1402 files changed, 22174 insertions, 8003 deletions

diff --git a/.gitauthors b/.gitauthors
index 75dd4d3b07ad..26f0db203dcc 100644
--- a/.gitauthors
+++ b/.gitauthors
@@ -707,6 +707,7 @@ sepotvin = Stephane E. Potvin <sepotvin@FreeBSD.org>
 sergei = Sergei Kolobov <sergei@FreeBSD.org>
 sevan = Sevan Janiyan <sevan@FreeBSD.org>
 sf = FUJISHIMA Satsuki <sf@FreeBSD.org>
+sg = Stephen Gregoratto <sg@FreeBSD.org>
 sgalabov = Stanislav Galabov <sgalabov@FreeBSD.org>
 shafeeq = Shafeeq Sinnamohideen <shafeeq@FreeBSD.org>
 shaun = Shaun Amott <shaun@FreeBSD.org>
diff --git a/MOVED b/MOVED
index 6593a19f5451..2830b12375e2 100644
--- a/MOVED
+++ b/MOVED
@@ -11925,7 +11925,6 @@ x11/py-qt4-opengl||2019-03-16|Has expired: Qt4 has been EOL since december 2015
 x11/qt4-graphicssystems-opengl||2019-03-16|Has expired: Qt4 has been EOL since december 2015
 x11/qt4-inputmethods||2019-03-16|Has expired: Qt4 has been EOL since december 2015
 x11/qxkb||2019-03-16|Has expired: Qt4 has been EOL since december 2015
-x11-fonts/fontmatrix||2019-03-16|Has expired: Qt4 has been EOL since december 2015
 x11-themes/qt4-style-float||2019-03-16|Has expired: Qt4 has been EOL since december 2015
 x11-themes/qt4-style-phase||2019-03-16|Has expired: Qt4 has been EOL since december 2015
 x11-themes/qt4-style-quantumstyle||2019-03-16|Has expired: Qt4 has been EOL since december 2015
@@ -12923,7 +12922,6 @@ emulators/qemu2||2019-09-05|Has expired: Latest 3.X branch is in ports tree
 games/asc||2019-09-05|Has expired: Broken for more than 6 months
 games/slade||2019-09-05|Has expired: Broken for more than 6 months
 graphics/gimp-wavelet-decompose-plugin||2019-09-05|Has expired: Broken for more than 6 months
-graphics/py-pyembree||2019-09-05|Has expired: Depends on expiring graphics/embree
 irc/irssi-otr||2019-09-05|Has expired: Broken for more than 6 months
 mail/p5-Mail-ClamAV||2019-09-05|Has expired: Broken for more than 6 months
 mail/qmail-ldap||2019-09-05|Has expired: Broken for more than 6 months
@@ -12936,7 +12934,6 @@ math/octave-forge-parallel||2019-09-05|Has expired: Broken for more than 6 month
 math/octave-forge-strings||2019-09-05|Has expired: Broken for more than 6 months
 math/octave-forge-tisean||2019-09-05|Has expired: Broken for more than 6 months
 math/octave-forge-video||2019-09-05|Has expired: Broken for more than 6 months
-math/py-yt||2019-09-05|Has expired: Depends on expiring graphics/embree
 misc/gnustep-examples||2019-09-05|Has expired: Broken for more than 6 months
 net/turses||2019-09-05|Has expired: Depends on expiring net/py-tweepy
 security/clamcour||2019-09-05|Has expired: Broken for more than 6 months
@@ -12951,3 +12948,7 @@ x11-toolkits/p5-Wx-GLCanvas||2019-09-05|Has expired: Depends on expiring x11-too
 x11-toolkits/p5-Wx-Perl-ProcessStream||2019-09-05|Has expired: Depends on expiring x11-toolkits/p5-Wx
 x11-wm/golem||2019-09-05|Has expired: Broken for more than 6 months
 x11-wm/pawm||2019-09-05|Has expired: Broken for more than 6 months
+x11-toolkits/p5-Wx||2019-09-07|Has expired: Broken for more than 6 months
+graphics/luxrender14||2019-09-07|Has expired: Depends on expiring graphics/embree, broken with boost 1.70
+graphics/luxrender||2019-09-07|Has expired: Depends on expiring graphics/embree, broken with boost 1.70
+sysutils/libutempter||2019-09-11|Belong to base in all supported version of FreeBSD
diff --git a/Mk/Uses/gem.mk b/Mk/Uses/gem.mk
index 3d26a6febedf..452a9ec730d4 100644
--- a/Mk/Uses/gem.mk
+++ b/Mk/Uses/gem.mk
@@ -108,8 +108,9 @@ do-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/
 	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f -name '*.so' -exec ${STRIP_CMD} {} +
 	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f \( -name mkmf.log -or -name gem_make.out \) -delete
-	${RM} -r ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext \
-		${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null || ${TRUE}
+	${FIND} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext -type f -not -name '*.so' -delete 2> /dev/null || ${TRUE}
+	${FIND} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext -type d -empty -delete 2> /dev/null || ${TRUE}
+	${RM} -r ${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null || ${TRUE}
 	${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null || ${TRUE}
 .if !${PORT_OPTIONS:MDOCS}
 	-@${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index 7e622517cece..cb1bb6e1b298 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -49,127 +49,118 @@ ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	Linux compatibility is only available on amd64 and i386
 .endif
 
-linux_allegro_DEP=		linux-${linux_ARGS}-allegro>0:devel/linux-${linux_ARGS}-allegro
-linux_alsa-plugins-oss_DEP=	linux-${linux_ARGS}-alsa-plugins-oss>0:audio/linux-${linux_ARGS}-alsa-plugins-oss
-linux_alsa-plugins-pulseaudio_DEP=linux-${linux_ARGS}-alsa-plugins-pulseaudio>0:audio/linux-${linux_ARGS}-alsa-plugins-pulseaudio
-linux_alsalib_DEP=		linux-${linux_ARGS}-alsa-lib>0:audio/linux-${linux_ARGS}-alsa-lib
-linux_atk_DEP=			linux-${linux_ARGS}-atk>0:accessibility/linux-${linux_ARGS}-atk
-linux_avahi-libs_DEP=		linux-${linux_ARGS}-avahi-libs>0:net/linux-${linux_ARGS}-avahi-libs
-linux_base_DEP=			linux_base-${linux_ARGS}>0:emulators/linux_base-${linux_ARGS}
-linux_cairo_DEP=		linux-${linux_ARGS}-cairo>0:graphics/linux-${linux_ARGS}-cairo
-linux_cups-libs_DEP=		linux-${linux_ARGS}-cups-libs>0:print/linux-${linux_ARGS}-cups-libs
-linux_curl_DEP=			linux-${linux_ARGS}-curl>0:ftp/linux-${linux_ARGS}-curl
-linux_cyrus-sasl2_DEP=		linux-${linux_ARGS}-cyrus-sasl-lib>0:security/linux-${linux_ARGS}-cyrus-sasl2
-linux_dbusglib_DEP=		linux-${linux_ARGS}-dbus-glib>0:devel/linux-${linux_ARGS}-dbus-glib
-linux_dbuslibs_DEP=		linux-${linux_ARGS}-dbus-libs>0:devel/linux-${linux_ARGS}-dbus-libs
-linux_devtools_DEP=		linux-${linux_ARGS}-devtools>0:devel/linux-${linux_ARGS}-devtools
-linux_dri_DEP=			linux-${linux_ARGS}-dri>0:graphics/linux-${linux_ARGS}-dri
-linux_elfutils-libelf_DEP=	linux-${linux_ARGS}-elfutils-libelf>0:devel/linux-${linux_ARGS}-elfutils-libelf
-linux_elfutils-libs_DEP=	linux-${linux_ARGS}-elfutils-libs>0:devel/linux-${linux_ARGS}-elfutils-libs
-linux_expat_DEP=		linux-${linux_ARGS}-expat>0:textproc/linux-${linux_ARGS}-expat
-.if ${linux_ARGS} == c6
-linux_flac_DEP=			linux-${linux_ARGS}-flac>0:audio/linux-${linux_ARGS}-flac
-.else
-linux_flac_DEP=			linux-${linux_ARGS}-flac-libs>0:audio/linux-${linux_ARGS}-flac
-.endif
-linux_fontconfig_DEP=		linux-${linux_ARGS}-fontconfig>0:x11-fonts/linux-${linux_ARGS}-fontconfig
-linux_freetype_DEP=		linux-${linux_ARGS}-freetype>0:print/linux-${linux_ARGS}-freetype
-linux_fribidi_DEP=		linux-${linux_ARGS}-fribidi>0:converters/linux-${linux_ARGS}-fribidi
-linux_gdkpixbuf2_DEP=		linux-${linux_ARGS}-gdk-pixbuf2>0:graphics/linux-${linux_ARGS}-gdk-pixbuf2
-linux_gnutls_DEP=		linux-${linux_ARGS}-gnutls>0:security/linux-${linux_ARGS}-gnutls
-linux_graphite2_DEP=		linux-${linux_ARGS}-graphite2>0:graphics/linux-${linux_ARGS}-graphite2
-linux_gtk2_DEP=			linux-${linux_ARGS}-gtk2>0:x11-toolkits/linux-${linux_ARGS}-gtk2
-linux_harfbuzz_DEP=		linux-${linux_ARGS}-harfbuzz>0:print/linux-${linux_ARGS}-harfbuzz
-linux_icu_DEP=			linux-${linux_ARGS}-icu>0:devel/linux-${linux_ARGS}-icu
-linux_jasper_DEP=		linux-${linux_ARGS}-jasper-libs>0:graphics/linux-${linux_ARGS}-jasper
-linux_jbigkit_DEP=		linux-${linux_ARGS}-jbigkit-libs>0:graphics/linux-${linux_ARGS}-jbigkit
-linux_jpeg_DEP=			linux-${linux_ARGS}-jpeg>0:graphics/linux-${linux_ARGS}-jpeg
-linux_libasyncns_DEP=		linux-${linux_ARGS}-libasyncns>0:dns/linux-${linux_ARGS}-libasyncns
-.if ${linux_ARGS} == c6
-linux_libaudiofile_DEP=		linux-${linux_ARGS}-audiofile>0:audio/linux-${linux_ARGS}-libaudiofile
-.else
-linux_libaudiofile_DEP=		linux-${linux_ARGS}-audiofile>0:audio/linux-${linux_ARGS}-audiofile
-.endif
-linux_libgcrypt_DEP=		linux-${linux_ARGS}-libgcrypt>0:security/linux-${linux_ARGS}-libgcrypt
-linux_libgfortran_DEP=		linux-${linux_ARGS}-libgfortran>0:devel/linux-${linux_ARGS}-libgfortran
-linux_libglvnd_DEP=		linux-${linux_ARGS}-libglvnd>0:graphics/linux-${linux_ARGS}-libglvnd
-linux_libgpg-error_DEP=		linux-${linux_ARGS}-libgpg-error>0:security/linux-${linux_ARGS}-libgpg-error
-linux_libmng_DEP=		linux-${linux_ARGS}-libmng>0:graphics/linux-${linux_ARGS}-libmng
-linux_libogg_DEP=		linux-${linux_ARGS}-libogg>0:audio/linux-${linux_ARGS}-libogg
-linux_libpciaccess_DEP=		linux-${linux_ARGS}-libpciaccess>0:devel/linux-${linux_ARGS}-libpciaccess
-linux_libsndfile_DEP=		linux-${linux_ARGS}-libsndfile>0:audio/linux-${linux_ARGS}-libsndfile
-linux_libsoup_DEP=		linux-${linux_ARGS}-libsoup>0:devel/linux-${linux_ARGS}-libsoup
-linux_libssh2_DEP=		linux-${linux_ARGS}-libssh2>0:security/linux-${linux_ARGS}-libssh2
-linux_libtasn1_DEP=		linux-${linux_ARGS}-libtasn1>0:security/linux-${linux_ARGS}-libtasn1
-linux_libthai_DEP=		linux-${linux_ARGS}-libthai>0:devel/linux-${linux_ARGS}-libthai
-linux_libtheora_DEP=		linux-${linux_ARGS}-libtheora>0:multimedia/linux-${linux_ARGS}-libtheora
-linux_libunwind_DEP=		linux-${linux_ARGS}-libunwind>0:devel/linux-${linux_ARGS}-libunwind
-linux_libv4l_DEP=		linux-${linux_ARGS}-libv4l>0:multimedia/linux-${linux_ARGS}-libv4l
-linux_libvorbis_DEP=		linux-${linux_ARGS}-libvorbis>0:audio/linux-${linux_ARGS}-libvorbis
-linux_libxml2_DEP=		linux-${linux_ARGS}-libxml2>0:textproc/linux-${linux_ARGS}-libxml2
-linux_lttng-ust_DEP=		linux-${linux_ARGS}-lttng-ust>0:sysutils/linux-${linux_ARGS}-lttng-ust
-linux_lz4_DEP=			linux-${linux_ARGS}-lz4>0:archivers/linux-${linux_ARGS}-lz4
-linux_mikmod_DEP=		linux-${linux_ARGS}-libmikmod>0:audio/linux-${linux_ARGS}-mikmod
-linux_naslibs_DEP=		linux-${linux_ARGS}-nas>0:audio/linux-${linux_ARGS}-nas-libs
-linux_nettle_DEP=		linux-${linux_ARGS}-nettle>0:security/linux-${linux_ARGS}-nettle
-linux_nspr_DEP=			linux-${linux_ARGS}-nspr>0:devel/linux-${linux_ARGS}-nspr
-linux_nss_DEP=			linux-${linux_ARGS}-nss>0:security/linux-${linux_ARGS}-nss
-linux_openal_DEP=		linux-${linux_ARGS}-openal>0:audio/linux-${linux_ARGS}-openal
-linux_openal-soft_DEP=		linux-${linux_ARGS}-openal-soft>0:audio/linux-${linux_ARGS}-openal-soft
-linux_openldap_DEP=		linux-${linux_ARGS}-openldap>0:net/linux-${linux_ARGS}-openldap
-.if ${linux_ARGS} == c6
-linux_openmotif_DEP=		linux-${linux_ARGS}-openmotif>0:x11-toolkits/linux-${linux_ARGS}-openmotif
-.else
-linux_openmotif_DEP=		linux-${linux_ARGS}-motif>0:x11-toolkits/linux-${linux_ARGS}-openmotif
-.endif
-.if ${linux_ARGS} == c6
-linux_openssl_DEP=		linux-${linux_ARGS}-openssl>0:security/linux-${linux_ARGS}-openssl
-.else
-linux_openssl_DEP=		# empty
-.endif
-linux_p11-kit_DEP=		linux-${linux_ARGS}-p11-kit>0:security/linux-${linux_ARGS}-p11-kit
-linux_pango_DEP=		linux-${linux_ARGS}-pango>0:x11-toolkits/linux-${linux_ARGS}-pango
-linux_pixman_DEP=		linux-${linux_ARGS}-pixman>0:x11/linux-${linux_ARGS}-pixman
-linux_png_DEP=			linux-${linux_ARGS}-libpng>0:graphics/linux-${linux_ARGS}-png
-linux_pulseaudio-libs_DEP=	linux-${linux_ARGS}-pulseaudio-libs>0:audio/linux-${linux_ARGS}-pulseaudio-libs
-.if ${linux_ARGS} == c6
-linux_qt_DEP=			linux-${linux_ARGS}-qt47>0:devel/linux-${linux_ARGS}-qt47
-linux_qt-x11_DEP=		linux-${linux_ARGS}-qt47-x11>0:x11-toolkits/linux-${linux_ARGS}-qt47-x11
-linux_qtwebkit_DEP=		linux-${linux_ARGS}-qt47-webkit>0:www/linux-${linux_ARGS}-qt47-webkit
-.else
-linux_qt_DEP=			linux-${linux_ARGS}-qt>0:devel/linux-${linux_ARGS}-qt
-linux_qt-x11_DEP=		linux-${linux_ARGS}-qt-x11>0:x11-toolkits/linux-${linux_ARGS}-qt-x11
-linux_qtwebkit_DEP=		linux-${linux_ARGS}-qtwebkit>0:www/linux-${linux_ARGS}-qtwebkit
-.endif
-linux_scimlibs_DEP=		linux-${linux_ARGS}-scim-libs>0:textproc/linux-${linux_ARGS}-scim-libs
-linux_sdl12_DEP=		linux-${linux_ARGS}-sdl>0:devel/linux-${linux_ARGS}-sdl12
-linux_sdlimage_DEP=		linux-${linux_ARGS}-sdl_image>0:graphics/linux-${linux_ARGS}-sdl_image
-linux_sdlmixer_DEP=		linux-${linux_ARGS}-sdl_mixer>0:audio/linux-${linux_ARGS}-sdl_mixer
-linux_sqlite3_DEP=		linux-${linux_ARGS}-sqlite>0:databases/linux-${linux_ARGS}-sqlite3
-linux_systemd-libs_DEP=		linux-${linux_ARGS}-systemd-libs>0:devel/linux-${linux_ARGS}-systemd-libs
-linux_tcl85_DEP=		linux-${linux_ARGS}-tcl85>0:lang/linux-${linux_ARGS}-tcl85
-linux_tcp_wrappers-libs_DEP=	linux-${linux_ARGS}-tcp_wrappers-libs>0:net/linux-${linux_ARGS}-tcp_wrappers-libs
-linux_tiff_DEP=			linux-${linux_ARGS}-libtiff>0:graphics/linux-${linux_ARGS}-tiff
-linux_tk85_DEP=			linux-${linux_ARGS}-tk85>0:x11-toolkits/linux-${linux_ARGS}-tk85
-linux_trousers_DEP=		linux-${linux_ARGS}-trousers>0:security/linux-${linux_ARGS}-trousers
-linux_ucl_DEP=			linux-${linux_ARGS}-ucl>0:archivers/linux-${linux_ARGS}-ucl
-linux_userspace-rcu_DEP=	linux-${linux_ARGS}-userspace-rcu>0:sysutils/linux-${linux_ARGS}-userspace-rcu
-linux_wayland_DEP=		linux-${linux_ARGS}-wayland>0:graphics/linux-${linux_ARGS}-wayland
-linux_xorglibs_DEP=		linux-${linux_ARGS}-xorg-libs>0:x11/linux-${linux_ARGS}-xorg-libs
+_linux_c7_alsa-lib-devel=		linux-c7-alsa-lib-devel>0:audio/linux-c7-alsa-lib-devel
+_linux_${linux_ARGS}_alsa-plugins-oss=	linux-${linux_ARGS}-alsa-plugins-oss>0:audio/linux-${linux_ARGS}-alsa-plugins-oss
+_linux_${linux_ARGS}_alsa-plugins-pulseaudio=linux-${linux_ARGS}-alsa-plugins-pulseaudio>0:audio/linux-${linux_ARGS}-alsa-plugins-pulseaudio
+_linux_${linux_ARGS}_alsalib=		linux-${linux_ARGS}-alsa-lib>0:audio/linux-${linux_ARGS}-alsa-lib
+_linux_c7_at-spi2-atk=			linux-c7-at-spi2-atk>0:accessibility/linux-c7-at-spi2-atk
+_linux_c7_at-spi2-core=			linux-c7-at-spi2-core>0:accessibility/linux-c7-at-spi2-core
+_linux_${linux_ARGS}_atk=		linux-${linux_ARGS}-atk>0:accessibility/linux-${linux_ARGS}-atk
+_linux_${linux_ARGS}_avahi-libs=	linux-${linux_ARGS}-avahi-libs>0:net/linux-${linux_ARGS}-avahi-libs
+_linux_c6_base=				linux_base-c6>=6.10:emulators/linux_base-c6
+_linux_c7_base=				linux_base-c7>=7.6.1810_7:emulators/linux_base-c7
+_linux_${linux_ARGS}_cairo=		linux-${linux_ARGS}-cairo>0:graphics/linux-${linux_ARGS}-cairo
+_linux_c7_cairo-gobject=		linux-c7-cairo-gobject>0:graphics/linux-c7-cairo-gobject
+_linux_${linux_ARGS}_cups-libs=		linux-${linux_ARGS}-cups-libs>0:print/linux-${linux_ARGS}-cups-libs
+_linux_${linux_ARGS}_curl=		linux-${linux_ARGS}-curl>0:ftp/linux-${linux_ARGS}-curl
+_linux_${linux_ARGS}_cyrus-sasl2=	linux-${linux_ARGS}-cyrus-sasl-lib>0:security/linux-${linux_ARGS}-cyrus-sasl2
+_linux_${linux_ARGS}_dbusglib=		linux-${linux_ARGS}-dbus-glib>0:devel/linux-${linux_ARGS}-dbus-glib
+_linux_${linux_ARGS}_dbuslibs=		linux-${linux_ARGS}-dbus-libs>0:devel/linux-${linux_ARGS}-dbus-libs
+_linux_${linux_ARGS}_devtools=		linux-${linux_ARGS}-devtools>0:devel/linux-${linux_ARGS}-devtools
+_linux_${linux_ARGS}_dri=		linux-${linux_ARGS}-dri>0:graphics/linux-${linux_ARGS}-dri
+_linux_${linux_ARGS}_elfutils-libelf=	linux-${linux_ARGS}-elfutils-libelf>0:devel/linux-${linux_ARGS}-elfutils-libelf
+_linux_c7_elfutils-libs=		linux-c7-elfutils-libs>0:devel/linux-c7-elfutils-libs
+_linux_${linux_ARGS}_expat=		linux-${linux_ARGS}-expat>0:textproc/linux-${linux_ARGS}-expat
+_linux_c6_flac=				linux-c6-flac>0:audio/linux-c6-flac
+_linux_c7_flac=				linux-c7-flac-libs>0:audio/linux-c7-flac
+_linux_${linux_ARGS}_fontconfig=	linux-${linux_ARGS}-fontconfig>0:x11-fonts/linux-${linux_ARGS}-fontconfig
+_linux_c7_freetype=			linux-c7-freetype>0:print/linux-c7-freetype
+_linux_c7_fribidi=			linux-c7-fribidi>0:converters/linux-c7-fribidi
+_linux_${linux_ARGS}_gdkpixbuf2=	linux-${linux_ARGS}-gdk-pixbuf2>0:graphics/linux-${linux_ARGS}-gdk-pixbuf2
+_linux_${linux_ARGS}_gnutls=		linux-${linux_ARGS}-gnutls>0:security/linux-${linux_ARGS}-gnutls
+_linux_c7_graphite2=			linux-c7-graphite2>0:graphics/linux-c7-graphite2
+_linux_${linux_ARGS}_gtk2=		linux-${linux_ARGS}-gtk2>0:x11-toolkits/linux-${linux_ARGS}-gtk2
+_linux_c7_gtk3=				linux-c7-gtk3>0:x11-toolkits/linux-c7-gtk3
+_linux_c7_harfbuzz=			linux-c7-harfbuzz>0:print/linux-c7-harfbuzz
+_linux_${linux_ARGS}_icu=		linux-${linux_ARGS}-icu>0:devel/linux-${linux_ARGS}-icu
+_linux_${linux_ARGS}_jasper=		linux-${linux_ARGS}-jasper-libs>0:graphics/linux-${linux_ARGS}-jasper
+_linux_c7_jbigkit=			linux-c7-jbigkit-libs>0:graphics/linux-c7-jbigkit
+_linux_${linux_ARGS}_jpeg=		linux-${linux_ARGS}-jpeg>0:graphics/linux-${linux_ARGS}-jpeg
+_linux_${linux_ARGS}_libasyncns=	linux-${linux_ARGS}-libasyncns>0:dns/linux-${linux_ARGS}-libasyncns
+_linux_c6_libaudiofile=			linux-c6-audiofile>0:audio/linux-c6-libaudiofile
+_linux_c7_libaudiofile=			linux-c7-audiofile>0:audio/linux-c7-audiofile
+_linux_c7_libepoxy=			linux-c7-libepoxy>0:graphics/linux-c7-libepoxy
+_linux_${linux_ARGS}_libgcrypt=		linux-${linux_ARGS}-libgcrypt>0:security/linux-${linux_ARGS}-libgcrypt
+_linux_${linux_ARGS}_libgfortran=	linux-${linux_ARGS}-libgfortran>0:devel/linux-${linux_ARGS}-libgfortran
+_linux_c7_libglvnd=			linux-c7-libglvnd>0:graphics/linux-c7-libglvnd
+_linux_${linux_ARGS}_libgpg-error=	linux-${linux_ARGS}-libgpg-error>0:security/linux-${linux_ARGS}-libgpg-error
+_linux_${linux_ARGS}_libogg=		linux-${linux_ARGS}-libogg>0:audio/linux-${linux_ARGS}-libogg
+_linux_${linux_ARGS}_libpciaccess=	linux-${linux_ARGS}-libpciaccess>0:devel/linux-${linux_ARGS}-libpciaccess
+_linux_${linux_ARGS}_libsndfile=	linux-${linux_ARGS}-libsndfile>0:audio/linux-${linux_ARGS}-libsndfile
+_linux_c6_libsoup=			linux-c6-libsoup>0:devel/linux-c6-libsoup
+_linux_${linux_ARGS}_libssh2=		linux-${linux_ARGS}-libssh2>0:security/linux-${linux_ARGS}-libssh2
+_linux_${linux_ARGS}_libtasn1=		linux-${linux_ARGS}-libtasn1>0:security/linux-${linux_ARGS}-libtasn1
+_linux_${linux_ARGS}_libthai=		linux-${linux_ARGS}-libthai>0:devel/linux-${linux_ARGS}-libthai
+_linux_${linux_ARGS}_libtheora=		linux-${linux_ARGS}-libtheora>0:multimedia/linux-${linux_ARGS}-libtheora
+_linux_${linux_ARGS}_libunwind=		linux-${linux_ARGS}-libunwind>0:devel/linux-${linux_ARGS}-libunwind
+_linux_${linux_ARGS}_libv4l=		linux-${linux_ARGS}-libv4l>0:multimedia/linux-${linux_ARGS}-libv4l
+_linux_${linux_ARGS}_libvorbis=		linux-${linux_ARGS}-libvorbis>0:audio/linux-${linux_ARGS}-libvorbis
+_linux_c7_libxkbcommon=			linux-c7-libxkbcommon>0:x11/linux-c7-libxkbcommon
+_linux_${linux_ARGS}_libxml2=		linux-${linux_ARGS}-libxml2>0:textproc/linux-${linux_ARGS}-libxml2
+_linux_${linux_ARGS}_lttng-ust=		linux-${linux_ARGS}-lttng-ust>0:sysutils/linux-${linux_ARGS}-lttng-ust
+_linux_c7_lz4=				linux-c7-lz4>0:archivers/linux-c7-lz4
+_linux_c7_make=				linux-c7-make>0:devel/linux-c7-make
+_linux_c6_mikmod=			linux-c6-libmikmod>0:audio/linux-c6-mikmod
+_linux_c6_naslibs=			linux-c6-nas>0:audio/linux-c6-nas-libs
+_linux_c7_nettle=			linux-c7-nettle>0:security/linux-c7-nettle
+_linux_${linux_ARGS}_nspr=		linux-${linux_ARGS}-nspr>0:devel/linux-${linux_ARGS}-nspr
+_linux_${linux_ARGS}_nss=		linux-${linux_ARGS}-nss>0:security/linux-${linux_ARGS}-nss
+_linux_${linux_ARGS}_openal-soft=	linux-${linux_ARGS}-openal-soft>0:audio/linux-${linux_ARGS}-openal-soft
+_linux_${linux_ARGS}_openldap=		linux-${linux_ARGS}-openldap>0:net/linux-${linux_ARGS}-openldap
+_linux_c6_openmotif=			linux-c6-openmotif>0:x11-toolkits/linux-c6-openmotif
+_linux_c7_openmotif=			linux-c7-motif>0:x11-toolkits/linux-c7-openmotif
+_linux_c6_openssl=			linux-c6-openssl>0:security/linux-c6-openssl
+_linux_c7_openssl=			${_linux_c7_base}
+_linux_c7_p11-kit=			linux-c7-p11-kit>0:security/linux-c7-p11-kit
+_linux_${linux_ARGS}_pango=		linux-${linux_ARGS}-pango>0:x11-toolkits/linux-${linux_ARGS}-pango
+_linux_${linux_ARGS}_pixman=		linux-${linux_ARGS}-pixman>0:x11/linux-${linux_ARGS}-pixman
+_linux_${linux_ARGS}_png=		linux-${linux_ARGS}-libpng>0:graphics/linux-${linux_ARGS}-png
+_linux_${linux_ARGS}_pulseaudio-libs=	linux-${linux_ARGS}-pulseaudio-libs>0:audio/linux-${linux_ARGS}-pulseaudio-libs
+_linux_c6_qt=				linux-c6-qt47>0:devel/linux-c6-qt47
+_linux_c7_qt=				linux-c7-qt>0:devel/linux-c7-qt
+_linux_c6_qt-x11=			linux-c6-qt47-x11>0:x11-toolkits/linux-c6-qt47-x11
+_linux_c7_qt-x11=			linux-c7-qt-x11>0:x11-toolkits/linux-c7-qt-x11
+_linux_c6_qtwebkit=			linux-c6-qt47-webkit>0:www/linux-c6-qt47-webkit
+_linux_c7_qtwebkit=			linux-c7-qtwebkit>0:www/linux-c7-qtwebkit
+_linux_${linux_ARGS}_sdl12=		linux-${linux_ARGS}-sdl>0:devel/linux-${linux_ARGS}-sdl12
+_linux_${linux_ARGS}_sdlimage=		linux-${linux_ARGS}-sdl_image>0:graphics/linux-${linux_ARGS}-sdl_image
+_linux_${linux_ARGS}_sdlmixer=		linux-${linux_ARGS}-sdl_mixer>0:audio/linux-${linux_ARGS}-sdl_mixer
+_linux_${linux_ARGS}_sdlttf=		linux-${linux_ARGS}-sdl_ttf>0:graphics/linux-${linux_ARGS}-sdl_ttf
+_linux_${linux_ARGS}_sqlite3=		linux-${linux_ARGS}-sqlite>0:databases/linux-${linux_ARGS}-sqlite3
+_linux_c7_systemd-libs=			linux-c7-systemd-libs>0:devel/linux-c7-systemd-libs
+_linux_${linux_ARGS}_tcl85=		linux-${linux_ARGS}-tcl85>0:lang/linux-${linux_ARGS}-tcl85
+_linux_${linux_ARGS}_tcp_wrappers-libs=	linux-${linux_ARGS}-tcp_wrappers-libs>0:net/linux-${linux_ARGS}-tcp_wrappers-libs
+_linux_${linux_ARGS}_tiff=		linux-${linux_ARGS}-libtiff>0:graphics/linux-${linux_ARGS}-tiff
+_linux_${linux_ARGS}_tk85=		linux-${linux_ARGS}-tk85>0:x11-toolkits/linux-${linux_ARGS}-tk85
+_linux_c7_trousers=			linux-c7-trousers>0:security/linux-c7-trousers
+_linux_${linux_ARGS}_userspace-rcu=	linux-${linux_ARGS}-userspace-rcu>0:sysutils/linux-${linux_ARGS}-userspace-rcu
+_linux_c7_wayland=			linux-c7-wayland>0:graphics/linux-c7-wayland
+_linux_c6_xorglibs=			linux-c6-xorg-libs>0:x11/linux-c6-xorg-libs
+_linux_c7_xorglibs=			linux-c7-xorg-libs>=7.7_7:x11/linux-c7-xorg-libs
 
 USE_LINUX?=		base
 .for i in ${USE_LINUX}
 _i_args:=		${i:C/^[^:]*:?//:S/,/ /g}
 .if ${_i_args:Mpatch}
-PATCH_DEPENDS+=		${linux_${i:C/:.*//}_DEP}
+PATCH_DEPENDS+=		${_linux_${linux_ARGS}_${i:C/:.*//}}
 .endif
 .if ${_i_args:Mbuild}
-BUILD_DEPENDS+=		${linux_${i:C/:.*//}_DEP}
+BUILD_DEPENDS+=		${_linux_${linux_ARGS}_${i:C/:.*//}}
 .endif
 .if ${_i_args:Mrun} || empty(_i_args)
-RUN_DEPENDS+=		${linux_${i:C/:.*//}_DEP}
+RUN_DEPENDS+=		${_linux_${linux_ARGS}_${i:C/:.*//}}
 .endif
-.if !defined(linux_${i:C/:.*//}_DEP)
+.if !defined(_linux_${linux_ARGS}_${i:C/:.*//})
 DEV_ERROR+=		"USE_LINUX=${i}: package does not exist"
 .endif
 .endfor
@@ -187,6 +178,8 @@ MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/x86_64/Packages/:DEFAULT,amd64 \
 			centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE
 .endif
 DIST_SUBDIR?=		centos
+DEPRECATED=		Superseded by CentOS 7
+EXPIRATION_DATE=	2019-12-31
 .elif ${linux_ARGS} == c7
 .ifndef MASTER_SITES
 MASTER_SITES=		${MASTER_SITE_CENTOS_LINUX}
diff --git a/Mk/Uses/xorg.mk b/Mk/Uses/xorg.mk
index 2a2dea2b8989..bdc9125b4cd9 100644
--- a/Mk/Uses/xorg.mk
+++ b/Mk/Uses/xorg.mk
@@ -74,6 +74,7 @@ XORG_MODULES=	dmx \
 		xorgproto \
 		xp \
 		xpm \
+		xpresent \
 		xprintapputil \
 		xprintutil \
 		xrandr \
@@ -131,6 +132,7 @@ xorg-server_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-server.pc:x11-se
 xorgproto_BUILD_DEPENDS=	xorgproto>=0:x11/xorgproto
 xp_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xp.pc:x11/libXp
 xpm_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xpm.pc:x11/libXpm
+xpresent_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xpresent.pc:x11/libXpresent
 xprintapputil_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:x11/libXprintAppUtil
 xprintutil_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xprintutil.pc:x11/libXprintUtil
 xrandr_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xrandr.pc:x11/libXrandr
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index d8feded2404f..f18367a63b11 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -91,7 +91,7 @@ PYTHON2_DEFAULT?=	2.7
 # Possible values: 3.5, 3.6, 3.7
 PYTHON3_DEFAULT?=	3.6
 # Possible values: 2.4, 2.5, 2.6
-RUBY_DEFAULT?=		2.5
+RUBY_DEFAULT?=		2.6
 # Possible values: rust, rust-nightly
 RUST_DEFAULT?=		rust
 # Possible values: 4.8, 4.10
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index a527cb561836..0e25b0a497ca 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -245,7 +245,7 @@ MOZ_OPTIONS+=	--disable-libproxy
 .endif
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	libasound.so:audio/alsa-lib
+BUILD_DEPENDS+=	${LOCALBASE}/include/alsa/asoundlib.h:audio/alsa-lib
 RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 RUN_DEPENDS+=	alsa-lib>=1.1.1_1:audio/alsa-lib
 MOZ_OPTIONS+=	--enable-alsa
@@ -264,7 +264,7 @@ MOZ_OPTIONS+=	--disable-pulseaudio
 .endif
 
 .if ${PORT_OPTIONS:MSNDIO}
-LIB_DEPENDS+=	libsndio.so:audio/sndio
+BUILD_DEPENDS+=	${LOCALBASE}/include/sndio.h:audio/sndio
 post-patch-SNDIO-on:
 	@${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \
 		${MOZSRC}/media/libcubeb/src/moz.build \
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 7db88d34989a..8bfed0f4b1fd 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1462,7 +1462,7 @@ _usefound=
 .endif
 .endfor
 .if !defined(_usefound)
-ERROR+=	"Unkonwn USES=${f:C/\:.*//}"
+ERROR+=	"Unknown USES=${f:C/\:.*//}"
 .endif
 .endfor
 
@@ -1984,7 +1984,7 @@ _usefound=
 .endif
 .endfor
 .if !defined(_usefound)
-ERROR+=	"Unkonwn USES=${f:C/\:.*//}"
+ERROR+=	"Unknown USES=${f:C/\:.*//}"
 .endif
 .endfor
 
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index f611c5d8c0bb..590bb963c14e 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -799,7 +799,8 @@ MASTER_SITE_KDE+= \
 	https://ftp.icm.edu.pl/pub/unix/kde/%SUBDIR%/ \
 	http://ftp.fi.muni.cz/pub/kde/%SUBDIR%/ \
 	ftp://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
-	http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/%SUBDIR%/
+	http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
+	http://kde.cs.nctu.edu.tw/%SUBDIR%/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_LIBREOFFICE_DEV)
diff --git a/Tools/scripts/tindex b/Tools/scripts/tindex
index 54e6d04f2166..c9679bbdd2fe 100755
--- a/Tools/scripts/tindex
+++ b/Tools/scripts/tindex
@@ -26,10 +26,9 @@ ERROR_ADDRESS=root@localhost
 # Location of ports tree and source trees
 export BASEDIR=/a/tindex
 export PORTSDIR=${BASEDIR}/ports
-export SRCDIR9=${BASEDIR}/src.9
-export SRCDIR10=${BASEDIR}/src.10
 export SRCDIR11=${BASEDIR}/src.11
 export SRCDIR12=${BASEDIR}/src.12
+export SRCDIR13=${BASEDIR}/src.13
 export OUTDIR=${BASEDIR}/out
 
 # Target architecture if not set in the environment
@@ -115,20 +114,18 @@ export INDEX_JOBS=3
 export INDEX_QUIET=1
 
 # First update the source trees to get current OSVERSION
-${SVN} -q up ${SRCDIR9}/sys/sys
-OSVERSION9=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR9}/sys/sys/param.h)
-
-${SVN} -q up ${SRCDIR10}/sys/sys
-OSVERSION10=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR10}/sys/sys/param.h)
-
 ${SVN} -q up ${SRCDIR11}/sys/sys
 OSVERSION11=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR11}/sys/sys/param.h)
 
 ${SVN} -q up ${SRCDIR12}/sys/sys
 OSVERSION12=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR12}/sys/sys/param.h)
 
+${SVN} -q up ${SRCDIR13}/sys/sys
+OSVERSION13=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR12}/sys/sys/param.h)
+
+
 cd ${PORTSDIR}
-rm -f INDEX-9 INDEX-9.bz2 INDEX-10 INDEX-10.bz2 INDEX-11 INDEX-11.bz2 INDEX-12 INDEX-12.bz2
+rm -f INDEX-11 INDEX-11.bz2 INDEX-12 INDEX-12.bz2 INDEX-13 INDEX-13.bz2
 (${SVN} up 2>1 ) > svn.log
 if grep -q ^C svn.log ; then
   (echo "svn update failed with conflicts:";
@@ -136,7 +133,7 @@ if grep -q ^C svn.log ; then
     exit 1
 fi
 
-for branch in 9.x 10.x 11.x 12.x; do
+for branch in 11.x 12.x 13.x; do
     release=$(echo $branch | sed -e 's,.x,,')
 
     eval _osver=\$OSVERSION${release}
@@ -144,14 +141,9 @@ for branch in 9.x 10.x 11.x 12.x; do
     export OSVERSION=${_osver}
     export UNAME_r=${_uname_r}
 
-    if [ "${release}" = "9" ]; then
-        MAKE_CMD=fmake
-    else
-        MAKE_CMD=make
-    fi
     echo "Building INDEX for ${branch} with OSVERSION=${OSVERSION}"
     cd ${PORTSDIR}
-    ((${MAKE_CMD} index 2> index.err) > index.out) || indexfail ${branch}
+    ((make index 2> index.err) > index.out) || indexfail ${branch}
     if [ -s index.err ]; then
         indexfail ${branch}
     fi
diff --git a/UPDATING b/UPDATING
index 30c04781a501..15183756e95c 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,60 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20190911:
+  AFFECTS: users of security/bastillion
+  AUTHOR: netchild@FreeBSD.org
+
+  The datastore of bastillion needs to be updated:
+    java -jar $PREFIX/jetty_bastillion/upgrade/bastillion-upgrade-3.08.00.jar \
+      $PREFIX/jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties
+
+20190909:
+  AFFECTS: users of lang/ruby25
+  AUTHOR: mfechner@FreeBSD.org
+
+  The default ruby version has been updated from 2.5 to 2.6.
+
+  If you compile your own ports you may keep 2.5 as the default version by
+  adding the following lines to your /etc/make.conf file:
+
+  #
+  # Keep ruby 2.5 as default version
+  #
+  DEFAULT_VERSIONS+=ruby=2.5
+
+  If you wish to update to the new default version, you need to first stop any
+  software that uses ruby. Then, you will need to follow these steps, depending
+  upon how you manage your system.
+
+  If you use pkgng, simply upgrade:
+  # pkg upgrade
+
+  If you do not use pkg, please check entry 20190420.
+  The description there should also work for this version.
+
+20190906:
+  AFFECTS: users of devel/py-fabric
+  AUTHOR: dbaio@FreeBSD.org
+
+  Fabric (devel/py-fabric) was upgraded to 2.5.0, Fabric (2+) represents
+  a near-total reimplementation and reorganization of the software.
+
+  Fabric 2 is not at 100% feature parity with 1.x! Some features have been
+  explicitly dropped, but others simply have not been ported over yet,
+  either due to time constraints or because said features need to be
+  re-examined in a modern context.
+
+  More information at:
+  https://www.fabfile.org/upgrading.html#upgrading
+  https://www.fabfile.org/upgrading.html#upgrade-specifics
+
+  If you would like to keep using 1.x, please run the following command to
+  update pkg database:
+
+    pkg set -n py27-fabric:py27-fabric1
+    pkg set -o devel/py-fabric:devel/py-fabric1
+
 20190830:
   AFFECTS: users of www/gitlab-ce
   AUTHOR: mfechner@FreeBSD.org
diff --git a/accessibility/Makefile b/accessibility/Makefile
index 51ff204f5ebe..6fb0dfe49c64 100644
--- a/accessibility/Makefile
+++ b/accessibility/Makefile
@@ -16,6 +16,8 @@
     SUBDIR += kmouth
     SUBDIR += libqaccessibilityclient
     SUBDIR += linux-c6-atk
+    SUBDIR += linux-c7-at-spi2-atk
+    SUBDIR += linux-c7-at-spi2-core
     SUBDIR += linux-c7-atk
     SUBDIR += orca
     SUBDIR += py-atspi
diff --git a/accessibility/linux-c7-at-spi2-atk/Makefile b/accessibility/linux-c7-at-spi2-atk/Makefile
new file mode 100644
index 000000000000..ad9f5350f1c4
--- /dev/null
+++ b/accessibility/linux-c7-at-spi2-atk/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+PORTNAME=	at-spi2-atk
+PORTVERSION=	2.26.2
+DISTVERSIONSUFFIX=	-1.el7
+CATEGORIES=	accessibility linux
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Assistive technology ATK bridge (Linux CentOS ${LINUX_DIST_VER})
+
+LICENSE=	LGPL20+
+
+USES=		linux:c7
+USE_LDCONFIG=	yes
+USE_LINUX=	at-spi2-core atk dbuslibs
+USE_LINUX_RPM=	yes
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.mk>
diff --git a/accessibility/linux-c7-at-spi2-atk/distinfo b/accessibility/linux-c7-at-spi2-atk/distinfo
new file mode 100644
index 000000000000..e05d4cea1cc6
--- /dev/null
+++ b/accessibility/linux-c7-at-spi2-atk/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1567343610
+SHA256 (centos/at-spi2-atk-2.26.2-1.el7.i686.rpm) = c9a7f19bd6299f3a43d1d27bf03f7ad0ed9e8746a7b5d8c0a16321df9254b7bb
+SIZE (centos/at-spi2-atk-2.26.2-1.el7.i686.rpm) = 82212
+SHA256 (centos/at-spi2-atk-2.26.2-1.el7.x86_64.rpm) = 200b24d1dd03fd72979a2aa76bfa8152da9c86fde1247f0848f0282bd26eb495
+SIZE (centos/at-spi2-atk-2.26.2-1.el7.x86_64.rpm) = 82596
+SHA256 (centos/at-spi2-atk-2.26.2-1.el7.src.rpm) = 591b565db75496122046c86adba72eccb56333f73046e6e38468c87cb0c26f06
+SIZE (centos/at-spi2-atk-2.26.2-1.el7.src.rpm) = 337567
diff --git a/accessibility/linux-c7-at-spi2-atk/pkg-plist.amd64 b/accessibility/linux-c7-at-spi2-atk/pkg-plist.amd64
new file mode 100644
index 000000000000..07ac5680fc62
--- /dev/null
+++ b/accessibility/linux-c7-at-spi2-atk/pkg-plist.amd64
@@ -0,0 +1,11 @@
+usr/lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
+usr/lib/gtk-2.0/modules/libatk-bridge.so
+usr/lib/libatk-bridge-2.0.so.0
+usr/lib/libatk-bridge-2.0.so.0.0.0
+usr/lib64/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
+usr/lib64/gtk-2.0/modules/libatk-bridge.so
+usr/lib64/libatk-bridge-2.0.so.0
+usr/lib64/libatk-bridge-2.0.so.0.0.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/README
+usr/share/licenses/at-spi2-atk-2.26.2/COPYING
diff --git a/accessibility/linux-c7-at-spi2-atk/pkg-plist.i386 b/accessibility/linux-c7-at-spi2-atk/pkg-plist.i386
new file mode 100644
index 000000000000..923ae7637ccf
--- /dev/null
+++ b/accessibility/linux-c7-at-spi2-atk/pkg-plist.i386
@@ -0,0 +1,7 @@
+usr/lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
+usr/lib/gtk-2.0/modules/libatk-bridge.so
+usr/lib/libatk-bridge-2.0.so.0
+usr/lib/libatk-bridge-2.0.so.0.0.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/README
+usr/share/licenses/at-spi2-atk-2.26.2/COPYING
diff --git a/accessibility/linux-c7-at-spi2-core/Makefile b/accessibility/linux-c7-at-spi2-core/Makefile
new file mode 100644
index 000000000000..492cdcbed911
--- /dev/null
+++ b/accessibility/linux-c7-at-spi2-core/Makefile
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+PORTNAME=	at-spi2-core
+PORTVERSION=	2.28.0
+DISTVERSIONSUFFIX=	-1.el7
+CATEGORIES=	accessibility linux
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Assistive technology service provider interface (Linux CentOS ${LINUX_DIST_VER})
+
+LICENSE=	LGPL20+
+
+RUN_DEPENDS=	at-spi2-core>=2.28.0:accessibility/at-spi2-core
+
+USES=		linux:c7
+USE_LDCONFIG=	yes
+USE_LINUX=	dbuslibs xorglibs
+USE_LINUX_RPM=	yes
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+
+post-patch:
+.for d in etc usr/lib/systemd usr/libexec usr/share/dbus-1 usr/share/defaults
+	@${RM} -r ${WRKSRC}/${d}
+.endfor
+
+.include <bsd.port.mk>
diff --git a/accessibility/linux-c7-at-spi2-core/distinfo b/accessibility/linux-c7-at-spi2-core/distinfo
new file mode 100644
index 000000000000..197635e77e42
--- /dev/null
+++ b/accessibility/linux-c7-at-spi2-core/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1567344326
+SHA256 (centos/at-spi2-core-2.28.0-1.el7.i686.rpm) = c99ef2b942bf41c4bf1df3ed96ad5db1b64c9da72d785eeb43a34141d940ef6a
+SIZE (centos/at-spi2-core-2.28.0-1.el7.i686.rpm) = 160236
+SHA256 (centos/at-spi2-core-2.28.0-1.el7.x86_64.rpm) = 24fb8f259f1c458490f2b6413d92bfdd781c01d5f13b291324bcceeea519e3c4
+SIZE (centos/at-spi2-core-2.28.0-1.el7.x86_64.rpm) = 161696
+SHA256 (centos/at-spi2-core-2.28.0-1.el7.src.rpm) = b559d8c2134ee1d78506d308f8104c37660e459b5865e812b57cc710ae952768
+SIZE (centos/at-spi2-core-2.28.0-1.el7.src.rpm) = 201578
diff --git a/accessibility/linux-c7-at-spi2-core/pkg-plist.amd64 b/accessibility/linux-c7-at-spi2-core/pkg-plist.amd64
new file mode 100644
index 000000000000..dc2ce12018bf
--- /dev/null
+++ b/accessibility/linux-c7-at-spi2-core/pkg-plist.amd64
@@ -0,0 +1,80 @@
+usr/lib/girepository-1.0/Atspi-2.0.typelib
+usr/lib/libatspi.so.0
+usr/lib/libatspi.so.0.0.1
+usr/lib64/girepository-1.0/Atspi-2.0.typelib
+usr/lib64/libatspi.so.0
+usr/lib64/libatspi.so.0.0.1
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/README
+usr/share/licenses/at-spi2-core-2.28.0/COPYING
+%%NLS%%usr/share/locale/an/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/as/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ast/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/be/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/bg/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/bn_IN/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/bs/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ca/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ca@valencia/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/cs/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/da/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/el/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/en_CA/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/en_GB/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/eo/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/es/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/et/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/eu/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/fa/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/fi/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/fur/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ga/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/gd/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/gl/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/gu/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/he/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/hi/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/hr/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/hu/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/id/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/kk/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/km/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/kn/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ko/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/lt/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/lv/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ml/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/mr/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ms/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/nb/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ne/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/oc/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/or/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/pa/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/pt/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ro/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ru/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/sk/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/sl/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/sq/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/sr/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/sr@latin/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ta/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/te/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/tg/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/tr/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ug/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/uk/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/uz@cyrillic/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/zh_HK/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/at-spi2-core.mo
diff --git a/accessibility/linux-c7-at-spi2-core/pkg-plist.i386 b/accessibility/linux-c7-at-spi2-core/pkg-plist.i386
new file mode 100644
index 000000000000..0e1d9b76b7b5
--- /dev/null
+++ b/accessibility/linux-c7-at-spi2-core/pkg-plist.i386
@@ -0,0 +1,77 @@
+usr/lib/girepository-1.0/Atspi-2.0.typelib
+usr/lib/libatspi.so.0
+usr/lib/libatspi.so.0.0.1
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/README
+usr/share/licenses/at-spi2-core-2.28.0/COPYING
+%%NLS%%usr/share/locale/an/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/as/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ast/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/be/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/bg/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/bn_IN/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/bs/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ca/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ca@valencia/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/cs/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/da/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/el/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/en_CA/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/en_GB/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/eo/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/es/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/et/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/eu/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/fa/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/fi/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/fur/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ga/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/gd/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/gl/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/gu/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/he/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/hi/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/hr/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/hu/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/id/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/kk/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/km/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/kn/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ko/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/lt/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/lv/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ml/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/mr/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ms/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/nb/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ne/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/oc/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/or/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/pa/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/pt/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ro/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ru/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/sk/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/sl/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/sq/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/sr/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/sr@latin/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ta/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/te/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/tg/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/tr/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/ug/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/uk/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/uz@cyrillic/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/zh_HK/LC_MESSAGES/at-spi2-core.mo
+%%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/at-spi2-core.mo
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index 8bd60389f6ea..7eea45e7e3d4 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	orca
 PORTVERSION=	3.28.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/accessibility/orca/pkg-descr b/accessibility/orca/pkg-descr
index 30cfd432ca09..636b9916e389 100644
--- a/accessibility/orca/pkg-descr
+++ b/accessibility/orca/pkg-descr
@@ -2,6 +2,6 @@ Orca a scriptable screen reader that is currently under development.
 As such it is highly unstable and undergoes frequent changes.  To
 read more about Orca, please refer to the Orca documentation series
 available in the ./docs/doc-set directory and also the Orca WIKI at
-http://live.gnome.org/Orca.
+the URL below.
 
 WWW: http://live.gnome.org/Orca
diff --git a/archivers/p5-Archive-Zip/Makefile b/archivers/p5-Archive-Zip/Makefile
index 0890bbe7d8ab..5963bec25e6b 100644
--- a/archivers/p5-Archive-Zip/Makefile
+++ b/archivers/p5-Archive-Zip/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Archive-Zip
-PORTVERSION=	1.64
+PORTVERSION=	1.65
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,8 +15,9 @@ LICENSE_COMB=	dual
 
 TEST_DEPENDS=	p5-Test-MockModule>=0:devel/p5-Test-MockModule
 
-NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
+NO_ARCH=	yes
+
 .include <bsd.port.mk>
diff --git a/archivers/p5-Archive-Zip/distinfo b/archivers/p5-Archive-Zip/distinfo
index fb6741584d39..06dc44b3d792 100644
--- a/archivers/p5-Archive-Zip/distinfo
+++ b/archivers/p5-Archive-Zip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536789879
-SHA256 (Archive-Zip-1.64.tar.gz) = de5f84f2148038363d557b1fa33f58edc208111f789f7299fe3d8f6e11b4d17d
-SIZE (Archive-Zip-1.64.tar.gz) = 192005
+TIMESTAMP = 1568290992
+SHA256 (Archive-Zip-1.65.tar.gz) = 743179fe0464d273cf4531d108bcdce9d76426eba0af61d98922d9d3d163db84
+SIZE (Archive-Zip-1.65.tar.gz) = 192150
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index 35b5af7eb3b8..0bbdb8cb5222 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	kstars
-DISTVERSION=	3.3.4
+DISTVERSION=	3.3.5
 PORTEPOCH=	1
 CATEGORIES=	astro kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
diff --git a/astro/kstars/distinfo b/astro/kstars/distinfo
index fb1622fb842c..c38139e66b22 100644
--- a/astro/kstars/distinfo
+++ b/astro/kstars/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567023349
-SHA256 (kstars-3.3.4.tar.xz) = 0579dabaf8a024bcea1e7c97cc3284a013da8d2bc14a95dcdb74f088e18e86d9
-SIZE (kstars-3.3.4.tar.xz) = 70764724
+TIMESTAMP = 1568038651
+SHA256 (kstars-3.3.5.tar.xz) = d17a72bdcc579c3de7dd8ad386b15bb1c4932bf6bbd220407bef43cf6a6fd667
+SIZE (kstars-3.3.5.tar.xz) = 70750064
diff --git a/astro/kstars/files/patch-kstars_auxiliary_ksutils.cpp b/astro/kstars/files/patch-kstars_auxiliary_ksutils.cpp
new file mode 100644
index 000000000000..c61038680cee
--- /dev/null
+++ b/astro/kstars/files/patch-kstars_auxiliary_ksutils.cpp
@@ -0,0 +1,11 @@
+--- kstars/auxiliary/ksutils.cpp.orig	2019-09-09 16:36:17 UTC
++++ kstars/auxiliary/ksutils.cpp
+@@ -1325,7 +1325,7 @@ bool copyRecursively(QString sourceFolder, QString des
+ //One is createLocalAstrometryConf and the other is configureAstrometry
+ bool configureLocalAstrometryConfIfNecessary()
+ {
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+     QString confPath = KSPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Literal("astrometry") + QLatin1Literal("/astrometry.cfg");
+     if (QFileInfo(confPath).exists() == false)
+     {
diff --git a/astro/kstars/pkg-plist b/astro/kstars/pkg-plist
index 0f7670e8b375..a9b07c446126 100644
--- a/astro/kstars/pkg-plist
+++ b/astro/kstars/pkg-plist
@@ -1695,7 +1695,6 @@ share/knotifications5/kstars.notifyrc
 %%DATADIR%%/venus.R4.vsop
 %%DATADIR%%/venus.R5.vsop
 %%DATADIR%%/venus.orbit
-%%DATADIR%%/windi.png
 %%DATADIR%%/wzdownload.png
 %%DATADIR%%/wzekos.png
 %%DATADIR%%/wzgeo.png
diff --git a/astro/p5-Astro-Coords/Makefile b/astro/p5-Astro-Coords/Makefile
index 8b6a6403106a..18855f1f0bf2 100644
--- a/astro/p5-Astro-Coords/Makefile
+++ b/astro/p5-Astro-Coords/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Astro-Coords
-PORTVERSION=	0.19
+PORTVERSION=	0.20
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/astro/p5-Astro-Coords/distinfo b/astro/p5-Astro-Coords/distinfo
index eb57ef2fd48f..4ae1feb3aea3 100644
--- a/astro/p5-Astro-Coords/distinfo
+++ b/astro/p5-Astro-Coords/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518038224
-SHA256 (Astro-Coords-0.19.tar.gz) = 22b319a912c662d47733cc5ed0a5dd64b210cd22f5e3a9d66beae74637076d12
-SIZE (Astro-Coords-0.19.tar.gz) = 141211
+TIMESTAMP = 1568290948
+SHA256 (Astro-Coords-0.20.tar.gz) = 3409928dbdaa44db1e155808543012a3e57ff085c41821775c2bf12f0a154aa8
+SIZE (Astro-Coords-0.20.tar.gz) = 142414
diff --git a/astro/p5-Astro-satpass/Makefile b/astro/p5-Astro-satpass/Makefile
index 17c948547e8d..6fbe2045c290 100644
--- a/astro/p5-Astro-satpass/Makefile
+++ b/astro/p5-Astro-satpass/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Astro-satpass
-PORTVERSION=	0.108
+PORTVERSION=	0.109
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -17,21 +17,21 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Date-Manip>=1.14:devel/p5-Date-Manip
 TEST_DEPENDS=	p5-JSON>=0:converters/p5-JSON
 
-OPTIONS_DEFINE=	SIMBAD SOAPLITE SPACETRACK USGS
-OPTIONS_DEFAULT=SIMBAD SPACETRACK USGS
-SIMBAD_DESC=		Add support for Astro::SIMBAD::Client
-SOAPLITE_DESC=		Add support for SOAP::Lite (deprecated)
-SPACETRACK_DESC=	Add support for Astro::SpaceTrack
-USGS_DESC=		Add support for Geo::WebService::Elevation::USGS
-
-PORTSCOUT=	limit:^[0-9\.]*$$
-
 USES=		perl5
 USE_PERL5=	configure
 
 CONFIGURE_ARGS=	-y
 NO_ARCH=	yes
 
+PORTSCOUT=	limit:^[0-9\.]*$$
+
+OPTIONS_DEFINE=	SIMBAD SOAPLITE SPACETRACK USGS
+OPTIONS_DEFAULT=SIMBAD SPACETRACK USGS
+SIMBAD_DESC=	Add support for Astro::SIMBAD::Client
+SOAPLITE_DESC=	Add support for SOAP::Lite (deprecated)
+SPACETRACK_DESC=Add support for Astro::SpaceTrack
+USGS_DESC=	Add support for Geo::WebService::Elevation::USGS
+
 SIMBAD_RUN_DEPENDS=	p5-Astro-SIMBAD-Client>=0:astro/p5-Astro-SIMBAD-Client
 SOAPLITE_RUN_DEPENDS=	p5-SOAP-Lite>=0:net/p5-SOAP-Lite
 SPACETRACK_RUN_DEPENDS=	p5-Astro-SpaceTrack>=0:astro/p5-Astro-SpaceTrack
diff --git a/astro/p5-Astro-satpass/distinfo b/astro/p5-Astro-satpass/distinfo
index 74349e837d81..bad338ff370c 100644
--- a/astro/p5-Astro-satpass/distinfo
+++ b/astro/p5-Astro-satpass/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567292080
-SHA256 (Astro-satpass-0.108.tar.gz) = 98012b26ddf52f534dbedf79214e40d46b56242752aaf745cbe93e0d99e70ad4
-SIZE (Astro-satpass-0.108.tar.gz) = 520092
+TIMESTAMP = 1568290994
+SHA256 (Astro-satpass-0.109.tar.gz) = c0770868db1d6c73a7b8a8d25df734409582606fd37ed361006e143426b99a34
+SIZE (Astro-satpass-0.109.tar.gz) = 520124
diff --git a/astro/routino/Makefile b/astro/routino/Makefile
index 320b7bb1fe29..146189d4e0af 100644
--- a/astro/routino/Makefile
+++ b/astro/routino/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	routino
-PORTVERSION=	3.2
+PORTVERSION=	3.3.1
 CATEGORIES=	astro
 MASTER_SITES=	http://www.routino.org/download/
 
diff --git a/astro/routino/distinfo b/astro/routino/distinfo
index cdafc966c363..f3c6d83d1e31 100644
--- a/astro/routino/distinfo
+++ b/astro/routino/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491683625
-SHA256 (routino-3.2.tgz) = e2a431eaffbafab630835966d342e4ae25d5edb94c8ed419200e1ffb50bc7552
-SIZE (routino-3.2.tgz) = 2463662
+TIMESTAMP = 1568197606
+SHA256 (routino-3.3.1.tgz) = a954565ab60a5abebc47e8c6e8b496f972e8dd781810fa5548b6d7a9e3e5e135
+SIZE (routino-3.3.1.tgz) = 2541830
diff --git a/astro/routino/files/patch-src_Makefile b/astro/routino/files/patch-src_Makefile
index a750f1ea5051..943c4cd16c9a 100644
--- a/astro/routino/files/patch-src_Makefile
+++ b/astro/routino/files/patch-src_Makefile
@@ -1,17 +1,16 @@
---- src/Makefile.orig	2015-09-29 18:09:59 UTC
+--- src/Makefile.orig	2018-10-30 19:12:36 UTC
 +++ src/Makefile
-@@ -38,9 +38,7 @@ EXE=planetsplitter$(.EXE) planetsplitter
-     router+lib$(.EXE) router+lib-slim$(.EXE)
+@@ -39,8 +39,7 @@ EXE=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) r
  
  ifneq ($(HOST),MINGW)
--LIB =libroutino.so               libroutino-slim.so
--LIB+=libroutino.so.$(SOVERSION)  libroutino-slim.so.$(SOVERSION)
--LIB+=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
-+LIB=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
+   LIB =libroutino.so               libroutino-slim.so
+-  LIB+=libroutino.so.$(SOVERSION)  libroutino-slim.so.$(SOVERSION)
+-  LIB+=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
++  LIB=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
  else
- LIB =routino.dll routino-slim.dll
- LIB+=routino.def routino-slim.def
-@@ -284,22 +282,23 @@ install-local: all-local
+   LIB =routino.dll routino-slim.dll
+   LIB+=routino.def routino-slim.def
+@@ -284,22 +283,23 @@ install-local: all-local
  	@[ -d $(DESTDIR)$(bindir) ] || mkdir -p $(DESTDIR)$(bindir)
  	@for file in $(EXE); do \
  	    if [ -f $$file ]; then \
diff --git a/astro/routino/pkg-plist b/astro/routino/pkg-plist
index 30d581a6fcd1..8e668e56033f 100644
--- a/astro/routino/pkg-plist
+++ b/astro/routino/pkg-plist
@@ -70,10 +70,13 @@ lib/libroutino.so.0.0.0
 %%WWWDIR%%/data/translations.xml
 %%WWWDIR%%/translations/router.html
 %%WWWDIR%%/translations/translate.pl
+%%WWWDIR%%/translations/translation.cs.txt
 %%WWWDIR%%/translations/translation.de.txt
 %%WWWDIR%%/translations/translation.en.txt
+%%WWWDIR%%/translations/translation.es.txt
 %%WWWDIR%%/translations/translation.fr.txt
 %%WWWDIR%%/translations/translation.hu.txt
+%%WWWDIR%%/translations/translation.it.txt
 %%WWWDIR%%/translations/translation.nl.txt
 %%WWWDIR%%/translations/translation.pl.txt
 %%WWWDIR%%/translations/translation.ru.txt
@@ -83,7 +86,8 @@ lib/libroutino.so.0.0.0
 %%WWWDIR%%/translations/visualiser.html
 %%WWWDIR%%/www/leaflet/install.sh
 %%WWWDIR%%/www/openlayers/install.sh
-%%WWWDIR%%/www/openlayers/routino.cfg
+%%WWWDIR%%/www/openlayers2/install.sh
+%%WWWDIR%%/www/openlayers2/routino.cfg
 %%WWWDIR%%/%%WWWDIR%%/.htaccess
 %%WWWDIR%%/%%WWWDIR%%/documentation/algorithm.html
 %%WWWDIR%%/%%WWWDIR%%/documentation/configuration.html
@@ -942,15 +946,19 @@ lib/libroutino.so.0.0.0
 %%WWWDIR%%/%%WWWDIR%%/router.cgi
 %%WWWDIR%%/%%WWWDIR%%/router.css
 %%WWWDIR%%/%%WWWDIR%%/router.html
+%%WWWDIR%%/%%WWWDIR%%/router.html.cs
 %%WWWDIR%%/%%WWWDIR%%/router.html.de
 %%WWWDIR%%/%%WWWDIR%%/router.html.en
+%%WWWDIR%%/%%WWWDIR%%/router.html.es
 %%WWWDIR%%/%%WWWDIR%%/router.html.fr
 %%WWWDIR%%/%%WWWDIR%%/router.html.hu
+%%WWWDIR%%/%%WWWDIR%%/router.html.it
 %%WWWDIR%%/%%WWWDIR%%/router.html.nl
 %%WWWDIR%%/%%WWWDIR%%/router.html.pl
 %%WWWDIR%%/%%WWWDIR%%/router.html.ru
 %%WWWDIR%%/%%WWWDIR%%/router.leaflet.js
 %%WWWDIR%%/%%WWWDIR%%/router.openlayers.js
+%%WWWDIR%%/%%WWWDIR%%/router.openlayers2.js
 %%WWWDIR%%/%%WWWDIR%%/router.pl
 %%WWWDIR%%/%%WWWDIR%%/search.cgi
 %%WWWDIR%%/%%WWWDIR%%/search.pl
@@ -959,13 +967,17 @@ lib/libroutino.so.0.0.0
 %%WWWDIR%%/%%WWWDIR%%/visualiser.cgi
 %%WWWDIR%%/%%WWWDIR%%/visualiser.css
 %%WWWDIR%%/%%WWWDIR%%/visualiser.html
+%%WWWDIR%%/%%WWWDIR%%/visualiser.html.cs
 %%WWWDIR%%/%%WWWDIR%%/visualiser.html.de
 %%WWWDIR%%/%%WWWDIR%%/visualiser.html.en
+%%WWWDIR%%/%%WWWDIR%%/visualiser.html.es
 %%WWWDIR%%/%%WWWDIR%%/visualiser.html.fr
 %%WWWDIR%%/%%WWWDIR%%/visualiser.html.hu
+%%WWWDIR%%/%%WWWDIR%%/visualiser.html.it
 %%WWWDIR%%/%%WWWDIR%%/visualiser.html.nl
 %%WWWDIR%%/%%WWWDIR%%/visualiser.html.pl
 %%WWWDIR%%/%%WWWDIR%%/visualiser.html.ru
 %%WWWDIR%%/%%WWWDIR%%/visualiser.leaflet.js
 %%WWWDIR%%/%%WWWDIR%%/visualiser.openlayers.js
+%%WWWDIR%%/%%WWWDIR%%/visualiser.openlayers2.js
 @dir %%WWWDIR%%/results
diff --git a/audio/Makefile b/audio/Makefile
index f5bcc2428897..b55c56fc9d10 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -460,6 +460,7 @@
     SUBDIR += linux-c6-pulseaudio-utils
     SUBDIR += linux-c6-sdl_mixer
     SUBDIR += linux-c7-alsa-lib
+    SUBDIR += linux-c7-alsa-lib-devel
     SUBDIR += linux-c7-alsa-plugins-oss
     SUBDIR += linux-c7-alsa-plugins-pulseaudio
     SUBDIR += linux-c7-alsa-utils
diff --git a/audio/bambootracker/Makefile b/audio/bambootracker/Makefile
index bd7d70d7bd03..2ebdc11c2bbf 100644
--- a/audio/bambootracker/Makefile
+++ b/audio/bambootracker/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bambootracker
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.2.2
+DISTVERSION=	0.2.3
 CATEGORIES=	audio
 MASTER_SITES=	LOCAL/ehaupt:extras
 DISTFILES=	${PORTNAME}-extras-${EXTRASVERSION}${EXTRACT_SUFX}:extras
@@ -48,7 +48,7 @@ do-install:
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/demos/*.btm \
+	${INSTALL_DATA} ${WRKSRC}/demos/modules/*.btm \
 		${WRKDIR}/${PORTNAME}-extras-${EXTRASVERSION}/*.btm \
 		${STAGEDIR}${EXAMPLESDIR}
 
diff --git a/audio/bambootracker/distinfo b/audio/bambootracker/distinfo
index 30974b8efc1d..0696a7f1cc3d 100644
--- a/audio/bambootracker/distinfo
+++ b/audio/bambootracker/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1567236442
+TIMESTAMP = 1568408030
 SHA256 (bambootracker-extras-2.tar.gz) = 72f9994ea329bc6bd3f8855262209aa827b66f880e5734fc1486e9709546c9ce
 SIZE (bambootracker-extras-2.tar.gz) = 8321
-SHA256 (rerrahkr-BambooTracker-v0.2.2_GH0.tar.gz) = 418c815e32f363d08e057fda425acd400e96f351f4e6cf1a1224d621734cd9d5
-SIZE (rerrahkr-BambooTracker-v0.2.2_GH0.tar.gz) = 2713848
+SHA256 (rerrahkr-BambooTracker-v0.2.3_GH0.tar.gz) = 58e01e63ac83513eeb55e0647872b0c454d3df738dc3ffc8b80139f890fdeedd
+SIZE (rerrahkr-BambooTracker-v0.2.3_GH0.tar.gz) = 2727809
diff --git a/audio/gbsplay/Makefile b/audio/gbsplay/Makefile
index 66d40c589144..025ec77fff31 100644
--- a/audio/gbsplay/Makefile
+++ b/audio/gbsplay/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	gbsplay
-DISTVERSION=	0.0.93-130
+DISTVERSION=	0.0.93-151
 PORTREVISION=	1
-DISTVERSIONSUFFIX=	-g6225989
+DISTVERSIONSUFFIX=	-ga7777f8
 PORTEPOCH=	1
 CATEGORIES=	audio
 
diff --git a/audio/gbsplay/distinfo b/audio/gbsplay/distinfo
index 8b94a1e48339..1a72866c5676 100644
--- a/audio/gbsplay/distinfo
+++ b/audio/gbsplay/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545989371
-SHA256 (mmitch-gbsplay-0.0.93-130-g6225989_GH0.tar.gz) = 00bc00bbec4a66edef6dfd71df4c0b55c28fa9b65cc614381ae258576fdd1622
-SIZE (mmitch-gbsplay-0.0.93-130-g6225989_GH0.tar.gz) = 129907
+TIMESTAMP = 1567890902
+SHA256 (mmitch-gbsplay-0.0.93-151-ga7777f8_GH0.tar.gz) = 851145187f32fa04ba803a7f914e5b82bd9e80ed5dd35abc1c157fe19390bc7d
+SIZE (mmitch-gbsplay-0.0.93-151-ga7777f8_GH0.tar.gz) = 136054
diff --git a/audio/gsequencer/Makefile b/audio/gsequencer/Makefile
index 1180dc6a8a92..1aa73d5462c8 100644
--- a/audio/gsequencer/Makefile
+++ b/audio/gsequencer/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gsequencer
-DISTVERSION=	2.2.38
+DISTVERSION=	2.3.3
 CATEGORIES=	audio
 MASTER_SITES=	SAVANNAH/gsequencer/${DISTVERSION:R}.x
 
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	dssi>0:audio/dssi
 
-USES=		desktop-file-utils gettext-runtime gmake gnome libtool localbase pkgconfig shared-mime-info
+USES=		desktop-file-utils gettext-runtime gmake gnome libtool localbase pkgconfig shared-mime-info xorg
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-alsa --enable-oss
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 libxml2 pango
diff --git a/audio/gsequencer/distinfo b/audio/gsequencer/distinfo
index f39c3e7503ab..f229e5e775fa 100644
--- a/audio/gsequencer/distinfo
+++ b/audio/gsequencer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565760852
-SHA256 (gsequencer-2.2.38.tar.gz) = 27cdf2cb199ae1200c07aa77b6f0de3d40ea2befe217936b310472d9292b2711
-SIZE (gsequencer-2.2.38.tar.gz) = 5243313
+TIMESTAMP = 1568174414
+SHA256 (gsequencer-2.3.3.tar.gz) = 958afe91a300ebd27a4bc94d5b57099cbe35f939304ffaedeba50c850717dd08
+SIZE (gsequencer-2.3.3.tar.gz) = 5369468
diff --git a/audio/gsequencer/pkg-plist b/audio/gsequencer/pkg-plist
index 612380f9054d..6dd56d94dd98 100644
--- a/audio/gsequencer/pkg-plist
+++ b/audio/gsequencer/pkg-plist
@@ -11,10 +11,17 @@ include/ags/audio/ags_channel.h
 include/ags/audio/ags_char_buffer_util.h
 include/ags/audio/ags_devin.h
 include/ags/audio/ags_devout.h
+include/ags/audio/ags_diatonic_scale.h
 include/ags/audio/ags_fifoout.h
+include/ags/audio/ags_filter_util.h
+include/ags/audio/ags_fm_synth_util.h
+include/ags/audio/ags_fourier_transform_util.h
+include/ags/audio/ags_frequency_map.h
+include/ags/audio/ags_frequency_map_manager.h
 include/ags/audio/ags_generic_recall_channel_run.h
 include/ags/audio/ags_generic_recall_recycling.h
 include/ags/audio/ags_input.h
+include/ags/audio/ags_lfo_synth_util.h
 include/ags/audio/ags_midi.h
 include/ags/audio/ags_midiin.h
 include/ags/audio/ags_notation.h
@@ -48,6 +55,7 @@ include/ags/audio/ags_sequencer_util.h
 include/ags/audio/ags_sound_enums.h
 include/ags/audio/ags_sound_provider.h
 include/ags/audio/ags_soundcard_util.h
+include/ags/audio/ags_synth_enums.h
 include/ags/audio/ags_synth_generator.h
 include/ags/audio/ags_synth_util.h
 include/ags/audio/ags_track.h
@@ -67,6 +75,10 @@ include/ags/audio/file/ags_ipatch_dls2_reader.h
 include/ags/audio/file/ags_ipatch_gig_reader.h
 include/ags/audio/file/ags_ipatch_sample.h
 include/ags/audio/file/ags_ipatch_sf2_reader.h
+include/ags/audio/file/ags_sfz_file.h
+include/ags/audio/file/ags_sfz_group.h
+include/ags/audio/file/ags_sfz_region.h
+include/ags/audio/file/ags_sfz_sample.h
 include/ags/audio/file/ags_sndfile.h
 include/ags/audio/file/ags_sound_container.h
 include/ags/audio/file/ags_sound_resource.h
@@ -141,6 +153,10 @@ include/ags/audio/recall/ags_feed_audio_signal.h
 include/ags/audio/recall/ags_feed_channel.h
 include/ags/audio/recall/ags_feed_channel_run.h
 include/ags/audio/recall/ags_feed_recycling.h
+include/ags/audio/recall/ags_lfo_audio_signal.h
+include/ags/audio/recall/ags_lfo_channel.h
+include/ags/audio/recall/ags_lfo_channel_run.h
+include/ags/audio/recall/ags_lfo_recycling.h
 include/ags/audio/recall/ags_loop_channel.h
 include/ags/audio/recall/ags_loop_channel_run.h
 include/ags/audio/recall/ags_mute_audio.h
@@ -245,6 +261,7 @@ include/ags/audio/thread/ags_audio_thread.h
 include/ags/audio/thread/ags_channel_thread.h
 include/ags/audio/thread/ags_export_thread.h
 include/ags/audio/thread/ags_sequencer_thread.h
+include/ags/audio/thread/ags_sfz_loader.h
 include/ags/audio/thread/ags_soundcard_thread.h
 include/ags/audio/thread/ags_wave_loader.h
 include/ags/config.h
diff --git a/audio/linux-c7-alsa-lib-devel/Makefile b/audio/linux-c7-alsa-lib-devel/Makefile
new file mode 100644
index 000000000000..de2d4b3b7841
--- /dev/null
+++ b/audio/linux-c7-alsa-lib-devel/Makefile
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+PORTNAME=	alsa-lib
+PORTVERSION=	1.1.6
+DISTVERSIONSUFFIX=	-2.el7
+CATEGORIES=	audio linux
+PKGNAMESUFFIX=	-devel
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Advanced Linux Sound Architecture headers (Linux CentOS ${LINUX_DIST_VER})
+
+LICENSE=	LGPL21+
+
+USES=		linux:c7
+USE_LINUX=	alsalib
+USE_LINUX_RPM=	yes
+
+LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.mk>
diff --git a/audio/linux-c7-alsa-lib-devel/distinfo b/audio/linux-c7-alsa-lib-devel/distinfo
new file mode 100644
index 000000000000..a050a9c280aa
--- /dev/null
+++ b/audio/linux-c7-alsa-lib-devel/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1567880217
+SHA256 (centos/alsa-lib-devel-1.1.6-2.el7.i686.rpm) = 47cccf052146b269ba2c8dd269385fabade58450166eb640bfca6afff5792f85
+SIZE (centos/alsa-lib-devel-1.1.6-2.el7.i686.rpm) = 984608
+SHA256 (centos/alsa-lib-devel-1.1.6-2.el7.x86_64.rpm) = 9ae063780b8652153fe4c58015d00f651577f105cc30c944c665e2a27602f8e6
+SIZE (centos/alsa-lib-devel-1.1.6-2.el7.x86_64.rpm) = 984508
+SHA256 (centos/alsa-lib-1.1.6-2.el7.src.rpm) = 56cb2556210f4443f4ef81074ae396f82ba7a0ba3d224065628baddb8c6a55ef
+SIZE (centos/alsa-lib-1.1.6-2.el7.src.rpm) = 1028253
diff --git a/audio/linux-c7-alsa-lib-devel/pkg-plist.amd64 b/audio/linux-c7-alsa-lib-devel/pkg-plist.amd64
new file mode 100644
index 000000000000..7e66e2c2467e
--- /dev/null
+++ b/audio/linux-c7-alsa-lib-devel/pkg-plist.amd64
@@ -0,0 +1,582 @@
+usr/include/alsa/asoundef.h
+usr/include/alsa/asoundlib.h
+usr/include/alsa/conf.h
+usr/include/alsa/control.h
+usr/include/alsa/control_external.h
+usr/include/alsa/error.h
+usr/include/alsa/global.h
+usr/include/alsa/hwdep.h
+usr/include/alsa/input.h
+usr/include/alsa/mixer.h
+usr/include/alsa/mixer_abst.h
+usr/include/alsa/output.h
+usr/include/alsa/pcm.h
+usr/include/alsa/pcm_external.h
+usr/include/alsa/pcm_extplug.h
+usr/include/alsa/pcm_ioplug.h
+usr/include/alsa/pcm_old.h
+usr/include/alsa/pcm_plugin.h
+usr/include/alsa/pcm_rate.h
+usr/include/alsa/rawmidi.h
+usr/include/alsa/seq.h
+usr/include/alsa/seq_event.h
+usr/include/alsa/seq_midi_event.h
+usr/include/alsa/seqmid.h
+usr/include/alsa/sound/asoc.h
+usr/include/alsa/sound/asound_fm.h
+usr/include/alsa/sound/emu10k1.h
+usr/include/alsa/sound/hdsp.h
+usr/include/alsa/sound/hdspm.h
+usr/include/alsa/sound/sb16_csp.h
+usr/include/alsa/sound/sscape_ioctl.h
+usr/include/alsa/sound/tlv.h
+usr/include/alsa/sound/type_compat.h
+usr/include/alsa/timer.h
+usr/include/alsa/topology.h
+usr/include/alsa/use-case.h
+usr/include/alsa/version.h
+usr/include/sys/asoundlib.h
+usr/lib/libasound.so
+usr/lib/pkgconfig/alsa.pc
+usr/lib64/libasound.so
+usr/lib64/pkgconfig/alsa.pc
+usr/share/aclocal/alsa.m4
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2latency_8c-example.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2pcm_8c-example.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2pcm_min_8c-example.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2rawmidi_8c-example.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2timer_8c-example.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/asoundef_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/asoundef_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/asoundlib_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/asoundlib_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/async_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/bc_s.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/bdwn.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/bug.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/cards_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/classes.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/closed.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conf.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conf_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conf_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conf_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/confarg.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conffunc.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/confhooks.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/confmisc_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control__ext_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control__external_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control__external_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ctl_external_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/deprecated.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_381a0a05232d68d0a2ebe5cd502f4d69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_5f851d935025f1be023c2c62bd843fe2.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_8c35c1873c2690b478a9950d0638d637.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_b73df3c68338d0823ff9d736eb268d89.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_b81b067251166617f9d0a8c0cfc3a4a9.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_d0e40b335958b6212fb6f781133eecbc.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_d1b0f45016cd06bf2eb252bd3f501161.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_d3519ec5023707b37568b471096da878.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_d44c64559bbebec7f509842c48db8b23.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_e8b3d2be6db305a5d41d291dd9fd6e9c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dlmisc_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dynsections.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/error_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/error_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/error_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/files.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2blank.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2cl.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2doc.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2folderclosed.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2folderopen.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2lastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2link.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2mlastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2mnode.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2mo.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2node.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2ns.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2plastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2pnode.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2splitbar.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2vertline.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x62.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x63.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x64.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x65.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x66.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x67.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x68.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x70.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x71.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x72.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x74.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x75.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x76.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x77.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x62.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x63.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x64.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x65.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x66.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x67.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x68.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x6c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x6e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x6f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x70.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x71.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x72.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x74.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x75.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x76.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x77.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/global_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/global_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x61.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x6c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x70.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs_0x61.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs_0x69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs_0x6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs_0x73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_enum.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_eval.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_func.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_func_0x73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_type.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___config.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___control.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___ctl_plugin___s_d_k.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___digital___audio___interface.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___error.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___global.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___h_control.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___hw_dep.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___input.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___m_i_d_i___commands.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___m_i_d_i___controllers.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___m_i_d_i___event.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___m_i_d_i___interface.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___mixer.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___output.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___access.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___deprecated.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___description.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___direct.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___dump.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___ext_plug.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___format.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___h_w___params.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___helpers.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___hook.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___i_o_plug.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___info.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___s_w___params.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___scope.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___simple.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___status.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___sub_format.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___plugin___s_d_k.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___raw_midi.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___s_control.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_client.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_ev_type.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_event.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_events.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_middle.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_misc.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_port.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_queue.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_subscribe.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___sequencer.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___simple_mixer.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___timer.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group__topology.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group__ucm.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hcontrol.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hcontrol_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hwdep_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hwdep_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hwdep_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/input_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/input_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/input_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer__simple_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/namehint_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/names_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/nav_f.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/nav_g.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/nav_h.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/open.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/output_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/output_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/output_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pages.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_2pcm_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__adpcm_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__alaw_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__asym_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__copy_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__dmix_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__dshare_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__dsnoop_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__empty_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__external_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__external_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__extplug_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__extplug_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__extplug_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__file_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__hooks_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__hw_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__iec958_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__ioplug_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__ioplug_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__ioplug_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__ladspa_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__lfloat_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__linear_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__meter_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__mmap__emul_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__mulaw_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__multi_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__null_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__plugin_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__rate_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__route_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__share_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__shm_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__simple_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__softvol_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_external_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/rawmidi.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/rawmidi_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/rawmidi_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/rawmidi_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_5f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_5f.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_61.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_61.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_62.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_62.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_63.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_63.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_64.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_64.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_65.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_65.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_66.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_66.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_67.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_67.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_68.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_68.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_69.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6c.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6d.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6e.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6f.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_70.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_70.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_71.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_71.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_72.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_72.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_74.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_74.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_75.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_75.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_76.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_76.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_77.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_77.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_63.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_63.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/close.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/defines_61.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/defines_61.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_5f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_5f.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_61.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_61.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_63.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_63.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_64.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_64.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_65.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_65.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_67.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_67.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_68.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_68.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_69.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6d.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6e.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6f.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_70.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_70.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_72.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_72.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_74.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_74.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_75.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_75.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_5f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_5f.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_61.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_61.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_63.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_63.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_64.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_64.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_65.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_65.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_66.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_66.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_67.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_67.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_68.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_68.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_69.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_6d.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_6f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_6f.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_70.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_70.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_72.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_72.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_74.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_74.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_75.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_75.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/mag_sel.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/nomatches.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_61.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_61.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_62.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_62.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_63.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_63.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_64.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_64.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_65.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_65.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_68.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_68.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_69.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_6d.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_70.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_70.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_72.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_72.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_74.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_74.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search.css
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search_l.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search_m.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search_r.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_61.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_61.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_62.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_62.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_63.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_63.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_64.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_64.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_65.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_65.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_66.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_66.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_67.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_67.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_68.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_68.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_69.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6c.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6d.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6e.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6f.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_70.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_70.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_71.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_71.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_72.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_72.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_74.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_74.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_75.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_75.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_76.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_76.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_77.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_77.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__event_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__event_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__event_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__midi__event_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__midi__event_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__midi__event_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seqmid_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seqmid_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/setup_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/simple_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/simple__abst_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/simple__none_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structctl__access__elem.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__aes__iec958__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__ctl__ext.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__ctl__ext__callback.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__devname.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__mixer__selem__regopt.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__audio__tstamp__config__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__audio__tstamp__report__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__channel__area__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__chmap__query__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__chmap__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__extplug.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__extplug__callback.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__ioplug.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__ioplug__callback.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__scope__ops__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__addr__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__connect__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__ctrl__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__ext.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__note__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__queue__control__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__raw32__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__raw8__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__event__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__queue__skew__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__real__time__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__result__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__timer__read__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__timer__tread__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__bytes__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__channel__elem.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__channel__map__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__channel__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__ctl__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__dai__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__enum__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__graph__elem.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__graph__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__hw__config__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__io__ops__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__link__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__mixer__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__obj__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__obj__template__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__pcm__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__pdata__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__stream__caps__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__stream__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__tlv__dbscale__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__tlv__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__widget__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/sync_off.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/sync_on.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tab_a.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tab_b.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tab_h.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tab_s.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tabs.css
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer__local_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer__query_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tlv_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/topology_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/unionsnd__pcm__sync__id__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/unionsnd__seq__timestamp__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/use-case_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/use-case_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/version_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/wave1.gif
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/wave2.gif
diff --git a/audio/linux-c7-alsa-lib-devel/pkg-plist.i386 b/audio/linux-c7-alsa-lib-devel/pkg-plist.i386
new file mode 100644
index 000000000000..2d4365d3d16e
--- /dev/null
+++ b/audio/linux-c7-alsa-lib-devel/pkg-plist.i386
@@ -0,0 +1,580 @@
+usr/include/alsa/asoundef.h
+usr/include/alsa/asoundlib.h
+usr/include/alsa/conf.h
+usr/include/alsa/control.h
+usr/include/alsa/control_external.h
+usr/include/alsa/error.h
+usr/include/alsa/global.h
+usr/include/alsa/hwdep.h
+usr/include/alsa/input.h
+usr/include/alsa/mixer.h
+usr/include/alsa/mixer_abst.h
+usr/include/alsa/output.h
+usr/include/alsa/pcm.h
+usr/include/alsa/pcm_external.h
+usr/include/alsa/pcm_extplug.h
+usr/include/alsa/pcm_ioplug.h
+usr/include/alsa/pcm_old.h
+usr/include/alsa/pcm_plugin.h
+usr/include/alsa/pcm_rate.h
+usr/include/alsa/rawmidi.h
+usr/include/alsa/seq.h
+usr/include/alsa/seq_event.h
+usr/include/alsa/seq_midi_event.h
+usr/include/alsa/seqmid.h
+usr/include/alsa/sound/asoc.h
+usr/include/alsa/sound/asound_fm.h
+usr/include/alsa/sound/emu10k1.h
+usr/include/alsa/sound/hdsp.h
+usr/include/alsa/sound/hdspm.h
+usr/include/alsa/sound/sb16_csp.h
+usr/include/alsa/sound/sscape_ioctl.h
+usr/include/alsa/sound/tlv.h
+usr/include/alsa/sound/type_compat.h
+usr/include/alsa/timer.h
+usr/include/alsa/topology.h
+usr/include/alsa/use-case.h
+usr/include/alsa/version.h
+usr/include/sys/asoundlib.h
+usr/lib/libasound.so
+usr/lib/pkgconfig/alsa.pc
+usr/share/aclocal/alsa.m4
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2latency_8c-example.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2pcm_8c-example.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2pcm_min_8c-example.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2rawmidi_8c-example.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2timer_8c-example.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/asoundef_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/asoundef_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/asoundlib_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/asoundlib_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/async_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/bc_s.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/bdwn.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/bug.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/cards_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/classes.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/closed.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conf.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conf_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conf_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conf_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/confarg.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conffunc.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/confhooks.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/confmisc_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control__ext_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control__external_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control__external_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ctl_external_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/deprecated.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_381a0a05232d68d0a2ebe5cd502f4d69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_5f851d935025f1be023c2c62bd843fe2.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_8c35c1873c2690b478a9950d0638d637.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_b73df3c68338d0823ff9d736eb268d89.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_b81b067251166617f9d0a8c0cfc3a4a9.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_d0e40b335958b6212fb6f781133eecbc.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_d1b0f45016cd06bf2eb252bd3f501161.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_d3519ec5023707b37568b471096da878.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_d44c64559bbebec7f509842c48db8b23.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_e8b3d2be6db305a5d41d291dd9fd6e9c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dlmisc_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dynsections.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/error_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/error_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/error_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/files.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2blank.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2cl.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2doc.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2folderclosed.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2folderopen.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2lastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2link.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2mlastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2mnode.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2mo.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2node.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2ns.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2plastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2pnode.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2splitbar.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2vertline.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x62.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x63.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x64.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x65.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x66.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x67.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x68.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x70.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x71.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x72.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x74.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x75.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x76.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x77.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x62.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x63.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x64.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x65.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x66.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x67.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x68.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x6c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x6e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x6f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x70.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x71.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x72.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x74.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x75.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x76.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x77.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/global_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/global_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x61.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x6c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x70.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs_0x61.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs_0x69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs_0x6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs_0x73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_enum.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_eval.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_func.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_func_0x73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_type.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___config.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___control.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___ctl_plugin___s_d_k.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___digital___audio___interface.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___error.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___global.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___h_control.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___hw_dep.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___input.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___m_i_d_i___commands.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___m_i_d_i___controllers.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___m_i_d_i___event.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___m_i_d_i___interface.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___mixer.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___output.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___access.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___deprecated.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___description.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___direct.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___dump.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___ext_plug.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___format.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___h_w___params.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___helpers.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___hook.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___i_o_plug.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___info.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___s_w___params.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___scope.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___simple.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___status.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___sub_format.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___plugin___s_d_k.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___raw_midi.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___s_control.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_client.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_ev_type.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_event.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_events.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_middle.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_misc.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_port.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_queue.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_subscribe.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___sequencer.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___simple_mixer.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___timer.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group__topology.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group__ucm.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hcontrol.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hcontrol_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hwdep_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hwdep_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hwdep_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/input_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/input_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/input_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer__simple_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/namehint_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/names_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/nav_f.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/nav_g.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/nav_h.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/open.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/output_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/output_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/output_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pages.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_2pcm_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__adpcm_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__alaw_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__asym_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__copy_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__dmix_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__dshare_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__dsnoop_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__empty_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__external_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__external_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__extplug_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__extplug_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__extplug_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__file_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__hooks_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__hw_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__iec958_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__ioplug_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__ioplug_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__ioplug_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__ladspa_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__lfloat_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__linear_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__meter_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__mmap__emul_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__mulaw_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__multi_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__null_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__plugin_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__rate_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__route_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__share_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__shm_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__simple_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__softvol_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_external_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/rawmidi.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/rawmidi_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/rawmidi_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/rawmidi_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_5f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_5f.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_61.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_61.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_62.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_62.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_63.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_63.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_64.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_64.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_65.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_65.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_66.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_66.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_67.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_67.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_68.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_68.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_69.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6c.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6d.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6e.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6f.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_70.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_70.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_71.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_71.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_72.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_72.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_74.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_74.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_75.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_75.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_76.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_76.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_77.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_77.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_63.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_63.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/close.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/defines_61.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/defines_61.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_5f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_5f.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_61.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_61.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_63.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_63.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_64.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_64.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_65.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_65.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_67.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_67.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_68.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_68.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_69.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6d.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6e.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6f.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_70.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_70.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_72.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_72.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_74.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_74.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_75.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_75.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_5f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_5f.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_61.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_61.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_63.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_63.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_64.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_64.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_65.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_65.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_66.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_66.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_67.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_67.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_68.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_68.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_69.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_6d.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_6f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_6f.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_70.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_70.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_72.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_72.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_74.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_74.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_75.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_75.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/mag_sel.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/nomatches.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_61.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_61.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_62.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_62.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_63.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_63.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_64.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_64.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_65.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_65.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_68.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_68.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_69.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_6d.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_70.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_70.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_72.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_72.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_74.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_74.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search.css
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search_l.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search_m.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search_r.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_61.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_61.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_62.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_62.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_63.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_63.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_64.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_64.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_65.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_65.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_66.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_66.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_67.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_67.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_68.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_68.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_69.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_69.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6c.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6d.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6e.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6f.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_70.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_70.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_71.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_71.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_72.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_72.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_73.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_73.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_74.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_74.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_75.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_75.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_76.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_76.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_77.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_77.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__event_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__event_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__event_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__midi__event_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__midi__event_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__midi__event_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seqmid_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seqmid_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/setup_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/simple_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/simple__abst_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/simple__none_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structctl__access__elem.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__aes__iec958__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__ctl__ext.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__ctl__ext__callback.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__devname.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__mixer__selem__regopt.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__audio__tstamp__config__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__audio__tstamp__report__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__channel__area__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__chmap__query__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__chmap__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__extplug.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__extplug__callback.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__ioplug.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__ioplug__callback.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__scope__ops__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__addr__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__connect__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__ctrl__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__ext.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__note__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__queue__control__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__raw32__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__raw8__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__event__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__queue__skew__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__real__time__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__result__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__timer__read__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__timer__tread__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__bytes__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__channel__elem.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__channel__map__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__channel__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__ctl__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__dai__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__enum__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__graph__elem.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__graph__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__hw__config__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__io__ops__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__link__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__mixer__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__obj__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__obj__template__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__pcm__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__pdata__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__stream__caps__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__stream__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__tlv__dbscale__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__tlv__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__widget__template.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/sync_off.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/sync_on.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tab_a.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tab_b.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tab_h.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tab_s.png
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tabs.css
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer__local_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer__query_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tlv_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/topology_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/unionsnd__pcm__sync__id__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/unionsnd__seq__timestamp__t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/use-case_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/use-case_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/version_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/wave1.gif
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/wave2.gif
diff --git a/audio/linux-c7-alsa-plugins-oss/Makefile b/audio/linux-c7-alsa-plugins-oss/Makefile
index 6d5571de0433..81c75c4393a6 100644
--- a/audio/linux-c7-alsa-plugins-oss/Makefile
+++ b/audio/linux-c7-alsa-plugins-oss/Makefile
@@ -4,29 +4,108 @@
 PORTNAME=	alsa-plugins
 PORTVERSION=	1.1.6
 DISTVERSIONSUFFIX=	-1.el7
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	audio linux
+MASTER_SITES=	CENTOS_LINUX
+MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/Source/SPackages/ \
+			centos/${LINUX_DIST_VER}/updates/Source/SPackages/
+PKGNAMEPREFIX=	linux-c7-
 PKGNAMESUFFIX=	-oss
+EXTRACT_SUFX=	.src.rpm
+DIST_SUBDIR=	centos
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	OSS plugin for ALSA (Linux CentOS ${LINUX_DIST_VER})
 
-LICENSE=	GPLv3
+LICENSE=	LGPL21+
 
-USES=		linux:c7
+USES=		autoreconf:build gmake libtool:build linux:c7 pkgconfig
 USE_LDCONFIG=	yes
-USE_LINUX=	alsalib
-USE_LINUX_RPM=	yes
+USE_LINUX=	alsalib:build,run alsa-lib-devel:build base:build devtools:build
+USE_LINUX_PREFIX=yes
 
-LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+RPM_PATCHES=	alsa-plugins-1.1.6-post.patch \
+		alsa-plugins-1.1.6-speexdsp.patch
+CONFIG_ARGS=	--disable-static --disable-mix --disable-usbstream \
+		--disable-arcamav --disable-jack --disable-pulseaudio \
+		--disable-samplerate --disable-libav --disable-a52 \
+		--disable-lavrate --disable-speexdsp --with-speex=no
+CPPFLAGS+=	-DFREEBSD_OSS -DFREEBSD_OSS_USE_IO_PTR
+CFLAGS+=	--sysroot=${LINUXBASE}
+COMPAT32_CFLAGS_amd64=	-m32
+LIBDIR_amd64=	/usr/lib64
+LIBDIR_i386=	/usr/lib
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC32=	${WRKDIR}/32/${PORTNAME}-${PORTVERSION}
 
 CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+PLIST=		${PKGDIR}/pkg-plist.${ARCH}
 
-OPTIONS_DEFINE=	DOCS
+.include <bsd.port.options.mk>
 
-post-patch:
-	@${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/share/alsa
+post-extract:
+.if !empty(COMPAT32_CFLAGS_${ARCH})
+	@${MKDIR} ${WRKDIR}/32
+	@(cd ${WRKDIR}/32 && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		../${PORTNAME}-${PORTVERSION}.tar.bz2 ${EXTRACT_AFTER_ARGS})
+.endif
+	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		${PORTNAME}-${PORTVERSION}.tar.bz2 ${EXTRACT_AFTER_ARGS})
+
+do-patch:
+	@${REINPLACE_CMD} 's/mkdir -p/$$(MKDIR_P)/' \
+		${WRKDIR}/alsa-plugins-1.1.6-post.patch
+.for p in ${RPM_PATCHES}
+.if !empty(COMPAT32_CFLAGS_${ARCH})
+	@${PATCH} -d ${WRKSRC32} --forward --quiet -E -p1 < ${WRKDIR}/${p}
+.endif
+	@${PATCH} -d ${WRKSRC} --forward --quiet -E -p1 < ${WRKDIR}/${p}
+.endfor
+.if !empty(COMPAT32_CFLAGS_${ARCH})
+	@${CAT} ${PATCHDIR}/patch-* | ${PATCH} -d ${WRKSRC32} --forward \
+		--quiet -E -p0
+.endif
+	@${CAT} ${PATCHDIR}/patch-* | ${PATCH} -d ${WRKSRC} --forward \
+		--quiet -E -p0
+
+do-configure:
+.if !empty(COMPAT32_CFLAGS_${ARCH})
+	@(cd ${WRKSRC32} && ${AUTORECONF} -f -i && ${SETENV} \
+		PATH=${LINUXBASE}/usr/bin ./configure CPPFLAGS="${CPPFLAGS}" \
+		CFLAGS="${CFLAGS:N-march=*} ${COMPAT32_CFLAGS_${ARCH}}" \
+		LDFLAGS="${LDFLAGS}" MAKE="${LOCALBASE}/bin/gmake" \
+		MKDIR_P="${MKDIR}" PKG_CONFIG="${LOCALBASE}/bin/pkgconf" \
+		PKG_CONFIG_PATH=${LINUXBASE}/usr/lib/pkgconfig \
+		${CONFIG_ARGS})
+.endif
+	@(cd ${WRKSRC} && ${AUTORECONF} -f -i && ${SETENV} \
+		PATH=${LINUXBASE}/usr/bin ./configure CPPFLAGS="${CPPFLAGS}" \
+		CFLAGS="${CFLAGS:N-march=*}" LDFLAGS="${LDFLAGS}" \
+		MAKE="${LOCALBASE}/bin/gmake" MKDIR_P="${MKDIR}" \
+		PKG_CONFIG="${LOCALBASE}/bin/pkgconf" \
+		PKG_CONFIG_PATH=${LINUXBASE}${LIBDIR_${ARCH}}/pkgconfig \
+		--libdir ${LIBDIR_${ARCH}} ${CONFIG_ARGS})
+
+do-build:
+.if !empty(COMPAT32_CFLAGS_${ARCH})
+	@(cd ${WRKSRC32} && ${SETENV} PATH=${LINUXBASE}/usr/bin \
+		${LOCALBASE}/bin/gmake)
+.endif
+	@(cd ${WRKSRC} && ${SETENV} PATH=${LINUXBASE}/usr/bin \
+		${LOCALBASE}/bin/gmake)
+
+do-install:
+.if !empty(COMPAT32_CFLAGS_${ARCH})
+	@(cd ${WRKSRC32} && ${SETENV} PATH=${LINUXBASE}/usr/bin \
+		${LOCALBASE}/bin/gmake install-strip \
+		DESTDIR=${STAGEDIR}${LINUXBASE})
+	${RM} -r ${STAGEDIR}${LINUXBASE}/usr/lib/alsa-lib/*.la
+.endif
+	@(cd ${WRKSRC} && ${SETENV} PATH=${LINUXBASE}/usr/bin \
+		${LOCALBASE}/bin/gmake install-strip \
+		DESTDIR=${STAGEDIR}${LINUXBASE})
+	${RM} -r ${STAGEDIR}${LINUXBASE}${LIBDIR_${ARCH}}/alsa-lib/*.la
+	${RM} -r ${STAGEDIR}${LINUXBASE}/etc ${STAGEDIR}${LINUXBASE}/usr/share
 
 .include <bsd.port.mk>
diff --git a/audio/linux-c7-alsa-plugins-oss/distinfo b/audio/linux-c7-alsa-plugins-oss/distinfo
index a6a995595bbb..df4ad797633c 100644
--- a/audio/linux-c7-alsa-plugins-oss/distinfo
+++ b/audio/linux-c7-alsa-plugins-oss/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1556469061
-SHA256 (centos/alsa-plugins-oss-1.1.6-1.el7.i686.rpm) = 4da7c5cd52caed8640db1cb1521c7c7ef837dd89272e93870a13d919f1db081a
-SIZE (centos/alsa-plugins-oss-1.1.6-1.el7.i686.rpm) = 32748
-SHA256 (centos/alsa-plugins-oss-1.1.6-1.el7.x86_64.rpm) = f7ebfb51012b6905e4e96eecfff1179cde32ade799c2eb7e740c3646146a70c3
-SIZE (centos/alsa-plugins-oss-1.1.6-1.el7.x86_64.rpm) = 33236
+TIMESTAMP = 1567864839
 SHA256 (centos/alsa-plugins-1.1.6-1.el7.src.rpm) = e01bf476f3117bc29276a24ddae250396b928dfe2755550ec234e6f77f43add0
 SIZE (centos/alsa-plugins-1.1.6-1.el7.src.rpm) = 396174
diff --git a/audio/linux-c7-alsa-plugins-oss/files/patch-oss-ctl_oss.c b/audio/linux-c7-alsa-plugins-oss/files/patch-oss-ctl_oss.c
new file mode 100644
index 000000000000..01a998655fd4
--- /dev/null
+++ b/audio/linux-c7-alsa-plugins-oss/files/patch-oss-ctl_oss.c
@@ -0,0 +1,42 @@
+--- oss/ctl_oss.c.orig	2018-04-03 07:01:38 UTC
++++ oss/ctl_oss.c
+@@ -362,7 +362,9 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss)
+ {
+ 	snd_config_iterator_t it, next;
+ 	const char *device = "/dev/mixer";
++#ifndef FREEBSD_OSS
+ 	struct mixer_info mixinfo;
++#endif
+ 	int i, err, val;
+ 	snd_ctl_oss_t *oss;
+ 	
+@@ -399,19 +401,29 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss)
+ 		goto error;
+ 	}
+ 
++#ifndef FREEBSD_OSS
+ 	if (ioctl(oss->fd, SOUND_MIXER_INFO, &mixinfo) < 0) {
+ 		err = -errno;
+ 		SNDERR("Cannot get mixer info for device %s", device);
+ 		goto error;
+ 	}
++#endif
+ 
+ 	oss->ext.version = SND_CTL_EXT_VERSION;
+ 	oss->ext.card_idx = 0; /* FIXME */
++#ifdef FREEBSD_OSS
++	strncpy(oss->ext.id, "fbsd", sizeof(oss->ext.id) - 1);
++	strcpy(oss->ext.driver, "FreeBSD/OSS plugin");
++	strncpy(oss->ext.name, "FreeBSD/OSS", sizeof(oss->ext.name) - 1);
++	strncpy(oss->ext.longname, "FreeBSD/OSS", sizeof(oss->ext.longname) - 1);
++	strncpy(oss->ext.mixername, "FreeBSD/OSS", sizeof(oss->ext.mixername) - 1);
++#else
+ 	strncpy(oss->ext.id, mixinfo.id, sizeof(oss->ext.id) - 1);
+ 	strcpy(oss->ext.driver, "OSS-Emulation");
+ 	strncpy(oss->ext.name, mixinfo.name, sizeof(oss->ext.name) - 1);
+ 	strncpy(oss->ext.longname, mixinfo.name, sizeof(oss->ext.longname) - 1);
+ 	strncpy(oss->ext.mixername, mixinfo.name, sizeof(oss->ext.mixername) - 1);
++#endif
+ 	oss->ext.poll_fd = -1;
+ 	oss->ext.callback = &oss_ext_callback;
+ 	oss->ext.private_data = oss;
diff --git a/audio/linux-c7-alsa-plugins-oss/files/patch-oss-pcm_oss.c b/audio/linux-c7-alsa-plugins-oss/files/patch-oss-pcm_oss.c
new file mode 100644
index 000000000000..384dbb865682
--- /dev/null
+++ b/audio/linux-c7-alsa-plugins-oss/files/patch-oss-pcm_oss.c
@@ -0,0 +1,673 @@
+--- oss/pcm_oss.c.orig	2018-04-03 07:01:38 UTC
++++ oss/pcm_oss.c
+@@ -24,15 +24,48 @@
+ #include <alsa/pcm_external.h>
+ #include <linux/soundcard.h>
+ 
++#define ARRAY_SIZE(x)	(sizeof(x) / sizeof(*(x)))
++
++#ifdef FREEBSD_OSS
++#define AFMT_S32_LE	0x00001000	/* Little endian signed 32-bit */
++#define AFMT_S32_BE	0x00002000	/* Big endian signed 32-bit */
++#define AFMT_U32_LE	0x00004000	/* Little endian unsigned 32-bit */
++#define AFMT_U32_BE	0x00008000	/* Big endian unsigned 32-bit */
++#define AFMT_S24_LE	0x00010000	/* Little endian signed 24-bit */
++#define AFMT_S24_BE	0x00020000	/* Big endian signed 24-bit */
++#define AFMT_U24_LE	0x00040000	/* Little endian unsigned 24-bit */
++#define AFMT_U24_BE	0x00080000	/* Big endian unsigned 24-bit */
++
++#define FREEBSD_OSS_RATE_MIN	1
++#define FREEBSD_OSS_RATE_MAX	384000
++
++#define FREEBSD_OSS_CHANNELS_MIN	1
++#define FREEBSD_OSS_CHANNELS_MAX	8
++
++#define FREEBSD_OSS_BUFSZ_MAX	131072
++#define FREEBSD_OSS_BLKCNT_MIN	2
++#define FREEBSD_OSS_BLKSZ_MIN	16 /* (FREEBSD_OSS_CHANNELS_MAX * 4) */
++
++#define FREEBSD_OSS_BUFSZ_MIN	(FREEBSD_OSS_BLKCNT_MIN * FREEBSD_OSS_BLKSZ_MIN)
++#define FREEBSD_OSS_BLKCNT_MAX	(FREEBSD_OSS_BUFSZ_MAX / FREEBSD_OSS_BUFSZ_MIN)
++#define FREEBSD_OSS_BLKSZ_MAX	(FREEBSD_OSS_BUFSZ_MAX / FREEBSD_OSS_BLKCNT_MIN)
++#endif
++
+ typedef struct snd_pcm_oss {
+ 	snd_pcm_ioplug_t io;
+ 	char *device;
+ 	int fd;
++#ifdef FREEBSD_OSS
++	int bufsz, ptr, ptr_align, last_bytes;
++#else
+ 	int fragment_set;
+ 	int caps;
++#endif
+ 	int format;
++#ifndef FREEBSD_OSS
+ 	unsigned int period_shift;
+ 	unsigned int periods;
++#endif
+ 	unsigned int frame_bytes;
+ } snd_pcm_oss_t;
+ 
+@@ -49,8 +82,21 @@ static snd_pcm_sframes_t oss_write(snd_pcm_ioplug_t *i
+ 	buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8;
+ 	size *= oss->frame_bytes;
+ 	result = write(oss->fd, buf, size);
+-	if (result <= 0)
+-		return result;
++#ifdef FREEBSD_OSS
++	if (result == -1) {
++		if (errno == EAGAIN)
++			return 0;
++		else
++			return -errno;
++	}
++#else
++	if (result <= 0) {
++		if (result == -EAGAIN)
++			return 0;
++		else
++			return result;
++	}
++#endif
+ 	return result / oss->frame_bytes;
+ }
+ 
+@@ -67,14 +113,88 @@ static snd_pcm_sframes_t oss_read(snd_pcm_ioplug_t *io
+ 	buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8;
+ 	size *= oss->frame_bytes;
+ 	result = read(oss->fd, buf, size);
+-	if (result <= 0)
+-		return result;
++#ifdef FREEBSD_OSS
++	if (result == -1) {
++		if (errno == EAGAIN)
++			return 0;
++		else
++			return -errno;
++	}
++#else
++	if (result <= 0) {
++		if (result == -EAGAIN)
++			return 0;
++		else
++			return result;
++	}
++#endif
+ 	return result / oss->frame_bytes;
+ }
+ 
+ static snd_pcm_sframes_t oss_pointer(snd_pcm_ioplug_t *io)
+ {
++#ifdef FREEBSD_OSS
+ 	snd_pcm_oss_t *oss = io->private_data;
++#ifdef FREEBSD_OSS_USE_IO_PTR
++	struct count_info ci;
++#endif
++	audio_buf_info bi;
++
++	if (io->state != SND_PCM_STATE_RUNNING)
++		return 0;
++
++	if (io->state == SND_PCM_STATE_XRUN)
++		return -EPIPE;
++
++#ifdef FREEBSD_OSS_USE_IO_PTR
++	if (ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ?
++	    SNDCTL_DSP_GETOPTR : SNDCTL_DSP_GETIPTR, &ci) < 0)
++		return -EINVAL;
++
++	if (ci.ptr == oss->last_bytes &&
++	    ((ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ?
++	    SNDCTL_DSP_GETOSPACE : SNDCTL_DSP_GETISPACE, &bi) < 0) ||
++	    bi.bytes == oss->bufsz))
++		return -EPIPE;
++
++	if (ci.ptr < oss->last_bytes)
++		oss->ptr += oss->bufsz;
++
++	oss->ptr += ci.ptr;
++	oss->ptr -= oss->last_bytes;
++	oss->ptr %= oss->ptr_align;
++
++	oss->last_bytes = ci.ptr;
++#else	/* !FREEBSD_OSS_USE_IO_PTR */
++	if (ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ?
++	    SNDCTL_DSP_GETOSPACE : SNDCTL_DSP_GETISPACE, &bi) < 0)
++		return -EINVAL;
++
++	if (bi.bytes == oss->bufsz && bi.bytes == oss->last_bytes) {
++#if 0
++#ifdef SNDCTL_DSP_GETERROR
++		audio_errinfo ei;
++		if (ioctl(oss->fd, SNDCTL_DSP_GETERROR, &ei) < 0 ||
++		    (io->stream == SND_PCM_STREAM_PLAYBACK &&
++		    ei.play_underruns != 0) ||
++		    (io->stream == SND_PCM_STREAM_CAPTURE &&
++		    ei.rec_overruns != 0))
++#endif
++#endif
++			return -EPIPE;
++	}
++
++	if (bi.bytes > oss->last_bytes) {
++		oss->ptr += bi.bytes - oss->last_bytes;
++		oss->ptr %= oss->ptr_align;
++	}
++
++	oss->last_bytes = bi.bytes;
++#endif	/* FREEBSD_OSS_USE_IO_PTR */
++
++	return snd_pcm_bytes_to_frames(io->pcm, oss->ptr);
++#else
++	snd_pcm_oss_t *oss = io->private_data;
+ 	struct count_info info;
+ 	int ptr;
+ 
+@@ -85,20 +205,59 @@ static snd_pcm_sframes_t oss_pointer(snd_pcm_ioplug_t 
+ 	}
+ 	ptr = snd_pcm_bytes_to_frames(io->pcm, info.ptr);
+ 	return ptr;
++#endif
+ }
+ 
+ static int oss_start(snd_pcm_ioplug_t *io)
+ {
+ 	snd_pcm_oss_t *oss = io->private_data;
++#ifdef FREEBSD_OSS
++	audio_buf_info bi;
++#ifdef FREEBSD_OSS_USE_IO_PTR
++	struct count_info ci;
++#endif
++#endif
+ 	int tmp = io->stream == SND_PCM_STREAM_PLAYBACK ?
+ 		PCM_ENABLE_OUTPUT : PCM_ENABLE_INPUT;
+ 
++#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
++	fprintf(stderr, "%s()\n", __func__);
++#endif
++
+ 	if (ioctl(oss->fd, SNDCTL_DSP_SETTRIGGER, &tmp) < 0) {
+ 		fprintf(stderr, "*** OSS: trigger failed\n");
++#ifdef FREEBSD_OSS
++		return -EINVAL;
++#else
+ 		if (io->stream == SND_PCM_STREAM_CAPTURE)
+ 			/* fake read to trigger */
+ 			read(oss->fd, &tmp, 0);
++#endif
+ 	}
++
++#ifdef FREEBSD_OSS
++	if (ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ?
++	    SNDCTL_DSP_GETOSPACE : SNDCTL_DSP_GETISPACE, &bi) < 0)
++		return -EINVAL;
++
++	if (oss->bufsz != (bi.fragsize * bi.fragstotal)) {
++		fprintf(stderr, "%s(): WARNING - bufsz changed! %d -> %d\n",
++		    __func__, oss->bufsz, bi.fragsize * bi.fragstotal);
++		oss->bufsz = bi.fragsize * bi.fragstotal;
++	}
++
++#ifdef FREEBSD_OSS_USE_IO_PTR
++	if (ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ?
++	    SNDCTL_DSP_GETOPTR : SNDCTL_DSP_GETIPTR, &ci) < 0)
++		return -EINVAL;
++
++	oss->last_bytes = ci.ptr;
++#else
++	oss->last_bytes = bi.bytes;
++#endif
++	oss->ptr = 0;
++#endif
++
+ 	return 0;
+ }
+ 
+@@ -107,6 +266,10 @@ static int oss_stop(snd_pcm_ioplug_t *io)
+ 	snd_pcm_oss_t *oss = io->private_data;
+ 	int tmp = 0;
+ 
++#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
++	fprintf(stderr, "%s()\n", __func__);
++#endif
++
+ 	ioctl(oss->fd, SNDCTL_DSP_SETTRIGGER, &tmp);
+ 	return 0;
+ }
+@@ -115,18 +278,46 @@ static int oss_drain(snd_pcm_ioplug_t *io)
+ {
+ 	snd_pcm_oss_t *oss = io->private_data;
+ 
++#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
++	fprintf(stderr, "%s()\n", __func__);
++#endif
++
+ 	if (io->stream == SND_PCM_STREAM_PLAYBACK)
+-		ioctl(oss->fd, SNDCTL_DSP_SYNC);
++		ioctl(oss->fd, SNDCTL_DSP_SYNC, NULL);
+ 	return 0;
+ }
+ 
++static int oss_delay(snd_pcm_ioplug_t *io, snd_pcm_sframes_t *delayp)
++{
++	snd_pcm_oss_t *oss = io->private_data;
++	int tmp;
++
++	if (oss->fd < 0)
++		return -EBADFD;
++
++	if (io->stream == SND_PCM_STREAM_PLAYBACK) {
++		if (ioctl(oss->fd, SNDCTL_DSP_GETODELAY, &tmp) < 0 || tmp < 0)
++			tmp = 0;
++	} else {
++		tmp = 0;
++	}
++	*delayp = snd_pcm_bytes_to_frames(io->pcm, tmp);
++
++	return (0);
++}
++
++#ifndef FREEBSD_OSS
+ static int oss_prepare(snd_pcm_ioplug_t *io)
+ {
+ 	snd_pcm_oss_t *oss = io->private_data;
+ 	int tmp;
+ 
+-	ioctl(oss->fd, SNDCTL_DSP_RESET);
++#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
++	fprintf(stderr, "%s()\n", __func__);
++#endif
+ 
++	ioctl(oss->fd, SNDCTL_DSP_RESET, NULL);
++
+ 	tmp = io->channels;
+ 	if (ioctl(oss->fd, SNDCTL_DSP_CHANNELS, &tmp) < 0) {
+ 		perror("SNDCTL_DSP_CHANNELS");
+@@ -145,16 +336,75 @@ static int oss_prepare(snd_pcm_ioplug_t *io)
+ 	}
+ 	return 0;
+ }
++#endif
+ 
++#ifdef FREEBSD_OSS
++static const struct {
++	int oss_format;
++	snd_pcm_format_t alsa_format;
++} oss_formats_tab[] = {
++	{ AFMT_U8, SND_PCM_FORMAT_U8 },
++	{ AFMT_S8, SND_PCM_FORMAT_S8 },
++	{ AFMT_MU_LAW, SND_PCM_FORMAT_MU_LAW  },
++	{  AFMT_A_LAW, SND_PCM_FORMAT_A_LAW   },
++	{ AFMT_S16_LE, SND_PCM_FORMAT_S16_LE  },
++	{ AFMT_S16_BE, SND_PCM_FORMAT_S16_BE  },
++	{ AFMT_U16_LE, SND_PCM_FORMAT_U16_LE  },
++	{ AFMT_U16_BE, SND_PCM_FORMAT_U16_BE  },
++	{ AFMT_S24_LE, SND_PCM_FORMAT_S24_3LE },
++	{ AFMT_S24_BE, SND_PCM_FORMAT_S24_3BE },
++	{ AFMT_U24_LE, SND_PCM_FORMAT_U24_3LE },
++	{ AFMT_U24_BE, SND_PCM_FORMAT_U24_3BE },
++	{ AFMT_S32_LE, SND_PCM_FORMAT_S32_LE  },
++	{ AFMT_S32_BE, SND_PCM_FORMAT_S32_BE  },
++	{ AFMT_U32_LE, SND_PCM_FORMAT_U32_LE  },
++	{ AFMT_U32_BE, SND_PCM_FORMAT_U32_BE  },
++	/* Special */
++	{ AFMT_S24_LE, SND_PCM_FORMAT_S20_3LE },
++	{ AFMT_S24_BE, SND_PCM_FORMAT_S20_3BE },
++	{ AFMT_U24_LE, SND_PCM_FORMAT_U20_3LE },
++	{ AFMT_U24_BE, SND_PCM_FORMAT_U20_3BE },
++	{ AFMT_S24_LE, SND_PCM_FORMAT_S18_3LE },
++	{ AFMT_S24_BE, SND_PCM_FORMAT_S18_3BE },
++	{ AFMT_U24_LE, SND_PCM_FORMAT_U18_3LE },
++	{ AFMT_U24_BE, SND_PCM_FORMAT_U18_3BE },
++	{ AFMT_S32_LE, SND_PCM_FORMAT_S24_LE  },
++	{ AFMT_S32_BE, SND_PCM_FORMAT_S24_BE  },
++	{ AFMT_U32_LE, SND_PCM_FORMAT_U24_LE  },
++	{ AFMT_U32_BE, SND_PCM_FORMAT_U24_BE  },
++};
++#endif
++
+ static int oss_hw_params(snd_pcm_ioplug_t *io,
+ 			 snd_pcm_hw_params_t *params ATTRIBUTE_UNUSED)
+ {
+ 	snd_pcm_oss_t *oss = io->private_data;
+ 	int i, tmp, err;
++#ifdef FREEBSD_OSS
++	int blksz_shift, blkcnt;
++	audio_buf_info bi;
++#else
+ 	unsigned int period_bytes;
++#endif
+ 	long oflags, flags;
+ 
++#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
++	fprintf(stderr, "%s()\n", __func__);
++#endif
++
+ 	oss->frame_bytes = (snd_pcm_format_physical_width(io->format) * io->channels) / 8;
++#ifdef FREEBSD_OSS
++	oss->ptr_align = io->buffer_size * oss->frame_bytes;
++
++	oss->format = 0;
++	for (i = 0; i < ARRAY_SIZE(oss_formats_tab); i++) {
++		if (oss_formats_tab[i].alsa_format == io->format) {
++			oss->format = oss_formats_tab[i].oss_format;
++			break;
++		}
++	}
++	if (oss->format == 0) {
++#else
+ 	switch (io->format) {
+ 	case SND_PCM_FORMAT_U8:
+ 		oss->format = AFMT_U8;
+@@ -166,9 +416,93 @@ static int oss_hw_params(snd_pcm_ioplug_t *io,
+ 		oss->format = AFMT_S16_BE;
+ 		break;
+ 	default:
++#endif
+ 		fprintf(stderr, "*** OSS: unsupported format %s\n", snd_pcm_format_name(io->format));
+ 		return -EINVAL;
+ 	}
++#ifdef FREEBSD_OSS
++
++	ioctl(oss->fd, SNDCTL_DSP_RESET);
++
++	/* use a 16ms HW buffer by default */
++	tmp = ((16 * io->rate) / 1000) * oss->frame_bytes;
++
++	/* round up to nearest power of two */
++	while (tmp & (tmp - 1))
++		tmp += tmp & ~(tmp - 1);
++
++	/* get logarithmic value */
++	for (blksz_shift = 0; blksz_shift < 24; blksz_shift++) {
++		if (tmp == (1 << blksz_shift))
++			break;
++	}
++
++	tmp = io->buffer_size * oss->frame_bytes;
++
++	/* compute HW buffer big enough to hold SW buffer */
++	for (blkcnt = FREEBSD_OSS_BLKCNT_MIN; blkcnt != FREEBSD_OSS_BLKCNT_MAX; blkcnt *= 2) {
++		if ((blkcnt << blksz_shift) >= tmp)
++			break;
++	}
++
++	tmp = blksz_shift | (blkcnt << 16);
++	if (ioctl(oss->fd, SNDCTL_DSP_SETFRAGMENT, &tmp) < 0) {
++		perror("SNDCTL_DSP_SETFRAGMENTS");
++		return -EINVAL;
++	}
++
++	tmp = oss->format;
++	if (ioctl(oss->fd, SNDCTL_DSP_SETFMT, &tmp) < 0 ||
++	    tmp != oss->format) {
++		perror("SNDCTL_DSP_SETFMT");
++		return -EINVAL;
++	}
++
++	tmp = io->channels;
++	if (ioctl(oss->fd, SNDCTL_DSP_CHANNELS, &tmp) < 0 ||
++	    tmp != io->channels) {
++		perror("SNDCTL_DSP_CHANNELS");
++		return -EINVAL;
++	}
++
++	tmp = io->rate;
++	if (ioctl(oss->fd, SNDCTL_DSP_SPEED, &tmp) < 0 ||
++	    tmp > io->rate * 1.01 || tmp < io->rate * 0.99) {
++		perror("SNDCTL_DSP_SPEED");
++		return -EINVAL;
++	}
++
++	if (ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ?
++	    SNDCTL_DSP_GETOSPACE : SNDCTL_DSP_GETISPACE, &bi) < 0) {
++		perror("SNDCTL_DSP_GET[I/O]SPACE");
++		return -EINVAL;
++	}
++
++	oss->bufsz = bi.fragsize * bi.fragstotal;
++
++#ifdef SNDCTL_DSP_LOW_WATER
++	tmp = ((io->period_size * oss->frame_bytes) * 3) / 4;
++	tmp -= tmp % oss->frame_bytes;
++	if (tmp < oss->frame_bytes)
++		tmp = oss->frame_bytes;
++	if (tmp > bi.fragsize)
++		tmp = bi.fragsize;
++	if (ioctl(oss->fd, SNDCTL_DSP_LOW_WATER, &tmp) < 0)
++		perror("SNDCTL_DSP_LOW_WATER");
++#endif
++
++#ifdef FREEBSD_OSS_DEBUG_VERBOSE
++	fprintf(stderr,
++	    "\n\n[%lu -> %d] %lu ~ %d -> %d, %lu ~ %d -> %d [d:%ld lw:%d]\n\n",
++	    io->buffer_size / io->period_size, bi.fragstotal,
++	    io->buffer_size * oss->frame_bytes,
++	    (1 << blksz_shift) * blkcnt, oss->bufsz,
++	    io->period_size * oss->frame_bytes, 1 << blksz_shift,
++	    bi.fragsize,
++	    (long)(io->buffer_size * oss->frame_bytes) -
++	    oss->bufsz, tmp);
++#endif
++#else
+ 	period_bytes = io->period_size * oss->frame_bytes;
+ 	oss->period_shift = 0;
+ 	for (i = 31; i >= 4; i--) {
+@@ -209,6 +543,7 @@ static int oss_hw_params(snd_pcm_ioplug_t *io,
+ 		goto _retry;
+ 	}
+ 	oss->fragment_set = 1;
++#endif
+ 
+ 	if ((flags = fcntl(oss->fd, F_GETFL)) < 0) {
+ 		err = -errno;
+@@ -229,16 +564,152 @@ static int oss_hw_params(snd_pcm_ioplug_t *io,
+ 	return 0;
+ }
+ 
+-#define ARRAY_SIZE(ary)	(sizeof(ary)/sizeof(ary[0]))
+-
+ static int oss_hw_constraint(snd_pcm_oss_t *oss)
+ {
++#ifdef FREEBSD_OSS
+ 	snd_pcm_ioplug_t *io = &oss->io; 
+ 	static const snd_pcm_access_t access_list[] = {
+ 		SND_PCM_ACCESS_RW_INTERLEAVED,
+ 		SND_PCM_ACCESS_MMAP_INTERLEAVED
+ 	};
++#ifdef FREEBSD_OSS_BLKCNT_P2
++	unsigned int period_list[30];
++#endif
++#ifdef FREEBSD_OSS_BUFSZ_P2
++	unsigned int bufsz_list[30];
++#endif
+ 	unsigned int nformats;
++	unsigned int format[ARRAY_SIZE(oss_formats_tab)];
++#if 0
++	unsigned int nchannels;
++	unsigned int channel[FREEBSD_OSS_CHANNELS_MAX];
++#endif
++	int i, err, tmp;
++
++#ifdef FREEBSD_OSS_DEBUG_VERBOSE
++	fprintf(stderr, "%s()\n", __func__);
++#endif
++
++	/* check trigger */
++	tmp = 0;
++	if (ioctl(oss->fd, SNDCTL_DSP_GETCAPS, &tmp) >= 0) {
++		if (!(tmp & DSP_CAP_TRIGGER))
++			fprintf(stderr, "*** OSS: trigger is not supported!\n");
++	}
++
++	/* access type - interleaved only */
++	if ((err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_ACCESS,
++						 ARRAY_SIZE(access_list), access_list)) < 0)
++		return err;
++
++	/* supported formats. */
++	tmp = 0;
++	ioctl(oss->fd, SNDCTL_DSP_GETFMTS, &tmp);
++	nformats = 0;
++	for (i = 0; i < ARRAY_SIZE(oss_formats_tab); i++) {
++		if (tmp & oss_formats_tab[i].oss_format)
++			format[nformats++] = oss_formats_tab[i].alsa_format;
++	}
++	if (! nformats)
++		format[nformats++] = SND_PCM_FORMAT_S16;
++	if ((err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_FORMAT,
++						 nformats, format)) < 0)
++		return err;
++	
++#if 0
++	/* supported channels */
++	nchannels = 0;
++	for (i = 0; i < ARRAY_SIZE(channel); i++) {
++		tmp = i + 1;
++		if (ioctl(oss->fd, SNDCTL_DSP_CHANNELS, &tmp) >= 0 &&
++		    1 + i == tmp)
++			channel[nchannels++] = tmp;
++	}
++	if (! nchannels) /* assume 2ch stereo */
++		err = snd_pcm_ioplug_set_param_minmax(io,
++		    SND_PCM_IOPLUG_HW_CHANNELS, 2, 2);
++	else
++		err = snd_pcm_ioplug_set_param_list(io,
++		    SND_PCM_IOPLUG_HW_CHANNELS, nchannels, channel);
++	if (err < 0)
++		return err;
++#endif
++	err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_CHANNELS,
++	    FREEBSD_OSS_CHANNELS_MIN, FREEBSD_OSS_CHANNELS_MAX);
++	if (err < 0)
++		return err;
++
++	/* supported rates */
++	err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_RATE,
++	    FREEBSD_OSS_RATE_MIN, FREEBSD_OSS_RATE_MAX);
++	if (err < 0)
++		return err;
++
++	/*
++	 *  Maximum buffer size on FreeBSD can go up to 131072 bytes without
++	 *  strict ^2 alignment so that s24le in 3bytes packing can be fed
++	 *  directly.
++	 */
++
++#ifdef FREEBSD_OSS_BLKCNT_P2
++	tmp = 0;
++	for (i = 1; i < 31 && tmp < ARRAY_SIZE(period_list); i++) {
++		if ((1 << i) > FREEBSD_OSS_BLKCNT_MAX)
++			break;
++		if ((1 << i) < FREEBSD_OSS_BLKCNT_MIN)
++			continue;
++		period_list[tmp++] = 1 << i;
++	}
++
++	if (tmp > 0)
++		err = snd_pcm_ioplug_set_param_list(io,
++		    SND_PCM_IOPLUG_HW_PERIODS, tmp, period_list);
++	else
++#endif
++	/* periods , not strictly ^2 but later on will be refined */
++		err = snd_pcm_ioplug_set_param_minmax(io,
++		    SND_PCM_IOPLUG_HW_PERIODS, FREEBSD_OSS_BLKCNT_MIN,
++		    FREEBSD_OSS_BLKCNT_MAX);
++	if (err < 0)
++		return err;
++
++	/* period size , not strictly ^2 */
++	err = snd_pcm_ioplug_set_param_minmax(io,
++	    SND_PCM_IOPLUG_HW_PERIOD_BYTES, FREEBSD_OSS_BLKSZ_MIN,
++	    FREEBSD_OSS_BLKSZ_MAX);
++	if (err < 0)
++		return err;
++
++#ifdef FREEBSD_OSS_BUFSZ_P2
++	tmp = 0;
++	for (i = 1; i < 31 && tmp < ARRAY_SIZE(bufsz_list); i++) {
++		if ((1 << i) > FREEBSD_OSS_BUFSZ_MAX)
++			break;
++		if ((1 << i) < FREEBSD_OSS_BUFSZ_MIN)
++			continue;
++		bufsz_list[tmp++] = 1 << i;
++	}
++
++	if (tmp > 0)
++		err = snd_pcm_ioplug_set_param_list(io,
++		    SND_PCM_IOPLUG_HW_BUFFER_BYTES, tmp, bufsz_list);
++	else
++#endif
++	/* buffer size , not strictly ^2 */
++	err = snd_pcm_ioplug_set_param_minmax(io,
++	    SND_PCM_IOPLUG_HW_BUFFER_BYTES, FREEBSD_OSS_BUFSZ_MIN,
++	    FREEBSD_OSS_BUFSZ_MAX);
++	if (err < 0)
++		return err;
++
++	return 0;
++#else
++	snd_pcm_ioplug_t *io = &oss->io; 
++	static const snd_pcm_access_t access_list[] = {
++		SND_PCM_ACCESS_RW_INTERLEAVED,
++		SND_PCM_ACCESS_MMAP_INTERLEAVED
++	};
++	unsigned int nformats;
+ 	unsigned int format[5];
+ 	unsigned int nchannels;
+ 	unsigned int channel[6];
+@@ -317,6 +788,7 @@ static int oss_hw_constraint(snd_pcm_oss_t *oss)
+ 		return err;
+ 
+ 	return 0;
++#endif
+ }
+ 
+ 
+@@ -324,6 +796,10 @@ static int oss_close(snd_pcm_ioplug_t *io)
+ {
+ 	snd_pcm_oss_t *oss = io->private_data;
+ 
++#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
++	fprintf(stderr, "%s()\n", __func__);
++#endif
++
+ 	close(oss->fd);
+ 	free(oss->device);
+ 	free(oss);
+@@ -337,8 +813,11 @@ static const snd_pcm_ioplug_callback_t oss_playback_ca
+ 	.pointer = oss_pointer,
+ 	.close = oss_close,
+ 	.hw_params = oss_hw_params,
++#ifndef FREEBSD_OSS
+ 	.prepare = oss_prepare,
++#endif
+ 	.drain = oss_drain,
++	.delay = oss_delay,
+ };
+ 
+ static const snd_pcm_ioplug_callback_t oss_capture_callback = {
+@@ -348,8 +827,11 @@ static const snd_pcm_ioplug_callback_t oss_capture_cal
+ 	.pointer = oss_pointer,
+ 	.close = oss_close,
+ 	.hw_params = oss_hw_params,
++#ifndef FREEBSD_OSS
+ 	.prepare = oss_prepare,
++#endif
+ 	.drain = oss_drain,
++	.delay = oss_delay,
+ };
+ 
+ 
+@@ -360,6 +842,10 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss)
+ 	int err;
+ 	snd_pcm_oss_t *oss;
+ 	
++#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
++	fprintf(stderr, "%s()\n", __func__);
++#endif
++
+ 	snd_config_for_each(i, next, conf) {
+ 		snd_config_t *n = snd_config_iterator_entry(i);
+ 		const char *id;
diff --git a/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 b/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64
index 02cf9a2c25f7..d2715433a1ff 100644
--- a/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64
+++ b/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64
@@ -2,6 +2,3 @@ usr/lib/alsa-lib/libasound_module_ctl_oss.so
 usr/lib/alsa-lib/libasound_module_pcm_oss.so
 usr/lib64/alsa-lib/libasound_module_ctl_oss.so
 usr/lib64/alsa-lib/libasound_module_pcm_oss.so
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL
-%%PORTDOCS%%%%DOCSDIR%%/README-pcm-oss
diff --git a/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 b/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386
index d3c738962118..f1114fa640b9 100644
--- a/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386
+++ b/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386
@@ -1,5 +1,2 @@
 usr/lib/alsa-lib/libasound_module_ctl_oss.so
 usr/lib/alsa-lib/libasound_module_pcm_oss.so
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL
-%%PORTDOCS%%%%DOCSDIR%%/README-pcm-oss
diff --git a/audio/yoshimi/Makefile b/audio/yoshimi/Makefile
index 7fb4ca2b1385..98fe25ecf01c 100644
--- a/audio/yoshimi/Makefile
+++ b/audio/yoshimi/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	yoshimi
-DISTVERSION=	1.6.0
+DISTVERSION=	1.6.0.1
 CATEGORIES=	audio
 
 MAINTAINER=	tobik@FreeBSD.org
@@ -10,9 +10,6 @@ COMMENT=	Sophisticated software synthesizer
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_armv6=		fails to compile: c++: warning: argument unused during compilation: '-msse'
-BROKEN_armv7=		fails to compile: c++: warning: argument unused during compilation: '-msse'
-
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3 \
 		dssi>0:audio/dssi \
 		lv2>0:audio/lv2
diff --git a/audio/yoshimi/distinfo b/audio/yoshimi/distinfo
index 9ec611be8f93..5d1053612377 100644
--- a/audio/yoshimi/distinfo
+++ b/audio/yoshimi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567341715
-SHA256 (Yoshimi-yoshimi-1.6.0_GH0.tar.gz) = 006c5101b2a3abd9f3b060f520d573b52834b551ad7efad7530c5d0469d0dd0c
-SIZE (Yoshimi-yoshimi-1.6.0_GH0.tar.gz) = 9981151
+TIMESTAMP = 1567962161
+SHA256 (Yoshimi-yoshimi-1.6.0.1_GH0.tar.gz) = 92c4570391721f8faff1059063cf36f6e9018e52be6b18bce9d3d263087afcfb
+SIZE (Yoshimi-yoshimi-1.6.0.1_GH0.tar.gz) = 9974770
diff --git a/benchmarks/fio/Makefile b/benchmarks/fio/Makefile
index 50dbccc37df2..4e1a6fd0979f 100644
--- a/benchmarks/fio/Makefile
+++ b/benchmarks/fio/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	fio
-PORTVERSION=	3.13
+PORTVERSION=	3.15
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://brick.kernel.dk/snaps/
 
-MAINTAINER=	bapt@FreeBSD.org
+MAINTAINER=	krion@FreeBSD.org
 COMMENT=	Flexible IO tester
 
 LICENSE=	GPLv2
diff --git a/benchmarks/fio/distinfo b/benchmarks/fio/distinfo
index 08baa12abc0f..774ecd1319f1 100644
--- a/benchmarks/fio/distinfo
+++ b/benchmarks/fio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550645470
-SHA256 (fio-3.13.tar.bz2) = a21d1e50c18eecbd5ee6f7c3c0a8c8605bbe31b91e07c387b2144b02ea3fb235
-SIZE (fio-3.13.tar.bz2) = 871425
+TIMESTAMP = 1568382760
+SHA256 (fio-3.15.tar.bz2) = 246369954833e0d6be5ef4f9c47968adafcb4a0751badca2cdd80700b4bc5784
+SIZE (fio-3.15.tar.bz2) = 876140
diff --git a/benchmarks/fio/pkg-plist b/benchmarks/fio/pkg-plist
index 462cec0dabad..5f75744f0cfe 100644
--- a/benchmarks/fio/pkg-plist
+++ b/benchmarks/fio/pkg-plist
@@ -37,6 +37,7 @@ man/man1/fio_generate_plots.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iometer-file-access-server.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/jesd219.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/latency-profile.fio
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/libiscsi.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/libhdfs.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/libpmem.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mtd.fio
diff --git a/biology/bedtools/Makefile b/biology/bedtools/Makefile
index 7595ab5a82de..19e0173cac27 100644
--- a/biology/bedtools/Makefile
+++ b/biology/bedtools/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-PORTNAME=	bedtools
+PORTNAME=		bedtools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.27.1
-PORTREVISION=	3
-CATEGORIES=	biology
+DISTVERSION=		2.29.0
+CATEGORIES=		biology
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Toolset for genome set arithmetic such as intersect, union
@@ -12,6 +11,8 @@ COMMENT=	Toolset for genome set arithmetic such as intersect, union
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+TEST_DEPENDS=	bash:shells/bash
+
 USES=		compiler:c++11-lang gmake python
 USE_GITHUB=	yes
 GH_ACCOUNT=	arq5x
@@ -22,15 +23,17 @@ post-extract:
 	@${MV} ${WRKSRC}/src/utils/gzstream/version \
 		${WRKSRC}/src/utils/gzstream/version.txt
 
-pre-build:
+pre-configure:
 	@${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|g' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|@\$$(CXX)|$$(CXX)|g' \
 		${WRKSRC}/*/Makefile \
 		${WRKSRC}/*/*/Makefile \
-		${WRKSRC}/*/*/*/Makefile \
-		${WRKSRC}/*/*/*/*/Makefile
+		${WRKSRC}/*/*/*/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bedtools
 
+do-test:
+	(cd ${WRKSRC}/test && bash test.sh)
+
 .include <bsd.port.mk>
diff --git a/biology/bedtools/distinfo b/biology/bedtools/distinfo
index bd752c979d56..17636136ba72 100644
--- a/biology/bedtools/distinfo
+++ b/biology/bedtools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519746174
-SHA256 (arq5x-bedtools2-v2.27.1_GH0.tar.gz) = edcac089d84e63a51f85c3c189469daa7d42180272130b046856faad3cf79112
-SIZE (arq5x-bedtools2-v2.27.1_GH0.tar.gz) = 20003119
+TIMESTAMP = 1567891084
+SHA256 (arq5x-bedtools2-v2.29.0_GH0.tar.gz) = 8a13b7ec93a2dc960616268d8009f6061bec5a32b8a38d5734f80e851bb8ed1e
+SIZE (arq5x-bedtools2-v2.29.0_GH0.tar.gz) = 20635364
diff --git a/biology/bedtools/files/patch-Makefile b/biology/bedtools/files/patch-Makefile
index 6a947277fe1c..16159fa81527 100644
--- a/biology/bedtools/files/patch-Makefile
+++ b/biology/bedtools/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2017-12-14 17:15:02 UTC
+--- Makefile.orig	2019-09-07 21:14:56 UTC
 +++ Makefile
 @@ -4,7 +4,7 @@
  # (c) 2009 Aaron Quinlan
@@ -9,42 +9,25 @@
  
  VERSION_FILE=./src/utils/version/version_git.h
  RELEASED_VERSION_FILE=./src/utils/version/version_release.txt
-@@ -16,11 +16,11 @@ export OBJ_DIR	= obj
- export BIN_DIR	= bin
- export SRC_DIR	= src
- export UTIL_DIR	= src/utils
--export CXX		= g++
-+export CXX		?= g++
- ifeq ($(DEBUG),1)
--export CXXFLAGS = -Wall -Wextra -DDEBUG -D_DEBUG -g -O0 -D_FILE_OFFSET_BITS=64 -fPIC $(INCLUDES)
-+export CXXFLAGS += -Wall -Wextra -DDEBUG -D_DEBUG -g -O0 -D_FILE_OFFSET_BITS=64 -fPIC $(INCLUDES)
- else
--export CXXFLAGS = -Wall -O2 -D_FILE_OFFSET_BITS=64 -fPIC $(INCLUDES)
-+export CXXFLAGS += -D_FILE_OFFSET_BITS=64 -fPIC $(INCLUDES)
- endif
+@@ -20,7 +20,7 @@ OBJ_DIR	= obj
+ BIN_DIR	= bin
+ SRC_DIR	= src
+ 
+-CXX     = g++
++CXX     ?= g++
  
- # If the user has specified to do so, tell the compile to use rand() (instead of mt19937).
-@@ -33,7 +33,7 @@ endif 
- export LIBS		= -lz
- export BT_ROOT  = src/utils/BamTools/
+ ifeq ($(DEBUG),1)
+ BT_CPPFLAGS = -DDEBUG -D_DEBUG -D_FILE_OFFSET_BITS=64 -DWITH_HTS_CB_API $(INCLUDES)
+@@ -40,7 +40,7 @@ endif
+ BT_LDFLAGS =
+ BT_LIBS    = -lz -lm -lbz2 -llzma -lpthread
  
 -prefix ?= /usr/local
 +PREFIX ?= /usr/local
  
  SUBDIRS = $(SRC_DIR)/annotateBed \
  		  $(SRC_DIR)/bamToBed \
-@@ -143,8 +143,8 @@ INCLUDES =	-I$(SRC_DIR)/utils/bedFile \
- 
- all: print_banner $(OBJ_DIR) $(BIN_DIR) autoversion $(UTIL_SUBDIRS) $(SUBDIRS)
- 	@echo "- Building main bedtools binary."
--	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c src/bedtools.cpp -o obj/bedtools.o $(INCLUDES)
--	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(BIN_DIR)/bedtools $(BUILT_OBJECTS) -L$(UTIL_DIR)/BamTools/lib/ -lbamtools $(LIBS) $(LDFLAGS) $(INCLUDES)
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c src/bedtools.cpp -o obj/bedtools.o $(INCLUDES)
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(BIN_DIR)/bedtools $(BUILT_OBJECTS) -L$(UTIL_DIR)/BamTools/lib/ -lbamtools $(LIBS) $(LDFLAGS) $(INCLUDES)
- 	@echo "done."
- 
- 	@echo "- Creating executables for old CLI."
-@@ -156,9 +156,9 @@ all: print_banner $(OBJ_DIR) $(BIN_DIR) 
+@@ -183,9 +183,9 @@ $(BIN_DIR)/intersectBed: | $(BIN_DIR)
  .PHONY: all
  
  install: all
@@ -56,12 +39,3 @@
  	done
  
  print_banner:
-@@ -193,7 +193,7 @@ clean:
- .PHONY: clean
- 
- test: all
--	@cd test; bash test.sh
-+	@cd test; $(SHELL) test.sh
- 
- .PHONY: test
- 
diff --git a/biology/bedtools/files/patch-src_utils_Contexts_ContextBase.h b/biology/bedtools/files/patch-src_utils_Contexts_ContextBase.h
new file mode 100644
index 000000000000..89f21e42296f
--- /dev/null
+++ b/biology/bedtools/files/patch-src_utils_Contexts_ContextBase.h
@@ -0,0 +1,11 @@
+--- src/utils/Contexts/ContextBase.h.orig	2019-03-25 18:03:45 UTC
++++ src/utils/Contexts/ContextBase.h
+@@ -44,7 +44,7 @@ public:
+ 	FileRecordMgr *getFile(int fileIdx) { return _files[fileIdx]; }
+ 	void setProgram(PROGRAM_TYPE program) { _program = program; }
+ 
+-	void addInputFile(const string &inputFile) { _fileNames.push_back(inputFile); }
++	void addInputFile(const string &inputFile) { _fileNames.push_back(inputFile); cerr << "Adding " << inputFile << endl; }
+ 
+ 	int getNumInputFiles() const { return _fileNames.size(); }
+ 	const string &getInputFileName(int fileNum) const { return _fileNames[fileNum]; }
diff --git a/biology/bedtools/files/patch-src_utils_htslib_Makefile b/biology/bedtools/files/patch-src_utils_htslib_Makefile
new file mode 100644
index 000000000000..7ca62f5eb33a
--- /dev/null
+++ b/biology/bedtools/files/patch-src_utils_htslib_Makefile
@@ -0,0 +1,27 @@
+--- src/utils/htslib/Makefile.orig	2019-03-25 03:58:18 UTC
++++ src/utils/htslib/Makefile
+@@ -22,9 +22,9 @@
+ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ # DEALINGS IN THE SOFTWARE.
+ 
+-CC     = gcc
+-AR     = ar
+-RANLIB = ranlib
++CC     ?= gcc
++AR     ?= ar
++RANLIB ?= ranlib
+ 
+ # Default libraries to link if configure is not used
+ htslib_default_libs = -lz -lm -lbz2 -llzma
+@@ -33,9 +33,9 @@ CPPFLAGS =
+ # TODO: probably update cram code to make it compile cleanly with -Wc++-compat
+ # For testing strict C99 support add -std=c99 -D_XOPEN_SOURCE=600
+ #CFLAGS   = -g -Wall -O2 -pedantic -std=c99 -D_XOPEN_SOURCE=600 -D__FUNCTION__=__func__
+-CFLAGS   = -g -Wall -O2
++CFLAGS   ?= -g -Wall -O2
+ EXTRA_CFLAGS_PIC = -fpic
+-LDFLAGS  =
++LDFLAGS  ?=
+ LIBS     = $(htslib_default_libs)
+ 
+ prefix      = /usr/local
diff --git a/biology/p5-BioPerl/Makefile b/biology/p5-BioPerl/Makefile
index 6147a19796cb..9166f42ced3b 100644
--- a/biology/p5-BioPerl/Makefile
+++ b/biology/p5-BioPerl/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	BioPerl
-PORTVERSION=	1.007005
-PORTREVISION=	1
+PORTVERSION=	1.007006
 CATEGORIES=	biology perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CDRAUG
@@ -18,10 +17,8 @@ LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
-		p5-Data-Stag>=0:devel/p5-Data-Stag \
+RUN_DEPENDS=	p5-Data-Stag>=0:devel/p5-Data-Stag \
 		p5-Error>=0:lang/p5-Error \
-		p5-GD>=0:graphics/p5-GD \
 		p5-Graph>=0:math/p5-Graph \
 		p5-HTTP-Message>=0:www/p5-HTTP-Message \
 		p5-IO-String>=0:devel/p5-IO-String \
@@ -52,16 +49,9 @@ USE_PERL5=	configure
 
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=	DOCS EXAMPLES PGTEST SQLITETEST
-PGTEST_DESC=	Test PostGreSQL
-SQLITETEST_DESC=Test SQLite
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
-PGTEST_RUN_DEPENDS=	p5-DBD-Pg>=3:databases/p5-DBD-Pg
-PGTEST_BUILD_DEPENDS=	p5-DBD-Pg>=3:databases/p5-DBD-Pg
-SQLITETEST_RUN_DEPENDS=	p5-DBD-SQLite>=1:databases/p5-DBD-SQLite
-SQLITETEST_BUILD_DEPENDS=	p5-DBD-SQLite>=1:databases/p5-DBD-SQLite
-
-SHEBANG_FILES=	examples/*.pl examples/*/*.pl
+SHEBANG_GLOB=	*.pl
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/biology/p5-BioPerl/distinfo b/biology/p5-BioPerl/distinfo
index a7180cfa9733..79a3ea039320 100644
--- a/biology/p5-BioPerl/distinfo
+++ b/biology/p5-BioPerl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565523237
-SHA256 (BioPerl-1.7.5.tar.gz) = 4a96472004e35e11eafd1fa3b3966f1d18622de3afde3e2fa6765a2dbedb3a0a
-SIZE (BioPerl-1.7.5.tar.gz) = 7512326
+TIMESTAMP = 1567842458
+SHA256 (BioPerl-1.7.6.tar.gz) = df2a3efc991b9b5d7cc9d038a1452c6dac910c9ad2a0e47e408dd692c111688d
+SIZE (BioPerl-1.7.6.tar.gz) = 7514084
diff --git a/biology/p5-BioPerl/pkg-plist b/biology/p5-BioPerl/pkg-plist
index 244f0c123a1d..6a2f6dc5ae16 100644
--- a/biology/p5-BioPerl/pkg-plist
+++ b/biology/p5-BioPerl/pkg-plist
@@ -2,7 +2,6 @@ bin/bp_aacomp
 bin/bp_bioflat_index
 bin/bp_biogetseq
 bin/bp_chaos_plot
-bin/bp_classify_hits_kingdom
 bin/bp_dbsplit
 bin/bp_extract_feature_seq
 bin/bp_fastam9_to_table
@@ -516,7 +515,6 @@ bin/bp_unflatten_seq
 %%PERL5_MAN1%%/bp_bioflat_index.1.gz
 %%PERL5_MAN1%%/bp_biogetseq.1.gz
 %%PERL5_MAN1%%/bp_chaos_plot.1.gz
-%%PERL5_MAN1%%/bp_classify_hits_kingdom.1.gz
 %%PERL5_MAN1%%/bp_dbsplit.1.gz
 %%PERL5_MAN1%%/bp_extract_feature_seq.1.gz
 %%PERL5_MAN1%%/bp_fastam9_to_table.1.gz
@@ -1035,6 +1033,7 @@ bin/bp_unflatten_seq
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/align/align_on_codons.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/align/aligntutorial.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/align/simplealign.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/classify_hits_kingdom
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contributed/nmrpdb_parse.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contributed/prosite2perl.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contributed/rebase2list.pl
diff --git a/biology/phyml/Makefile b/biology/phyml/Makefile
index ed0366c21ebb..f39d5aa3f29f 100644
--- a/biology/phyml/Makefile
+++ b/biology/phyml/Makefile
@@ -3,15 +3,15 @@
 
 PORTNAME=	phyml
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.3.20190321
+DISTVERSION=	3.3.20190909
 PORTEPOCH=	1
 CATEGORIES=	biology
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple, fast, and accurate algorithm to estimate large phylogenies
 
-LICENSE=	GPLv2
-#LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf libtool pkgconfig
 
diff --git a/biology/phyml/distinfo b/biology/phyml/distinfo
index 98efbc4f27ec..fdb1a1dde279 100644
--- a/biology/phyml/distinfo
+++ b/biology/phyml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558343639
-SHA256 (stephaneguindon-phyml-v3.3.20190321_GH0.tar.gz) = 5274546cda7445c947fd26838487cd4246e2becf18d333882b7a2a24dff853ee
-SIZE (stephaneguindon-phyml-v3.3.20190321_GH0.tar.gz) = 2223457
+TIMESTAMP = 1568127899
+SHA256 (stephaneguindon-phyml-v3.3.20190909_GH0.tar.gz) = f3afd6d5332cd98298736b3c6df63d751fa74388a0e972ec08f63a032d5e6a9c
+SIZE (stephaneguindon-phyml-v3.3.20190909_GH0.tar.gz) = 2237651
diff --git a/biology/py-cutadapt/Makefile b/biology/py-cutadapt/Makefile
index be2a07f67eff..dd21cf1dc9e2 100644
--- a/biology/py-cutadapt/Makefile
+++ b/biology/py-cutadapt/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cutadapt
-DISTVERSION=	2.3
+DISTVERSION=	2.5
 CATEGORIES=	biology python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xopen>=0.5.0:archivers/py-xopen@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dnaio>=0.3:biology/py-dnaio@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}dnaio>=0.3:biology/py-dnaio@${PY_FLAVOR} \
+		pigz>=0:archivers/pigz
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR}
 
diff --git a/biology/py-cutadapt/distinfo b/biology/py-cutadapt/distinfo
index 5aa859bc448e..592c5d7aa273 100644
--- a/biology/py-cutadapt/distinfo
+++ b/biology/py-cutadapt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556282310
-SHA256 (cutadapt-2.3.tar.gz) = 98b864ac9d81525263897bdda9ec5bfd4ff6b5d2ef48f915219def620a6e92ac
-SIZE (cutadapt-2.3.tar.gz) = 265584
+TIMESTAMP = 1568342520
+SHA256 (cutadapt-2.5.tar.gz) = ced79e49b93e922e579d0bb9d21298dcb2d7b7b1ea721feed484277e08b1660b
+SIZE (cutadapt-2.5.tar.gz) = 269321
diff --git a/cad/brickutils/Makefile b/cad/brickutils/Makefile
index 0fd79d650099..35f83fe9ea85 100644
--- a/cad/brickutils/Makefile
+++ b/cad/brickutils/Makefile
@@ -19,6 +19,8 @@ COMMENT=	Utility for building models with LEGO
 
 LICENSE=	GPLv3
 
+BROKEN=		missing RUN_DEPENDS
+
 RUN_DEPENDS=	${LOCALBASE}/share/ldraw/models/car.dat:cad/ldraw \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
diff --git a/cad/k40-whisperer/Makefile b/cad/k40-whisperer/Makefile
index 64d47f01ef59..1268a6c017a2 100644
--- a/cad/k40-whisperer/Makefile
+++ b/cad/k40-whisperer/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	k40-whisperer
-DISTVERSION=	0.35
+DISTVERSION=	0.36
 CATEGORIES=	cad python
 MASTER_SITES=	http://www.scorchworks.com/K40whisperer/
 DISTNAME=	K40_Whisperer-${DISTVERSION}_src
@@ -42,15 +42,6 @@ NON_DATA_FILES=	${DOCS} \
 		requirements.txt
 WHISPERER_COMMAND=	${PORTNAME}
 
-post-patch:
-	# Replace every leading tab with 8 spaces. It is a workaround for
-	# misindented Python scripts.
-	@${REINPLACE_CMD} -e 's|^	|        |g' \
-		-e ':again' \
-		-e 's|^\(        \)*	|\1        |g' \
-		-e 't again' \
-		${WRKSRC}/*.py
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${WHISPERER_COMMAND} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/cad/k40-whisperer/distinfo b/cad/k40-whisperer/distinfo
index 96140faabaf2..7f1fa56dccb0 100644
--- a/cad/k40-whisperer/distinfo
+++ b/cad/k40-whisperer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567611773
-SHA256 (K40_Whisperer-0.35_src.zip) = e555dc8de00d88596463d3af61d523b3df3d0beb3385aa38dab2dfbd1cfc1015
-SIZE (K40_Whisperer-0.35_src.zip) = 170723
+TIMESTAMP = 1568044883
+SHA256 (K40_Whisperer-0.36_src.zip) = 29d93d6520b76d70ee1468ed9d85308d7e668fc73a885fbdaa03e5a0da3f9b78
+SIZE (K40_Whisperer-0.36_src.zip) = 170784
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index 3ed2097dbc30..cab56d9663d7 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xcircuit
-PORTVERSION=	3.10.12
+PORTVERSION=	3.10.13
 PORTEPOCH=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://opencircuitdesign.com/xcircuit/archive/ \
@@ -16,7 +16,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		ghostscript:x11,run gmake gnome pkgconfig tar:tgz tk:tea
+USES=		ghostscript:x11,run gmake gnome pkgconfig tar:tgz tk:tea xorg
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index 2257c815c841..f3fa6e6ed88f 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1540589489
-SHA256 (xcircuit-3.10.12.tgz) = 92ea6366fdb58b669b62abc0c5f5662658bbaf80de01b4344b24d1eeeea0a610
-SIZE (xcircuit-3.10.12.tgz) = 1615276
+TIMESTAMP = 1567944966
+SHA256 (xcircuit-3.10.13.tgz) = 769c886531fd5f7da0142115aa67d4eb465a3da127f0ad8b8705c5b53702a2f0
+SIZE (xcircuit-3.10.13.tgz) = 1615156
diff --git a/cad/xcircuit/files/patch-svg.c b/cad/xcircuit/files/patch-svg.c
index e83e1ecf6bb8..566c880bb4c7 100644
--- a/cad/xcircuit/files/patch-svg.c
+++ b/cad/xcircuit/files/patch-svg.c
@@ -1,11 +1,12 @@
---- svg.c.orig	2009-09-23 21:50:37.000000000 +0900
-+++ svg.c	2009-11-09 22:27:21.000000000 +0900
-@@ -8,6 +8,7 @@
+--- svg.c.orig	2019-09-08 12:19:55 UTC
++++ svg.c
+@@ -7,9 +7,7 @@
+ #include <stdlib.h>
+ #include <stdint.h>
  #include <string.h>
+-#ifndef XC_WIN32
+ #include <unistd.h>
+-#endif
  #include <math.h>
  #include <limits.h>
-+#include <unistd.h>
  #include <sys/stat.h>
- #include <sys/wait.h>
- 
-
diff --git a/cad/xcircuit/files/patch-tclxcircuit.c b/cad/xcircuit/files/patch-tclxcircuit.c
deleted file mode 100644
index 161c3d101dca..000000000000
--- a/cad/xcircuit/files/patch-tclxcircuit.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- tclxcircuit.c.orig	2017-04-25 12:36:04 UTC
-+++ tclxcircuit.c
-@@ -8947,7 +8947,7 @@ int defaultscript()
-          sprintf(_STR2, "%s/tcl/%s", SCRIPTS_DIR, STARTUP_FILE);
-          if ((fd = fopen(_STR2, "r")) == NULL) {
-             Wprintf("Failed to open startup script \"%s\"\n", STARTUP_FILE);
--            return;
-+            return TCL_ERROR;
- 	 }
-       }
-    }
diff --git a/chinese/pyzy/Makefile b/chinese/pyzy/Makefile
index bc0f33f94aaf..5a8c84c335f5 100644
--- a/chinese/pyzy/Makefile
+++ b/chinese/pyzy/Makefile
@@ -11,10 +11,6 @@ COMMENT=	Chinese PinYin and Bopomofo conversion library
 
 LICENSE=	LGPL21
 
-BROKEN_aarch64=		fails to compile: constant expression evaluates to -1
-BROKEN_armv6=		fails to compile: constant expression evaluates to -1
-BROKEN_armv7=		fails to compile: constant expression evaluates to -1
-
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 USE_GITHUB=	yes
@@ -36,13 +32,7 @@ OPENCC_DESC=	Use opencc for simplified and traditional Chinese conversion
 OPENCC_CONFIGURE_ENABLE=	opencc
 OPENCC_LIB_DEPENDS=		libopencc.so:chinese/opencc
 
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-CXXFLAGS+=	-Wno-error=narrowing
-.endif
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-1.0.so
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/pyzy/files/patch-src_DoublePinyinContext.cc b/chinese/pyzy/files/patch-src_DoublePinyinContext.cc
new file mode 100644
index 000000000000..566ce454be6b
--- /dev/null
+++ b/chinese/pyzy/files/patch-src_DoublePinyinContext.cc
@@ -0,0 +1,22 @@
+--- src/DoublePinyinContext.cc.orig	2019-09-09 19:45:16 UTC
++++ src/DoublePinyinContext.cc
+@@ -352,7 +352,7 @@ DoublePinyinContext::isPinyin (int i)
+         return NULL;
+     }
+ 
+-    char sheng = ID_TO_SHENG (i);
++    signed char sheng = ID_TO_SHENG (i);
+ 
+     if (sheng == PINYIN_ID_VOID) {
+         return NULL;
+@@ -365,8 +365,8 @@ inline const Pinyin *
+ DoublePinyinContext::isPinyin (int i, int j)
+ {
+     const Pinyin *pinyin = NULL;
+-    char sheng = ID_TO_SHENG (i);
+-    const char *yun = ID_TO_YUNS (j);
++    signed char sheng = ID_TO_SHENG (i);
++    const signed char *yun = ID_TO_YUNS (j);
+ 
+     do {
+         if (sheng == PINYIN_ID_VOID || yun[0] == PINYIN_ID_VOID)
diff --git a/chinese/pyzy/files/patch-src_DoublePinyinTable.h b/chinese/pyzy/files/patch-src_DoublePinyinTable.h
new file mode 100644
index 000000000000..205e4c1201c0
--- /dev/null
+++ b/chinese/pyzy/files/patch-src_DoublePinyinTable.h
@@ -0,0 +1,121 @@
+--- src/DoublePinyinTable.h.orig	2019-09-09 19:30:30 UTC
++++ src/DoublePinyinTable.h
+@@ -26,7 +26,7 @@
+ 
+ #define PINYIN_ID_AEO PINYIN_ID_ZERO
+ 
+-static const char double_pinyin_mspy_sheng[] = {
++static const signed char double_pinyin_mspy_sheng[] = {
+     PINYIN_ID_AEO,  // A
+     PINYIN_ID_B,    // B
+     PINYIN_ID_C,    // C
+@@ -55,7 +55,7 @@ static const char double_pinyin_mspy_sheng[] = {
+     PINYIN_ID_Z,    // Z
+     PINYIN_ID_VOID, // ;
+ };
+-static const char double_pinyin_mspy_yun[][2] = {
++static const signed char double_pinyin_mspy_yun[][2] = {
+     { PINYIN_ID_A,    PINYIN_ID_VOID }, // A
+     { PINYIN_ID_OU,   PINYIN_ID_VOID }, // B
+     { PINYIN_ID_IAO,  PINYIN_ID_VOID }, // C
+@@ -84,7 +84,7 @@ static const char double_pinyin_mspy_yun[][2] = {
+     { PINYIN_ID_EI,   PINYIN_ID_VOID }, // Z
+     { PINYIN_ID_ING,  PINYIN_ID_VOID }, // ;
+ };
+-static const char double_pinyin_zrm_sheng[] = {
++static const signed char double_pinyin_zrm_sheng[] = {
+     PINYIN_ID_AEO,  // A
+     PINYIN_ID_B,    // B
+     PINYIN_ID_C,    // C
+@@ -113,7 +113,7 @@ static const char double_pinyin_zrm_sheng[] = {
+     PINYIN_ID_Z,    // Z
+     PINYIN_ID_VOID, // ;
+ };
+-static const char double_pinyin_zrm_yun[][2] = {
++static const signed char double_pinyin_zrm_yun[][2] = {
+     { PINYIN_ID_A,    PINYIN_ID_VOID }, // A
+     { PINYIN_ID_OU,   PINYIN_ID_VOID }, // B
+     { PINYIN_ID_IAO,  PINYIN_ID_VOID }, // C
+@@ -142,7 +142,7 @@ static const char double_pinyin_zrm_yun[][2] = {
+     { PINYIN_ID_EI,   PINYIN_ID_VOID }, // Z
+     { PINYIN_ID_VOID, PINYIN_ID_VOID }, // ;
+ };
+-static const char double_pinyin_abc_sheng[] = {
++static const signed char double_pinyin_abc_sheng[] = {
+     PINYIN_ID_ZH,   // A
+     PINYIN_ID_B,    // B
+     PINYIN_ID_C,    // C
+@@ -171,7 +171,7 @@ static const char double_pinyin_abc_sheng[] = {
+     PINYIN_ID_Z,    // Z
+     PINYIN_ID_VOID, // ;
+ };
+-static const char double_pinyin_abc_yun[][2] = {
++static const signed char double_pinyin_abc_yun[][2] = {
+     { PINYIN_ID_A,    PINYIN_ID_VOID }, // A
+     { PINYIN_ID_OU,   PINYIN_ID_VOID }, // B
+     { PINYIN_ID_IN,   PINYIN_ID_UAI  }, // C
+@@ -200,7 +200,7 @@ static const char double_pinyin_abc_yun[][2] = {
+     { PINYIN_ID_IAO,  PINYIN_ID_VOID }, // Z
+     { PINYIN_ID_VOID, PINYIN_ID_VOID }, // ;
+ };
+-static const char double_pinyin_zgpy_sheng[] = {
++static const signed char double_pinyin_zgpy_sheng[] = {
+     PINYIN_ID_CH,   // A
+     PINYIN_ID_B,    // B
+     PINYIN_ID_C,    // C
+@@ -229,7 +229,7 @@ static const char double_pinyin_zgpy_sheng[] = {
+     PINYIN_ID_Z,    // Z
+     PINYIN_ID_VOID, // ;
+ };
+-static const char double_pinyin_zgpy_yun[][2] = {
++static const signed char double_pinyin_zgpy_yun[][2] = {
+     { PINYIN_ID_A,    PINYIN_ID_VOID }, // A
+     { PINYIN_ID_IAO,  PINYIN_ID_VOID }, // B
+     { PINYIN_ID_VOID, PINYIN_ID_VOID }, // C
+@@ -258,7 +258,7 @@ static const char double_pinyin_zgpy_yun[][2] = {
+     { PINYIN_ID_OU,   PINYIN_ID_VOID }, // Z
+     { PINYIN_ID_ING,  PINYIN_ID_VOID }, // ;
+ };
+-static const char double_pinyin_pyjj_sheng[] = {
++static const signed char double_pinyin_pyjj_sheng[] = {
+     PINYIN_ID_ZERO, // A
+     PINYIN_ID_B,    // B
+     PINYIN_ID_C,    // C
+@@ -287,7 +287,7 @@ static const char double_pinyin_pyjj_sheng[] = {
+     PINYIN_ID_Z,    // Z
+     PINYIN_ID_VOID, // ;
+ };
+-static const char double_pinyin_pyjj_yun[][2] = {
++static const signed char double_pinyin_pyjj_yun[][2] = {
+     { PINYIN_ID_A,    PINYIN_ID_VOID }, // A
+     { PINYIN_ID_IA,   PINYIN_ID_UA   }, // B
+     { PINYIN_ID_UAN,  PINYIN_ID_VOID }, // C
+@@ -316,7 +316,7 @@ static const char double_pinyin_pyjj_yun[][2] = {
+     { PINYIN_ID_UN,   PINYIN_ID_VOID }, // Z
+     { PINYIN_ID_VOID, PINYIN_ID_VOID }, // ;
+ };
+-static const char double_pinyin_xhe_sheng[] = {
++static const signed char double_pinyin_xhe_sheng[] = {
+     PINYIN_ID_AEO,  // A
+     PINYIN_ID_B,    // B
+     PINYIN_ID_C,    // C
+@@ -345,7 +345,7 @@ static const char double_pinyin_xhe_sheng[] = {
+     PINYIN_ID_Z,    // Z
+     PINYIN_ID_VOID, // ;
+ };
+-static const char double_pinyin_xhe_yun[][2] = {
++static const signed char double_pinyin_xhe_yun[][2] = {
+     { PINYIN_ID_A,    PINYIN_ID_VOID }, // A
+     { PINYIN_ID_IN,   PINYIN_ID_VOID }, // B
+     { PINYIN_ID_AO,   PINYIN_ID_VOID }, // C
+@@ -376,8 +376,8 @@ static const char double_pinyin_xhe_yun[][2] = {
+ };
+ 
+ static const struct {
+-    const char  (&sheng)[27];
+-    const char  (&yun)[27][2];
++    const signed char  (&sheng)[27];
++    const signed char  (&yun)[27][2];
+ } double_pinyin_map [] = {
+     { double_pinyin_mspy_sheng, double_pinyin_mspy_yun },
+     { double_pinyin_zrm_sheng,  double_pinyin_zrm_yun  },
diff --git a/comms/conserver-com/pkg-descr b/comms/conserver-com/pkg-descr
index 16eab6e05259..63e41ce27b9d 100644
--- a/comms/conserver-com/pkg-descr
+++ b/comms/conserver-com/pkg-descr
@@ -11,4 +11,4 @@ train, etc.
 It also does all that client-server stuff so that, assuming you have a network
 connection, you can interact with any of the equipment from home or wherever.
 
-WWW: http://www.conserver.com/
+WWW: https://www.conserver.com/
diff --git a/comms/klog/Makefile b/comms/klog/Makefile
index ddbe0a556c6c..e38536cdb21b 100644
--- a/comms/klog/Makefile
+++ b/comms/klog/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	klog
-PORTVERSION=	0.9.7.2
-PORTREVISION=	1
+PORTVERSION=	0.9.8.1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SAVANNAH
 
@@ -12,10 +11,12 @@ COMMENT=	Simple Qt-based amateur radio logger
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		compiler:c++11-lang gl qmake qt:5
+LIB_DEPENDS=	libhamlib.so:comms/hamlib
+
+USES=		compiler:c++11-lang gl qmake qt:5 xorg
 USE_GL=		gl
 USE_QT=		buildtools_build charts core gui linguisttools_build multimedia network \
-		printsupport sql sql-sqlite3_run widgets
+		printsupport sql sql-sqlite3_run serialport widgets
 
 DESKTOP_ENTRIES=	"KLog" "Simple Amateur Radio Logging Program" \
 		"" "klog" "Network;HamRadio;" \
diff --git a/comms/klog/distinfo b/comms/klog/distinfo
index d619f1fe17dd..cb12811d54aa 100644
--- a/comms/klog/distinfo
+++ b/comms/klog/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555664268
-SHA256 (klog-0.9.7.2.tar.gz) = d60f6d9f56717f99e46757a3912b48b1604d133a410b35b6d56e6f9c8f9d45c5
-SIZE (klog-0.9.7.2.tar.gz) = 2020081
+TIMESTAMP = 1567980395
+SHA256 (klog-0.9.8.1.tar.gz) = 068106b8e8a6aac2f62e7b5c9280a7aa97fe35bb11d37764039df2ab998ad36d
+SIZE (klog-0.9.8.1.tar.gz) = 2064170
diff --git a/comms/openzwave-devel/Makefile b/comms/openzwave-devel/Makefile
index 581131525617..bcef22bec4fe 100644
--- a/comms/openzwave-devel/Makefile
+++ b/comms/openzwave-devel/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Open-zwave - An open-source interface to Z-Wave networks
 
 LICENSE=	LGPL20
 
-USES=		gmake tar:bz2 iconv pkgconfig
+USES=		compiler:c++11-lang gmake iconv pkgconfig tar:bz2
 
 # Manually update this when makefile is updated
 # echo $(git describe --long --tags --dirty 2>/dev/null | sed s/^v//) | awk '{split($$0,a,"-"); print a[2]}'
diff --git a/comms/qrq/Makefile b/comms/qrq/Makefile
index a22ad59c6a0c..313273aeb2dc 100644
--- a/comms/qrq/Makefile
+++ b/comms/qrq/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qrq
-PORTVERSION=	0.3.2
+PORTVERSION=	0.3.3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://fkurz.net/ham/qrq/
 
diff --git a/comms/qrq/distinfo b/comms/qrq/distinfo
index 513cd30574e3..04125c3c2fba 100644
--- a/comms/qrq/distinfo
+++ b/comms/qrq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556007902
-SHA256 (qrq-0.3.2.tar.gz) = f340aa1e99a1c7752fe3600828a6596354485fffdb66a39eaf79227ac24ac43c
-SIZE (qrq-0.3.2.tar.gz) = 132546
+TIMESTAMP = 1567990101
+SHA256 (qrq-0.3.3.tar.gz) = 306ef7f8e0bbb16bdddc58a5d9c357e9b05c1a5c8a52680e5bae093a4064e945
+SIZE (qrq-0.3.3.tar.gz) = 159832
diff --git a/comms/qtel/pkg-plist b/comms/qtel/pkg-plist
index d06c0ff474ce..9e9118c9b955 100644
--- a/comms/qtel/pkg-plist
+++ b/comms/qtel/pkg-plist
@@ -1,21 +1,21 @@
 bin/qtel
 include/svxlink/AsyncQtApplication.h
 %%STATIC%%lib/libasyncqt.a
-lib/libasyncqt.so.1.5.0
-lib/libasyncqt.so.1.5
+lib/libasyncqt.so.1.6.0
+lib/libasyncqt.so.1.6
 lib/libasyncqt.so
 share/applications/qtel.desktop
-share/qtel/translations/qtel_sv.qm
-share/qtel/translations/qtel_de.qm
-share/qtel/translations/qtel_tr.qm
-share/qtel/translations/qtel_nl.qm
-share/qtel/translations/qtel_it.qm
-share/qtel/translations/qtel_uk.qm
-share/qtel/translations/qtel_ru.qm
-share/qtel/translations/qtel_hu.qm
-share/qtel/translations/qtel_es.qm
-share/qtel/translations/qtel_ja.qm
-share/qtel/translations/qtel_fr.qm
-share/qtel/sounds/connect.raw
+%%DATADIR%%/translations/qtel_sv.qm
+%%DATADIR%%/translations/qtel_de.qm
+%%DATADIR%%/translations/qtel_tr.qm
+%%DATADIR%%/translations/qtel_nl.qm
+%%DATADIR%%/translations/qtel_it.qm
+%%DATADIR%%/translations/qtel_uk.qm
+%%DATADIR%%/translations/qtel_ru.qm
+%%DATADIR%%/translations/qtel_hu.qm
+%%DATADIR%%/translations/qtel_es.qm
+%%DATADIR%%/translations/qtel_ja.qm
+%%DATADIR%%/translations/qtel_fr.qm
+%%DATADIR%%/sounds/connect.raw
 share/icons/link.xpm
 man/man1/qtel.1.gz
diff --git a/comms/svxlink/Makefile b/comms/svxlink/Makefile
index bf66c99831b0..d2a74f7ed507 100644
--- a/comms/svxlink/Makefile
+++ b/comms/svxlink/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME?=	svxlink
 PORTVERSION=	19.09.1
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile
index d300e4b207c2..31d744905a8b 100644
--- a/comms/uhd/Makefile
+++ b/comms/uhd/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Ettus Research UHD driver framework
 # is understood and if appropriate, we can add that license here.
 LICENSE=	GPLv3
 
+BROKEN=		fails to package
 BROKEN_powerpc64=	fails to link: undefined reference to boost function
 
 LIB_DEPENDS=	${PY_BOOST} \
diff --git a/comms/yfklog/Makefile b/comms/yfklog/Makefile
index 307aaedb5844..7a14b3dd8b20 100644
--- a/comms/yfklog/Makefile
+++ b/comms/yfklog/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	yfklog
-PORTVERSION=	0.3.5
+PORTVERSION=	0.6.0
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://fkurz.net/ham/yfklog/ \
 		LOCAL/db
@@ -22,9 +22,8 @@ RUN_DEPENDS=	p5-Curses>=0:devel/p5-Curses \
 		p5-Net-FTP-File>=0:net/p5-Net-FTP-File
 
 USES=		perl5
-NO_BUILD=	yes
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+NO_BUILD=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' \
@@ -34,20 +33,21 @@ post-patch:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/yfk ${STAGEDIR}${PREFIX}/bin/yfklog
 	${INSTALL_DATA} ${FILESDIR}/yfklog.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_SCRIPT} ${WRKSRC}/yfksubs.pl ${STAGEDIR}${PREFIX}/libexec/yfksubs.pl
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/yfklog
+	${INSTALL_SCRIPT} ${WRKSRC}/yfksubs.pl ${STAGEDIR}${PREFIX}/share/yfklog/yfksubs.pl
 	${INSTALL_DATA} ${_DISTDIR}/yfk.png ${STAGEDIR}${PREFIX}/share/pixmaps/yfklog.png
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for	f in cty.dat db_calls.sql db_clubs.sql \
 	db_config.sql db_log.sql db_log.sqlite \
 	zweckform3421.lab zweckform3475.lab zweckform3657.lab config
-	@${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/onlinelog
 .for	f in README  search.php test.txt
 	${INSTALL_DATA} ${WRKSRC}/onlinelog/$f ${STAGEDIR}${EXAMPLESDIR}/onlinelog
 .endfor
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/clubs
-.for	f in README hsc2sql.awk hscmember.txt
+.for	f in README
 	${INSTALL_DATA} ${WRKSRC}/clubs/$f ${STAGEDIR}${EXAMPLESDIR}/clubs
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/comms/yfklog/distinfo b/comms/yfklog/distinfo
index 3d0f144b0506..f0c7340a6955 100644
--- a/comms/yfklog/distinfo
+++ b/comms/yfklog/distinfo
@@ -1,4 +1,5 @@
-SHA256 (yfklog/yfklog-0.3.5.tar.gz) = af46983aa8900a8b1379b0302cf7891e29e3c2af662dd96ccd7342dc2a159bbf
-SIZE (yfklog/yfklog-0.3.5.tar.gz) = 128790
+TIMESTAMP = 1568047136
+SHA256 (yfklog/yfklog-0.6.0.tar.gz) = acca744084aebed9591b2b29f899a1193fdfcb453d6e4bad574e648953e87338
+SIZE (yfklog/yfklog-0.6.0.tar.gz) = 520368
 SHA256 (yfklog/yfk.png) = e54bf52aa79ac2a90b8a901d9eea37c04b4a5895daee4736dde65110abb7d49d
 SIZE (yfklog/yfk.png) = 1495
diff --git a/comms/yfklog/files/patch-yfk b/comms/yfklog/files/patch-yfk
deleted file mode 100644
index 15ffe8ce72fa..000000000000
--- a/comms/yfklog/files/patch-yfk
+++ /dev/null
@@ -1,11 +0,0 @@
---- yfk.orig	2008-06-17 17:34:44.000000000 -0400
-+++ yfk	2008-06-17 17:36:27.000000000 -0400
-@@ -28,7 +28,7 @@
- 
- my $prefix="/usr";		
- 
--require "$prefix/share/yfklog/yfksubs.pl";	
-+require "$prefix/libexec/yfksubs.pl";	
- import yfksubs;
- 
- our $yfkver = '0.3.5';	# Program Version
diff --git a/comms/yfklog/pkg-plist b/comms/yfklog/pkg-plist
index 54d5c5118898..c9424fa4a154 100644
--- a/comms/yfklog/pkg-plist
+++ b/comms/yfklog/pkg-plist
@@ -1,6 +1,6 @@
 bin/yfklog
-libexec/yfksubs.pl
 man/man1/yfklog.1.gz
+share/yfklog/yfksubs.pl
 share/pixmaps/yfklog.png
 %%DATADIR%%/config
 %%DATADIR%%/cty.dat
@@ -12,16 +12,14 @@ share/pixmaps/yfklog.png
 %%DATADIR%%/zweckform3421.lab
 %%DATADIR%%/zweckform3475.lab
 %%DATADIR%%/zweckform3657.lab
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clubs/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clubs/hsc2sql.awk
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clubs/hscmember.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/onlinelog/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/onlinelog/search.php
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/onlinelog/test.txt
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/MANUAL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASENOTES
+%%EXAMPLESDIR%%/clubs/README
+%%EXAMPLESDIR%%/onlinelog/README
+%%EXAMPLESDIR%%/onlinelog/search.php
+%%EXAMPLESDIR%%/onlinelog/test.txt
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/CHANGELOG
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/MANUAL
+%%DOCSDIR%%/README
+%%DOCSDIR%%/RELEASENOTES
diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile
index 7f9a6be755de..3bf8e81347dd 100644
--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	osm2pgsql
-PORTVERSION=	0.96.0
-PORTREVISION=	7
+PORTVERSION=	1.0.0
 CATEGORIES=	converters geography
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -19,7 +18,7 @@ LIB_DEPENDS=	libproj.so:graphics/proj \
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
 
-USES=		cmake compiler:c++11-lang lua:53 pgsql
+USES=		cmake compiler:c++11-lang pgsql
 
 CXXFLAGS+=	"-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
 
@@ -29,7 +28,12 @@ PLIST_FILES=	bin/osm2pgsql \
 PORTDOCS=	AUTHORS ChangeLog README.md
 PORTDATA=	*
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS LUAJIT
+
+LUAJIT_DESC=		Build with LuaJIT support
+LUAJIT_CMAKE_BOOL=	WITH_LUAJIT
+LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
+LUAJIT_USES_OFF=	lua:53
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' ${WRKSRC}/CMakeLists.txt
diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo
index d5f975467619..6bc12bd70307 100644
--- a/converters/osm2pgsql/distinfo
+++ b/converters/osm2pgsql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525370298
-SHA256 (openstreetmap-osm2pgsql-0.96.0_GH0.tar.gz) = b6020e77d88772989279a69ae4678e9782989b630613754e483b5192cd39c723
-SIZE (openstreetmap-osm2pgsql-0.96.0_GH0.tar.gz) = 1219163
+TIMESTAMP = 1567801524
+SHA256 (openstreetmap-osm2pgsql-1.0.0_GH0.tar.gz) = e938f7b82a94ab6746da4f0dffdc0f60a55e6a596890e57eb169823e090b7cb9
+SIZE (openstreetmap-osm2pgsql-1.0.0_GH0.tar.gz) = 1222604
diff --git a/databases/Makefile b/databases/Makefile
index fc7ac12fc7aa..befd52766e0b 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -91,6 +91,7 @@
     SUBDIR += frontbase-jdbc
     SUBDIR += gadfly
     SUBDIR += galera
+    SUBDIR += galera26
     SUBDIR += gdbm
     SUBDIR += geoserver-mysql-plugin
     SUBDIR += gigabase
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 531f355454dc..6b78d845961f 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freetds
-PORTVERSION=	1.1.51
+PORTVERSION=	1.1.56
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://www.freetds.org/files/current/ \
diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo
index 5239adda8388..d4b7de57a0f6 100644
--- a/databases/freetds-devel/distinfo
+++ b/databases/freetds-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565555125
-SHA256 (freetds-dev.1.1.51.tar.bz2) = 38501a906c8ab641a2e1c9acbe36892702b8d88669c5a39896f6894156a9574d
-SIZE (freetds-dev.1.1.51.tar.bz2) = 2262275
+TIMESTAMP = 1567764290
+SHA256 (freetds-dev.1.1.56.tar.bz2) = a8d99201eaa32224e75d4e70d519c8a1a2b5c62b37c80c73480ee104470707b9
+SIZE (freetds-dev.1.1.56.tar.bz2) = 2247109
diff --git a/databases/galera26/Makefile b/databases/galera26/Makefile
new file mode 100644
index 000000000000..eec65fd6342b
--- /dev/null
+++ b/databases/galera26/Makefile
@@ -0,0 +1,71 @@
+# Created by: Nicolas Embriz <nbari@tequila.io>
+# $FreeBSD$
+
+PORTNAME=	galera
+PORTVERSION=	26.4.2
+DISTVERSIONPREFIX=	release_
+CATEGORIES=	databases
+PKGNAMESUFFIX=	26
+
+MAINTAINER=	devel@galeracluster.com
+COMMENT=	Synchronous multi-master replication engine
+
+LICENSE=	GPLv2
+
+BROKEN_aarch64=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
+BROKEN_armv6=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
+BROKEN_armv7=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
+NOT_FOR_ARCHS=		i386
+# On i386 older versions of clang produce:
+#   cannot compile this atomic library call yet ... __atomic_add_fetch
+# whereas newer ones generate a call to __atomic_add_fetch which ends up with
+# undefined reference at link time:
+#   undefined reference to `__atomic_fetch_add_8'
+# https://bugs.llvm.org//show_bug.cgi?id=23262
+# https://bugs.llvm.org//show_bug.cgi?id=24908
+# https://tracker.crystax.net/issues/1263
+NOT_FOR_ARCHS_REASON_i386=Uses 64 bit atomics that clang cannot generate on i386
+
+BUILD_DEPENDS=	checkmk:devel/check \
+		${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
+
+USES=		compiler:c++11-lang python:build scons ssl
+
+USE_LDCONFIG=	yes
+
+USE_GITHUB=	yes
+GH_TUPLE?=	codership:galera:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \
+		codership:wsrep-API:75a5f452f2ba07b0f4a3a9a94825fccc71b27398:dummy/wsrep/src
+
+LDFLAGS+=	-lboost_program_options -lboost_system
+MAKE_ARGS+=	revno=${GH_TAGNAME} system_asio=0 tests=0
+
+USE_RC_SUBR=	garb.sh
+
+# Abuse TEST_TARGET to append tests=1 (which is not a target, strictly
+# speaking) at the end of the "scons ..." command so that it overrides
+# tests=0 from ${MAKE_ARGS}. To rerun the tests a second time, remove
+# all *.passed files: find ./work -name *.passed -print -delete
+TEST_TARGET=	deterministic_tests=1 tests=1
+
+PLIST_FILES=	bin/garbd \
+		lib/libgalera.so \
+		lib/libgalera_smm.so
+
+OPTIONS_DEFINE=	BOOSTPOOL BPOSTATIC DEBUG
+
+BOOSTPOOL_DESC=	Use boost pool allocator
+BPOSTATIC_DESC=	Use static boost_program_options
+
+BOOSTPOOL_MAKE_ARGS=	boost_pool=1
+BPOSTATIC_MAKE_ARGS=	bpostatic=${LOCALBASE}/lib/libboost_program_options.a
+DEBUG_MAKE_ARGS=	debug=0
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/garb/garbd ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_LIB} ${WRKSRC}/libgalera_smm.so ${STAGEDIR}${PREFIX}/lib/
+	@(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libgalera_smm.so \
+		libgalera.so)
+
+.include <bsd.port.mk>
diff --git a/databases/galera26/distinfo b/databases/galera26/distinfo
new file mode 100644
index 000000000000..84c51e11c678
--- /dev/null
+++ b/databases/galera26/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1568151779
+SHA256 (codership-galera-release_26.4.2_GH0.tar.gz) = 367ff81e52d2b3c95e8bf2092616f7d1dcfb9723a91fa13e7e5a7b4573f7dcd1
+SIZE (codership-galera-release_26.4.2_GH0.tar.gz) = 3397996
+SHA256 (codership-wsrep-API-75a5f452f2ba07b0f4a3a9a94825fccc71b27398_GH0.tar.gz) = ac782d33d84a874d89bbe4eeb818ab56ae729aee4c491f91892694a2e134c558
+SIZE (codership-wsrep-API-75a5f452f2ba07b0f4a3a9a94825fccc71b27398_GH0.tar.gz) = 50214
diff --git a/databases/galera26/files/garb.sh.in b/databases/galera26/files/garb.sh.in
new file mode 100644
index 000000000000..48cc876f3add
--- /dev/null
+++ b/databases/galera26/files/garb.sh.in
@@ -0,0 +1,95 @@
+#!/bin/sh
+#
+# garb.sh for rc.d usage (c) 2013 Codership Oy
+# $Id$
+
+# PROVIDE: garb
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable Galera Arbitrator Daemon (garbd):
+#  garb_enable (bool):         Set to "NO" by default.
+#                              Set it to "YES" to enable Galera Arbitrator Daemon.
+#  garb_galera_nodes (str):    A space-separated list of node addresses (address[:port]) in the cluster
+#                              (default empty).
+#  garb_galera_group (str):    Galera cluster name, should be the same as on the rest of the nodes.
+#                              (default empty).
+# Optional:
+#  garb_galera_options (str):  Optional Galera internal options string (e.g. SSL settings)
+#                              see http://www.codership.com/wiki/doku.php?id=galera_parameters
+#                              (default empty).
+#  garb_log_file (str):        Log file for garbd (default empty). Optional, by default logs to syslog
+#  garb_pid_file (str):        Custum PID file path and name.
+#                              Default to "/var/run/garb.pid".
+#
+
+. /etc/rc.subr
+
+name="garb"
+rcvar=garb_enable
+
+load_rc_config $name
+
+# set defaults
+: ${garb_enable="NO"}
+: ${garb_galera_nodes=""}
+: ${garb_galera_group=""}
+: ${garb_galera_options=""}
+: ${garb_log_file=""}
+: ${garb_pid_file="/var/run/garbd"}
+
+procname="/usr/local/bin/garbd"
+command="/usr/sbin/daemon"
+command_args="-c -f -u nobody -p $garb_pid_file $procname"
+start_precmd="${name}_prestart"
+#start_cmd="${name}_start"
+start_postcmd="${name}_poststart"
+stop_precmd="${name}_prestop"
+#stop_cmd="${name}_stop"
+#stop_postcmd="${name}_poststop"
+#extra_commands="reload"
+#reload_cmd="${name}_reload"
+#export LD_LIBRARY_PATH=/usr/local/lib/gcc44
+
+garb_prestart()
+{
+	[ "$(id -ur)" != "0" ] && err 4 "root rights are required to start $name"
+	[ -r "$garb_pid_file" ] && err 0 "$procname is already running with PID $(cat $garb_pid_file)"
+	[ -x "$procname" ] || err 5 "$procname is not found"
+
+	# check that node addresses are configured
+	[ -z "$garb_galera_nodes" ] && err 6 "List of garb_galera_nodes is not configured"
+	[ -z "$garb_galera_group" ] && err 6 "garb_galera_group name is not configured"
+
+	GALERA_PORT=${GALERA_PORT:-4567}
+
+	# Concatenate all nodes in the list (for backward compatibility)
+	ADDRESS=
+	for NODE in ${garb_galera_nodes}; do
+		[ -z "$ADDRESS" ] && ADDRESS="$NODE" || ADDRESS="$ADDRESS,$NODE"
+	done
+
+	command_args="$command_args -a gcomm://$ADDRESS"
+	[ -n "$garb_galera_group" ]   && command_args="$command_args -g $garb_galera_group"
+	[ -n "$garb_galera_options" ] && command_args="$command_args -o $garb_galera_options"
+	[ -n "$garb_log_file" ]       && command_args="$command_args -l $garb_log_file"
+	return 0
+}
+
+garb_poststart()
+{
+	local timeout=15
+	while [ ! -f "$garb_pid_file" -a $timeout -gt 0 ]; do
+		timeout=$(( timeout - 1 ))
+		sleep 1
+	done
+	return 0
+}
+
+garb_prestop() {
+	[ "$(id -ur)" != "0" ] && err 4 "root rights are required to stop $name"
+	[ -r $garb_pid_file ] || err 0 ""
+	return 0
+}
+
+run_rc_command "$1"
diff --git a/databases/galera26/pkg-descr b/databases/galera26/pkg-descr
new file mode 100644
index 000000000000..2c21687fe034
--- /dev/null
+++ b/databases/galera26/pkg-descr
@@ -0,0 +1,5 @@
+Galera v26 wsrep provider library for Galera Cluster for MySQL, an
+easy-to-use high-availability solution with high system up-time,
+no data loss, and scalability for future growth.
+
+WWW: https://galeracluster.com/
diff --git a/databases/galera26/pkg-message b/databases/galera26/pkg-message
new file mode 100644
index 000000000000..ee97d9728fc1
--- /dev/null
+++ b/databases/galera26/pkg-message
@@ -0,0 +1,8 @@
+[
+{ type: install
+  message: <<EOM
+Find the Galera Cluster documentation at
+http://galeracluster.com/documentation-webpages/
+EOM
+}
+]
diff --git a/databases/grass7/Makefile b/databases/grass7/Makefile
index 6967b02bcdf6..755b812e4f0a 100644
--- a/databases/grass7/Makefile
+++ b/databases/grass7/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	grass
 PORTVERSION=	7.6.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases geography
 MASTER_SITES=	https://grass.osgeo.org/%SUBDIR%/ \
 		http://grass.cict.fr/%SUBDIR%/ \
@@ -79,12 +79,12 @@ PLIST_SUB=	GRASS_INST_DIR="${GRASS_INST_DIR}" \
 		VERSION="${PORTVERSION}" VERS="${PORTVERSION:C/([0-9]+).([0-9]+)(.*)/\1.\2/}" \
 		VER="${VER}" MAJVER="${PKGNAMESUFFIX}"
 
-OPTIONS_DEFINE=		LAS MOTIF NETCDF PDAL
+OPTIONS_DEFINE=		LAS NETCDF PDAL
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	MYSQL ODBC PGSQL SQLITE
 #OPTIONS_SINGLE=		BLAS
 #OPTIONS_SINGLE_BLAS=	ATLAS NETLIB GOTOBLAS OPENBLAS
-OPTIONS_DEFAULT=	LAS PDAL PGSQL SQLITE NETLIB MOTIF NETCDF MYSQL ODBC
+OPTIONS_DEFAULT=	LAS PDAL PGSQL SQLITE NETLIB NETCDF MYSQL ODBC
 OPTIONS_SUB=		yes
 
 #BLAS_DESC=		BLAS/LAPACK support
@@ -101,9 +101,6 @@ LAS_LIB_DEPENDS=	liblas.so:devel/liblas \
 			libboost_program_options.so:devel/boost-libs \
 			libboost_thread.so:devel/boost-libs \
 			libgeotiff.so:graphics/libgeotiff
-MOTIF_USES=		motif
-MOTIF_USE=		GL=glw
-MOTIF_CONFIGURE_ON=	--with-motif --with-glw
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-mysql \
 			--with-mysql-includes=${LOCALBASE}/include/mysql \
diff --git a/databases/iplike/Makefile b/databases/iplike/Makefile
index 738a456a86f5..3db174081d2c 100644
--- a/databases/iplike/Makefile
+++ b/databases/iplike/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	iplike
-PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTVERSION=	2.1.3
 CATEGORIES=	databases
 MASTER_SITES=	SF/opennms/IPLIKE/stable-2.1/
 
diff --git a/databases/iplike/distinfo b/databases/iplike/distinfo
index c8e597dff9e7..a0abf5fadb6a 100644
--- a/databases/iplike/distinfo
+++ b/databases/iplike/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550939644
-SHA256 (iplike-2.1.1.tar.gz) = 7c68a44e4696c185ee974f7eaa9d4d2f9e68d7827ba417973556fe11a8f8f62d
-SIZE (iplike-2.1.1.tar.gz) = 357850
+TIMESTAMP = 1568026022
+SHA256 (iplike-2.1.3.tar.gz) = 516e6522d03ef8c8345f0d84100a18fac1c4c0959a2ab23c4158e8b36b48a622
+SIZE (iplike-2.1.3.tar.gz) = 357938
diff --git a/databases/mroonga/Makefile b/databases/mroonga/Makefile
index dd7f22c494fe..ee1a355c4f50 100644
--- a/databases/mroonga/Makefile
+++ b/databases/mroonga/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mroonga
-PORTVERSION=	9.05
+PORTVERSION=	9.07
 CATEGORIES=	databases textproc
 MASTER_SITES=	http://packages.groonga.org/source/mroonga/
 
diff --git a/databases/mroonga/distinfo b/databases/mroonga/distinfo
index 20d4557ac514..ebf8615a3ba4 100644
--- a/databases/mroonga/distinfo
+++ b/databases/mroonga/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564783847
-SHA256 (mroonga-9.05.tar.gz) = 3385072732ff89466dfbef1d53b4c4367d28a4636d446178e57dc5afcde1591d
-SIZE (mroonga-9.05.tar.gz) = 2671989
+TIMESTAMP = 1567681564
+SHA256 (mroonga-9.07.tar.gz) = 2e5ba33f042de13923cb307c0be44b14052c30103aa27b0a1f955adbf283bdd3
+SIZE (mroonga-9.07.tar.gz) = 2688119
diff --git a/databases/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile
index eba222b49222..84f3e2273788 100644
--- a/databases/mysqlwsrep56-server/Makefile
+++ b/databases/mysqlwsrep56-server/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	mysqlwsrep
-PORTVERSION?=	5.6.44
+PORTVERSION?=	5.6.45
 DISTVERSIONPREFIX?=	wsrep_
-DISTVERSIONSUFFIX?=	-25.26
+DISTVERSIONSUFFIX?=	-25.27
 PORTREVISION?=	1
 CATEGORIES=	databases ipv6
 PKGNAMESUFFIX=	56-server
diff --git a/databases/mysqlwsrep56-server/distinfo b/databases/mysqlwsrep56-server/distinfo
index 52ef4cab58b1..def4988b5b59 100644
--- a/databases/mysqlwsrep56-server/distinfo
+++ b/databases/mysqlwsrep56-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1563525011
-SHA256 (codership-mysql-wsrep-wsrep_5.6.44-25.26_GH0.tar.gz) = 4a3671ad6eb2a71585e16f9f9acbec14cbf27eead41cf0dc9c2c8bac448120fe
-SIZE (codership-mysql-wsrep-wsrep_5.6.44-25.26_GH0.tar.gz) = 32778456
+TIMESTAMP = 1567524448
+SHA256 (codership-mysql-wsrep-wsrep_5.6.45-25.27_GH0.tar.gz) = 670c622644a9a271db810b193eb7eea3693b5ec6e25c38a26e22cd1f4e551d73
+SIZE (codership-mysql-wsrep-wsrep_5.6.45-25.27_GH0.tar.gz) = 32782117
 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
diff --git a/databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc b/databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc
deleted file mode 100644
index fdbf5eb98562..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-sql-common/client_authentication.cc:87:56: error: comparison between pointer and integer ('char *' and 'int')
-      mysql->options.extension->server_public_key_path != '\0')
-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~~~~
-
-Part of https://github.com/mysql/mysql-server/commit/db1bde79b1b4
-
---- sql-common/client_authentication.cc.orig	2017-09-13 15:49:17 UTC
-+++ sql-common/client_authentication.cc
-@@ -84,7 +84,7 @@ RSA *rsa_init(MYSQL *mysql)
- 
-   if (mysql->options.extension != NULL &&
-       mysql->options.extension->server_public_key_path != NULL &&
--      mysql->options.extension->server_public_key_path != '\0')
-+      mysql->options.extension->server_public_key_path[0] != '\0')
-   {
-     pub_key_file= fopen(mysql->options.extension->server_public_key_path,
-                         "r");
diff --git a/databases/mysqlwsrep56-server/pkg-descr b/databases/mysqlwsrep56-server/pkg-descr
index 7abcf7c7ab63..f7761d10379c 100644
--- a/databases/mysqlwsrep56-server/pkg-descr
+++ b/databases/mysqlwsrep56-server/pkg-descr
@@ -1,3 +1,3 @@
 MySQL built with WSREP patch to support replication using the Galera library.
 
-WWW: http://www.galeracluster.com/
+WWW: https://galeracluster.com/
diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile
index c80ac62e89bd..5ecd139a787b 100644
--- a/databases/mysqlwsrep57-server/Makefile
+++ b/databases/mysqlwsrep57-server/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	mysqlwsrep
-PORTVERSION?=	5.7.26
+PORTVERSION?=	5.7.27
 DISTVERSIONPREFIX?=	wsrep_
-DISTVERSIONSUFFIX?=	-25.18
+DISTVERSIONSUFFIX?=	-25.19
 PORTREVISION?=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES+=	SF/boost/boost/1.59.0:boost
diff --git a/databases/mysqlwsrep57-server/distinfo b/databases/mysqlwsrep57-server/distinfo
index 23599ce4e348..f83bcf78c02f 100644
--- a/databases/mysqlwsrep57-server/distinfo
+++ b/databases/mysqlwsrep57-server/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1563530272
+TIMESTAMP = 1567528044
 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
 SIZE (boost_1_59_0.tar.gz) = 83709983
-SHA256 (codership-mysql-wsrep-wsrep_5.7.26-25.18_GH0.tar.gz) = 91d44918284e2f8e5ec7aabbf15e0c7ccefefd32a7a0206494d16ea8216098fc
-SIZE (codership-mysql-wsrep-wsrep_5.7.26-25.18_GH0.tar.gz) = 54333146
+SHA256 (codership-mysql-wsrep-wsrep_5.7.27-25.19_GH0.tar.gz) = 2d4907d107fe6ea714a34da7b7e86c9cc7e53a445341ca2bb36e79f917266b16
+SIZE (codership-mysql-wsrep-wsrep_5.7.27-25.19_GH0.tar.gz) = 54689025
 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
diff --git a/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt
index ee57c92ab667..115e206da279 100644
--- a/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt
+++ b/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
+--- CMakeLists.txt.orig	2019-08-30 12:42:21 UTC
 +++ CMakeLists.txt
-@@ -691,12 +691,10 @@ IF(UNIX)
+@@ -710,12 +710,10 @@ IF(UNIX)
  ENDIF()
  
  IF(NOT WITHOUT_SERVER)
@@ -13,7 +13,7 @@
    ENDIF(WITH_EMBEDDED_SERVER)
  ENDIF()
  
-@@ -705,8 +703,6 @@ ENDIF()
+@@ -724,8 +722,6 @@ ENDIF()
  ADD_SUBDIRECTORY(scripts)
  
  IF(NOT WITHOUT_SERVER)
@@ -22,7 +22,7 @@
    ADD_SUBDIRECTORY(support-files)
    IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
      ADD_SUBDIRECTORY(internal)
-@@ -765,6 +761,7 @@ ENDIF()
+@@ -784,6 +780,7 @@ ENDIF()
  #
  # RPM installs documentation directly from the source tree
  #
@@ -30,7 +30,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -788,6 +785,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -807,6 +804,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "mysql.info" EXCLUDE
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
diff --git a/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt
index 80a09c5e0515..458979364790 100644
--- a/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt
@@ -1,15 +1,15 @@
---- scripts/CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
+--- scripts/CMakeLists.txt.orig	2019-08-30 12:42:21 UTC
 +++ scripts/CMakeLists.txt
-@@ -324,6 +324,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+@@ -326,6 +326,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
            GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
            STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " ) 
+           SET(${var} "${${var}}-l${lib} " )
 +        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
++          SET(${var} "${${var}}-pthread " )
          ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
+           SET(${var} "${${var}}-l${lib} " )
          ENDIF()
-@@ -409,14 +411,13 @@ ELSE()
+@@ -411,14 +413,13 @@ ELSE()
    # On Unix, most of the files end up in the bin directory
    SET(mysql_config_COMPONENT COMPONENT Development)
  
@@ -25,7 +25,7 @@
        mysqldumpslow
        mysqld_multi
        mysqld_safe
-@@ -460,7 +461,7 @@ ELSE()
+@@ -462,7 +463,7 @@ ELSE()
    FOREACH(file ${BIN_SCRIPTS})
      IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
        CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
diff --git a/databases/mysqlwsrep57-server/pkg-descr b/databases/mysqlwsrep57-server/pkg-descr
index 707e6108346f..03d7408d7141 100644
--- a/databases/mysqlwsrep57-server/pkg-descr
+++ b/databases/mysqlwsrep57-server/pkg-descr
@@ -3,5 +3,5 @@ MySQL is a very fast, multi-threaded, multi-user and robust SQL
 
 Modified to support replication using the Galera library.
 
-WWW: http://www.mysql.com/
-WWW: http://www.galeracluster.com/
+WWW: https://www.mysql.com/
+WWW: https://galeracluster.com/
diff --git a/databases/plpgsql_check/Makefile b/databases/plpgsql_check/Makefile
index 40513e3c09d9..ef27163c0b55 100644
--- a/databases/plpgsql_check/Makefile
+++ b/databases/plpgsql_check/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	plpgsql_check
-PORTVERSION=	1.7.3
+PORTVERSION=	1.7.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER_NODOT}-
diff --git a/databases/plpgsql_check/distinfo b/databases/plpgsql_check/distinfo
index 14d5e803cb92..616986d71b5b 100644
--- a/databases/plpgsql_check/distinfo
+++ b/databases/plpgsql_check/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564577734
-SHA256 (okbob-plpgsql_check-v1.7.3_GH0.tar.gz) = 1f2111963cf79d33f190b2be507dba632ea805ef7ccab363468736b957e05e0c
-SIZE (okbob-plpgsql_check-v1.7.3_GH0.tar.gz) = 219464
+TIMESTAMP = 1568290890
+SHA256 (okbob-plpgsql_check-v1.7.5_GH0.tar.gz) = a5fc3b8575b053f0ff0a30975aa85e86dfcc6d2ca594bf369dc959a0ceb2c7d9
+SIZE (okbob-plpgsql_check-v1.7.5_GH0.tar.gz) = 220412
diff --git a/databases/postgresql-plruby/Makefile b/databases/postgresql-plruby/Makefile
index 507b1f85b937..68c53c83a586 100644
--- a/databases/postgresql-plruby/Makefile
+++ b/databases/postgresql-plruby/Makefile
@@ -16,6 +16,7 @@ LICENSE_COMB=	dual
 DEPRECATED=		Abandonware
 EXPIRATION_DATE=	2019-09-15
 BROKEN_powerpc64=	fails to build: ruby.h:628:35: call to 'ruby_safe_level_2_error' declared with attribute error: $SAFE=2 to 4 are obsolete
+BROKEN_RUBY26=		yes
 
 USES=		uidfix pgsql
 WANT_PGSQL=	server
diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile
index c80722ce7024..268232548e03 100644
--- a/databases/postgresql12-server/Makefile
+++ b/databases/postgresql12-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	postgresql
-DISTVERSION?=	12beta3
+DISTVERSION?=	12beta4
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	0
diff --git a/databases/postgresql12-server/distinfo b/databases/postgresql12-server/distinfo
index ff53c2fe4bf8..df71722f6288 100644
--- a/databases/postgresql12-server/distinfo
+++ b/databases/postgresql12-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565174257
-SHA256 (postgresql/postgresql-12beta3.tar.bz2) = e4a4079c75bf049349c70a02f705beecbb8263684ff2d4e13a582a3ff50332aa
-SIZE (postgresql/postgresql-12beta3.tar.bz2) = 20698785
+TIMESTAMP = 1568295853
+SHA256 (postgresql/postgresql-12beta4.tar.bz2) = 422f5e2ad999126f505b44c2d56abe726a08ed7e50e2d268e9906c879831805f
+SIZE (postgresql/postgresql-12beta4.tar.bz2) = 20710205
diff --git a/databases/postgresql12-server/pkg-plist-client b/databases/postgresql12-server/pkg-plist-client
index d636f517296e..1900e6dfcad3 100644
--- a/databases/postgresql12-server/pkg-plist-client
+++ b/databases/postgresql12-server/pkg-plist-client
@@ -1210,6 +1210,11 @@ man/man7/WITH.7.gz
 %%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-12.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-12.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/psql-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/ecpg-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/ecpglib7-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/libpq5-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_config-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/psql-12.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/ecpg-12.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/ecpglib7-12.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/pg_config-12.mo
diff --git a/databases/postgresql12-server/pkg-plist-server b/databases/postgresql12-server/pkg-plist-server
index 862be134189b..98bbfcdb9e87 100644
--- a/databases/postgresql12-server/pkg-plist-server
+++ b/databases/postgresql12-server/pkg-plist-server
@@ -883,6 +883,11 @@ lib/libpgcommon.a
 %%NLS%%share/locale/tr/LC_MESSAGES/pg_waldump-12.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-12.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/postgres-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_controldata-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_ctl-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_fsync-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_timing-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/plpgsql-12.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/initdb-12.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/pg_archivecleanup-12.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/pg_basebackup-12.mo
diff --git a/databases/pspg/Makefile b/databases/pspg/Makefile
index 8078b8480680..ffe7101ebb47 100644
--- a/databases/pspg/Makefile
+++ b/databases/pspg/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pspg
-DISTVERSION=	1.7.2
+DISTVERSION=	2.0.2
 CATEGORIES=	databases
 
 MAINTAINER=	dg@syrec.org
diff --git a/databases/pspg/distinfo b/databases/pspg/distinfo
index d3433044eee9..43c729bea7ca 100644
--- a/databases/pspg/distinfo
+++ b/databases/pspg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567371014
-SHA256 (okbob-pspg-1.7.2_GH0.tar.gz) = 8865da5672cb160a5609e0e6f3de0377b3e25e287311a54c0290edbb56f367f1
-SIZE (okbob-pspg-1.7.2_GH0.tar.gz) = 1316356
+TIMESTAMP = 1568217796
+SHA256 (okbob-pspg-2.0.2_GH0.tar.gz) = 7d3b1b2467c004302128d794243824e75b84182790e3e3815dc1b9403ecc691e
+SIZE (okbob-pspg-2.0.2_GH0.tar.gz) = 1328279
diff --git a/databases/pspg/pkg-descr b/databases/pspg/pkg-descr
index 3004b2e4d975..5956d33dcfc6 100644
--- a/databases/pspg/pkg-descr
+++ b/databases/pspg/pkg-descr
@@ -1,5 +1,6 @@
-pspg is a small specialized pager designed to be used with psql. It know how
-to work with tabular data, has the ability to freeze first few rows/columns
-and configurable colors.
+pspg is a small specialized pager designed to work with tables. Its primary
+purpose is to work as PostgreSQL pager, but MySQL is supported too. Main
+features include the ability to freeze first few rows/columns, possibility to
+sort data by specified numeric column and configurable color themes.
 
 WWW: https://github.com/okbob/pspg
diff --git a/databases/py-marshmallow-sqlalchemy/Makefile b/databases/py-marshmallow-sqlalchemy/Makefile
index 5d95e94078ad..d7bbed9d269f 100644
--- a/databases/py-marshmallow-sqlalchemy/Makefile
+++ b/databases/py-marshmallow-sqlalchemy/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	marshmallow-sqlalchemy
-PORTVERSION=	0.18.0
+PORTVERSION=	0.19.0
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,8 +13,8 @@ COMMENT=	SQLAlchemy integration with the marshmallow serialization library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}marshmallow>=2.0.0:devel/py-marshmallow@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0.9.7:databases/py-sqlalchemy12@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}marshmallow>=2.15.2:devel/py-marshmallow@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.2.0:databases/py-sqlalchemy12@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
diff --git a/databases/py-marshmallow-sqlalchemy/distinfo b/databases/py-marshmallow-sqlalchemy/distinfo
index d474d8f8c17d..2d0853de8828 100644
--- a/databases/py-marshmallow-sqlalchemy/distinfo
+++ b/databases/py-marshmallow-sqlalchemy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567784699
-SHA256 (marshmallow-sqlalchemy-0.18.0.tar.gz) = 6698354f882919fb232e881bb6f99bdf8a86a76a709105bff826551f53c0b6c5
-SIZE (marshmallow-sqlalchemy-0.18.0.tar.gz) = 47928
+TIMESTAMP = 1567842466
+SHA256 (marshmallow-sqlalchemy-0.19.0.tar.gz) = b53ae45f6f113ae5433211786129ecb6eaf3646a3a333e769eeb22593b6dbe9c
+SIZE (marshmallow-sqlalchemy-0.19.0.tar.gz) = 47312
diff --git a/databases/py-python-swiftclient/Makefile b/databases/py-python-swiftclient/Makefile
index 5c007f5d32dd..66f05e2f19be 100644
--- a/databases/py-python-swiftclient/Makefile
+++ b/databases/py-python-swiftclient/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	python-swiftclient
-PORTVERSION=	3.7.0
+PORTVERSION=	3.8.0
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/databases/py-python-swiftclient/distinfo b/databases/py-python-swiftclient/distinfo
index 199ac06246aa..775ad44cd5fd 100644
--- a/databases/py-python-swiftclient/distinfo
+++ b/databases/py-python-swiftclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552154238
-SHA256 (python-swiftclient-3.7.0.tar.gz) = 1a11268a8fa2483b8b172e3bc12ce7fcef5e8790fc301c50a5f3e9dc668a7019
-SIZE (python-swiftclient-3.7.0.tar.gz) = 190256
+TIMESTAMP = 1565088494
+SHA256 (python-swiftclient-3.8.0.tar.gz) = 107a9d5356663365a9f7c0b3a2b55da97a0a9ba7f10da2319b3972481510f33d
+SIZE (python-swiftclient-3.8.0.tar.gz) = 190385
diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile
index 3df7364a6b9b..3dc3c3f059e9 100644
--- a/databases/ruby-bdb/Makefile
+++ b/databases/ruby-bdb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bdb
 PORTVERSION=	0.6.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases ruby
 MASTER_SITES=	ftp://ftp.idaemons.org/pub/distfiles/ruby/ \
 		http://idaemons.org/distfiles/ruby/ \
@@ -16,8 +16,11 @@ COMMENT=	Ruby interface to Oracle Berkeley DB revision 2 or later
 
 LICENSE=	RUBY
 
+BUILD_DEPENDS=	rubygem-rdoc>=0.a:devel/rubygem-rdoc
+
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
+USES=		bdb shebangfix tar:bzip2
 USE_RUBY=		yes
 USE_RUBY_EXTCONF=	yes
 USE_RUBY_RDOC=		yes
@@ -34,7 +37,6 @@ SHAREMODE=	0644
 PLIST_FILES=	%%RUBY_SITEARCHLIBDIR%%/bdb.so
 PORTDOCS=	*
 PORTEXAMPLES=	*
-USES=		bdb shebangfix tar:bzip2
 SHEBANG_FILES=	examples/record.rb \
 		examples/recno.rb \
 		examples/zeroc.rb \
diff --git a/deskutils/Makefile b/deskutils/Makefile
index af02135bca2d..92d83ed6feac 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -232,6 +232,7 @@
     SUBDIR += sugarcrm
     SUBDIR += synapse
     SUBDIR += syncthing-gtk
+    SUBDIR += syncthingtray
     SUBDIR += sysctlview
     SUBDIR += systempreferences
     SUBDIR += taskcoach
diff --git a/deskutils/calcurse/Makefile b/deskutils/calcurse/Makefile
index 3e6a92de558a..0f72d8233516 100644
--- a/deskutils/calcurse/Makefile
+++ b/deskutils/calcurse/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	calcurse
-PORTVERSION=	4.3.0
+PORTVERSION=	4.5.0
 CATEGORIES=	deskutils
-MASTER_SITES=	http://calcurse.org/files/
+MASTER_SITES=	https://calcurse.org/files/
 
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Text-based calendar and scheduling application
@@ -18,7 +18,9 @@ OPTIONS_SUB=	yes
 
 USES=		gmake ncurses shebangfix
 SHEBANG_FILES=	contrib/caldav/calcurse-caldav \
-		contrib/caldav/calcurse-caldav.py
+		contrib/caldav/calcurse-caldav.py \
+		contrib/vdir/calcurse-vdir \
+		contrib/vdir/calcurse-vdir.py
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-asciidoc
 
diff --git a/deskutils/calcurse/distinfo b/deskutils/calcurse/distinfo
index 0c1f6bf2f02a..e0c626e6f91b 100644
--- a/deskutils/calcurse/distinfo
+++ b/deskutils/calcurse/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517490109
-SHA256 (calcurse-4.3.0.tar.gz) = 31ecc3dc09e1e561502b4c94f965ed6b167c03e9418438c4a7ad5bad2c785f9a
-SIZE (calcurse-4.3.0.tar.gz) = 597490
+TIMESTAMP = 1568036850
+SHA256 (calcurse-4.5.0.tar.gz) = c372ef16abcacb33a1aca99d0d4eba7c5cc8121fa96360f9d6edc0506e655cee
+SIZE (calcurse-4.5.0.tar.gz) = 657976
diff --git a/deskutils/calcurse/pkg-descr b/deskutils/calcurse/pkg-descr
index 007a9d517178..5e412d5a1d3e 100644
--- a/deskutils/calcurse/pkg-descr
+++ b/deskutils/calcurse/pkg-descr
@@ -4,4 +4,4 @@ A configurable notification system reminds user of upcoming deadlines,
 and the curses based interface can be customized to suit user needs.
 All of the commands are documented within an online help system.
 
-WWW: http://calcurse.org/
+WWW: https://calcurse.org/
diff --git a/deskutils/calcurse/pkg-plist b/deskutils/calcurse/pkg-plist
index 8c11f7254e5e..8194e564545f 100644
--- a/deskutils/calcurse/pkg-plist
+++ b/deskutils/calcurse/pkg-plist
@@ -1,6 +1,7 @@
 bin/calcurse
 bin/calcurse-caldav
 bin/calcurse-upgrade
+bin/calcurse-vdir
 man/man1/calcurse.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/add.txt
 %%PORTDOCS%%%%DOCSDIR%%/config.txt
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 8d033b6e500f..d5b66d4e4a25 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	calibre
-PORTVERSION=	3.47.1
+PORTVERSION=	3.48.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 
diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo
index 62a105c3cdcd..0dc4287d3aa1 100644
--- a/deskutils/calibre/distinfo
+++ b/deskutils/calibre/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567407078
-SHA256 (calibre-3.47.1.tar.xz) = b309933f295cddf05553c60012d8c0376aae732a729688f646466cca55369f9e
-SIZE (calibre-3.47.1.tar.xz) = 38710008
+TIMESTAMP = 1568357689
+SHA256 (calibre-3.48.0.tar.xz) = 024528f0f913c78e121fb34beb3dae8dba3686f2334422c6450808796042950c
+SIZE (calibre-3.48.0.tar.xz) = 38777408
diff --git a/deskutils/py-todoman/Makefile b/deskutils/py-todoman/Makefile
index 974107b7b613..9c9f03936ede 100644
--- a/deskutils/py-todoman/Makefile
+++ b/deskutils/py-todoman/Makefile
@@ -1,38 +1,38 @@
 # $FreeBSD$
 
-PORTNAME=		todoman
-DISTVERSION=	3.5.0
-CATEGORIES=		deskutils python
+PORTNAME=	todoman
+DISTVERSION=	3.6.0
+CATEGORIES=	deskutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=		andreas@bilke.org
-COMMENT=		Simple CalDAV-based todo manager
+MAINTAINER=	andreas@bilke.org
+COMMENT=	Simple CalDAV-based todo manager
 
-LICENSE=		ISCL
+LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>1.12.0:devel/py-setuptools_scm@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}click>=6.0:devel/py-click@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}click-log>=0.2.1:devel/py-click-log@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}dateutil>=2.6:devel/py-dateutil@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}humanize>=0.5.1:devel/py-humanize@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}icalendar>=4.0.3:devel/py-icalendar@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}parsedatetime>=2.4:devel/py-parsedatetime@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}tabulate>=0.8.2:devel/py-tabulate@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}urwid>=2.0.1:devel/py-urwid@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0:deskutils/py-vdirsyncer@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${PY_FLAVOR}
-
-USES=			python:3.5+
-USE_PYTHON=		autoplist distutils
-
-NO_ARCH=		yes
-
-PLIST_FILES=	share/zsh/site-functions/_todoman \
-				${EXAMPLESDIR}/todoman.conf.sample
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>0:devel/py-atomicwrites@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click-log>=0.2.1:devel/py-click-log@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>=7.0&&<8.0:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}humanize>0:devel/py-humanize@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}icalendar>=4.0.3:devel/py-icalendar@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}parsedatetime>0:devel/py-parsedatetime@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}urwid>0:devel/py-urwid@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}vdirsyncer>0:deskutils/py-vdirsyncer@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR}
+
+USES=		python:3.5+
+USE_PYTHON=	autoplist distutils
+
+NO_ARCH=	yes
+
+PLIST_FILES=	${EXAMPLESDIR}/todoman.conf.sample \
+		share/zsh/site-functions/_todoman
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
diff --git a/deskutils/py-todoman/distinfo b/deskutils/py-todoman/distinfo
index a6ce40fb52ab..02b480b4f611 100644
--- a/deskutils/py-todoman/distinfo
+++ b/deskutils/py-todoman/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542740061
-SHA256 (todoman-3.5.0.tar.gz) = 89032887051b164527b90cfb947eb5162dd8b8bb64d9abf1e906b8c86f933814
-SIZE (todoman-3.5.0.tar.gz) = 61484
+TIMESTAMP = 1568129088
+SHA256 (todoman-3.6.0.tar.gz) = 60425aa59b7e6f576fb4cec18ec59d1f00fa7c4546cd49f861d27511578212b0
+SIZE (todoman-3.6.0.tar.gz) = 61901
diff --git a/deskutils/syncthingtray/Makefile b/deskutils/syncthingtray/Makefile
new file mode 100644
index 000000000000..b8d3db1bfeaa
--- /dev/null
+++ b/deskutils/syncthingtray/Makefile
@@ -0,0 +1,69 @@
+# $FreeBSD$
+
+PORTNAME=	syncthingtray
+PORTVERSION=	0.10.0
+DISTVERSIONPREFIX=	v
+CATEGORIES=	deskutils
+
+MAINTAINER=	swills@FreeBSD.org
+COMMENT=	Qt 5-based Syncthing tray application
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKDIR}/syncthingtray/LICENSE
+
+BUILD_DEPENDS=	${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/kf5-extra-cmake-modules \
+		doxygen:devel/doxygen
+LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
+		libboost_regex.so:devel/boost-libs
+
+USES=		cmake:insource iconv kde:5 qt:5
+
+USE_GITHUB=	nodefault
+GH_TUPLE=	Martchus:${PORTNAME}:${DISTVERSIONPREFIX}${DISTVERSION}:syncthingtray/../syncthingtray \
+		Martchus:cpp-utilities:v5.0.0:cpputilities/../c++utilities \
+		Martchus:qtutilities:v6.0.0:qtutilities/../qtutilities \
+		Martchus:subdirs:f3b12f9:subdirs/../subdirs
+
+USE_KDE=	plasma-framework
+USE_QT=		concurrent core dbus declarative gui location network \
+		printsupport qdbus quickcontrols2 svg webchannel webengine \
+		widgets x11extras buildtools_build doc_build linguist_build \
+		qmake_build
+
+CMAKE_OFF=	USE_STANDARD_FILESYSTEM
+
+CONFIGURE_WRKSRC=	${WRKDIR}
+BUILD_WRKSRC=		${WRKDIR}
+INSTALL_WRKSRC=		${WRKDIR}
+CMAKE_SOURCE_PATH=	${WRKDIR}/subdirs/syncthingtray
+
+post-install:
+	${RM} -r \
+		${STAGEDIR}${PREFIX}/include/c++utilities \
+		${STAGEDIR}${PREFIX}/include/qtutilities \
+		${STAGEDIR}${PREFIX}/lib/libc++utilities.a \
+		${STAGEDIR}${PREFIX}/lib/libqtutilities.a \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/c++utilities.pc \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/qtutilities.pc \
+		${STAGEDIR}${PREFIX}/share/c++utilities \
+		${STAGEDIR}${PREFIX}/share/qtutilities \
+		${STAGEDIR}${PREFIX}/share/syncthingconnector/cmake \
+		${STAGEDIR}${PREFIX}/share/syncthingfileitemaction/cmake \
+		${STAGEDIR}${PREFIX}/share/syncthingmodel/cmake \
+		${STAGEDIR}${PREFIX}/share/syncthingplasmoid/cmake \
+		${STAGEDIR}${PREFIX}/share/syncthingwidgets/cmake \
+		${STAGEDIR}${PREFIX}/include/syncthingconnector \
+		${STAGEDIR}${PREFIX}/include/syncthingmodel \
+		${STAGEDIR}${PREFIX}/include/syncthingwidgets \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/syncthingconnector.pc \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/syncthingfileitemaction.pc \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/syncthingmodel.pc \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/syncthingplasmoid.pc \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/syncthingwidgets.pc \
+		${STAGEDIR}${PREFIX}/lib/libsyncthingconnector.a \
+		${STAGEDIR}${PREFIX}/lib/libsyncthingmodel.a \
+		${STAGEDIR}${PREFIX}/lib/libsyncthingwidgets.a \
+		${STAGEDIR}${QT_PLUGINDIR} \
+		${STAGEDIR}${QT_LIBDIR}
+
+.include <bsd.port.mk>
diff --git a/deskutils/syncthingtray/distinfo b/deskutils/syncthingtray/distinfo
new file mode 100644
index 000000000000..a619554de113
--- /dev/null
+++ b/deskutils/syncthingtray/distinfo
@@ -0,0 +1,9 @@
+TIMESTAMP = 1568388680
+SHA256 (Martchus-syncthingtray-v0.10.0_GH0.tar.gz) = 89a87dc6eb38fcb75f22cb696257300603bdfda460732db4deb545dab19d6942
+SIZE (Martchus-syncthingtray-v0.10.0_GH0.tar.gz) = 1414409
+SHA256 (Martchus-cpp-utilities-v5.0.0_GH0.tar.gz) = 3fda34ea7794a67b0fd454e39827d7733eb76dde0443b6f9b3fd0c41116ffdca
+SIZE (Martchus-cpp-utilities-v5.0.0_GH0.tar.gz) = 151785
+SHA256 (Martchus-qtutilities-v6.0.0_GH0.tar.gz) = fca8352d43a689264574daebcd4d59d6f296112e16122e5509fbe46ed3976692
+SIZE (Martchus-qtutilities-v6.0.0_GH0.tar.gz) = 99292
+SHA256 (Martchus-subdirs-f3b12f9_GH0.tar.gz) = b4879e20a46ea6b24558264dbd9f20072de94fa32b71b4d60e0d39523aae769f
+SIZE (Martchus-subdirs-f3b12f9_GH0.tar.gz) = 8834
diff --git a/deskutils/syncthingtray/pkg-descr b/deskutils/syncthingtray/pkg-descr
new file mode 100644
index 000000000000..9709490dc126
--- /dev/null
+++ b/deskutils/syncthingtray/pkg-descr
@@ -0,0 +1,8 @@
+Syncthing Tray
+
+Qt 5-based tray application
+Dolphin/Plasma integration
+command-line interface
+Qt-ish C++ interface to control Syncthing
+
+WWW: https://github.com/Martchus/syncthingtray
diff --git a/deskutils/syncthingtray/pkg-plist b/deskutils/syncthingtray/pkg-plist
new file mode 100644
index 000000000000..93144eeb9b4d
--- /dev/null
+++ b/deskutils/syncthingtray/pkg-plist
@@ -0,0 +1,45 @@
+bin/syncthingctl
+bin/syncthingtray
+share/applications/syncthingtray.desktop
+share/bash-completion/completions/syncthingctl
+share/bash-completion/completions/syncthingtray
+share/icons/hicolor/scalable/apps/syncthingtray.svg
+share/kservices5/plasma-applet-martchus.syncthingplasmoid.desktop
+share/kservices5/syncthingfileitemaction.desktop
+share/metainfo/syncthingtray.appdata.xml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/ButtonShadow.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/CompactRepresentation.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/DetailItem.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/DetailView.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/DevicesPage.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/DirectoriesPage.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/DownloadsPage.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/FullRepresentation.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/IconLabel.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/StatisticsView.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/TinyButton.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/TinyButtonStyle.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/ToolTipTrigger.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/ToolTipView.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/TopLevelItem.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/TopLevelView.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/contents/ui/main.qml
+share/plasma/plasmoids/martchus.syncthingplasmoid/metadata.desktop
+share/plasma/plasmoids/martchus.syncthingplasmoid/metadata.json
+share/syncthingconnector/translations/syncthingconnector_cs_CZ.qm
+share/syncthingconnector/translations/syncthingconnector_de_DE.qm
+share/syncthingconnector/translations/syncthingconnector_en_US.qm
+share/syncthingfileitemaction/translations/syncthingfileitemaction_cs_CZ.qm
+share/syncthingfileitemaction/translations/syncthingfileitemaction_de_DE.qm
+share/syncthingfileitemaction/translations/syncthingfileitemaction_en_US.qm
+share/syncthingmodel/translations/syncthingmodel_cs_CZ.qm
+share/syncthingmodel/translations/syncthingmodel_de_DE.qm
+share/syncthingmodel/translations/syncthingmodel_en_US.qm
+share/syncthingplasmoid/translations/syncthingplasmoid_de_DE.qm
+share/syncthingplasmoid/translations/syncthingplasmoid_en_US.qm
+%%DATADIR%%/translations/syncthingtray_cs_CZ.qm
+%%DATADIR%%/translations/syncthingtray_de_DE.qm
+%%DATADIR%%/translations/syncthingtray_en_US.qm
+share/syncthingwidgets/translations/syncthingwidgets_cs_CZ.qm
+share/syncthingwidgets/translations/syncthingwidgets_de_DE.qm
+share/syncthingwidgets/translations/syncthingwidgets_en_US.qm
diff --git a/deskutils/xmaddressbook/Makefile b/deskutils/xmaddressbook/Makefile
index 118d0d9a18d3..19784aa7d7bc 100644
--- a/deskutils/xmaddressbook/Makefile
+++ b/deskutils/xmaddressbook/Makefile
@@ -10,6 +10,9 @@ MASTER_SITES=	XCONTRIB/office
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11/Motif-based addressbook program
 
+DEPRECATED=	Deprecated upstream
+EXPIRATION_DATE=2019-10-15
+
 USES=		imake motif tar:Z
 USE_XORG=	ice sm x11 xext xi xp xt oldx
 WRKSRC=		${WRKDIR}/xmaddressbook
diff --git a/devel/Makefile b/devel/Makefile
index 40815a1ef922..111078f4ef37 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1446,6 +1446,7 @@
     SUBDIR += linux-c7-libsigc++20
     SUBDIR += linux-c7-libthai
     SUBDIR += linux-c7-libunwind
+    SUBDIR += linux-c7-make
     SUBDIR += linux-c7-nspr
     SUBDIR += linux-c7-qt
     SUBDIR += linux-c7-sdl12
@@ -4154,9 +4155,12 @@
     SUBDIR += py-azure-batch
     SUBDIR += py-azure-cosmos
     SUBDIR += py-azure-datalake-store
+    SUBDIR += py-azure-functions-devops-build
     SUBDIR += py-azure-graphrbac
     SUBDIR += py-azure-keyvault
     SUBDIR += py-azure-mgmt-advisor
+    SUBDIR += py-azure-mgmt-apimanagement
+    SUBDIR += py-azure-mgmt-appconfiguration
     SUBDIR += py-azure-mgmt-applicationinsights
     SUBDIR += py-azure-mgmt-authorization
     SUBDIR += py-azure-mgmt-batch
@@ -4174,25 +4178,30 @@
     SUBDIR += py-azure-mgmt-datalake-analytics
     SUBDIR += py-azure-mgmt-datalake-store
     SUBDIR += py-azure-mgmt-datamigration
+    SUBDIR += py-azure-mgmt-deploymentmanager
     SUBDIR += py-azure-mgmt-devtestlabs
     SUBDIR += py-azure-mgmt-dns
     SUBDIR += py-azure-mgmt-eventgrid
     SUBDIR += py-azure-mgmt-eventhub
     SUBDIR += py-azure-mgmt-hdinsight
+    SUBDIR += py-azure-mgmt-imagebuilder
     SUBDIR += py-azure-mgmt-iotcentral
     SUBDIR += py-azure-mgmt-iothub
     SUBDIR += py-azure-mgmt-iothubprovisioningservices
     SUBDIR += py-azure-mgmt-keyvault
     SUBDIR += py-azure-mgmt-kusto
     SUBDIR += py-azure-mgmt-loganalytics
+    SUBDIR += py-azure-mgmt-managedservices
     SUBDIR += py-azure-mgmt-managementgroups
     SUBDIR += py-azure-mgmt-maps
     SUBDIR += py-azure-mgmt-marketplaceordering
     SUBDIR += py-azure-mgmt-media
     SUBDIR += py-azure-mgmt-monitor
     SUBDIR += py-azure-mgmt-msi
+    SUBDIR += py-azure-mgmt-netapp
     SUBDIR += py-azure-mgmt-network
     SUBDIR += py-azure-mgmt-policyinsights
+    SUBDIR += py-azure-mgmt-privatedns
     SUBDIR += py-azure-mgmt-rdbms
     SUBDIR += py-azure-mgmt-recoveryservices
     SUBDIR += py-azure-mgmt-recoveryservicesbackup
@@ -4252,6 +4261,7 @@
     SUBDIR += py-buildbot-worker
     SUBDIR += py-buildbot-www
     SUBDIR += py-bullet3
+    SUBDIR += py-cabby
     SUBDIR += py-cached-property
     SUBDIR += py-cachetools
     SUBDIR += py-calendar
@@ -4396,6 +4406,7 @@
     SUBDIR += py-extremes
     SUBDIR += py-ezpyinline
     SUBDIR += py-fabric
+    SUBDIR += py-fabric1
     SUBDIR += py-fabric3
     SUBDIR += py-fam
     SUBDIR += py-fastcache
@@ -4442,6 +4453,7 @@
     SUBDIR += py-funcsigs
     SUBDIR += py-functools32
     SUBDIR += py-funcy
+    SUBDIR += py-furl
     SUBDIR += py-fusefs
     SUBDIR += py-fusepy
     SUBDIR += py-future
@@ -4847,6 +4859,7 @@
     SUBDIR += py-pylru-cache
     SUBDIR += py-pymarc
     SUBDIR += py-pymaven-patch
+    SUBDIR += py-pymisp
     SUBDIR += py-pympler
     SUBDIR += py-pymtbl
     SUBDIR += py-pyopencl
@@ -5108,6 +5121,7 @@
     SUBDIR += py-tzlocal
     SUBDIR += py-u-msgpack-python
     SUBDIR += py-ua_parser
+    SUBDIR += py-uhid-freebsd
     SUBDIR += py-ujson
     SUBDIR += py-uncompyle2
     SUBDIR += py-unicodecsv
@@ -5136,6 +5150,7 @@
     SUBDIR += py-virtualenvwrapper
     SUBDIR += py-visitor
     SUBDIR += py-voluptuous
+    SUBDIR += py-vsts
     SUBDIR += py-vsts-cd-manager
     SUBDIR += py-vulture
     SUBDIR += py-wadllib
@@ -5567,6 +5582,8 @@
     SUBDIR += rubygem-aws-sdk-pinpointsmsvoice
     SUBDIR += rubygem-aws-sdk-polly
     SUBDIR += rubygem-aws-sdk-pricing
+    SUBDIR += rubygem-aws-sdk-qldb
+    SUBDIR += rubygem-aws-sdk-qldbsession
     SUBDIR += rubygem-aws-sdk-quicksight
     SUBDIR += rubygem-aws-sdk-ram
     SUBDIR += rubygem-aws-sdk-rds
@@ -5836,6 +5853,7 @@
     SUBDIR += rubygem-grape-swagger
     SUBDIR += rubygem-grape11
     SUBDIR += rubygem-grape_logging
+    SUBDIR += rubygem-grape_logging181
     SUBDIR += rubygem-graphiql-rails
     SUBDIR += rubygem-graphql
     SUBDIR += rubygem-graphql-docs
diff --git a/devel/R-cran-hms/Makefile b/devel/R-cran-hms/Makefile
index 1f50a37dca8b..fc891dab089d 100644
--- a/devel/R-cran-hms/Makefile
+++ b/devel/R-cran-hms/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hms
-PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTVERSION=	0.5.1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/devel/R-cran-hms/distinfo b/devel/R-cran-hms/distinfo
index 4df8ccf95c5a..8ba7a68be68e 100644
--- a/devel/R-cran-hms/distinfo
+++ b/devel/R-cran-hms/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563088358
-SHA256 (hms_0.5.0.tar.gz) = a87872665c3bf3901f597d78c152e7805f7129e4dbe27397051de4cf1a76561b
-SIZE (hms_0.5.0.tar.gz) = 136036
+TIMESTAMP = 1567917093
+SHA256 (hms_0.5.1.tar.gz) = 6d336efef276ada8a565cd72dc5dd89274be0426cb288a1f51b4a0bbafeb8cec
+SIZE (hms_0.5.1.tar.gz) = 136031
diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile
index 961b6c84e130..e1f10c6a6927 100644
--- a/devel/android-tools-adb/Makefile
+++ b/devel/android-tools-adb/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	android-tools-adb
 DISTVERSIONPREFIX=	platform-tools-
-DISTVERSION?=	29.0.2
+DISTVERSION?=	29.0.3
 PORTREVISION?=	0
 CATEGORIES=	devel comms
 
@@ -12,8 +12,7 @@ COMMENT=	Android debug bridge command line tool
 LICENSE=	APACHE20
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	aosp-mirror
-GH_PROJECT=	platform_system_core
+GH_TUPLE=	aosp-mirror:platform_system_core:${DISTVERSIONFULL}
 
 CONFLICTS_INSTALL?=	${PORTNAME}-devel-*
 
@@ -37,9 +36,7 @@ OPTIONS_SUB=	yes
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}"
 .endif
 
-BASH_GH_ACCOUNT=	mbrubeck:bashcomp
-BASH_GH_PROJECT=	android-completion:bashcomp
-BASH_GH_TAGNAME=	c1b0656:bashcomp
+BASH_GH_TUPLE=		mbrubeck:android-completion:c1b0656:bashcomp
 BASH_PLIST_FILES=	etc/bash_completion.d/adb
 BASH_VARS=		LICENSE+=MIT LICENSE_COMB=multi
 
@@ -55,7 +52,7 @@ TEST_BUILD_DEPENDS+=	googlemock>=1.6.0:devel/googlemock \
 TEST_ALL_TARGET=	adb_test
 
 TEST_PYTHON_DESC=	${TEST_DESC:S/tests/python &/}
-TEST_PYTHON_GH_PROJECT=	platform_development:development
+TEST_PYTHON_GH_TUPLE=	aosp-mirror:platform_development:${DISTVERSIONFULL}:development
 TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
 TEST_PYTHON_USES=	python:2.7,build
 
diff --git a/devel/android-tools-adb/distinfo b/devel/android-tools-adb/distinfo
index f731528f4fe4..3c4bd1880c70 100644
--- a/devel/android-tools-adb/distinfo
+++ b/devel/android-tools-adb/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1563393249
-SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.2_GH0.tar.gz) = cd0f6fe386f07d7aef98cf46a41cef0aa1e8cebfe06f434bb5c88777de4c2643
-SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.2_GH0.tar.gz) = 59909027
+TIMESTAMP = 1565662258
+SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.3_GH0.tar.gz) = f2938ab5d206f5d4e075afba1a3e32fc26656bb439b6208200bef0ea5bae77eb
+SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.3_GH0.tar.gz) = 61252755
 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
 SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
-SHA256 (aosp-mirror-platform_development-platform-tools-29.0.2_GH0.tar.gz) = aa40c37fd1cbb1c4a93a0c4ba26468bb47a5837826cb94423f5ca161dd85f118
-SIZE (aosp-mirror-platform_development-platform-tools-29.0.2_GH0.tar.gz) = 56861217
+SHA256 (aosp-mirror-platform_development-platform-tools-29.0.3_GH0.tar.gz) = 58a291b441d7ab9a0ec1224ce3e383feff5ec67940de901d544af8fdfaf5687b
+SIZE (aosp-mirror-platform_development-platform-tools-29.0.3_GH0.tar.gz) = 56856358
diff --git a/devel/android-tools-adb/files/Makefile b/devel/android-tools-adb/files/Makefile
index daae11ae98bd..676164ed9754 100644
--- a/devel/android-tools-adb/files/Makefile
+++ b/devel/android-tools-adb/files/Makefile
@@ -63,13 +63,11 @@ SRCS+= chrono_utils.cpp
 SRCS+= file.cpp
 SRCS+= logging.cpp
 SRCS+= parsenetaddress.cpp
-SRCS+= quick_exit.cpp
 SRCS+= stringprintf.cpp
 SRCS+= strings.cpp
 TEST_SRCS+= file_test.cpp
 TEST_SRCS+= logging_test.cpp
 TEST_SRCS+= parsenetaddress_test.cpp
-TEST_SRCS+= quick_exit_test.cpp
 TEST_SRCS+= stringprintf_test.cpp
 TEST_SRCS+= strings_test.cpp
 TEST_SRCS+= test_main.cpp
@@ -90,28 +88,14 @@ SRCS+= socket_local_client_unix.cpp
 SRCS+= socket_local_server_unix.cpp
 SRCS+= socket_network_client_unix.cpp
 SRCS+= ../libcutils/sockets.cpp
-SRCS+= load_file.cpp
 SRCS+= threads.cpp
 # DragonFly, NetBSD, OpenBSD
 CPPFLAGS.sockets.cpp+= -o ${.TARGET}
 
-# required by base/file.cpp
-.PATH: ${.CURDIR}/../liblog
-SRCS+= config_read.cpp
-SRCS+= config_write.cpp
-SRCS+= fake_log_device.cpp
-SRCS+= fake_writer.cpp
-SRCS+= logger_lock.cpp
-SRCS+= logger_name.cpp
-SRCS+= logger_write.cpp
-SRCS+= logprint.cpp
-SRCS+= stderr_write.cpp
-
 CPPFLAGS+= -DPLATFORM_TOOLS_VERSION="\"${VERSION:U0.0.0}\""
 CPPFLAGS+= -DADB_HOST=1
 CPPFLAGS+= -Doff64_t=off_t
 CPPFLAGS+= -Dlseek64=lseek
-CPPFLAGS+= -DFAKE_LOG_DEVICE=1
 CPPFLAGS+= -I${.CURDIR}
 CPPFLAGS+= -I${.CURDIR}/client
 CPPFLAGS+= -I${.CURDIR}/../include
diff --git a/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp b/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp
index c201a86849dc..e9fa97dc6ed4 100644
--- a/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp
+++ b/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp
@@ -1,6 +1,23 @@
---- adb/bugreport_test.cpp.orig	2016-09-28 18:07:09 UTC
+--- adb/bugreport_test.cpp.orig	2019-08-13 02:10:58 UTC
 +++ adb/bugreport_test.cpp
-@@ -40,6 +40,7 @@ using ::testing::internal::CaptureStdout
+@@ -14,8 +14,6 @@
+  * limitations under the License.
+  */
+ 
+-#include "bugreport.h"
+-
+ #include <gmock/gmock.h>
+ #include <gtest/gtest.h>
+ 
+@@ -24,6 +22,7 @@
+ 
+ #include "sysdeps.h"
+ #include "adb_utils.h"
++#include "bugreport.h"
+ 
+ using ::testing::_;
+ using ::testing::Action;
+@@ -40,6 +39,7 @@ using ::testing::internal::CaptureStdout;
  using ::testing::internal::GetCapturedStderr;
  using ::testing::internal::GetCapturedStdout;
  
@@ -8,7 +25,7 @@
  // Empty function so tests don't need to be linked against file_sync_service.cpp, which requires
  // SELinux and its transitive dependencies...
  bool do_sync_pull(const std::vector<const char*>& srcs, const char* dst, bool copy_attrs,
-@@ -47,6 +48,7 @@ bool do_sync_pull(const std::vector<cons
+@@ -47,6 +47,7 @@ bool do_sync_pull(const std::vector<const char*>& srcs
      ADD_FAILURE() << "do_sync_pull() should have been mocked";
      return false;
  }
diff --git a/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp b/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp
new file mode 100644
index 000000000000..675ec42dba69
--- /dev/null
+++ b/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp
@@ -0,0 +1,11 @@
+--- adb/client/adb_install.cpp.orig	2019-08-13 02:10:58 UTC
++++ adb/client/adb_install.cpp
+@@ -214,7 +214,7 @@ static int install_app_streamed(int argc, const char**
+             return 1;
+         }
+ 
+-#ifdef __linux__
++#if !defined(__APPLE__) && !defined(_WIN32)
+         posix_fadvise(local_fd.get(), 0, 0, POSIX_FADV_SEQUENTIAL | POSIX_FADV_NOREUSE);
+ #endif
+ 
diff --git a/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h b/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h
deleted file mode 100644
index bf3766d9bf05..000000000000
--- a/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- adb/fdevent/fdevent.h.orig	2019-07-17 19:54:09 UTC
-+++ adb/fdevent/fdevent.h
-@@ -20,6 +20,7 @@
- #include <stddef.h>
- #include <stdint.h>
- 
-+#include <atomic> // std::atomic<bool> for GCC
- #include <chrono>
- #include <deque>
- #include <functional>
diff --git a/devel/android-tools-adb/files/patch-adb_types.h b/devel/android-tools-adb/files/patch-adb_types.h
deleted file mode 100644
index a4b9794ad1d3..000000000000
--- a/devel/android-tools-adb/files/patch-adb_types.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- adb/types.h.orig	2019-07-17 19:54:09 UTC
-+++ adb/types.h
-@@ -16,6 +16,7 @@
- 
- #pragma once
- 
-+#include <cstring> // memcpy for GCC
- #include <algorithm>
- #include <deque>
- #include <memory>
diff --git a/devel/android-tools-fastboot/Makefile b/devel/android-tools-fastboot/Makefile
index 19fc3921c5fe..52ea8c351355 100644
--- a/devel/android-tools-fastboot/Makefile
+++ b/devel/android-tools-fastboot/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	android-tools-fastboot
-DISTVERSIONPREFIX=	android-
-DISTVERSION?=	9.0.0_r3
-PORTREVISION?=	3
+DISTVERSIONPREFIX=	platform-tools-
+DISTVERSION?=	29.0.3
+PORTREVISION?=	0
 CATEGORIES=	devel sysutils
 MASTER_SITES=	https://salsa.debian.org/android-tools-team/android-tools/raw/706e754/debian/:manpage
 DISTFILES=	fastboot.1:manpage
@@ -16,29 +16,25 @@ LICENSE=	APACHE20 BSD2CLAUSE
 LICENSE_COMB=	multi
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	aosp-mirror jbeich:extras
-GH_PROJECT=	platform_system_core platform_system_extras:extras
+GH_TUPLE=	aosp-mirror:platform_system_core:${DISTVERSIONFULL} \
+		jbeich:platform_system_extras:${DISTVERSIONFULL}:extras/extras \
+		jbeich:platform_system_tools_mkbootimg:${DISTVERSIONFULL}:mkbootimg/mkbootimg
 
 CONFLICTS_INSTALL?=	${PORTNAME}-devel-*
 
-USES=		compiler:c++11-lib pkgconfig uidfix
+USES=		compiler:c++17-lang pkgconfig ssl uidfix
 BUILD_WRKSRC=	${WRKSRC}/fastboot
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
-CPPFLAGS+=	-D_GLIBCXX_USE_C99 # XXX ports/193528
 MAKEFILE?=	${.CURDIR}/files/Makefile
 MAKE_ENV=	BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \
 		FILESDIR="${DOCSDIR}" \
-		VERSION="${SDK_REVISION}-0 ${GH_REVISION}-android" \
+		VERSION="${DISTVERSION}${DISTVERSIONSUFFIX}" \
 		MANDIR="${PREFIX}/man/man"
 PLIST_FILES=	bin/fastboot \
 		man/man1/fastboot.1.gz
 PORTDOCS=	*
 SUB_FILES=	pkg-message
 
-# Generated by "make update-revision" for "fastboot --version"
-SDK_REVISION?=	28.0.0
-GH_REVISION=	${DISTVERSIONSUFFIX:U0fac9018f238:S/-g//}
-
 OPTIONS_DEFINE=	BASH DOCS
 OPTIONS_SUB=	yes
 
@@ -46,9 +42,7 @@ OPTIONS_SUB=	yes
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}"
 .endif
 
-BASH_GH_ACCOUNT=	mbrubeck:bashcomp
-BASH_GH_PROJECT=	android-completion:bashcomp
-BASH_GH_TAGNAME=	c1b0656:bashcomp
+BASH_GH_TUPLE=		mbrubeck:android-completion:c1b0656:bashcomp
 BASH_PLIST_FILES=	etc/bash_completion.d/fastboot
 BASH_VARS=		LICENSE+=MIT
 
@@ -57,33 +51,10 @@ DOCS_MAKE_ARGS_OFF=	FILES="" FILESDIR=""
 post-extract:
 	@${CP} ${_DISTDIR}/${DISTFILES:M*\:manpage:C/:.*//} \
 		${BUILD_WRKSRC}
-# Adjust paths relative to core
-	@(cd ${WRKSRC_extras} && ${COPYTREE_SHARE} . ${WRKSRC})
 
 post-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES:H}
 	${INSTALL_DATA} ${WRKSRC_bashcomp}/android \
 		${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES}
 
-update-revision:
-	@${REINPLACE_CMD} -i '' -e "/^SDK_REVISION?=/s/=.*/=	$$(\
-		${FETCH_CMD} -qo- \
-			https://github.com/${GH_ACCOUNT}/platform_build/raw/${GH_TAGNAME}/core/version_defaults.mk | \
-			${SED} -n 's/^[[:space:]]*PLATFORM_SDK_VERSION := //p' \
-		).0.0/" \
-		${.CURDIR}/Makefile
-# https://developer.github.com/v3/repos/commits/#get-a-single-commit
-# Pretend to be curl(1) for pretty-printed JSON to help parse with sed(1)
-	@${REINPLACE_CMD} -i '' -e "/^GH_REVISION=/s/:U[^}:]*/:U$$(\
-		${SETENV} HTTP_USER_AGENT=curl ${FETCH_CMD} -qo- \
-			https://api.github.com/repos/${GH_ACCOUNT}/${GH_PROJECT}/commits/${GH_TAGNAME} | \
-			${SED} -n '/sha/ { s/.*\"\([0-9a-f]\{12\}\).*/\1/p; q; }' \
-		)/" \
-		${.CURDIR}/Makefile
-
 .include <bsd.port.mk>
-
-# XXX Work around !target(makesum)
-.ifndef DISTVERSIONSUFFIX
-makesum:	update-revision
-.endif
diff --git a/devel/android-tools-fastboot/distinfo b/devel/android-tools-fastboot/distinfo
index 18cb9d5bc13c..971811b7908c 100644
--- a/devel/android-tools-fastboot/distinfo
+++ b/devel/android-tools-fastboot/distinfo
@@ -1,9 +1,11 @@
-TIMESTAMP = 1529542722
+TIMESTAMP = 1565662258
 SHA256 (fastboot.1) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
 SIZE (fastboot.1) = 5906
-SHA256 (aosp-mirror-platform_system_core-android-9.0.0_r3_GH0.tar.gz) = b9de23465b304432aa2b585aa66c6bf4841b177f2139b75ca5adc5d917e0ecd6
-SIZE (aosp-mirror-platform_system_core-android-9.0.0_r3_GH0.tar.gz) = 27484684
-SHA256 (jbeich-platform_system_extras-android-9.0.0_r3_GH0.tar.gz) = d82c4576bed24bfe701bb8c781714fa70365c03aed93cf4777407215de4d672d
-SIZE (jbeich-platform_system_extras-android-9.0.0_r3_GH0.tar.gz) = 211722695
+SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.3_GH0.tar.gz) = f2938ab5d206f5d4e075afba1a3e32fc26656bb439b6208200bef0ea5bae77eb
+SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.3_GH0.tar.gz) = 61252755
+SHA256 (jbeich-platform_system_extras-platform-tools-29.0.3_GH0.tar.gz) = 342433c834f260b5d55c5dc0b98ef27aea18feb50e1fff5e09fdb846c0f75a51
+SIZE (jbeich-platform_system_extras-platform-tools-29.0.3_GH0.tar.gz) = 210790583
+SHA256 (jbeich-platform_system_tools_mkbootimg-platform-tools-29.0.3_GH0.tar.gz) = 9c2f9ab0006969613a48b5a529674c0d79784b830479c28f802aa2a1916cdf53
+SIZE (jbeich-platform_system_tools_mkbootimg-platform-tools-29.0.3_GH0.tar.gz) = 6620
 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
 SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
diff --git a/devel/android-tools-fastboot/files/Makefile b/devel/android-tools-fastboot/files/Makefile
index b75861435383..abbb88e6bfff 100644
--- a/devel/android-tools-fastboot/files/Makefile
+++ b/devel/android-tools-fastboot/files/Makefile
@@ -3,15 +3,14 @@
 PROG_CXX=fastboot
 BINDIR?=/usr/bin
 FILESDIR?=${DOCDIR}/${PROG}
-VERSION?=0.0.0-0
 
 FILES=	README.md
 
 SRCS+=	bootimg_utils.cpp
-SRCS+=	engine.cpp
 SRCS+=	fastboot.cpp
+SRCS+=	fastboot_driver.cpp
 SRCS+=	../fastboot/fs.cpp
-SRCS+=	protocol.cpp
+SRCS+=	main.cpp
 SRCS+=	socket.cpp
 SRCS+=	tcp.cpp
 SRCS+=	udp.cpp
@@ -20,18 +19,33 @@ SRCS+=	util.cpp
 .PATH: ${EXTRADIR}
 SRCS+=	usb_freebsd.cpp
 
-# required by fastboot
-.PATH: ${.CURDIR}/../adb
-SRCS+=	diagnose_usb.cpp
-
 # required by fastboot, diagnose_usb and libziparchive
 .PATH: ${.CURDIR}/../base
 SRCS+=	errors_unix.cpp
 SRCS+=	file.cpp
 SRCS+=	logging.cpp
+SRCS+=	mapped_file.cpp
 SRCS+=	parsenetaddress.cpp
 SRCS+=	stringprintf.cpp
 SRCS+=	strings.cpp
+SRCS+=	threads.cpp
+
+# required by fastboot
+.PATH: ${.CURDIR}/../diagnose_usb
+SRCS+=	diagnose_usb.cpp
+
+# required by fs_mgr/liblp
+.PATH: ${.CURDIR}/../extras/ext4_utils
+SRCS+=	ext4_sb.cpp
+SRCS+=	ext4_utils.cpp
+
+# required by fastboot
+.PATH: ${.CURDIR}/../fs_mgr/liblp
+SRCS+=	images.cpp
+SRCS+=	partition_opener.cpp
+SRCS+=	reader.cpp
+SRCS+=	utility.cpp
+SRCS+=	writer.cpp
 
 # required by fastboot
 .PATH: ${.CURDIR}/../libcutils
@@ -45,36 +59,30 @@ CPPFLAGS.sockets.cpp+=	-o ${.TARGET}
 
 # required by base and libutils
 .PATH:	${.CURDIR}/../liblog
-SRCS+=	config_read.c
-SRCS+=	config_write.c
-SRCS+=	fake_log_device.c
-SRCS+=	fake_writer.c
-SRCS+=	local_logger.c
-SRCS+=	logger_lock.c
-SRCS+=	logger_name.c
-SRCS+=	logger_write.c
-SRCS+=	logprint.c
-SRCS+=	stderr_write.c
-SRCS+=	test_utils.cpp
+SRCS+=	config_read.cpp
+SRCS+=	config_write.cpp
+SRCS+=	fake_log_device.cpp
+SRCS+=	fake_writer.cpp
+SRCS+=	logger_lock.cpp
+SRCS+=	logger_name.cpp
+SRCS+=	logger_write.cpp
+SRCS+=	logprint.cpp
+SRCS+=	stderr_write.cpp
 
 # required by fastboot
 .PATH:	${.CURDIR}/../libsparse
-SRCS+=	backed_block.c
-SRCS+=	output_file.c
-SRCS+=	sparse.c
-SRCS+=	sparse_crc32.c
-SRCS+=	sparse_err.c
+SRCS+=	backed_block.cpp
+SRCS+=	output_file.cpp
+SRCS+=	sparse.cpp
+SRCS+=	sparse_crc32.cpp
+SRCS+=	sparse_err.cpp
 SRCS+=	sparse_read.cpp
 
-# required by libziparchive
-.PATH: ${.CURDIR}/../libutils
-SRCS+=	FileMap.cpp
-
 # required by fastboot
 .PATH:	${.CURDIR}/../libziparchive
 SRCS+=	zip_archive.cc
 
-CPPFLAGS+=	-DFASTBOOT_VERSION="\"${VERSION}\""
+CPPFLAGS+=	-DPLATFORM_TOOLS_VERSION="\"${VERSION:U0.0.0}\""
 CPPFLAGS+=	-Doff64_t=off_t
 CPPFLAGS+=	-Dftruncate64=ftruncate
 CPPFLAGS+=	-Dlseek64=lseek
@@ -83,21 +91,25 @@ CPPFLAGS+=	-Dpread64=pread
 CPPFLAGS+=	-DFAKE_LOG_DEVICE=1
 CPPFLAGS+=	-I${.CURDIR}
 CPPFLAGS+=	-I${.CURDIR}/../include
-CPPFLAGS+=	-I${.CURDIR}/../adb
 CPPFLAGS+=	-I${.CURDIR}/../mkbootimg/include/bootimg
 CPPFLAGS+=	-I${.CURDIR}/../base/include
+CPPFLAGS+=	-I${.CURDIR}/../diagnose_usb/include
+CPPFLAGS+=	-I${.CURDIR}/../extras/ext4_utils/include
+CPPFLAGS+=	-I${.CURDIR}/../fs_mgr/liblp/include
 CPPFLAGS+=	-I${.CURDIR}/../libsparse/include
 CPPFLAGS+=	-I${.CURDIR}/../libziparchive/include
 CPPFLAGS+=	${CPPFLAGS.${.IMPSRC:T}}
+CPPFLAGS+=	$$(${PKG_CONFIG} libcrypto --cflags 2>/dev/null)
 CPPFLAGS+=	$$(${PKG_CONFIG} libusb-1.0 --cflags 2>/dev/null)
 CXXFLAGS+=	-D__STDC_LIMIT_MACROS # DragonFly
-CXXFLAGS+=	-std=gnu++11
+CXXFLAGS+=	-std=gnu++17
 
 .ifndef COMPILE.c
 CFLAGS+=	${CPPFLAGS}
 CXXFLAGS+=	${CPPFLAGS}
 .endif
 
+LDADD+=	$$(${PKG_CONFIG} libcrypto --libs 2>/dev/null || echo -lcrypto)
 LDADD+=	$$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb)
 LDADD+=	-lz \-lpthread
 DPADD+=	${LIBPTHREAD} ${LIBUSB} ${LIBZ}
diff --git a/devel/android-tools-fastboot/files/patch-adb_sysdeps.h b/devel/android-tools-fastboot/files/patch-adb_sysdeps.h
deleted file mode 100644
index 8ca18724c86a..000000000000
--- a/devel/android-tools-fastboot/files/patch-adb_sysdeps.h
+++ /dev/null
@@ -1,43 +0,0 @@
---- adb/sysdeps.h.orig	2015-09-05 00:01:27 UTC
-+++ adb/sysdeps.h
-@@ -61,11 +61,13 @@
- #endif
- #endif
- 
--#ifdef _WIN32
--
-+#if !defined(__clang__) || __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 7)
- // Clang-only nullability specifiers
- #define _Nonnull
- #define _Nullable
-+#endif
-+
-+#ifdef _WIN32
- 
- #include <ctype.h>
- #include <direct.h>
-@@ -401,6 +401,11 @@ typedef std::unique_ptr<HANDLE, handle_d
- 
- #include <string>
- 
-+#if defined(__Bitrig__) || defined(__DragonFly__) || \
-+    defined(__FreeBSD__) || defined(__OpenBSD__)
-+#include <pthread_np.h>
-+#endif
-+
- #define OS_PATH_SEPARATORS "/"
- #define OS_PATH_SEPARATOR '/'
- #define OS_PATH_SEPARATOR_STR "/"
-@@ -627,6 +632,12 @@ static __inline__ bool adb_thread_create
- static __inline__ int adb_thread_setname(const std::string& name) {
- #ifdef __APPLE__
-     return pthread_setname_np(name.c_str());
-+#elif defined(__Bitrig__) || defined(__DragonFly__) || \
-+      defined(__FreeBSD__) || defined(__OpenBSD__)
-+    pthread_set_name_np(pthread_self(), name.c_str());
-+    return 0;
-+#elif defined(__NetBSD__)
-+    return pthread_setname_np(pthread_self(), "%s", (void*)name.c_str());
- #else
-     const char *s = name.c_str();
- 
diff --git a/devel/android-tools-fastboot/files/patch-base_errors__unix.cpp b/devel/android-tools-fastboot/files/patch-base_errors__unix.cpp
deleted file mode 100644
index f9ccad0a59b5..000000000000
--- a/devel/android-tools-fastboot/files/patch-base_errors__unix.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/errors_unix.cpp.orig	2016-02-20 02:39:51 UTC
-+++ base/errors_unix.cpp
-@@ -16,7 +16,7 @@
- 
- #include "android-base/errors.h"
- 
--#include <errno.h>
-+#include <string.h>
- 
- namespace android {
- namespace base {
diff --git a/devel/android-tools-fastboot/files/patch-base_file.cpp b/devel/android-tools-fastboot/files/patch-base_file.cpp
index ca20501150a6..9129decebfbf 100644
--- a/devel/android-tools-fastboot/files/patch-base_file.cpp
+++ b/devel/android-tools-fastboot/files/patch-base_file.cpp
@@ -1,17 +1,14 @@
---- base/file.cpp.orig	2017-06-20 10:50:27 UTC
+--- base/file.cpp.orig	2019-07-17 19:54:09 UTC
 +++ base/file.cpp
-@@ -19,6 +19,10 @@
- #include <errno.h>
+@@ -20,6 +20,7 @@
  #include <fcntl.h>
+ #include <ftw.h>
  #include <libgen.h>
-+#include <limits.h> // PATH_MAX
-+#include <stdio.h> // BUFSIZ
-+#include <stdlib.h> // realpath
-+#include <string.h> // strerror
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -36,6 +39,9 @@
++#include <limits.h> // PATH_MAX for GCC
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -35,6 +36,9 @@
  #if defined(__APPLE__)
  #include <mach-o/dyld.h>
  #endif
@@ -19,9 +16,9 @@
 +#include <sys/sysctl.h>
 +#endif
  #if defined(_WIN32)
+ #include <direct.h>
  #include <windows.h>
- #define O_CLOEXEC O_NOINHERIT
-@@ -251,6 +258,23 @@ std::string GetExecutablePath() {
+@@ -421,6 +425,23 @@ std::string GetExecutablePath() {
    if (result == 0 || result == sizeof(path) - 1) return "";
    path[PATH_MAX - 1] = 0;
    return path;
diff --git a/devel/android-tools-fastboot/files/patch-base_include_android-base_logging.h b/devel/android-tools-fastboot/files/patch-base_include_android-base_logging.h
index 7f170c3f521b..7e536840b840 100644
--- a/devel/android-tools-fastboot/files/patch-base_include_android-base_logging.h
+++ b/devel/android-tools-fastboot/files/patch-base_include_android-base_logging.h
@@ -1,11 +1,22 @@
---- base/include/android-base/logging.h.orig	2015-09-29 18:07:07 UTC
+--- base/include/android-base/logging.h.orig	2019-07-17 19:54:09 UTC
 +++ base/include/android-base/logging.h
-@@ -25,6 +25,8 @@
- #endif
- #endif
- 
-+#include <errno.h>
-+
- #include <functional>
- #include <memory>
- #include <ostream>
+@@ -350,7 +350,7 @@ struct LogAbortAfterFullExpr {
+ // DCHECKs are debug variants of CHECKs only enabled in debug builds. Generally
+ // CHECK should be used unless profiling identifies a CHECK as being in
+ // performance critical code.
+-#if defined(NDEBUG) && !defined(__clang_analyzer__)
++#if defined(NDEBUG) && !defined(__clang_analyzer__) || !defined(__ANDROID__)
+ static constexpr bool kEnableDChecks = false;
+ #else
+ static constexpr bool kEnableDChecks = true;
+@@ -486,8 +486,9 @@ namespace std {  // NOLINT(cert-dcl58-cpp)
+ #pragma clang diagnostic ignored "-Wgcc-compat"
+ #define OSTREAM_STRING_POINTER_USAGE_WARNING \
+     __attribute__((diagnose_if(true, "Unexpected logging of string pointer", "warning")))
++OSTREAM_STRING_POINTER_USAGE_WARNING // GCC
+ inline std::ostream& operator<<(std::ostream& stream, const std::string* string_pointer)
+-    OSTREAM_STRING_POINTER_USAGE_WARNING {
++{
+   return stream << static_cast<const void*>(string_pointer);
+ }
+ #pragma clang diagnostic pop
diff --git a/devel/android-tools-fastboot/files/patch-base_parsenetaddress.cpp b/devel/android-tools-fastboot/files/patch-base_parsenetaddress.cpp
deleted file mode 100644
index b640a75485fa..000000000000
--- a/devel/android-tools-fastboot/files/patch-base_parsenetaddress.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- base/parsenetaddress.cpp.orig	2016-02-20 02:39:51 UTC
-+++ base/parsenetaddress.cpp
-@@ -16,6 +16,7 @@
- 
- #include "android-base/parsenetaddress.h"
- 
-+#include <stdio.h> // sscanf
- #include <algorithm>
- 
- #include "android-base/stringprintf.h"
diff --git a/devel/android-tools-fastboot/files/patch-base_logging.cpp b/devel/android-tools-fastboot/files/patch-base_threads.cpp
index c85502208e86..df22b968c34a 100644
--- a/devel/android-tools-fastboot/files/patch-base_logging.cpp
+++ b/devel/android-tools-fastboot/files/patch-base_threads.cpp
@@ -1,25 +1,7 @@
---- base/logging.cpp.orig	2016-08-08 21:10:17 UTC
-+++ base/logging.cpp
-@@ -25,7 +25,7 @@
- #include <time.h>
- 
- // For getprogname(3) or program_invocation_short_name.
--#if defined(__ANDROID__) || defined(__APPLE__)
-+#if !defined(_WIN32) && !defined(__GLIBC__)
- #include <stdlib.h>
- #elif defined(__GLIBC__)
- #include <errno.h>
-@@ -35,6 +35,8 @@
- #include <sys/uio.h>
- #endif
- 
-+#include <cstring> // strrchr
-+#include <cstdio>  // fprintf
- #include <iostream>
- #include <limits>
- #include <sstream>
-@@ -71,6 +72,16 @@
- #include <unistd.h>
+--- base/threads.cpp.orig	2019-07-17 19:54:09 UTC
++++ base/threads.cpp
+@@ -25,6 +25,16 @@
+ #include <syscall.h>
  #elif defined(_WIN32)
  #include <windows.h>
 +#elif defined(__DragonFly__) || defined(__FreeBSD__)
@@ -34,8 +16,8 @@
 +#include <stdint.h>
  #endif
  
- #if defined(_WIN32)
-@@ -88,6 +97,16 @@ static thread_id GetThreadId() {
+ namespace android {
+@@ -41,6 +51,16 @@ uint64_t GetThreadId() {
    return syscall(__NR_gettid);
  #elif defined(_WIN32)
    return GetCurrentThreadId();
diff --git a/devel/android-tools-fastboot/files/patch-extras_ext4__utils_ext4__utils.cpp b/devel/android-tools-fastboot/files/patch-extras_ext4__utils_ext4__utils.cpp
new file mode 100644
index 000000000000..802be5e45ca5
--- /dev/null
+++ b/devel/android-tools-fastboot/files/patch-extras_ext4__utils_ext4__utils.cpp
@@ -0,0 +1,47 @@
+--- extras/ext4_utils/ext4_utils.cpp.orig	2019-08-13 02:10:50 UTC
++++ extras/ext4_utils/ext4_utils.cpp
+@@ -32,8 +32,16 @@
+ 
+ #if defined(__linux__)
+ #include <linux/fs.h>
+-#elif defined(__APPLE__) && defined(__MACH__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
++  || (defined(__APPLE__) && defined(__MACH__))
+ #include <sys/disk.h>
++#elif defined(__sun)
++#include <sys/dkio.h>
++#elif defined(__Bitrig__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#include <sys/disklabel.h>
++#include <sys/dkio.h>
++#elif defined(__DragonFly__)
++#include <sys/diskslice.h>
+ #endif
+ 
+ int force = 0;
+@@ -206,10 +214,24 @@ u64 get_block_device_size(int fd)
+ 	u64 size = 0;
+ 	int ret;
+ 
+-#if defined(__linux__)
++#if defined(BLKGETSIZE64)
+ 	ret = ioctl(fd, BLKGETSIZE64, &size);
+-#elif defined(__APPLE__) && defined(__MACH__)
++#elif defined(DKIOCGETBLOCKCOUNT)
+ 	ret = ioctl(fd, DKIOCGETBLOCKCOUNT, &size);
++#elif defined(DIOCGMEDIASIZE)
++	ret = ioctl(fd, DIOCGMEDIASIZE, &size);
++#elif defined(DKIOCGMEDIAINFO)
++	struct dk_minfo minfo;
++	ret = ioctl(fd, DKIOCGMEDIAINFO, &minfo);
++	size = minfo.dki_lbsize * minfo.dki_capacity;
++#elif defined(DIOCGDINFO)
++	struct disklabel dl;
++	ret = ioctl(fd, DIOCGDINFO, &dl);
++	size = dl.d_secsize * dl.d_nsectors * dl.d_ntracks * dl.d_ncylinders;
++#elif defined(DIOCGPART)
++	struct partinfo pi;
++	ret = ioctl(fd, DIOCGPART, &pi);
++	size = pi.media_size;
+ #else
+ 	close(fd);
+ 	return 0;
diff --git a/devel/android-tools-fastboot/files/patch-fastboot_fastboot.cpp b/devel/android-tools-fastboot/files/patch-fastboot_fastboot.cpp
new file mode 100644
index 000000000000..b0aba681ef38
--- /dev/null
+++ b/devel/android-tools-fastboot/files/patch-fastboot_fastboot.cpp
@@ -0,0 +1,24 @@
+--- fastboot/fastboot.cpp.orig	2019-08-13 02:10:58 UTC
++++ fastboot/fastboot.cpp
+@@ -58,9 +58,20 @@
+ #include <android-base/stringprintf.h>
+ #include <android-base/strings.h>
+ #include <android-base/unique_fd.h>
++#ifdef PLATFORM_TOOLS_VERSION
++#include <sys/utsname.h>
++namespace android { namespace build {
++std::string GetBuildNumber() {
++  struct utsname uts;
++  if (uname(&uts) == -1)
++    return "unknown";
++  return uts.sysname;
++}}}
++#else
+ #include <build/version.h>
+-#include <liblp/liblp.h>
+ #include <platform_tools_version.h>
++#endif
++#include <liblp/liblp.h>
+ #include <sparse/sparse.h>
+ #include <ziparchive/zip_archive.h>
+ 
diff --git a/devel/android-tools-adb/files/patch-liblog_fake__writer.cpp b/devel/android-tools-fastboot/files/patch-liblog_fake__writer.cpp
index e93327448dc3..e93327448dc3 100644
--- a/devel/android-tools-adb/files/patch-liblog_fake__writer.cpp
+++ b/devel/android-tools-fastboot/files/patch-liblog_fake__writer.cpp
diff --git a/devel/android-tools-adb/files/patch-liblog_logger.h b/devel/android-tools-fastboot/files/patch-liblog_logger.h
index 77c69a4895cf..c446ea70c5c1 100644
--- a/devel/android-tools-adb/files/patch-liblog_logger.h
+++ b/devel/android-tools-fastboot/files/patch-liblog_logger.h
@@ -1,6 +1,6 @@
---- liblog/logger.h.orig	2019-07-17 19:54:09 UTC
+--- liblog/logger.h.orig	2019-08-13 02:10:58 UTC
 +++ liblog/logger.h
-@@ -16,8 +16,14 @@
+@@ -16,7 +16,13 @@
  
  #pragma once
  
@@ -10,7 +10,6 @@
 +using std::atomic_uintptr_t;
 +#else
  #include <stdatomic.h>
- #include <stdbool.h>
 +#endif
  
  #include <cutils/list.h>
diff --git a/devel/android-tools-fastboot/files/patch-liblog_logger__write.c b/devel/android-tools-fastboot/files/patch-liblog_logger__write.c
deleted file mode 100644
index 481e87407296..000000000000
--- a/devel/android-tools-fastboot/files/patch-liblog_logger__write.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- liblog/logger_write.c.orig	2016-04-16 00:01:39 UTC
-+++ liblog/logger_write.c
-@@ -15,12 +15,12 @@
-  */
- 
- #include <errno.h>
--#include <stdatomic.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/time.h>
- 
- #ifdef __BIONIC__
-+#include <stdatomic.h>
- #include <android/set_abort_message.h>
- #endif
- 
diff --git a/devel/android-tools-adb/files/patch-liblog_logger__write.cpp b/devel/android-tools-fastboot/files/patch-liblog_logger__write.cpp
index 63dffda415a8..63dffda415a8 100644
--- a/devel/android-tools-adb/files/patch-liblog_logger__write.cpp
+++ b/devel/android-tools-fastboot/files/patch-liblog_logger__write.cpp
diff --git a/devel/android-tools-adb/files/patch-liblog_stderr__write.cpp b/devel/android-tools-fastboot/files/patch-liblog_stderr__write.cpp
index 10d1418c09bb..2da1354f365e 100644
--- a/devel/android-tools-adb/files/patch-liblog_stderr__write.cpp
+++ b/devel/android-tools-fastboot/files/patch-liblog_stderr__write.cpp
@@ -1,6 +1,6 @@
---- liblog/stderr_write.cpp.orig	2019-07-17 19:54:09 UTC
+--- liblog/stderr_write.cpp.orig	2019-08-13 02:10:58 UTC
 +++ liblog/stderr_write.cpp
-@@ -56,8 +56,8 @@ struct stderrContext {
+@@ -55,8 +55,8 @@ struct stderrContext {
  
  struct android_log_transport_write stderrLoggerWrite = {
      .node = {&stderrLoggerWrite.node, &stderrLoggerWrite.node},
diff --git a/devel/android-tools-fastboot/files/patch-libsparse_sparse__read.cpp b/devel/android-tools-fastboot/files/patch-libsparse_sparse__read.cpp
deleted file mode 100644
index 30753c5b96cd..000000000000
--- a/devel/android-tools-fastboot/files/patch-libsparse_sparse__read.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- libsparse/sparse_read.cpp.orig	2017-06-20 10:50:27 UTC
-+++ libsparse/sparse_read.cpp
-@@ -26,6 +26,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string>
-+#include <string.h> // memset
- #include <unistd.h>
- 
- #include <sparse/sparse.h>
diff --git a/devel/android-tools-fastboot/files/patch-libziparchive_zip__archive.cc b/devel/android-tools-fastboot/files/patch-libziparchive_zip__archive.cc
deleted file mode 100644
index 805366a5ea15..000000000000
--- a/devel/android-tools-fastboot/files/patch-libziparchive_zip__archive.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- libziparchive/zip_archive.cc.orig	2018-06-21 00:58:42 UTC
-+++ libziparchive/zip_archive.cc
-@@ -47,6 +47,17 @@
- #include "zip_archive_common.h"
- #include "zip_archive_private.h"
- 
-+#if !defined(_WIN32)
-+#if __cplusplus >= 201703 || (defined(_LIBCPP_VERSION) && __has_include(<string_view>))
-+#include <string_view>
-+#elif __cplusplus >= 201402
-+#include <experimental/string_view>
-+namespace std {
-+using std::experimental::string_view;
-+}
-+#endif // __cplusplus >= 201703
-+#endif // !defined(_WIN32)
-+
- using android::base::get_unaligned;
- 
- // Used to turn on crc checks - verify that the content CRC matches the values
-@@ -100,7 +111,7 @@ static uint32_t RoundUpPower2(uint32_t val) {
- }
- 
- static uint32_t ComputeHash(const ZipString& name) {
--#if !defined(_WIN32)
-+#if __cplusplus >= 201402 && !defined(_WIN32)
-   return std::hash<std::string_view>{}(
-       std::string_view(reinterpret_cast<const char*>(name.name), name.name_length));
- #else
diff --git a/devel/android-tools-fastboot/files/usb_freebsd.cpp b/devel/android-tools-fastboot/files/usb_freebsd.cpp
index c7664e67697a..de2385f6a27b 100644
--- a/devel/android-tools-fastboot/files/usb_freebsd.cpp
+++ b/devel/android-tools-fastboot/files/usb_freebsd.cpp
@@ -42,18 +42,20 @@ struct usb_handle {
 	unsigned char iface;
 };
 
-class LibusbUsbTransport : public Transport {
+class LibusbUsbTransport : public UsbTransport {
 public:
-	explicit LibusbUsbTransport(std::unique_ptr<usb_handle> handle):
-		h(std::move(handle)) {}
-	~LibusbUsbTransport() override = default;
+	explicit LibusbUsbTransport(std::unique_ptr<usb_handle> handle, uint32_t ms_timeout):
+		h(std::move(handle)), ms_timeout_(ms_timeout) {}
+	~LibusbUsbTransport() override;
 
 	ssize_t Read(void *_data, size_t len) override;
 	ssize_t Write(const void *_data, size_t len) override;
 	int Close() override;
+	int Reset() override;
 
 private:
 	std::unique_ptr<usb_handle> h;
+	const uint32_t ms_timeout_;
 
 	DISALLOW_COPY_AND_ASSIGN(LibusbUsbTransport);
 };
@@ -174,7 +176,7 @@ LibusbUsbTransport::Write(const void *_data, size_t len)
 	int actlen;
 
 	if (libusb_bulk_transfer(h->handle, h->ep_out,
-				 (unsigned char *)_data, len, &actlen, 0) < 0)
+				 (unsigned char *)_data, len, &actlen, ms_timeout_) < 0)
 		return (-1);
 	return (actlen);
 }
@@ -185,11 +187,16 @@ LibusbUsbTransport::Read(void *_data, size_t len)
 	int actlen;
 
 	if (libusb_bulk_transfer(h->handle, h->ep_in,
-				 (unsigned char *)_data, len, &actlen, 0) < 0)
+				 (unsigned char *)_data, len, &actlen, ms_timeout_) < 0)
 		return (-1);
 	return (actlen);
 }
 
+LibusbUsbTransport::~LibusbUsbTransport()
+{
+	Close();
+}
+
 int
 LibusbUsbTransport::Close()
 {
@@ -200,9 +207,17 @@ LibusbUsbTransport::Close()
 	return (0);
 }
 
-Transport *
-usb_open(ifc_match_func callback)
+int
+LibusbUsbTransport::Reset()
+{
+	if (libusb_reset_device(h->handle))
+		return (-1);
+	return (0);
+}
+
+UsbTransport *
+usb_open(ifc_match_func callback, uint32_t timeout_ms)
 {
 	std::unique_ptr<usb_handle> h = enumerate(callback);
-	return (h ? new LibusbUsbTransport(std::move(h)) : nullptr);
+	return (h ? new LibusbUsbTransport(std::move(h), timeout_ms) : nullptr);
 }
diff --git a/devel/android-tools-simpleperf/Makefile b/devel/android-tools-simpleperf/Makefile
index 7478d7d5d936..23f41680cb3b 100644
--- a/devel/android-tools-simpleperf/Makefile
+++ b/devel/android-tools-simpleperf/Makefile
@@ -14,10 +14,9 @@ LICENSE=	APACHE20
 BUILD_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	android:bionic,core jbeich
-GH_PROJECT=	platform_bionic:bionic platform_system_core:core \
-		platform_system_extras
-GH_SUBDIR=	bionic:bionic
+GH_TUPLE=	jbeich:platform_system_extras:${DISTVERSIONFULL} \
+		aosp-mirror:platform_system_core:${DISTVERSIONFULL}:core \
+		aosp-mirror:platform_bionic:${DISTVERSIONFULL}:bionic/bionic
 
 USES=		compiler:c++11-lib ncurses uidfix
 BUILD_WRKSRC=	${WRKSRC}/simpleperf
diff --git a/devel/android-tools-simpleperf/distinfo b/devel/android-tools-simpleperf/distinfo
index d8204c5fba17..1761a8b53a1c 100644
--- a/devel/android-tools-simpleperf/distinfo
+++ b/devel/android-tools-simpleperf/distinfo
@@ -1,7 +1,7 @@
 TIMESTAMP = 1495068953
 SHA256 (jbeich-platform_system_extras-android-7.1.2_r17_GH0.tar.gz) = ee97ae3df4eecc0d7fc16d3cb6f016ae1b1f81d7e450e678473c9b4618676b42
 SIZE (jbeich-platform_system_extras-android-7.1.2_r17_GH0.tar.gz) = 79621709
-SHA256 (android-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 33677ce1ca7a534c1d9060081890939d3ae7b6980cf573b650c4ec306874613a
-SIZE (android-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 3518577
-SHA256 (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = fb8d053d846f439951c651f205c9c914531d8dace86da60474f6675a92576449
-SIZE (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = 1596372
+SHA256 (aosp-mirror-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = fb8d053d846f439951c651f205c9c914531d8dace86da60474f6675a92576449
+SIZE (aosp-mirror-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = 1596372
+SHA256 (aosp-mirror-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 33677ce1ca7a534c1d9060081890939d3ae7b6980cf573b650c4ec306874613a
+SIZE (aosp-mirror-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 3518577
diff --git a/devel/aws-c-commons/Makefile b/devel/aws-c-commons/Makefile
index 2afd6df29e14..c115fa34884a 100644
--- a/devel/aws-c-commons/Makefile
+++ b/devel/aws-c-commons/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-c-common
-PORTVERSION=	0.3.9
-PORTREVISION=	1
+PORTVERSION=	0.4.6
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	devel
diff --git a/devel/aws-c-commons/distinfo b/devel/aws-c-commons/distinfo
index 8b59b3a580e3..f89d7504fee4 100644
--- a/devel/aws-c-commons/distinfo
+++ b/devel/aws-c-commons/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559160349
-SHA256 (awslabs-aws-c-common-v0.3.9_GH0.tar.gz) = c7cca1dc0adf5f565bb6478b04dbee76bea51d7127609c9d07f2971cd68ab327
-SIZE (awslabs-aws-c-common-v0.3.9_GH0.tar.gz) = 218283
+TIMESTAMP = 1568026655
+SHA256 (awslabs-aws-c-common-v0.4.6_GH0.tar.gz) = 82e866d48f4bce41bcf915583d2c3fe73c32d6f8af3a8fb3177dec37c0ac0188
+SIZE (awslabs-aws-c-common-v0.4.6_GH0.tar.gz) = 304308
diff --git a/devel/aws-c-commons/pkg-plist b/devel/aws-c-commons/pkg-plist
index 488676bb5a01..b6be24efb5ee 100644
--- a/devel/aws-c-commons/pkg-plist
+++ b/devel/aws-c-commons/pkg-plist
@@ -1,14 +1,18 @@
+include/aws/common/allocator.h
 include/aws/common/array_list.h
 include/aws/common/array_list.inl
-include/aws/common/assert.inl
+include/aws/common/assert.h
 include/aws/common/atomics.h
+include/aws/common/atomics.inl
 include/aws/common/atomics_fallback.inl
 include/aws/common/atomics_gnu.inl
 include/aws/common/atomics_gnu_old.inl
 include/aws/common/atomics_msvc.inl
 include/aws/common/byte_buf.h
 include/aws/common/byte_order.h
+include/aws/common/byte_order.inl
 include/aws/common/clock.h
+include/aws/common/clock.inl
 include/aws/common/command_line_parser.h
 include/aws/common/common.h
 include/aws/common/condition_variable.h
@@ -16,27 +20,46 @@ include/aws/common/config.h
 include/aws/common/date_time.h
 include/aws/common/device_random.h
 include/aws/common/encoding.h
+include/aws/common/encoding.inl
 include/aws/common/environment.h
 include/aws/common/error.h
+include/aws/common/error.inl
 include/aws/common/exports.h
 include/aws/common/hash_table.h
 include/aws/common/linked_list.h
+include/aws/common/linked_list.inl
+include/aws/common/log_channel.h
+include/aws/common/log_formatter.h
+include/aws/common/log_writer.h
+include/aws/common/logging.h
 include/aws/common/lru_cache.h
+include/aws/common/macros.h
+include/aws/common/math.cbmc.inl
 include/aws/common/math.fallback.inl
 include/aws/common/math.gcc_overflow.inl
 include/aws/common/math.gcc_x64_asm.inl
 include/aws/common/math.h
+include/aws/common/math.inl
 include/aws/common/math.msvc.inl
 include/aws/common/mutex.h
 include/aws/common/posix/common.inl
+include/aws/common/predicates.h
 include/aws/common/priority_queue.h
+include/aws/common/ring_buffer.h
+include/aws/common/ring_buffer.inl
 include/aws/common/rw_lock.h
+include/aws/common/stdbool.h
+include/aws/common/stdint.h
 include/aws/common/string.h
+include/aws/common/string.inl
 include/aws/common/system_info.h
 include/aws/common/task_scheduler.h
 include/aws/common/thread.h
 include/aws/common/time.h
 include/aws/common/uuid.h
+include/aws/common/zero.h
+include/aws/common/zero.inl
+include/aws/testing/aws_test_allocators.h
 include/aws/testing/aws_test_harness.h
 lib/aws-c-common/cmake/aws-c-common-config.cmake
 lib/aws-c-common/cmake/aws-c-common-targets-release.cmake
diff --git a/devel/aws-c-event-stream/Makefile b/devel/aws-c-event-stream/Makefile
index e5e8b7bf8e4d..00acd147397d 100644
--- a/devel/aws-c-event-stream/Makefile
+++ b/devel/aws-c-event-stream/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-c-event-stream
-PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTVERSION=	0.1.2
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	devel
@@ -21,7 +20,7 @@ USES=		cmake compiler:c11
 USE_GITHUB=	yes
 GH_ACCOUNT=	awslabs
 
-CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=ON
+CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_LIBDIR=${LOCALBASE}/lib
 LDFLAGS+=	-lexecinfo -lpthread
 
 USE_LDCONFIG=	yes
diff --git a/devel/aws-c-event-stream/distinfo b/devel/aws-c-event-stream/distinfo
index 081899038ab9..ad1137173bc0 100644
--- a/devel/aws-c-event-stream/distinfo
+++ b/devel/aws-c-event-stream/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547063997
-SHA256 (awslabs-aws-c-event-stream-v0.1.1_GH0.tar.gz) = e5ff7baa4bf90da1413ebed21edbc5b6c17bc13462036d128019886edac70ba5
-SIZE (awslabs-aws-c-event-stream-v0.1.1_GH0.tar.gz) = 27614
+TIMESTAMP = 1568026244
+SHA256 (awslabs-aws-c-event-stream-v0.1.2_GH0.tar.gz) = 9fadc2bad97eedcbdbd971dfc78815fb6f0cc09b82bd0de6632f267115023b07
+SIZE (awslabs-aws-c-event-stream-v0.1.2_GH0.tar.gz) = 27872
diff --git a/devel/aws-checksums/Makefile b/devel/aws-checksums/Makefile
index f786f3cd9bbc..c0767196869f 100644
--- a/devel/aws-checksums/Makefile
+++ b/devel/aws-checksums/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-checksums
-PORTVERSION=	0.1.2
+PORTVERSION=	0.1.3
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	devel
diff --git a/devel/aws-checksums/distinfo b/devel/aws-checksums/distinfo
index db060538d910..7146969dd2cb 100644
--- a/devel/aws-checksums/distinfo
+++ b/devel/aws-checksums/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547063623
-SHA256 (awslabs-aws-checksums-v0.1.2_GH0.tar.gz) = 5b2111c1f86324aca276eabd0f4d2802bc48a3ae6a4f2e87d999028fe7e82a17
-SIZE (awslabs-aws-checksums-v0.1.2_GH0.tar.gz) = 78026
+TIMESTAMP = 1568027075
+SHA256 (awslabs-aws-checksums-v0.1.3_GH0.tar.gz) = c0236128f43303bf1085d0424e578cc2b1bb7cb874016840e2bcb7e0eed30078
+SIZE (awslabs-aws-checksums-v0.1.3_GH0.tar.gz) = 78242
diff --git a/devel/aws-sdk-cpp/Makefile b/devel/aws-sdk-cpp/Makefile
index e03d5c59613b..053455e979ea 100644
--- a/devel/aws-sdk-cpp/Makefile
+++ b/devel/aws-sdk-cpp/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-cpp
-PORTVERSION=	1.7.113
-PORTREVISION=	1
+PORTVERSION=	1.7.178
 CATEGORIES=	devel
 
 MAINTAINER=	danilo@FreeBSD.org
diff --git a/devel/aws-sdk-cpp/distinfo b/devel/aws-sdk-cpp/distinfo
index 7385ed7a97ab..7e2cd1447ac2 100644
--- a/devel/aws-sdk-cpp/distinfo
+++ b/devel/aws-sdk-cpp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559160293
-SHA256 (aws-aws-sdk-cpp-1.7.113_GH0.tar.gz) = fb3c9af166725df8e25ac9afcf0df433cb5d19b7a384497c49a4e4363a3c21f7
-SIZE (aws-aws-sdk-cpp-1.7.113_GH0.tar.gz) = 21248186
+TIMESTAMP = 1568027338
+SHA256 (aws-aws-sdk-cpp-1.7.178_GH0.tar.gz) = 28c8eca4c349ae5a8a915ab30263f1147e2fb57d84a2fcd9c79d12dce7c5071a
+SIZE (aws-aws-sdk-cpp-1.7.178_GH0.tar.gz) = 22589166
diff --git a/devel/aws-sdk-cpp/pkg-plist b/devel/aws-sdk-cpp/pkg-plist
index 06ada3602a9c..b81e6f189dbb 100644
--- a/devel/aws-sdk-cpp/pkg-plist
+++ b/devel/aws-sdk-cpp/pkg-plist
@@ -329,6 +329,8 @@ include/aws/alexaforbusiness/model/NetworkProfile.h
 include/aws/alexaforbusiness/model/NetworkProfileData.h
 include/aws/alexaforbusiness/model/NetworkSecurityType.h
 include/aws/alexaforbusiness/model/PSTNDialIn.h
+include/aws/alexaforbusiness/model/PhoneNumber.h
+include/aws/alexaforbusiness/model/PhoneNumberType.h
 include/aws/alexaforbusiness/model/Profile.h
 include/aws/alexaforbusiness/model/ProfileData.h
 include/aws/alexaforbusiness/model/PutConferencePreferenceRequest.h
@@ -371,6 +373,8 @@ include/aws/alexaforbusiness/model/SendAnnouncementRequest.h
 include/aws/alexaforbusiness/model/SendAnnouncementResult.h
 include/aws/alexaforbusiness/model/SendInvitationRequest.h
 include/aws/alexaforbusiness/model/SendInvitationResult.h
+include/aws/alexaforbusiness/model/SipAddress.h
+include/aws/alexaforbusiness/model/SipType.h
 include/aws/alexaforbusiness/model/SkillDetails.h
 include/aws/alexaforbusiness/model/SkillGroup.h
 include/aws/alexaforbusiness/model/SkillGroupData.h
@@ -424,13 +428,18 @@ include/aws/amplify/AmplifyErrors.h
 include/aws/amplify/AmplifyRequest.h
 include/aws/amplify/Amplify_EXPORTS.h
 include/aws/amplify/model/App.h
+include/aws/amplify/model/AutoBranchCreationConfig.h
 include/aws/amplify/model/Branch.h
 include/aws/amplify/model/CreateAppRequest.h
 include/aws/amplify/model/CreateAppResult.h
 include/aws/amplify/model/CreateBranchRequest.h
 include/aws/amplify/model/CreateBranchResult.h
+include/aws/amplify/model/CreateDeploymentRequest.h
+include/aws/amplify/model/CreateDeploymentResult.h
 include/aws/amplify/model/CreateDomainAssociationRequest.h
 include/aws/amplify/model/CreateDomainAssociationResult.h
+include/aws/amplify/model/CreateWebhookRequest.h
+include/aws/amplify/model/CreateWebhookResult.h
 include/aws/amplify/model/CustomRule.h
 include/aws/amplify/model/DeleteAppRequest.h
 include/aws/amplify/model/DeleteAppResult.h
@@ -440,6 +449,8 @@ include/aws/amplify/model/DeleteDomainAssociationRequest.h
 include/aws/amplify/model/DeleteDomainAssociationResult.h
 include/aws/amplify/model/DeleteJobRequest.h
 include/aws/amplify/model/DeleteJobResult.h
+include/aws/amplify/model/DeleteWebhookRequest.h
+include/aws/amplify/model/DeleteWebhookResult.h
 include/aws/amplify/model/DomainAssociation.h
 include/aws/amplify/model/DomainStatus.h
 include/aws/amplify/model/GetAppRequest.h
@@ -450,6 +461,8 @@ include/aws/amplify/model/GetDomainAssociationRequest.h
 include/aws/amplify/model/GetDomainAssociationResult.h
 include/aws/amplify/model/GetJobRequest.h
 include/aws/amplify/model/GetJobResult.h
+include/aws/amplify/model/GetWebhookRequest.h
+include/aws/amplify/model/GetWebhookResult.h
 include/aws/amplify/model/Job.h
 include/aws/amplify/model/JobStatus.h
 include/aws/amplify/model/JobSummary.h
@@ -462,9 +475,15 @@ include/aws/amplify/model/ListDomainAssociationsRequest.h
 include/aws/amplify/model/ListDomainAssociationsResult.h
 include/aws/amplify/model/ListJobsRequest.h
 include/aws/amplify/model/ListJobsResult.h
+include/aws/amplify/model/ListTagsForResourceRequest.h
+include/aws/amplify/model/ListTagsForResourceResult.h
+include/aws/amplify/model/ListWebhooksRequest.h
+include/aws/amplify/model/ListWebhooksResult.h
 include/aws/amplify/model/Platform.h
 include/aws/amplify/model/ProductionBranch.h
 include/aws/amplify/model/Stage.h
+include/aws/amplify/model/StartDeploymentRequest.h
+include/aws/amplify/model/StartDeploymentResult.h
 include/aws/amplify/model/StartJobRequest.h
 include/aws/amplify/model/StartJobResult.h
 include/aws/amplify/model/Step.h
@@ -472,12 +491,19 @@ include/aws/amplify/model/StopJobRequest.h
 include/aws/amplify/model/StopJobResult.h
 include/aws/amplify/model/SubDomain.h
 include/aws/amplify/model/SubDomainSetting.h
+include/aws/amplify/model/TagResourceRequest.h
+include/aws/amplify/model/TagResourceResult.h
+include/aws/amplify/model/UntagResourceRequest.h
+include/aws/amplify/model/UntagResourceResult.h
 include/aws/amplify/model/UpdateAppRequest.h
 include/aws/amplify/model/UpdateAppResult.h
 include/aws/amplify/model/UpdateBranchRequest.h
 include/aws/amplify/model/UpdateBranchResult.h
 include/aws/amplify/model/UpdateDomainAssociationRequest.h
 include/aws/amplify/model/UpdateDomainAssociationResult.h
+include/aws/amplify/model/UpdateWebhookRequest.h
+include/aws/amplify/model/UpdateWebhookResult.h
+include/aws/amplify/model/Webhook.h
 include/aws/apigateway/APIGatewayClient.h
 include/aws/apigateway/APIGatewayEndpoint.h
 include/aws/apigateway/APIGatewayErrorMarshaller.h
@@ -556,6 +582,7 @@ include/aws/apigateway/model/DocumentationPartLocation.h
 include/aws/apigateway/model/DocumentationPartType.h
 include/aws/apigateway/model/DocumentationVersion.h
 include/aws/apigateway/model/DomainName.h
+include/aws/apigateway/model/DomainNameStatus.h
 include/aws/apigateway/model/EndpointConfiguration.h
 include/aws/apigateway/model/EndpointType.h
 include/aws/apigateway/model/FlushStageAuthorizersCacheRequest.h
@@ -693,6 +720,7 @@ include/aws/apigateway/model/Resource.h
 include/aws/apigateway/model/RestApi.h
 include/aws/apigateway/model/SdkConfigurationProperty.h
 include/aws/apigateway/model/SdkType.h
+include/aws/apigateway/model/SecurityPolicy.h
 include/aws/apigateway/model/Stage.h
 include/aws/apigateway/model/StageKey.h
 include/aws/apigateway/model/TagResourceRequest.h
@@ -757,6 +785,10 @@ include/aws/apigatewaymanagementapi/ApiGatewayManagementApiErrorMarshaller.h
 include/aws/apigatewaymanagementapi/ApiGatewayManagementApiErrors.h
 include/aws/apigatewaymanagementapi/ApiGatewayManagementApiRequest.h
 include/aws/apigatewaymanagementapi/ApiGatewayManagementApi_EXPORTS.h
+include/aws/apigatewaymanagementapi/model/DeleteConnectionRequest.h
+include/aws/apigatewaymanagementapi/model/GetConnectionRequest.h
+include/aws/apigatewaymanagementapi/model/GetConnectionResult.h
+include/aws/apigatewaymanagementapi/model/Identity.h
 include/aws/apigatewaymanagementapi/model/PostToConnectionRequest.h
 include/aws/apigatewayv2/ApiGatewayV2Client.h
 include/aws/apigatewayv2/ApiGatewayV2Endpoint.h
@@ -809,6 +841,7 @@ include/aws/apigatewayv2/model/Deployment.h
 include/aws/apigatewayv2/model/DeploymentStatus.h
 include/aws/apigatewayv2/model/DomainName.h
 include/aws/apigatewayv2/model/DomainNameConfiguration.h
+include/aws/apigatewayv2/model/DomainNameStatus.h
 include/aws/apigatewayv2/model/EndpointType.h
 include/aws/apigatewayv2/model/GetApiMappingRequest.h
 include/aws/apigatewayv2/model/GetApiMappingResult.h
@@ -856,6 +889,8 @@ include/aws/apigatewayv2/model/GetStageRequest.h
 include/aws/apigatewayv2/model/GetStageResult.h
 include/aws/apigatewayv2/model/GetStagesRequest.h
 include/aws/apigatewayv2/model/GetStagesResult.h
+include/aws/apigatewayv2/model/GetTagsRequest.h
+include/aws/apigatewayv2/model/GetTagsResult.h
 include/aws/apigatewayv2/model/Integration.h
 include/aws/apigatewayv2/model/IntegrationResponse.h
 include/aws/apigatewayv2/model/IntegrationType.h
@@ -867,7 +902,11 @@ include/aws/apigatewayv2/model/ProtocolType.h
 include/aws/apigatewayv2/model/Route.h
 include/aws/apigatewayv2/model/RouteResponse.h
 include/aws/apigatewayv2/model/RouteSettings.h
+include/aws/apigatewayv2/model/SecurityPolicy.h
 include/aws/apigatewayv2/model/Stage.h
+include/aws/apigatewayv2/model/TagResourceRequest.h
+include/aws/apigatewayv2/model/TagResourceResult.h
+include/aws/apigatewayv2/model/UntagResourceRequest.h
 include/aws/apigatewayv2/model/UpdateApiMappingRequest.h
 include/aws/apigatewayv2/model/UpdateApiMappingResult.h
 include/aws/apigatewayv2/model/UpdateApiRequest.h
@@ -935,7 +974,58 @@ include/aws/application-autoscaling/model/ScheduledAction.h
 include/aws/application-autoscaling/model/ServiceNamespace.h
 include/aws/application-autoscaling/model/StepAdjustment.h
 include/aws/application-autoscaling/model/StepScalingPolicyConfiguration.h
+include/aws/application-autoscaling/model/SuspendedState.h
 include/aws/application-autoscaling/model/TargetTrackingScalingPolicyConfiguration.h
+include/aws/application-insights/ApplicationInsightsClient.h
+include/aws/application-insights/ApplicationInsightsEndpoint.h
+include/aws/application-insights/ApplicationInsightsErrorMarshaller.h
+include/aws/application-insights/ApplicationInsightsErrors.h
+include/aws/application-insights/ApplicationInsightsRequest.h
+include/aws/application-insights/ApplicationInsights_EXPORTS.h
+include/aws/application-insights/model/ApplicationComponent.h
+include/aws/application-insights/model/ApplicationInfo.h
+include/aws/application-insights/model/CreateApplicationRequest.h
+include/aws/application-insights/model/CreateApplicationResult.h
+include/aws/application-insights/model/CreateComponentRequest.h
+include/aws/application-insights/model/CreateComponentResult.h
+include/aws/application-insights/model/DeleteApplicationRequest.h
+include/aws/application-insights/model/DeleteApplicationResult.h
+include/aws/application-insights/model/DeleteComponentRequest.h
+include/aws/application-insights/model/DeleteComponentResult.h
+include/aws/application-insights/model/DescribeApplicationRequest.h
+include/aws/application-insights/model/DescribeApplicationResult.h
+include/aws/application-insights/model/DescribeComponentConfigurationRecommendationRequest.h
+include/aws/application-insights/model/DescribeComponentConfigurationRecommendationResult.h
+include/aws/application-insights/model/DescribeComponentConfigurationRequest.h
+include/aws/application-insights/model/DescribeComponentConfigurationResult.h
+include/aws/application-insights/model/DescribeComponentRequest.h
+include/aws/application-insights/model/DescribeComponentResult.h
+include/aws/application-insights/model/DescribeObservationRequest.h
+include/aws/application-insights/model/DescribeObservationResult.h
+include/aws/application-insights/model/DescribeProblemObservationsRequest.h
+include/aws/application-insights/model/DescribeProblemObservationsResult.h
+include/aws/application-insights/model/DescribeProblemRequest.h
+include/aws/application-insights/model/DescribeProblemResult.h
+include/aws/application-insights/model/FeedbackKey.h
+include/aws/application-insights/model/FeedbackValue.h
+include/aws/application-insights/model/ListApplicationsRequest.h
+include/aws/application-insights/model/ListApplicationsResult.h
+include/aws/application-insights/model/ListComponentsRequest.h
+include/aws/application-insights/model/ListComponentsResult.h
+include/aws/application-insights/model/ListProblemsRequest.h
+include/aws/application-insights/model/ListProblemsResult.h
+include/aws/application-insights/model/LogFilter.h
+include/aws/application-insights/model/Observation.h
+include/aws/application-insights/model/Problem.h
+include/aws/application-insights/model/RelatedObservations.h
+include/aws/application-insights/model/SeverityLevel.h
+include/aws/application-insights/model/Status.h
+include/aws/application-insights/model/UpdateApplicationRequest.h
+include/aws/application-insights/model/UpdateApplicationResult.h
+include/aws/application-insights/model/UpdateComponentConfigurationRequest.h
+include/aws/application-insights/model/UpdateComponentConfigurationResult.h
+include/aws/application-insights/model/UpdateComponentRequest.h
+include/aws/application-insights/model/UpdateComponentResult.h
 include/aws/appmesh/AppMeshClient.h
 include/aws/appmesh/AppMeshEndpoint.h
 include/aws/appmesh/AppMeshErrorMarshaller.h
@@ -943,6 +1033,8 @@ include/aws/appmesh/AppMeshErrors.h
 include/aws/appmesh/AppMeshRequest.h
 include/aws/appmesh/AppMesh_EXPORTS.h
 include/aws/appmesh/model/AccessLog.h
+include/aws/appmesh/model/AwsCloudMapInstanceAttribute.h
+include/aws/appmesh/model/AwsCloudMapServiceDiscovery.h
 include/aws/appmesh/model/Backend.h
 include/aws/appmesh/model/CreateMeshRequest.h
 include/aws/appmesh/model/CreateMeshResult.h
@@ -978,10 +1070,14 @@ include/aws/appmesh/model/DnsServiceDiscovery.h
 include/aws/appmesh/model/EgressFilter.h
 include/aws/appmesh/model/EgressFilterType.h
 include/aws/appmesh/model/FileAccessLog.h
+include/aws/appmesh/model/HeaderMatchMethod.h
 include/aws/appmesh/model/HealthCheckPolicy.h
+include/aws/appmesh/model/HttpMethod.h
 include/aws/appmesh/model/HttpRoute.h
 include/aws/appmesh/model/HttpRouteAction.h
+include/aws/appmesh/model/HttpRouteHeader.h
 include/aws/appmesh/model/HttpRouteMatch.h
+include/aws/appmesh/model/HttpScheme.h
 include/aws/appmesh/model/ListMeshesRequest.h
 include/aws/appmesh/model/ListMeshesResult.h
 include/aws/appmesh/model/ListRoutesRequest.h
@@ -996,6 +1092,7 @@ include/aws/appmesh/model/ListVirtualServicesRequest.h
 include/aws/appmesh/model/ListVirtualServicesResult.h
 include/aws/appmesh/model/Listener.h
 include/aws/appmesh/model/Logging.h
+include/aws/appmesh/model/MatchRange.h
 include/aws/appmesh/model/MeshData.h
 include/aws/appmesh/model/MeshRef.h
 include/aws/appmesh/model/MeshSpec.h
@@ -1054,6 +1151,8 @@ include/aws/appstream/AppStreamErrorMarshaller.h
 include/aws/appstream/AppStreamErrors.h
 include/aws/appstream/AppStreamRequest.h
 include/aws/appstream/AppStream_EXPORTS.h
+include/aws/appstream/model/AccessEndpoint.h
+include/aws/appstream/model/AccessEndpointType.h
 include/aws/appstream/model/Action.h
 include/aws/appstream/model/Application.h
 include/aws/appstream/model/ApplicationSettings.h
@@ -1751,6 +1850,8 @@ include/aws/batch/model/DescribeJobQueuesRequest.h
 include/aws/batch/model/DescribeJobQueuesResult.h
 include/aws/batch/model/DescribeJobsRequest.h
 include/aws/batch/model/DescribeJobsResult.h
+include/aws/batch/model/Device.h
+include/aws/batch/model/DeviceCgroupPermission.h
 include/aws/batch/model/Host.h
 include/aws/batch/model/JQState.h
 include/aws/batch/model/JQStatus.h
@@ -1764,6 +1865,7 @@ include/aws/batch/model/JobSummary.h
 include/aws/batch/model/JobTimeout.h
 include/aws/batch/model/KeyValuePair.h
 include/aws/batch/model/LaunchTemplateSpecification.h
+include/aws/batch/model/LinuxParameters.h
 include/aws/batch/model/ListJobsRequest.h
 include/aws/batch/model/ListJobsResult.h
 include/aws/batch/model/MountPoint.h
@@ -1853,11 +1955,14 @@ include/aws/ce/model/CoverageByTime.h
 include/aws/ce/model/CoverageCost.h
 include/aws/ce/model/CoverageHours.h
 include/aws/ce/model/CoverageNormalizedUnits.h
+include/aws/ce/model/CurrentInstance.h
 include/aws/ce/model/DateInterval.h
 include/aws/ce/model/Dimension.h
 include/aws/ce/model/DimensionValues.h
 include/aws/ce/model/DimensionValuesWithAttributes.h
 include/aws/ce/model/EC2InstanceDetails.h
+include/aws/ce/model/EC2ResourceDetails.h
+include/aws/ce/model/EC2ResourceUtilization.h
 include/aws/ce/model/EC2Specification.h
 include/aws/ce/model/ESInstanceDetails.h
 include/aws/ce/model/ElastiCacheInstanceDetails.h
@@ -1875,8 +1980,12 @@ include/aws/ce/model/GetReservationPurchaseRecommendationRequest.h
 include/aws/ce/model/GetReservationPurchaseRecommendationResult.h
 include/aws/ce/model/GetReservationUtilizationRequest.h
 include/aws/ce/model/GetReservationUtilizationResult.h
+include/aws/ce/model/GetRightsizingRecommendationRequest.h
+include/aws/ce/model/GetRightsizingRecommendationResult.h
 include/aws/ce/model/GetTagsRequest.h
 include/aws/ce/model/GetTagsResult.h
+include/aws/ce/model/GetUsageForecastRequest.h
+include/aws/ce/model/GetUsageForecastResult.h
 include/aws/ce/model/Granularity.h
 include/aws/ce/model/Group.h
 include/aws/ce/model/GroupDefinition.h
@@ -1885,6 +1994,7 @@ include/aws/ce/model/InstanceDetails.h
 include/aws/ce/model/LookbackPeriodInDays.h
 include/aws/ce/model/Metric.h
 include/aws/ce/model/MetricValue.h
+include/aws/ce/model/ModifyRecommendationDetail.h
 include/aws/ce/model/OfferingClass.h
 include/aws/ce/model/PaymentOption.h
 include/aws/ce/model/RDSInstanceDetails.h
@@ -1896,10 +2006,18 @@ include/aws/ce/model/ReservationPurchaseRecommendationDetail.h
 include/aws/ce/model/ReservationPurchaseRecommendationMetadata.h
 include/aws/ce/model/ReservationPurchaseRecommendationSummary.h
 include/aws/ce/model/ReservationUtilizationGroup.h
+include/aws/ce/model/ResourceDetails.h
+include/aws/ce/model/ResourceUtilization.h
 include/aws/ce/model/ResultByTime.h
+include/aws/ce/model/RightsizingRecommendation.h
+include/aws/ce/model/RightsizingRecommendationMetadata.h
+include/aws/ce/model/RightsizingRecommendationSummary.h
+include/aws/ce/model/RightsizingType.h
 include/aws/ce/model/ServiceSpecification.h
 include/aws/ce/model/TagValues.h
+include/aws/ce/model/TargetInstance.h
 include/aws/ce/model/TermInYears.h
+include/aws/ce/model/TerminateRecommendationDetail.h
 include/aws/ce/model/UtilizationByTime.h
 include/aws/chime/ChimeClient.h
 include/aws/chime/ChimeEndpoint.h
@@ -2492,6 +2610,7 @@ include/aws/cloudfront/CloudFrontErrors.h
 include/aws/cloudfront/CloudFrontRequest.h
 include/aws/cloudfront/CloudFront_EXPORTS.h
 include/aws/cloudfront/model/ActiveTrustedSigners.h
+include/aws/cloudfront/model/AliasICPRecordal.h
 include/aws/cloudfront/model/Aliases.h
 include/aws/cloudfront/model/AllowedMethods.h
 include/aws/cloudfront/model/CacheBehavior.h
@@ -2506,35 +2625,35 @@ include/aws/cloudfront/model/ContentTypeProfileConfig.h
 include/aws/cloudfront/model/ContentTypeProfiles.h
 include/aws/cloudfront/model/CookieNames.h
 include/aws/cloudfront/model/CookiePreference.h
-include/aws/cloudfront/model/CreateCloudFrontOriginAccessIdentity2018_11_05Request.h
-include/aws/cloudfront/model/CreateCloudFrontOriginAccessIdentity2018_11_05Result.h
-include/aws/cloudfront/model/CreateDistribution2018_11_05Request.h
-include/aws/cloudfront/model/CreateDistribution2018_11_05Result.h
-include/aws/cloudfront/model/CreateDistributionWithTags2018_11_05Request.h
-include/aws/cloudfront/model/CreateDistributionWithTags2018_11_05Result.h
-include/aws/cloudfront/model/CreateFieldLevelEncryptionConfig2018_11_05Request.h
-include/aws/cloudfront/model/CreateFieldLevelEncryptionConfig2018_11_05Result.h
-include/aws/cloudfront/model/CreateFieldLevelEncryptionProfile2018_11_05Request.h
-include/aws/cloudfront/model/CreateFieldLevelEncryptionProfile2018_11_05Result.h
-include/aws/cloudfront/model/CreateInvalidation2018_11_05Request.h
-include/aws/cloudfront/model/CreateInvalidation2018_11_05Result.h
-include/aws/cloudfront/model/CreatePublicKey2018_11_05Request.h
-include/aws/cloudfront/model/CreatePublicKey2018_11_05Result.h
-include/aws/cloudfront/model/CreateStreamingDistribution2018_11_05Request.h
-include/aws/cloudfront/model/CreateStreamingDistribution2018_11_05Result.h
-include/aws/cloudfront/model/CreateStreamingDistributionWithTags2018_11_05Request.h
-include/aws/cloudfront/model/CreateStreamingDistributionWithTags2018_11_05Result.h
+include/aws/cloudfront/model/CreateCloudFrontOriginAccessIdentity2019_03_26Request.h
+include/aws/cloudfront/model/CreateCloudFrontOriginAccessIdentity2019_03_26Result.h
+include/aws/cloudfront/model/CreateDistribution2019_03_26Request.h
+include/aws/cloudfront/model/CreateDistribution2019_03_26Result.h
+include/aws/cloudfront/model/CreateDistributionWithTags2019_03_26Request.h
+include/aws/cloudfront/model/CreateDistributionWithTags2019_03_26Result.h
+include/aws/cloudfront/model/CreateFieldLevelEncryptionConfig2019_03_26Request.h
+include/aws/cloudfront/model/CreateFieldLevelEncryptionConfig2019_03_26Result.h
+include/aws/cloudfront/model/CreateFieldLevelEncryptionProfile2019_03_26Request.h
+include/aws/cloudfront/model/CreateFieldLevelEncryptionProfile2019_03_26Result.h
+include/aws/cloudfront/model/CreateInvalidation2019_03_26Request.h
+include/aws/cloudfront/model/CreateInvalidation2019_03_26Result.h
+include/aws/cloudfront/model/CreatePublicKey2019_03_26Request.h
+include/aws/cloudfront/model/CreatePublicKey2019_03_26Result.h
+include/aws/cloudfront/model/CreateStreamingDistribution2019_03_26Request.h
+include/aws/cloudfront/model/CreateStreamingDistribution2019_03_26Result.h
+include/aws/cloudfront/model/CreateStreamingDistributionWithTags2019_03_26Request.h
+include/aws/cloudfront/model/CreateStreamingDistributionWithTags2019_03_26Result.h
 include/aws/cloudfront/model/CustomErrorResponse.h
 include/aws/cloudfront/model/CustomErrorResponses.h
 include/aws/cloudfront/model/CustomHeaders.h
 include/aws/cloudfront/model/CustomOriginConfig.h
 include/aws/cloudfront/model/DefaultCacheBehavior.h
-include/aws/cloudfront/model/DeleteCloudFrontOriginAccessIdentity2018_11_05Request.h
-include/aws/cloudfront/model/DeleteDistribution2018_11_05Request.h
-include/aws/cloudfront/model/DeleteFieldLevelEncryptionConfig2018_11_05Request.h
-include/aws/cloudfront/model/DeleteFieldLevelEncryptionProfile2018_11_05Request.h
-include/aws/cloudfront/model/DeletePublicKey2018_11_05Request.h
-include/aws/cloudfront/model/DeleteStreamingDistribution2018_11_05Request.h
+include/aws/cloudfront/model/DeleteCloudFrontOriginAccessIdentity2019_03_26Request.h
+include/aws/cloudfront/model/DeleteDistribution2019_03_26Request.h
+include/aws/cloudfront/model/DeleteFieldLevelEncryptionConfig2019_03_26Request.h
+include/aws/cloudfront/model/DeleteFieldLevelEncryptionProfile2019_03_26Request.h
+include/aws/cloudfront/model/DeletePublicKey2019_03_26Request.h
+include/aws/cloudfront/model/DeleteStreamingDistribution2019_03_26Request.h
 include/aws/cloudfront/model/Distribution.h
 include/aws/cloudfront/model/DistributionConfig.h
 include/aws/cloudfront/model/DistributionConfigWithTags.h
@@ -2556,34 +2675,35 @@ include/aws/cloudfront/model/Format.h
 include/aws/cloudfront/model/ForwardedValues.h
 include/aws/cloudfront/model/GeoRestriction.h
 include/aws/cloudfront/model/GeoRestrictionType.h
-include/aws/cloudfront/model/GetCloudFrontOriginAccessIdentity2018_11_05Request.h
-include/aws/cloudfront/model/GetCloudFrontOriginAccessIdentity2018_11_05Result.h
-include/aws/cloudfront/model/GetCloudFrontOriginAccessIdentityConfig2018_11_05Request.h
-include/aws/cloudfront/model/GetCloudFrontOriginAccessIdentityConfig2018_11_05Result.h
-include/aws/cloudfront/model/GetDistribution2018_11_05Request.h
-include/aws/cloudfront/model/GetDistribution2018_11_05Result.h
-include/aws/cloudfront/model/GetDistributionConfig2018_11_05Request.h
-include/aws/cloudfront/model/GetDistributionConfig2018_11_05Result.h
-include/aws/cloudfront/model/GetFieldLevelEncryption2018_11_05Request.h
-include/aws/cloudfront/model/GetFieldLevelEncryption2018_11_05Result.h
-include/aws/cloudfront/model/GetFieldLevelEncryptionConfig2018_11_05Request.h
-include/aws/cloudfront/model/GetFieldLevelEncryptionConfig2018_11_05Result.h
-include/aws/cloudfront/model/GetFieldLevelEncryptionProfile2018_11_05Request.h
-include/aws/cloudfront/model/GetFieldLevelEncryptionProfile2018_11_05Result.h
-include/aws/cloudfront/model/GetFieldLevelEncryptionProfileConfig2018_11_05Request.h
-include/aws/cloudfront/model/GetFieldLevelEncryptionProfileConfig2018_11_05Result.h
-include/aws/cloudfront/model/GetInvalidation2018_11_05Request.h
-include/aws/cloudfront/model/GetInvalidation2018_11_05Result.h
-include/aws/cloudfront/model/GetPublicKey2018_11_05Request.h
-include/aws/cloudfront/model/GetPublicKey2018_11_05Result.h
-include/aws/cloudfront/model/GetPublicKeyConfig2018_11_05Request.h
-include/aws/cloudfront/model/GetPublicKeyConfig2018_11_05Result.h
-include/aws/cloudfront/model/GetStreamingDistribution2018_11_05Request.h
-include/aws/cloudfront/model/GetStreamingDistribution2018_11_05Result.h
-include/aws/cloudfront/model/GetStreamingDistributionConfig2018_11_05Request.h
-include/aws/cloudfront/model/GetStreamingDistributionConfig2018_11_05Result.h
+include/aws/cloudfront/model/GetCloudFrontOriginAccessIdentity2019_03_26Request.h
+include/aws/cloudfront/model/GetCloudFrontOriginAccessIdentity2019_03_26Result.h
+include/aws/cloudfront/model/GetCloudFrontOriginAccessIdentityConfig2019_03_26Request.h
+include/aws/cloudfront/model/GetCloudFrontOriginAccessIdentityConfig2019_03_26Result.h
+include/aws/cloudfront/model/GetDistribution2019_03_26Request.h
+include/aws/cloudfront/model/GetDistribution2019_03_26Result.h
+include/aws/cloudfront/model/GetDistributionConfig2019_03_26Request.h
+include/aws/cloudfront/model/GetDistributionConfig2019_03_26Result.h
+include/aws/cloudfront/model/GetFieldLevelEncryption2019_03_26Request.h
+include/aws/cloudfront/model/GetFieldLevelEncryption2019_03_26Result.h
+include/aws/cloudfront/model/GetFieldLevelEncryptionConfig2019_03_26Request.h
+include/aws/cloudfront/model/GetFieldLevelEncryptionConfig2019_03_26Result.h
+include/aws/cloudfront/model/GetFieldLevelEncryptionProfile2019_03_26Request.h
+include/aws/cloudfront/model/GetFieldLevelEncryptionProfile2019_03_26Result.h
+include/aws/cloudfront/model/GetFieldLevelEncryptionProfileConfig2019_03_26Request.h
+include/aws/cloudfront/model/GetFieldLevelEncryptionProfileConfig2019_03_26Result.h
+include/aws/cloudfront/model/GetInvalidation2019_03_26Request.h
+include/aws/cloudfront/model/GetInvalidation2019_03_26Result.h
+include/aws/cloudfront/model/GetPublicKey2019_03_26Request.h
+include/aws/cloudfront/model/GetPublicKey2019_03_26Result.h
+include/aws/cloudfront/model/GetPublicKeyConfig2019_03_26Request.h
+include/aws/cloudfront/model/GetPublicKeyConfig2019_03_26Result.h
+include/aws/cloudfront/model/GetStreamingDistribution2019_03_26Request.h
+include/aws/cloudfront/model/GetStreamingDistribution2019_03_26Result.h
+include/aws/cloudfront/model/GetStreamingDistributionConfig2019_03_26Request.h
+include/aws/cloudfront/model/GetStreamingDistributionConfig2019_03_26Result.h
 include/aws/cloudfront/model/Headers.h
 include/aws/cloudfront/model/HttpVersion.h
+include/aws/cloudfront/model/ICPRecordalStatus.h
 include/aws/cloudfront/model/Invalidation.h
 include/aws/cloudfront/model/InvalidationBatch.h
 include/aws/cloudfront/model/InvalidationList.h
@@ -2592,24 +2712,24 @@ include/aws/cloudfront/model/ItemSelection.h
 include/aws/cloudfront/model/KeyPairIds.h
 include/aws/cloudfront/model/LambdaFunctionAssociation.h
 include/aws/cloudfront/model/LambdaFunctionAssociations.h
-include/aws/cloudfront/model/ListCloudFrontOriginAccessIdentities2018_11_05Request.h
-include/aws/cloudfront/model/ListCloudFrontOriginAccessIdentities2018_11_05Result.h
-include/aws/cloudfront/model/ListDistributions2018_11_05Request.h
-include/aws/cloudfront/model/ListDistributions2018_11_05Result.h
-include/aws/cloudfront/model/ListDistributionsByWebACLId2018_11_05Request.h
-include/aws/cloudfront/model/ListDistributionsByWebACLId2018_11_05Result.h
-include/aws/cloudfront/model/ListFieldLevelEncryptionConfigs2018_11_05Request.h
-include/aws/cloudfront/model/ListFieldLevelEncryptionConfigs2018_11_05Result.h
-include/aws/cloudfront/model/ListFieldLevelEncryptionProfiles2018_11_05Request.h
-include/aws/cloudfront/model/ListFieldLevelEncryptionProfiles2018_11_05Result.h
-include/aws/cloudfront/model/ListInvalidations2018_11_05Request.h
-include/aws/cloudfront/model/ListInvalidations2018_11_05Result.h
-include/aws/cloudfront/model/ListPublicKeys2018_11_05Request.h
-include/aws/cloudfront/model/ListPublicKeys2018_11_05Result.h
-include/aws/cloudfront/model/ListStreamingDistributions2018_11_05Request.h
-include/aws/cloudfront/model/ListStreamingDistributions2018_11_05Result.h
-include/aws/cloudfront/model/ListTagsForResource2018_11_05Request.h
-include/aws/cloudfront/model/ListTagsForResource2018_11_05Result.h
+include/aws/cloudfront/model/ListCloudFrontOriginAccessIdentities2019_03_26Request.h
+include/aws/cloudfront/model/ListCloudFrontOriginAccessIdentities2019_03_26Result.h
+include/aws/cloudfront/model/ListDistributions2019_03_26Request.h
+include/aws/cloudfront/model/ListDistributions2019_03_26Result.h
+include/aws/cloudfront/model/ListDistributionsByWebACLId2019_03_26Request.h
+include/aws/cloudfront/model/ListDistributionsByWebACLId2019_03_26Result.h
+include/aws/cloudfront/model/ListFieldLevelEncryptionConfigs2019_03_26Request.h
+include/aws/cloudfront/model/ListFieldLevelEncryptionConfigs2019_03_26Result.h
+include/aws/cloudfront/model/ListFieldLevelEncryptionProfiles2019_03_26Request.h
+include/aws/cloudfront/model/ListFieldLevelEncryptionProfiles2019_03_26Result.h
+include/aws/cloudfront/model/ListInvalidations2019_03_26Request.h
+include/aws/cloudfront/model/ListInvalidations2019_03_26Result.h
+include/aws/cloudfront/model/ListPublicKeys2019_03_26Request.h
+include/aws/cloudfront/model/ListPublicKeys2019_03_26Result.h
+include/aws/cloudfront/model/ListStreamingDistributions2019_03_26Request.h
+include/aws/cloudfront/model/ListStreamingDistributions2019_03_26Result.h
+include/aws/cloudfront/model/ListTagsForResource2019_03_26Request.h
+include/aws/cloudfront/model/ListTagsForResource2019_03_26Result.h
 include/aws/cloudfront/model/LoggingConfig.h
 include/aws/cloudfront/model/Method.h
 include/aws/cloudfront/model/MinimumProtocolVersion.h
@@ -2648,22 +2768,22 @@ include/aws/cloudfront/model/StreamingDistributionSummary.h
 include/aws/cloudfront/model/StreamingLoggingConfig.h
 include/aws/cloudfront/model/Tag.h
 include/aws/cloudfront/model/TagKeys.h
-include/aws/cloudfront/model/TagResource2018_11_05Request.h
+include/aws/cloudfront/model/TagResource2019_03_26Request.h
 include/aws/cloudfront/model/Tags.h
 include/aws/cloudfront/model/TrustedSigners.h
-include/aws/cloudfront/model/UntagResource2018_11_05Request.h
-include/aws/cloudfront/model/UpdateCloudFrontOriginAccessIdentity2018_11_05Request.h
-include/aws/cloudfront/model/UpdateCloudFrontOriginAccessIdentity2018_11_05Result.h
-include/aws/cloudfront/model/UpdateDistribution2018_11_05Request.h
-include/aws/cloudfront/model/UpdateDistribution2018_11_05Result.h
-include/aws/cloudfront/model/UpdateFieldLevelEncryptionConfig2018_11_05Request.h
-include/aws/cloudfront/model/UpdateFieldLevelEncryptionConfig2018_11_05Result.h
-include/aws/cloudfront/model/UpdateFieldLevelEncryptionProfile2018_11_05Request.h
-include/aws/cloudfront/model/UpdateFieldLevelEncryptionProfile2018_11_05Result.h
-include/aws/cloudfront/model/UpdatePublicKey2018_11_05Request.h
-include/aws/cloudfront/model/UpdatePublicKey2018_11_05Result.h
-include/aws/cloudfront/model/UpdateStreamingDistribution2018_11_05Request.h
-include/aws/cloudfront/model/UpdateStreamingDistribution2018_11_05Result.h
+include/aws/cloudfront/model/UntagResource2019_03_26Request.h
+include/aws/cloudfront/model/UpdateCloudFrontOriginAccessIdentity2019_03_26Request.h
+include/aws/cloudfront/model/UpdateCloudFrontOriginAccessIdentity2019_03_26Result.h
+include/aws/cloudfront/model/UpdateDistribution2019_03_26Request.h
+include/aws/cloudfront/model/UpdateDistribution2019_03_26Result.h
+include/aws/cloudfront/model/UpdateFieldLevelEncryptionConfig2019_03_26Request.h
+include/aws/cloudfront/model/UpdateFieldLevelEncryptionConfig2019_03_26Result.h
+include/aws/cloudfront/model/UpdateFieldLevelEncryptionProfile2019_03_26Request.h
+include/aws/cloudfront/model/UpdateFieldLevelEncryptionProfile2019_03_26Result.h
+include/aws/cloudfront/model/UpdatePublicKey2019_03_26Request.h
+include/aws/cloudfront/model/UpdatePublicKey2019_03_26Result.h
+include/aws/cloudfront/model/UpdateStreamingDistribution2019_03_26Request.h
+include/aws/cloudfront/model/UpdateStreamingDistribution2019_03_26Result.h
 include/aws/cloudfront/model/ViewerCertificate.h
 include/aws/cloudfront/model/ViewerProtocolPolicy.h
 include/aws/cloudhsm/CloudHSMClient.h
@@ -3019,6 +3139,12 @@ include/aws/codecommit/CodeCommitErrorMarshaller.h
 include/aws/codecommit/CodeCommitErrors.h
 include/aws/codecommit/CodeCommitRequest.h
 include/aws/codecommit/CodeCommit_EXPORTS.h
+include/aws/codecommit/model/BatchDescribeMergeConflictsError.h
+include/aws/codecommit/model/BatchDescribeMergeConflictsRequest.h
+include/aws/codecommit/model/BatchDescribeMergeConflictsResult.h
+include/aws/codecommit/model/BatchGetCommitsError.h
+include/aws/codecommit/model/BatchGetCommitsRequest.h
+include/aws/codecommit/model/BatchGetCommitsResult.h
 include/aws/codecommit/model/BatchGetRepositoriesRequest.h
 include/aws/codecommit/model/BatchGetRepositoriesResult.h
 include/aws/codecommit/model/BlobMetadata.h
@@ -3028,6 +3154,11 @@ include/aws/codecommit/model/Comment.h
 include/aws/codecommit/model/CommentsForComparedCommit.h
 include/aws/codecommit/model/CommentsForPullRequest.h
 include/aws/codecommit/model/Commit.h
+include/aws/codecommit/model/Conflict.h
+include/aws/codecommit/model/ConflictDetailLevelTypeEnum.h
+include/aws/codecommit/model/ConflictMetadata.h
+include/aws/codecommit/model/ConflictResolution.h
+include/aws/codecommit/model/ConflictResolutionStrategyTypeEnum.h
 include/aws/codecommit/model/CreateBranchRequest.h
 include/aws/codecommit/model/CreateCommitRequest.h
 include/aws/codecommit/model/CreateCommitResult.h
@@ -3035,6 +3166,8 @@ include/aws/codecommit/model/CreatePullRequestRequest.h
 include/aws/codecommit/model/CreatePullRequestResult.h
 include/aws/codecommit/model/CreateRepositoryRequest.h
 include/aws/codecommit/model/CreateRepositoryResult.h
+include/aws/codecommit/model/CreateUnreferencedMergeCommitRequest.h
+include/aws/codecommit/model/CreateUnreferencedMergeCommitResult.h
 include/aws/codecommit/model/DeleteBranchRequest.h
 include/aws/codecommit/model/DeleteBranchResult.h
 include/aws/codecommit/model/DeleteCommentContentRequest.h
@@ -3044,12 +3177,16 @@ include/aws/codecommit/model/DeleteFileRequest.h
 include/aws/codecommit/model/DeleteFileResult.h
 include/aws/codecommit/model/DeleteRepositoryRequest.h
 include/aws/codecommit/model/DeleteRepositoryResult.h
+include/aws/codecommit/model/DescribeMergeConflictsRequest.h
+include/aws/codecommit/model/DescribeMergeConflictsResult.h
 include/aws/codecommit/model/DescribePullRequestEventsRequest.h
 include/aws/codecommit/model/DescribePullRequestEventsResult.h
 include/aws/codecommit/model/Difference.h
 include/aws/codecommit/model/File.h
 include/aws/codecommit/model/FileMetadata.h
 include/aws/codecommit/model/FileModeTypeEnum.h
+include/aws/codecommit/model/FileModes.h
+include/aws/codecommit/model/FileSizes.h
 include/aws/codecommit/model/Folder.h
 include/aws/codecommit/model/GetBlobRequest.h
 include/aws/codecommit/model/GetBlobResult.h
@@ -3069,25 +3206,47 @@ include/aws/codecommit/model/GetFileRequest.h
 include/aws/codecommit/model/GetFileResult.h
 include/aws/codecommit/model/GetFolderRequest.h
 include/aws/codecommit/model/GetFolderResult.h
+include/aws/codecommit/model/GetMergeCommitRequest.h
+include/aws/codecommit/model/GetMergeCommitResult.h
 include/aws/codecommit/model/GetMergeConflictsRequest.h
 include/aws/codecommit/model/GetMergeConflictsResult.h
+include/aws/codecommit/model/GetMergeOptionsRequest.h
+include/aws/codecommit/model/GetMergeOptionsResult.h
 include/aws/codecommit/model/GetPullRequestRequest.h
 include/aws/codecommit/model/GetPullRequestResult.h
 include/aws/codecommit/model/GetRepositoryRequest.h
 include/aws/codecommit/model/GetRepositoryResult.h
 include/aws/codecommit/model/GetRepositoryTriggersRequest.h
 include/aws/codecommit/model/GetRepositoryTriggersResult.h
+include/aws/codecommit/model/IsBinaryFile.h
 include/aws/codecommit/model/ListBranchesRequest.h
 include/aws/codecommit/model/ListBranchesResult.h
 include/aws/codecommit/model/ListPullRequestsRequest.h
 include/aws/codecommit/model/ListPullRequestsResult.h
 include/aws/codecommit/model/ListRepositoriesRequest.h
 include/aws/codecommit/model/ListRepositoriesResult.h
+include/aws/codecommit/model/ListTagsForResourceRequest.h
+include/aws/codecommit/model/ListTagsForResourceResult.h
 include/aws/codecommit/model/Location.h
+include/aws/codecommit/model/MergeBranchesByFastForwardRequest.h
+include/aws/codecommit/model/MergeBranchesByFastForwardResult.h
+include/aws/codecommit/model/MergeBranchesBySquashRequest.h
+include/aws/codecommit/model/MergeBranchesBySquashResult.h
+include/aws/codecommit/model/MergeBranchesByThreeWayRequest.h
+include/aws/codecommit/model/MergeBranchesByThreeWayResult.h
+include/aws/codecommit/model/MergeHunk.h
+include/aws/codecommit/model/MergeHunkDetail.h
 include/aws/codecommit/model/MergeMetadata.h
+include/aws/codecommit/model/MergeOperations.h
 include/aws/codecommit/model/MergeOptionTypeEnum.h
 include/aws/codecommit/model/MergePullRequestByFastForwardRequest.h
 include/aws/codecommit/model/MergePullRequestByFastForwardResult.h
+include/aws/codecommit/model/MergePullRequestBySquashRequest.h
+include/aws/codecommit/model/MergePullRequestBySquashResult.h
+include/aws/codecommit/model/MergePullRequestByThreeWayRequest.h
+include/aws/codecommit/model/MergePullRequestByThreeWayResult.h
+include/aws/codecommit/model/ObjectTypeEnum.h
+include/aws/codecommit/model/ObjectTypes.h
 include/aws/codecommit/model/OrderEnum.h
 include/aws/codecommit/model/PostCommentForComparedCommitRequest.h
 include/aws/codecommit/model/PostCommentForComparedCommitResult.h
@@ -3110,6 +3269,8 @@ include/aws/codecommit/model/PutFileResult.h
 include/aws/codecommit/model/PutRepositoryTriggersRequest.h
 include/aws/codecommit/model/PutRepositoryTriggersResult.h
 include/aws/codecommit/model/RelativeFileVersionEnum.h
+include/aws/codecommit/model/ReplaceContentEntry.h
+include/aws/codecommit/model/ReplacementTypeEnum.h
 include/aws/codecommit/model/RepositoryMetadata.h
 include/aws/codecommit/model/RepositoryNameIdPair.h
 include/aws/codecommit/model/RepositoryTrigger.h
@@ -3120,9 +3281,11 @@ include/aws/codecommit/model/SortByEnum.h
 include/aws/codecommit/model/SourceFileSpecifier.h
 include/aws/codecommit/model/SubModule.h
 include/aws/codecommit/model/SymbolicLink.h
+include/aws/codecommit/model/TagResourceRequest.h
 include/aws/codecommit/model/Target.h
 include/aws/codecommit/model/TestRepositoryTriggersRequest.h
 include/aws/codecommit/model/TestRepositoryTriggersResult.h
+include/aws/codecommit/model/UntagResourceRequest.h
 include/aws/codecommit/model/UpdateCommentRequest.h
 include/aws/codecommit/model/UpdateCommentResult.h
 include/aws/codecommit/model/UpdateDefaultBranchRequest.h
@@ -3359,6 +3522,7 @@ include/aws/codepipeline/model/EncryptionKey.h
 include/aws/codepipeline/model/EncryptionKeyType.h
 include/aws/codepipeline/model/ErrorDetails.h
 include/aws/codepipeline/model/ExecutionDetails.h
+include/aws/codepipeline/model/ExecutionTrigger.h
 include/aws/codepipeline/model/FailureDetails.h
 include/aws/codepipeline/model/FailureType.h
 include/aws/codepipeline/model/GetJobDetailsRequest.h
@@ -3434,6 +3598,7 @@ include/aws/codepipeline/model/ThirdPartyJob.h
 include/aws/codepipeline/model/ThirdPartyJobData.h
 include/aws/codepipeline/model/ThirdPartyJobDetails.h
 include/aws/codepipeline/model/TransitionState.h
+include/aws/codepipeline/model/TriggerType.h
 include/aws/codepipeline/model/UntagResourceRequest.h
 include/aws/codepipeline/model/UntagResourceResult.h
 include/aws/codepipeline/model/UpdatePipelineRequest.h
@@ -3967,6 +4132,7 @@ include/aws/comprehend/model/EntityRecognizerMetadata.h
 include/aws/comprehend/model/EntityRecognizerMetadataEntityTypesListItem.h
 include/aws/comprehend/model/EntityRecognizerProperties.h
 include/aws/comprehend/model/EntityType.h
+include/aws/comprehend/model/EntityTypesEvaluationMetrics.h
 include/aws/comprehend/model/EntityTypesListItem.h
 include/aws/comprehend/model/InputDataConfig.h
 include/aws/comprehend/model/InputFormat.h
@@ -4101,9 +4267,12 @@ include/aws/config/model/DeleteConfigurationRecorderRequest.h
 include/aws/config/model/DeleteDeliveryChannelRequest.h
 include/aws/config/model/DeleteEvaluationResultsRequest.h
 include/aws/config/model/DeleteEvaluationResultsResult.h
+include/aws/config/model/DeleteOrganizationConfigRuleRequest.h
 include/aws/config/model/DeletePendingAggregationRequestRequest.h
 include/aws/config/model/DeleteRemediationConfigurationRequest.h
 include/aws/config/model/DeleteRemediationConfigurationResult.h
+include/aws/config/model/DeleteRemediationExceptionsRequest.h
+include/aws/config/model/DeleteRemediationExceptionsResult.h
 include/aws/config/model/DeleteRetentionConfigurationRequest.h
 include/aws/config/model/DeliverConfigSnapshotRequest.h
 include/aws/config/model/DeliverConfigSnapshotResult.h
@@ -4134,10 +4303,16 @@ include/aws/config/model/DescribeDeliveryChannelStatusRequest.h
 include/aws/config/model/DescribeDeliveryChannelStatusResult.h
 include/aws/config/model/DescribeDeliveryChannelsRequest.h
 include/aws/config/model/DescribeDeliveryChannelsResult.h
+include/aws/config/model/DescribeOrganizationConfigRuleStatusesRequest.h
+include/aws/config/model/DescribeOrganizationConfigRuleStatusesResult.h
+include/aws/config/model/DescribeOrganizationConfigRulesRequest.h
+include/aws/config/model/DescribeOrganizationConfigRulesResult.h
 include/aws/config/model/DescribePendingAggregationRequestsRequest.h
 include/aws/config/model/DescribePendingAggregationRequestsResult.h
 include/aws/config/model/DescribeRemediationConfigurationsRequest.h
 include/aws/config/model/DescribeRemediationConfigurationsResult.h
+include/aws/config/model/DescribeRemediationExceptionsRequest.h
+include/aws/config/model/DescribeRemediationExceptionsResult.h
 include/aws/config/model/DescribeRemediationExecutionStatusRequest.h
 include/aws/config/model/DescribeRemediationExecutionStatusResult.h
 include/aws/config/model/DescribeRetentionConfigurationsRequest.h
@@ -4147,7 +4322,10 @@ include/aws/config/model/EvaluationResult.h
 include/aws/config/model/EvaluationResultIdentifier.h
 include/aws/config/model/EvaluationResultQualifier.h
 include/aws/config/model/EventSource.h
+include/aws/config/model/ExecutionControls.h
+include/aws/config/model/FailedDeleteRemediationExceptionsBatch.h
 include/aws/config/model/FailedRemediationBatch.h
+include/aws/config/model/FailedRemediationExceptionBatch.h
 include/aws/config/model/FieldInfo.h
 include/aws/config/model/GetAggregateComplianceDetailsByConfigRuleRequest.h
 include/aws/config/model/GetAggregateComplianceDetailsByConfigRuleResult.h
@@ -4166,6 +4344,8 @@ include/aws/config/model/GetComplianceSummaryByResourceTypeRequest.h
 include/aws/config/model/GetComplianceSummaryByResourceTypeResult.h
 include/aws/config/model/GetDiscoveredResourceCountsRequest.h
 include/aws/config/model/GetDiscoveredResourceCountsResult.h
+include/aws/config/model/GetOrganizationConfigRuleDetailedStatusRequest.h
+include/aws/config/model/GetOrganizationConfigRuleDetailedStatusResult.h
 include/aws/config/model/GetResourceConfigHistoryRequest.h
 include/aws/config/model/GetResourceConfigHistoryResult.h
 include/aws/config/model/GroupedResourceCount.h
@@ -4176,8 +4356,16 @@ include/aws/config/model/ListDiscoveredResourcesResult.h
 include/aws/config/model/ListTagsForResourceRequest.h
 include/aws/config/model/ListTagsForResourceResult.h
 include/aws/config/model/MaximumExecutionFrequency.h
+include/aws/config/model/MemberAccountRuleStatus.h
+include/aws/config/model/MemberAccountStatus.h
 include/aws/config/model/MessageType.h
 include/aws/config/model/OrganizationAggregationSource.h
+include/aws/config/model/OrganizationConfigRule.h
+include/aws/config/model/OrganizationConfigRuleStatus.h
+include/aws/config/model/OrganizationConfigRuleTriggerType.h
+include/aws/config/model/OrganizationCustomRuleMetadata.h
+include/aws/config/model/OrganizationManagedRuleMetadata.h
+include/aws/config/model/OrganizationRuleStatus.h
 include/aws/config/model/Owner.h
 include/aws/config/model/PendingAggregationRequest.h
 include/aws/config/model/PutAggregationAuthorizationRequest.h
@@ -4189,8 +4377,12 @@ include/aws/config/model/PutConfigurationRecorderRequest.h
 include/aws/config/model/PutDeliveryChannelRequest.h
 include/aws/config/model/PutEvaluationsRequest.h
 include/aws/config/model/PutEvaluationsResult.h
+include/aws/config/model/PutOrganizationConfigRuleRequest.h
+include/aws/config/model/PutOrganizationConfigRuleResult.h
 include/aws/config/model/PutRemediationConfigurationsRequest.h
 include/aws/config/model/PutRemediationConfigurationsResult.h
+include/aws/config/model/PutRemediationExceptionsRequest.h
+include/aws/config/model/PutRemediationExceptionsResult.h
 include/aws/config/model/PutRetentionConfigurationRequest.h
 include/aws/config/model/PutRetentionConfigurationResult.h
 include/aws/config/model/QueryInfo.h
@@ -4198,6 +4390,8 @@ include/aws/config/model/RecorderStatus.h
 include/aws/config/model/RecordingGroup.h
 include/aws/config/model/Relationship.h
 include/aws/config/model/RemediationConfiguration.h
+include/aws/config/model/RemediationException.h
+include/aws/config/model/RemediationExceptionResourceKey.h
 include/aws/config/model/RemediationExecutionState.h
 include/aws/config/model/RemediationExecutionStatus.h
 include/aws/config/model/RemediationExecutionStep.h
@@ -4219,12 +4413,14 @@ include/aws/config/model/SelectResourceConfigRequest.h
 include/aws/config/model/SelectResourceConfigResult.h
 include/aws/config/model/Source.h
 include/aws/config/model/SourceDetail.h
+include/aws/config/model/SsmControls.h
 include/aws/config/model/StartConfigRulesEvaluationRequest.h
 include/aws/config/model/StartConfigRulesEvaluationResult.h
 include/aws/config/model/StartConfigurationRecorderRequest.h
 include/aws/config/model/StartRemediationExecutionRequest.h
 include/aws/config/model/StartRemediationExecutionResult.h
 include/aws/config/model/StaticValue.h
+include/aws/config/model/StatusDetailFilters.h
 include/aws/config/model/StopConfigurationRecorderRequest.h
 include/aws/config/model/Tag.h
 include/aws/config/model/TagResourceRequest.h
@@ -4318,6 +4514,7 @@ include/aws/core/auth/AWSAuthSignerProvider.h
 include/aws/core/auth/AWSCredentials.h
 include/aws/core/auth/AWSCredentialsProvider.h
 include/aws/core/auth/AWSCredentialsProviderChain.h
+include/aws/core/auth/STSCredentialsProvider.h
 include/aws/core/client/AWSClient.h
 include/aws/core/client/AWSError.h
 include/aws/core/client/AWSErrorMarshaller.h
@@ -4326,6 +4523,7 @@ include/aws/core/client/ClientConfiguration.h
 include/aws/core/client/CoreErrors.h
 include/aws/core/client/DefaultRetryStrategy.h
 include/aws/core/client/RetryStrategy.h
+include/aws/core/client/SpecifiedRetryableErrorsRetryStrategy.h
 include/aws/core/config/AWSProfileConfigLoader.h
 include/aws/core/external/cjson/cJSON.h
 include/aws/core/external/tinyxml2/tinyxml2.h
@@ -4445,6 +4643,8 @@ include/aws/cur/model/DeleteReportDefinitionRequest.h
 include/aws/cur/model/DeleteReportDefinitionResult.h
 include/aws/cur/model/DescribeReportDefinitionsRequest.h
 include/aws/cur/model/DescribeReportDefinitionsResult.h
+include/aws/cur/model/ModifyReportDefinitionRequest.h
+include/aws/cur/model/ModifyReportDefinitionResult.h
 include/aws/cur/model/PutReportDefinitionRequest.h
 include/aws/cur/model/PutReportDefinitionResult.h
 include/aws/cur/model/ReportDefinition.h
@@ -4530,6 +4730,8 @@ include/aws/datasync/model/CreateLocationNfsRequest.h
 include/aws/datasync/model/CreateLocationNfsResult.h
 include/aws/datasync/model/CreateLocationS3Request.h
 include/aws/datasync/model/CreateLocationS3Result.h
+include/aws/datasync/model/CreateLocationSmbRequest.h
+include/aws/datasync/model/CreateLocationSmbResult.h
 include/aws/datasync/model/CreateTaskRequest.h
 include/aws/datasync/model/CreateTaskResult.h
 include/aws/datasync/model/DeleteAgentRequest.h
@@ -4546,12 +4748,14 @@ include/aws/datasync/model/DescribeLocationNfsRequest.h
 include/aws/datasync/model/DescribeLocationNfsResult.h
 include/aws/datasync/model/DescribeLocationS3Request.h
 include/aws/datasync/model/DescribeLocationS3Result.h
+include/aws/datasync/model/DescribeLocationSmbRequest.h
+include/aws/datasync/model/DescribeLocationSmbResult.h
 include/aws/datasync/model/DescribeTaskExecutionRequest.h
 include/aws/datasync/model/DescribeTaskExecutionResult.h
 include/aws/datasync/model/DescribeTaskRequest.h
 include/aws/datasync/model/DescribeTaskResult.h
 include/aws/datasync/model/Ec2Config.h
-include/aws/datasync/model/EndpointOptions.h
+include/aws/datasync/model/EndpointType.h
 include/aws/datasync/model/FilterRule.h
 include/aws/datasync/model/FilterType.h
 include/aws/datasync/model/Gid.h
@@ -4577,6 +4781,8 @@ include/aws/datasync/model/PreserveDeletedFiles.h
 include/aws/datasync/model/PreserveDevices.h
 include/aws/datasync/model/PrivateLinkConfig.h
 include/aws/datasync/model/S3Config.h
+include/aws/datasync/model/SmbMountOptions.h
+include/aws/datasync/model/SmbVersion.h
 include/aws/datasync/model/StartTaskExecutionRequest.h
 include/aws/datasync/model/StartTaskExecutionResult.h
 include/aws/datasync/model/TagListEntry.h
@@ -5237,6 +5443,7 @@ include/aws/dms/model/RefreshSchemasRequest.h
 include/aws/dms/model/RefreshSchemasResult.h
 include/aws/dms/model/RefreshSchemasStatus.h
 include/aws/dms/model/RefreshSchemasStatusTypeValue.h
+include/aws/dms/model/ReleaseStatusValues.h
 include/aws/dms/model/ReloadOptionValue.h
 include/aws/dms/model/ReloadTablesRequest.h
 include/aws/dms/model/ReloadTablesResult.h
@@ -5375,6 +5582,10 @@ include/aws/docdb/model/RestoreDBClusterFromSnapshotResult.h
 include/aws/docdb/model/RestoreDBClusterToPointInTimeRequest.h
 include/aws/docdb/model/RestoreDBClusterToPointInTimeResult.h
 include/aws/docdb/model/SourceType.h
+include/aws/docdb/model/StartDBClusterRequest.h
+include/aws/docdb/model/StartDBClusterResult.h
+include/aws/docdb/model/StopDBClusterRequest.h
+include/aws/docdb/model/StopDBClusterResult.h
 include/aws/docdb/model/Subnet.h
 include/aws/docdb/model/Tag.h
 include/aws/docdb/model/UpgradeTarget.h
@@ -5729,6 +5940,14 @@ include/aws/dynamodbstreams/model/StreamDescription.h
 include/aws/dynamodbstreams/model/StreamRecord.h
 include/aws/dynamodbstreams/model/StreamStatus.h
 include/aws/dynamodbstreams/model/StreamViewType.h
+include/aws/ec2-instance-connect/EC2InstanceConnectClient.h
+include/aws/ec2-instance-connect/EC2InstanceConnectEndpoint.h
+include/aws/ec2-instance-connect/EC2InstanceConnectErrorMarshaller.h
+include/aws/ec2-instance-connect/EC2InstanceConnectErrors.h
+include/aws/ec2-instance-connect/EC2InstanceConnectRequest.h
+include/aws/ec2-instance-connect/EC2InstanceConnect_EXPORTS.h
+include/aws/ec2-instance-connect/model/SendSSHPublicKeyRequest.h
+include/aws/ec2-instance-connect/model/SendSSHPublicKeyResult.h
 include/aws/ec2/EC2Client.h
 include/aws/ec2/EC2Endpoint.h
 include/aws/ec2/EC2ErrorMarshaller.h
@@ -5765,6 +5984,8 @@ include/aws/ec2/model/ArchitectureValues.h
 include/aws/ec2/model/AssignIpv6AddressesRequest.h
 include/aws/ec2/model/AssignIpv6AddressesResponse.h
 include/aws/ec2/model/AssignPrivateIpAddressesRequest.h
+include/aws/ec2/model/AssignPrivateIpAddressesResponse.h
+include/aws/ec2/model/AssignedPrivateIpAddress.h
 include/aws/ec2/model/AssociateAddressRequest.h
 include/aws/ec2/model/AssociateAddressResponse.h
 include/aws/ec2/model/AssociateClientVpnTargetNetworkRequest.h
@@ -5953,6 +6174,14 @@ include/aws/ec2/model/CreateSpotDatafeedSubscriptionResponse.h
 include/aws/ec2/model/CreateSubnetRequest.h
 include/aws/ec2/model/CreateSubnetResponse.h
 include/aws/ec2/model/CreateTagsRequest.h
+include/aws/ec2/model/CreateTrafficMirrorFilterRequest.h
+include/aws/ec2/model/CreateTrafficMirrorFilterResponse.h
+include/aws/ec2/model/CreateTrafficMirrorFilterRuleRequest.h
+include/aws/ec2/model/CreateTrafficMirrorFilterRuleResponse.h
+include/aws/ec2/model/CreateTrafficMirrorSessionRequest.h
+include/aws/ec2/model/CreateTrafficMirrorSessionResponse.h
+include/aws/ec2/model/CreateTrafficMirrorTargetRequest.h
+include/aws/ec2/model/CreateTrafficMirrorTargetResponse.h
 include/aws/ec2/model/CreateTransitGatewayRequest.h
 include/aws/ec2/model/CreateTransitGatewayResponse.h
 include/aws/ec2/model/CreateTransitGatewayRouteRequest.h
@@ -6030,6 +6259,14 @@ include/aws/ec2/model/DeleteSnapshotRequest.h
 include/aws/ec2/model/DeleteSpotDatafeedSubscriptionRequest.h
 include/aws/ec2/model/DeleteSubnetRequest.h
 include/aws/ec2/model/DeleteTagsRequest.h
+include/aws/ec2/model/DeleteTrafficMirrorFilterRequest.h
+include/aws/ec2/model/DeleteTrafficMirrorFilterResponse.h
+include/aws/ec2/model/DeleteTrafficMirrorFilterRuleRequest.h
+include/aws/ec2/model/DeleteTrafficMirrorFilterRuleResponse.h
+include/aws/ec2/model/DeleteTrafficMirrorSessionRequest.h
+include/aws/ec2/model/DeleteTrafficMirrorSessionResponse.h
+include/aws/ec2/model/DeleteTrafficMirrorTargetRequest.h
+include/aws/ec2/model/DeleteTrafficMirrorTargetResponse.h
 include/aws/ec2/model/DeleteTransitGatewayRequest.h
 include/aws/ec2/model/DeleteTransitGatewayResponse.h
 include/aws/ec2/model/DeleteTransitGatewayRouteRequest.h
@@ -6090,6 +6327,8 @@ include/aws/ec2/model/DescribeEgressOnlyInternetGatewaysRequest.h
 include/aws/ec2/model/DescribeEgressOnlyInternetGatewaysResponse.h
 include/aws/ec2/model/DescribeElasticGpusRequest.h
 include/aws/ec2/model/DescribeElasticGpusResponse.h
+include/aws/ec2/model/DescribeExportImageTasksRequest.h
+include/aws/ec2/model/DescribeExportImageTasksResponse.h
 include/aws/ec2/model/DescribeExportTasksRequest.h
 include/aws/ec2/model/DescribeExportTasksResponse.h
 include/aws/ec2/model/DescribeFleetError.h
@@ -6204,6 +6443,12 @@ include/aws/ec2/model/DescribeSubnetsRequest.h
 include/aws/ec2/model/DescribeSubnetsResponse.h
 include/aws/ec2/model/DescribeTagsRequest.h
 include/aws/ec2/model/DescribeTagsResponse.h
+include/aws/ec2/model/DescribeTrafficMirrorFiltersRequest.h
+include/aws/ec2/model/DescribeTrafficMirrorFiltersResponse.h
+include/aws/ec2/model/DescribeTrafficMirrorSessionsRequest.h
+include/aws/ec2/model/DescribeTrafficMirrorSessionsResponse.h
+include/aws/ec2/model/DescribeTrafficMirrorTargetsRequest.h
+include/aws/ec2/model/DescribeTrafficMirrorTargetsResponse.h
 include/aws/ec2/model/DescribeTransitGatewayAttachmentsRequest.h
 include/aws/ec2/model/DescribeTransitGatewayAttachmentsResponse.h
 include/aws/ec2/model/DescribeTransitGatewayRouteTablesRequest.h
@@ -6321,7 +6566,12 @@ include/aws/ec2/model/ExportClientVpnClientCertificateRevocationListResponse.h
 include/aws/ec2/model/ExportClientVpnClientConfigurationRequest.h
 include/aws/ec2/model/ExportClientVpnClientConfigurationResponse.h
 include/aws/ec2/model/ExportEnvironment.h
+include/aws/ec2/model/ExportImageRequest.h
+include/aws/ec2/model/ExportImageResponse.h
+include/aws/ec2/model/ExportImageTask.h
 include/aws/ec2/model/ExportTask.h
+include/aws/ec2/model/ExportTaskS3Location.h
+include/aws/ec2/model/ExportTaskS3LocationRequest.h
 include/aws/ec2/model/ExportTaskState.h
 include/aws/ec2/model/ExportToS3Task.h
 include/aws/ec2/model/ExportToS3TaskSpecification.h
@@ -6349,6 +6599,8 @@ include/aws/ec2/model/FpgaImageAttributeName.h
 include/aws/ec2/model/FpgaImageState.h
 include/aws/ec2/model/FpgaImageStateCode.h
 include/aws/ec2/model/GatewayType.h
+include/aws/ec2/model/GetCapacityReservationUsageRequest.h
+include/aws/ec2/model/GetCapacityReservationUsageResponse.h
 include/aws/ec2/model/GetConsoleOutputRequest.h
 include/aws/ec2/model/GetConsoleOutputResponse.h
 include/aws/ec2/model/GetConsoleScreenshotRequest.h
@@ -6380,6 +6632,7 @@ include/aws/ec2/model/Host.h
 include/aws/ec2/model/HostInstance.h
 include/aws/ec2/model/HostOffering.h
 include/aws/ec2/model/HostProperties.h
+include/aws/ec2/model/HostRecovery.h
 include/aws/ec2/model/HostReservation.h
 include/aws/ec2/model/HostTenancy.h
 include/aws/ec2/model/HypervisorType.h
@@ -6444,6 +6697,7 @@ include/aws/ec2/model/InstanceStatusDetails.h
 include/aws/ec2/model/InstanceStatusEvent.h
 include/aws/ec2/model/InstanceStatusSummary.h
 include/aws/ec2/model/InstanceType.h
+include/aws/ec2/model/InstanceUsage.h
 include/aws/ec2/model/InterfacePermissionType.h
 include/aws/ec2/model/InternetGateway.h
 include/aws/ec2/model/InternetGatewayAttachment.h
@@ -6534,6 +6788,12 @@ include/aws/ec2/model/ModifySnapshotAttributeRequest.h
 include/aws/ec2/model/ModifySpotFleetRequestRequest.h
 include/aws/ec2/model/ModifySpotFleetRequestResponse.h
 include/aws/ec2/model/ModifySubnetAttributeRequest.h
+include/aws/ec2/model/ModifyTrafficMirrorFilterNetworkServicesRequest.h
+include/aws/ec2/model/ModifyTrafficMirrorFilterNetworkServicesResponse.h
+include/aws/ec2/model/ModifyTrafficMirrorFilterRuleRequest.h
+include/aws/ec2/model/ModifyTrafficMirrorFilterRuleResponse.h
+include/aws/ec2/model/ModifyTrafficMirrorSessionRequest.h
+include/aws/ec2/model/ModifyTrafficMirrorSessionResponse.h
 include/aws/ec2/model/ModifyTransitGatewayVpcAttachmentRequest.h
 include/aws/ec2/model/ModifyTransitGatewayVpcAttachmentRequestOptions.h
 include/aws/ec2/model/ModifyTransitGatewayVpcAttachmentResponse.h
@@ -6555,6 +6815,8 @@ include/aws/ec2/model/ModifyVpcTenancyRequest.h
 include/aws/ec2/model/ModifyVpcTenancyResponse.h
 include/aws/ec2/model/ModifyVpnConnectionRequest.h
 include/aws/ec2/model/ModifyVpnConnectionResponse.h
+include/aws/ec2/model/ModifyVpnTunnelCertificateRequest.h
+include/aws/ec2/model/ModifyVpnTunnelCertificateResponse.h
 include/aws/ec2/model/MonitorInstancesRequest.h
 include/aws/ec2/model/MonitorInstancesResponse.h
 include/aws/ec2/model/Monitoring.h
@@ -6724,6 +6986,7 @@ include/aws/ec2/model/SearchTransitGatewayRoutesResponse.h
 include/aws/ec2/model/SecurityGroup.h
 include/aws/ec2/model/SecurityGroupIdentifier.h
 include/aws/ec2/model/SecurityGroupReference.h
+include/aws/ec2/model/SendDiagnosticInterruptRequest.h
 include/aws/ec2/model/ServiceConfiguration.h
 include/aws/ec2/model/ServiceDetail.h
 include/aws/ec2/model/ServiceState.h
@@ -6795,6 +7058,18 @@ include/aws/ec2/model/TerminateClientVpnConnectionsResponse.h
 include/aws/ec2/model/TerminateConnectionStatus.h
 include/aws/ec2/model/TerminateInstancesRequest.h
 include/aws/ec2/model/TerminateInstancesResponse.h
+include/aws/ec2/model/TrafficDirection.h
+include/aws/ec2/model/TrafficMirrorFilter.h
+include/aws/ec2/model/TrafficMirrorFilterRule.h
+include/aws/ec2/model/TrafficMirrorFilterRuleField.h
+include/aws/ec2/model/TrafficMirrorNetworkService.h
+include/aws/ec2/model/TrafficMirrorPortRange.h
+include/aws/ec2/model/TrafficMirrorPortRangeRequest.h
+include/aws/ec2/model/TrafficMirrorRuleAction.h
+include/aws/ec2/model/TrafficMirrorSession.h
+include/aws/ec2/model/TrafficMirrorSessionField.h
+include/aws/ec2/model/TrafficMirrorTarget.h
+include/aws/ec2/model/TrafficMirrorTargetType.h
 include/aws/ec2/model/TrafficType.h
 include/aws/ec2/model/TransitGateway.h
 include/aws/ec2/model/TransitGatewayAssociation.h
@@ -6930,6 +7205,7 @@ include/aws/ecr/model/ImageDetail.h
 include/aws/ecr/model/ImageFailure.h
 include/aws/ecr/model/ImageFailureCode.h
 include/aws/ecr/model/ImageIdentifier.h
+include/aws/ecr/model/ImageTagMutability.h
 include/aws/ecr/model/InitiateLayerUploadRequest.h
 include/aws/ecr/model/InitiateLayerUploadResult.h
 include/aws/ecr/model/Layer.h
@@ -6948,6 +7224,8 @@ include/aws/ecr/model/ListTagsForResourceRequest.h
 include/aws/ecr/model/ListTagsForResourceResult.h
 include/aws/ecr/model/PutImageRequest.h
 include/aws/ecr/model/PutImageResult.h
+include/aws/ecr/model/PutImageTagMutabilityRequest.h
+include/aws/ecr/model/PutImageTagMutabilityResult.h
 include/aws/ecr/model/PutLifecyclePolicyRequest.h
 include/aws/ecr/model/PutLifecyclePolicyResult.h
 include/aws/ecr/model/Repository.h
@@ -6977,6 +7255,8 @@ include/aws/ecs/model/Attribute.h
 include/aws/ecs/model/AwsVpcConfiguration.h
 include/aws/ecs/model/Cluster.h
 include/aws/ecs/model/ClusterField.h
+include/aws/ecs/model/ClusterSetting.h
+include/aws/ecs/model/ClusterSettingName.h
 include/aws/ecs/model/Compatibility.h
 include/aws/ecs/model/Connectivity.h
 include/aws/ecs/model/Container.h
@@ -7031,10 +7311,14 @@ include/aws/ecs/model/DiscoverPollEndpointRequest.h
 include/aws/ecs/model/DiscoverPollEndpointResult.h
 include/aws/ecs/model/DockerVolumeConfiguration.h
 include/aws/ecs/model/Failure.h
+include/aws/ecs/model/FirelensConfiguration.h
+include/aws/ecs/model/FirelensConfigurationType.h
 include/aws/ecs/model/HealthCheck.h
 include/aws/ecs/model/HealthStatus.h
 include/aws/ecs/model/HostEntry.h
 include/aws/ecs/model/HostVolumeProperties.h
+include/aws/ecs/model/InferenceAccelerator.h
+include/aws/ecs/model/InferenceAcceleratorOverride.h
 include/aws/ecs/model/IpcMode.h
 include/aws/ecs/model/KernelCapabilities.h
 include/aws/ecs/model/KeyValuePair.h
@@ -7110,6 +7394,8 @@ include/aws/ecs/model/StartTaskRequest.h
 include/aws/ecs/model/StartTaskResult.h
 include/aws/ecs/model/StopTaskRequest.h
 include/aws/ecs/model/StopTaskResult.h
+include/aws/ecs/model/SubmitAttachmentStateChangesRequest.h
+include/aws/ecs/model/SubmitAttachmentStateChangesResult.h
 include/aws/ecs/model/SubmitContainerStateChangeRequest.h
 include/aws/ecs/model/SubmitContainerStateChangeResult.h
 include/aws/ecs/model/SubmitTaskStateChangeRequest.h
@@ -7136,6 +7422,8 @@ include/aws/ecs/model/Ulimit.h
 include/aws/ecs/model/UlimitName.h
 include/aws/ecs/model/UntagResourceRequest.h
 include/aws/ecs/model/UntagResourceResult.h
+include/aws/ecs/model/UpdateClusterSettingsRequest.h
+include/aws/ecs/model/UpdateClusterSettingsResult.h
 include/aws/ecs/model/UpdateContainerAgentRequest.h
 include/aws/ecs/model/UpdateContainerAgentResult.h
 include/aws/ecs/model/UpdateContainerInstancesStateRequest.h
@@ -7168,6 +7456,7 @@ include/aws/eks/model/DescribeUpdateRequest.h
 include/aws/eks/model/DescribeUpdateResult.h
 include/aws/eks/model/ErrorCode.h
 include/aws/eks/model/ErrorDetail.h
+include/aws/eks/model/Identity.h
 include/aws/eks/model/ListClustersRequest.h
 include/aws/eks/model/ListClustersResult.h
 include/aws/eks/model/ListUpdatesRequest.h
@@ -7175,6 +7464,7 @@ include/aws/eks/model/ListUpdatesResult.h
 include/aws/eks/model/LogSetup.h
 include/aws/eks/model/LogType.h
 include/aws/eks/model/Logging.h
+include/aws/eks/model/OIDC.h
 include/aws/eks/model/Update.h
 include/aws/eks/model/UpdateClusterConfigRequest.h
 include/aws/eks/model/UpdateClusterConfigResult.h
@@ -7199,6 +7489,10 @@ include/aws/elasticache/model/AuthorizeCacheSecurityGroupIngressRequest.h
 include/aws/elasticache/model/AuthorizeCacheSecurityGroupIngressResult.h
 include/aws/elasticache/model/AutomaticFailoverStatus.h
 include/aws/elasticache/model/AvailabilityZone.h
+include/aws/elasticache/model/BatchApplyUpdateActionRequest.h
+include/aws/elasticache/model/BatchApplyUpdateActionResult.h
+include/aws/elasticache/model/BatchStopUpdateActionRequest.h
+include/aws/elasticache/model/BatchStopUpdateActionResult.h
 include/aws/elasticache/model/CacheCluster.h
 include/aws/elasticache/model/CacheEngineVersion.h
 include/aws/elasticache/model/CacheNode.h
@@ -7258,8 +7552,12 @@ include/aws/elasticache/model/DescribeReservedCacheNodesOfferingsRequest.h
 include/aws/elasticache/model/DescribeReservedCacheNodesOfferingsResult.h
 include/aws/elasticache/model/DescribeReservedCacheNodesRequest.h
 include/aws/elasticache/model/DescribeReservedCacheNodesResult.h
+include/aws/elasticache/model/DescribeServiceUpdatesRequest.h
+include/aws/elasticache/model/DescribeServiceUpdatesResult.h
 include/aws/elasticache/model/DescribeSnapshotsRequest.h
 include/aws/elasticache/model/DescribeSnapshotsResult.h
+include/aws/elasticache/model/DescribeUpdateActionsRequest.h
+include/aws/elasticache/model/DescribeUpdateActionsResult.h
 include/aws/elasticache/model/EC2SecurityGroup.h
 include/aws/elasticache/model/Endpoint.h
 include/aws/elasticache/model/EngineDefaults.h
@@ -7283,12 +7581,17 @@ include/aws/elasticache/model/ModifyReplicationGroupShardConfigurationResult.h
 include/aws/elasticache/model/NodeGroup.h
 include/aws/elasticache/model/NodeGroupConfiguration.h
 include/aws/elasticache/model/NodeGroupMember.h
+include/aws/elasticache/model/NodeGroupMemberUpdateStatus.h
+include/aws/elasticache/model/NodeGroupUpdateStatus.h
 include/aws/elasticache/model/NodeSnapshot.h
+include/aws/elasticache/model/NodeUpdateInitiatedBy.h
+include/aws/elasticache/model/NodeUpdateStatus.h
 include/aws/elasticache/model/NotificationConfiguration.h
 include/aws/elasticache/model/Parameter.h
 include/aws/elasticache/model/ParameterNameValue.h
 include/aws/elasticache/model/PendingAutomaticFailoverStatus.h
 include/aws/elasticache/model/PendingModifiedValues.h
+include/aws/elasticache/model/ProcessedUpdateAction.h
 include/aws/elasticache/model/PurchaseReservedCacheNodesOfferingRequest.h
 include/aws/elasticache/model/PurchaseReservedCacheNodesOfferingResult.h
 include/aws/elasticache/model/RebootCacheClusterRequest.h
@@ -7308,6 +7611,11 @@ include/aws/elasticache/model/ResponseMetadata.h
 include/aws/elasticache/model/RevokeCacheSecurityGroupIngressRequest.h
 include/aws/elasticache/model/RevokeCacheSecurityGroupIngressResult.h
 include/aws/elasticache/model/SecurityGroupMembership.h
+include/aws/elasticache/model/ServiceUpdate.h
+include/aws/elasticache/model/ServiceUpdateSeverity.h
+include/aws/elasticache/model/ServiceUpdateStatus.h
+include/aws/elasticache/model/ServiceUpdateType.h
+include/aws/elasticache/model/SlaMet.h
 include/aws/elasticache/model/SlotMigration.h
 include/aws/elasticache/model/Snapshot.h
 include/aws/elasticache/model/SourceType.h
@@ -7315,6 +7623,10 @@ include/aws/elasticache/model/Subnet.h
 include/aws/elasticache/model/Tag.h
 include/aws/elasticache/model/TestFailoverRequest.h
 include/aws/elasticache/model/TestFailoverResult.h
+include/aws/elasticache/model/TimeRangeFilter.h
+include/aws/elasticache/model/UnprocessedUpdateAction.h
+include/aws/elasticache/model/UpdateAction.h
+include/aws/elasticache/model/UpdateActionStatus.h
 include/aws/elasticbeanstalk/ElasticBeanstalkClient.h
 include/aws/elasticbeanstalk/ElasticBeanstalkEndpoint.h
 include/aws/elasticbeanstalk/ElasticBeanstalkErrorMarshaller.h
@@ -7745,6 +8057,8 @@ include/aws/elasticmapreduce/model/AutoScalingPolicyState.h
 include/aws/elasticmapreduce/model/AutoScalingPolicyStateChangeReason.h
 include/aws/elasticmapreduce/model/AutoScalingPolicyStateChangeReasonCode.h
 include/aws/elasticmapreduce/model/AutoScalingPolicyStatus.h
+include/aws/elasticmapreduce/model/BlockPublicAccessConfiguration.h
+include/aws/elasticmapreduce/model/BlockPublicAccessConfigurationMetadata.h
 include/aws/elasticmapreduce/model/BootstrapActionConfig.h
 include/aws/elasticmapreduce/model/BootstrapActionDetail.h
 include/aws/elasticmapreduce/model/CancelStepsInfo.h
@@ -7778,6 +8092,8 @@ include/aws/elasticmapreduce/model/EbsConfiguration.h
 include/aws/elasticmapreduce/model/EbsVolume.h
 include/aws/elasticmapreduce/model/Ec2InstanceAttributes.h
 include/aws/elasticmapreduce/model/FailureDetails.h
+include/aws/elasticmapreduce/model/GetBlockPublicAccessConfigurationRequest.h
+include/aws/elasticmapreduce/model/GetBlockPublicAccessConfigurationResult.h
 include/aws/elasticmapreduce/model/HadoopJarStepConfig.h
 include/aws/elasticmapreduce/model/HadoopStepConfig.h
 include/aws/elasticmapreduce/model/Instance.h
@@ -7837,8 +8153,11 @@ include/aws/elasticmapreduce/model/MetricDimension.h
 include/aws/elasticmapreduce/model/ModifyInstanceFleetRequest.h
 include/aws/elasticmapreduce/model/ModifyInstanceGroupsRequest.h
 include/aws/elasticmapreduce/model/PlacementType.h
+include/aws/elasticmapreduce/model/PortRange.h
 include/aws/elasticmapreduce/model/PutAutoScalingPolicyRequest.h
 include/aws/elasticmapreduce/model/PutAutoScalingPolicyResult.h
+include/aws/elasticmapreduce/model/PutBlockPublicAccessConfigurationRequest.h
+include/aws/elasticmapreduce/model/PutBlockPublicAccessConfigurationResult.h
 include/aws/elasticmapreduce/model/RemoveAutoScalingPolicyRequest.h
 include/aws/elasticmapreduce/model/RemoveAutoScalingPolicyResult.h
 include/aws/elasticmapreduce/model/RemoveTagsRequest.h
@@ -8004,6 +8323,7 @@ include/aws/email/model/DeleteReceiptRuleSetResult.h
 include/aws/email/model/DeleteTemplateRequest.h
 include/aws/email/model/DeleteTemplateResult.h
 include/aws/email/model/DeleteVerifiedEmailAddressRequest.h
+include/aws/email/model/DeliveryOptions.h
 include/aws/email/model/DescribeActiveReceiptRuleSetRequest.h
 include/aws/email/model/DescribeActiveReceiptRuleSetResult.h
 include/aws/email/model/DescribeConfigurationSetRequest.h
@@ -8066,6 +8386,8 @@ include/aws/email/model/Message.h
 include/aws/email/model/MessageDsn.h
 include/aws/email/model/MessageTag.h
 include/aws/email/model/NotificationType.h
+include/aws/email/model/PutConfigurationSetDeliveryOptionsRequest.h
+include/aws/email/model/PutConfigurationSetDeliveryOptionsResult.h
 include/aws/email/model/PutIdentityPolicyRequest.h
 include/aws/email/model/PutIdentityPolicyResult.h
 include/aws/email/model/RawMessage.h
@@ -8234,29 +8556,140 @@ include/aws/es/model/VPCDerivedInfoStatus.h
 include/aws/es/model/VPCOptions.h
 include/aws/es/model/VolumeType.h
 include/aws/es/model/ZoneAwarenessConfig.h
+include/aws/eventbridge/EventBridgeClient.h
+include/aws/eventbridge/EventBridgeEndpoint.h
+include/aws/eventbridge/EventBridgeErrorMarshaller.h
+include/aws/eventbridge/EventBridgeErrors.h
+include/aws/eventbridge/EventBridgeRequest.h
+include/aws/eventbridge/EventBridge_EXPORTS.h
+include/aws/eventbridge/model/ActivateEventSourceRequest.h
+include/aws/eventbridge/model/AssignPublicIp.h
+include/aws/eventbridge/model/AwsVpcConfiguration.h
+include/aws/eventbridge/model/BatchArrayProperties.h
+include/aws/eventbridge/model/BatchParameters.h
+include/aws/eventbridge/model/BatchRetryStrategy.h
+include/aws/eventbridge/model/Condition.h
+include/aws/eventbridge/model/CreateEventBusRequest.h
+include/aws/eventbridge/model/CreateEventBusResult.h
+include/aws/eventbridge/model/CreatePartnerEventSourceRequest.h
+include/aws/eventbridge/model/CreatePartnerEventSourceResult.h
+include/aws/eventbridge/model/DeactivateEventSourceRequest.h
+include/aws/eventbridge/model/DeleteEventBusRequest.h
+include/aws/eventbridge/model/DeletePartnerEventSourceRequest.h
+include/aws/eventbridge/model/DeleteRuleRequest.h
+include/aws/eventbridge/model/DescribeEventBusRequest.h
+include/aws/eventbridge/model/DescribeEventBusResult.h
+include/aws/eventbridge/model/DescribeEventSourceRequest.h
+include/aws/eventbridge/model/DescribeEventSourceResult.h
+include/aws/eventbridge/model/DescribePartnerEventSourceRequest.h
+include/aws/eventbridge/model/DescribePartnerEventSourceResult.h
+include/aws/eventbridge/model/DescribeRuleRequest.h
+include/aws/eventbridge/model/DescribeRuleResult.h
+include/aws/eventbridge/model/DisableRuleRequest.h
+include/aws/eventbridge/model/EcsParameters.h
+include/aws/eventbridge/model/EnableRuleRequest.h
+include/aws/eventbridge/model/EventBus.h
+include/aws/eventbridge/model/EventSource.h
+include/aws/eventbridge/model/EventSourceState.h
+include/aws/eventbridge/model/InputTransformer.h
+include/aws/eventbridge/model/KinesisParameters.h
+include/aws/eventbridge/model/LaunchType.h
+include/aws/eventbridge/model/ListEventBusesRequest.h
+include/aws/eventbridge/model/ListEventBusesResult.h
+include/aws/eventbridge/model/ListEventSourcesRequest.h
+include/aws/eventbridge/model/ListEventSourcesResult.h
+include/aws/eventbridge/model/ListPartnerEventSourceAccountsRequest.h
+include/aws/eventbridge/model/ListPartnerEventSourceAccountsResult.h
+include/aws/eventbridge/model/ListPartnerEventSourcesRequest.h
+include/aws/eventbridge/model/ListPartnerEventSourcesResult.h
+include/aws/eventbridge/model/ListRuleNamesByTargetRequest.h
+include/aws/eventbridge/model/ListRuleNamesByTargetResult.h
+include/aws/eventbridge/model/ListRulesRequest.h
+include/aws/eventbridge/model/ListRulesResult.h
+include/aws/eventbridge/model/ListTagsForResourceRequest.h
+include/aws/eventbridge/model/ListTagsForResourceResult.h
+include/aws/eventbridge/model/ListTargetsByRuleRequest.h
+include/aws/eventbridge/model/ListTargetsByRuleResult.h
+include/aws/eventbridge/model/NetworkConfiguration.h
+include/aws/eventbridge/model/PartnerEventSource.h
+include/aws/eventbridge/model/PartnerEventSourceAccount.h
+include/aws/eventbridge/model/PutEventsRequest.h
+include/aws/eventbridge/model/PutEventsRequestEntry.h
+include/aws/eventbridge/model/PutEventsResult.h
+include/aws/eventbridge/model/PutEventsResultEntry.h
+include/aws/eventbridge/model/PutPartnerEventsRequest.h
+include/aws/eventbridge/model/PutPartnerEventsRequestEntry.h
+include/aws/eventbridge/model/PutPartnerEventsResult.h
+include/aws/eventbridge/model/PutPartnerEventsResultEntry.h
+include/aws/eventbridge/model/PutPermissionRequest.h
+include/aws/eventbridge/model/PutRuleRequest.h
+include/aws/eventbridge/model/PutRuleResult.h
+include/aws/eventbridge/model/PutTargetsRequest.h
+include/aws/eventbridge/model/PutTargetsResult.h
+include/aws/eventbridge/model/PutTargetsResultEntry.h
+include/aws/eventbridge/model/RemovePermissionRequest.h
+include/aws/eventbridge/model/RemoveTargetsRequest.h
+include/aws/eventbridge/model/RemoveTargetsResult.h
+include/aws/eventbridge/model/RemoveTargetsResultEntry.h
+include/aws/eventbridge/model/Rule.h
+include/aws/eventbridge/model/RuleState.h
+include/aws/eventbridge/model/RunCommandParameters.h
+include/aws/eventbridge/model/RunCommandTarget.h
+include/aws/eventbridge/model/SqsParameters.h
+include/aws/eventbridge/model/Tag.h
+include/aws/eventbridge/model/TagResourceRequest.h
+include/aws/eventbridge/model/TagResourceResult.h
+include/aws/eventbridge/model/Target.h
+include/aws/eventbridge/model/TestEventPatternRequest.h
+include/aws/eventbridge/model/TestEventPatternResult.h
+include/aws/eventbridge/model/UntagResourceRequest.h
+include/aws/eventbridge/model/UntagResourceResult.h
 include/aws/events/CloudWatchEventsClient.h
 include/aws/events/CloudWatchEventsEndpoint.h
 include/aws/events/CloudWatchEventsErrorMarshaller.h
 include/aws/events/CloudWatchEventsErrors.h
 include/aws/events/CloudWatchEventsRequest.h
 include/aws/events/CloudWatchEvents_EXPORTS.h
+include/aws/events/model/ActivateEventSourceRequest.h
 include/aws/events/model/AssignPublicIp.h
 include/aws/events/model/AwsVpcConfiguration.h
 include/aws/events/model/BatchArrayProperties.h
 include/aws/events/model/BatchParameters.h
 include/aws/events/model/BatchRetryStrategy.h
 include/aws/events/model/Condition.h
+include/aws/events/model/CreateEventBusRequest.h
+include/aws/events/model/CreateEventBusResult.h
+include/aws/events/model/CreatePartnerEventSourceRequest.h
+include/aws/events/model/CreatePartnerEventSourceResult.h
+include/aws/events/model/DeactivateEventSourceRequest.h
+include/aws/events/model/DeleteEventBusRequest.h
+include/aws/events/model/DeletePartnerEventSourceRequest.h
 include/aws/events/model/DeleteRuleRequest.h
 include/aws/events/model/DescribeEventBusRequest.h
 include/aws/events/model/DescribeEventBusResult.h
+include/aws/events/model/DescribeEventSourceRequest.h
+include/aws/events/model/DescribeEventSourceResult.h
+include/aws/events/model/DescribePartnerEventSourceRequest.h
+include/aws/events/model/DescribePartnerEventSourceResult.h
 include/aws/events/model/DescribeRuleRequest.h
 include/aws/events/model/DescribeRuleResult.h
 include/aws/events/model/DisableRuleRequest.h
 include/aws/events/model/EcsParameters.h
 include/aws/events/model/EnableRuleRequest.h
+include/aws/events/model/EventBus.h
+include/aws/events/model/EventSource.h
+include/aws/events/model/EventSourceState.h
 include/aws/events/model/InputTransformer.h
 include/aws/events/model/KinesisParameters.h
 include/aws/events/model/LaunchType.h
+include/aws/events/model/ListEventBusesRequest.h
+include/aws/events/model/ListEventBusesResult.h
+include/aws/events/model/ListEventSourcesRequest.h
+include/aws/events/model/ListEventSourcesResult.h
+include/aws/events/model/ListPartnerEventSourceAccountsRequest.h
+include/aws/events/model/ListPartnerEventSourceAccountsResult.h
+include/aws/events/model/ListPartnerEventSourcesRequest.h
+include/aws/events/model/ListPartnerEventSourcesResult.h
 include/aws/events/model/ListRuleNamesByTargetRequest.h
 include/aws/events/model/ListRuleNamesByTargetResult.h
 include/aws/events/model/ListRulesRequest.h
@@ -8266,10 +8699,16 @@ include/aws/events/model/ListTagsForResourceResult.h
 include/aws/events/model/ListTargetsByRuleRequest.h
 include/aws/events/model/ListTargetsByRuleResult.h
 include/aws/events/model/NetworkConfiguration.h
+include/aws/events/model/PartnerEventSource.h
+include/aws/events/model/PartnerEventSourceAccount.h
 include/aws/events/model/PutEventsRequest.h
 include/aws/events/model/PutEventsRequestEntry.h
 include/aws/events/model/PutEventsResult.h
 include/aws/events/model/PutEventsResultEntry.h
+include/aws/events/model/PutPartnerEventsRequest.h
+include/aws/events/model/PutPartnerEventsRequestEntry.h
+include/aws/events/model/PutPartnerEventsResult.h
+include/aws/events/model/PutPartnerEventsResultEntry.h
 include/aws/events/model/PutPermissionRequest.h
 include/aws/events/model/PutRuleRequest.h
 include/aws/events/model/PutRuleResult.h
@@ -8429,12 +8868,111 @@ include/aws/fms/model/ResourceTag.h
 include/aws/fms/model/SecurityServicePolicyData.h
 include/aws/fms/model/SecurityServiceType.h
 include/aws/fms/model/ViolationReason.h
+include/aws/forecast/ForecastServiceClient.h
+include/aws/forecast/ForecastServiceEndpoint.h
+include/aws/forecast/ForecastServiceErrorMarshaller.h
+include/aws/forecast/ForecastServiceErrors.h
+include/aws/forecast/ForecastServiceRequest.h
+include/aws/forecast/ForecastService_EXPORTS.h
+include/aws/forecast/model/AttributeType.h
+include/aws/forecast/model/CategoricalParameterRange.h
+include/aws/forecast/model/ContinuousParameterRange.h
+include/aws/forecast/model/CreateDatasetGroupRequest.h
+include/aws/forecast/model/CreateDatasetGroupResult.h
+include/aws/forecast/model/CreateDatasetImportJobRequest.h
+include/aws/forecast/model/CreateDatasetImportJobResult.h
+include/aws/forecast/model/CreateDatasetRequest.h
+include/aws/forecast/model/CreateDatasetResult.h
+include/aws/forecast/model/CreateForecastExportJobRequest.h
+include/aws/forecast/model/CreateForecastExportJobResult.h
+include/aws/forecast/model/CreateForecastRequest.h
+include/aws/forecast/model/CreateForecastResult.h
+include/aws/forecast/model/CreatePredictorRequest.h
+include/aws/forecast/model/CreatePredictorResult.h
+include/aws/forecast/model/DataDestination.h
+include/aws/forecast/model/DataSource.h
+include/aws/forecast/model/DatasetGroupSummary.h
+include/aws/forecast/model/DatasetImportJobSummary.h
+include/aws/forecast/model/DatasetSummary.h
+include/aws/forecast/model/DatasetType.h
+include/aws/forecast/model/DeleteDatasetGroupRequest.h
+include/aws/forecast/model/DeleteDatasetImportJobRequest.h
+include/aws/forecast/model/DeleteDatasetRequest.h
+include/aws/forecast/model/DeleteForecastExportJobRequest.h
+include/aws/forecast/model/DeleteForecastRequest.h
+include/aws/forecast/model/DeletePredictorRequest.h
+include/aws/forecast/model/DescribeDatasetGroupRequest.h
+include/aws/forecast/model/DescribeDatasetGroupResult.h
+include/aws/forecast/model/DescribeDatasetImportJobRequest.h
+include/aws/forecast/model/DescribeDatasetImportJobResult.h
+include/aws/forecast/model/DescribeDatasetRequest.h
+include/aws/forecast/model/DescribeDatasetResult.h
+include/aws/forecast/model/DescribeForecastExportJobRequest.h
+include/aws/forecast/model/DescribeForecastExportJobResult.h
+include/aws/forecast/model/DescribeForecastRequest.h
+include/aws/forecast/model/DescribeForecastResult.h
+include/aws/forecast/model/DescribePredictorRequest.h
+include/aws/forecast/model/DescribePredictorResult.h
+include/aws/forecast/model/Domain.h
+include/aws/forecast/model/EncryptionConfig.h
+include/aws/forecast/model/EvaluationParameters.h
+include/aws/forecast/model/EvaluationResult.h
+include/aws/forecast/model/EvaluationType.h
+include/aws/forecast/model/Featurization.h
+include/aws/forecast/model/FeaturizationConfig.h
+include/aws/forecast/model/FeaturizationMethod.h
+include/aws/forecast/model/FeaturizationMethodName.h
+include/aws/forecast/model/Filter.h
+include/aws/forecast/model/FilterConditionString.h
+include/aws/forecast/model/ForecastExportJobSummary.h
+include/aws/forecast/model/ForecastSummary.h
+include/aws/forecast/model/GetAccuracyMetricsRequest.h
+include/aws/forecast/model/GetAccuracyMetricsResult.h
+include/aws/forecast/model/HyperParameterTuningJobConfig.h
+include/aws/forecast/model/InputDataConfig.h
+include/aws/forecast/model/IntegerParameterRange.h
+include/aws/forecast/model/ListDatasetGroupsRequest.h
+include/aws/forecast/model/ListDatasetGroupsResult.h
+include/aws/forecast/model/ListDatasetImportJobsRequest.h
+include/aws/forecast/model/ListDatasetImportJobsResult.h
+include/aws/forecast/model/ListDatasetsRequest.h
+include/aws/forecast/model/ListDatasetsResult.h
+include/aws/forecast/model/ListForecastExportJobsRequest.h
+include/aws/forecast/model/ListForecastExportJobsResult.h
+include/aws/forecast/model/ListForecastsRequest.h
+include/aws/forecast/model/ListForecastsResult.h
+include/aws/forecast/model/ListPredictorsRequest.h
+include/aws/forecast/model/ListPredictorsResult.h
+include/aws/forecast/model/Metrics.h
+include/aws/forecast/model/ParameterRanges.h
+include/aws/forecast/model/PredictorSummary.h
+include/aws/forecast/model/S3Config.h
+include/aws/forecast/model/ScalingType.h
+include/aws/forecast/model/Schema.h
+include/aws/forecast/model/SchemaAttribute.h
+include/aws/forecast/model/Statistics.h
+include/aws/forecast/model/SupplementaryFeature.h
+include/aws/forecast/model/UpdateDatasetGroupRequest.h
+include/aws/forecast/model/UpdateDatasetGroupResult.h
+include/aws/forecast/model/WeightedQuantileLoss.h
+include/aws/forecast/model/WindowSummary.h
+include/aws/forecastquery/ForecastQueryServiceClient.h
+include/aws/forecastquery/ForecastQueryServiceEndpoint.h
+include/aws/forecastquery/ForecastQueryServiceErrorMarshaller.h
+include/aws/forecastquery/ForecastQueryServiceErrors.h
+include/aws/forecastquery/ForecastQueryServiceRequest.h
+include/aws/forecastquery/ForecastQueryService_EXPORTS.h
+include/aws/forecastquery/model/DataPoint.h
+include/aws/forecastquery/model/Forecast.h
+include/aws/forecastquery/model/QueryForecastRequest.h
+include/aws/forecastquery/model/QueryForecastResult.h
 include/aws/fsx/FSxClient.h
 include/aws/fsx/FSxEndpoint.h
 include/aws/fsx/FSxErrorMarshaller.h
 include/aws/fsx/FSxErrors.h
 include/aws/fsx/FSxRequest.h
 include/aws/fsx/FSx_EXPORTS.h
+include/aws/fsx/model/ActiveDirectoryBackupAttributes.h
 include/aws/fsx/model/ActiveDirectoryErrorType.h
 include/aws/fsx/model/Backup.h
 include/aws/fsx/model/BackupFailureDetails.h
@@ -8469,6 +9007,9 @@ include/aws/fsx/model/FilterName.h
 include/aws/fsx/model/ListTagsForResourceRequest.h
 include/aws/fsx/model/ListTagsForResourceResult.h
 include/aws/fsx/model/LustreFileSystemConfiguration.h
+include/aws/fsx/model/SelfManagedActiveDirectoryAttributes.h
+include/aws/fsx/model/SelfManagedActiveDirectoryConfiguration.h
+include/aws/fsx/model/SelfManagedActiveDirectoryConfigurationUpdates.h
 include/aws/fsx/model/ServiceLimit.h
 include/aws/fsx/model/Tag.h
 include/aws/fsx/model/TagResourceRequest.h
@@ -8492,8 +9033,11 @@ include/aws/gamelift/model/AcceptanceType.h
 include/aws/gamelift/model/Alias.h
 include/aws/gamelift/model/AttributeValue.h
 include/aws/gamelift/model/AwsCredentials.h
+include/aws/gamelift/model/BackfillMode.h
 include/aws/gamelift/model/Build.h
 include/aws/gamelift/model/BuildStatus.h
+include/aws/gamelift/model/CertificateConfiguration.h
+include/aws/gamelift/model/CertificateType.h
 include/aws/gamelift/model/ComparisonOperatorType.h
 include/aws/gamelift/model/CreateAliasRequest.h
 include/aws/gamelift/model/CreateAliasResult.h
@@ -8863,10 +9407,14 @@ include/aws/glue/model/BatchGetPartitionRequest.h
 include/aws/glue/model/BatchGetPartitionResult.h
 include/aws/glue/model/BatchGetTriggersRequest.h
 include/aws/glue/model/BatchGetTriggersResult.h
+include/aws/glue/model/BatchGetWorkflowsRequest.h
+include/aws/glue/model/BatchGetWorkflowsResult.h
 include/aws/glue/model/BatchStopJobRunError.h
 include/aws/glue/model/BatchStopJobRunRequest.h
 include/aws/glue/model/BatchStopJobRunResult.h
 include/aws/glue/model/BatchStopJobRunSuccessfulSubmission.h
+include/aws/glue/model/CancelMLTaskRunRequest.h
+include/aws/glue/model/CancelMLTaskRunResult.h
 include/aws/glue/model/CatalogEncryptionMode.h
 include/aws/glue/model/CatalogEntry.h
 include/aws/glue/model/CatalogImportStatus.h
@@ -8878,15 +9426,20 @@ include/aws/glue/model/CodeGenEdge.h
 include/aws/glue/model/CodeGenNode.h
 include/aws/glue/model/CodeGenNodeArg.h
 include/aws/glue/model/Column.h
+include/aws/glue/model/Comparator.h
 include/aws/glue/model/Condition.h
+include/aws/glue/model/ConfusionMatrix.h
 include/aws/glue/model/Connection.h
 include/aws/glue/model/ConnectionInput.h
 include/aws/glue/model/ConnectionPasswordEncryption.h
 include/aws/glue/model/ConnectionPropertyKey.h
 include/aws/glue/model/ConnectionType.h
 include/aws/glue/model/ConnectionsList.h
+include/aws/glue/model/Crawl.h
+include/aws/glue/model/CrawlState.h
 include/aws/glue/model/Crawler.h
 include/aws/glue/model/CrawlerMetrics.h
+include/aws/glue/model/CrawlerNodeDetails.h
 include/aws/glue/model/CrawlerState.h
 include/aws/glue/model/CrawlerTargets.h
 include/aws/glue/model/CreateClassifierRequest.h
@@ -8904,6 +9457,8 @@ include/aws/glue/model/CreateGrokClassifierRequest.h
 include/aws/glue/model/CreateJobRequest.h
 include/aws/glue/model/CreateJobResult.h
 include/aws/glue/model/CreateJsonClassifierRequest.h
+include/aws/glue/model/CreateMLTransformRequest.h
+include/aws/glue/model/CreateMLTransformResult.h
 include/aws/glue/model/CreatePartitionRequest.h
 include/aws/glue/model/CreatePartitionResult.h
 include/aws/glue/model/CreateScriptRequest.h
@@ -8916,10 +9471,13 @@ include/aws/glue/model/CreateTriggerRequest.h
 include/aws/glue/model/CreateTriggerResult.h
 include/aws/glue/model/CreateUserDefinedFunctionRequest.h
 include/aws/glue/model/CreateUserDefinedFunctionResult.h
+include/aws/glue/model/CreateWorkflowRequest.h
+include/aws/glue/model/CreateWorkflowResult.h
 include/aws/glue/model/CreateXMLClassifierRequest.h
 include/aws/glue/model/CsvClassifier.h
 include/aws/glue/model/CsvHeaderOption.h
 include/aws/glue/model/DataCatalogEncryptionSettings.h
+include/aws/glue/model/DataLakePrincipal.h
 include/aws/glue/model/Database.h
 include/aws/glue/model/DatabaseInput.h
 include/aws/glue/model/DeleteBehavior.h
@@ -8935,6 +9493,8 @@ include/aws/glue/model/DeleteDevEndpointRequest.h
 include/aws/glue/model/DeleteDevEndpointResult.h
 include/aws/glue/model/DeleteJobRequest.h
 include/aws/glue/model/DeleteJobResult.h
+include/aws/glue/model/DeleteMLTransformRequest.h
+include/aws/glue/model/DeleteMLTransformResult.h
 include/aws/glue/model/DeletePartitionRequest.h
 include/aws/glue/model/DeletePartitionResult.h
 include/aws/glue/model/DeleteResourcePolicyRequest.h
@@ -8949,14 +9509,22 @@ include/aws/glue/model/DeleteTriggerRequest.h
 include/aws/glue/model/DeleteTriggerResult.h
 include/aws/glue/model/DeleteUserDefinedFunctionRequest.h
 include/aws/glue/model/DeleteUserDefinedFunctionResult.h
+include/aws/glue/model/DeleteWorkflowRequest.h
+include/aws/glue/model/DeleteWorkflowResult.h
 include/aws/glue/model/DevEndpoint.h
 include/aws/glue/model/DevEndpointCustomLibraries.h
 include/aws/glue/model/DynamoDBTarget.h
+include/aws/glue/model/Edge.h
 include/aws/glue/model/EncryptionAtRest.h
 include/aws/glue/model/EncryptionConfiguration.h
 include/aws/glue/model/ErrorDetail.h
+include/aws/glue/model/EvaluationMetrics.h
 include/aws/glue/model/ExecutionProperty.h
 include/aws/glue/model/ExistCondition.h
+include/aws/glue/model/ExportLabelsTaskRunProperties.h
+include/aws/glue/model/FindMatchesMetrics.h
+include/aws/glue/model/FindMatchesParameters.h
+include/aws/glue/model/FindMatchesTaskRunProperties.h
 include/aws/glue/model/GetCatalogImportStatusRequest.h
 include/aws/glue/model/GetCatalogImportStatusResult.h
 include/aws/glue/model/GetClassifierRequest.h
@@ -8986,6 +9554,8 @@ include/aws/glue/model/GetDevEndpointRequest.h
 include/aws/glue/model/GetDevEndpointResult.h
 include/aws/glue/model/GetDevEndpointsRequest.h
 include/aws/glue/model/GetDevEndpointsResult.h
+include/aws/glue/model/GetJobBookmarkRequest.h
+include/aws/glue/model/GetJobBookmarkResult.h
 include/aws/glue/model/GetJobRequest.h
 include/aws/glue/model/GetJobResult.h
 include/aws/glue/model/GetJobRunRequest.h
@@ -8994,6 +9564,14 @@ include/aws/glue/model/GetJobRunsRequest.h
 include/aws/glue/model/GetJobRunsResult.h
 include/aws/glue/model/GetJobsRequest.h
 include/aws/glue/model/GetJobsResult.h
+include/aws/glue/model/GetMLTaskRunRequest.h
+include/aws/glue/model/GetMLTaskRunResult.h
+include/aws/glue/model/GetMLTaskRunsRequest.h
+include/aws/glue/model/GetMLTaskRunsResult.h
+include/aws/glue/model/GetMLTransformRequest.h
+include/aws/glue/model/GetMLTransformResult.h
+include/aws/glue/model/GetMLTransformsRequest.h
+include/aws/glue/model/GetMLTransformsResult.h
 include/aws/glue/model/GetMappingRequest.h
 include/aws/glue/model/GetMappingResult.h
 include/aws/glue/model/GetPartitionRequest.h
@@ -9026,19 +9604,31 @@ include/aws/glue/model/GetUserDefinedFunctionRequest.h
 include/aws/glue/model/GetUserDefinedFunctionResult.h
 include/aws/glue/model/GetUserDefinedFunctionsRequest.h
 include/aws/glue/model/GetUserDefinedFunctionsResult.h
+include/aws/glue/model/GetWorkflowRequest.h
+include/aws/glue/model/GetWorkflowResult.h
+include/aws/glue/model/GetWorkflowRunPropertiesRequest.h
+include/aws/glue/model/GetWorkflowRunPropertiesResult.h
+include/aws/glue/model/GetWorkflowRunRequest.h
+include/aws/glue/model/GetWorkflowRunResult.h
+include/aws/glue/model/GetWorkflowRunsRequest.h
+include/aws/glue/model/GetWorkflowRunsResult.h
+include/aws/glue/model/GlueTable.h
 include/aws/glue/model/GrokClassifier.h
 include/aws/glue/model/ImportCatalogToGlueRequest.h
 include/aws/glue/model/ImportCatalogToGlueResult.h
+include/aws/glue/model/ImportLabelsTaskRunProperties.h
 include/aws/glue/model/JdbcTarget.h
 include/aws/glue/model/Job.h
 include/aws/glue/model/JobBookmarkEntry.h
 include/aws/glue/model/JobBookmarksEncryption.h
 include/aws/glue/model/JobBookmarksEncryptionMode.h
 include/aws/glue/model/JobCommand.h
+include/aws/glue/model/JobNodeDetails.h
 include/aws/glue/model/JobRun.h
 include/aws/glue/model/JobRunState.h
 include/aws/glue/model/JobUpdate.h
 include/aws/glue/model/JsonClassifier.h
+include/aws/glue/model/LabelingSetGenerationTaskRunProperties.h
 include/aws/glue/model/Language.h
 include/aws/glue/model/LastCrawlInfo.h
 include/aws/glue/model/LastCrawlStatus.h
@@ -9050,24 +9640,34 @@ include/aws/glue/model/ListJobsRequest.h
 include/aws/glue/model/ListJobsResult.h
 include/aws/glue/model/ListTriggersRequest.h
 include/aws/glue/model/ListTriggersResult.h
+include/aws/glue/model/ListWorkflowsRequest.h
+include/aws/glue/model/ListWorkflowsResult.h
 include/aws/glue/model/Location.h
 include/aws/glue/model/Logical.h
 include/aws/glue/model/LogicalOperator.h
+include/aws/glue/model/MLTransform.h
 include/aws/glue/model/MappingEntry.h
+include/aws/glue/model/Node.h
+include/aws/glue/model/NodeType.h
 include/aws/glue/model/NotificationProperty.h
 include/aws/glue/model/Order.h
 include/aws/glue/model/Partition.h
 include/aws/glue/model/PartitionError.h
 include/aws/glue/model/PartitionInput.h
 include/aws/glue/model/PartitionValueList.h
+include/aws/glue/model/Permission.h
 include/aws/glue/model/PhysicalConnectionRequirements.h
 include/aws/glue/model/Predecessor.h
 include/aws/glue/model/Predicate.h
+include/aws/glue/model/PrincipalPermissions.h
 include/aws/glue/model/PrincipalType.h
+include/aws/glue/model/PropertyPredicate.h
 include/aws/glue/model/PutDataCatalogEncryptionSettingsRequest.h
 include/aws/glue/model/PutDataCatalogEncryptionSettingsResult.h
 include/aws/glue/model/PutResourcePolicyRequest.h
 include/aws/glue/model/PutResourcePolicyResult.h
+include/aws/glue/model/PutWorkflowRunPropertiesRequest.h
+include/aws/glue/model/PutWorkflowRunPropertiesResult.h
 include/aws/glue/model/ResetJobBookmarkRequest.h
 include/aws/glue/model/ResetJobBookmarkResult.h
 include/aws/glue/model/ResourceType.h
@@ -9078,18 +9678,34 @@ include/aws/glue/model/S3Target.h
 include/aws/glue/model/Schedule.h
 include/aws/glue/model/ScheduleState.h
 include/aws/glue/model/SchemaChangePolicy.h
+include/aws/glue/model/SchemaColumn.h
+include/aws/glue/model/SearchTablesRequest.h
+include/aws/glue/model/SearchTablesResult.h
 include/aws/glue/model/SecurityConfiguration.h
 include/aws/glue/model/Segment.h
 include/aws/glue/model/SerDeInfo.h
 include/aws/glue/model/SkewedInfo.h
+include/aws/glue/model/Sort.h
+include/aws/glue/model/SortCriterion.h
+include/aws/glue/model/SortDirectionType.h
 include/aws/glue/model/StartCrawlerRequest.h
 include/aws/glue/model/StartCrawlerResult.h
 include/aws/glue/model/StartCrawlerScheduleRequest.h
 include/aws/glue/model/StartCrawlerScheduleResult.h
+include/aws/glue/model/StartExportLabelsTaskRunRequest.h
+include/aws/glue/model/StartExportLabelsTaskRunResult.h
+include/aws/glue/model/StartImportLabelsTaskRunRequest.h
+include/aws/glue/model/StartImportLabelsTaskRunResult.h
 include/aws/glue/model/StartJobRunRequest.h
 include/aws/glue/model/StartJobRunResult.h
+include/aws/glue/model/StartMLEvaluationTaskRunRequest.h
+include/aws/glue/model/StartMLEvaluationTaskRunResult.h
+include/aws/glue/model/StartMLLabelingSetGenerationTaskRunRequest.h
+include/aws/glue/model/StartMLLabelingSetGenerationTaskRunResult.h
 include/aws/glue/model/StartTriggerRequest.h
 include/aws/glue/model/StartTriggerResult.h
+include/aws/glue/model/StartWorkflowRunRequest.h
+include/aws/glue/model/StartWorkflowRunResult.h
 include/aws/glue/model/StopCrawlerRequest.h
 include/aws/glue/model/StopCrawlerResult.h
 include/aws/glue/model/StopCrawlerScheduleRequest.h
@@ -9104,7 +9720,21 @@ include/aws/glue/model/TableVersion.h
 include/aws/glue/model/TableVersionError.h
 include/aws/glue/model/TagResourceRequest.h
 include/aws/glue/model/TagResourceResult.h
+include/aws/glue/model/TaskRun.h
+include/aws/glue/model/TaskRunFilterCriteria.h
+include/aws/glue/model/TaskRunProperties.h
+include/aws/glue/model/TaskRunSortColumnType.h
+include/aws/glue/model/TaskRunSortCriteria.h
+include/aws/glue/model/TaskStatusType.h
+include/aws/glue/model/TaskType.h
+include/aws/glue/model/TransformFilterCriteria.h
+include/aws/glue/model/TransformParameters.h
+include/aws/glue/model/TransformSortColumnType.h
+include/aws/glue/model/TransformSortCriteria.h
+include/aws/glue/model/TransformStatusType.h
+include/aws/glue/model/TransformType.h
 include/aws/glue/model/Trigger.h
+include/aws/glue/model/TriggerNodeDetails.h
 include/aws/glue/model/TriggerState.h
 include/aws/glue/model/TriggerType.h
 include/aws/glue/model/TriggerUpdate.h
@@ -9128,6 +9758,8 @@ include/aws/glue/model/UpdateGrokClassifierRequest.h
 include/aws/glue/model/UpdateJobRequest.h
 include/aws/glue/model/UpdateJobResult.h
 include/aws/glue/model/UpdateJsonClassifierRequest.h
+include/aws/glue/model/UpdateMLTransformRequest.h
+include/aws/glue/model/UpdateMLTransformResult.h
 include/aws/glue/model/UpdatePartitionRequest.h
 include/aws/glue/model/UpdatePartitionResult.h
 include/aws/glue/model/UpdateTableRequest.h
@@ -9136,10 +9768,17 @@ include/aws/glue/model/UpdateTriggerRequest.h
 include/aws/glue/model/UpdateTriggerResult.h
 include/aws/glue/model/UpdateUserDefinedFunctionRequest.h
 include/aws/glue/model/UpdateUserDefinedFunctionResult.h
+include/aws/glue/model/UpdateWorkflowRequest.h
+include/aws/glue/model/UpdateWorkflowResult.h
 include/aws/glue/model/UpdateXMLClassifierRequest.h
 include/aws/glue/model/UserDefinedFunction.h
 include/aws/glue/model/UserDefinedFunctionInput.h
 include/aws/glue/model/WorkerType.h
+include/aws/glue/model/Workflow.h
+include/aws/glue/model/WorkflowGraph.h
+include/aws/glue/model/WorkflowRun.h
+include/aws/glue/model/WorkflowRunStatistics.h
+include/aws/glue/model/WorkflowRunStatus.h
 include/aws/glue/model/XMLClassifier.h
 include/aws/greengrass/GreengrassClient.h
 include/aws/greengrass/GreengrassEndpoint.h
@@ -9516,6 +10155,7 @@ include/aws/guardduty/model/DisassociateMembersRequest.h
 include/aws/guardduty/model/DisassociateMembersResult.h
 include/aws/guardduty/model/DnsRequestAction.h
 include/aws/guardduty/model/DomainDetails.h
+include/aws/guardduty/model/Evidence.h
 include/aws/guardduty/model/Feedback.h
 include/aws/guardduty/model/FilterAction.h
 include/aws/guardduty/model/Finding.h
@@ -9561,6 +10201,8 @@ include/aws/guardduty/model/ListInvitationsRequest.h
 include/aws/guardduty/model/ListInvitationsResult.h
 include/aws/guardduty/model/ListMembersRequest.h
 include/aws/guardduty/model/ListMembersResult.h
+include/aws/guardduty/model/ListTagsForResourceRequest.h
+include/aws/guardduty/model/ListTagsForResourceResult.h
 include/aws/guardduty/model/ListThreatIntelSetsRequest.h
 include/aws/guardduty/model/ListThreatIntelSetsResult.h
 include/aws/guardduty/model/LocalPortDetails.h
@@ -9585,11 +10227,16 @@ include/aws/guardduty/model/StartMonitoringMembersResult.h
 include/aws/guardduty/model/StopMonitoringMembersRequest.h
 include/aws/guardduty/model/StopMonitoringMembersResult.h
 include/aws/guardduty/model/Tag.h
+include/aws/guardduty/model/TagResourceRequest.h
+include/aws/guardduty/model/TagResourceResult.h
 include/aws/guardduty/model/ThreatIntelSetFormat.h
 include/aws/guardduty/model/ThreatIntelSetStatus.h
+include/aws/guardduty/model/ThreatIntelligenceDetail.h
 include/aws/guardduty/model/UnarchiveFindingsRequest.h
 include/aws/guardduty/model/UnarchiveFindingsResult.h
 include/aws/guardduty/model/UnprocessedAccount.h
+include/aws/guardduty/model/UntagResourceRequest.h
+include/aws/guardduty/model/UntagResourceResult.h
 include/aws/guardduty/model/UpdateDetectorRequest.h
 include/aws/guardduty/model/UpdateDetectorResult.h
 include/aws/guardduty/model/UpdateFilterRequest.h
@@ -9638,6 +10285,7 @@ include/aws/iam/IAMErrorMarshaller.h
 include/aws/iam/IAMErrors.h
 include/aws/iam/IAMRequest.h
 include/aws/iam/IAM_EXPORTS.h
+include/aws/iam/model/AccessDetail.h
 include/aws/iam/model/AccessKey.h
 include/aws/iam/model/AccessKeyLastUsed.h
 include/aws/iam/model/AccessKeyMetadata.h
@@ -9719,6 +10367,8 @@ include/aws/iam/model/ErrorDetails.h
 include/aws/iam/model/EvaluationResult.h
 include/aws/iam/model/GenerateCredentialReportRequest.h
 include/aws/iam/model/GenerateCredentialReportResult.h
+include/aws/iam/model/GenerateOrganizationsAccessReportRequest.h
+include/aws/iam/model/GenerateOrganizationsAccessReportResult.h
 include/aws/iam/model/GenerateServiceLastAccessedDetailsRequest.h
 include/aws/iam/model/GenerateServiceLastAccessedDetailsResult.h
 include/aws/iam/model/GetAccessKeyLastUsedRequest.h
@@ -9745,6 +10395,8 @@ include/aws/iam/model/GetLoginProfileRequest.h
 include/aws/iam/model/GetLoginProfileResult.h
 include/aws/iam/model/GetOpenIDConnectProviderRequest.h
 include/aws/iam/model/GetOpenIDConnectProviderResult.h
+include/aws/iam/model/GetOrganizationsAccessReportRequest.h
+include/aws/iam/model/GetOrganizationsAccessReportResult.h
 include/aws/iam/model/GetPolicyRequest.h
 include/aws/iam/model/GetPolicyResult.h
 include/aws/iam/model/GetPolicyVersionRequest.h
@@ -9885,6 +10537,7 @@ include/aws/iam/model/SimulateCustomPolicyRequest.h
 include/aws/iam/model/SimulateCustomPolicyResult.h
 include/aws/iam/model/SimulatePrincipalPolicyRequest.h
 include/aws/iam/model/SimulatePrincipalPolicyResult.h
+include/aws/iam/model/SortKeyType.h
 include/aws/iam/model/Statement.h
 include/aws/iam/model/StatusType.h
 include/aws/iam/model/SummaryKeyType.h
@@ -9923,6 +10576,7 @@ include/aws/identity-management/IdentityManagment_EXPORTS.h
 include/aws/identity-management/auth/CognitoCachingCredentialsProvider.h
 include/aws/identity-management/auth/PersistentCognitoIdentityProvider.h
 include/aws/identity-management/auth/STSAssumeRoleCredentialsProvider.h
+include/aws/identity-management/auth/STSProfileCredentialsProvider.h
 include/aws/importexport/ImportExportClient.h
 include/aws/importexport/ImportExportEndpoint.h
 include/aws/importexport/ImportExportErrorMarshaller.h
@@ -10116,6 +10770,7 @@ include/aws/iot/model/AddThingToBillingGroupRequest.h
 include/aws/iot/model/AddThingToBillingGroupResult.h
 include/aws/iot/model/AddThingToThingGroupRequest.h
 include/aws/iot/model/AddThingToThingGroupResult.h
+include/aws/iot/model/AddThingsToThingGroupParams.h
 include/aws/iot/model/AlertTarget.h
 include/aws/iot/model/AlertTargetType.h
 include/aws/iot/model/Allowed.h
@@ -10133,6 +10788,11 @@ include/aws/iot/model/AuditCheckRunStatus.h
 include/aws/iot/model/AuditFinding.h
 include/aws/iot/model/AuditFindingSeverity.h
 include/aws/iot/model/AuditFrequency.h
+include/aws/iot/model/AuditMitigationActionExecutionMetadata.h
+include/aws/iot/model/AuditMitigationActionsExecutionStatus.h
+include/aws/iot/model/AuditMitigationActionsTaskMetadata.h
+include/aws/iot/model/AuditMitigationActionsTaskStatus.h
+include/aws/iot/model/AuditMitigationActionsTaskTarget.h
 include/aws/iot/model/AuditNotificationTarget.h
 include/aws/iot/model/AuditNotificationType.h
 include/aws/iot/model/AuditTaskMetadata.h
@@ -10153,6 +10813,9 @@ include/aws/iot/model/BillingGroupProperties.h
 include/aws/iot/model/CACertificate.h
 include/aws/iot/model/CACertificateDescription.h
 include/aws/iot/model/CACertificateStatus.h
+include/aws/iot/model/CACertificateUpdateAction.h
+include/aws/iot/model/CancelAuditMitigationActionsTaskRequest.h
+include/aws/iot/model/CancelAuditMitigationActionsTaskResult.h
 include/aws/iot/model/CancelAuditTaskRequest.h
 include/aws/iot/model/CancelAuditTaskResult.h
 include/aws/iot/model/CancelCertificateTransferRequest.h
@@ -10185,6 +10848,8 @@ include/aws/iot/model/CreateJobRequest.h
 include/aws/iot/model/CreateJobResult.h
 include/aws/iot/model/CreateKeysAndCertificateRequest.h
 include/aws/iot/model/CreateKeysAndCertificateResult.h
+include/aws/iot/model/CreateMitigationActionRequest.h
+include/aws/iot/model/CreateMitigationActionResult.h
 include/aws/iot/model/CreateOTAUpdateRequest.h
 include/aws/iot/model/CreateOTAUpdateResult.h
 include/aws/iot/model/CreatePolicyRequest.h
@@ -10221,6 +10886,8 @@ include/aws/iot/model/DeleteDynamicThingGroupRequest.h
 include/aws/iot/model/DeleteDynamicThingGroupResult.h
 include/aws/iot/model/DeleteJobExecutionRequest.h
 include/aws/iot/model/DeleteJobRequest.h
+include/aws/iot/model/DeleteMitigationActionRequest.h
+include/aws/iot/model/DeleteMitigationActionResult.h
 include/aws/iot/model/DeleteOTAUpdateRequest.h
 include/aws/iot/model/DeleteOTAUpdateResult.h
 include/aws/iot/model/DeletePolicyRequest.h
@@ -10248,6 +10915,10 @@ include/aws/iot/model/DeprecateThingTypeRequest.h
 include/aws/iot/model/DeprecateThingTypeResult.h
 include/aws/iot/model/DescribeAccountAuditConfigurationRequest.h
 include/aws/iot/model/DescribeAccountAuditConfigurationResult.h
+include/aws/iot/model/DescribeAuditFindingRequest.h
+include/aws/iot/model/DescribeAuditFindingResult.h
+include/aws/iot/model/DescribeAuditMitigationActionsTaskRequest.h
+include/aws/iot/model/DescribeAuditMitigationActionsTaskResult.h
 include/aws/iot/model/DescribeAuditTaskRequest.h
 include/aws/iot/model/DescribeAuditTaskResult.h
 include/aws/iot/model/DescribeAuthorizerRequest.h
@@ -10270,6 +10941,8 @@ include/aws/iot/model/DescribeJobExecutionRequest.h
 include/aws/iot/model/DescribeJobExecutionResult.h
 include/aws/iot/model/DescribeJobRequest.h
 include/aws/iot/model/DescribeJobResult.h
+include/aws/iot/model/DescribeMitigationActionRequest.h
+include/aws/iot/model/DescribeMitigationActionResult.h
 include/aws/iot/model/DescribeRoleAliasRequest.h
 include/aws/iot/model/DescribeRoleAliasResult.h
 include/aws/iot/model/DescribeScheduledAuditRequest.h
@@ -10292,6 +10965,7 @@ include/aws/iot/model/DetachSecurityProfileRequest.h
 include/aws/iot/model/DetachSecurityProfileResult.h
 include/aws/iot/model/DetachThingPrincipalRequest.h
 include/aws/iot/model/DetachThingPrincipalResult.h
+include/aws/iot/model/DeviceCertificateUpdateAction.h
 include/aws/iot/model/DisableTopicRuleRequest.h
 include/aws/iot/model/DynamicGroupStatus.h
 include/aws/iot/model/DynamoDBAction.h
@@ -10299,6 +10973,7 @@ include/aws/iot/model/DynamoDBv2Action.h
 include/aws/iot/model/DynamoKeyType.h
 include/aws/iot/model/EffectivePolicy.h
 include/aws/iot/model/ElasticsearchAction.h
+include/aws/iot/model/EnableIoTLoggingParams.h
 include/aws/iot/model/EnableTopicRuleRequest.h
 include/aws/iot/model/ErrorInfo.h
 include/aws/iot/model/EventType.h
@@ -10354,6 +11029,10 @@ include/aws/iot/model/ListAttachedPoliciesRequest.h
 include/aws/iot/model/ListAttachedPoliciesResult.h
 include/aws/iot/model/ListAuditFindingsRequest.h
 include/aws/iot/model/ListAuditFindingsResult.h
+include/aws/iot/model/ListAuditMitigationActionsExecutionsRequest.h
+include/aws/iot/model/ListAuditMitigationActionsExecutionsResult.h
+include/aws/iot/model/ListAuditMitigationActionsTasksRequest.h
+include/aws/iot/model/ListAuditMitigationActionsTasksResult.h
 include/aws/iot/model/ListAuditTasksRequest.h
 include/aws/iot/model/ListAuditTasksResult.h
 include/aws/iot/model/ListAuthorizersRequest.h
@@ -10374,6 +11053,8 @@ include/aws/iot/model/ListJobExecutionsForThingRequest.h
 include/aws/iot/model/ListJobExecutionsForThingResult.h
 include/aws/iot/model/ListJobsRequest.h
 include/aws/iot/model/ListJobsResult.h
+include/aws/iot/model/ListMitigationActionsRequest.h
+include/aws/iot/model/ListMitigationActionsResult.h
 include/aws/iot/model/ListOTAUpdatesRequest.h
 include/aws/iot/model/ListOTAUpdatesResult.h
 include/aws/iot/model/ListOutgoingCertificatesRequest.h
@@ -10431,6 +11112,10 @@ include/aws/iot/model/LogTargetType.h
 include/aws/iot/model/LoggingOptionsPayload.h
 include/aws/iot/model/MessageFormat.h
 include/aws/iot/model/MetricValue.h
+include/aws/iot/model/MitigationAction.h
+include/aws/iot/model/MitigationActionIdentifier.h
+include/aws/iot/model/MitigationActionParams.h
+include/aws/iot/model/MitigationActionType.h
 include/aws/iot/model/NonCompliantResource.h
 include/aws/iot/model/OTAUpdateFile.h
 include/aws/iot/model/OTAUpdateInfo.h
@@ -10438,9 +11123,11 @@ include/aws/iot/model/OTAUpdateStatus.h
 include/aws/iot/model/OTAUpdateSummary.h
 include/aws/iot/model/OutgoingCertificate.h
 include/aws/iot/model/Policy.h
+include/aws/iot/model/PolicyTemplateName.h
 include/aws/iot/model/PolicyVersion.h
 include/aws/iot/model/PolicyVersionIdentifier.h
 include/aws/iot/model/PresignedUrlConfig.h
+include/aws/iot/model/PublishFindingToSnsParams.h
 include/aws/iot/model/PutItemInput.h
 include/aws/iot/model/RateIncreaseCriteria.h
 include/aws/iot/model/RegisterCACertificateRequest.h
@@ -10456,6 +11143,7 @@ include/aws/iot/model/RemoveThingFromBillingGroupRequest.h
 include/aws/iot/model/RemoveThingFromBillingGroupResult.h
 include/aws/iot/model/RemoveThingFromThingGroupRequest.h
 include/aws/iot/model/RemoveThingFromThingGroupResult.h
+include/aws/iot/model/ReplaceDefaultPolicyVersionParams.h
 include/aws/iot/model/ReplaceTopicRuleRequest.h
 include/aws/iot/model/ReportType.h
 include/aws/iot/model/RepublishAction.h
@@ -10481,6 +11169,8 @@ include/aws/iot/model/SetV2LoggingOptionsRequest.h
 include/aws/iot/model/SigningProfileParameter.h
 include/aws/iot/model/SnsAction.h
 include/aws/iot/model/SqsAction.h
+include/aws/iot/model/StartAuditMitigationActionsTaskRequest.h
+include/aws/iot/model/StartAuditMitigationActionsTaskResult.h
 include/aws/iot/model/StartOnDemandAuditTaskRequest.h
 include/aws/iot/model/StartOnDemandAuditTaskResult.h
 include/aws/iot/model/StartSigningJobParameter.h
@@ -10501,6 +11191,7 @@ include/aws/iot/model/TagResourceRequest.h
 include/aws/iot/model/TagResourceResult.h
 include/aws/iot/model/TargetSelection.h
 include/aws/iot/model/TaskStatistics.h
+include/aws/iot/model/TaskStatisticsForAuditCheck.h
 include/aws/iot/model/TestAuthorizationRequest.h
 include/aws/iot/model/TestAuthorizationResult.h
 include/aws/iot/model/TestInvokeAuthorizerRequest.h
@@ -10534,8 +11225,10 @@ include/aws/iot/model/UpdateAuthorizerRequest.h
 include/aws/iot/model/UpdateAuthorizerResult.h
 include/aws/iot/model/UpdateBillingGroupRequest.h
 include/aws/iot/model/UpdateBillingGroupResult.h
+include/aws/iot/model/UpdateCACertificateParams.h
 include/aws/iot/model/UpdateCACertificateRequest.h
 include/aws/iot/model/UpdateCertificateRequest.h
+include/aws/iot/model/UpdateDeviceCertificateParams.h
 include/aws/iot/model/UpdateDynamicThingGroupRequest.h
 include/aws/iot/model/UpdateDynamicThingGroupResult.h
 include/aws/iot/model/UpdateEventConfigurationsRequest.h
@@ -10543,6 +11236,8 @@ include/aws/iot/model/UpdateEventConfigurationsResult.h
 include/aws/iot/model/UpdateIndexingConfigurationRequest.h
 include/aws/iot/model/UpdateIndexingConfigurationResult.h
 include/aws/iot/model/UpdateJobRequest.h
+include/aws/iot/model/UpdateMitigationActionRequest.h
+include/aws/iot/model/UpdateMitigationActionResult.h
 include/aws/iot/model/UpdateRoleAliasRequest.h
 include/aws/iot/model/UpdateRoleAliasResult.h
 include/aws/iot/model/UpdateScheduledAuditRequest.h
@@ -10657,6 +11352,8 @@ include/aws/iotanalytics/model/Channel.h
 include/aws/iotanalytics/model/ChannelActivity.h
 include/aws/iotanalytics/model/ChannelStatistics.h
 include/aws/iotanalytics/model/ChannelStatus.h
+include/aws/iotanalytics/model/ChannelStorage.h
+include/aws/iotanalytics/model/ChannelStorageSummary.h
 include/aws/iotanalytics/model/ChannelSummary.h
 include/aws/iotanalytics/model/ComputeType.h
 include/aws/iotanalytics/model/ContainerDatasetAction.h
@@ -10670,6 +11367,10 @@ include/aws/iotanalytics/model/CreateDatastoreRequest.h
 include/aws/iotanalytics/model/CreateDatastoreResult.h
 include/aws/iotanalytics/model/CreatePipelineRequest.h
 include/aws/iotanalytics/model/CreatePipelineResult.h
+include/aws/iotanalytics/model/CustomerManagedChannelS3Storage.h
+include/aws/iotanalytics/model/CustomerManagedChannelS3StorageSummary.h
+include/aws/iotanalytics/model/CustomerManagedDatastoreS3Storage.h
+include/aws/iotanalytics/model/CustomerManagedDatastoreS3StorageSummary.h
 include/aws/iotanalytics/model/Dataset.h
 include/aws/iotanalytics/model/DatasetAction.h
 include/aws/iotanalytics/model/DatasetActionSummary.h
@@ -10688,6 +11389,8 @@ include/aws/iotanalytics/model/Datastore.h
 include/aws/iotanalytics/model/DatastoreActivity.h
 include/aws/iotanalytics/model/DatastoreStatistics.h
 include/aws/iotanalytics/model/DatastoreStatus.h
+include/aws/iotanalytics/model/DatastoreStorage.h
+include/aws/iotanalytics/model/DatastoreStorageSummary.h
 include/aws/iotanalytics/model/DatastoreSummary.h
 include/aws/iotanalytics/model/DeleteChannelRequest.h
 include/aws/iotanalytics/model/DeleteDatasetContentRequest.h
@@ -10748,6 +11451,10 @@ include/aws/iotanalytics/model/SampleChannelDataRequest.h
 include/aws/iotanalytics/model/SampleChannelDataResult.h
 include/aws/iotanalytics/model/Schedule.h
 include/aws/iotanalytics/model/SelectAttributesActivity.h
+include/aws/iotanalytics/model/ServiceManagedChannelS3Storage.h
+include/aws/iotanalytics/model/ServiceManagedChannelS3StorageSummary.h
+include/aws/iotanalytics/model/ServiceManagedDatastoreS3Storage.h
+include/aws/iotanalytics/model/ServiceManagedDatastoreS3StorageSummary.h
 include/aws/iotanalytics/model/SqlQueryDatasetAction.h
 include/aws/iotanalytics/model/StartPipelineReprocessingRequest.h
 include/aws/iotanalytics/model/StartPipelineReprocessingResult.h
@@ -10763,6 +11470,104 @@ include/aws/iotanalytics/model/UpdateDatastoreRequest.h
 include/aws/iotanalytics/model/UpdatePipelineRequest.h
 include/aws/iotanalytics/model/Variable.h
 include/aws/iotanalytics/model/VersioningConfiguration.h
+include/aws/iotevents-data/IoTEventsDataClient.h
+include/aws/iotevents-data/IoTEventsDataEndpoint.h
+include/aws/iotevents-data/IoTEventsDataErrorMarshaller.h
+include/aws/iotevents-data/IoTEventsDataErrors.h
+include/aws/iotevents-data/IoTEventsDataRequest.h
+include/aws/iotevents-data/IoTEventsData_EXPORTS.h
+include/aws/iotevents-data/model/BatchPutMessageErrorEntry.h
+include/aws/iotevents-data/model/BatchPutMessageRequest.h
+include/aws/iotevents-data/model/BatchPutMessageResult.h
+include/aws/iotevents-data/model/BatchUpdateDetectorErrorEntry.h
+include/aws/iotevents-data/model/BatchUpdateDetectorRequest.h
+include/aws/iotevents-data/model/BatchUpdateDetectorResult.h
+include/aws/iotevents-data/model/DescribeDetectorRequest.h
+include/aws/iotevents-data/model/DescribeDetectorResult.h
+include/aws/iotevents-data/model/Detector.h
+include/aws/iotevents-data/model/DetectorState.h
+include/aws/iotevents-data/model/DetectorStateDefinition.h
+include/aws/iotevents-data/model/DetectorStateSummary.h
+include/aws/iotevents-data/model/DetectorSummary.h
+include/aws/iotevents-data/model/ErrorCode.h
+include/aws/iotevents-data/model/ListDetectorsRequest.h
+include/aws/iotevents-data/model/ListDetectorsResult.h
+include/aws/iotevents-data/model/Message.h
+include/aws/iotevents-data/model/Timer.h
+include/aws/iotevents-data/model/TimerDefinition.h
+include/aws/iotevents-data/model/UpdateDetectorRequest.h
+include/aws/iotevents-data/model/Variable.h
+include/aws/iotevents-data/model/VariableDefinition.h
+include/aws/iotevents/IoTEventsClient.h
+include/aws/iotevents/IoTEventsEndpoint.h
+include/aws/iotevents/IoTEventsErrorMarshaller.h
+include/aws/iotevents/IoTEventsErrors.h
+include/aws/iotevents/IoTEventsRequest.h
+include/aws/iotevents/IoTEvents_EXPORTS.h
+include/aws/iotevents/model/Action.h
+include/aws/iotevents/model/Attribute.h
+include/aws/iotevents/model/ClearTimerAction.h
+include/aws/iotevents/model/CreateDetectorModelRequest.h
+include/aws/iotevents/model/CreateDetectorModelResult.h
+include/aws/iotevents/model/CreateInputRequest.h
+include/aws/iotevents/model/CreateInputResult.h
+include/aws/iotevents/model/DeleteDetectorModelRequest.h
+include/aws/iotevents/model/DeleteDetectorModelResult.h
+include/aws/iotevents/model/DeleteInputRequest.h
+include/aws/iotevents/model/DeleteInputResult.h
+include/aws/iotevents/model/DescribeDetectorModelRequest.h
+include/aws/iotevents/model/DescribeDetectorModelResult.h
+include/aws/iotevents/model/DescribeInputRequest.h
+include/aws/iotevents/model/DescribeInputResult.h
+include/aws/iotevents/model/DescribeLoggingOptionsRequest.h
+include/aws/iotevents/model/DescribeLoggingOptionsResult.h
+include/aws/iotevents/model/DetectorDebugOption.h
+include/aws/iotevents/model/DetectorModel.h
+include/aws/iotevents/model/DetectorModelConfiguration.h
+include/aws/iotevents/model/DetectorModelDefinition.h
+include/aws/iotevents/model/DetectorModelSummary.h
+include/aws/iotevents/model/DetectorModelVersionStatus.h
+include/aws/iotevents/model/DetectorModelVersionSummary.h
+include/aws/iotevents/model/Event.h
+include/aws/iotevents/model/FirehoseAction.h
+include/aws/iotevents/model/Input.h
+include/aws/iotevents/model/InputConfiguration.h
+include/aws/iotevents/model/InputDefinition.h
+include/aws/iotevents/model/InputStatus.h
+include/aws/iotevents/model/InputSummary.h
+include/aws/iotevents/model/IotEventsAction.h
+include/aws/iotevents/model/IotTopicPublishAction.h
+include/aws/iotevents/model/LambdaAction.h
+include/aws/iotevents/model/ListDetectorModelVersionsRequest.h
+include/aws/iotevents/model/ListDetectorModelVersionsResult.h
+include/aws/iotevents/model/ListDetectorModelsRequest.h
+include/aws/iotevents/model/ListDetectorModelsResult.h
+include/aws/iotevents/model/ListInputsRequest.h
+include/aws/iotevents/model/ListInputsResult.h
+include/aws/iotevents/model/ListTagsForResourceRequest.h
+include/aws/iotevents/model/ListTagsForResourceResult.h
+include/aws/iotevents/model/LoggingLevel.h
+include/aws/iotevents/model/LoggingOptions.h
+include/aws/iotevents/model/OnEnterLifecycle.h
+include/aws/iotevents/model/OnExitLifecycle.h
+include/aws/iotevents/model/OnInputLifecycle.h
+include/aws/iotevents/model/PutLoggingOptionsRequest.h
+include/aws/iotevents/model/ResetTimerAction.h
+include/aws/iotevents/model/SNSTopicPublishAction.h
+include/aws/iotevents/model/SetTimerAction.h
+include/aws/iotevents/model/SetVariableAction.h
+include/aws/iotevents/model/SqsAction.h
+include/aws/iotevents/model/State.h
+include/aws/iotevents/model/Tag.h
+include/aws/iotevents/model/TagResourceRequest.h
+include/aws/iotevents/model/TagResourceResult.h
+include/aws/iotevents/model/TransitionEvent.h
+include/aws/iotevents/model/UntagResourceRequest.h
+include/aws/iotevents/model/UntagResourceResult.h
+include/aws/iotevents/model/UpdateDetectorModelRequest.h
+include/aws/iotevents/model/UpdateDetectorModelResult.h
+include/aws/iotevents/model/UpdateInputRequest.h
+include/aws/iotevents/model/UpdateInputResult.h
 include/aws/iotthingsgraph/IoTThingsGraphClient.h
 include/aws/iotthingsgraph/IoTThingsGraphEndpoint.h
 include/aws/iotthingsgraph/IoTThingsGraphErrorMarshaller.h
@@ -10877,10 +11682,14 @@ include/aws/kafka/KafkaErrors.h
 include/aws/kafka/KafkaRequest.h
 include/aws/kafka/Kafka_EXPORTS.h
 include/aws/kafka/model/BrokerAZDistribution.h
+include/aws/kafka/model/BrokerEBSVolumeInfo.h
 include/aws/kafka/model/BrokerNodeGroupInfo.h
 include/aws/kafka/model/BrokerNodeInfo.h
 include/aws/kafka/model/BrokerSoftwareInfo.h
+include/aws/kafka/model/ClientAuthentication.h
+include/aws/kafka/model/ClientBroker.h
 include/aws/kafka/model/ClusterInfo.h
+include/aws/kafka/model/ClusterOperationInfo.h
 include/aws/kafka/model/ClusterState.h
 include/aws/kafka/model/Configuration.h
 include/aws/kafka/model/ConfigurationInfo.h
@@ -10891,6 +11700,8 @@ include/aws/kafka/model/CreateConfigurationRequest.h
 include/aws/kafka/model/CreateConfigurationResult.h
 include/aws/kafka/model/DeleteClusterRequest.h
 include/aws/kafka/model/DeleteClusterResult.h
+include/aws/kafka/model/DescribeClusterOperationRequest.h
+include/aws/kafka/model/DescribeClusterOperationResult.h
 include/aws/kafka/model/DescribeClusterRequest.h
 include/aws/kafka/model/DescribeClusterResult.h
 include/aws/kafka/model/DescribeConfigurationRequest.h
@@ -10899,23 +11710,35 @@ include/aws/kafka/model/DescribeConfigurationRevisionRequest.h
 include/aws/kafka/model/DescribeConfigurationRevisionResult.h
 include/aws/kafka/model/EBSStorageInfo.h
 include/aws/kafka/model/EncryptionAtRest.h
+include/aws/kafka/model/EncryptionInTransit.h
 include/aws/kafka/model/EncryptionInfo.h
 include/aws/kafka/model/EnhancedMonitoring.h
+include/aws/kafka/model/ErrorInfo.h
 include/aws/kafka/model/GetBootstrapBrokersRequest.h
 include/aws/kafka/model/GetBootstrapBrokersResult.h
+include/aws/kafka/model/ListClusterOperationsRequest.h
+include/aws/kafka/model/ListClusterOperationsResult.h
 include/aws/kafka/model/ListClustersRequest.h
 include/aws/kafka/model/ListClustersResult.h
+include/aws/kafka/model/ListConfigurationRevisionsRequest.h
+include/aws/kafka/model/ListConfigurationRevisionsResult.h
 include/aws/kafka/model/ListConfigurationsRequest.h
 include/aws/kafka/model/ListConfigurationsResult.h
 include/aws/kafka/model/ListNodesRequest.h
 include/aws/kafka/model/ListNodesResult.h
 include/aws/kafka/model/ListTagsForResourceRequest.h
 include/aws/kafka/model/ListTagsForResourceResult.h
+include/aws/kafka/model/MutableClusterInfo.h
 include/aws/kafka/model/NodeInfo.h
 include/aws/kafka/model/NodeType.h
 include/aws/kafka/model/StorageInfo.h
 include/aws/kafka/model/TagResourceRequest.h
+include/aws/kafka/model/Tls.h
 include/aws/kafka/model/UntagResourceRequest.h
+include/aws/kafka/model/UpdateBrokerStorageRequest.h
+include/aws/kafka/model/UpdateBrokerStorageResult.h
+include/aws/kafka/model/UpdateClusterConfigurationRequest.h
+include/aws/kafka/model/UpdateClusterConfigurationResult.h
 include/aws/kafka/model/ZookeeperNodeInfo.h
 include/aws/kinesis-video-archived-media/KinesisVideoArchivedMediaClient.h
 include/aws/kinesis-video-archived-media/KinesisVideoArchivedMediaEndpoint.h
@@ -10924,21 +11747,29 @@ include/aws/kinesis-video-archived-media/KinesisVideoArchivedMediaErrors.h
 include/aws/kinesis-video-archived-media/KinesisVideoArchivedMediaRequest.h
 include/aws/kinesis-video-archived-media/KinesisVideoArchivedMedia_EXPORTS.h
 include/aws/kinesis-video-archived-media/model/ContainerFormat.h
-include/aws/kinesis-video-archived-media/model/DiscontinuityMode.h
-include/aws/kinesis-video-archived-media/model/DisplayFragmentTimestamp.h
+include/aws/kinesis-video-archived-media/model/DASHDisplayFragmentNumber.h
+include/aws/kinesis-video-archived-media/model/DASHDisplayFragmentTimestamp.h
+include/aws/kinesis-video-archived-media/model/DASHFragmentSelector.h
+include/aws/kinesis-video-archived-media/model/DASHFragmentSelectorType.h
+include/aws/kinesis-video-archived-media/model/DASHPlaybackMode.h
+include/aws/kinesis-video-archived-media/model/DASHTimestampRange.h
 include/aws/kinesis-video-archived-media/model/Fragment.h
 include/aws/kinesis-video-archived-media/model/FragmentSelector.h
 include/aws/kinesis-video-archived-media/model/FragmentSelectorType.h
+include/aws/kinesis-video-archived-media/model/GetDASHStreamingSessionURLRequest.h
+include/aws/kinesis-video-archived-media/model/GetDASHStreamingSessionURLResult.h
 include/aws/kinesis-video-archived-media/model/GetHLSStreamingSessionURLRequest.h
 include/aws/kinesis-video-archived-media/model/GetHLSStreamingSessionURLResult.h
 include/aws/kinesis-video-archived-media/model/GetMediaForFragmentListRequest.h
 include/aws/kinesis-video-archived-media/model/GetMediaForFragmentListResult.h
+include/aws/kinesis-video-archived-media/model/HLSDiscontinuityMode.h
+include/aws/kinesis-video-archived-media/model/HLSDisplayFragmentTimestamp.h
 include/aws/kinesis-video-archived-media/model/HLSFragmentSelector.h
 include/aws/kinesis-video-archived-media/model/HLSFragmentSelectorType.h
+include/aws/kinesis-video-archived-media/model/HLSPlaybackMode.h
 include/aws/kinesis-video-archived-media/model/HLSTimestampRange.h
 include/aws/kinesis-video-archived-media/model/ListFragmentsRequest.h
 include/aws/kinesis-video-archived-media/model/ListFragmentsResult.h
-include/aws/kinesis-video-archived-media/model/PlaybackMode.h
 include/aws/kinesis-video-archived-media/model/TimestampRange.h
 include/aws/kinesis-video-media/KinesisVideoMediaClient.h
 include/aws/kinesis-video-media/KinesisVideoMediaEndpoint.h
@@ -11015,6 +11846,10 @@ include/aws/kinesis/model/StopStreamEncryptionRequest.h
 include/aws/kinesis/model/StreamDescription.h
 include/aws/kinesis/model/StreamDescriptionSummary.h
 include/aws/kinesis/model/StreamStatus.h
+include/aws/kinesis/model/SubscribeToShardEvent.h
+include/aws/kinesis/model/SubscribeToShardEventStream.h
+include/aws/kinesis/model/SubscribeToShardHandler.h
+include/aws/kinesis/model/SubscribeToShardRequest.h
 include/aws/kinesis/model/Tag.h
 include/aws/kinesis/model/UpdateShardCountRequest.h
 include/aws/kinesis/model/UpdateShardCountResult.h
@@ -11399,6 +12234,58 @@ include/aws/kms/model/UpdateCustomKeyStoreRequest.h
 include/aws/kms/model/UpdateCustomKeyStoreResult.h
 include/aws/kms/model/UpdateKeyDescriptionRequest.h
 include/aws/kms/model/WrappingKeySpec.h
+include/aws/lakeformation/LakeFormationClient.h
+include/aws/lakeformation/LakeFormationEndpoint.h
+include/aws/lakeformation/LakeFormationErrorMarshaller.h
+include/aws/lakeformation/LakeFormationErrors.h
+include/aws/lakeformation/LakeFormationRequest.h
+include/aws/lakeformation/LakeFormation_EXPORTS.h
+include/aws/lakeformation/model/BatchGrantPermissionsRequest.h
+include/aws/lakeformation/model/BatchGrantPermissionsResult.h
+include/aws/lakeformation/model/BatchPermissionsFailureEntry.h
+include/aws/lakeformation/model/BatchPermissionsRequestEntry.h
+include/aws/lakeformation/model/BatchRevokePermissionsRequest.h
+include/aws/lakeformation/model/BatchRevokePermissionsResult.h
+include/aws/lakeformation/model/CatalogResource.h
+include/aws/lakeformation/model/ColumnWildcard.h
+include/aws/lakeformation/model/ComparisonOperator.h
+include/aws/lakeformation/model/DataLakePrincipal.h
+include/aws/lakeformation/model/DataLakeResourceType.h
+include/aws/lakeformation/model/DataLakeSettings.h
+include/aws/lakeformation/model/DataLocationResource.h
+include/aws/lakeformation/model/DatabaseResource.h
+include/aws/lakeformation/model/DeregisterResourceRequest.h
+include/aws/lakeformation/model/DeregisterResourceResult.h
+include/aws/lakeformation/model/DescribeResourceRequest.h
+include/aws/lakeformation/model/DescribeResourceResult.h
+include/aws/lakeformation/model/ErrorDetail.h
+include/aws/lakeformation/model/FieldNameString.h
+include/aws/lakeformation/model/FilterCondition.h
+include/aws/lakeformation/model/GetDataLakeSettingsRequest.h
+include/aws/lakeformation/model/GetDataLakeSettingsResult.h
+include/aws/lakeformation/model/GetEffectivePermissionsForPathRequest.h
+include/aws/lakeformation/model/GetEffectivePermissionsForPathResult.h
+include/aws/lakeformation/model/GrantPermissionsRequest.h
+include/aws/lakeformation/model/GrantPermissionsResult.h
+include/aws/lakeformation/model/ListPermissionsRequest.h
+include/aws/lakeformation/model/ListPermissionsResult.h
+include/aws/lakeformation/model/ListResourcesRequest.h
+include/aws/lakeformation/model/ListResourcesResult.h
+include/aws/lakeformation/model/Permission.h
+include/aws/lakeformation/model/PrincipalPermissions.h
+include/aws/lakeformation/model/PrincipalResourcePermissions.h
+include/aws/lakeformation/model/PutDataLakeSettingsRequest.h
+include/aws/lakeformation/model/PutDataLakeSettingsResult.h
+include/aws/lakeformation/model/RegisterResourceRequest.h
+include/aws/lakeformation/model/RegisterResourceResult.h
+include/aws/lakeformation/model/Resource.h
+include/aws/lakeformation/model/ResourceInfo.h
+include/aws/lakeformation/model/RevokePermissionsRequest.h
+include/aws/lakeformation/model/RevokePermissionsResult.h
+include/aws/lakeformation/model/TableResource.h
+include/aws/lakeformation/model/TableWithColumnsResource.h
+include/aws/lakeformation/model/UpdateResourceRequest.h
+include/aws/lakeformation/model/UpdateResourceResult.h
 include/aws/lambda/LambdaClient.h
 include/aws/lambda/LambdaEndpoint.h
 include/aws/lambda/LambdaErrorMarshaller.h
@@ -11614,14 +12501,25 @@ include/aws/lex/LexRuntimeServiceErrors.h
 include/aws/lex/LexRuntimeServiceRequest.h
 include/aws/lex/LexRuntimeService_EXPORTS.h
 include/aws/lex/model/Button.h
+include/aws/lex/model/ConfirmationStatus.h
 include/aws/lex/model/ContentType.h
+include/aws/lex/model/DeleteSessionRequest.h
+include/aws/lex/model/DeleteSessionResult.h
+include/aws/lex/model/DialogAction.h
+include/aws/lex/model/DialogActionType.h
 include/aws/lex/model/DialogState.h
+include/aws/lex/model/FulfillmentState.h
 include/aws/lex/model/GenericAttachment.h
+include/aws/lex/model/GetSessionRequest.h
+include/aws/lex/model/GetSessionResult.h
+include/aws/lex/model/IntentSummary.h
 include/aws/lex/model/MessageFormatType.h
 include/aws/lex/model/PostContentRequest.h
 include/aws/lex/model/PostContentResult.h
 include/aws/lex/model/PostTextRequest.h
 include/aws/lex/model/PostTextResult.h
+include/aws/lex/model/PutSessionRequest.h
+include/aws/lex/model/PutSessionResult.h
 include/aws/lex/model/ResponseCard.h
 include/aws/license-manager/LicenseManagerClient.h
 include/aws/license-manager/LicenseManagerEndpoint.h
@@ -12462,6 +13360,15 @@ include/aws/mediaconvert/model/DvbSubtitleOutlineColor.h
 include/aws/mediaconvert/model/DvbSubtitleShadowColor.h
 include/aws/mediaconvert/model/DvbSubtitleTeletextSpacing.h
 include/aws/mediaconvert/model/DvbTdtSettings.h
+include/aws/mediaconvert/model/Eac3AtmosBitstreamMode.h
+include/aws/mediaconvert/model/Eac3AtmosCodingMode.h
+include/aws/mediaconvert/model/Eac3AtmosDialogueIntelligence.h
+include/aws/mediaconvert/model/Eac3AtmosDynamicRangeCompressionLine.h
+include/aws/mediaconvert/model/Eac3AtmosDynamicRangeCompressionRf.h
+include/aws/mediaconvert/model/Eac3AtmosMeteringMode.h
+include/aws/mediaconvert/model/Eac3AtmosSettings.h
+include/aws/mediaconvert/model/Eac3AtmosStereoDownmix.h
+include/aws/mediaconvert/model/Eac3AtmosSurroundExMode.h
 include/aws/mediaconvert/model/Eac3AttenuationControl.h
 include/aws/mediaconvert/model/Eac3BitstreamMode.h
 include/aws/mediaconvert/model/Eac3CodingMode.h
@@ -12552,6 +13459,7 @@ include/aws/mediaconvert/model/H265UnregisteredSeiTimecode.h
 include/aws/mediaconvert/model/H265WriteMp4PackagingType.h
 include/aws/mediaconvert/model/Hdr10Metadata.h
 include/aws/mediaconvert/model/HlsAdMarkers.h
+include/aws/mediaconvert/model/HlsAudioOnlyContainer.h
 include/aws/mediaconvert/model/HlsAudioTrackType.h
 include/aws/mediaconvert/model/HlsCaptionLanguageMapping.h
 include/aws/mediaconvert/model/HlsCaptionLanguageSetting.h
@@ -12666,6 +13574,7 @@ include/aws/mediaconvert/model/NoiseReducer.h
 include/aws/mediaconvert/model/NoiseReducerFilter.h
 include/aws/mediaconvert/model/NoiseReducerFilterSettings.h
 include/aws/mediaconvert/model/NoiseReducerSpatialFilterSettings.h
+include/aws/mediaconvert/model/NoiseReducerTemporalFilterSettings.h
 include/aws/mediaconvert/model/Order.h
 include/aws/mediaconvert/model/Output.h
 include/aws/mediaconvert/model/OutputChannelMapping.h
@@ -12705,12 +13614,15 @@ include/aws/mediaconvert/model/S3ServerSideEncryptionType.h
 include/aws/mediaconvert/model/ScalingBehavior.h
 include/aws/mediaconvert/model/SccDestinationFramerate.h
 include/aws/mediaconvert/model/SccDestinationSettings.h
+include/aws/mediaconvert/model/SimulateReservedQueue.h
 include/aws/mediaconvert/model/SpekeKeyProvider.h
+include/aws/mediaconvert/model/SpekeKeyProviderCmaf.h
 include/aws/mediaconvert/model/StaticKeyProvider.h
 include/aws/mediaconvert/model/StatusUpdateInterval.h
 include/aws/mediaconvert/model/TagResourceRequest.h
 include/aws/mediaconvert/model/TagResourceResult.h
 include/aws/mediaconvert/model/TeletextDestinationSettings.h
+include/aws/mediaconvert/model/TeletextPageType.h
 include/aws/mediaconvert/model/TeletextSourceSettings.h
 include/aws/mediaconvert/model/TimecodeBurnin.h
 include/aws/mediaconvert/model/TimecodeBurninPosition.h
@@ -12942,10 +13854,12 @@ include/aws/medialive/model/HlsTsFileMode.h
 include/aws/medialive/model/HlsWebdavHttpTransferMode.h
 include/aws/medialive/model/HlsWebdavSettings.h
 include/aws/medialive/model/IFrameOnlyPlaylistType.h
+include/aws/medialive/model/ImmediateModeScheduleActionStartSettings.h
 include/aws/medialive/model/Input.h
 include/aws/medialive/model/InputAttachment.h
 include/aws/medialive/model/InputChannelLevel.h
 include/aws/medialive/model/InputClass.h
+include/aws/medialive/model/InputClippingSettings.h
 include/aws/medialive/model/InputCodec.h
 include/aws/medialive/model/InputDeblockFilter.h
 include/aws/medialive/model/InputDenoiseFilter.h
@@ -12968,14 +13882,17 @@ include/aws/medialive/model/InputSettings.h
 include/aws/medialive/model/InputSource.h
 include/aws/medialive/model/InputSourceEndBehavior.h
 include/aws/medialive/model/InputSourceRequest.h
+include/aws/medialive/model/InputSourceType.h
 include/aws/medialive/model/InputSpecification.h
 include/aws/medialive/model/InputState.h
 include/aws/medialive/model/InputSwitchScheduleActionSettings.h
+include/aws/medialive/model/InputTimecodeSource.h
 include/aws/medialive/model/InputType.h
 include/aws/medialive/model/InputVpcRequest.h
 include/aws/medialive/model/InputWhitelistRule.h
 include/aws/medialive/model/InputWhitelistRuleCidr.h
 include/aws/medialive/model/KeyProviderSettings.h
+include/aws/medialive/model/LastFrameClippingBehavior.h
 include/aws/medialive/model/ListChannelsRequest.h
 include/aws/medialive/model/ListChannelsResult.h
 include/aws/medialive/model/ListInputSecurityGroupsRequest.h
@@ -13035,6 +13952,7 @@ include/aws/medialive/model/OutputLocationRef.h
 include/aws/medialive/model/OutputSettings.h
 include/aws/medialive/model/PassThroughSettings.h
 include/aws/medialive/model/PauseStateScheduleActionSettings.h
+include/aws/medialive/model/PipelineDetail.h
 include/aws/medialive/model/PipelineId.h
 include/aws/medialive/model/PipelinePauseStateSettings.h
 include/aws/medialive/model/PurchaseOfferingRequest.h
@@ -13094,11 +14012,13 @@ include/aws/medialive/model/SmpteTtDestinationSettings.h
 include/aws/medialive/model/StandardHlsSettings.h
 include/aws/medialive/model/StartChannelRequest.h
 include/aws/medialive/model/StartChannelResult.h
+include/aws/medialive/model/StartTimecode.h
 include/aws/medialive/model/StaticImageActivateScheduleActionSettings.h
 include/aws/medialive/model/StaticImageDeactivateScheduleActionSettings.h
 include/aws/medialive/model/StaticKeySettings.h
 include/aws/medialive/model/StopChannelRequest.h
 include/aws/medialive/model/StopChannelResult.h
+include/aws/medialive/model/StopTimecode.h
 include/aws/medialive/model/TeletextDestinationSettings.h
 include/aws/medialive/model/TeletextSourceSettings.h
 include/aws/medialive/model/TimecodeConfig.h
@@ -13189,6 +14109,7 @@ include/aws/mediapackage/MediaPackageErrors.h
 include/aws/mediapackage/MediaPackageRequest.h
 include/aws/mediapackage/MediaPackage_EXPORTS.h
 include/aws/mediapackage/model/AdMarkers.h
+include/aws/mediapackage/model/AdsOnDeliveryRestrictions.h
 include/aws/mediapackage/model/Channel.h
 include/aws/mediapackage/model/CmafEncryption.h
 include/aws/mediapackage/model/CmafPackage.h
@@ -13238,6 +14159,7 @@ include/aws/mediapackage/model/UpdateChannelRequest.h
 include/aws/mediapackage/model/UpdateChannelResult.h
 include/aws/mediapackage/model/UpdateOriginEndpointRequest.h
 include/aws/mediapackage/model/UpdateOriginEndpointResult.h
+include/aws/mediapackage/model/__AdTriggersElement.h
 include/aws/mediapackage/model/__PeriodTriggersElement.h
 include/aws/mediastore-data/MediaStoreDataClient.h
 include/aws/mediastore-data/MediaStoreDataEndpoint.h
@@ -13288,6 +14210,8 @@ include/aws/mediastore/model/GetLifecyclePolicyRequest.h
 include/aws/mediastore/model/GetLifecyclePolicyResult.h
 include/aws/mediastore/model/ListContainersRequest.h
 include/aws/mediastore/model/ListContainersResult.h
+include/aws/mediastore/model/ListTagsForResourceRequest.h
+include/aws/mediastore/model/ListTagsForResourceResult.h
 include/aws/mediastore/model/MethodName.h
 include/aws/mediastore/model/PutContainerPolicyRequest.h
 include/aws/mediastore/model/PutContainerPolicyResult.h
@@ -13299,6 +14223,11 @@ include/aws/mediastore/model/StartAccessLoggingRequest.h
 include/aws/mediastore/model/StartAccessLoggingResult.h
 include/aws/mediastore/model/StopAccessLoggingRequest.h
 include/aws/mediastore/model/StopAccessLoggingResult.h
+include/aws/mediastore/model/Tag.h
+include/aws/mediastore/model/TagResourceRequest.h
+include/aws/mediastore/model/TagResourceResult.h
+include/aws/mediastore/model/UntagResourceRequest.h
+include/aws/mediastore/model/UntagResourceResult.h
 include/aws/mediatailor/MediaTailorClient.h
 include/aws/mediatailor/MediaTailorEndpoint.h
 include/aws/mediatailor/MediaTailorErrorMarshaller.h
@@ -13386,11 +14315,15 @@ include/aws/monitoring/CloudWatchErrors.h
 include/aws/monitoring/CloudWatchRequest.h
 include/aws/monitoring/CloudWatch_EXPORTS.h
 include/aws/monitoring/model/AlarmHistoryItem.h
+include/aws/monitoring/model/AnomalyDetector.h
+include/aws/monitoring/model/AnomalyDetectorConfiguration.h
 include/aws/monitoring/model/ComparisonOperator.h
 include/aws/monitoring/model/DashboardEntry.h
 include/aws/monitoring/model/DashboardValidationMessage.h
 include/aws/monitoring/model/Datapoint.h
 include/aws/monitoring/model/DeleteAlarmsRequest.h
+include/aws/monitoring/model/DeleteAnomalyDetectorRequest.h
+include/aws/monitoring/model/DeleteAnomalyDetectorResult.h
 include/aws/monitoring/model/DeleteDashboardsRequest.h
 include/aws/monitoring/model/DeleteDashboardsResult.h
 include/aws/monitoring/model/DescribeAlarmHistoryRequest.h
@@ -13399,6 +14332,8 @@ include/aws/monitoring/model/DescribeAlarmsForMetricRequest.h
 include/aws/monitoring/model/DescribeAlarmsForMetricResult.h
 include/aws/monitoring/model/DescribeAlarmsRequest.h
 include/aws/monitoring/model/DescribeAlarmsResult.h
+include/aws/monitoring/model/DescribeAnomalyDetectorsRequest.h
+include/aws/monitoring/model/DescribeAnomalyDetectorsResult.h
 include/aws/monitoring/model/Dimension.h
 include/aws/monitoring/model/DimensionFilter.h
 include/aws/monitoring/model/DisableAlarmActionsRequest.h
@@ -13425,10 +14360,13 @@ include/aws/monitoring/model/MetricDataQuery.h
 include/aws/monitoring/model/MetricDataResult.h
 include/aws/monitoring/model/MetricDatum.h
 include/aws/monitoring/model/MetricStat.h
+include/aws/monitoring/model/PutAnomalyDetectorRequest.h
+include/aws/monitoring/model/PutAnomalyDetectorResult.h
 include/aws/monitoring/model/PutDashboardRequest.h
 include/aws/monitoring/model/PutDashboardResult.h
 include/aws/monitoring/model/PutMetricAlarmRequest.h
 include/aws/monitoring/model/PutMetricDataRequest.h
+include/aws/monitoring/model/Range.h
 include/aws/monitoring/model/ResponseMetadata.h
 include/aws/monitoring/model/ScanBy.h
 include/aws/monitoring/model/SetAlarmStateRequest.h
@@ -13485,6 +14423,7 @@ include/aws/mq/model/DescribeConfigurationRevisionRequest.h
 include/aws/mq/model/DescribeConfigurationRevisionResult.h
 include/aws/mq/model/DescribeUserRequest.h
 include/aws/mq/model/DescribeUserResult.h
+include/aws/mq/model/EncryptionOptions.h
 include/aws/mq/model/EngineType.h
 include/aws/mq/model/EngineVersion.h
 include/aws/mq/model/ListBrokersRequest.h
@@ -14099,6 +15038,8 @@ include/aws/organizations/model/ListPoliciesRequest.h
 include/aws/organizations/model/ListPoliciesResult.h
 include/aws/organizations/model/ListRootsRequest.h
 include/aws/organizations/model/ListRootsResult.h
+include/aws/organizations/model/ListTagsForResourceRequest.h
+include/aws/organizations/model/ListTagsForResourceResult.h
 include/aws/organizations/model/ListTargetsForPolicyRequest.h
 include/aws/organizations/model/ListTargetsForPolicyResult.h
 include/aws/organizations/model/MoveAccountRequest.h
@@ -14115,11 +15056,143 @@ include/aws/organizations/model/PolicyTypeStatus.h
 include/aws/organizations/model/PolicyTypeSummary.h
 include/aws/organizations/model/RemoveAccountFromOrganizationRequest.h
 include/aws/organizations/model/Root.h
+include/aws/organizations/model/Tag.h
+include/aws/organizations/model/TagResourceRequest.h
 include/aws/organizations/model/TargetType.h
+include/aws/organizations/model/UntagResourceRequest.h
 include/aws/organizations/model/UpdateOrganizationalUnitRequest.h
 include/aws/organizations/model/UpdateOrganizationalUnitResult.h
 include/aws/organizations/model/UpdatePolicyRequest.h
 include/aws/organizations/model/UpdatePolicyResult.h
+include/aws/personalize-events/PersonalizeEventsClient.h
+include/aws/personalize-events/PersonalizeEventsEndpoint.h
+include/aws/personalize-events/PersonalizeEventsErrorMarshaller.h
+include/aws/personalize-events/PersonalizeEventsErrors.h
+include/aws/personalize-events/PersonalizeEventsRequest.h
+include/aws/personalize-events/PersonalizeEvents_EXPORTS.h
+include/aws/personalize-events/model/Event.h
+include/aws/personalize-events/model/PutEventsRequest.h
+include/aws/personalize-runtime/PersonalizeRuntimeClient.h
+include/aws/personalize-runtime/PersonalizeRuntimeEndpoint.h
+include/aws/personalize-runtime/PersonalizeRuntimeErrorMarshaller.h
+include/aws/personalize-runtime/PersonalizeRuntimeErrors.h
+include/aws/personalize-runtime/PersonalizeRuntimeRequest.h
+include/aws/personalize-runtime/PersonalizeRuntime_EXPORTS.h
+include/aws/personalize-runtime/model/GetPersonalizedRankingRequest.h
+include/aws/personalize-runtime/model/GetPersonalizedRankingResult.h
+include/aws/personalize-runtime/model/GetRecommendationsRequest.h
+include/aws/personalize-runtime/model/GetRecommendationsResult.h
+include/aws/personalize-runtime/model/PredictedItem.h
+include/aws/personalize/PersonalizeClient.h
+include/aws/personalize/PersonalizeEndpoint.h
+include/aws/personalize/PersonalizeErrorMarshaller.h
+include/aws/personalize/PersonalizeErrors.h
+include/aws/personalize/PersonalizeRequest.h
+include/aws/personalize/Personalize_EXPORTS.h
+include/aws/personalize/model/Algorithm.h
+include/aws/personalize/model/AlgorithmImage.h
+include/aws/personalize/model/AutoMLConfig.h
+include/aws/personalize/model/AutoMLResult.h
+include/aws/personalize/model/Campaign.h
+include/aws/personalize/model/CampaignSummary.h
+include/aws/personalize/model/CampaignUpdateSummary.h
+include/aws/personalize/model/CategoricalHyperParameterRange.h
+include/aws/personalize/model/ContinuousHyperParameterRange.h
+include/aws/personalize/model/CreateCampaignRequest.h
+include/aws/personalize/model/CreateCampaignResult.h
+include/aws/personalize/model/CreateDatasetGroupRequest.h
+include/aws/personalize/model/CreateDatasetGroupResult.h
+include/aws/personalize/model/CreateDatasetImportJobRequest.h
+include/aws/personalize/model/CreateDatasetImportJobResult.h
+include/aws/personalize/model/CreateDatasetRequest.h
+include/aws/personalize/model/CreateDatasetResult.h
+include/aws/personalize/model/CreateEventTrackerRequest.h
+include/aws/personalize/model/CreateEventTrackerResult.h
+include/aws/personalize/model/CreateSchemaRequest.h
+include/aws/personalize/model/CreateSchemaResult.h
+include/aws/personalize/model/CreateSolutionRequest.h
+include/aws/personalize/model/CreateSolutionResult.h
+include/aws/personalize/model/CreateSolutionVersionRequest.h
+include/aws/personalize/model/CreateSolutionVersionResult.h
+include/aws/personalize/model/DataSource.h
+include/aws/personalize/model/Dataset.h
+include/aws/personalize/model/DatasetGroup.h
+include/aws/personalize/model/DatasetGroupSummary.h
+include/aws/personalize/model/DatasetImportJob.h
+include/aws/personalize/model/DatasetImportJobSummary.h
+include/aws/personalize/model/DatasetSchema.h
+include/aws/personalize/model/DatasetSchemaSummary.h
+include/aws/personalize/model/DatasetSummary.h
+include/aws/personalize/model/DefaultCategoricalHyperParameterRange.h
+include/aws/personalize/model/DefaultContinuousHyperParameterRange.h
+include/aws/personalize/model/DefaultHyperParameterRanges.h
+include/aws/personalize/model/DefaultIntegerHyperParameterRange.h
+include/aws/personalize/model/DeleteCampaignRequest.h
+include/aws/personalize/model/DeleteDatasetGroupRequest.h
+include/aws/personalize/model/DeleteDatasetRequest.h
+include/aws/personalize/model/DeleteEventTrackerRequest.h
+include/aws/personalize/model/DeleteSchemaRequest.h
+include/aws/personalize/model/DeleteSolutionRequest.h
+include/aws/personalize/model/DescribeAlgorithmRequest.h
+include/aws/personalize/model/DescribeAlgorithmResult.h
+include/aws/personalize/model/DescribeCampaignRequest.h
+include/aws/personalize/model/DescribeCampaignResult.h
+include/aws/personalize/model/DescribeDatasetGroupRequest.h
+include/aws/personalize/model/DescribeDatasetGroupResult.h
+include/aws/personalize/model/DescribeDatasetImportJobRequest.h
+include/aws/personalize/model/DescribeDatasetImportJobResult.h
+include/aws/personalize/model/DescribeDatasetRequest.h
+include/aws/personalize/model/DescribeDatasetResult.h
+include/aws/personalize/model/DescribeEventTrackerRequest.h
+include/aws/personalize/model/DescribeEventTrackerResult.h
+include/aws/personalize/model/DescribeFeatureTransformationRequest.h
+include/aws/personalize/model/DescribeFeatureTransformationResult.h
+include/aws/personalize/model/DescribeRecipeRequest.h
+include/aws/personalize/model/DescribeRecipeResult.h
+include/aws/personalize/model/DescribeSchemaRequest.h
+include/aws/personalize/model/DescribeSchemaResult.h
+include/aws/personalize/model/DescribeSolutionRequest.h
+include/aws/personalize/model/DescribeSolutionResult.h
+include/aws/personalize/model/DescribeSolutionVersionRequest.h
+include/aws/personalize/model/DescribeSolutionVersionResult.h
+include/aws/personalize/model/EventTracker.h
+include/aws/personalize/model/EventTrackerSummary.h
+include/aws/personalize/model/FeatureTransformation.h
+include/aws/personalize/model/GetSolutionMetricsRequest.h
+include/aws/personalize/model/GetSolutionMetricsResult.h
+include/aws/personalize/model/HPOConfig.h
+include/aws/personalize/model/HPOObjective.h
+include/aws/personalize/model/HPOResourceConfig.h
+include/aws/personalize/model/HyperParameterRanges.h
+include/aws/personalize/model/IntegerHyperParameterRange.h
+include/aws/personalize/model/ListCampaignsRequest.h
+include/aws/personalize/model/ListCampaignsResult.h
+include/aws/personalize/model/ListDatasetGroupsRequest.h
+include/aws/personalize/model/ListDatasetGroupsResult.h
+include/aws/personalize/model/ListDatasetImportJobsRequest.h
+include/aws/personalize/model/ListDatasetImportJobsResult.h
+include/aws/personalize/model/ListDatasetsRequest.h
+include/aws/personalize/model/ListDatasetsResult.h
+include/aws/personalize/model/ListEventTrackersRequest.h
+include/aws/personalize/model/ListEventTrackersResult.h
+include/aws/personalize/model/ListRecipesRequest.h
+include/aws/personalize/model/ListRecipesResult.h
+include/aws/personalize/model/ListSchemasRequest.h
+include/aws/personalize/model/ListSchemasResult.h
+include/aws/personalize/model/ListSolutionVersionsRequest.h
+include/aws/personalize/model/ListSolutionVersionsResult.h
+include/aws/personalize/model/ListSolutionsRequest.h
+include/aws/personalize/model/ListSolutionsResult.h
+include/aws/personalize/model/Recipe.h
+include/aws/personalize/model/RecipeProvider.h
+include/aws/personalize/model/RecipeSummary.h
+include/aws/personalize/model/Solution.h
+include/aws/personalize/model/SolutionConfig.h
+include/aws/personalize/model/SolutionSummary.h
+include/aws/personalize/model/SolutionVersion.h
+include/aws/personalize/model/SolutionVersionSummary.h
+include/aws/personalize/model/UpdateCampaignRequest.h
+include/aws/personalize/model/UpdateCampaignResult.h
 include/aws/pi/PIClient.h
 include/aws/pi/PIEndpoint.h
 include/aws/pi/PIErrorMarshaller.h
@@ -14265,6 +15338,7 @@ include/aws/pinpoint-email/model/SnsDestination.h
 include/aws/pinpoint-email/model/Tag.h
 include/aws/pinpoint-email/model/TagResourceRequest.h
 include/aws/pinpoint-email/model/TagResourceResult.h
+include/aws/pinpoint-email/model/TlsPolicy.h
 include/aws/pinpoint-email/model/TrackingOptions.h
 include/aws/pinpoint-email/model/UntagResourceRequest.h
 include/aws/pinpoint-email/model/UntagResourceResult.h
@@ -14294,6 +15368,7 @@ include/aws/pinpoint/model/Action.h
 include/aws/pinpoint/model/ActivitiesResponse.h
 include/aws/pinpoint/model/ActivityResponse.h
 include/aws/pinpoint/model/AddressConfiguration.h
+include/aws/pinpoint/model/ApplicationDateRangeKpiResponse.h
 include/aws/pinpoint/model/ApplicationResponse.h
 include/aws/pinpoint/model/ApplicationSettingsResource.h
 include/aws/pinpoint/model/ApplicationsResponse.h
@@ -14303,6 +15378,8 @@ include/aws/pinpoint/model/AttributesResource.h
 include/aws/pinpoint/model/BaiduChannelRequest.h
 include/aws/pinpoint/model/BaiduChannelResponse.h
 include/aws/pinpoint/model/BaiduMessage.h
+include/aws/pinpoint/model/BaseKpiResult.h
+include/aws/pinpoint/model/CampaignDateRangeKpiResponse.h
 include/aws/pinpoint/model/CampaignEmailMessage.h
 include/aws/pinpoint/model/CampaignEventFilter.h
 include/aws/pinpoint/model/CampaignHook.h
@@ -14409,6 +15486,8 @@ include/aws/pinpoint/model/GetApnsVoipSandboxChannelRequest.h
 include/aws/pinpoint/model/GetApnsVoipSandboxChannelResult.h
 include/aws/pinpoint/model/GetAppRequest.h
 include/aws/pinpoint/model/GetAppResult.h
+include/aws/pinpoint/model/GetApplicationDateRangeKpiRequest.h
+include/aws/pinpoint/model/GetApplicationDateRangeKpiResult.h
 include/aws/pinpoint/model/GetApplicationSettingsRequest.h
 include/aws/pinpoint/model/GetApplicationSettingsResult.h
 include/aws/pinpoint/model/GetAppsRequest.h
@@ -14417,6 +15496,8 @@ include/aws/pinpoint/model/GetBaiduChannelRequest.h
 include/aws/pinpoint/model/GetBaiduChannelResult.h
 include/aws/pinpoint/model/GetCampaignActivitiesRequest.h
 include/aws/pinpoint/model/GetCampaignActivitiesResult.h
+include/aws/pinpoint/model/GetCampaignDateRangeKpiRequest.h
+include/aws/pinpoint/model/GetCampaignDateRangeKpiResult.h
 include/aws/pinpoint/model/GetCampaignRequest.h
 include/aws/pinpoint/model/GetCampaignResult.h
 include/aws/pinpoint/model/GetCampaignVersionRequest.h
@@ -14494,6 +15575,8 @@ include/aws/pinpoint/model/RecencyDimension.h
 include/aws/pinpoint/model/RecencyType.h
 include/aws/pinpoint/model/RemoveAttributesRequest.h
 include/aws/pinpoint/model/RemoveAttributesResult.h
+include/aws/pinpoint/model/ResultRow.h
+include/aws/pinpoint/model/ResultRowValue.h
 include/aws/pinpoint/model/SMSChannelRequest.h
 include/aws/pinpoint/model/SMSChannelResponse.h
 include/aws/pinpoint/model/SMSMessage.h
@@ -14574,6 +15657,7 @@ include/aws/polly/model/DeleteLexiconRequest.h
 include/aws/polly/model/DeleteLexiconResult.h
 include/aws/polly/model/DescribeVoicesRequest.h
 include/aws/polly/model/DescribeVoicesResult.h
+include/aws/polly/model/Engine.h
 include/aws/polly/model/Gender.h
 include/aws/polly/model/GetLexiconRequest.h
 include/aws/polly/model/GetLexiconResult.h
@@ -14720,14 +15804,25 @@ include/aws/rds-data/RDSDataServiceErrorMarshaller.h
 include/aws/rds-data/RDSDataServiceErrors.h
 include/aws/rds-data/RDSDataServiceRequest.h
 include/aws/rds-data/RDSDataService_EXPORTS.h
+include/aws/rds-data/model/BatchExecuteStatementRequest.h
+include/aws/rds-data/model/BatchExecuteStatementResult.h
+include/aws/rds-data/model/BeginTransactionRequest.h
+include/aws/rds-data/model/BeginTransactionResult.h
 include/aws/rds-data/model/ColumnMetadata.h
-include/aws/rds-data/model/ExecuteSqlRequest.h
-include/aws/rds-data/model/ExecuteSqlResult.h
+include/aws/rds-data/model/CommitTransactionRequest.h
+include/aws/rds-data/model/CommitTransactionResult.h
+include/aws/rds-data/model/ExecuteStatementRequest.h
+include/aws/rds-data/model/ExecuteStatementResult.h
+include/aws/rds-data/model/Field.h
 include/aws/rds-data/model/Record.h
 include/aws/rds-data/model/ResultFrame.h
 include/aws/rds-data/model/ResultSetMetadata.h
+include/aws/rds-data/model/RollbackTransactionRequest.h
+include/aws/rds-data/model/RollbackTransactionResult.h
+include/aws/rds-data/model/SqlParameter.h
 include/aws/rds-data/model/SqlStatementResult.h
 include/aws/rds-data/model/StructValue.h
+include/aws/rds-data/model/UpdateResult.h
 include/aws/rds-data/model/Value.h
 include/aws/rds/RDSClient.h
 include/aws/rds/RDSEndpoint.h
@@ -14736,6 +15831,8 @@ include/aws/rds/RDSErrors.h
 include/aws/rds/RDSRequest.h
 include/aws/rds/RDS_EXPORTS.h
 include/aws/rds/model/AccountQuota.h
+include/aws/rds/model/ActivityStreamMode.h
+include/aws/rds/model/ActivityStreamStatus.h
 include/aws/rds/model/AddRoleToDBClusterRequest.h
 include/aws/rds/model/AddRoleToDBInstanceRequest.h
 include/aws/rds/model/AddSourceIdentifierToSubscriptionRequest.h
@@ -15003,10 +16100,14 @@ include/aws/rds/model/ScalingConfiguration.h
 include/aws/rds/model/ScalingConfigurationInfo.h
 include/aws/rds/model/SourceRegion.h
 include/aws/rds/model/SourceType.h
+include/aws/rds/model/StartActivityStreamRequest.h
+include/aws/rds/model/StartActivityStreamResult.h
 include/aws/rds/model/StartDBClusterRequest.h
 include/aws/rds/model/StartDBClusterResult.h
 include/aws/rds/model/StartDBInstanceRequest.h
 include/aws/rds/model/StartDBInstanceResult.h
+include/aws/rds/model/StopActivityStreamRequest.h
+include/aws/rds/model/StopActivityStreamResult.h
 include/aws/rds/model/StopDBClusterRequest.h
 include/aws/rds/model/StopDBClusterResult.h
 include/aws/rds/model/StopDBInstanceRequest.h
@@ -15470,6 +16571,8 @@ include/aws/robomaker/model/CreateSimulationApplicationVersionRequest.h
 include/aws/robomaker/model/CreateSimulationApplicationVersionResult.h
 include/aws/robomaker/model/CreateSimulationJobRequest.h
 include/aws/robomaker/model/CreateSimulationJobResult.h
+include/aws/robomaker/model/DataSource.h
+include/aws/robomaker/model/DataSourceConfig.h
 include/aws/robomaker/model/DeleteFleetRequest.h
 include/aws/robomaker/model/DeleteFleetResult.h
 include/aws/robomaker/model/DeleteRobotApplicationRequest.h
@@ -15516,6 +16619,7 @@ include/aws/robomaker/model/ListSimulationJobsRequest.h
 include/aws/robomaker/model/ListSimulationJobsResult.h
 include/aws/robomaker/model/ListTagsForResourceRequest.h
 include/aws/robomaker/model/ListTagsForResourceResult.h
+include/aws/robomaker/model/LoggingConfig.h
 include/aws/robomaker/model/OutputLocation.h
 include/aws/robomaker/model/ProgressDetail.h
 include/aws/robomaker/model/RegisterRobotRequest.h
@@ -15533,6 +16637,7 @@ include/aws/robomaker/model/RobotSoftwareSuite.h
 include/aws/robomaker/model/RobotSoftwareSuiteType.h
 include/aws/robomaker/model/RobotSoftwareSuiteVersionType.h
 include/aws/robomaker/model/RobotStatus.h
+include/aws/robomaker/model/S3KeyOutput.h
 include/aws/robomaker/model/SimulationApplicationConfig.h
 include/aws/robomaker/model/SimulationApplicationSummary.h
 include/aws/robomaker/model/SimulationJob.h
@@ -16265,6 +17370,7 @@ include/aws/sagemaker/model/CategoricalParameterRange.h
 include/aws/sagemaker/model/CategoricalParameterRangeSpecification.h
 include/aws/sagemaker/model/Channel.h
 include/aws/sagemaker/model/ChannelSpecification.h
+include/aws/sagemaker/model/CheckpointConfig.h
 include/aws/sagemaker/model/CodeRepositorySortBy.h
 include/aws/sagemaker/model/CodeRepositorySortOrder.h
 include/aws/sagemaker/model/CodeRepositorySummary.h
@@ -16306,6 +17412,7 @@ include/aws/sagemaker/model/CreateTransformJobRequest.h
 include/aws/sagemaker/model/CreateTransformJobResult.h
 include/aws/sagemaker/model/CreateWorkteamRequest.h
 include/aws/sagemaker/model/CreateWorkteamResult.h
+include/aws/sagemaker/model/DataProcessing.h
 include/aws/sagemaker/model/DataSource.h
 include/aws/sagemaker/model/DeleteAlgorithmRequest.h
 include/aws/sagemaker/model/DeleteCodeRepositoryRequest.h
@@ -16359,6 +17466,9 @@ include/aws/sagemaker/model/EndpointConfigSummary.h
 include/aws/sagemaker/model/EndpointSortKey.h
 include/aws/sagemaker/model/EndpointStatus.h
 include/aws/sagemaker/model/EndpointSummary.h
+include/aws/sagemaker/model/FileSystemAccessMode.h
+include/aws/sagemaker/model/FileSystemDataSource.h
+include/aws/sagemaker/model/FileSystemType.h
 include/aws/sagemaker/model/Filter.h
 include/aws/sagemaker/model/FinalHyperParameterTuningJobObjectiveMetric.h
 include/aws/sagemaker/model/Framework.h
@@ -16386,6 +17496,7 @@ include/aws/sagemaker/model/InputConfig.h
 include/aws/sagemaker/model/InstanceType.h
 include/aws/sagemaker/model/IntegerParameterRange.h
 include/aws/sagemaker/model/IntegerParameterRangeSpecification.h
+include/aws/sagemaker/model/JoinSource.h
 include/aws/sagemaker/model/LabelCounters.h
 include/aws/sagemaker/model/LabelCountersForWorkteam.h
 include/aws/sagemaker/model/LabelingJobAlgorithmsConfig.h
@@ -16634,6 +17745,7 @@ include/aws/securityhub/SecurityHub_EXPORTS.h
 include/aws/securityhub/model/AcceptInvitationRequest.h
 include/aws/securityhub/model/AcceptInvitationResult.h
 include/aws/securityhub/model/AccountDetails.h
+include/aws/securityhub/model/ActionTarget.h
 include/aws/securityhub/model/AwsEc2InstanceDetails.h
 include/aws/securityhub/model/AwsIamAccessKeyDetails.h
 include/aws/securityhub/model/AwsIamAccessKeyStatus.h
@@ -16649,6 +17761,8 @@ include/aws/securityhub/model/BatchImportFindingsResult.h
 include/aws/securityhub/model/Compliance.h
 include/aws/securityhub/model/ComplianceStatus.h
 include/aws/securityhub/model/ContainerDetails.h
+include/aws/securityhub/model/CreateActionTargetRequest.h
+include/aws/securityhub/model/CreateActionTargetResult.h
 include/aws/securityhub/model/CreateInsightRequest.h
 include/aws/securityhub/model/CreateInsightResult.h
 include/aws/securityhub/model/CreateMembersRequest.h
@@ -16658,12 +17772,18 @@ include/aws/securityhub/model/DateRange.h
 include/aws/securityhub/model/DateRangeUnit.h
 include/aws/securityhub/model/DeclineInvitationsRequest.h
 include/aws/securityhub/model/DeclineInvitationsResult.h
+include/aws/securityhub/model/DeleteActionTargetRequest.h
+include/aws/securityhub/model/DeleteActionTargetResult.h
 include/aws/securityhub/model/DeleteInsightRequest.h
 include/aws/securityhub/model/DeleteInsightResult.h
 include/aws/securityhub/model/DeleteInvitationsRequest.h
 include/aws/securityhub/model/DeleteInvitationsResult.h
 include/aws/securityhub/model/DeleteMembersRequest.h
 include/aws/securityhub/model/DeleteMembersResult.h
+include/aws/securityhub/model/DescribeActionTargetsRequest.h
+include/aws/securityhub/model/DescribeActionTargetsResult.h
+include/aws/securityhub/model/DescribeHubRequest.h
+include/aws/securityhub/model/DescribeHubResult.h
 include/aws/securityhub/model/DescribeProductsRequest.h
 include/aws/securityhub/model/DescribeProductsResult.h
 include/aws/securityhub/model/DisableImportFindingsForProductRequest.h
@@ -16707,8 +17827,8 @@ include/aws/securityhub/model/ListInvitationsRequest.h
 include/aws/securityhub/model/ListInvitationsResult.h
 include/aws/securityhub/model/ListMembersRequest.h
 include/aws/securityhub/model/ListMembersResult.h
-include/aws/securityhub/model/ListProductSubscribersRequest.h
-include/aws/securityhub/model/ListProductSubscribersResult.h
+include/aws/securityhub/model/ListTagsForResourceRequest.h
+include/aws/securityhub/model/ListTagsForResourceResult.h
 include/aws/securityhub/model/Malware.h
 include/aws/securityhub/model/MalwareState.h
 include/aws/securityhub/model/MalwareType.h
@@ -16738,9 +17858,15 @@ include/aws/securityhub/model/StandardsSubscription.h
 include/aws/securityhub/model/StandardsSubscriptionRequest.h
 include/aws/securityhub/model/StringFilter.h
 include/aws/securityhub/model/StringFilterComparison.h
+include/aws/securityhub/model/TagResourceRequest.h
+include/aws/securityhub/model/TagResourceResult.h
 include/aws/securityhub/model/ThreatIntelIndicator.h
 include/aws/securityhub/model/ThreatIntelIndicatorCategory.h
 include/aws/securityhub/model/ThreatIntelIndicatorType.h
+include/aws/securityhub/model/UntagResourceRequest.h
+include/aws/securityhub/model/UntagResourceResult.h
+include/aws/securityhub/model/UpdateActionTargetRequest.h
+include/aws/securityhub/model/UpdateActionTargetResult.h
 include/aws/securityhub/model/UpdateFindingsRequest.h
 include/aws/securityhub/model/UpdateFindingsResult.h
 include/aws/securityhub/model/UpdateInsightRequest.h
@@ -16790,6 +17916,55 @@ include/aws/serverlessrepo/model/UpdateApplicationRequest.h
 include/aws/serverlessrepo/model/UpdateApplicationResult.h
 include/aws/serverlessrepo/model/Version.h
 include/aws/serverlessrepo/model/VersionSummary.h
+include/aws/service-quotas/ServiceQuotasClient.h
+include/aws/service-quotas/ServiceQuotasEndpoint.h
+include/aws/service-quotas/ServiceQuotasErrorMarshaller.h
+include/aws/service-quotas/ServiceQuotasErrors.h
+include/aws/service-quotas/ServiceQuotasRequest.h
+include/aws/service-quotas/ServiceQuotas_EXPORTS.h
+include/aws/service-quotas/model/AssociateServiceQuotaTemplateRequest.h
+include/aws/service-quotas/model/AssociateServiceQuotaTemplateResult.h
+include/aws/service-quotas/model/DeleteServiceQuotaIncreaseRequestFromTemplateRequest.h
+include/aws/service-quotas/model/DeleteServiceQuotaIncreaseRequestFromTemplateResult.h
+include/aws/service-quotas/model/DisassociateServiceQuotaTemplateRequest.h
+include/aws/service-quotas/model/DisassociateServiceQuotaTemplateResult.h
+include/aws/service-quotas/model/ErrorCode.h
+include/aws/service-quotas/model/ErrorReason.h
+include/aws/service-quotas/model/GetAWSDefaultServiceQuotaRequest.h
+include/aws/service-quotas/model/GetAWSDefaultServiceQuotaResult.h
+include/aws/service-quotas/model/GetAssociationForServiceQuotaTemplateRequest.h
+include/aws/service-quotas/model/GetAssociationForServiceQuotaTemplateResult.h
+include/aws/service-quotas/model/GetRequestedServiceQuotaChangeRequest.h
+include/aws/service-quotas/model/GetRequestedServiceQuotaChangeResult.h
+include/aws/service-quotas/model/GetServiceQuotaIncreaseRequestFromTemplateRequest.h
+include/aws/service-quotas/model/GetServiceQuotaIncreaseRequestFromTemplateResult.h
+include/aws/service-quotas/model/GetServiceQuotaRequest.h
+include/aws/service-quotas/model/GetServiceQuotaResult.h
+include/aws/service-quotas/model/ListAWSDefaultServiceQuotasRequest.h
+include/aws/service-quotas/model/ListAWSDefaultServiceQuotasResult.h
+include/aws/service-quotas/model/ListRequestedServiceQuotaChangeHistoryByQuotaRequest.h
+include/aws/service-quotas/model/ListRequestedServiceQuotaChangeHistoryByQuotaResult.h
+include/aws/service-quotas/model/ListRequestedServiceQuotaChangeHistoryRequest.h
+include/aws/service-quotas/model/ListRequestedServiceQuotaChangeHistoryResult.h
+include/aws/service-quotas/model/ListServiceQuotaIncreaseRequestsInTemplateRequest.h
+include/aws/service-quotas/model/ListServiceQuotaIncreaseRequestsInTemplateResult.h
+include/aws/service-quotas/model/ListServiceQuotasRequest.h
+include/aws/service-quotas/model/ListServiceQuotasResult.h
+include/aws/service-quotas/model/ListServicesRequest.h
+include/aws/service-quotas/model/ListServicesResult.h
+include/aws/service-quotas/model/MetricInfo.h
+include/aws/service-quotas/model/PeriodUnit.h
+include/aws/service-quotas/model/PutServiceQuotaIncreaseRequestIntoTemplateRequest.h
+include/aws/service-quotas/model/PutServiceQuotaIncreaseRequestIntoTemplateResult.h
+include/aws/service-quotas/model/QuotaPeriod.h
+include/aws/service-quotas/model/RequestServiceQuotaIncreaseRequest.h
+include/aws/service-quotas/model/RequestServiceQuotaIncreaseResult.h
+include/aws/service-quotas/model/RequestStatus.h
+include/aws/service-quotas/model/RequestedServiceQuotaChange.h
+include/aws/service-quotas/model/ServiceInfo.h
+include/aws/service-quotas/model/ServiceQuota.h
+include/aws/service-quotas/model/ServiceQuotaIncreaseRequestInTemplate.h
+include/aws/service-quotas/model/ServiceQuotaTemplateAssociationStatus.h
 include/aws/servicecatalog/ServiceCatalogClient.h
 include/aws/servicecatalog/ServiceCatalogEndpoint.h
 include/aws/servicecatalog/ServiceCatalogErrorMarshaller.h
@@ -16880,6 +18055,8 @@ include/aws/servicecatalog/model/DescribeProvisioningParametersRequest.h
 include/aws/servicecatalog/model/DescribeProvisioningParametersResult.h
 include/aws/servicecatalog/model/DescribeRecordRequest.h
 include/aws/servicecatalog/model/DescribeRecordResult.h
+include/aws/servicecatalog/model/DescribeServiceActionExecutionParametersRequest.h
+include/aws/servicecatalog/model/DescribeServiceActionExecutionParametersResult.h
 include/aws/servicecatalog/model/DescribeServiceActionRequest.h
 include/aws/servicecatalog/model/DescribeServiceActionResult.h
 include/aws/servicecatalog/model/DescribeTagOptionRequest.h
@@ -16903,6 +18080,7 @@ include/aws/servicecatalog/model/ExecuteProvisionedProductPlanRequest.h
 include/aws/servicecatalog/model/ExecuteProvisionedProductPlanResult.h
 include/aws/servicecatalog/model/ExecuteProvisionedProductServiceActionRequest.h
 include/aws/servicecatalog/model/ExecuteProvisionedProductServiceActionResult.h
+include/aws/servicecatalog/model/ExecutionParameter.h
 include/aws/servicecatalog/model/FailedServiceActionAssociation.h
 include/aws/servicecatalog/model/GetAWSOrganizationsAccessStatusRequest.h
 include/aws/servicecatalog/model/GetAWSOrganizationsAccessStatusResult.h
@@ -16940,6 +18118,8 @@ include/aws/servicecatalog/model/ListServiceActionsForProvisioningArtifactReques
 include/aws/servicecatalog/model/ListServiceActionsForProvisioningArtifactResult.h
 include/aws/servicecatalog/model/ListServiceActionsRequest.h
 include/aws/servicecatalog/model/ListServiceActionsResult.h
+include/aws/servicecatalog/model/ListStackInstancesForProvisionedProductRequest.h
+include/aws/servicecatalog/model/ListStackInstancesForProvisionedProductResult.h
 include/aws/servicecatalog/model/ListTagOptionsFilters.h
 include/aws/servicecatalog/model/ListTagOptionsRequest.h
 include/aws/servicecatalog/model/ListTagOptionsResult.h
@@ -16970,6 +18150,7 @@ include/aws/servicecatalog/model/ProvisionedProductStatus.h
 include/aws/servicecatalog/model/ProvisionedProductViewFilterBy.h
 include/aws/servicecatalog/model/ProvisioningArtifact.h
 include/aws/servicecatalog/model/ProvisioningArtifactDetail.h
+include/aws/servicecatalog/model/ProvisioningArtifactGuidance.h
 include/aws/servicecatalog/model/ProvisioningArtifactParameter.h
 include/aws/servicecatalog/model/ProvisioningArtifactPreferences.h
 include/aws/servicecatalog/model/ProvisioningArtifactProperties.h
@@ -17011,6 +18192,8 @@ include/aws/servicecatalog/model/ShareDetails.h
 include/aws/servicecatalog/model/ShareError.h
 include/aws/servicecatalog/model/ShareStatus.h
 include/aws/servicecatalog/model/SortOrder.h
+include/aws/servicecatalog/model/StackInstance.h
+include/aws/servicecatalog/model/StackInstanceStatus.h
 include/aws/servicecatalog/model/StackSetOperationType.h
 include/aws/servicecatalog/model/Status.h
 include/aws/servicecatalog/model/Tag.h
@@ -17514,6 +18697,8 @@ include/aws/sqs/model/ListQueuesResult.h
 include/aws/sqs/model/Message.h
 include/aws/sqs/model/MessageAttributeValue.h
 include/aws/sqs/model/MessageSystemAttributeName.h
+include/aws/sqs/model/MessageSystemAttributeNameForSends.h
+include/aws/sqs/model/MessageSystemAttributeValue.h
 include/aws/sqs/model/PurgeQueueRequest.h
 include/aws/sqs/model/QueueAttributeName.h
 include/aws/sqs/model/ReceiveMessageRequest.h
@@ -17599,6 +18784,8 @@ include/aws/ssm/model/CreateDocumentRequest.h
 include/aws/ssm/model/CreateDocumentResult.h
 include/aws/ssm/model/CreateMaintenanceWindowRequest.h
 include/aws/ssm/model/CreateMaintenanceWindowResult.h
+include/aws/ssm/model/CreateOpsItemRequest.h
+include/aws/ssm/model/CreateOpsItemResult.h
 include/aws/ssm/model/CreatePatchBaselineRequest.h
 include/aws/ssm/model/CreatePatchBaselineResult.h
 include/aws/ssm/model/CreateResourceDataSyncRequest.h
@@ -17681,6 +18868,8 @@ include/aws/ssm/model/DescribeMaintenanceWindowsForTargetRequest.h
 include/aws/ssm/model/DescribeMaintenanceWindowsForTargetResult.h
 include/aws/ssm/model/DescribeMaintenanceWindowsRequest.h
 include/aws/ssm/model/DescribeMaintenanceWindowsResult.h
+include/aws/ssm/model/DescribeOpsItemsRequest.h
+include/aws/ssm/model/DescribeOpsItemsResult.h
 include/aws/ssm/model/DescribeParametersRequest.h
 include/aws/ssm/model/DescribeParametersResult.h
 include/aws/ssm/model/DescribePatchBaselinesRequest.h
@@ -17738,6 +18927,10 @@ include/aws/ssm/model/GetMaintenanceWindowRequest.h
 include/aws/ssm/model/GetMaintenanceWindowResult.h
 include/aws/ssm/model/GetMaintenanceWindowTaskRequest.h
 include/aws/ssm/model/GetMaintenanceWindowTaskResult.h
+include/aws/ssm/model/GetOpsItemRequest.h
+include/aws/ssm/model/GetOpsItemResult.h
+include/aws/ssm/model/GetOpsSummaryRequest.h
+include/aws/ssm/model/GetOpsSummaryResult.h
 include/aws/ssm/model/GetParameterHistoryRequest.h
 include/aws/ssm/model/GetParameterHistoryResult.h
 include/aws/ssm/model/GetParameterRequest.h
@@ -17831,6 +19024,20 @@ include/aws/ssm/model/NotificationConfig.h
 include/aws/ssm/model/NotificationEvent.h
 include/aws/ssm/model/NotificationType.h
 include/aws/ssm/model/OperatingSystem.h
+include/aws/ssm/model/OpsAggregator.h
+include/aws/ssm/model/OpsEntity.h
+include/aws/ssm/model/OpsEntityItem.h
+include/aws/ssm/model/OpsFilter.h
+include/aws/ssm/model/OpsFilterOperatorType.h
+include/aws/ssm/model/OpsItem.h
+include/aws/ssm/model/OpsItemDataType.h
+include/aws/ssm/model/OpsItemDataValue.h
+include/aws/ssm/model/OpsItemFilter.h
+include/aws/ssm/model/OpsItemFilterKey.h
+include/aws/ssm/model/OpsItemFilterOperator.h
+include/aws/ssm/model/OpsItemNotification.h
+include/aws/ssm/model/OpsItemStatus.h
+include/aws/ssm/model/OpsItemSummary.h
 include/aws/ssm/model/OutputSource.h
 include/aws/ssm/model/Parameter.h
 include/aws/ssm/model/ParameterHistory.h
@@ -17877,6 +19084,7 @@ include/aws/ssm/model/RegisterTargetWithMaintenanceWindowRequest.h
 include/aws/ssm/model/RegisterTargetWithMaintenanceWindowResult.h
 include/aws/ssm/model/RegisterTaskWithMaintenanceWindowRequest.h
 include/aws/ssm/model/RegisterTaskWithMaintenanceWindowResult.h
+include/aws/ssm/model/RelatedOpsItem.h
 include/aws/ssm/model/RemoveTagsFromResourceRequest.h
 include/aws/ssm/model/RemoveTagsFromResourceResult.h
 include/aws/ssm/model/ResetServiceSettingRequest.h
@@ -17940,6 +19148,8 @@ include/aws/ssm/model/UpdateMaintenanceWindowTaskRequest.h
 include/aws/ssm/model/UpdateMaintenanceWindowTaskResult.h
 include/aws/ssm/model/UpdateManagedInstanceRoleRequest.h
 include/aws/ssm/model/UpdateManagedInstanceRoleResult.h
+include/aws/ssm/model/UpdateOpsItemRequest.h
+include/aws/ssm/model/UpdateOpsItemResult.h
 include/aws/ssm/model/UpdatePatchBaselineRequest.h
 include/aws/ssm/model/UpdatePatchBaselineResult.h
 include/aws/ssm/model/UpdateServiceSettingRequest.h
@@ -18000,6 +19210,8 @@ include/aws/states/model/ListStateMachinesRequest.h
 include/aws/states/model/ListStateMachinesResult.h
 include/aws/states/model/ListTagsForResourceRequest.h
 include/aws/states/model/ListTagsForResourceResult.h
+include/aws/states/model/MapIterationEventDetails.h
+include/aws/states/model/MapStateStartedEventDetails.h
 include/aws/states/model/SendTaskFailureRequest.h
 include/aws/states/model/SendTaskFailureResult.h
 include/aws/states/model/SendTaskHeartbeatRequest.h
@@ -18166,6 +19378,7 @@ include/aws/storagegateway/model/RetrieveTapeArchiveResult.h
 include/aws/storagegateway/model/RetrieveTapeRecoveryPointRequest.h
 include/aws/storagegateway/model/RetrieveTapeRecoveryPointResult.h
 include/aws/storagegateway/model/SMBFileShareInfo.h
+include/aws/storagegateway/model/SMBSecurityStrategy.h
 include/aws/storagegateway/model/SetLocalConsolePasswordRequest.h
 include/aws/storagegateway/model/SetLocalConsolePasswordResult.h
 include/aws/storagegateway/model/SetSMBGuestPasswordRequest.h
@@ -18195,6 +19408,8 @@ include/aws/storagegateway/model/UpdateNFSFileShareRequest.h
 include/aws/storagegateway/model/UpdateNFSFileShareResult.h
 include/aws/storagegateway/model/UpdateSMBFileShareRequest.h
 include/aws/storagegateway/model/UpdateSMBFileShareResult.h
+include/aws/storagegateway/model/UpdateSMBSecurityStrategyRequest.h
+include/aws/storagegateway/model/UpdateSMBSecurityStrategyResult.h
 include/aws/storagegateway/model/UpdateSnapshotScheduleRequest.h
 include/aws/storagegateway/model/UpdateSnapshotScheduleResult.h
 include/aws/storagegateway/model/UpdateVTLDeviceTypeRequest.h
@@ -18220,6 +19435,8 @@ include/aws/sts/model/Credentials.h
 include/aws/sts/model/DecodeAuthorizationMessageRequest.h
 include/aws/sts/model/DecodeAuthorizationMessageResult.h
 include/aws/sts/model/FederatedUser.h
+include/aws/sts/model/GetAccessKeyInfoRequest.h
+include/aws/sts/model/GetAccessKeyInfoResult.h
 include/aws/sts/model/GetCallerIdentityRequest.h
 include/aws/sts/model/GetCallerIdentityResult.h
 include/aws/sts/model/GetFederationTokenRequest.h
@@ -18369,6 +19586,8 @@ include/aws/swf/model/ListDomainsRequest.h
 include/aws/swf/model/ListDomainsResult.h
 include/aws/swf/model/ListOpenWorkflowExecutionsRequest.h
 include/aws/swf/model/ListOpenWorkflowExecutionsResult.h
+include/aws/swf/model/ListTagsForResourceRequest.h
+include/aws/swf/model/ListTagsForResourceResult.h
 include/aws/swf/model/ListWorkflowTypesRequest.h
 include/aws/swf/model/ListWorkflowTypesResult.h
 include/aws/swf/model/MarkerRecordedEventAttributes.h
@@ -18393,6 +19612,7 @@ include/aws/swf/model/RequestCancelExternalWorkflowExecutionFailedCause.h
 include/aws/swf/model/RequestCancelExternalWorkflowExecutionFailedEventAttributes.h
 include/aws/swf/model/RequestCancelExternalWorkflowExecutionInitiatedEventAttributes.h
 include/aws/swf/model/RequestCancelWorkflowExecutionRequest.h
+include/aws/swf/model/ResourceTag.h
 include/aws/swf/model/RespondActivityTaskCanceledRequest.h
 include/aws/swf/model/RespondActivityTaskCompletedRequest.h
 include/aws/swf/model/RespondActivityTaskFailedRequest.h
@@ -18420,11 +19640,16 @@ include/aws/swf/model/StartTimerFailedEventAttributes.h
 include/aws/swf/model/StartWorkflowExecutionRequest.h
 include/aws/swf/model/StartWorkflowExecutionResult.h
 include/aws/swf/model/TagFilter.h
+include/aws/swf/model/TagResourceRequest.h
 include/aws/swf/model/TaskList.h
 include/aws/swf/model/TerminateWorkflowExecutionRequest.h
 include/aws/swf/model/TimerCanceledEventAttributes.h
 include/aws/swf/model/TimerFiredEventAttributes.h
 include/aws/swf/model/TimerStartedEventAttributes.h
+include/aws/swf/model/UndeprecateActivityTypeRequest.h
+include/aws/swf/model/UndeprecateDomainRequest.h
+include/aws/swf/model/UndeprecateWorkflowTypeRequest.h
+include/aws/swf/model/UntagResourceRequest.h
 include/aws/swf/model/WorkflowExecution.h
 include/aws/swf/model/WorkflowExecutionCancelRequestedCause.h
 include/aws/swf/model/WorkflowExecutionCancelRequestedEventAttributes.h
@@ -18715,6 +19940,8 @@ include/aws/waf-regional/model/ListSqlInjectionMatchSetsRequest.h
 include/aws/waf-regional/model/ListSqlInjectionMatchSetsResult.h
 include/aws/waf-regional/model/ListSubscribedRuleGroupsRequest.h
 include/aws/waf-regional/model/ListSubscribedRuleGroupsResult.h
+include/aws/waf-regional/model/ListTagsForResourceRequest.h
+include/aws/waf-regional/model/ListTagsForResourceResult.h
 include/aws/waf-regional/model/ListWebACLsRequest.h
 include/aws/waf-regional/model/ListWebACLsResult.h
 include/aws/waf-regional/model/ListXssMatchSetsRequest.h
@@ -18756,8 +19983,14 @@ include/aws/waf-regional/model/SqlInjectionMatchSetSummary.h
 include/aws/waf-regional/model/SqlInjectionMatchSetUpdate.h
 include/aws/waf-regional/model/SqlInjectionMatchTuple.h
 include/aws/waf-regional/model/SubscribedRuleGroupSummary.h
+include/aws/waf-regional/model/Tag.h
+include/aws/waf-regional/model/TagInfoForResource.h
+include/aws/waf-regional/model/TagResourceRequest.h
+include/aws/waf-regional/model/TagResourceResult.h
 include/aws/waf-regional/model/TextTransformation.h
 include/aws/waf-regional/model/TimeWindow.h
+include/aws/waf-regional/model/UntagResourceRequest.h
+include/aws/waf-regional/model/UntagResourceResult.h
 include/aws/waf-regional/model/UpdateByteMatchSetRequest.h
 include/aws/waf-regional/model/UpdateByteMatchSetResult.h
 include/aws/waf-regional/model/UpdateGeoMatchSetRequest.h
@@ -18937,6 +20170,8 @@ include/aws/waf/model/ListSqlInjectionMatchSetsRequest.h
 include/aws/waf/model/ListSqlInjectionMatchSetsResult.h
 include/aws/waf/model/ListSubscribedRuleGroupsRequest.h
 include/aws/waf/model/ListSubscribedRuleGroupsResult.h
+include/aws/waf/model/ListTagsForResourceRequest.h
+include/aws/waf/model/ListTagsForResourceResult.h
 include/aws/waf/model/ListWebACLsRequest.h
 include/aws/waf/model/ListWebACLsResult.h
 include/aws/waf/model/ListXssMatchSetsRequest.h
@@ -18977,8 +20212,14 @@ include/aws/waf/model/SqlInjectionMatchSetSummary.h
 include/aws/waf/model/SqlInjectionMatchSetUpdate.h
 include/aws/waf/model/SqlInjectionMatchTuple.h
 include/aws/waf/model/SubscribedRuleGroupSummary.h
+include/aws/waf/model/Tag.h
+include/aws/waf/model/TagInfoForResource.h
+include/aws/waf/model/TagResourceRequest.h
+include/aws/waf/model/TagResourceResult.h
 include/aws/waf/model/TextTransformation.h
 include/aws/waf/model/TimeWindow.h
+include/aws/waf/model/UntagResourceRequest.h
+include/aws/waf/model/UntagResourceResult.h
 include/aws/waf/model/UpdateByteMatchSetRequest.h
 include/aws/waf/model/UpdateByteMatchSetResult.h
 include/aws/waf/model/UpdateGeoMatchSetRequest.h
@@ -19315,6 +20556,8 @@ include/aws/workspaces/model/ClientPropertiesResult.h
 include/aws/workspaces/model/Compute.h
 include/aws/workspaces/model/ComputeType.h
 include/aws/workspaces/model/ConnectionState.h
+include/aws/workspaces/model/CopyWorkspaceImageRequest.h
+include/aws/workspaces/model/CopyWorkspaceImageResult.h
 include/aws/workspaces/model/CreateIpGroupRequest.h
 include/aws/workspaces/model/CreateIpGroupResult.h
 include/aws/workspaces/model/CreateTagsRequest.h
@@ -19567,6 +20810,10 @@ lib/cmake/aws-cpp-sdk-application-autoscaling/aws-cpp-sdk-application-autoscalin
 lib/cmake/aws-cpp-sdk-application-autoscaling/aws-cpp-sdk-application-autoscaling-config.cmake
 lib/cmake/aws-cpp-sdk-application-autoscaling/aws-cpp-sdk-application-autoscaling-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/aws-cpp-sdk-application-autoscaling/aws-cpp-sdk-application-autoscaling-targets.cmake
+lib/cmake/aws-cpp-sdk-application-insights/aws-cpp-sdk-application-insights-config-version.cmake
+lib/cmake/aws-cpp-sdk-application-insights/aws-cpp-sdk-application-insights-config.cmake
+lib/cmake/aws-cpp-sdk-application-insights/aws-cpp-sdk-application-insights-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/aws-cpp-sdk-application-insights/aws-cpp-sdk-application-insights-targets.cmake
 lib/cmake/aws-cpp-sdk-appmesh/aws-cpp-sdk-appmesh-config-version.cmake
 lib/cmake/aws-cpp-sdk-appmesh/aws-cpp-sdk-appmesh-config.cmake
 lib/cmake/aws-cpp-sdk-appmesh/aws-cpp-sdk-appmesh-targets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -19755,6 +21002,10 @@ lib/cmake/aws-cpp-sdk-dynamodbstreams/aws-cpp-sdk-dynamodbstreams-config-version
 lib/cmake/aws-cpp-sdk-dynamodbstreams/aws-cpp-sdk-dynamodbstreams-config.cmake
 lib/cmake/aws-cpp-sdk-dynamodbstreams/aws-cpp-sdk-dynamodbstreams-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/aws-cpp-sdk-dynamodbstreams/aws-cpp-sdk-dynamodbstreams-targets.cmake
+lib/cmake/aws-cpp-sdk-ec2-instance-connect/aws-cpp-sdk-ec2-instance-connect-config-version.cmake
+lib/cmake/aws-cpp-sdk-ec2-instance-connect/aws-cpp-sdk-ec2-instance-connect-config.cmake
+lib/cmake/aws-cpp-sdk-ec2-instance-connect/aws-cpp-sdk-ec2-instance-connect-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/aws-cpp-sdk-ec2-instance-connect/aws-cpp-sdk-ec2-instance-connect-targets.cmake
 lib/cmake/aws-cpp-sdk-ec2/aws-cpp-sdk-ec2-config-version.cmake
 lib/cmake/aws-cpp-sdk-ec2/aws-cpp-sdk-ec2-config.cmake
 lib/cmake/aws-cpp-sdk-ec2/aws-cpp-sdk-ec2-targets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -19807,6 +21058,10 @@ lib/cmake/aws-cpp-sdk-es/aws-cpp-sdk-es-config-version.cmake
 lib/cmake/aws-cpp-sdk-es/aws-cpp-sdk-es-config.cmake
 lib/cmake/aws-cpp-sdk-es/aws-cpp-sdk-es-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/aws-cpp-sdk-es/aws-cpp-sdk-es-targets.cmake
+lib/cmake/aws-cpp-sdk-eventbridge/aws-cpp-sdk-eventbridge-config-version.cmake
+lib/cmake/aws-cpp-sdk-eventbridge/aws-cpp-sdk-eventbridge-config.cmake
+lib/cmake/aws-cpp-sdk-eventbridge/aws-cpp-sdk-eventbridge-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/aws-cpp-sdk-eventbridge/aws-cpp-sdk-eventbridge-targets.cmake
 lib/cmake/aws-cpp-sdk-events/aws-cpp-sdk-events-config-version.cmake
 lib/cmake/aws-cpp-sdk-events/aws-cpp-sdk-events-config.cmake
 lib/cmake/aws-cpp-sdk-events/aws-cpp-sdk-events-targets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -19819,6 +21074,14 @@ lib/cmake/aws-cpp-sdk-fms/aws-cpp-sdk-fms-config-version.cmake
 lib/cmake/aws-cpp-sdk-fms/aws-cpp-sdk-fms-config.cmake
 lib/cmake/aws-cpp-sdk-fms/aws-cpp-sdk-fms-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/aws-cpp-sdk-fms/aws-cpp-sdk-fms-targets.cmake
+lib/cmake/aws-cpp-sdk-forecast/aws-cpp-sdk-forecast-config-version.cmake
+lib/cmake/aws-cpp-sdk-forecast/aws-cpp-sdk-forecast-config.cmake
+lib/cmake/aws-cpp-sdk-forecast/aws-cpp-sdk-forecast-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/aws-cpp-sdk-forecast/aws-cpp-sdk-forecast-targets.cmake
+lib/cmake/aws-cpp-sdk-forecastquery/aws-cpp-sdk-forecastquery-config-version.cmake
+lib/cmake/aws-cpp-sdk-forecastquery/aws-cpp-sdk-forecastquery-config.cmake
+lib/cmake/aws-cpp-sdk-forecastquery/aws-cpp-sdk-forecastquery-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/aws-cpp-sdk-forecastquery/aws-cpp-sdk-forecastquery-targets.cmake
 lib/cmake/aws-cpp-sdk-fsx/aws-cpp-sdk-fsx-config-version.cmake
 lib/cmake/aws-cpp-sdk-fsx/aws-cpp-sdk-fsx-config.cmake
 lib/cmake/aws-cpp-sdk-fsx/aws-cpp-sdk-fsx-targets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -19895,6 +21158,14 @@ lib/cmake/aws-cpp-sdk-iotanalytics/aws-cpp-sdk-iotanalytics-config-version.cmake
 lib/cmake/aws-cpp-sdk-iotanalytics/aws-cpp-sdk-iotanalytics-config.cmake
 lib/cmake/aws-cpp-sdk-iotanalytics/aws-cpp-sdk-iotanalytics-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/aws-cpp-sdk-iotanalytics/aws-cpp-sdk-iotanalytics-targets.cmake
+lib/cmake/aws-cpp-sdk-iotevents-data/aws-cpp-sdk-iotevents-data-config-version.cmake
+lib/cmake/aws-cpp-sdk-iotevents-data/aws-cpp-sdk-iotevents-data-config.cmake
+lib/cmake/aws-cpp-sdk-iotevents-data/aws-cpp-sdk-iotevents-data-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/aws-cpp-sdk-iotevents-data/aws-cpp-sdk-iotevents-data-targets.cmake
+lib/cmake/aws-cpp-sdk-iotevents/aws-cpp-sdk-iotevents-config-version.cmake
+lib/cmake/aws-cpp-sdk-iotevents/aws-cpp-sdk-iotevents-config.cmake
+lib/cmake/aws-cpp-sdk-iotevents/aws-cpp-sdk-iotevents-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/aws-cpp-sdk-iotevents/aws-cpp-sdk-iotevents-targets.cmake
 lib/cmake/aws-cpp-sdk-iotthingsgraph/aws-cpp-sdk-iotthingsgraph-config-version.cmake
 lib/cmake/aws-cpp-sdk-iotthingsgraph/aws-cpp-sdk-iotthingsgraph-config.cmake
 lib/cmake/aws-cpp-sdk-iotthingsgraph/aws-cpp-sdk-iotthingsgraph-targets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -19931,6 +21202,10 @@ lib/cmake/aws-cpp-sdk-kms/aws-cpp-sdk-kms-config-version.cmake
 lib/cmake/aws-cpp-sdk-kms/aws-cpp-sdk-kms-config.cmake
 lib/cmake/aws-cpp-sdk-kms/aws-cpp-sdk-kms-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/aws-cpp-sdk-kms/aws-cpp-sdk-kms-targets.cmake
+lib/cmake/aws-cpp-sdk-lakeformation/aws-cpp-sdk-lakeformation-config-version.cmake
+lib/cmake/aws-cpp-sdk-lakeformation/aws-cpp-sdk-lakeformation-config.cmake
+lib/cmake/aws-cpp-sdk-lakeformation/aws-cpp-sdk-lakeformation-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/aws-cpp-sdk-lakeformation/aws-cpp-sdk-lakeformation-targets.cmake
 lib/cmake/aws-cpp-sdk-lambda/aws-cpp-sdk-lambda-config-version.cmake
 lib/cmake/aws-cpp-sdk-lambda/aws-cpp-sdk-lambda-config.cmake
 lib/cmake/aws-cpp-sdk-lambda/aws-cpp-sdk-lambda-targets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -20047,6 +21322,18 @@ lib/cmake/aws-cpp-sdk-organizations/aws-cpp-sdk-organizations-config-version.cma
 lib/cmake/aws-cpp-sdk-organizations/aws-cpp-sdk-organizations-config.cmake
 lib/cmake/aws-cpp-sdk-organizations/aws-cpp-sdk-organizations-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/aws-cpp-sdk-organizations/aws-cpp-sdk-organizations-targets.cmake
+lib/cmake/aws-cpp-sdk-personalize-events/aws-cpp-sdk-personalize-events-config-version.cmake
+lib/cmake/aws-cpp-sdk-personalize-events/aws-cpp-sdk-personalize-events-config.cmake
+lib/cmake/aws-cpp-sdk-personalize-events/aws-cpp-sdk-personalize-events-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/aws-cpp-sdk-personalize-events/aws-cpp-sdk-personalize-events-targets.cmake
+lib/cmake/aws-cpp-sdk-personalize-runtime/aws-cpp-sdk-personalize-runtime-config-version.cmake
+lib/cmake/aws-cpp-sdk-personalize-runtime/aws-cpp-sdk-personalize-runtime-config.cmake
+lib/cmake/aws-cpp-sdk-personalize-runtime/aws-cpp-sdk-personalize-runtime-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/aws-cpp-sdk-personalize-runtime/aws-cpp-sdk-personalize-runtime-targets.cmake
+lib/cmake/aws-cpp-sdk-personalize/aws-cpp-sdk-personalize-config-version.cmake
+lib/cmake/aws-cpp-sdk-personalize/aws-cpp-sdk-personalize-config.cmake
+lib/cmake/aws-cpp-sdk-personalize/aws-cpp-sdk-personalize-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/aws-cpp-sdk-personalize/aws-cpp-sdk-personalize-targets.cmake
 lib/cmake/aws-cpp-sdk-pi/aws-cpp-sdk-pi-config-version.cmake
 lib/cmake/aws-cpp-sdk-pi/aws-cpp-sdk-pi-config.cmake
 lib/cmake/aws-cpp-sdk-pi/aws-cpp-sdk-pi-targets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -20155,6 +21442,10 @@ lib/cmake/aws-cpp-sdk-serverlessrepo/aws-cpp-sdk-serverlessrepo-config-version.c
 lib/cmake/aws-cpp-sdk-serverlessrepo/aws-cpp-sdk-serverlessrepo-config.cmake
 lib/cmake/aws-cpp-sdk-serverlessrepo/aws-cpp-sdk-serverlessrepo-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/aws-cpp-sdk-serverlessrepo/aws-cpp-sdk-serverlessrepo-targets.cmake
+lib/cmake/aws-cpp-sdk-service-quotas/aws-cpp-sdk-service-quotas-config-version.cmake
+lib/cmake/aws-cpp-sdk-service-quotas/aws-cpp-sdk-service-quotas-config.cmake
+lib/cmake/aws-cpp-sdk-service-quotas/aws-cpp-sdk-service-quotas-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/aws-cpp-sdk-service-quotas/aws-cpp-sdk-service-quotas-targets.cmake
 lib/cmake/aws-cpp-sdk-servicecatalog/aws-cpp-sdk-servicecatalog-config-version.cmake
 lib/cmake/aws-cpp-sdk-servicecatalog/aws-cpp-sdk-servicecatalog-config.cmake
 lib/cmake/aws-cpp-sdk-servicecatalog/aws-cpp-sdk-servicecatalog-targets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -20277,6 +21568,7 @@ lib/libaws-cpp-sdk-apigateway.so
 lib/libaws-cpp-sdk-apigatewaymanagementapi.so
 lib/libaws-cpp-sdk-apigatewayv2.so
 lib/libaws-cpp-sdk-application-autoscaling.so
+lib/libaws-cpp-sdk-application-insights.so
 lib/libaws-cpp-sdk-appmesh.so
 lib/libaws-cpp-sdk-appstream.so
 lib/libaws-cpp-sdk-appsync.so
@@ -20324,6 +21616,7 @@ lib/libaws-cpp-sdk-docdb.so
 lib/libaws-cpp-sdk-ds.so
 lib/libaws-cpp-sdk-dynamodb.so
 lib/libaws-cpp-sdk-dynamodbstreams.so
+lib/libaws-cpp-sdk-ec2-instance-connect.so
 lib/libaws-cpp-sdk-ec2.so
 lib/libaws-cpp-sdk-ecr.so
 lib/libaws-cpp-sdk-ecs.so
@@ -20337,9 +21630,12 @@ lib/libaws-cpp-sdk-elasticmapreduce.so
 lib/libaws-cpp-sdk-elastictranscoder.so
 lib/libaws-cpp-sdk-email.so
 lib/libaws-cpp-sdk-es.so
+lib/libaws-cpp-sdk-eventbridge.so
 lib/libaws-cpp-sdk-events.so
 lib/libaws-cpp-sdk-firehose.so
 lib/libaws-cpp-sdk-fms.so
+lib/libaws-cpp-sdk-forecast.so
+lib/libaws-cpp-sdk-forecastquery.so
 lib/libaws-cpp-sdk-fsx.so
 lib/libaws-cpp-sdk-gamelift.so
 lib/libaws-cpp-sdk-glacier.so
@@ -20359,6 +21655,8 @@ lib/libaws-cpp-sdk-iot.so
 lib/libaws-cpp-sdk-iot1click-devices.so
 lib/libaws-cpp-sdk-iot1click-projects.so
 lib/libaws-cpp-sdk-iotanalytics.so
+lib/libaws-cpp-sdk-iotevents-data.so
+lib/libaws-cpp-sdk-iotevents.so
 lib/libaws-cpp-sdk-iotthingsgraph.so
 lib/libaws-cpp-sdk-kafka.so
 lib/libaws-cpp-sdk-kinesis-video-archived-media.so
@@ -20368,6 +21666,7 @@ lib/libaws-cpp-sdk-kinesisanalytics.so
 lib/libaws-cpp-sdk-kinesisanalyticsv2.so
 lib/libaws-cpp-sdk-kinesisvideo.so
 lib/libaws-cpp-sdk-kms.so
+lib/libaws-cpp-sdk-lakeformation.so
 lib/libaws-cpp-sdk-lambda.so
 lib/libaws-cpp-sdk-lex-models.so
 lib/libaws-cpp-sdk-lex.so
@@ -20397,6 +21696,9 @@ lib/libaws-cpp-sdk-neptune.so
 lib/libaws-cpp-sdk-opsworks.so
 lib/libaws-cpp-sdk-opsworkscm.so
 lib/libaws-cpp-sdk-organizations.so
+lib/libaws-cpp-sdk-personalize-events.so
+lib/libaws-cpp-sdk-personalize-runtime.so
+lib/libaws-cpp-sdk-personalize.so
 lib/libaws-cpp-sdk-pi.so
 lib/libaws-cpp-sdk-pinpoint-email.so
 lib/libaws-cpp-sdk-pinpoint.so
@@ -20424,6 +21726,7 @@ lib/libaws-cpp-sdk-sdb.so
 lib/libaws-cpp-sdk-secretsmanager.so
 lib/libaws-cpp-sdk-securityhub.so
 lib/libaws-cpp-sdk-serverlessrepo.so
+lib/libaws-cpp-sdk-service-quotas.so
 lib/libaws-cpp-sdk-servicecatalog.so
 lib/libaws-cpp-sdk-servicediscovery.so
 lib/libaws-cpp-sdk-shield.so
@@ -20462,6 +21765,7 @@ libdata/pkgconfig/aws-cpp-sdk-apigateway.pc
 libdata/pkgconfig/aws-cpp-sdk-apigatewaymanagementapi.pc
 libdata/pkgconfig/aws-cpp-sdk-apigatewayv2.pc
 libdata/pkgconfig/aws-cpp-sdk-application-autoscaling.pc
+libdata/pkgconfig/aws-cpp-sdk-application-insights.pc
 libdata/pkgconfig/aws-cpp-sdk-appmesh.pc
 libdata/pkgconfig/aws-cpp-sdk-appstream.pc
 libdata/pkgconfig/aws-cpp-sdk-appsync.pc
@@ -20509,6 +21813,7 @@ libdata/pkgconfig/aws-cpp-sdk-docdb.pc
 libdata/pkgconfig/aws-cpp-sdk-ds.pc
 libdata/pkgconfig/aws-cpp-sdk-dynamodb.pc
 libdata/pkgconfig/aws-cpp-sdk-dynamodbstreams.pc
+libdata/pkgconfig/aws-cpp-sdk-ec2-instance-connect.pc
 libdata/pkgconfig/aws-cpp-sdk-ec2.pc
 libdata/pkgconfig/aws-cpp-sdk-ecr.pc
 libdata/pkgconfig/aws-cpp-sdk-ecs.pc
@@ -20522,9 +21827,12 @@ libdata/pkgconfig/aws-cpp-sdk-elasticmapreduce.pc
 libdata/pkgconfig/aws-cpp-sdk-elastictranscoder.pc
 libdata/pkgconfig/aws-cpp-sdk-email.pc
 libdata/pkgconfig/aws-cpp-sdk-es.pc
+libdata/pkgconfig/aws-cpp-sdk-eventbridge.pc
 libdata/pkgconfig/aws-cpp-sdk-events.pc
 libdata/pkgconfig/aws-cpp-sdk-firehose.pc
 libdata/pkgconfig/aws-cpp-sdk-fms.pc
+libdata/pkgconfig/aws-cpp-sdk-forecast.pc
+libdata/pkgconfig/aws-cpp-sdk-forecastquery.pc
 libdata/pkgconfig/aws-cpp-sdk-fsx.pc
 libdata/pkgconfig/aws-cpp-sdk-gamelift.pc
 libdata/pkgconfig/aws-cpp-sdk-glacier.pc
@@ -20544,6 +21852,8 @@ libdata/pkgconfig/aws-cpp-sdk-iot.pc
 libdata/pkgconfig/aws-cpp-sdk-iot1click-devices.pc
 libdata/pkgconfig/aws-cpp-sdk-iot1click-projects.pc
 libdata/pkgconfig/aws-cpp-sdk-iotanalytics.pc
+libdata/pkgconfig/aws-cpp-sdk-iotevents-data.pc
+libdata/pkgconfig/aws-cpp-sdk-iotevents.pc
 libdata/pkgconfig/aws-cpp-sdk-iotthingsgraph.pc
 libdata/pkgconfig/aws-cpp-sdk-kafka.pc
 libdata/pkgconfig/aws-cpp-sdk-kinesis-video-archived-media.pc
@@ -20553,6 +21863,7 @@ libdata/pkgconfig/aws-cpp-sdk-kinesisanalytics.pc
 libdata/pkgconfig/aws-cpp-sdk-kinesisanalyticsv2.pc
 libdata/pkgconfig/aws-cpp-sdk-kinesisvideo.pc
 libdata/pkgconfig/aws-cpp-sdk-kms.pc
+libdata/pkgconfig/aws-cpp-sdk-lakeformation.pc
 libdata/pkgconfig/aws-cpp-sdk-lambda.pc
 libdata/pkgconfig/aws-cpp-sdk-lex-models.pc
 libdata/pkgconfig/aws-cpp-sdk-lex.pc
@@ -20582,6 +21893,9 @@ libdata/pkgconfig/aws-cpp-sdk-neptune.pc
 libdata/pkgconfig/aws-cpp-sdk-opsworks.pc
 libdata/pkgconfig/aws-cpp-sdk-opsworkscm.pc
 libdata/pkgconfig/aws-cpp-sdk-organizations.pc
+libdata/pkgconfig/aws-cpp-sdk-personalize-events.pc
+libdata/pkgconfig/aws-cpp-sdk-personalize-runtime.pc
+libdata/pkgconfig/aws-cpp-sdk-personalize.pc
 libdata/pkgconfig/aws-cpp-sdk-pi.pc
 libdata/pkgconfig/aws-cpp-sdk-pinpoint-email.pc
 libdata/pkgconfig/aws-cpp-sdk-pinpoint.pc
@@ -20609,6 +21923,7 @@ libdata/pkgconfig/aws-cpp-sdk-sdb.pc
 libdata/pkgconfig/aws-cpp-sdk-secretsmanager.pc
 libdata/pkgconfig/aws-cpp-sdk-securityhub.pc
 libdata/pkgconfig/aws-cpp-sdk-serverlessrepo.pc
+libdata/pkgconfig/aws-cpp-sdk-service-quotas.pc
 libdata/pkgconfig/aws-cpp-sdk-servicecatalog.pc
 libdata/pkgconfig/aws-cpp-sdk-servicediscovery.pc
 libdata/pkgconfig/aws-cpp-sdk-shield.pc
diff --git a/devel/awscli/Makefile b/devel/awscli/Makefile
index 24fddac6526e..80cc7b7928ed 100644
--- a/devel/awscli/Makefile
+++ b/devel/awscli/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	awscli
 PORTVERSION=	1.16.227
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 
@@ -25,6 +26,6 @@ USE_PYTHON=	autoplist distutils concurrent noflavors
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
-DOCS_USERS=	groff:run
+DOCS_USES=	groff:run
 
 .include <bsd.port.mk>
diff --git a/devel/boost-jam/Makefile b/devel/boost-jam/Makefile
index ee7b7b49a41c..0d4a64c21cc0 100644
--- a/devel/boost-jam/Makefile
+++ b/devel/boost-jam/Makefile
@@ -13,6 +13,8 @@ MAKE_FLAGS=	#
 _MAKE_JOBS=	#
 MAKEFILE=	#
 
+USES=		compiler:c++11-lang
+
 WRKSRC_SUBDIR=	tools/build/src/engine
 
 .include "${.CURDIR}/../boost-all/common.mk"
diff --git a/devel/clixon/files/pkg-message.in b/devel/clixon/files/pkg-message.in
index b2b7b67cfd6d..265fc6ac4069 100644
--- a/devel/clixon/files/pkg-message.in
+++ b/devel/clixon/files/pkg-message.in
@@ -1,7 +1,11 @@
-
+[
+{ type: upgrade, maximum_version: 4, message: <<EOT
 Version 4.0.0 is much stricter and more standards compliant
 
 It is very likely that you will need to change your code.
 
 See https://github.com/clicon/clixon/blob/master/CHANGELOG.md
 for details on the changes, especially the API changes.
+EOT
+}
+]
diff --git a/devel/clojure-cider/Makefile b/devel/clojure-cider/Makefile
index 8188821027cf..f1cffe5ce76b 100644
--- a/devel/clojure-cider/Makefile
+++ b/devel/clojure-cider/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	clojure-cider
-PORTVERSION=	0.21.0
+PORTVERSION=	0.22.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
diff --git a/devel/clojure-cider/distinfo b/devel/clojure-cider/distinfo
index bc48da215133..6463e501c6f5 100644
--- a/devel/clojure-cider/distinfo
+++ b/devel/clojure-cider/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550684908
-SHA256 (clojure-emacs-cider-v0.21.0_GH0.tar.gz) = 9337d141972e494d5057e848caa899906b9fa09f302fab0dc5f9e13f731272c3
-SIZE (clojure-emacs-cider-v0.21.0_GH0.tar.gz) = 4307928
+TIMESTAMP = 1568259607
+SHA256 (clojure-emacs-cider-v0.22.0_GH0.tar.gz) = 284ca73e44dd69494ac9ceee8e3db0d602791b03739169aa201d5986bc79ea28
+SIZE (clojure-emacs-cider-v0.22.0_GH0.tar.gz) = 8097772
diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile
index 6185674af90f..451c3c13a827 100644
--- a/devel/cmake-doc/Makefile
+++ b/devel/cmake-doc/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-DISTVERSION=	3.15.2
+DISTVERSION=	3.15.3
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-doc
diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
index 29dcf349cfff..85231c35f612 100644
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-DISTVERSION=	3.15.2
+DISTVERSION=	3.15.3
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-gui
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index d790708b8e85..6772b7f53092 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cmake
 # Remember to update devel/cmake-doc and devel/cmake-gui as well.
-DISTVERSION=	3.15.2
+DISTVERSION=	3.15.3
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \
 		https://www.cmake.org/files/v${PORTVERSION}/
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 32c8612c2d65..34e635315281 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565240207
-SHA256 (cmake-3.15.2.tar.gz) = 539088cb29a68e6d6a8fba5c00951e5e5b1a92c68fa38a83e1ed2f355933f768
-SIZE (cmake-3.15.2.tar.gz) = 9269449
+TIMESTAMP = 1567705700
+SHA256 (cmake-3.15.3.tar.gz) = 13958243a01365b05652fa01b21d40fa834f70a9e30efa69c02604e64f58b8f5
+SIZE (cmake-3.15.3.tar.gz) = 9270184
diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 371d3dd658c5..cc6a152d949e 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	cppcheck
-PORTVERSION=	1.88
-PORTREVISION?=	1	# devel/cppcheck-gui
+PORTVERSION=	1.89
+PORTREVISION?=	0	# devel/cppcheck-gui
 CATEGORIES=	devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -35,6 +35,8 @@ PKGNAMESUFFIX=		-gui
 USES+=			shebangfix
 SHEBANG_FILES=		htmlreport/cppcheck-htmlreport
 
+PORTDATA=		*
+
 OPTIONS_DEFINE=		RULES HTMLREPORT MANPAGES MATCHCOMPILER TEST
 OPTIONS_DEFAULT=	RULES HTMLREPORT MANPAGES MATCHCOMPILER
 OPTIONS_SUB=		yes
diff --git a/devel/cppcheck/distinfo b/devel/cppcheck/distinfo
index 8ad04d30f767..6efa262ab5d6 100644
--- a/devel/cppcheck/distinfo
+++ b/devel/cppcheck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562000248
-SHA256 (danmar-cppcheck-1.88_GH0.tar.gz) = 4aace0420d6aaa900b84b3329c5173c2294e251d2e24d8cba6e38254333dde3f
-SIZE (danmar-cppcheck-1.88_GH0.tar.gz) = 2364053
+TIMESTAMP = 1567801420
+SHA256 (danmar-cppcheck-1.89_GH0.tar.gz) = 37452d378825c7bd78116b4d7073df795fa732207d371ad5348287f811755783
+SIZE (danmar-cppcheck-1.89_GH0.tar.gz) = 2455141
diff --git a/devel/cppcheck/pkg-plist b/devel/cppcheck/pkg-plist
index b692bdb5af42..5e8bca7096a2 100644
--- a/devel/cppcheck/pkg-plist
+++ b/devel/cppcheck/pkg-plist
@@ -1,29 +1,2 @@
 bin/cppcheck
-%%DATADIR%%/avr.cfg
-%%DATADIR%%/boost.cfg
-%%DATADIR%%/bsd.cfg
-%%DATADIR%%/cppcheck-lib.cfg
-%%DATADIR%%/cppunit.cfg
-%%DATADIR%%/daca.cfg
-%%DATADIR%%/embedded_sql.cfg
-%%DATADIR%%/gnu.cfg
-%%DATADIR%%/googletest.cfg
-%%DATADIR%%/gtk.cfg
-%%DATADIR%%/libcerror.cfg
-%%DATADIR%%/microsoft_sal.cfg
-%%DATADIR%%/motif.cfg
-%%DATADIR%%/nspr.cfg
-%%DATADIR%%/opengl.cfg
-%%DATADIR%%/posix.cfg
-%%DATADIR%%/python.cfg
-%%DATADIR%%/qt.cfg
-%%DATADIR%%/ruby.cfg
-%%DATADIR%%/sdl.cfg
-%%DATADIR%%/sfml.cfg
-%%DATADIR%%/sqlite3.cfg
-%%DATADIR%%/std.cfg
-%%DATADIR%%/tinyxml2.cfg
-%%DATADIR%%/windows.cfg
-%%DATADIR%%/wxwidgets.cfg
-%%DATADIR%%/zlib.cfg
 %%MANPAGES%%man/man1/cppcheck.1.gz
diff --git a/devel/cvs2cl/pkg-descr b/devel/cvs2cl/pkg-descr
index 5ee7f0d962f8..467916867e20 100644
--- a/devel/cvs2cl/pkg-descr
+++ b/devel/cvs2cl/pkg-descr
@@ -4,4 +4,4 @@ This Perl script does what you think it does: It produces a GNU-style
 ChangeLog for CVS-controlled sources, by running "cvs log" and parsing
 the output. Duplicate log messages get unified in the Right Way.
 
-WWW: http://www.red-bean.com/cvs2cl/
+WWW: https://www.red-bean.com/cvs2cl/
diff --git a/devel/gb/Makefile b/devel/gb/Makefile
index d9091211b030..707911379789 100644
--- a/devel/gb/Makefile
+++ b/devel/gb/Makefile
@@ -13,7 +13,7 @@ LICENSE=	MIT
 USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	constabulary
-GH_TUPLE=	pkg:errors:645ef00:errors/../src/github.com/pkg/errors
+GH_TUPLE=	pkg:errors:645ef00:errors/vendor/github.com/pkg/errors
 
 PLIST_FILES=	bin/gb bin/gb-vendor
 
@@ -22,10 +22,10 @@ PORTDOCS=	README.md
 OPTIONS_DEFINE=	DOCS
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
-GO_TARGET=	./...
+GO_TARGET=	./cmd/gb \
+		./cmd/gb-vendor
 
-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/* ${STAGEDIR}/${LOCALBASE}/bin
+post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	( cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ ; )
 
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 0539db6342a3..f799b8233eb8 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-DISTVERSION=	1.53.3
+DISTVERSION=	1.59.2
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -14,21 +14,20 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # define dependencies that are required for build and run under MY_DEPENDS
 MY_DEPENDS=	git>=2.21:devel/git \
 		rubygem-bundler>=1.17.3:sysutils/rubygem-bundler \
-		rubygem-rugged>=0.28.0:devel/rubygem-rugged \
-		rubygem-github-linguist>=6.1:textproc/rubygem-github-linguist \
-		rubygem-gitlab-markup>=1.7.0:textproc/rubygem-gitlab-markup \
-		rubygem-activesupport52>=5.2.3:devel/rubygem-activesupport52 \
-		rubygem-gitaly-proto>=1.32.0:net/rubygem-gitaly-proto \
+		rubygem-rugged>=0.28<1.0:devel/rubygem-rugged \
+		rubygem-github-linguist>=6.1<7.0:textproc/rubygem-github-linguist \
+		rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \
+		rubygem-activesupport52>=5.2.3<5.3.0:devel/rubygem-activesupport52 \
 		rubygem-rdoc>=6.0:devel/rubygem-rdoc \
-		rubygem-gitlab-gollum-lib>=4.2.7.7:www/rubygem-gitlab-gollum-lib \
-		rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2:www/rubygem-gitlab-gollum-rugged_adapter \
-		rubygem-grpc>=1.19.0:net/rubygem-grpc \
-		rubygem-sentry-raven>=2.9.0:devel/rubygem-sentry-raven \
-		rubygem-faraday>=0.12:www/rubygem-faraday \
+		rubygem-gitlab-gollum-lib>=4.2.7.7<4.2.8.0:www/rubygem-gitlab-gollum-lib \
+		rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
+		rubygem-grpc>=1.19.0<1.20.0:net/rubygem-grpc \
+		rubygem-sentry-raven>=2.9.0<2.10.0:devel/rubygem-sentry-raven \
+		rubygem-faraday>=0.12<1.0:www/rubygem-faraday \
 		rubygem-rbtrace>0:devel/rubygem-rbtrace \
-		rubygem-gitlab-labkit>=0.3.0:devel/rubygem-gitlab-labkit \
-		rubygem-licensee8>=8.9.0:devel/rubygem-licensee8 \
-		rubygem-google-protobuf371>=3.7.1:devel/rubygem-google-protobuf371
+		rubygem-gitlab-labkit>=0.4.0<0.5.0:devel/rubygem-gitlab-labkit \
+		rubygem-licensee8>=8.9.0<8.10.0:devel/rubygem-licensee8 \
+		rubygem-google-protobuf371>=3.7.1<3.8.0:devel/rubygem-google-protobuf371
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 		${MY_DEPENDS}
 RUN_DEPENDS=	${MY_DEPENDS} \
@@ -42,7 +41,7 @@ MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/tags
-GL_COMMIT=	37b71fbdfe4375bb8eaf64f855f1182caf066ec7
+GL_COMMIT=	1e7005f12bda1dfd0b724ebc039cca75f1cd38d1
 
 # for go dependencies
 USE_GITHUB=	nodefault
@@ -56,11 +55,11 @@ GH_TUPLE=	\
 		codahale:hdrhistogram:3a0bb77429bd:codahale_hdrhistogram/vendor/github.com/codahale/hdrhistogram \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		getsentry:raven-go:v0.1.2:getsentry_raven_go/vendor/github.com/getsentry/raven-go \
-		golang:crypto:c2843e01d9a2:golang_crypto/vendor/golang.org/x/crypto \
+		golang:crypto:20be4c3c3ed5:golang_crypto/vendor/golang.org/x/crypto \
 		golang:net:d28f0bde5980:golang_net/vendor/golang.org/x/net \
 		golang:protobuf:v1.3.1:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:sync:37e7f081c4d4:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:d0b11bdaac8a:golang_sys/vendor/golang.org/x/sys \
+		golang:sys:953cdadca894:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
 		google:go-genproto:bd91e49a0898:google_go_genproto/vendor/google.golang.org/genproto \
 		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
@@ -86,10 +85,8 @@ GH_TUPLE=	\
 		uber:jaeger-client-go:v2.15.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \
 		uber:jaeger-lib:v1.5.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib
 GL_TUPLE=	\
-		gitlab-org:gitaly-proto:f5d7f3cf76555acb5a14ae80eb7db4ad9ff2c553:gitlab_org_gitaly_proto/vendor/gitlab.com/gitlab-org/gitaly-proto \
 		gitlab-org:labkit:0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit
 
-
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example
 	${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 057d7439f3c2..6b7fb24b1785 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1566042205
+TIMESTAMP = 1567416269
 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
 SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
@@ -15,16 +15,16 @@ SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
 SHA256 (getsentry-raven-go-v0.1.2_GH0.tar.gz) = fe603da75a8284273f253a8524d456cd6293fb47508d907f830153ed9af98cb5
 SIZE (getsentry-raven-go-v0.1.2_GH0.tar.gz) = 19314
-SHA256 (golang-crypto-c2843e01d9a2_GH0.tar.gz) = a4d91350f176b2ef99084cd71f990ecee5f549efed72ef59a5b9e425a00d454a
-SIZE (golang-crypto-c2843e01d9a2_GH0.tar.gz) = 1650817
+SHA256 (golang-crypto-20be4c3c3ed5_GH0.tar.gz) = bc78136186ecd1683395d9094a7b973cb01675529131ac59f484e2716609de6f
+SIZE (golang-crypto-20be4c3c3ed5_GH0.tar.gz) = 1690016
 SHA256 (golang-net-d28f0bde5980_GH0.tar.gz) = 40f4d37b315f4a6867ab5beadf4d73f93b9c1d777b48ec66d59f953a4a19acb4
 SIZE (golang-net-d28f0bde5980_GH0.tar.gz) = 1097062
 SHA256 (golang-protobuf-v1.3.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf
 SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884
 SHA256 (golang-sync-37e7f081c4d4_GH0.tar.gz) = d0f0ce92264903fa32032fc365c0c0d36d129fa282d74364c406179a94714f10
 SIZE (golang-sync-37e7f081c4d4_GH0.tar.gz) = 16238
-SHA256 (golang-sys-d0b11bdaac8a_GH0.tar.gz) = e7e3f36dd307e908e59dbda3864ff74f9a5d7f0fdd4d88af630e092beb7d270c
-SIZE (golang-sys-d0b11bdaac8a_GH0.tar.gz) = 1243049
+SHA256 (golang-sys-953cdadca894_GH0.tar.gz) = fb56f244784dac7e7f66fc0ff9f5ff6adbd49ccb8f3625285e6e39254b64c12f
+SIZE (golang-sys-953cdadca894_GH0.tar.gz) = 1353286
 SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
 SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
 SHA256 (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 659ae77d08446b4bcb7d6b8a9c050d903e6e13fbd903541da7bf9966142e9377
@@ -73,9 +73,7 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137
 SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460
 SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3
 SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655
-SHA256 (gitlab-org-gitaly-37b71fbdfe4375bb8eaf64f855f1182caf066ec7_GL0.tar.gz) = c069342eb5d1b87fb5bdc5876ede1157c04ec5de0501628813a95c02f2dd34ac
-SIZE (gitlab-org-gitaly-37b71fbdfe4375bb8eaf64f855f1182caf066ec7_GL0.tar.gz) = 2097542
-SHA256 (gitlab-org-gitaly-proto-f5d7f3cf76555acb5a14ae80eb7db4ad9ff2c553_GL0.tar.gz) = 20befa9ab47936d6a83fd362f5609d293dd4f6a3cb49d5b0049f6c8d6434810a
-SIZE (gitlab-org-gitaly-proto-f5d7f3cf76555acb5a14ae80eb7db4ad9ff2c553_GL0.tar.gz) = 178864
+SHA256 (gitlab-org-gitaly-1e7005f12bda1dfd0b724ebc039cca75f1cd38d1_GL0.tar.gz) = 803b300bfb0a7491158ae768b65d6dcd402954a6a24fb663f7f80f8e880485ad
+SIZE (gitlab-org-gitaly-1e7005f12bda1dfd0b724ebc039cca75f1cd38d1_GL0.tar.gz) = 2727106
 SHA256 (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 449f2e2d1cedea1ea276a1d8132d0244a4c5ffc465d2a24b824ab9790641f78e
 SIZE (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 2280466
diff --git a/devel/gitaly/files/patch-__support_makegen.go b/devel/gitaly/files/patch-__support_makegen.go
index 14e8815357dc..f4cfcec068a2 100644
--- a/devel/gitaly/files/patch-__support_makegen.go
+++ b/devel/gitaly/files/patch-__support_makegen.go
@@ -1,6 +1,6 @@
---- _support/makegen.go.orig	2019-06-18 09:53:31 UTC
+--- _support/makegen.go.orig	2019-08-22 16:24:24 UTC
 +++ _support/makegen.go
-@@ -282,7 +282,7 @@ var templateText = `
+@@ -320,7 +320,7 @@ var templateText = `
  # These variables may be overridden at runtime by top-level make
  PREFIX ?= /usr/local
  INSTALL_DEST_DIR := $(DESTDIR)$(PREFIX)/bin/
@@ -9,13 +9,13 @@
  ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly
  BUILD_TAGS := tracer_static tracer_static_jaeger
  
-@@ -330,8 +330,8 @@ build: ../.ruby-bundle
+@@ -368,8 +368,8 @@ build: ../.ruby-bundle
  # step. Both Omnibus and CNG assume it is in the Gitaly root, not in
  # _build. Hence the '../' in front.
  ../.ruby-bundle:  {{ .GitalyRubyDir }}/Gemfile.lock  {{ .GitalyRubyDir }}/Gemfile
 +	cd  {{ .GitalyRubyDir }} && rm Gemfile.lock && bundle install $(BUNDLE_FLAGS)
  	cd  {{ .GitalyRubyDir }} && bundle config # for debugging
 -	cd  {{ .GitalyRubyDir }} && bundle install $(BUNDLE_FLAGS)
- 	cd  {{ .GitalyRubyDir }} && bundle show gitaly-proto # sanity check
  	touch $@
  
+ .PHONY: install
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile
index b1cdb651b810..5cef30dfff83 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,19 +1,15 @@
---- ruby/Gemfile.orig	2019-07-11 10:11:31 UTC
+--- ruby/Gemfile.orig	2019-08-22 16:24:24 UTC
 +++ ruby/Gemfile
-@@ -6,9 +6,9 @@ gem 'bundler', '>= 1.17.3'
- gem 'rugged', '~> 0.28'
+@@ -7,7 +7,7 @@ gem 'rugged', '~> 0.28'
  gem 'github-linguist', '~> 6.1', require: 'linguist'
  gem 'gitlab-markup', '~> 1.7.0'
--gem 'activesupport', '~> 5.1.7'
--gem 'gitaly-proto', '~> 1.36.0'
+ gem 'activesupport', '~> 5.2.3'
 -gem 'rdoc', '~> 4.2'
-+gem 'activesupport', '~> 5.2.3'
-+gem 'gitaly-proto', '~> 1.37.0'
 +gem 'rdoc', '~> 6.0'
  gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
  gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
  gem 'grpc', '~> 1.19.0'
-@@ -25,17 +25,3 @@ gem 'licensee', '~> 8.9.0'
+@@ -24,17 +24,3 @@ gem 'licensee', '~> 8.9.0'
  
  gem 'google-protobuf', '~> 3.7.1'
  
diff --git a/devel/gitaly/pkg-plist b/devel/gitaly/pkg-plist
index d31c913f40ea..0a2b1a645de4 100644
--- a/devel/gitaly/pkg-plist
+++ b/devel/gitaly/pkg-plist
@@ -142,6 +142,42 @@
 %%DATADIR%%/ruby/lib/gitlab/rails_logger.rb
 %%DATADIR%%/ruby/lib/gitlab/ref_matcher.rb
 %%DATADIR%%/ruby/lib/gitlab/utils/strong_memoize.rb
+%%DATADIR%%/ruby/proto/README.md
+%%DATADIR%%/ruby/proto/gitaly.rb
+%%DATADIR%%/ruby/proto/gitaly/blob_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/blob_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/cleanup_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/cleanup_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/commit_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/commit_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/conflicts_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/conflicts_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/diff_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/diff_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/namespace_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/namespace_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/objectpool_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/objectpool_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/operations_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/operations_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/ref_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/ref_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/remote_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/remote_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/repository-service_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/repository-service_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/server_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/server_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/shared_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/smarthttp_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/smarthttp_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/ssh_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/ssh_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/storage_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/storage_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/version.rb
+%%DATADIR%%/ruby/proto/gitaly/wiki_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/wiki_services_pb.rb
 %%DATADIR%%/ruby/spec/factories/gitaly/commit.rb
 %%DATADIR%%/ruby/spec/factories/gitaly/commit_author.rb
 %%DATADIR%%/ruby/spec/factories/sequences.rb
diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile
index 01431645654f..7410d60df0df 100644
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gsoap
-PORTVERSION=	2.8.89
+PORTVERSION=	2.8.91
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}2/gsoap-2.8
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/devel/gsoap/distinfo b/devel/gsoap/distinfo
index ab52d9d675c1..8ceecb21b47e 100644
--- a/devel/gsoap/distinfo
+++ b/devel/gsoap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565173034
-SHA256 (gsoap_2.8.89.zip) = d9b10ca2611b00932fab98cbf67b514ddad24f22cbbda91d9d68ea45821c54f2
-SIZE (gsoap_2.8.89.zip) = 32553046
+TIMESTAMP = 1567767619
+SHA256 (gsoap_2.8.91.zip) = 2ca21b5ab2b40d899566c559f71a1d51ed7eac3f00160ab78060027a3ee6488f
+SIZE (gsoap_2.8.91.zip) = 32553307
diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile
index df5d358a54de..dfb3f280ed75 100644
--- a/devel/ipython/Makefile
+++ b/devel/ipython/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ipython
-PORTVERSION=	7.7.0
+PORTVERSION=	7.8.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/ipython/distinfo b/devel/ipython/distinfo
index 4733663b342d..91e82fcce26d 100644
--- a/devel/ipython/distinfo
+++ b/devel/ipython/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564577892
-SHA256 (ipython-7.7.0.tar.gz) = 1d3a1692921e932751bc1a1f7bb96dc38671eeefdc66ed33ee4cbc57e92a410e
-SIZE (ipython-7.7.0.tar.gz) = 5157086
+TIMESTAMP = 1567842520
+SHA256 (ipython-7.8.0.tar.gz) = dd76831f065f17bddd7eaa5c781f5ea32de5ef217592cf019e34043b56895aa1
+SIZE (ipython-7.8.0.tar.gz) = 5198219
diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile
index 74e9c3dc62df..851415dcee3e 100644
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	jenkins
-PORTVERSION=	2.193
+PORTVERSION=	2.194
 CATEGORIES=	devel java
 MASTER_SITES=	http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
 DISTNAME=	jenkins
diff --git a/devel/jenkins/distinfo b/devel/jenkins/distinfo
index 4823bb8ec331..0cb4766c8982 100644
--- a/devel/jenkins/distinfo
+++ b/devel/jenkins/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567589365
-SHA256 (jenkins/2.193/jenkins.war) = 516d8fd3ef9a6c622079a0b200419f5c7039b3cc9de5d473410111b0f45c8985
-SIZE (jenkins/2.193/jenkins.war) = 78246752
+TIMESTAMP = 1568047225
+SHA256 (jenkins/2.194/jenkins.war) = 25e01768f8f7e2d677fdb09591e5c78f1c9b191ec8e5526f0adbed4d1dbc668a
+SIZE (jenkins/2.194/jenkins.war) = 78327249
diff --git a/devel/libclc/Makefile b/devel/libclc/Makefile
index 1b64aae038df..9844918130a9 100644
--- a/devel/libclc/Makefile
+++ b/devel/libclc/Makefile
@@ -2,23 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	libclc
-DISTVERSION=	0.3.0.20180518
-PORTREVISION=	3
+DISTVERSION=	0.4.0.20190527
 CATEGORIES=	devel
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Required library functions for OpenCL C programming language
 
-LICENSE=	BSD3CLAUSE MIT
-LICENSE_COMB=	dual
+LICENSE=	LLVM
+LICENSE_NAME=	LLVM Release License
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	llvm${LLVM_DEFAULT}>=4.0:devel/llvm${LLVM_DEFAULT} \
 		libedit>=0:devel/libedit
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	llvm-mirror
-GH_TAGNAME=	a2118d5
+GH_TAGNAME=	9f6204e
 
 # ninja based build is broken since commit 598792bc (16 sep 2016)
 USES=		gmake python:2.7,build gmake
diff --git a/devel/libclc/distinfo b/devel/libclc/distinfo
index dc2b4edab8e8..7a4dad2a1c99 100644
--- a/devel/libclc/distinfo
+++ b/devel/libclc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527376171
-SHA256 (llvm-mirror-libclc-0.3.0.20180518-a2118d5_GH0.tar.gz) = 0796b912f3133ae85b731ff37fd2b040cc7acc455a6cc8f1bc12a3433afde0cc
-SIZE (llvm-mirror-libclc-0.3.0.20180518-a2118d5_GH0.tar.gz) = 168255
+TIMESTAMP = 1562723277
+SHA256 (llvm-mirror-libclc-0.4.0.20190527-9f6204e_GH0.tar.gz) = 8004c3a075d715cff6780c8ffe04c9f798dadf48bd375bdd6d98adabed04cd55
+SIZE (llvm-mirror-libclc-0.4.0.20190527-9f6204e_GH0.tar.gz) = 176995
diff --git a/devel/libclc/files/patch-62a9191.c b/devel/libclc/files/patch-62a9191.c
deleted file mode 100644
index 5dd301c59037..000000000000
--- a/devel/libclc/files/patch-62a9191.c
+++ /dev/null
@@ -1,73 +0,0 @@
-From 62a9191b606abdab8e2607d945628fa90d9664c1 Mon Sep 17 00:00:00 2001
-From: Jan Vesely <jan.vesely@rutgers.edu>
-Date: Fri, 3 Aug 2018 15:14:08 +0000
-Subject: [PATCH] amdgcn: Use __constant AS for amdgcn builtins.
-
-Fixes build after clang r338707.
-Reviewer: Matthew.Arsenault@amd.com
-Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
-
-git-svn-id: https://llvm.org/svn/llvm-project/libclc/trunk@338898 91177308-0d34-0410-b5e6-96231b3b80d8
----
- amdgcn-amdhsa/lib/workitem/get_global_size.cl | 4 +++-
- amdgcn-amdhsa/lib/workitem/get_local_size.cl  | 4 +++-
- amdgcn/lib/workitem/get_global_offset.cl      | 4 +++-
- amdgcn/lib/workitem/get_work_dim.cl           | 4 +++-
- 4 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/amdgcn-amdhsa/lib/workitem/get_global_size.cl b/amdgcn-amdhsa/lib/workitem/get_global_size.cl
-index 2289615..392cd08 100644
---- amdgcn-amdhsa/lib/workitem/get_global_size.cl
-+++ amdgcn-amdhsa/lib/workitem/get_global_size.cl
-@@ -1,6 +1,8 @@
- #include <clc/clc.h>
- 
--#if __clang_major__ >= 7
-+#if __clang_major__ >= 8
-+#define CONST_AS __constant
-+#elif __clang_major__ >= 7
- #define CONST_AS __attribute__((address_space(4)))
- #else
- #define CONST_AS __attribute__((address_space(2)))
-diff --git a/amdgcn-amdhsa/lib/workitem/get_local_size.cl b/amdgcn-amdhsa/lib/workitem/get_local_size.cl
-index 034c6d9..64d1cf4 100644
---- amdgcn-amdhsa/lib/workitem/get_local_size.cl
-+++ amdgcn-amdhsa/lib/workitem/get_local_size.cl
-@@ -1,6 +1,8 @@
- #include <clc/clc.h>
- 
--#if __clang_major__ >= 7
-+#if __clang_major__ >= 8
-+#define CONST_AS __constant
-+#elif __clang_major__ >= 7
- #define CONST_AS __attribute__((address_space(4)))
- #else
- #define CONST_AS __attribute__((address_space(2)))
-diff --git a/amdgcn/lib/workitem/get_global_offset.cl b/amdgcn/lib/workitem/get_global_offset.cl
-index 0c2b948..0a87cd2 100644
---- amdgcn/lib/workitem/get_global_offset.cl
-+++ amdgcn/lib/workitem/get_global_offset.cl
-@@ -1,6 +1,8 @@
- #include <clc/clc.h>
- 
--#if __clang_major__ >= 7
-+#if __clang_major__ >= 8
-+#define CONST_AS __constant
-+#elif __clang_major__ >= 7
- #define CONST_AS __attribute__((address_space(4)))
- #else
- #define CONST_AS __attribute__((address_space(2)))
-diff --git a/amdgcn/lib/workitem/get_work_dim.cl b/amdgcn/lib/workitem/get_work_dim.cl
-index 8eb81ba..3add9b6 100644
---- amdgcn/lib/workitem/get_work_dim.cl
-+++ amdgcn/lib/workitem/get_work_dim.cl
-@@ -1,6 +1,8 @@
- #include <clc/clc.h>
- 
--#if __clang_major__ >= 7
-+#if __clang_major__ >= 8
-+#define CONST_AS __constant
-+#elif __clang_major__ >= 7
- #define CONST_AS __attribute__((address_space(4)))
- #else
- #define CONST_AS __attribute__((address_space(2)))
diff --git a/devel/libclc/pkg-plist b/devel/libclc/pkg-plist
index d85c14c6fa64..8804a406c809 100644
--- a/devel/libclc/pkg-plist
+++ b/devel/libclc/pkg-plist
@@ -7,6 +7,8 @@ include/clc/async/gentype.inc
 include/clc/async/prefetch.h
 include/clc/async/prefetch.inc
 include/clc/async/wait_group_events.h
+include/clc/atom_decl_int32.inc
+include/clc/atom_decl_int64.inc
 include/clc/atomic/atomic_add.h
 include/clc/atomic/atomic_and.h
 include/clc/atomic/atomic_cmpxchg.h
@@ -127,18 +129,14 @@ include/clc/math/asinh.h
 include/clc/math/asinpi.h
 include/clc/math/atan.h
 include/clc/math/atan2.h
-include/clc/math/atan2.inc
 include/clc/math/atan2pi.h
-include/clc/math/atan2pi.inc
 include/clc/math/atanh.h
 include/clc/math/atanpi.h
 include/clc/math/binary_decl.inc
 include/clc/math/binary_decl_tt.inc
-include/clc/math/binary_intrin.inc
 include/clc/math/cbrt.h
 include/clc/math/ceil.h
 include/clc/math/copysign.h
-include/clc/math/copysign.inc
 include/clc/math/cos.h
 include/clc/math/cosh.h
 include/clc/math/cospi.h
@@ -150,7 +148,6 @@ include/clc/math/exp2.h
 include/clc/math/expm1.h
 include/clc/math/fabs.h
 include/clc/math/fdim.h
-include/clc/math/fdim.inc
 include/clc/math/floor.h
 include/clc/math/fma.h
 include/clc/math/fmax.h
@@ -176,7 +173,6 @@ include/clc/math/half_sin.h
 include/clc/math/half_sqrt.h
 include/clc/math/half_tan.h
 include/clc/math/hypot.h
-include/clc/math/hypot.inc
 include/clc/math/ilogb.h
 include/clc/math/ilogb.inc
 include/clc/math/ldexp.h
@@ -190,7 +186,6 @@ include/clc/math/log1p.h
 include/clc/math/log2.h
 include/clc/math/logb.h
 include/clc/math/mad.h
-include/clc/math/mad.inc
 include/clc/math/maxmag.h
 include/clc/math/minmag.h
 include/clc/math/modf.h
@@ -212,7 +207,6 @@ include/clc/math/native_sin.h
 include/clc/math/native_sqrt.h
 include/clc/math/native_tan.h
 include/clc/math/nextafter.h
-include/clc/math/nextafter.inc
 include/clc/math/pow.h
 include/clc/math/pown.h
 include/clc/math/pown.inc
@@ -234,11 +228,10 @@ include/clc/math/sqrt.h
 include/clc/math/tan.h
 include/clc/math/tanh.h
 include/clc/math/tanpi.h
-include/clc/math/ternary_intrin.inc
+include/clc/math/ternary_decl.inc
 include/clc/math/tgamma.h
 include/clc/math/trunc.h
 include/clc/math/unary_decl.inc
-include/clc/math/unary_intrin.inc
 include/clc/misc/shuffle.h
 include/clc/misc/shuffle2.h
 include/clc/relational/all.h
@@ -301,6 +294,15 @@ lib/clc/fiji-amdgcn-mesa-mesa3d.bc
 lib/clc/gfx900-amdgcn--.bc
 lib/clc/gfx900-amdgcn--amdhsa.bc
 lib/clc/gfx900-amdgcn-mesa-mesa3d.bc
+lib/clc/gfx902-amdgcn--.bc
+lib/clc/gfx902-amdgcn--amdhsa.bc
+lib/clc/gfx902-amdgcn-mesa-mesa3d.bc
+lib/clc/gfx904-amdgcn--.bc
+lib/clc/gfx904-amdgcn--amdhsa.bc
+lib/clc/gfx904-amdgcn-mesa-mesa3d.bc
+lib/clc/gfx906-amdgcn--.bc
+lib/clc/gfx906-amdgcn--amdhsa.bc
+lib/clc/gfx906-amdgcn-mesa-mesa3d.bc
 lib/clc/hainan-amdgcn--.bc
 lib/clc/hainan-amdgcn-mesa-mesa3d.bc
 lib/clc/hawaii-amdgcn--.bc
diff --git a/devel/libregf/Makefile b/devel/libregf/Makefile
index 6aa0636e450f..ffd68944a820 100644
--- a/devel/libregf/Makefile
+++ b/devel/libregf/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libregf
-DISTVERSION=	alpha-20190714
+DISTVERSION=	alpha-20190808
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libregf/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
diff --git a/devel/libregf/distinfo b/devel/libregf/distinfo
index 0171d3d82795..81b37e312e46 100644
--- a/devel/libregf/distinfo
+++ b/devel/libregf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563169712
-SHA256 (libregf-alpha-20190714.tar.gz) = 41f9b83cb9a2d97f5eadde8f7e7800742a831e56bd0c88443cfe0b5bc80cb768
-SIZE (libregf-alpha-20190714.tar.gz) = 1589443
+TIMESTAMP = 1565295729
+SHA256 (libregf-alpha-20190808.tar.gz) = 740469a611ce8073e85b3777409515e9fa8f75680a239f5463dff17c7a5dfa2a
+SIZE (libregf-alpha-20190808.tar.gz) = 1596245
diff --git a/devel/libuv/Makefile b/devel/libuv/Makefile
index 86b6075f7ebf..65fbbb847d7f 100644
--- a/devel/libuv/Makefile
+++ b/devel/libuv/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libuv
-PORTVERSION=	1.31.0
+PORTVERSION=	1.32.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/libuv/distinfo b/devel/libuv/distinfo
index 852cc102ff93..8f9d0c905c5b 100644
--- a/devel/libuv/distinfo
+++ b/devel/libuv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565375007
-SHA256 (libuv-libuv-v1.31.0_GH0.tar.gz) = ab041ea5d1965a33d4e03ea87718b8922ba4e54abb46c71cf9e040edef2556c0
-SIZE (libuv-libuv-v1.31.0_GH0.tar.gz) = 1238566
+TIMESTAMP = 1568056155
+SHA256 (libuv-libuv-v1.32.0_GH0.tar.gz) = c9818f38eee79d4e56f3ae55320d207ab183c5d4aff0fb148b5d6f5702f371cd
+SIZE (libuv-libuv-v1.32.0_GH0.tar.gz) = 1242643
diff --git a/devel/libversion/Makefile b/devel/libversion/Makefile
index da27806cf7b5..f0f1d142ddaa 100644
--- a/devel/libversion/Makefile
+++ b/devel/libversion/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libversion
-PORTVERSION=	2.9.1
+PORTVERSION=	3.0.0
 CATEGORIES=	devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -23,7 +23,7 @@ OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in CHANGES.md README.md TODO.md doc/ALGORITHM.md
+.for f in CHANGES.md README.md doc/ALGORITHM.md
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
diff --git a/devel/libversion/distinfo b/devel/libversion/distinfo
index a6e07b83e4a4..f996508b3ead 100644
--- a/devel/libversion/distinfo
+++ b/devel/libversion/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567789118
-SHA256 (repology-libversion-2.9.1_GH0.tar.gz) = 2fb3b81069acbb58253c6db115e1c93349a2e7012e8ad9d46f3f0f97de1178f8
-SIZE (repology-libversion-2.9.1_GH0.tar.gz) = 22109
+TIMESTAMP = 1568230019
+SHA256 (repology-libversion-3.0.0_GH0.tar.gz) = e7e576de4044dd186f642132ee3fec5392d909f69fc8e26590f4c372f92adee0
+SIZE (repology-libversion-3.0.0_GH0.tar.gz) = 23127
diff --git a/devel/libversion/pkg-plist b/devel/libversion/pkg-plist
index f05fd15d09ea..c0b6b8aa05c9 100644
--- a/devel/libversion/pkg-plist
+++ b/devel/libversion/pkg-plist
@@ -1,4 +1,5 @@
 bin/version_compare
+bin/version_sort
 include/libversion/config.h
 include/libversion/export.h
 include/libversion/version.h
@@ -6,6 +7,6 @@ lib/cmake/libversion/libversionConfig-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/libversion/libversionConfig.cmake
 lib/libversion.a
 lib/libversion.so
-lib/libversion.so.0
-lib/libversion.so.0.1.0
+lib/libversion.so.1
+lib/libversion.so.1.0.0
 libdata/pkgconfig/libversion.pc
diff --git a/devel/linux-c7-devtools/Makefile b/devel/linux-c7-devtools/Makefile
index f1eef05413e7..0651f1fecf6d 100644
--- a/devel/linux-c7-devtools/Makefile
+++ b/devel/linux-c7-devtools/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	devtools
 PORTVERSION=	${LINUX_DIST_VER}
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	devel
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -22,10 +22,11 @@ BIN_DISTNAMES=	binutils-2.27-34.base.el7 \
 		cpp-4.8.5-36.el7_6.2 \
 		gcc-4.8.5-36.el7_6.2 \
 		gcc-c++-4.8.5-36.el7_6.2 \
-		gcc-gfortran-4.8.5-36.el7_6.2
+		gcc-gfortran-4.8.5-36.el7_6.2 \
+		libstdc++-devel-4.8.5-36.el7_6.2
 LIB_DISTNAMES=	binutils-devel-2.27-34.base.el7 \
 		glibc-devel-2.17-260.el7_6.6 \
-		libstdc++-devel-4.8.5-36.el7_6.2 \
+		glibc-static-2.17-260.el7_6.6 \
 		libgomp-4.8.5-36.el7_6.2 \
 		libmpc-1.0.1-3.el7
 DISTFILES_amd64=${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
diff --git a/devel/linux-c7-devtools/distinfo b/devel/linux-c7-devtools/distinfo
index 785ddbe5a58f..4e3e1a0f901b 100644
--- a/devel/linux-c7-devtools/distinfo
+++ b/devel/linux-c7-devtools/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1564859591
+TIMESTAMP = 1567936796
 SHA256 (centos/binutils-2.27-34.base.el7.i686.rpm) = 40f02c8e10d58e86e0d37ae4d3813ff1a2ece9d340f15371465758c0791e2c42
 SIZE (centos/binutils-2.27-34.base.el7.i686.rpm) = 6343144
 SHA256 (centos/binutils-2.27-34.base.el7.x86_64.rpm) = 45995236bc07a51d506c036a557540e9407024758027eb58635390e408823392
@@ -31,6 +31,10 @@ SHA256 (centos/glibc-headers-2.17-260.el7_6.6.i686.rpm) = ca43e46741f414d2848982
 SIZE (centos/glibc-headers-2.17-260.el7_6.6.i686.rpm) = 699932
 SHA256 (centos/glibc-headers-2.17-260.el7_6.6.x86_64.rpm) = 67de580f4cabd7625a050f101eb42ac93de27582d04ef939ab252059d11abedb
 SIZE (centos/glibc-headers-2.17-260.el7_6.6.x86_64.rpm) = 700036
+SHA256 (centos/glibc-static-2.17-260.el7_6.6.i686.rpm) = b67f91ceae9cbaedd450e9aa7fc79037fcaa95b40b758a73dc60a6d05c6ce40d
+SIZE (centos/glibc-static-2.17-260.el7_6.6.i686.rpm) = 1326892
+SHA256 (centos/glibc-static-2.17-260.el7_6.6.x86_64.rpm) = 69def216085fcc622f3795a68e25a43fed92be2b5e75a8d8c1e5eefc30846414
+SIZE (centos/glibc-static-2.17-260.el7_6.6.x86_64.rpm) = 1623928
 SHA256 (centos/kernel-headers-3.10.0-957.21.3.el7.centos.plus.i686.rpm) = 776f25e647161f6dcd4175742eb312427128d456a7cea147d58a0435f4ae8078
 SIZE (centos/kernel-headers-3.10.0-957.21.3.el7.centos.plus.i686.rpm) = 8393612
 SHA256 (centos/kernel-headers-3.10.0-957.27.2.el7.x86_64.rpm) = dcba6cda3e82004a9b75cc1a029bb5a822baaaefe17155579289b644f7c5a575
diff --git a/devel/linux-c7-devtools/pkg-plist.amd64 b/devel/linux-c7-devtools/pkg-plist.amd64
index 4d530adf9450..ea427f7ae9dc 100644
--- a/devel/linux-c7-devtools/pkg-plist.amd64
+++ b/devel/linux-c7-devtools/pkg-plist.amd64
@@ -734,29 +734,6 @@ usr/include/c++/4.8.2/forward_list
 usr/include/c++/4.8.2/fstream
 usr/include/c++/4.8.2/functional
 usr/include/c++/4.8.2/future
-usr/include/c++/4.8.2/i686-redhat-linux/bits/atomic_word.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/basic_file.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/c++allocator.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/c++config.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/c++io.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/c++locale.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/cpu_defines.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/ctype_base.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/ctype_inline.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/cxxabi_tweaks.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/error_constants.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/extc++.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/gthr-default.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/gthr-posix.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/gthr-single.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/gthr.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/messages_members.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/opt_random.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/os_defines.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/stdc++.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/stdtr1c++.h
-usr/include/c++/4.8.2/i686-redhat-linux/bits/time_members.h
-usr/include/c++/4.8.2/i686-redhat-linux/ext/opt_random.h
 usr/include/c++/4.8.2/initializer_list
 usr/include/c++/4.8.2/iomanip
 usr/include/c++/4.8.2/ios
@@ -1955,8 +1932,6 @@ usr/lib/cpp
 usr/lib/crt1.o
 usr/lib/crti.o
 usr/lib/crtn.o
-usr/lib/gcc/i686-redhat-linux/4.8.2/libstdc++.so
-usr/lib/gcc/i686-redhat-linux/4.8.5
 usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/crtbegin.o
 usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/crtbeginS.o
 usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/crtbeginT.o
@@ -2079,26 +2054,34 @@ usr/lib/gcc/x86_64-redhat-linux/4.8.2/libtsan.so
 usr/lib/gcc/x86_64-redhat-linux/4.8.2/rpmver
 usr/lib/gcc/x86_64-redhat-linux/4.8.5
 usr/lib/gcrt1.o
+usr/lib/libBrokenLocale.a
 usr/lib/libBrokenLocale.so
+usr/lib/libanl.a
 usr/lib/libanl.so
 usr/lib/libbfd.a
 usr/lib/libbfd.so
 usr/lib/libbsd-compat.a
 usr/lib/libbsd.a
+usr/lib/libc.a
 usr/lib/libc.so
 usr/lib/libc_nonshared.a
+usr/lib/libc_stubs.a
 usr/lib/libcidn.so
+usr/lib/libcrypt.a
 usr/lib/libcrypt.so
+usr/lib/libdl.a
 usr/lib/libdl.so
 usr/lib/libg.a
 usr/lib/libgomp.so.1
 usr/lib/libgomp.so.1.0.0
 usr/lib/libiberty.a
 usr/lib/libieee.a
+usr/lib/libm.a
 usr/lib/libm.so
 usr/lib/libmcheck.a
 usr/lib/libmpc.so.3
 usr/lib/libmpc.so.3.0.0
+usr/lib/libnsl.a
 usr/lib/libnsl.so
 usr/lib/libnss_compat.so
 usr/lib/libnss_db.so
@@ -2109,12 +2092,16 @@ usr/lib/libnss_nis.so
 usr/lib/libnss_nisplus.so
 usr/lib/libopcodes.a
 usr/lib/libopcodes.so
+usr/lib/libpthread.a
 usr/lib/libpthread.so
 usr/lib/libpthread_nonshared.a
+usr/lib/libresolv.a
 usr/lib/libresolv.so
 usr/lib/librpcsvc.a
+usr/lib/librt.a
 usr/lib/librt.so
 usr/lib/libthread_db.so
+usr/lib/libutil.a
 usr/lib/libutil.so
 usr/lib64/Mcrt1.o
 usr/lib64/Scrt1.o
@@ -2122,29 +2109,37 @@ usr/lib64/crt1.o
 usr/lib64/crti.o
 usr/lib64/crtn.o
 usr/lib64/gcrt1.o
+usr/lib64/libBrokenLocale.a
 usr/lib64/libBrokenLocale.so
+usr/lib64/libanl.a
 usr/lib64/libanl.so
 usr/lib64/libbfd-2.27-34.base.el7.so
 usr/lib64/libbfd.a
 usr/lib64/libbfd.so
 usr/lib64/libbsd-compat.a
 usr/lib64/libbsd.a
+usr/lib64/libc.a
 usr/lib64/libc.so
 usr/lib64/libc_nonshared.a
+usr/lib64/libc_stubs.a
 usr/lib64/libcidn.so
+usr/lib64/libcrypt.a
 usr/lib64/libcrypt.so
+usr/lib64/libdl.a
 usr/lib64/libdl.so
 usr/lib64/libg.a
 usr/lib64/libgomp.so.1
 usr/lib64/libgomp.so.1.0.0
 usr/lib64/libiberty.a
 usr/lib64/libieee.a
+usr/lib64/libm.a
 usr/lib64/libm.so
 usr/lib64/libmcheck.a
 usr/lib64/libmpc.so.3
 usr/lib64/libmpc.so.3.0.0
 usr/lib64/libmpfr.so.4
 usr/lib64/libmpfr.so.4.1.1
+usr/lib64/libnsl.a
 usr/lib64/libnsl.so
 usr/lib64/libnss_compat.so
 usr/lib64/libnss_db.so
@@ -2156,12 +2151,16 @@ usr/lib64/libnss_nisplus.so
 usr/lib64/libopcodes-2.27-34.base.el7.so
 usr/lib64/libopcodes.a
 usr/lib64/libopcodes.so
+usr/lib64/libpthread.a
 usr/lib64/libpthread.so
 usr/lib64/libpthread_nonshared.a
+usr/lib64/libresolv.a
 usr/lib64/libresolv.so
 usr/lib64/librpcsvc.a
+usr/lib64/librt.a
 usr/lib64/librt.so
 usr/lib64/libthread_db.so
+usr/lib64/libutil.a
 usr/lib64/libutil.so
 usr/libexec/gcc/x86_64-redhat-linux/4.8.2/cc1
 usr/libexec/gcc/x86_64-redhat-linux/4.8.2/cc1plus
diff --git a/devel/linux-c7-devtools/pkg-plist.i386 b/devel/linux-c7-devtools/pkg-plist.i386
index 05dc68f6d937..50c2b2155979 100644
--- a/devel/linux-c7-devtools/pkg-plist.i386
+++ b/devel/linux-c7-devtools/pkg-plist.i386
@@ -1672,8 +1672,8 @@ usr/include/pty.h
 usr/include/pwd.h
 usr/include/rdma/cxgb3-abi.h
 usr/include/rdma/cxgb4-abi.h
-usr/include/rdma/hfi/hfi1_user.h
 usr/include/rdma/hfi/hfi1_ioctl.h
+usr/include/rdma/hfi/hfi1_user.h
 usr/include/rdma/ib_user_cm.h
 usr/include/rdma/ib_user_mad.h
 usr/include/rdma/ib_user_sa.h
@@ -1994,29 +1994,37 @@ usr/lib/gcc/i686-redhat-linux/4.8.2/libstdc++.so
 usr/lib/gcc/i686-redhat-linux/4.8.2/rpmver
 usr/lib/gcc/i686-redhat-linux/4.8.5
 usr/lib/gcrt1.o
+usr/lib/libBrokenLocale.a
 usr/lib/libBrokenLocale.so
+usr/lib/libanl.a
 usr/lib/libanl.so
 usr/lib/libbfd-2.27-34.base.el7.so
 usr/lib/libbfd.a
 usr/lib/libbfd.so
 usr/lib/libbsd-compat.a
 usr/lib/libbsd.a
+usr/lib/libc.a
 usr/lib/libc.so
 usr/lib/libc_nonshared.a
+usr/lib/libc_stubs.a
 usr/lib/libcidn.so
+usr/lib/libcrypt.a
 usr/lib/libcrypt.so
+usr/lib/libdl.a
 usr/lib/libdl.so
 usr/lib/libg.a
 usr/lib/libgomp.so.1
 usr/lib/libgomp.so.1.0.0
 usr/lib/libiberty.a
 usr/lib/libieee.a
+usr/lib/libm.a
 usr/lib/libm.so
 usr/lib/libmcheck.a
 usr/lib/libmpc.so.3
 usr/lib/libmpc.so.3.0.0
 usr/lib/libmpfr.so.4
 usr/lib/libmpfr.so.4.1.1
+usr/lib/libnsl.a
 usr/lib/libnsl.so
 usr/lib/libnss_compat.so
 usr/lib/libnss_db.so
@@ -2028,12 +2036,16 @@ usr/lib/libnss_nisplus.so
 usr/lib/libopcodes-2.27-34.base.el7.so
 usr/lib/libopcodes.a
 usr/lib/libopcodes.so
+usr/lib/libpthread.a
 usr/lib/libpthread.so
 usr/lib/libpthread_nonshared.a
+usr/lib/libresolv.a
 usr/lib/libresolv.so
 usr/lib/librpcsvc.a
+usr/lib/librt.a
 usr/lib/librt.so
 usr/lib/libthread_db.so
+usr/lib/libutil.a
 usr/lib/libutil.so
 usr/libexec/gcc/i686-redhat-linux/4.8.2/cc1
 usr/libexec/gcc/i686-redhat-linux/4.8.2/cc1plus
diff --git a/devel/linux-c7-make/Makefile b/devel/linux-c7-make/Makefile
new file mode 100644
index 000000000000..445ae80bc348
--- /dev/null
+++ b/devel/linux-c7-make/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME=	make
+PORTVERSION=	3.82
+DISTVERSIONSUFFIX=	-23.el7
+CATEGORIES=	devel
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	GNU make utility (Linux CentOS ${LINUX_DIST_VER})
+
+USES=		linux:c7
+USE_LINUX_RPM=	nolib
+
+DESCR=		${.CURDIR}/../gmake/pkg-descr
+
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/linux-c7-make/distinfo b/devel/linux-c7-make/distinfo
new file mode 100644
index 000000000000..dc889245ef70
--- /dev/null
+++ b/devel/linux-c7-make/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1567881407
+SHA256 (centos/make-3.82-23.el7.i686.rpm) = 6417801fa80cb5b7c362eb0b74f938b8256a1dc4d248f44faa8c9c24fc831f34
+SIZE (centos/make-3.82-23.el7.i686.rpm) = 427472
+SHA256 (centos/make-3.82-23.el7.x86_64.rpm) = e02baba191334ec15234324f32b36f2384ec50135982811880e075b8e9281459
+SIZE (centos/make-3.82-23.el7.x86_64.rpm) = 430540
+SHA256 (centos/make-3.82-23.el7.src.rpm) = 284a9239fe74d9db5ce074e5f0c36658398c68b7ef20e9ea590017051121199b
+SIZE (centos/make-3.82-23.el7.src.rpm) = 1282509
diff --git a/devel/linux-c7-make/pkg-plist.amd64 b/devel/linux-c7-make/pkg-plist.amd64
new file mode 100644
index 000000000000..38bc39b0e96c
--- /dev/null
+++ b/devel/linux-c7-make/pkg-plist.amd64
@@ -0,0 +1,35 @@
+usr/bin/gmake
+usr/bin/make
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+usr/share/info/make.info-1.gz
+usr/share/info/make.info-2.gz
+usr/share/info/make.info.gz
+%%NLS%%usr/share/locale/be/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/da/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/es/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/fi/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/ga/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/gl/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/he/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/hr/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/id/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/ko/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/lt/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/ru/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/tr/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/uk/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/make.mo
+usr/share/man/man1/gmake.1.gz
+usr/share/man/man1/make.1.gz
diff --git a/devel/linux-c7-make/pkg-plist.i386 b/devel/linux-c7-make/pkg-plist.i386
new file mode 100644
index 000000000000..38bc39b0e96c
--- /dev/null
+++ b/devel/linux-c7-make/pkg-plist.i386
@@ -0,0 +1,35 @@
+usr/bin/gmake
+usr/bin/make
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+usr/share/info/make.info-1.gz
+usr/share/info/make.info-2.gz
+usr/share/info/make.info.gz
+%%NLS%%usr/share/locale/be/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/da/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/es/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/fi/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/ga/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/gl/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/he/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/hr/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/id/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/ko/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/lt/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/ru/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/tr/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/uk/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/make.mo
+%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/make.mo
+usr/share/man/man1/gmake.1.gz
+usr/share/man/man1/make.1.gz
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index e83b56462d14..fbc478268ccf 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -29,7 +29,11 @@ USES=		cmake compiler:c++11-lib libedit perl5 \
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
 _USES_PYTHON?=	python:build,3.6+
 USES+=		${_USES_PYTHON}
-SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in
+SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \
+		tools/opt-viewer/optrecord.py \
+		tools/opt-viewer/opt-diff.py \
+		tools/opt-viewer/opt-stats.py \
+		tools/opt-viewer/opt-viewer.py
 
 SUB_FILES=	llvm-wrapper.sh
 SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
@@ -223,7 +227,7 @@ USES+=	gnome
 .endif
 
 .if ${PORT_OPTIONS:MCOMPILER_RT}
-COMPILER_RT_PATTERN=	(sanitizer|include.xray)
+COMPILER_RT_PATTERN=	(sanitizer|include.xray|include\/fuzzer)
 .endif
 
 .if ${PORT_OPTIONS:MEXTRAS}
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index 8495e55e4370..e547a98ebb13 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -6,12 +6,12 @@
 #
 LLVM_MAJOR=	10
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20190821
+SNAPDATE=	20190913
 
-LLVM_COMMIT=		0b762696b2473cab574ad3a7822c0b5449b6fb54
-CLANG_COMMIT=		a19ba5238e9f864ab20cafad1cf8c5e09e394dc5
-COMPILER_RT_COMMIT=	e52749ced386eadf7efe931910f38747ec690ff6
-EXTRAS_COMMIT=		0b2126922b9db7490cc94c7706a82308f211fa60
-LLD_COMMIT=		51ec494940928b4442399977cb56f87b1bdec435
-LLDB_COMMIT=		054f396e52a944075687c3b863dc5cfb1ebafb6b
-OPENMP_COMMIT=		3f4c51a258bcfbf588265dd6e80726c67305f8eb
+LLVM_COMMIT=		d8b09e1ff4d64f9e83cb91d7899e68756fdf0375
+CLANG_COMMIT=		f5ae2881e6c3ca5c6d7f832f046d762ba46c537c
+COMPILER_RT_COMMIT=	b83f360f7e249afbc59a20dc81845ac776079f0a
+EXTRAS_COMMIT=		e4ddfce1654ae0b4c24892915594ad623eccc7e3
+LLD_COMMIT=		a4a4ad55926fd271cd9bd05d81ed6420bc75c17c
+LLDB_COMMIT=		dedf56240bf255791846589401ff2be688bed137
+OPENMP_COMMIT=		2b135c5afc8ffa96cebe7a9ce9ae3e7251b1fadc
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 15edb1ade271..4f3b9f0ec186 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1566379315
-SHA256 (llvm-mirror-llvm-10.0.d20190821-0b762696b2473cab574ad3a7822c0b5449b6fb54_GH0.tar.gz) = 863200c62a94accec000b334c369550c294ce2f4e93a14cf9121de899fe8f4c0
-SIZE (llvm-mirror-llvm-10.0.d20190821-0b762696b2473cab574ad3a7822c0b5449b6fb54_GH0.tar.gz) = 50367568
-SHA256 (llvm-mirror-clang-a19ba5238e9f864ab20cafad1cf8c5e09e394dc5_GH0.tar.gz) = f7bb218b0424adc9ca369377dfc4f229be795f55242665361b650cabdce1d5d7
-SIZE (llvm-mirror-clang-a19ba5238e9f864ab20cafad1cf8c5e09e394dc5_GH0.tar.gz) = 19196755
-SHA256 (llvm-mirror-compiler-rt-e52749ced386eadf7efe931910f38747ec690ff6_GH0.tar.gz) = d7975026edea6fa39ed04ebe67d1ad25926280dce0c5963aeb7219d53a1972f8
-SIZE (llvm-mirror-compiler-rt-e52749ced386eadf7efe931910f38747ec690ff6_GH0.tar.gz) = 3418990
-SHA256 (llvm-mirror-clang-tools-extra-0b2126922b9db7490cc94c7706a82308f211fa60_GH0.tar.gz) = 2317d32f9ee4de973615a4ee1e33e7872c020a227468cb23861ab5510914d25a
-SIZE (llvm-mirror-clang-tools-extra-0b2126922b9db7490cc94c7706a82308f211fa60_GH0.tar.gz) = 2693712
-SHA256 (llvm-mirror-lld-51ec494940928b4442399977cb56f87b1bdec435_GH0.tar.gz) = 7b36e4efeeaa8e7cab0489d229ac61510018844e85422c91f38a19341b0a3692
-SIZE (llvm-mirror-lld-51ec494940928b4442399977cb56f87b1bdec435_GH0.tar.gz) = 1548455
-SHA256 (llvm-mirror-lldb-054f396e52a944075687c3b863dc5cfb1ebafb6b_GH0.tar.gz) = b91c1aac1015ce86d535da6b6f057e046160b5d6dd68009f42553e4947636a7f
-SIZE (llvm-mirror-lldb-054f396e52a944075687c3b863dc5cfb1ebafb6b_GH0.tar.gz) = 13305676
-SHA256 (llvm-mirror-openmp-3f4c51a258bcfbf588265dd6e80726c67305f8eb_GH0.tar.gz) = ab1db327f4b43eeeb3ce14041790f971037f472fc6ae339488aafb36635246b0
-SIZE (llvm-mirror-openmp-3f4c51a258bcfbf588265dd6e80726c67305f8eb_GH0.tar.gz) = 1472426
+TIMESTAMP = 1568380653
+SHA256 (llvm-mirror-llvm-10.0.d20190913-d8b09e1ff4d64f9e83cb91d7899e68756fdf0375_GH0.tar.gz) = b0dc8d447377a086d3752fe3533c16c84a0ea6edc610818dfc5b435740d9a90a
+SIZE (llvm-mirror-llvm-10.0.d20190913-d8b09e1ff4d64f9e83cb91d7899e68756fdf0375_GH0.tar.gz) = 51307193
+SHA256 (llvm-mirror-clang-f5ae2881e6c3ca5c6d7f832f046d762ba46c537c_GH0.tar.gz) = 46aeb38d94d41d133428a0bf0fbd22edc1779b94ecdb615cad38d5edc0d026c9
+SIZE (llvm-mirror-clang-f5ae2881e6c3ca5c6d7f832f046d762ba46c537c_GH0.tar.gz) = 19349665
+SHA256 (llvm-mirror-compiler-rt-b83f360f7e249afbc59a20dc81845ac776079f0a_GH0.tar.gz) = ee390babba2d39f6310643ab15c0d76bedbfeeaf94675d0e5280e8525ca4f7c9
+SIZE (llvm-mirror-compiler-rt-b83f360f7e249afbc59a20dc81845ac776079f0a_GH0.tar.gz) = 3449166
+SHA256 (llvm-mirror-clang-tools-extra-e4ddfce1654ae0b4c24892915594ad623eccc7e3_GH0.tar.gz) = d3bc715208d743baac17e7824bf40e7f94959e7746b500ca67c863a86834d849
+SIZE (llvm-mirror-clang-tools-extra-e4ddfce1654ae0b4c24892915594ad623eccc7e3_GH0.tar.gz) = 2968313
+SHA256 (llvm-mirror-lld-a4a4ad55926fd271cd9bd05d81ed6420bc75c17c_GH0.tar.gz) = aee7f6f861e3be72060f9af14a9ccadfd6e21462e94e0c9f0a79c0aa0cff721e
+SIZE (llvm-mirror-lld-a4a4ad55926fd271cd9bd05d81ed6420bc75c17c_GH0.tar.gz) = 1560014
+SHA256 (llvm-mirror-lldb-dedf56240bf255791846589401ff2be688bed137_GH0.tar.gz) = a7bc362fc8274b370343a1d45cf87754b653fdb0d3ee0966d6fb1f4a9f7ed208
+SIZE (llvm-mirror-lldb-dedf56240bf255791846589401ff2be688bed137_GH0.tar.gz) = 13313191
+SHA256 (llvm-mirror-openmp-2b135c5afc8ffa96cebe7a9ce9ae3e7251b1fadc_GH0.tar.gz) = 28d3f80c47eab6f19d2b5e62da75bec10713d96032450a53551f79f16fcf08ff
+SIZE (llvm-mirror-openmp-2b135c5afc8ffa96cebe7a9ce9ae3e7251b1fadc_GH0.tar.gz) = 1472534
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 6bd8909e6ccb..00808023c85f 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -789,7 +789,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Tooling/Syntax/Tree.h
 %%CLANG%%llvm-devel/include/clang/Tooling/ToolExecutorPluginRegistry.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Tooling.h
-llvm-devel/include/fuzzer/FuzzedDataProvider.h
+%%COMPILER_RT%%llvm-devel/include/fuzzer/FuzzedDataProvider.h
 %%LLD%%llvm-devel/include/lld/Common/Args.h
 %%LLD%%llvm-devel/include/lld/Common/Driver.h
 %%LLD%%llvm-devel/include/lld/Common/ErrorHandler.h
diff --git a/devel/llvm80/Makefile b/devel/llvm80/Makefile
index d768f73da22c..60a057956946 100644
--- a/devel/llvm80/Makefile
+++ b/devel/llvm80/Makefile
@@ -48,7 +48,7 @@ CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
 CMAKE_ARGS+=	-DLLVM_PARALLEL_LINK_JOBS=1
 CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
 		-DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDEDIR} \
-		-DPYTHON_LIBRARY=${LOCALBASE}/lib/lib${PYTHON_VERSION}m.so
+		-DPYTHON_LIBRARY=${LOCALBASE}/lib/lib${PYTHON_VERSION}${PYTHON_ABIVER}.so
 
 # Disable assertions.  They should be disabled by cmake, but USES=cmake
 # overrides -DCMAKE_*_FLAGS_RELEASE.
diff --git a/devel/llvm90/Makefile b/devel/llvm90/Makefile
index 3022fe8407d8..8223ba2bca63 100644
--- a/devel/llvm90/Makefile
+++ b/devel/llvm90/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-DISTVERSION=	9.0.0rc3
-PORTREVISION=	0
+DISTVERSION=	9.0.0rc4
+PORTREVISION=	1
 CATEGORIES=	devel lang
 .if ${DISTVERSION:M*rc*}
 MASTER_SITES=  http://prereleases.llvm.org/${LLVM_RELEASE}/${RCDIR}
@@ -59,19 +59,21 @@ CMAKE_ARGS+=	-DLLVM_PARALLEL_LINK_JOBS=1
 CMAKE_ARGS+=	-DLLVM_ENABLE_Z3_SOLVER=OFF
 CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
 		-DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDEDIR} \
-		-DPYTHON_LIBRARY=${LOCALBASE}/lib/lib${PYTHON_VERSION}m.so
+		-DPYTHON_LIBRARY=${LOCALBASE}/lib/lib${PYTHON_VERSION}${PYTHON_ABIVER}.so
 
 # Disable assertions.  They should be disabled by cmake, but USES=cmake
 # overrides -DCMAKE_*_FLAGS_RELEASE.
 CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
-OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLDB PYCLANG
+OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLD_LINK LLDB PYCLANG
 OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
+OPTIONS_DEFINE_powerpc64=	OPENMP
 OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLDB PYCLANG
-OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
+OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD LLD_LINK OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
+OPTIONS_DEFAULT_powerpc64=	OPENMP
 OPTIONS_SINGLE=		BACKENDS
 OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD
 OPTIONS_SUB=	yes
@@ -115,6 +117,8 @@ LIT_DESC=		Install lit and FileCheck test tools
 LIT_VARS=		_USES_PYTHON=python:3.6+
 LLD_DESC=		Install lld, the LLVM linker
 LLD_DISTFILES=		lld-${DISTVERSION}.src${EXTRACT_SUFX}
+LLD_LINK_DESC=		Link ld.lld as ld to clang uses it
+LLD_LINK_IMPLIES=	LLD
 LLDB_BUILD_DEPENDS=	swig3.0:devel/swig30 \
 			${PY_ENUM34}
 LLDB_DESC=		Install lldb, the LLVM debugger
@@ -124,6 +128,7 @@ LLDB_IMPLIES=		CLANG
 LLDB_PORTDOCS=		lldb
 LLDB_VARS=		_USES_PYTHON=python:3.6+
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
+OPENMP_EXTRA_PATCHES=	${PATCHDIR}/openmp
 OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
 PYCLANG_DESC=	Install python bindings to libclang
 PYCLANG_IMPLIES=	CLANG
@@ -533,6 +538,9 @@ post-install-LIT-on:
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
 	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
 
+post-install-LLD_LINK-on:
+	${LN} -s ld.lld ${STAGEDIR}${LOCALBASE}/llvm${LLVM_SUFFIX}/bin/ld
+
 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
 do-test:
 	if [ `${ID} -u` = 0 ]; then \
@@ -579,6 +587,7 @@ build-plist:
 		{printf "%%%%COMPILER_RT%%%%"} \
 	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
 	    if ($$0 ~ /(lld|wasm-ld)/ && $$0 !~ /(lldb)/) {printf "%%%%LLD%%%%"} \
+	    if ($$0 ~ /(bin\/ld$$)/) {printf "%%%%LLD_LINK%%%%"} \
 	    if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
 	    if ($$0 ~ /(lib.*omp|omp.h|ompt.h)/) {printf "%%%%OPENMP%%%%"} \
 	    if ($$0 ~ /(LLVMgold)/) {printf "%%%%GOLD%%%%"} \
diff --git a/devel/llvm90/distinfo b/devel/llvm90/distinfo
index b40f41eb10b4..640f425e5e61 100644
--- a/devel/llvm90/distinfo
+++ b/devel/llvm90/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1567190923
-SHA256 (llvm-9.0.0rc3.src.tar.xz) = df21bfab2dea6f5951276a03bb896f7a76409c669ab1bd9d4755ae673f184faa
-SIZE (llvm-9.0.0rc3.src.tar.xz) = 32986428
-SHA256 (cfe-9.0.0rc3.src.tar.xz) = f584e72919bed3e4bcd4783f14aa736ab80d3ea1708835f54ff085d7fb85329d
-SIZE (cfe-9.0.0rc3.src.tar.xz) = 13531816
-SHA256 (compiler-rt-9.0.0rc3.src.tar.xz) = ce32699768c0c6abcc2de804165bcba949321519fca30e6074d64c379ef9eef5
-SIZE (compiler-rt-9.0.0rc3.src.tar.xz) = 1990992
-SHA256 (clang-tools-extra-9.0.0rc3.src.tar.xz) = d05899fe6a38530397743acfa8d6e0bda46a59bd0d7fd18ed21a31f58735246b
-SIZE (clang-tools-extra-9.0.0rc3.src.tar.xz) = 2184004
-SHA256 (lld-9.0.0rc3.src.tar.xz) = dfcc551533c5d3a42fd386fdcbee1c56aa4c6a0d30805ea8c27bb6f892c7b23c
-SIZE (lld-9.0.0rc3.src.tar.xz) = 1098952
-SHA256 (lldb-9.0.0rc3.src.tar.xz) = 0a0e5fbc97f0d51089c14d35b6074731d3c685b5952239158306c7c18d0ea0f7
-SIZE (lldb-9.0.0rc3.src.tar.xz) = 9848056
-SHA256 (openmp-9.0.0rc3.src.tar.xz) = 70f03a8db41f245c4591a83d01e5f4b3dcf8322c728b85c5b8b78c98ab1a5f97
-SIZE (openmp-9.0.0rc3.src.tar.xz) = 938984
+TIMESTAMP = 1568188104
+SHA256 (llvm-9.0.0rc4.src.tar.xz) = b7a4cca6dc7b7c9bf0766be389afcba1ee1a229cc77cf39741e78e67dfadb0d0
+SIZE (llvm-9.0.0rc4.src.tar.xz) = 32998872
+SHA256 (cfe-9.0.0rc4.src.tar.xz) = a134a6fe858a29c7ccf6113504aa423277c5f10fa2b51e8e5202643b754a760d
+SIZE (cfe-9.0.0rc4.src.tar.xz) = 13532608
+SHA256 (compiler-rt-9.0.0rc4.src.tar.xz) = 409c60d812e5e5445ccf6af59edfb1ef412ba8aa7728399fed980a37ed2c67f3
+SIZE (compiler-rt-9.0.0rc4.src.tar.xz) = 1993372
+SHA256 (clang-tools-extra-9.0.0rc4.src.tar.xz) = b1fef1828ac0a09911a32452fdd7cac82260474ee7b1f11801db22fe2136d7c2
+SIZE (clang-tools-extra-9.0.0rc4.src.tar.xz) = 2183936
+SHA256 (lld-9.0.0rc4.src.tar.xz) = 9b3e87edf2a162fc6fdc2c2b3e5506044c00da125f934efc6ec228185910b7bc
+SIZE (lld-9.0.0rc4.src.tar.xz) = 1100616
+SHA256 (lldb-9.0.0rc4.src.tar.xz) = 90b425a26ae0e3c73f0811938ea59307e92c548137647365ce6106b26cff7e1e
+SIZE (lldb-9.0.0rc4.src.tar.xz) = 9848692
+SHA256 (openmp-9.0.0rc4.src.tar.xz) = d6eb006d98336f7a7dfa908ce73431ef734bf9c0be5cec6c0ae5cb45996a0ac3
+SIZE (openmp-9.0.0rc4.src.tar.xz) = 938944
diff --git a/devel/llvm90/files/openmp/patch-projects_openmp_runtime_src_kmp__platform.h b/devel/llvm90/files/openmp/patch-projects_openmp_runtime_src_kmp__platform.h
new file mode 100644
index 000000000000..65feb08008d0
--- /dev/null
+++ b/devel/llvm90/files/openmp/patch-projects_openmp_runtime_src_kmp__platform.h
@@ -0,0 +1,33 @@
+--- projects/openmp/runtime/src/kmp_platform.h.orig	2019-01-19 10:56:40 UTC
++++ projects/openmp/runtime/src/kmp_platform.h
+@@ -93,9 +93,9 @@
+ #define KMP_ARCH_X86 0
+ #define KMP_ARCH_X86_64 0
+ #define KMP_ARCH_AARCH64 0
+-#define KMP_ARCH_PPC64_BE 0
+-#define KMP_ARCH_PPC64_LE 0
+-#define KMP_ARCH_PPC64 (KMP_ARCH_PPC64_LE || KMP_ARCH_PPC64_BE)
++#define KMP_ARCH_PPC64_ELFv1 0
++#define KMP_ARCH_PPC64_ELFv2 0
++#define KMP_ARCH_PPC64 (KMP_ARCH_PPC64_ELFv2 || KMP_ARCH_PPC64_ELFv1)
+ #define KMP_ARCH_MIPS 0
+ #define KMP_ARCH_MIPS64 0
+ 
+@@ -117,12 +117,12 @@
+ #undef KMP_ARCH_X86
+ #define KMP_ARCH_X86 1
+ #elif defined __powerpc64__
+-#if defined __LITTLE_ENDIAN__
+-#undef KMP_ARCH_PPC64_LE
+-#define KMP_ARCH_PPC64_LE 1
++#if defined(_CALL_ELF) && _CALL_ELF == 2
++#undef KMP_ARCH_PPC64_ELFv2
++#define KMP_ARCH_PPC64_ELFv2 1
+ #else
+-#undef KMP_ARCH_PPC64_BE
+-#define KMP_ARCH_PPC64_BE 1
++#undef KMP_ARCH_PPC64_ELFv1
++#define KMP_ARCH_PPC64_ELFv1 1
+ #endif
+ #elif defined __aarch64__
+ #undef KMP_ARCH_AARCH64
diff --git a/devel/llvm90/files/openmp/patch-projects_openmp_runtime_src_z__Linux__asm.S b/devel/llvm90/files/openmp/patch-projects_openmp_runtime_src_z__Linux__asm.S
new file mode 100644
index 000000000000..d0709b84e2f7
--- /dev/null
+++ b/devel/llvm90/files/openmp/patch-projects_openmp_runtime_src_z__Linux__asm.S
@@ -0,0 +1,62 @@
+--- projects/openmp/runtime/src/z_Linux_asm.S.orig	2019-07-02 13:45:40 UTC
++++ projects/openmp/runtime/src/z_Linux_asm.S
+@@ -1328,12 +1328,12 @@ KMP_LABEL(kmp_1):
+ // return:	r3	(always 1/TRUE)
+ //
+ 	.text
+-# if KMP_ARCH_PPC64_LE
++# if KMP_ARCH_PPC64_ELFv2
+ 	.abiversion 2
+ # endif
+ 	.globl	__kmp_invoke_microtask
+ 
+-# if KMP_ARCH_PPC64_LE
++# if KMP_ARCH_PPC64_ELFv2
+ 	.p2align	4
+ # else
+ 	.p2align	2
+@@ -1341,7 +1341,7 @@ KMP_LABEL(kmp_1):
+ 
+ 	.type	__kmp_invoke_microtask,@function
+ 
+-# if KMP_ARCH_PPC64_LE
++# if KMP_ARCH_PPC64_ELFv2
+ __kmp_invoke_microtask:
+ .Lfunc_begin0:
+ .Lfunc_gep0:
+@@ -1385,7 +1385,7 @@ __kmp_invoke_microtask:
+ 	.cfi_offset lr, 16
+ 
+ // Compute the size necessary for the local stack frame.
+-# if KMP_ARCH_PPC64_LE
++# if KMP_ARCH_PPC64_ELFv2
+ 	li 12, 72
+ # else
+ 	li 12, 88
+@@ -1463,7 +1463,7 @@ __kmp_invoke_microtask:
+ // for the microtask begins 48 + 8*8 == 112 bytes above r1 for ELFv1 and
+ // 32 + 8*8 == 96 bytes above r1 for ELFv2.
+ 	addi 4, 4, 40
+-# if KMP_ARCH_PPC64_LE
++# if KMP_ARCH_PPC64_ELFv2
+ 	addi 12, 1, 88
+ # else
+ 	addi 12, 1, 104
+@@ -1475,7 +1475,7 @@ __kmp_invoke_microtask:
+ 	bdnz .Lnext
+ 
+ .Lcall:
+-# if KMP_ARCH_PPC64_LE
++# if KMP_ARCH_PPC64_ELFv2
+ 	std 2, 24(1)
+ 	mr 12, 3
+ #else
+@@ -1491,7 +1491,7 @@ __kmp_invoke_microtask:
+ 
+ 	mtctr 12
+ 	bctrl
+-# if KMP_ARCH_PPC64_LE
++# if KMP_ARCH_PPC64_ELFv2
+ 	ld 2, 24(1)
+ # else
+ 	ld 2, 40(1)
diff --git a/devel/llvm90/pkg-plist b/devel/llvm90/pkg-plist
index 6b84a4def4e6..3bdfdd758bb9 100644
--- a/devel/llvm90/pkg-plist
+++ b/devel/llvm90/pkg-plist
@@ -141,6 +141,7 @@ llvm%%LLVM_SUFFIX%%/bin/dsymutil
 %%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/find-all-symbols
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/git-clang-format
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/hmaptool
+%%LLD_LINK%%llvm%%LLVM_SUFFIX%%/bin/ld
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld.lld
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld
 llvm%%LLVM_SUFFIX%%/bin/llc
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index dfde5cd16ab3..eb352d6b55ee 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mercurial
-PORTVERSION=	5.1
+PORTVERSION=	5.1.1
 CATEGORIES=	devel python
 MASTER_SITES=	https://www.mercurial-scm.org/release/
 
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 2c02c979be61..f865961c1a16 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564837287
-SHA256 (mercurial-5.1.tar.gz) = 6222d92d860e411e422b7dc58062132bc512fa52ec48a71143b40cab4be7c829
-SIZE (mercurial-5.1.tar.gz) = 7283396
+TIMESTAMP = 1567842522
+SHA256 (mercurial-5.1.1.tar.gz) = 35fc8ba5e0379c1b3affa2757e83fb0509e8ac314cbd9f1fd133cf265d16e49f
+SIZE (mercurial-5.1.1.tar.gz) = 7285831
diff --git a/devel/netsurf-buildsystem/Makefile b/devel/netsurf-buildsystem/Makefile
index 9a3e79803657..98b67f12b9f0 100644
--- a/devel/netsurf-buildsystem/Makefile
+++ b/devel/netsurf-buildsystem/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	buildsystem
-PORTVERSION=	1.7
+PORTVERSION=	1.8
 CATEGORIES=	devel
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 PKGNAMEPREFIX=	netsurf-
diff --git a/devel/netsurf-buildsystem/distinfo b/devel/netsurf-buildsystem/distinfo
index 5249a2d5cea5..63b3711fb167 100644
--- a/devel/netsurf-buildsystem/distinfo
+++ b/devel/netsurf-buildsystem/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536019754
-SHA256 (buildsystem-1.7.tar.gz) = 1cd6453301cd88c4dcc36ae67c67d2023b8a56ec2fd0704851b58ccdbc5243e0
-SIZE (buildsystem-1.7.tar.gz) = 38597
+TIMESTAMP = 1567620887
+SHA256 (buildsystem-1.8.tar.gz) = e6a324e7c5965ca032d3196adddd6fd986b5f47c0e6340a646d0d23e3597cd39
+SIZE (buildsystem-1.8.tar.gz) = 38617
diff --git a/devel/oclgrind/Makefile b/devel/oclgrind/Makefile
index 9ee398083d21..8025a8c163a1 100644
--- a/devel/oclgrind/Makefile
+++ b/devel/oclgrind/Makefile
@@ -2,8 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	oclgrind
-PORTVERSION=	20190807
+PORTVERSION=	20190907
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	jmd@FreeBSD.org
@@ -17,13 +18,17 @@ BUILD_DEPENDS=	opencl>=0:devel/opencl \
 LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 RUN_DEPENDS=	opencl>=0:devel/opencl
 
-USES=		cmake compiler:c++11-lang
+USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	jrprice
 GH_PROJECT=	Oclgrind
-GH_TAGNAME=	cd8cad1
+GH_TAGNAME=	e7c87b0
 USE_LDCONFIG=	yes
 
-CMAKE_ARGS+=	-DLLVM_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}/share/llvm/cmake
+CC=		clang${LLVM_DEFAULT}
+CXX=		clang++${LLVM_DEFAULT}
+CPP=		clang-cpp${LLVM_DEFAULT}
+
+CMAKE_ARGS+=	-DLLVM_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm
 
 .include <bsd.port.mk>
diff --git a/devel/oclgrind/distinfo b/devel/oclgrind/distinfo
index 927e39a5f2bd..dabe435280d1 100644
--- a/devel/oclgrind/distinfo
+++ b/devel/oclgrind/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565212188
-SHA256 (jrprice-Oclgrind-v20190807-cd8cad1_GH0.tar.gz) = afc653cba9ca0e936d0b24303b703c63efa689356e5189738e05cba9ed8a0db6
-SIZE (jrprice-Oclgrind-v20190807-cd8cad1_GH0.tar.gz) = 196613
+TIMESTAMP = 1567897486
+SHA256 (jrprice-Oclgrind-v20190907-e7c87b0_GH0.tar.gz) = d9900578c320c430f2970423c6d2288f18f187a67d508c5b93295f1b422bc52c
+SIZE (jrprice-Oclgrind-v20190907-e7c87b0_GH0.tar.gz) = 196630
diff --git a/devel/oniguruma/Makefile b/devel/oniguruma/Makefile
index 628736892971..43b94acc0a7f 100644
--- a/devel/oniguruma/Makefile
+++ b/devel/oniguruma/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	oniguruma
-DISTVERSION=	6.9.2
+DISTVERSION=	6.9.3
 CATEGORIES=	devel textproc
 MASTER_SITES=	https://github.com/kkos/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	onig-${DISTVERSION}
diff --git a/devel/oniguruma/distinfo b/devel/oniguruma/distinfo
index 3955a8401ef3..0c2acdb77082 100644
--- a/devel/oniguruma/distinfo
+++ b/devel/oniguruma/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557598901
-SHA256 (onig-6.9.2.tar.gz) = db7addb196ecb34e9f38d8f9c97b29a3e962c0e17ea9636127b3e3c42f24976a
-SIZE (onig-6.9.2.tar.gz) = 901931
+TIMESTAMP = 1567779306
+SHA256 (onig-6.9.3.tar.gz) = ab5992a76b7ab2185b55f3aacc1b0df81132c947b3d594f82eb0b41cf219725f
+SIZE (onig-6.9.3.tar.gz) = 902349
diff --git a/devel/p5-ExtUtils-MakeMaker/Makefile b/devel/p5-ExtUtils-MakeMaker/Makefile
index f4a3558482ba..618cc814dda7 100644
--- a/devel/p5-ExtUtils-MakeMaker/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ExtUtils-MakeMaker
-PORTVERSION=	7.36
+PORTVERSION=	7.38
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -13,13 +13,13 @@ COMMENT=	Designed to write a Makefile for an extension module
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-CONFLICTS_INSTALL=	p5-ExtUtils-Command
-
 USES=		perl5
 USE_PERL5=	configure
 
 NO_ARCH=	yes
 
+CONFLICTS_INSTALL=	p5-ExtUtils-Command
+
 post-patch:
 	@${REINPLACE_CMD} -e '/EXE_FILES/d; /my::bundles/d' ${WRKSRC}/Makefile.PL
 	@${REINPLACE_CMD} -e '/^bundled\//d' ${WRKSRC}/MANIFEST
diff --git a/devel/p5-ExtUtils-MakeMaker/distinfo b/devel/p5-ExtUtils-MakeMaker/distinfo
index ce8abd29fd63..f2d429d58bd9 100644
--- a/devel/p5-ExtUtils-MakeMaker/distinfo
+++ b/devel/p5-ExtUtils-MakeMaker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556640019
-SHA256 (ExtUtils-MakeMaker-7.36.tar.gz) = 06cef6429315cdc6afa9b2dc6fbdfa33538b6f68c827f441294621858e28c558
-SIZE (ExtUtils-MakeMaker-7.36.tar.gz) = 474751
+TIMESTAMP = 1568290996
+SHA256 (ExtUtils-MakeMaker-7.38.tar.gz) = 897d64af242331ebb69090f68a2b610091e1996952d02096ce7942072a35e02c
+SIZE (ExtUtils-MakeMaker-7.38.tar.gz) = 475927
diff --git a/devel/p5-IO-Pager/Makefile b/devel/p5-IO-Pager/Makefile
index 5016ae0ced81..76555f1f84ab 100644
--- a/devel/p5-IO-Pager/Makefile
+++ b/devel/p5-IO-Pager/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	IO-Pager
-PORTVERSION=	0.40
+PORTVERSION=	0.42
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Pager/distinfo b/devel/p5-IO-Pager/distinfo
index 0254bc16bbe0..23283c18cddd 100644
--- a/devel/p5-IO-Pager/distinfo
+++ b/devel/p5-IO-Pager/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539291278
-SHA256 (IO-Pager-0.40.tgz) = 0735f5ccc077d5d10f4d2856ce5591f89ac8f4cc8c25d5ac4572ee93f5f5edef
-SIZE (IO-Pager-0.40.tgz) = 18847
+TIMESTAMP = 1567842460
+SHA256 (IO-Pager-0.42.tgz) = cc2c9c9d76f141281772c73d95b8f496c1fb6b4ed7fef6ccac04aacc14976aa8
+SIZE (IO-Pager-0.42.tgz) = 20518
diff --git a/devel/p5-IO-Pager/pkg-plist b/devel/p5-IO-Pager/pkg-plist
index 82b8002bf1cc..8f2ee65208e1 100644
--- a/devel/p5-IO-Pager/pkg-plist
+++ b/devel/p5-IO-Pager/pkg-plist
@@ -1,8 +1,10 @@
 %%SITE_PERL%%/IO/Pager.pm
 %%SITE_PERL%%/IO/Pager/Buffered.pm
 %%SITE_PERL%%/IO/Pager/Page.pm
+%%SITE_PERL%%/IO/Pager/Perl.pm
 %%SITE_PERL%%/IO/Pager/Unbuffered.pm
 %%PERL5_MAN3%%/IO::Pager.3.gz
 %%PERL5_MAN3%%/IO::Pager::Buffered.3.gz
 %%PERL5_MAN3%%/IO::Pager::Page.3.gz
+%%PERL5_MAN3%%/IO::Pager::Perl.3.gz
 %%PERL5_MAN3%%/IO::Pager::Unbuffered.3.gz
diff --git a/devel/p5-Locale-Maketext-Gettext/Makefile b/devel/p5-Locale-Maketext-Gettext/Makefile
index 778dc2519659..fed0c3b69a8f 100644
--- a/devel/p5-Locale-Maketext-Gettext/Makefile
+++ b/devel/p5-Locale-Maketext-Gettext/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Locale-Maketext-Gettext
-PORTVERSION=	1.28
-PORTREVISION=	2
+PORTVERSION=	1.29
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,12 +13,14 @@ COMMENT=	Joins gettext and Maketext frameworks
 USES=		perl5
 USE_PERL5=	configure
 
+NO_ARCH=	yes
+
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	BUGS Changes README THANKS
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Locale-Maketext-Gettext/distinfo b/devel/p5-Locale-Maketext-Gettext/distinfo
index 88780b1afadf..e043cc6e491d 100644
--- a/devel/p5-Locale-Maketext-Gettext/distinfo
+++ b/devel/p5-Locale-Maketext-Gettext/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Locale-Maketext-Gettext-1.28.tar.gz) = 6af69d04bf1cadf21099ad535f29ec146a01be617f11c79f533a2e9b2a5ac1ab
-SIZE (Locale-Maketext-Gettext-1.28.tar.gz) = 55013
+TIMESTAMP = 1568290998
+SHA256 (Locale-Maketext-Gettext-1.29.tar.gz) = c638130a6528d6367727544e52241e2ed9a0516cbee77620118f614bee4afe89
+SIZE (Locale-Maketext-Gettext-1.29.tar.gz) = 55248
diff --git a/devel/p5-MCE-Shared/Makefile b/devel/p5-MCE-Shared/Makefile
index 22cbbf2ee46c..dda0d4ffe1dc 100644
--- a/devel/p5-MCE-Shared/Makefile
+++ b/devel/p5-MCE-Shared/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	MCE-Shared
-PORTVERSION=	1.848
+PORTVERSION=	1.850
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARIOROY
diff --git a/devel/p5-MCE-Shared/distinfo b/devel/p5-MCE-Shared/distinfo
index 7d72cada8d3b..739c55421207 100644
--- a/devel/p5-MCE-Shared/distinfo
+++ b/devel/p5-MCE-Shared/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567611060
-SHA256 (MCE-Shared-1.848.tar.gz) = 3e4b32d4b14d7f8fd667b385a6dd359ce83ecd0ef63cd35ff446a302f3905eeb
-SIZE (MCE-Shared-1.848.tar.gz) = 145661
+TIMESTAMP = 1568132223
+SHA256 (MCE-Shared-1.850.tar.gz) = 3485be2ae55c452f8bcf6ac7c16a299b928468f9c1092bb784653f5db351199d
+SIZE (MCE-Shared-1.850.tar.gz) = 146473
diff --git a/devel/p5-MCE/Makefile b/devel/p5-MCE/Makefile
index 42dea07b52d9..1ee3fcad8798 100644
--- a/devel/p5-MCE/Makefile
+++ b/devel/p5-MCE/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	MCE
-PORTVERSION=	1.848
+PORTVERSION=	1.850
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARIOROY
diff --git a/devel/p5-MCE/distinfo b/devel/p5-MCE/distinfo
index 02ac60b700de..d7c1716dcc97 100644
--- a/devel/p5-MCE/distinfo
+++ b/devel/p5-MCE/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567611058
-SHA256 (MCE-1.848.tar.gz) = ca31d3c22d0ba151e6e8a671b962cf4f2f40bed8e3a6fe6093d0bbf1c3e2a8a8
-SIZE (MCE-1.848.tar.gz) = 213732
+TIMESTAMP = 1568132221
+SHA256 (MCE-1.850.tar.gz) = 02d550e6637a46c682a0b96d6f7ba654d3bc8299ed26e92f4f711b096f29926f
+SIZE (MCE-1.850.tar.gz) = 213978
diff --git a/devel/p5-Module-Info-File/Makefile b/devel/p5-Module-Info-File/Makefile
index 7cd9363be0f0..989c1d8e8d00 100644
--- a/devel/p5-Module-Info-File/Makefile
+++ b/devel/p5-Module-Info-File/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Module-Info-File
-PORTVERSION=	1.00
+PORTVERSION=	1.01
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -17,8 +17,9 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Module-Info>=0.20:devel/p5-Module-Info \
 		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 
-NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
+NO_ARCH=	yes
+
 .include <bsd.port.mk>
diff --git a/devel/p5-Module-Info-File/distinfo b/devel/p5-Module-Info-File/distinfo
index 58b90974643c..d03ac26e08a2 100644
--- a/devel/p5-Module-Info-File/distinfo
+++ b/devel/p5-Module-Info-File/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491601108
-SHA256 (Module-Info-File-1.00.tar.gz) = 545459f8c42f90d2e22da98f444a1ad1180f6e771cbdcf060e884f9b3deaa583
-SIZE (Module-Info-File-1.00.tar.gz) = 14347
+TIMESTAMP = 1567842514
+SHA256 (Module-Info-File-1.01.tar.gz) = f276fb98d324eea684eb87f4b87ecb297fdc123b8c98999b13b05182bd290ff9
+SIZE (Module-Info-File-1.01.tar.gz) = 16553
diff --git a/devel/p5-Test-Compile/Makefile b/devel/p5-Test-Compile/Makefile
index 6482ebd33bab..8b3ba7864d6d 100644
--- a/devel/p5-Test-Compile/Makefile
+++ b/devel/p5-Test-Compile/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Test-Compile
-PORTVERSION=	1.3.0
+PORTVERSION=	2.2.2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EGILES
diff --git a/devel/p5-Test-Compile/distinfo b/devel/p5-Test-Compile/distinfo
index 81bf31e3a20c..9fdc3d5a659a 100644
--- a/devel/p5-Test-Compile/distinfo
+++ b/devel/p5-Test-Compile/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Test-Compile-v1.3.0.tar.gz) = 77527e9477ac5260443c756367a7f7bc3d8f6c6ebbc561b0b2fb3f79303bad33
-SIZE (Test-Compile-v1.3.0.tar.gz) = 15198
+TIMESTAMP = 1568033474
+SHA256 (Test-Compile-v2.2.2.tar.gz) = 7853b44a9819eb3e6003260eedf904a1ad80035ea5254296ce014f96084b65d4
+SIZE (Test-Compile-v2.2.2.tar.gz) = 17532
diff --git a/devel/p5-Test-Simple/Makefile b/devel/p5-Test-Simple/Makefile
index fd871a0d30e4..3b632470651a 100644
--- a/devel/p5-Test-Simple/Makefile
+++ b/devel/p5-Test-Simple/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Test-Simple
-PORTVERSION=	1.302167
+PORTVERSION=	1.302168
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Simple/distinfo b/devel/p5-Test-Simple/distinfo
index 9e3adce16ba8..260b343943ab 100644
--- a/devel/p5-Test-Simple/distinfo
+++ b/devel/p5-Test-Simple/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566804045
-SHA256 (Test-Simple-1.302167.tar.gz) = cad2f7e45de3fa231187193669085ab1c7b31a3f2f7da8d8501027022e83db7d
-SIZE (Test-Simple-1.302167.tar.gz) = 306627
+TIMESTAMP = 1567842462
+SHA256 (Test-Simple-1.302168.tar.gz) = 02f6132b2062abb23474b0fc02e70a0fbbf7bf581a6010e64c08891530447ffa
+SIZE (Test-Simple-1.302168.tar.gz) = 306733
diff --git a/devel/p5-Test2-Harness/Makefile b/devel/p5-Test2-Harness/Makefile
index 73136e5ac58a..e06d439d6cbf 100644
--- a/devel/p5-Test2-Harness/Makefile
+++ b/devel/p5-Test2-Harness/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Test2-Harness
-PORTVERSION=	0.001095
+PORTVERSION=	0.001099
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EXODIST
diff --git a/devel/p5-Test2-Harness/distinfo b/devel/p5-Test2-Harness/distinfo
index 22ed2d1b4ede..e1e2560cefd8 100644
--- a/devel/p5-Test2-Harness/distinfo
+++ b/devel/p5-Test2-Harness/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567688295
-SHA256 (Test2-Harness-0.001095.tar.gz) = ab52ddcc98b0e5ea7791516e249423a10714e8ea6b0b7a01187840122dd833ce
-SIZE (Test2-Harness-0.001095.tar.gz) = 535787
+TIMESTAMP = 1568290950
+SHA256 (Test2-Harness-0.001099.tar.gz) = 09b4d48b12ab9dc5a41a476335bb02b1b8cf194fdf3f7b800afb391dc1558bcc
+SIZE (Test2-Harness-0.001099.tar.gz) = 555691
diff --git a/devel/p5-Test2-Harness/pkg-plist b/devel/p5-Test2-Harness/pkg-plist
index fead0d4d4d55..26f5ec3450fd 100644
--- a/devel/p5-Test2-Harness/pkg-plist
+++ b/devel/p5-Test2-Harness/pkg-plist
@@ -9,6 +9,7 @@ bin/yath
 %%SITE_PERL%%/App/Yath/Command/replay.pm
 %%SITE_PERL%%/App/Yath/Command/run.pm
 %%SITE_PERL%%/App/Yath/Command/spawn.pm
+%%SITE_PERL%%/App/Yath/Command/speedtag.pm
 %%SITE_PERL%%/App/Yath/Command/start.pm
 %%SITE_PERL%%/App/Yath/Command/stop.pm
 %%SITE_PERL%%/App/Yath/Command/test.pm
@@ -78,6 +79,7 @@ bin/yath
 %%PERL5_MAN3%%/App::Yath::Command::replay.3.gz
 %%PERL5_MAN3%%/App::Yath::Command::run.3.gz
 %%PERL5_MAN3%%/App::Yath::Command::spawn.3.gz
+%%PERL5_MAN3%%/App::Yath::Command::speedtag.3.gz
 %%PERL5_MAN3%%/App::Yath::Command::start.3.gz
 %%PERL5_MAN3%%/App::Yath::Command::stop.3.gz
 %%PERL5_MAN3%%/App::Yath::Command::test.3.gz
diff --git a/devel/p5-Workflow/Makefile b/devel/p5-Workflow/Makefile
index a888a88bdf21..7ea63dd1b83d 100644
--- a/devel/p5-Workflow/Makefile
+++ b/devel/p5-Workflow/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Workflow
-PORTVERSION=	1.46
+PORTVERSION=	1.48
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Workflow/distinfo b/devel/p5-Workflow/distinfo
index c936273f194a..759b64a9045b 100644
--- a/devel/p5-Workflow/distinfo
+++ b/devel/p5-Workflow/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561756213
-SHA256 (Workflow-1.46.tar.gz) = ee1e0e9ca95f1287a6314e225251162b9fa24f8779061664f13984ebd3b8fd83
-SIZE (Workflow-1.46.tar.gz) = 8441525
+TIMESTAMP = 1568197897
+SHA256 (Workflow-1.48.tar.gz) = 4e04b0bc762e598ccc0b0cc3d4df6a61f5a45b34c85504672cf0f99a687ce62f
+SIZE (Workflow-1.48.tar.gz) = 153680
diff --git a/devel/pmd/Makefile b/devel/pmd/Makefile
index 2fcf01503438..99cc3fd7a696 100644
--- a/devel/pmd/Makefile
+++ b/devel/pmd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pmd
-PORTVERSION=	6.12.0
+PORTVERSION=	6.17.0
 CATEGORIES=	devel java
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-bin-${PORTVERSION}
diff --git a/devel/pmd/distinfo b/devel/pmd/distinfo
index 926a67ebfe78..1a4a3d6f61b0 100644
--- a/devel/pmd/distinfo
+++ b/devel/pmd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551542863
-SHA256 (pmd-bin-6.12.0.zip) = c9a523d5d59f646e7ec1c9282ef93ef6e4339ca43d1e6f5ac0415c1385595eb9
-SIZE (pmd-bin-6.12.0.zip) = 46084063
+TIMESTAMP = 1568030688
+SHA256 (pmd-bin-6.17.0.zip) = 1c794cd4791a636691f0b5ccaaba073e83b01d68a7c3ce8e7ee897d790e00000
+SIZE (pmd-bin-6.17.0.zip) = 48249469
diff --git a/devel/pmd/pkg-plist b/devel/pmd/pkg-plist
index fa223ff4f21a..a944daebdefa 100644
--- a/devel/pmd/pkg-plist
+++ b/devel/pmd/pkg-plist
@@ -6,22 +6,15 @@ bin/pmd
 %%DATADIR%%/antlr-runtime-3.5.2.jar
 %%DATADIR%%/antlr4-runtime-4.7.jar
 %%DATADIR%%/aopalliance-1.0.jar
-%%DATADIR%%/asm-7.0.jar
+%%DATADIR%%/asm-7.1.jar
 %%DATADIR%%/cglib-3.2.0.jar
 %%DATADIR%%/checker-qual-2.5.2.jar
-%%DATADIR%%/commons-beanutils-core-1.8.3.jar
 %%DATADIR%%/commons-io-2.6.jar
 %%DATADIR%%/commons-lang3-3.8.1.jar
-%%DATADIR%%/commons-logging-1.1.1.jar
-%%DATADIR%%/controlsfx-8.40.13.jar
 %%DATADIR%%/error_prone_annotations-2.1.3.jar
-%%DATADIR%%/flowless-0.6.jar
 %%DATADIR%%/groovy-2.4.7.jar
 %%DATADIR%%/gson-2.8.5.jar
 %%DATADIR%%/guava-26.0-jre.jar
-%%DATADIR%%/ikonli-core-2.3.0.jar
-%%DATADIR%%/ikonli-fontawesome5-pack-2.3.0.jar
-%%DATADIR%%/ikonli-javafx-2.3.0.jar
 %%DATADIR%%/j2objc-annotations-1.1.jar
 %%DATADIR%%/javacc-5.0.jar
 %%DATADIR%%/javax.inject-1.jar
@@ -36,6 +29,7 @@ bin/pmd
 %%DATADIR%%/pmd-core-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-cpp-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-cs-%%PORTVERSION%%.jar
+%%DATADIR%%/pmd-dart-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-fortran-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-go-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-groovy-%%PORTVERSION%%.jar
@@ -43,6 +37,7 @@ bin/pmd
 %%DATADIR%%/pmd-javascript-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-jsp-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-kotlin-%%PORTVERSION%%.jar
+%%DATADIR%%/pmd-lua-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-matlab-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-objectivec-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-perl-%%PORTVERSION%%.jar
@@ -56,9 +51,7 @@ bin/pmd
 %%DATADIR%%/pmd-visualforce-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-vm-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-xml-%%PORTVERSION%%.jar
-%%DATADIR%%/reactfx-2.0-M5.jar
 %%DATADIR%%/rhino-1.7.7.2.jar
-%%DATADIR%%/richtextfx-0.9.2.jar
 %%DATADIR%%/saxon-9.1.0.8-dom.jar
 %%DATADIR%%/saxon-9.1.0.8.jar
 %%DATADIR%%/scala-compiler-2.12.4.jar
@@ -68,5 +61,3 @@ bin/pmd
 %%DATADIR%%/slf4j-api-1.7.25.jar
 %%DATADIR%%/snakeyaml-1.17.jar
 %%DATADIR%%/stringtemplate-3.2.1.jar
-%%DATADIR%%/undofx-2.1.0.jar
-%%DATADIR%%/wellbehavedfx-0.3.3.jar
diff --git a/devel/py-arrow/Makefile b/devel/py-arrow/Makefile
index 71bf0c501af8..e417025f785f 100644
--- a/devel/py-arrow/Makefile
+++ b/devel/py-arrow/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	arrow
-PORTVERSION=	0.14.7
+PORTVERSION=	0.15.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-arrow/distinfo b/devel/py-arrow/distinfo
index b0f3d06a2dc1..48f9e03432cd 100644
--- a/devel/py-arrow/distinfo
+++ b/devel/py-arrow/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567688299
-SHA256 (arrow-0.14.7.tar.gz) = 67f8be7c0cf420424bc62d8d7dc40b44e4bb2f7b515f9cc2954fb36e35797656
-SIZE (arrow-0.14.7.tar.gz) = 67657
+TIMESTAMP = 1568290952
+SHA256 (arrow-0.15.1.tar.gz) = c65ea9214403c77b09bd676cba3dcf1e0a396f5dfb316b811bb7f7e10d99e955
+SIZE (arrow-0.15.1.tar.gz) = 71297
diff --git a/devel/py-azure-batch/Makefile b/devel/py-azure-batch/Makefile
index 71c30251393f..01651dc55021 100644
--- a/devel/py-azure-batch/Makefile
+++ b/devel/py-azure-batch/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-batch
-PORTVERSION=	7.0.0
+PORTVERSION=	8.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-batch/distinfo b/devel/py-azure-batch/distinfo
index b277a7f98da0..19e1892187d3 100644
--- a/devel/py-azure-batch/distinfo
+++ b/devel/py-azure-batch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561037811
-SHA256 (azure-batch-7.0.0.zip) = 1225f142176a1cbc8330d0367009da41a2f7d3c3fd070fa4f80890bf9a6c15e1
-SIZE (azure-batch-7.0.0.zip) = 236003
+TIMESTAMP = 1567880486
+SHA256 (azure-batch-8.0.0.zip) = 918bd0dae244a595f5de6cebf0bdab87c6ccd7d9d2f288e1543b6916ed8a16c9
+SIZE (azure-batch-8.0.0.zip) = 241961
diff --git a/devel/py-azure-cosmos/Makefile b/devel/py-azure-cosmos/Makefile
index a046a1957a0a..73a457b9f4b9 100644
--- a/devel/py-azure-cosmos/Makefile
+++ b/devel/py-azure-cosmos/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-cosmos
-PORTVERSION=	3.1.0
+PORTVERSION=	3.1.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-cosmos/distinfo b/devel/py-azure-cosmos/distinfo
index 13c72808f2a1..ccb28c647c59 100644
--- a/devel/py-azure-cosmos/distinfo
+++ b/devel/py-azure-cosmos/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561040691
-SHA256 (azure-cosmos-3.1.0.tar.gz) = f4a718cc4d26e90ad22abbd0d208f43040cbb4b7768144632dd3042fec9da5a4
-SIZE (azure-cosmos-3.1.0.tar.gz) = 122634
+TIMESTAMP = 1567880428
+SHA256 (azure-cosmos-3.1.1.tar.gz) = f3922891baf59742556cbc8bd96aaba4f582a6a8f9bbccb8f2b0376539a21761
+SIZE (azure-cosmos-3.1.1.tar.gz) = 122635
diff --git a/devel/py-azure-datalake-store/Makefile b/devel/py-azure-datalake-store/Makefile
index 38bb3175c0ab..5c44e63d6e4f 100644
--- a/devel/py-azure-datalake-store/Makefile
+++ b/devel/py-azure-datalake-store/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-datalake-store
-PORTVERSION=	0.0.45
+PORTVERSION=	0.0.47
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-datalake-store/distinfo b/devel/py-azure-datalake-store/distinfo
index 7171f9e86e74..d1823a75a618 100644
--- a/devel/py-azure-datalake-store/distinfo
+++ b/devel/py-azure-datalake-store/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557602077
-SHA256 (azure-datalake-store-0.0.45.tar.gz) = 6d719302f2fcac6c941c47d934a6f20f71ec7a519ab53f4aac9283b1db9d5ccc
-SIZE (azure-datalake-store-0.0.45.tar.gz) = 57249
+TIMESTAMP = 1567880397
+SHA256 (azure-datalake-store-0.0.47.tar.gz) = 55bcbec99a35a52ea291518dadfd94c3b645e66d05ce927228289b93979ad3a5
+SIZE (azure-datalake-store-0.0.47.tar.gz) = 52533
diff --git a/devel/py-azure-functions-devops-build/Makefile b/devel/py-azure-functions-devops-build/Makefile
new file mode 100644
index 000000000000..926eb475e91a
--- /dev/null
+++ b/devel/py-azure-functions-devops-build/Makefile
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+PORTNAME=	azure-functions-devops-build
+PORTVERSION=	0.0.22
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	dbaio@FreeBSD.org
+COMMENT=	Azure Devops Build Manager For Azure Functions
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msrest>=0:net-mgmt/py-msrest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}vsts>=0:devel/py-vsts@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/py-azure-functions-devops-build/distinfo b/devel/py-azure-functions-devops-build/distinfo
new file mode 100644
index 000000000000..b4b96f6d0a69
--- /dev/null
+++ b/devel/py-azure-functions-devops-build/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1558568726
+SHA256 (azure-functions-devops-build-0.0.22.tar.gz) = c6341abda6098813f8fa625acd1e925410a17a8a1c7aaabdf975bb7cecb14edf
+SIZE (azure-functions-devops-build-0.0.22.tar.gz) = 23669
diff --git a/devel/py-azure-functions-devops-build/pkg-descr b/devel/py-azure-functions-devops-build/pkg-descr
new file mode 100644
index 000000000000..7604bd5f01cc
--- /dev/null
+++ b/devel/py-azure-functions-devops-build/pkg-descr
@@ -0,0 +1,6 @@
+This project provides the class AzureDevopsBuildManager and supporting classes.
+This manager class allows the caller to manage Azure Devops pipelines that are
+maintained within an Azure Devops account. This project was created to be able
+to support command line tooling for the AZ Cli.
+
+WWW: https://pypi.org/project/azure-functions-devops-build/
diff --git a/devel/py-azure-mgmt-apimanagement/Makefile b/devel/py-azure-mgmt-apimanagement/Makefile
new file mode 100644
index 000000000000..ec4a84612bc6
--- /dev/null
+++ b/devel/py-azure-mgmt-apimanagement/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PORTNAME=	azure-mgmt-apimanagement
+PORTVERSION=	0.1.0
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	dbaio@FreeBSD.org
+COMMENT=	Microsoft Azure API Management Client Library for Python
+
+LICENSE=	MIT
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msrest>=0.5.0:net-mgmt/py-msrest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.32:net-mgmt/py-msrestazure@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-common>=1.1:www/py-azure-common@${PY_FLAVOR}
+
+USES=		azurepy python zip
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/py-azure-mgmt-apimanagement/distinfo b/devel/py-azure-mgmt-apimanagement/distinfo
new file mode 100644
index 000000000000..037cbcfddc2e
--- /dev/null
+++ b/devel/py-azure-mgmt-apimanagement/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1567883130
+SHA256 (azure-mgmt-apimanagement-0.1.0.zip) = 5d45d3438c6a11bae6bb8d4d5173cdb44b85683695f9f3433f22f45aecc47819
+SIZE (azure-mgmt-apimanagement-0.1.0.zip) = 556098
diff --git a/devel/py-azure-mgmt-apimanagement/pkg-descr b/devel/py-azure-mgmt-apimanagement/pkg-descr
new file mode 100644
index 000000000000..982d6ac63837
--- /dev/null
+++ b/devel/py-azure-mgmt-apimanagement/pkg-descr
@@ -0,0 +1,6 @@
+This is the Microsoft Azure API Management Client Library.
+
+Azure Resource Manager (ARM) is the next generation of management APIs that
+replace the old Azure Service Management (ASM).
+
+WWW: https://pypi.org/project/azure-mgmt-apimanagement/
diff --git a/devel/py-azure-mgmt-appconfiguration/Makefile b/devel/py-azure-mgmt-appconfiguration/Makefile
new file mode 100644
index 000000000000..3c75acbeef3a
--- /dev/null
+++ b/devel/py-azure-mgmt-appconfiguration/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PORTNAME=	azure-mgmt-appconfiguration
+PORTVERSION=	0.1.0
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	dbaio@FreeBSD.org
+COMMENT=	Microsoft Azure App Configuration Client Library for Python
+
+LICENSE=	MIT
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msrest>=0.5.0:net-mgmt/py-msrest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.32:net-mgmt/py-msrestazure@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-common>=1.1:www/py-azure-common@${PY_FLAVOR}
+
+USES=		azurepy python zip
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/py-azure-mgmt-appconfiguration/distinfo b/devel/py-azure-mgmt-appconfiguration/distinfo
new file mode 100644
index 000000000000..3c6c3f02dc33
--- /dev/null
+++ b/devel/py-azure-mgmt-appconfiguration/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1567885539
+SHA256 (azure-mgmt-appconfiguration-0.1.0.zip) = 2ff66c9aa1946ab5b604f98af550df0fda05d05ee9106f61ec2db7b357064e7c
+SIZE (azure-mgmt-appconfiguration-0.1.0.zip) = 25015
diff --git a/devel/py-azure-mgmt-appconfiguration/pkg-descr b/devel/py-azure-mgmt-appconfiguration/pkg-descr
new file mode 100644
index 000000000000..c367af22dba1
--- /dev/null
+++ b/devel/py-azure-mgmt-appconfiguration/pkg-descr
@@ -0,0 +1,6 @@
+This is the Microsoft Azure App Configuration Client Library.
+
+Azure Resource Manager (ARM) is the next generation of management APIs that
+replace the old Azure Service Management (ASM).
+
+WWW: https://pypi.org/project/azure-mgmt-appconfiguration/
diff --git a/devel/py-azure-mgmt-batch/Makefile b/devel/py-azure-mgmt-batch/Makefile
index afd85d8ece34..b8e1974d8caa 100644
--- a/devel/py-azure-mgmt-batch/Makefile
+++ b/devel/py-azure-mgmt-batch/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-batch
-PORTVERSION=	6.0.0
+PORTVERSION=	7.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-batch/distinfo b/devel/py-azure-mgmt-batch/distinfo
index 8980355725f9..4e3b53d34fb0 100644
--- a/devel/py-azure-mgmt-batch/distinfo
+++ b/devel/py-azure-mgmt-batch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548590210
-SHA256 (azure-mgmt-batch-6.0.0.zip) = dc929d2a0a65804c28a75dc00bb84ba581f805582a09238f4e7faacb15f8a2a3
-SIZE (azure-mgmt-batch-6.0.0.zip) = 78197
+TIMESTAMP = 1567880378
+SHA256 (azure-mgmt-batch-7.0.0.zip) = 16c5b652b439b1a0a20366558f5c06858a3052d50b16a470bb80cd30f97abca1
+SIZE (azure-mgmt-batch-7.0.0.zip) = 116027
diff --git a/devel/py-azure-mgmt-cognitiveservices/Makefile b/devel/py-azure-mgmt-cognitiveservices/Makefile
index 032038415377..ecdfa31f80c0 100644
--- a/devel/py-azure-mgmt-cognitiveservices/Makefile
+++ b/devel/py-azure-mgmt-cognitiveservices/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-cognitiveservices
-PORTVERSION=	4.0.0
+PORTVERSION=	5.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-cognitiveservices/distinfo b/devel/py-azure-mgmt-cognitiveservices/distinfo
index 3f6152b648f8..da46ebe2fcc2 100644
--- a/devel/py-azure-mgmt-cognitiveservices/distinfo
+++ b/devel/py-azure-mgmt-cognitiveservices/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557601575
-SHA256 (azure-mgmt-cognitiveservices-4.0.0.zip) = 4d0b393ac6cc85bff4caa44f9d3a22db366e49f68b046f36864c57d3827feb17
-SIZE (azure-mgmt-cognitiveservices-4.0.0.zip) = 66131
+TIMESTAMP = 1567880356
+SHA256 (azure-mgmt-cognitiveservices-5.0.0.zip) = 06245a7200bd1ed8a7a8ad3bce282011d6ba2faaae847f337cafd53d5d1efbd4
+SIZE (azure-mgmt-cognitiveservices-5.0.0.zip) = 41950
diff --git a/devel/py-azure-mgmt-compute/Makefile b/devel/py-azure-mgmt-compute/Makefile
index d767582e21d9..47e27fbc64b3 100644
--- a/devel/py-azure-mgmt-compute/Makefile
+++ b/devel/py-azure-mgmt-compute/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-compute
-PORTVERSION=	5.0.0
+PORTVERSION=	7.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-compute/distinfo b/devel/py-azure-mgmt-compute/distinfo
index 3d57d18bad16..4400f586c692 100644
--- a/devel/py-azure-mgmt-compute/distinfo
+++ b/devel/py-azure-mgmt-compute/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557601516
-SHA256 (azure-mgmt-compute-5.0.0.zip) = bc200f100da77c0c910cc9e4db103d4c3f9e052222aa400630b608e410bbbefd
-SIZE (azure-mgmt-compute-5.0.0.zip) = 3383546
+TIMESTAMP = 1567880337
+SHA256 (azure-mgmt-compute-7.0.0.zip) = fba4147a479dda850aac1df5f4a08921aff69a17d7f26648705303fecb576ffd
+SIZE (azure-mgmt-compute-7.0.0.zip) = 1486932
diff --git a/devel/py-azure-mgmt-containerregistry/Makefile b/devel/py-azure-mgmt-containerregistry/Makefile
index f262f24dde24..03e4ff76bff3 100644
--- a/devel/py-azure-mgmt-containerregistry/Makefile
+++ b/devel/py-azure-mgmt-containerregistry/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-containerregistry
-PORTVERSION=	2.8.0
+DISTVERSION=	3.0.0rc5
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-containerregistry/distinfo b/devel/py-azure-mgmt-containerregistry/distinfo
index 1d1cfe604aa2..8160336539e4 100644
--- a/devel/py-azure-mgmt-containerregistry/distinfo
+++ b/devel/py-azure-mgmt-containerregistry/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557601482
-SHA256 (azure-mgmt-containerregistry-2.8.0.zip) = b24be1050d54f3158e8be7f6ad677f0c8888dddefd09fb8391ebfc73d40173a4
-SIZE (azure-mgmt-containerregistry-2.8.0.zip) = 782109
+TIMESTAMP = 1567882391
+SHA256 (azure-mgmt-containerregistry-3.0.0rc5.zip) = 899985f58c5f6390a02c8da04af5a7df877ee5ca6bd81ea256ecb0ec02ce1e56
+SIZE (azure-mgmt-containerregistry-3.0.0rc5.zip) = 461605
diff --git a/devel/py-azure-mgmt-cosmosdb/Makefile b/devel/py-azure-mgmt-cosmosdb/Makefile
index c2955d9fe167..b719f25174ce 100644
--- a/devel/py-azure-mgmt-cosmosdb/Makefile
+++ b/devel/py-azure-mgmt-cosmosdb/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-cosmosdb
-PORTVERSION=	0.7.0
+PORTVERSION=	0.8.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-cosmosdb/distinfo b/devel/py-azure-mgmt-cosmosdb/distinfo
index 2405c461d242..d0db0099738f 100644
--- a/devel/py-azure-mgmt-cosmosdb/distinfo
+++ b/devel/py-azure-mgmt-cosmosdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561037774
-SHA256 (azure-mgmt-cosmosdb-0.7.0.zip) = b980d1556f1a415a3c7b964faff83a1448914394c4c878a6a61cd2e693fb3db5
-SIZE (azure-mgmt-cosmosdb-0.7.0.zip) = 216358
+TIMESTAMP = 1567880296
+SHA256 (azure-mgmt-cosmosdb-0.8.0.zip) = 4b7b59132992bdf5d4ad211ca8e416402bfca5d7a90a80c20989879cc5ea5345
+SIZE (azure-mgmt-cosmosdb-0.8.0.zip) = 92519
diff --git a/devel/py-azure-mgmt-datamigration/Makefile b/devel/py-azure-mgmt-datamigration/Makefile
index 8183830ff595..8b01f22d18fc 100644
--- a/devel/py-azure-mgmt-datamigration/Makefile
+++ b/devel/py-azure-mgmt-datamigration/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-datamigration
-PORTVERSION=	2.2.0
+PORTVERSION=	3.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-datamigration/distinfo b/devel/py-azure-mgmt-datamigration/distinfo
index 425f1a8359e3..d95cc3f3984e 100644
--- a/devel/py-azure-mgmt-datamigration/distinfo
+++ b/devel/py-azure-mgmt-datamigration/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558570976
-SHA256 (azure-mgmt-datamigration-2.2.0.zip) = fc93558356bfc415efb5f2858bf66ee41313dd8e274a2eb6065a399594f73d2e
-SIZE (azure-mgmt-datamigration-2.2.0.zip) = 532518
+TIMESTAMP = 1567880258
+SHA256 (azure-mgmt-datamigration-3.0.0.zip) = b6d45a8c802f9cdbef3417f2714ee9b705102714d029589acaedce2b8fbb855d
+SIZE (azure-mgmt-datamigration-3.0.0.zip) = 143629
diff --git a/devel/py-azure-mgmt-deploymentmanager/Makefile b/devel/py-azure-mgmt-deploymentmanager/Makefile
new file mode 100644
index 000000000000..a42a9a2e9fd3
--- /dev/null
+++ b/devel/py-azure-mgmt-deploymentmanager/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PORTNAME=	azure-mgmt-deploymentmanager
+PORTVERSION=	0.1.0
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	dbaio@FreeBSD.org
+COMMENT=	Microsoft Azure Deployment Manager Client Library for Python
+
+LICENSE=	MIT
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msrest>=0.5.0:net-mgmt/py-msrest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.32:net-mgmt/py-msrestazure@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-common>=1.1:www/py-azure-common@${PY_FLAVOR}
+
+USES=		azurepy python zip
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/py-azure-mgmt-deploymentmanager/distinfo b/devel/py-azure-mgmt-deploymentmanager/distinfo
new file mode 100644
index 000000000000..323046e1b465
--- /dev/null
+++ b/devel/py-azure-mgmt-deploymentmanager/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1567885670
+SHA256 (azure-mgmt-deploymentmanager-0.1.0.zip) = 398a6d38b658c4a790e1a6884921eb98a22a10d906340bb8c9fb3207d709703f
+SIZE (azure-mgmt-deploymentmanager-0.1.0.zip) = 98176
diff --git a/devel/py-azure-mgmt-deploymentmanager/pkg-descr b/devel/py-azure-mgmt-deploymentmanager/pkg-descr
new file mode 100644
index 000000000000..1bf2df6bf997
--- /dev/null
+++ b/devel/py-azure-mgmt-deploymentmanager/pkg-descr
@@ -0,0 +1,6 @@
+This is the Microsoft Azure Deployment Manager Client Library.
+
+Azure Resource Manager (ARM) is the next generation of management APIs that
+replace the old Azure Service Management (ASM).
+
+WWW: https://pypi.org/project/azure-mgmt-deploymentmanager/
diff --git a/devel/py-azure-mgmt-devtestlabs/Makefile b/devel/py-azure-mgmt-devtestlabs/Makefile
index c8513c2947f2..12a948df8e81 100644
--- a/devel/py-azure-mgmt-devtestlabs/Makefile
+++ b/devel/py-azure-mgmt-devtestlabs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-devtestlabs
-PORTVERSION=	3.0.0
+PORTVERSION=	4.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-devtestlabs/distinfo b/devel/py-azure-mgmt-devtestlabs/distinfo
index 435f5c048584..3d14c4d72c55 100644
--- a/devel/py-azure-mgmt-devtestlabs/distinfo
+++ b/devel/py-azure-mgmt-devtestlabs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550320300
-SHA256 (azure-mgmt-devtestlabs-3.0.0.zip) = b3d5b2919021bf45f0acdd34ab23dc9b0435d9d0a6b472e5008128fb8521e700
-SIZE (azure-mgmt-devtestlabs-3.0.0.zip) = 394574
+TIMESTAMP = 1567880237
+SHA256 (azure-mgmt-devtestlabs-4.0.0.zip) = 59549c4c4068f26466b1097b574a8e5099fb2cd6c8be0a00395b06d3b29e278d
+SIZE (azure-mgmt-devtestlabs-4.0.0.zip) = 149388
diff --git a/devel/py-azure-mgmt-hdinsight/Makefile b/devel/py-azure-mgmt-hdinsight/Makefile
index 32680305c5b2..60ac31263ead 100644
--- a/devel/py-azure-mgmt-hdinsight/Makefile
+++ b/devel/py-azure-mgmt-hdinsight/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-hdinsight
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-hdinsight/distinfo b/devel/py-azure-mgmt-hdinsight/distinfo
index 236dd27b0125..309732efef36 100644
--- a/devel/py-azure-mgmt-hdinsight/distinfo
+++ b/devel/py-azure-mgmt-hdinsight/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561037686
-SHA256 (azure-mgmt-hdinsight-1.1.0.zip) = 76d277fb1a2fedc5181a7c738f058ebff8646bde5fb477cb53a43712166c4952
-SIZE (azure-mgmt-hdinsight-1.1.0.zip) = 62456
+TIMESTAMP = 1567880216
+SHA256 (azure-mgmt-hdinsight-1.2.0.zip) = 958a366736749fc5f6f575e3a8fdd0054b2b4119f2c3e11441124126d4d109fb
+SIZE (azure-mgmt-hdinsight-1.2.0.zip) = 69797
diff --git a/devel/py-azure-mgmt-imagebuilder/Makefile b/devel/py-azure-mgmt-imagebuilder/Makefile
new file mode 100644
index 000000000000..57a955a71990
--- /dev/null
+++ b/devel/py-azure-mgmt-imagebuilder/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PORTNAME=	azure-mgmt-imagebuilder
+PORTVERSION=	0.2.1
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	dbaio@FreeBSD.org
+COMMENT=	Microsoft Azure Image Builder Client Library for Python
+
+LICENSE=	MIT
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msrest>=0.5.0:net-mgmt/py-msrest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.32:net-mgmt/py-msrestazure@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-common>=1.1:www/py-azure-common@${PY_FLAVOR}
+
+USES=		azurepy python zip
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/py-azure-mgmt-imagebuilder/distinfo b/devel/py-azure-mgmt-imagebuilder/distinfo
new file mode 100644
index 000000000000..0423391ecfb0
--- /dev/null
+++ b/devel/py-azure-mgmt-imagebuilder/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1567885796
+SHA256 (azure-mgmt-imagebuilder-0.2.1.zip) = 7e5efd9f641764884cbb6e1521c8e7ff67c5ff85ed367ebe8623dbd289df9457
+SIZE (azure-mgmt-imagebuilder-0.2.1.zip) = 72553
diff --git a/devel/py-azure-mgmt-imagebuilder/pkg-descr b/devel/py-azure-mgmt-imagebuilder/pkg-descr
new file mode 100644
index 000000000000..86ba50696166
--- /dev/null
+++ b/devel/py-azure-mgmt-imagebuilder/pkg-descr
@@ -0,0 +1,6 @@
+This is the Microsoft Azure Image Builder Client Library.
+
+Azure Resource Manager (ARM) is the next generation of management APIs that
+replace the old Azure Service Management (ASM).
+
+WWW: https://pypi.org/project/azure-mgmt-imagebuilder/
diff --git a/devel/py-azure-mgmt-kusto/Makefile b/devel/py-azure-mgmt-kusto/Makefile
index ec2240a140c3..cc08c8b5f0f2 100644
--- a/devel/py-azure-mgmt-kusto/Makefile
+++ b/devel/py-azure-mgmt-kusto/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-kusto
-PORTVERSION=	0.3.0
+PORTVERSION=	0.4.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-kusto/distinfo b/devel/py-azure-mgmt-kusto/distinfo
index cd71b6c0bddb..3a4a1dab115b 100644
--- a/devel/py-azure-mgmt-kusto/distinfo
+++ b/devel/py-azure-mgmt-kusto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551394436
-SHA256 (azure-mgmt-kusto-0.3.0.zip) = 9eb8b7781fd4410ee9e207cd0c3983baf9e58414b5b4a18849d09856e36bacde
-SIZE (azure-mgmt-kusto-0.3.0.zip) = 79531
+TIMESTAMP = 1567880195
+SHA256 (azure-mgmt-kusto-0.4.0.zip) = 0bcc4a6c8a1f53702c4f144e7bc73bc541cf092b67d55581648c1b205072a8eb
+SIZE (azure-mgmt-kusto-0.4.0.zip) = 43196
diff --git a/devel/py-azure-mgmt-managedservices/Makefile b/devel/py-azure-mgmt-managedservices/Makefile
new file mode 100644
index 000000000000..6460fec2571e
--- /dev/null
+++ b/devel/py-azure-mgmt-managedservices/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PORTNAME=	azure-mgmt-managedservices
+PORTVERSION=	1.0.0
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	dbaio@FreeBSD.org
+COMMENT=	Microsoft Azure Managed Services Client Library for Python
+
+LICENSE=	MIT
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msrest>=0.5.0:net-mgmt/py-msrest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.32:net-mgmt/py-msrestazure@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-common>=1.1:www/py-azure-common@${PY_FLAVOR}
+
+USES=		azurepy python zip
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/py-azure-mgmt-managedservices/distinfo b/devel/py-azure-mgmt-managedservices/distinfo
new file mode 100644
index 000000000000..92b4dcfe4dcf
--- /dev/null
+++ b/devel/py-azure-mgmt-managedservices/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1567885903
+SHA256 (azure-mgmt-managedservices-1.0.0.zip) = fed8399fc6773aada37c1d0496a46f59410d77c9494d0ca5967c531c3376ad19
+SIZE (azure-mgmt-managedservices-1.0.0.zip) = 50022
diff --git a/devel/py-azure-mgmt-managedservices/pkg-descr b/devel/py-azure-mgmt-managedservices/pkg-descr
new file mode 100644
index 000000000000..b86768e18bcd
--- /dev/null
+++ b/devel/py-azure-mgmt-managedservices/pkg-descr
@@ -0,0 +1,6 @@
+This is the Microsoft Azure Managed Services Client Library.
+
+Azure Resource Manager (ARM) is the next generation of management APIs that
+replace the old Azure Service Management (ASM).
+
+WWW: https://pypi.org/project/azure-mgmt-managedservices/
diff --git a/devel/py-azure-mgmt-monitor/Makefile b/devel/py-azure-mgmt-monitor/Makefile
index 182a236810e1..e9b3f4f53401 100644
--- a/devel/py-azure-mgmt-monitor/Makefile
+++ b/devel/py-azure-mgmt-monitor/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-monitor
-PORTVERSION=	0.6.0
+PORTVERSION=	0.7.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-monitor/distinfo b/devel/py-azure-mgmt-monitor/distinfo
index b2708182af74..24cbae79ba44 100644
--- a/devel/py-azure-mgmt-monitor/distinfo
+++ b/devel/py-azure-mgmt-monitor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552135334
-SHA256 (azure-mgmt-monitor-0.6.0.zip) = 5a804dae2c3e31bfd6f1b0482d49761b9a56f7eefa9b190cd76ef5fe1d504ef2
-SIZE (azure-mgmt-monitor-0.6.0.zip) = 300779
+TIMESTAMP = 1567880159
+SHA256 (azure-mgmt-monitor-0.7.0.zip) = 8216ab3ec57994303c47a0977e853a8a3fff4778e08dc3575e669522cadcf9de
+SIZE (azure-mgmt-monitor-0.7.0.zip) = 354032
diff --git a/devel/py-azure-mgmt-netapp/Makefile b/devel/py-azure-mgmt-netapp/Makefile
new file mode 100644
index 000000000000..020eb7dd715b
--- /dev/null
+++ b/devel/py-azure-mgmt-netapp/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PORTNAME=	azure-mgmt-netapp
+PORTVERSION=	0.5.0
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	dbaio@FreeBSD.org
+COMMENT=	Microsoft Azure NetApp Files Management Client Library for Python
+
+LICENSE=	MIT
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msrest>=0.5.0:net-mgmt/py-msrest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.32:net-mgmt/py-msrestazure@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-common>=1.1:www/py-azure-common@${PY_FLAVOR}
+
+USES=		azurepy python zip
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/py-azure-mgmt-netapp/distinfo b/devel/py-azure-mgmt-netapp/distinfo
new file mode 100644
index 000000000000..3ff5fb184b25
--- /dev/null
+++ b/devel/py-azure-mgmt-netapp/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1567886007
+SHA256 (azure-mgmt-netapp-0.5.0.zip) = cd1c15c18a52bb5297243719b2c2881a3f3817c6bc37fb1d06f7dae3e75df4f2
+SIZE (azure-mgmt-netapp-0.5.0.zip) = 130878
diff --git a/devel/py-azure-mgmt-netapp/pkg-descr b/devel/py-azure-mgmt-netapp/pkg-descr
new file mode 100644
index 000000000000..eaed9526c729
--- /dev/null
+++ b/devel/py-azure-mgmt-netapp/pkg-descr
@@ -0,0 +1,6 @@
+This is the Microsoft Azure NetApp Files Management Client Library.
+
+Azure Resource Manager (ARM) is the next generation of management APIs that
+replace the old Azure Service Management (ASM).
+
+WWW: https://pypi.org/project/azure-mgmt-netapp/
diff --git a/devel/py-azure-mgmt-network/Makefile b/devel/py-azure-mgmt-network/Makefile
index aa7bf9b01c80..763469563c9d 100644
--- a/devel/py-azure-mgmt-network/Makefile
+++ b/devel/py-azure-mgmt-network/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-network
-DISTVERSION=	3.0.0
+DISTVERSION=	5.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-network/distinfo b/devel/py-azure-mgmt-network/distinfo
index 8be47ce7d9f0..6379eb12451a 100644
--- a/devel/py-azure-mgmt-network/distinfo
+++ b/devel/py-azure-mgmt-network/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559777803
-SHA256 (azure-mgmt-network-3.0.0.zip) = 7b7f4759c367da33be631e63320daa6663575d092c04891fef531dff6f4be516
-SIZE (azure-mgmt-network-3.0.0.zip) = 5094722
+TIMESTAMP = 1567879921
+SHA256 (azure-mgmt-network-5.0.0.zip) = ec63eac868ad231892b41dd93dade162773a968f0e007e8323f0419f47edd50f
+SIZE (azure-mgmt-network-5.0.0.zip) = 5874392
diff --git a/devel/py-azure-mgmt-privatedns/Makefile b/devel/py-azure-mgmt-privatedns/Makefile
new file mode 100644
index 000000000000..f79779b47461
--- /dev/null
+++ b/devel/py-azure-mgmt-privatedns/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PORTNAME=	azure-mgmt-privatedns
+PORTVERSION=	0.1.0
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	dbaio@FreeBSD.org
+COMMENT=	Microsoft Azure DNS Private Zones Client Library for Python
+
+LICENSE=	MIT
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msrest>=0.5.0:net-mgmt/py-msrest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.32:net-mgmt/py-msrestazure@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-common>=1.1:www/py-azure-common@${PY_FLAVOR}
+
+USES=		azurepy python zip
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/py-azure-mgmt-privatedns/distinfo b/devel/py-azure-mgmt-privatedns/distinfo
new file mode 100644
index 000000000000..999c091cc1f7
--- /dev/null
+++ b/devel/py-azure-mgmt-privatedns/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1567886095
+SHA256 (azure-mgmt-privatedns-0.1.0.zip) = d29cfd8cec806e06673d9382d3f5766fc65d9a9de75b424705094a34a7db8d23
+SIZE (azure-mgmt-privatedns-0.1.0.zip) = 49776
diff --git a/devel/py-azure-mgmt-privatedns/pkg-descr b/devel/py-azure-mgmt-privatedns/pkg-descr
new file mode 100644
index 000000000000..04b1f0308f47
--- /dev/null
+++ b/devel/py-azure-mgmt-privatedns/pkg-descr
@@ -0,0 +1,6 @@
+This is the Microsoft Azure DNS Private Zones Client Library.
+
+Azure Resource Manager (ARM) is the next generation of management APIs that
+replace the old Azure Service Management (ASM).
+
+WWW: https://pypi.org/project/azure-mgmt-privatedns/
diff --git a/devel/py-azure-mgmt-resource/Makefile b/devel/py-azure-mgmt-resource/Makefile
index 0c36e0ac67d9..0db40362b9f4 100644
--- a/devel/py-azure-mgmt-resource/Makefile
+++ b/devel/py-azure-mgmt-resource/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-resource
-PORTVERSION=	3.0.0
+PORTVERSION=	4.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-resource/distinfo b/devel/py-azure-mgmt-resource/distinfo
index ad4760821065..f7f99b01cd0b 100644
--- a/devel/py-azure-mgmt-resource/distinfo
+++ b/devel/py-azure-mgmt-resource/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561037567
-SHA256 (azure-mgmt-resource-3.0.0.zip) = a64b49f6e9bc07c7499c767c9fadfa2019a4d44222d78c941cd748653f83a963
-SIZE (azure-mgmt-resource-3.0.0.zip) = 631187
+TIMESTAMP = 1567862145
+SHA256 (azure-mgmt-resource-4.0.0.zip) = 2b909f137469c7bfa541554c3d22eb918e9191c07667a42f2c6fc684e24ac83f
+SIZE (azure-mgmt-resource-4.0.0.zip) = 908349
diff --git a/devel/py-azure-mgmt-security/Makefile b/devel/py-azure-mgmt-security/Makefile
index 4b79f89ac458..9e19f24752da 100644
--- a/devel/py-azure-mgmt-security/Makefile
+++ b/devel/py-azure-mgmt-security/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-security
-PORTVERSION=	0.2.0
+PORTVERSION=	0.3.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-security/distinfo b/devel/py-azure-mgmt-security/distinfo
index 862dcbb88736..94e9cba2b6a9 100644
--- a/devel/py-azure-mgmt-security/distinfo
+++ b/devel/py-azure-mgmt-security/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556399186
-SHA256 (azure-mgmt-security-0.2.0.zip) = 32965b12dece3b7bad56f247608258985d61bff90952d8ff00b1c4dc67cfe432
-SIZE (azure-mgmt-security-0.2.0.zip) = 161380
+TIMESTAMP = 1567862089
+SHA256 (azure-mgmt-security-0.3.0.zip) = 1b1d621d796e59c690cadfa83bd1c2df2db0b4eecb97db8a376aa0430431e67c
+SIZE (azure-mgmt-security-0.3.0.zip) = 123703
diff --git a/devel/py-azure-mgmt-servicefabric/Makefile b/devel/py-azure-mgmt-servicefabric/Makefile
index 1bc8bb641b39..576fd57a3f7d 100644
--- a/devel/py-azure-mgmt-servicefabric/Makefile
+++ b/devel/py-azure-mgmt-servicefabric/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-servicefabric
-PORTVERSION=	0.3.0
+PORTVERSION=	0.4.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-servicefabric/distinfo b/devel/py-azure-mgmt-servicefabric/distinfo
index 3b88e534d441..98f7a3d30076 100644
--- a/devel/py-azure-mgmt-servicefabric/distinfo
+++ b/devel/py-azure-mgmt-servicefabric/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559777483
-SHA256 (azure-mgmt-servicefabric-0.3.0.zip) = 56f47d7529195711f71b06f85a0a1a914b2da9d084d7f58c5a5c6bcbd1d53932
-SIZE (azure-mgmt-servicefabric-0.3.0.zip) = 172152
+TIMESTAMP = 1567862046
+SHA256 (azure-mgmt-servicefabric-0.4.0.zip) = a2cbd2797e796a550a93d37229b2ded22765f50166730a63c8e20a27677e28f4
+SIZE (azure-mgmt-servicefabric-0.4.0.zip) = 70460
diff --git a/devel/py-azure-mgmt-signalr/Makefile b/devel/py-azure-mgmt-signalr/Makefile
index 53a27654f771..4672ecaf9efb 100644
--- a/devel/py-azure-mgmt-signalr/Makefile
+++ b/devel/py-azure-mgmt-signalr/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-signalr
-PORTVERSION=	0.2.0
+PORTVERSION=	0.3.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-signalr/distinfo b/devel/py-azure-mgmt-signalr/distinfo
index 52341e0f2b88..97f8d86c231b 100644
--- a/devel/py-azure-mgmt-signalr/distinfo
+++ b/devel/py-azure-mgmt-signalr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558570625
-SHA256 (azure-mgmt-signalr-0.2.0.zip) = 9fee18e9a27ad06aa097c9ecc0b47198555e85829fa5d63d17de65918d83694c
-SIZE (azure-mgmt-signalr-0.2.0.zip) = 54773
+TIMESTAMP = 1567862024
+SHA256 (azure-mgmt-signalr-0.3.0.zip) = 0a6c876434f1a51bfbf1c4cea3f7167329f4ea86c12ba8ce8123d8f4b9896221
+SIZE (azure-mgmt-signalr-0.3.0.zip) = 60560
diff --git a/devel/py-azure-mgmt-sql/Makefile b/devel/py-azure-mgmt-sql/Makefile
index 47b4b36e58c9..8b4e4ff66069 100644
--- a/devel/py-azure-mgmt-sql/Makefile
+++ b/devel/py-azure-mgmt-sql/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-sql
-PORTVERSION=	0.12.0
+PORTVERSION=	0.13.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-sql/distinfo b/devel/py-azure-mgmt-sql/distinfo
index 39a59ee75b5e..991564838882 100644
--- a/devel/py-azure-mgmt-sql/distinfo
+++ b/devel/py-azure-mgmt-sql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553900412
-SHA256 (azure-mgmt-sql-0.12.0.zip) = 8399702e9d1836f3b040ce0c93d8dc089767d66edb9224a3b8a6c9ab7e8ff01f
-SIZE (azure-mgmt-sql-0.12.0.zip) = 630709
+TIMESTAMP = 1567861993
+SHA256 (azure-mgmt-sql-0.13.0.zip) = f41c47a8bcf0eaa8daaac863d9b454d34496cd050f48594561c47a8b84aa92a0
+SIZE (azure-mgmt-sql-0.13.0.zip) = 367772
diff --git a/devel/py-azure-mgmt-sqlvirtualmachine/Makefile b/devel/py-azure-mgmt-sqlvirtualmachine/Makefile
index 57ded289bf2d..f7551d66534b 100644
--- a/devel/py-azure-mgmt-sqlvirtualmachine/Makefile
+++ b/devel/py-azure-mgmt-sqlvirtualmachine/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-mgmt-sqlvirtualmachine
-PORTVERSION=	0.3.0
+PORTVERSION=	0.4.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-mgmt-sqlvirtualmachine/distinfo b/devel/py-azure-mgmt-sqlvirtualmachine/distinfo
index f29c392a1def..7139c82eebf2 100644
--- a/devel/py-azure-mgmt-sqlvirtualmachine/distinfo
+++ b/devel/py-azure-mgmt-sqlvirtualmachine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559777054
-SHA256 (azure-mgmt-sqlvirtualmachine-0.3.0.zip) = 8de993db9b0bdd964cdeefc68b99b5ab9e95109c0aacb3b65d574a5efae0b63e
-SIZE (azure-mgmt-sqlvirtualmachine-0.3.0.zip) = 74257
+TIMESTAMP = 1567861890
+SHA256 (azure-mgmt-sqlvirtualmachine-0.4.0.zip) = 95718425df713e87700e21207f2695ea26b91fe2ddd89918ca7c76bfe58cb5cb
+SIZE (azure-mgmt-sqlvirtualmachine-0.4.0.zip) = 75890
diff --git a/devel/py-azure-storage-blob/Makefile b/devel/py-azure-storage-blob/Makefile
index eb3220c98239..6abb153a3d82 100644
--- a/devel/py-azure-storage-blob/Makefile
+++ b/devel/py-azure-storage-blob/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-storage-blob
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,7 @@ COMMENT=	Microsoft Azure Storage Blob Client Library for Python
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-common>=1.1.5:www/py-azure-common@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-storage-common>=2.0:devel/py-azure-storage-common@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-storage-common>=2.1:devel/py-azure-storage-common@${PY_FLAVOR} \
 		${PY_FUTURES}
 
 USES=		azurepy python
diff --git a/devel/py-azure-storage-blob/distinfo b/devel/py-azure-storage-blob/distinfo
index 11323bbc5c86..73dd6bef7ed5 100644
--- a/devel/py-azure-storage-blob/distinfo
+++ b/devel/py-azure-storage-blob/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557600678
-SHA256 (azure-storage-blob-2.0.1.tar.gz) = 93381abf5d18222b9dd8a07fa5f810536427c047663433f4c77877d047877032
-SIZE (azure-storage-blob-2.0.1.tar.gz) = 75732
+TIMESTAMP = 1567861589
+SHA256 (azure-storage-blob-2.1.0.tar.gz) = b90323aad60f207f9f90a0c4cf94c10acc313c20b39403398dfba51f25f7b454
+SIZE (azure-storage-blob-2.1.0.tar.gz) = 83156
diff --git a/devel/py-azure-storage-common/Makefile b/devel/py-azure-storage-common/Makefile
index cfa86ab60bcf..6f7221ee3b9b 100644
--- a/devel/py-azure-storage-common/Makefile
+++ b/devel/py-azure-storage-common/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-storage-common
-PORTVERSION=	2.0.0
+PORTVERSION=	2.1.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-azure-storage-common/distinfo b/devel/py-azure-storage-common/distinfo
index edf28b2d64ae..cef40663937c 100644
--- a/devel/py-azure-storage-common/distinfo
+++ b/devel/py-azure-storage-common/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557600571
-SHA256 (azure-storage-common-2.0.0.tar.gz) = 4390cd5f6fb50fbff37ba154258ea010291a84f128917141e1d7060597bd4708
-SIZE (azure-storage-common-2.0.0.tar.gz) = 41352
+TIMESTAMP = 1567861764
+SHA256 (azure-storage-common-2.1.0.tar.gz) = ccedef5c67227bc4d6670ffd37cec18fb529a1b7c3a5e53e4096eb0cf23dc73f
+SIZE (azure-storage-common-2.1.0.tar.gz) = 41869
diff --git a/devel/py-cabby/Makefile b/devel/py-cabby/Makefile
new file mode 100644
index 000000000000..9396d5b082cf
--- /dev/null
+++ b/devel/py-cabby/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+PORTNAME=	cabby
+PORTVERSION=	0.1.20
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	gmm@tutanota.com
+COMMENT=	Python TAXII client implementation from EclecticIQ
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.rst
+
+USES=		python
+USE_PYTHON=	autoplist distutils
+
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}furl>0:devel/py-furl@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}libtaxii>0:devel/py-libtaxii@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}colorlog>0:devel/py-colorlog@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/py-cabby/distinfo b/devel/py-cabby/distinfo
new file mode 100644
index 000000000000..ca11cd48899b
--- /dev/null
+++ b/devel/py-cabby/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1568136221
+SHA256 (cabby-0.1.20.tar.gz) = f4a98bfe20a8fe666d63c8430f45dbcf02c9ec4d0632e0f13b82d16117fe2229
+SIZE (cabby-0.1.20.tar.gz) = 34866
diff --git a/devel/py-cabby/pkg-descr b/devel/py-cabby/pkg-descr
new file mode 100644
index 000000000000..240fe8e1c98c
--- /dev/null
+++ b/devel/py-cabby/pkg-descr
@@ -0,0 +1,4 @@
+Python TAXII client implementation from EclecticIQ. A simple Python library for
+interacting with TAXII servers.
+
+WWW: https://github.com/EclecticIQ/cabby/
diff --git a/devel/py-cuisine/Makefile b/devel/py-cuisine/Makefile
index 162e0b93f40c..5c6b1195f514 100644
--- a/devel/py-cuisine/Makefile
+++ b/devel/py-cuisine/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cuisine
 PORTVERSION=	0.7.13
+PORTREVISION=	1
 #PORTEPOCH=	0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
@@ -12,7 +13,7 @@ COMMENT=	Chef-like functionality for Fabric
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fabric>=1.7,1:devel/py-fabric@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fabric1>=1.7,1:devel/py-fabric1@${PY_FLAVOR}
 
 USES=		python:2.7
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-fabric/Makefile b/devel/py-fabric/Makefile
index 007971ab3453..9c818f6ca467 100644
--- a/devel/py-fabric/Makefile
+++ b/devel/py-fabric/Makefile
@@ -2,31 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	fabric
-PORTVERSION=	1.14.1
+PORTVERSION=	2.5.0
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	Fabric-${DISTVERSION}
 
 MAINTAINER=	koobs@FreeBSD.org
-COMMENT=	Simple, Pythonic remote execution and deployment
+COMMENT=	High level SSH command execution
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.10:security/py-paramiko@${PY_FLAVOR} # <3.0
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=2.4:security/py-paramiko@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}invoke>=1.1,<2.0:devel/py-invoke@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cryptography>=1.1:security/py-cryptography@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.2.5:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-relaxed>0:devel/py-pytest-relaxed@${PY_FLAVOR}
 
-USES=		python:2.7
+USES=		python
 USE_PYTHON=	distutils concurrent autoplist
 
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}fabric1
+
 NO_ARCH=	yes
 
 do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} -m nose -v \
-		--exclude=test_nested_execution_with_explicit_ports
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs \
+		-k 'not python_dash_m_acts_like_fab'
 
 .include <bsd.port.mk>
diff --git a/devel/py-fabric/distinfo b/devel/py-fabric/distinfo
index da201a341357..0e55b2f698e9 100644
--- a/devel/py-fabric/distinfo
+++ b/devel/py-fabric/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1554010618
-SHA256 (Fabric-1.14.1.tar.gz) = 66097883bb3e5beecacae92b82b2bd489d10a8fd4f06ce1cb27019de2e6d76a8
-SIZE (Fabric-1.14.1.tar.gz) = 220463
+TIMESTAMP = 1565561659
+SHA256 (fabric-2.5.0.tar.gz) = 24842d7d51556adcabd885ac3cf5e1df73fc622a1708bf3667bf5927576cdfa6
+SIZE (fabric-2.5.0.tar.gz) = 161421
diff --git a/devel/py-fabric/pkg-descr b/devel/py-fabric/pkg-descr
index 39a31b532253..c61d1414070f 100644
--- a/devel/py-fabric/pkg-descr
+++ b/devel/py-fabric/pkg-descr
@@ -1,10 +1,8 @@
-Fabric is a simple pythonic remote deployment tool.
+Fabric is a high level Python library designed to execute shell commands
+remotely over SSH, yielding useful Python objects in return.
 
-It is designed to upload files to, and run shell commands on, a number
-of servers in parallel or serially. These commands are grouped in tasks
-(regular python functions) and specified in a 'fabfile.'
-
-This is called remote automation, and the primary use case is deploying
-applications to multiple similar hosts.
+It builds on top of Invoke (subprocess command execution and command-line
+features) and Paramiko (SSH protocol implementation), extending their APIs
+to complement one another and provide additional functionality.
 
 WWW: https://www.fabfile.org
diff --git a/devel/py-fabric1/Makefile b/devel/py-fabric1/Makefile
new file mode 100644
index 000000000000..2fef03c0db83
--- /dev/null
+++ b/devel/py-fabric1/Makefile
@@ -0,0 +1,35 @@
+# Created by: Yi-Jheng Lin <yzlin@cs.nctu.edu.tw>
+# $FreeBSD$
+
+PORTNAME=	fabric
+PORTVERSION=	1.14.1
+PORTEPOCH=	1
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	1
+DISTNAME=	Fabric-${DISTVERSION}
+
+MAINTAINER=	koobs@FreeBSD.org
+COMMENT=	High level SSH command execution
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.10:security/py-paramiko@${PY_FLAVOR} # <3.0
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
+
+USES=		python:2.7
+USE_PYTHON=	distutils concurrent autoplist
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}fabric
+
+NO_ARCH=	yes
+
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m nose -v \
+		--exclude=test_nested_execution_with_explicit_ports
+
+.include <bsd.port.mk>
diff --git a/devel/py-fabric1/distinfo b/devel/py-fabric1/distinfo
new file mode 100644
index 000000000000..da201a341357
--- /dev/null
+++ b/devel/py-fabric1/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1554010618
+SHA256 (Fabric-1.14.1.tar.gz) = 66097883bb3e5beecacae92b82b2bd489d10a8fd4f06ce1cb27019de2e6d76a8
+SIZE (Fabric-1.14.1.tar.gz) = 220463
diff --git a/devel/py-fabric/files/patch-setup.py b/devel/py-fabric1/files/patch-setup.py
index faaa912c16e5..faaa912c16e5 100644
--- a/devel/py-fabric/files/patch-setup.py
+++ b/devel/py-fabric1/files/patch-setup.py
diff --git a/devel/py-fabric1/pkg-descr b/devel/py-fabric1/pkg-descr
new file mode 100644
index 000000000000..c61d1414070f
--- /dev/null
+++ b/devel/py-fabric1/pkg-descr
@@ -0,0 +1,8 @@
+Fabric is a high level Python library designed to execute shell commands
+remotely over SSH, yielding useful Python objects in return.
+
+It builds on top of Invoke (subprocess command execution and command-line
+features) and Paramiko (SSH protocol implementation), extending their APIs
+to complement one another and provide additional functionality.
+
+WWW: https://www.fabfile.org
diff --git a/devel/py-furl/Makefile b/devel/py-furl/Makefile
new file mode 100644
index 000000000000..000b22024958
--- /dev/null
+++ b/devel/py-furl/Makefile
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+PORTNAME=	furl
+PORTVERSION=	2.0.0
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	gmm@tutanota.com
+COMMENT=	Small Python library that makes parsing and manipulating URLs easy
+
+LICENSE=	PD
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+USES=		python
+USE_PYTHON=	autoplist distutils
+
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}orderedmultidict>0:devel/py-orderedmultidict@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/py-furl/distinfo b/devel/py-furl/distinfo
new file mode 100644
index 000000000000..1366ba1688e7
--- /dev/null
+++ b/devel/py-furl/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1568134642
+SHA256 (furl-2.0.0.tar.gz) = fdcaedc1fb19a63d7d875b0105b0a5b496dd0989330d454a42bcb401fa5454ec
+SIZE (furl-2.0.0.tar.gz) = 42732
diff --git a/devel/py-furl/pkg-descr b/devel/py-furl/pkg-descr
new file mode 100644
index 000000000000..b4e6b142a4cd
--- /dev/null
+++ b/devel/py-furl/pkg-descr
@@ -0,0 +1,12 @@
+furl is a small Python library that makes parsing and
+manipulating URLs easy.
+
+Python's standard urllib and urlparse modules provide a number of URL
+related functions, but using these functions to perform common URL
+operations proves tedious. Furl makes parsing and manipulating URLs
+easy.
+
+Furl is well tested, Unlicensed in the public domain, and supports
+Python 2, Python 3, PyPy2, and PyPy3.
+
+WWW: https://github.com/gruns/furl
diff --git a/devel/py-google-pasta/Makefile b/devel/py-google-pasta/Makefile
index 49e2be043ee9..1c3f9925ee29 100644
--- a/devel/py-google-pasta/Makefile
+++ b/devel/py-google-pasta/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	google-pasta
 PORTVERSION=	0.1.7
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,9 +12,14 @@ COMMENT=	Library to refactor python code through AST manipulation
 
 LICENSE=	APACHE20
 
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+
 .include <bsd.port.mk>
diff --git a/devel/py-google-pasta/files/patch-setup.py b/devel/py-google-pasta/files/patch-setup.py
new file mode 100644
index 000000000000..7a0c0d70be25
--- /dev/null
+++ b/devel/py-google-pasta/files/patch-setup.py
@@ -0,0 +1,27 @@
+# Fix tests running twice
+# TODO: Upstream
+
+# Register six dependency
+# https://github.com/google/pasta/pull/77
+
+--- setup.py.orig	2019-05-29 17:07:01 UTC
++++ setup.py
+@@ -26,7 +26,8 @@ def all_tests():
+     test_suite = test_loader.discover('.', pattern='*_test.py')
+     return test_suite
+ 
+-setup(
++if __name__ == '__main__':
++  setup(
+     name="google-pasta",
+     version="0.1.7",
+     packages=find_packages(),
+@@ -43,4 +44,7 @@ setup(
+         "Development Status :: 2 - Pre-Alpha",
+         "License :: OSI Approved :: Apache Software License",
+     ],
+-)
++    install_requires=[
++        'six',
++    ],
++  )
diff --git a/devel/py-hypothesis/Makefile b/devel/py-hypothesis/Makefile
index 50131ce766ac..6a1e8d84e842 100644
--- a/devel/py-hypothesis/Makefile
+++ b/devel/py-hypothesis/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hypothesis
-PORTVERSION=	4.35.0
+PORTVERSION=	4.36.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-hypothesis/distinfo b/devel/py-hypothesis/distinfo
index ad40ce344289..917f9e8efd1c 100644
--- a/devel/py-hypothesis/distinfo
+++ b/devel/py-hypothesis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567688306
-SHA256 (hypothesis-4.35.0.tar.gz) = c1019e6b47bf3a4d566d3d4a916e48c363467878943447aac380358544a23810
-SIZE (hypothesis-4.35.0.tar.gz) = 209790
+TIMESTAMP = 1568132227
+SHA256 (hypothesis-4.36.0.tar.gz) = e4d70db2086215c90d8235c764ccf2371e34837e03daf2b14ea5fb227b47fa55
+SIZE (hypothesis-4.36.0.tar.gz) = 210037
diff --git a/devel/py-jep/Makefile b/devel/py-jep/Makefile
index d0179b216a27..d58523b83060 100644
--- a/devel/py-jep/Makefile
+++ b/devel/py-jep/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jep
-PORTVERSION=	3.8.2
-PORTREVISION=	2
+PORTVERSION=	3.9.0
 CATEGORIES=	devel java python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-jep/distinfo b/devel/py-jep/distinfo
index 384495db66a5..c16144619cf1 100644
--- a/devel/py-jep/distinfo
+++ b/devel/py-jep/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534073822
-SHA256 (jep-3.8.2.tar.gz) = 6825fa2d399c228ebcb0c70b979b6ab733468b7c9541ab48ef1d9ca83184de2f
-SIZE (jep-3.8.2.tar.gz) = 2967853
+TIMESTAMP = 1567946938
+SHA256 (jep-3.9.0.tar.gz) = 7a15b6279b703c8af6b1f002186c542770f9059e8b3fe724914f664e67b7e595
+SIZE (jep-3.9.0.tar.gz) = 2999022
diff --git a/devel/py-jupyterlab/Makefile b/devel/py-jupyterlab/Makefile
index 7ce2e03f9588..40c45de6ddda 100644
--- a/devel/py-jupyterlab/Makefile
+++ b/devel/py-jupyterlab/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jupyterlab
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.3
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-jupyterlab/distinfo b/devel/py-jupyterlab/distinfo
index 13ff89c6aa50..0d99d126ac8b 100644
--- a/devel/py-jupyterlab/distinfo
+++ b/devel/py-jupyterlab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567191906
-SHA256 (jupyterlab-1.1.1.tar.gz) = 6515229d18ff3412dd582a4ba780c76476810c9b27d832bd55533d88e2d071d6
-SIZE (jupyterlab-1.1.1.tar.gz) = 11068352
+TIMESTAMP = 1568290954
+SHA256 (jupyterlab-1.1.3.tar.gz) = 820975c5a4d7be40245d7ec1c4feef469fa07f8f62907091bc4965353da124e0
+SIZE (jupyterlab-1.1.3.tar.gz) = 11065802
diff --git a/devel/py-knack/Makefile b/devel/py-knack/Makefile
index 14eb7227d399..914702023d52 100644
--- a/devel/py-knack/Makefile
+++ b/devel/py-knack/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	knack
-DISTVERSION=	0.6.2
+DISTVERSION=	0.6.3
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-knack/distinfo b/devel/py-knack/distinfo
index 016936d54b2d..0a45a804aa97 100644
--- a/devel/py-knack/distinfo
+++ b/devel/py-knack/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559779943
-SHA256 (knack-0.6.2.tar.gz) = 281ea8475178089ac730442a874413e1c40a5e7bd7d4107e4e6aef2a6a92bdcf
-SIZE (knack-0.6.2.tar.gz) = 61781
+TIMESTAMP = 1567886810
+SHA256 (knack-0.6.3.tar.gz) = b1ac92669641b902e1aef97138666a21b8852f65d83cbde03eb9ddebf82ce121
+SIZE (knack-0.6.3.tar.gz) = 62069
diff --git a/devel/py-lark-parser/Makefile b/devel/py-lark-parser/Makefile
index df8ded178cd4..62efe1aa5ca8 100644
--- a/devel/py-lark-parser/Makefile
+++ b/devel/py-lark-parser/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lark-parser
-PORTVERSION=	0.7.4
+PORTVERSION=	0.7.5
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-lark-parser/distinfo b/devel/py-lark-parser/distinfo
index 7af0a12369b3..f277a2f6a568 100644
--- a/devel/py-lark-parser/distinfo
+++ b/devel/py-lark-parser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567191913
-SHA256 (lark-parser-0.7.4.tar.gz) = 64676473e0e45363ea4840dc68be442c9dfab05bf3847d176e551dfbbacbd470
-SIZE (lark-parser-0.7.4.tar.gz) = 274654
+TIMESTAMP = 1567842468
+SHA256 (lark-parser-0.7.5.tar.gz) = 00080827281eee9c9f305dd948c824646f2ea97fe9dbde903be1b608ae786459
+SIZE (lark-parser-0.7.5.tar.gz) = 274865
diff --git a/devel/py-libversion/Makefile b/devel/py-libversion/Makefile
index 3ba7f71d35d7..157417d6c925 100644
--- a/devel/py-libversion/Makefile
+++ b/devel/py-libversion/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libversion
-PORTVERSION=	1.1.4
+PORTVERSION=	1.2.0
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-libversion/distinfo b/devel/py-libversion/distinfo
index f4c69249ab2b..ff4afb648aa7 100644
--- a/devel/py-libversion/distinfo
+++ b/devel/py-libversion/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561496915
-SHA256 (libversion-1.1.4.tar.gz) = 982019a547a922b96cde904f17dad1e0dc00dd1c30068523d06794a0c9e6e076
-SIZE (libversion-1.1.4.tar.gz) = 7909
+TIMESTAMP = 1568230023
+SHA256 (libversion-1.2.0.tar.gz) = b352cc98ca4e23095b362e3dee57a75f193b5380060988d4823b84a7a9b47adc
+SIZE (libversion-1.2.0.tar.gz) = 8197
diff --git a/devel/py-marshmallow/Makefile b/devel/py-marshmallow/Makefile
index 0b23e3c2e862..3d9cb90f4e2c 100644
--- a/devel/py-marshmallow/Makefile
+++ b/devel/py-marshmallow/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	marshmallow
-PORTVERSION=	3.0.3
+PORTVERSION=	3.0.4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-marshmallow/distinfo b/devel/py-marshmallow/distinfo
index e7ac4b46b1fb..79763d66da09 100644
--- a/devel/py-marshmallow/distinfo
+++ b/devel/py-marshmallow/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567784709
-SHA256 (marshmallow-3.0.3.tar.gz) = 51188df086da5c427c3c193faddf7f95857ee4053dbf2d083e5cbfd846b2fb29
-SIZE (marshmallow-3.0.3.tar.gz) = 168839
+TIMESTAMP = 1568290956
+SHA256 (marshmallow-3.0.4.tar.gz) = 5d6412948383b8d628b9d267045e83a5c4c387300ee7d7d57edc93d375be2660
+SIZE (marshmallow-3.0.4.tar.gz) = 168688
diff --git a/devel/py-portalocker/Makefile b/devel/py-portalocker/Makefile
index ee99a6597872..ad37f1c33e63 100644
--- a/devel/py-portalocker/Makefile
+++ b/devel/py-portalocker/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	portalocker
-PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTVERSION=	1.5.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +17,4 @@ USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-post-extract:
-	@${RM} -r ${WRKSRC}/tests
-
 .include <bsd.port.mk>
diff --git a/devel/py-portalocker/distinfo b/devel/py-portalocker/distinfo
index 554e1a83c606..e9a1a4ee0b34 100644
--- a/devel/py-portalocker/distinfo
+++ b/devel/py-portalocker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550328827
-SHA256 (portalocker-1.4.0.tar.gz) = 3fb35648a9e03f267e54c6186513abbd1cdd321c305502545a3550eea8b2923f
-SIZE (portalocker-1.4.0.tar.gz) = 11255
+TIMESTAMP = 1567947250
+SHA256 (portalocker-1.5.1.tar.gz) = 1ed88cff4807267ec3331d2a843529399256043851509c39487db97146dda821
+SIZE (portalocker-1.5.1.tar.gz) = 11746
diff --git a/devel/py-pymisp/Makefile b/devel/py-pymisp/Makefile
new file mode 100644
index 000000000000..e805a0970de4
--- /dev/null
+++ b/devel/py-pymisp/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PORTNAME=	pymisp
+PORTVERSION=	2.4.114
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	gmm@tutanota.com
+COMMENT=	Python library to access MISP platforms via their REST API
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=	python
+
+USE_PYTHON=	autoplist distutils
+
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/py-pymisp/distinfo b/devel/py-pymisp/distinfo
new file mode 100644
index 000000000000..e79fec22a22b
--- /dev/null
+++ b/devel/py-pymisp/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1568136084
+SHA256 (pymisp-2.4.114.tar.gz) = 420891752747af4f38af765644ccb6f5da66ec3aef8f3d9c95449a9b20daab57
+SIZE (pymisp-2.4.114.tar.gz) = 1600875
diff --git a/devel/py-pymisp/pkg-descr b/devel/py-pymisp/pkg-descr
new file mode 100644
index 000000000000..0b9f67f30816
--- /dev/null
+++ b/devel/py-pymisp/pkg-descr
@@ -0,0 +1,4 @@
+PyMISP allows you to fetch events, add or update events/attributes, add or
+update samples or search for attributes.
+
+WWW: https://github.com/MISP/PyMISP
diff --git a/devel/py-pyvisa/Makefile b/devel/py-pyvisa/Makefile
index d97e0da3718d..49ab09c3b64c 100644
--- a/devel/py-pyvisa/Makefile
+++ b/devel/py-pyvisa/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pyvisa
-PORTVERSION=	1.10.0
+PORTVERSION=	1.10.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-pyvisa/distinfo b/devel/py-pyvisa/distinfo
index d95577c613f1..611d4ef2e8cb 100644
--- a/devel/py-pyvisa/distinfo
+++ b/devel/py-pyvisa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565441531
-SHA256 (PyVISA-1.10.0.tar.gz) = 9133a5c1c28ae30c9846d55039a2361ad9f9f9af21920c1b0310145977afc313
-SIZE (PyVISA-1.10.0.tar.gz) = 6813100
+TIMESTAMP = 1568290958
+SHA256 (PyVISA-1.10.1.tar.gz) = ba936e2943ae29d7e33c3df00077d554c6137b02d097457ed4f36d77977e3293
+SIZE (PyVISA-1.10.1.tar.gz) = 6830252
diff --git a/devel/py-tblib/Makefile b/devel/py-tblib/Makefile
index 5507cd557275..f2a20a516458 100644
--- a/devel/py-tblib/Makefile
+++ b/devel/py-tblib/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	tblib
-PORTVERSION=	1.3.2
+PORTVERSION=	1.4.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-tblib/distinfo b/devel/py-tblib/distinfo
index 0dc46f2fc008..2e8b7c463793 100644
--- a/devel/py-tblib/distinfo
+++ b/devel/py-tblib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492205405
-SHA256 (tblib-1.3.2.tar.gz) = 436e4200e63d92316551179dc540906652878df4ff39b43db30fcf6400444fe7
-SIZE (tblib-1.3.2.tar.gz) = 26958
+TIMESTAMP = 1567982004
+SHA256 (tblib-1.4.0.tar.gz) = bd1ad564564a158ff62c290687f3db446038f9ac11a0bf6892712e3601af3bcd
+SIZE (tblib-1.4.0.tar.gz) = 27050
diff --git a/devel/py-twine/Makefile b/devel/py-twine/Makefile
index a9032a383db1..7027594fae22 100644
--- a/devel/py-twine/Makefile
+++ b/devel/py-twine/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	twine
-DISTVERSION=	1.13.0
-PORTREVISION=	1
+DISTVERSION=	1.14.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-twine/distinfo b/devel/py-twine/distinfo
index 5a6e61c88e77..dfabc9809d3d 100644
--- a/devel/py-twine/distinfo
+++ b/devel/py-twine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550171679
-SHA256 (twine-1.13.0.tar.gz) = d6c29c933ecfc74e9b1d9fa13aa1f87c5d5770e119f5a4ce032092f0ff5b14dc
-SIZE (twine-1.13.0.tar.gz) = 68643
+TIMESTAMP = 1567940871
+SHA256 (twine-1.14.0.tar.gz) = e37d5a73d77b095b85314dde807bfb85b580b5b9d137f5b21332f4636990d97a
+SIZE (twine-1.14.0.tar.gz) = 139195
diff --git a/devel/py-uhid-freebsd/Makefile b/devel/py-uhid-freebsd/Makefile
new file mode 100644
index 000000000000..39d0d839e5f2
--- /dev/null
+++ b/devel/py-uhid-freebsd/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME=		uhid-freebsd
+PORTVERSION=		1.2.1
+CATEGORIES=		devel python
+MASTER_SITES=		CHEESESHOP
+PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=		grembo@FreeBSD.org
+COMMENT=		Python library to retrieve information on uhid devices
+
+LICENSE=		BSD2CLAUSE
+LICENSE_FILE=		${WRKSRC}/LICENSE
+
+USES=			python
+USE_PYTHON=		autoplist distutils
+
+.include <bsd.port.mk>
diff --git a/devel/py-uhid-freebsd/distinfo b/devel/py-uhid-freebsd/distinfo
new file mode 100644
index 000000000000..09b79fe6468f
--- /dev/null
+++ b/devel/py-uhid-freebsd/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1568241061
+SHA256 (uhid-freebsd-1.2.1.tar.gz) = 13436ea492271b27cd4847fe3168fd467c0f31aa295abd4aeab61e92920fdd58
+SIZE (uhid-freebsd-1.2.1.tar.gz) = 4467
diff --git a/devel/py-uhid-freebsd/pkg-descr b/devel/py-uhid-freebsd/pkg-descr
new file mode 100644
index 000000000000..6ccdf55592ee
--- /dev/null
+++ b/devel/py-uhid-freebsd/pkg-descr
@@ -0,0 +1,4 @@
+uhid-freebsd is a Python library to retrieve information on USB HID devices
+on FreeBSD (/dev/uhid*).
+
+WWW: https://github.com/grembo/uhid-freebsd
diff --git a/devel/py-vsts/Makefile b/devel/py-vsts/Makefile
new file mode 100644
index 000000000000..c4e6101f22af
--- /dev/null
+++ b/devel/py-vsts/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+PORTNAME=	vsts
+PORTVERSION=	0.1.25
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	dbaio@FreeBSD.org
+COMMENT=	Python wrapper around the VSTS APIs
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msrest>=0.6.0:net-mgmt/py-msrest@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/py-vsts/distinfo b/devel/py-vsts/distinfo
new file mode 100644
index 000000000000..fb945f8804e1
--- /dev/null
+++ b/devel/py-vsts/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1553909959
+SHA256 (vsts-0.1.25.tar.gz) = da179160121f5b38be061dbff29cd2b60d5d029b2207102454d77a7114e64f97
+SIZE (vsts-0.1.25.tar.gz) = 847327
diff --git a/devel/py-vsts/pkg-descr b/devel/py-vsts/pkg-descr
new file mode 100644
index 000000000000..051a215ecd3b
--- /dev/null
+++ b/devel/py-vsts/pkg-descr
@@ -0,0 +1,4 @@
+This repository contains Python APIs for interacting with and managing Azure
+DevOps. These APIs power the Visual Studio Team Services CLI.
+
+WWW: https://pypi.org/project/vsts/
diff --git a/devel/py-whichcraft/Makefile b/devel/py-whichcraft/Makefile
index 1cd35dac23b3..6028341f0e27 100644
--- a/devel/py-whichcraft/Makefile
+++ b/devel/py-whichcraft/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	whichcraft
-PORTVERSION=	0.6.0
+PORTVERSION=	0.6.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-whichcraft/distinfo b/devel/py-whichcraft/distinfo
index 428344f9c7de..7e7119fef6df 100644
--- a/devel/py-whichcraft/distinfo
+++ b/devel/py-whichcraft/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563011681
-SHA256 (whichcraft-0.6.0.tar.gz) = d54caa14cc3f7b1d2276f8753fd05f1dc5a554df6f83a36c5c2a551e81de2498
-SIZE (whichcraft-0.6.0.tar.gz) = 6745
+TIMESTAMP = 1567938473
+SHA256 (whichcraft-0.6.1.tar.gz) = acdbb91b63d6a15efbd6430d1d7b2d36e44a71697e93e19b7ded477afd9fce87
+SIZE (whichcraft-0.6.1.tar.gz) = 6909
diff --git a/devel/rubygem-aws-partitions/Makefile b/devel/rubygem-aws-partitions/Makefile
index a6b05a5207b6..ca4cb46f6e11 100644
--- a/devel/rubygem-aws-partitions/Makefile
+++ b/devel/rubygem-aws-partitions/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-partitions
-PORTVERSION=	1.209.0
+PORTVERSION=	1.211.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-partitions/distinfo b/devel/rubygem-aws-partitions/distinfo
index bf899fe472fa..868c23b494da 100644
--- a/devel/rubygem-aws-partitions/distinfo
+++ b/devel/rubygem-aws-partitions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567784712
-SHA256 (rubygem/aws-partitions-1.209.0.gem) = 11621683f6061c6e1ad533d9e1a3b57670998464a0ad9518194f10a7e594d225
-SIZE (rubygem/aws-partitions-1.209.0.gem) = 17408
+TIMESTAMP = 1568132229
+SHA256 (rubygem/aws-partitions-1.211.0.gem) = 03da9dd38a865890d87517103a016d21bd36dee34f9e5c01e48bbe6d0944923e
+SIZE (rubygem/aws-partitions-1.211.0.gem) = 17408
diff --git a/devel/rubygem-aws-sdk-appmesh/Makefile b/devel/rubygem-aws-sdk-appmesh/Makefile
index b722cfe207e9..da1205ff7838 100644
--- a/devel/rubygem-aws-sdk-appmesh/Makefile
+++ b/devel/rubygem-aws-sdk-appmesh/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-appmesh
-PORTVERSION=	1.15.0
+PORTVERSION=	1.16.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-appmesh/distinfo b/devel/rubygem-aws-sdk-appmesh/distinfo
index 27ae93613382..a2d4094aeb41 100644
--- a/devel/rubygem-aws-sdk-appmesh/distinfo
+++ b/devel/rubygem-aws-sdk-appmesh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567272026
-SHA256 (rubygem/aws-sdk-appmesh-1.15.0.gem) = 1fb47413eb30b972a5417864b6389d50499a9d7888c8107b3ab836744d0cab19
-SIZE (rubygem/aws-sdk-appmesh-1.15.0.gem) = 34816
+TIMESTAMP = 1568132231
+SHA256 (rubygem/aws-sdk-appmesh-1.16.0.gem) = 78bcee608b9b85745a1ee259adaf30ddf5b3bf6fd04109fc87b6e2dcbb15ff0f
+SIZE (rubygem/aws-sdk-appmesh-1.16.0.gem) = 35840
diff --git a/devel/rubygem-aws-sdk-appstream/Makefile b/devel/rubygem-aws-sdk-appstream/Makefile
index df326cdfa9f4..2c8fa0d21cf0 100644
--- a/devel/rubygem-aws-sdk-appstream/Makefile
+++ b/devel/rubygem-aws-sdk-appstream/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-appstream
-PORTVERSION=	1.35.0
+PORTVERSION=	1.36.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-appstream/distinfo b/devel/rubygem-aws-sdk-appstream/distinfo
index d135ebb9a0ae..e340aef4dbd8 100644
--- a/devel/rubygem-aws-sdk-appstream/distinfo
+++ b/devel/rubygem-aws-sdk-appstream/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567272028
-SHA256 (rubygem/aws-sdk-appstream-1.35.0.gem) = 09e02981944235aa1882a2548f198fe8b6274f6c1310f5f5b01f62db8ba0d60e
-SIZE (rubygem/aws-sdk-appstream-1.35.0.gem) = 52224
+TIMESTAMP = 1568132233
+SHA256 (rubygem/aws-sdk-appstream-1.36.0.gem) = fe17e675450980ef41d7a903c0736941d90b1be26298532b906dd14aba3958f1
+SIZE (rubygem/aws-sdk-appstream-1.36.0.gem) = 52736
diff --git a/devel/rubygem-aws-sdk-configservice/Makefile b/devel/rubygem-aws-sdk-configservice/Makefile
index baccf98d1493..06d68e400dab 100644
--- a/devel/rubygem-aws-sdk-configservice/Makefile
+++ b/devel/rubygem-aws-sdk-configservice/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-configservice
-PORTVERSION=	1.36.0
+PORTVERSION=	1.37.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-configservice/distinfo b/devel/rubygem-aws-sdk-configservice/distinfo
index 73d693713a02..9e852df3d9c8 100644
--- a/devel/rubygem-aws-sdk-configservice/distinfo
+++ b/devel/rubygem-aws-sdk-configservice/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567784715
-SHA256 (rubygem/aws-sdk-configservice-1.36.0.gem) = 4ba884379eafcea4a2e4db29658ff7d3148308042f17dbc6d79de9ce0b1dd964
-SIZE (rubygem/aws-sdk-configservice-1.36.0.gem) = 77312
+TIMESTAMP = 1568290964
+SHA256 (rubygem/aws-sdk-configservice-1.37.0.gem) = 0f1a6080bfc28a6c510d2f9b1efc8a13f0b3f94486a4d72633391792d7db252c
+SIZE (rubygem/aws-sdk-configservice-1.37.0.gem) = 77312
diff --git a/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile
index 890faa39245e..13d899a1ff75 100644
--- a/devel/rubygem-aws-sdk-core/Makefile
+++ b/devel/rubygem-aws-sdk-core/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-core
-DISTVERSION=	3.66.0
+DISTVERSION=	3.67.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-core/distinfo b/devel/rubygem-aws-sdk-core/distinfo
index 37ed895eb35e..c63a04c83c23 100644
--- a/devel/rubygem-aws-sdk-core/distinfo
+++ b/devel/rubygem-aws-sdk-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567688378
-SHA256 (rubygem/aws-sdk-core-3.66.0.gem) = d377facf580d3cb1efc3095e0ee7ad186ae999ecf136930bfbc69ecb8f2c03a2
-SIZE (rubygem/aws-sdk-core-3.66.0.gem) = 255488
+TIMESTAMP = 1568132235
+SHA256 (rubygem/aws-sdk-core-3.67.0.gem) = df329b1c82590e017ec1bd9bc7215025ca5a904fb04bf314ab2a56d5feeb40d8
+SIZE (rubygem/aws-sdk-core-3.67.0.gem) = 255488
diff --git a/devel/rubygem-aws-sdk-core2/Makefile b/devel/rubygem-aws-sdk-core2/Makefile
index b2d62f6af555..6605e7367570 100644
--- a/devel/rubygem-aws-sdk-core2/Makefile
+++ b/devel/rubygem-aws-sdk-core2/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-core
-DISTVERSION=	2.11.348
+DISTVERSION=	2.11.351
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	2
diff --git a/devel/rubygem-aws-sdk-core2/distinfo b/devel/rubygem-aws-sdk-core2/distinfo
index 0c8c428c7ba1..29de1ba6f0ff 100644
--- a/devel/rubygem-aws-sdk-core2/distinfo
+++ b/devel/rubygem-aws-sdk-core2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567784719
-SHA256 (rubygem/aws-sdk-core-2.11.348.gem) = 1ab6a7659f3c1e3799fa1958d7b4c62340cd7fd0b0d5dced0343462f005d1010
-SIZE (rubygem/aws-sdk-core-2.11.348.gem) = 1646080
+TIMESTAMP = 1568290966
+SHA256 (rubygem/aws-sdk-core-2.11.351.gem) = 26e12dd1c0e2cf221e4877a6f88ebab36e0048e6023d531853d36ea570d5d32a
+SIZE (rubygem/aws-sdk-core-2.11.351.gem) = 1650688
diff --git a/devel/rubygem-aws-sdk-ec2/Makefile b/devel/rubygem-aws-sdk-ec2/Makefile
index 2ed590cd4063..305ad1fec9aa 100644
--- a/devel/rubygem-aws-sdk-ec2/Makefile
+++ b/devel/rubygem-aws-sdk-ec2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-ec2
-PORTVERSION=	1.106.0
+PORTVERSION=	1.108.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-ec2/distinfo b/devel/rubygem-aws-sdk-ec2/distinfo
index 34be3b296cfd..8183fd3bdc74 100644
--- a/devel/rubygem-aws-sdk-ec2/distinfo
+++ b/devel/rubygem-aws-sdk-ec2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567272120
-SHA256 (rubygem/aws-sdk-ec2-1.106.0.gem) = 17aa940caa3b93c78cd49ed5c25e8b82fe612a43922590f06b8f0256e92260e9
-SIZE (rubygem/aws-sdk-ec2-1.106.0.gem) = 557568
+TIMESTAMP = 1568290968
+SHA256 (rubygem/aws-sdk-ec2-1.108.0.gem) = 49a45f352fc98679753c2be157067afaebe94490553e08c4308eae959f02792a
+SIZE (rubygem/aws-sdk-ec2-1.108.0.gem) = 564224
diff --git a/devel/rubygem-aws-sdk-kinesisanalytics/Makefile b/devel/rubygem-aws-sdk-kinesisanalytics/Makefile
index a586f361c48e..09b1d0ba2503 100644
--- a/devel/rubygem-aws-sdk-kinesisanalytics/Makefile
+++ b/devel/rubygem-aws-sdk-kinesisanalytics/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-kinesisanalytics
-PORTVERSION=	1.19.0
+PORTVERSION=	1.20.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-kinesisanalytics/distinfo b/devel/rubygem-aws-sdk-kinesisanalytics/distinfo
index 46163a61c00d..7e439bb59cd8 100644
--- a/devel/rubygem-aws-sdk-kinesisanalytics/distinfo
+++ b/devel/rubygem-aws-sdk-kinesisanalytics/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567272202
-SHA256 (rubygem/aws-sdk-kinesisanalytics-1.19.0.gem) = 51f46c141cf44ead7a560d876836329273658c76a406db5ba0998c4779ca3b60
-SIZE (rubygem/aws-sdk-kinesisanalytics-1.19.0.gem) = 38912
+TIMESTAMP = 1567842478
+SHA256 (rubygem/aws-sdk-kinesisanalytics-1.20.0.gem) = 54d14ea7e16e7c70b0231725cde59ed1ff449067e51b3bc99d34dd763471accc
+SIZE (rubygem/aws-sdk-kinesisanalytics-1.20.0.gem) = 38912
diff --git a/devel/rubygem-aws-sdk-marketplacecommerceanalytics/Makefile b/devel/rubygem-aws-sdk-marketplacecommerceanalytics/Makefile
index db10a577b190..f4217d79e68e 100644
--- a/devel/rubygem-aws-sdk-marketplacecommerceanalytics/Makefile
+++ b/devel/rubygem-aws-sdk-marketplacecommerceanalytics/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-marketplacecommerceanalytics
-PORTVERSION=	1.15.0
+PORTVERSION=	1.16.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-marketplacecommerceanalytics/distinfo b/devel/rubygem-aws-sdk-marketplacecommerceanalytics/distinfo
index 4f395d7ac430..f8e62726d1af 100644
--- a/devel/rubygem-aws-sdk-marketplacecommerceanalytics/distinfo
+++ b/devel/rubygem-aws-sdk-marketplacecommerceanalytics/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567272234
-SHA256 (rubygem/aws-sdk-marketplacecommerceanalytics-1.15.0.gem) = e1b79aa43c2a4756140c1f2317cb7e1faa94a9cb4174867bc0ad8bc270c02d7c
-SIZE (rubygem/aws-sdk-marketplacecommerceanalytics-1.15.0.gem) = 13312
+TIMESTAMP = 1568132241
+SHA256 (rubygem/aws-sdk-marketplacecommerceanalytics-1.16.0.gem) = 138879ca6b326e06ef7d89b579638c3cdd7d880bf2641b88acfb048b4b049b14
+SIZE (rubygem/aws-sdk-marketplacecommerceanalytics-1.16.0.gem) = 13312
diff --git a/devel/rubygem-aws-sdk-mediaconnect/Makefile b/devel/rubygem-aws-sdk-mediaconnect/Makefile
index 1b0d03eee9dd..47673281b5de 100644
--- a/devel/rubygem-aws-sdk-mediaconnect/Makefile
+++ b/devel/rubygem-aws-sdk-mediaconnect/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-mediaconnect
-PORTVERSION=	1.13.0
+PORTVERSION=	1.14.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-mediaconnect/distinfo b/devel/rubygem-aws-sdk-mediaconnect/distinfo
index 8c5cf0ae697a..c2a7d3436e75 100644
--- a/devel/rubygem-aws-sdk-mediaconnect/distinfo
+++ b/devel/rubygem-aws-sdk-mediaconnect/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567272240
-SHA256 (rubygem/aws-sdk-mediaconnect-1.13.0.gem) = 67aa9348f026e5e327b3d5ef329f9960f65a2d6ee3439a0a2d0e41d255723504
-SIZE (rubygem/aws-sdk-mediaconnect-1.13.0.gem) = 24576
+TIMESTAMP = 1568290970
+SHA256 (rubygem/aws-sdk-mediaconnect-1.14.0.gem) = d52c172b30b731ecf83297361008af73ce8b461f91b73c8fb4cfd6b1ad687cb4
+SIZE (rubygem/aws-sdk-mediaconnect-1.14.0.gem) = 24576
diff --git a/devel/rubygem-aws-sdk-qldb/Makefile b/devel/rubygem-aws-sdk-qldb/Makefile
new file mode 100644
index 000000000000..9e1df208ef00
--- /dev/null
+++ b/devel/rubygem-aws-sdk-qldb/Makefile
@@ -0,0 +1,22 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	aws-sdk-qldb
+PORTVERSION=	1.0.0
+CATEGORIES=	devel rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Official AWS Ruby gem for Amazon QLDB (QLDB)
+
+LICENSE=	APACHE20
+
+RUN_DEPENDS=	rubygem-aws-sdk-core>=3.61.1<4:devel/rubygem-aws-sdk-core \
+		rubygem-aws-sigv4>=1.1<2:devel/rubygem-aws-sigv4
+
+USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-aws-sdk-qldb/distinfo b/devel/rubygem-aws-sdk-qldb/distinfo
new file mode 100644
index 000000000000..e653d44e4053
--- /dev/null
+++ b/devel/rubygem-aws-sdk-qldb/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1568132217
+SHA256 (rubygem/aws-sdk-qldb-1.0.0.gem) = fd82eb330873312e5e44199e3a219e0fed20a6baecae1c3dbe845b6bafeed6a6
+SIZE (rubygem/aws-sdk-qldb-1.0.0.gem) = 20992
diff --git a/devel/rubygem-aws-sdk-qldb/pkg-descr b/devel/rubygem-aws-sdk-qldb/pkg-descr
new file mode 100644
index 000000000000..feef3afe717d
--- /dev/null
+++ b/devel/rubygem-aws-sdk-qldb/pkg-descr
@@ -0,0 +1,4 @@
+Official AWS Ruby gem for Amazon QLDB (QLDB).
+
+WWW: https://github.com/aws/aws-sdk-ruby
+WWW: https://github.com/aws/aws-sdk-ruby/tree/master/gems/aws-sdk-qldb
diff --git a/devel/rubygem-aws-sdk-qldbsession/Makefile b/devel/rubygem-aws-sdk-qldbsession/Makefile
new file mode 100644
index 000000000000..20f524702531
--- /dev/null
+++ b/devel/rubygem-aws-sdk-qldbsession/Makefile
@@ -0,0 +1,22 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	aws-sdk-qldbsession
+PORTVERSION=	1.0.0
+CATEGORIES=	devel rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Official AWS Ruby gem for Amazon QLDB Session (QLDB Session)
+
+LICENSE=	APACHE20
+
+RUN_DEPENDS=	rubygem-aws-sdk-core>=3.61.1<4:devel/rubygem-aws-sdk-core \
+		rubygem-aws-sigv4>=1.1<2:devel/rubygem-aws-sigv4
+
+USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-aws-sdk-qldbsession/distinfo b/devel/rubygem-aws-sdk-qldbsession/distinfo
new file mode 100644
index 000000000000..c74a74bc47d4
--- /dev/null
+++ b/devel/rubygem-aws-sdk-qldbsession/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1568132219
+SHA256 (rubygem/aws-sdk-qldbsession-1.0.0.gem) = d6783bf5aefeb8782b0023ce38a9ae918ef53b584e58579ca6f76602bc509506
+SIZE (rubygem/aws-sdk-qldbsession-1.0.0.gem) = 13312
diff --git a/devel/rubygem-aws-sdk-qldbsession/pkg-descr b/devel/rubygem-aws-sdk-qldbsession/pkg-descr
new file mode 100644
index 000000000000..ed73cf322c2e
--- /dev/null
+++ b/devel/rubygem-aws-sdk-qldbsession/pkg-descr
@@ -0,0 +1,4 @@
+Official AWS Ruby gem for Amazon QLDB Session (QLDB Session).
+
+WWW: https://github.com/aws/aws-sdk-ruby
+WWW: https://github.com/aws/aws-sdk-ruby/tree/master/gems/aws-sdk-qldbsession
diff --git a/devel/rubygem-aws-sdk-rds/Makefile b/devel/rubygem-aws-sdk-rds/Makefile
index 086e044cede4..35db0bb977a7 100644
--- a/devel/rubygem-aws-sdk-rds/Makefile
+++ b/devel/rubygem-aws-sdk-rds/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-rds
-PORTVERSION=	1.64.0
+PORTVERSION=	1.65.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-rds/distinfo b/devel/rubygem-aws-sdk-rds/distinfo
index bcf3f59c4103..bd3ba657e889 100644
--- a/devel/rubygem-aws-sdk-rds/distinfo
+++ b/devel/rubygem-aws-sdk-rds/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567272294
-SHA256 (rubygem/aws-sdk-rds-1.64.0.gem) = 1f0609d605d61a2bea3fde4444ede7c9efeaa2dff718aa80820f500ccb467734
-SIZE (rubygem/aws-sdk-rds-1.64.0.gem) = 282624
+TIMESTAMP = 1568290972
+SHA256 (rubygem/aws-sdk-rds-1.65.0.gem) = e10aa9006a4bee91add7f4fd167bcb403a0134f093ae388be0c589a98b699e4c
+SIZE (rubygem/aws-sdk-rds-1.65.0.gem) = 283136
diff --git a/devel/rubygem-aws-sdk-resources/Makefile b/devel/rubygem-aws-sdk-resources/Makefile
index c57a92b82604..1464fd152f78 100644
--- a/devel/rubygem-aws-sdk-resources/Makefile
+++ b/devel/rubygem-aws-sdk-resources/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-resources
-DISTVERSION=	3.52.0
+DISTVERSION=	3.53.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -152,6 +152,8 @@ RUN_DEPENDS=	rubygem-aws-sdk-acm>=1<2:devel/rubygem-aws-sdk-acm \
 		rubygem-aws-sdk-pinpointsmsvoice>=1<2:devel/rubygem-aws-sdk-pinpointsmsvoice \
 		rubygem-aws-sdk-polly>=1<2:devel/rubygem-aws-sdk-polly \
 		rubygem-aws-sdk-pricing>=1<2:devel/rubygem-aws-sdk-pricing \
+		rubygem-aws-sdk-qldb>=1<2:devel/rubygem-aws-sdk-qldb \
+		rubygem-aws-sdk-qldbsession>=1<2:devel/rubygem-aws-sdk-qldbsession \
 		rubygem-aws-sdk-quicksight>=1<2:devel/rubygem-aws-sdk-quicksight \
 		rubygem-aws-sdk-ram>=1<2:devel/rubygem-aws-sdk-ram \
 		rubygem-aws-sdk-rds>=1<2:devel/rubygem-aws-sdk-rds \
diff --git a/devel/rubygem-aws-sdk-resources/distinfo b/devel/rubygem-aws-sdk-resources/distinfo
index 6c41aa908d4f..f8234e1f3f38 100644
--- a/devel/rubygem-aws-sdk-resources/distinfo
+++ b/devel/rubygem-aws-sdk-resources/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567272388
-SHA256 (rubygem/aws-sdk-resources-3.52.0.gem) = af98a6b40ce4c28dc4ea1cf5e08064a36089e02846cd17faf36ab48c960c53f8
-SIZE (rubygem/aws-sdk-resources-3.52.0.gem) = 9728
+TIMESTAMP = 1568132243
+SHA256 (rubygem/aws-sdk-resources-3.53.0.gem) = 68d2113485bf8a3404be3bfed2cffdab8dabda3a8e5ee39e523e2003d3e83acf
+SIZE (rubygem/aws-sdk-resources-3.53.0.gem) = 9728
diff --git a/devel/rubygem-aws-sdk-resources2/Makefile b/devel/rubygem-aws-sdk-resources2/Makefile
index 8829ec8810c1..4c882a110855 100644
--- a/devel/rubygem-aws-sdk-resources2/Makefile
+++ b/devel/rubygem-aws-sdk-resources2/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-resources
-DISTVERSION=	2.11.348
+DISTVERSION=	2.11.351
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	2
diff --git a/devel/rubygem-aws-sdk-resources2/distinfo b/devel/rubygem-aws-sdk-resources2/distinfo
index 53e9e334c21d..c05af871339c 100644
--- a/devel/rubygem-aws-sdk-resources2/distinfo
+++ b/devel/rubygem-aws-sdk-resources2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567784721
-SHA256 (rubygem/aws-sdk-resources-2.11.348.gem) = dd904b414d141f94328eb0c50ac46c6c1d477bb8b315f921c12b41afcd03c895
-SIZE (rubygem/aws-sdk-resources-2.11.348.gem) = 48640
+TIMESTAMP = 1568290974
+SHA256 (rubygem/aws-sdk-resources-2.11.351.gem) = 7453e03c74537d8b8bdaa43206edd14a97019ed3d0488470103f2d992c8f29ca
+SIZE (rubygem/aws-sdk-resources-2.11.351.gem) = 48640
diff --git a/devel/rubygem-aws-sdk-robomaker/Makefile b/devel/rubygem-aws-sdk-robomaker/Makefile
index f6492fdbe41d..a14dcab6fa9d 100644
--- a/devel/rubygem-aws-sdk-robomaker/Makefile
+++ b/devel/rubygem-aws-sdk-robomaker/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-robomaker
-PORTVERSION=	1.14.0
+PORTVERSION=	1.15.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-robomaker/distinfo b/devel/rubygem-aws-sdk-robomaker/distinfo
index c8461721343e..3c315a7757b5 100644
--- a/devel/rubygem-aws-sdk-robomaker/distinfo
+++ b/devel/rubygem-aws-sdk-robomaker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567272306
-SHA256 (rubygem/aws-sdk-robomaker-1.14.0.gem) = 4179c2e6a7115f58204ef15b3f69a8a831aaa8bf81e82e6ce79324368598917e
-SIZE (rubygem/aws-sdk-robomaker-1.14.0.gem) = 39424
+TIMESTAMP = 1568132247
+SHA256 (rubygem/aws-sdk-robomaker-1.15.0.gem) = 593792bc4af4353e2165b1fbb80b0eccdf5f853bd439ea6f5db7e5652f6bd62c
+SIZE (rubygem/aws-sdk-robomaker-1.15.0.gem) = 40960
diff --git a/devel/rubygem-aws-sdk-ses/Makefile b/devel/rubygem-aws-sdk-ses/Makefile
index 94edd5743163..342bc55ac43a 100644
--- a/devel/rubygem-aws-sdk-ses/Makefile
+++ b/devel/rubygem-aws-sdk-ses/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-ses
-PORTVERSION=	1.25.0
+PORTVERSION=	1.26.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-ses/distinfo b/devel/rubygem-aws-sdk-ses/distinfo
index 34a7b218eb11..d73ceab13d90 100644
--- a/devel/rubygem-aws-sdk-ses/distinfo
+++ b/devel/rubygem-aws-sdk-ses/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567272334
-SHA256 (rubygem/aws-sdk-ses-1.25.0.gem) = 7187c84c37475d1999b417167e24d05ee3c17a7bb736b2873307ea4de62e2828
-SIZE (rubygem/aws-sdk-ses-1.25.0.gem) = 80384
+TIMESTAMP = 1568290976
+SHA256 (rubygem/aws-sdk-ses-1.26.0.gem) = 56cc07ad898c7b042b18833c0fd332ede82da50b48f6acbca5f5e922ee9c0f97
+SIZE (rubygem/aws-sdk-ses-1.26.0.gem) = 80384
diff --git a/devel/rubygem-aws-sdk-states/Makefile b/devel/rubygem-aws-sdk-states/Makefile
index 83f80a776db5..ae6d838b3ca8 100644
--- a/devel/rubygem-aws-sdk-states/Makefile
+++ b/devel/rubygem-aws-sdk-states/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-states
-PORTVERSION=	1.21.0
+PORTVERSION=	1.22.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-states/distinfo b/devel/rubygem-aws-sdk-states/distinfo
index 3c8fcc4d8f5d..a41ca17fb654 100644
--- a/devel/rubygem-aws-sdk-states/distinfo
+++ b/devel/rubygem-aws-sdk-states/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567688392
-SHA256 (rubygem/aws-sdk-states-1.21.0.gem) = 5745b2e60cf349726c8e48b84f28f6e3f3c472d692c34e9f1343b43e7a4a156a
-SIZE (rubygem/aws-sdk-states-1.21.0.gem) = 29696
+TIMESTAMP = 1568290978
+SHA256 (rubygem/aws-sdk-states-1.22.0.gem) = e2f3d7e8240ca532158ecf33431a722e1c1985b9ee6733d13ca28c825ae57fb2
+SIZE (rubygem/aws-sdk-states-1.22.0.gem) = 29696
diff --git a/devel/rubygem-aws-sdk-storagegateway/Makefile b/devel/rubygem-aws-sdk-storagegateway/Makefile
index dd12c206e3b3..c3f90a9def62 100644
--- a/devel/rubygem-aws-sdk-storagegateway/Makefile
+++ b/devel/rubygem-aws-sdk-storagegateway/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-storagegateway
-PORTVERSION=	1.31.0
+PORTVERSION=	1.32.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-storagegateway/distinfo b/devel/rubygem-aws-sdk-storagegateway/distinfo
index 4bf5b072df7b..21ea66f86d58 100644
--- a/devel/rubygem-aws-sdk-storagegateway/distinfo
+++ b/devel/rubygem-aws-sdk-storagegateway/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567272354
-SHA256 (rubygem/aws-sdk-storagegateway-1.31.0.gem) = 1aa1b7ba0f25d7bf2249d3800f8bd0903a0cc0c1289a8817ecdb6e88c725d9ea
-SIZE (rubygem/aws-sdk-storagegateway-1.31.0.gem) = 79872
+TIMESTAMP = 1568290980
+SHA256 (rubygem/aws-sdk-storagegateway-1.32.0.gem) = b83c0433865c90893f716fb8d0f4229057dcdad749ea53b679dc1131abf6d699
+SIZE (rubygem/aws-sdk-storagegateway-1.32.0.gem) = 80896
diff --git a/devel/rubygem-aws-sdk2/Makefile b/devel/rubygem-aws-sdk2/Makefile
index b030f2bde657..394e737490e8 100644
--- a/devel/rubygem-aws-sdk2/Makefile
+++ b/devel/rubygem-aws-sdk2/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk
-DISTVERSION=	2.11.348
+DISTVERSION=	2.11.351
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	2
diff --git a/devel/rubygem-aws-sdk2/distinfo b/devel/rubygem-aws-sdk2/distinfo
index cb4c5542c8c0..35c09590e0d8 100644
--- a/devel/rubygem-aws-sdk2/distinfo
+++ b/devel/rubygem-aws-sdk2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567784722
-SHA256 (rubygem/aws-sdk-2.11.348.gem) = ba2bf2080ace6ab7c7250060b37b707b7b1a841a41d3b1cb7e45fb8a2466fef0
-SIZE (rubygem/aws-sdk-2.11.348.gem) = 4608
+TIMESTAMP = 1568290982
+SHA256 (rubygem/aws-sdk-2.11.351.gem) = e3aae0bed13c587c3df1966d53a88696e5a50610909a3bfd76ae7ce76962ba56
+SIZE (rubygem/aws-sdk-2.11.351.gem) = 4608
diff --git a/devel/rubygem-crack/Makefile b/devel/rubygem-crack/Makefile
index 4f4bea00057c..1b77f688af7a 100644
--- a/devel/rubygem-crack/Makefile
+++ b/devel/rubygem-crack/Makefile
@@ -12,10 +12,11 @@ COMMENT=	Ruby Library of Simple JSON and XML Parsing
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-safe_yaml>=1.0.0:devel/rubygem-safe_yaml
+RUN_DEPENDS=	rubygem-safe_yaml>=1.0.0<1.1:devel/rubygem-safe_yaml
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-cucumber-core/Makefile b/devel/rubygem-cucumber-core/Makefile
index 5f9a07985480..d503d224ea3d 100644
--- a/devel/rubygem-cucumber-core/Makefile
+++ b/devel/rubygem-cucumber-core/Makefile
@@ -21,4 +21,9 @@ USE_RUBY=	yes
 
 NO_ARCH=	yes
 
+post-patch:
+# Remove backports
+	@${REINPLACE_CMD} -e '/backports/d' ${WRKSRC}/cucumber-core.gemspec
+	@${REINPLACE_CMD} -e "/require 'backports/d" ${WRKSRC}/lib/cucumber/core/event.rb
+
 .include <bsd.port.mk>
diff --git a/devel/rubygem-cucumber-core/files/patch-gemspec b/devel/rubygem-cucumber-core/files/patch-gemspec
deleted file mode 100644
index 114fed19f7d1..000000000000
--- a/devel/rubygem-cucumber-core/files/patch-gemspec
+++ /dev/null
@@ -1,12 +0,0 @@
---- cucumber-core.gemspec.orig	2019-07-18 18:16:20 UTC
-+++ cucumber-core.gemspec
-@@ -24,8 +24,7 @@ Gem::Specification.new do |s|
- 
-     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-       s.add_runtime_dependency(%q<gherkin>.freeze, ["~> 5.0"])
--      s.add_runtime_dependency(%q<cucumber-tag_expressions>.freeze, ["~> 1.1.0"])
--      s.add_runtime_dependency(%q<backports>.freeze, [">= 3.8.0"])
-+      s.add_runtime_dependency(%q<cucumber-tag_expressions>.freeze, [">= 1.1.0"])
-       s.add_development_dependency(%q<bundler>.freeze, ["~> 1.16.0"])
-       s.add_development_dependency(%q<rake>.freeze, [">= 0.9.2"])
-       s.add_development_dependency(%q<rspec>.freeze, ["~> 3.6"])
diff --git a/devel/rubygem-cucumber-core/files/patch-lib-cucumber-core-event.rb b/devel/rubygem-cucumber-core/files/patch-lib-cucumber-core-event.rb
deleted file mode 100644
index 85df0988a46b..000000000000
--- a/devel/rubygem-cucumber-core/files/patch-lib-cucumber-core-event.rb
+++ /dev/null
@@ -1,8 +0,0 @@
---- lib/cucumber/core/event.rb.orig	2017-09-28 08:34:06 UTC
-+++ lib/cucumber/core/event.rb
-@@ -1,5 +1,3 @@
--require 'backports/2.1.0/array/to_h'
--
- module Cucumber
-   module Core
-     class Event
diff --git a/devel/rubygem-delayer/Makefile b/devel/rubygem-delayer/Makefile
index 8c5cfb61801a..d5f1576d5bdb 100644
--- a/devel/rubygem-delayer/Makefile
+++ b/devel/rubygem-delayer/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	delayer
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-delayer/distinfo b/devel/rubygem-delayer/distinfo
index 7eb173b04f6a..9e5c7ccbe79c 100644
--- a/devel/rubygem-delayer/distinfo
+++ b/devel/rubygem-delayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1560004548
-SHA256 (rubygem/delayer-1.0.0.gem) = a8f0196fa06688f9ae6c36c764aba80f7bcbe46f48da49a6c8775c2883f77f57
-SIZE (rubygem/delayer-1.0.0.gem) = 10240
+TIMESTAMP = 1568045119
+SHA256 (rubygem/delayer-1.0.1.gem) = 6359b1ed71aace43914e069c3709b918f7fd4d23358883610db5dd36e0cce426
+SIZE (rubygem/delayer-1.0.1.gem) = 10240
diff --git a/devel/rubygem-devise-rails5/Makefile b/devel/rubygem-devise-rails5/Makefile
index 04cfdda63153..eb30fd6febe5 100644
--- a/devel/rubygem-devise-rails5/Makefile
+++ b/devel/rubygem-devise-rails5/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	devise
-PORTVERSION=	4.7.0
+PORTVERSION=	4.7.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails5
diff --git a/devel/rubygem-devise-rails5/distinfo b/devel/rubygem-devise-rails5/distinfo
index ce2f638bcc9d..a399f46300ed 100644
--- a/devel/rubygem-devise-rails5/distinfo
+++ b/devel/rubygem-devise-rails5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566324269
-SHA256 (rubygem/devise-4.7.0.gem) = b0283431db29de160600fa421dfe24a5fd7d68d6894ae15f05ca891c34841161
-SIZE (rubygem/devise-4.7.0.gem) = 88064
+TIMESTAMP = 1567842484
+SHA256 (rubygem/devise-4.7.1.gem) = 31e5eaebf25a68c8a0ccce173fe109fb4e45abcbb992777374e01ad900eec428
+SIZE (rubygem/devise-4.7.1.gem) = 88576
diff --git a/devel/rubygem-devise-rails52/Makefile b/devel/rubygem-devise-rails52/Makefile
index ce5311956b93..bf74061e2dc1 100644
--- a/devel/rubygem-devise-rails52/Makefile
+++ b/devel/rubygem-devise-rails52/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	devise
-PORTVERSION=	4.7.0
+PORTVERSION=	4.7.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails52
diff --git a/devel/rubygem-devise-rails52/distinfo b/devel/rubygem-devise-rails52/distinfo
index ce2f638bcc9d..a399f46300ed 100644
--- a/devel/rubygem-devise-rails52/distinfo
+++ b/devel/rubygem-devise-rails52/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566324269
-SHA256 (rubygem/devise-4.7.0.gem) = b0283431db29de160600fa421dfe24a5fd7d68d6894ae15f05ca891c34841161
-SIZE (rubygem/devise-4.7.0.gem) = 88064
+TIMESTAMP = 1567842484
+SHA256 (rubygem/devise-4.7.1.gem) = 31e5eaebf25a68c8a0ccce173fe109fb4e45abcbb992777374e01ad900eec428
+SIZE (rubygem/devise-4.7.1.gem) = 88576
diff --git a/devel/rubygem-devise/Makefile b/devel/rubygem-devise/Makefile
index 2ec1b3a91f3b..aceba7741323 100644
--- a/devel/rubygem-devise/Makefile
+++ b/devel/rubygem-devise/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	devise
-PORTVERSION=	4.7.0
+PORTVERSION=	4.7.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-devise/distinfo b/devel/rubygem-devise/distinfo
index ce2f638bcc9d..a399f46300ed 100644
--- a/devel/rubygem-devise/distinfo
+++ b/devel/rubygem-devise/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566324269
-SHA256 (rubygem/devise-4.7.0.gem) = b0283431db29de160600fa421dfe24a5fd7d68d6894ae15f05ca891c34841161
-SIZE (rubygem/devise-4.7.0.gem) = 88064
+TIMESTAMP = 1567842484
+SHA256 (rubygem/devise-4.7.1.gem) = 31e5eaebf25a68c8a0ccce173fe109fb4e45abcbb992777374e01ad900eec428
+SIZE (rubygem/devise-4.7.1.gem) = 88576
diff --git a/devel/rubygem-faker/Makefile b/devel/rubygem-faker/Makefile
index 4b44ead0db38..546e08c4f525 100644
--- a/devel/rubygem-faker/Makefile
+++ b/devel/rubygem-faker/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	faker
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -11,7 +11,7 @@ COMMENT=	Library for generating fake data: names, addresses, phone numbers
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/License.txt
 
-RUN_DEPENDS=	rubygem-i18n>=0.8:devel/rubygem-i18n
+RUN_DEPENDS=	rubygem-i18n>=1.6.0,2<1.7,2:devel/rubygem-i18n
 
 USES=		gem
 USE_RUBY=	yes
diff --git a/devel/rubygem-faker/distinfo b/devel/rubygem-faker/distinfo
index 1b32ad394b42..493c80e8fe2c 100644
--- a/devel/rubygem-faker/distinfo
+++ b/devel/rubygem-faker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567362095
-SHA256 (rubygem/faker-2.2.1.gem) = ba171d5cc32360beb46ee0addb19540ddae5b440015d35ea9732357c3fbefff2
-SIZE (rubygem/faker-2.2.1.gem) = 862720
+TIMESTAMP = 1567842486
+SHA256 (rubygem/faker-2.2.2.gem) = 2efbcde352156ff15e5dfcb6b0106bc6c263a2652e54106a7a660e826c1472cc
+SIZE (rubygem/faker-2.2.2.gem) = 858112
diff --git a/devel/rubygem-gitlab-labkit/Makefile b/devel/rubygem-gitlab-labkit/Makefile
index 9c194884cea2..45394ccfa257 100644
--- a/devel/rubygem-gitlab-labkit/Makefile
+++ b/devel/rubygem-gitlab-labkit/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-labkit
-PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTVERSION=	0.4.2
+PORTREVISION=	0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -13,11 +13,11 @@ COMMENT=	Instrumentation for GitLab
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack52>=5:www/rubygem-actionpack52 \
-		rubygem-activesupport52>=5:devel/rubygem-activesupport52 \
-		rubygem-grpc>=1.19.0:net/rubygem-grpc \
-		rubygem-jaeger-client>=0.10:devel/rubygem-jaeger-client \
-		rubygem-opentracing>=0.4:devel/rubygem-opentracing
+RUN_DEPENDS=	rubygem-actionpack52>=5<6:www/rubygem-actionpack52 \
+		rubygem-activesupport52>=5<6:devel/rubygem-activesupport52 \
+		rubygem-grpc>=1.19<2.0:net/rubygem-grpc \
+		rubygem-jaeger-client>=0.10<1.0:devel/rubygem-jaeger-client \
+		rubygem-opentracing>=0.4<1.0:devel/rubygem-opentracing
 
 USES=		gem
 USE_RUBY=	yes
diff --git a/devel/rubygem-gitlab-labkit/distinfo b/devel/rubygem-gitlab-labkit/distinfo
index 4db95896c7b9..c40d842b1f97 100644
--- a/devel/rubygem-gitlab-labkit/distinfo
+++ b/devel/rubygem-gitlab-labkit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561191887
-SHA256 (rubygem/gitlab-labkit-0.3.0.gem) = 418d59e2ba3174b6715ededfa5749e1985b170c609bd27704bb5abc45abd6a37
-SIZE (rubygem/gitlab-labkit-0.3.0.gem) = 14848
+TIMESTAMP = 1567415906
+SHA256 (rubygem/gitlab-labkit-0.4.2.gem) = 4fc9e87a7e1c0e5e3d248b0ded3bd6f8a8b2b4fb3d888058d2ebef37f44f9e0a
+SIZE (rubygem/gitlab-labkit-0.4.2.gem) = 15360
diff --git a/devel/rubygem-gitlab-sidekiq-fetcher/Makefile b/devel/rubygem-gitlab-sidekiq-fetcher/Makefile
index c22d783bc7b6..42fc128d0cc5 100644
--- a/devel/rubygem-gitlab-sidekiq-fetcher/Makefile
+++ b/devel/rubygem-gitlab-sidekiq-fetcher/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-sidekiq-fetcher
-PORTVERSION=	0.4.0
+PORTVERSION=	0.5.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-gitlab-sidekiq-fetcher/distinfo b/devel/rubygem-gitlab-sidekiq-fetcher/distinfo
index fcbd6c12f8c3..9710a3cba077 100644
--- a/devel/rubygem-gitlab-sidekiq-fetcher/distinfo
+++ b/devel/rubygem-gitlab-sidekiq-fetcher/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545471705
-SHA256 (rubygem/gitlab-sidekiq-fetcher-0.4.0.gem) = 5962746a3faf60493dc15d016ae2139aeb86348fb39dee9057b152164f7a4af5
-SIZE (rubygem/gitlab-sidekiq-fetcher-0.4.0.gem) = 16384
+TIMESTAMP = 1567423431
+SHA256 (rubygem/gitlab-sidekiq-fetcher-0.5.1.gem) = abf86592fe2af8b7a1770b84bf153677da4764840381e23c17513fef64b932d3
+SIZE (rubygem/gitlab-sidekiq-fetcher-0.5.1.gem) = 17920
diff --git a/devel/rubygem-google-api-client/Makefile b/devel/rubygem-google-api-client/Makefile
index 33a45a72bfd9..b72b01d21faf 100644
--- a/devel/rubygem-google-api-client/Makefile
+++ b/devel/rubygem-google-api-client/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	google-api-client
-PORTVERSION=	0.30.8
+PORTVERSION=	0.30.9
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-google-api-client/distinfo b/devel/rubygem-google-api-client/distinfo
index d4e6f837c243..2b25389f0dba 100644
--- a/devel/rubygem-google-api-client/distinfo
+++ b/devel/rubygem-google-api-client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564577881
-SHA256 (rubygem/google-api-client-0.30.8.gem) = 2d011fd5a93033147ff397b0cfb4d8382d5cca9f7e6e7916023afb93bcbdd2c2
-SIZE (rubygem/google-api-client-0.30.8.gem) = 5554688
+TIMESTAMP = 1568290984
+SHA256 (rubygem/google-api-client-0.30.9.gem) = 3039459d407dc5cb647db61329a0864d4ba4681bd0dde4d52023c9664c9023a4
+SIZE (rubygem/google-api-client-0.30.9.gem) = 5625856
diff --git a/devel/rubygem-grape_logging/Makefile b/devel/rubygem-grape_logging/Makefile
index 647ad701e88b..534a7b713f4a 100644
--- a/devel/rubygem-grape_logging/Makefile
+++ b/devel/rubygem-grape_logging/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	grape_logging
 PORTVERSION=	1.8.2
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-grape_logging/files/patch-lib-grape_logging-util-parameter_filter.rb b/devel/rubygem-grape_logging/files/patch-lib-grape_logging-util-parameter_filter.rb
new file mode 100644
index 000000000000..9b9392964de8
--- /dev/null
+++ b/devel/rubygem-grape_logging/files/patch-lib-grape_logging-util-parameter_filter.rb
@@ -0,0 +1,9 @@
+--- lib/grape_logging/util/parameter_filter.rb.orig	2019-09-07 15:56:34 UTC
++++ lib/grape_logging/util/parameter_filter.rb
+@@ -1,5 +1,5 @@
+ if defined?(::Rails.application)
+-  class ParameterFilter < ActiveSupport::ParameterFilter
++  class ParameterFilter < ActionDispatch::Http::ParameterFilter
+     def initialize(_replacement, filter_parameters)
+       super(filter_parameters)
+     end
diff --git a/devel/rubygem-grape_logging181/Makefile b/devel/rubygem-grape_logging181/Makefile
new file mode 100644
index 000000000000..2835ddd27b31
--- /dev/null
+++ b/devel/rubygem-grape_logging181/Makefile
@@ -0,0 +1,26 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	grape_logging
+PORTVERSION=	1.8.1
+CATEGORIES=	devel rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	181
+
+MAINTAINER=	mfechner@FreeBSD.org
+COMMENT=	Request logging for Grape
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS=	rubygem-grape>=0:devel/rubygem-grape \
+		rubygem-rack>=0:www/rubygem-rack
+
+USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^1\.8\.1
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-grape_logging181/distinfo b/devel/rubygem-grape_logging181/distinfo
new file mode 100644
index 000000000000..211645148c8a
--- /dev/null
+++ b/devel/rubygem-grape_logging181/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1549018944
+SHA256 (rubygem/grape_logging-1.8.1.gem) = 9109e6d404898e102b82cd8c5234522276ded4c6ec7be73426c750fb2beb33d2
+SIZE (rubygem/grape_logging-1.8.1.gem) = 12800
diff --git a/devel/rubygem-grape_logging181/pkg-descr b/devel/rubygem-grape_logging181/pkg-descr
new file mode 100644
index 000000000000..68b45b2a7a62
--- /dev/null
+++ b/devel/rubygem-grape_logging181/pkg-descr
@@ -0,0 +1,5 @@
+This gem provides simple request logging for Grape with just few lines of code
+you have to put in your project! In return you will get response codes, paths,
+parameters and more!
+
+WWW: https://github.com/aserafin/grape_logging
diff --git a/devel/rubygem-jekyll-coffeescript/Makefile b/devel/rubygem-jekyll-coffeescript/Makefile
index c59339042243..432746856ec6 100644
--- a/devel/rubygem-jekyll-coffeescript/Makefile
+++ b/devel/rubygem-jekyll-coffeescript/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jekyll-coffeescript
-PORTVERSION=	1.2.2
+PORTVERSION=	2.0.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -11,8 +11,8 @@ COMMENT=	CoffeeScript converter for Jekyll
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-coffee-script>=2.2:devel/rubygem-coffee-script \
-		rubygem-coffee-script-source>=1.12:devel/rubygem-coffee-script-source
+RUN_DEPENDS=	rubygem-coffee-script>=2.2<3:devel/rubygem-coffee-script \
+		rubygem-coffee-script-source>=1.12<2:devel/rubygem-coffee-script-source
 
 USES=		gem
 USE_RUBY=	yes
diff --git a/devel/rubygem-jekyll-coffeescript/distinfo b/devel/rubygem-jekyll-coffeescript/distinfo
index 76ee6b5861eb..bbb20dd8a12e 100644
--- a/devel/rubygem-jekyll-coffeescript/distinfo
+++ b/devel/rubygem-jekyll-coffeescript/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553536705
-SHA256 (rubygem/jekyll-coffeescript-1.2.2.gem) = 894e71c2071a834e76eb7e8044944440a0c81c2c7092532fed1503b13d331110
-SIZE (rubygem/jekyll-coffeescript-1.2.2.gem) = 4608
+TIMESTAMP = 1567842488
+SHA256 (rubygem/jekyll-coffeescript-2.0.0.gem) = 329c72fb62843056a5d6711514d4ff7f17a799169e88167d1d3a83ea1698d29d
+SIZE (rubygem/jekyll-coffeescript-2.0.0.gem) = 4608
diff --git a/devel/rubygem-octopress-hooks/Makefile b/devel/rubygem-octopress-hooks/Makefile
index 98d3fb4597af..245cd91668db 100644
--- a/devel/rubygem-octopress-hooks/Makefile
+++ b/devel/rubygem-octopress-hooks/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	octopress-hooks
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -11,10 +12,11 @@ COMMENT=	Allows access to Jekyll data at different internal processing stages
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-jekyll>=2.0:www/rubygem-jekyll
+RUN_DEPENDS=	rubygem-jekyll3>=2.0:www/rubygem-jekyll3
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-parser/Makefile b/devel/rubygem-parser/Makefile
index 19e4cc1403ba..858199a54356 100644
--- a/devel/rubygem-parser/Makefile
+++ b/devel/rubygem-parser/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	parser
-PORTVERSION=	2.6.4.0
+PORTVERSION=	2.6.4.1
 CATEGORIES=	devel ruby
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-parser/distinfo b/devel/rubygem-parser/distinfo
index b55cbcabd2b3..bd0665b84dab 100644
--- a/devel/rubygem-parser/distinfo
+++ b/devel/rubygem-parser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567240006
-SHA256 (rubygem/parser-2.6.4.0.gem) = 0cad95e500eddab8528f6bc552bf38e7b11c1e2cf46aba41e5a04939c6a737e8
-SIZE (rubygem/parser-2.6.4.0.gem) = 708608
+TIMESTAMP = 1568290986
+SHA256 (rubygem/parser-2.6.4.1.gem) = bc75eb4975973d8a6ae4ab453bcf15fdebadfec76925afec6a1e90fa1978b1ab
+SIZE (rubygem/parser-2.6.4.1.gem) = 708608
diff --git a/devel/rubygem-safe_yaml/Makefile b/devel/rubygem-safe_yaml/Makefile
index c16a32e1bd3f..e14bbdaf6990 100644
--- a/devel/rubygem-safe_yaml/Makefile
+++ b/devel/rubygem-safe_yaml/Makefile
@@ -2,23 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	safe_yaml
-PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTVERSION=	1.0.5
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ruby@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Parse YAML safely
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
+USES=		gem shebangfix
+USE_RUBY=	yes
+
 NO_ARCH=	yes
 
-USE_RUBY=	yes
-USES=		gem shebangfix
-SHEBANG_FILES=	bundle_install_all_ruby_versions.sh \
-		run_specs_all_ruby_versions.sh
 PLIST_FILES=	bin/safe_yaml
 
+SHEBANG_GLOB=	*.sh
+
 .include <bsd.port.mk>
diff --git a/devel/rubygem-safe_yaml/distinfo b/devel/rubygem-safe_yaml/distinfo
index b69bbdaadf41..b657b2d6c655 100644
--- a/devel/rubygem-safe_yaml/distinfo
+++ b/devel/rubygem-safe_yaml/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/safe_yaml-1.0.4.gem) = 248193992ef1730a0c9ec579999ef2256a2b3a32a9bd9d708a1e12544a489ec2
-SIZE (rubygem/safe_yaml-1.0.4.gem) = 30208
+TIMESTAMP = 1567842490
+SHA256 (rubygem/safe_yaml-1.0.5.gem) = a6ac2d64b7eb027bdeeca1851fe7e7af0d668e133e8a88066a0c6f7087d9f848
+SIZE (rubygem/safe_yaml-1.0.5.gem) = 30720
diff --git a/devel/rubygem-safe_yaml/pkg-descr b/devel/rubygem-safe_yaml/pkg-descr
index 9fcd1318b8c8..15c0b418b5cf 100644
--- a/devel/rubygem-safe_yaml/pkg-descr
+++ b/devel/rubygem-safe_yaml/pkg-descr
@@ -1,4 +1,4 @@
 Parse YAML safely, without that pesky arbitrary object deserialization
 vulnerability
 
-WWW: http://dtao.github.io/safe_yaml/
+WWW: https://github.com/dtao/safe_yaml
diff --git a/devel/rubygem-tty-box/pkg-descr b/devel/rubygem-tty-box/pkg-descr
index 924aeae0a876..94223b0e6b98 100644
--- a/devel/rubygem-tty-box/pkg-descr
+++ b/devel/rubygem-tty-box/pkg-descr
@@ -1,5 +1,5 @@
 TTY::Box provides box drawing component for TTY toolkit. It draws various frames
 and boxes in your terminal interface.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-box
diff --git a/devel/rubygem-tty-color/pkg-descr b/devel/rubygem-tty-color/pkg-descr
index 4a96827338b7..d72d5d661097 100644
--- a/devel/rubygem-tty-color/pkg-descr
+++ b/devel/rubygem-tty-color/pkg-descr
@@ -1,5 +1,5 @@
 TTY::Color provides independent color support detection component for TTY
 toolkit.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-color
diff --git a/devel/rubygem-tty-command/pkg-descr b/devel/rubygem-tty-command/pkg-descr
index 8603822626a3..dd10cb7dc456 100644
--- a/devel/rubygem-tty-command/pkg-descr
+++ b/devel/rubygem-tty-command/pkg-descr
@@ -3,5 +3,5 @@ It runs external commands with pretty output logging and capture stdout, stderr
 and exit status. Redirect stdin, stdout and stderr of each command to a file or
 a string.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-command
diff --git a/devel/rubygem-tty-config/pkg-descr b/devel/rubygem-tty-config/pkg-descr
index d6e03604abd8..d48e5b30bebb 100644
--- a/devel/rubygem-tty-config/pkg-descr
+++ b/devel/rubygem-tty-config/pkg-descr
@@ -2,5 +2,5 @@ TTY::Config provides app configuration component for TTY toolkit. It defines,
 reads and writes any Ruby app configurations with a penchant for terminal
 clients.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-config
diff --git a/devel/rubygem-tty-cursor/pkg-descr b/devel/rubygem-tty-cursor/pkg-descr
index 610f6b5274ac..f6fb711d0df8 100644
--- a/devel/rubygem-tty-cursor/pkg-descr
+++ b/devel/rubygem-tty-cursor/pkg-descr
@@ -3,5 +3,5 @@ supports terminal cursor positioning, visibility and text manipulation. The
 purpose of this library is to help move the terminal cursor around and
 manipulate text by using intuitive method calls.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-cursor
diff --git a/devel/rubygem-tty-editor/pkg-descr b/devel/rubygem-tty-editor/pkg-descr
index e5d9e6c5dc74..82c82f16936b 100644
--- a/devel/rubygem-tty-editor/pkg-descr
+++ b/devel/rubygem-tty-editor/pkg-descr
@@ -1,5 +1,5 @@
 TTY::Editor provides independent component for TTY toolkit. It opens a file or
 text in the user's preferred editor.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-editor
diff --git a/devel/rubygem-tty-file/pkg-descr b/devel/rubygem-tty-file/pkg-descr
index ddac140a06de..26c482f67176 100644
--- a/devel/rubygem-tty-file/pkg-descr
+++ b/devel/rubygem-tty-file/pkg-descr
@@ -4,5 +4,5 @@ Though Ruby's File and FileUtils libraries provide very robust apis for dealing
 with files, this library aims to provide a level of abstraction that is much
 more convenient, with useful logging capabilities.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-file
diff --git a/devel/rubygem-tty-font/pkg-descr b/devel/rubygem-tty-font/pkg-descr
index 2f5e7dc0c9be..fc9d5bd96f94 100644
--- a/devel/rubygem-tty-font/pkg-descr
+++ b/devel/rubygem-tty-font/pkg-descr
@@ -2,5 +2,5 @@ TTY::Font provides independent terminal font rendering component for TTY
 toolkit. It writes text in large stylized characters using a variety of terminal
 friendly fonts.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-font
diff --git a/devel/rubygem-tty-markdown/Makefile b/devel/rubygem-tty-markdown/Makefile
index 7664fbfb3c97..9de90fdae5ae 100644
--- a/devel/rubygem-tty-markdown/Makefile
+++ b/devel/rubygem-tty-markdown/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tty-markdown
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -12,7 +13,7 @@ COMMENT=	Convert markdown document/text into terminal friendly output
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-kramdown>=1.16.2<2:textproc/rubygem-kramdown \
+RUN_DEPENDS=	rubygem-kramdown1>=1.16.2<2:textproc/rubygem-kramdown1 \
 		rubygem-pastel>=0.7.2<0.8:devel/rubygem-pastel \
 		rubygem-rouge>=3.3<4:textproc/rubygem-rouge \
 		rubygem-strings>=0.1.4<0.2:devel/rubygem-strings \
diff --git a/devel/rubygem-tty-markdown/pkg-descr b/devel/rubygem-tty-markdown/pkg-descr
index 4577e5cf3ad1..124c32ab86a9 100644
--- a/devel/rubygem-tty-markdown/pkg-descr
+++ b/devel/rubygem-tty-markdown/pkg-descr
@@ -2,5 +2,5 @@ TTY::Markdown provides independent markdown processing component for TTY
 toolkit. It converts a markdown document or text into a terminal friendly
 output.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-markdown
diff --git a/devel/rubygem-tty-pager/pkg-descr b/devel/rubygem-tty-pager/pkg-descr
index 5b4e6ec61aec..fded39d18f52 100644
--- a/devel/rubygem-tty-pager/pkg-descr
+++ b/devel/rubygem-tty-pager/pkg-descr
@@ -2,5 +2,5 @@ TTY::Pager provides independent terminal output paging component for TTY
 toolkit. It supports terminal output paging in a cross-platform way supporting
 all major ruby interpreters.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-pager
diff --git a/devel/rubygem-tty-pie/pkg-descr b/devel/rubygem-tty-pie/pkg-descr
index 92f17ae72f37..1b34a0d84cb4 100644
--- a/devel/rubygem-tty-pie/pkg-descr
+++ b/devel/rubygem-tty-pie/pkg-descr
@@ -1,5 +1,5 @@
 TTY::Pie provides pie chart drawing component for TTY toolkit. It draws pie
 charts in your terminal window.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-pie
diff --git a/devel/rubygem-tty-platform/pkg-descr b/devel/rubygem-tty-platform/pkg-descr
index fc2b4e6e9869..edb5ac4db03f 100644
--- a/devel/rubygem-tty-platform/pkg-descr
+++ b/devel/rubygem-tty-platform/pkg-descr
@@ -2,5 +2,5 @@ TTY::Platform provides independent operating system detection component for TTY
 toolkit. It supports terminal platform query methods for detecting different
 operating systems.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-platform
diff --git a/devel/rubygem-tty-progressbar/pkg-descr b/devel/rubygem-tty-progressbar/pkg-descr
index 6a0bff05747d..c038174f387f 100644
--- a/devel/rubygem-tty-progressbar/pkg-descr
+++ b/devel/rubygem-tty-progressbar/pkg-descr
@@ -1,5 +1,5 @@
 TTY::ProgressBar provides independent progress bars component for TTY toolkit.
 It supports a flexible progress bars drawing in terminal emulators.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-progressbar
diff --git a/devel/rubygem-tty-prompt/pkg-descr b/devel/rubygem-tty-prompt/pkg-descr
index abfbc7fb30fc..2930388208af 100644
--- a/devel/rubygem-tty-prompt/pkg-descr
+++ b/devel/rubygem-tty-prompt/pkg-descr
@@ -2,5 +2,5 @@ TTY::Prompt provides independent prompt component for TTY toolkit. It supports a
 beautiful and powerful interactive command line prompt with a robust API for
 getting and validating complex inputs.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-prompt
diff --git a/devel/rubygem-tty-reader/pkg-descr b/devel/rubygem-tty-reader/pkg-descr
index d2b927b2c2d8..d9520e030b62 100644
--- a/devel/rubygem-tty-reader/pkg-descr
+++ b/devel/rubygem-tty-reader/pkg-descr
@@ -4,5 +4,5 @@ character, line and multiline modes. In addition it maintains history of entered
 input with an ability to recall and re-edit those inputs and register to listen
 for keystroke events.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-reader
diff --git a/devel/rubygem-tty-screen/pkg-descr b/devel/rubygem-tty-screen/pkg-descr
index 375597cc3755..14999eb5ca44 100644
--- a/devel/rubygem-tty-screen/pkg-descr
+++ b/devel/rubygem-tty-screen/pkg-descr
@@ -2,5 +2,5 @@ TTY::Screen provides independent terminal screen size detection component for
 TTY toolkit. It supports terminal screen size detection which works on various
 OS platforms and supports MRI, JRuby and Rubinius interpreters.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-screen
diff --git a/devel/rubygem-tty-spinner/pkg-descr b/devel/rubygem-tty-spinner/pkg-descr
index fe29dacbd19d..eae6b51efd93 100644
--- a/devel/rubygem-tty-spinner/pkg-descr
+++ b/devel/rubygem-tty-spinner/pkg-descr
@@ -1,5 +1,5 @@
 TTY::Spinner provides independent spinner component for TTY toolkit. It supports
 a terminal spinner for tasks that have non-deterministic time frame.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-spinner
diff --git a/devel/rubygem-tty-table/pkg-descr b/devel/rubygem-tty-table/pkg-descr
index b5d1a289a7c7..40344a1a16ca 100644
--- a/devel/rubygem-tty-table/pkg-descr
+++ b/devel/rubygem-tty-table/pkg-descr
@@ -1,5 +1,5 @@
 TTY::Table provides independent table formatting component for TTY toolkit. It
 supports a flexible and intuitive table formatting.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-table
diff --git a/devel/rubygem-tty-tree/pkg-descr b/devel/rubygem-tty-tree/pkg-descr
index a1d468178e16..edf0444077cc 100644
--- a/devel/rubygem-tty-tree/pkg-descr
+++ b/devel/rubygem-tty-tree/pkg-descr
@@ -1,5 +1,5 @@
 TTY::Prompt provides independent directory or hash data rendering component for
 TTY toolkit. It prints directory or structured data in a tree like format.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-tree
diff --git a/devel/rubygem-tty-which/pkg-descr b/devel/rubygem-tty-which/pkg-descr
index b1d9fdcd610c..60a0178d55f2 100644
--- a/devel/rubygem-tty-which/pkg-descr
+++ b/devel/rubygem-tty-which/pkg-descr
@@ -2,5 +2,5 @@ TTY::Which provides cross-platform executables search component for TTY toolkit.
 It supports platform independent implementation of Unix which utility that
 searches for executable file in the path variable.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-which
diff --git a/devel/rubygem-tty/pkg-descr b/devel/rubygem-tty/pkg-descr
index bbad8a8f3fb0..5a4597bcf865 100644
--- a/devel/rubygem-tty/pkg-descr
+++ b/devel/rubygem-tty/pkg-descr
@@ -2,5 +2,5 @@ TTY is a toolbox for developing beautiful command line clients in Ruby with a
 fluid interface for gathering input, querying terminal properties and displaying
 information.
 
-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty
diff --git a/devel/rubygem-zeitwerk/Makefile b/devel/rubygem-zeitwerk/Makefile
index 0ea218081ab9..107e57b4daf9 100644
--- a/devel/rubygem-zeitwerk/Makefile
+++ b/devel/rubygem-zeitwerk/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zeitwerk
-PORTVERSION=	2.1.9
+PORTVERSION=	2.1.10
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -14,4 +14,6 @@ LICENSE=	MIT
 USES=		gem
 USE_RUBY=	yes
 
+NO_ARCH=	yes
+
 .include <bsd.port.mk>
diff --git a/devel/rubygem-zeitwerk/distinfo b/devel/rubygem-zeitwerk/distinfo
index b94f1689c855..b0777960c0fa 100644
--- a/devel/rubygem-zeitwerk/distinfo
+++ b/devel/rubygem-zeitwerk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566809897
-SHA256 (rubygem/zeitwerk-2.1.9.gem) = fcdf5dd8ba6aab1867735dfd02730e1f92a08cbec4d677f16629c903c4c3513d
-SIZE (rubygem/zeitwerk-2.1.9.gem) = 20992
+TIMESTAMP = 1567842492
+SHA256 (rubygem/zeitwerk-2.1.10.gem) = c00d3e4f9622b709431ca3cc75cb178eb363d97a7b99c87746703701c6eb2f40
+SIZE (rubygem/zeitwerk-2.1.10.gem) = 20992
diff --git a/devel/thonny/Makefile b/devel/thonny/Makefile
index 793d0880eb07..0754f6e2169e 100644
--- a/devel/thonny/Makefile
+++ b/devel/thonny/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	thonny
-PORTVERSION=	3.1.2
+PORTVERSION=	3.2.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
diff --git a/devel/thonny/distinfo b/devel/thonny/distinfo
index f4d0289a9740..bfb905eabc52 100644
--- a/devel/thonny/distinfo
+++ b/devel/thonny/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550362194
-SHA256 (thonny-3.1.2.tar.gz) = 13dd3fc1f5150853904e1cec650c380e4ed27b8cc38e14938ef2522d0d41ba35
-SIZE (thonny-3.1.2.tar.gz) = 378077
+TIMESTAMP = 1567939723
+SHA256 (thonny-3.2.1.tar.gz) = 01098357e6224fe9d0e9de4ff88c4d6b4bb2a68a6c52a0730bff08faf44b2980
+SIZE (thonny-3.2.1.tar.gz) = 691488
diff --git a/devel/xtoolchain-llvm-devel/Makefile b/devel/xtoolchain-llvm-devel/Makefile
index 04ff9a6786da..f11f1b7c221c 100644
--- a/devel/xtoolchain-llvm-devel/Makefile
+++ b/devel/xtoolchain-llvm-devel/Makefile
@@ -1,7 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	xtoolchain
+.ifndef NO_LLD_LINK
 PORTVERSION=	0.1
+.else
+PORTVERSION=	0.2
+.endif
 CATEGORIES=	devel
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -37,11 +41,13 @@ do-install:
 	@${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
 		${STAGEDIR}${PREFIX}/share/toolchains/llvm${LLVM_SUFFIX}.mk
 
+.ifndef NO_LLD_LINK
 # XXX: would be better to add -fuse-ld=lld to LDFLAGS, but there isn't
 # yet a mechansim for that.  Link added here, not in devel/llvm* to avoid
 # forcing lld on all users.
 post-install:
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/llvm${LLVM_SUFFIX}/bin
 	@${LN} -s ld.lld ${STAGEDIR}${LOCALBASE}/llvm${LLVM_SUFFIX}/bin/ld
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/xtoolchain-llvm90/Makefile b/devel/xtoolchain-llvm90/Makefile
index 57968617a3ce..ce69007ecd6b 100644
--- a/devel/xtoolchain-llvm90/Makefile
+++ b/devel/xtoolchain-llvm90/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 LLVM_SUFFIX=90
+NO_LLD_LINK=yes
 
 MASTERDIR=	${.CURDIR}/../xtoolchain-llvm-devel
 
diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index 980c00bd3477..45df7d979972 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -6,7 +6,8 @@ PORTVERSION?=	${DJBDNS_VER}
 PORTREVISION?=	22
 PORTEPOCH?=	1
 CATEGORIES?=	dns
-MASTER_SITES=	http://cr.yp.to/djbdns/ \
+MASTER_SITES=	https://cr.yp.to/djbdns/ \
+		http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/
 DISTNAME=	djbdns-${DJBDNS_VER}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index a8d12d88eb1d..1cf3b6c047ac 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	emacs
-DISTVERSION=	${EMACS_VER}.${EMACS_REV}
+DISTVERSION=	27.0.50.20190908
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 PKGNAMESUFFIX=	-devel
@@ -26,13 +26,14 @@ nox_PKGNAMESUFFIX=	-devel-nox
 
 USES=		autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig
 .if ${FLAVOR:U} != nox
-USES+=		desktop-file-utils xorg
+USES+=		desktop-file-utils gnome xorg
+INSTALLS_ICONS=	yes
 USE_XORG=	ice sm x11 xcb xext xfixes xinerama xmu xrandr xrender xt
 .endif
 CPE_VENDOR=	gnu
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
-GH_TAGNAME=	5f089ac
+GH_TAGNAME=	4042dad
 
 CONFIGURE_ARGS=	--disable-build-details \
 		--localstatedir=/var
@@ -61,18 +62,16 @@ INFO=		auth autotype bovine calc ccmode cl dbus dired-x \
 		sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode \
 		tramp url vhdl-mode vip viper widget wisent woman
 INFO_PATH=	${DATADIR_REL}/info
-.if ${FLAVOR:U} != nox
-INSTALLS_ICONS=	yes
-.endif
-PLIST_SUB=	EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
+PLIST_SUB=	EMACS_VER=${DISTVERSION:R} GNU_HOST=${CONFIGURE_TARGET}
 SUB_FILES=	sources.el
-SUB_LIST=	EMACS_VER=${EMACS_VER} # sources.el
+SUB_LIST=	EMACS_VER=${DISTVERSION:R} # sources.el
 
 OPTIONS_DEFINE=	ACL DBUS GCONF GNUTLS GSETTINGS HARFBUZZ JSON LCMS2 M17N \
-		 MAILUTILS MODULES OTF SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS
-OPTIONS_DEFAULT=	ACL DBUS GIF GNUTLS GSETTINGS GTK3 HARFBUZZ JPEG JSON KQUEUE \
-		LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG SCROLLBARS \
-		SOURCES SVG THREADS TIFF XFT XIM XML XPM
+		 MAILUTILS MODULES OTF SCROLLBARS SOURCES THREADS XFT XIM XML \
+		XWIDGETS
+OPTIONS_DEFAULT=	ACL DBUS GIF GNUTLS GSETTINGS GTK3 HARFBUZZ JPEG JSON \
+		KQUEUE LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG \
+		SCROLLBARS SOURCES SVG THREADS TIFF XFT XIM XML XPM
 OPTIONS_GROUP=	GRAPHICS
 OPTIONS_GROUP_GRAPHICS=	CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
 OPTIONS_RADIO=	FILENOTIFY SOUND X11TOOLKIT
@@ -81,14 +80,14 @@ OPTIONS_RADIO_SOUND=	ALSA OSS
 OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 MOTIF XAW XAW3D
 
 .if ${FLAVOR:U} == nox
-OPTIONS_EXCLUDE=	ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 GTK3 HARFBUZZ \
-			JPEG LCMS2 M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG \
-			TIFF XAW XAW3D XFT XIM XPM XWIDGETS
+OPTIONS_EXCLUDE=	ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 GTK3 \
+			HARFBUZZ JPEG LCMS2 M17N MAGICK MOTIF OSS OTF PNG \
+			SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM XWIDGETS
 .endif
 OPTIONS_SUB=	YES
 
 ACL_DESC=	Access control list support
-CAIRO_DESC=	Experimental Cairo library support     (implies PNG, XFT)
+CAIRO_DESC=	Cairo graphics library support    [implies PNG, XFT]
 FILENOTIFY_DESC=	File notification support
 GFILE_DESC=	File notification via gfile
 GRAPHICS_DESC=	Graphics support
@@ -96,49 +95,42 @@ GSETTINGS_DESC=	GSettings API for application settings
 HARFBUZZ_DESC=	HarfBuzz for text shaping
 KQUEUE_DESC=	File notification via kqueue
 #LTO_DESC=	Enable link-time optimization
-M17N_DESC=	M17N support for text-shaping (implies XFT)
-MAGICK_DESC=	ImageMagick image processing support
+M17N_DESC=	M17N support for text-shaping     [implies XFT]
 MAILUTILS_DESC=	Mail framework via GNU Mailutils
 MODULES_DESC=	Dynamic modules support
-OTF_DESC=	Opentype fonts                         (implies XFT)
+OTF_DESC=	Opentype fonts                    [implies XFT]
 SCROLLBARS_DESC=	Toolkit scroll-bars
 SOURCES_DESC=	Install sources
-SVG_DESC=	Scalable vector graphics support       (implies PNG)
+SVG_DESC=	Scalable vector graphics support  [implies PNG]
 X11TOOLKIT_DESC=	X11 toolkit
 XAW3D_DESC=	Athena3D widgets
 XAW_DESC=	Athena widgets
 XIM_DESC=	X Input Method
-XWIDGETS_DESC=	Experimental GTK widgets               (requires GTK3)
+XWIDGETS_DESC=	Experimental GTK widgets          [implies GTK3]
 
 ACL_CONFIGURE_ENABLE=	acl
 ALSA_CONFIGURE_ON=	--with-sound=alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-CAIRO_USES=		gnome
 CAIRO_USE=		GNOME=cairo
 CAIRO_CONFIGURE_WITH=	cairo
 CAIRO_IMPLIES=		PNG XFT
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=	dbus
-GCONF_USES=		gnome
 GCONF_USE=		GNOME=gconf2
 GCONF_CONFIGURE_WITH=	gconf
 GFILE_CONFIGURE_ON=	--with-file-notification=gfile
-GFILE_USES=		gnome
 GFILE_USE=		GNOME=glib20
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CONFIGURE_WITH=	gif
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
-GSETTINGS_USES=		gnome
 GSETTINGS_USE=		GNOME=glib20
 GSETTINGS_CONFIGURE_WITH=	gsettings
 GSETTINGS_IMPLIES=	DBUS
-GTK2_USES=		gnome
 GTK2_USE=		GNOME=cairo,gtk20
 GTK2_CONFIGURE_ON=	--with-x-toolkit=gtk2
 GTK2_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 			libfontconfig.so:x11-fonts/fontconfig
-GTK3_USES=		gnome
 GTK3_USE=		GNOME=cairo,gtk30
 GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
 HARFBUZZ_CONFIGURE_WITH=	harfbuzz
@@ -170,7 +162,6 @@ OTF_IMPLIES=		XFT
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_WITH=	png
 SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
-SVG_USES=		gnome
 SVG_USE=		GNOME=cairo,librsvg2
 SVG_CONFIGURE_WITH=	rsvg
 SVG_IMPLIES=		PNG
@@ -186,7 +177,7 @@ XFT_CONFIGURE_WITH=	xft
 XFT_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 XIM_CONFIGURE_WITH=	xim
-XML_USES=		gnome
+XML_USES=		gnome # portlint complains, but necessary for nox flavor
 XML_USE=		GNOME=libxml2
 XML_CONFIGURE_WITH=	xml2
 XPM_USE=		XORG=xpm
@@ -197,9 +188,6 @@ XWIDGETS_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 			libsoup-2.4.so:devel/libsoup
 XWIDGETS_IMPLIES=	GTK3
 
-EMACS_VER=	27.0.50
-EMACS_REV=	20190903
-
 .include <bsd.port.options.mk>
 
 # has graphics/ImageMagick been compiled with OPENMP?
@@ -229,12 +217,12 @@ post-patch:
 
 post-install-MAILUTILS-on:
 	${LN} -sf ${PREFIX}/bin/movemail \
-		${STAGEDIR}${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
+		${STAGEDIR}${PREFIX}/libexec/emacs/${DISTVERSION:R}/${CONFIGURE_TARGET}
 
 post-install-SOURCES-on:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
-	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
-	${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
+	@${MKDIR} ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/src
+	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/src
+	${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/site-lisp/site-start.el
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index 47155e3b91fc..aab9c064c206 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567546776
-SHA256 (emacs-mirror-emacs-27.0.50.20190903-5f089ac_GH0.tar.gz) = 4d1dc3165e672897c0b41c2635a83e7008a62f0b1b7a6f20e787a9a94493e71a
-SIZE (emacs-mirror-emacs-27.0.50.20190903-5f089ac_GH0.tar.gz) = 40740194
+TIMESTAMP = 1568041373
+SHA256 (emacs-mirror-emacs-27.0.50.20190908-4042dad_GH0.tar.gz) = 284effffeb8aed2d02fdc2257a089c3cd6e49e7f4307442789eb12bca539a104
+SIZE (emacs-mirror-emacs-27.0.50.20190908-4042dad_GH0.tar.gz) = 40740122
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 4d07b6745272..c4a17a73c264 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -35,7 +35,8 @@ nox_PKGNAMESUFFIX=	-nox
 
 USES=		cpe gmake localbase:ldflags makeinfo ncurses pkgconfig tar:xz
 .if ${FLAVOR:U} != nox
-USES+=		desktop-file-utils xorg
+USES+=		desktop-file-utils gnome xorg
+INSTALLS_ICONS=	yes
 USE_XORG=	ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
 .endif
 CPE_VENDOR=	gnu
@@ -70,10 +71,6 @@ INFO=		ada-mode auth autotype bovine calc ccmode cl dbus dired-x \
 		sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode \
 		tramp url vhdl-mode vip viper widget wisent woman
 INFO_PATH=	${DATADIR_REL}/info
-.if ${FLAVOR:U} != nox
-INSTALLS_ICONS=	yes
-USES+=		gnome
-.endif
 .if ${FLAVOR:U} == canna
 PLIST_FILES+=	${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \
 		${DATADIR}/${DISTVERSION}/lisp/canna.elc \
@@ -104,26 +101,25 @@ OPTIONS_EXCLUDE=	ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 GTK3 \
 OPTIONS_SUB=	YES
 
 ACL_DESC=	Access control list support
-CAIRO_DESC=	Experimental Cairo library support     (implies PNG, XFT)
+CAIRO_DESC=	Experimental Cairo library support  [implies PNG, XFT]
 FILENOTIFY_DESC=	File notification support
 GFILE_DESC=	File notification via gfile
 GRAPHICS_DESC=	Graphics support
 GSETTINGS_DESC=	GSettings API for application settings
 KQUEUE_DESC=	File notification via kqueue
 #LTO_DESC=	Enable link-time optimization
-M17N_DESC=	M17N support for text-shaping (implies XFT)
-MAGICK_DESC=	ImageMagick image processing support
+M17N_DESC=	M17N support for text-shaping       [implies XFT]
 MAILUTILS_DESC=	Mail framework via GNU Mailutils
 MODULES_DESC=	Dynamic modules support
-OTF_DESC=	Opentype fonts                         (implies XFT)
+OTF_DESC=	Opentype fonts                      [implies XFT]
 SCROLLBARS_DESC=	Toolkit scroll-bars
 SOURCES_DESC=	Install sources
-SVG_DESC=	Scalable vector graphics support       (implies PNG)
+SVG_DESC=	Scalable vector graphics support    [implies PNG]
 X11TOOLKIT_DESC=	X11 toolkit
 XAW3D_DESC=	Athena3D widgets
 XAW_DESC=	Athena widgets
 XIM_DESC=	X Input Method
-XWIDGETS_DESC=	Experimental GTK widgets               (requires GTK3)
+XWIDGETS_DESC=	Experimental GTK widgets            [implies GTK3]
 
 ACL_CONFIGURE_ENABLE=	acl
 ALSA_CONFIGURE_ON=	--with-sound=alsa
@@ -193,7 +189,7 @@ XFT_CONFIGURE_WITH=	xft
 XFT_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 XIM_CONFIGURE_WITH=	xim
-XML_USES=		gnome
+XML_USES=		gnome # portlint complains, but necessary for nox flavor
 XML_USE=		GNOME=libxml2
 XML_CONFIGURE_WITH=	xml2
 XPM_USE=		XORG=xpm
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index 3712a4156e76..c6c521e74305 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nano
-PORTVERSION=	4.3
+PORTVERSION=	4.4
 CATEGORIES=	editors
 MASTER_SITES=	https://www.nano-editor.org/dist/v${PORTVERSION:R}/ GNU
 
diff --git a/editors/nano/distinfo b/editors/nano/distinfo
index 81f6e114d502..6fca01188757 100644
--- a/editors/nano/distinfo
+++ b/editors/nano/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564338029
-SHA256 (nano-4.3.tar.xz) = 00d3ad1a287a85b4bf83e5f06cedd0a9f880413682bebd52b4b1e2af8cfc0d81
-SIZE (nano-4.3.tar.xz) = 1485776
+TIMESTAMP = 1567202485
+SHA256 (nano-4.4.tar.xz) = 2af222e0354848ffaa3af31b5cd0a77917e9cb7742cd073d762f3c32f0f582c7
+SIZE (nano-4.4.tar.xz) = 1488452
diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index 9196e8a85b6c..02f455fdaee6 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tea
-PORTVERSION=	47.0.1
-PORTREVISION=	3
+PORTVERSION=	47.1.0
 CATEGORIES=	editors
 
 MAINTAINER=	danilo@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT=	Simple and powerful Qt-based text editor
 
 LICENSE=	GPLv3
 
-USES=		compiler:c++11-lang gl gmake pkgconfig:build qmake qt:5
+USES=		compiler:c++11-lang gl gmake pkgconfig:build qmake qt:5 xorg
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_GROUP=		SPELL
diff --git a/editors/tea/distinfo b/editors/tea/distinfo
index f636a4356723..0b26e5df0f96 100644
--- a/editors/tea/distinfo
+++ b/editors/tea/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1544875227
-SHA256 (psemiletov-tea-qt-47.0.1_GH0.tar.gz) = 637e27bb0accff813b17968896d71f071dd51cee9b294370490c64db4c2a3c63
-SIZE (psemiletov-tea-qt-47.0.1_GH0.tar.gz) = 504723
+TIMESTAMP = 1568031478
+SHA256 (psemiletov-tea-qt-47.1.0_GH0.tar.gz) = 0b1371777a5aa5d8a9c62db40bf6c652a3398d8f9c0b015be0d38e8fac16b1f7
+SIZE (psemiletov-tea-qt-47.1.0_GH0.tar.gz) = 503335
diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile
index 61325146da23..db6b6ea996e2 100644
--- a/editors/xcoral/Makefile
+++ b/editors/xcoral/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	xcoral
 PORTVERSION=	3.47
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	http://xcoral.free.fr/
 
 PATCH_SITES=	http://aldan.algebra.com/~mi/port-stuff/
-PATCHFILES=	xcoral-alpheus-and-peneus.patch.bz2
+PATCHFILES=	xcoral-alpheus-and-peneus-2019.patch.bz2
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Multiwindow mouse-based text editor for X
diff --git a/editors/xcoral/distinfo b/editors/xcoral/distinfo
index 0cd3d67c23cc..5517f675c3db 100644
--- a/editors/xcoral/distinfo
+++ b/editors/xcoral/distinfo
@@ -1,4 +1,5 @@
+TIMESTAMP = 1567738907
 SHA256 (xcoral-3.47.tar.gz) = 886e02eeb96e494d32969fcf41dcd09133896b717b714eb42affed1f460af3dd
 SIZE (xcoral-3.47.tar.gz) = 2760763
-SHA256 (xcoral-alpheus-and-peneus.patch.bz2) = f04cc61f0cf05cbdfe720e7b6f4f743d26f2a04dc109a2ead445394a739456a0
-SIZE (xcoral-alpheus-and-peneus.patch.bz2) = 71099
+SHA256 (xcoral-alpheus-and-peneus-2019.patch.bz2) = fcc31a3f7b1dfbcab1c10853ee69afe93e74fba3ac81cd23325e8f7b81852d45
+SIZE (xcoral-alpheus-and-peneus-2019.patch.bz2) = 71180
diff --git a/emulators/citra-qt5/Makefile b/emulators/citra-qt5/Makefile
index 690002e635c2..ac7516fe5ba0 100644
--- a/emulators/citra-qt5/Makefile
+++ b/emulators/citra-qt5/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-qt5
 
 MASTERDIR=	${.CURDIR}/../citra
diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile
index b170874df2f4..47e5f51c39c6 100644
--- a/emulators/citra/Makefile
+++ b/emulators/citra/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	citra
-PORTVERSION=	s20190902
-PORTREVISION?=	0
+PORTVERSION=	s20190906
+PORTREVISION?=	1
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	boost-libs>=1.66:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	citra-emu
-GH_TAGNAME=	8acd2b966
+GH_TAGNAME=	4bc22aa35
 GH_TUPLE=	citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \
 		citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \
 		MerryMage:dynarmic:r1-992-g4e6848d1:dynarmic/externals/dynarmic \
@@ -45,13 +45,13 @@ LDFLAGS+=	-Wl,--as-needed # Qt5Network
 TEST_TARGET=	test
 
 OPTIONS_DEFINE=	ALSA FFMPEG PULSEAUDIO JACK SNDIO
-OPTIONS_DEFAULT=ALSA FFMPEG PULSEAUDIO JACK
+OPTIONS_DEFAULT=ALSA FFMPEG PULSEAUDIO JACK SNDIO
 OPTIONS_MULTI=	GUI
 OPTIONS_MULTI_GUI=	QT5 SDL
 OPTIONS_SLAVE?=	SDL
 OPTIONS_EXCLUDE:=	${OPTIONS_MULTI_GUI}
 
-ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_BUILD_DEPENDS=	alsa-lib>0:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_CMAKE_BOOL=	USE_ALSA
 
@@ -61,10 +61,10 @@ FFMPEG_CMAKE_BOOL=	ENABLE_FFMPEG_AUDIO_DECODER ENABLE_FFMPEG_VIDEO_DUMPER
 JACK_BUILD_DEPENDS=	jackit>0:audio/jack
 JACK_CMAKE_BOOL=	USE_JACK
 
-PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0.:audio/pulseaudio
+PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	USE_PULSE
 
-SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
+SNDIO_BUILD_DEPENDS=	sndio>0:audio/sndio
 SNDIO_CMAKE_BOOL=	USE_SNDIO
 
 SDL_CMAKE_BOOL=	ENABLE_SDL2
diff --git a/emulators/citra/distinfo b/emulators/citra/distinfo
index 745fe1167e9c..2ebe18d712b2 100644
--- a/emulators/citra/distinfo
+++ b/emulators/citra/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1567438685
-SHA256 (citra-emu-citra-s20190902-8acd2b966_GH0.tar.gz) = 5d4e7a17539654d207212ae061741db786980e513570c884049cb57b3788a071
-SIZE (citra-emu-citra-s20190902-8acd2b966_GH0.tar.gz) = 5062786
+TIMESTAMP = 1567778886
+SHA256 (citra-emu-citra-s20190906-4bc22aa35_GH0.tar.gz) = 59b7db608412090a52ed3a4ca1580ef0e019fd5370d0a895513dcbf962cc5d98
+SIZE (citra-emu-citra-s20190906-4bc22aa35_GH0.tar.gz) = 5062871
 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3
 SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942
 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c
diff --git a/emulators/citra/files/patch-cubeb-dlopen b/emulators/citra/files/patch-cubeb-dlopen
new file mode 100644
index 000000000000..b523917f9943
--- /dev/null
+++ b/emulators/citra/files/patch-cubeb-dlopen
@@ -0,0 +1,809 @@
+https://github.com/kinetiknz/cubeb/commit/0d1d9d84fb3e
+https://github.com/kinetiknz/cubeb/pull/539
+
+diff --git externals/cubeb/CMakeLists.txt externals/cubeb/CMakeLists.txt
+index cdb00f9..71373cb 100644
+--- externals/cubeb/CMakeLists.txt
++++ externals/cubeb/CMakeLists.txt
+@@ -135,10 +135,7 @@ if(USE_PULSE)
+   target_sources(cubeb PRIVATE
+     src/cubeb_pulse.c)
+   target_compile_definitions(cubeb PRIVATE USE_PULSE)
+-  target_link_libraries(cubeb PRIVATE pulse)
+-  if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+-    target_link_libraries(cubeb PRIVATE dl)
+-  endif()
++  target_link_libraries(cubeb PRIVATE pthread ${CMAKE_DL_LIBS})
+ endif()
+ 
+ check_include_files(alsa/asoundlib.h USE_ALSA)
+@@ -146,10 +143,7 @@ if(USE_ALSA)
+   target_sources(cubeb PRIVATE
+     src/cubeb_alsa.c)
+   target_compile_definitions(cubeb PRIVATE USE_ALSA)
+-  target_link_libraries(cubeb PRIVATE asound pthread)
+-  if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+-    target_link_libraries(cubeb PRIVATE dl)
+-  endif()
++  target_link_libraries(cubeb PRIVATE pthread ${CMAKE_DL_LIBS})
+ endif()
+ 
+ check_include_files(jack/jack.h USE_JACK)
+@@ -157,10 +151,7 @@ if(USE_JACK)
+   target_sources(cubeb PRIVATE
+     src/cubeb_jack.cpp)
+   target_compile_definitions(cubeb PRIVATE USE_JACK)
+-  target_link_libraries(cubeb PRIVATE jack pthread)
+-  if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+-    target_link_libraries(cubeb PRIVATE dl)
+-  endif()
++  target_link_libraries(cubeb PRIVATE pthread ${CMAKE_DL_LIBS})
+ endif()
+ 
+ check_include_files(audioclient.h USE_WASAPI)
+@@ -201,7 +192,7 @@ if(USE_SNDIO)
+   target_sources(cubeb PRIVATE
+     src/cubeb_sndio.c)
+   target_compile_definitions(cubeb PRIVATE USE_SNDIO)
+-  target_link_libraries(cubeb PRIVATE sndio)
++  target_link_libraries(cubeb PRIVATE pthread)
+ endif()
+ 
+ check_include_files(kai.h USE_KAI)
+diff --git externals/cubeb/src/cubeb.c externals/cubeb/src/cubeb.c
+index e562a35..d66dd16 100644
+--- externals/cubeb/src/cubeb.c
++++ externals/cubeb/src/cubeb.c
+@@ -177,6 +177,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
+ #if defined(USE_JACK)
+     jack_init,
+ #endif
++#if defined(USE_SNDIO)
++    sndio_init,
++#endif
+ #if defined(USE_ALSA)
+     alsa_init,
+ #endif
+@@ -189,9 +192,6 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
+ #if defined(USE_WINMM)
+     winmm_init,
+ #endif
+-#if defined(USE_SNDIO)
+-    sndio_init,
+-#endif
+ #if defined(USE_OPENSL)
+     opensl_init,
+ #endif
+diff --git externals/cubeb/src/cubeb_alsa.c externals/cubeb/src/cubeb_alsa.c
+index bfd4d8f..a29eed0 100644
+--- externals/cubeb/src/cubeb_alsa.c
++++ externals/cubeb/src/cubeb_alsa.c
+@@ -14,10 +14,58 @@
+ #include <limits.h>
+ #include <poll.h>
+ #include <unistd.h>
++#include <dlfcn.h>
+ #include <alsa/asoundlib.h>
+ #include "cubeb/cubeb.h"
+ #include "cubeb-internal.h"
+ 
++#ifdef DISABLE_LIBASOUND_DLOPEN
++#define WRAP(x) x
++#else
++#define WRAP(x) cubeb_##x
++#define LIBASOUND_API_VISIT(X)                   \
++  X(snd_config)                                  \
++  X(snd_config_add)                              \
++  X(snd_config_copy)                             \
++  X(snd_config_delete)                           \
++  X(snd_config_get_id)                           \
++  X(snd_config_get_string)                       \
++  X(snd_config_imake_integer)                    \
++  X(snd_config_search)                           \
++  X(snd_config_search_definition)                \
++  X(snd_lib_error_set_handler)                   \
++  X(snd_pcm_avail_update)                        \
++  X(snd_pcm_close)                               \
++  X(snd_pcm_delay)                               \
++  X(snd_pcm_drain)                               \
++  X(snd_pcm_frames_to_bytes)                     \
++  X(snd_pcm_get_params)                          \
++  X(snd_pcm_hw_params_any)                       \
++  X(snd_pcm_hw_params_get_channels_max)          \
++  X(snd_pcm_hw_params_get_rate)                  \
++  X(snd_pcm_hw_params_set_rate_near)             \
++  X(snd_pcm_hw_params_sizeof)                    \
++  X(snd_pcm_nonblock)                            \
++  X(snd_pcm_open)                                \
++  X(snd_pcm_open_lconf)                          \
++  X(snd_pcm_pause)                               \
++  X(snd_pcm_poll_descriptors)                    \
++  X(snd_pcm_poll_descriptors_count)              \
++  X(snd_pcm_poll_descriptors_revents)            \
++  X(snd_pcm_readi)                               \
++  X(snd_pcm_recover)                             \
++  X(snd_pcm_set_params)                          \
++  X(snd_pcm_start)                               \
++  X(snd_pcm_state)                               \
++  X(snd_pcm_writei)                              \
++
++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x;
++LIBASOUND_API_VISIT(MAKE_TYPEDEF);
++#undef MAKE_TYPEDEF
++/* snd_pcm_hw_params_alloca is actually a macro */
++#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof
++#endif
++
+ #define CUBEB_STREAM_MAX 16
+ #define CUBEB_WATCHDOG_MS 10000
+ 
+@@ -36,6 +84,7 @@ static struct cubeb_ops const alsa_ops;
+ 
+ struct cubeb {
+   struct cubeb_ops const * ops;
++  void * libasound;
+ 
+   pthread_t thread;
+ 
+@@ -245,8 +294,8 @@ set_timeout(struct timeval * timeout, unsigned int ms)
+ static void
+ stream_buffer_decrement(cubeb_stream * stm, long count)
+ {
+-  char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count);
+-  memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count));
++  char * bufremains = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count);
++  memmove(stm->buffer, bufremains, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes - count));
+   stm->bufframes -= count;
+ }
+ 
+@@ -278,9 +327,9 @@ alsa_process_stream(cubeb_stream * stm)
+   /* Call _poll_descriptors_revents() even if we don't use it
+      to let underlying plugins clear null events.  Otherwise poll()
+      may wake up again and again, producing unnecessary CPU usage. */
+-  snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents);
++  WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents);
+ 
+-  avail = snd_pcm_avail_update(stm->pcm);
++  avail = WRAP(snd_pcm_avail_update)(stm->pcm);
+ 
+   /* Got null event? Bail and wait for another wakeup. */
+   if (avail == 0) {
+@@ -303,7 +352,7 @@ alsa_process_stream(cubeb_stream * stm)
+       // TODO: should it be marked as DRAINING?
+     }
+ 
+-    got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail);
++    got = WRAP(snd_pcm_readi)(stm->pcm, stm->buffer+stm->bufframes, avail);
+ 
+     if (got < 0) {
+       avail = got; // the error handler below will recover us
+@@ -347,7 +396,7 @@ alsa_process_stream(cubeb_stream * stm)
+       (!stm->other_stream || stm->other_stream->bufframes > 0)) {
+     long got = avail - stm->bufframes;
+     void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL;
+-    char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);
++    char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
+ 
+     /* Correct read size to the other stream available frames */
+     if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) {
+@@ -374,8 +423,8 @@ alsa_process_stream(cubeb_stream * stm)
+     long drain_frames = avail - stm->bufframes;
+     double drain_time = (double) drain_frames / stm->params.rate;
+ 
+-    char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);
+-    memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames));
++    char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
++    memset(buftail, 0, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, drain_frames));
+     stm->bufframes = avail;
+ 
+     /* Mark as draining, unless we're waiting for capture */
+@@ -402,7 +451,7 @@ alsa_process_stream(cubeb_stream * stm)
+       }
+     }
+ 
+-    wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail);
++    wrote = WRAP(snd_pcm_writei)(stm->pcm, stm->buffer, avail);
+     if (wrote < 0) {
+       avail = wrote; // the error handler below will recover us
+     } else {
+@@ -415,13 +464,13 @@ alsa_process_stream(cubeb_stream * stm)
+ 
+   /* Got some error? Let's try to recover the stream. */
+   if (avail < 0) {
+-    avail = snd_pcm_recover(stm->pcm, avail, 0);
++    avail = WRAP(snd_pcm_recover)(stm->pcm, avail, 0);
+ 
+     /* Capture pcm must be started after initial setup/recover */
+     if (avail >= 0 &&
+         stm->stream_type == SND_PCM_STREAM_CAPTURE &&
+-        snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {
+-      avail = snd_pcm_start(stm->pcm);
++        WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) {
++      avail = WRAP(snd_pcm_start)(stm->pcm);
+     }
+   }
+ 
+@@ -537,26 +586,26 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm)
+ 
+   slave_def = NULL;
+ 
+-  r = snd_config_search(root_pcm, "slave", &slave_pcm);
++  r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm);
+   if (r < 0) {
+     return NULL;
+   }
+ 
+-  r = snd_config_get_string(slave_pcm, &string);
++  r = WRAP(snd_config_get_string)(slave_pcm, &string);
+   if (r >= 0) {
+-    r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def);
++    r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def);
+     if (r < 0) {
+       return NULL;
+     }
+   }
+ 
+   do {
+-    r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
++    r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string);
++    r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -565,7 +614,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm)
+     if (r < 0 || r > (int) sizeof(node_name)) {
+       break;
+     }
+-    r = snd_config_search(lconf, node_name, &pcm);
++    r = WRAP(snd_config_search)(lconf, node_name, &pcm);
+     if (r < 0) {
+       break;
+     }
+@@ -574,7 +623,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm)
+   } while (0);
+ 
+   if (slave_def) {
+-    snd_config_delete(slave_def);
++    WRAP(snd_config_delete)(slave_def);
+   }
+ 
+   return NULL;
+@@ -597,22 +646,22 @@ init_local_config_with_workaround(char const * pcm_name)
+ 
+   lconf = NULL;
+ 
+-  if (snd_config == NULL) {
++  if (*WRAP(snd_config) == NULL) {
+     return NULL;
+   }
+ 
+-  r = snd_config_copy(&lconf, snd_config);
++  r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config));
+   if (r < 0) {
+     return NULL;
+   }
+ 
+   do {
+-    r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node);
++    r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_id(pcm_node, &string);
++    r = WRAP(snd_config_get_id)(pcm_node, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -621,7 +670,7 @@ init_local_config_with_workaround(char const * pcm_name)
+     if (r < 0 || r > (int) sizeof(node_name)) {
+       break;
+     }
+-    r = snd_config_search(lconf, node_name, &pcm_node);
++    r = WRAP(snd_config_search)(lconf, node_name, &pcm_node);
+     if (r < 0) {
+       break;
+     }
+@@ -632,12 +681,12 @@ init_local_config_with_workaround(char const * pcm_name)
+     }
+ 
+     /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
+-    r = snd_config_search(pcm_node, "type", &node);
++    r = WRAP(snd_config_search)(pcm_node, "type", &node);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_string(node, &string);
++    r = WRAP(snd_config_get_string)(node, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -648,18 +697,18 @@ init_local_config_with_workaround(char const * pcm_name)
+ 
+     /* Don't clobber an explicit existing handle_underrun value, set it only
+        if it doesn't already exist. */
+-    r = snd_config_search(pcm_node, "handle_underrun", &node);
++    r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node);
+     if (r != -ENOENT) {
+       break;
+     }
+ 
+     /* Disable pcm_pulse's asynchronous underrun handling. */
+-    r = snd_config_imake_integer(&node, "handle_underrun", 0);
++    r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_add(pcm_node, node);
++    r = WRAP(snd_config_add)(pcm_node, node);
+     if (r < 0) {
+       break;
+     }
+@@ -667,7 +716,7 @@ init_local_config_with_workaround(char const * pcm_name)
+     return lconf;
+   } while (0);
+ 
+-  snd_config_delete(lconf);
++  WRAP(snd_config_delete)(lconf);
+ 
+   return NULL;
+ }
+@@ -679,9 +728,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, char const * pcm_name, snd_pcm_stream_t s
+ 
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+   if (local_config) {
+-    r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);
++    r = WRAP(snd_pcm_open_lconf)(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);
+   } else {
+-    r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK);
++    r = WRAP(snd_pcm_open)(pcm, pcm_name, stream, SND_PCM_NONBLOCK);
+   }
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+ 
+@@ -694,7 +743,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
+   int r;
+ 
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+-  r = snd_pcm_close(pcm);
++  r = WRAP(snd_pcm_close)(pcm);
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+ 
+   return r;
+@@ -750,6 +799,7 @@ silent_error_handler(char const * file, int line, char const * function,
+ alsa_init(cubeb ** context, char const * context_name)
+ {
+   (void)context_name;
++  void * libasound = NULL;
+   cubeb * ctx;
+   int r;
+   int i;
+@@ -760,9 +810,27 @@ alsa_init(cubeb ** context, char const * context_name)
+   assert(context);
+   *context = NULL;
+ 
++#ifndef DISABLE_LIBASOUND_DLOPEN
++  libasound = dlopen("libasound.so", RTLD_LAZY);
++  if (!libasound) {
++    return CUBEB_ERROR;
++  }
++
++#define LOAD(x) {                               \
++    cubeb_##x = dlsym(libasound, #x);            \
++    if (!cubeb_##x) {                           \
++      dlclose(libasound);                        \
++      return CUBEB_ERROR;                       \
++    }                                           \
++  }
++
++  LIBASOUND_API_VISIT(LOAD);
++#undef LOAD
++#endif
++
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+   if (!cubeb_alsa_error_handler_set) {
+-    snd_lib_error_set_handler(silent_error_handler);
++    WRAP(snd_lib_error_set_handler)(silent_error_handler);
+     cubeb_alsa_error_handler_set = 1;
+   }
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+@@ -771,6 +839,7 @@ alsa_init(cubeb ** context, char const * context_name)
+   assert(ctx);
+ 
+   ctx->ops = &alsa_ops;
++  ctx->libasound = libasound;
+ 
+   r = pthread_mutex_init(&ctx->mutex, NULL);
+   assert(r == 0);
+@@ -819,7 +888,7 @@ alsa_init(cubeb ** context, char const * context_name)
+        config fails with EINVAL, the PA PCM is too old for this workaround. */
+     if (r == -EINVAL) {
+       pthread_mutex_lock(&cubeb_alsa_mutex);
+-      snd_config_delete(ctx->local_config);
++      WRAP(snd_config_delete)(ctx->local_config);
+       pthread_mutex_unlock(&cubeb_alsa_mutex);
+       ctx->local_config = NULL;
+     } else if (r >= 0) {
+@@ -861,10 +930,14 @@ alsa_destroy(cubeb * ctx)
+ 
+   if (ctx->local_config) {
+     pthread_mutex_lock(&cubeb_alsa_mutex);
+-    snd_config_delete(ctx->local_config);
++    WRAP(snd_config_delete)(ctx->local_config);
+     pthread_mutex_unlock(&cubeb_alsa_mutex);
+   }
+ 
++  if (ctx->libasound) {
++    dlclose(ctx->libasound);
++  }
++
+   free(ctx);
+ }
+ 
+@@ -948,7 +1021,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_nonblock(stm->pcm, 1);
++  r = WRAP(snd_pcm_nonblock)(stm->pcm, 1);
+   assert(r == 0);
+ 
+   latency_us = latency_frames * 1e6 / stm->params.rate;
+@@ -961,7 +1034,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream
+     latency_us = latency_us < min_latency ? min_latency: latency_us;
+   }
+ 
+-  r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
++  r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
+                          stm->params.channels, stm->params.rate, 1,
+                          latency_us);
+   if (r < 0) {
+@@ -969,20 +1042,20 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream
+     return CUBEB_ERROR_INVALID_FORMAT;
+   }
+ 
+-  r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size);
++  r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size);
+   assert(r == 0);
+ 
+   /* Double internal buffer size to have enough space when waiting for the other side of duplex connection */
+   stm->buffer_size *= 2;
+-  stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size));
++  stm->buffer = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->buffer_size));
+   assert(stm->buffer);
+ 
+-  stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm);
++  stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm);
+   assert(stm->nfds > 0);
+ 
+   stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd));
+   assert(stm->saved_fds);
+-  r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds);
++  r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds);
+   assert((nfds_t) r == stm->nfds);
+ 
+   if (alsa_register_stream(ctx, stm) != 0) {
+@@ -1054,7 +1127,7 @@ alsa_stream_destroy(cubeb_stream * stm)
+   pthread_mutex_lock(&stm->mutex);
+   if (stm->pcm) {
+     if (stm->state == DRAINING) {
+-      snd_pcm_drain(stm->pcm);
++      WRAP(snd_pcm_drain)(stm->pcm);
+     }
+     alsa_locked_pcm_close(stm->pcm);
+     stm->pcm = NULL;
+@@ -1100,12 +1173,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels)
+ 
+   assert(stm);
+ 
+-  r = snd_pcm_hw_params_any(stm->pcm, hw_params);
++  r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
+   if (r < 0) {
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels);
++  r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels);
+   if (r < 0) {
+     return CUBEB_ERROR;
+   }
+@@ -1126,34 +1199,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) {
+ 
+   /* get a pcm, disabling resampling, so we get a rate the
+    * hardware/dmix/pulse/etc. supports. */
+-  r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE);
++  r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE);
+   if (r < 0) {
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_hw_params_any(pcm, hw_params);
++  r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params);
+   if (r < 0) {
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir);
++  r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir);
+   if (r >= 0) {
+     /* There is a default rate: use it. */
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_OK;
+   }
+ 
+   /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */
+   *rate = 44100;
+ 
+-  r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL);
++  r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL);
+   if (r < 0) {
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_ERROR;
+   }
+ 
+-  snd_pcm_close(pcm);
++  WRAP(snd_pcm_close)(pcm);
+ 
+   return CUBEB_OK;
+ }
+@@ -1186,10 +1259,10 @@ alsa_stream_start(cubeb_stream * stm)
+   pthread_mutex_lock(&stm->mutex);
+   /* Capture pcm must be started after initial setup/recover */
+   if (stm->stream_type == SND_PCM_STREAM_CAPTURE &&
+-      snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {
+-    snd_pcm_start(stm->pcm);
++      WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) {
++    WRAP(snd_pcm_start)(stm->pcm);
+   }
+-  snd_pcm_pause(stm->pcm, 0);
++  WRAP(snd_pcm_pause)(stm->pcm, 0);
+   gettimeofday(&stm->last_activity, NULL);
+   pthread_mutex_unlock(&stm->mutex);
+ 
+@@ -1229,7 +1302,7 @@ alsa_stream_stop(cubeb_stream * stm)
+   pthread_mutex_unlock(&ctx->mutex);
+ 
+   pthread_mutex_lock(&stm->mutex);
+-  snd_pcm_pause(stm->pcm, 1);
++  WRAP(snd_pcm_pause)(stm->pcm, 1);
+   pthread_mutex_unlock(&stm->mutex);
+ 
+   return CUBEB_OK;
+@@ -1245,8 +1318,8 @@ alsa_stream_get_position(cubeb_stream * stm, uint64_t * position)
+   pthread_mutex_lock(&stm->mutex);
+ 
+   delay = -1;
+-  if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING ||
+-      snd_pcm_delay(stm->pcm, &delay) != 0) {
++  if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING ||
++      WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) {
+     *position = stm->last_position;
+     pthread_mutex_unlock(&stm->mutex);
+     return CUBEB_OK;
+@@ -1271,7 +1344,7 @@ alsa_stream_get_latency(cubeb_stream * stm, uint32_t * latency)
+   snd_pcm_sframes_t delay;
+   /* This function returns the delay in frames until a frame written using
+      snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */
+-  if (snd_pcm_delay(stm->pcm, &delay)) {
++  if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) {
+     return CUBEB_ERROR;
+   }
+ 
+diff --git externals/cubeb/src/cubeb_sndio.c externals/cubeb/src/cubeb_sndio.c
+index 5a43343..c9a31a7 100644
+--- externals/cubeb/src/cubeb_sndio.c
++++ externals/cubeb/src/cubeb_sndio.c
+@@ -12,6 +12,7 @@
+ #include <stdbool.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <dlfcn.h>
+ #include <assert.h>
+ #include "cubeb/cubeb.h"
+ #include "cubeb-internal.h"
+@@ -22,10 +23,36 @@
+ #define DPR(...) do {} while(0)
+ #endif
+ 
++#ifdef DISABLE_LIBSNDIO_DLOPEN
++#define WRAP(x) x
++#else
++#define WRAP(x) cubeb_##x
++#define LIBSNDIO_API_VISIT(X)                   \
++  X(sio_close)                               \
++  X(sio_eof)                                 \
++  X(sio_getpar)                              \
++  X(sio_initpar)                             \
++  X(sio_onmove)                              \
++  X(sio_open)                                \
++  X(sio_pollfd)                              \
++  X(sio_read)                                \
++  X(sio_revents)                             \
++  X(sio_setpar)                              \
++  X(sio_setvol)                              \
++  X(sio_start)                               \
++  X(sio_stop)                                \
++  X(sio_write)                               \
++
++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x;
++LIBSNDIO_API_VISIT(MAKE_TYPEDEF);
++#undef MAKE_TYPEDEF
++#endif
++
+ static struct cubeb_ops const sndio_ops;
+ 
+ struct cubeb {
+   struct cubeb_ops const * ops;
++  void * libsndio;
+ };
+ 
+ struct cubeb_stream {
+@@ -103,7 +130,7 @@ sndio_mainloop(void *arg)
+   DPR("sndio_mainloop()\n");
+   s->state_cb(s, s->arg, CUBEB_STATE_STARTED);
+   pthread_mutex_lock(&s->mtx);
+-  if (!sio_start(s->hdl)) {
++  if (!WRAP(sio_start)(s->hdl)) {
+     pthread_mutex_unlock(&s->mtx);
+     return NULL;
+   }
+@@ -183,7 +210,7 @@ sndio_mainloop(void *arg)
+       events |= POLLIN;
+     if ((s->mode & SIO_PLAY) && pstart < pend)
+       events |= POLLOUT;
+-    nfds = sio_pollfd(s->hdl, pfds, events);
++    nfds = WRAP(sio_pollfd)(s->hdl, pfds, events);
+ 
+     if (nfds > 0) {
+       pthread_mutex_unlock(&s->mtx);
+@@ -193,7 +220,7 @@ sndio_mainloop(void *arg)
+         continue;
+     }
+ 
+-    revents = sio_revents(s->hdl, pfds);
++    revents = WRAP(sio_revents)(s->hdl, pfds);
+ 
+     if (revents & POLLHUP) {
+       state = CUBEB_STATE_ERROR;
+@@ -201,8 +228,8 @@ sndio_mainloop(void *arg)
+     }
+ 
+     if (revents & POLLOUT) {
+-      n = sio_write(s->hdl, s->pbuf + pstart, pend - pstart);
+-      if (n == 0 && sio_eof(s->hdl)) {
++      n = WRAP(sio_write)(s->hdl, s->pbuf + pstart, pend - pstart);
++      if (n == 0 && WRAP(sio_eof)(s->hdl)) {
+         DPR("sndio_mainloop() werr\n");
+         state = CUBEB_STATE_ERROR;
+         break;
+@@ -211,8 +238,8 @@ sndio_mainloop(void *arg)
+     }
+ 
+     if (revents & POLLIN) {
+-      n = sio_read(s->hdl, s->rbuf + rstart, rend - rstart);
+-      if (n == 0 && sio_eof(s->hdl)) {
++      n = WRAP(sio_read)(s->hdl, s->rbuf + rstart, rend - rstart);
++      if (n == 0 && WRAP(sio_eof)(s->hdl)) {
+         DPR("sndio_mainloop() rerr\n");
+         state = CUBEB_STATE_ERROR;
+         break;
+@@ -224,7 +251,7 @@ sndio_mainloop(void *arg)
+     if (prime > 0 && (s->mode & SIO_REC))
+       rstart = rend;
+   }
+-  sio_stop(s->hdl);
++  WRAP(sio_stop)(s->hdl);
+   s->hwpos = s->swpos;
+   pthread_mutex_unlock(&s->mtx);
+   s->state_cb(s, s->arg, state);
+@@ -234,8 +261,31 @@ sndio_mainloop(void *arg)
+ /*static*/ int
+ sndio_init(cubeb **context, char const *context_name)
+ {
++  void * libsndio = NULL;
++
++#ifndef DISABLE_LIBSNDIO_DLOPEN
++  libsndio = dlopen("libsndio.so", RTLD_LAZY);
++  if (!libsndio) {
++    DPR("sndio_init(%s) failed dlopen(libsndio.so)\n", context_name);
++    return CUBEB_ERROR;
++  }
++
++#define LOAD(x) {                               \
++    cubeb_##x = dlsym(libsndio, #x);            \
++    if (!cubeb_##x) {                           \
++      DPR("sndio_init(%s) failed dlsym(%s)\n", context_name, #x); \
++      dlclose(libsndio);                        \
++      return CUBEB_ERROR;                       \
++    }                                           \
++  }
++
++  LIBSNDIO_API_VISIT(LOAD);
++#undef LOAD
++#endif
++
+   DPR("sndio_init(%s)\n", context_name);
+   *context = malloc(sizeof(*context));
++  (*context)->libsndio = libsndio;
+   (*context)->ops = &sndio_ops;
+   (void)context_name;
+   return CUBEB_OK;
+@@ -251,6 +301,8 @@ static void
+ sndio_destroy(cubeb *context)
+ {
+   DPR("sndio_destroy()\n");
++  if (context->libsndio)
++    dlclose(context->libsndio);
+   free(context);
+ }
+ 
+@@ -303,12 +355,12 @@ sndio_stream_init(cubeb * context,
+     goto err;
+   }
+   s->context = context;
+-  s->hdl = sio_open(NULL, s->mode, 1);
++  s->hdl = WRAP(sio_open)(NULL, s->mode, 1);
+   if (s->hdl == NULL) {
+     DPR("sndio_stream_init(), sio_open() failed\n");
+     goto err;
+   }
+-  sio_initpar(&wpar);
++  WRAP(sio_initpar)(&wpar);
+   wpar.sig = 1;
+   wpar.bits = 16;
+   switch (format) {
+@@ -331,7 +383,7 @@ sndio_stream_init(cubeb * context,
+   if (s->mode & SIO_PLAY)
+     wpar.pchan = output_stream_params->channels;
+   wpar.appbufsz = latency_frames;
+-  if (!sio_setpar(s->hdl, &wpar) || !sio_getpar(s->hdl, &rpar)) {
++  if (!WRAP(sio_setpar)(s->hdl, &wpar) || !WRAP(sio_getpar)(s->hdl, &rpar)) {
+     DPR("sndio_stream_init(), sio_setpar() failed\n");
+     goto err;
+   }
+@@ -342,7 +394,7 @@ sndio_stream_init(cubeb * context,
+     DPR("sndio_stream_init() unsupported params\n");
+     goto err;
+   }
+-  sio_onmove(s->hdl, sndio_onmove, s);
++  WRAP(sio_onmove)(s->hdl, sndio_onmove, s);
+   s->active = 0;
+   s->nfr = rpar.round;
+   s->rbpf = rpar.bps * rpar.rchan;
+@@ -379,7 +431,7 @@ sndio_stream_init(cubeb * context,
+   return CUBEB_OK;
+ err:
+   if (s->hdl)
+-    sio_close(s->hdl);
++    WRAP(sio_close)(s->hdl);
+   if (s->pbuf)
+     free(s->pbuf);
+   if (s->rbuf)
+@@ -425,7 +477,7 @@ static void
+ sndio_stream_destroy(cubeb_stream *s)
+ {
+   DPR("sndio_stream_destroy()\n");
+-  sio_close(s->hdl);
++  WRAP(sio_close)(s->hdl);
+   if (s->mode & SIO_PLAY)
+     free(s->pbuf);
+   if (s->mode & SIO_REC)
+@@ -476,7 +528,7 @@ sndio_stream_set_volume(cubeb_stream *s, float volume)
+ {
+   DPR("sndio_stream_set_volume(%f)\n", volume);
+   pthread_mutex_lock(&s->mtx);
+-  sio_setvol(s->hdl, SIO_MAXVOL * volume);
++  WRAP(sio_setvol)(s->hdl, SIO_MAXVOL * volume);
+   pthread_mutex_unlock(&s->mtx);
+   return CUBEB_OK;
+ }
diff --git a/emulators/linux_base-c7/Makefile b/emulators/linux_base-c7/Makefile
index 6f592cc29946..52d6e1ae1a19 100644
--- a/emulators/linux_base-c7/Makefile
+++ b/emulators/linux_base-c7/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	c7
 PORTVERSION=	${LINUX_DIST_VER}
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	emulators linux
 PKGNAMEPREFIX=	linux_base-
 EXTRACT_ONLY=	${DISTFILES:N*${SRC_SUFX}*:Nfilesystem-*:C/:[^:]+$//}
@@ -17,9 +17,11 @@ USE_LINUX_RPM=	yes
 BIN_DISTNAMES=	bash-4.2.46-31.el7 \
 		bzip2-1.0.6-13.el7 \
 		coreutils-8.22-23.el7 \
+		diffutils-3.3-4.el7 \
 		e2fsprogs-1.42.9-13.el7 \
 		filesystem-3.2-25.el7 \
 		findutils-4.5.11-6.el7 \
+		gawk-4.0.2-4.el7_3.1 \
 		glibc-common-2.17-260.el7_6.6 \
 		grep-2.20-3.el7 \
 		info-5.1-5.el7 \
@@ -86,10 +88,12 @@ SRC_DISTFILES=	acl-2.2.51-14.el7${SRC_SUFX}:SOURCE \
 		compat-db-4.7.25-28.el7${SRC_SUFX}:SOURCE \
 		compat-gcc-32-3.2.3-72.el7${SRC_SUFX}:SOURCE \
 		coreutils-8.22-23.el7${SRC_SUFX}:SOURCE \
+		diffutils-3.3-4.el7${SRC_SUFX}:SOURCE \
 		e2fsprogs-1.42.9-13.el7${SRC_SUFX}:SOURCE \
 		filesystem-3.2-25.el7${SRC_SUFX}:SOURCE \
 		findutils-4.5.11-6.el7${SRC_SUFX}:SOURCE \
 		gamin-0.1.10-16.el7${SRC_SUFX}:SOURCE \
+		gawk-4.0.2-4.el7_3.1${SRC_SUFX}:SOURCE \
 		gcc-4.8.5-36.el7_6.2${SRC_SUFX}:SOURCE \
 		gdbm-1.10-8.el7${SRC_SUFX}:SOURCE \
 		glib2-2.56.1-4.el7_6${SRC_SUFX}:SOURCE \
diff --git a/emulators/linux_base-c7/distinfo b/emulators/linux_base-c7/distinfo
index ab69bb04e3d3..8f0ab2173356 100644
--- a/emulators/linux_base-c7/distinfo
+++ b/emulators/linux_base-c7/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1566746201
+TIMESTAMP = 1568037911
 SHA256 (centos/basesystem-10.0-7.el7.centos.noarch.rpm) = 0280ee16df09be0cebf62695706598caed8ff5cba47de1fed625068a90a9ef68
 SIZE (centos/basesystem-10.0-7.el7.centos.noarch.rpm) = 5124
 SHA256 (centos/bash-4.2.46-31.el7.i686.rpm) = 2988de97c4231cd72677ac64f3f1e20191355e0e34a56d59ed26cabc700ee29d
@@ -29,6 +29,10 @@ SHA256 (centos/coreutils-8.22-23.el7.i686.rpm) = 524ab0a2f0739544363201524381a7e
 SIZE (centos/coreutils-8.22-23.el7.i686.rpm) = 3479156
 SHA256 (centos/coreutils-8.22-23.el7.x86_64.rpm) = 4d3f33ad5e764765d47a7132be0ec2868cbc1a9d3861ab8854c56bd0138b42cc
 SIZE (centos/coreutils-8.22-23.el7.x86_64.rpm) = 3415152
+SHA256 (centos/diffutils-3.3-4.el7.i686.rpm) = 324ea0854b7678806771514824490bf262ae570447d9f660be40ca5b741848bb
+SIZE (centos/diffutils-3.3-4.el7.i686.rpm) = 327736
+SHA256 (centos/diffutils-3.3-4.el7.x86_64.rpm) = 5668ccb29661f7c957bdc50d05a72bb11f0a15ee6fb119e42b992a45756a1292
+SIZE (centos/diffutils-3.3-4.el7.x86_64.rpm) = 329656
 SHA256 (centos/e2fsprogs-1.42.9-13.el7.i686.rpm) = 379a6a5a42aa7406f5eebf95ce82bd668d6d9869a282a1f8185fb665ac76fc66
 SIZE (centos/e2fsprogs-1.42.9-13.el7.i686.rpm) = 721724
 SHA256 (centos/e2fsprogs-1.42.9-13.el7.x86_64.rpm) = 617e9e1c9769016ea264e6a846d63aa9d22c35e820ffe03ae66aea6db860dc62
@@ -49,6 +53,10 @@ SHA256 (centos/gamin-0.1.10-16.el7.i686.rpm) = c90f79a61297f76b4192ea5eb0dbe460c
 SIZE (centos/gamin-0.1.10-16.el7.i686.rpm) = 129420
 SHA256 (centos/gamin-0.1.10-16.el7.x86_64.rpm) = f1b3e07abe6b1de722d3c3cf42a039a519be5d13aad9a7894e560504892167e7
 SIZE (centos/gamin-0.1.10-16.el7.x86_64.rpm) = 131464
+SHA256 (centos/gawk-4.0.2-4.el7_3.1.i686.rpm) = 80c502934e0e79f8ed297fd6ac7edf9988c2bed3f06d62a280a31a5250e42fa1
+SIZE (centos/gawk-4.0.2-4.el7_3.1.i686.rpm) = 872308
+SHA256 (centos/gawk-4.0.2-4.el7_3.1.x86_64.rpm) = 3aedd340b676e49fe6d25b04a77402d074b2a13f2607e165d6ec94c51a5ced12
+SIZE (centos/gawk-4.0.2-4.el7_3.1.x86_64.rpm) = 894476
 SHA256 (centos/gdbm-1.10-8.el7.i686.rpm) = cb3e549dd21830d782fdd68385ade2acd8105c55ed56473b572d058098b79128
 SIZE (centos/gdbm-1.10-8.el7.i686.rpm) = 71744
 SHA256 (centos/gdbm-1.10-8.el7.x86_64.rpm) = 65f28fdefa291bfe53e9c8646ce0f7510f312a4fee232af36e3d4fe678b60591
@@ -231,6 +239,8 @@ SHA256 (centos/compat-gcc-32-3.2.3-72.el7.src.rpm) = bf748c424917bf99237baeadc82
 SIZE (centos/compat-gcc-32-3.2.3-72.el7.src.rpm) = 21623860
 SHA256 (centos/coreutils-8.22-23.el7.src.rpm) = aba61b6aa7d4293675e6c9238e3c977a8bbe86426ce3d3f92d2b4402938d605e
 SIZE (centos/coreutils-8.22-23.el7.src.rpm) = 5518732
+SHA256 (centos/diffutils-3.3-4.el7.src.rpm) = ea0b8b8f6a0f0c6ae4bebfdfff8437d09864de9011ad3f51a9372c209086fc4f
+SIZE (centos/diffutils-3.3-4.el7.src.rpm) = 1217500
 SHA256 (centos/e2fsprogs-1.42.9-13.el7.src.rpm) = d7fe09bd3ad9bb027458149fc5eb743e2dc6ccb1b678608d9ba5b84305b230b6
 SIZE (centos/e2fsprogs-1.42.9-13.el7.src.rpm) = 4729088
 SHA256 (centos/filesystem-3.2-25.el7.src.rpm) = d9a82c51739df0f5c5258dc339a949f660af0d776e4a35e7b33649287b70d9ab
@@ -239,6 +249,8 @@ SHA256 (centos/findutils-4.5.11-6.el7.src.rpm) = 2c931e340b646212a941ba1c5d08314
 SIZE (centos/findutils-4.5.11-6.el7.src.rpm) = 3134161
 SHA256 (centos/gamin-0.1.10-16.el7.src.rpm) = 33ff0eb6f5bf0795c263669d874b72b51a29d3fcfaeb139540713c0abb9e7603
 SIZE (centos/gamin-0.1.10-16.el7.src.rpm) = 475323
+SHA256 (centos/gawk-4.0.2-4.el7_3.1.src.rpm) = 4ea7058b4c1e6da7dc2f2b11d70969132643721ebe05e86fb94a8d999e11ebdb
+SIZE (centos/gawk-4.0.2-4.el7_3.1.src.rpm) = 2761533
 SHA256 (centos/gcc-4.8.5-36.el7_6.2.src.rpm) = ac99e3be48ea00a95dc8d302a31c74597f365f1f3c05ed10623954a155f5498c
 SIZE (centos/gcc-4.8.5-36.el7_6.2.src.rpm) = 79303561
 SHA256 (centos/gdbm-1.10-8.el7.src.rpm) = 0cbcec29b9a0ff012d3e03ee30b2e87d3dbe26f3b8dd095d7a277eb7047fb76e
diff --git a/emulators/linux_base-c7/pkg-plist.amd64 b/emulators/linux_base-c7/pkg-plist.amd64
index 3ca83c36226b..c5067ac21bff 100644
--- a/emulators/linux_base-c7/pkg-plist.amd64
+++ b/emulators/linux_base-c7/pkg-plist.amd64
@@ -79,6 +79,7 @@ sbin
 usr/bin/[
 usr/bin/alias
 usr/bin/arch
+usr/bin/awk
 usr/bin/base64
 usr/bin/basename
 usr/bin/bash
@@ -109,6 +110,7 @@ usr/bin/chown
 usr/bin/chrt
 usr/bin/cksum
 usr/bin/clear
+usr/bin/cmp
 usr/bin/col
 usr/bin/colcrt
 usr/bin/colrm
@@ -134,6 +136,9 @@ usr/bin/db47_upgrade
 usr/bin/db47_verify
 usr/bin/dd
 usr/bin/df
+usr/bin/dgawk
+usr/bin/diff
+usr/bin/diff3
 usr/bin/dir
 usr/bin/dircolors
 usr/bin/dirname
@@ -156,6 +161,7 @@ usr/bin/flock
 usr/bin/fmt
 usr/bin/fold
 usr/bin/gapplication
+usr/bin/gawk
 usr/bin/gdbus
 usr/bin/gencat
 usr/bin/getconf
@@ -176,6 +182,7 @@ usr/bin/i386
 usr/bin/iconv
 usr/bin/id
 usr/bin/idn
+usr/bin/igawk
 usr/bin/info
 usr/bin/infocmp
 usr/bin/infokey
@@ -230,6 +237,7 @@ usr/bin/od
 usr/bin/oldfind
 usr/bin/paste
 usr/bin/pathchk
+usr/bin/pgawk
 usr/bin/pinky
 usr/bin/pldd
 usr/bin/pr
@@ -252,6 +260,7 @@ usr/bin/rmdir
 usr/bin/rpcgen
 usr/bin/runcon
 usr/bin/scriptreplay
+usr/bin/sdiff
 usr/bin/sed
 usr/bin/seq
 usr/bin/setarch
@@ -1256,6 +1265,8 @@ usr/lib64/openssl/engines/libubsec.so
 usr/lib64/rtkaio/librt.so.1
 usr/lib64/rtkaio/librtkaio-2.17.so
 usr/lib64/security/pam_cap.so
+usr/libexec/awk/grcat
+usr/libexec/awk/pwcat
 usr/libexec/coreutils/libstdbuf.so
 usr/libexec/gam_server
 usr/libexec/getconf/POSIX_V6_ILP32_OFF32
@@ -1345,6 +1356,26 @@ usr/sbin/tune2fs
 usr/sbin/wipefs
 usr/sbin/zdump
 usr/sbin/zic
+usr/share/awk/assert.awk
+usr/share/awk/bits2str.awk
+usr/share/awk/cliff_rand.awk
+usr/share/awk/ctime.awk
+usr/share/awk/ftrans.awk
+usr/share/awk/getopt.awk
+usr/share/awk/gettime.awk
+usr/share/awk/group.awk
+usr/share/awk/join.awk
+usr/share/awk/libintl.awk
+usr/share/awk/noassign.awk
+usr/share/awk/ord.awk
+usr/share/awk/passwd.awk
+usr/share/awk/quicksort.awk
+usr/share/awk/readable.awk
+usr/share/awk/rewind.awk
+usr/share/awk/round.awk
+usr/share/awk/strtonum.awk
+usr/share/awk/walkarray.awk
+usr/share/awk/zerofile.awk
 usr/share/bash-completion/completions/addpart
 usr/share/bash-completion/completions/blkdiscard
 usr/share/bash-completion/completions/blkid
@@ -1457,6 +1488,9 @@ usr/share/centos-release/EULA
 %%PORTDOCS%%usr/share/doc/coreutils-8.22/sh-utils/NEWS
 %%PORTDOCS%%usr/share/doc/coreutils-8.22/textutils/ChangeLog.bz2
 %%PORTDOCS%%usr/share/doc/coreutils-8.22/textutils/NEWS
+%%PORTDOCS%%usr/share/doc/diffutils-3.3/COPYING
+%%PORTDOCS%%usr/share/doc/diffutils-3.3/NEWS
+%%PORTDOCS%%usr/share/doc/diffutils-3.3/README
 %%PORTDOCS%%usr/share/doc/e2fsprogs-1.42.9/COPYING
 %%PORTDOCS%%usr/share/doc/e2fsprogs-1.42.9/README
 %%PORTDOCS%%usr/share/doc/e2fsprogs-1.42.9/RELEASE-NOTES
@@ -1495,6 +1529,14 @@ usr/share/centos-release/EULA
 %%PORTDOCS%%usr/share/doc/gamin-0.1.10/server_structs.gif
 %%PORTDOCS%%usr/share/doc/gamin-0.1.10/socket.txt
 %%PORTDOCS%%usr/share/doc/gamin-0.1.10/using.html
+%%PORTDOCS%%usr/share/doc/gawk-4.0.2/COPYING
+%%PORTDOCS%%usr/share/doc/gawk-4.0.2/FUTURES
+%%PORTDOCS%%usr/share/doc/gawk-4.0.2/LIMITATIONS
+%%PORTDOCS%%usr/share/doc/gawk-4.0.2/NEWS
+%%PORTDOCS%%usr/share/doc/gawk-4.0.2/POSIX.STD
+%%PORTDOCS%%usr/share/doc/gawk-4.0.2/README
+%%PORTDOCS%%usr/share/doc/gawk-4.0.2/README.multibyte
+%%PORTDOCS%%usr/share/doc/gawk-4.0.2/README.tests
 %%PORTDOCS%%usr/share/doc/gdbm-1.10/AUTHORS
 %%PORTDOCS%%usr/share/doc/gdbm-1.10/COPYING
 %%PORTDOCS%%usr/share/doc/gdbm-1.10/NEWS
@@ -2194,9 +2236,12 @@ usr/share/i18n/locales/zu_ZA
 usr/share/icons
 usr/share/info/bash.info.gz
 usr/share/info/coreutils.info.gz
+usr/share/info/diffutils.info.gz
 usr/share/info/dir
 usr/share/info/find-maint.info.gz
 usr/share/info/find.info.gz
+usr/share/info/gawk.info.gz
+usr/share/info/gawkinet.info.gz
 usr/share/info/grep.info.gz
 usr/share/info/history.info.gz
 usr/share/info/info-stnd.info.gz
@@ -2246,6 +2291,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/bs/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ca/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/glib20.mo
@@ -2257,6 +2303,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ca@valencia/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/cs/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/glib20.mo
@@ -2269,7 +2316,9 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/cs/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/cy/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/da/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/da/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/libc.mo
@@ -2280,8 +2329,10 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/da/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/gdbm.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/grep.mo
@@ -2294,6 +2345,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/de/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/dz/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/el/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/el/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/el/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/el/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/el/LC_MESSAGES/grep.mo
@@ -2311,6 +2363,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/en_US/LC_MESSAGES/mit-krb5.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/eo/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/grep.mo
@@ -2320,8 +2373,10 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/eo/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/es/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/es/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/libc.mo
@@ -2346,7 +2401,9 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/fa/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/fi/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/fi/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/gdbm.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/grep.mo
@@ -2357,8 +2414,10 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/fi/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/libc.mo
@@ -2370,6 +2429,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/fur/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ga/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/grep.mo
@@ -2378,6 +2438,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ga/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/gd/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/gl/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/grep.mo
@@ -2387,11 +2448,13 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/util-linux.mo
 %%NLS%%usr/share/locale/gl/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/gu/LC_MESSAGES/glib20.mo
+%%NLS%%usr/share/locale/he/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/he/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/he/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/he/LC_MESSAGES/sed.mo
 %%NLS%%usr/share/locale/hi/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/hr/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/hr/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/hr/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/hr/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/hr/LC_MESSAGES/grep.mo
@@ -2402,6 +2465,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/hr/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/hu/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/grep.mo
@@ -2415,6 +2479,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ia/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/id/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/glib20.mo
@@ -2427,8 +2492,10 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/is/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/is/LC_MESSAGES/popt.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/libc.mo
@@ -2439,7 +2506,9 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/it/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/gdbm.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/grep.mo
@@ -2475,6 +2544,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/lt/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/lt/LC_MESSAGES/libc.mo
 %%NLS%%usr/share/locale/lt/LC_TIME/coreutils.mo
+%%NLS%%usr/share/locale/lv/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/lv/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/mai/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/mg/LC_MESSAGES/glib20.mo
@@ -2483,6 +2553,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/mn/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/mr/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ms/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ms/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ms/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ms/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ms/LC_TIME/coreutils.mo
@@ -2497,8 +2568,10 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ne/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/libc.mo
@@ -2514,8 +2587,10 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/pa/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/gdbm.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/grep.mo
@@ -2535,6 +2610,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/pt/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/grep.mo
@@ -2544,6 +2620,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/pt_BR/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ro/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/grep.mo
@@ -2553,6 +2630,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ro/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ru/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/grep.mo
@@ -2583,6 +2661,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/sl/LC_MESSAGES/util-linux.mo
 %%NLS%%usr/share/locale/sl/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/sq/LC_MESSAGES/glib20.mo
+%%NLS%%usr/share/locale/sr/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/sr/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/sr/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/sr/LC_MESSAGES/grep.mo
@@ -2592,8 +2671,10 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/sr@latin/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/libc.mo
@@ -2609,6 +2690,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/tl/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/tr/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/glib20.mo
@@ -2622,6 +2704,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ug/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/uk/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/gdbm.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/glib20.mo
@@ -2633,8 +2716,10 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/uk/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/libc.mo
@@ -2649,6 +2734,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/yi/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/glib20.mo
@@ -2662,6 +2748,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/zh_HK/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/grep.mo
@@ -2683,6 +2770,7 @@ usr/share/man/man1/:.1.gz
 usr/share/man/man1/[.1.gz
 usr/share/man/man1/alias.1.gz
 usr/share/man/man1/arch.1.gz
+usr/share/man/man1/awk.1.gz
 usr/share/man/man1/base64.1.gz
 usr/share/man/man1/basename.1.gz
 usr/share/man/man1/bash.1.gz
@@ -2719,6 +2807,7 @@ usr/share/man/man1/chrt.1.gz
 usr/share/man/man1/chsh.1.gz
 usr/share/man/man1/cksum.1.gz
 usr/share/man/man1/clear.1.gz
+usr/share/man/man1/cmp.1.gz
 usr/share/man/man1/col.1.gz
 usr/share/man/man1/colcrt.1.gz
 usr/share/man/man1/colrm.1.gz
@@ -2736,6 +2825,9 @@ usr/share/man/man1/date.1.gz
 usr/share/man/man1/dd.1.gz
 usr/share/man/man1/declare.1.gz
 usr/share/man/man1/df.1.gz
+usr/share/man/man1/dgawk.1.gz
+usr/share/man/man1/diff.1.gz
+usr/share/man/man1/diff3.1.gz
 usr/share/man/man1/dir.1.gz
 usr/share/man/man1/dircolors.1.gz
 usr/share/man/man1/dirname.1.gz
@@ -2765,6 +2857,7 @@ usr/share/man/man1/flock.1.gz
 usr/share/man/man1/fmt.1.gz
 usr/share/man/man1/fold.1.gz
 usr/share/man/man1/gapplication.1.gz
+usr/share/man/man1/gawk.1.gz
 usr/share/man/man1/gdbus.1.gz
 usr/share/man/man1/getopt.1.gz
 usr/share/man/man1/getopts.1.gz
@@ -2782,6 +2875,7 @@ usr/share/man/man1/history.1.gz
 usr/share/man/man1/hostid.1.gz
 usr/share/man/man1/id.1.gz
 usr/share/man/man1/idn.1.gz
+usr/share/man/man1/igawk.1.gz
 usr/share/man/man1/info.1.gz
 usr/share/man/man1/infocmp.1m.gz
 usr/share/man/man1/infokey.1.gz
@@ -2836,6 +2930,7 @@ usr/share/man/man1/od.1.gz
 usr/share/man/man1/oldfind.1.gz
 usr/share/man/man1/paste.1.gz
 usr/share/man/man1/pathchk.1.gz
+usr/share/man/man1/pgawk.1.gz
 usr/share/man/man1/pinky.1.gz
 usr/share/man/man1/popd.1.gz
 usr/share/man/man1/pr.1.gz
@@ -2860,6 +2955,7 @@ usr/share/man/man1/runcon.1.gz
 usr/share/man/man1/runuser.1.gz
 usr/share/man/man1/script.1.gz
 usr/share/man/man1/scriptreplay.1.gz
+usr/share/man/man1/sdiff.1.gz
 usr/share/man/man1/sed.1.gz
 usr/share/man/man1/seq.1.gz
 usr/share/man/man1/set.1.gz
diff --git a/emulators/linux_base-c7/pkg-plist.i386 b/emulators/linux_base-c7/pkg-plist.i386
index dc71d62e3b17..90b4abdacd65 100644
--- a/emulators/linux_base-c7/pkg-plist.i386
+++ b/emulators/linux_base-c7/pkg-plist.i386
@@ -77,6 +77,7 @@ sbin
 usr/bin/[
 usr/bin/alias
 usr/bin/arch
+usr/bin/awk
 usr/bin/base64
 usr/bin/basename
 usr/bin/bash
@@ -107,6 +108,7 @@ usr/bin/chown
 usr/bin/chrt
 usr/bin/cksum
 usr/bin/clear
+usr/bin/cmp
 usr/bin/col
 usr/bin/colcrt
 usr/bin/colrm
@@ -132,6 +134,9 @@ usr/bin/db47_upgrade
 usr/bin/db47_verify
 usr/bin/dd
 usr/bin/df
+usr/bin/dgawk
+usr/bin/diff
+usr/bin/diff3
 usr/bin/dir
 usr/bin/dircolors
 usr/bin/dirname
@@ -154,6 +159,7 @@ usr/bin/flock
 usr/bin/fmt
 usr/bin/fold
 usr/bin/gapplication
+usr/bin/gawk
 usr/bin/gdbus
 usr/bin/gencat
 usr/bin/getconf
@@ -173,6 +179,7 @@ usr/bin/i386
 usr/bin/iconv
 usr/bin/id
 usr/bin/idn
+usr/bin/igawk
 usr/bin/info
 usr/bin/infocmp
 usr/bin/infokey
@@ -228,6 +235,7 @@ usr/bin/od
 usr/bin/oldfind
 usr/bin/paste
 usr/bin/pathchk
+usr/bin/pgawk
 usr/bin/pinky
 usr/bin/pldd
 usr/bin/pr
@@ -250,6 +258,7 @@ usr/bin/rmdir
 usr/bin/rpcgen
 usr/bin/runcon
 usr/bin/scriptreplay
+usr/bin/sdiff
 usr/bin/sed
 usr/bin/seq
 usr/bin/setarch
@@ -800,6 +809,8 @@ usr/lib/systemd/system/fstrim.service
 usr/lib/systemd/system/fstrim.timer
 usr/lib/tmpfiles.d/libselinux.conf
 usr/lib/udev/rules.d/60-raw.rules
+usr/libexec/awk/grcat
+usr/libexec/awk/pwcat
 usr/libexec/coreutils/libstdbuf.so
 usr/libexec/gam_server
 usr/libexec/getconf/POSIX_V6_ILP32_OFF32
@@ -883,6 +894,26 @@ usr/sbin/tune2fs
 usr/sbin/wipefs
 usr/sbin/zdump
 usr/sbin/zic
+usr/share/awk/assert.awk
+usr/share/awk/bits2str.awk
+usr/share/awk/cliff_rand.awk
+usr/share/awk/ctime.awk
+usr/share/awk/ftrans.awk
+usr/share/awk/getopt.awk
+usr/share/awk/gettime.awk
+usr/share/awk/group.awk
+usr/share/awk/join.awk
+usr/share/awk/libintl.awk
+usr/share/awk/noassign.awk
+usr/share/awk/ord.awk
+usr/share/awk/passwd.awk
+usr/share/awk/quicksort.awk
+usr/share/awk/readable.awk
+usr/share/awk/rewind.awk
+usr/share/awk/round.awk
+usr/share/awk/strtonum.awk
+usr/share/awk/walkarray.awk
+usr/share/awk/zerofile.awk
 usr/share/bash-completion/completions/addpart
 usr/share/bash-completion/completions/blkdiscard
 usr/share/bash-completion/completions/blkid
@@ -995,6 +1026,9 @@ usr/share/centos-release/EULA
 %%PORTDOCS%%usr/share/doc/coreutils-8.22/sh-utils/NEWS
 %%PORTDOCS%%usr/share/doc/coreutils-8.22/textutils/ChangeLog.bz2
 %%PORTDOCS%%usr/share/doc/coreutils-8.22/textutils/NEWS
+%%PORTDOCS%%usr/share/doc/diffutils-3.3/COPYING
+%%PORTDOCS%%usr/share/doc/diffutils-3.3/NEWS
+%%PORTDOCS%%usr/share/doc/diffutils-3.3/README
 %%PORTDOCS%%usr/share/doc/e2fsprogs-1.42.9/COPYING
 %%PORTDOCS%%usr/share/doc/e2fsprogs-1.42.9/README
 %%PORTDOCS%%usr/share/doc/e2fsprogs-1.42.9/RELEASE-NOTES
@@ -1033,6 +1067,14 @@ usr/share/centos-release/EULA
 %%PORTDOCS%%usr/share/doc/gamin-0.1.10/server_structs.gif
 %%PORTDOCS%%usr/share/doc/gamin-0.1.10/socket.txt
 %%PORTDOCS%%usr/share/doc/gamin-0.1.10/using.html
+%%PORTDOCS%%usr/share/doc/gawk-4.0.2/COPYING
+%%PORTDOCS%%usr/share/doc/gawk-4.0.2/FUTURES
+%%PORTDOCS%%usr/share/doc/gawk-4.0.2/LIMITATIONS
+%%PORTDOCS%%usr/share/doc/gawk-4.0.2/NEWS
+%%PORTDOCS%%usr/share/doc/gawk-4.0.2/POSIX.STD
+%%PORTDOCS%%usr/share/doc/gawk-4.0.2/README
+%%PORTDOCS%%usr/share/doc/gawk-4.0.2/README.multibyte
+%%PORTDOCS%%usr/share/doc/gawk-4.0.2/README.tests
 %%PORTDOCS%%usr/share/doc/gdbm-1.10/AUTHORS
 %%PORTDOCS%%usr/share/doc/gdbm-1.10/COPYING
 %%PORTDOCS%%usr/share/doc/gdbm-1.10/NEWS
@@ -1729,9 +1771,12 @@ usr/share/i18n/locales/zu_ZA
 usr/share/icons
 usr/share/info/bash.info.gz
 usr/share/info/coreutils.info.gz
+usr/share/info/diffutils.info.gz
 usr/share/info/dir
 usr/share/info/find-maint.info.gz
 usr/share/info/find.info.gz
+usr/share/info/gawk.info.gz
+usr/share/info/gawkinet.info.gz
 usr/share/info/grep.info.gz
 usr/share/info/history.info.gz
 usr/share/info/info-stnd.info.gz
@@ -1781,6 +1826,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/bs/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ca/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/glib20.mo
@@ -1792,6 +1838,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ca@valencia/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/cs/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/glib20.mo
@@ -1804,7 +1851,9 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/cs/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/cy/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/da/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/da/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/libc.mo
@@ -1815,8 +1864,10 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/da/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/gdbm.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/grep.mo
@@ -1829,6 +1880,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/de/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/dz/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/el/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/el/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/el/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/el/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/el/LC_MESSAGES/grep.mo
@@ -1846,6 +1898,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/en_US/LC_MESSAGES/mit-krb5.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/eo/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/grep.mo
@@ -1855,8 +1908,10 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/eo/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/es/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/es/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/libc.mo
@@ -1881,7 +1936,9 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/fa/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/fi/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/fi/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/gdbm.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/grep.mo
@@ -1892,8 +1949,10 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/fi/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/libc.mo
@@ -1905,6 +1964,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/fur/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ga/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/grep.mo
@@ -1913,6 +1973,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ga/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/gd/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/gl/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/grep.mo
@@ -1922,11 +1983,13 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/util-linux.mo
 %%NLS%%usr/share/locale/gl/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/gu/LC_MESSAGES/glib20.mo
+%%NLS%%usr/share/locale/he/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/he/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/he/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/he/LC_MESSAGES/sed.mo
 %%NLS%%usr/share/locale/hi/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/hr/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/hr/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/hr/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/hr/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/hr/LC_MESSAGES/grep.mo
@@ -1937,6 +2000,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/hr/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/hu/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/grep.mo
@@ -1950,6 +2014,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ia/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/id/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/glib20.mo
@@ -1962,8 +2027,10 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/is/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/is/LC_MESSAGES/popt.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/libc.mo
@@ -1974,7 +2041,9 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/it/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/gdbm.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/grep.mo
@@ -2010,6 +2079,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/lt/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/lt/LC_MESSAGES/libc.mo
 %%NLS%%usr/share/locale/lt/LC_TIME/coreutils.mo
+%%NLS%%usr/share/locale/lv/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/lv/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/mai/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/mg/LC_MESSAGES/glib20.mo
@@ -2018,6 +2088,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/mn/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/mr/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ms/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ms/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ms/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ms/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ms/LC_TIME/coreutils.mo
@@ -2032,8 +2103,10 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ne/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/libc.mo
@@ -2049,8 +2122,10 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/pa/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/gdbm.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/grep.mo
@@ -2070,6 +2145,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/pt/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/grep.mo
@@ -2079,6 +2155,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/pt_BR/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ro/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/grep.mo
@@ -2088,6 +2165,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ro/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ru/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/grep.mo
@@ -2118,6 +2196,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/sl/LC_MESSAGES/util-linux.mo
 %%NLS%%usr/share/locale/sl/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/sq/LC_MESSAGES/glib20.mo
+%%NLS%%usr/share/locale/sr/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/sr/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/sr/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/sr/LC_MESSAGES/grep.mo
@@ -2127,8 +2206,10 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/sr@latin/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/libc.mo
@@ -2144,6 +2225,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/tl/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/tr/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/glib20.mo
@@ -2157,6 +2239,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ug/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/uk/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/gdbm.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/glib20.mo
@@ -2168,8 +2251,10 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/uk/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/findutils.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/libc.mo
@@ -2184,6 +2269,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/yi/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/glib20.mo
@@ -2197,6 +2283,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/zh_HK/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/grep.mo
@@ -2215,6 +2302,7 @@ usr/share/man/man1/:.1.gz
 usr/share/man/man1/[.1.gz
 usr/share/man/man1/alias.1.gz
 usr/share/man/man1/arch.1.gz
+usr/share/man/man1/awk.1.gz
 usr/share/man/man1/base64.1.gz
 usr/share/man/man1/basename.1.gz
 usr/share/man/man1/bash.1.gz
@@ -2251,6 +2339,7 @@ usr/share/man/man1/chrt.1.gz
 usr/share/man/man1/chsh.1.gz
 usr/share/man/man1/cksum.1.gz
 usr/share/man/man1/clear.1.gz
+usr/share/man/man1/cmp.1.gz
 usr/share/man/man1/col.1.gz
 usr/share/man/man1/colcrt.1.gz
 usr/share/man/man1/colrm.1.gz
@@ -2268,6 +2357,9 @@ usr/share/man/man1/date.1.gz
 usr/share/man/man1/dd.1.gz
 usr/share/man/man1/declare.1.gz
 usr/share/man/man1/df.1.gz
+usr/share/man/man1/dgawk.1.gz
+usr/share/man/man1/diff.1.gz
+usr/share/man/man1/diff3.1.gz
 usr/share/man/man1/dir.1.gz
 usr/share/man/man1/dircolors.1.gz
 usr/share/man/man1/dirname.1.gz
@@ -2297,6 +2389,7 @@ usr/share/man/man1/flock.1.gz
 usr/share/man/man1/fmt.1.gz
 usr/share/man/man1/fold.1.gz
 usr/share/man/man1/gapplication.1.gz
+usr/share/man/man1/gawk.1.gz
 usr/share/man/man1/gdbus.1.gz
 usr/share/man/man1/getopt.1.gz
 usr/share/man/man1/getopts.1.gz
@@ -2314,6 +2407,7 @@ usr/share/man/man1/history.1.gz
 usr/share/man/man1/hostid.1.gz
 usr/share/man/man1/id.1.gz
 usr/share/man/man1/idn.1.gz
+usr/share/man/man1/igawk.1.gz
 usr/share/man/man1/info.1.gz
 usr/share/man/man1/infocmp.1m.gz
 usr/share/man/man1/infokey.1.gz
@@ -2368,6 +2462,7 @@ usr/share/man/man1/od.1.gz
 usr/share/man/man1/oldfind.1.gz
 usr/share/man/man1/paste.1.gz
 usr/share/man/man1/pathchk.1.gz
+usr/share/man/man1/pgawk.1.gz
 usr/share/man/man1/pinky.1.gz
 usr/share/man/man1/popd.1.gz
 usr/share/man/man1/pr.1.gz
@@ -2392,6 +2487,7 @@ usr/share/man/man1/runcon.1.gz
 usr/share/man/man1/runuser.1.gz
 usr/share/man/man1/script.1.gz
 usr/share/man/man1/scriptreplay.1.gz
+usr/share/man/man1/sdiff.1.gz
 usr/share/man/man1/sed.1.gz
 usr/share/man/man1/seq.1.gz
 usr/share/man/man1/set.1.gz
diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index 561d6fb80946..c9dd1143d106 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.7-8640 # git rev-list --count HEAD
-DISTVERSIONSUFFIX=	-g08c12f4c0
+DISTVERSION=	0.0.7-8690 # git rev-list --count HEAD
+DISTVERSIONSUFFIX=	-g27af75fe7
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -38,19 +38,24 @@ USES=		cmake compiler:c++17-lang iconv:wchar_t localbase:ldflags \
 USE_GL=		gl glew
 USE_QT=		qmake_build buildtools_build core dbus declarative gui network widgets
 USE_XORG=	x11
-LLD_UNSAFE=	yes # XXX ports/219089
 CMAKE_ON=	CMAKE_SKIP_RPATH USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG
 CMAKE_OFF=	USE_NATIVE_INSTRUCTIONS
 LDFLAGS+=	-Wl,--as-needed # GLU
 
+# XXX Drop after FreeBSD 12.0 EOL
+.if exists(/usr/lib/clang/6.0.1)
+LLD_UNSAFE=	yes # XXX ports/219089
+.endif
+
 # XXX Remove after FreeBSD 11.2/12.0 reach EOL i.e., around 2020-02-01
 .if !exists(/usr/include/c++/v1/charconv) && exists(/usr/lib/libc++.so)
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-revert-f9ad6358563b
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-revert-4504ac2d1248
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-revert-5bd17a44c972
 .endif
 
 OPTIONS_DEFINE=	ALSA EVDEV GDB LLVM PULSEAUDIO VULKAN
-OPTIONS_DEFAULT=ALSA LLVM VULKAN
+OPTIONS_DEFAULT=LLVM VULKAN
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo
index 9acc58f68dbc..9cf21c19101f 100644
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1567469989
-SHA256 (RPCS3-rpcs3-v0.0.7-8640-g08c12f4c0_GH0.tar.gz) = f983c882af6fbd2078c8a3838e9ff3c42ec2f536f1fff3aa69066132a39084f5
-SIZE (RPCS3-rpcs3-v0.0.7-8640-g08c12f4c0_GH0.tar.gz) = 5556484
+TIMESTAMP = 1568233855
+SHA256 (RPCS3-rpcs3-v0.0.7-8690-g27af75fe7_GH0.tar.gz) = b61ee696f3f555efaee90fef8fe49a1280d146a8029d53b76f848383c39dac50
+SIZE (RPCS3-rpcs3-v0.0.7-8690-g27af75fe7_GH0.tar.gz) = 5573156
 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5
 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 105400
 SHA256 (RPCS3-llvm-b860b5e8f4ee_GH0.tar.gz) = c151972a0c8ceac568c24b61e63d2ecbdac0f125185e23fc2238e0a14048256e
diff --git a/emulators/rpcs3/files/extra-patch-revert-4504ac2d1248 b/emulators/rpcs3/files/extra-patch-revert-4504ac2d1248
new file mode 100644
index 000000000000..05bc7ade21c1
--- /dev/null
+++ b/emulators/rpcs3/files/extra-patch-revert-4504ac2d1248
@@ -0,0 +1,218 @@
+rpcs3/util/atomic.cpp:95:3: error: use of undeclared identifier 'fallback_wait'
+                fallback_wait(data, size, old_value, timeout);
+                ^
+rpcs3/util/atomic.cpp:219:4: error: use of undeclared identifier 'fallback_notify_one'
+                        fallback_notify_one(data);
+                        ^
+rpcs3/util/atomic.cpp:307:5: error: use of undeclared identifier 'fallback_notify_all'
+                                fallback_notify_all(data);
+                                ^
+
+--- rpcs3/util/atomic.cpp.orig	2019-09-10 16:25:39 UTC
++++ rpcs3/util/atomic.cpp
+@@ -15,14 +15,11 @@
+ // Pointer mask without bits used as hash, assuming signed 48-bit pointers
+ static constexpr u64 s_pointer_mask = 0xffff'ffff'ffff & ~(s_hashtable_size - 1);
+ 
+-// Max number of waiters is 32767
+-static constexpr u64 s_waiter_mask = 0x7fff'0000'0000'0000;
+-
+-//
+-static constexpr u64 s_collision_bit = 0x8000'0000'0000'0000;
++// Max number of waiters is 65535
++static constexpr u64 s_waiter_mask = 0xffff'0000'0000'0000;
+ 
+ // Implementation detail (remaining bits out of 32 available for futex)
+-static constexpr u64 s_signal_mask = 0xffffffff & ~(s_waiter_mask | s_pointer_mask | s_collision_bit);
++static constexpr u64 s_signal_mask = 0xffffffff & ~(s_waiter_mask | s_pointer_mask);
+ 
+ // Callback for wait() function, returns false if wait should return
+ static thread_local bool(*s_tls_wait_cb)(const void* data) = [](const void*)
+@@ -182,8 +179,6 @@
+ 
+ 	u32 new_value = 0;
+ 
+-	bool fallback = false;
+-
+ 	const auto [_, ok] = entry.fetch_op([&](u64& value)
+ 	{
+ 		if ((value & s_waiter_mask) == s_waiter_mask || (value & s_signal_mask) == s_signal_mask)
+@@ -196,17 +191,11 @@
+ 		{
+ 			// Store pointer bits
+ 			value |= (iptr & s_pointer_mask);
+-			fallback = false;
+-
+-#ifdef _WIN32
+-			value += s_signal_mask & -s_signal_mask;
+-#endif
+ 		}
+ 		else
+ 		{
+-			// Set collision bit
+-			value |= s_collision_bit;
+-			fallback = true;
++			// Set pointer bits to all ones (collision, TODO)
++			value |= s_pointer_mask;
+ 		}
+ 
+ 		// Add waiter
+@@ -220,11 +209,7 @@
+ 		return;
+ 	}
+ 
+-	if (fallback)
+-	{
+-		fallback_wait(data, size, old_value, timeout);
+-	}
+-	else if (ptr_cmp(data, size, old_value) && s_tls_wait_cb(data))
++	if (ptr_cmp(data, size, old_value) && s_tls_wait_cb(data))
+ 	{
+ #ifdef _WIN32
+ 		LARGE_INTEGER qw;
+@@ -260,13 +245,6 @@
+ 			{
+ 				value -= s_waiter_mask & -s_waiter_mask;
+ 
+-#ifdef _WIN32
+-				if (!fallback)
+-				{
+-					value -= s_signal_mask & -s_signal_mask;
+-				}
+-#endif
+-
+ 				if ((value & s_waiter_mask) == 0)
+ 				{
+ 					// Reset on last waiter
+@@ -279,7 +257,7 @@
+ 			return false;
+ 		});
+ 
+-		if (ok || fallback)
++		if (ok)
+ 		{
+ 			break;
+ 		}
+@@ -306,20 +284,15 @@
+ 
+ 	atomic_t<u64>& entry = s_hashtable[iptr % s_hashtable_size];
+ 
++	bool fallback = false;
++
+ 	const auto [prev, ok] = entry.fetch_op([&](u64& value)
+ 	{
+ 		if (value & s_waiter_mask && (value & s_pointer_mask) == (iptr & s_pointer_mask))
+ 		{
+ #ifdef _WIN32
+-			if ((value & s_signal_mask) == 0)
+-			{
+-				// No relevant waiters, do nothing
+-				return false;
+-			}
+-
+-			// Try to decrement if possible
++			// Try to decrement if no collision
+ 			value -= s_waiter_mask & -s_waiter_mask;
+-			value -= s_signal_mask & -s_signal_mask;
+ 
+ 			if ((value & s_waiter_mask) == 0)
+ 			{
+@@ -337,22 +310,30 @@
+ 
+ 			if ((value & s_signal_mask) == s_signal_mask)
+ 			{
+-				// Signal will overflow, fallback to notify_all
+-				notify_all(data);
++				// Signal will overflow, fallback
++				fallback = true;
+ 				return false;
+ 			}
+ #endif
++
+ 			return true;
+ 		}
+-		else if (value & s_waiter_mask && value & s_collision_bit)
++
++		if (value & s_waiter_mask && (value & s_pointer_mask) == s_pointer_mask)
+ 		{
+-			fallback_notify_one(data);
+-			return false;
++			// Collision, notify everything
++			fallback = true;
+ 		}
+ 
+ 		return false;
+ 	});
+ 
++	if (fallback)
++	{
++		notify_all(data);
++		return;
++	}
++
+ 	if (ok)
+ 	{
+ #ifdef _WIN32
+@@ -375,32 +356,11 @@
+ 	{
+ 		if (value & s_waiter_mask)
+ 		{
+-			if ((value & s_pointer_mask) == (iptr & s_pointer_mask))
++			if ((value & s_pointer_mask) == s_pointer_mask || (value & s_pointer_mask) == (iptr & s_pointer_mask))
+ 			{
+-				if ((value & s_signal_mask) == 0)
+-				{
+-					// No relevant waiters, do nothing
+-					return false;
+-				}
+-
+-				const u64 count = (value & s_signal_mask) / (s_signal_mask & -s_signal_mask);
+-				value -= (s_waiter_mask & -s_waiter_mask) * count;
+-				value -= (s_signal_mask & -s_signal_mask) * count;
+-
+-				if ((value & s_waiter_mask) == 0)
+-				{
+-					// Reset on last waiter
+-					value = 0;
+-				}
+-
++				value = 0;
+ 				return true;
+ 			}
+-
+-			if (value & s_collision_bit)
+-			{
+-				fallback_notify_all(data);
+-				return false;
+-			}
+ 		}
+ 
+ 		return false;
+@@ -411,7 +371,7 @@
+ 		return;
+ 	}
+ 
+-	for (u64 count = old & s_signal_mask; count; count -= s_signal_mask & -s_signal_mask)
++	for (u64 count = old & s_waiter_mask; count; count -= s_waiter_mask & -s_waiter_mask)
+ 	{
+ 		NtReleaseKeyedEvent(nullptr, &entry, false, nullptr);
+ 	}
+@@ -426,17 +386,11 @@
+ 				return false;
+ 			}
+ 
+-			if ((value & s_pointer_mask) == (iptr & s_pointer_mask))
++			if ((value & s_pointer_mask) == s_pointer_mask || (value & s_pointer_mask) == (iptr & s_pointer_mask))
+ 			{
+ 				value += s_signal_mask & -s_signal_mask;
+ 				return true;
+ 			}
+-
+-			if (value & s_collision_bit)
+-			{
+-				fallback_notify_all(data);
+-				return false;
+-			}
+ 		}
+ 
+ 		return false;
diff --git a/emulators/rpcs3/files/extra-patch-revert-5bd17a44c972 b/emulators/rpcs3/files/extra-patch-revert-5bd17a44c972
index 1071fe0069ab..cb64ca6c8bc7 100644
--- a/emulators/rpcs3/files/extra-patch-revert-5bd17a44c972
+++ b/emulators/rpcs3/files/extra-patch-revert-5bd17a44c972
@@ -25,7 +25,7 @@ rpcs3/util/atomic.cpp:94:7: error: member reference base type 'unsigned long' is
                 ptls->mapped().cond.notify_one();
                 ~~~~^ ~~~~~~
 
---- rpcs3/util/atomic.cpp.orig	2019-08-04 18:16:19 UTC
+--- rpcs3/util/atomic.cpp.orig	2019-09-10 16:25:39 UTC
 +++ rpcs3/util/atomic.cpp
 @@ -2,10 +2,6 @@
  
@@ -38,7 +38,7 @@ rpcs3/util/atomic.cpp:94:7: error: member reference base type 'unsigned long' is
  // Should be at least 65536, currently 2097152.
  static constexpr std::uintptr_t s_hashtable_size = 1u << 21;
  
-@@ -31,113 +27,6 @@ static inline bool ptr_cmp(const void* data, std::size_t size, u64 old_value)
+@@ -40,134 +36,8 @@ static inline bool ptr_cmp(const void* data, std::size
  	return false;
  }
  
@@ -77,22 +77,41 @@ rpcs3/util/atomic.cpp:94:7: error: member reference base type 'unsigned long' is
 -		return s_waiter_maps[std::hash<const void*>()(ptr) % std::size(s_waiter_maps)];
 -	}
 -
--	void fallback_wait(const void* data, std::size_t size, u64 old_value)
+-	void fallback_wait(const void* data, std::size_t size, u64 old_value, u64 timeout)
 -	{
 -		auto& wmap = get_fallback_map(data);
 -
+-		if (!timeout)
+-		{
+-			return;
+-		}
+-
 -		// Update node key
 -		s_tls_waiter.key() = data;
 -
--		if (std::unique_lock lock(wmap.mutex); ptr_cmp(data, size, old_value))
+-		if (std::unique_lock lock(wmap.mutex); ptr_cmp(data, size, old_value) && s_tls_wait_cb(data))
 -		{
 -			// Add node to the waiter list
--			std::condition_variable& cond = wmap.list.insert(std::move(s_tls_waiter))->second.cond;
+-			const auto iter = wmap.list.insert(std::move(s_tls_waiter));
 -
 -			// Wait until the node is returned to its TLS location
+-			if (timeout + 1)
+-			{
+-				if (!iter->second.cond.wait_for(lock, std::chrono::nanoseconds(timeout), [&]
+-				{
+-					return 1 && s_tls_waiter;
+-				}))
+-				{
+-					// Put it back
+-					s_tls_waiter = wmap.list.extract(iter);
+-				}
+-
+-				return;
+-			}
+-
 -			while (!s_tls_waiter)
 -			{
--				cond.wait(lock);
+-				iter->second.cond.wait(lock);
 -			}
 -		}
 -	}
@@ -132,9 +151,9 @@ rpcs3/util/atomic.cpp:94:7: error: member reference base type 'unsigned long' is
 -
 -#if !defined(_WIN32) && !defined(__linux__)
 -
--void atomic_storage_futex::wait(const void* data, std::size_t size, u64 old_value)
--{
--	fallback_wait(data, size, old_value);
+ void atomic_storage_futex::wait(const void* data, std::size_t size, u64 old_value, u64 timeout)
+ {
+-	fallback_wait(data, size, old_value, timeout);
 -}
 -
 -void atomic_storage_futex::notify_one(const void* data)
@@ -149,12 +168,17 @@ rpcs3/util/atomic.cpp:94:7: error: member reference base type 'unsigned long' is
 -
 -#else
 -
- void atomic_storage_futex::wait(const void* data, std::size_t size, u64 old_value)
- {
- #ifdef _WIN32
-@@ -337,5 +226,3 @@ void atomic_storage_futex::notify_all(const void* data)
+-void atomic_storage_futex::wait(const void* data, std::size_t size, u64 old_value, u64 timeout)
+-{
+ 	if (!timeout)
+ 	{
+ 		return;
+@@ -402,8 +272,6 @@ void atomic_storage_futex::notify_all(const void* data
  	}
  #endif
  }
 -
 -#endif
+ 
+ void atomic_storage_futex::set_wait_callback(bool(*cb)(const void* data))
+ {
diff --git a/emulators/rpcs3/files/patch-rpcs3_Emu_Audio_ALSA_ALSABackend.cpp b/emulators/rpcs3/files/patch-rpcs3_Emu_Audio_ALSA_ALSABackend.cpp
deleted file mode 100644
index 6f0fc222e63a..000000000000
--- a/emulators/rpcs3/files/patch-rpcs3_Emu_Audio_ALSA_ALSABackend.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-Revert https://github.com/RPCS3/rpcs3/commit/d4591b15083b as ALSA on
-FreeBSD can only use plugins i.e., no kernel support.
-
---- rpcs3/Emu/Audio/ALSA/ALSABackend.cpp.orig	2019-01-22 20:10:17 UTC
-+++ rpcs3/Emu/Audio/ALSA/ALSABackend.cpp
-@@ -139,7 +139,7 @@ bool ALSABackend::AddData(const void* src, u32 num_sam
- 		return false;
- 	}
- 
--	if (false)
-+	if (res < 0)
- 	{
- 		res = snd_pcm_recover(tls_handle, res, 0);
- 
diff --git a/emulators/rpcs3/files/patch-rpcs3_Emu_IdManager.h b/emulators/rpcs3/files/patch-rpcs3_Emu_IdManager.h
new file mode 100644
index 000000000000..1691691d9a4f
--- /dev/null
+++ b/emulators/rpcs3/files/patch-rpcs3_Emu_IdManager.h
@@ -0,0 +1,13 @@
+https://github.com/RPCS3/rpcs3/issues/6529
+
+--- rpcs3/Emu/IdManager.h.orig	2019-09-09 16:16:02 UTC
++++ rpcs3/Emu/IdManager.h
+@@ -30,7 +30,7 @@ namespace id_manager
+ 		static const u32 base    = T::id_base;
+ 		static const u32 step    = T::id_step;
+ 		static const u32 count   = T::id_count;
+-		static const u32 invalid = base > 0 ? 0 : -1;
++		static constexpr u32 invalid = base > 0 ? 0 : -1;
+ 
+ 		// Note: full 32 bits range cannot be used at current implementation
+ 		static_assert(count > 0 && step > 0 && u64{step} * count + base < u64{UINT32_MAX} + (base != 0 ? 1 : 0), "ID traits: invalid object range");
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 067ffb44fa4a..7b62a6f31d49 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -109,14 +109,14 @@ EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefil
 .endif
 
 post-patch:
-	@${ECHO} 'VBOX_ONLY_ADDITIONS = 1' > ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_X11}' >> \
+	@${ECHO_CMD} 'VBOX_ONLY_ADDITIONS = 1' > ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_X11}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_X11}' >> \
+	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_X11}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> \
+	@${ECHO_CMD} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk
 .if ${COMPILER_TYPE} == clang
 	@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
 	    -e 's| -fno-merge-constants||' \
@@ -140,14 +140,14 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk \
 	    ${WRKSRC}/src/VBox/Runtime/Makefile.kmk \
 	    ${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
-	@${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 
 post-patch-OPENGL-on:
-	@${ECHO} 'VBOX_USE_SYSTEM_GL_HEADERS = 1' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_USE_SYSTEM_GL_HEADERS = 1' >> ${WRKSRC}/LocalConfig.kmk
 
 post-patch-X11-on:
-	@${ECHO} 'VBOX_USE_SYSTEM_XORG_HEADERS = 1' >> \
+	@${ECHO_CMD} 'VBOX_USE_SYSTEM_XORG_HEADERS = 1' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 
 pre-build:
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index 35dfec852e59..906898d82722 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -80,12 +80,12 @@ SYMBOLSUFFIX=	debug
 PLIST_SUB+=	SYMBOLSUFFIX=${SYMBOLSUFFIX}
 
 post-patch:
-	@${ECHO} 'VBOX_WITH_VBOXDRV = 1' > ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_NETFLT = 1' >> ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_NETADP = 1' >> ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_VBOXDRV = 1' > ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_NETFLT = 1' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_NETADP = 1' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
 .if ${PORT_OPTIONS:MVIMAGE}
-	@${ECHO} 'VBOX_WITH_NETFLT_VIMAGE = 1' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_NETFLT_VIMAGE = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 	    ${WRKSRC}/Config.kmk ${WRKSRC}/configure
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 6805eb32fc34..d4e6659ac130 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -230,60 +230,60 @@ CONFIGURE_ARGS+=	--with-openssl-dir="${OPENSSLBASE}"
 pre-everything::
 .if ${ARCH} == "amd64"
 .if ${_ELF32} != yes
-	@${ECHO} 'Requires 32-bit runtime support in kernel.'
-	@${ECHO} 'Rebuild kernel with "options COMPAT_FREEBSD32" and reboot.'
+	@${ECHO_MSG} 'Requires 32-bit runtime support in kernel.'
+	@${ECHO_MSG} 'Rebuild kernel with "options COMPAT_FREEBSD32" and reboot.'
 	@${FALSE}
 .elif !exists(/usr/lib32/libc.so)
-	@${ECHO} 'Requires 32-bit libraries installed under /usr/lib32.'
-	@${ECHO} 'Do: cd /usr/src; make build32 install32; service ldconfig restart'
+	@${ECHO_MSG} 'Requires 32-bit libraries installed under /usr/lib32.'
+	@${ECHO_MSG} 'Do: cd /usr/src; make build32 install32; service ldconfig restart'
 	@${FALSE}
 .endif
 .endif
 
 post-patch:
-	@${ECHO} 'VBOX_PATH_APP_PRIVATE_ARCH = ${VBOX_DIR}' > \
+	@${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE_ARCH = ${VBOX_DIR}' > \
 	    ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_PATH_DOCBOOK = ${DBKXSLDIR}' >> \
+	@${ECHO_CMD} 'VBOX_PATH_DOCBOOK = ${DBKXSLDIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_PATH_DOCBOOK_DTD = ${DBKXMLDIR}' >> \
+	@${ECHO_CMD} 'VBOX_PATH_DOCBOOK_DTD = ${DBKXMLDIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_PATH_SHARED_LIBS = ${VBOX_DIR}' >> \
+	@${ECHO_CMD} 'VBOX_PATH_SHARED_LIBS = ${VBOX_DIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_RUNPATH = ${VBOX_DIR}' >> \
+	@${ECHO_CMD} 'VBOX_WITH_RUNPATH = ${VBOX_DIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> \
+	@${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_PATH_APP_DOCS = ${DOCSDIR}' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_PATH_APP_DOCS = ${DOCSDIR}' >> ${WRKSRC}/LocalConfig.kmk
 .if ${SSL_DEFAULT} != base
-	@${ECHO} 'VBOX_WITH_ALT_HASH_CODE = 1' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_ALT_HASH_CODE = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
-	@${ECHO} 'VBOX_WITH_EXTPACK_VBOXDTRACE =' >> ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_INSTALLER = 1' >> ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_VBOXDRV =' >> ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_TESTCASES =' >> ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'SDK_VBOX_LIBPNG_INCS = ${PREFIX}/include/libpng' >> \
+	@${ECHO_CMD} 'VBOX_WITH_EXTPACK_VBOXDTRACE =' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_INSTALLER = 1' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_VBOXDRV =' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_TESTCASES =' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'SDK_VBOX_LIBPNG_INCS = ${PREFIX}/include/libpng' >> \
 	    ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_QT}' >> \
+	@${ECHO_CMD} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_QT}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_QT}' >> \
+	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_QT}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_VALIDATIONKIT =' >> ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_VALIDATIONKIT =' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
 .if ${PORT_OPTIONS:MR0LOGGING}
-	@${ECHO} 'VBOX_WITH_R0_LOGGING = 1' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_R0_LOGGING = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 .if ${PORT_OPTIONS:MWEBSERVICE}
-	@${ECHO} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_PATH_GSOAP = ${PREFIX}/lib/gsoap' >> \
+	@${ECHO_CMD} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_PATH_GSOAP = ${PREFIX}/lib/gsoap' >> \
 	    ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_PATH_GSOAP_BIN = ${PREFIX}/bin' >> \
+	@${ECHO_CMD} 'VBOX_PATH_GSOAP_BIN = ${PREFIX}/bin' >> \
 	    ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> \
+	@${ECHO_CMD} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> \
 	    ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \
+	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 .endif
 .if ${COMPILER_TYPE} == clang
@@ -291,7 +291,7 @@ post-patch:
 	    -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk
 	@${REINPLACE_CMD} -e 's| -fpermissive||' ${WRKSRC}/Config.kmk \
 	    ${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk
-	@${ECHO} 'TOOL_VBoxGccFreeBSD_LD = ${CXX}' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'TOOL_VBoxGccFreeBSD_LD = ${CXX}' >> ${WRKSRC}/LocalConfig.kmk
 	@${SED} -e 's|GXX3|VBoxGccFreeBSD|g' \
 	    ${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \
 	    ${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk
@@ -308,7 +308,7 @@ post-patch:
 .if empty(ICONV_LIB)
 	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk \
 	    ${WRKSRC}/src/VBox/Runtime/Makefile.kmk
-	@${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/local/lib/virtualbox|${VBOX_DIR}|' \
 	    -e 's|/usr/local|${PREFIX}|' \
diff --git a/emulators/wine/files/patch-dlls_iphlpapi_ipstats.c b/emulators/wine/files/patch-dlls_iphlpapi_ipstats.c
index 07e9526bbab8..434df520f94d 100644
--- a/emulators/wine/files/patch-dlls_iphlpapi_ipstats.c
+++ b/emulators/wine/files/patch-dlls_iphlpapi_ipstats.c
@@ -1,3 +1,6 @@
+This has been merged upstream in Wine 4.15 (in a slightly tweaked manner),
+so we should be able to drop it latest with the next major release.
+
 --- UTC
 --- dlls/iphlpapi/ipstats.c.orig	2017-03-21 00:03:25.304042000 -0700
 +++ dlls/iphlpapi/ipstats.c	2017-03-21 00:09:42.312023000 -0700
diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile
index 3d8c212566e3..c1584d7c8484 100644
--- a/emulators/yuzu/Makefile
+++ b/emulators/yuzu/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	yuzu
-PORTVERSION=	s20190901
+PORTVERSION=	s20190909
 PORTREVISION?=	0
 CATEGORIES=	emulators
 
@@ -28,7 +28,7 @@ BUILD_DEPENDS=	boost-libs>=1.66:devel/boost-libs \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yuzu-emu
-GH_TAGNAME=	50b5bb44a
+GH_TAGNAME=	07a024253
 GH_TUPLE=	yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn/externals/unicorn \
 		DarkLordZach:mbedtls:a280e60:mbedtls/externals/mbedtls \
 		KhronosGroup:SPIRV-Headers:2c51218:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \
@@ -40,7 +40,7 @@ GH_TUPLE=	yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn/externals/unicorn \
 		citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \
 		citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \
 		facebook:zstd:v1.3.8:zstd/externals/zstd \
-		fmtlib:fmt:5.3.0:fmt/externals/fmt \
+		fmtlib:fmt:6.0.0:fmt/externals/fmt \
 		kinetiknz:cubeb:cubeb-0.2-1098-g6f2420d:cubeb/externals/cubeb \
 		lz4:lz4:v1.8.0-8-g4db65c1:lz4/externals/lz4 \
 		ogniK5377:opus:v1.3-rc-20-g562f8ba5:opus/externals/opus \
@@ -53,23 +53,23 @@ LDFLAGS+=	-Wl,--as-needed # Qt5Network
 TEST_TARGET=	test
 
 OPTIONS_DEFINE=	ALSA PULSEAUDIO JACK SNDIO
-OPTIONS_DEFAULT=ALSA PULSEAUDIO JACK
+OPTIONS_DEFAULT=ALSA PULSEAUDIO JACK SNDIO
 OPTIONS_MULTI=	GUI
 OPTIONS_MULTI_GUI=	QT5 SDL
 OPTIONS_SLAVE?=	SDL
 OPTIONS_EXCLUDE:=	${OPTIONS_MULTI_GUI}
 
-ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_BUILD_DEPENDS=	alsa-lib>0:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_CMAKE_BOOL=	USE_ALSA
 
 JACK_BUILD_DEPENDS=	jackit>0:audio/jack
 JACK_CMAKE_BOOL=	USE_JACK
 
-PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0.:audio/pulseaudio
+PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	USE_PULSE
 
-SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
+SNDIO_BUILD_DEPENDS=	sndio>0:audio/sndio
 SNDIO_CMAKE_BOOL=	USE_SNDIO
 
 SDL_CMAKE_BOOL=	ENABLE_SDL2
diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo
index 0001c534173e..b21867a74de5 100644
--- a/emulators/yuzu/distinfo
+++ b/emulators/yuzu/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1567357985
-SHA256 (yuzu-emu-yuzu-s20190901-50b5bb44a_GH0.tar.gz) = dc94a90d66b2f8b797afbe4e20b3b5e063ba41c7b0412a9fab8ed059646668e8
-SIZE (yuzu-emu-yuzu-s20190901-50b5bb44a_GH0.tar.gz) = 2713991
+TIMESTAMP = 1568011528
+SHA256 (yuzu-emu-yuzu-s20190909-07a024253_GH0.tar.gz) = 2d23e6015664f52cf8440735f56414358083e79b64a142255bc4cd08ae2f01f3
+SIZE (yuzu-emu-yuzu-s20190909-07a024253_GH0.tar.gz) = 2744286
 SHA256 (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 8f7b4d8eb998c2a4c146268d83b44fc22ca8d4d276f26d6af1071e51f4b5bd4f
 SIZE (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 3296254
 SHA256 (DarkLordZach-mbedtls-a280e60_GH0.tar.gz) = 4fc6ddc256bc75b975fd5ad8bb7d31ff79c62d49daafb0108585c9ef80c6c5a7
@@ -23,8 +23,8 @@ SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b
 SIZE (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = 59514
 SHA256 (facebook-zstd-v1.3.8_GH0.tar.gz) = 90d902a1282cc4e197a8023b6d6e8d331c1fd1dfe60f7f8e4ee9da40da886dc3
 SIZE (facebook-zstd-v1.3.8_GH0.tar.gz) = 1875233
-SHA256 (fmtlib-fmt-5.3.0_GH0.tar.gz) = defa24a9af4c622a7134076602070b45721a43c51598c8456ec6f2c4dbb51c89
-SIZE (fmtlib-fmt-5.3.0_GH0.tar.gz) = 662493
+SHA256 (fmtlib-fmt-6.0.0_GH0.tar.gz) = f1907a58d5e86e6c382e51441d92ad9e23aea63827ba47fd647eacc0d3a16c78
+SIZE (fmtlib-fmt-6.0.0_GH0.tar.gz) = 708425
 SHA256 (kinetiknz-cubeb-cubeb-0.2-1098-g6f2420d_GH0.tar.gz) = f13de26eb3bdf4bf328ca199e78b242b10f750ce29c064ac650995e62e520e28
 SIZE (kinetiknz-cubeb-cubeb-0.2-1098-g6f2420d_GH0.tar.gz) = 202308
 SHA256 (lz4-lz4-v1.8.0-8-g4db65c1_GH0.tar.gz) = 31a61b29dcb0204c9ac283d24cd53ae4d7e15e6f4e7dd88919d965ff9cf8ced5
diff --git a/emulators/yuzu/files/patch-cubeb-dlopen b/emulators/yuzu/files/patch-cubeb-dlopen
new file mode 100644
index 000000000000..53d46f24d97a
--- /dev/null
+++ b/emulators/yuzu/files/patch-cubeb-dlopen
@@ -0,0 +1,799 @@
+https://github.com/kinetiknz/cubeb/commit/0d1d9d84fb3e
+https://github.com/kinetiknz/cubeb/pull/539
+
+diff --git externals/cubeb/CMakeLists.txt externals/cubeb/CMakeLists.txt
+index cdb00f9..71373cb 100644
+--- externals/cubeb/CMakeLists.txt
++++ externals/cubeb/CMakeLists.txt
+@@ -135,10 +135,7 @@ if(USE_PULSE)
+   target_sources(cubeb PRIVATE
+     src/cubeb_pulse.c)
+   target_compile_definitions(cubeb PRIVATE USE_PULSE)
+-  target_link_libraries(cubeb PRIVATE pulse)
+-  if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+-    target_link_libraries(cubeb PRIVATE dl)
+-  endif()
++  target_link_libraries(cubeb PRIVATE pthread ${CMAKE_DL_LIBS})
+ endif()
+ 
+ check_include_files(alsa/asoundlib.h USE_ALSA)
+@@ -146,10 +143,7 @@ if(USE_ALSA)
+   target_sources(cubeb PRIVATE
+     src/cubeb_alsa.c)
+   target_compile_definitions(cubeb PRIVATE USE_ALSA)
+-  target_link_libraries(cubeb PRIVATE asound pthread)
+-  if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+-    target_link_libraries(cubeb PRIVATE dl)
+-  endif()
++  target_link_libraries(cubeb PRIVATE pthread ${CMAKE_DL_LIBS})
+ endif()
+ 
+ check_include_files(jack/jack.h USE_JACK)
+@@ -157,10 +151,7 @@ if(USE_JACK)
+   target_sources(cubeb PRIVATE
+     src/cubeb_jack.cpp)
+   target_compile_definitions(cubeb PRIVATE USE_JACK)
+-  target_link_libraries(cubeb PRIVATE jack pthread)
+-  if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+-    target_link_libraries(cubeb PRIVATE dl)
+-  endif()
++  target_link_libraries(cubeb PRIVATE pthread ${CMAKE_DL_LIBS})
+ endif()
+ 
+ check_include_files(audioclient.h USE_WASAPI)
+@@ -201,7 +192,7 @@ if(USE_SNDIO)
+   target_sources(cubeb PRIVATE
+     src/cubeb_sndio.c)
+   target_compile_definitions(cubeb PRIVATE USE_SNDIO)
+-  target_link_libraries(cubeb PRIVATE sndio)
++  target_link_libraries(cubeb PRIVATE pthread)
+ endif()
+ 
+ check_include_files(kai.h USE_KAI)
+diff --git externals/cubeb/src/cubeb.c externals/cubeb/src/cubeb.c
+index e562a35..d66dd16 100644
+--- externals/cubeb/src/cubeb.c
++++ externals/cubeb/src/cubeb.c
+@@ -177,6 +177,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
+ #if defined(USE_JACK)
+     jack_init,
+ #endif
++#if defined(USE_SNDIO)
++    sndio_init,
++#endif
+ #if defined(USE_ALSA)
+     alsa_init,
+ #endif
+@@ -189,9 +192,6 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
+ #if defined(USE_WINMM)
+     winmm_init,
+ #endif
+-#if defined(USE_SNDIO)
+-    sndio_init,
+-#endif
+ #if defined(USE_OPENSL)
+     opensl_init,
+ #endif
+diff --git externals/cubeb/src/cubeb_alsa.c externals/cubeb/src/cubeb_alsa.c
+index bfd4d8f..a29eed0 100644
+--- externals/cubeb/src/cubeb_alsa.c
++++ externals/cubeb/src/cubeb_alsa.c
+@@ -14,10 +14,58 @@
+ #include <limits.h>
+ #include <poll.h>
+ #include <unistd.h>
++#include <dlfcn.h>
+ #include <alsa/asoundlib.h>
+ #include "cubeb/cubeb.h"
+ #include "cubeb-internal.h"
+ 
++#ifdef DISABLE_LIBASOUND_DLOPEN
++#define WRAP(x) x
++#else
++#define WRAP(x) cubeb_##x
++#define LIBASOUND_API_VISIT(X)                   \
++  X(snd_config)                                  \
++  X(snd_config_add)                              \
++  X(snd_config_copy)                             \
++  X(snd_config_delete)                           \
++  X(snd_config_get_id)                           \
++  X(snd_config_get_string)                       \
++  X(snd_config_imake_integer)                    \
++  X(snd_config_search)                           \
++  X(snd_config_search_definition)                \
++  X(snd_lib_error_set_handler)                   \
++  X(snd_pcm_avail_update)                        \
++  X(snd_pcm_close)                               \
++  X(snd_pcm_delay)                               \
++  X(snd_pcm_drain)                               \
++  X(snd_pcm_frames_to_bytes)                     \
++  X(snd_pcm_get_params)                          \
++  X(snd_pcm_hw_params_any)                       \
++  X(snd_pcm_hw_params_get_channels_max)          \
++  X(snd_pcm_hw_params_get_rate)                  \
++  X(snd_pcm_hw_params_set_rate_near)             \
++  X(snd_pcm_hw_params_sizeof)                    \
++  X(snd_pcm_nonblock)                            \
++  X(snd_pcm_open)                                \
++  X(snd_pcm_open_lconf)                          \
++  X(snd_pcm_pause)                               \
++  X(snd_pcm_poll_descriptors)                    \
++  X(snd_pcm_poll_descriptors_count)              \
++  X(snd_pcm_poll_descriptors_revents)            \
++  X(snd_pcm_readi)                               \
++  X(snd_pcm_recover)                             \
++  X(snd_pcm_set_params)                          \
++  X(snd_pcm_start)                               \
++  X(snd_pcm_state)                               \
++  X(snd_pcm_writei)                              \
++
++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x;
++LIBASOUND_API_VISIT(MAKE_TYPEDEF);
++#undef MAKE_TYPEDEF
++/* snd_pcm_hw_params_alloca is actually a macro */
++#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof
++#endif
++
+ #define CUBEB_STREAM_MAX 16
+ #define CUBEB_WATCHDOG_MS 10000
+ 
+@@ -36,6 +84,7 @@ static struct cubeb_ops const alsa_ops;
+ 
+ struct cubeb {
+   struct cubeb_ops const * ops;
++  void * libasound;
+ 
+   pthread_t thread;
+ 
+@@ -245,8 +294,8 @@ set_timeout(struct timeval * timeout, unsigned int ms)
+ static void
+ stream_buffer_decrement(cubeb_stream * stm, long count)
+ {
+-  char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count);
+-  memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count));
++  char * bufremains = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count);
++  memmove(stm->buffer, bufremains, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes - count));
+   stm->bufframes -= count;
+ }
+ 
+@@ -278,9 +327,9 @@ alsa_process_stream(cubeb_stream * stm)
+   /* Call _poll_descriptors_revents() even if we don't use it
+      to let underlying plugins clear null events.  Otherwise poll()
+      may wake up again and again, producing unnecessary CPU usage. */
+-  snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents);
++  WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents);
+ 
+-  avail = snd_pcm_avail_update(stm->pcm);
++  avail = WRAP(snd_pcm_avail_update)(stm->pcm);
+ 
+   /* Got null event? Bail and wait for another wakeup. */
+   if (avail == 0) {
+@@ -303,7 +352,7 @@ alsa_process_stream(cubeb_stream * stm)
+       // TODO: should it be marked as DRAINING?
+     }
+ 
+-    got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail);
++    got = WRAP(snd_pcm_readi)(stm->pcm, stm->buffer+stm->bufframes, avail);
+ 
+     if (got < 0) {
+       avail = got; // the error handler below will recover us
+@@ -347,7 +396,7 @@ alsa_process_stream(cubeb_stream * stm)
+       (!stm->other_stream || stm->other_stream->bufframes > 0)) {
+     long got = avail - stm->bufframes;
+     void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL;
+-    char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);
++    char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
+ 
+     /* Correct read size to the other stream available frames */
+     if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) {
+@@ -374,8 +423,8 @@ alsa_process_stream(cubeb_stream * stm)
+     long drain_frames = avail - stm->bufframes;
+     double drain_time = (double) drain_frames / stm->params.rate;
+ 
+-    char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);
+-    memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames));
++    char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
++    memset(buftail, 0, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, drain_frames));
+     stm->bufframes = avail;
+ 
+     /* Mark as draining, unless we're waiting for capture */
+@@ -402,7 +451,7 @@ alsa_process_stream(cubeb_stream * stm)
+       }
+     }
+ 
+-    wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail);
++    wrote = WRAP(snd_pcm_writei)(stm->pcm, stm->buffer, avail);
+     if (wrote < 0) {
+       avail = wrote; // the error handler below will recover us
+     } else {
+@@ -415,13 +464,13 @@ alsa_process_stream(cubeb_stream * stm)
+ 
+   /* Got some error? Let's try to recover the stream. */
+   if (avail < 0) {
+-    avail = snd_pcm_recover(stm->pcm, avail, 0);
++    avail = WRAP(snd_pcm_recover)(stm->pcm, avail, 0);
+ 
+     /* Capture pcm must be started after initial setup/recover */
+     if (avail >= 0 &&
+         stm->stream_type == SND_PCM_STREAM_CAPTURE &&
+-        snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {
+-      avail = snd_pcm_start(stm->pcm);
++        WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) {
++      avail = WRAP(snd_pcm_start)(stm->pcm);
+     }
+   }
+ 
+@@ -537,26 +586,26 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm)
+ 
+   slave_def = NULL;
+ 
+-  r = snd_config_search(root_pcm, "slave", &slave_pcm);
++  r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm);
+   if (r < 0) {
+     return NULL;
+   }
+ 
+-  r = snd_config_get_string(slave_pcm, &string);
++  r = WRAP(snd_config_get_string)(slave_pcm, &string);
+   if (r >= 0) {
+-    r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def);
++    r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def);
+     if (r < 0) {
+       return NULL;
+     }
+   }
+ 
+   do {
+-    r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
++    r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string);
++    r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -565,7 +614,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm)
+     if (r < 0 || r > (int) sizeof(node_name)) {
+       break;
+     }
+-    r = snd_config_search(lconf, node_name, &pcm);
++    r = WRAP(snd_config_search)(lconf, node_name, &pcm);
+     if (r < 0) {
+       break;
+     }
+@@ -574,7 +623,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm)
+   } while (0);
+ 
+   if (slave_def) {
+-    snd_config_delete(slave_def);
++    WRAP(snd_config_delete)(slave_def);
+   }
+ 
+   return NULL;
+@@ -597,22 +646,22 @@ init_local_config_with_workaround(char const * pcm_name)
+ 
+   lconf = NULL;
+ 
+-  if (snd_config == NULL) {
++  if (*WRAP(snd_config) == NULL) {
+     return NULL;
+   }
+ 
+-  r = snd_config_copy(&lconf, snd_config);
++  r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config));
+   if (r < 0) {
+     return NULL;
+   }
+ 
+   do {
+-    r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node);
++    r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_id(pcm_node, &string);
++    r = WRAP(snd_config_get_id)(pcm_node, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -621,7 +670,7 @@ init_local_config_with_workaround(char const * pcm_name)
+     if (r < 0 || r > (int) sizeof(node_name)) {
+       break;
+     }
+-    r = snd_config_search(lconf, node_name, &pcm_node);
++    r = WRAP(snd_config_search)(lconf, node_name, &pcm_node);
+     if (r < 0) {
+       break;
+     }
+@@ -632,12 +681,12 @@ init_local_config_with_workaround(char const * pcm_name)
+     }
+ 
+     /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
+-    r = snd_config_search(pcm_node, "type", &node);
++    r = WRAP(snd_config_search)(pcm_node, "type", &node);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_string(node, &string);
++    r = WRAP(snd_config_get_string)(node, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -648,18 +697,18 @@ init_local_config_with_workaround(char const * pcm_name)
+ 
+     /* Don't clobber an explicit existing handle_underrun value, set it only
+        if it doesn't already exist. */
+-    r = snd_config_search(pcm_node, "handle_underrun", &node);
++    r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node);
+     if (r != -ENOENT) {
+       break;
+     }
+ 
+     /* Disable pcm_pulse's asynchronous underrun handling. */
+-    r = snd_config_imake_integer(&node, "handle_underrun", 0);
++    r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_add(pcm_node, node);
++    r = WRAP(snd_config_add)(pcm_node, node);
+     if (r < 0) {
+       break;
+     }
+@@ -667,7 +716,7 @@ init_local_config_with_workaround(char const * pcm_name)
+     return lconf;
+   } while (0);
+ 
+-  snd_config_delete(lconf);
++  WRAP(snd_config_delete)(lconf);
+ 
+   return NULL;
+ }
+@@ -679,9 +728,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, char const * pcm_name, snd_pcm_stream_t s
+ 
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+   if (local_config) {
+-    r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);
++    r = WRAP(snd_pcm_open_lconf)(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);
+   } else {
+-    r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK);
++    r = WRAP(snd_pcm_open)(pcm, pcm_name, stream, SND_PCM_NONBLOCK);
+   }
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+ 
+@@ -694,7 +743,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
+   int r;
+ 
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+-  r = snd_pcm_close(pcm);
++  r = WRAP(snd_pcm_close)(pcm);
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+ 
+   return r;
+@@ -750,6 +799,7 @@ silent_error_handler(char const * file, int line, char const * function,
+ alsa_init(cubeb ** context, char const * context_name)
+ {
+   (void)context_name;
++  void * libasound = NULL;
+   cubeb * ctx;
+   int r;
+   int i;
+@@ -760,9 +810,27 @@ alsa_init(cubeb ** context, char const * context_name)
+   assert(context);
+   *context = NULL;
+ 
++#ifndef DISABLE_LIBASOUND_DLOPEN
++  libasound = dlopen("libasound.so", RTLD_LAZY);
++  if (!libasound) {
++    return CUBEB_ERROR;
++  }
++
++#define LOAD(x) {                               \
++    cubeb_##x = dlsym(libasound, #x);            \
++    if (!cubeb_##x) {                           \
++      dlclose(libasound);                        \
++      return CUBEB_ERROR;                       \
++    }                                           \
++  }
++
++  LIBASOUND_API_VISIT(LOAD);
++#undef LOAD
++#endif
++
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+   if (!cubeb_alsa_error_handler_set) {
+-    snd_lib_error_set_handler(silent_error_handler);
++    WRAP(snd_lib_error_set_handler)(silent_error_handler);
+     cubeb_alsa_error_handler_set = 1;
+   }
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+@@ -771,6 +839,7 @@ alsa_init(cubeb ** context, char const * context_name)
+   assert(ctx);
+ 
+   ctx->ops = &alsa_ops;
++  ctx->libasound = libasound;
+ 
+   r = pthread_mutex_init(&ctx->mutex, NULL);
+   assert(r == 0);
+@@ -819,7 +888,7 @@ alsa_init(cubeb ** context, char const * context_name)
+        config fails with EINVAL, the PA PCM is too old for this workaround. */
+     if (r == -EINVAL) {
+       pthread_mutex_lock(&cubeb_alsa_mutex);
+-      snd_config_delete(ctx->local_config);
++      WRAP(snd_config_delete)(ctx->local_config);
+       pthread_mutex_unlock(&cubeb_alsa_mutex);
+       ctx->local_config = NULL;
+     } else if (r >= 0) {
+@@ -861,10 +930,14 @@ alsa_destroy(cubeb * ctx)
+ 
+   if (ctx->local_config) {
+     pthread_mutex_lock(&cubeb_alsa_mutex);
+-    snd_config_delete(ctx->local_config);
++    WRAP(snd_config_delete)(ctx->local_config);
+     pthread_mutex_unlock(&cubeb_alsa_mutex);
+   }
+ 
++  if (ctx->libasound) {
++    dlclose(ctx->libasound);
++  }
++
+   free(ctx);
+ }
+ 
+@@ -948,7 +1021,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_nonblock(stm->pcm, 1);
++  r = WRAP(snd_pcm_nonblock)(stm->pcm, 1);
+   assert(r == 0);
+ 
+   latency_us = latency_frames * 1e6 / stm->params.rate;
+@@ -961,7 +1034,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream
+     latency_us = latency_us < min_latency ? min_latency: latency_us;
+   }
+ 
+-  r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
++  r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
+                          stm->params.channels, stm->params.rate, 1,
+                          latency_us);
+   if (r < 0) {
+@@ -969,20 +1042,20 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream
+     return CUBEB_ERROR_INVALID_FORMAT;
+   }
+ 
+-  r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size);
++  r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size);
+   assert(r == 0);
+ 
+   /* Double internal buffer size to have enough space when waiting for the other side of duplex connection */
+   stm->buffer_size *= 2;
+-  stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size));
++  stm->buffer = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->buffer_size));
+   assert(stm->buffer);
+ 
+-  stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm);
++  stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm);
+   assert(stm->nfds > 0);
+ 
+   stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd));
+   assert(stm->saved_fds);
+-  r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds);
++  r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds);
+   assert((nfds_t) r == stm->nfds);
+ 
+   if (alsa_register_stream(ctx, stm) != 0) {
+@@ -1054,7 +1127,7 @@ alsa_stream_destroy(cubeb_stream * stm)
+   pthread_mutex_lock(&stm->mutex);
+   if (stm->pcm) {
+     if (stm->state == DRAINING) {
+-      snd_pcm_drain(stm->pcm);
++      WRAP(snd_pcm_drain)(stm->pcm);
+     }
+     alsa_locked_pcm_close(stm->pcm);
+     stm->pcm = NULL;
+@@ -1100,12 +1173,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels)
+ 
+   assert(stm);
+ 
+-  r = snd_pcm_hw_params_any(stm->pcm, hw_params);
++  r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
+   if (r < 0) {
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels);
++  r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels);
+   if (r < 0) {
+     return CUBEB_ERROR;
+   }
+@@ -1126,34 +1199,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) {
+ 
+   /* get a pcm, disabling resampling, so we get a rate the
+    * hardware/dmix/pulse/etc. supports. */
+-  r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE);
++  r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE);
+   if (r < 0) {
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_hw_params_any(pcm, hw_params);
++  r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params);
+   if (r < 0) {
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir);
++  r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir);
+   if (r >= 0) {
+     /* There is a default rate: use it. */
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_OK;
+   }
+ 
+   /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */
+   *rate = 44100;
+ 
+-  r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL);
++  r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL);
+   if (r < 0) {
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_ERROR;
+   }
+ 
+-  snd_pcm_close(pcm);
++  WRAP(snd_pcm_close)(pcm);
+ 
+   return CUBEB_OK;
+ }
+@@ -1186,10 +1259,10 @@ alsa_stream_start(cubeb_stream * stm)
+   pthread_mutex_lock(&stm->mutex);
+   /* Capture pcm must be started after initial setup/recover */
+   if (stm->stream_type == SND_PCM_STREAM_CAPTURE &&
+-      snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {
+-    snd_pcm_start(stm->pcm);
++      WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) {
++    WRAP(snd_pcm_start)(stm->pcm);
+   }
+-  snd_pcm_pause(stm->pcm, 0);
++  WRAP(snd_pcm_pause)(stm->pcm, 0);
+   gettimeofday(&stm->last_activity, NULL);
+   pthread_mutex_unlock(&stm->mutex);
+ 
+@@ -1229,7 +1302,7 @@ alsa_stream_stop(cubeb_stream * stm)
+   pthread_mutex_unlock(&ctx->mutex);
+ 
+   pthread_mutex_lock(&stm->mutex);
+-  snd_pcm_pause(stm->pcm, 1);
++  WRAP(snd_pcm_pause)(stm->pcm, 1);
+   pthread_mutex_unlock(&stm->mutex);
+ 
+   return CUBEB_OK;
+@@ -1245,8 +1318,8 @@ alsa_stream_get_position(cubeb_stream * stm, uint64_t * position)
+   pthread_mutex_lock(&stm->mutex);
+ 
+   delay = -1;
+-  if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING ||
+-      snd_pcm_delay(stm->pcm, &delay) != 0) {
++  if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING ||
++      WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) {
+     *position = stm->last_position;
+     pthread_mutex_unlock(&stm->mutex);
+     return CUBEB_OK;
+@@ -1271,7 +1344,7 @@ alsa_stream_get_latency(cubeb_stream * stm, uint32_t * latency)
+   snd_pcm_sframes_t delay;
+   /* This function returns the delay in frames until a frame written using
+      snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */
+-  if (snd_pcm_delay(stm->pcm, &delay)) {
++  if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) {
+     return CUBEB_ERROR;
+   }
+ 
+diff --git externals/cubeb/src/cubeb_sndio.c externals/cubeb/src/cubeb_sndio.c
+index 5a43343..c9a31a7 100644
+--- externals/cubeb/src/cubeb_sndio.c
++++ externals/cubeb/src/cubeb_sndio.c
+@@ -12,6 +12,7 @@
+ #include <stdbool.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <dlfcn.h>
+ #include <assert.h>
+ #include "cubeb/cubeb.h"
+ #include "cubeb-internal.h"
+@@ -22,10 +23,35 @@
+ #define DPR(...) do {} while(0)
+ #endif
+ 
++#ifdef DISABLE_LIBSNDIO_DLOPEN
++#define WRAP(x) x
++#else
++#define WRAP(x) cubeb_##x
++#define LIBSNDIO_API_VISIT(X)                   \
++  X(sio_close)                               \
++  X(sio_eof)                                 \
++  X(sio_getpar)                              \
++  X(sio_initpar)                             \
++  X(sio_onmove)                              \
++  X(sio_open)                                \
++  X(sio_pollfd)                              \
++  X(sio_read)                                \
++  X(sio_revents)                             \
++  X(sio_setpar)                              \
++  X(sio_start)                               \
++  X(sio_stop)                                \
++  X(sio_write)                               \
++
++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x;
++LIBSNDIO_API_VISIT(MAKE_TYPEDEF);
++#undef MAKE_TYPEDEF
++#endif
++
+ static struct cubeb_ops const sndio_ops;
+ 
+ struct cubeb {
+   struct cubeb_ops const * ops;
++  void * libsndio;
+ };
+ 
+ struct cubeb_stream {
+@@ -119,7 +145,7 @@ sndio_mainloop(void *arg)
+   DPR("sndio_mainloop()\n");
+   s->state_cb(s, s->arg, CUBEB_STATE_STARTED);
+   pthread_mutex_lock(&s->mtx);
+-  if (!sio_start(s->hdl)) {
++  if (!WRAP(sio_start)(s->hdl)) {
+     pthread_mutex_unlock(&s->mtx);
+     return NULL;
+   }
+@@ -203,7 +229,7 @@ sndio_mainloop(void *arg)
+       events |= POLLIN;
+     if ((s->mode & SIO_PLAY) && pstart < pend)
+       events |= POLLOUT;
+-    nfds = sio_pollfd(s->hdl, pfds, events);
++    nfds = WRAP(sio_pollfd)(s->hdl, pfds, events);
+ 
+     if (nfds > 0) {
+       pthread_mutex_unlock(&s->mtx);
+@@ -213,7 +239,7 @@ sndio_mainloop(void *arg)
+         continue;
+     }
+ 
+-    revents = sio_revents(s->hdl, pfds);
++    revents = WRAP(sio_revents)(s->hdl, pfds);
+ 
+     if (revents & POLLHUP) {
+       state = CUBEB_STATE_ERROR;
+@@ -221,8 +247,8 @@ sndio_mainloop(void *arg)
+     }
+ 
+     if (revents & POLLOUT) {
+-      n = sio_write(s->hdl, s->pbuf + pstart, pend - pstart);
+-      if (n == 0 && sio_eof(s->hdl)) {
++      n = WRAP(sio_write)(s->hdl, s->pbuf + pstart, pend - pstart);
++      if (n == 0 && WRAP(sio_eof)(s->hdl)) {
+         DPR("sndio_mainloop() werr\n");
+         state = CUBEB_STATE_ERROR;
+         break;
+@@ -231,8 +257,8 @@ sndio_mainloop(void *arg)
+     }
+ 
+     if (revents & POLLIN) {
+-      n = sio_read(s->hdl, s->rbuf + rstart, rend - rstart);
+-      if (n == 0 && sio_eof(s->hdl)) {
++      n = WRAP(sio_read)(s->hdl, s->rbuf + rstart, rend - rstart);
++      if (n == 0 && WRAP(sio_eof)(s->hdl)) {
+         DPR("sndio_mainloop() rerr\n");
+         state = CUBEB_STATE_ERROR;
+         break;
+@@ -244,7 +270,7 @@ sndio_mainloop(void *arg)
+     if (prime > 0 && (s->mode & SIO_REC))
+       rstart = rend;
+   }
+-  sio_stop(s->hdl);
++  WRAP(sio_stop)(s->hdl);
+   s->hwpos = s->swpos;
+   pthread_mutex_unlock(&s->mtx);
+   s->state_cb(s, s->arg, state);
+@@ -254,8 +280,31 @@ sndio_mainloop(void *arg)
+ /*static*/ int
+ sndio_init(cubeb **context, char const *context_name)
+ {
++  void * libsndio = NULL;
++
++#ifndef DISABLE_LIBSNDIO_DLOPEN
++  libsndio = dlopen("libsndio.so", RTLD_LAZY);
++  if (!libsndio) {
++    DPR("sndio_init(%s) failed dlopen(libsndio.so)\n", context_name);
++    return CUBEB_ERROR;
++  }
++
++#define LOAD(x) {                               \
++    cubeb_##x = dlsym(libsndio, #x);            \
++    if (!cubeb_##x) {                           \
++      DPR("sndio_init(%s) failed dlsym(%s)\n", context_name, #x); \
++      dlclose(libsndio);                        \
++      return CUBEB_ERROR;                       \
++    }                                           \
++  }
++
++  LIBSNDIO_API_VISIT(LOAD);
++#undef LOAD
++#endif
++
+   DPR("sndio_init(%s)\n", context_name);
+   *context = malloc(sizeof(*context));
++  (*context)->libsndio = libsndio;
+   (*context)->ops = &sndio_ops;
+   (void)context_name;
+   return CUBEB_OK;
+@@ -271,6 +320,8 @@ static void
+ sndio_destroy(cubeb *context)
+ {
+   DPR("sndio_destroy()\n");
++  if (context->libsndio)
++    dlclose(context->libsndio);
+   free(context);
+ }
+ 
+@@ -323,12 +374,12 @@ sndio_stream_init(cubeb * context,
+     goto err;
+   }
+   s->context = context;
+-  s->hdl = sio_open(NULL, s->mode, 1);
++  s->hdl = WRAP(sio_open)(NULL, s->mode, 1);
+   if (s->hdl == NULL) {
+     DPR("sndio_stream_init(), sio_open() failed\n");
+     goto err;
+   }
+-  sio_initpar(&wpar);
++  WRAP(sio_initpar)(&wpar);
+   wpar.sig = 1;
+   wpar.bits = 16;
+   switch (format) {
+@@ -351,7 +402,7 @@ sndio_stream_init(cubeb * context,
+   if (s->mode & SIO_PLAY)
+     wpar.pchan = output_stream_params->channels;
+   wpar.appbufsz = latency_frames;
+-  if (!sio_setpar(s->hdl, &wpar) || !sio_getpar(s->hdl, &rpar)) {
++  if (!WRAP(sio_setpar)(s->hdl, &wpar) || !WRAP(sio_getpar)(s->hdl, &rpar)) {
+     DPR("sndio_stream_init(), sio_setpar() failed\n");
+     goto err;
+   }
+@@ -362,7 +413,7 @@ sndio_stream_init(cubeb * context,
+     DPR("sndio_stream_init() unsupported params\n");
+     goto err;
+   }
+-  sio_onmove(s->hdl, sndio_onmove, s);
++  WRAP(sio_onmove)(s->hdl, sndio_onmove, s);
+   s->active = 0;
+   s->nfr = rpar.round;
+   s->rbpf = rpar.bps * rpar.rchan;
+@@ -400,7 +451,7 @@ sndio_stream_init(cubeb * context,
+   return CUBEB_OK;
+ err:
+   if (s->hdl)
+-    sio_close(s->hdl);
++    WRAP(sio_close)(s->hdl);
+   if (s->pbuf)
+     free(s->pbuf);
+   if (s->rbuf)
+@@ -446,7 +497,7 @@ static void
+ sndio_stream_destroy(cubeb_stream *s)
+ {
+   DPR("sndio_stream_destroy()\n");
+-  sio_close(s->hdl);
++  WRAP(sio_close)(s->hdl);
+   if (s->mode & SIO_PLAY)
+     free(s->pbuf);
+   if (s->mode & SIO_REC)
diff --git a/finance/R-cran-plm/Makefile b/finance/R-cran-plm/Makefile
index 5e6bedba5fdc..76684d8217d2 100644
--- a/finance/R-cran-plm/Makefile
+++ b/finance/R-cran-plm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	plm
-DISTVERSION=	2.1-0
+DISTVERSION=	2.2-0
 CATEGORIES=	finance
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/finance/R-cran-plm/distinfo b/finance/R-cran-plm/distinfo
index 5f6b6a7da3ce..150c4e1ad34d 100644
--- a/finance/R-cran-plm/distinfo
+++ b/finance/R-cran-plm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564834646
-SHA256 (plm_2.1-0.tar.gz) = fa62f2b4ed561b39daca2245aa8b93f97536dce24deacdefa29529c464b58637
-SIZE (plm_2.1-0.tar.gz) = 1512526
+TIMESTAMP = 1567917807
+SHA256 (plm_2.2-0.tar.gz) = 7f038532c387d417ea0c86322d873e6a3959a061a490bc506241a95edc50c86a
+SIZE (plm_2.2-0.tar.gz) = 1513935
diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index 63be701d1e53..27b1696995d5 100644
--- a/finance/gnucash-docs/Makefile
+++ b/finance/gnucash-docs/Makefile
@@ -3,7 +3,7 @@
 #   $MCom: ports/finance/gnucash-docs/Makefile,v 1.7 2007/08/04 03:51:29 marcus Exp $
 
 PORTNAME=	gnucash-docs
-DISTVERSION=	3.6
+DISTVERSION=	3.7
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/gnucash/gnucash%20%28stable%29/${PORTVERSION}
 
diff --git a/finance/gnucash-docs/distinfo b/finance/gnucash-docs/distinfo
index c5f8197f2b8b..0d82d6df0ef6 100644
--- a/finance/gnucash-docs/distinfo
+++ b/finance/gnucash-docs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561973142
-SHA256 (gnucash-docs-3.6.tar.gz) = 32d373a4faa96cde2bba564bc8d7143d6317f121c488492f2dc5ebe99b4b6163
-SIZE (gnucash-docs-3.6.tar.gz) = 96921528
+TIMESTAMP = 1568017014
+SHA256 (gnucash-docs-3.7.tar.gz) = 393919c12e7a0711b113cca3af83c2dcd195eabfa83ed2e985cbb91951a990c0
+SIZE (gnucash-docs-3.7.tar.gz) = 61234559
diff --git a/finance/gnucash-docs/pkg-plist b/finance/gnucash-docs/pkg-plist
index c1d46468d2de..04aadf45d711 100644
--- a/finance/gnucash-docs/pkg-plist
+++ b/finance/gnucash-docs/pkg-plist
@@ -207,6 +207,7 @@ share/gnome/help/gnucash-guide/C/figures/txns_sxn_ledger1.png
 share/gnome/help/gnucash-guide/C/figures/txns_sxn_ledger2.png
 share/gnome/help/gnucash-guide/C/figures/txns_sxn_ledger3.png
 share/gnome/help/gnucash-guide/C/figures/txns_sxn_ledger4.png
+share/gnome/help/gnucash-guide/C/gnc-docbookx.dtd
 share/gnome/help/gnucash-guide/C/gnc-glossary.xml
 share/gnome/help/gnucash-guide/C/gnucash-guide.xml
 share/gnome/help/gnucash-guide/C/legal.xml
@@ -438,6 +439,7 @@ share/gnome/help/gnucash-guide/de/figures/txns_sxn_ledger2.png
 share/gnome/help/gnucash-guide/de/figures/txns_sxn_ledger3.png
 share/gnome/help/gnucash-guide/de/figures/txns_sxn_ledger4.png
 share/gnome/help/gnucash-guide/de/glossary.xml
+share/gnome/help/gnucash-guide/de/gnc-docbookx.dtd
 share/gnome/help/gnucash-guide/de/gnucash-guide.xml
 share/gnome/help/gnucash-guide/it/figures/accts_CreateAssetsAccount.png
 share/gnome/help/gnucash-guide/it/figures/accts_DefaultExpenseAccounts.png
@@ -603,6 +605,7 @@ share/gnome/help/gnucash-guide/it/figures/txns_sxn_ledger1.png
 share/gnome/help/gnucash-guide/it/figures/txns_sxn_ledger2.png
 share/gnome/help/gnucash-guide/it/figures/txns_sxn_ledger3.png
 share/gnome/help/gnucash-guide/it/figures/txns_sxn_ledger4.png
+share/gnome/help/gnucash-guide/it/gnc-docbookx.dtd
 share/gnome/help/gnucash-guide/it/gnucash-guide.xml
 share/gnome/help/gnucash-guide/ja/appendixa.xml
 share/gnome/help/gnucash-guide/ja/appendixb.xml
@@ -812,6 +815,7 @@ share/gnome/help/gnucash-guide/ja/figures/txns_sxn_ledger1.png
 share/gnome/help/gnucash-guide/ja/figures/txns_sxn_ledger2.png
 share/gnome/help/gnucash-guide/ja/figures/txns_sxn_ledger3.png
 share/gnome/help/gnucash-guide/ja/figures/txns_sxn_ledger4.png
+share/gnome/help/gnucash-guide/ja/gnc-docbookx.dtd
 share/gnome/help/gnucash-guide/ja/gnucash-guide.xml
 share/gnome/help/gnucash-guide/ja/legal.xml
 share/gnome/help/gnucash-guide/pt/appendixa.xml
@@ -1008,6 +1012,7 @@ share/gnome/help/gnucash-guide/pt/figures/txns_sxn_ledger1.png
 share/gnome/help/gnucash-guide/pt/figures/txns_sxn_ledger2.png
 share/gnome/help/gnucash-guide/pt/figures/txns_sxn_ledger3.png
 share/gnome/help/gnucash-guide/pt/figures/txns_sxn_ledger4.png
+share/gnome/help/gnucash-guide/pt/gnc-docbookx.dtd
 share/gnome/help/gnucash-guide/pt/gnucash-guide.xml
 share/gnome/help/gnucash-guide/pt/legal.xml
 share/gnome/help/gnucash-guide/ru/appendixa.xml
@@ -1217,6 +1222,7 @@ share/gnome/help/gnucash-guide/ru/figures/txns_sxn_ledger1.png
 share/gnome/help/gnucash-guide/ru/figures/txns_sxn_ledger2.png
 share/gnome/help/gnucash-guide/ru/figures/txns_sxn_ledger3.png
 share/gnome/help/gnucash-guide/ru/figures/txns_sxn_ledger4.png
+share/gnome/help/gnucash-guide/ru/gnc-docbookx.dtd
 share/gnome/help/gnucash-guide/ru/gnc-glossary.xml
 share/gnome/help/gnucash-guide/ru/gnucash-guide.xml
 share/gnome/help/gnucash-guide/ru/legal.xml
@@ -1266,6 +1272,7 @@ share/gnome/help/gnucash-help/C/figures/home.png
 share/gnome/help/gnucash-help/C/figures/left.png
 share/gnome/help/gnucash-help/C/figures/right.png
 share/gnome/help/gnucash-help/C/figures/up.png
+share/gnome/help/gnucash-help/C/gnc-docbookx.dtd
 share/gnome/help/gnucash-help/C/gnucash-help.xml
 share/gnome/help/gnucash-help/de/Help_ch_GettingStarted.xml
 share/gnome/help/gnucash-help/de/Help_ch_Intro.xml
@@ -1279,6 +1286,7 @@ share/gnome/help/gnucash-help/de/figures/home.png
 share/gnome/help/gnucash-help/de/figures/left.png
 share/gnome/help/gnucash-help/de/figures/right.png
 share/gnome/help/gnucash-help/de/figures/up.png
+share/gnome/help/gnucash-help/de/gnc-docbookx.dtd
 share/gnome/help/gnucash-help/de/gnucash-help.xml
 share/gnome/help/gnucash-help/it/figures/Help_AccountReg_Screen.png
 share/gnome/help/gnucash-help/it/figures/Help_AccountTree_Screen.png
@@ -1300,6 +1308,7 @@ share/gnome/help/gnucash-help/it/figures/home.png
 share/gnome/help/gnucash-help/it/figures/left.png
 share/gnome/help/gnucash-help/it/figures/right.png
 share/gnome/help/gnucash-help/it/figures/up.png
+share/gnome/help/gnucash-help/it/gnc-docbookx.dtd
 share/gnome/help/gnucash-help/it/gnucash-help.xml
 share/gnome/help/gnucash-help/pt/Help_ch_Account-Actions.xml
 share/gnome/help/gnucash-help/pt/Help_ch_Business.xml
@@ -1340,4 +1349,5 @@ share/gnome/help/gnucash-help/pt/figures/home.png
 share/gnome/help/gnucash-help/pt/figures/left.png
 share/gnome/help/gnucash-help/pt/figures/right.png
 share/gnome/help/gnucash-help/pt/figures/up.png
+share/gnome/help/gnucash-help/pt/gnc-docbookx.dtd
 share/gnome/help/gnucash-help/pt/gnucash-help.xml
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 528190947fa6..f8c34cb1b86f 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -2,8 +2,7 @@
 #   $MCom: ports/finance/gnucash/Makefile,v 1.26 2008/12/31 03:25:18 mezz Exp $
 
 PORTNAME=	gnucash
-PORTVERSION=	3.6
-PORTREVISION=	2
+PORTVERSION=	3.7
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index 82f6391b56c3..8545f6aa05e6 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561973076
-SHA256 (gnucash-3.6.tar.bz2) = f1cb86de60bb0eb2cf5c2c3868e7dab7d889017e233230f944f158f84eb85f25
-SIZE (gnucash-3.6.tar.bz2) = 13811045
+TIMESTAMP = 1568016973
+SHA256 (gnucash-3.7.tar.bz2) = 6b8eb09f3980531509bcb3a589ab0334d827c32f860ce8a209aa2fe0ed8858b4
+SIZE (gnucash-3.7.tar.bz2) = 13896595
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index 9a24647a90e6..6550f797dcb0 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -23,7 +23,6 @@ include/gnucash/Transaction.h
 include/gnucash/account-quickfill.h
 include/gnucash/assistant-xml-encoding.h
 include/gnucash/basiccell.h
-include/gnucash/business-helpers.h
 include/gnucash/business-options.h
 include/gnucash/cap-gains.h
 include/gnucash/cashobjects.h
@@ -685,6 +684,22 @@ share/metainfo/gnucash.appdata.xml
 %%DATADIR%%/accounts/fr_FR/acctchrt_retiremt.gnucash-xea
 %%DATADIR%%/accounts/fr_FR/acctchrt_spouseinc.gnucash-xea
 %%DATADIR%%/accounts/fr_FR/acctchrt_spouseretire.gnucash-xea
+%%DATADIR%%/accounts/he/acctchrt_brokerage.gnucash-xea
+%%DATADIR%%/accounts/he/acctchrt_business.gnucash-xea
+%%DATADIR%%/accounts/he/acctchrt_carloan.gnucash-xea
+%%DATADIR%%/accounts/he/acctchrt_cdmoneymkt.gnucash-xea
+%%DATADIR%%/accounts/he/acctchrt_checkbook.gnucash-xea
+%%DATADIR%%/accounts/he/acctchrt_childcare.gnucash-xea
+%%DATADIR%%/accounts/he/acctchrt_common.gnucash-xea
+%%DATADIR%%/accounts/he/acctchrt_eduloan.gnucash-xea
+%%DATADIR%%/accounts/he/acctchrt_fixedassets.gnucash-xea
+%%DATADIR%%/accounts/he/acctchrt_homeloan.gnucash-xea
+%%DATADIR%%/accounts/he/acctchrt_homeown.gnucash-xea
+%%DATADIR%%/accounts/he/acctchrt_otherloan.gnucash-xea
+%%DATADIR%%/accounts/he/acctchrt_renter.gnucash-xea
+%%DATADIR%%/accounts/he/acctchrt_retiremt.gnucash-xea
+%%DATADIR%%/accounts/he/acctchrt_spouseinc.gnucash-xea
+%%DATADIR%%/accounts/he/acctchrt_spouseretire.gnucash-xea
 %%DATADIR%%/accounts/hr/acctchrt_car.gnucash-xea
 %%DATADIR%%/accounts/hr/acctchrt_cdmoneymkt.gnucash-xea
 %%DATADIR%%/accounts/hr/acctchrt_checkbook.gnucash-xea
diff --git a/ftp/bftpd/Makefile b/ftp/bftpd/Makefile
index c9d0c2fc5905..5197a503617c 100644
--- a/ftp/bftpd/Makefile
+++ b/ftp/bftpd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bftpd
-PORTVERSION=	5.0
+PORTVERSION=	5.2
 CATEGORIES=	ftp
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -13,6 +13,7 @@ LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-pam
+
 USES=		autoreconf
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
diff --git a/ftp/bftpd/distinfo b/ftp/bftpd/distinfo
index d143ea3bc385..d83fc2f7bba3 100644
--- a/ftp/bftpd/distinfo
+++ b/ftp/bftpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1540045777
-SHA256 (bftpd-5.0.tar.gz) = 177b905e9da308d7b341cabef315c909e0e0ca3c44e63d1e9c74fdf396c64fe1
-SIZE (bftpd-5.0.tar.gz) = 165751
+TIMESTAMP = 1568031906
+SHA256 (bftpd-5.2.tar.gz) = 7e6259f8eada88ef598df4c1517fa260c798ad2361d9b4627b97ff2125ddaa4e
+SIZE (bftpd-5.2.tar.gz) = 166047
diff --git a/ftp/netdumpd/Makefile b/ftp/netdumpd/Makefile
index c9a5048c7a26..a846a0517399 100644
--- a/ftp/netdumpd/Makefile
+++ b/ftp/netdumpd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	netdumpd
-PORTVERSION=	20190518
+PORTVERSION=	20190910
 PORTREVISION=	0
 CATEGORIES=	ftp
 MASTER_SITES=	LOCAL/markj
diff --git a/ftp/netdumpd/distinfo b/ftp/netdumpd/distinfo
index eab4de7ea76b..1657e6fbb9b5 100644
--- a/ftp/netdumpd/distinfo
+++ b/ftp/netdumpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558204420
-SHA256 (netdumpd-20190518.tar.gz) = cac88663b8424f12013508deadcd5ac44d12fa61acd8c6380bb71cd313d61cee
-SIZE (netdumpd-20190518.tar.gz) = 17620
+TIMESTAMP = 1568157384
+SHA256 (netdumpd-20190910.tar.gz) = 22fa99e9ca475d37150160aa405ff4dea81b1efbfd20e538be60bf1e5e91b9cc
+SIZE (netdumpd-20190910.tar.gz) = 17624
diff --git a/games/barrage/Makefile b/games/barrage/Makefile
index ca50e66994b3..0114c3624125 100644
--- a/games/barrage/Makefile
+++ b/games/barrage/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	barrage
-PORTVERSION=	1.0.4
-PORTREVISION=	4
+PORTVERSION=	1.0.5
 CATEGORIES=	games
 MASTER_SITES=	SF/lgames/${PORTNAME}/
 
@@ -13,8 +12,9 @@ COMMENT=	Destroy as many targets as possible
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake
+USES=		gmake gnome sdl
 USE_SDL=	sdl mixer
+
 GNU_CONFIGURE=	yes
 
 INSTALLS_ICONS=	yes
@@ -26,8 +26,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/games/|/|g' ${WRKSRC}/configure
 
 post-install:
-	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/
+	${LN} -sf ${PREFIX}/share/icons/${PORTNAME}48.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/games/barrage/distinfo b/games/barrage/distinfo
index a54fdfcac010..e2edd202c0d1 100644
--- a/games/barrage/distinfo
+++ b/games/barrage/distinfo
@@ -1,2 +1,3 @@
-SHA256 (barrage-1.0.4.tar.gz) = ad74e049dfded3bca28b8dc1c5870408cfad9e024b35cc5b501ba90486d9af25
-SIZE (barrage-1.0.4.tar.gz) = 484641
+TIMESTAMP = 1568050232
+SHA256 (barrage-1.0.5.tar.gz) = a78897ab6a8cf6d53d4093bb8abae204ddfa3a22c5cab9e76220e4987de76904
+SIZE (barrage-1.0.5.tar.gz) = 510221
diff --git a/games/barrage/pkg-plist b/games/barrage/pkg-plist
index 3b59e24d2733..c23d32bbbd3b 100644
--- a/games/barrage/pkg-plist
+++ b/games/barrage/pkg-plist
@@ -23,7 +23,6 @@ share/applications/barrage.desktop
 %%DATADIR%%/sounds/expl3.wav
 %%DATADIR%%/sounds/gunfire.wav
 %%DATADIR%%/sounds/highlight.wav
-share/icons/hicolor/16x16/apps/barrage.png
-share/icons/hicolor/32x32/apps/barrage.png
-share/icons/hicolor/48x48/apps/barrage.png
+share/icons/barrage48.png
 share/pixmaps/barrage.png
+/var/barrage.hscr
diff --git a/games/cutemaze/pkg-descr b/games/cutemaze/pkg-descr
index 87a54911cbc0..7b4246bf9c25 100644
--- a/games/cutemaze/pkg-descr
+++ b/games/cutemaze/pkg-descr
@@ -3,4 +3,4 @@ one of a choice of several different algorithms. You move the character through
 the maze while hunting for targets (cheese, by default) the game is won once
  all of these targets have been picked up.
 
-WWW: http://gottcode.org/cutemaze/
+WWW: https://gottcode.org/cutemaze/
diff --git a/games/linux-dwarffortress/Makefile b/games/linux-dwarffortress/Makefile
index a18158c6a888..ba5096ddc204 100644
--- a/games/linux-dwarffortress/Makefile
+++ b/games/linux-dwarffortress/Makefile
@@ -28,10 +28,8 @@ LICENSE_TEXT=	Copyright (c) 2002-2016. All rights are retained by Tarn Adams, \
 		contact Tarn Adams at toadyone@bay12games.com.
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
-RUN_DEPENDS=	linux-${linux_ARGS}-sdl_ttf>0:graphics/linux-${linux_ARGS}-sdl_ttf
-
 USES=		linux tar:bzip2
-USE_LINUX=	dri gtk2 libsndfile openal-soft sdlimage xorglibs
+USE_LINUX=	dri gtk2 libsndfile openal-soft sdlimage sdlttf xorglibs
 
 SUB_FILES=	dwarffortress
 NO_BUILD=	yes
diff --git a/games/solarus-quest-editor/Makefile b/games/solarus-quest-editor/Makefile
index 269539adfe90..96217cf731fe 100644
--- a/games/solarus-quest-editor/Makefile
+++ b/games/solarus-quest-editor/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	solarus-quest-editor
-PORTVERSION=	1.6.0
+PORTVERSION=	1.6.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
 CATEGORIES=	games
 
 MAINTAINER=	danilo@FreeBSD.org
@@ -26,7 +25,7 @@ USES=		cmake compiler:c++11-lib openal qt:5 sdl
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	solarus-games
-GL_COMMIT=	47ebde229b805ebe076ab6ef7f8e947a06a17451
+GL_COMMIT=	a2aa91dc9bb60d3df6183b8e0a74a5d4c3b2d016
 
 CMAKE_ARGS+=	-DSOLARUS_USE_LUAJIT=OFF
 USE_SDL=	sdl2 ttf2 image2
diff --git a/games/solarus-quest-editor/distinfo b/games/solarus-quest-editor/distinfo
index d23e09a40313..cbf21553433f 100644
--- a/games/solarus-quest-editor/distinfo
+++ b/games/solarus-quest-editor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545689078
-SHA256 (solarus-games-solarus-quest-editor-47ebde229b805ebe076ab6ef7f8e947a06a17451_GL0.tar.gz) = 2b70da748b564ee593e093e937bfa4392706c71c049a3e135916c8d175094171
-SIZE (solarus-games-solarus-quest-editor-47ebde229b805ebe076ab6ef7f8e947a06a17451_GL0.tar.gz) = 68711893
+TIMESTAMP = 1567194762
+SHA256 (solarus-games-solarus-quest-editor-a2aa91dc9bb60d3df6183b8e0a74a5d4c3b2d016_GL0.tar.gz) = 02681eb1f828c2e05bd6dcc9aa483605f6074cda06a1bf28855e864b09e58fcf
+SIZE (solarus-games-solarus-quest-editor-a2aa91dc9bb60d3df6183b8e0a74a5d4c3b2d016_GL0.tar.gz) = 57772038
diff --git a/games/solarus-quest-editor/pkg-plist b/games/solarus-quest-editor/pkg-plist
index cf455ef7bef2..946ac6707aa0 100644
--- a/games/solarus-quest-editor/pkg-plist
+++ b/games/solarus-quest-editor/pkg-plist
@@ -1,19 +1,15 @@
 bin/solarus-quest-editor
 share/applications/solarus-quest-editor.desktop
-share/icons/hicolor/1024x1024/apps/solarus-quest-editor.png
-share/icons/hicolor/128x128/apps/solarus-quest-editor.png
 share/icons/hicolor/16x16/apps/solarus-quest-editor.png
-share/icons/hicolor/256x256/apps/solarus-quest-editor.png
+share/icons/hicolor/20x20/apps/solarus-quest-editor.png
+share/icons/hicolor/24x24/apps/solarus-quest-editor.png
 share/icons/hicolor/32x32/apps/solarus-quest-editor.png
+share/icons/hicolor/40x40/apps/solarus-quest-editor.png
 share/icons/hicolor/48x48/apps/solarus-quest-editor.png
-share/icons/hicolor/512x512/apps/solarus-quest-editor.png
-share/icons/hicolor/64x64/apps/solarus-quest-editor.png
-share/icons/hicolor/768x768/apps/solarus-quest-editor.png
-share/icons/hicolor/96x96/apps/solarus-quest-editor.png
+share/icons/hicolor/scalable/apps/solarus-quest-editor.svg
+share/icons/hicolor/symbolic/apps/solarus-quest-editor-symbolic.svg
 share/pixmaps/solarus-quest-editor.png
 %%DATADIR%%/assets/initial_quest/data/enemies/chameleon.lua
-%%DATADIR%%/assets/initial_quest/data/enemies/clucko.lua
-%%DATADIR%%/assets/initial_quest/data/enemies/crow.lua
 %%DATADIR%%/assets/initial_quest/data/enemies/explosion.lua
 %%DATADIR%%/assets/initial_quest/data/enemies/flame.lua
 %%DATADIR%%/assets/initial_quest/data/enemies/generic_projectile.lua
@@ -30,7 +26,7 @@ share/pixmaps/solarus-quest-editor.png
 %%DATADIR%%/assets/initial_quest/data/enemies/slime_purple.lua
 %%DATADIR%%/assets/initial_quest/data/enemies/slime_red.lua
 %%DATADIR%%/assets/initial_quest/data/enemies/slime_yellow.lua
-%%DATADIR%%/assets/initial_quest/data/enemies/soldier.lua
+%%DATADIR%%/assets/initial_quest/data/enemies/slimy_green.lua
 %%DATADIR%%/assets/initial_quest/data/fonts/8_bit.png
 %%DATADIR%%/assets/initial_quest/data/fonts/enter_command.ttf
 %%DATADIR%%/assets/initial_quest/data/items/gem.lua
@@ -291,6 +287,8 @@ share/pixmaps/solarus-quest-editor.png
 %%DATADIR%%/assets/initial_quest/data/sprites/enemies/slime_cyan.dat
 %%DATADIR%%/assets/initial_quest/data/sprites/enemies/slime_cyan.png
 %%DATADIR%%/assets/initial_quest/data/sprites/enemies/slime_egg.dat
+%%DATADIR%%/assets/initial_quest/data/sprites/enemies/slime_egg_blue.dat
+%%DATADIR%%/assets/initial_quest/data/sprites/enemies/slime_egg_blue.png
 %%DATADIR%%/assets/initial_quest/data/sprites/enemies/slime_green.dat
 %%DATADIR%%/assets/initial_quest/data/sprites/enemies/slime_green.png
 %%DATADIR%%/assets/initial_quest/data/sprites/enemies/slime_green_small.dat
@@ -300,11 +298,15 @@ share/pixmaps/solarus-quest-editor.png
 %%DATADIR%%/assets/initial_quest/data/sprites/enemies/slime_red.png
 %%DATADIR%%/assets/initial_quest/data/sprites/enemies/slime_yellow.dat
 %%DATADIR%%/assets/initial_quest/data/sprites/enemies/slime_yellow.png
+%%DATADIR%%/assets/initial_quest/data/sprites/enemies/slimy_green.dat
+%%DATADIR%%/assets/initial_quest/data/sprites/enemies/slimy_green.png
 %%DATADIR%%/assets/initial_quest/data/sprites/enemies/soldier.dat
 %%DATADIR%%/assets/initial_quest/data/sprites/enemies/soldier.png
 %%DATADIR%%/assets/initial_quest/data/sprites/enemies/soldier_feather.dat
 %%DATADIR%%/assets/initial_quest/data/sprites/enemies/soldier_sword.dat
 %%DATADIR%%/assets/initial_quest/data/sprites/enemies/soldier_sword.png
+%%DATADIR%%/assets/initial_quest/data/sprites/enemies/spiderskull.dat
+%%DATADIR%%/assets/initial_quest/data/sprites/enemies/spiderskull.png
 %%DATADIR%%/assets/initial_quest/data/sprites/enemies/wings_evil.dat
 %%DATADIR%%/assets/initial_quest/data/sprites/entities/arrow.dat
 %%DATADIR%%/assets/initial_quest/data/sprites/entities/arrow.png
@@ -510,3 +512,5 @@ share/pixmaps/solarus-quest-editor.png
 %%DATADIR%%/assets/initial_quest/data/tilesets/house.tiles.png
 %%DATADIR%%/assets/initial_quest/data/tilesets/outside.dat
 %%DATADIR%%/assets/initial_quest/data/tilesets/outside.tiles.png
+%%DATADIR%%/translations/solarus_editor_es.qm
+%%DATADIR%%/translations/solarus_editor_fr.qm
diff --git a/games/solarus/Makefile b/games/solarus/Makefile
index df181aaa756e..6a6698f1644f 100644
--- a/games/solarus/Makefile
+++ b/games/solarus/Makefile
@@ -1,11 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	solarus
-PORTVERSION=	1.6.0
-PORTREVISION=	2
+PORTVERSION=	1.6.2
+DISTVERSIONPREFIX=	v
 CATEGORIES=	games
-MASTER_SITES=	http://www.solarus-games.org/downloads/solarus/
-DISTNAME=	solarus-${PORTVERSION}-src
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Zelda-like 2D game engine
@@ -19,12 +17,15 @@ LIB_DEPENDS=	libphysfs.so:devel/physfs \
 		libvorbis.so:audio/libvorbis \
 		libogg.so:audio/libogg
 
-USES=		cmake:noninja compiler:c++11-lib gl openal qmake qt:5
+USES=		cmake:noninja compiler:c++11-lib gl openal qmake qt:5 sdl xorg
+
+USE_GITLAB=	yes
+GL_ACCOUNT=	solarus-games
+GL_COMMIT=	004d6f792d9ad5dcfc0575e6a029b987bd9f8807
 
 MAKE_ARGS+=	DESTDIR=${STAGEDIR}
 USE_QT=		buildtools_build core gui linguisttools_build widgets
 USE_SDL=	sdl2 ttf2 image2
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GL=		gl glu
 USE_LDCONFIG=	yes
 
diff --git a/games/solarus/distinfo b/games/solarus/distinfo
index 08b82105cfd9..d53d8e5dc863 100644
--- a/games/solarus/distinfo
+++ b/games/solarus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545604770
-SHA256 (solarus-1.6.0-src.tar.gz) = d800fdf388f860732f2d40c8dd635c34fd1c452857f75bf9b3a421e3ef5ee751
-SIZE (solarus-1.6.0-src.tar.gz) = 3982219
+TIMESTAMP = 1567194123
+SHA256 (solarus-games-solarus-004d6f792d9ad5dcfc0575e6a029b987bd9f8807_GL0.tar.gz) = 36f29d154447c93a54e92a6979a0005017fd00c83dd1cd9d9d2c4f92d6c452c7
+SIZE (solarus-games-solarus-004d6f792d9ad5dcfc0575e6a029b987bd9f8807_GL0.tar.gz) = 15073302
diff --git a/games/solarus/pkg-plist b/games/solarus/pkg-plist
index 57e4f5d060dd..84f8729cd157 100644
--- a/games/solarus/pkg-plist
+++ b/games/solarus/pkg-plist
@@ -35,6 +35,8 @@ include/solarus/core/Logger.h
 include/solarus/core/MainLoop.h
 include/solarus/core/Map.h
 include/solarus/core/MapData.h
+include/solarus/core/PerfCounter.h
+include/solarus/core/PerfCounter.inl
 include/solarus/core/PixelBits.h
 include/solarus/core/Point.h
 include/solarus/core/Point.inl
@@ -144,6 +146,7 @@ include/solarus/graphics/ShaderData.h
 include/solarus/graphics/ShaderPtr.h
 include/solarus/graphics/SoftwarePixelFilter.h
 include/solarus/graphics/SoftwareVideoMode.h
+include/solarus/graphics/SolarusGl.h
 include/solarus/graphics/Sprite.h
 include/solarus/graphics/SpriteAnimation.h
 include/solarus/graphics/SpriteAnimationDirection.h
@@ -164,7 +167,7 @@ include/solarus/graphics/Video.h
 include/solarus/graphics/glrenderer/GlRenderer.h
 include/solarus/graphics/glrenderer/GlShader.h
 include/solarus/graphics/glrenderer/GlTexture.h
-include/solarus/graphics/glrenderer/gles2funcs.h
+include/solarus/graphics/quest_icon.h
 include/solarus/graphics/sdlrenderer/SDLRenderer.h
 include/solarus/graphics/sdlrenderer/SDLShader.h
 include/solarus/graphics/sdlrenderer/SDLSurfaceImpl.h
@@ -235,6 +238,8 @@ include/solarus/movements/RandomPathMovement.h
 include/solarus/movements/RelativeMovement.h
 include/solarus/movements/StraightMovement.h
 include/solarus/movements/TargetMovement.h
+include/solarus/third_party/KHR/khrplatform.h
+include/solarus/third_party/glad/glad.h
 include/solarus/third_party/glm/CMakeLists.txt
 include/solarus/third_party/glm/common.hpp
 include/solarus/third_party/glm/detail/_features.hpp
@@ -502,9 +507,11 @@ include/solarus/third_party/snes_spc/blargg_source.h
 include/solarus/third_party/snes_spc/dsp.h
 include/solarus/third_party/snes_spc/spc.h
 lib/libsolarus-gui.so
+lib/libsolarus-gui.so.1
+lib/libsolarus-gui.so.1.6.2
 lib/libsolarus.so
 lib/libsolarus.so.1
-lib/libsolarus.so.1.6.0
+lib/libsolarus.so.1.6.2
 share/appdata/solarus.appdata.xml
 share/applications/solarus.desktop
 share/icons/hicolor/128x128/apps/solarus.png
diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile
index 6bec541f81da..7adc7bf18582 100644
--- a/games/supertuxkart/Makefile
+++ b/games/supertuxkart/Makefile
@@ -27,7 +27,6 @@ BROKEN_armv7=		invokes x86 assembler
 BROKEN_mips=		invokes x86 assembler
 BROKEN_mips64=		invokes x86 assembler
 BROKEN_sparc64=		invokes x86 assembler
-BROKEN_powerpc64=	invokes x86 assembler
 BROKEN_i386=		does not build (error: this directive must appear between .cfi_startproc and .cfi_endproc directives)
 
 USES=		alias cmake compiler:c++11-lib gettext gl \
diff --git a/games/supertuxkart/files/patch-lib_angelscript_source_as__config.h b/games/supertuxkart/files/patch-lib_angelscript_source_as__config.h
new file mode 100644
index 000000000000..029c1d2832b1
--- /dev/null
+++ b/games/supertuxkart/files/patch-lib_angelscript_source_as__config.h
@@ -0,0 +1,12 @@
+--- lib/angelscript/source/as_config.h.orig	2019-04-20 16:40:12 UTC
++++ lib/angelscript/source/as_config.h
+@@ -953,7 +953,9 @@
+ 			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+ 			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+ 			#define AS_X86
++		#elif defined(__powerpc64__)
++			#define AS_MAX_PORTABILITY
+ 		#elif defined(__LP64__)
+ 			#define AS_X64_GCC
+ 			#define HAS_128_BIT_PRIMITIVES
+ 			#define SPLIT_OBJS_BY_MEMBER_TYPES
diff --git a/games/xpilot-ng-client/Makefile b/games/xpilot-ng-client/Makefile
index f35eca7ff1b2..a25c92cb9051 100644
--- a/games/xpilot-ng-client/Makefile
+++ b/games/xpilot-ng-client/Makefile
@@ -6,6 +6,9 @@ PKGNAMESUFFIX=	-client
 
 COMMENT=	Enhanced version of XPilot (client program)
 
+DEPRECATED=	Depends on deprecated libXxf86misc
+EXPIRATION_DATE=2019-11-01
+
 MASTERDIR=	${.CURDIR}/../xpilot-ng-server
 
 USE_XORG=	x11 xext xxf86misc
diff --git a/german/mythes/Makefile b/german/mythes/Makefile
index ecb9d15eac47..c87bd7df9144 100644
--- a/german/mythes/Makefile
+++ b/german/mythes/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mythes
-PORTVERSION=	2019.09.01
+PORTVERSION=	2019.09.08
 CATEGORIES=	german textproc
 MASTER_SITES=	LOCAL/sunpoet/${PORTNAME}
 DISTNAME=	Deutscher-Thesaurus-${PORTVERSION:C/\.//g}
diff --git a/german/mythes/distinfo b/german/mythes/distinfo
index af5422645684..cb53041ba92f 100644
--- a/german/mythes/distinfo
+++ b/german/mythes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567451254
-SHA256 (mythes/Deutscher-Thesaurus-20190901.oxt) = 9f9174239dfdc99074068421e4607aafb6f04089e6e904f1c3e9b65b6e31e680
-SIZE (mythes/Deutscher-Thesaurus-20190901.oxt) = 9510824
+TIMESTAMP = 1568051709
+SHA256 (mythes/Deutscher-Thesaurus-20190908.oxt) = 814a89424b76ce70a71cd0d291826b824d5ca2151e4c6f6710ea9f1d15822cd5
+SIZE (mythes/Deutscher-Thesaurus-20190908.oxt) = 9521668
diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile
index 0c38c5998b12..0aeb5aa40c10 100644
--- a/graphics/ImageMagick6/Makefile
+++ b/graphics/ImageMagick6/Makefile
@@ -162,8 +162,7 @@ RAW_IMPLIES=		LCMS2
 
 SVG_DESC=		SVG vector image format support (via librsvg, implies the x11 option)
 SVG_CONFIGURE_WITH=	rsvg
-SVG_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
-SVG_USE=		gnome=cairo,gdkpixbuf2
+SVG_USE=		gnome=cairo,gdkpixbuf2,librsvg2
 SVG_IMPLIES=		X11
 
 TIFF_CONFIGURE_WITH=	tiff
diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index 5a401f3c5d1e..1afc8893e890 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -161,8 +161,7 @@ RAW_IMPLIES=		LCMS2
 
 SVG_DESC=		SVG vector image format support (via librsvg, implies the x11 option)
 SVG_CONFIGURE_WITH=	rsvg
-SVG_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
-SVG_USE=		gnome=cairo,gdkpixbuf2
+SVG_USE=		gnome=cairo,gdkpixbuf2,librsvg2
 SVG_IMPLIES=		X11
 
 TIFF_CONFIGURE_WITH=	tiff
diff --git a/graphics/Makefile b/graphics/Makefile
index 7d8479a5d791..be87b41fee06 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -519,6 +519,7 @@
     SUBDIR += linux-c6-sdl_ttf
     SUBDIR += linux-c6-tiff
     SUBDIR += linux-c7-cairo
+    SUBDIR += linux-c7-cairo-gobject
     SUBDIR += linux-c7-dri
     SUBDIR += linux-c7-gdk-pixbuf2
     SUBDIR += linux-c7-glx-utils
@@ -526,6 +527,7 @@
     SUBDIR += linux-c7-jasper
     SUBDIR += linux-c7-jbigkit
     SUBDIR += linux-c7-jpeg
+    SUBDIR += linux-c7-libepoxy
     SUBDIR += linux-c7-libglvnd
     SUBDIR += linux-c7-png
     SUBDIR += linux-c7-sdl_image
@@ -534,8 +536,6 @@
     SUBDIR += linux-c7-wayland
     SUBDIR += lua-gd
     SUBDIR += luminance-qt5
-    SUBDIR += luxrender
-    SUBDIR += luxrender14
     SUBDIR += lximage-qt
     SUBDIR += magnum
     SUBDIR += magnum-examples
@@ -871,6 +871,7 @@
     SUBDIR += py-pycha
     SUBDIR += py-pycollada
     SUBDIR += py-pydot
+    SUBDIR += py-pyembree
     SUBDIR += py-pyepsg
     SUBDIR += py-pygal
     SUBDIR += py-pyganim
diff --git a/graphics/R-cran-visNetwork/Makefile b/graphics/R-cran-visNetwork/Makefile
index 3ec8a70d1ac4..b215bdac0912 100644
--- a/graphics/R-cran-visNetwork/Makefile
+++ b/graphics/R-cran-visNetwork/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	visNetwork
-PORTVERSION=	2.0.7
-PORTREVISION=	1
+PORTVERSION=	2.0.8
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/graphics/R-cran-visNetwork/distinfo b/graphics/R-cran-visNetwork/distinfo
index cc46cfb982b2..e4e2f42472ac 100644
--- a/graphics/R-cran-visNetwork/distinfo
+++ b/graphics/R-cran-visNetwork/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563057855
-SHA256 (visNetwork_2.0.7.tar.gz) = 15ad01636a3a19e1901be6743052805a5b6a9ac1240fb3dab765252b1e865128
-SIZE (visNetwork_2.0.7.tar.gz) = 4156264
+TIMESTAMP = 1567917214
+SHA256 (visNetwork_2.0.8.tar.gz) = 89ca01cabfcb40513314580daf25dccda0bd8fc74cbe8789e1d7ed6426093051
+SIZE (visNetwork_2.0.8.tar.gz) = 4155589
diff --git a/graphics/delaboratory/pkg-descr b/graphics/delaboratory/pkg-descr
index a10be0140a43..4c5edee7f413 100644
--- a/graphics/delaboratory/pkg-descr
+++ b/graphics/delaboratory/pkg-descr
@@ -21,4 +21,4 @@ It features:
  - RAW support (via dcraw), up to 5 color samplers, histograms and color
    matrices, etc.
 
-WWW: http://bsdforge.com/projects/graphics/delaboratory/
+WWW: https://bsdforge.com/projects/graphics/delaboratory/
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index f9e123ab37c7..db5bacf62a7d 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	digikam
-DISTVERSION=	6.2.0
+DISTVERSION=	6.3.0
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	KDE/digikam/${PORTVERSION}
@@ -17,6 +17,7 @@ LIB_DEPENDS=	libKF5KGeoMap.so:astro/libkgeomap \
 		libboost_graph.so:devel/boost-libs \
 		libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
+		libMagickCore-6.so:graphics/ImageMagick6 \
 		libgphoto2.so:graphics/libgphoto2 \
 		libicalss.so:devel/libical \
 		libjasper.so:graphics/jasper \
diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo
index 522e03cb714e..592c5379b6ec 100644
--- a/graphics/digikam/distinfo
+++ b/graphics/digikam/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566159606
-SHA256 (KDE/digikam/6.2.0/digikam-6.2.0.tar.xz) = 28762ea0f03a82e3b2473c0682a358c9b83f5013aec827dd5ab6556a1f29baeb
-SIZE (KDE/digikam/6.2.0/digikam-6.2.0.tar.xz) = 339472960
+TIMESTAMP = 1567767452
+SHA256 (KDE/digikam/6.3.0/digikam-6.3.0.tar.xz) = 94dc05e3f9c08b83419010d1689c7b0398d4eced4fef42375249c974622874ba
+SIZE (KDE/digikam/6.3.0/digikam-6.3.0.tar.xz) = 335641824
diff --git a/graphics/digikam/files/patch-core_dplugins_generic_tools_mediaserver_CMakeLists.txt b/graphics/digikam/files/patch-core_dplugins_generic_tools_mediaserver_CMakeLists.txt
new file mode 100644
index 000000000000..a516706ab7bd
--- /dev/null
+++ b/graphics/digikam/files/patch-core_dplugins_generic_tools_mediaserver_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- core/dplugins/generic/tools/mediaserver/CMakeLists.txt.orig	2019-09-09 17:14:58 UTC
++++ core/dplugins/generic/tools/mediaserver/CMakeLists.txt
+@@ -166,6 +166,7 @@ add_library(mediaserverbackend STATIC ${libmediaserver
+ 
+ target_link_libraries(mediaserverbackend
+                       digikamcore
++		      Threads::Threads
+ )
+ 
+ # ---------------------------------------------------------------------------------------------------
diff --git a/graphics/digikam/pkg-plist b/graphics/digikam/pkg-plist
index 021cf76e0313..85ff4d5c373c 100644
--- a/graphics/digikam/pkg-plist
+++ b/graphics/digikam/pkg-plist
@@ -2,29 +2,79 @@ bin/cleanup_digikamdb
 bin/digikam
 bin/digitaglinktree
 bin/showfoto
+include/digikam/batchtool.h
+include/digikam/bcgcontainer.h
+include/digikam/coredbaccess.h
+include/digikam/coredbalbuminfo.h
+include/digikam/coredbconstants.h
+include/digikam/coredbfields.h
+include/digikam/coredburl.h
+include/digikam/curvescontainer.h
+include/digikam/dbengineaction.h
+include/digikam/dbengineconfig.h
+include/digikam/dbengineconfigsettings.h
+include/digikam/dbengineerrorhandler.h
+include/digikam/dbengineparameters.h
+include/digikam/dcolor.h
+include/digikam/dcolorblend.h
+include/digikam/dcolorcomposer.h
+include/digikam/dcolorpixelaccess.h
+include/digikam/digikam_config.h
 include/digikam/digikam_core_export.h
 include/digikam/digikam_database_export.h
 include/digikam/digikam_export.h
+include/digikam/digikam_globals.h
+include/digikam/dimg.h
+include/digikam/dimgbuiltinfilter.h
 include/digikam/dinfointerface.h
 include/digikam/ditemslist.h
+include/digikam/dmessagebox.h
 include/digikam/dmetainfoiface.h
 include/digikam/dplugin.h
 include/digikam/dpluginaction.h
 include/digikam/dpluginauthor.h
+include/digikam/dpluginbqm.h
 include/digikam/dplugindialog.h
 include/digikam/dplugineditor.h
 include/digikam/dplugingeneric.h
+include/digikam/dpluginloader.h
 include/digikam/dpreviewimage.h
 include/digikam/dpreviewmanager.h
+include/digikam/drawdecoder.h
+include/digikam/drawdecodersettings.h
+include/digikam/drawdecoding.h
+include/digikam/drawinfo.h
 include/digikam/dsavesettingswidget.h
+include/digikam/dshareddata.h
 include/digikam/dwizarddlg.h
 include/digikam/dwizardpage.h
-lib/cmake/digikam/DigikamCoreConfig-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/digikam/DigikamCoreConfig.cmake
-lib/cmake/digikam/DigikamDatabaseConfig-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/digikam/DigikamDatabaseConfig.cmake
-lib/cmake/digikam/DigikamGuiConfig-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/digikam/DigikamGuiConfig.cmake
+include/digikam/filesaveconflictbox.h
+include/digikam/filteraction.h
+include/digikam/geocoordinates.h
+include/digikam/geoifacetypes.h
+include/digikam/gpsdatacontainer.h
+include/digikam/gpsitemcontainer.h
+include/digikam/historyimageid.h
+include/digikam/iccprofile.h
+include/digikam/imageiface.h
+include/digikam/iofilesettings.h
+include/digikam/iteminfo.h
+include/digikam/iteminfolist.h
+include/digikam/metaengine.h
+include/digikam/metaengine_data.h
+include/digikam/photoinfocontainer.h
+include/digikam/queuesettings.h
+include/digikam/rginfo.h
+include/digikam/wbcontainer.h
+lib/cmake/DigikamCore/DigikamCoreConfig-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/DigikamCore/DigikamCoreConfig.cmake
+lib/cmake/DigikamCore/DigikamCoreConfigVersion.cmake
+lib/cmake/DigikamDatabase/DigikamDatabaseConfig-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/DigikamDatabase/DigikamDatabaseConfig.cmake
+lib/cmake/DigikamDatabase/DigikamDatabaseConfigVersion.cmake
+lib/cmake/DigikamGui/DigikamGuiConfig-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/DigikamGui/DigikamGuiConfig.cmake
+lib/cmake/DigikamGui/DigikamGuiConfigVersion.cmake
 lib/libdigikamcore.so
 lib/libdigikamcore.so.%%SHLIB_VER%%
 lib/libdigikamdatabase.so
@@ -635,6 +685,12 @@ share/kxmlgui5/digikam/importui5.rc
 share/kxmlgui5/digikam/lighttablewindowui5.rc
 share/kxmlgui5/digikam/queuemgrwindowui5.rc
 share/kxmlgui5/showfoto/showfotoui5.rc
+share/metainfo/org.kde.digikam.appdata.xml
+share/metainfo/org.kde.showfoto.appdata.xml
+share/showfoto/data/banner-showfoto.png
+share/showfoto/data/logo-showfoto.png
+share/showfoto/data/splash-showfoto.png
+share/solid/actions/digikam-opencamera.desktop
 %%NLS%%share/locale/ar/LC_MESSAGES/digikam.mo
 %%NLS%%share/locale/be/LC_MESSAGES/digikam.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/digikam.mo
@@ -689,9 +745,3 @@ share/kxmlgui5/showfoto/showfotoui5.rc
 %%NLS%%share/locale/vi/LC_MESSAGES/digikam.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/digikam.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/digikam.mo
-share/metainfo/org.kde.digikam.appdata.xml
-share/metainfo/org.kde.showfoto.appdata.xml
-share/showfoto/data/banner-showfoto.png
-share/showfoto/data/logo-showfoto.png
-share/showfoto/data/splash-showfoto.png
-share/solid/actions/digikam-opencamera.desktop
diff --git a/graphics/drm-legacy-kmod/Makefile b/graphics/drm-legacy-kmod/Makefile
index c04956460203..ecf2f263c445 100644
--- a/graphics/drm-legacy-kmod/Makefile
+++ b/graphics/drm-legacy-kmod/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	drm-legacy-kmod
-PORTVERSION=	g20190828
+PORTVERSION=	g20190910
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
@@ -27,7 +27,7 @@ CONFLICTS_INSTALL=	drm-devel-kmod \
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeBSDDesktop
 GH_PROJECT=	drm-legacy
-GH_TAGNAME=	55900ed
+GH_TAGNAME=	f5db697
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/drm-legacy-kmod/distinfo b/graphics/drm-legacy-kmod/distinfo
index 7a827001696a..20c036d0f6f7 100644
--- a/graphics/drm-legacy-kmod/distinfo
+++ b/graphics/drm-legacy-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566979460
-SHA256 (FreeBSDDesktop-drm-legacy-g20190828-55900ed_GH0.tar.gz) = 8f9600c19a8d32de361ea969bef96dd2a2f87aa6aebadf83d7653dcf0dfdb7a6
-SIZE (FreeBSDDesktop-drm-legacy-g20190828-55900ed_GH0.tar.gz) = 1676494
+TIMESTAMP = 1568094328
+SHA256 (FreeBSDDesktop-drm-legacy-g20190910-f5db697_GH0.tar.gz) = ccbb18735add634cebb73ccfed4e55848d50eea819bac3e0a1fb57657b5bc1ea
+SIZE (FreeBSDDesktop-drm-legacy-g20190910-f5db697_GH0.tar.gz) = 1676641
diff --git a/graphics/embree/Makefile b/graphics/embree/Makefile
index 9f489ebf0f51..99a6fed469f4 100644
--- a/graphics/embree/Makefile
+++ b/graphics/embree/Makefile
@@ -11,19 +11,14 @@ COMMENT=	Collection of high-performance ray tracing kernels
 
 LICENSE=	APACHE20
 
-BROKEN=		fails to link
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2019-09-04
-
-ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	heavy use of SSE instructions
 
-USE_GITHUB=	yes
-
-USES=		cmake compiler:env
+USES=		cmake compiler:env gl xorg
 USE_GL=		gl glu glut
 USE_XORG=	xi xmu
 USE_LDCONFIG=	yes
+USE_GITHUB=	yes
 
 CMAKE_ARGS=	-DEMBREE_TASKING_SYSTEM:STRING=INTERNAL
 
@@ -31,7 +26,6 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}2
 PLIST_SUB+=	VERSION=${DISTVERSION}
 
 OPTIONS_DEFINE=	DOCS IMAGEMAGICK ISPC JPEG PNG
-OPTIONS_DEFAULT=	ISPC
 OPTIONS_SUB=	yes
 
 IMAGEMAGICK_DESC=	BMP, GIF, PNG, TGA, TIFF image formats support
diff --git a/graphics/fpc-rsvg/Makefile b/graphics/fpc-rsvg/Makefile
index b8e18e41fb7b..806b38fa7e5e 100644
--- a/graphics/fpc-rsvg/Makefile
+++ b/graphics/fpc-rsvg/Makefile
@@ -17,6 +17,7 @@ OPTIONS_DEFINE=	LIBRSVG2
 LIBRSVG2_DESC=	Install librsvg2 library
 OPTIONS_DEFAULT=	LIBRSVG2
 
-LIBRSVG2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
+LIBRSVG2_USES=	gnome
+LIBRSVG2_USE=	GNOME=librsvg2
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/geeqie/files/patch-Makefile.am b/graphics/geeqie/files/patch-Makefile.am
index 37a435fce8e6..4bd94c141248 100644
--- a/graphics/geeqie/files/patch-Makefile.am
+++ b/graphics/geeqie/files/patch-Makefile.am
@@ -1,6 +1,16 @@
-Don't install changelogs for they're too heavy and are a git logs (instead of real changelogs) anyway
---- Makefile.am.orig	2019-07-26 18:19:11 UTC
+--- Makefile.am.orig	2019-08-20 19:01:23 UTC
 +++ Makefile.am
+@@ -2,8 +2,8 @@
+ 
+ include $(top_srcdir)/aminclude.am
+ 
+-SUBDIRS = src po doc plugins
+-DIST_SUBDIRS = src po doc plugins
++SUBDIRS = src po plugins
++DIST_SUBDIRS = src po plugins
+ 
+ man_MANS = geeqie.1
+ 
 @@ -12,7 +12,7 @@ readmedir = @readmedir@
  if HAVE_MARKDOWN
  readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html
diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index 20fccac40cb4..fd886f89010e 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gegl
 PORTVERSION=	0.4.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	GIMP
 
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 44898d3ab46f..2d58a2755166 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -40,7 +40,7 @@ LIBWMF_CONFIGURE_WITH=	libwmf
 LIBWMF_LIB_DEPENDS=	libwmf.so:graphics/libwmf
 
 LIBRSVG2_CONFIGURE_WITH=librsvg
-LIBRSVG2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
+LIBRSVG2_USE=		GNOME=librsvg2
 
 LIBEXIF_CONFIGURE_ENABLE=exif # bundled exif is used
 LIBEXIF_BROKEN_OFF=	does not build without libexif support
diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile
index 2404ae7a7309..c3c0fce9acad 100644
--- a/graphics/inventor/Makefile
+++ b/graphics/inventor/Makefile
@@ -15,6 +15,8 @@ COMMENT=	SGI's Open Inventor (TM)
 LICENSE=	LGPL21
 
 BROKEN=		unfetchable
+DEPRECATED=	Depends on expiring graphics/libGLw
+EXPIRATION_DATE=	2019-11-01
 
 ONLY_FOR_ARCHS=	amd64 i386
 CONFLICTS=	Coin-[0-9]* SoXt-[0-9]*
diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile
index 28cf33454055..131dfa1f8eb7 100644
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	krita
-DISTVERSION=	4.2.3
-PORTREVISION=	4
+DISTVERSION=	4.2.6
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}
 DIST_SUBDIR=	KDE/${PORTNAME}
@@ -35,7 +34,7 @@ LIB_DEPENDS=	libImath.so:graphics/ilmbase \
 # Disable ninja generator for now (with gmake), until the duplicate test targets are resolved upstream.
 USES=		cmake:noninja gmake compiler:c++11-lib desktop-file-utils \
 		eigen:3 gettext jpeg kde:5 pkgconfig python:3.4+ qt:5 \
-		shared-mime-info
+		shared-mime-info xorg
 USE_KDE=	archive completion config coreaddons crash guiaddons i18n \
 		itemmodels itemviews kio service widgetsaddons windowsystem
 USE_QT=		concurrent core dbus declarative gui multimedia network printsupport \
diff --git a/graphics/krita/distinfo b/graphics/krita/distinfo
index 6326dce8e1cd..ab7ee1a29b94 100644
--- a/graphics/krita/distinfo
+++ b/graphics/krita/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563002816
-SHA256 (KDE/krita/krita-4.2.3.tar.gz) = 7b302dc204fba84737013528720c1704bea98f805a1215369f53c6421c088467
-SIZE (KDE/krita/krita-4.2.3.tar.gz) = 246136588
+TIMESTAMP = 1568188576
+SHA256 (KDE/krita/krita-4.2.6.tar.gz) = a7ea86f7943a29c7e0a764efc3f992a834b08c1ad4cdb4c7073a3912df3cdde3
+SIZE (KDE/krita/krita-4.2.6.tar.gz) = 246320346
diff --git a/graphics/krita/pkg-plist b/graphics/krita/pkg-plist
index 3883a8618112..183123caf64d 100644
--- a/graphics/krita/pkg-plist
+++ b/graphics/krita/pkg-plist
@@ -96,8 +96,6 @@ lib/kritaplugins/kritapixelizefilter.so
 lib/kritaplugins/kritapngexport.so
 lib/kritaplugins/kritapngimport.so
 lib/kritaplugins/kritaposterize.so
-lib/kritaplugins/kritappmexport.so
-lib/kritaplugins/kritappmimport.so
 lib/kritaplugins/kritapresetdocker.so
 lib/kritaplugins/kritapresethistory.so
 lib/kritaplugins/kritapsdexport.so
@@ -262,7 +260,6 @@ share/applications/krita_kra.desktop
 share/applications/krita_ora.desktop
 share/applications/krita_pdf.desktop
 share/applications/krita_png.desktop
-share/applications/krita_ppm.desktop
 share/applications/krita_psd.desktop
 share/applications/krita_qimageio.desktop
 share/applications/krita_raw.desktop
@@ -302,25 +299,25 @@ share/color/icc/krita/krita25_lcms-builtin-sRGB_g100-truegamma.icc
 share/color/icc/krita/sRGB-elle-V2-g10.icc
 share/color/icc/krita/sRGB-elle-V2-srgbtrc.icc
 share/color/icc/krita/scRGB.icm
-share/icons/hicolor/1024x1024/apps/calligrakrita.png
+share/icons/hicolor/1024x1024/apps/krita.png
 share/icons/hicolor/1024x1024/mimetypes/application-x-krita.png
-share/icons/hicolor/128x128/apps/calligrakrita.png
+share/icons/hicolor/128x128/apps/krita.png
 share/icons/hicolor/128x128/mimetypes/application-x-krita.png
-share/icons/hicolor/16x16/apps/calligrakrita.png
+share/icons/hicolor/16x16/apps/krita.png
 share/icons/hicolor/16x16/mimetypes/application-x-krita.png
-share/icons/hicolor/22x22/apps/calligrakrita.png
+share/icons/hicolor/22x22/apps/krita.png
 share/icons/hicolor/22x22/mimetypes/application-x-krita.png
-share/icons/hicolor/256x256/apps/calligrakrita.png
+share/icons/hicolor/256x256/apps/krita.png
 share/icons/hicolor/256x256/mimetypes/application-x-krita.png
-share/icons/hicolor/32x32/apps/calligrakrita.png
+share/icons/hicolor/32x32/apps/krita.png
 share/icons/hicolor/32x32/mimetypes/application-x-krita.png
-share/icons/hicolor/48x48/apps/calligrakrita.png
+share/icons/hicolor/48x48/apps/krita.png
 share/icons/hicolor/48x48/mimetypes/application-x-krita.png
-share/icons/hicolor/512x512/apps/calligrakrita.png
+share/icons/hicolor/512x512/apps/krita.png
 share/icons/hicolor/512x512/mimetypes/application-x-krita.png
-share/icons/hicolor/64x64/apps/calligrakrita.png
+share/icons/hicolor/64x64/apps/krita.png
 share/icons/hicolor/64x64/mimetypes/application-x-krita.png
-share/icons/hicolor/scalable/apps/calligrakrita.svgz
+share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/actions/ConnectionTool.action
 %%DATADIR%%/actions/InteractionTool.action
 %%DATADIR%%/actions/KarbonCalligraphyTool.action
diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile
index 3f23fc95c2cb..cd434ec15198 100644
--- a/graphics/libGLw/Makefile
+++ b/graphics/libGLw/Makefile
@@ -12,6 +12,9 @@ DIST_SUBDIR=	GL
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL widgets library
 
+DEPRECATED=    Deprecated upstream
+EXPIRATION_DATE=       2019-11-01
+
 USES=		motif libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 USE_GL=		gl
diff --git a/graphics/librsvg2-rust/Makefile b/graphics/librsvg2-rust/Makefile
index bb9ca8d0c67c..495de516ab46 100644
--- a/graphics/librsvg2-rust/Makefile
+++ b/graphics/librsvg2-rust/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	librsvg
-PORTVERSION=	2.45.92
+PORTVERSION=	2.46.0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2-rust
diff --git a/graphics/librsvg2-rust/distinfo b/graphics/librsvg2-rust/distinfo
index 1127dbad7162..814695fd5aba 100644
--- a/graphics/librsvg2-rust/distinfo
+++ b/graphics/librsvg2-rust/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567494201
-SHA256 (gnome2/librsvg-2.45.92.tar.xz) = 77b358ed5cfe1b18f36797f764195be714f04d10454d9a4a4863a73c7b3f41d5
-SIZE (gnome2/librsvg-2.45.92.tar.xz) = 12691020
+TIMESTAMP = 1568097969
+SHA256 (gnome2/librsvg-2.46.0.tar.xz) = 96c81e52cb81450f3b2e915e6409fd7d1e3c01e4661974b3a98c09a7c45743d1
+SIZE (gnome2/librsvg-2.46.0.tar.xz) = 12769900
diff --git a/graphics/linux-c7-cairo-gobject/Makefile b/graphics/linux-c7-cairo-gobject/Makefile
new file mode 100644
index 000000000000..03be76167c6c
--- /dev/null
+++ b/graphics/linux-c7-cairo-gobject/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+PORTNAME=	cairo
+PORTVERSION=	1.15.12
+DISTVERSIONSUFFIX=	-3.el7
+CATEGORIES=	graphics linux
+PKGNAMESUFFIX=	-gobject
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Vector graphics library Cairo (Linux CentOS ${LINUX_DIST_VER})
+
+USES=		linux:c7
+USE_LINUX=	cairo dri fontconfig freetype pixman png xorglibs
+USE_LINUX_RPM=	yes
+
+LIB_DISTNAMES=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
+.include <bsd.port.mk>
diff --git a/graphics/linux-c7-cairo-gobject/distinfo b/graphics/linux-c7-cairo-gobject/distinfo
new file mode 100644
index 000000000000..50c9f7d45864
--- /dev/null
+++ b/graphics/linux-c7-cairo-gobject/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1567362495
+SHA256 (centos/cairo-gobject-1.15.12-3.el7.i686.rpm) = e1ee61497557c14118ba7143aae631da9c5d82c0414063a0f3b730d3822642b2
+SIZE (centos/cairo-gobject-1.15.12-3.el7.i686.rpm) = 25076
+SHA256 (centos/cairo-gobject-1.15.12-3.el7.x86_64.rpm) = 3379f8913ca89146da289efce61c342f4e0143e01deae61d2ba9e5d9b1efe468
+SIZE (centos/cairo-gobject-1.15.12-3.el7.x86_64.rpm) = 26040
+SHA256 (centos/cairo-1.15.12-3.el7.src.rpm) = 466d800d523211017c26429c5d02597c20db40403334a57ced716d20c4a9fd84
+SIZE (centos/cairo-1.15.12-3.el7.src.rpm) = 41912306
diff --git a/graphics/linux-c7-cairo-gobject/pkg-plist.amd64 b/graphics/linux-c7-cairo-gobject/pkg-plist.amd64
new file mode 100644
index 000000000000..0f3da14b1a05
--- /dev/null
+++ b/graphics/linux-c7-cairo-gobject/pkg-plist.amd64
@@ -0,0 +1,4 @@
+usr/lib/libcairo-gobject.so.2
+usr/lib/libcairo-gobject.so.2.11512.0
+usr/lib64/libcairo-gobject.so.2
+usr/lib64/libcairo-gobject.so.2.11512.0
diff --git a/graphics/linux-c7-cairo-gobject/pkg-plist.i386 b/graphics/linux-c7-cairo-gobject/pkg-plist.i386
new file mode 100644
index 000000000000..0f61a311cf77
--- /dev/null
+++ b/graphics/linux-c7-cairo-gobject/pkg-plist.i386
@@ -0,0 +1,2 @@
+usr/lib/libcairo-gobject.so.2
+usr/lib/libcairo-gobject.so.2.11512.0
diff --git a/graphics/linux-c7-libepoxy/Makefile b/graphics/linux-c7-libepoxy/Makefile
new file mode 100644
index 000000000000..232046543763
--- /dev/null
+++ b/graphics/linux-c7-libepoxy/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME=	libepoxy
+PORTVERSION=	1.5.2
+DISTVERSIONSUFFIX=	-1.el7
+CATEGORIES=	graphics linux
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Library to handle OpenGL function pointer management (Linux CentOS ${LINUX_DIST_VER})
+
+USES=		linux:c7
+USE_LDCONFIG=	yes
+USE_LINUX_RPM=	yes
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.mk>
diff --git a/graphics/linux-c7-libepoxy/distinfo b/graphics/linux-c7-libepoxy/distinfo
new file mode 100644
index 000000000000..5b7223c8d14b
--- /dev/null
+++ b/graphics/linux-c7-libepoxy/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1567361597
+SHA256 (centos/libepoxy-1.5.2-1.el7.i686.rpm) = 856175aef5ac663d3eb404169539a300bb781dc232781f6a144442804d8aa8dc
+SIZE (centos/libepoxy-1.5.2-1.el7.i686.rpm) = 225316
+SHA256 (centos/libepoxy-1.5.2-1.el7.x86_64.rpm) = 34fb298fb5ea30cb6c7eca7a78ceb9cfb8d97d56ccd41aa3b1a4b023ad5a906f
+SIZE (centos/libepoxy-1.5.2-1.el7.x86_64.rpm) = 215620
+SHA256 (centos/libepoxy-1.5.2-1.el7.src.rpm) = a3322972bdbf3febae6fdc37d8712bb59475f832e504abd7d979fcac5400c50e
+SIZE (centos/libepoxy-1.5.2-1.el7.src.rpm) = 816159
diff --git a/graphics/linux-c7-libepoxy/pkg-plist.amd64 b/graphics/linux-c7-libepoxy/pkg-plist.amd64
new file mode 100644
index 000000000000..dce0ce2ac7a9
--- /dev/null
+++ b/graphics/linux-c7-libepoxy/pkg-plist.amd64
@@ -0,0 +1,5 @@
+usr/lib/libepoxy.so.0
+usr/lib/libepoxy.so.0.0.0
+usr/lib64/libepoxy.so.0
+usr/lib64/libepoxy.so.0.0.0
+%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/graphics/linux-c7-libepoxy/pkg-plist.i386 b/graphics/linux-c7-libepoxy/pkg-plist.i386
new file mode 100644
index 000000000000..566b96f1b6e2
--- /dev/null
+++ b/graphics/linux-c7-libepoxy/pkg-plist.i386
@@ -0,0 +1,3 @@
+usr/lib/libepoxy.so.0
+usr/lib/libepoxy.so.0.0.0
+%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile
deleted file mode 100644
index b12e88b2586a..000000000000
--- a/graphics/luxrender/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	luxrender
-DISTVERSION?=	1.6
-PORTREVISION=	15
-CATEGORIES=	graphics
-MASTER_SITES=	https://bitbucket.org/luxrender/lux/get/ \
-		https://bitbucket.org/luxrender/luxrays/get/:lr
-DISTFILES=	v${DISTVERSION:C/[.-]//g}${EXTRACT_SUFX} \
-		${PORTNAME}_v${DISTVERSION:S/-//}${EXTRACT_SUFX}:lr
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	Physically based and unbiased rendering system
-
-LICENSE=	GPLv3
-
-BROKEN=		fails to build with boost 1.70, see bug 236599
-DEPRECATED=	Depends on expiring graphics/embree
-EXPIRATION_DATE=	2019-09-04
-
-LIB_DEPENDS=	${PY_BOOST} \
-		libfftw3.so:math/fftw3 \
-		libOpenImageIO.so:graphics/openimageio
-.if ${DISTVERSION} != 1.4
-LIB_DEPENDS+=	libembree.so:graphics/embree
-.endif
-
-CONFLICTS_INSTALL?=	${PORTNAME}14-1.4*
-
-ONLY_FOR_ARCHS=	i386 amd64
-ONLY_FOR_ARCHS_REASON=	uses SSE instructions
-
-USES+=		bison cmake:noninja python:build tar:bzip2
-USE_GL=		glu
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-lux-${LUX_REV}
-LUXRAYS_WRKSRC=	${WRKDIR}/${PORTNAME}-luxrays-${LUXRAYS_REV}
-
-CMAKE_ARGS=	-DLUXCORE_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \
-		-DLUXCORE_LIBRARY:STRING="${LUXRAYS_WRKSRC}/lib/libluxcore.a" \
-		-DLUXRAYS_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \
-		-DLUXRAYS_LIBRARY:STRING="${LUXRAYS_WRKSRC}/lib/libluxrays.a" \
-		-DSLG_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \
-		-DSLG_LIBRARY:PATH="${LUXRAYS_WRKSRC}/lib/libsmallluxgpu.a" \
-		-DLUXRAYS_DISABLE_OPENCL:BOOL=ON
-
-LUX_REV?=	b3f85cf7742f
-LUXRAYS_REV?=	61352e6aae3f
-
-OPTIONS_DEFINE=	FREEIMAGE X11
-OPTIONS_DEFAULT=	X11
-
-FREEIMAGE_DESC=	Build with FreeImage (otherwise use OIIO only)
-FREEIMAGE_CMAKE_ON=	-DLUX_USE_FREEIMAGE:BOOL=ON
-FREEIMAGE_LIB_DEPENDS=	libfreeimage.so:graphics/freeimage
-
-post-extract:
-	@${LN} -sf ${PORTNAME}-luxrays-${LUXRAYS_REV} ${WRKDIR}/luxrays
-
-post-patch:
-	@${REINPLACE_CMD} -e 's/__APPLE__/__FreeBSD__/' \
-		${WRKSRC}/core/osfunc.h \
-		${WRKSRC}/shapes/mikktspace/weldmesh.c
-# Avoid infamous "local symbol discarded in section `.text...' errors
-	@${REINPLACE_CMD} -e '/^set(Boost_USE_STATIC_LIBS/s,ON,OFF,' \
-		${LUXRAYS_WRKSRC}/cmake/Dependencies.cmake
-# Avoid picking up Python 3.x bits if they're installed
-	@${REINPLACE_CMD} -e 's,PythonLibs,& ${PYTHON_VER} EXACT REQUIRED,' \
-		${LUXRAYS_WRKSRC}/cmake/Dependencies.cmake \
-		${WRKSRC}/cmake/pylux.cmake
-
-pre-configure:
-	-${PYTHON_CMD} ${WRKSRC}/makeBuildNumber.py ${WRKSRC}/core/version.h
-	cd ${LUXRAYS_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \
-		${CMAKE_ARGS} .
-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
-		${_MAKE_JOBS} ${MAKE_ARGS} -C ${LUXRAYS_WRKSRC}
-
-.include <bsd.port.mk>
diff --git a/graphics/luxrender/distinfo b/graphics/luxrender/distinfo
deleted file mode 100644
index a857ce4ab2df..000000000000
--- a/graphics/luxrender/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (luxrender/v16.tar.bz2) = 29144f657087644086928a66421df5d25fc4dccd05970200932f5693650ddecf
-SIZE (luxrender/v16.tar.bz2) = 2421141
-SHA256 (luxrender/luxrender_v1.6.tar.bz2) = eb38489e4bcb1336027efc8fa991f506bf78e8cb9edc7b73794e0cdcf998b15a
-SIZE (luxrender/luxrender_v1.6.tar.bz2) = 36615450
diff --git a/graphics/luxrender/files/patch-CMakeLists.txt b/graphics/luxrender/files/patch-CMakeLists.txt
deleted file mode 100644
index 5cd7bca61653..000000000000
--- a/graphics/luxrender/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -210,7 +210,6 @@ IF(NOT APPLE AND NOT WIN32)
- 	STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _mach_x86_64 ${MACHINE})
- 	IF (_mach_x86_64)
- 		SET(ARCH_X86_64 1)
--		SET(LIB_SUFFIX 64)
- 		#jromang - Hack to avoid boost bug on x64  Ubuntu 8.10 and Fedora 10 (http://www.luxrender.net/mantis/view.php?id=433)
- 		ADD_DEFINITIONS(-DBOOST_NO_INTRINSIC_INT64_T)
- 	ENDIF (_mach_x86_64)
-@@ -402,7 +401,7 @@ ELSEIF(MSVC)
- ELSE(APPLE)
- 	# Dade - default compiler options
- 	# Removed "-O3" from definitions in order to have CMake Release/Debug options to work
--	ADD_DEFINITIONS(-msse2 -mfpmath=sse -ftree-vectorize -funroll-loops -Wall -fPIC -DHAVE_PTHREAD_H)
-+	ADD_DEFINITIONS(-msse -Wall -fPIC -DHAVE_PTHREAD_H)
- 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fvisibility=hidden -fvisibility-inlines-hidden")
- 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fvisibility=hidden -fvisibility-inlines-hidden")
- 	# The QBVH accelerator needs to be compiled with much reduced optimizations
diff --git a/graphics/luxrender/files/patch-accelerators_bvhaccel.cpp b/graphics/luxrender/files/patch-accelerators_bvhaccel.cpp
deleted file mode 100644
index 9b351647ea1d..000000000000
--- a/graphics/luxrender/files/patch-accelerators_bvhaccel.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-After http://github.com/boostorg/range/commit/69409ed63a9e1 build fails:
-
-accelerators/bvhaccel.cpp:149:19: error: call to 'distance' is ambiguous
-                        u_int middle = distance(list.begin(), it);
-                                       ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = std::__1::__wrap_iter<boost::shared_ptr<lux::BVHAccelTreeNode> *>]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = std::__1::__wrap_iter<boost::shared_ptr<lux::BVHAccelTreeNode> *>]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
-
---- accelerators/bvhaccel.cpp.orig	2016-05-09 21:21:17 UTC
-+++ accelerators/bvhaccel.cpp
-@@ -146,7 +146,7 @@ boost::shared_ptr<BVHAccelTreeNode> BVHAccel::BuildHie
- 
- 			vector<boost::shared_ptr<BVHAccelTreeNode> >::iterator it =
- 				partition(list.begin()+splits[j], list.begin()+splits[j+1], bind2nd(ptr_fun(bvh_ltf[splitAxis]), splitValue));
--			u_int middle = distance(list.begin(), it);
-+			u_int middle = std::distance(list.begin(), it);
- 			middle = max(splits[j]+1, min(splits[j+1]-1, middle)); // Make sure coincidental BBs are still split
- 			splits.insert(splits.begin()+j+1, middle);
- 		}
diff --git a/graphics/luxrender/files/patch-c++14-fixes b/graphics/luxrender/files/patch-c++14-fixes
deleted file mode 100644
index 2391a7e2f783..000000000000
--- a/graphics/luxrender/files/patch-c++14-fixes
+++ /dev/null
@@ -1,40 +0,0 @@
---- core/queryable/queryable.h.orig	2016-05-09 21:21:17 UTC
-+++ core/queryable/queryable.h
-@@ -194,7 +194,7 @@ class LUX_EXPORT Queryable (public)
- 	}
- 	template<class T> friend void AddStringAttribute(T &object,
- 		const std::string &name, const std::string &description,
--		const boost::function<std::string (void)> &get, const boost::function<void (std::string)> set = NULL) {
-+		const boost::function<std::string (void)> &get, const boost::function<void (std::string)> set = 0x0) {
- 
- 		AddAttrib<QueryableStringAttribute>(object, name, description, get, set);
- 	}
---- core/scheduler.cpp.orig	2016-05-09 21:21:17 UTC
-+++ core/scheduler.cpp
-@@ -43,7 +43,7 @@ void NullTask(Range*){}
- 
- Scheduler::Scheduler(unsigned step)
- {
--	current_task = NULL;
-+	current_task = 0x0;
- 	default_step = step;
- 	state = RUNNING;
- 
-@@ -127,7 +127,7 @@ TaskType Scheduler::GetTask()
- 		condition.wait(lock);
- 
- 	if(current_task == NullTask)
--		return NULL;
-+		return 0x0;
- 
- 	return current_task;
- }
-@@ -152,7 +152,7 @@ bool Scheduler::EndTask(Thread* thread)
- 
- 	if(counter == 0)
- 	{
--		current_task = NULL;
-+		current_task = 0x0;
- 		condition.notify_all();
- 	}
- 	else
diff --git a/graphics/luxrender/files/patch-gcc42-fixes b/graphics/luxrender/files/patch-gcc42-fixes
deleted file mode 100644
index dbf2e1b99f53..000000000000
--- a/graphics/luxrender/files/patch-gcc42-fixes
+++ /dev/null
@@ -1,394 +0,0 @@
---- ../luxrays/include/luxrays/core/geometry/frame.h.orig
-+++ ../luxrays/include/luxrays/core/geometry/frame.h
-@@ -46,11 +46,11 @@ public:
- 		SetFromZ(z);
- 	}
- 
--	Frame(const Normal &z) {
-+	Frame(const luxrays::Normal &z) {
- 		SetFromZ(Vector(z));
- 	}
- 
--	void SetFromZ(const Normal &z) {
-+	void SetFromZ(const luxrays::Normal &z) {
- 		SetFromZ(Vector(z)); 
- 	}
- 
---- textures/bilerp.h.orig
-+++ textures/bilerp.h
-@@ -39,7 +39,7 @@ public:
- 	// BilerpTexture Public Methods
- 	BilerpFloatTexture(TextureMapping2D *m,
- 		float t00, float t01, float t10, float t11) :
--		Texture("BilerpFloatTexture-" + boost::lexical_cast<string>(this)) {
-+		lux::Texture<float>::Texture("BilerpFloatTexture-" + boost::lexical_cast<string>(this)) {
- 		mapping = m;
- 		v00 = t00;
- 		v01 = t01;
-@@ -87,7 +87,7 @@ public:
- 	BilerpSpectrumTexture(TextureMapping2D *m,
- 		const RGBColor &t00, const RGBColor &t01,
- 		const RGBColor &t10, const RGBColor &t11) :
--		Texture("BilerpSpectrumTexture-" + boost::lexical_cast<string>(this)) {
-+		lux::Texture<lux::SWCSpectrum>::Texture("BilerpSpectrumTexture-" + boost::lexical_cast<string>(this)) {
- 		mapping = m;
- 		v00 = t00;
- 		v01 = t01;
-@@ -145,7 +145,7 @@ public:
- 		const boost::shared_ptr<Texture<FresnelGeneral> > &t01,
- 		const boost::shared_ptr<Texture<FresnelGeneral> > &t10,
- 		const boost::shared_ptr<Texture<FresnelGeneral> > &t11) :
--		Texture("BilerpFresnelTexture-" + boost::lexical_cast<string>(this)) {
-+		lux::Texture<lux::FresnelGeneral>::Texture("BilerpFresnelTexture-" + boost::lexical_cast<string>(this)) {
- 		mapping = m;
- 		v00 = t00;
- 		v01 = t01;
---- textures/blackbody.h.orig
-+++ textures/blackbody.h
-@@ -34,7 +34,7 @@ namespace lux
- class BlackBodyTexture : public Texture<SWCSpectrum> {
- public:
- 	// BlackBodyTexture Public Methods
--	BlackBodyTexture(float t) : Texture("BlackBodyTexture-" + boost::lexical_cast<string>(this)),
-+	BlackBodyTexture(float t) : lux::Texture<lux::SWCSpectrum>::Texture("BlackBodyTexture-" + boost::lexical_cast<string>(this)),
- 			BBSPD(t) { }
- 	virtual ~BlackBodyTexture() { }
- 	virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
---- textures/blender_base.h.orig
-+++ textures/blender_base.h
-@@ -34,7 +34,7 @@ public:
- 	virtual ~BlenderTexture3D() { }
- 
- 	BlenderTexture3D(const std::string &name, const Transform &tex2world, const ParamSet &tp,
--		short type) : Texture(name) {
-+		short type) : lux::Texture<float>::Texture(name) {
- 		// Read mapping coordinates
- 		mapping = TextureMapping3D::Create(tex2world, tp);
- 		tex1 = tp.GetFloatTexture("tex1", 0.f);
---- textures/cauchytexture.h.orig
-+++ textures/cauchytexture.h
-@@ -35,7 +35,7 @@ class CauchyTexture : public Texture<Fre
- public:
- 	// ConstantTexture Public Methods
- 	CauchyTexture(float cauchya, float cauchyb) :
--		Texture("CauchyTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::FresnelGeneral>::Texture("CauchyTexture-" + boost::lexical_cast<string>(this)),
- 		fresnel(cauchya, cauchyb, 0.f), index(cauchya + cauchyb * 1e6f /
- 		(WAVELENGTH_END * WAVELENGTH_START)) { }
- 	virtual ~CauchyTexture() { }
---- textures/checkerboard.h.orig
-+++ textures/checkerboard.h
-@@ -42,7 +42,7 @@ public:
- 	Checkerboard2D(TextureMapping2D *m,
- 		boost::shared_ptr<Texture<float> > &c1,
- 		boost::shared_ptr<Texture<float> > &c2, const string &aa) :
--		Texture("Checkerboard2D-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<float>::Texture("Checkerboard2D-" + boost::lexical_cast<string>(this)),
- 		tex1(c1), tex2(c2), mapping(m) {
- 		// Select anti-aliasing method for _Checkerboard2D_
- 		if (aa == "none")
-@@ -226,7 +226,7 @@ public:
- 	Checkerboard3D(TextureMapping3D *m,
- 		boost::shared_ptr<Texture<float> > &c1,
- 		boost::shared_ptr<Texture<float> > &c2) :
--		Texture("Checkerboard3D-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<float>::Texture("Checkerboard3D-" + boost::lexical_cast<string>(this)),
- 		tex1(c1), tex2(c2), mapping(m) { }
- 	virtual ~Checkerboard3D() { delete mapping; }
- 	virtual float Evaluate(const SpectrumWavelengths &sw,
---- textures/cloud.h.orig
-+++ textures/cloud.h
-@@ -47,7 +47,7 @@ public:
- 		const u_int octaves, const float o, const float offset,
- 		const u_int numspheres, const float spheresize,
- 		TextureMapping3D *map) :
--		Texture("CloudTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<float>::Texture("CloudTexture-" + boost::lexical_cast<string>(this)),
- 		radius(r), numSpheres(numspheres), sphereSize(spheresize),
- 		sharpness(sharp), baseFlatness(baseflatness), variability(v),
- 		omega(o), firstNoiseScale(noiseScale), noiseOffset(offset),
---- textures/colordepth.h.orig
-+++ textures/colordepth.h
-@@ -34,7 +34,7 @@ class ColorDepthTexture : public Texture
- public:
- 	// ColorDepthTexture Public Methods
- 	ColorDepthTexture(float t, boost::shared_ptr<Texture<SWCSpectrum> > &c) :
--		Texture("ColorDepthTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::SWCSpectrum>::Texture("ColorDepthTexture-" + boost::lexical_cast<string>(this)),
- 		d(-max(1e-3f, t)), color(c) { }
- 	virtual ~ColorDepthTexture() { }
- 	virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
---- textures/constant.h.orig
-+++ textures/constant.h
-@@ -36,7 +36,7 @@ class ConstantFloatTexture : public Text
- public:
- 	// ConstantTexture Public Methods
- 	ConstantFloatTexture(float v) :
--		Texture("ConstantFloatTexture-" + boost::lexical_cast<string>(this)), value(v) {
-+		lux::Texture<float>::Texture("ConstantFloatTexture-" + boost::lexical_cast<string>(this)), value(v) {
- 			AddFloatAttribute(*this, "value", "ConstantFloatTexture value", &ConstantFloatTexture::value);
- 		}
- 	virtual ~ConstantFloatTexture() { }
-@@ -60,7 +60,7 @@ class ConstantRGBColorTexture : public T
- public:
- 	// ConstantTexture Public Methods
- 	ConstantRGBColorTexture(const RGBColor &s) :
--		Texture("ConstantRGBColorTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::SWCSpectrum>::Texture("ConstantRGBColorTexture-" + boost::lexical_cast<string>(this)),
- 		color(s) {
- 		RGBSPD = new RGBReflSPD(color);
- 
-@@ -99,7 +99,7 @@ class ConstantFresnelTexture : public Te
- public:
- 	// ConstantTexture Public Methods
- 	ConstantFresnelTexture(float v) :
--		Texture("ConstantFresnelTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::FresnelGeneral>::Texture("ConstantFresnelTexture-" + boost::lexical_cast<string>(this)),
- 		value(DIELECTRIC_FRESNEL, SWCSpectrum(v), 0.f), val(v) {
- 		AddFloatAttribute(*this, "value", "ConstantFresnelTexture value", &ConstantFresnelTexture::val);
- 	}
---- textures/densitygrid.h.orig
-+++ textures/densitygrid.h
-@@ -39,7 +39,7 @@ public:
- 	// DensityGridTexture Public Methods
- 	DensityGridTexture(int x, int y, int z, const float *d,
- 		enum WrapMode w, TextureMapping3D *map) :
--		Texture("DensityGridTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<float>::Texture("DensityGridTexture-" + boost::lexical_cast<string>(this)),
- 		nx(x), ny(y), nz(z), wrapMode(w), mapping(map) {
- 		density.assign(d, d + nx * ny * nz);
- 		dMin = *std::min_element(density.begin(), density.end());
---- textures/dots.h.orig
-+++ textures/dots.h
-@@ -37,7 +37,7 @@ public:
- 	// DotsTexture Public Methods
- 	DotsTexture(TextureMapping2D *m, boost::shared_ptr<Texture<float> > &c1,
- 		boost::shared_ptr<Texture<float> > &c2) :
--		Texture("DotsTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<float>::Texture("DotsTexture-" + boost::lexical_cast<string>(this)),
- 		outsideDot(c1), insideDot(c2), mapping(m) { }
- 	virtual ~DotsTexture() { delete mapping; }
- 	virtual float Evaluate(const SpectrumWavelengths &sw,
---- textures/equalenergy.h.orig
-+++ textures/equalenergy.h
-@@ -35,7 +35,7 @@ class EqualEnergyTexture : public Textur
- public:
- 	// EqualEnergyTexture Public Methods
- 	EqualEnergyTexture(float t) :
--		Texture("EqualEnergyTexture-" + boost::lexical_cast<string>(this)), e(t) { }
-+		lux::Texture<lux::SWCSpectrum>::Texture("EqualEnergyTexture-" + boost::lexical_cast<string>(this)), e(t) { }
- 	virtual ~EqualEnergyTexture() { }
- 	virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
- 		const DifferentialGeometry &) const {
---- textures/exponential.h.orig
-+++ textures/exponential.h
-@@ -36,7 +36,7 @@ public:
- 	// ExponentialTexture Public Methods
- 	ExponentialTexture(const Point &o, const Vector &up, float d,
- 		TextureMapping3D *map) :
--		Texture("ExponentialTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<float>::Texture("ExponentialTexture-" + boost::lexical_cast<string>(this)),
- 		origin(o), upDir(up), decay(d), mapping(map) { }
- 	virtual ~ExponentialTexture() { delete mapping; }
- 	virtual float Evaluate(const SpectrumWavelengths &sw,
---- textures/fbm.h.orig
-+++ textures/fbm.h
-@@ -37,7 +37,7 @@ class FBmTexture : public Texture<float>
- public:
- 	// FBmTexture Public Methods
- 	FBmTexture(int oct, float roughness, TextureMapping3D *map) :
--		Texture("FBmTexture-" + boost::lexical_cast<string>(this)) {
-+		lux::Texture<float>::Texture("FBmTexture-" + boost::lexical_cast<string>(this)) {
- 		omega = roughness;
- 		octaves = oct;
- 		mapping = map;
---- textures/frequencytexture.h.orig
-+++ textures/frequencytexture.h
-@@ -35,7 +35,7 @@ class FrequencyTexture : public Texture<
- public:
- 	// FrequencyTexture Public Methods
- 	FrequencyTexture(float w, float p, float r)
--		: Texture("FrequencyTexture-" + boost::lexical_cast<string>(this)),
-+		: lux::Texture<lux::SWCSpectrum>::Texture("FrequencyTexture-" + boost::lexical_cast<string>(this)),
- 		FSPD(w, p, r) { }
- 	virtual ~FrequencyTexture() { }
- 	virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
---- textures/fresnelcolor.h.orig
-+++ textures/fresnelcolor.h
-@@ -34,7 +34,7 @@ class FresnelColorTexture : public Textu
- public:
- 	// FresnelColorTexture Public Methods
- 	FresnelColorTexture(const boost::shared_ptr<Texture<SWCSpectrum> > &c) :
--		Texture("FresnelColorTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::FresnelGeneral>::Texture("FresnelColorTexture-" + boost::lexical_cast<string>(this)),
- 		color(c) { }
- 	virtual ~FresnelColorTexture() { }
- 	virtual FresnelGeneral Evaluate(const SpectrumWavelengths &sw,
---- textures/gaussiantexture.h.orig
-+++ textures/gaussiantexture.h
-@@ -35,7 +35,7 @@ class GaussianTexture : public Texture<S
- public:
- 	// GaussianTexture Public Methods
- 	GaussianTexture(float m, float w, float r) :
--		Texture("GaussianTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::SWCSpectrum>::Texture("GaussianTexture-" + boost::lexical_cast<string>(this)),
- 		GSPD(m, w, r) { }
- 	virtual ~GaussianTexture() { }
- 	virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
---- textures/harlequin.h.orig
-+++ textures/harlequin.h
-@@ -40,7 +40,7 @@ namespace lux
- class HarlequinTexture : public Texture<SWCSpectrum> {
- public:
- 	// Harlequin Public Methods
--	HarlequinTexture() : Texture("HarlequinTexture-" + boost::lexical_cast<string>(this)) {
-+	HarlequinTexture() : lux::Texture<lux::SWCSpectrum>::Texture("HarlequinTexture-" + boost::lexical_cast<string>(this)) {
- 		float c[3];
- 		for (int i = 0; i < HARLEQUIN_TEXTURE_PALETTE_SIZE; i++) {
- 			c[0] = RadicalInverse(i * COLOR_SAMPLES + 1, 2);
---- textures/hitpointcolor.h.orig
-+++ textures/hitpointcolor.h
-@@ -34,7 +34,7 @@ namespace lux
- class HitPointAlphaTexture : public Texture<float> {
- public:
- 	HitPointAlphaTexture() :
--		Texture("HitPointAlphaTexture-" + boost::lexical_cast<string>(this)) { }
-+		lux::Texture<float>::Texture("HitPointAlphaTexture-" + boost::lexical_cast<string>(this)) { }
- 	virtual ~HitPointAlphaTexture() { }
- 	virtual float Evaluate(const SpectrumWavelengths &sw,
- 		const DifferentialGeometry &dgs) const {
-@@ -58,7 +58,7 @@ public:
- class HitPointRGBColorTexture : public Texture<SWCSpectrum> {
- public:
- 	HitPointRGBColorTexture() :
--		Texture("HitPointRGBColorTexture-" + boost::lexical_cast<string>(this)) { }
-+		lux::Texture<lux::SWCSpectrum>::Texture("HitPointRGBColorTexture-" + boost::lexical_cast<string>(this)) { }
- 	virtual ~HitPointRGBColorTexture() { }
- 	virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
- 		const DifferentialGeometry &dgs) const {
-@@ -83,7 +83,7 @@ public:
- class HitPointGreyTexture : public Texture<float> {
- public:
- 	HitPointGreyTexture(const u_int ch) :
--		Texture("HitPointGreyTexture-" + boost::lexical_cast<string>(this)), channel(ch) { }
-+		lux::Texture<float>::Texture("HitPointGreyTexture-" + boost::lexical_cast<string>(this)), channel(ch) { }
- 	virtual ~HitPointGreyTexture() { }
- 	virtual float Evaluate(const SpectrumWavelengths &sw,
- 		const DifferentialGeometry &dgs) const {
---- textures/imagemap.h.orig
-+++ textures/imagemap.h
-@@ -112,7 +112,7 @@ class ImageFloatTexture : public Texture
- public:
- 	// ImageFloatTexture Public Methods
- 	ImageFloatTexture(const TexInfo &texInfo, TextureMapping2D *m, Channel ch) :
--		Texture("ImageFloatTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<float>::Texture("ImageFloatTexture-" + boost::lexical_cast<string>(this)),
- 		ImageTexture(texInfo, m) { channel = ch; }
- 
- 	virtual ~ImageFloatTexture() { }
-@@ -152,7 +152,7 @@ class ImageSpectrumTexture : public Text
- public:
- 	// ImageSpectrumTexture Public Methods
- 	ImageSpectrumTexture(const TexInfo &texInfo, TextureMapping2D *m) :
--		Texture("ImageSpectrumTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::SWCSpectrum>::Texture("ImageSpectrumTexture-" + boost::lexical_cast<string>(this)),
- 		ImageTexture(texInfo, m), isIlluminant(false) { }
- 
- 	virtual ~ImageSpectrumTexture() { }
-@@ -200,7 +200,7 @@ class NormalMapTexture : public Texture<
- public:
- 	// NormalMapTexture Public Methods
- 	NormalMapTexture(const TexInfo &texInfo, TextureMapping2D *m) :
--		Texture("NormalMapTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<float>::Texture("NormalMapTexture-" + boost::lexical_cast<string>(this)),
- 		ImageTexture(texInfo, m) { }
- 
- 	virtual ~NormalMapTexture() { }
---- textures/irregulardata.h.orig
-+++ textures/irregulardata.h
-@@ -36,7 +36,7 @@ public:
- 	// IrregularDataSpectrumTexture Public Methods
- 	IrregularDataTexture(u_int n, const float *wl, const float *data,
- 		float resolution = 5.f) :
--		Texture("IrregularDataTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::SWCSpectrum>::Texture("IrregularDataTexture-" + boost::lexical_cast<string>(this)),
- 		SPD(wl, data, n, resolution) { }
- 	virtual ~IrregularDataTexture() { }
- 	virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
---- textures/marble.h.orig
-+++ textures/marble.h
-@@ -39,7 +39,7 @@ public:
- 	// MarbleTexture Public Methods
- 	virtual ~MarbleTexture() { delete mapping; }
- 	MarbleTexture(int oct, float roughness, float sc, float var,
--		TextureMapping3D *map) : Texture("MarbleTexture-" + boost::lexical_cast<string>(this)) {
-+		TextureMapping3D *map) : lux::Texture<lux::SWCSpectrum>::Texture("MarbleTexture-" + boost::lexical_cast<string>(this)) {
- 		omega = roughness;
- 		octaves = oct;
- 		mapping = map;
---- textures/regulardata.h.orig
-+++ textures/regulardata.h
-@@ -35,7 +35,7 @@ class RegularDataTexture : public Textur
- public:
- 	// RegularDataSpectrumTexture Public Methods
- 	RegularDataTexture(float s, float e, u_int n, const float *data)
--		: Texture("RegularDataTexture-" + boost::lexical_cast<string>(this)),
-+		: lux::Texture<lux::SWCSpectrum>::Texture("RegularDataTexture-" + boost::lexical_cast<string>(this)),
- 		SPD(data, s, e, n) { }
- 	virtual ~RegularDataTexture() { }
- 	virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
---- textures/sellmeiertexture.h.orig
-+++ textures/sellmeiertexture.h
-@@ -36,7 +36,7 @@ class SellmeierTexture : public Texture<
- public:
- 	// SellmeierTexture Public Methods
- 	SellmeierTexture(float a_, u_int n, const float *b_, const float *c_) :
--		Texture("SellmeierTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::FresnelGeneral>::Texture("SellmeierTexture-" + boost::lexical_cast<string>(this)),
- 		b(b_, b_ + n), c(c_, c_ + n), a(a_) {
- 		// Sellmeier expects wavelength in µm but we have it in nm
- 		for (u_int i = 0; i < n; ++i)
---- textures/tabulatedfresnel.h.orig
-+++ textures/tabulatedfresnel.h
-@@ -37,7 +37,7 @@ public:
- 	// TabulatedFresnel Public Methods
- 	TabulatedFresnel(const vector<float> &wl, const vector<float> &n,
- 		const vector<float> &k) :
--		Texture("TabulatedFresnel-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::FresnelGeneral>::Texture("TabulatedFresnel-" + boost::lexical_cast<string>(this)),
- 		N(&wl[0], &n[0], wl.size()), K(&wl[0], &k[0], wl.size()),
- 		index(N.Filter()) { }
- 	virtual ~TabulatedFresnel() { }
---- textures/uv.h.orig
-+++ textures/uv.h
-@@ -36,7 +36,7 @@ namespace lux
- class UVTexture : public Texture<SWCSpectrum> {
- public:
- 	// UVTexture Public Methods
--	UVTexture(TextureMapping2D *m) : Texture("UVTexture-" + boost::lexical_cast<string>(this)) {
-+	UVTexture(TextureMapping2D *m) : lux::Texture<lux::SWCSpectrum>::Texture("UVTexture-" + boost::lexical_cast<string>(this)) {
- 		mapping = m;
- 	}
- 	virtual ~UVTexture() {
---- textures/windy.h.orig
-+++ textures/windy.h
-@@ -37,7 +37,7 @@ class WindyTexture : public Texture<floa
- public:
- 	// WindyTexture Public Methods
- 	WindyTexture(TextureMapping3D *map) :
--		Texture("WindyTexture-" + boost::lexical_cast<string>(this)) { mapping = map; }
-+		lux::Texture<float>::Texture("WindyTexture-" + boost::lexical_cast<string>(this)) { mapping = map; }
- 	virtual ~WindyTexture() { delete mapping; }
- 	virtual float Evaluate(const SpectrumWavelengths &sw,
- 		const DifferentialGeometry &dg) const {
---- textures/wrinkled.h.orig
-+++ textures/wrinkled.h
-@@ -37,7 +37,7 @@ class WrinkledTexture : public Texture<f
- public:
- 	// WrinkledTexture Public Methods
- 	WrinkledTexture(int oct, float roughness, TextureMapping3D *map) :
--		Texture("WrinkledTexture-" + boost::lexical_cast<string>(this)) {
-+		lux::Texture<float>::Texture("WrinkledTexture-" + boost::lexical_cast<string>(this)) {
- 		omega = roughness;
- 		octaves = oct;
- 		mapping = map;
diff --git a/graphics/luxrender/files/patch-luxrays-CMakeLists.txt b/graphics/luxrender/files/patch-luxrays-CMakeLists.txt
deleted file mode 100644
index ffdd49ebebc0..000000000000
--- a/graphics/luxrender/files/patch-luxrays-CMakeLists.txt
+++ /dev/null
@@ -1,47 +0,0 @@
---- ../luxrays/CMakeLists.txt.orig
-+++ ../luxrays/CMakeLists.txt
-@@ -91,14 +91,6 @@ if (NOT OPENGL_FOUND AND NOT LUXRAYS_DIS
- 	SET(LUXRAYS_DISABLE_OPENCL 1)
- endif()
- 
--if (NOT GLEW_FOUND)
--	MESSAGE(FATAL_ERROR "--> Could not locate required GLEW files, disabling samples build - Please check ${GLEW_SEARCH_PATH}")
--endif()
--
--if (NOT GLUT_FOUND)
--	MESSAGE(FATAL_ERROR "--> Could not locate required GLUT files, disabling samples build - Please check ${GLUT_SEARCH_PATH}")
--endif()
--
- if (NOT EMBREE_FOUND)
- 	MESSAGE(FATAL_ERROR "--> Could not locate required Intel Embree files - Please check ${EMBREE_SEARCH_PATH}")
- endif()
-@@ -124,29 +116,6 @@ add_subdirectory(src/luxcore)
- 
- ################################################################################
- #
--# Samples
--#
--################################################################################
--
--if(NOT APPLE OR OSX_BUILD_DEMOS)
--	add_subdirectory(samples/benchsimple)
--	add_subdirectory(samples/luxcoredemo)
--	add_subdirectory(samples/luxcorescenedemo)
--	add_subdirectory(samples/luxcoreimplserializationdemo)
--endif()
--
--if(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND)
--	add_subdirectory(samples/smallluxgpu4)
--endif(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND)
--
--add_subdirectory(samples/luxcoreconsole)
--if(OPENGL_FOUND)
--	add_subdirectory(samples/luxcoreui)
--endif(OPENGL_FOUND)
--
--
--################################################################################
--#
- # For non win32 we'll have to copy everything to a single dir
- #
- ################################################################################
diff --git a/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake b/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake
deleted file mode 100644
index 4ff5dc3bad2b..000000000000
--- a/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
---- ../luxrays/cmake/PlatformSpecific.cmake.orig
-+++ ../luxrays/cmake/PlatformSpecific.cmake
-@@ -138,18 +138,17 @@ ENDIF(MSVC)
- 
- 
- 
--IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-+#IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-   # Update if necessary
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -msse3 -mssse3")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
-   IF(NOT CYGWIN)
- 	  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-   ENDIF(NOT CYGWIN)
- 
-   SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
--  SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 -ftree-vectorize -fvariable-expansion-in-unroller")
--  
--ENDIF()
-+  SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG")
-+#ENDIF()
- 
- 
- # Setting Universal Binary Properties, only for Mac OS X
diff --git a/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h b/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h
deleted file mode 100644
index 4a0b0eeb7380..000000000000
--- a/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../luxrays/include/luxcore/luxcore.h.orig
-+++ ../luxrays/include/luxcore/luxcore.h
-@@ -63,7 +63,7 @@
-  */
- namespace luxcore {
- 
--CPP_EXPORT CPP_API void (*LuxCore_LogHandler)(const char *msg); // LuxCore Log Handler
-+extern CPP_API void (*LuxCore_LogHandler)(const char *msg); // LuxCore Log Handler
- 
- #define LC_LOG(a) { if (luxcore::LuxCore_LogHandler) { std::stringstream _LUXCORE_LOG_LOCAL_SS; _LUXCORE_LOG_LOCAL_SS << a; luxcore::LuxCore_LogHandler(_LUXCORE_LOG_LOCAL_SS.str().c_str()); } }
- 
-@@ -603,7 +603,7 @@ public:
- 	 * 
- 	 * \return the default Properties.
- 	 */
--	static const luxrays::Properties &GetDefaultProperties();
-+	const luxrays::Properties &GetDefaultProperties();
- 
- 	friend class RenderSession;
- 
diff --git a/graphics/luxrender/pkg-descr b/graphics/luxrender/pkg-descr
deleted file mode 100644
index 164c5dfb4a6b..000000000000
--- a/graphics/luxrender/pkg-descr
+++ /dev/null
@@ -1,25 +0,0 @@
-LuxRender is a physically based and unbiased rendering engine.  Based on
-state of the art algorithms, LuxRender simulates the flow of light according
-to physical equations, thus producing realistic images of photographic
-quality.  Some of the main features of LuxRender are:
-
-  * biased and unbiased rendering: Users can choose between physical
-    accuracy (unbiased) and speed (biased);
-  * full spectral rendering: Instead of the RGB colour spectrum, full
-    spectra are used for internal calculations;
-  * hierarchical procedural and image based texture system: Procedural and
-    image based textures can be mixed in various ways, making it possible to
-    create complex materials;
-  * displacement mapping and subdivision: Based on procedural or image
-    textures, object surfaces can be transformed;
-  * network and co-operative rendering: Rendering time can be reduced by
-    combining the processing power of multiple computers;
-  * perspective (including shift lens), orthographic, and environment
-    cameras;
-  * HDR output: Render output can be saved in various file formats,
-    including .png, .tga, and .exr.
-
-Fully functional exporters are available for Blender and Maya, while
-exporters for a growing number of 3D applications are under development.
-
-WWW: http://www.luxrender.net/
diff --git a/graphics/luxrender/pkg-plist b/graphics/luxrender/pkg-plist
deleted file mode 100644
index ea0ba1485cb1..000000000000
--- a/graphics/luxrender/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/luxconsole
-bin/luxmerger
-include/luxrender/api.h
-lib/liblux.so
-share/pixmaps/luxrender.svg
-share/applications/luxrender.desktop
diff --git a/graphics/luxrender14/Makefile b/graphics/luxrender14/Makefile
deleted file mode 100644
index d2235915762b..000000000000
--- a/graphics/luxrender14/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
-# $FreeBSD$
-
-DISTVERSION=	1.4
-PORTREVISION=	5
-
-LUX_REV=	dfd211d6faa0
-LUXRAYS_REV=	7c7127ee1fa4
-
-MASTERDIR=	${.CURDIR}/../luxrender
-PKGNAMESUFFIX=	14
-
-DISTINFO_FILE=	${.CURDIR}/distinfo
-PATCHDIR=	${.CURDIR}/files
-
-CONFLICTS_INSTALL=	${PORTNAME}-*
-
-USES=		dos2unix
-DOS2UNIX_FILES=	../luxrays/CMakeLists.txt
-
-OPTIONS_SLAVE=	FREEIMAGE
-
-.include "${MASTERDIR}/Makefile"
diff --git a/graphics/luxrender14/distinfo b/graphics/luxrender14/distinfo
deleted file mode 100644
index 21b9a50c4199..000000000000
--- a/graphics/luxrender14/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (luxrender/v14.tar.bz2) = 87389167496037e22cbf420efd610474d6a02395c4f4e4a39e2bd50453676b0b
-SIZE (luxrender/v14.tar.bz2) = 2642639
-SHA256 (luxrender/luxrender_v1.4.tar.bz2) = 8229a814807fed2810eefd4a5ba051e7b05a4b30862ee066a3c205d6bd730205
-SIZE (luxrender/luxrender_v1.4.tar.bz2) = 26682611
diff --git a/graphics/luxrender14/files/patch-CMakeLists.txt b/graphics/luxrender14/files/patch-CMakeLists.txt
deleted file mode 100644
index 5cd7bca61653..000000000000
--- a/graphics/luxrender14/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -210,7 +210,6 @@ IF(NOT APPLE AND NOT WIN32)
- 	STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _mach_x86_64 ${MACHINE})
- 	IF (_mach_x86_64)
- 		SET(ARCH_X86_64 1)
--		SET(LIB_SUFFIX 64)
- 		#jromang - Hack to avoid boost bug on x64  Ubuntu 8.10 and Fedora 10 (http://www.luxrender.net/mantis/view.php?id=433)
- 		ADD_DEFINITIONS(-DBOOST_NO_INTRINSIC_INT64_T)
- 	ENDIF (_mach_x86_64)
-@@ -402,7 +401,7 @@ ELSEIF(MSVC)
- ELSE(APPLE)
- 	# Dade - default compiler options
- 	# Removed "-O3" from definitions in order to have CMake Release/Debug options to work
--	ADD_DEFINITIONS(-msse2 -mfpmath=sse -ftree-vectorize -funroll-loops -Wall -fPIC -DHAVE_PTHREAD_H)
-+	ADD_DEFINITIONS(-msse -Wall -fPIC -DHAVE_PTHREAD_H)
- 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fvisibility=hidden -fvisibility-inlines-hidden")
- 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fvisibility=hidden -fvisibility-inlines-hidden")
- 	# The QBVH accelerator needs to be compiled with much reduced optimizations
diff --git a/graphics/luxrender14/files/patch-accelerators_bvhaccel.cpp b/graphics/luxrender14/files/patch-accelerators_bvhaccel.cpp
deleted file mode 100644
index 77cffab89162..000000000000
--- a/graphics/luxrender14/files/patch-accelerators_bvhaccel.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-After http://github.com/boostorg/range/commit/69409ed63a9e1 build fails:
-
-accelerators/bvhaccel.cpp:149:19: error: call to 'distance' is ambiguous
-                        u_int middle = distance(list.begin(), it);
-                                       ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = std::__1::__wrap_iter<boost::shared_ptr<lux::BVHAccelTreeNode> *>]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = std::__1::__wrap_iter<boost::shared_ptr<lux::BVHAccelTreeNode> *>]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
-
---- accelerators/bvhaccel.cpp.orig	2015-01-20 23:10:10 UTC
-+++ accelerators/bvhaccel.cpp
-@@ -146,7 +146,7 @@ boost::shared_ptr<BVHAccelTreeNode> BVHAccel::BuildHie
- 
- 			vector<boost::shared_ptr<BVHAccelTreeNode> >::iterator it =
- 				partition(list.begin()+splits[j], list.begin()+splits[j+1], bind2nd(ptr_fun(bvh_ltf[splitAxis]), splitValue));
--			u_int middle = distance(list.begin(), it);
-+			u_int middle = std::distance(list.begin(), it);
- 			middle = max(splits[j]+1, min(splits[j+1]-1, middle)); // Make sure coincidental BBs are still split
- 			splits.insert(splits.begin()+j+1, middle);
- 		}
diff --git a/graphics/luxrender14/files/patch-c++14-fixes b/graphics/luxrender14/files/patch-c++14-fixes
deleted file mode 100644
index 6516429721d9..000000000000
--- a/graphics/luxrender14/files/patch-c++14-fixes
+++ /dev/null
@@ -1,40 +0,0 @@
---- core/queryable/queryable.h.orig	2015-01-20 23:10:10 UTC
-+++ core/queryable/queryable.h
-@@ -194,7 +194,7 @@ class LUX_EXPORT Queryable (public)
- 	}
- 	template<class T> friend void AddStringAttribute(T &object,
- 		const std::string &name, const std::string &description,
--		const boost::function<std::string (void)> &get, const boost::function<void (std::string)> set = NULL) {
-+		const boost::function<std::string (void)> &get, const boost::function<void (std::string)> set = 0x0) {
- 
- 		AddAttrib<QueryableStringAttribute>(object, name, description, get, set);
- 	}
---- core/scheduler.cpp.orig	2015-01-20 23:10:10 UTC
-+++ core/scheduler.cpp
-@@ -43,7 +43,7 @@ void NullTask(Range*){}
- 
- Scheduler::Scheduler(unsigned step)
- {
--	current_task = NULL;
-+	current_task = 0x0;
- 	default_step = step;
- 	state = RUNNING;
- 
-@@ -127,7 +127,7 @@ TaskType Scheduler::GetTask()
- 		condition.wait(lock);
- 
- 	if(current_task == NullTask)
--		return NULL;
-+		return 0x0;
- 
- 	return current_task;
- }
-@@ -152,7 +152,7 @@ bool Scheduler::EndTask(Thread* thread)
- 
- 	if(counter == 0)
- 	{
--		current_task = NULL;
-+		current_task = 0x0;
- 		condition.notify_all();
- 	}
- 	else
diff --git a/graphics/luxrender14/files/patch-gcc42-fixes b/graphics/luxrender14/files/patch-gcc42-fixes
deleted file mode 100644
index dbf2e1b99f53..000000000000
--- a/graphics/luxrender14/files/patch-gcc42-fixes
+++ /dev/null
@@ -1,394 +0,0 @@
---- ../luxrays/include/luxrays/core/geometry/frame.h.orig
-+++ ../luxrays/include/luxrays/core/geometry/frame.h
-@@ -46,11 +46,11 @@ public:
- 		SetFromZ(z);
- 	}
- 
--	Frame(const Normal &z) {
-+	Frame(const luxrays::Normal &z) {
- 		SetFromZ(Vector(z));
- 	}
- 
--	void SetFromZ(const Normal &z) {
-+	void SetFromZ(const luxrays::Normal &z) {
- 		SetFromZ(Vector(z)); 
- 	}
- 
---- textures/bilerp.h.orig
-+++ textures/bilerp.h
-@@ -39,7 +39,7 @@ public:
- 	// BilerpTexture Public Methods
- 	BilerpFloatTexture(TextureMapping2D *m,
- 		float t00, float t01, float t10, float t11) :
--		Texture("BilerpFloatTexture-" + boost::lexical_cast<string>(this)) {
-+		lux::Texture<float>::Texture("BilerpFloatTexture-" + boost::lexical_cast<string>(this)) {
- 		mapping = m;
- 		v00 = t00;
- 		v01 = t01;
-@@ -87,7 +87,7 @@ public:
- 	BilerpSpectrumTexture(TextureMapping2D *m,
- 		const RGBColor &t00, const RGBColor &t01,
- 		const RGBColor &t10, const RGBColor &t11) :
--		Texture("BilerpSpectrumTexture-" + boost::lexical_cast<string>(this)) {
-+		lux::Texture<lux::SWCSpectrum>::Texture("BilerpSpectrumTexture-" + boost::lexical_cast<string>(this)) {
- 		mapping = m;
- 		v00 = t00;
- 		v01 = t01;
-@@ -145,7 +145,7 @@ public:
- 		const boost::shared_ptr<Texture<FresnelGeneral> > &t01,
- 		const boost::shared_ptr<Texture<FresnelGeneral> > &t10,
- 		const boost::shared_ptr<Texture<FresnelGeneral> > &t11) :
--		Texture("BilerpFresnelTexture-" + boost::lexical_cast<string>(this)) {
-+		lux::Texture<lux::FresnelGeneral>::Texture("BilerpFresnelTexture-" + boost::lexical_cast<string>(this)) {
- 		mapping = m;
- 		v00 = t00;
- 		v01 = t01;
---- textures/blackbody.h.orig
-+++ textures/blackbody.h
-@@ -34,7 +34,7 @@ namespace lux
- class BlackBodyTexture : public Texture<SWCSpectrum> {
- public:
- 	// BlackBodyTexture Public Methods
--	BlackBodyTexture(float t) : Texture("BlackBodyTexture-" + boost::lexical_cast<string>(this)),
-+	BlackBodyTexture(float t) : lux::Texture<lux::SWCSpectrum>::Texture("BlackBodyTexture-" + boost::lexical_cast<string>(this)),
- 			BBSPD(t) { }
- 	virtual ~BlackBodyTexture() { }
- 	virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
---- textures/blender_base.h.orig
-+++ textures/blender_base.h
-@@ -34,7 +34,7 @@ public:
- 	virtual ~BlenderTexture3D() { }
- 
- 	BlenderTexture3D(const std::string &name, const Transform &tex2world, const ParamSet &tp,
--		short type) : Texture(name) {
-+		short type) : lux::Texture<float>::Texture(name) {
- 		// Read mapping coordinates
- 		mapping = TextureMapping3D::Create(tex2world, tp);
- 		tex1 = tp.GetFloatTexture("tex1", 0.f);
---- textures/cauchytexture.h.orig
-+++ textures/cauchytexture.h
-@@ -35,7 +35,7 @@ class CauchyTexture : public Texture<Fre
- public:
- 	// ConstantTexture Public Methods
- 	CauchyTexture(float cauchya, float cauchyb) :
--		Texture("CauchyTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::FresnelGeneral>::Texture("CauchyTexture-" + boost::lexical_cast<string>(this)),
- 		fresnel(cauchya, cauchyb, 0.f), index(cauchya + cauchyb * 1e6f /
- 		(WAVELENGTH_END * WAVELENGTH_START)) { }
- 	virtual ~CauchyTexture() { }
---- textures/checkerboard.h.orig
-+++ textures/checkerboard.h
-@@ -42,7 +42,7 @@ public:
- 	Checkerboard2D(TextureMapping2D *m,
- 		boost::shared_ptr<Texture<float> > &c1,
- 		boost::shared_ptr<Texture<float> > &c2, const string &aa) :
--		Texture("Checkerboard2D-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<float>::Texture("Checkerboard2D-" + boost::lexical_cast<string>(this)),
- 		tex1(c1), tex2(c2), mapping(m) {
- 		// Select anti-aliasing method for _Checkerboard2D_
- 		if (aa == "none")
-@@ -226,7 +226,7 @@ public:
- 	Checkerboard3D(TextureMapping3D *m,
- 		boost::shared_ptr<Texture<float> > &c1,
- 		boost::shared_ptr<Texture<float> > &c2) :
--		Texture("Checkerboard3D-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<float>::Texture("Checkerboard3D-" + boost::lexical_cast<string>(this)),
- 		tex1(c1), tex2(c2), mapping(m) { }
- 	virtual ~Checkerboard3D() { delete mapping; }
- 	virtual float Evaluate(const SpectrumWavelengths &sw,
---- textures/cloud.h.orig
-+++ textures/cloud.h
-@@ -47,7 +47,7 @@ public:
- 		const u_int octaves, const float o, const float offset,
- 		const u_int numspheres, const float spheresize,
- 		TextureMapping3D *map) :
--		Texture("CloudTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<float>::Texture("CloudTexture-" + boost::lexical_cast<string>(this)),
- 		radius(r), numSpheres(numspheres), sphereSize(spheresize),
- 		sharpness(sharp), baseFlatness(baseflatness), variability(v),
- 		omega(o), firstNoiseScale(noiseScale), noiseOffset(offset),
---- textures/colordepth.h.orig
-+++ textures/colordepth.h
-@@ -34,7 +34,7 @@ class ColorDepthTexture : public Texture
- public:
- 	// ColorDepthTexture Public Methods
- 	ColorDepthTexture(float t, boost::shared_ptr<Texture<SWCSpectrum> > &c) :
--		Texture("ColorDepthTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::SWCSpectrum>::Texture("ColorDepthTexture-" + boost::lexical_cast<string>(this)),
- 		d(-max(1e-3f, t)), color(c) { }
- 	virtual ~ColorDepthTexture() { }
- 	virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
---- textures/constant.h.orig
-+++ textures/constant.h
-@@ -36,7 +36,7 @@ class ConstantFloatTexture : public Text
- public:
- 	// ConstantTexture Public Methods
- 	ConstantFloatTexture(float v) :
--		Texture("ConstantFloatTexture-" + boost::lexical_cast<string>(this)), value(v) {
-+		lux::Texture<float>::Texture("ConstantFloatTexture-" + boost::lexical_cast<string>(this)), value(v) {
- 			AddFloatAttribute(*this, "value", "ConstantFloatTexture value", &ConstantFloatTexture::value);
- 		}
- 	virtual ~ConstantFloatTexture() { }
-@@ -60,7 +60,7 @@ class ConstantRGBColorTexture : public T
- public:
- 	// ConstantTexture Public Methods
- 	ConstantRGBColorTexture(const RGBColor &s) :
--		Texture("ConstantRGBColorTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::SWCSpectrum>::Texture("ConstantRGBColorTexture-" + boost::lexical_cast<string>(this)),
- 		color(s) {
- 		RGBSPD = new RGBReflSPD(color);
- 
-@@ -99,7 +99,7 @@ class ConstantFresnelTexture : public Te
- public:
- 	// ConstantTexture Public Methods
- 	ConstantFresnelTexture(float v) :
--		Texture("ConstantFresnelTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::FresnelGeneral>::Texture("ConstantFresnelTexture-" + boost::lexical_cast<string>(this)),
- 		value(DIELECTRIC_FRESNEL, SWCSpectrum(v), 0.f), val(v) {
- 		AddFloatAttribute(*this, "value", "ConstantFresnelTexture value", &ConstantFresnelTexture::val);
- 	}
---- textures/densitygrid.h.orig
-+++ textures/densitygrid.h
-@@ -39,7 +39,7 @@ public:
- 	// DensityGridTexture Public Methods
- 	DensityGridTexture(int x, int y, int z, const float *d,
- 		enum WrapMode w, TextureMapping3D *map) :
--		Texture("DensityGridTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<float>::Texture("DensityGridTexture-" + boost::lexical_cast<string>(this)),
- 		nx(x), ny(y), nz(z), wrapMode(w), mapping(map) {
- 		density.assign(d, d + nx * ny * nz);
- 		dMin = *std::min_element(density.begin(), density.end());
---- textures/dots.h.orig
-+++ textures/dots.h
-@@ -37,7 +37,7 @@ public:
- 	// DotsTexture Public Methods
- 	DotsTexture(TextureMapping2D *m, boost::shared_ptr<Texture<float> > &c1,
- 		boost::shared_ptr<Texture<float> > &c2) :
--		Texture("DotsTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<float>::Texture("DotsTexture-" + boost::lexical_cast<string>(this)),
- 		outsideDot(c1), insideDot(c2), mapping(m) { }
- 	virtual ~DotsTexture() { delete mapping; }
- 	virtual float Evaluate(const SpectrumWavelengths &sw,
---- textures/equalenergy.h.orig
-+++ textures/equalenergy.h
-@@ -35,7 +35,7 @@ class EqualEnergyTexture : public Textur
- public:
- 	// EqualEnergyTexture Public Methods
- 	EqualEnergyTexture(float t) :
--		Texture("EqualEnergyTexture-" + boost::lexical_cast<string>(this)), e(t) { }
-+		lux::Texture<lux::SWCSpectrum>::Texture("EqualEnergyTexture-" + boost::lexical_cast<string>(this)), e(t) { }
- 	virtual ~EqualEnergyTexture() { }
- 	virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
- 		const DifferentialGeometry &) const {
---- textures/exponential.h.orig
-+++ textures/exponential.h
-@@ -36,7 +36,7 @@ public:
- 	// ExponentialTexture Public Methods
- 	ExponentialTexture(const Point &o, const Vector &up, float d,
- 		TextureMapping3D *map) :
--		Texture("ExponentialTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<float>::Texture("ExponentialTexture-" + boost::lexical_cast<string>(this)),
- 		origin(o), upDir(up), decay(d), mapping(map) { }
- 	virtual ~ExponentialTexture() { delete mapping; }
- 	virtual float Evaluate(const SpectrumWavelengths &sw,
---- textures/fbm.h.orig
-+++ textures/fbm.h
-@@ -37,7 +37,7 @@ class FBmTexture : public Texture<float>
- public:
- 	// FBmTexture Public Methods
- 	FBmTexture(int oct, float roughness, TextureMapping3D *map) :
--		Texture("FBmTexture-" + boost::lexical_cast<string>(this)) {
-+		lux::Texture<float>::Texture("FBmTexture-" + boost::lexical_cast<string>(this)) {
- 		omega = roughness;
- 		octaves = oct;
- 		mapping = map;
---- textures/frequencytexture.h.orig
-+++ textures/frequencytexture.h
-@@ -35,7 +35,7 @@ class FrequencyTexture : public Texture<
- public:
- 	// FrequencyTexture Public Methods
- 	FrequencyTexture(float w, float p, float r)
--		: Texture("FrequencyTexture-" + boost::lexical_cast<string>(this)),
-+		: lux::Texture<lux::SWCSpectrum>::Texture("FrequencyTexture-" + boost::lexical_cast<string>(this)),
- 		FSPD(w, p, r) { }
- 	virtual ~FrequencyTexture() { }
- 	virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
---- textures/fresnelcolor.h.orig
-+++ textures/fresnelcolor.h
-@@ -34,7 +34,7 @@ class FresnelColorTexture : public Textu
- public:
- 	// FresnelColorTexture Public Methods
- 	FresnelColorTexture(const boost::shared_ptr<Texture<SWCSpectrum> > &c) :
--		Texture("FresnelColorTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::FresnelGeneral>::Texture("FresnelColorTexture-" + boost::lexical_cast<string>(this)),
- 		color(c) { }
- 	virtual ~FresnelColorTexture() { }
- 	virtual FresnelGeneral Evaluate(const SpectrumWavelengths &sw,
---- textures/gaussiantexture.h.orig
-+++ textures/gaussiantexture.h
-@@ -35,7 +35,7 @@ class GaussianTexture : public Texture<S
- public:
- 	// GaussianTexture Public Methods
- 	GaussianTexture(float m, float w, float r) :
--		Texture("GaussianTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::SWCSpectrum>::Texture("GaussianTexture-" + boost::lexical_cast<string>(this)),
- 		GSPD(m, w, r) { }
- 	virtual ~GaussianTexture() { }
- 	virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
---- textures/harlequin.h.orig
-+++ textures/harlequin.h
-@@ -40,7 +40,7 @@ namespace lux
- class HarlequinTexture : public Texture<SWCSpectrum> {
- public:
- 	// Harlequin Public Methods
--	HarlequinTexture() : Texture("HarlequinTexture-" + boost::lexical_cast<string>(this)) {
-+	HarlequinTexture() : lux::Texture<lux::SWCSpectrum>::Texture("HarlequinTexture-" + boost::lexical_cast<string>(this)) {
- 		float c[3];
- 		for (int i = 0; i < HARLEQUIN_TEXTURE_PALETTE_SIZE; i++) {
- 			c[0] = RadicalInverse(i * COLOR_SAMPLES + 1, 2);
---- textures/hitpointcolor.h.orig
-+++ textures/hitpointcolor.h
-@@ -34,7 +34,7 @@ namespace lux
- class HitPointAlphaTexture : public Texture<float> {
- public:
- 	HitPointAlphaTexture() :
--		Texture("HitPointAlphaTexture-" + boost::lexical_cast<string>(this)) { }
-+		lux::Texture<float>::Texture("HitPointAlphaTexture-" + boost::lexical_cast<string>(this)) { }
- 	virtual ~HitPointAlphaTexture() { }
- 	virtual float Evaluate(const SpectrumWavelengths &sw,
- 		const DifferentialGeometry &dgs) const {
-@@ -58,7 +58,7 @@ public:
- class HitPointRGBColorTexture : public Texture<SWCSpectrum> {
- public:
- 	HitPointRGBColorTexture() :
--		Texture("HitPointRGBColorTexture-" + boost::lexical_cast<string>(this)) { }
-+		lux::Texture<lux::SWCSpectrum>::Texture("HitPointRGBColorTexture-" + boost::lexical_cast<string>(this)) { }
- 	virtual ~HitPointRGBColorTexture() { }
- 	virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
- 		const DifferentialGeometry &dgs) const {
-@@ -83,7 +83,7 @@ public:
- class HitPointGreyTexture : public Texture<float> {
- public:
- 	HitPointGreyTexture(const u_int ch) :
--		Texture("HitPointGreyTexture-" + boost::lexical_cast<string>(this)), channel(ch) { }
-+		lux::Texture<float>::Texture("HitPointGreyTexture-" + boost::lexical_cast<string>(this)), channel(ch) { }
- 	virtual ~HitPointGreyTexture() { }
- 	virtual float Evaluate(const SpectrumWavelengths &sw,
- 		const DifferentialGeometry &dgs) const {
---- textures/imagemap.h.orig
-+++ textures/imagemap.h
-@@ -112,7 +112,7 @@ class ImageFloatTexture : public Texture
- public:
- 	// ImageFloatTexture Public Methods
- 	ImageFloatTexture(const TexInfo &texInfo, TextureMapping2D *m, Channel ch) :
--		Texture("ImageFloatTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<float>::Texture("ImageFloatTexture-" + boost::lexical_cast<string>(this)),
- 		ImageTexture(texInfo, m) { channel = ch; }
- 
- 	virtual ~ImageFloatTexture() { }
-@@ -152,7 +152,7 @@ class ImageSpectrumTexture : public Text
- public:
- 	// ImageSpectrumTexture Public Methods
- 	ImageSpectrumTexture(const TexInfo &texInfo, TextureMapping2D *m) :
--		Texture("ImageSpectrumTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::SWCSpectrum>::Texture("ImageSpectrumTexture-" + boost::lexical_cast<string>(this)),
- 		ImageTexture(texInfo, m), isIlluminant(false) { }
- 
- 	virtual ~ImageSpectrumTexture() { }
-@@ -200,7 +200,7 @@ class NormalMapTexture : public Texture<
- public:
- 	// NormalMapTexture Public Methods
- 	NormalMapTexture(const TexInfo &texInfo, TextureMapping2D *m) :
--		Texture("NormalMapTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<float>::Texture("NormalMapTexture-" + boost::lexical_cast<string>(this)),
- 		ImageTexture(texInfo, m) { }
- 
- 	virtual ~NormalMapTexture() { }
---- textures/irregulardata.h.orig
-+++ textures/irregulardata.h
-@@ -36,7 +36,7 @@ public:
- 	// IrregularDataSpectrumTexture Public Methods
- 	IrregularDataTexture(u_int n, const float *wl, const float *data,
- 		float resolution = 5.f) :
--		Texture("IrregularDataTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::SWCSpectrum>::Texture("IrregularDataTexture-" + boost::lexical_cast<string>(this)),
- 		SPD(wl, data, n, resolution) { }
- 	virtual ~IrregularDataTexture() { }
- 	virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
---- textures/marble.h.orig
-+++ textures/marble.h
-@@ -39,7 +39,7 @@ public:
- 	// MarbleTexture Public Methods
- 	virtual ~MarbleTexture() { delete mapping; }
- 	MarbleTexture(int oct, float roughness, float sc, float var,
--		TextureMapping3D *map) : Texture("MarbleTexture-" + boost::lexical_cast<string>(this)) {
-+		TextureMapping3D *map) : lux::Texture<lux::SWCSpectrum>::Texture("MarbleTexture-" + boost::lexical_cast<string>(this)) {
- 		omega = roughness;
- 		octaves = oct;
- 		mapping = map;
---- textures/regulardata.h.orig
-+++ textures/regulardata.h
-@@ -35,7 +35,7 @@ class RegularDataTexture : public Textur
- public:
- 	// RegularDataSpectrumTexture Public Methods
- 	RegularDataTexture(float s, float e, u_int n, const float *data)
--		: Texture("RegularDataTexture-" + boost::lexical_cast<string>(this)),
-+		: lux::Texture<lux::SWCSpectrum>::Texture("RegularDataTexture-" + boost::lexical_cast<string>(this)),
- 		SPD(data, s, e, n) { }
- 	virtual ~RegularDataTexture() { }
- 	virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw,
---- textures/sellmeiertexture.h.orig
-+++ textures/sellmeiertexture.h
-@@ -36,7 +36,7 @@ class SellmeierTexture : public Texture<
- public:
- 	// SellmeierTexture Public Methods
- 	SellmeierTexture(float a_, u_int n, const float *b_, const float *c_) :
--		Texture("SellmeierTexture-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::FresnelGeneral>::Texture("SellmeierTexture-" + boost::lexical_cast<string>(this)),
- 		b(b_, b_ + n), c(c_, c_ + n), a(a_) {
- 		// Sellmeier expects wavelength in µm but we have it in nm
- 		for (u_int i = 0; i < n; ++i)
---- textures/tabulatedfresnel.h.orig
-+++ textures/tabulatedfresnel.h
-@@ -37,7 +37,7 @@ public:
- 	// TabulatedFresnel Public Methods
- 	TabulatedFresnel(const vector<float> &wl, const vector<float> &n,
- 		const vector<float> &k) :
--		Texture("TabulatedFresnel-" + boost::lexical_cast<string>(this)),
-+		lux::Texture<lux::FresnelGeneral>::Texture("TabulatedFresnel-" + boost::lexical_cast<string>(this)),
- 		N(&wl[0], &n[0], wl.size()), K(&wl[0], &k[0], wl.size()),
- 		index(N.Filter()) { }
- 	virtual ~TabulatedFresnel() { }
---- textures/uv.h.orig
-+++ textures/uv.h
-@@ -36,7 +36,7 @@ namespace lux
- class UVTexture : public Texture<SWCSpectrum> {
- public:
- 	// UVTexture Public Methods
--	UVTexture(TextureMapping2D *m) : Texture("UVTexture-" + boost::lexical_cast<string>(this)) {
-+	UVTexture(TextureMapping2D *m) : lux::Texture<lux::SWCSpectrum>::Texture("UVTexture-" + boost::lexical_cast<string>(this)) {
- 		mapping = m;
- 	}
- 	virtual ~UVTexture() {
---- textures/windy.h.orig
-+++ textures/windy.h
-@@ -37,7 +37,7 @@ class WindyTexture : public Texture<floa
- public:
- 	// WindyTexture Public Methods
- 	WindyTexture(TextureMapping3D *map) :
--		Texture("WindyTexture-" + boost::lexical_cast<string>(this)) { mapping = map; }
-+		lux::Texture<float>::Texture("WindyTexture-" + boost::lexical_cast<string>(this)) { mapping = map; }
- 	virtual ~WindyTexture() { delete mapping; }
- 	virtual float Evaluate(const SpectrumWavelengths &sw,
- 		const DifferentialGeometry &dg) const {
---- textures/wrinkled.h.orig
-+++ textures/wrinkled.h
-@@ -37,7 +37,7 @@ class WrinkledTexture : public Texture<f
- public:
- 	// WrinkledTexture Public Methods
- 	WrinkledTexture(int oct, float roughness, TextureMapping3D *map) :
--		Texture("WrinkledTexture-" + boost::lexical_cast<string>(this)) {
-+		lux::Texture<float>::Texture("WrinkledTexture-" + boost::lexical_cast<string>(this)) {
- 		omega = roughness;
- 		octaves = oct;
- 		mapping = map;
diff --git a/graphics/luxrender14/files/patch-luxrays-CMakeLists.txt b/graphics/luxrender14/files/patch-luxrays-CMakeLists.txt
deleted file mode 100644
index 03af0903b73b..000000000000
--- a/graphics/luxrender14/files/patch-luxrays-CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
---- ../luxrays/CMakeLists.txt.orig
-+++ ../luxrays/CMakeLists.txt
-@@ -91,14 +91,6 @@ if (NOT OPENGL_FOUND AND NOT LUXRAYS_DIS
- 	SET(LUXRAYS_DISABLE_OPENCL 1)
- endif()
- 
--if (NOT GLEW_FOUND)
--	MESSAGE(FATAL_ERROR "--> Could not locate required GLEW files, disabling samples build - Please check ${GLEW_SEARCH_PATH}")
--endif()
--
--if (NOT GLUT_FOUND)
--	MESSAGE(FATAL_ERROR "--> Could not locate required GLUT files, disabling samples build - Please check ${GLUT_SEARCH_PATH}")
--endif()
--
- if (LUXRAYS_DISABLE_OPENCL)
- 	ADD_DEFINITIONS("-DLUXRAYS_DISABLE_OPENCL")
- endif()
-@@ -120,20 +112,6 @@ add_subdirectory(src/luxcore)
- 
- ################################################################################
- #
--# Samples
--#
--################################################################################
--
--add_subdirectory(samples/benchsimple)
--add_subdirectory(samples/luxcoredemo)
--add_subdirectory(samples/luxcorescenedemo)
--if(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND)
--	add_subdirectory(samples/smallluxgpu4)
--endif(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND)
--
--
--################################################################################
--#
- # For non win32 we'll have to copy everything to a single dir
- #
- ################################################################################
diff --git a/graphics/luxrender14/files/patch-luxrays-cmake-PlatformSpecific.cmake b/graphics/luxrender14/files/patch-luxrays-cmake-PlatformSpecific.cmake
deleted file mode 100644
index 4ff5dc3bad2b..000000000000
--- a/graphics/luxrender14/files/patch-luxrays-cmake-PlatformSpecific.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
---- ../luxrays/cmake/PlatformSpecific.cmake.orig
-+++ ../luxrays/cmake/PlatformSpecific.cmake
-@@ -138,18 +138,17 @@ ENDIF(MSVC)
- 
- 
- 
--IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-+#IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-   # Update if necessary
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -msse3 -mssse3")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
-   IF(NOT CYGWIN)
- 	  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-   ENDIF(NOT CYGWIN)
- 
-   SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
--  SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 -ftree-vectorize -fvariable-expansion-in-unroller")
--  
--ENDIF()
-+  SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG")
-+#ENDIF()
- 
- 
- # Setting Universal Binary Properties, only for Mac OS X
diff --git a/graphics/luxrender14/files/patch-luxrays-include-luxcore-luxcore.h b/graphics/luxrender14/files/patch-luxrays-include-luxcore-luxcore.h
deleted file mode 100644
index 4a0b0eeb7380..000000000000
--- a/graphics/luxrender14/files/patch-luxrays-include-luxcore-luxcore.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../luxrays/include/luxcore/luxcore.h.orig
-+++ ../luxrays/include/luxcore/luxcore.h
-@@ -63,7 +63,7 @@
-  */
- namespace luxcore {
- 
--CPP_EXPORT CPP_API void (*LuxCore_LogHandler)(const char *msg); // LuxCore Log Handler
-+extern CPP_API void (*LuxCore_LogHandler)(const char *msg); // LuxCore Log Handler
- 
- #define LC_LOG(a) { if (luxcore::LuxCore_LogHandler) { std::stringstream _LUXCORE_LOG_LOCAL_SS; _LUXCORE_LOG_LOCAL_SS << a; luxcore::LuxCore_LogHandler(_LUXCORE_LOG_LOCAL_SS.str().c_str()); } }
- 
-@@ -603,7 +603,7 @@ public:
- 	 * 
- 	 * \return the default Properties.
- 	 */
--	static const luxrays::Properties &GetDefaultProperties();
-+	const luxrays::Properties &GetDefaultProperties();
- 
- 	friend class RenderSession;
- 
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index 5eb7fd2d52e4..697107f6948c 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		mapserver
-PORTVERSION=		7.4.0
+PORTVERSION=		7.4.1
 PORTREVISION=	1
 CATEGORIES=		graphics www geography
 MASTER_SITES=		https://download.osgeo.org/mapserver/
diff --git a/graphics/mapserver/distinfo b/graphics/mapserver/distinfo
index 7ad41b22b863..be7f30a85366 100644
--- a/graphics/mapserver/distinfo
+++ b/graphics/mapserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557963299
-SHA256 (mapserver-7.4.0.tar.gz) = fc714f5836023fd39005296665c562022fa294348ecc244b93647b3ba1e361f5
-SIZE (mapserver-7.4.0.tar.gz) = 2686054
+TIMESTAMP = 1567993244
+SHA256 (mapserver-7.4.1.tar.gz) = ec61388902dab9db2debf826cb9a57cabff2e7ab49fb1c82df2aa8e0253b206e
+SIZE (mapserver-7.4.1.tar.gz) = 2686231
diff --git a/graphics/mapserver/pkg-plist b/graphics/mapserver/pkg-plist
index 450ed95d0af4..a090824c0260 100644
--- a/graphics/mapserver/pkg-plist
+++ b/graphics/mapserver/pkg-plist
@@ -11,7 +11,7 @@ bin/tile4ms
 %%PHP%%etc/php/ext-20-php_mapscript.ini
 lib/libmapserver.so
 lib/libmapserver.so.2
-lib/libmapserver.so.7.4.0
+lib/libmapserver.so.7.4.1
 %%PHP%%lib/php/%%PHP_EXT_DIR%%/php_mapscript.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mapscript.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_mapscript.so
diff --git a/graphics/minder/Makefile b/graphics/minder/Makefile
index 5a3f8a6dd817..00108599cb41 100644
--- a/graphics/minder/Makefile
+++ b/graphics/minder/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	minder
-PORTVERSION=	1.4.1
+PORTVERSION=	1.5.0
 CATEGORIES=	graphics
 # avoid PKGBASE collision with net-p2p/minder
 PKGNAMESUFFIX=	-app
diff --git a/graphics/minder/distinfo b/graphics/minder/distinfo
index f4661bc343cf..b5fed663a663 100644
--- a/graphics/minder/distinfo
+++ b/graphics/minder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563180628
-SHA256 (phase1geo-Minder-1.4.1_GH0.tar.gz) = e1e5343fb83612bfc4f1943cbc53411649da4ce9bd078061b0623e7c9db95621
-SIZE (phase1geo-Minder-1.4.1_GH0.tar.gz) = 681957
+TIMESTAMP = 1567931738
+SHA256 (phase1geo-Minder-1.5.0_GH0.tar.gz) = e313b5305242959434d551d3ec78bbed6faceb5494c1832b98b0b63a95b2e3f0
+SIZE (phase1geo-Minder-1.5.0_GH0.tar.gz) = 879292
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 1de8f7e3eacd..7836a617422a 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	netpbm
-DISTVERSION=	10.87.01
+DISTVERSION=	10.87.02
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/t6/netpbm/releases/download/v${DISTVERSION}/ \
-		https://gitlab.com/tobiask/netpbm/uploads/aa50c2aa391a8aedb35d5e914b88c4d0/ \
 		LOCAL/tobik
 
 MAINTAINER=	tobik@FreeBSD.org
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index e27abab91e34..838cb3152563 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565471255
-SHA256 (netpbm-10.87.01.tar.gz) = 29c4c6a5588ca45c9598678a4e71e579be3d38fcf61dd7629195c77f4ec5adf6
-SIZE (netpbm-10.87.01.tar.gz) = 3336887
+TIMESTAMP = 1567932994
+SHA256 (netpbm-10.87.02.tar.gz) = 3adab914fa78a31c3d60c02a6839fa52765d1dc58afb123379e647bd8f535268
+SIZE (netpbm-10.87.02.tar.gz) = 3336952
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 1591a7defd3e..8d85af3b4204 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -103,8 +103,8 @@ QT5_VARS_OFF=		FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidgets"
 SDL_USE=		sdl=sdl
 SDL_VARS=		FORCE_REQUIRE+=SDL
 SDL_VARS_OFF=		FORCE_IGNORE+=SDL
-SVG_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
-SVG_USE=		gnome=cairo
+SVG_USES=		gnome
+SVG_USE=		gnome=cairo,librsvg2
 SVG_VARS=		FORCE_REQUIRE+=RSVG
 SVG_VARS_OFF=		FORCE_IGNORE+=RSVG
 VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index e20ac79deb8f..496098a0bc8c 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -106,8 +106,8 @@ QT5_VARS_OFF=		FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidgets"
 SDL_USE=		sdl=sdl
 SDL_VARS=		FORCE_REQUIRE+=SDL
 SDL_VARS_OFF=		FORCE_IGNORE+=SDL
-SVG_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
-SVG_USE=		gnome=cairo
+SVG_USES=		gnome
+SVG_USE=		gnome=cairo,librsvg2
 SVG_VARS=		FORCE_REQUIRE+=RSVG
 SVG_VARS_OFF=		FORCE_IGNORE+=RSVG
 VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
diff --git a/graphics/py-pillow/Makefile b/graphics/py-pillow/Makefile
index 4d8b59106c1f..af60e47e190d 100644
--- a/graphics/py-pillow/Makefile
+++ b/graphics/py-pillow/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pillow
-PORTVERSION=	6.0.0
-PORTREVISION=	2
+PORTVERSION=	6.1.0
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/graphics/py-pillow/distinfo b/graphics/py-pillow/distinfo
index fcaef530f863..e416b64f5c99 100644
--- a/graphics/py-pillow/distinfo
+++ b/graphics/py-pillow/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555711743
-SHA256 (python-pillow-Pillow-6.0.0_GH0.tar.gz) = f0babf5d7072ea9923a3950cd7ea41b0008429b16584de7d95cc5550a2806cda
-SIZE (python-pillow-Pillow-6.0.0_GH0.tar.gz) = 29205509
+TIMESTAMP = 1565961342
+SHA256 (python-pillow-Pillow-6.1.0_GH0.tar.gz) = 9a3a613e7780362605b10765274389b3e9a6fe3201dd2bceeb422d45c5c9ba18
+SIZE (python-pillow-Pillow-6.1.0_GH0.tar.gz) = 33523149
diff --git a/graphics/py-pillow/pkg-descr b/graphics/py-pillow/pkg-descr
index 6b1fb44798c4..0249c5723e14 100644
--- a/graphics/py-pillow/pkg-descr
+++ b/graphics/py-pillow/pkg-descr
@@ -2,4 +2,4 @@ Pillow is the "friendly" PIL fork. PIL is the Python Imaging Library. Pillow
 was started for and is currently maintained by the Plone community. But it is
 used by many other folks in the Python web community.
 
-WWW: https://python-pillow.github.io/
+WWW: https://python-pillow.org/
diff --git a/graphics/py-pyembree/Makefile b/graphics/py-pyembree/Makefile
new file mode 100644
index 000000000000..b6699399424c
--- /dev/null
+++ b/graphics/py-pyembree/Makefile
@@ -0,0 +1,28 @@
+# Created by: Yuri Victorovich <yuri@rawbw.com>
+# $FreeBSD$
+
+PORTNAME=	pyembree
+DISTVERSION=	0.1.4
+PORTREVISION=	2
+CATEGORIES=	graphics python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Python wrapper for Embree
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYNUMPY}
+LIB_DEPENDS=	libembree.so:graphics/embree
+RUN_DEPENDS=	${PYNUMPY}
+
+USES=		localbase python
+USE_PYTHON=	autoplist distutils cython
+USE_GITHUB=	yes
+GH_ACCOUNT=	scopatz
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pyembree/*.so
+
+.include <bsd.port.mk>
diff --git a/graphics/py-pyembree/distinfo b/graphics/py-pyembree/distinfo
new file mode 100644
index 000000000000..ea8ed0f9d1a8
--- /dev/null
+++ b/graphics/py-pyembree/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1523604521
+SHA256 (scopatz-pyembree-0.1.4_GH0.tar.gz) = 63a73f198c38c37374e6288c73f7ddfdccf7b67829e2b81a1990b714b4fdabd3
+SIZE (scopatz-pyembree-0.1.4_GH0.tar.gz) = 12812
diff --git a/graphics/py-pyembree/pkg-descr b/graphics/py-pyembree/pkg-descr
new file mode 100644
index 000000000000..16a0b99446df
--- /dev/null
+++ b/graphics/py-pyembree/pkg-descr
@@ -0,0 +1,3 @@
+Python wrapper for Embree.
+
+WWW: https://github.com/scopatz/pyembree
diff --git a/graphics/py-traitsui/Makefile b/graphics/py-traitsui/Makefile
index bcc952437e31..327a99f0d969 100644
--- a/graphics/py-traitsui/Makefile
+++ b/graphics/py-traitsui/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	traitsui
-PORTVERSION=	6.1.2
+PORTVERSION=	6.1.3
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -57,6 +57,6 @@ do-test:
 # Note: The occurences of "qt4" aren't typos
 do-test-QT5-on:
 	@cd ${WRKSRC} && ${SETENV} ETS_TOOLKIT=qt4 QT_API=pyqt5 \
-		${PYTHON_CMD} -m nose -v -e 'test_wrap_text_narrow_short' traitsui.qt4.tests
+		${PYTHON_CMD} -m nose -v traitsui.qt4.tests
 
 .include <bsd.port.mk>
diff --git a/graphics/py-traitsui/distinfo b/graphics/py-traitsui/distinfo
index 21e99f9dfd8d..8175dacc554c 100644
--- a/graphics/py-traitsui/distinfo
+++ b/graphics/py-traitsui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565984705
-SHA256 (traitsui-6.1.2.tar.gz) = 698dd44d6ff6a50502f6ef0ffe545c233f2772e5c37127667302b8c845be9551
-SIZE (traitsui-6.1.2.tar.gz) = 5125470
+TIMESTAMP = 1568023310
+SHA256 (traitsui-6.1.3.tar.gz) = 48381763b181efc58eaf288431d1d92d028d0d97dfdd33eba7809aae8aef814f
+SIZE (traitsui-6.1.3.tar.gz) = 5129662
diff --git a/graphics/unpaper/Makefile b/graphics/unpaper/Makefile
index 5ac1a001b245..1c523f72c44e 100644
--- a/graphics/unpaper/Makefile
+++ b/graphics/unpaper/Makefile
@@ -2,31 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	unpaper
-PORTVERSION=	0.3
+PORTVERSION=	6.1
 CATEGORIES=	graphics
 MASTER_SITES=	https://www.flameeyes.eu/files/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Post-processing tool for scanned sheets of paper
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-PORTDOCS=	*
-PLIST_FILES=	bin/${PORTNAME}
+BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+		bash:shells/bash
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+		libavformat.so:multimedia/ffmpeg \
+		libavutil.so:multimedia/ffmpeg
 
-OPTIONS_DEFINE=	DOCS
+USES=		autoreconf pkgconfig tar:xz
 
-do-build:
-	@${CC} ${CFLAGS} -o ${WRKSRC}/${PORTNAME} \
-		${WRKSRC}/src/${PORTNAME}.c -lm
+GNU_CONFIGURE=	yes
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGELOG README ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+PLIST_FILES=	bin/${PORTNAME} \
+		man/man1/${PORTNAME}.1.gz
 
 .include <bsd.port.mk>
diff --git a/graphics/unpaper/distinfo b/graphics/unpaper/distinfo
index 9021174aa58d..16e5a9c01cd8 100644
--- a/graphics/unpaper/distinfo
+++ b/graphics/unpaper/distinfo
@@ -1,2 +1,3 @@
-SHA256 (unpaper-0.3.tar.gz) = 3433664040942bf7638946e2327e5c64119c600fde8ace918f47109fafbde5be
-SIZE (unpaper-0.3.tar.gz) = 546488
+TIMESTAMP = 1565468288
+SHA256 (unpaper-6.1.tar.xz) = 237c84f5da544b3f7709827f9f12c37c346cdf029b1128fb4633f9bafa5cb930
+SIZE (unpaper-6.1.tar.xz) = 2655724
diff --git a/graphics/unpaper/files/patch-file.c b/graphics/unpaper/files/patch-file.c
new file mode 100644
index 000000000000..aa8bbf6368fb
--- /dev/null
+++ b/graphics/unpaper/files/patch-file.c
@@ -0,0 +1,30 @@
+Subject: Fix wrong ffmpeg API usage
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800312
+Bug: https://github.com/Flameeyes/unpaper/issues/39
+Author: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
+Forwarded: https://github.com/Flameeyes/unpaper/pull/42
+
+--- file.c.orig	2014-10-26 22:35:38 UTC
++++ file.c
+@@ -93,10 +93,21 @@ void loadImage(const char *filename, AVFrame **image) 
+     if (pkt.stream_index != 0)
+         errOutput("unable to open file %s: invalid stream.", filename);
+ 
++    while (!got_frame && pkt.data) {
++
++        if (pkt.size <= 0) {
++            pkt.data = NULL;
++            pkt.size = 0;
++        }
++
+     ret = avcodec_decode_video2(avctx, frame, &got_frame, &pkt);
+     if (ret < 0) {
+         av_strerror(ret, errbuff, sizeof(errbuff));
+         errOutput("unable to open file %s: %s", filename, errbuff);
++    }
++
++        pkt.data += ret;
++        pkt.size -= ret;
+     }
+ 
+     switch(frame->format) {
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index 636971fc131b..121c1feb2bd8 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wxsvg
-PORTVERSION=	1.5.16
-PORTREVISION=	2
+PORTVERSION=	1.5.20
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
diff --git a/graphics/wxsvg/distinfo b/graphics/wxsvg/distinfo
index 422f5eecff2f..5238cf6b3d90 100644
--- a/graphics/wxsvg/distinfo
+++ b/graphics/wxsvg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548803155
-SHA256 (wxsvg-1.5.16.tar.bz2) = a4bdd3ebc3a32add577bc5414d811b93e1642910d9fa41623c72ee71a696cabe
-SIZE (wxsvg-1.5.16.tar.bz2) = 495389
+TIMESTAMP = 1568036139
+SHA256 (wxsvg-1.5.20.tar.bz2) = 1536da8591f9354e903c56b6765df758d65ae6d83354cd2ce867d7428391459e
+SIZE (wxsvg-1.5.20.tar.bz2) = 495401
diff --git a/graphics/wxsvg/pkg-plist b/graphics/wxsvg/pkg-plist
index 797856582c31..53123027b850 100644
--- a/graphics/wxsvg/pkg-plist
+++ b/graphics/wxsvg/pkg-plist
@@ -193,5 +193,5 @@ include/wxSVGXML/svgxmlhelpr.h
 lib/libwxsvg.a
 lib/libwxsvg.so
 lib/libwxsvg.so.3
-lib/libwxsvg.so.3.12.0
+lib/libwxsvg.so.3.12.4
 libdata/pkgconfig/libwxsvg.pc
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index 4bef2064a59d..2fd14dfd0d79 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	irssi
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 PORTEPOCH=	1
 CATEGORIES?=	irc
 MASTER_SITES=	https://github.com/irssi/irssi/releases/download/${PORTVERSION}/
diff --git a/irc/irssi/distinfo b/irc/irssi/distinfo
index 0f41eeeac0f5..2d1f117cce34 100644
--- a/irc/irssi/distinfo
+++ b/irc/irssi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561883152
-SHA256 (irssi-1.2.1.tar.xz) = 5466a1ed9612cfa707d9a37d60b29d027b4ac7d83c74ceb1a410e2b59edba92c
-SIZE (irssi-1.2.1.tar.xz) = 1140380
+TIMESTAMP = 1568194739
+SHA256 (irssi-1.2.2.tar.xz) = 6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578
+SIZE (irssi-1.2.2.tar.xz) = 1140844
diff --git a/japanese/Makefile b/japanese/Makefile
index d70c754adc65..19cb4cd87a40 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -92,6 +92,8 @@
     SUBDIR += font-mplus-bitmap
     SUBDIR += font-mplus-ipa
     SUBDIR += font-mplus-outline
+    SUBDIR += font-myrica
+    SUBDIR += font-myricam
     SUBDIR += font-naga10
     SUBDIR += font-nasu
     SUBDIR += font-ricty
diff --git a/japanese/ajaxzip2-data/Makefile b/japanese/ajaxzip2-data/Makefile
index b0a471c63d5e..208370b60145 100644
--- a/japanese/ajaxzip2-data/Makefile
+++ b/japanese/ajaxzip2-data/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ajaxzip2
-PORTVERSION=	20181228
+PORTVERSION=	20190830
 CATEGORIES=	japanese
 MASTER_SITES=	LOCAL/kuriyama
 PKGNAMESUFFIX=	-data
diff --git a/japanese/ajaxzip2-data/distinfo b/japanese/ajaxzip2-data/distinfo
index f218b11235e6..baafe1496ac3 100644
--- a/japanese/ajaxzip2-data/distinfo
+++ b/japanese/ajaxzip2-data/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1547791765
-SHA256 (ken_all-20181228.zip) = 814257c9c93d4393bedb4025542a4b54def16fd6e88268b03e29fe6d19ba10da
-SIZE (ken_all-20181228.zip) = 1687342
-SHA256 (jigyosyo-20181228.zip) = 9d3b7a11c1b851c70a41f4dc6cf3bffd800f3cf254bcad1d65ea0829fc67bb5d
-SIZE (jigyosyo-20181228.zip) = 763205
+TIMESTAMP = 1568020622
+SHA256 (ken_all-20190830.zip) = 32f9df12d9833cf6a5874c7a6a7190079d107e52521029399776c15c94f106a9
+SIZE (ken_all-20190830.zip) = 1688691
+SHA256 (jigyosyo-20190830.zip) = c7e951647cfde1fabf9289adb8554b72475ba38c423afd5165c43f5da25f2586
+SIZE (jigyosyo-20190830.zip) = 765754
diff --git a/japanese/font-myrica/Makefile b/japanese/font-myrica/Makefile
new file mode 100644
index 000000000000..5c41f96b1c07
--- /dev/null
+++ b/japanese/font-myrica/Makefile
@@ -0,0 +1,45 @@
+# $FreeBSD$
+
+PORTNAME=	myrica
+PORTVERSION=	2.012.20180119
+#PORTREVISION=	0
+CATEGORIES=	japanese x11-fonts
+MASTER_SITES=	https://github.com/tomokuni/Myrica/raw/master/product/
+PKGNAMEPREFIX=	ja-font-
+DISTNAME=	Myrica
+DIST_SUBDIR=	${DISTNAME}-${PORTVERSION}
+
+MAINTAINER=	ume@FreeBSD.org
+COMMENT=	Myrica free TrueType fonts for programming
+
+USES=		fonts:fc 7z
+FONTNAME=	myrica
+NO_WRKSUBDIR=	yes
+NO_ARCH=	yes
+NO_BUILD=	yes
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+SUB_FILES=	pkg-install
+WRKSRC=		${WRKDIR}/${DISTNAME}
+PORTDOCS=	LICENSE_M+.txt LICENSE_OFL.txt README.md
+
+OPTIONS_DEFINE=	DOCS
+
+do-install:
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} *.TTC ${STAGEDIR}${FONTSDIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
+	    ${FILESDIR}/62-fonts-${PORTNAME}.conf \
+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail
+	${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \
+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
+	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
+
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/japanese/font-myrica/distinfo b/japanese/font-myrica/distinfo
new file mode 100644
index 000000000000..bd3781e993fa
--- /dev/null
+++ b/japanese/font-myrica/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1567831810
+SHA256 (Myrica-2.012.20180119/Myrica.7z) = f73dca7a5999d02351534dbdc184e0e2f9f1a8294de5ff931bb535a5327c68c0
+SIZE (Myrica-2.012.20180119/Myrica.7z) = 4735980
diff --git a/japanese/font-myrica/files/20-unhint-myrica.conf b/japanese/font-myrica/files/20-unhint-myrica.conf
new file mode 100644
index 000000000000..60ea9abd01ab
--- /dev/null
+++ b/japanese/font-myrica/files/20-unhint-myrica.conf
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+	<match target="font">
+		<test name="family">
+			<string>Myrica M</string>
+		</test>
+		<test name="family">
+			<string>Myrica N</string>
+		</test>
+		<test name="family">
+			<string>Myrica P</string>
+		</test>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+	</match>
+</fontconfig>
diff --git a/japanese/font-myrica/files/62-fonts-myrica.conf b/japanese/font-myrica/files/62-fonts-myrica.conf
new file mode 100644
index 000000000000..d992fd8fdd25
--- /dev/null
+++ b/japanese/font-myrica/files/62-fonts-myrica.conf
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>Myrica P</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>Myrica M</family>
+		</prefer>
+	</alias>
+</fontconfig>
diff --git a/japanese/font-myrica/files/pkg-install.in b/japanese/font-myrica/files/pkg-install.in
new file mode 100644
index 000000000000..61de9573ef61
--- /dev/null
+++ b/japanese/font-myrica/files/pkg-install.in
@@ -0,0 +1,107 @@
+#!/bin/sh
+# $FreeBSD$
+
+catfontsdir()
+{
+    while read _IN
+    do
+      case "${_IN}" in
+      *-misc-myrica-*|[0-9]*|"") ;;
+      *)       echo ${_IN} ;;
+      esac
+    done
+}
+
+ROMA=""
+BOLD="ds=y"
+RITA="ai=0.08"
+ROBL="ai=0.08"
+
+make_xlfd()
+{
+	_enc=$1
+	_file=$2
+	_vendor=$3
+	_fname=$4
+	_poc=$5
+	_weight=$6
+
+	case "${_poc}:${_enc}" in
+	p:jisx0201.1976-*)	PFIX="bw=0.5" ;;
+	c:jisx0201.1976-*)	PFIX="bw=0.5" ;;
+	p:*)			PFIX="" ;;
+	c:*)			PFIX="" ;;
+	esac
+
+	set --	""	${_weight}-r \
+		${RITA}	${_weight}-ri \
+		${ROBL}	${_weight}-ro
+	while [ $# != 0 ]; do
+		_prefix="${PFIX}:$1"; shift
+		_variant=$1; shift
+		[ ${index_type} = "scale" -a ${_prefix} != ":" ] && continue
+		printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \
+		       $_prefix $_file $_vendor "$_fname" $_variant $_poc $_enc
+	done | sed -e 's,::,:,g' -e 's,^:,,'
+
+	_prefix="${PFIX}:"
+	[ ${index_type} = "scale" -a ${_prefix} != ":" ] && return
+	_file=$(echo $_file | sed -e 's,\.ttf$,Italic&,')
+	for _variant in ${_weight}-i ${_weight}-o; do
+		printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \
+		       $_prefix $_file $_vendor "$_fname" $_variant $_poc $_enc
+		[ ${index_type} = "scale" ] && break
+	done | sed -e 's,::,:,g' -e 's,^:,,'
+}
+
+addentries()
+{
+	for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0 jisx0208.1997-0 jisx0213.2004-1
+	do
+		make_xlfd $ENC Myrica.TTC misc "myrica" m medium
+	done
+}
+
+nfonts()
+{
+    _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L}
+}
+
+install_fontsdir()
+{
+	index_type=${1:-"dir"}
+	index="fonts.${index_type}"
+	tmpfile="${index}.tmp"
+	touch ${index}
+	(catfontsdir < ${index}; addentries ${index_type}) > ${tmpfile}
+	nfonts < ${tmpfile} > ${index}
+	cat ${tmpfile} >> ${index}
+	rm -f ${tmpfile}
+}
+
+deinstall_fontsdir()
+{
+	index_type=${1:-"dir"}
+	index="fonts.${index_type}"
+	tmpfile="${index}.tmp"
+	catfontsdir < ${index} > ${tmpfile}
+	nfonts < ${tmpfile} > ${index}
+	cat ${tmpfile} >> ${index}
+	rm -f ${tmpfile}
+	if [ -r ${index} -a $(wc -l < ${index}) = 1 ]; then
+		rm -f ${index}
+	fi
+}
+
+case "$2" in
+POST-INSTALL)
+	cd %%FONTSDIR%%
+	install_fontsdir dir
+	install_fontsdir scale
+	;;
+POST-DEINSTALL)
+	cd %%FONTSDIR%%
+	deinstall_fontsdir dir
+	deinstall_fontsdir scale
+	;;
+esac
diff --git a/japanese/font-myrica/pkg-descr b/japanese/font-myrica/pkg-descr
new file mode 100644
index 000000000000..863652656048
--- /dev/null
+++ b/japanese/font-myrica/pkg-descr
@@ -0,0 +1,3 @@
+Myrica is a free TrueType fonts for programming
+
+WWW: https://myrica.estable.jp/
diff --git a/japanese/font-myrica/pkg-plist b/japanese/font-myrica/pkg-plist
new file mode 100644
index 000000000000..ac9d32ae2ff8
--- /dev/null
+++ b/japanese/font-myrica/pkg-plist
@@ -0,0 +1,5 @@
+etc/fonts/conf.avail/20-unhint-myrica.conf
+etc/fonts/conf.avail/62-fonts-myrica.conf
+etc/fonts/conf.d/20-unhint-myrica.conf
+etc/fonts/conf.d/62-fonts-myrica.conf
+%%FONTSDIR%%/Myrica.TTC
diff --git a/japanese/font-myricam/Makefile b/japanese/font-myricam/Makefile
new file mode 100644
index 000000000000..806e2a4f4dcc
--- /dev/null
+++ b/japanese/font-myricam/Makefile
@@ -0,0 +1,45 @@
+# $FreeBSD$
+
+PORTNAME=	myricam
+PORTVERSION=	2.012.20180119
+#PORTREVISION=	0
+CATEGORIES=	japanese x11-fonts
+MASTER_SITES=	https://github.com/tomokuni/Myrica/raw/master/product/
+PKGNAMEPREFIX=	ja-font-
+DISTNAME=	MyricaM
+DIST_SUBDIR=	${DISTNAME}-${PORTVERSION}
+
+MAINTAINER=	ume@FreeBSD.org
+COMMENT=	Myrica free TrueType fonts for programming
+
+USES=		fonts:fc 7z
+FONTNAME=	myricam
+NO_WRKSUBDIR=	yes
+NO_ARCH=	yes
+NO_BUILD=	yes
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-install
+SUB_FILES=	pkg-install
+WRKSRC=		${WRKDIR}/${DISTNAME}
+PORTDOCS=	LICENSE_M+.txt LICENSE_OFL.txt README.md
+
+OPTIONS_DEFINE=	DOCS
+
+do-install:
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} *.TTC ${STAGEDIR}${FONTSDIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
+	    ${FILESDIR}/62-fonts-${PORTNAME}.conf \
+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail
+	${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \
+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
+	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
+
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/japanese/font-myricam/distinfo b/japanese/font-myricam/distinfo
new file mode 100644
index 000000000000..807e2eee69f8
--- /dev/null
+++ b/japanese/font-myricam/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1567834800
+SHA256 (MyricaM-2.012.20180119/MyricaM.7z) = 7b309919d0f5e51cb2d96dc13b94794efe39f2b2f4eae7a43d9404088ad2ddda
+SIZE (MyricaM-2.012.20180119/MyricaM.7z) = 4394538
diff --git a/japanese/font-myricam/files/20-unhint-myricam.conf b/japanese/font-myricam/files/20-unhint-myricam.conf
new file mode 100644
index 000000000000..0b8e46b7d95f
--- /dev/null
+++ b/japanese/font-myricam/files/20-unhint-myricam.conf
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+	<match target="font">
+		<test name="family">
+			<string>MyricaM M</string>
+		</test>
+		<test name="family">
+			<string>MyricaM N</string>
+		</test>
+		<test name="family">
+			<string>MyricaM P</string>
+		</test>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+	</match>
+</fontconfig>
diff --git a/japanese/font-myricam/files/62-fonts-myricam.conf b/japanese/font-myricam/files/62-fonts-myricam.conf
new file mode 100644
index 000000000000..9a995412f54e
--- /dev/null
+++ b/japanese/font-myricam/files/62-fonts-myricam.conf
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- $FreeBSD$ -->
+<fontconfig>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>MyricaM P</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>MyricaM M</family>
+		</prefer>
+	</alias>
+</fontconfig>
diff --git a/japanese/font-myricam/files/pkg-install.in b/japanese/font-myricam/files/pkg-install.in
new file mode 100644
index 000000000000..964e1b27ee31
--- /dev/null
+++ b/japanese/font-myricam/files/pkg-install.in
@@ -0,0 +1,107 @@
+#!/bin/sh
+# $FreeBSD$
+
+catfontsdir()
+{
+    while read _IN
+    do
+      case "${_IN}" in
+      *-misc-myrica\ m-*|[0-9]*|"") ;;
+      *)       echo ${_IN} ;;
+      esac
+    done
+}
+
+ROMA=""
+BOLD="ds=y"
+RITA="ai=0.08"
+ROBL="ai=0.08"
+
+make_xlfd()
+{
+	_enc=$1
+	_file=$2
+	_vendor=$3
+	_fname=$4
+	_poc=$5
+	_weight=$6
+
+	case "${_poc}:${_enc}" in
+	p:jisx0201.1976-*)	PFIX="bw=0.5" ;;
+	c:jisx0201.1976-*)	PFIX="bw=0.5" ;;
+	p:*)			PFIX="" ;;
+	c:*)			PFIX="" ;;
+	esac
+
+	set --	""	${_weight}-r \
+		${RITA}	${_weight}-ri \
+		${ROBL}	${_weight}-ro
+	while [ $# != 0 ]; do
+		_prefix="${PFIX}:$1"; shift
+		_variant=$1; shift
+		[ ${index_type} = "scale" -a ${_prefix} != ":" ] && continue
+		printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \
+		       $_prefix $_file $_vendor "$_fname" $_variant $_poc $_enc
+	done | sed -e 's,::,:,g' -e 's,^:,,'
+
+	_prefix="${PFIX}:"
+	[ ${index_type} = "scale" -a ${_prefix} != ":" ] && return
+	_file=$(echo $_file | sed -e 's,\.ttf$,Italic&,')
+	for _variant in ${_weight}-i ${_weight}-o; do
+		printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \
+		       $_prefix $_file $_vendor "$_fname" $_variant $_poc $_enc
+		[ ${index_type} = "scale" ] && break
+	done | sed -e 's,::,:,g' -e 's,^:,,'
+}
+
+addentries()
+{
+	for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0 jisx0208.1997-0 jisx0213.2004-1
+	do
+		make_xlfd $ENC MyricaM.TTC misc "myrica m" m medium
+	done
+}
+
+nfonts()
+{
+    _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L}
+}
+
+install_fontsdir()
+{
+	index_type=${1:-"dir"}
+	index="fonts.${index_type}"
+	tmpfile="${index}.tmp"
+	touch ${index}
+	(catfontsdir < ${index}; addentries ${index_type}) > ${tmpfile}
+	nfonts < ${tmpfile} > ${index}
+	cat ${tmpfile} >> ${index}
+	rm -f ${tmpfile}
+}
+
+deinstall_fontsdir()
+{
+	index_type=${1:-"dir"}
+	index="fonts.${index_type}"
+	tmpfile="${index}.tmp"
+	catfontsdir < ${index} > ${tmpfile}
+	nfonts < ${tmpfile} > ${index}
+	cat ${tmpfile} >> ${index}
+	rm -f ${tmpfile}
+	if [ -r ${index} -a $(wc -l < ${index}) = 1 ]; then
+		rm -f ${index}
+	fi
+}
+
+case "$2" in
+POST-INSTALL)
+	cd %%FONTSDIR%%
+	install_fontsdir dir
+	install_fontsdir scale
+	;;
+POST-DEINSTALL)
+	cd %%FONTSDIR%%
+	deinstall_fontsdir dir
+	deinstall_fontsdir scale
+	;;
+esac
diff --git a/japanese/font-myricam/pkg-descr b/japanese/font-myricam/pkg-descr
new file mode 100644
index 000000000000..863652656048
--- /dev/null
+++ b/japanese/font-myricam/pkg-descr
@@ -0,0 +1,3 @@
+Myrica is a free TrueType fonts for programming
+
+WWW: https://myrica.estable.jp/
diff --git a/japanese/font-myricam/pkg-plist b/japanese/font-myricam/pkg-plist
new file mode 100644
index 000000000000..72873fee04da
--- /dev/null
+++ b/japanese/font-myricam/pkg-plist
@@ -0,0 +1,5 @@
+etc/fonts/conf.avail/20-unhint-myricam.conf
+etc/fonts/conf.avail/62-fonts-myricam.conf
+etc/fonts/conf.d/20-unhint-myricam.conf
+etc/fonts/conf.d/62-fonts-myricam.conf
+%%FONTSDIR%%/MyricaM.TTC
diff --git a/japanese/p5-Number-Phone-JP/Makefile b/japanese/p5-Number-Phone-JP/Makefile
index 176d491bbbc5..541beda5900c 100644
--- a/japanese/p5-Number-Phone-JP/Makefile
+++ b/japanese/p5-Number-Phone-JP/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Number-Phone-JP
-PORTVERSION=	0.20190204
+PORTVERSION=	0.20190521
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TANIGUCHI
diff --git a/japanese/p5-Number-Phone-JP/distinfo b/japanese/p5-Number-Phone-JP/distinfo
index 4cef0bf1c405..a295853d7d10 100644
--- a/japanese/p5-Number-Phone-JP/distinfo
+++ b/japanese/p5-Number-Phone-JP/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550932502
-SHA256 (Number-Phone-JP-0.20190204.tar.gz) = 58e122395899bea8636e304e368dc2717016f57a852a05ae0e4432f63ed822c6
-SIZE (Number-Phone-JP-0.20190204.tar.gz) = 397714
+TIMESTAMP = 1568058927
+SHA256 (Number-Phone-JP-0.20190521.tar.gz) = 7a174af2a6b03a355143872fc72b1f9691b8ce0fda52f5e11162671044c161c3
+SIZE (Number-Phone-JP-0.20190521.tar.gz) = 397839
diff --git a/japanese/zipcodes/Makefile b/japanese/zipcodes/Makefile
index e444730d9133..bd464099b808 100644
--- a/japanese/zipcodes/Makefile
+++ b/japanese/zipcodes/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	zipcodes
-PORTVERSION=	20181228
+PORTVERSION=	20190830
 CATEGORIES=	japanese
 MASTER_SITES=	LOCAL/kuriyama
 DISTFILES=	ken_all-${PORTVERSION_K}.zip jigyosyo-${PORTVERSION_J}.zip
diff --git a/japanese/zipcodes/distinfo b/japanese/zipcodes/distinfo
index 1e0ce50514aa..4b9dafc2f089 100644
--- a/japanese/zipcodes/distinfo
+++ b/japanese/zipcodes/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1547791784
-SHA256 (ken_all-20181228.zip) = 814257c9c93d4393bedb4025542a4b54def16fd6e88268b03e29fe6d19ba10da
-SIZE (ken_all-20181228.zip) = 1687342
-SHA256 (jigyosyo-20181228.zip) = 9d3b7a11c1b851c70a41f4dc6cf3bffd800f3cf254bcad1d65ea0829fc67bb5d
-SIZE (jigyosyo-20181228.zip) = 763205
+TIMESTAMP = 1568020640
+SHA256 (ken_all-20190830.zip) = 32f9df12d9833cf6a5874c7a6a7190079d107e52521029399776c15c94f106a9
+SIZE (ken_all-20190830.zip) = 1688691
+SHA256 (jigyosyo-20190830.zip) = c7e951647cfde1fabf9289adb8554b72475ba38c423afd5165c43f5da25f2586
+SIZE (jigyosyo-20190830.zip) = 765754
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index e3b31cc82b93..6139e6eaada9 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	eclipse
 PORTVERSION=	4.12
+PORTREVISION=	1
 CATEGORIES=	java devel
 
 # Update to git-tag on git.eclipse.org
@@ -37,8 +38,8 @@ ECLIPSE_MODULES=jdt/eclipse.jdt \
 		equinox/rt.equinox.p2
 # Each Eclipse module has its own MASTER_SITE
 .for M in ${ECLIPSE_MODULES}
-MASTER_SITES+=	https://git.eclipse.org/c/${M}.git/snapshot/:${M:C/[\.\/]//g} \
-		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/:${M:C/[\.\/]//g}
+MASTER_SITES+=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/:${M:C/[\.\/]//g} \
+		https://git.eclipse.org/c/${M}.git/snapshot/:${M:C/[\.\/]//g}
 DISTFILES+=	${M:C/.*\///}-${ECLIPSE_SUFX}:${M:C/[\.\/]//g}
 .endfor
 
diff --git a/java/eclipse/files/patch-eclipse.platform.swt b/java/eclipse/files/patch-eclipse.platform.swt
index 8d57e331eed0..c71e4f916b59 100644
--- a/java/eclipse/files/patch-eclipse.platform.swt
+++ b/java/eclipse/files/patch-eclipse.platform.swt
@@ -159,6 +159,18 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/ecl
  		if (osName.startsWith("Windows")) isWin32 = true;
  		IsLinux = isLinux;  IsWin32 = isWin32;
  
+diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
+--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	0000-00-00 00:00:00.000000000 +0000
+@@ -155,7 +155,7 @@
+ 	 * https://www.nczonline.net/blog/2009/01/05/what-determines-that-a-script-is-long-running/
+ 	 * https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript
+ 	 */
+-	static final int ASYNC_EXEC_TIMEOUT_MS = 10000; // Webkit2.
++	static final int ASYNC_EXEC_TIMEOUT_MS = 100; // Dirty hack for webkit issues on FreeBSD
+ 
+ 	static boolean bug522733FirstInstanceCreated = false; //Webkit2 workaround for Bug 522733
+ 
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
 --- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
diff --git a/lang/Makefile b/lang/Makefile
index 80ac35a00279..dc71ec4d86e3 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -190,6 +190,7 @@
     SUBDIR += lua52
     SUBDIR += lua53
     SUBDIR += luajit
+    SUBDIR += luajit-openresty
     SUBDIR += malbolge
     SUBDIR += maude
     SUBDIR += mawk
diff --git a/lang/gcc10-devel/Makefile b/lang/gcc10-devel/Makefile
index 7aec74b051df..1dbe51d8e080 100644
--- a/lang/gcc10-devel/Makefile
+++ b/lang/gcc10-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	10.0.0.s20190901
+PORTVERSION=	10.0.0.s20190908
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
diff --git a/lang/gcc10-devel/distinfo b/lang/gcc10-devel/distinfo
index 4e2722d6ad67..1cdc69114e55 100644
--- a/lang/gcc10-devel/distinfo
+++ b/lang/gcc10-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567428547
-SHA256 (gcc-10-20190901.tar.xz) = 53f814de840289ee17af864e03eaf87edec41bda50b175bb3b3063f5844d506c
-SIZE (gcc-10-20190901.tar.xz) = 69690400
+TIMESTAMP = 1568035272
+SHA256 (gcc-10-20190908.tar.xz) = 42ce91dab25aee3e9db96aedb5e78e86d8fee369cd22e88f9b1a2409184fcae5
+SIZE (gcc-10-20190908.tar.xz) = 69594588
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index cbfde8875e14..4c9c5da81610 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.8.5
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	lang
 MASTER_SITES=	GCC
 PKGNAMESUFFIX=	${SUFFIX}
@@ -14,7 +14,7 @@ COMMENT=	GNU Compiler Collection 4.8
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-DEPRECATED=	Unsupported by upstream. Use GCC 8 or newer instead.
+DEPRECATED=	Unsupported by upstream. Use GCC 9 or newer instead.
 ONLY_FOR_ARCHS=	amd64 armv6 i386 powerpc powerpc64 sparc64
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile
index e4cf7c8d1588..80be5ef7e132 100644
--- a/lang/gcc5/Makefile
+++ b/lang/gcc5/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GNU Compiler Collection 5
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-DEPRECATED=	Unsupported by upstream. Use GCC 8 or newer instead.
+DEPRECATED=	Unsupported by upstream. Use GCC 9 or newer instead.
 EXPIRATION_DATE=2019-10-29
 ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 i386 powerpc powerpc64 powerpcspe sparc64
 BROKEN_sparc64=	Does not build: bootstrap comparison failure
diff --git a/lang/gcc6/Makefile b/lang/gcc6/Makefile
index ec0828f740e2..bdb82358c9e2 100644
--- a/lang/gcc6/Makefile
+++ b/lang/gcc6/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GNU Compiler Collection 6
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-DEPRECATED=	Unsupported by upstream. Use GCC 8 or newer instead.
+DEPRECATED=	Unsupported by upstream. Use GCC 9 or newer instead.
 ONLY_FOR_ARCHS=	aarch64 amd64 arm armv6 armv7 i386 powerpc powerpc64 powerpcspe sparc64
 BROKEN_sparc64=	fails to configure: cannot compute suffix of object files: cannot compile
 
diff --git a/lang/gcc7-devel/Makefile b/lang/gcc7-devel/Makefile
index 122a5ac9dc41..e72471d47271 100644
--- a/lang/gcc7-devel/Makefile
+++ b/lang/gcc7-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	7.4.1.s20190829
+PORTVERSION=	7.4.1.s20190905
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
diff --git a/lang/gcc7-devel/distinfo b/lang/gcc7-devel/distinfo
index 2ceba2700a8f..68a906c4fc18 100644
--- a/lang/gcc7-devel/distinfo
+++ b/lang/gcc7-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567146830
-SHA256 (gcc-7-20190829.tar.xz) = 3940927900cf61fefe41b00cc3786c900fc17e9dcdcd1b6087b58e21ec06f1bb
-SIZE (gcc-7-20190829.tar.xz) = 59373056
+TIMESTAMP = 1567768738
+SHA256 (gcc-7-20190905.tar.xz) = 40ed2c71caf9132e9d05ba62504e4561d27a006728a0db7bad68bf06f58c38d6
+SIZE (gcc-7-20190905.tar.xz) = 59408084
diff --git a/lang/gcc8-devel/Makefile b/lang/gcc8-devel/Makefile
index 84aebd27a2ad..6b0491ed0c88 100644
--- a/lang/gcc8-devel/Makefile
+++ b/lang/gcc8-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	8.3.1.s20190830
+PORTVERSION=	8.3.1.s20190906
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
diff --git a/lang/gcc8-devel/distinfo b/lang/gcc8-devel/distinfo
index 6d734c4f07d4..a0b323d2fd28 100644
--- a/lang/gcc8-devel/distinfo
+++ b/lang/gcc8-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567226297
-SHA256 (gcc-8-20190830.tar.xz) = 4b05c96968a679b63db6590fe2d047f9ef5df2676a06093df7fb00045289e427
-SIZE (gcc-8-20190830.tar.xz) = 61917852
+TIMESTAMP = 1567825698
+SHA256 (gcc-8-20190906.tar.xz) = 136655a1c170dbc66b0ca57e10cc244a2b38c6eb9ec23991a670a45f600f0a00
+SIZE (gcc-8-20190906.tar.xz) = 61973904
diff --git a/lang/gcc9-devel/Makefile b/lang/gcc9-devel/Makefile
index c014b418b273..20b91f8bdff3 100644
--- a/lang/gcc9-devel/Makefile
+++ b/lang/gcc9-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	9.2.1.s20190831
+PORTVERSION=	9.2.1.s20190907
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
diff --git a/lang/gcc9-devel/distinfo b/lang/gcc9-devel/distinfo
index de1e12711517..e10fad68fae9 100644
--- a/lang/gcc9-devel/distinfo
+++ b/lang/gcc9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567297358
-SHA256 (gcc-9-20190831.tar.xz) = 9b39511c0f9f8030a84203cf9f323e83c7c6d55c814ac6f2fd238509b3832874
-SIZE (gcc-9-20190831.tar.xz) = 68875072
+TIMESTAMP = 1567914226
+SHA256 (gcc-9-20190907.tar.xz) = 9f4aa7fd704df77e9b649f99959572477e9b99868f48a0fcc8b866b4fd1e76a5
+SIZE (gcc-9-20190907.tar.xz) = 68883596
diff --git a/lang/luajit-openresty/Makefile b/lang/luajit-openresty/Makefile
new file mode 100644
index 000000000000..ba738b6c35d2
--- /dev/null
+++ b/lang/luajit-openresty/Makefile
@@ -0,0 +1,41 @@
+# Created by: Martin Matuska <mm@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	luajit
+DISTVERSION=	2.1.20190626
+CATEGORIES=	lang
+PKGNAMESUFFIX=	-openresty
+
+MAINTAINER=	mm@FreeBSD.org
+COMMENT=	Just-In-Time Compiler for Lua (OpenResty branch)
+
+LICENSE=	MIT PD
+LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
+
+USES=		gmake
+
+CONFLICTS_INSTALL=	luajit
+
+USE_LDCONFIG=	yes
+MAKE_ARGS=	CC=${CC}
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	openresty
+GH_PROJECT=	luajit2
+GH_TAGNAME=	v2.1-20190626
+
+PLIST_SUB+=	VERSION=2.1.0-beta3 SOVERSION=2.1.0
+
+.include <bsd.port.options.mk>
+
+.if ${ARCH:Mpowerpc*} || ${ARCH:Mmips*} || ${ARCH:Msparc*}
+USE_GCC=yes
+.endif
+
+post-install:
+	${LN} -sf ${PORTNAME}-${DISTVERSION} \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+
+.include <bsd.port.mk>
diff --git a/lang/luajit-openresty/distinfo b/lang/luajit-openresty/distinfo
new file mode 100644
index 000000000000..c62bae66c157
--- /dev/null
+++ b/lang/luajit-openresty/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1567982328
+SHA256 (openresty-luajit2-2.1.20190626-v2.1-20190626_GH0.tar.gz) = 132cf463b1f3317cd8ac0ba91ddf48a8b730531de3ae7a3ed1bbbd8436cd3112
+SIZE (openresty-luajit2-2.1.20190626-v2.1-20190626_GH0.tar.gz) = 1049535
diff --git a/lang/luajit-openresty/files/patch-Makefile b/lang/luajit-openresty/files/patch-Makefile
new file mode 100644
index 000000000000..a248ac68e3f0
--- /dev/null
+++ b/lang/luajit-openresty/files/patch-Makefile
@@ -0,0 +1,59 @@
+--- Makefile.orig	2019-06-26 21:12:49 UTC
++++ Makefile
+@@ -25,7 +25,7 @@ ABIVER=  5.1
+ # Change the installation path as needed. This automatically adjusts
+ # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
+ #
+-export PREFIX= /usr/local
++#export PREFIX= /usr/local
+ export MULTILIB= lib
+ ##############################################################################
+ 
+@@ -34,6 +34,7 @@ INSTALL_BIN=   $(DPREFIX)/bin
+ INSTALL_LIB=   $(DPREFIX)/$(MULTILIB)
+ INSTALL_SHARE= $(DPREFIX)/share
+ INSTALL_INC=   $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
++INSTALL_LIBD=  $(DPREFIX)/libdata
+ 
+ INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
+ INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
+@@ -41,8 +42,7 @@ INSTALL_LMODD= $(INSTALL_SHARE)/lua
+ INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
+ INSTALL_CMODD= $(INSTALL_LIB)/lua
+ INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
+-INSTALL_MAN= $(INSTALL_SHARE)/man/man1
+-INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
++INSTALL_PKGCONFIG= $(INSTALL_LIBD)/pkgconfig
+ 
+ INSTALL_TNAME= luajit-$(VERSION)
+ INSTALL_TSYMNAME= luajit
+@@ -63,8 +63,8 @@ INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
+ INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
+ INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
+ 
+-INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
+-  $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD)
++INSTALL_DIRS= $(INSTALL_INC) \
++  $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB)
+ UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \
+   $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD)
+ 
+@@ -121,10 +121,8 @@ install: $(INSTALL_DEP)
+ 	$(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
+ 	cd src && test -f $(FILE_SO) && \
+ 	  $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
+-	  $(LDCONFIG) $(INSTALL_LIB) && \
+ 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
+ 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
+-	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
+ 	cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
+ 	  $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
+ 	  $(RM) $(FILE_PC).tmp
+@@ -143,7 +141,6 @@ uninstall:
+ 	for file in $(FILES_INC); do \
+ 	  $(UNINSTALL) $(INSTALL_INC)/$$file; \
+ 	  done
+-	$(LDCONFIG) $(INSTALL_LIB)
+ 	$(RMDIR) $(UNINSTALL_DIRS) || :
+ 	@echo "==== Successfully uninstalled LuaJIT $(VERSION) from $(PREFIX) ===="
+ 
diff --git a/lang/luajit-openresty/files/patch-etc_luajit.pc b/lang/luajit-openresty/files/patch-etc_luajit.pc
new file mode 100644
index 000000000000..8867dc0b4be8
--- /dev/null
+++ b/lang/luajit-openresty/files/patch-etc_luajit.pc
@@ -0,0 +1,9 @@
+--- etc/luajit.pc.orig	2019-06-26 21:12:49 UTC
++++ etc/luajit.pc
+@@ -21,5 +21,5 @@ URL: http://luajit.org
+ Version: ${version}
+ Requires:
+ Libs: -L${libdir} -l${libname}
+-Libs.private: -Wl,-E -lm -ldl
++Libs.private: -Wl,-E -lm
+ Cflags: -I${includedir}
diff --git a/lang/luajit-openresty/files/patch-src_Makefile b/lang/luajit-openresty/files/patch-src_Makefile
new file mode 100644
index 000000000000..88511431f17a
--- /dev/null
+++ b/lang/luajit-openresty/files/patch-src_Makefile
@@ -0,0 +1,29 @@
+--- src/Makefile.orig	2019-06-26 21:12:49 UTC
++++ src/Makefile
+@@ -24,7 +24,7 @@ NODOTABIVER= 51
+ # removing the '#' in front of them. Make sure you force a full recompile
+ # with "make clean", followed by "make" if you change any options.
+ #
+-DEFAULT_CC = gcc
++DEFAULT_CC = cc
+ #
+ # LuaJIT builds as a native 32 or 64 bit binary by default.
+ CC= $(DEFAULT_CC)
+@@ -36,7 +36,7 @@ CC= $(DEFAULT_CC)
+ # to slow down the C part by not omitting it. Debugging, tracebacks and
+ # unwinding are not affected -- the assembler part has frame unwind
+ # information and GCC emits it where needed (x64) or with -g (see CCDEBUG).
+-CCOPT= -O2 -fomit-frame-pointer
++#CCOPT= -O2 -fomit-frame-pointer
+ # Use this if you want to generate a smaller binary (but it's slower):
+ #CCOPT= -Os -fomit-frame-pointer
+ # Note: it's no longer recommended to use -O3 with GCC 4.x.
+@@ -47,7 +47,7 @@ CCOPT= -O2 -fomit-frame-pointer
+ # x86/x64 only: For GCC 4.2 or higher and if you don't intend to distribute
+ # the binaries to a different machine you could also use: -march=native
+ #
+-CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse
++#CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse
+ CCOPT_x64=
+ CCOPT_arm=
+ CCOPT_arm64=
diff --git a/lang/luajit-openresty/pkg-descr b/lang/luajit-openresty/pkg-descr
new file mode 100644
index 000000000000..dd0f45f9fb48
--- /dev/null
+++ b/lang/luajit-openresty/pkg-descr
@@ -0,0 +1,3 @@
+OpenResty's Branch of LuaJIT 2
+
+WWW: https://github.com/openresty/luajit2
diff --git a/lang/luajit-openresty/pkg-plist b/lang/luajit-openresty/pkg-plist
new file mode 100644
index 000000000000..018c0d90e318
--- /dev/null
+++ b/lang/luajit-openresty/pkg-plist
@@ -0,0 +1,31 @@
+bin/luajit
+bin/luajit-%%VERSION%%
+include/luajit-2.1/lauxlib.h
+include/luajit-2.1/lua.h
+include/luajit-2.1/lua.hpp
+include/luajit-2.1/luaconf.h
+include/luajit-2.1/luajit.h
+include/luajit-2.1/lualib.h
+lib/libluajit-5.1.a
+lib/libluajit-5.1.so
+lib/libluajit-5.1.so.2
+lib/libluajit-5.1.so.%%SOVERSION%%
+libdata/pkgconfig/luajit.pc
+share/luajit-%%VERSION%%/jit/bc.lua
+share/luajit-%%VERSION%%/jit/bcsave.lua
+share/luajit-%%VERSION%%/jit/dis_arm.lua
+share/luajit-%%VERSION%%/jit/dis_arm64.lua
+share/luajit-%%VERSION%%/jit/dis_arm64be.lua
+share/luajit-%%VERSION%%/jit/dis_mips.lua
+share/luajit-%%VERSION%%/jit/dis_mips64.lua
+share/luajit-%%VERSION%%/jit/dis_mips64el.lua
+share/luajit-%%VERSION%%/jit/dis_mipsel.lua
+share/luajit-%%VERSION%%/jit/dis_ppc.lua
+share/luajit-%%VERSION%%/jit/dis_x64.lua
+share/luajit-%%VERSION%%/jit/dis_x86.lua
+share/luajit-%%VERSION%%/jit/dump.lua
+share/luajit-%%VERSION%%/jit/p.lua
+share/luajit-%%VERSION%%/jit/v.lua
+share/luajit-%%VERSION%%/jit/vmdef.lua
+share/luajit-%%VERSION%%/jit/zone.lua
+man/man1/luajit.1.gz
diff --git a/lang/luajit/Makefile b/lang/luajit/Makefile
index b5809101c816..9e911100e3d2 100644
--- a/lang/luajit/Makefile
+++ b/lang/luajit/Makefile
@@ -18,6 +18,8 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 IGNORE_aarch64=		fails to compile: lj_arch.h:55:2: No support for this architecture (yet)
 IGNORE_powerpc64=	fails to compile: lj_arch.h:346:2: No support for PowerPC 64 bit mode
 
+CONFLICTS_INSTALL=	luajit-openresty
+
 WRKSRC=		${WRKDIR}/LuaJIT-${DISTVERSION}
 USES=		gmake
 USE_LDCONFIG=	yes
diff --git a/lang/nickle/Makefile b/lang/nickle/Makefile
index 1331f8caae73..8ef1ecb651bd 100644
--- a/lang/nickle/Makefile
+++ b/lang/nickle/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nickle
-PORTVERSION=	2.84
-PORTREVISION=	1
+PORTVERSION=	2.85
 CATEGORIES=	lang
 MASTER_SITES=	http://www.nickle.org/release/
 
diff --git a/lang/nickle/distinfo b/lang/nickle/distinfo
index 801a73095d58..5f09aebef73d 100644
--- a/lang/nickle/distinfo
+++ b/lang/nickle/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1540859403
-SHA256 (nickle-2.84.tar.gz) = ba785eaa352264d638168bf88abacf2e36aa32b881805bc8181b4f3dc26a74d5
-SIZE (nickle-2.84.tar.gz) = 810473
+TIMESTAMP = 1567939386
+SHA256 (nickle-2.85.tar.gz) = aaa8c96c31e533f238e03b1d91d6a6b5e95bed25a8b89a48d64d67fcfe8c7e89
+SIZE (nickle-2.85.tar.gz) = 810187
diff --git a/lang/nickle/pkg-plist b/lang/nickle/pkg-plist
index 18757c0785a8..3628420a242d 100644
--- a/lang/nickle/pkg-plist
+++ b/lang/nickle/pkg-plist
@@ -54,3 +54,4 @@ man/man1/nickle.1.gz
 %%DATADIR%%/test/round.5c
 %%DATADIR%%/test/scanf.5c
 %%DATADIR%%/test/signal.5c
+%%DATADIR%%/test/string-file.5c
diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index ac162c13c05c..e740a58e3b58 100644
--- a/lang/rust-nightly/Makefile
+++ b/lang/rust-nightly/Makefile
@@ -16,7 +16,7 @@ CONFLICTS_INSTALL=	rust
 # Which source to pull:
 #   https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz
 #   https://static.rust-lang.org/dist/channel-rust-nightly.toml
-NIGHTLY_DATE=			2019-09-03
+NIGHTLY_DATE=			2019-09-14
 NIGHTLY_SUBDIR=			${NIGHTLY_DATE}/
 
 # See WRKSRC/src/stage0.txt for this date
diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo
index 4266b1e95c14..be037633a0b7 100644
--- a/lang/rust-nightly/distinfo
+++ b/lang/rust-nightly/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1567445447
-SHA256 (rust/2019-09-03/rustc-nightly-src.tar.xz) = 9c3b989938b3fa274e50a4ec6bd98bc5429a76f3d5f3d65bf41f2a02917b5c74
-SIZE (rust/2019-09-03/rustc-nightly-src.tar.xz) = 94079212
+TIMESTAMP = 1568397100
+SHA256 (rust/2019-09-14/rustc-nightly-src.tar.xz) = b4f69498cdb345a1d04a2032a259d60b96e70e9702ec94a877705d7b300c2124
+SIZE (rust/2019-09-14/rustc-nightly-src.tar.xz) = 96426328
 SHA256 (rust/2019-08-13/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 62117526710b92d1cc00632a6bcf8c1941f5a7d9c1f7a964d7bca55f09786537
 SIZE (rust/2019-08-13/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 49723228
 SHA256 (rust/2019-08-13/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = c65ef74bebebcf18c9f89c67c16de146c7071e2dffe90effcaf544ff74829d6d
diff --git a/lang/rust-nightly/files/patch-src_bootstrap_native.rs b/lang/rust-nightly/files/patch-src_bootstrap_native.rs
deleted file mode 100644
index ed2de6528b74..000000000000
--- a/lang/rust-nightly/files/patch-src_bootstrap_native.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-Avoid unnecessarily restarting the LLVM build and installing it
-into STAGEDIR during the install phase.
-
-https://github.com/rust-lang/rust/issues/61206
-
---- src/bootstrap/native.rs.orig	2019-05-22 05:39:52 UTC
-+++ src/bootstrap/native.rs
-@@ -92,17 +92,9 @@ impl Step for Llvm {
-             .join(exe("llvm-config", &*builder.config.build));
-         let done_stamp = out_dir.join("llvm-finished-building");
- 
--        if let Some(llvm_commit) = llvm_info.sha() {
-             if done_stamp.exists() {
--                let done_contents = t!(fs::read(&done_stamp));
--
--                // If LLVM was already built previously and the submodule's commit didn't change
--                // from the previous build, then no action is required.
--                if done_contents == llvm_commit.as_bytes() {
--                    return build_llvm_config
--                }
-+                return build_llvm_config
-             }
--        }
- 
-         let _folder = builder.fold_output(|| "llvm");
-         let descriptor = if emscripten { "Emscripten " } else { "" };
-@@ -218,6 +210,10 @@ impl Step for Llvm {
-             }
-         }
- 
-+        if target == "powerpc64-unknown-freebsd" {
-+            cfg.define("CMAKE_EXE_LINKER_FLAGS", "-Wl,-rpath=/usr/local/lib/%CC% -L/usr/local/lib/%CC%");
-+        }
-+
-         // http://llvm.org/docs/HowToCrossCompileLLVM.html
-         if target != builder.config.build && !emscripten {
-             builder.ensure(Llvm {
-@@ -283,9 +279,7 @@ impl Step for Llvm {
- 
-         cfg.build();
- 
--        if let Some(llvm_commit) = llvm_info.sha() {
--            t!(fs::write(&done_stamp, llvm_commit));
--        }
-+        t!(fs::write(&done_stamp, "done building LLVM"));
- 
-         build_llvm_config
-     }
diff --git a/mail/Makefile b/mail/Makefile
index ad087b1e6528..4ee03707d9ed 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -36,6 +36,8 @@
     SUBDIR += bincimap
     SUBDIR += bmf
     SUBDIR += bogofilter
+    SUBDIR += bogofilter-kc
+    SUBDIR += bogofilter-lmdb
     SUBDIR += bogofilter-sqlite
     SUBDIR += bogofilter-tc
     SUBDIR += bsfilter
@@ -96,6 +98,7 @@
     SUBDIR += dma
     SUBDIR += dot-forward
     SUBDIR += dovecot
+    SUBDIR += dovecot-fts-xapian
     SUBDIR += dovecot-pigeonhole
     SUBDIR += dspam
     SUBDIR += ecartis
diff --git a/mail/bogofilter-kc/Makefile b/mail/bogofilter-kc/Makefile
new file mode 100644
index 000000000000..d6c1a0235557
--- /dev/null
+++ b/mail/bogofilter-kc/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+PORTNAME=	bogofilter
+PORTREVISION=	0
+CATEGORIES=	mail
+PKGNAMESUFFIX=	-kc
+
+MAINTAINER=	mandree@FreeBSD.org
+
+LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
+
+CONFLICTS_INSTALL=	bogofilter-[0-9]* bogofilter-lmdb-[0-9]* bogofilter-sqlite-[0-9]* bogofilter-tc-[0-9]*
+
+CONFIGURE_ARGS=	--with-database=kyotocabinet
+BF_CPPFLAGS=	-I${LOCALBASE}/include
+BF_LIBS=
+DESCR=		${PKGDIR}/pkg-descr
+
+MASTERDIR=	${.CURDIR}/../bogofilter
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/bogofilter-lmdb/Makefile b/mail/bogofilter-lmdb/Makefile
new file mode 100644
index 000000000000..1c0068bd3670
--- /dev/null
+++ b/mail/bogofilter-lmdb/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+PORTNAME=	bogofilter
+PORTREVISION=	0
+CATEGORIES=	mail
+PKGNAMESUFFIX=	-lmdb
+
+MAINTAINER=	mandree@FreeBSD.org
+
+LIB_DEPENDS=	liblmdb.so:databases/lmdb
+
+CONFLICTS_INSTALL=	bogofilter-[0-9]* bogofilter-kc-[0-9]* bogofilter-sqlite-[0-9]* *bogofilter-tc-[0-9]*
+
+CONFIGURE_ARGS=	--with-database=lmdb
+BF_CPPFLAGS=	-I${LOCALBASE}/include
+BF_LIBS=
+DESCR=		${PKGDIR}/pkg-descr
+
+MASTERDIR=	${.CURDIR}/../bogofilter
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/bogofilter-sqlite/Makefile b/mail/bogofilter-sqlite/Makefile
index 963813e95b3b..07f2a58c2b1f 100644
--- a/mail/bogofilter-sqlite/Makefile
+++ b/mail/bogofilter-sqlite/Makefile
@@ -2,14 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	bogofilter
-PORTREVISION=	4
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-sqlite
 
 MAINTAINER=	mandree@FreeBSD.org
 
 USES=		sqlite
-CONFLICTS_INSTALL=	bogofilter-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tc-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
+CONFLICTS_INSTALL=	bogofilter-[0-9]* bogofilter-lmdb-[0-9]* bogofilter-kc-[0-9]* bogofilter-tc-[0-9]*
 
 CONFIGURE_ARGS=	--with-database=sqlite
 BF_CPPFLAGS=	-I${LOCALBASE}/include
diff --git a/mail/bogofilter-tc/Makefile b/mail/bogofilter-tc/Makefile
index f1a672b5b867..9e03b3e6eb9b 100644
--- a/mail/bogofilter-tc/Makefile
+++ b/mail/bogofilter-tc/Makefile
@@ -2,16 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	bogofilter
-PORTREVISION=	3
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tc
 
+DEPRECATED=	TokyoCabinet is being phased out in favor of KyotoCabinet.
+EXPIRATION_DATE=2020-12-31
+
 MAINTAINER=	mandree@FreeBSD.org
 # Blanket approval for changes by Zach Thompson (address above)
 
 LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
-CONFLICTS_INSTALL=	bogofilter-[0-9]* [a-z][a-z]-bogofilter-[1-9]* bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]*
+CONFLICTS_INSTALL=	bogofilter-[0-9]* bogofilter-sqlite-[0-9]* bogofilter-kc-[0-9]* bogofilter-lmdb-[0-9]*
 
 CONFIGURE_ARGS=	--with-database=tokyocabinet
 BF_CPPFLAGS=	-I${LOCALBASE}/include
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index a244c05ba566..a07141515ce1 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	bogofilter
-PORTVERSION=	1.2.4
-PORTREVISION?=	8
+DISTVERSION=	1.2.5.rc1
+PORTREVISION?=	0
 CATEGORIES?=	mail
-MASTER_SITES=	SF/bogofilter/bogofilter-current/bogofilter-${PORTVERSION}
+MASTER_SITES=	SF/bogofilter/bogofilter-current/bogofilter-1.2.5/
 
 MAINTAINER?=	mandree@FreeBSD.org
 COMMENT=	Fast, teachable, learning spam detector
@@ -22,9 +22,13 @@ OPTIONS_DEFAULT=	GSL UNICODE
 GSL_DESC=		Link with system-wide GSL dynamically (recommended)
 UNICODE_DESC=		Normalize tokens to Unicode (UTF-8) (recommended)
 
-CONFLICTS_INSTALL?=	bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tc-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
+CONFLICTS_INSTALL?=	bogofilter-sqlite-[0-9]* bogofilter-tc-[0-9]* bogofilter-lmdb-[0-9]* \
+			bogofilter-kc-[0-9]*
 
-USES+=		cpe perl5 shebangfix tar:bzip2
+# XXX FIXME: autoreconf:build should not be required,
+# but something hoses timestamps on src/tests/Makefile.am
+# but not src/tests/Makefile.in.
+USES+=		autoreconf:build cpe perl5 shebangfix tar:xz
 SHEBANG_FILES=	contrib/randomtrain.sh contrib/scramble.sh \
 		src/tests/unsort.pl contrib/*.pl
 USE_PERL5=	run
@@ -59,16 +63,16 @@ post-patch:
 		-e 's/ENVIRON_TESTS = t.abort/ENVIRON_TESTS =/' \
 		${WRKSRC}/src/tests/Makefile.am
 
-# XXX: disable self-tests until issue with automake-1.13 is sorted out
-# post-build::
-# 	cd ${WRKSRC}/src && make check SHELL=${SH}
+post-build:
+	cd ${WRKSRC}/src && ${SETENV} SHELL=${SH} ${MAKE_CMD} ${TEST_TARGET} ${_MAKE_JOBS} SHELL=${SH} \
+		|| { r=$$? ; head -n30000 ${WRKSRC}/src/tests/test-suite.log ; exit $$r ; }
 
-post-install::
+post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib
 .for i in html programmer xml
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
 .endfor
-.for i in AUTHORS COPYING INSTALL NEWS README README.svn \
+.for i in AUTHORS COPYING INSTALL NEWS README README.git \
 	doc/README.validation TODO GETTING.STARTED \
 	RELEASE.NOTES doc/README.db doc/README.sqlite \
 	doc/integrating-with-postfix doc/integrating-with-qmail \
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index edf94524a2e7..18176c8f62d7 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -1,2 +1,3 @@
-SHA256 (bogofilter-1.2.4.tar.bz2) = e10287a58d135feaea26880ce7d4b9fa2841fb114a2154bf7da8da98aab0a6b4
-SIZE (bogofilter-1.2.4.tar.bz2) = 887848
+TIMESTAMP = 1567975270
+SHA256 (bogofilter-1.2.5.rc1.tar.xz) = 62a9a00ca575b1253bafd5ae308049cbf388816e5ef0a9a18ee8167cf6c42680
+SIZE (bogofilter-1.2.5.rc1.tar.xz) = 802008
diff --git a/mail/crm114/Makefile b/mail/crm114/Makefile
index 5e4e5787a17c..e68b744d8fca 100644
--- a/mail/crm114/Makefile
+++ b/mail/crm114/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	crm114
 PORTVERSION=	20100106
-PORTREVISION=	2
+PORTREVISION=	3
 # WARNING change versionname in CRM114RELEASENAME too.
 # portlint didn't like this variable at this place.
 # So I have to put it down in this file.
@@ -14,7 +14,7 @@ MASTER_SITES=	http://crm114.sourceforge.net/tarballs/
 # .css extention.
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${CRM114RELEASENAME}.src
 
-MAINTAINER=	chalpin@cs.wisc.edu
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Markov based SpamFilter
 
 LICENSE=	GPLv2
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libtre.so:textproc/libtre
 
 CRM114RELEASENAME=BlameMichelson
 
-USES=		gettext iconv
+USES=	gettext-runtime
 USE_CSTD=gnu89
 
 OPTIONS_DEFINE=	NORMALIZEMIME DOCS EXAMPLES
@@ -35,7 +35,7 @@ MAKE_ARGS=	CC="${CC}" prefix="${STAGEDIR}${PREFIX}" \
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB} -lintl
+LIBS+=		-L${LOCALBASE}/lib -lintl
 
 CFLAGS+=	-DVERSION='\"${PORTVERSION}-${CRM114RELEASENAME}\"'
 CFLAGS+=	-DNO_LOGL
@@ -57,6 +57,12 @@ post-patch:
 
 # Peter Jeremy recommended the use of b64decode and md5 20040302
 post-install:
+	${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/bin/crm \
+		${STAGEDIR}${PREFIX}/bin/cssdiff \
+		${STAGEDIR}${PREFIX}/bin/cssutil \
+		${STAGEDIR}${PREFIX}/bin/osbf-util \
+		${STAGEDIR}${PREFIX}/bin/cssmerge
 	@${REINPLACE_CMD} -Ee 's|^(.*/openssl base64 -d/)|#\1|' \
 		-e 's|/mewdecode/|/b64decode -pr/|' ${WRKSRC}/mailfilter.cf
 	@${REINPLACE_CMD} -e 's|/md5sum/|/md5 -r/|' \
diff --git a/mail/dovecot-fts-xapian/Makefile b/mail/dovecot-fts-xapian/Makefile
new file mode 100644
index 000000000000..cc44a72adca8
--- /dev/null
+++ b/mail/dovecot-fts-xapian/Makefile
@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+PORTNAME=	fts-xapian
+PORTVERSION=	1.2.1
+PORTREVISION=	1
+CATEGORIES=	mail
+PKGNAMEPREFIX=	dovecot-
+
+MAINTAINER=	bapt@FreeBSD.org
+COMMENT=	Dovecot FTS plugin based on Xapian
+
+LICENSE=	LGPL21
+
+LIB_DEPENDS=	libxapian.so:databases/xapian-core \
+		libicuuc.so:devel/icu
+BUILD_DEPENDS=	dovecot>=2.3.7:mail/dovecot
+RUN_DEPENDS=	dovecot>=2.3.7:mail/dovecot
+
+USES=		autoreconf libtool pkgconfig
+
+USE_LDCONFIG=	yes
+
+USE_GITHUB=yes
+GH_ACCOUNT=	grosjo
+GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
+
+GNU_CONFIGURE=	yes
+
+PLIST_FILES=	lib/dovecot/lib21_fts_xapian_plugin.a \
+		lib/dovecot/lib21_fts_xapian_plugin.so
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/lib21_fts_xapian_plugin.so
+
+.include <bsd.port.mk>
diff --git a/mail/dovecot-fts-xapian/distinfo b/mail/dovecot-fts-xapian/distinfo
new file mode 100644
index 000000000000..8aed9f022c74
--- /dev/null
+++ b/mail/dovecot-fts-xapian/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1568284001
+SHA256 (grosjo-fts-xapian-1.2.1-fts-xapian-1.2.1_GH0.tar.gz) = 9c8dbaa3ddf5f489356a3ec40af012c02aaa6af7ae513ade5b208d3d19771277
+SIZE (grosjo-fts-xapian-1.2.1-fts-xapian-1.2.1_GH0.tar.gz) = 27267
diff --git a/mail/dovecot-fts-xapian/files/patch-reduce-verbosity b/mail/dovecot-fts-xapian/files/patch-reduce-verbosity
new file mode 100644
index 000000000000..b3dcf493a18d
--- /dev/null
+++ b/mail/dovecot-fts-xapian/files/patch-reduce-verbosity
@@ -0,0 +1,74 @@
+diff --git src/fts-backend-xapian-functions.cpp src/fts-backend-xapian-functions.cpp
+index e7f8324..ed0ab1a 100644
+--- src/fts-backend-xapian-functions.cpp
++++ src/fts-backend-xapian-functions.cpp
+@@ -35,7 +35,6 @@ class XQuerySet
+ 	bool item_neg; // for the term
+ 	long qsize;
+ 	long limit;
+-	bool display;
+ 
+ 	XQuerySet()
+ 	{
+@@ -45,7 +44,6 @@ class XQuerySet
+ 		header=NULL;
+                 text=NULL;
+ 		global_neg=false;
+-		display=false;
+ 	}
+ 
+ 	XQuerySet(bool is_and, bool is_neg, long l)
+@@ -57,7 +55,6 @@ class XQuerySet
+ 		text=NULL;
+ 		global_and=is_and;
+ 		global_neg=is_neg;
+-		display=true;
+ 	}
+ 
+ 	~XQuerySet()
+@@ -293,7 +290,7 @@ class XQuerySet
+ 
+ 		char *s = i_strdup(get_string().c_str());
+ 	
+-		if(display) { i_info("FTS Xapian: Query= %s",s); }
++		i_debug("FTS Xapian: Query= %s",s);
+ 
+ 		qp->set_database(*db);
+ 	
+@@ -452,7 +449,7 @@ static void fts_backend_xapian_oldbox(struct xapian_fts_backend *backend)
+ 		}
+         	/* End Performance calculator*/
+ 	
+-                i_info("FTS Xapian: Done indexing '%s' (%ld msgs in %ld ms, rate: %.1f)",backend->oldbox,backend->perf_nb,dt,r);
++                i_debug("FTS Xapian: Done indexing '%s' (%ld msgs in %ld ms, rate: %.1f)",backend->oldbox,backend->perf_nb,dt,r);
+                 i_free(backend->oldbox);
+                 backend->oldbox=NULL;
+         }
+diff --git src/fts-backend-xapian.cpp src/fts-backend-xapian.cpp
+index 5ff83d0..d55852c 100644
+--- src/fts-backend-xapian.cpp
++++ src/fts-backend-xapian.cpp
+@@ -442,12 +442,12 @@ static int fts_backend_xapian_lookup(struct fts_backend *_backend, struct mailbo
+ 
+ 	if((flags & FTS_LOOKUP_FLAG_AND_ARGS) != 0)
+ 	{
+-		i_info("FTS Xapian: FLAG=AND");
++		i_debug("FTS Xapian: FLAG=AND");
+ 		is_and=true;
+ 	}
+ 	else
+ 	{
+-		i_info("FTS Xapian: FLAG=OR");
++		i_debug("FTS Xapian: FLAG=OR");
+ 	}
+ 
+ 	XQuerySet * qs = new XQuerySet(is_and,false,backend->partial);
+@@ -480,7 +480,7 @@ static int fts_backend_xapian_lookup(struct fts_backend *_backend, struct mailbo
+ 	/* Performance calc */
+         gettimeofday(&tp, NULL);
+         dt = tp.tv_sec * 1000 + tp.tv_usec / 1000 - dt;
+-	i_info("FTS Xapian: %ld results in %ld ms",n,dt);	
++	i_debug("FTS Xapian: %ld results in %ld ms",n,dt);
+ 
+ 	return 0;
+ }
diff --git a/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp b/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp
new file mode 100644
index 000000000000..de42b3940487
--- /dev/null
+++ b/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp
@@ -0,0 +1,13 @@
+--- src/fts-backend-xapian.cpp.orig	2019-08-18 16:36:45 UTC
++++ src/fts-backend-xapian.cpp
+@@ -115,9 +115,7 @@ static int fts_backend_xapian_init(struct fts_backend 
+     	}
+ 
+ 	const char * path = mailbox_list_get_root_forced(_backend->ns->list, MAILBOX_LIST_PATH_TYPE_INDEX);
+-	long l=strlen(path)+strlen(XAPIAN_FILE_PREFIX)+2;
+-	backend->path = (char *)i_malloc(l*sizeof(char));
+-	snprintf(backend->path,l,"%s/%s",path,XAPIAN_FILE_PREFIX);
++	backend->path = i_strconcat(path, "/" XAPIAN_FILE_PREFIX, NULL);
+ 
+ 	struct stat sb;
+ 	if(!( (stat(backend->path, &sb)==0) && S_ISDIR(sb.st_mode)))
diff --git a/mail/dovecot-fts-xapian/pkg-descr b/mail/dovecot-fts-xapian/pkg-descr
new file mode 100644
index 000000000000..c10d90f14bd5
--- /dev/null
+++ b/mail/dovecot-fts-xapian/pkg-descr
@@ -0,0 +1,8 @@
+This project intends to provide a straightforward and simple way to configure
+FTS plugin for Dovecot, leveraging the efforts by the Xapian.org team.
+
+This effort came after Dovecot team decided to deprecate "fts_squat" included in
+the dovecot core, and due to the complexity of the Solr plugin capabilitles,
+un-needed for most users.
+
+WWW: https://github.com/grosjo/fts-xapian
diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile
index 129ad28cfcf5..a42d52371d11 100644
--- a/mail/libspf2/Makefile
+++ b/mail/libspf2/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.libspf2.org/spf/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Sender Rewriting Scheme 2 C Implementation
+COMMENT=	Sender Policy Framework 2 C Implementation
 
 LICENSE=	BSD2CLAUSE LGPL21 LGPL3
 LICENSE_COMB=	dual
diff --git a/mail/libsrs2/Makefile b/mail/libsrs2/Makefile
index 4ff8d48f789a..d10df17c12f9 100644
--- a/mail/libsrs2/Makefile
+++ b/mail/libsrs2/Makefile
@@ -5,11 +5,16 @@ PORTNAME=	libsrs2
 PORTVERSION=	1.0.18
 PORTREVISION=	4
 CATEGORIES=	mail
-MASTER_SITES=	http://www.libsrs2.org/srs/
+MASTER_SITES=	https://www.libsrs2.org/srs/
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Sender Rewriting Scheme 2 C Implementation
 
+LICENSE=	BSD3CLAUSE GPLv2
+LICENSE_COMB=	dual
+LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE.BSD
+LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE.GPL-2
+
 CONFLICTS=	p5-Mail-SRS*
 
 USES=		libtool
diff --git a/mail/libsrs2/pkg-descr b/mail/libsrs2/pkg-descr
index 61592b55f453..a14711211aa2 100644
--- a/mail/libsrs2/pkg-descr
+++ b/mail/libsrs2/pkg-descr
@@ -1,4 +1,4 @@
 libsrs2 is the next generation SRS library from the original designer of SRS.
 It implements the Sender Rewriting Scheme, a part of the SPF/SRS protocol pair.
 
-WWW: http://www.libsrs2.org/
+WWW: https://www.libsrs2.org/
diff --git a/mail/p5-Sisimai/Makefile b/mail/p5-Sisimai/Makefile
index dd0a03422e97..f2ef5c30d3d5 100644
--- a/mail/p5-Sisimai/Makefile
+++ b/mail/p5-Sisimai/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Sisimai
-PORTVERSION=	4.25.2
+PORTVERSION=	4.25.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
diff --git a/mail/p5-Sisimai/distinfo b/mail/p5-Sisimai/distinfo
index 2f2a394a52e1..b62aad78274b 100644
--- a/mail/p5-Sisimai/distinfo
+++ b/mail/p5-Sisimai/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564837264
-SHA256 (Sisimai-v4.25.2.tar.gz) = 308b52fa07e153b2940df45d0d2a8a09b8e0660698943dfca5c0e108e64c9649
-SIZE (Sisimai-v4.25.2.tar.gz) = 1202287
+TIMESTAMP = 1567842516
+SHA256 (Sisimai-v4.25.3.tar.gz) = 102936c7f345b0266fbd4408af981c17a3bd988768e59fb99da03119cb27b8ce
+SIZE (Sisimai-v4.25.3.tar.gz) = 1204149
diff --git a/mail/sieve-connect/Makefile b/mail/sieve-connect/Makefile
index cf7474668d9c..63c2a0f8fcaf 100644
--- a/mail/sieve-connect/Makefile
+++ b/mail/sieve-connect/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	sieve-connect
-DISTVERSION=	0.89
-PORTREVISION=	1
+DISTVERSION=	0.90
 CATEGORIES=	mail
 MASTER_SITES=	http://people.spodhuis.org/phil.pennock/software/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Command-line client for the MANAGESIEVE protocol
 
 LICENSE=	BSD3CLAUSE
diff --git a/mail/sieve-connect/distinfo b/mail/sieve-connect/distinfo
index f4c5a6e2ba90..e989a4b4a0d6 100644
--- a/mail/sieve-connect/distinfo
+++ b/mail/sieve-connect/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531954128
-SHA256 (sieve-connect-0.89.tar.bz2) = 6d8962516458a27d4d904cfb370db01ca7e495e61c966f236ba6b65f5b4caa5f
-SIZE (sieve-connect-0.89.tar.bz2) = 45683
+TIMESTAMP = 1568022315
+SHA256 (sieve-connect-0.90.tar.bz2) = 4a188ba50009170b5a7a51cbd0dbaab972eb1e42a3ad7c2d8d22fb63f2f77603
+SIZE (sieve-connect-0.90.tar.bz2) = 46481
diff --git a/mail/sieve-connect/files/patch-sieve-connect.pl b/mail/sieve-connect/files/patch-sieve-connect.pl
deleted file mode 100644
index 26c66da83ed9..000000000000
--- a/mail/sieve-connect/files/patch-sieve-connect.pl
+++ /dev/null
@@ -1,29 +0,0 @@
---- sieve-connect.pl.orig	2019-05-23 07:31:11 UTC
-+++ sieve-connect.pl
-@@ -927,7 +927,7 @@ if (defined $realm) {
- 		if (/^"(.*)"\r?\n?$/) {
- 			$challenge = $1;
- 		} else {
--			unless (/^{(\d+)\+?}\r?$/m) {
-+			unless (/^\{(\d+)\+?}\r?$/m) {
- 				sfinish $sock, "*";
- 				closedie($sock, "Failure to parse server SASL response.\n");
- 			}
-@@ -1510,7 +1510,7 @@ sub sieve_download
- 		warn qq{Empty script "$remotefn"?  Not saved.\n};
- 		return;
- 	}
--	unless (/^{(\d+)\+?}\r?$/m) {
-+	unless (/^\{(\d+)\+?}\r?$/m) {
- 		die "QUIT:Failed to parse server response to GETSCRIPT";
- 	}
- 	my $contentdata = $_;
-@@ -1526,7 +1526,7 @@ sub sieve_download
- 			or die "write-open($localfn) failed: $!\n";
- 		$oldouthandle = select $fh;
- 	}
--	$contentdata =~ s/^{\d+\+?}\r?\n?//m;
-+	$contentdata =~ s/^\{\d+\+?}\r?\n?//m;
- 	print $contentdata;
- 	select $oldouthandle if defined $oldouthandle;
- 	if (defined $fh) {
diff --git a/mail/sieve-connect/pkg-descr b/mail/sieve-connect/pkg-descr
index 4fb636f6a4f1..53994abd8998 100644
--- a/mail/sieve-connect/pkg-descr
+++ b/mail/sieve-connect/pkg-descr
@@ -17,4 +17,4 @@ sieve-connect is designed to be both a tool which can be invoked from scripts
 and also a decent interactive client. It should also be a drop-in replacement
 for "sieveshell", as supplied with Cyrus IMAP.
 
-WWW: https://people.spodhuis.org/phil.pennock/software/
+WWW: https://github.com/philpennock/sieve-connect
diff --git a/mail/simscan/Makefile b/mail/simscan/Makefile
index c33f6ece3ce0..bccdd3f584ed 100644
--- a/mail/simscan/Makefile
+++ b/mail/simscan/Makefile
@@ -91,12 +91,6 @@ CONFIGURE_ARGS+=--enable-qmail-queue=${QMAIL_QUEUE}
 
 PORTDOCS=	AUTHORS ChangeLog README TODO
 
-if ! ${TEST} -f ${QMAIL_QUEUE}; then \
-	${ECHO_MSG} "Unable to find qmail-queue binary trying '${QMAIL_QUEUE}'.";  \
-	${ECHO_MSG} "Please set QMAIL_PREFIX to your qmail installation directory !"; \
-	exit 1; \
-fi
-
 post-patch:
 	@${REINPLACE_CMD} -E 's,($f/daily.cvd"),\1 || test -d "$$f/daily.inc",' \
 		${WRKSRC}/configure
diff --git a/mail/smtprelay/Makefile b/mail/smtprelay/Makefile
index 2b6c93f55494..18e0979611cb 100644
--- a/mail/smtprelay/Makefile
+++ b/mail/smtprelay/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	smtprelay
 DISTVERSIONPREFIX=v
-DISTVERSION=	1.2.0
+DISTVERSION=	1.3.0
 CATEGORIES=	mail
 MASTER_SITES=	https://code.bluelife.at/decke/smtprelay/archive/ \
 		LOCAL/decke/smtprelay/
@@ -15,15 +15,13 @@ COMMENT=	Simple Go SMTP relay/proxy server
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go
+USES=		go:modules
 USE_RC_SUBR=	smtprelay
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	chrj:smtpd:v0.1.2:smtpd/vendor/github.com/chrj/smtpd \
 		vharitonsky:iniflags:a33cd0b5f3de:iniflags/vendor/github.com/vharitonsky/iniflags \
-		golang:crypto:505ab145d0a9:golang/vendor/golang.org/x/crypto
-
-MAKE_ENV+=	GOFLAGS=-mod=vendor
+		golang:crypto:9756ffdc2472:golang/vendor/golang.org/x/crypto
 
 PLIST_FILES=	bin/${PORTNAME} \
 		"@sample ${ETCDIR}/smtprelay.ini.sample"
diff --git a/mail/smtprelay/distinfo b/mail/smtprelay/distinfo
index e641783f398e..185ef074c6bb 100644
--- a/mail/smtprelay/distinfo
+++ b/mail/smtprelay/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1546979068
-SHA256 (smtprelay/v1.2.0.tar.gz) = 924864ecaeeebb52895d1b16a25a9ad7ac407b9000c2c83ec1763d106cbf145e
-SIZE (smtprelay/v1.2.0.tar.gz) = 8960
+TIMESTAMP = 1567882351
+SHA256 (smtprelay/v1.3.0.tar.gz) = b5eca3889beb56b0c4632905ddde5df0ca9dd57249a3f7eabe531d5944e62f4c
+SIZE (smtprelay/v1.3.0.tar.gz) = 9650
 SHA256 (smtprelay/chrj-smtpd-v0.1.2_GH0.tar.gz) = f290b7233bf781222e40184f32bfa4550424f96a9d69cbb75241d744080eb8f7
 SIZE (smtprelay/chrj-smtpd-v0.1.2_GH0.tar.gz) = 13676
 SHA256 (smtprelay/vharitonsky-iniflags-a33cd0b5f3de_GH0.tar.gz) = d60f3292be138071158e47e794c2ba93ea9dfc866c44e6472833e2d8566024aa
 SIZE (smtprelay/vharitonsky-iniflags-a33cd0b5f3de_GH0.tar.gz) = 7498
-SHA256 (smtprelay/golang-crypto-505ab145d0a9_GH0.tar.gz) = 33a4ff7a15a69640a7ce2c65ba94680643554b744c69f3ed3623bd9557c985e7
-SIZE (smtprelay/golang-crypto-505ab145d0a9_GH0.tar.gz) = 1644681
+SHA256 (smtprelay/golang-crypto-9756ffdc2472_GH0.tar.gz) = 6af409930c3a9313b33f9b8da1a2c24da8ffa07c4fcd55356a77a2f09a0d6326
+SIZE (smtprelay/golang-crypto-9756ffdc2472_GH0.tar.gz) = 1693048
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 0bd2f861213d..01ed1701cde5 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	68.1.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source
 DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 84baffda75f9..60c3a909b64c 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567687294
-SHA256 (thunderbird-68.1.0.source.tar.xz) = a7880622859a8560b65c725f8f0e8c99424cc9efdd2dffeb606b29decda7fd40
-SIZE (thunderbird-68.1.0.source.tar.xz) = 333358404
+TIMESTAMP = 1568072652
+SHA256 (thunderbird-68.1.0.source.tar.xz) = de0e5c7d1d5576f451e386e4779f155b7af97621a4e22caac0c6dee3c9d76eef
+SIZE (thunderbird-68.1.0.source.tar.xz) = 333332920
diff --git a/mail/thunderbird/files/patch-cubeb-dlopen b/mail/thunderbird/files/patch-cubeb-dlopen
new file mode 100644
index 000000000000..9314ede79256
--- /dev/null
+++ b/mail/thunderbird/files/patch-cubeb-dlopen
@@ -0,0 +1,793 @@
+https://github.com/kinetiknz/cubeb/pull/539
+
+diff --git media/libcubeb/gtest/moz.build media/libcubeb/gtest/moz.build
+index 1ff0c02545251..ca364d1ef7845 100644
+--- media/libcubeb/gtest/moz.build
++++ media/libcubeb/gtest/moz.build
+@@ -67,13 +67,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
+       '-framework CoreFoundation',
+       '-framework AudioToolbox',
+     ]
+-elif CONFIG['OS_TARGET'] == 'OpenBSD':
+-    OS_LIBS += [
+-        'sndio',
+-    ]
+-else:
+-    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+-    OS_LIBS += CONFIG['MOZ_PULSEAUDIO_LIBS']
+ 
+ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
+     CXXFLAGS += ['-Wno-error=shadow']
+diff --git media/libcubeb/src/cubeb.c media/libcubeb/src/cubeb.c
+index 98a735f..db294b3 100644
+--- media/libcubeb/src/cubeb.c
++++ media/libcubeb/src/cubeb.c
+@@ -180,6 +180,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
+ #if defined(USE_JACK)
+     jack_init,
+ #endif
++#if defined(USE_SNDIO)
++    sndio_init,
++#endif
+ #if defined(USE_ALSA)
+     alsa_init,
+ #endif
+@@ -192,9 +195,6 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
+ #if defined(USE_WINMM)
+     winmm_init,
+ #endif
+-#if defined(USE_SNDIO)
+-    sndio_init,
+-#endif
+ #if defined(USE_OPENSL)
+     opensl_init,
+ #endif
+diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c
+index bfd4d8f..a29eed0 100644
+--- media/libcubeb/src/cubeb_alsa.c
++++ media/libcubeb/src/cubeb_alsa.c
+@@ -14,10 +14,58 @@
+ #include <limits.h>
+ #include <poll.h>
+ #include <unistd.h>
++#include <dlfcn.h>
+ #include <alsa/asoundlib.h>
+ #include "cubeb/cubeb.h"
+ #include "cubeb-internal.h"
+ 
++#ifdef DISABLE_LIBASOUND_DLOPEN
++#define WRAP(x) x
++#else
++#define WRAP(x) cubeb_##x
++#define LIBASOUND_API_VISIT(X)                   \
++  X(snd_config)                                  \
++  X(snd_config_add)                              \
++  X(snd_config_copy)                             \
++  X(snd_config_delete)                           \
++  X(snd_config_get_id)                           \
++  X(snd_config_get_string)                       \
++  X(snd_config_imake_integer)                    \
++  X(snd_config_search)                           \
++  X(snd_config_search_definition)                \
++  X(snd_lib_error_set_handler)                   \
++  X(snd_pcm_avail_update)                        \
++  X(snd_pcm_close)                               \
++  X(snd_pcm_delay)                               \
++  X(snd_pcm_drain)                               \
++  X(snd_pcm_frames_to_bytes)                     \
++  X(snd_pcm_get_params)                          \
++  X(snd_pcm_hw_params_any)                       \
++  X(snd_pcm_hw_params_get_channels_max)          \
++  X(snd_pcm_hw_params_get_rate)                  \
++  X(snd_pcm_hw_params_set_rate_near)             \
++  X(snd_pcm_hw_params_sizeof)                    \
++  X(snd_pcm_nonblock)                            \
++  X(snd_pcm_open)                                \
++  X(snd_pcm_open_lconf)                          \
++  X(snd_pcm_pause)                               \
++  X(snd_pcm_poll_descriptors)                    \
++  X(snd_pcm_poll_descriptors_count)              \
++  X(snd_pcm_poll_descriptors_revents)            \
++  X(snd_pcm_readi)                               \
++  X(snd_pcm_recover)                             \
++  X(snd_pcm_set_params)                          \
++  X(snd_pcm_start)                               \
++  X(snd_pcm_state)                               \
++  X(snd_pcm_writei)                              \
++
++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x;
++LIBASOUND_API_VISIT(MAKE_TYPEDEF);
++#undef MAKE_TYPEDEF
++/* snd_pcm_hw_params_alloca is actually a macro */
++#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof
++#endif
++
+ #define CUBEB_STREAM_MAX 16
+ #define CUBEB_WATCHDOG_MS 10000
+ 
+@@ -36,6 +84,7 @@ static struct cubeb_ops const alsa_ops;
+ 
+ struct cubeb {
+   struct cubeb_ops const * ops;
++  void * libasound;
+ 
+   pthread_t thread;
+ 
+@@ -245,8 +294,8 @@ set_timeout(struct timeval * timeout, unsigned int ms)
+ static void
+ stream_buffer_decrement(cubeb_stream * stm, long count)
+ {
+-  char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count);
+-  memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count));
++  char * bufremains = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count);
++  memmove(stm->buffer, bufremains, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes - count));
+   stm->bufframes -= count;
+ }
+ 
+@@ -278,9 +327,9 @@ alsa_process_stream(cubeb_stream * stm)
+   /* Call _poll_descriptors_revents() even if we don't use it
+      to let underlying plugins clear null events.  Otherwise poll()
+      may wake up again and again, producing unnecessary CPU usage. */
+-  snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents);
++  WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents);
+ 
+-  avail = snd_pcm_avail_update(stm->pcm);
++  avail = WRAP(snd_pcm_avail_update)(stm->pcm);
+ 
+   /* Got null event? Bail and wait for another wakeup. */
+   if (avail == 0) {
+@@ -303,7 +352,7 @@ alsa_process_stream(cubeb_stream * stm)
+       // TODO: should it be marked as DRAINING?
+     }
+ 
+-    got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail);
++    got = WRAP(snd_pcm_readi)(stm->pcm, stm->buffer+stm->bufframes, avail);
+ 
+     if (got < 0) {
+       avail = got; // the error handler below will recover us
+@@ -347,7 +396,7 @@ alsa_process_stream(cubeb_stream * stm)
+       (!stm->other_stream || stm->other_stream->bufframes > 0)) {
+     long got = avail - stm->bufframes;
+     void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL;
+-    char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);
++    char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
+ 
+     /* Correct read size to the other stream available frames */
+     if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) {
+@@ -374,8 +423,8 @@ alsa_process_stream(cubeb_stream * stm)
+     long drain_frames = avail - stm->bufframes;
+     double drain_time = (double) drain_frames / stm->params.rate;
+ 
+-    char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);
+-    memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames));
++    char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
++    memset(buftail, 0, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, drain_frames));
+     stm->bufframes = avail;
+ 
+     /* Mark as draining, unless we're waiting for capture */
+@@ -402,7 +451,7 @@ alsa_process_stream(cubeb_stream * stm)
+       }
+     }
+ 
+-    wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail);
++    wrote = WRAP(snd_pcm_writei)(stm->pcm, stm->buffer, avail);
+     if (wrote < 0) {
+       avail = wrote; // the error handler below will recover us
+     } else {
+@@ -415,13 +464,13 @@ alsa_process_stream(cubeb_stream * stm)
+ 
+   /* Got some error? Let's try to recover the stream. */
+   if (avail < 0) {
+-    avail = snd_pcm_recover(stm->pcm, avail, 0);
++    avail = WRAP(snd_pcm_recover)(stm->pcm, avail, 0);
+ 
+     /* Capture pcm must be started after initial setup/recover */
+     if (avail >= 0 &&
+         stm->stream_type == SND_PCM_STREAM_CAPTURE &&
+-        snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {
+-      avail = snd_pcm_start(stm->pcm);
++        WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) {
++      avail = WRAP(snd_pcm_start)(stm->pcm);
+     }
+   }
+ 
+@@ -537,26 +586,26 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm)
+ 
+   slave_def = NULL;
+ 
+-  r = snd_config_search(root_pcm, "slave", &slave_pcm);
++  r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm);
+   if (r < 0) {
+     return NULL;
+   }
+ 
+-  r = snd_config_get_string(slave_pcm, &string);
++  r = WRAP(snd_config_get_string)(slave_pcm, &string);
+   if (r >= 0) {
+-    r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def);
++    r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def);
+     if (r < 0) {
+       return NULL;
+     }
+   }
+ 
+   do {
+-    r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
++    r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string);
++    r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -565,7 +614,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm)
+     if (r < 0 || r > (int) sizeof(node_name)) {
+       break;
+     }
+-    r = snd_config_search(lconf, node_name, &pcm);
++    r = WRAP(snd_config_search)(lconf, node_name, &pcm);
+     if (r < 0) {
+       break;
+     }
+@@ -574,7 +623,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm)
+   } while (0);
+ 
+   if (slave_def) {
+-    snd_config_delete(slave_def);
++    WRAP(snd_config_delete)(slave_def);
+   }
+ 
+   return NULL;
+@@ -597,22 +646,22 @@ init_local_config_with_workaround(char const * pcm_name)
+ 
+   lconf = NULL;
+ 
+-  if (snd_config == NULL) {
++  if (*WRAP(snd_config) == NULL) {
+     return NULL;
+   }
+ 
+-  r = snd_config_copy(&lconf, snd_config);
++  r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config));
+   if (r < 0) {
+     return NULL;
+   }
+ 
+   do {
+-    r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node);
++    r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_id(pcm_node, &string);
++    r = WRAP(snd_config_get_id)(pcm_node, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -621,7 +670,7 @@ init_local_config_with_workaround(char const * pcm_name)
+     if (r < 0 || r > (int) sizeof(node_name)) {
+       break;
+     }
+-    r = snd_config_search(lconf, node_name, &pcm_node);
++    r = WRAP(snd_config_search)(lconf, node_name, &pcm_node);
+     if (r < 0) {
+       break;
+     }
+@@ -632,12 +681,12 @@ init_local_config_with_workaround(char const * pcm_name)
+     }
+ 
+     /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
+-    r = snd_config_search(pcm_node, "type", &node);
++    r = WRAP(snd_config_search)(pcm_node, "type", &node);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_string(node, &string);
++    r = WRAP(snd_config_get_string)(node, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -648,18 +697,18 @@ init_local_config_with_workaround(char const * pcm_name)
+ 
+     /* Don't clobber an explicit existing handle_underrun value, set it only
+        if it doesn't already exist. */
+-    r = snd_config_search(pcm_node, "handle_underrun", &node);
++    r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node);
+     if (r != -ENOENT) {
+       break;
+     }
+ 
+     /* Disable pcm_pulse's asynchronous underrun handling. */
+-    r = snd_config_imake_integer(&node, "handle_underrun", 0);
++    r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_add(pcm_node, node);
++    r = WRAP(snd_config_add)(pcm_node, node);
+     if (r < 0) {
+       break;
+     }
+@@ -667,7 +716,7 @@ init_local_config_with_workaround(char const * pcm_name)
+     return lconf;
+   } while (0);
+ 
+-  snd_config_delete(lconf);
++  WRAP(snd_config_delete)(lconf);
+ 
+   return NULL;
+ }
+@@ -679,9 +728,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, char const * pcm_name, snd_pcm_stream_t s
+ 
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+   if (local_config) {
+-    r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);
++    r = WRAP(snd_pcm_open_lconf)(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);
+   } else {
+-    r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK);
++    r = WRAP(snd_pcm_open)(pcm, pcm_name, stream, SND_PCM_NONBLOCK);
+   }
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+ 
+@@ -694,7 +743,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
+   int r;
+ 
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+-  r = snd_pcm_close(pcm);
++  r = WRAP(snd_pcm_close)(pcm);
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+ 
+   return r;
+@@ -750,6 +799,7 @@ silent_error_handler(char const * file, int line, char const * function,
+ alsa_init(cubeb ** context, char const * context_name)
+ {
+   (void)context_name;
++  void * libasound = NULL;
+   cubeb * ctx;
+   int r;
+   int i;
+@@ -760,9 +810,27 @@ alsa_init(cubeb ** context, char const * context_name)
+   assert(context);
+   *context = NULL;
+ 
++#ifndef DISABLE_LIBASOUND_DLOPEN
++  libasound = dlopen("libasound.so", RTLD_LAZY);
++  if (!libasound) {
++    return CUBEB_ERROR;
++  }
++
++#define LOAD(x) {                               \
++    cubeb_##x = dlsym(libasound, #x);            \
++    if (!cubeb_##x) {                           \
++      dlclose(libasound);                        \
++      return CUBEB_ERROR;                       \
++    }                                           \
++  }
++
++  LIBASOUND_API_VISIT(LOAD);
++#undef LOAD
++#endif
++
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+   if (!cubeb_alsa_error_handler_set) {
+-    snd_lib_error_set_handler(silent_error_handler);
++    WRAP(snd_lib_error_set_handler)(silent_error_handler);
+     cubeb_alsa_error_handler_set = 1;
+   }
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+@@ -771,6 +839,7 @@ alsa_init(cubeb ** context, char const * context_name)
+   assert(ctx);
+ 
+   ctx->ops = &alsa_ops;
++  ctx->libasound = libasound;
+ 
+   r = pthread_mutex_init(&ctx->mutex, NULL);
+   assert(r == 0);
+@@ -819,7 +888,7 @@ alsa_init(cubeb ** context, char const * context_name)
+        config fails with EINVAL, the PA PCM is too old for this workaround. */
+     if (r == -EINVAL) {
+       pthread_mutex_lock(&cubeb_alsa_mutex);
+-      snd_config_delete(ctx->local_config);
++      WRAP(snd_config_delete)(ctx->local_config);
+       pthread_mutex_unlock(&cubeb_alsa_mutex);
+       ctx->local_config = NULL;
+     } else if (r >= 0) {
+@@ -861,10 +930,14 @@ alsa_destroy(cubeb * ctx)
+ 
+   if (ctx->local_config) {
+     pthread_mutex_lock(&cubeb_alsa_mutex);
+-    snd_config_delete(ctx->local_config);
++    WRAP(snd_config_delete)(ctx->local_config);
+     pthread_mutex_unlock(&cubeb_alsa_mutex);
+   }
+ 
++  if (ctx->libasound) {
++    dlclose(ctx->libasound);
++  }
++
+   free(ctx);
+ }
+ 
+@@ -948,7 +1021,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_nonblock(stm->pcm, 1);
++  r = WRAP(snd_pcm_nonblock)(stm->pcm, 1);
+   assert(r == 0);
+ 
+   latency_us = latency_frames * 1e6 / stm->params.rate;
+@@ -961,7 +1034,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream
+     latency_us = latency_us < min_latency ? min_latency: latency_us;
+   }
+ 
+-  r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
++  r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
+                          stm->params.channels, stm->params.rate, 1,
+                          latency_us);
+   if (r < 0) {
+@@ -969,20 +1042,20 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream
+     return CUBEB_ERROR_INVALID_FORMAT;
+   }
+ 
+-  r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size);
++  r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size);
+   assert(r == 0);
+ 
+   /* Double internal buffer size to have enough space when waiting for the other side of duplex connection */
+   stm->buffer_size *= 2;
+-  stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size));
++  stm->buffer = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->buffer_size));
+   assert(stm->buffer);
+ 
+-  stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm);
++  stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm);
+   assert(stm->nfds > 0);
+ 
+   stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd));
+   assert(stm->saved_fds);
+-  r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds);
++  r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds);
+   assert((nfds_t) r == stm->nfds);
+ 
+   if (alsa_register_stream(ctx, stm) != 0) {
+@@ -1054,7 +1127,7 @@ alsa_stream_destroy(cubeb_stream * stm)
+   pthread_mutex_lock(&stm->mutex);
+   if (stm->pcm) {
+     if (stm->state == DRAINING) {
+-      snd_pcm_drain(stm->pcm);
++      WRAP(snd_pcm_drain)(stm->pcm);
+     }
+     alsa_locked_pcm_close(stm->pcm);
+     stm->pcm = NULL;
+@@ -1100,12 +1173,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels)
+ 
+   assert(stm);
+ 
+-  r = snd_pcm_hw_params_any(stm->pcm, hw_params);
++  r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
+   if (r < 0) {
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels);
++  r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels);
+   if (r < 0) {
+     return CUBEB_ERROR;
+   }
+@@ -1126,34 +1199,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) {
+ 
+   /* get a pcm, disabling resampling, so we get a rate the
+    * hardware/dmix/pulse/etc. supports. */
+-  r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE);
++  r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE);
+   if (r < 0) {
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_hw_params_any(pcm, hw_params);
++  r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params);
+   if (r < 0) {
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir);
++  r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir);
+   if (r >= 0) {
+     /* There is a default rate: use it. */
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_OK;
+   }
+ 
+   /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */
+   *rate = 44100;
+ 
+-  r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL);
++  r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL);
+   if (r < 0) {
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_ERROR;
+   }
+ 
+-  snd_pcm_close(pcm);
++  WRAP(snd_pcm_close)(pcm);
+ 
+   return CUBEB_OK;
+ }
+@@ -1186,10 +1259,10 @@ alsa_stream_start(cubeb_stream * stm)
+   pthread_mutex_lock(&stm->mutex);
+   /* Capture pcm must be started after initial setup/recover */
+   if (stm->stream_type == SND_PCM_STREAM_CAPTURE &&
+-      snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {
+-    snd_pcm_start(stm->pcm);
++      WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) {
++    WRAP(snd_pcm_start)(stm->pcm);
+   }
+-  snd_pcm_pause(stm->pcm, 0);
++  WRAP(snd_pcm_pause)(stm->pcm, 0);
+   gettimeofday(&stm->last_activity, NULL);
+   pthread_mutex_unlock(&stm->mutex);
+ 
+@@ -1229,7 +1302,7 @@ alsa_stream_stop(cubeb_stream * stm)
+   pthread_mutex_unlock(&ctx->mutex);
+ 
+   pthread_mutex_lock(&stm->mutex);
+-  snd_pcm_pause(stm->pcm, 1);
++  WRAP(snd_pcm_pause)(stm->pcm, 1);
+   pthread_mutex_unlock(&stm->mutex);
+ 
+   return CUBEB_OK;
+@@ -1245,8 +1318,8 @@ alsa_stream_get_position(cubeb_stream * stm, uint64_t * position)
+   pthread_mutex_lock(&stm->mutex);
+ 
+   delay = -1;
+-  if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING ||
+-      snd_pcm_delay(stm->pcm, &delay) != 0) {
++  if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING ||
++      WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) {
+     *position = stm->last_position;
+     pthread_mutex_unlock(&stm->mutex);
+     return CUBEB_OK;
+@@ -1271,7 +1344,7 @@ alsa_stream_get_latency(cubeb_stream * stm, uint32_t * latency)
+   snd_pcm_sframes_t delay;
+   /* This function returns the delay in frames until a frame written using
+      snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */
+-  if (snd_pcm_delay(stm->pcm, &delay)) {
++  if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) {
+     return CUBEB_ERROR;
+   }
+ 
+diff --git media/libcubeb/src/cubeb_sndio.c media/libcubeb/src/cubeb_sndio.c
+index 9e99b2c..0559af4 100644
+--- media/libcubeb/src/cubeb_sndio.c
++++ media/libcubeb/src/cubeb_sndio.c
+@@ -12,6 +12,7 @@
+ #include <stdbool.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <dlfcn.h>
+ #include <assert.h>
+ #include "cubeb/cubeb.h"
+ #include "cubeb-internal.h"
+@@ -22,10 +23,35 @@
+ #define DPR(...) do {} while(0)
+ #endif
+ 
++#ifdef DISABLE_LIBSNDIO_DLOPEN
++#define WRAP(x) x
++#else
++#define WRAP(x) cubeb_##x
++#define LIBSNDIO_API_VISIT(X)                   \
++  X(sio_close)                               \
++  X(sio_eof)                                 \
++  X(sio_getpar)                              \
++  X(sio_initpar)                             \
++  X(sio_onmove)                              \
++  X(sio_open)                                \
++  X(sio_pollfd)                              \
++  X(sio_read)                                \
++  X(sio_revents)                             \
++  X(sio_setpar)                              \
++  X(sio_start)                               \
++  X(sio_stop)                                \
++  X(sio_write)                               \
++
++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x;
++LIBSNDIO_API_VISIT(MAKE_TYPEDEF);
++#undef MAKE_TYPEDEF
++#endif
++
+ static struct cubeb_ops const sndio_ops;
+ 
+ struct cubeb {
+   struct cubeb_ops const * ops;
++  void * libsndio;
+ };
+ 
+ struct cubeb_stream {
+@@ -119,7 +145,7 @@ sndio_mainloop(void *arg)
+   DPR("sndio_mainloop()\n");
+   s->state_cb(s, s->arg, CUBEB_STATE_STARTED);
+   pthread_mutex_lock(&s->mtx);
+-  if (!sio_start(s->hdl)) {
++  if (!WRAP(sio_start)(s->hdl)) {
+     pthread_mutex_unlock(&s->mtx);
+     return NULL;
+   }
+@@ -203,7 +229,7 @@ sndio_mainloop(void *arg)
+       events |= POLLIN;
+     if ((s->mode & SIO_PLAY) && pstart < pend)
+       events |= POLLOUT;
+-    nfds = sio_pollfd(s->hdl, pfds, events);
++    nfds = WRAP(sio_pollfd)(s->hdl, pfds, events);
+ 
+     if (nfds > 0) {
+       pthread_mutex_unlock(&s->mtx);
+@@ -213,7 +239,7 @@ sndio_mainloop(void *arg)
+         continue;
+     }
+ 
+-    revents = sio_revents(s->hdl, pfds);
++    revents = WRAP(sio_revents)(s->hdl, pfds);
+ 
+     if (revents & POLLHUP) {
+       state = CUBEB_STATE_ERROR;
+@@ -221,8 +247,8 @@ sndio_mainloop(void *arg)
+     }
+ 
+     if (revents & POLLOUT) {
+-      n = sio_write(s->hdl, s->pbuf + pstart, pend - pstart);
+-      if (n == 0 && sio_eof(s->hdl)) {
++      n = WRAP(sio_write)(s->hdl, s->pbuf + pstart, pend - pstart);
++      if (n == 0 && WRAP(sio_eof)(s->hdl)) {
+         DPR("sndio_mainloop() werr\n");
+         state = CUBEB_STATE_ERROR;
+         break;
+@@ -231,8 +257,8 @@ sndio_mainloop(void *arg)
+     }
+ 
+     if (revents & POLLIN) {
+-      n = sio_read(s->hdl, s->rbuf + rstart, rend - rstart);
+-      if (n == 0 && sio_eof(s->hdl)) {
++      n = WRAP(sio_read)(s->hdl, s->rbuf + rstart, rend - rstart);
++      if (n == 0 && WRAP(sio_eof)(s->hdl)) {
+         DPR("sndio_mainloop() rerr\n");
+         state = CUBEB_STATE_ERROR;
+         break;
+@@ -244,7 +270,7 @@ sndio_mainloop(void *arg)
+     if (prime > 0 && (s->mode & SIO_REC))
+       rstart = rend;
+   }
+-  sio_stop(s->hdl);
++  WRAP(sio_stop)(s->hdl);
+   s->hwpos = s->swpos;
+   pthread_mutex_unlock(&s->mtx);
+   s->state_cb(s, s->arg, state);
+@@ -254,8 +280,31 @@ sndio_mainloop(void *arg)
+ /*static*/ int
+ sndio_init(cubeb **context, char const *context_name)
+ {
++  void * libsndio = NULL;
++
++#ifndef DISABLE_LIBSNDIO_DLOPEN
++  libsndio = dlopen("libsndio.so", RTLD_LAZY);
++  if (!libsndio) {
++    DPR("sndio_init(%s) failed dlopen(libsndio.so)\n", context_name);
++    return CUBEB_ERROR;
++  }
++
++#define LOAD(x) {                               \
++    cubeb_##x = dlsym(libsndio, #x);            \
++    if (!cubeb_##x) {                           \
++      DPR("sndio_init(%s) failed dlsym(%s)\n", context_name, #x); \
++      dlclose(libsndio);                        \
++      return CUBEB_ERROR;                       \
++    }                                           \
++  }
++
++  LIBSNDIO_API_VISIT(LOAD);
++#undef LOAD
++#endif
++
+   DPR("sndio_init(%s)\n", context_name);
+   *context = malloc(sizeof(*context));
++  (*context)->libsndio = libsndio;
+   (*context)->ops = &sndio_ops;
+   (void)context_name;
+   return CUBEB_OK;
+@@ -271,6 +320,8 @@ static void
+ sndio_destroy(cubeb *context)
+ {
+   DPR("sndio_destroy()\n");
++  if (context->libsndio)
++    dlclose(context->libsndio);
+   free(context);
+ }
+ 
+@@ -323,12 +374,12 @@ sndio_stream_init(cubeb * context,
+     goto err;
+   }
+   s->context = context;
+-  s->hdl = sio_open(NULL, s->mode, 1);
++  s->hdl = WRAP(sio_open)(NULL, s->mode, 1);
+   if (s->hdl == NULL) {
+     DPR("sndio_stream_init(), sio_open() failed\n");
+     goto err;
+   }
+-  sio_initpar(&wpar);
++  WRAP(sio_initpar)(&wpar);
+   wpar.sig = 1;
+   wpar.bits = 16;
+   switch (format) {
+@@ -351,7 +402,7 @@ sndio_stream_init(cubeb * context,
+   if (s->mode & SIO_PLAY)
+     wpar.pchan = output_stream_params->channels;
+   wpar.appbufsz = latency_frames;
+-  if (!sio_setpar(s->hdl, &wpar) || !sio_getpar(s->hdl, &rpar)) {
++  if (!WRAP(sio_setpar)(s->hdl, &wpar) || !WRAP(sio_getpar)(s->hdl, &rpar)) {
+     DPR("sndio_stream_init(), sio_setpar() failed\n");
+     goto err;
+   }
+@@ -362,7 +413,7 @@ sndio_stream_init(cubeb * context,
+     DPR("sndio_stream_init() unsupported params\n");
+     goto err;
+   }
+-  sio_onmove(s->hdl, sndio_onmove, s);
++  WRAP(sio_onmove)(s->hdl, sndio_onmove, s);
+   s->active = 0;
+   s->nfr = rpar.round;
+   s->rbpf = rpar.bps * rpar.rchan;
+@@ -400,7 +451,7 @@ sndio_stream_init(cubeb * context,
+   return CUBEB_OK;
+ err:
+   if (s->hdl)
+-    sio_close(s->hdl);
++    WRAP(sio_close)(s->hdl);
+   if (s->pbuf)
+     free(s->pbuf);
+   if (s->rbuf)
+@@ -446,7 +497,7 @@ static void
+ sndio_stream_destroy(cubeb_stream *s)
+ {
+   DPR("sndio_stream_destroy()\n");
+-  sio_close(s->hdl);
++  WRAP(sio_close)(s->hdl);
+   if (s->mode & SIO_PLAY)
+     free(s->pbuf);
+   if (s->mode & SIO_REC)
+diff --git toolkit/library/moz.build toolkit/library/moz.build
+index 8ce595ff96bff..c318e96a1fdfc 100644
+--- toolkit/library/moz.build
++++ toolkit/library/moz.build
+@@ -231,9 +231,6 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
+ if not CONFIG['MOZ_TREE_PIXMAN']:
+     OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
+ 
+-if CONFIG['MOZ_ALSA']:
+-    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+-
+ if CONFIG['HAVE_CLOCK_MONOTONIC']:
+     OS_LIBS += CONFIG['REALTIME_LIBS']
+ 
+@@ -242,11 +239,6 @@ OS_LIBS += CONFIG['ICONV_LIBS']
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
+     OS_LIBS += CONFIG['TK_LIBS']
+ 
+-if CONFIG['OS_ARCH'] == 'OpenBSD':
+-    OS_LIBS += [
+-        'sndio',
+-    ]
+-
+ if CONFIG['MOZ_ENABLE_DBUS']:
+     OS_LIBS += CONFIG['MOZ_DBUS_GLIB_LIBS']
+ 
diff --git a/math/Makefile b/math/Makefile
index c8e420fe3125..fa5486f981e7 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -784,6 +784,7 @@
     SUBDIR += py-uncertainties
     SUBDIR += py-vincenty
     SUBDIR += py-viper
+    SUBDIR += py-yt
     SUBDIR += py-z3-solver
     SUBDIR += qalculate
     SUBDIR += qd
diff --git a/math/R-cran-forecast/Makefile b/math/R-cran-forecast/Makefile
index 8b897651cab1..836464e98cce 100644
--- a/math/R-cran-forecast/Makefile
+++ b/math/R-cran-forecast/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	forecast
-PORTVERSION=	8.8
+PORTVERSION=	8.9
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
@@ -15,6 +15,7 @@ CRAN_DEPENDS=	R-cran-colorspace>0:graphics/R-cran-colorspace \
 		R-cran-fracdiff>0:math/R-cran-fracdiff \
 		R-cran-ggplot2>=2.2.1:graphics/R-cran-ggplot2 \
 		R-cran-lmtest>0:finance/R-cran-lmtest \
+		R-cran-magrittr>0:devel/R-cran-magrittr \
 		R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp \
 		R-cran-timeDate>0:finance/R-cran-timeDate \
 		R-cran-tseries>0:finance/R-cran-tseries \
diff --git a/math/R-cran-forecast/distinfo b/math/R-cran-forecast/distinfo
index 94cd7587b56f..25651d72ea49 100644
--- a/math/R-cran-forecast/distinfo
+++ b/math/R-cran-forecast/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564835304
-SHA256 (forecast_8.8.tar.gz) = d077074d77d3ea00e9215c828b3689a8c841a16af1e6859bb2dfdede081c2c1d
-SIZE (forecast_8.8.tar.gz) = 826615
+TIMESTAMP = 1567916702
+SHA256 (forecast_8.9.tar.gz) = ade3ec37f16c374b85f605780337a7a6349bfc8352caef319f927d36e4b57d04
+SIZE (forecast_8.9.tar.gz) = 829958
diff --git a/math/R-cran-units/Makefile b/math/R-cran-units/Makefile
index 663b26f21093..fa0373b8635d 100644
--- a/math/R-cran-units/Makefile
+++ b/math/R-cran-units/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	units
-DISTVERSION=	0.6-3
-PORTREVISION=	1
+DISTVERSION=	0.6-4
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-units/distinfo b/math/R-cran-units/distinfo
index 47920133de5b..6d130a492f4a 100644
--- a/math/R-cran-units/distinfo
+++ b/math/R-cran-units/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562486936
-SHA256 (units_0.6-3.tar.gz) = 03de88d9dcfe80d22dd3813413f33657c576aed24a8091dbfc7f68602020a64f
-SIZE (units_0.6-3.tar.gz) = 961803
+TIMESTAMP = 1567915837
+SHA256 (units_0.6-4.tar.gz) = 25720a06d7b68cbfa50f2396a2a0981256084a9481008ee1ecae6974daafe0cb
+SIZE (units_0.6-4.tar.gz) = 959885
diff --git a/math/ess/Makefile b/math/ess/Makefile
index bfed6febca99..9ecc961ff68d 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ess
-DISTVERSION=	17.11
-PORTREVISION=	6
+DISTVERSION=	18.10.2
 CATEGORIES=	math
 MASTER_SITES=	http://ess.r-project.org/downloads/ess/ \
 		http://stat.ethz.ch/ESS/downloads/ess/
@@ -17,11 +16,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	R:math/R
 
-NO_ARCH=	yes
-
 USES=		emacs gmake makeinfo perl5 tar:tgz
 USE_PERL5=	build
 
+NO_ARCH=	yes
+
 INFO=		ess
 
 OPTIONS_DEFINE=	DOCS
@@ -30,9 +29,12 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^DESTDIR|#DESTDIR| ; \
 		 s|^PREFIX|#PREFIX| ; \
-		 s|=$$(PREFIX)|=$$(DESTDIR)$$(PREFIX)|' \
-		 ${WRKSRC}/Makeconf
+		 s|=$$(PREFIX)|=$$(DESTDIR)$$(PREFIX)| ; \
+		 s|share/info|${INFO_PATH}|' ${WRKSRC}/Makeconf
 	@${REINPLACE_CMD} -e \
 		'/^PDFs/s|=.*|=|' ${WRKSRC}/doc/Makefile
 
+post-install:
+	@${CP} ${WRKSRC}/lisp/*.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/ess/
+
 .include <bsd.port.mk>
diff --git a/math/ess/distinfo b/math/ess/distinfo
index a00c0f35679b..735340bd028f 100644
--- a/math/ess/distinfo
+++ b/math/ess/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516644885
-SHA256 (ess-17.11.tgz) = 484773fcfa2463fbbb9470cbdcf8e628500ca6cf97fb751ac72eed198d5fa715
-SIZE (ess-17.11.tgz) = 3275703
+TIMESTAMP = 1542041727
+SHA256 (ess-18.10.2.tgz) = f77b42283c698da091aabca9ccd14a648c3240f00898b93128490feefa04e9d6
+SIZE (ess-18.10.2.tgz) = 2939425
diff --git a/math/ess/pkg-plist b/math/ess/pkg-plist
index 42e9f2dfe3b6..551a79ab92f0 100644
--- a/math/ess/pkg-plist
+++ b/math/ess/pkg-plist
@@ -16,10 +16,7 @@
 %%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/pkg.R
 %%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/VERSION
 %%EMACS_LIBDIR%%/%%ETCDIR%%/ess-julia.jl
-%%EMACS_LIBDIR%%/%%ETCDIR%%/ess-s4.S
 %%EMACS_LIBDIR%%/%%ETCDIR%%/ess-sas-sh-command
-%%EMACS_LIBDIR%%/%%ETCDIR%%/ess-sp3.S
-%%EMACS_LIBDIR%%/%%ETCDIR%%/function-outline.S
 %%EMACS_LIBDIR%%/%%ETCDIR%%/git-ref
 %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/rbuffer.xpm
 %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/rfunction.xpm
@@ -32,25 +29,17 @@
 %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/switch_ess.xpm
 %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/switchr.xpm
 %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/switchs.xpm
-%%EMACS_LIBDIR%%/%%ETCDIR%%/sas-keys.doc
-%%EMACS_LIBDIR%%/%%ETCDIR%%/sas-keys.ps
-%%EMACS_LIBDIR%%/%%ETCDIR%%/sas-keys.rtf
-%%EMACS_SITE_LISPDIR%%/ess/ChangeLog
 %%EMACS_SITE_LISPDIR%%/ess/ess-arc-d.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-arc-d.elc
+%%EMACS_SITE_LISPDIR%%/ess/ess-autoloads.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-bugs-d.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-bugs-d.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-bugs-l.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-bugs-l.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-comp.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-comp.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-compat.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-compat.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-custom.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-custom.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-dde.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-dde.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-eldoc.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-eldoc.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-font-lock.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-font-lock.elc
@@ -82,10 +71,13 @@
 %%EMACS_SITE_LISPDIR%%/ess/ess-omg-d.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-omg-l.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-omg-l.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-r-args.el
+%%EMACS_SITE_LISPDIR%%/ess/ess-r-a.el
+%%EMACS_SITE_LISPDIR%%/ess/ess-r-a.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-args.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-completion.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-completion.elc
+%%EMACS_SITE_LISPDIR%%/ess/ess-r-flymake.el
+%%EMACS_SITE_LISPDIR%%/ess/ess-r-flymake.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-gui.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-gui.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-mode.el
@@ -94,6 +86,8 @@
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-package.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-syntax.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-syntax.elc
+%%EMACS_SITE_LISPDIR%%/ess/ess-r-xref.el
+%%EMACS_SITE_LISPDIR%%/ess/ess-r-xref.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-rd.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-rd.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-rdired.el
@@ -154,5 +148,4 @@
 %%EMACS_SITE_LISPDIR%%/ess/make-regexp.elc
 %%EMACS_SITE_LISPDIR%%/ess/mouseme.el
 %%EMACS_SITE_LISPDIR%%/ess/mouseme.elc
-%%EMACS_SITE_LISPDIR%%/ess/msdos.el
 %%EMACS_SITE_LISPDIR%%/ess/msdos.elc
diff --git a/math/libnormaliz/Makefile b/math/libnormaliz/Makefile
index 0f844319806e..3fb57b6ca75b 100644
--- a/math/libnormaliz/Makefile
+++ b/math/libnormaliz/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=		libnormaliz
 DISTVERSIONPREFIX=	v
-DISTVERSION=		3.7.4
-PORTREVISION=		1
+DISTVERSION=		3.8.0
 CATEGORIES=		math
 
 MAINTAINER=	phascolarctos@protonmail.ch
diff --git a/math/libnormaliz/distinfo b/math/libnormaliz/distinfo
index 4ccc02d33df0..1eed2b8e866e 100644
--- a/math/libnormaliz/distinfo
+++ b/math/libnormaliz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565302647
-SHA256 (Normaliz-Normaliz-v3.7.4_GH0.tar.gz) = 1a33e7695d43ebc09c81c9d0192f304df71640baa3a9fd0c7552a0075b8a1da5
-SIZE (Normaliz-Normaliz-v3.7.4_GH0.tar.gz) = 9343121
+TIMESTAMP = 1568038578
+SHA256 (Normaliz-Normaliz-v3.8.0_GH0.tar.gz) = 5b46c26f76dbbdd0f862f3bef24cd93e315d2343cafab94c3fc5226288ece05f
+SIZE (Normaliz-Normaliz-v3.8.0_GH0.tar.gz) = 4433133
diff --git a/math/openblas/Makefile b/math/openblas/Makefile
index 7ad26b93f06e..660934c4a4a0 100644
--- a/math/openblas/Makefile
+++ b/math/openblas/Makefile
@@ -41,6 +41,7 @@ OPTIONS_DEFINE=		INTERFACE64 OPENMP
 OPTIONS_DEFINE_i386=	DYNAMIC_ARCH AVX AVX2
 OPTIONS_DEFINE_amd64=	${OPTIONS_DEFINE_i386}
 OPTIONS_DEFINE_powerpc64=	POWER6
+OPTIONS_EXCLUDE_powerpc64=	OPENMP
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT_i386=	DYNAMIC_ARCH
@@ -57,6 +58,7 @@ POWER6_DESC=		Optimize for POWER6, instead of the default PPC970
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
+USE_GCC=	yes
 .  if ${PORT_OPTIONS:MPOWER6}
 TARGET_CPU_ARCH=	POWER6
 .else
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index f7572c94a6cb..3bdd3bbeeba8 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	numpy
-PORTVERSION=	1.16.4
-PORTREVISION=	1
+PORTVERSION=	1.16.5
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP \
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index a04a0874c4a4..63193b9011e6 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1562166804
-SHA256 (numpy-1.16.4.zip) = 7242be12a58fec245ee9734e625964b97cf7e3f2f7d016603f9e56660ce479c7
-SIZE (numpy-1.16.4.zip) = 5122740
+TIMESTAMP = 1567971451
+SHA256 (numpy-1.16.5.zip) = 8bb452d94e964b312205b0de1238dd7209da452343653ab214b5d681780e7a0c
+SIZE (numpy-1.16.5.zip) = 5138208
 SHA256 (numpy-ref-1.16.1.pdf) = 5296c4949c92d00ae2c94ce65b78369b8081995dc72447bb20b6518bfaed3552
 SIZE (numpy-ref-1.16.1.pdf) = 5175448
 SHA256 (numpy-user-1.16.1.pdf) = aa8c591eee4c537768854f19e3cf4b861280828c19eb9d2e6194ea230570ea75
diff --git a/math/py-pandas/Makefile b/math/py-pandas/Makefile
index 09cda3a35c33..69b317c3296f 100644
--- a/math/py-pandas/Makefile
+++ b/math/py-pandas/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	pandas
 DISTVERSION=	0.24.2
 PORTREVISION=	1
+PORTEPOCH=	1
 CATEGORIES=	math devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-yt/Makefile b/math/py-yt/Makefile
new file mode 100644
index 000000000000..a8307fed88b1
--- /dev/null
+++ b/math/py-yt/Makefile
@@ -0,0 +1,39 @@
+# Created by: Yuri Victorovich <yuri@rawbw.com>
+# $FreeBSD$
+
+PORTNAME=	yt
+DISTVERSION=	3.5.0
+PORTREVISION=	3
+CATEGORIES=	math astro python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Analysis and visualization toolkit for volumetric data
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING.txt
+
+BUILD_DEPENDS=	${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree@${PY_FLAVOR}
+LIB_DEPENDS=	libembree.so:graphics/embree \
+		libomp.so:devel/openmp
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sympy>=1.0:math/py-sympy@${PY_FLAVOR} \
+		${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ipython5>=1.0:devel/ipython5@${PY_FLAVOR}
+
+USES=		dos2unix localbase python
+USE_PYTHON=	distutils cython autoplist concurrent
+
+post-patch:
+	@${REINPLACE_CMD} -e "s|check_for_pyembree() is not None|True|; s|check_for_openmp() is True|True|" \
+		${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e "s|\['-fopenmp', filename\]|['-I${LOCALBASE}/include', '-L${LOCALBASE}/lib', '-lm', '-fopenmp', filename]|" \
+		${WRKSRC}/setupext.py
+
+post-install:
+	@${STRIP_CMD} $$(${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name "*.so")
+
+.include <bsd.port.mk>
diff --git a/math/py-yt/distinfo b/math/py-yt/distinfo
new file mode 100644
index 000000000000..e3cfab5cd2e8
--- /dev/null
+++ b/math/py-yt/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1539846194
+SHA256 (yt-3.5.0.tar.gz) = ee4bf8349f02ce21f571654c26d85c1f69d9678fc8f5c7cfe5d1686c7ed2e3ca
+SIZE (yt-3.5.0.tar.gz) = 10417638
diff --git a/math/py-yt/files/patch-yt_extern_tqdm___utils.py b/math/py-yt/files/patch-yt_extern_tqdm___utils.py
new file mode 100644
index 000000000000..42900ea89072
--- /dev/null
+++ b/math/py-yt/files/patch-yt_extern_tqdm___utils.py
@@ -0,0 +1,11 @@
+--- yt/extern/tqdm/_utils.py.orig	2017-01-01 20:57:19 UTC
++++ yt/extern/tqdm/_utils.py
+@@ -40,7 +40,7 @@ def _environ_cols_wrapper():  # pragma: 
+         _environ_cols = _environ_cols_windows
+         if _environ_cols is None:
+             _environ_cols = _environ_cols_tput
+-    if current_os in ['Linux', 'Darwin'] or current_os.startswith('CYGWIN'):
++    if current_os in ['FreeBSD', 'Linux', 'Darwin'] or current_os.startswith('CYGWIN'):
+         _environ_cols = _environ_cols_linux
+     return _environ_cols
+ 
diff --git a/math/py-yt/files/patch-yt_utilities_lib_platform__dep.h b/math/py-yt/files/patch-yt_utilities_lib_platform__dep.h
new file mode 100644
index 000000000000..4bf2fcc821d3
--- /dev/null
+++ b/math/py-yt/files/patch-yt_utilities_lib_platform__dep.h
@@ -0,0 +1,11 @@
+--- yt/utilities/lib/platform_dep.h.orig	2017-01-01 20:57:35 UTC
++++ yt/utilities/lib/platform_dep.h
+@@ -57,7 +57,7 @@ double erf(double x)
+ 
+ #else
+ #include <stdint.h>
+-#include "alloca.h"
++#include <stdlib.h>
+ #include <math.h>
+ #endif
+ 
diff --git a/math/py-yt/pkg-descr b/math/py-yt/pkg-descr
new file mode 100644
index 000000000000..164d85c3123e
--- /dev/null
+++ b/math/py-yt/pkg-descr
@@ -0,0 +1,7 @@
+yt supports structured, variable-resolution meshes, unstructured meshes,
+and discrete or sampled data such as particles. Focused on driving
+physically-meaningful inquiry, yt has been applied in domains such as
+astrophysics, seismology, nuclear engineering, molecular dynamics, and
+oceanography.
+
+WWW: http://yt-project.org
diff --git a/math/wxmaxima/Makefile b/math/wxmaxima/Makefile
index f857b0633b48..642057d49660 100644
--- a/math/wxmaxima/Makefile
+++ b/math/wxmaxima/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wxmaxima
-PORTVERSION=	19.08.1
+PORTVERSION=	19.09.0
 DISTVERSIONPREFIX=	Version-
 CATEGORIES=	math
 
diff --git a/math/wxmaxima/distinfo b/math/wxmaxima/distinfo
index 48814ebbd83f..438a983d78e0 100644
--- a/math/wxmaxima/distinfo
+++ b/math/wxmaxima/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566144551
-SHA256 (wxMaxima-Developers-wxmaxima-Version-19.08.1_GH0.tar.gz) = 9e8dce440f085d795e9829708e575df15f6bcf124940669d6786494ef71b54c3
-SIZE (wxMaxima-Developers-wxmaxima-Version-19.08.1_GH0.tar.gz) = 15153254
+TIMESTAMP = 1567935888
+SHA256 (wxMaxima-Developers-wxmaxima-Version-19.09.0_GH0.tar.gz) = 5080cc3fee1bd1fb570dd354dea3c4fae8e8b752895e720fd51e160481d2bd72
+SIZE (wxMaxima-Developers-wxmaxima-Version-19.09.0_GH0.tar.gz) = 15153282
diff --git a/misc/Makefile b/misc/Makefile
index 5e65c57e9a79..c8844c05e89c 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -510,6 +510,7 @@
     SUBDIR += usbids
     SUBDIR += usbrh-libusb
     SUBDIR += utftools
+    SUBDIR += utouch-kmod
     SUBDIR += valentina
     SUBDIR += valspeak
     SUBDIR += vdmfec
diff --git a/misc/R-cran-xfun/Makefile b/misc/R-cran-xfun/Makefile
index 7457e25292bb..53e212ee6869 100644
--- a/misc/R-cran-xfun/Makefile
+++ b/misc/R-cran-xfun/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfun
-PORTVERSION=	0.8
-PORTREVISION=	1
+PORTVERSION=	0.9
 CATEGORIES=	misc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/misc/R-cran-xfun/distinfo b/misc/R-cran-xfun/distinfo
index 4c4a6582167c..7f6db4d22565 100644
--- a/misc/R-cran-xfun/distinfo
+++ b/misc/R-cran-xfun/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562498136
-SHA256 (xfun_0.8.tar.gz) = c2f8ecf8b57ddec02f9be7f417d9e22fc1ae2c7db8d70aa703fc62bf4a5c5416
-SIZE (xfun_0.8.tar.gz) = 54885
+TIMESTAMP = 1567915095
+SHA256 (xfun_0.9.tar.gz) = d453fe89ee39bc20f05b3bde4529182f8cd6197a221eca6b106832a28daf7cb0
+SIZE (xfun_0.9.tar.gz) = 55965
diff --git a/misc/adios2/Makefile b/misc/adios2/Makefile
index 36ce74e85f98..7fc7752bd863 100644
--- a/misc/adios2/Makefile
+++ b/misc/adios2/Makefile
@@ -11,6 +11,8 @@ COMMENT=	Next generation of ADIOS developed in the Exascale Computing Program
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN=		fails to package
+
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libblosc.so:archivers/c-blosc \
 		libepoll-shim.so:devel/libepoll-shim \
diff --git a/misc/cloc/Makefile b/misc/cloc/Makefile
index 32353c0e5f7f..e136e4e1698e 100644
--- a/misc/cloc/Makefile
+++ b/misc/cloc/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cloc
-PORTVERSION=	1.80
-DISTVERSIONPREFIX=	v
+PORTVERSION=	1.82
 CATEGORIES=	misc
 
 MAINTAINER=	danilo@FreeBSD.org
diff --git a/misc/cloc/distinfo b/misc/cloc/distinfo
index dca62ba6322c..910b68773ae4 100644
--- a/misc/cloc/distinfo
+++ b/misc/cloc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538817920
-SHA256 (AlDanial-cloc-v1.80_GH0.tar.gz) = 29f6b2a90f00b02b6197354d6d78051530e2942e3b52421ec138c4f3ab683eb0
-SIZE (AlDanial-cloc-v1.80_GH0.tar.gz) = 451896
+TIMESTAMP = 1568063532
+SHA256 (AlDanial-cloc-1.82_GH0.tar.gz) = 7ab390f3a4888d9b78df420bff586326b53e3f7fc0e0c9ff9b160d076ca85a17
+SIZE (AlDanial-cloc-1.82_GH0.tar.gz) = 494399
diff --git a/misc/findutils/Makefile b/misc/findutils/Makefile
index 589d2b92c84b..4b4d366ba939 100644
--- a/misc/findutils/Makefile
+++ b/misc/findutils/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	findutils
-PORTVERSION=	4.6.0
-PORTREVISION=	1
+PORTVERSION=	4.7.0
 CATEGORIES=	misc
 MASTER_SITES=	GNU
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
@@ -15,7 +14,8 @@ COMMENT=	GNU find utilities
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES+=		charsetfix cpe gmake
+USES=		charsetfix cpe gmake tar:xz
+
 SIG_FILES=	${DISTNAME}${EXTRACT_SUFX}.sig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/misc/findutils/distinfo b/misc/findutils/distinfo
index 47d6ab72578e..4187ea69ed73 100644
--- a/misc/findutils/distinfo
+++ b/misc/findutils/distinfo
@@ -1,4 +1,5 @@
-SHA256 (findutils-4.6.0.tar.gz) = ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d
-SIZE (findutils-4.6.0.tar.gz) = 3780154
-SHA256 (findutils-4.6.0.tar.gz.sig) = d6a77e6889f31571eb2f0446ac4d1cc16acbaf684f5e5d4e0feb88f2cc1d5b52
-SIZE (findutils-4.6.0.tar.gz.sig) = 152
+TIMESTAMP = 1567957854
+SHA256 (findutils-4.7.0.tar.xz) = c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a
+SIZE (findutils-4.7.0.tar.xz) = 1895048
+SHA256 (findutils-4.7.0.tar.xz.sig) = 2f620e6d941e241fac52344a89149ab1ffeefb0fb9e42174e17a508d59a31d0f
+SIZE (findutils-4.7.0.tar.xz.sig) = 488
diff --git a/misc/findutils/files/patch-locate__updatedb.sh b/misc/findutils/files/patch-locate__updatedb.sh
index 4795680cbf4e..83563cf164d6 100644
--- a/misc/findutils/files/patch-locate__updatedb.sh
+++ b/misc/findutils/files/patch-locate__updatedb.sh
@@ -1,6 +1,6 @@
---- locate/updatedb.sh.orig	2011-04-03 23:53:12.000000000 +0100
-+++ locate/updatedb.sh	2011-05-17 18:20:29.000000000 +0100
-@@ -250,7 +250,7 @@
+--- locate/updatedb.sh.orig	2019-06-23 09:00:40 UTC
++++ locate/updatedb.sh
+@@ -292,7 +292,7 @@ cd "$changeto"
  if test -n "$SEARCHPATHS"; then
    if [ "$LOCALUSER" != "" ]; then
      # : A1
@@ -9,7 +9,7 @@
      "$find $SEARCHPATHS $FINDOPTIONS \
       \\( $prunefs_exp \
       -type d -regex '$PRUNEREGEX' \\) -prune -o $print_option"
-@@ -266,7 +266,7 @@
+@@ -308,7 +308,7 @@ if test -n "$NETPATHS"; then
  myuid=`getuid`
  if [ "$myuid" = 0 ]; then
      # : A3
@@ -18,21 +18,3 @@
       "$find $NETPATHS $FINDOPTIONS \\( -type d -regex '$PRUNEREGEX' -prune \\) -o $print_option" ||
      exit $?
    else
-@@ -319,7 +319,7 @@
- if test -n "$SEARCHPATHS"; then
-   if [ "$LOCALUSER" != "" ]; then
-     # : A5
--    su $LOCALUSER `select_shell $LOCALUSER` -c \
-+    su -m $LOCALUSER -c \
-     "$find $SEARCHPATHS $FINDOPTIONS \
-      \( $prunefs_exp \
-      -type d -regex '$PRUNEREGEX' \) -prune -o $print_option" || exit $?
-@@ -335,7 +335,7 @@
-   myuid=`getuid`
-   if [ "$myuid" = 0 ]; then
-     # : A7
--    su $NETUSER `select_shell $NETUSER` -c \
-+    su -m $NETUSER -c \
-      "$find $NETPATHS $FINDOPTIONS \\( -type d -regex '$PRUNEREGEX' -prune \\) -o $print_option" ||
-     exit $?
-   else
diff --git a/misc/findutils/pkg-plist b/misc/findutils/pkg-plist
index 8c9bab1611e8..f51735b0999f 100644
--- a/misc/findutils/pkg-plist
+++ b/misc/findutils/pkg-plist
@@ -2,8 +2,6 @@ bin/gfind
 bin/glocate
 bin/gupdatedb
 bin/gxargs
-libexec/gbigram
-libexec/gcode
 libexec/gfrcode
 man/man1/gfind.1.gz
 man/man1/glocate.1.gz
@@ -40,7 +38,6 @@ man/man5/glocatedb.5.gz
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/findutils.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/findutils.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/findutils.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/findutils.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/findutils.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/findutils.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/findutils.mo
diff --git a/misc/osinfo-db/Makefile b/misc/osinfo-db/Makefile
index b8a4587f68eb..bd751d17f4a4 100644
--- a/misc/osinfo-db/Makefile
+++ b/misc/osinfo-db/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	osinfo-db
-PORTVERSION=	20190805
+PORTVERSION=	20190905
 CATEGORIES=	misc
 MASTER_SITES=	https://releases.pagure.org/libosinfo/
 
diff --git a/misc/osinfo-db/distinfo b/misc/osinfo-db/distinfo
index 85671dfc56fd..e604c2f71c9c 100644
--- a/misc/osinfo-db/distinfo
+++ b/misc/osinfo-db/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565407129
-SHA256 (osinfo-db-20190805.tar.xz) = 7da4477508cb2fb03da90123bafcc2ab1ff6c2d8f911a590cad9a202eb0448d1
-SIZE (osinfo-db-20190805.tar.xz) = 90228
+TIMESTAMP = 1567825369
+SHA256 (osinfo-db-20190905.tar.xz) = 7233b5a68cc0c3c231db510f342fcc78f6e7c40ca0a739bff484f66591b0bda3
+SIZE (osinfo-db-20190905.tar.xz) = 91728
diff --git a/misc/osinfo-db/pkg-plist b/misc/osinfo-db/pkg-plist
index 649258128788..e377c0e4d38a 100644
--- a/misc/osinfo-db/pkg-plist
+++ b/misc/osinfo-db/pkg-plist
@@ -217,8 +217,12 @@ share/osinfo/os/dragonflybsd.org/dragonflybsd-5.4.1.xml
 share/osinfo/os/dragonflybsd.org/dragonflybsd-5.4.2.xml
 share/osinfo/os/dragonflybsd.org/dragonflybsd-5.4.3.xml
 share/osinfo/os/dragonflybsd.org/dragonflybsd-5.6.xml
+share/osinfo/os/endlessos.com/eos-3.1.xml
+share/osinfo/os/endlessos.com/eos-3.2.xml
 share/osinfo/os/endlessos.com/eos-3.3.xml
 share/osinfo/os/endlessos.com/eos-3.4.xml
+share/osinfo/os/endlessos.com/eos-3.5.xml
+share/osinfo/os/endlessos.com/eos-3.6.xml
 share/osinfo/os/fedoraproject.org/fedora-1.xml
 share/osinfo/os/fedoraproject.org/fedora-10.xml
 share/osinfo/os/fedoraproject.org/fedora-11.xml
@@ -407,6 +411,7 @@ share/osinfo/os/netbsd.org/netbsd-7.1.2.xml
 share/osinfo/os/netbsd.org/netbsd-7.1.xml
 share/osinfo/os/netbsd.org/netbsd-7.2.xml
 share/osinfo/os/netbsd.org/netbsd-8.0.xml
+share/osinfo/os/netbsd.org/netbsd-8.1.xml
 share/osinfo/os/novell.com/netware-4.xml
 share/osinfo/os/novell.com/netware-5.xml
 share/osinfo/os/novell.com/netware-6.xml
@@ -551,6 +556,7 @@ share/osinfo/os/redhat.com/rhel-7.3.xml
 share/osinfo/os/redhat.com/rhel-7.4.xml
 share/osinfo/os/redhat.com/rhel-7.5.xml
 share/osinfo/os/redhat.com/rhel-7.6.xml
+share/osinfo/os/redhat.com/rhel-7.7.xml
 share/osinfo/os/redhat.com/rhel-8-unknown.xml
 share/osinfo/os/redhat.com/rhel-8.0.xml
 share/osinfo/os/redhat.com/rhel-atomic-7.0.xml
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index 523f0a233e3d..546a7e31c9e3 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pinfo
 PORTVERSION=	0.6.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc
 MASTER_SITES=	GENTOO \
 		http://alioth.debian.org/frs/download.php/file/3351/
@@ -16,10 +16,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=	Fails to link: missing sbrk
 
-USES=		autoreconf gettext-tools libtool makeinfo ncurses tar:bzip2
+USES=		autoreconf gettext-tools libtool localbase makeinfo ncurses tar:bzip2
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--with-curses=${NCURSESBASE}
 
 INFO=		pinfo
 PLIST_FILES=	bin/pinfo etc/pinforc man/man1/pinfo.1.gz
diff --git a/misc/pinfo/files/patch-macros_curses.m4 b/misc/pinfo/files/patch-macros_curses.m4
new file mode 100644
index 000000000000..ab83a943c5ba
--- /dev/null
+++ b/misc/pinfo/files/patch-macros_curses.m4
@@ -0,0 +1,15 @@
+--- macros/curses.m4.orig	2006-03-09 19:44:48 UTC
++++ macros/curses.m4
+@@ -182,6 +182,12 @@ AC_DEFUN([AC_SEARCH_CURSES_H], [
+ 	if test "x$curses_location" != "xfalse"
+ 	then
+ 		dnl  check this particular location
++		AC_SEARCH_CURSES_FILE($curses_location/include, ncurses/ncurses.h, 
++					-L$curses_location/lib -lncursesw, 
++					-I$curses_location/include )
++		AC_SEARCH_CURSES_FILE($curses_location/include, ncurses.h, 
++					-L$curses_location/lib -lncursesw, 
++					-I$curses_location/include )
+ 		AC_SEARCH_CURSES_FILE($curses_location/include, ncursesw/ncurses.h, 
+ 					-L$curses_location/lib -lncursesw, 
+ 					-I$curses_location/include )
diff --git a/misc/qt5ct/Makefile b/misc/qt5ct/Makefile
index 5536b3ea0f67..6484f9e4a954 100644
--- a/misc/qt5ct/Makefile
+++ b/misc/qt5ct/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qt5ct
-DISTVERSION=	0.39
-PORTREVISION=	1
+DISTVERSION=	0.41
 CATEGORIES=	misc
 MASTER_SITES=	SF/${PORTNAME}
 
@@ -12,12 +11,13 @@ COMMENT=	Qt 5 configuration tool
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
-	libfreetype.so:print/freetype2
+		libfreetype.so:print/freetype2
 
-USES=		compiler:c++11-lang gettext-runtime gl gnome qmake qt:5 tar:bz2
-USE_QT=		core dbus gui svg widgets buildtools_build \
-	linguisttools_build
-USE_GL=	egl gl
+USES=		compiler:c++11-lang gettext-runtime gl gnome qmake \
+		qt:5 tar:bz2 xorg
+USE_QT=		concurrent core dbus gui svg widgets \
+		buildtools_build linguisttools_build
+USE_GL=		egl gl
 USE_XORG=	x11 xext xrender
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
diff --git a/misc/qt5ct/distinfo b/misc/qt5ct/distinfo
index b4b72d663d60..69837ec2d3e6 100644
--- a/misc/qt5ct/distinfo
+++ b/misc/qt5ct/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557658654
-SHA256 (qt5ct-0.39.tar.bz2) = 3769ecdcbdf821d52f7f1e013531a9692c28bab0bae5f133d22cba7702333e19
-SIZE (qt5ct-0.39.tar.bz2) = 70554
+TIMESTAMP = 1568088783
+SHA256 (qt5ct-0.41.tar.bz2) = f24030e90d8b923b60c320b2db5b4c0fcc47f9f35ac4c52060ab3c6e423057dc
+SIZE (qt5ct-0.41.tar.bz2) = 73009
diff --git a/misc/utouch-kmod/Makefile b/misc/utouch-kmod/Makefile
new file mode 100644
index 000000000000..5287efce8562
--- /dev/null
+++ b/misc/utouch-kmod/Makefile
@@ -0,0 +1,41 @@
+# Created by: Vladimir Kondratyev <wulf@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	utouch-kmod
+PORTVERSION=	0.0.1
+CATEGORIES=	misc
+
+MAINTAINER=	wulf@FreeBSD.org
+COMMENT=	Kernel driver for absolute USB HID mouses
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		kmod uidfix
+
+OPTIONS_DEFINE=	SOURCE
+OPTIONS_DEFAULT=SOURCE
+SOURCE_DESC=	Install kernel module sources
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	wulf7
+GH_PROJECT=	utouch
+
+PLIST_FILES=	${KMODDIR}/utouch.ko
+
+KMODSRC_DIR=	sys/modules/${PORTNAME}
+KMODSRC_FILES=	Makefile utouch.c
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSOURCE}
+PLIST_FILES+=	${KMODSRC_FILES:S|^|${KMODSRC_DIR}/|}
+.endif
+
+post-install-SOURCE-on:
+	${MKDIR} ${STAGEDIR}${PREFIX}/${KMODSRC_DIR}
+.for file in ${KMODSRC_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/${KMODSRC_DIR}
+.endfor
+
+.include <bsd.port.mk>
diff --git a/misc/utouch-kmod/distinfo b/misc/utouch-kmod/distinfo
new file mode 100644
index 000000000000..ee80710c1e74
--- /dev/null
+++ b/misc/utouch-kmod/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1567539845
+SHA256 (wulf7-utouch-0.0.1_GH0.tar.gz) = cb173ac478d51af06f3c6cac86c4f4613c8f7f1cb5a23867aae745fa99bdb4ba
+SIZE (wulf7-utouch-0.0.1_GH0.tar.gz) = 5338
diff --git a/misc/utouch-kmod/pkg-descr b/misc/utouch-kmod/pkg-descr
new file mode 100644
index 000000000000..617beceb8754
--- /dev/null
+++ b/misc/utouch-kmod/pkg-descr
@@ -0,0 +1,9 @@
+utouch - Kernel driver for absolute USB HID mouses emulated by some
+virtualization systems like Virtual Box, BHyve, etc. It uses evdev
+protocol to communicate with userland applications like libinput and
+xf86-input-evdev.
+
+The driver should be installed in to the guest FreeBSD system. Host system
+should be configured to emulate mouse as a single-touch USB tablet.
+
+WWW: https://github.com/wulf7/utouch
diff --git a/misc/utouch-kmod/pkg-message b/misc/utouch-kmod/pkg-message
new file mode 100644
index 000000000000..d0c2e4d509f3
--- /dev/null
+++ b/misc/utouch-kmod/pkg-message
@@ -0,0 +1,14 @@
+[
+{ type: install
+  message: <<EOM
+To load installed driver in to the kernel type:
+"kldload /boot/modules/utouch.ko"
+
+It may be necessary to unload conflicting uhid(4) driver
+with "kldunload uhid" after utouch.ko has been loaded.
+
+To load driver automaticaly at the boot time add
+utouch_load="YES" string to /boot/loader.conf file.
+EOM
+}
+]
diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index 42fe86d2350d..cafb8ef002ab 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.0.0-2316
-DISTVERSIONSUFFIX=	-g05b33047c
+DISTVERSION=	1.0.0-2365
+DISTVERSIONSUFFIX=	-g466fde92d
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo
index 23d809e144af..1e5469081497 100644
--- a/multimedia/aom/distinfo
+++ b/multimedia/aom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567204380
-SHA256 (jbeich-aom-v1.0.0-2316-g05b33047c_GH0.tar.gz) = 925c49bf38d07d85ecf506372609b7d4684db27d36631115d8d28fb28f76ddc5
-SIZE (jbeich-aom-v1.0.0-2316-g05b33047c_GH0.tar.gz) = 3414134
+TIMESTAMP = 1568248279
+SHA256 (jbeich-aom-v1.0.0-2365-g466fde92d_GH0.tar.gz) = 8a5c1d506f1e54d3b7ff989c793b5598fa67d5cee10a2a3fad54f8562a05d19e
+SIZE (jbeich-aom-v1.0.0-2365-g466fde92d_GH0.tar.gz) = 3413480
diff --git a/multimedia/cmrtlib/Makefile b/multimedia/cmrtlib/Makefile
index 358a3aed5caa..9e3da5e5c176 100644
--- a/multimedia/cmrtlib/Makefile
+++ b/multimedia/cmrtlib/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cmrtlib
 DISTVERSIONPREFIX=	intel-media-
-DISTVERSION=	19.3.pre3
+DISTVERSION=	19.3.pre4
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/cmrtlib/distinfo b/multimedia/cmrtlib/distinfo
index 31417238069e..96d71dc1f33e 100644
--- a/multimedia/cmrtlib/distinfo
+++ b/multimedia/cmrtlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567063600
-SHA256 (intel-media-driver-intel-media-19.3.pre3_GH0.tar.gz) = 42a09c3c490e7bdf8c766485799a22bddeb29d72b7f3e938e2a434753c793648
-SIZE (intel-media-driver-intel-media-19.3.pre3_GH0.tar.gz) = 15729431
+TIMESTAMP = 1567692073
+SHA256 (intel-media-driver-intel-media-19.3.pre4_GH0.tar.gz) = 957b5114e911248472632aae2c2883dbd04ed639862575c256da1fc928f6c953
+SIZE (intel-media-driver-intel-media-19.3.pre4_GH0.tar.gz) = 15716017
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 6bf008943e78..0d9b11f0c6ba 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	ffmpeg
-PORTVERSION=	4.2
-PORTREVISION=	2
+PORTVERSION=	4.2.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	https://ffmpeg.org/releases/
@@ -304,7 +304,8 @@ LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CONFIGURE_ENABLE=	libbluray
 
 # librsvg
-LIBRSVG2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
+LIBRSVG2_USES=			gnome
+LIBRSVG2_USE=			GNOME=librsvg2
 LIBRSVG2_CONFIGURE_ENABLE=	librsvg
 
 # libxml
@@ -440,7 +441,7 @@ SRT_CONFIGURE_ENABLE=	libsrt
 # svt-av1
 SVTAV1_LIB_DEPENDS=	libSvtAv1Enc.so:multimedia/svt-av1
 SVTAV1_CONFIGURE_ON=	--enable-libsvtav1
-SVTAV1_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.6.0-151-gcd79924e/ffmpeg_plugin/:svtav1
+SVTAV1_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.6.0-277-gb7b71ce4/ffmpeg_plugin/:svtav1
 SVTAV1_PATCHFILES=	0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1
 .if make(makesum)
 .MAKEFLAGS:		WITH+=SVTAV1
@@ -452,7 +453,7 @@ SVTAV1_PREVENTS_MSG=	Only one SVT vendor patch can be applied at the same time
 # svt-hevc
 SVTHEVC_LIB_DEPENDS=	libSvtHevcEnc.so:multimedia/svt-hevc
 SVTHEVC_CONFIGURE_ON=	--enable-libsvthevc
-SVTHEVC_PATCH_SITES=	https://github.com/Intel/SVT-HEVC/raw/v1.4.0/ffmpeg_plugin/:svthevc
+SVTHEVC_PATCH_SITES=	https://github.com/Intel/SVT-HEVC/raw/v1.4.1/ffmpeg_plugin/:svthevc
 SVTHEVC_PATCHFILES=	0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \
 			0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc
 .if make(makesum)
@@ -599,10 +600,7 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \
 		--enable-shared \
 		--enable-pic \
 		--enable-gpl \
-		--enable-postproc \
-		--enable-avfilter \
 		--enable-avresample \
-		--enable-pthreads \
 		--cc="${CC}"
 
 DOC_FILES=	Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 5c5bc49c373b..ba579777d37b 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1565039500
-SHA256 (ffmpeg-4.2.tar.xz) = 023f10831a97ad93d798f53a3640e55cd564abfeba807ecbe8524dac4fedecd5
-SIZE (ffmpeg-4.2.tar.xz) = 9088756
-SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 898dbbdb21cfafbb19381463382467fbe5c5a78ca3844f8c5583fa919b7d5a82
-SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 19723
-SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = d9bd8345ff994c26d5174759d460c723e92012139e29dd015fe83537e29a9554
-SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 20927
-SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 295220f498680d893bec525321e657dc3cdb98080a7117d1f575cd0508996a0e
-SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5273
+TIMESTAMP = 1567808306
+SHA256 (ffmpeg-4.2.1.tar.xz) = cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4
+SIZE (ffmpeg-4.2.1.tar.xz) = 9090632
+SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 4a46ec64650b3ae319021afbf969ec4e56653696089ff6cabc5c9c0e29d730e1
+SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 22632
+SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = d2db0acbdb0773f3883746cd25996905ff0a3f539d9b434fe314f883856ad883
+SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 21806
+SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
+SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5332
 SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = d2abcdcbcbff21e7ad8de574230622be993da19e9bddf0a690b1118cfd11c6c1
 SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 21580
diff --git a/multimedia/ffmpeg/files/patch-libavformat_matroskadec.c b/multimedia/ffmpeg/files/patch-libavformat_matroskadec.c
deleted file mode 100644
index f37cb5265658..000000000000
--- a/multimedia/ffmpeg/files/patch-libavformat_matroskadec.c
+++ /dev/null
@@ -1,13 +0,0 @@
-https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/299e0dff1fbc
-
---- libavformat/matroskadec.c.orig	2019-08-05 20:52:21 UTC
-+++ libavformat/matroskadec.c
-@@ -757,7 +757,7 @@ static int matroska_reset_status(MatroskaDemuxContext 
-                                  uint32_t id, int64_t position)
- {
-     if (position >= 0) {
--        int err = avio_seek(matroska->ctx->pb, position, SEEK_SET);
-+        int64_t err = avio_seek(matroska->ctx->pb, position, SEEK_SET);
-         if (err < 0)
-             return err;
-     }
diff --git a/multimedia/gstreamer1-plugins-svt-hevc/Makefile b/multimedia/gstreamer1-plugins-svt-hevc/Makefile
index 30ec3a233dcb..cf9327897424 100644
--- a/multimedia/gstreamer1-plugins-svt-hevc/Makefile
+++ b/multimedia/gstreamer1-plugins-svt-hevc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	svt-hevc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.0
+DISTVERSION=	1.4.1
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	gstreamer1-plugins-
 
diff --git a/multimedia/gstreamer1-plugins-svt-hevc/distinfo b/multimedia/gstreamer1-plugins-svt-hevc/distinfo
index 48bb8e7b49ca..b6ac267f21d3 100644
--- a/multimedia/gstreamer1-plugins-svt-hevc/distinfo
+++ b/multimedia/gstreamer1-plugins-svt-hevc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565309873
-SHA256 (OpenVisualCloud-SVT-HEVC-v1.4.0_GH0.tar.gz) = 7bb2ed0d6a46dbb6478127762b12f3d21a7901fd68876ce61f91360c5c52798e
-SIZE (OpenVisualCloud-SVT-HEVC-v1.4.0_GH0.tar.gz) = 1225319
+TIMESTAMP = 1567986865
+SHA256 (OpenVisualCloud-SVT-HEVC-v1.4.1_GH0.tar.gz) = 8ceb14acddd0af48e87deb17dc0a54fc9f82c50d6e0b392076fa8f7d0533f74b
+SIZE (OpenVisualCloud-SVT-HEVC-v1.4.1_GH0.tar.gz) = 1221678
diff --git a/multimedia/kvazaar/Makefile b/multimedia/kvazaar/Makefile
index 44dd6b9935f0..d26073988bf9 100644
--- a/multimedia/kvazaar/Makefile
+++ b/multimedia/kvazaar/Makefile
@@ -6,6 +6,9 @@ DISTVERSION?=	1.3.0
 PORTREVISION=	1
 CATEGORIES=	multimedia
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	1d7fcf4227ee.patch:-p1
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	H.265/HEVC encoder implemented in C
 
diff --git a/multimedia/kvazaar/distinfo b/multimedia/kvazaar/distinfo
index c39dffe61cfb..03b412e0b945 100644
--- a/multimedia/kvazaar/distinfo
+++ b/multimedia/kvazaar/distinfo
@@ -3,3 +3,5 @@ SHA256 (ultravideo-kvazaar-v1.3.0_GH0.tar.gz) = f694fe71cc6e3e6f583a9faf380825ea
 SIZE (ultravideo-kvazaar-v1.3.0_GH0.tar.gz) = 538824
 SHA256 (silentbicycle-greatest-v1.0.0_GH0.tar.gz) = 18ee57a34869c6f6ce511cd71a5cc8661801cf69d64c4c66ff76773835df659b
 SIZE (silentbicycle-greatest-v1.0.0_GH0.tar.gz) = 11959
+SHA256 (1d7fcf4227ee.patch) = b310a1e778c937d0105c4acff7b9363369d68671295f9370f261a66e93201d67
+SIZE (1d7fcf4227ee.patch) = 715
diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile
index 9ab192a8e12a..d10c6d16005c 100644
--- a/multimedia/libmediainfo/Makefile
+++ b/multimedia/libmediainfo/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libmediainfo
-PORTVERSION=	19.07
-PORTREVISION=	1
+PORTVERSION=	19.09
 CATEGORIES=	multimedia
 MASTER_SITES=	https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \
 		LOCAL/sunpoet
diff --git a/multimedia/libmediainfo/distinfo b/multimedia/libmediainfo/distinfo
index 0dc9b09ef941..021cc8ccd5bc 100644
--- a/multimedia/libmediainfo/distinfo
+++ b/multimedia/libmediainfo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563385079
-SHA256 (MediaInfo_CLI_19.07_GNU_FromSource.tar.xz) = 94460b3782c6923627273fa799b8fdaa529cff1481f6129c2ab7efb4cfced974
-SIZE (MediaInfo_CLI_19.07_GNU_FromSource.tar.xz) = 3050860
+TIMESTAMP = 1568290940
+SHA256 (MediaInfo_CLI_19.09_GNU_FromSource.tar.xz) = 3fb3e513feb65c82a995b500f826caa9bfe6c3abb890242d6160f390db7befc9
+SIZE (MediaInfo_CLI_19.09_GNU_FromSource.tar.xz) = 3126924
diff --git a/multimedia/libva-intel-media-driver/Makefile b/multimedia/libva-intel-media-driver/Makefile
index 60fd5a39079c..68a2fd013fea 100644
--- a/multimedia/libva-intel-media-driver/Makefile
+++ b/multimedia/libva-intel-media-driver/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	media-driver
 DISTVERSIONPREFIX=	intel-media-
-DISTVERSION=	19.3.pre3
+DISTVERSION=	19.3.pre4
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	libva-intel-
 
diff --git a/multimedia/libva-intel-media-driver/distinfo b/multimedia/libva-intel-media-driver/distinfo
index 31417238069e..96d71dc1f33e 100644
--- a/multimedia/libva-intel-media-driver/distinfo
+++ b/multimedia/libva-intel-media-driver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567063600
-SHA256 (intel-media-driver-intel-media-19.3.pre3_GH0.tar.gz) = 42a09c3c490e7bdf8c766485799a22bddeb29d72b7f3e938e2a434753c793648
-SIZE (intel-media-driver-intel-media-19.3.pre3_GH0.tar.gz) = 15729431
+TIMESTAMP = 1567692073
+SHA256 (intel-media-driver-intel-media-19.3.pre4_GH0.tar.gz) = 957b5114e911248472632aae2c2883dbd04ed639862575c256da1fc928f6c953
+SIZE (intel-media-driver-intel-media-19.3.pre4_GH0.tar.gz) = 15716017
diff --git a/multimedia/libzen/Makefile b/multimedia/libzen/Makefile
index 11441d12d236..8bb7c3119d8d 100644
--- a/multimedia/libzen/Makefile
+++ b/multimedia/libzen/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libzen
-PORTVERSION=	19.07
-PORTREVISION=	1
+PORTVERSION=	19.09
 CATEGORIES=	multimedia
 MASTER_SITES=	https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \
 		LOCAL/sunpoet
diff --git a/multimedia/libzen/distinfo b/multimedia/libzen/distinfo
index 34ed7e672a39..12563b3a944b 100644
--- a/multimedia/libzen/distinfo
+++ b/multimedia/libzen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563385076
-SHA256 (MediaInfo_CLI_19.07_GNU_FromSource.tar.xz) = 94460b3782c6923627273fa799b8fdaa529cff1481f6129c2ab7efb4cfced974
-SIZE (MediaInfo_CLI_19.07_GNU_FromSource.tar.xz) = 3050860
+TIMESTAMP = 1568290943
+SHA256 (MediaInfo_CLI_19.09_GNU_FromSource.tar.xz) = 3fb3e513feb65c82a995b500f826caa9bfe6c3abb890242d6160f390db7befc9
+SIZE (MediaInfo_CLI_19.09_GNU_FromSource.tar.xz) = 3126924
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index fa2d82b6aa8e..881031dcfae7 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -14,10 +14,6 @@ COMMENT=	Video editing system
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		fails to patch
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2019-09-04
-
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
 		${LOCALBASE}/bin/analyseplugin:audio/ladspa
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
@@ -52,8 +48,10 @@ RUN_DEPENDS=	${LOCALBASE}/bin/analyseplugin:audio/ladspa \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		compiler:c++11-lib gettext-runtime ghostscript:run libtool \
-		localbase pathfix perl5 pkgconfig python shebangfix tar:bzip2
+USES=		autoreconf compiler:c++11-lib gettext-runtime gettext-tools \
+		ghostscript:run gl gnome \
+		libtool localbase pathfix perl5 pkgconfig python sdl \
+		shebangfix tar:bzip2 xorg
 SHEBANG_FILES=	build-lives-rfx-plugin build-lives-rfx-plugin-multi \
 		smogrify tools/autolives.pl lives-plugins/plugins/encoders/*_encoder \
 		lives-plugins/marcos-encoders/*encoder* \
@@ -75,7 +73,7 @@ DOC_FILES=	AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README \
 		lives-plugins/marcos-encoders/README.multi_encoder \
 		weed-docs/weedspec.txt weed-docs/weedevents.txt
 
-OPTIONS_DEFINE=	DOCS DOXYGEN FREI0R MATROSKA NLS
+OPTIONS_DEFINE=	DOCS DOXYGEN FREI0R MATROSKA V4L NLS
 OPTIONS_SUB=	yes
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
@@ -84,6 +82,8 @@ FREI0R_BUILD_DEPENDS=	frei0r>0:graphics/frei0r
 FREI0R_RUN_DEPENDS=	frei0r>0:graphics/frei0r
 FREI0R_CONFIGURE_ENV_OFF=	ac_cv_header_frei0r_h=no
 MATROSKA_RUN_DEPENDS=	mkvmerge:multimedia/mkvtoolnix
+V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
+V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 NLS_USES=		gettext-tools
 NLS_CONFIGURE_OFF=	--disable-nls
 
@@ -113,7 +113,7 @@ post-install-DOCS-on:
 	${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-DOXYGEN-on:
-	@(cd ${STAGEDIR}${PREFIX} && ${FIND} ${DOCSDIR:S|${PREFIX}/||}/html \
-		! -type d >> ${TMPPLIST})
+	@(cd ${STAGEDIR}${PREFIX} && ${FIND} ${DOCSDIR_REL}/html \
+		-not -type d >> ${TMPPLIST})
 
 .include <bsd.port.mk>
diff --git a/multimedia/lives/files/patch-Makefile.am b/multimedia/lives/files/patch-Makefile.am
new file mode 100644
index 000000000000..1dca074cac5e
--- /dev/null
+++ b/multimedia/lives/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2019-04-16 07:43:04 UTC
++++ Makefile.am
+@@ -35,7 +35,7 @@ endif
+ SUBDIRS = $(OSC_SUBDIRS) intl $(WEED_SUBDIRS) src m4 lives-plugins po resources
+ PACKAGE_CAPITALISED = LiVES
+ 
+-docdir = "$(prefix)/share/doc/$(PACKAGE)-$(VERSION)"
++docdir = "$(prefix)/share/doc/$(PACKAGE)"
+ sharedir = "$(prefix)/share"
+ 
+ if HAVE_DOXYGEN
diff --git a/multimedia/lives/files/patch-configure b/multimedia/lives/files/patch-configure
deleted file mode 100644
index 2f1a306d4549..000000000000
--- a/multimedia/lives/files/patch-configure
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.orig	2015-12-23 17:59:14 UTC
-+++ configure
-@@ -28352,7 +28352,6 @@ if test -n "$WEED_CFLAGS"; then
-   test $ac_status = 0; }; then
-   pkg_cv_WEED_CFLAGS=`$PKG_CONFIG --cflags "libweed >= 0.8.0" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
--else
-   pkg_failed=yes
- fi
-  else
-@@ -28441,7 +28440,6 @@ if test -n "$WEED_SLICE_CFLAGS"; then
-   test $ac_status = 0; }; then
-   pkg_cv_WEED_SLICE_CFLAGS=`$PKG_CONFIG --cflags "libweed_slice >= 0.8.0" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
--else
-   pkg_failed=yes
- fi
-  else
-@@ -28531,7 +28529,6 @@ if test -n "$WEED_UTILS_CFLAGS"; then
-   test $ac_status = 0; }; then
-   pkg_cv_WEED_UTILS_CFLAGS=`$PKG_CONFIG --cflags "libweed-utils >= 0.8.0" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
--else
-   pkg_failed=yes
- fi
-  else
-@@ -28620,7 +28617,6 @@ if test -n "$WEED_COMPAT_CFLAGS"; then
-   test $ac_status = 0; }; then
-   pkg_cv_WEED_COMPAT_CFLAGS=`$PKG_CONFIG --cflags "libweed-compat >= 0.9.0" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
--else
-   pkg_failed=yes
- fi
-  else
-@@ -28709,7 +28705,6 @@ if test -n "$WEED_PLUGIN_CFLAGS"; then
-   test $ac_status = 0; }; then
-   pkg_cv_WEED_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "libweed-plugin >= 0.13.0" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
--else
-   pkg_failed=yes
- fi
-  else
diff --git a/multimedia/lives/files/patch-configure.ac b/multimedia/lives/files/patch-configure.ac
new file mode 100644
index 000000000000..d6e315d21925
--- /dev/null
+++ b/multimedia/lives/files/patch-configure.ac
@@ -0,0 +1,22 @@
+--- configure.ac.orig	2019-01-08 13:49:30 UTC
++++ configure.ac
+@@ -520,14 +520,16 @@ HAVE_OPENCV=false
+ 
+ dnl check for opencv
+ 
+-PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, HAVE_OPENCV=true, HAVE_OPENCV=false)
++PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, HAVE_OPENCV=true, HAVE_OPENCV=false)
+ 
+-if test "HAVE_OPENCV" = "true" ; then
+-OPENCV_LIBS_ONLY_L = `pkg-config opencv --libs-only-L`
++if test "$HAVE_OPENCV" = "true" ; then
++OPENCV_LIBS_ONLY_L=`$PKG_CONFIG opencv --libs-only-L`
++OPENCV_LIBS_ONLY_OTHER=`$PKG_CONFIG opencv --libs-only-other`
+ fi
+ 
+ AC_SUBST(OPENCV_CFLAGS)
+ AC_SUBST(OPENCV_LIBS_ONLY_L)
++AC_SUBST(OPENCV_LIBS_ONLY_OTHER)
+ 
+ AM_CONDITIONAL(HAVE_OPENCV,$HAVE_OPENCV)
+ 
diff --git a/multimedia/lives/files/patch-ffmpeg4 b/multimedia/lives/files/patch-ffmpeg4
deleted file mode 100644
index dea84678f63b..000000000000
--- a/multimedia/lives/files/patch-ffmpeg4
+++ /dev/null
@@ -1,343 +0,0 @@
-https://sourceforge.net/p/lives/code/2742/
-https://sourceforge.net/p/lives/code/2745/
-
---- configure.orig	2017-06-29 01:44:43 UTC
-+++ configure
-@@ -787,6 +787,8 @@ HAVE_AVFORMAT_NEW_STREAM_FALSE
- HAVE_AVFORMAT_NEW_STREAM_TRUE
- HAVE_AV_CODEC_SET_PKT_TIMEBASE_FALSE
- HAVE_AV_CODEC_SET_PKT_TIMEBASE_TRUE
-+HAVE_AVCODEC_GET_NAME_FALSE
-+HAVE_AVCODEC_GET_NAME_TRUE
- HAVE_AVCODEC_ALLOC_CONTEXT3_FALSE
- HAVE_AVCODEC_ALLOC_CONTEXT3_TRUE
- HAVE_AVCODEC_OPEN2_FALSE
-@@ -26007,6 +26009,7 @@ fi
- 
- HAVE_AVCODEC_OPEN2=false
- HAVE_AVCODEC_ALLOC_CONTEXT3=false
-+HAVE_AVCODEC_GET_NAME=false
- HAVE_AV_CODEC_SET_PKT_TIMEBASE=false
- HAVE_AVFORMAT_NEW_STREAM=false
- HAVE_AVFORMAT_FIND_STREAM_INFO=false
-@@ -26103,6 +26106,48 @@ else
-   HAVE_AVCODEC_ALLOC_COBTEXT3=false
- fi
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_get_name in -lavcodec" >&5
-+$as_echo_n "checking for avcodec_get_name in -lavcodec... " >&6; }
-+if ${ac_cv_lib_avcodec_avcodec_get_name+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lavcodec  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char avcodec_get_name ();
-+int
-+main ()
-+{
-+return avcodec_get_name ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_avcodec_avcodec_get_name=yes
-+else
-+  ac_cv_lib_avcodec_avcodec_get_name=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_get_name" >&5
-+$as_echo "$ac_cv_lib_avcodec_avcodec_get_name" >&6; }
-+if test "x$ac_cv_lib_avcodec_avcodec_get_name" = xyes; then :
-+  HAVE_AVCODEC_GET_NAME=true
-+else
-+  HAVE_AVCODEC_GET_NAME=false
-+fi
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_codec_set_pkt_timebase in -lavcodec" >&5
- $as_echo_n "checking for av_codec_set_pkt_timebase in -lavcodec... " >&6; }
- if ${ac_cv_lib_avcodec_av_codec_set_pkt_timebase+:} false; then :
-@@ -26525,6 +26570,14 @@ else
-   HAVE_AVCODEC_ALLOC_CONTEXT3_FALSE=
- fi
- 
-+ if $HAVE_AVCODEC_GET_NAME; then
-+  HAVE_AVCODEC_GET_NAME_TRUE=
-+  HAVE_AVCODEC_GET_NAME_FALSE='#'
-+else
-+  HAVE_AVCODEC_GET_NAME_TRUE='#'
-+  HAVE_AVCODEC_GET_NAME_FALSE=
-+fi
-+
-  if $HAVE_AV_CODEC_SET_PKT_TIMEBASE; then
-   HAVE_AV_CODEC_SET_PKT_TIMEBASE_TRUE=
-   HAVE_AV_CODEC_SET_PKT_TIMEBASE_FALSE='#'
-@@ -29545,6 +29598,10 @@ Usually this means the macro was only invoked conditio
- fi
- if test -z "${HAVE_AVCODEC_ALLOC_CONTEXT3_TRUE}" && test -z "${HAVE_AVCODEC_ALLOC_CONTEXT3_FALSE}"; then
-   as_fn_error $? "conditional \"HAVE_AVCODEC_ALLOC_CONTEXT3\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${HAVE_AVCODEC_GET_NAME_TRUE}" && test -z "${HAVE_AVCODEC_GET_NAME_FALSE}"; then
-+  as_fn_error $? "conditional \"HAVE_AVCODEC_GET_NAME\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_AV_CODEC_SET_PKT_TIMEBASE_TRUE}" && test -z "${HAVE_AV_CODEC_SET_PKT_TIMEBASE_FALSE}"; then
---- lives-plugins/plugins/decoders/asf_decoder.c.orig	2017-05-24 02:07:10 UTC
-+++ lives-plugins/plugins/decoders/asf_decoder.c
-@@ -439,7 +439,7 @@ static int get_next_video_packet(const lives_clip_data
- 
- 
-   if (tdts == -1) {
--    priv->avpkt.size = priv->def_packet_size + FF_INPUT_BUFFER_PADDING_SIZE;
-+    priv->avpkt.size = priv->def_packet_size + AV_INPUT_BUFFER_PADDING_SIZE;
-     priv->avpkt.data = malloc(priv->avpkt.size);
-     memset(priv->avpkt.data, 0, priv->avpkt.size);
-   }
-@@ -714,10 +714,10 @@ static int get_next_video_packet(const lives_clip_data
-             fprintf(stderr, "asf_decoder: buffer overflow reading vid packet (%d + %d > %d),\n increasing buffer size\n",
-                     asf->packet_frag_offset, asf->packet_frag_size, priv->avpkt.size);
- 
--            priv->avpkt.data = realloc(priv->avpkt.data, priv->def_packet_size * 2 + FF_INPUT_BUFFER_PADDING_SIZE);
-+            priv->avpkt.data = realloc(priv->avpkt.data, priv->def_packet_size * 2 + AV_INPUT_BUFFER_PADDING_SIZE);
-             memset(priv->avpkt.data + priv->avpkt.size, 0, priv->def_packet_size);
-             priv->def_packet_size *= 2;
--            priv->avpkt.size = priv->def_packet_size + FF_INPUT_BUFFER_PADDING_SIZE;
-+            priv->avpkt.size = priv->def_packet_size + AV_INPUT_BUFFER_PADDING_SIZE;
-           }
- 
-           if (read(priv->fd, priv->avpkt.data + asf->packet_frag_offset, asf->packet_frag_size)
-@@ -1436,8 +1436,8 @@ seek_skip:
-           if (!got_vidst) {
-             priv->st->codec->extradata_size = size - 40;
- 
--            priv->st->codec->extradata = malloc(priv->st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
--            memset(priv->st->codec->extradata, 0, priv->st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+            priv->st->codec->extradata = malloc(priv->st->codec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
-+            memset(priv->st->codec->extradata, 0, priv->st->codec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
- 
-             if (read(priv->fd, priv->st->codec->extradata,
-                      priv->st->codec->extradata_size) < priv->st->codec->extradata_size) {
---- lives-plugins/plugins/decoders/avformat_decoder.c.orig	2017-05-12 12:35:30 UTC
-+++ lives-plugins/plugins/decoders/avformat_decoder.c
-@@ -368,8 +368,12 @@ skip_init:
- 
-       get_samps_and_signed(cc->sample_fmt, &cdata->asamps, &cdata->asigned);
- 
--      sprintf(cdata->audio_name, "%s", cc->codec_name);
--
-+#ifdef HAVE_AVCODEC_GET_NAME
-+      sprintf(cdata->audio_name, "%s", avcodec_get_name(cc->codec_id));
-+#else
-+      sprintf(cdata->audio_name, "%s", cc->codec->name);
-+#endif
-+      
-       priv->astream = i;
-       break;
- 
-@@ -408,7 +412,11 @@ skip_init:
-         return FALSE;
-       }
- 
--      sprintf(cdata->video_name, "%s", cc->codec_name);
-+#ifdef HAVE_AVCODEC_GET_NAME
-+      sprintf(cdata->video_name, "%s", avcodec_get_name(cc->codec_id));
-+#else
-+      sprintf(cdata->video_name, "%s", cc->codec->name);
-+#endif
- 
-       cdata->par = cc->sample_aspect_ratio.num / cc->sample_aspect_ratio.den;
-       if (cdata->par == 0) cdata->par = 1;
---- lives-plugins/plugins/decoders/flv_decoder.c.orig	2017-05-11 22:46:57 UTC
-+++ lives-plugins/plugins/decoders/flv_decoder.c
-@@ -465,7 +465,7 @@ static int flv_get_extradata(lives_clip_data_t *cdata,
-   lives_flv_priv_t *priv = cdata->priv;
- 
-   av_free(priv->ctx->extradata);
--  priv->ctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+  priv->ctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-   if (priv->ctx->extradata == NULL) return AVERROR(ENOMEM);
-   priv->ctx->extradata_size = size;
-   dummy = read(priv->fd, priv->ctx->extradata, priv->ctx->extradata_size);
-@@ -1143,12 +1143,12 @@ static boolean attach_stream(lives_clip_data_t *cdata,
- 
-   if (isclone) return TRUE;
- 
--  pack.data = malloc(pack.size - priv->pack_offset + FF_INPUT_BUFFER_PADDING_SIZE);
-+  pack.data = malloc(pack.size - priv->pack_offset + AV_INPUT_BUFFER_PADDING_SIZE);
- 
-   av_init_packet(&priv->avpkt);
- 
-   priv->avpkt.size = read(priv->fd, pack.data, pack.size - priv->pack_offset);
--  memset(pack.data + priv->avpkt.size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+  memset(pack.data + priv->avpkt.size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
-   priv->input_position += pack.size + 4;
-   priv->avpkt.data = pack.data;
-   priv->avpkt.dts = priv->avpkt.pts = pack.dts;
-@@ -1206,10 +1206,10 @@ static boolean attach_stream(lives_clip_data_t *cdata,
-             continue;
-           }
- 
--          pack.data = malloc(pack.size - priv->pack_offset + FF_INPUT_BUFFER_PADDING_SIZE);
-+          pack.data = malloc(pack.size - priv->pack_offset + AV_INPUT_BUFFER_PADDING_SIZE);
-           if (priv->pack_offset != 5) lseek(priv->fd, priv->pack_offset - 5, SEEK_CUR);
-           priv->avpkt.size = read(priv->fd, pack.data, pack.size - priv->pack_offset);
--          memset(pack.data + priv->avpkt.size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+          memset(pack.data + priv->avpkt.size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
-           priv->avpkt.data = pack.data;
-           break;
-         }
-@@ -1709,12 +1709,12 @@ boolean get_frame(const lives_clip_data_t *cdata, int6
-         continue;
-       }
- 
--      pack.data = malloc(pack.size - priv->pack_offset + FF_INPUT_BUFFER_PADDING_SIZE);
-+      pack.data = malloc(pack.size - priv->pack_offset + AV_INPUT_BUFFER_PADDING_SIZE);
- 
-       if (priv->pack_offset != 1) lseek(priv->fd, priv->pack_offset - 1, SEEK_CUR);
- 
-       priv->avpkt.size = read(priv->fd, pack.data, pack.size - priv->pack_offset);
--      memset(pack.data + priv->avpkt.size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+      memset(pack.data + priv->avpkt.size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
-       priv->avpkt.data = pack.data;
-       priv->avpkt.dts = priv->avpkt.pts = pack.dts;
- 
---- lives-plugins/plugins/decoders/libav_helper.h.orig	2017-05-12 05:48:30 UTC
-+++ lives-plugins/plugins/decoders/libav_helper.h
-@@ -117,6 +117,21 @@ static UNUSED void av_set_pts_info(AVStream *s, int pt
- #define av_get_bits_per_sample(a) (av_get_bytes_per_sample(a) * 8)
- #endif
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0)
-+#ifndef FF_INPUT_BUFFER_PADDING_SIZE
-+#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_MIN_SIZE
-+#else
-+#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE
-+#endif
-+#else
-+#ifndef AV_INPUT_BUFFER_PADDING_SIZE
-+#define AV_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_MIN_SIZE
-+#endif
-+#endif
-+
-+#ifndef AV_CODEC_FLAG_GLOBAL_HEADER
-+#define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
-+#endif
- 
- 
- #endif // HAVE_LIBAV_LIBS
---- lives-plugins/plugins/decoders/mkv_decoder.c.orig	2017-05-12 08:39:45 UTC
-+++ lives-plugins/plugins/decoders/mkv_decoder.c
-@@ -883,7 +883,7 @@ static void matroska_fix_ass_packet(MatroskaDemuxConte
-     es = ec /   100;
-     ec -=    100 * es;
-     *ptr++ = '\0';
--    len = 50 + end - ptr + FF_INPUT_BUFFER_PADDING_SIZE;
-+    len = 50 + end - ptr + AV_INPUT_BUFFER_PADDING_SIZE;
-     if (!(line = malloc(len)))
-       return;
-     snprintf(line, len, "Dialogue: %s,%d:%02d:%02d.%02d,%d:%02d:%02d.%02d,%s\r\n",
-@@ -1544,7 +1544,7 @@ static int lives_mkv_read_header(lives_clip_data_t *cd
-         st->codec->extradata_size = extradata_size;
-       } else if (track->codec_priv.data && track->codec_priv.size > 0) {
-         st->codec->extradata = calloc(track->codec_priv.size +
--                                      FF_INPUT_BUFFER_PADDING_SIZE, 1);
-+                                      AV_INPUT_BUFFER_PADDING_SIZE, 1);
-         if (st->codec->extradata == NULL) {
-           fprintf(stderr,
-                   "mkv_decoder: Out of memory\n");
---- lives-plugins/plugins/decoders/mpegts_decoder.c.orig	2017-05-12 12:37:42 UTC
-+++ lives-plugins/plugins/decoders/mpegts_decoder.c
-@@ -125,7 +125,7 @@ static inline void skip_bits(GetBitContext *s, int n) 
- 
- /**
-  * init GetBitContext.
-- * @param buffer bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE bytes larger than the actual read bits
-+ * @param buffer bitstream buffer, must be AV_INPUT_BUFFER_PADDING_SIZE bytes larger than the actual read bits
-  * because some optimized bitstream readers read 32 or 64 bit at once and could read over the end
-  * @param bit_size the size of the buffer in bits
-  *
-@@ -337,6 +337,7 @@ struct MpegTSContext {
-   MpegTSFilter *pids[NB_PID_MAX];
- };
- 
-+/*
- static const AVOption options[] = {
-   {
-     "compute_pcr", "Compute exact PCR for each transport stream packet.", offsetof(MpegTSContext, mpeg2ts_compute_pcr), AV_OPT_TYPE_INT,
-@@ -344,6 +345,7 @@ static const AVOption options[] = {
-   },
-   { NULL },
- };
-+*/
- 
- /* TS stream handling */
- 
-@@ -1035,7 +1037,7 @@ static void new_pes_packet(PESContext *pes, AVPacket *
-     fprintf(stderr, "mpegts_decoder: PES packet size mismatch\n");
-     //pes->flags |= AV_PKT_FLAG_CORRUPT;
-   }
--  memset(pkt->data + pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+  memset(pkt->data + pkt->size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- 
-   // Separate out the AC3 substream from an HDMV combined TrueHD/AC3 PID
-   if (pes->sub_st && pes->stream_type == 0x83 && pes->extended_stream_id == 0x76)
-@@ -1192,7 +1194,7 @@ static int mpegts_push_data(lives_clip_data_t *cdata, 
-             pes->total_size = MAX_PES_PAYLOAD;
- 
-           /* allocate pes buffer */
--          pes->buffer = av_malloc(pes->total_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+          pes->buffer = av_malloc(pes->total_size + AV_INPUT_BUFFER_PADDING_SIZE);
-           if (!pes->buffer)
-             return AVERROR(ENOMEM);
- 
-@@ -1289,7 +1291,7 @@ skip:
-         if (pes->data_index > 0 && pes->data_index + buf_size > pes->total_size) {
-           new_pes_packet(pes, ts->pkt);
-           pes->total_size = MAX_PES_PAYLOAD;
--          pes->buffer = av_malloc(pes->total_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+          pes->buffer = av_malloc(pes->total_size + AV_INPUT_BUFFER_PADDING_SIZE);
-           if (!pes->buffer)
-             return AVERROR(ENOMEM);
-           ts->stop_parse = 1;
-@@ -1454,7 +1456,7 @@ int ff_mp4_read_dec_config_descr(lives_clip_data_t *cd
-     if (!len || (uint64_t)len > (1 << 30))
-       return -1;
-     av_free(st->codec->extradata);
--    st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);
-+    st->codec->extradata = av_mallocz(len + AV_INPUT_BUFFER_PADDING_SIZE);
-     if (!st->codec->extradata)
-       return AVERROR(ENOMEM);
-     memcpy(st->codec->extradata, p, len);
-@@ -1802,7 +1804,7 @@ int ff_parse_mpeg2_descriptor(lives_clip_data_t *cdata
-       //if (st->codec->extradata_size == 4 && memcmp(st->codec->extradata, *pp, 4))
-       //av_log_ask_for_sample(fc, "DVB sub with multiple IDs\n");
-       //} else {
--      st->codec->extradata = av_malloc(4 + FF_INPUT_BUFFER_PADDING_SIZE);
-+      st->codec->extradata = av_malloc(4 + AV_INPUT_BUFFER_PADDING_SIZE);
-       if (st->codec->extradata) {
-         st->codec->extradata_size = 4;
-         memcpy(st->codec->extradata, *pp, 4);
-@@ -3141,8 +3143,8 @@ skip_det:
- 
-   priv->codec = codec;
- 
--  if (codec->capabilities & CODEC_CAP_TRUNCATED)
--    ctx->flags |= CODEC_FLAG_TRUNCATED;
-+  if (codec->capabilities & AV_CODEC_CAP_TRUNCATED)
-+    ctx->flags |= AV_CODEC_FLAG_TRUNCATED;
- 
-   // re-scan with avcodec; priv->data_start holds video data start position
- 
diff --git a/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am b/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am
new file mode 100644
index 000000000000..de60be50c6f2
--- /dev/null
+++ b/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am
@@ -0,0 +1,12 @@
+--- lives-plugins/weed-plugins/Makefile.am.orig	2019-04-14 20:00:14 UTC
++++ lives-plugins/weed-plugins/Makefile.am
+@@ -85,7 +85,8 @@ endif
+ 
+ if HAVE_OPENCV
+ farneback_analyser_libs = farneback_analyser.la
+-farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) -lopencv_core -lopencv_video
++farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) $(OPENCV_LIBS_ONLY_OTHER) -lopencv_core -lopencv_video
++farneback_analyser_la_CXXFLAGS = $(OPENCV_CFLAGS)
+ farneback_analyser_la_CPPFLAGS = $(AM_CPPFLAGS)
+ farneback_analyser_la_SOURCES = farneback_analyser.cpp
+ 
diff --git a/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am b/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am
new file mode 100644
index 000000000000..36402bed045c
--- /dev/null
+++ b/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am
@@ -0,0 +1,13 @@
+--- lives-plugins/weed-plugins/gdk/Makefile.am.orig	2019-04-15 10:55:37 UTC
++++ lives-plugins/weed-plugins/gdk/Makefile.am
+@@ -59,8 +59,8 @@ EXTRA_DIST=data icons
+ 
+ install-data-local:
+ 	mkdir -p "$(DESTDIR)$(fxpluginslibdir)"
+-	cp -rf data/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/data/"
+-	cp -rf icons/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/icons/"
++	cp -rf data "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/data"
++	cp -rf icons "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/icons"
+ 	$(MAKE) -i install-data-local-remove-vcs-files
+ 
+ install-data-local-remove-vcs-files:
diff --git a/multimedia/lives/pkg-plist b/multimedia/lives/pkg-plist
index 39bb88b783f1..0279b634115c 100644
--- a/multimedia/lives/pkg-plist
+++ b/multimedia/lives/pkg-plist
@@ -76,11 +76,6 @@ lib/lives/plugins/effects/realtime/weed/ccorrect.so
 lib/lives/plugins/effects/realtime/weed/colorkey.so
 lib/lives/plugins/effects/realtime/weed/comic.so
 lib/lives/plugins/effects/realtime/weed/compositor.so
-lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/examples.txt
-lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/modulations.txt
-lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/newlives.txt
-lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/regrlives.txt
-lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/roselives.txt
 lib/lives/plugins/effects/realtime/weed/data_processor.so
 lib/lives/plugins/effects/realtime/weed/data_unpacker.so
 lib/lives/plugins/effects/realtime/weed/deinterlace.so
@@ -88,8 +83,13 @@ lib/lives/plugins/effects/realtime/weed/edge.so
 lib/lives/plugins/effects/realtime/weed/farneback_analyser.so
 lib/lives/plugins/effects/realtime/weed/fg_bg_removal.so
 lib/lives/plugins/effects/realtime/weed/fireTV.so
-lib/lives/plugins/effects/realtime/weed/fourKlives.so
 %%FREI0R%%lib/lives/plugins/effects/realtime/weed/frei0r/frei0r.so
+lib/lives/plugins/effects/realtime/weed/fourKlives.so
+lib/lives/plugins/effects/realtime/weed/fourKlives/songs/examples.txt
+lib/lives/plugins/effects/realtime/weed/fourKlives/songs/modulations.txt
+lib/lives/plugins/effects/realtime/weed/fourKlives/songs/newlives.txt
+lib/lives/plugins/effects/realtime/weed/fourKlives/songs/regrlives.txt
+lib/lives/plugins/effects/realtime/weed/fourKlives/songs/roselives.txt
 lib/lives/plugins/effects/realtime/weed/gdk_fast_resize.so
 lib/lives/plugins/effects/realtime/weed/haar_analyser.so
 lib/lives/plugins/effects/realtime/weed/haip.so
@@ -200,12 +200,12 @@ lib/lives/plugins/encoders/x264_encoder
 lib/lives/plugins/playback/audiostream/audiostreamer.pl
 lib/lives/plugins/playback/video/SDL.so
 lib/lives/plugins/playback/video/icecast_output.so
-lib/lives/plugins/playback/video/lives2lives_stream.so
 lib/lives/plugins/playback/video/libav_stream.so
+lib/lives/plugins/playback/video/lives2lives_stream.so
 lib/lives/plugins/playback/video/oggstream.so
 lib/lives/plugins/playback/video/openGL.so
 lib/lives/plugins/playback/video/vloopback.so
-lib/lives/plugins/playback/video/vloopback2.so
+%%V4L%%lib/lives/plugins/playback/video/vloopback2.so
 lib/lives/plugins/playback/video/yuv4mpeg_stream.so
 libdata/pkgconfig/libweed-compat.pc
 libdata/pkgconfig/libweed-plugin.pc
@@ -214,13 +214,6 @@ libdata/pkgconfig/libweed.pc
 libdata/pkgconfig/libweed_slice.pc
 share/app-install/icons/lives.png
 share/applications/LiVES.desktop
-share/icons/hicolor/128x128/apps/lives.png
-share/icons/hicolor/16x16/apps/lives.png
-share/icons/hicolor/22x22/apps/lives.png
-share/icons/hicolor/256x256/apps/lives.png
-share/icons/hicolor/32x32/apps/lives.png
-share/icons/hicolor/64x64/apps/lives.png
-share/pixmaps/lives.png
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -231,11 +224,18 @@ share/pixmaps/lives.png
 %%PORTDOCS%%%%DOCSDIR%%/README.multi_encoder
 %%PORTDOCS%%%%DOCSDIR%%/RFX.spec
 %%PORTDOCS%%%%DOCSDIR%%/clip_format.txt
+%%PORTDOCS%%%%DOCSDIR%%/c++-bindings.odt
 %%PORTDOCS%%%%DOCSDIR%%/lives-OMC.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfxbuilder.odt
 %%PORTDOCS%%%%DOCSDIR%%/weedevents.txt
 %%PORTDOCS%%%%DOCSDIR%%/weedspec.txt
+share/icons/hicolor/128x128/apps/lives.png
+share/icons/hicolor/16x16/apps/lives.png
+share/icons/hicolor/22x22/apps/lives.png
+share/icons/hicolor/256x256/apps/lives.png
+share/icons/hicolor/32x32/apps/lives.png
 share/icons/hicolor/48x48/apps/lives.png
+share/icons/hicolor/64x64/apps/lives.png
 %%DATADIR%%/default.keymap
 %%DATADIR%%/icons/audio.png
 %%DATADIR%%/icons/fullscreen.png
@@ -372,6 +372,8 @@ share/icons/hicolor/48x48/apps/lives.png
 %%NLS%%share/locale/uk/LC_MESSAGES/lives.mo
 %%NLS%%share/locale/uz/LC_MESSAGES/lives.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/lives.mo
+share/pixmaps/lives.png
 share/pixmaps/lives.xpm
-@dir %%DATADIR%%/devicemaps
+@dir lib/lives/plugins/effects/realtime/weed/data
 @dir lib/lives/plugins/effects/realtime/weed/icons
+@dir %%DATADIR%%/devicemaps
diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index 059e3df24687..7c7178b31e14 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mediainfo
-PORTVERSION=	19.07
-PORTREVISION=	1
+PORTVERSION=	19.09
 CATEGORIES=	multimedia
 MASTER_SITES=	https://mediaarea.net/download/binary/${PORTNAME}/${PORTVERSION}/ \
 		LOCAL/sunpoet
diff --git a/multimedia/mediainfo/distinfo b/multimedia/mediainfo/distinfo
index f5ded10a9b22..1ded5922c84e 100644
--- a/multimedia/mediainfo/distinfo
+++ b/multimedia/mediainfo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563385082
-SHA256 (MediaInfo_CLI_19.07_GNU_FromSource.tar.xz) = 94460b3782c6923627273fa799b8fdaa529cff1481f6129c2ab7efb4cfced974
-SIZE (MediaInfo_CLI_19.07_GNU_FromSource.tar.xz) = 3050860
+TIMESTAMP = 1568290946
+SHA256 (MediaInfo_CLI_19.09_GNU_FromSource.tar.xz) = 3fb3e513feb65c82a995b500f826caa9bfe6c3abb890242d6160f390db7befc9
+SIZE (MediaInfo_CLI_19.09_GNU_FromSource.tar.xz) = 3126924
diff --git a/multimedia/rav1e/Makefile b/multimedia/rav1e/Makefile
index ea7d7ef57d48..0f5da70a9b34 100644
--- a/multimedia/rav1e/Makefile
+++ b/multimedia/rav1e/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rav1e
-PORTVERSION=	s20190902
+PORTVERSION=	s20190909
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -16,19 +16,20 @@ BUILD_DEPENDS_amd64=	nasm:devel/nasm
 USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	xiph
-GH_TAGNAME=	b9975f82
+GH_TAGNAME=	07ca598c
 PLIST_FILES=	bin/${PORTNAME}
 
 CARGO_CRATES=	adler32-1.0.3 \
 		aho-corasick-0.7.6 \
 		ansi_term-0.11.0 \
 		aom-sys-0.1.2 \
+		arbitrary-0.2.0 \
 		arc-swap-0.4.2 \
 		arg_enum_proc_macro-0.3.0 \
 		arrayvec-0.4.11 \
 		atty-0.2.13 \
 		autocfg-0.1.6 \
-		backtrace-0.3.35 \
+		backtrace-0.3.37 \
 		backtrace-sys-0.1.31 \
 		better-panic-0.1.2 \
 		bincode-1.1.4 \
@@ -36,14 +37,13 @@ CARGO_CRATES=	adler32-1.0.3 \
 		bitflags-1.1.0 \
 		bitstream-io-0.8.4 \
 		bstr-0.2.8 \
-		bumpalo-2.6.0 \
 		byteorder-1.3.2 \
 		c2-chacha-0.2.2 \
 		cast-0.2.2 \
-		cc-1.0.41 \
+		cc-1.0.42 \
 		cexpr-0.3.5 \
 		cfg-if-0.1.9 \
-		chrono-0.4.8 \
+		chrono-0.4.9 \
 		clang-sys-0.28.1 \
 		clap-2.33.0 \
 		clicolors-control-1.0.1 \
@@ -72,7 +72,7 @@ CARGO_CRATES=	adler32-1.0.3 \
 		failure_derive-0.1.5 \
 		fuchsia-cprng-0.1.1 \
 		fxhash-0.2.1 \
-		getrandom-0.1.11 \
+		getrandom-0.1.12 \
 		gif-0.10.2 \
 		glob-0.3.0 \
 		humantime-1.2.0 \
@@ -82,7 +82,6 @@ CARGO_CRATES=	adler32-1.0.3 \
 		itertools-0.8.0 \
 		itoa-0.4.4 \
 		jpeg-decoder-0.1.16 \
-		js-sys-0.3.27 \
 		lazy_static-1.4.0 \
 		libc-0.2.62 \
 		libloading-0.5.2 \
@@ -131,7 +130,7 @@ CARGO_CRATES=	adler32-1.0.3 \
 		redox_syscall-0.1.56 \
 		regex-1.1.9 \
 		regex-automata-0.1.8 \
-		regex-syntax-0.6.11 \
+		regex-syntax-0.6.12 \
 		rustc-demangle-0.1.16 \
 		rustc_version-0.2.3 \
 		ryu-1.0.0 \
@@ -168,12 +167,7 @@ CARGO_CRATES=	adler32-1.0.3 \
 		vergen-3.0.4 \
 		version_check-0.1.5 \
 		walkdir-2.2.9 \
-		wasi-0.5.0 \
-		wasm-bindgen-0.2.50 \
-		wasm-bindgen-backend-0.2.50 \
-		wasm-bindgen-macro-0.2.50 \
-		wasm-bindgen-macro-support-0.2.50 \
-		wasm-bindgen-shared-0.2.50 \
+		wasi-0.7.0 \
 		which-2.0.1 \
 		winapi-0.3.8 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
diff --git a/multimedia/rav1e/distinfo b/multimedia/rav1e/distinfo
index 0b155a196921..9e5ba781b668 100644
--- a/multimedia/rav1e/distinfo
+++ b/multimedia/rav1e/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1567139421
+TIMESTAMP = 1568050424
 SHA256 (rust/crates/adler32-1.0.3.tar.gz) = 7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c
 SIZE (rust/crates/adler32-1.0.3.tar.gz) = 5734
 SHA256 (rust/crates/aho-corasick-0.7.6.tar.gz) = 58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d
@@ -7,6 +7,8 @@ SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db238
 SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087
 SHA256 (rust/crates/aom-sys-0.1.2.tar.gz) = 9d12f80222f2f70f5d16c8c0986f393f4638feba82af2a9700c9616fc9ea2a31
 SIZE (rust/crates/aom-sys-0.1.2.tar.gz) = 3047
+SHA256 (rust/crates/arbitrary-0.2.0.tar.gz) = 64cf76cb6e2222ed0ea86b2b0ee2f71c96ec6edd5af42e84d59160e91b836ec4
+SIZE (rust/crates/arbitrary-0.2.0.tar.gz) = 4743
 SHA256 (rust/crates/arc-swap-0.4.2.tar.gz) = 854ede29f7a0ce90519fb2439d030320c6201119b87dab0ee96044603e1130b9
 SIZE (rust/crates/arc-swap-0.4.2.tar.gz) = 48148
 SHA256 (rust/crates/arg_enum_proc_macro-0.3.0.tar.gz) = 9bc19845baa31d32d189d8020bc8d76bf735e4587c9eba9cf561003ba4c93908
@@ -17,8 +19,8 @@ SHA256 (rust/crates/atty-0.2.13.tar.gz) = 1803c647a3ec87095e7ae7acfca019e98de5ec
 SIZE (rust/crates/atty-0.2.13.tar.gz) = 4764
 SHA256 (rust/crates/autocfg-0.1.6.tar.gz) = b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875
 SIZE (rust/crates/autocfg-0.1.6.tar.gz) = 11439
-SHA256 (rust/crates/backtrace-0.3.35.tar.gz) = 1371048253fa3bac6704bfd6bbfc922ee9bdcee8881330d40f308b81cc5adc55
-SIZE (rust/crates/backtrace-0.3.35.tar.gz) = 60047
+SHA256 (rust/crates/backtrace-0.3.37.tar.gz) = 5180c5a20655b14a819b652fd2378fa5f1697b6c9ddad3e695c2f9cedf6df4e2
+SIZE (rust/crates/backtrace-0.3.37.tar.gz) = 67955
 SHA256 (rust/crates/backtrace-sys-0.1.31.tar.gz) = 82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b
 SIZE (rust/crates/backtrace-sys-0.1.31.tar.gz) = 518877
 SHA256 (rust/crates/better-panic-0.1.2.tar.gz) = 64714970eb2081691f85a923b78a490fd7c3e256dcc83c7a5177314586563356
@@ -33,22 +35,20 @@ SHA256 (rust/crates/bitstream-io-0.8.4.tar.gz) = 395bab683d996399e6046dbea0f7e61
 SIZE (rust/crates/bitstream-io-0.8.4.tar.gz) = 22256
 SHA256 (rust/crates/bstr-0.2.8.tar.gz) = 8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245
 SIZE (rust/crates/bstr-0.2.8.tar.gz) = 337654
-SHA256 (rust/crates/bumpalo-2.6.0.tar.gz) = ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708
-SIZE (rust/crates/bumpalo-2.6.0.tar.gz) = 124915
 SHA256 (rust/crates/byteorder-1.3.2.tar.gz) = a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5
 SIZE (rust/crates/byteorder-1.3.2.tar.gz) = 21596
 SHA256 (rust/crates/c2-chacha-0.2.2.tar.gz) = 7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101
 SIZE (rust/crates/c2-chacha-0.2.2.tar.gz) = 13766
 SHA256 (rust/crates/cast-0.2.2.tar.gz) = 926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427
 SIZE (rust/crates/cast-0.2.2.tar.gz) = 10318
-SHA256 (rust/crates/cc-1.0.41.tar.gz) = 8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff
-SIZE (rust/crates/cc-1.0.41.tar.gz) = 48185
+SHA256 (rust/crates/cc-1.0.42.tar.gz) = a61c7bce55cd2fae6ec8cb935ebd76256c2959a1f95790f6118a441c2cd5b406
+SIZE (rust/crates/cc-1.0.42.tar.gz) = 49868
 SHA256 (rust/crates/cexpr-0.3.5.tar.gz) = a7fa24eb00d5ffab90eaeaf1092ac85c04c64aaf358ea6f84505b8116d24c6af
 SIZE (rust/crates/cexpr-0.3.5.tar.gz) = 16938
 SHA256 (rust/crates/cfg-if-0.1.9.tar.gz) = b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33
 SIZE (rust/crates/cfg-if-0.1.9.tar.gz) = 7353
-SHA256 (rust/crates/chrono-0.4.8.tar.gz) = 27429a03ca54100bf6bdc726c09adc46a74187ac93f9ce96dc7aaa9594ebf707
-SIZE (rust/crates/chrono-0.4.8.tar.gz) = 133542
+SHA256 (rust/crates/chrono-0.4.9.tar.gz) = e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68
+SIZE (rust/crates/chrono-0.4.9.tar.gz) = 133671
 SHA256 (rust/crates/clang-sys-0.28.1.tar.gz) = 81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853
 SIZE (rust/crates/clang-sys-0.28.1.tar.gz) = 34180
 SHA256 (rust/crates/clap-2.33.0.tar.gz) = 5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9
@@ -105,8 +105,8 @@ SHA256 (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = a06f77d526c1a601b7c4cdd98f54b5
 SIZE (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = 2950
 SHA256 (rust/crates/fxhash-0.2.1.tar.gz) = c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c
 SIZE (rust/crates/fxhash-0.2.1.tar.gz) = 4102
-SHA256 (rust/crates/getrandom-0.1.11.tar.gz) = fc344b02d3868feb131e8b5fe2b9b0a1cc42942679af493061fc13b853243872
-SIZE (rust/crates/getrandom-0.1.11.tar.gz) = 23699
+SHA256 (rust/crates/getrandom-0.1.12.tar.gz) = 473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571
+SIZE (rust/crates/getrandom-0.1.12.tar.gz) = 23809
 SHA256 (rust/crates/gif-0.10.2.tar.gz) = 86c2f2b597d6e05c86ee5947b2223bda468fe8dad3e88e2a6520869322aaf568
 SIZE (rust/crates/gif-0.10.2.tar.gz) = 25307
 SHA256 (rust/crates/glob-0.3.0.tar.gz) = 9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574
@@ -125,8 +125,6 @@ SHA256 (rust/crates/itoa-0.4.4.tar.gz) = 501266b7edd0174f8530248f87f99c88fbe60ca
 SIZE (rust/crates/itoa-0.4.4.tar.gz) = 11147
 SHA256 (rust/crates/jpeg-decoder-0.1.16.tar.gz) = c1aae18ffeeae409c6622c3b6a7ee49792a7e5a062eea1b135fbb74e301792ba
 SIZE (rust/crates/jpeg-decoder-0.1.16.tar.gz) = 32542
-SHA256 (rust/crates/js-sys-0.3.27.tar.gz) = 1efc4f2a556c58e79c5500912e221dd826bec64ff4aabd8ce71ccef6da02d7d4
-SIZE (rust/crates/js-sys-0.3.27.tar.gz) = 59423
 SHA256 (rust/crates/lazy_static-1.4.0.tar.gz) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
 SIZE (rust/crates/lazy_static-1.4.0.tar.gz) = 10443
 SHA256 (rust/crates/libc-0.2.62.tar.gz) = 34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba
@@ -223,8 +221,8 @@ SHA256 (rust/crates/regex-1.1.9.tar.gz) = d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56
 SIZE (rust/crates/regex-1.1.9.tar.gz) = 246517
 SHA256 (rust/crates/regex-automata-0.1.8.tar.gz) = 92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9
 SIZE (rust/crates/regex-automata-0.1.8.tar.gz) = 92234
-SHA256 (rust/crates/regex-syntax-0.6.11.tar.gz) = b143cceb2ca5e56d5671988ef8b15615733e7ee16cd348e064333b251b89343f
-SIZE (rust/crates/regex-syntax-0.6.11.tar.gz) = 283238
+SHA256 (rust/crates/regex-syntax-0.6.12.tar.gz) = 11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716
+SIZE (rust/crates/regex-syntax-0.6.12.tar.gz) = 289531
 SHA256 (rust/crates/rustc-demangle-0.1.16.tar.gz) = 4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783
 SIZE (rust/crates/rustc-demangle-0.1.16.tar.gz) = 19137
 SHA256 (rust/crates/rustc_version-0.2.3.tar.gz) = 138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a
@@ -297,18 +295,8 @@ SHA256 (rust/crates/version_check-0.1.5.tar.gz) = 914b1a6776c4c929a602fafd8bc742
 SIZE (rust/crates/version_check-0.1.5.tar.gz) = 8173
 SHA256 (rust/crates/walkdir-2.2.9.tar.gz) = 9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e
 SIZE (rust/crates/walkdir-2.2.9.tar.gz) = 22423
-SHA256 (rust/crates/wasi-0.5.0.tar.gz) = fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7
-SIZE (rust/crates/wasi-0.5.0.tar.gz) = 31104
-SHA256 (rust/crates/wasm-bindgen-0.2.50.tar.gz) = dcddca308b16cd93c2b67b126c688e5467e4ef2e28200dc7dfe4ae284f2faefc
-SIZE (rust/crates/wasm-bindgen-0.2.50.tar.gz) = 144511
-SHA256 (rust/crates/wasm-bindgen-backend-0.2.50.tar.gz) = f805d9328b5fc7e5c6399960fd1889271b9b58ae17bdb2417472156cc9fafdd0
-SIZE (rust/crates/wasm-bindgen-backend-0.2.50.tar.gz) = 21115
-SHA256 (rust/crates/wasm-bindgen-macro-0.2.50.tar.gz) = 3ff88201a482abfc63921621f6cb18eb1efd74f136b05e5841e7f8ca434539e9
-SIZE (rust/crates/wasm-bindgen-macro-0.2.50.tar.gz) = 10849
-SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.50.tar.gz) = 6a433d89ecdb9f77d46fcf00c8cf9f3467b7de9954d8710c175f61e2e245bb0e
-SIZE (rust/crates/wasm-bindgen-macro-support-0.2.50.tar.gz) = 16461
-SHA256 (rust/crates/wasm-bindgen-shared-0.2.50.tar.gz) = d41fc1bc3570cdf8d108c15e014045fd45a95bb5eb36605f96a90461fc34027d
-SIZE (rust/crates/wasm-bindgen-shared-0.2.50.tar.gz) = 6727
+SHA256 (rust/crates/wasi-0.7.0.tar.gz) = b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d
+SIZE (rust/crates/wasi-0.7.0.tar.gz) = 33941
 SHA256 (rust/crates/which-2.0.1.tar.gz) = b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164
 SIZE (rust/crates/which-2.0.1.tar.gz) = 6953
 SHA256 (rust/crates/winapi-0.3.8.tar.gz) = 8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6
@@ -323,5 +311,5 @@ SHA256 (rust/crates/wincolor-1.0.2.tar.gz) = 96f5016b18804d24db43cebf3c77269e756
 SIZE (rust/crates/wincolor-1.0.2.tar.gz) = 4821
 SHA256 (rust/crates/y4m-0.3.5.tar.gz) = a2dde68bbd66d90675870b548cf0932cd06222b994223d89b49257feb4fdea05
 SIZE (rust/crates/y4m-0.3.5.tar.gz) = 11339
-SHA256 (xiph-rav1e-s20190902-b9975f82_GH0.tar.gz) = 69a797282baf6a9765cf1b05b1971aef17ce2c2d8080d1e86b79e134ae6c7445
-SIZE (xiph-rav1e-s20190902-b9975f82_GH0.tar.gz) = 479192
+SHA256 (xiph-rav1e-s20190909-07ca598c_GH0.tar.gz) = 5983cb032fbe991ce60a64a2794a7a0c42c6ddb9aacbd1d60196e4c31b8e56aa
+SIZE (xiph-rav1e-s20190909-07ca598c_GH0.tar.gz) = 486055
diff --git a/multimedia/svt-av1/Makefile b/multimedia/svt-av1/Makefile
index 64002c109487..68dee63deab7 100644
--- a/multimedia/svt-av1/Makefile
+++ b/multimedia/svt-av1/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	svt-av1
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.0-226
-DISTVERSIONSUFFIX=	-g9a15408f
+DISTVERSION=	0.6.0-346
+DISTVERSIONSUFFIX=	-g4f180cce
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/svt-av1/distinfo b/multimedia/svt-av1/distinfo
index 47d33a84ecf2..9b6540371ed9 100644
--- a/multimedia/svt-av1/distinfo
+++ b/multimedia/svt-av1/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567321367
-SHA256 (OpenVisualCloud-SVT-AV1-v0.6.0-226-g9a15408f_GH0.tar.gz) = b7c0ace66049bc42f3785049b4915cf595421c86f63e63b4314918f20ed2ab83
-SIZE (OpenVisualCloud-SVT-AV1-v0.6.0-226-g9a15408f_GH0.tar.gz) = 2766371
+TIMESTAMP = 1568415415
+SHA256 (OpenVisualCloud-SVT-AV1-v0.6.0-346-g4f180cce_GH0.tar.gz) = 68e5e1ad8eb36a8c59a81be5f47371ba3dd6a2b7f6fcd425e171ce57bfdef45c
+SIZE (OpenVisualCloud-SVT-AV1-v0.6.0-346-g4f180cce_GH0.tar.gz) = 2841990
diff --git a/multimedia/svt-hevc/Makefile b/multimedia/svt-hevc/Makefile
index b5c2916a5983..31c83773c9e6 100644
--- a/multimedia/svt-hevc/Makefile
+++ b/multimedia/svt-hevc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	svt-hevc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.0
+DISTVERSION=	1.4.1
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -26,6 +26,7 @@ GH_ACCOUNT=	OpenVisualCloud
 GH_PROJECT=	SVT-HEVC
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	NATIVE
+CFLAGS+=	-D__STDC_WANT_LIB_EXT1__=0
 
 post-patch:
 # Keep using nasm and drop vendor -O/-g
diff --git a/multimedia/svt-hevc/distinfo b/multimedia/svt-hevc/distinfo
index 48bb8e7b49ca..b6ac267f21d3 100644
--- a/multimedia/svt-hevc/distinfo
+++ b/multimedia/svt-hevc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565309873
-SHA256 (OpenVisualCloud-SVT-HEVC-v1.4.0_GH0.tar.gz) = 7bb2ed0d6a46dbb6478127762b12f3d21a7901fd68876ce61f91360c5c52798e
-SIZE (OpenVisualCloud-SVT-HEVC-v1.4.0_GH0.tar.gz) = 1225319
+TIMESTAMP = 1567986865
+SHA256 (OpenVisualCloud-SVT-HEVC-v1.4.1_GH0.tar.gz) = 8ceb14acddd0af48e87deb17dc0a54fc9f82c50d6e0b392076fa8f7d0533f74b
+SIZE (OpenVisualCloud-SVT-HEVC-v1.4.1_GH0.tar.gz) = 1221678
diff --git a/multimedia/svt-hevc/files/patch-Source_Lib_Codec_EbThreads.h b/multimedia/svt-hevc/files/patch-Source_Lib_Codec_EbThreads.h
index 1bedb7ea1781..4e3f5a3dcc60 100644
--- a/multimedia/svt-hevc/files/patch-Source_Lib_Codec_EbThreads.h
+++ b/multimedia/svt-hevc/files/patch-Source_Lib_Codec_EbThreads.h
@@ -5,12 +5,12 @@ Source/Lib/Codec/EbThreads.h:100:11: error: unknown type name 'cpu_set_t'
 extern    cpu_set_t                   groupAffinity;
           ^
 
---- Source/Lib/Codec/EbThreads.h.orig	2019-02-14 00:36:54 UTC
+--- Source/Lib/Codec/EbThreads.h.orig	2019-09-08 23:54:25 UTC
 +++ Source/Lib/Codec/EbThreads.h
-@@ -95,7 +95,14 @@ extern    EB_BOOL                  alternateGroups;
- #else
+@@ -97,8 +97,15 @@ extern    EB_BOOL                  alternateGroups;
  #define __USE_GNU
  #define _GNU_SOURCE
+ #endif
 +#ifdef __FreeBSD__
 +#define cpu_set_t cpuset_t
 +#else
@@ -22,3 +22,4 @@ extern    cpu_set_t                   groupAffinity;
 +#endif
  extern    cpu_set_t                   groupAffinity;
  #define EB_CREATETHREAD(type, pointer, nElements, pointerClass, threadFunction, threadContext) \
+     pointer = EbCreateThread(threadFunction, threadContext); \
diff --git a/multimedia/svt-hevc/pkg-plist b/multimedia/svt-hevc/pkg-plist
index a0e77da60b46..362bc3d0b2aa 100644
--- a/multimedia/svt-hevc/pkg-plist
+++ b/multimedia/svt-hevc/pkg-plist
@@ -1,7 +1,7 @@
 bin/SvtHevcEncApp
 include/svt-hevc/EbApi.h
+include/svt-hevc/EbApiVersion.h
 include/svt-hevc/EbErrorCodes.h
-include/svt-hevc/EbTime.h
 lib/libSvtHevcEnc.so
 lib/libSvtHevcEnc.so.1
 libdata/pkgconfig/SvtHevcEnc.pc
diff --git a/multimedia/svt-vp9/Makefile b/multimedia/svt-vp9/Makefile
index 91918c3801da..1f7677b6bb4b 100644
--- a/multimedia/svt-vp9/Makefile
+++ b/multimedia/svt-vp9/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	svt-vp9
-PORTVERSION=	s20190620
-PORTREVISION=	1
+PORTVERSION=	s20190906
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -24,31 +23,20 @@ USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	OpenVisualCloud
 GH_PROJECT=	SVT-VP9
-GH_TAGNAME=	8f99fda
+GH_TAGNAME=	e3dd26e
+CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_OFF=	NATIVE
 
 post-patch:
-# Default CFLAGS are already set by USES=cmake
-	@${REINPLACE_CMD} -i .flags -E -e 's/ -mavx//' \
-		-e 's/-O2 -flto //' \
-		-e '/C_FLAGS_(RELEASE|DEBUG)/d' \
-		-e '/NASM_FLAGS_DEBUG/d' \
+# Keep using nasm and drop vendor -O/-g
+	@${REINPLACE_CMD} -e '/find_program.*yasm/d' \
+		-Ee '/set.*(release|debug)_flags_to_test/,/\)/d' \
 		${WRKSRC}/CMakeLists.txt
-# Avoid devel/yasm dependency
-	@${REINPLACE_CMD} -i .typo 's/MAKE_ASM_NASM_COMPILER/s&/' \
-		${WRKSRC}/CMakeLists.txt
-# Avoid lang/gcc* dependency
-	@${REINPLACE_CMD} -i .gcc -e 's/gcc-//' \
-		-e '/CMAKE_C/{ s/STREQUAL/MATCHES/; s/"GNU/&|Clang/; }' \
-		${WRKSRC}/CMakeLists.txt \
-		${WRKSRC}/Source/Lib/*/CMakeLists.txt
 # Avoid conflict with standard types
 	@${GREP} -Flr '_T_DEFINED' ${WRKSRC} | ${XARGS} \
 		${REINPLACE_CMD} -i .types 's/_T_DEFINED/_DEFINED/'
 # Avoid platform whitelists for generic non-Windows code
-	@${REINPLACE_CMD} -i .opsys 's/Linux/${OPSYS}/' \
-		${WRKSRC}/CMakeLists.txt \
-		${WRKSRC}/Source/Lib/*/CMakeLists.txt
 	@${GREP} --exclude='*/third_party/*' -Flr '__linux' ${WRKSRC} | ${XARGS} \
-		${REINPLACE_CMD} -i .opsys -E 's/__linux(__)?/__${OPSYS}__/'
+		${REINPLACE_CMD} -i .opsys -E 's/__linux(__)?/__unix__/'
 
 .include <bsd.port.mk>
diff --git a/multimedia/svt-vp9/distinfo b/multimedia/svt-vp9/distinfo
index 1fc3f5498beb..55518d189276 100644
--- a/multimedia/svt-vp9/distinfo
+++ b/multimedia/svt-vp9/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561075709
-SHA256 (OpenVisualCloud-SVT-VP9-s20190620-8f99fda_GH0.tar.gz) = 27175f5446a150703828ed4d2cef09e52d28f30eed9d8a9eeb4743dfc31d2c9b
-SIZE (OpenVisualCloud-SVT-VP9-s20190620-8f99fda_GH0.tar.gz) = 981849
+TIMESTAMP = 1567798965
+SHA256 (OpenVisualCloud-SVT-VP9-s20190906-e3dd26e_GH0.tar.gz) = cea71a73e234c0970da553c5a16893fab6f1a2e14559edb276c9d805882541b1
+SIZE (OpenVisualCloud-SVT-VP9-s20190906-e3dd26e_GH0.tar.gz) = 985323
diff --git a/multimedia/svt-vp9/files/patch-Source_Lib_Codec_EbThreads.h b/multimedia/svt-vp9/files/patch-Source_Lib_Codec_EbThreads.h
new file mode 100644
index 000000000000..e16a8ffec414
--- /dev/null
+++ b/multimedia/svt-vp9/files/patch-Source_Lib_Codec_EbThreads.h
@@ -0,0 +1,26 @@
+Source/Lib/Codec/EbEncHandle.c:1531:5: error: use of undeclared identifier 'cpu_set_t'
+Source/Lib/Codec/EbThreads.h:102:62: note: expanded from macro 'EB_CREATETHREAD'
+        pthread_setaffinity_np(*((pthread_t*)pointer),sizeof(cpu_set_t),&group_affinity); \
+                                                             ^
+
+--- Source/Lib/Codec/EbThreads.h.orig	2019-09-06 19:42:45 UTC
++++ Source/Lib/Codec/EbThreads.h
+@@ -93,6 +93,18 @@ extern    uint64_t         *total_lib_memory;         
+     } \
+     lib_thread_count++;
+ #elif defined(__linux__)
++#define __USE_GNU
++#define _GNU_SOURCE
++#ifdef __FreeBSD__
++#define cpu_set_t cpuset_t
++#else
++#include <sched.h>
++#endif
++#include <pthread.h>
++#if defined(__DragonFly__) || defined(__FreeBSD__)
++#include <pthread_np.h>
++#endif
++extern    cpu_set_t                   group_affinity;
+ #define EB_CREATETHREAD(type, pointer, n_elements, pointer_class, thread_function, thread_context) \
+     pointer = eb_create_thread(thread_function, thread_context); \
+     if (pointer == (type)EB_NULL) { \
diff --git a/multimedia/webcamoid/Makefile b/multimedia/webcamoid/Makefile
index a39ff8fe35e1..d12889fe6fbc 100644
--- a/multimedia/webcamoid/Makefile
+++ b/multimedia/webcamoid/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	webcamoid
 DISTVERSION=	8.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -23,7 +23,8 @@ USE_GITHUB=	yes
 USE_GNOME=	glib20
 USE_GSTREAMER1=	yes
 USE_GL=		gl
-USE_QT=		concurrent core declarative gui multimedia network opengl quickcontrols2 svg widgets xml buildtools_build
+USE_QT=		concurrent core declarative gui multimedia network opengl quickcontrols2 svg widgets xml \
+		buildtools_build quickcontrols_run
 
 MAKE_ENV=	NOOSS=1 # NOOSS is because the OSS module attempts to use kevent on OSS devices, which is broken in the base
 QMAKE_ARGS=	INSTALLQMLDIR=${QT_QMLDIR} \
diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile
index f67aa87528ee..2fe004157865 100644
--- a/multimedia/x265/Makefile
+++ b/multimedia/x265/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	x265
 PORTVERSION=	3.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	https://bitbucket.org/multicoreware/x265/downloads/ \
 		https://downloads.videolan.org/pub/videolan/x265/ \
diff --git a/multimedia/x265/files/patch-source_encoder_svt.h b/multimedia/x265/files/patch-source_encoder_svt.h
new file mode 100644
index 000000000000..b510797af0bf
--- /dev/null
+++ b/multimedia/x265/files/patch-source_encoder_svt.h
@@ -0,0 +1,18 @@
+https://bitbucket.org/multicoreware/x265/issues/509/x265-fails-to-build-with-current-svt-hevc
+
+In file included from source/encoder/analysis.cpp:35:
+In file included from source/encoder/encoder.h:34:
+source/encoder/svt.h:32:10: fatal error: 'EbTime.h' file not found
+#include "EbTime.h"
+         ^~~~~~~~~~
+
+--- source/encoder/svt.h.orig	2019-07-31 04:59:54 UTC
++++ source/encoder/svt.h
+@@ -29,7 +29,6 @@
+ 
+ #include "EbApi.h"
+ #include "EbErrorCodes.h"
+-#include "EbTime.h"
+ 
+ namespace X265_NS {
+ 
diff --git a/net-im/pidgin-privacy-please/Makefile b/net-im/pidgin-privacy-please/Makefile
index e65a7e61a0a3..5fd08c0d499a 100644
--- a/net-im/pidgin-privacy-please/Makefile
+++ b/net-im/pidgin-privacy-please/Makefile
@@ -10,6 +10,9 @@ CATEGORIES=	net-im
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Privacy plugin for the pidgin instant messenger
 
+DEPRECATED=	Abandonware
+EXPIRATION_DATE=	2019-12-09
+
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index a0a9366ac899..04f0be80be44 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	telegram-desktop
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.7.14
+DISTVERSION=	1.8.4
 CATEGORIES=	net-im
 
 MAINTAINER=	henry.hu.sh@gmail.com
@@ -14,18 +14,19 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 NOT_FOR_ARCHS=		powerpc powerpc64 powerpcspe
 NOT_FOR_ARCHS_REASON=	Please add support for your architecture in base/build_config.h
 
-BUILD_DEPENDS=	dee>0:devel/dee \
+BUILD_DEPENDS=	alsa-lib>0:audio/alsa-lib \
+		dee>0:devel/dee \
 		gyp:devel/py-gyp@${PY_FLAVOR} \
-		range-v3>0:devel/range-v3 \
 		pulseaudio>0:audio/pulseaudio \
-		alsa-lib>0:audio/alsa-lib
+		range-v3>0:devel/range-v3
 LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 		libdbus-1.so:devel/dbus \
 		libminizip.so:archivers/minizip \
 		libopenal.so:audio/openal-soft \
 		libopus.so:audio/opus
 
-USES=		compiler:c++17-lang cmake:noninja desktop-file-utils gmake gnome pkgconfig python:2.7,build qt:5 ssl
+USES=		cmake:noninja compiler:c++17-lang desktop-file-utils gmake \
+		gnome pkgconfig python:2.7,build qt:5 ssl xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	telegramdesktop
@@ -33,13 +34,14 @@ GH_PROJECT=	tdesktop
 GH_TUPLE=	catchorg:Catch2:5ca44b68:catch/Telegram/ThirdParty/Catch \
 		mapbox:variant:550ac2f:variant/Telegram/ThirdParty/variant \
 		Microsoft:GSL:d846fe5:gsl/Telegram/ThirdParty/GSL \
-		telegramdesktop:libtgvoip:0e92a22:libtgvoip/Telegram/ThirdParty/libtgvoip \
-		telegramdesktop:crl:9ea8700:crl/Telegram/ThirdParty/crl \
+		telegramdesktop:libtgvoip:d4a0f71:libtgvoip/Telegram/ThirdParty/libtgvoip \
+		telegramdesktop:crl:52baf11:crl/Telegram/ThirdParty/crl \
 		Cyan4973:xxHash:7cc9639:xxhash/Telegram/ThirdParty/xxHash \
-		john-preston:rlottie:302b7f9:rlottie/Telegram/ThirdParty/rlottie \
+		john-preston:rlottie:589db02:rlottie/Telegram/ThirdParty/rlottie \
 		lz4:lz4:9a2a9f2:lz4/Telegram/ThirdParty/lz4
 USE_GNOME=	glib20
-USE_QT=		core gui imageformats network widgets buildtools_build qmake_build dbus
+USE_QT=		core dbus gui imageformats network widgets buildtools_build \
+		qmake_build
 USE_XORG=	x11 xcb
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/out/Release
@@ -49,14 +51,14 @@ CMAKE_SOURCE_PATH=	${WRKSRC}/out/Release
 # or create our own.
 TELEGRAM_API_ID=	17349
 TELEGRAM_API_HASH=	344583e45741c457fe1862106095a5eb
-GYP_DEFINES=	TDESKTOP_DISABLE_CRASH_REPORTS,TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
+GYP_DEFINES=		TDESKTOP_DISABLE_CRASH_REPORTS,TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
 
 # Telegram uses OpenAL for its audio, but libtgvoip (for voice calls) can use PulseAudio or ALSA.
 # It dynamically loads PulseAudio, and if this fails, it loads ALSA.
 # If both of them are not installed, then voice calls do not work, but other functionalities still work.
-OPTIONS_MULTI=	AUDIO
+OPTIONS_MULTI=		AUDIO
 OPTIONS_MULTI_AUDIO=	ALSA PULSEAUDIO
-OPTIONS_DEFINE=	GTK
+OPTIONS_DEFINE=		GTK
 OPTIONS_DEFAULT=	ALSA
 
 AUDIO_DESC=	Audio backend for voice calls
diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo
index 1164d3f664d4..7e2565da2090 100644
--- a/net-im/telegram-desktop/distinfo
+++ b/net-im/telegram-desktop/distinfo
@@ -1,19 +1,19 @@
-TIMESTAMP = 1564285102
-SHA256 (telegramdesktop-tdesktop-v1.7.14_GH0.tar.gz) = a52ab6efb4dc7579f05543df3fc3814baa09c0644e00ca30e37a9c6f99a5d164
-SIZE (telegramdesktop-tdesktop-v1.7.14_GH0.tar.gz) = 14296012
+TIMESTAMP = 1567889674
+SHA256 (telegramdesktop-tdesktop-v1.8.4_GH0.tar.gz) = 97f034d78447c99002b8742c75a3a436e709cdf2f5dff79f7ca04a8c76298627
+SIZE (telegramdesktop-tdesktop-v1.8.4_GH0.tar.gz) = 14367314
 SHA256 (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 8cdf2a345897bda1aaabffd4496dffe263768cef3e4254e74ae63545c8e12cc2
 SIZE (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 375264
 SHA256 (mapbox-variant-550ac2f_GH0.tar.gz) = 7ab3aa7c9fa672027f13721584df5f7ec09c0ecca499d374c6ac76e147ef7354
 SIZE (mapbox-variant-550ac2f_GH0.tar.gz) = 108686
 SHA256 (Microsoft-GSL-d846fe5_GH0.tar.gz) = 4c463f93ca3b1dcb0b8d73b54309c1d31145761c457f1a6fd53554a6d469b468
 SIZE (Microsoft-GSL-d846fe5_GH0.tar.gz) = 58930
-SHA256 (telegramdesktop-libtgvoip-0e92a22_GH0.tar.gz) = 179c780bf199ff41984756d1b0b96287edf0fa1490f76a31eb9cbdc572ecce6f
-SIZE (telegramdesktop-libtgvoip-0e92a22_GH0.tar.gz) = 1484785
-SHA256 (telegramdesktop-crl-9ea8700_GH0.tar.gz) = 68011a83a139d68bed4fd13b946c1aea6f7bea8bffc702a4795f2c0e23f9efd4
-SIZE (telegramdesktop-crl-9ea8700_GH0.tar.gz) = 21873
+SHA256 (telegramdesktop-libtgvoip-d4a0f71_GH0.tar.gz) = bff049b414bdaafe488f3d46d894e910c06ff5233bf33001d59fe50b7de3702a
+SIZE (telegramdesktop-libtgvoip-d4a0f71_GH0.tar.gz) = 1484804
+SHA256 (telegramdesktop-crl-52baf11_GH0.tar.gz) = 04effcfcbcd1486619d93dba0a30ca16579bca5cc37273ed1908dd8b375e3e3b
+SIZE (telegramdesktop-crl-52baf11_GH0.tar.gz) = 21842
 SHA256 (Cyan4973-xxHash-7cc9639_GH0.tar.gz) = f40801820e885f92bbe3d2434efeb39aa18eeaf878341982e8525b538468e3ed
 SIZE (Cyan4973-xxHash-7cc9639_GH0.tar.gz) = 37534
-SHA256 (john-preston-rlottie-302b7f9_GH0.tar.gz) = ade35b77c10c2a733ecccbca261222c36755bbd0f0d03f2e2772bd7cc0ad3d2b
-SIZE (john-preston-rlottie-302b7f9_GH0.tar.gz) = 7896441
+SHA256 (john-preston-rlottie-589db02_GH0.tar.gz) = 415a78d04836f5bf4e535b034a7d5cf540d55cce98b9be869c3178e1c251f361
+SIZE (john-preston-rlottie-589db02_GH0.tar.gz) = 7887733
 SHA256 (lz4-lz4-9a2a9f2_GH0.tar.gz) = 437827e1a1a0eec752777d29ef7ac78b195c805438448fe08154d9b5b181b8ea
 SIZE (lz4-lz4-9a2a9f2_GH0.tar.gz) = 293999
diff --git a/net-im/telegram-desktop/files/CMakeLists.inj b/net-im/telegram-desktop/files/CMakeLists.inj
index 46f39a2462b1..e7e49f15cf47 100644
--- a/net-im/telegram-desktop/files/CMakeLists.inj
+++ b/net-im/telegram-desktop/files/CMakeLists.inj
@@ -12,6 +12,7 @@ add_precompiled_header(Telegram ../../Telegram/SourceFiles/stdafx.h)
 add_precompiled_header(lib_base ../../Telegram/SourceFiles/base/base_pch.h)
 add_precompiled_header(lib_export ../../Telegram/SourceFiles/export/export_pch.h)
 add_precompiled_header(lib_storage ../../Telegram/SourceFiles/storage/storage_pch.h)
+add_precompiled_header(lib_mtproto ../../Telegram/SourceFiles/mtproto/mtp_pch.h)
 
 # vim: ft=cmake
 # -------------- debian/CMakeLists.inj end --------------
diff --git a/net-im/telegram-desktop/files/gyp-patches b/net-im/telegram-desktop/files/gyp-patches
index ad8e0aa62e0a..ff30e0c97d8e 100644
--- a/net-im/telegram-desktop/files/gyp-patches
+++ b/net-im/telegram-desktop/files/gyp-patches
@@ -1,4 +1,4 @@
---- Telegram/gyp/codegen_rules.gypi.orig	2019-07-07 13:34:35 UTC
+--- Telegram/gyp/codegen_rules.gypi.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/gyp/codegen_rules.gypi
 @@ -15,7 +15,7 @@
        '<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp',
@@ -25,7 +25,7 @@
        '-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp',
        '<@(qrc_files)',
      ],
---- Telegram/gyp/lib_export.gyp.orig	2019-07-07 13:34:35 UTC
+--- Telegram/gyp/lib_export.gyp.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/gyp/lib_export.gyp
 @@ -46,7 +46,7 @@
      'include_dirs': [
@@ -36,18 +36,18 @@
        '<(submodules_loc)/GSL/include',
        '<(submodules_loc)/variant/include',
        '<(submodules_loc)/crl/src',
---- Telegram/gyp/lib_scheme.gyp.orig	2019-07-07 13:34:35 UTC
+--- Telegram/gyp/lib_scheme.gyp.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/gyp/lib_scheme.gyp
-@@ -48,7 +48,7 @@
+@@ -49,7 +49,7 @@
          '<(SHARED_INTERMEDIATE_DIR)/scheme.h',
        ],
        'action': [
 -        'python', '<(src_loc)/codegen/scheme/codegen_scheme.py',
 +        '%%PYTHON_CMD%%', '<(src_loc)/codegen/scheme/codegen_scheme.py',
-         '-o', '<(SHARED_INTERMEDIATE_DIR)', '<(res_loc)/scheme.tl',
-       ],
-       'message': 'codegen_scheme-ing scheme.tl..',
---- Telegram/gyp/qt_moc.gypi.orig	2019-07-07 13:34:35 UTC
+         '-o', '<(SHARED_INTERMEDIATE_DIR)',
+ 		'<(res_loc)/tl/mtproto.tl',
+ 		'<(res_loc)/tl/api.tl',
+--- Telegram/gyp/qt_moc.gypi.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/gyp/qt_moc.gypi
 @@ -15,12 +15,12 @@
        '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
@@ -64,7 +64,7 @@
        # '<!@(python -c "for s in \'<@(_include_dirs)\'.split(\' \'): print(\'-I\' + s)")',
        '<(RULE_INPUT_PATH)',
        '-o', '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
---- Telegram/gyp/qt_rcc.gypi.orig	2019-07-07 13:34:35 UTC
+--- Telegram/gyp/qt_rcc.gypi.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/gyp/qt_rcc.gypi
 @@ -15,7 +15,7 @@
        '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp',
@@ -75,7 +75,7 @@
        '-name', '<(RULE_INPUT_ROOT)',
        '-no-compress',
        '<(RULE_INPUT_PATH)',
---- Telegram/gyp/qt.gypi.orig	2019-07-07 13:34:35 UTC
+--- Telegram/gyp/qt.gypi.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/gyp/qt.gypi
 @@ -14,25 +14,21 @@
                [ 'build_macold', {
@@ -233,7 +233,7 @@
          '-pthread',
          '-rdynamic',
        ],
---- Telegram/gyp/telegram_linux.gypi.orig	2019-07-07 13:34:35 UTC
+--- Telegram/gyp/telegram_linux.gypi.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/gyp/telegram_linux.gypi
 @@ -10,7 +10,7 @@
        'variables': {
@@ -339,7 +339,7 @@
          ],
        }], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', {
          'cflags_cc': [ '<!(pkg-config --cflags ayatana-appindicator3-0.1)' ],
---- Telegram/gyp/Telegram.gyp.orig	2019-07-07 13:34:35 UTC
+--- Telegram/gyp/Telegram.gyp.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/gyp/Telegram.gyp
 @@ -51,7 +51,7 @@
          'pt-BR',
@@ -358,7 +358,7 @@
        '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip',
        'crl.gyp:crl',
        'lib_base.gyp:lib_base',
-@@ -86,27 +85,18 @@
+@@ -87,27 +86,18 @@
      ],
  
      'defines': [
@@ -388,7 +388,7 @@
        '<(emoji_suggestions_loc)',
        '<(submodules_loc)/GSL/include',
        '<(submodules_loc)/variant/include',
-@@ -125,7 +115,7 @@
+@@ -126,7 +116,7 @@
        '<(res_loc)/export_html/images/back@2x.png',
      ],
      'sources!': [
@@ -397,7 +397,7 @@
      ],
      'conditions': [
        [ '"<(official_build_target)" != ""', {
---- Telegram/gyp/tests/tests.gyp.orig	2019-07-07 13:34:35 UTC
+--- Telegram/gyp/tests/tests.gyp.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/gyp/tests/tests.gyp
 @@ -13,7 +13,7 @@
      'src_loc': '../../SourceFiles',
@@ -408,7 +408,7 @@
    },
    'targets': [{
      'target_name': 'tests',
---- Telegram/ThirdParty/libtgvoip/libtgvoip.gyp.orig	2019-06-24 11:42:33 UTC
+--- Telegram/ThirdParty/libtgvoip/libtgvoip.gyp.orig	2019-07-15 12:59:17 UTC
 +++ Telegram/ThirdParty/libtgvoip/libtgvoip.gyp
 @@ -14,11 +14,12 @@
          'variables': {
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp
new file mode 100644
index 000000000000..2fd0c7f86ed4
--- /dev/null
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp
@@ -0,0 +1,11 @@
+--- Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp.orig	2019-09-06 13:41:43 UTC
++++ Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
+@@ -103,7 +103,7 @@ constexpr auto kClearSourceTimeout = 10 * crl::time(10
+ 		},
+ 		5,
+ 	};
+-	static const auto list = std::array{
++	static const auto list = std::array<const Lottie::ColorReplacements*, 5>{
+ 		&color1,
+ 		&color2,
+ 		&color3,
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp
index 1af55f056716..3e8e2d7f2a40 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp
@@ -1,4 +1,4 @@
---- Telegram/SourceFiles/core/launcher.cpp.orig	2019-07-07 13:34:35 UTC
+--- Telegram/SourceFiles/core/launcher.cpp.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/SourceFiles/core/launcher.cpp
 @@ -16,6 +16,8 @@ https://github.com/telegramdesktop/tdesktop/blob/maste
  #include "core/sandbox.h"
@@ -9,7 +9,7 @@
  namespace Core {
  namespace {
  
-@@ -246,12 +248,13 @@ void Launcher::init() {
+@@ -248,12 +250,13 @@ void Launcher::init() {
  #define TDESKTOP_LAUNCHER_FILENAME_TO_STRING_HELPER(V) #V
  #define TDESKTOP_LAUNCHER_FILENAME_TO_STRING(V) TDESKTOP_LAUNCHER_FILENAME_TO_STRING_HELPER(V)
  	QApplication::setDesktopFileName(qsl(TDESKTOP_LAUNCHER_FILENAME_TO_STRING(TDESKTOP_LAUNCHER_FILENAME)));
@@ -26,7 +26,7 @@
  
  	initHook();
  }
-@@ -268,6 +271,11 @@ int Launcher::exec() {
+@@ -270,6 +273,11 @@ int Launcher::exec() {
  	// both are finished in Sandbox::closeApplication
  	Logs::start(this); // must be started before Platform is started
  	Platform::start(); // must be started before Sandbox is created
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp
index cbf4aafb43f2..e597570b6550 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/core/update_checker.cpp.orig	2019-07-07 13:34:35 UTC
+--- Telegram/SourceFiles/core/update_checker.cpp.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/SourceFiles/core/update_checker.cpp
-@@ -1461,6 +1461,9 @@ int UpdateChecker::size() const {
+@@ -1463,6 +1463,9 @@ int UpdateChecker::size() const {
  //}
  
  bool checkReadyUpdate() {
@@ -10,7 +10,7 @@
  	QString readyFilePath = cWorkingDir() + qsl("tupdates/temp/ready"), readyPath = cWorkingDir() + qsl("tupdates/temp");
  	if (!QFile(readyFilePath).exists() || cExeName().isEmpty()) {
  		if (QDir(cWorkingDir() + qsl("tupdates/ready")).exists() || QDir(cWorkingDir() + qsl("tupdates/temp")).exists()) {
-@@ -1513,6 +1516,9 @@ bool checkReadyUpdate() {
+@@ -1515,6 +1518,9 @@ bool checkReadyUpdate() {
  #elif defined Q_OS_LINUX // Q_OS_MAC
  	QString curUpdater = (cExeDir() + qsl("Updater"));
  	QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater"));
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp
index 8a2f795c62d4..c6f83b8ea378 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/export/data/export_data_types.cpp.orig	2019-07-07 13:34:35 UTC
+--- Telegram/SourceFiles/export/data/export_data_types.cpp.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/SourceFiles/export/data/export_data_types.cpp
-@@ -360,9 +360,9 @@ QString CleanDocumentName(QString name) {
+@@ -362,9 +362,9 @@ QString CleanDocumentName(QString name) {
  		'|',
  #elif defined Q_OS_MAC // Q_OS_WIN
  		':',
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp
index e97a638eb221..5bde846deb76 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig	2019-07-07 13:34:35 UTC
+--- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
-@@ -1411,13 +1411,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre
+@@ -1425,13 +1425,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre
  	_mouseSelectType = TextSelectType::Letters;
  	//_widget->noSelectingScroll(); // TODO
  
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp
index 4e5d33da443b..8d4b1876beb7 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/history/history_inner_widget.cpp.orig	2019-07-07 13:34:35 UTC
+--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/SourceFiles/history/history_inner_widget.cpp
-@@ -1382,7 +1382,7 @@ void HistoryInner::mouseActionFinish(
+@@ -1390,7 +1390,7 @@ void HistoryInner::mouseActionFinish(
  	_widget->noSelectingScroll();
  	_widget->updateTopBarSelection();
  
@@ -9,7 +9,7 @@
  	if (!_selected.empty() && _selected.cbegin()->second != FullSelection) {
  		const auto [item, selection] = *_selected.cbegin();
  		if (const auto view = item->mainView()) {
-@@ -1391,7 +1391,7 @@ void HistoryInner::mouseActionFinish(
+@@ -1399,7 +1399,7 @@ void HistoryInner::mouseActionFinish(
  				QClipboard::Selection);
  		}
  	}
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp
index b62c26110fe7..b9d8380b289b 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig	2019-07-07 13:34:35 UTC
+--- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/SourceFiles/history/view/history_view_list_widget.cpp
-@@ -2042,7 +2042,7 @@ void ListWidget::mouseActionFinish(
+@@ -2050,7 +2050,7 @@ void ListWidget::mouseActionFinish(
  	_mouseSelectType = TextSelectType::Letters;
  	//_widget->noSelectingScroll(); // #TODO select scroll
  
@@ -9,7 +9,7 @@
  	if (_selectedTextItem
  		&& _selectedTextRange.from != _selectedTextRange.to) {
  		if (const auto view = viewForItem(_selectedTextItem)) {
-@@ -2051,7 +2051,7 @@ void ListWidget::mouseActionFinish(
+@@ -2059,7 +2059,7 @@ void ListWidget::mouseActionFinish(
  				QClipboard::Selection);
  }
  	}
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp
index aed7ca6a8090..748104c4d111 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig	2019-07-07 13:34:35 UTC
+--- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/SourceFiles/platform/linux/main_window_linux.cpp
-@@ -25,7 +25,9 @@ bool noQtTrayIcon = false, tryAppIndicator = false;
+@@ -26,7 +26,9 @@ bool noQtTrayIcon = false, tryAppIndicator = false;
  bool useGtkBase = false, useAppIndicator = false, useStatusIcon = false, trayIconChecked = false, useUnityCount = false;
  
  #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
@@ -10,7 +10,7 @@
  GtkStatusIcon *_trayIcon = 0;
  GtkWidget *_trayMenu = 0;
  GdkPixbuf *_trayPixbuf = 0;
-@@ -291,7 +293,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {
+@@ -292,7 +294,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {
  		if (noQtTrayIcon) {
  #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
  			if (useAppIndicator) {
@@ -20,7 +20,7 @@
  			} else if (useStatusIcon) {
  				Libs::gtk_status_icon_set_visible(_trayIcon, false);
  			}
-@@ -307,7 +311,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {
+@@ -308,7 +312,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {
  		if (noQtTrayIcon) {
  #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
  			if (useAppIndicator) {
@@ -30,7 +30,7 @@
  			} else if (useStatusIcon) {
  				Libs::gtk_status_icon_set_visible(_trayIcon, true);
  			}
-@@ -326,7 +332,9 @@ void MainWindow::psUpdateIndicator() {
+@@ -327,7 +333,9 @@ void MainWindow::psUpdateIndicator() {
  	if (iconFile.exists()) {
  		QByteArray path = QFile::encodeName(iconFile.absoluteFilePath()), name = QFile::encodeName(iconFile.fileName());
  		name = name.mid(0, name.size() - 4);
@@ -40,7 +40,7 @@
  	} else {
  		useAppIndicator = false;
  	}
-@@ -423,11 +431,15 @@ void MainWindow::LibsLoaded() {
+@@ -424,11 +432,15 @@ void MainWindow::LibsLoaded() {
  			&& (Libs::g_object_ref_sink != nullptr)
  			&& (Libs::g_object_unref != nullptr);
  
@@ -56,7 +56,7 @@
  
  	if (tryAppIndicator && useGtkBase && useAppIndicator) {
  		noQtTrayIcon = true;
-@@ -463,6 +475,7 @@ void MainWindow::psCreateTrayIcon() {
+@@ -464,6 +476,7 @@ void MainWindow::psCreateTrayIcon() {
  	}
  
  #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
@@ -64,7 +64,7 @@
  	if (useAppIndicator) {
  		DEBUG_LOG(("Trying to create AppIndicator"));
  		_trayMenu = Libs::gtk_menu_new();
-@@ -493,6 +506,7 @@ void MainWindow::psCreateTrayIcon() {
+@@ -494,6 +507,7 @@ void MainWindow::psCreateTrayIcon() {
  			useAppIndicator = false;
  		}
  	}
@@ -72,7 +72,7 @@
  	if (useStatusIcon) {
  		if (Libs::gdk_init_check(0, 0)) {
  			if (!_trayMenu) _trayMenu = Libs::gtk_menu_new();
-@@ -617,10 +631,12 @@ MainWindow::~MainWindow() {
+@@ -628,10 +642,12 @@ MainWindow::~MainWindow() {
  		Libs::g_object_unref(_trayMenu);
  		_trayMenu = nullptr;
  	}
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__functions.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__functions.cpp
index 020dd9f90e17..aa00f43661fe 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__functions.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__functions.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/qt_functions.cpp.orig	2018-08-05 22:39:05 UTC
+--- Telegram/SourceFiles/qt_functions.cpp.orig	2019-09-07 21:39:10 UTC
 +++ Telegram/SourceFiles/qt_functions.cpp
-@@ -0,0 +1,94 @@
+@@ -0,0 +1,96 @@
 +/****************************************************************************
 +**
 +** Copyright (C) 2015 The Qt Company Ltd.
@@ -34,6 +34,8 @@
 +**
 +****************************************************************************/
 +
++#include <private/qtextengine_p.h>
++
 +/* TODO: find a dynamic library with these symbols. */
 +
 +/* Debian maintainer: this function is taken from qfiledialog.cpp */
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp
index ecd5b42e2074..06b04574f9f7 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/settings/settings_notifications.cpp.orig	2019-07-07 13:34:35 UTC
+--- Telegram/SourceFiles/settings/settings_notifications.cpp.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/SourceFiles/settings/settings_notifications.cpp
-@@ -480,11 +480,11 @@ void NotificationsCount::SampleWidget::destroyDelayed(
+@@ -494,11 +494,11 @@ void NotificationsCount::SampleWidget::destroyDelayed(
  	_deleted = true;
  
  	// Ubuntu has a lag if deleteLater() called immediately.
@@ -14,4 +14,4 @@
 +#endif // Q_OS_LINUX32 || Q_OS_LINUX64 || Q_OS_FREEBSD
  }
  
- void SetupAdvancedNotifications(not_null<Ui::VerticalLayout*> container) {
+ void SetupAdvancedNotifications(
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp
index 8f5ea96bc084..34d1afac9f8b 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/ui/text/text.cpp.orig	2019-07-07 13:34:35 UTC
+--- Telegram/SourceFiles/ui/text/text.cpp.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/SourceFiles/ui/text/text.cpp
-@@ -2016,11 +2016,11 @@ class Renderer { (private)
+@@ -2018,11 +2018,11 @@ class Renderer { (private)
  		if (item == -1)
  			return;
  
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp
index 45558e1abd71..49784c03e3e1 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/ui/text/text_block.cpp.orig	2019-07-07 13:34:35 UTC
+--- Telegram/SourceFiles/ui/text/text_block.cpp.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/SourceFiles/ui/text/text_block.cpp
-@@ -335,6 +335,9 @@ TextBlock::TextBlock(const style::font &font, const QS
+@@ -337,6 +337,9 @@ TextBlock::TextBlock(const style::font &font, const QS
  
  		QStackTextEngine engine(part, blockFont->f);
  		BlockParser parser(&engine, this, minResizeWidth, _from, part);
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp
index 0d02efdf1d4c..898a1952378b 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/window/main_window.cpp.orig	2019-07-07 13:34:35 UTC
+--- Telegram/SourceFiles/window/main_window.cpp.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/SourceFiles/window/main_window.cpp
-@@ -565,7 +565,7 @@ bool MainWindow::minimizeToTray() {
+@@ -564,7 +564,7 @@ bool MainWindow::minimizeToTray() {
  }
  
  void MainWindow::reActivateWindow() {
@@ -9,7 +9,7 @@
  	const auto reActivate = [=] {
  		if (const auto w = App::wnd()) {
  			if (auto f = QApplication::focusWidget()) {
-@@ -580,7 +580,7 @@ void MainWindow::reActivateWindow() {
+@@ -579,7 +579,7 @@ void MainWindow::reActivateWindow() {
  	};
  	crl::on_main(this, reActivate);
  	App::CallDelayed(200, this, reActivate);
diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp
index ba2be7926830..bb8956d1d3d3 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp
@@ -1,16 +1,5 @@
---- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig	2019-06-24 11:42:33 UTC
+--- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig	2019-07-15 12:59:17 UTC
 +++ Telegram/ThirdParty/libtgvoip/VoIPController.cpp
-@@ -2389,8 +2389,8 @@ simpleAudioBlock random_id:long random_bytes:string ra
- 					stm->decoder=NULL;
- 				}else if(stm->type==STREAM_TYPE_VIDEO){
- 					if(!stm->packetReassembler){
--						stm->packetReassembler=make_shared<PacketReassembler>();
--						stm->packetReassembler->SetCallback(bind(&VoIPController::ProcessIncomingVideoFrame, this, placeholders::_1, placeholders::_2, placeholders::_3));
-+						//stm->packetReassembler=make_shared<PacketReassembler>();
-+						//stm->packetReassembler->SetCallback(bind(&VoIPController::ProcessIncomingVideoFrame, this, placeholders::_1, placeholders::_2, placeholders::_3));
- 					}
- 				}else{
- 					LOGW("Unknown incoming stream type: %d", stm->type);
 @@ -3048,7 +3048,7 @@ static void initMachTimestart() {
  #endif
  
diff --git a/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt b/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt
index 47407b3ccdb1..975693b875de 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt
+++ b/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt
@@ -1,6 +1,6 @@
---- Telegram/gyp/telegram_sources.txt.orig	2019-07-07 13:34:35 UTC
+--- Telegram/gyp/telegram_sources.txt.orig	2019-09-06 13:41:43 UTC
 +++ Telegram/gyp/telegram_sources.txt
-@@ -577,8 +577,8 @@
+@@ -605,8 +605,8 @@
  <(src_loc)/platform/linux/linux_libs.h
  <(src_loc)/platform/linux/file_utilities_linux.cpp
  <(src_loc)/platform/linux/file_utilities_linux.h
@@ -11,7 +11,7 @@
  <(src_loc)/platform/linux/launcher_linux.cpp
  <(src_loc)/platform/linux/launcher_linux.h
  <(src_loc)/platform/linux/main_window_linux.cpp
-@@ -894,14 +894,7 @@
+@@ -923,14 +923,7 @@
  <(emoji_suggestions_loc)/emoji_suggestions.cpp
  <(emoji_suggestions_loc)/emoji_suggestions.h
  
diff --git a/net-im/telegram-desktop/files/patch-issue6219 b/net-im/telegram-desktop/files/patch-issue6219
deleted file mode 100644
index 4f2a5c1fc9a7..000000000000
--- a/net-im/telegram-desktop/files/patch-issue6219
+++ /dev/null
@@ -1,172 +0,0 @@
-From 0710dde4d5526454318b2748331e887c01ecfdce Mon Sep 17 00:00:00 2001
-From: John Preston <johnprestonmail@gmail.com>
-Date: Tue, 9 Jul 2019 13:43:57 +0200
-Subject: [PATCH] Use private Qt color API only in official build.
-
-Fixes #6219.
----
- .../SourceFiles/ffmpeg/ffmpeg_utility.cpp     | 100 ++++++++++++------
- Telegram/gyp/lib_ffmpeg.gyp                   |   6 +-
- 2 files changed, 71 insertions(+), 35 deletions(-)
-
-diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
-index 5d0e50926..3775f7503 100644
---- Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
-+++ Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
-@@ -11,7 +11,10 @@ For license and copyright information please follow this link:
- #include "logs.h"
- 
- #include <QImage>
-+
-+#ifdef TDESKTOP_OFFICIAL_TARGET
- #include <private/qdrawhelper_p.h>
-+#endif // TDESKTOP_OFFICIAL_TARGET
- 
- extern "C" {
- #include <libavutil/opt.h>
-@@ -44,6 +47,58 @@ void AlignedImageBufferCleanupHandler(void* data) {
- 		&& !(image.bytesPerLine() % kAlignImageBy);
- }
- 
-+void UnPremultiplyLine(uchar *dst, const uchar *src, int intsCount) {
-+#ifdef TDESKTOP_OFFICIAL_TARGET
-+	const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
-+	const auto convert = layout->convertFromARGB32PM;
-+#else // TDESKTOP_OFFICIAL_TARGET
-+	const auto layout = nullptr;
-+	const auto convert = [](
-+			uint *dst,
-+			const uint *src,
-+			int count,
-+			std::nullptr_t,
-+			std::nullptr_t) {
-+		for (auto i = 0; i != count; ++i) {
-+			dst[i] = qUnpremultiply(src[i]);
-+		}
-+	};
-+#endif // TDESKTOP_OFFICIAL_TARGET
-+
-+	convert(
-+		reinterpret_cast<uint*>(dst),
-+		reinterpret_cast<const uint*>(src),
-+		intsCount,
-+		layout,
-+		nullptr);
-+}
-+
-+void PremultiplyLine(uchar *dst, const uchar *src, int intsCount) {
-+#ifdef TDESKTOP_OFFICIAL_TARGET
-+	const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
-+	const auto convert = layout->convertToARGB32PM;
-+#else // TDESKTOP_OFFICIAL_TARGET
-+	const auto layout = nullptr;
-+	const auto convert = [](
-+			uint *dst,
-+			const uint *src,
-+			int count,
-+			std::nullptr_t,
-+			std::nullptr_t) {
-+		for (auto i = 0; i != count; ++i) {
-+			dst[i] = qPremultiply(src[i]);
-+		}
-+	};
-+#endif // TDESKTOP_OFFICIAL_TARGET
-+
-+	convert(
-+		reinterpret_cast<uint*>(dst),
-+		reinterpret_cast<const uint*>(src),
-+		intsCount,
-+		layout,
-+		nullptr);
-+}
-+
- } // namespace
- 
- IOPointer MakeIOPointer(
-@@ -360,58 +415,35 @@ void UnPremultiply(QImage &to, const QImage &from) {
- 	if (!GoodStorageForFrame(to, from.size())) {
- 		to = CreateFrameStorage(from.size());
- 	}
--
--	const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
--	const auto convert = layout->convertFromARGB32PM;
- 	const auto fromPerLine = from.bytesPerLine();
- 	const auto toPerLine = to.bytesPerLine();
- 	const auto width = from.width();
-+	const auto height = from.height();
-+	auto fromBytes = from.bits();
-+	auto toBytes = to.bits();
- 	if (fromPerLine != width * 4 || toPerLine != width * 4) {
--		auto fromBytes = from.bits();
--		auto toBytes = to.bits();
--		for (auto i = 0; i != to.height(); ++i) {
--			convert(
--				reinterpret_cast<uint*>(toBytes),
--				reinterpret_cast<const uint*>(fromBytes),
--				width,
--				layout,
--				nullptr);
-+		for (auto i = 0; i != height; ++i) {
-+			UnPremultiplyLine(toBytes, fromBytes, width);
- 			fromBytes += fromPerLine;
- 			toBytes += toPerLine;
- 		}
- 	} else {
--		convert(
--			reinterpret_cast<uint*>(to.bits()),
--			reinterpret_cast<const uint*>(from.bits()),
--			from.width() * from.height(),
--			layout,
--			nullptr);
-+		UnPremultiplyLine(toBytes, fromBytes, width * height);
- 	}
- }
- 
- void PremultiplyInplace(QImage &image) {
--	const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
--	const auto convert = layout->convertToARGB32PM;
- 	const auto perLine = image.bytesPerLine();
- 	const auto width = image.width();
-+	const auto height = image.height();
-+	auto bytes = image.bits();
- 	if (perLine != width * 4) {
--		auto bytes = image.bits();
--		for (auto i = 0; i != image.height(); ++i) {
--			convert(
--				reinterpret_cast<uint*>(bytes),
--				reinterpret_cast<const uint*>(bytes),
--				width,
--				layout,
--				nullptr);
-+		for (auto i = 0; i != height; ++i) {
-+			PremultiplyLine(bytes, bytes, width);
- 			bytes += perLine;
- 		}
- 	} else {
--		convert(
--			reinterpret_cast<uint*>(image.bits()),
--			reinterpret_cast<const uint*>(image.bits()),
--			image.width() * image.height(),
--			layout,
--			nullptr);
-+		PremultiplyLine(bytes, bytes, width * height);
- 	}
- }
- 
-diff --git a/Telegram/gyp/lib_ffmpeg.gyp b/Telegram/gyp/lib_ffmpeg.gyp
-index 9971d76ae..b9ada5362 100644
---- Telegram/gyp/lib_ffmpeg.gyp
-+++ Telegram/gyp/lib_ffmpeg.gyp
-@@ -46,7 +46,11 @@
-       '<(src_loc)/ffmpeg/ffmpeg_utility.cpp',
-       '<(src_loc)/ffmpeg/ffmpeg_utility.h',
-     ],
--    'conditions': [[ 'build_macold', {
-+    'conditions': [[ '"<(official_build_target)" != ""', {
-+      'defines': [
-+        'TDESKTOP_OFFICIAL_TARGET=<(official_build_target)',
-+      ],
-+    }], [ 'build_macold', {
-       'xcode_settings': {
-         'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
-       },
diff --git a/net-im/telegram-purple/Makefile b/net-im/telegram-purple/Makefile
index e8110c4b4ece..50755c1266c2 100644
--- a/net-im/telegram-purple/Makefile
+++ b/net-im/telegram-purple/Makefile
@@ -15,8 +15,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BROKEN_armv6=		fails to link: undefined reference to 'backtrace'
 BROKEN_sparc64=		fails to compile: assertion fails
 
-BUILD_DEPENDS=	pidgin:net-im/pidgin
-RUN_DEPENDS=	pidgin:net-im/pidgin
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libwebp.so:graphics/webp \
 		libpurple.so:net-im/libpurple \
diff --git a/net-mgmt/blackbox_exporter/Makefile b/net-mgmt/blackbox_exporter/Makefile
index 7bad0c877c15..753a3a1afc2c 100644
--- a/net-mgmt/blackbox_exporter/Makefile
+++ b/net-mgmt/blackbox_exporter/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	blackbox_exporter
-PORTVERSION=	0.13.0
+PORTVERSION=	0.15.0
 DISTVERSIONPREFIX=v
 CATEGORIES=	net-mgmt
 
diff --git a/net-mgmt/blackbox_exporter/distinfo b/net-mgmt/blackbox_exporter/distinfo
index b154ddbe4385..908721c6026d 100644
--- a/net-mgmt/blackbox_exporter/distinfo
+++ b/net-mgmt/blackbox_exporter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1544893751
-SHA256 (prometheus-blackbox_exporter-v0.13.0_GH0.tar.gz) = c89563637647f456472f45e135ee482d8d2a40b8700ffb177f9e700017746006
-SIZE (prometheus-blackbox_exporter-v0.13.0_GH0.tar.gz) = 668255
+TIMESTAMP = 1568285638
+SHA256 (prometheus-blackbox_exporter-v0.15.0_GH0.tar.gz) = cf855e8accc960882157a86094ce3862b738932ab87d8d4f08b3ce0f3b387030
+SIZE (prometheus-blackbox_exporter-v0.15.0_GH0.tar.gz) = 2157865
diff --git a/net-mgmt/ipv6calc/Makefile b/net-mgmt/ipv6calc/Makefile
index 732acdbd7818..54dad14ba92a 100644
--- a/net-mgmt/ipv6calc/Makefile
+++ b/net-mgmt/ipv6calc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ipv6calc
-PORTVERSION=	2.0.0
+PORTVERSION=	2.1.1
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/
 
@@ -13,6 +13,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake perl5 shebangfix ssl
+
 GNU_CONFIGURE=	yes
 
 SHEBANG_FILES=	tools/*.pl tools/*.sh.in
diff --git a/net-mgmt/ipv6calc/distinfo b/net-mgmt/ipv6calc/distinfo
index d2a7c34d1837..47fc796d4a1a 100644
--- a/net-mgmt/ipv6calc/distinfo
+++ b/net-mgmt/ipv6calc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550403817
-SHA256 (ipv6calc-2.0.0.tar.gz) = a72c78c72e004ec91e62a4d251191621bb17ac89391a59ee2877f43f81f1810c
-SIZE (ipv6calc-2.0.0.tar.gz) = 1436990
+TIMESTAMP = 1567949855
+SHA256 (ipv6calc-2.1.1.tar.gz) = 964957e79505cbc71ebc706a0fc0b67c6e08c55ed53335470ed7f8309eb84405
+SIZE (ipv6calc-2.1.1.tar.gz) = 1453854
diff --git a/net-mgmt/ipv6mon/Makefile b/net-mgmt/ipv6mon/Makefile
index 70db43487f71..e26a9afad378 100644
--- a/net-mgmt/ipv6mon/Makefile
+++ b/net-mgmt/ipv6mon/Makefile
@@ -10,7 +10,8 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Tool for monitoring IPv6 address usage
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 USES=		uidfix
 CFLAGS+=	-DIPV6MON_CONF=\\\"${PREFIX}/etc/ipv6mon.conf\\\"
@@ -27,11 +28,13 @@ PORTDOCS=	README.TXT \
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
-	${INSTALL_DATA} ${FILESDIR}/Makefile ${WRKSRC}
-	${INSTALL_DATA} ${WRKSRC}/manuals/* ${WRKSRC}
+	@${INSTALL_DATA} ${FILESDIR}/Makefile ${WRKSRC}
+	@${INSTALL_DATA} ${WRKSRC}/manuals/* ${WRKSRC}
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/etc/rc.d
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/net-mgmt/ipv6mon/pkg-descr b/net-mgmt/ipv6mon/pkg-descr
index c9970a714146..42bf765b0120 100644
--- a/net-mgmt/ipv6mon/pkg-descr
+++ b/net-mgmt/ipv6mon/pkg-descr
@@ -5,4 +5,4 @@ where address assignment is decentralized and there is no central
 server that records which IPv6 addresses have been assigned to which
 nodes during which period of time.
 
-WWW: http://www.si6networks.com/tools/ipv6mon/
+WWW: https://www.si6networks.com/tools/ipv6mon/
diff --git a/net-mgmt/nrpe3/Makefile b/net-mgmt/nrpe3/Makefile
index d63d8ff74f61..b25acf9d2e7b 100644
--- a/net-mgmt/nrpe3/Makefile
+++ b/net-mgmt/nrpe3/Makefile
@@ -13,6 +13,9 @@ COMMENT?=	Nagios Remote Plugin Executor
 
 LICENSE=	GPLv2
 
+BROKEN_SSL=	libressl libressl-devel
+BROKEN_SSL_REASON=	nrpe3 does not work with libressl
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	NagiosEnterprises
 
diff --git a/net-mgmt/py-ciscoconfparse/Makefile b/net-mgmt/py-ciscoconfparse/Makefile
index 45a2d1e78248..34dbbc05757f 100644
--- a/net-mgmt/py-ciscoconfparse/Makefile
+++ b/net-mgmt/py-ciscoconfparse/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ciscoconfparse
-DISTVERSION=	1.4.3
+DISTVERSION=	1.4.7
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net-mgmt/py-ciscoconfparse/distinfo b/net-mgmt/py-ciscoconfparse/distinfo
index f53d722ebef1..c7856f9bb4e6 100644
--- a/net-mgmt/py-ciscoconfparse/distinfo
+++ b/net-mgmt/py-ciscoconfparse/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566645333
-SHA256 (ciscoconfparse-1.4.3.tar.gz) = 1ce7a137eefab4e3b69a650df6fde8b027fabacc272e201a08f57f6d0860256b
-SIZE (ciscoconfparse-1.4.3.tar.gz) = 127472
+TIMESTAMP = 1568272798
+SHA256 (ciscoconfparse-1.4.7.tar.gz) = dbebc9f87f07641015e1d1a294cf550c5a376060e9113586eb43f37884e7f230
+SIZE (ciscoconfparse-1.4.7.tar.gz) = 128398
diff --git a/net-mgmt/unifi5/Makefile b/net-mgmt/unifi5/Makefile
index 1b34c3a6125b..35325cdb54e4 100644
--- a/net-mgmt/unifi5/Makefile
+++ b/net-mgmt/unifi5/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	unifi5
-PORTVERSION=	5.10.25
+PORTVERSION=	5.11.39
 PORTREVISION=	0
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	http://dl.ubnt.com/unifi/${PORTVERSION}/
diff --git a/net-mgmt/unifi5/distinfo b/net-mgmt/unifi5/distinfo
index 722cee9f3307..58582dae7419 100644
--- a/net-mgmt/unifi5/distinfo
+++ b/net-mgmt/unifi5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562161900
-SHA256 (unifi5-5.10.25/unifi_sysvinit_all.deb) = bd39c9f2953736582f9707e120b7ed9cc9e023ce9a727ec6a74627d0f0c903ec
-SIZE (unifi5-5.10.25/unifi_sysvinit_all.deb) = 81225384
+TIMESTAMP = 1568307406
+SHA256 (unifi5-5.11.39/unifi_sysvinit_all.deb) = d2736dababcf96596a2c9ad82ee2fcbd02ee4d3a864284175b43f5afdab62f6c
+SIZE (unifi5-5.11.39/unifi_sysvinit_all.deb) = 97384556
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index e6b72d467e0f..4db4734f2064 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	xymon
-PORTVERSION=	4.3.28
-PORTREVISION=	1
+PORTVERSION=	4.3.29
+PORTREVISION=	0
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}
diff --git a/net-mgmt/xymon-server/distinfo b/net-mgmt/xymon-server/distinfo
index 876a584cc45d..2359623f2f97 100644
--- a/net-mgmt/xymon-server/distinfo
+++ b/net-mgmt/xymon-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487036734
-SHA256 (repacked/xymon-4.3.28.tar.gz) = 68cb33eb48d1bb212a1bbafd9fdea8c682ae1b69077cd5fb03676e0af39cbf80
-SIZE (repacked/xymon-4.3.28.tar.gz) = 3966200
+TIMESTAMP = 1565901233
+SHA256 (repacked/xymon-4.3.29.tar.gz) = 89bcb6c7a4325c8bcaa5c1f3de238c444f2731b04b0cb0348b88add89396c659
+SIZE (repacked/xymon-4.3.29.tar.gz) = 3548283
diff --git a/net-p2p/go-ethereum/Makefile b/net-p2p/go-ethereum/Makefile
index 4c6e9502915d..499d7000494a 100644
--- a/net-p2p/go-ethereum/Makefile
+++ b/net-p2p/go-ethereum/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	go-ethereum
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.9.2
+DISTVERSION=	1.9.3
 CATEGORIES=	net-p2p
 
 MAINTAINER=	me@enriquefynn.com
diff --git a/net-p2p/go-ethereum/distinfo b/net-p2p/go-ethereum/distinfo
index 3f019ac6a3ae..8f60d12ec3f5 100644
--- a/net-p2p/go-ethereum/distinfo
+++ b/net-p2p/go-ethereum/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565773811
-SHA256 (ethereum-go-ethereum-v1.9.2_GH0.tar.gz) = e6ffeec853847e859a37c6077cf4503642403926a6918686f161db50e88911e2
-SIZE (ethereum-go-ethereum-v1.9.2_GH0.tar.gz) = 16775855
+TIMESTAMP = 1568098684
+SHA256 (ethereum-go-ethereum-v1.9.3_GH0.tar.gz) = d16e8b42b37a23b448775f27f0d2018425e6a1e6fc215f764aad3665a20bf493
+SIZE (ethereum-go-ethereum-v1.9.3_GH0.tar.gz) = 16141718
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index 2832644f41cb..9a4542d789a4 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -68,11 +68,11 @@ PLIST_SUB+=	CORE="@comment " GUI="" GUICORE="@comment "
 
 .if ${PORT_OPTIONS:MGUI}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/ocaml/site-lib/lablgtk2/lablrsvg.cma:x11-toolkits/ocaml-lablgtk2
-LIB_DEPENDS+=	librsvg-2.so:graphics/librsvg2
 
 CONFIGURE_ARGS+=--enable-gui=newgui2
 # we don't need lablgtk as RUN dependency, but we need gtk+glib
-USE_GNOME=	gtk20
+USES+=		gnome
+USE_GNOME=	gtk20 librsvg2
 .endif # ${PORT_OPTIONS:MGUI}
 
 .if ${PORT_OPTIONS:MCORE}
diff --git a/net/Makefile b/net/Makefile
index efa0365a73e2..99cf87dc5701 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -95,6 +95,7 @@
     SUBDIR += corosync3
     SUBDIR += coturn
     SUBDIR += courier-authlib-ldap
+    SUBDIR += courier-sox
     SUBDIR += cppzmq
     SUBDIR += cryptcat
     SUBDIR += csocks
@@ -268,6 +269,7 @@
     SUBDIR += intel-ixl-kmod
     SUBDIR += iodine
     SUBDIR += ip2location
+    SUBDIR += ip2proxy
     SUBDIR += ip6_int
     SUBDIR += ipdecap
     SUBDIR += ipgrab
diff --git a/net/babeld/Makefile b/net/babeld/Makefile
index 7936740f8c50..bd69bf69acf3 100644
--- a/net/babeld/Makefile
+++ b/net/babeld/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	babeld
 PORTVERSION=	1.8.5
+DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	net
 
 MAINTAINER=	gaod@hychen.org
@@ -18,7 +19,6 @@ PLIST_FILES=	bin/babeld \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jech
-GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
 USE_RC_SUBR=	babeld
 
 do-install:
diff --git a/net/babeld/distinfo b/net/babeld/distinfo
index 68f693e5438a..6854f2125fe7 100644
--- a/net/babeld/distinfo
+++ b/net/babeld/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564936478
-SHA256 (jech-babeld-1.8.5-babeld-1.8.5_GH0.tar.gz) = 91192a7d6f7e99ad6a68d696c2e7b174f8e1413c693d4dc31c77d04e24b64f3c
-SIZE (jech-babeld-1.8.5-babeld-1.8.5_GH0.tar.gz) = 94753
+TIMESTAMP = 1568191930
+SHA256 (jech-babeld-babeld-1.8.5_GH0.tar.gz) = 91192a7d6f7e99ad6a68d696c2e7b174f8e1413c693d4dc31c77d04e24b64f3c
+SIZE (jech-babeld-babeld-1.8.5_GH0.tar.gz) = 94753
diff --git a/net/bird/Makefile b/net/bird/Makefile
index 88b95a42f4f8..2602e3d659b2 100644
--- a/net/bird/Makefile
+++ b/net/bird/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bird
-PORTVERSION=	1.6.7
-PORTREVISION=	1
+PORTVERSION=	1.6.8
 CATEGORIES=	net
 MASTER_SITES=	ftp://bird.network.cz/pub/bird/
 
diff --git a/net/bird/distinfo b/net/bird/distinfo
index 32c764c3827f..530b02d55294 100644
--- a/net/bird/distinfo
+++ b/net/bird/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565266049
-SHA256 (bird-1.6.7.tar.gz) = 7eab27ff4b0117a33d20f61b161b647e1fd354b9303c4ed4d3f99260b2173dc9
-SIZE (bird-1.6.7.tar.gz) = 1041299
+TIMESTAMP = 1568328091
+SHA256 (bird-1.6.8.tar.gz) = 6c61ab5d2ef59d2559a8735b8252b5a0238013b43e5fb8a96c5d9d06e7bc00b2
+SIZE (bird-1.6.8.tar.gz) = 1042222
diff --git a/net/bird2/Makefile b/net/bird2/Makefile
index 30efa95ac66f..36b99dc7990b 100644
--- a/net/bird2/Makefile
+++ b/net/bird2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bird
-DISTVERSION=	2.0.5
+DISTVERSION=	2.0.6
 CATEGORIES=	net
 MASTER_SITES=	ftp://bird.network.cz/pub/bird/
 PKGNAMESUFFIX=	2
diff --git a/net/bird2/distinfo b/net/bird2/distinfo
index 13c48d4fdb2e..46b66ce49880 100644
--- a/net/bird2/distinfo
+++ b/net/bird2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565265942
-SHA256 (bird-2.0.5.tar.gz) = 4e4b736fd26579823a728be6a7746b3f525206e3c9a4a21fccb302cffd3029d3
-SIZE (bird-2.0.5.tar.gz) = 1099509
+TIMESTAMP = 1568328201
+SHA256 (bird-2.0.6.tar.gz) = 90934cce6ae90039ab1e58ade223935f9221a7e5eac05df6fb53045b77bfd3aa
+SIZE (bird-2.0.6.tar.gz) = 1899912
diff --git a/net/courier-sox/Makefile b/net/courier-sox/Makefile
new file mode 100644
index 000000000000..7d5b2422893b
--- /dev/null
+++ b/net/courier-sox/Makefile
@@ -0,0 +1,35 @@
+# $FreeBSD$
+# Created by Radim Kolar <hsn@sendmail.cz>
+
+PORTNAME=	courier-sox
+DISTVERSION=	0.12.20180428
+CATEGORIES=	net
+MASTER_SITES=	SF/courier/sox-devel/${DISTVERSION:E}
+
+MAINTAINER=	hsn@sendmail.cz
+COMMENT=	Courier Socks 5 Proxy client library and wrapper
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	courier-authlib-base>0.56:security/courier-authlib-base \
+		gdbm>0:databases/gdbm \
+		libltdl>0:devel/libltdl
+RUN_DEPENDS=	courier-authlib-base>0.56:security/courier-authlib-base \
+		gdbm>0:databases/gdbm \
+		libltdl>0:devel/libltdl \
+		p5-GDBM>0:databases/p5-GDBM \
+		p5-Net-CIDR>0:net-mgmt/p5-Net-CIDR
+
+USES=		autoreconf libtool localbase perl5 tar:bz2
+USE_LDCONFIG=	yes
+
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
+
+post-stage:
+		@(cd ${STAGEDIR}/${PREFIX}/etc/socksrc/ && \
+			${MV} system system.sample)
+
+.include <bsd.port.mk>
diff --git a/net/courier-sox/distinfo b/net/courier-sox/distinfo
new file mode 100644
index 000000000000..cc2f7b5d92f5
--- /dev/null
+++ b/net/courier-sox/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1568030714
+SHA256 (courier-sox-0.12.20180428.tar.bz2) = 7d2b0c0dc69b355170834a011e0d15011ffe6ef2a0e737edec6fadf96857efee
+SIZE (courier-sox-0.12.20180428.tar.bz2) = 387961
diff --git a/net/courier-sox/pkg-descr b/net/courier-sox/pkg-descr
new file mode 100644
index 000000000000..50b2816936d3
--- /dev/null
+++ b/net/courier-sox/pkg-descr
@@ -0,0 +1,6 @@
+The Courier Socks 5 package contains:
+1. Courier Socks 5 Proxy client Library
+2. Courier Socks 5 server
+3. Courier Socks 5 wrapper
+
+WWW: https://www.Courier-MTA.org/
diff --git a/net/courier-sox/pkg-plist b/net/courier-sox/pkg-plist
new file mode 100644
index 000000000000..70f9b5458543
--- /dev/null
+++ b/net/courier-sox/pkg-plist
@@ -0,0 +1,19 @@
+bin/mkbl4
+bin/socksify
+@sample etc/socksrc/system.sample
+include/socks.h
+lib/libsocks.a
+lib/libsocks.so
+lib/libsocks.so.0
+lib/libsocks.so.0.0.0
+lib/libsockswrap.a
+lib/libsockswrap.so
+lib/libsockswrap.so.0
+lib/libsockswrap.so.0.0.0
+libexec/sockd
+man/man1/sockd.1.gz
+man/man1/socksify.1.gz
+man/man3/socks.3.gz
+man/man5/socksrc.5.gz
+man/man8/mkbl4.8.gz
+sbin/sockd
diff --git a/net/drive/Makefile b/net/drive/Makefile
index 8f0a966cee55..6e7a56ed0886 100644
--- a/net/drive/Makefile
+++ b/net/drive/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	drive
 PORTVERSION=	0.3.9.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -21,24 +21,28 @@ GO_TARGET=	${GO_PKGNAME}/cmd/${GH_PROJECT}
 PLIST_FILES=	bin/drive
 
 GH_ACCOUNT=	odeke-em
+GH_TAGNAME=	b868c96
 GH_TUPLE=	boltdb:bolt:v1.3.1:boltdb_bolt/../src/github.com/boltdb/bolt \
-		census-instrumentation:opencensus-go:v0.21.0:census_instrumentation_opencensus/../src/go.opencensus.io \
+		census-instrumentation:opencensus-go:v0.22.1:census_instrumentation_opencensus/../src/go.opencensus.io \
 		cheggaaa:pb:v1.0.28:cheggaaa_pb/../src/github.com/cheggaaa/pb \
 		fatih:color:v1.7.0:fatih_color/../src/github.com/fatih/color \
-		golang:crypto:22d7a77:golang_crypto/../src/golang.org/x/crypto \
-		golang:net:3ec1911:golang_net/../src/golang.org/x/net \
-		golang:oauth2:950ef44:golang_oauth2/../src/golang.org/x/oauth2 \
-		golang:protobuf:v1.3.1:golang_protobuf/../src/github.com/golang/protobuf \
-		golang:sys:61b9204:golang_sys/../src/golang.org/x/sys \
-		golang:text:342b2e1:golang_text/../src/golang.org/x/text \
-		google:go-genproto:bb713bd:google_go_genproto/../src/google.golang.org/genproto \
-		google:google-api-go-client:v0.5.0:google_googleapigoclient/../src/google.golang.org/api \
-		googleapis:google-cloud-go:v0.39.0:googleapis_googlecloudgo/../src/cloud.google.com/go \
-		grpc:grpc-go:v1.20.1:grpc_grpc_go/../src/google.golang.org/grpc \
-		hashicorp:golang-lru:v0.5.1:hashicorp_golang_lru/../src/github.com/hashicorp/golang-lru \
-		mattn:go-colorable:v0.1.1:mattn_gocolorable/../src/github.com/mattn/go-colorable \
-		mattn:go-isatty:v0.0.7:mattn_goisatty/../src/github.com/mattn/go-isatty \
+		golang:crypto:71b5226:golang_crypto/../src/golang.org/x/crypto \
+		golang:groupcache:869f871:golang_groupcache/../src/github.com/golang/groupcache \
+		golang:net:ba9fcec:golang_net/../src/golang.org/x/net \
+		golang:oauth2:0f29369:golang_oauth2/../src/golang.org/x/oauth2 \
+		golang:protobuf:v1.3.2:golang_protobuf/../src/github.com/golang/protobuf \
+		golang:sys:749cb33:golang_sys/../src/golang.org/x/sys \
+		golang:text:3d0f797:golang_text/../src/golang.org/x/text \
+		google:go-genproto:92dd089:google_go_genproto/../src/google.golang.org/genproto \
+		google:google-api-go-client:v0.10.0:google_googleapigoclient/../src/google.golang.org/api \
+		googleapis:google-cloud-go:v0.45.1:googleapis_googlecloudgo/../src/cloud.google.com/go \
+		googleapis:gax-go:v2.0.5:googleapis_gaxgo/../src/github.com/googleapis/gax-go \
+		grpc:grpc-go:v1.23.0:grpc_grpc_go/../src/google.golang.org/grpc \
+		hashicorp:golang-lru:v0.5.3:hashicorp_golang_lru/../src/github.com/hashicorp/golang-lru \
+		mattn:go-colorable:v0.1.2:mattn_gocolorable/../src/github.com/mattn/go-colorable \
+		mattn:go-isatty:v0.0.9:mattn_goisatty/../src/github.com/mattn/go-isatty \
 		mattn:go-runewidth:v0.0.4:mattn_gorunewidth/../src/github.com/mattn/go-runewidth \
+		mxk:go-flowrate:cca7078:mxk_goflowrate/../src/github.com/mxk/go-flowrate \
 		odeke-em:cache:baf8e43:odekeem_cache/../src/github.com/odeke-em/cache \
 		odeke-em:cli-spinner:610063b:odekeem_clispinner/../src/github.com/odeke-em/cli-spinner \
 		odeke-em:command:91ca5ec:odekeem_command/../src/github.com/odeke-em/command \
diff --git a/net/drive/distinfo b/net/drive/distinfo
index d3010c75928a..a9b88bf93dc1 100644
--- a/net/drive/distinfo
+++ b/net/drive/distinfo
@@ -1,42 +1,48 @@
-TIMESTAMP = 1558169627
-SHA256 (odeke-em-drive-v0.3.9.1_GH0.tar.gz) = 562958e336d2f52a34443fc8fbf59d9d2a2467b2bf4592a1d78dc009ade661a7
-SIZE (odeke-em-drive-v0.3.9.1_GH0.tar.gz) = 333217
+TIMESTAMP = 1567842452
+SHA256 (odeke-em-drive-v0.3.9.1-b868c96_GH0.tar.gz) = 9eb1434411d33499ead89be136678d5bdffc83589c9c2aa7ad21399c79f1f65e
+SIZE (odeke-em-drive-v0.3.9.1-b868c96_GH0.tar.gz) = 336998
 SHA256 (boltdb-bolt-v1.3.1_GH0.tar.gz) = b5ae498b780f535a5d308c188dee1329b3536275d29ad6758876084c0b8586a8
 SIZE (boltdb-bolt-v1.3.1_GH0.tar.gz) = 83437
-SHA256 (census-instrumentation-opencensus-go-v0.21.0_GH0.tar.gz) = e7129aebb9bcb590f01b4fb773b6cf0b10109211cb38cfbaf1f097d191043251
-SIZE (census-instrumentation-opencensus-go-v0.21.0_GH0.tar.gz) = 161522
+SHA256 (census-instrumentation-opencensus-go-v0.22.1_GH0.tar.gz) = b6d9b5921b69f34812a466bfa871b456ae8d59d061f6ef29d14909725dc3816d
+SIZE (census-instrumentation-opencensus-go-v0.22.1_GH0.tar.gz) = 163042
 SHA256 (cheggaaa-pb-v1.0.28_GH0.tar.gz) = f745c5636d3fb59bffab5f9d2a745a94a9608166c20c90936fc66848a5e816e6
 SIZE (cheggaaa-pb-v1.0.28_GH0.tar.gz) = 11788
 SHA256 (fatih-color-v1.7.0_GH0.tar.gz) = 4650d7aa3feed266fc85d91dc34ca9cffdf7ee03ea29bf2cbf84bbecc75fb755
 SIZE (fatih-color-v1.7.0_GH0.tar.gz) = 816449
-SHA256 (golang-crypto-22d7a77_GH0.tar.gz) = f4841ec4826e71e428a300f2c4990382a68e5a9890876b18f360b3c47404198d
-SIZE (golang-crypto-22d7a77_GH0.tar.gz) = 1685051
-SHA256 (golang-net-3ec1911_GH0.tar.gz) = ad1bbf37e8a125a3f989e9f1fbf7f7561a3f275f04baacd9f336367d9fc999c6
-SIZE (golang-net-3ec1911_GH0.tar.gz) = 1096221
-SHA256 (golang-oauth2-950ef44_GH0.tar.gz) = 1b8de4d4502640b84ecc10dc477c281fd3df09609c93a6b9f86693eea9844b8a
-SIZE (golang-oauth2-950ef44_GH0.tar.gz) = 45310
-SHA256 (golang-protobuf-v1.3.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf
-SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884
-SHA256 (golang-sys-61b9204_GH0.tar.gz) = a73df35a8c64cf371fda32e00519f15614f4dd5f26cd85d7a4598fa80d51d052
-SIZE (golang-sys-61b9204_GH0.tar.gz) = 1418673
-SHA256 (golang-text-342b2e1_GH0.tar.gz) = ee7a5a3208158692a6fb5b6a54c920cc167da399223a335b3bc2141a43b61a82
-SIZE (golang-text-342b2e1_GH0.tar.gz) = 7168276
-SHA256 (google-go-genproto-bb713bd_GH0.tar.gz) = c924b642e5d971aa1376091a8ec4ac54419b0fda793df0185d970722cf18d680
-SIZE (google-go-genproto-bb713bd_GH0.tar.gz) = 4027286
-SHA256 (google-google-api-go-client-v0.5.0_GH0.tar.gz) = 518691b284fc806ae4fda9dc2d8eb2ce6f9d26bbb5e512b3e0e09604e5b4e0db
-SIZE (google-google-api-go-client-v0.5.0_GH0.tar.gz) = 11905507
-SHA256 (googleapis-google-cloud-go-v0.39.0_GH0.tar.gz) = f88613524248130c58c30ddbcc6605d234abae02d96e896f9a683a16431776c7
-SIZE (googleapis-google-cloud-go-v0.39.0_GH0.tar.gz) = 2058540
-SHA256 (grpc-grpc-go-v1.20.1_GH0.tar.gz) = 109f4389cb22f2293a9640a3dd8d3a6d837985615353025c33c7d2923409c8ac
-SIZE (grpc-grpc-go-v1.20.1_GH0.tar.gz) = 707599
-SHA256 (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 3bf57512af746dc0338651ba1c35c65fe907ff214ccb22d679539f7ea791511e
-SIZE (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 12982
-SHA256 (mattn-go-colorable-v0.1.1_GH0.tar.gz) = 41773345d2a1037a37942b96e04a8ed5248f19a8f43a7ba26aa16a7b74132647
-SIZE (mattn-go-colorable-v0.1.1_GH0.tar.gz) = 8518
-SHA256 (mattn-go-isatty-v0.0.7_GH0.tar.gz) = 80b6b3e4fee3b15864f23d622129c17ba222786f8c93bb01f8805f3cb91dfefe
-SIZE (mattn-go-isatty-v0.0.7_GH0.tar.gz) = 3559
+SHA256 (golang-crypto-71b5226_GH0.tar.gz) = 7ab66566a1792bf53b26474bf023d0607e59158af6a1321d94c56de433cb083b
+SIZE (golang-crypto-71b5226_GH0.tar.gz) = 1693011
+SHA256 (golang-groupcache-869f871_GH0.tar.gz) = 8bc5d766826b73623d030cc6b263e371ca6ba58a9a6d7b24f66bee9438d6f6f3
+SIZE (golang-groupcache-869f871_GH0.tar.gz) = 26040
+SHA256 (golang-net-ba9fcec_GH0.tar.gz) = fa35ccfabf7e364a85bfe7ba6e8cb9f5a928e1018ba50a814fa61d6209e02c95
+SIZE (golang-net-ba9fcec_GH0.tar.gz) = 1099861
+SHA256 (golang-oauth2-0f29369_GH0.tar.gz) = 0b2093495f3f8e2938b829c07e768918004b92f8a4d2b5c23fe7de0069821652
+SIZE (golang-oauth2-0f29369_GH0.tar.gz) = 45469
+SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
+SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
+SHA256 (golang-sys-749cb33_GH0.tar.gz) = 14cd0776aff1de547c3d2501e985917d5843fbbab11c9f8c2ad7bb2c7a1279a8
+SIZE (golang-sys-749cb33_GH0.tar.gz) = 1468012
+SHA256 (golang-text-3d0f797_GH0.tar.gz) = d5cbfc9ac93211708e336c9129947b1f4146ed402b6cd624732e36838e1df4e9
+SIZE (golang-text-3d0f797_GH0.tar.gz) = 7168341
+SHA256 (google-go-genproto-92dd089_GH0.tar.gz) = ef461a9e28ad218157df21cb2c45cede4f33bc941e981b0231525a785a9ffac0
+SIZE (google-go-genproto-92dd089_GH0.tar.gz) = 5337280
+SHA256 (google-google-api-go-client-v0.10.0_GH0.tar.gz) = b867beedfc2eaa7623f620c15976adea1413f759149be122a07619d230131c78
+SIZE (google-google-api-go-client-v0.10.0_GH0.tar.gz) = 12432495
+SHA256 (googleapis-google-cloud-go-v0.45.1_GH0.tar.gz) = c9dc5b89e9b9a337e65f48887e35769f34759ea923f8ca6abc7b0a2c0d61eb08
+SIZE (googleapis-google-cloud-go-v0.45.1_GH0.tar.gz) = 2254762
+SHA256 (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 3089affe6f5e27f7a6d494cb399aa6baf232384f763f548ad5ddfbea0e88e59c
+SIZE (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 15328
+SHA256 (grpc-grpc-go-v1.23.0_GH0.tar.gz) = 2dc453fc20178f196ac5853040d3838df741a50461f29c3e2c429bd92f739568
+SIZE (grpc-grpc-go-v1.23.0_GH0.tar.gz) = 747448
+SHA256 (hashicorp-golang-lru-v0.5.3_GH0.tar.gz) = dd98197fc84fbf636b6811ff3c14ef1ea0fe732fe782b8034cf082b3ff274af3
+SIZE (hashicorp-golang-lru-v0.5.3_GH0.tar.gz) = 13348
+SHA256 (mattn-go-colorable-v0.1.2_GH0.tar.gz) = a7189bd9005c571303b117261955ce53b0e2aa89fe415e2289659be343fe1651
+SIZE (mattn-go-colorable-v0.1.2_GH0.tar.gz) = 8518
+SHA256 (mattn-go-isatty-v0.0.9_GH0.tar.gz) = 71d57a3fb3f990a5a5d1e190ae5112a8aca2fcdda9eb42770bd524076e8f371f
+SIZE (mattn-go-isatty-v0.0.9_GH0.tar.gz) = 3904
 SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe
 SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827
+SHA256 (mxk-go-flowrate-cca7078_GH0.tar.gz) = 84e6a0e300ec4c76c7d67cb9a72d1cdd13c7a6e48902cb41c29554bcd4ef0362
+SIZE (mxk-go-flowrate-cca7078_GH0.tar.gz) = 6978
 SHA256 (odeke-em-cache-baf8e43_GH0.tar.gz) = d7c03cde117153c8f28b495167cfbef88f5878e6e477841f54040d6848d6be87
 SIZE (odeke-em-cache-baf8e43_GH0.tar.gz) = 3520
 SHA256 (odeke-em-cli-spinner-610063b_GH0.tar.gz) = f0c410d12412653e8faa98589241567cebf4ba36bbab82d7a754e691e5622c22
diff --git a/net/geoipupdate/Makefile b/net/geoipupdate/Makefile
index 61f37d16fcf8..bf1ce9a9167f 100644
--- a/net/geoipupdate/Makefile
+++ b/net/geoipupdate/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	geoipupdate
-PORTVERSION=	4.0.4
+PORTVERSION=	4.0.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net geography
 
@@ -55,12 +55,12 @@ do-build-MANPAGES-on:
 		| ${SED} -e '1s/7/5/' > ${WRKSRC}/build/GeoIP.conf.5
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/GeoIP
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/GeoIP
 	${INSTALL_PROGRAM} ${WRKSRC}/build/geoipupdate ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/build/GeoIP.conf ${STAGEDIR}${PREFIX}/etc/GeoIP.conf.sample
 
 do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/build && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 do-install-MANPAGES-on:
diff --git a/net/geoipupdate/distinfo b/net/geoipupdate/distinfo
index 2f35a947567e..115cf0c8daf6 100644
--- a/net/geoipupdate/distinfo
+++ b/net/geoipupdate/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1567225390
-SHA256 (maxmind-geoipupdate-v4.0.4_GH0.tar.gz) = 1d490a32729db6cb91741ae14e04779cc86f91552d2fc2d51e3403078382ddc7
-SIZE (maxmind-geoipupdate-v4.0.4_GH0.tar.gz) = 107115
+TIMESTAMP = 1568387349
+SHA256 (maxmind-geoipupdate-v4.0.5_GH0.tar.gz) = c13a919ffd5ae3cc61469d26672bddd39c682a93928ff980f8b4b19f341009d3
+SIZE (maxmind-geoipupdate-v4.0.5_GH0.tar.gz) = 23529
 SHA256 (gofrs-flock-v0.7.1_GH0.tar.gz) = d4e33c3923e671fe6288a6dcb6618b7c46834c1a387653f482f5247c5a132dea
 SIZE (gofrs-flock-v0.7.1_GH0.tar.gz) = 7294
 SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
diff --git a/net/get_iplayer/Makefile b/net/get_iplayer/Makefile
index 62abd0f15ac2..3fdde825e77f 100644
--- a/net/get_iplayer/Makefile
+++ b/net/get_iplayer/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	get_iplayer
-PORTVERSION=	3.17
+PORTVERSION=	3.22
 DISTVERSIONPREFIX=v
-PORTREVISION=	2
 CATEGORIES=	net multimedia
 
-MAINTAINER=	crees@FreeBSD.org
+MAINTAINER=	jamie@catflap.org
 COMMENT=	Search, index, or stream archive video from BBC iPlayer
 
 LICENSE=	GPLv3
diff --git a/net/get_iplayer/distinfo b/net/get_iplayer/distinfo
index bd4cb79545d2..42d6075b46f7 100644
--- a/net/get_iplayer/distinfo
+++ b/net/get_iplayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535484740
-SHA256 (get-iplayer-get_iplayer-v3.17_GH0.tar.gz) = 12d8780311d73bb4f573f4c019f88332c97ee1d7a676b5dc7989cd8c37562566
-SIZE (get-iplayer-get_iplayer-v3.17_GH0.tar.gz) = 142052
+TIMESTAMP = 1568060901
+SHA256 (get-iplayer-get_iplayer-v3.22_GH0.tar.gz) = 299de0686f7a4848e2aef22f0647ba35b8114f573334dd3e1a7e331052145593
+SIZE (get-iplayer-get_iplayer-v3.22_GH0.tar.gz) = 146341
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 1e7c3636227a..00e8cd8bfcc0 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	haproxy
-DISTVERSION=	2.0.5
+DISTVERSION=	2.0.6
 CATEGORIES=	net www
 MASTER_SITES=	http://www.haproxy.org/download/2.0/src/
 
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index 1c707199ef13..fcabaebc2668 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566161605
-SHA256 (haproxy-2.0.5.tar.gz) = 3f2e0d40af66dd6df1dc2f6055d3de106ba62836d77b4c2e497a82a4bdbc5422
-SIZE (haproxy-2.0.5.tar.gz) = 2539226
+TIMESTAMP = 1568377563
+SHA256 (haproxy-2.0.6.tar.gz) = 01e1da09452010111107ca1b3a8b7f1927731ba0fe4380bacae1c626fdc521e4
+SIZE (haproxy-2.0.6.tar.gz) = 2541637
diff --git a/net/ip2proxy/Makefile b/net/ip2proxy/Makefile
new file mode 100644
index 000000000000..91c2aa94b177
--- /dev/null
+++ b/net/ip2proxy/Makefile
@@ -0,0 +1,29 @@
+# Created by: Ryan Steinmetz <zi@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	ip2proxy
+PORTVERSION=	20190910
+CATEGORIES=	net
+
+MAINTAINER=	zi@FreeBSD.org
+COMMENT=	C library to lookup proxies
+
+LICENSE=	MIT
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	ip2location
+GH_PROJECT=	${PORTNAME}-c
+GH_TAGNAME=	40abce6
+
+USES=		autoreconf libtool
+HAS_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
+
+post-patch:
+	${CHMOD} +x ${WRKSRC}/configure
+
+post-install:
+	(cd ${WRKSRC} && ${MAKE} install-data DESTDIR=${STAGEDIR})
+
+.include <bsd.port.mk>
diff --git a/net/ip2proxy/distinfo b/net/ip2proxy/distinfo
new file mode 100644
index 000000000000..c0cae02cbbaf
--- /dev/null
+++ b/net/ip2proxy/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1568151757
+SHA256 (ip2location-ip2proxy-c-20190910-40abce6_GH0.tar.gz) = e016ab59376c90554df7712f20aca0f43697b90f12dd749dd8e7f30e4032e549
+SIZE (ip2location-ip2proxy-c-20190910-40abce6_GH0.tar.gz) = 7934388
diff --git a/net/ip2proxy/pkg-descr b/net/ip2proxy/pkg-descr
new file mode 100644
index 000000000000..4ce45d9c6bbb
--- /dev/null
+++ b/net/ip2proxy/pkg-descr
@@ -0,0 +1,6 @@
+This library is the C programming language library to support all IP2Proxy™
+BIN database products to query proxy IP address and its country, region,
+city, ISP name and proxy types. It has been optimized for speed and memory
+utilization.
+
+WWW: https://ip2location.com/development-libraries/ip2proxy/c
diff --git a/net/ip2proxy/pkg-plist b/net/ip2proxy/pkg-plist
new file mode 100644
index 000000000000..5c6a2a0a2019
--- /dev/null
+++ b/net/ip2proxy/pkg-plist
@@ -0,0 +1,6 @@
+include/IP2Proxy.h
+include/IP2Proxy_DB.h
+lib/libIP2Proxy.a
+lib/libIP2Proxy.so
+lib/libIP2Proxy.so.1
+lib/libIP2Proxy.so.1.0.0
diff --git a/net/libdaq/Makefile b/net/libdaq/Makefile
index 889a8f9a19bc..596d9a7eed2a 100644
--- a/net/libdaq/Makefile
+++ b/net/libdaq/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libdaq
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.0.0-alpha1
+DISTVERSION=	3.0.0-alpha2
 CATEGORIES=	net
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/net/libdaq/distinfo b/net/libdaq/distinfo
index 85537000bcde..aa33102787f2 100644
--- a/net/libdaq/distinfo
+++ b/net/libdaq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563994415
-SHA256 (snort3-libdaq-v3.0.0-alpha1_GH0.tar.gz) = 0ede444bdda671fc0a08400b5b7607f80cee20a70a3577263faf28fd28dff734
-SIZE (snort3-libdaq-v3.0.0-alpha1_GH0.tar.gz) = 150809
+TIMESTAMP = 1567767906
+SHA256 (snort3-libdaq-v3.0.0-alpha2_GH0.tar.gz) = 9407968d3b1dd4a61356dd42cbd4a5de39f498a5242467e383769559d65d11c8
+SIZE (snort3-libdaq-v3.0.0-alpha2_GH0.tar.gz) = 153323
diff --git a/net/libdaq/files/patch-api_daq__common.h b/net/libdaq/files/patch-api_daq__common.h
new file mode 100644
index 000000000000..4268d0525d20
--- /dev/null
+++ b/net/libdaq/files/patch-api_daq__common.h
@@ -0,0 +1,12 @@
+--- api/daq_common.h.orig	2019-09-06 11:14:19 UTC
++++ api/daq_common.h
+@@ -30,6 +30,9 @@ extern "C" {
+ #include <sys/time.h>
+ #include <stdint.h>
+ #include <unistd.h>
++#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#include <sys/socket.h>
++#endif
+ 
+ #ifndef DAQ_SO_PUBLIC
+ #  ifdef HAVE_VISIBILITY
diff --git a/net/madonctl/Makefile b/net/madonctl/Makefile
index 2998df57eb3a..4585b4a85173 100644
--- a/net/madonctl/Makefile
+++ b/net/madonctl/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	madonctl
 PORTVERSION=	2.3.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -13,39 +13,40 @@ COMMENT=	CLI client for the Mastodon social network API
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go
+USES=		go:modules
 
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
+#GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 
 PLIST_FILES=	bin/madonctl
 
 GH_ACCOUNT=	McKael
-GH_TUPLE=	McKael:madon:v2.3.0:McKael_madon/../src/github.com/McKael/madon \
-		fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/../src/github.com/fsnotify/fsnotify \
-		ghodss:yaml:v1.0.0:ghodss_yaml/../src/github.com/ghodss/yaml \
-		go-yaml:yaml:v2.2.2:goyaml_yaml/../src/gopkg.in/yaml.v2 \
-		golang:net:3ec1911:golang_net/../src/golang.org/x/net \
-		golang:oauth2:950ef44:golang_oauth2/../src/golang.org/x/oauth2 \
-		golang:sys:61b9204:golang_sys/../src/golang.org/x/sys \
-		golang:text:342b2e1:golang_text/../src/golang.org/x/text \
-		gorilla:websocket:v1.4.0:gorilla_websocket/../src/github.com/gorilla/websocket \
-		hashicorp:hcl:v1.0.0:hashicorp_hcl/../src/github.com/hashicorp/hcl \
-		kr:text:v0.1.0:kr_text/../src/github.com/kr/text \
-		magiconair:properties:v1.8.1:magiconair_properties/../src/github.com/magiconair/properties \
-		mattn:go:go1.9.1:imattn_go/../src/github.com/mattn/go \
-		mattn:go-isatty:v0.0.7:mattn_goisatty/../src/github.com/mattn/go-isatty \
-		mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/../src/github.com/mitchellh/mapstructure \
-		pelletier:go-toml:v1.4.0:pelletier_gotoml/../src/github.com/pelletier/go-toml \
-		pkg:errors:v0.8.1:pkg_errors/../src/github.com/pkg/errors \
-		sendgrid:rest:v2.4.1:sendgrid_rest/../src/github.com/sendgrid/rest \
-		sgoertzen:html2text:491ddf8:sgoertzen_html2text/../src/github.com/sgoertzen/html2text \
-		spf13:afero:v1.2.2:spf13_afero/../src/github.com/spf13/afero \
-		spf13:cast:v1.3.0:spf13_cast/../src/github.com/spf13/cast \
-		spf13:cobra:v0.0.3:spf13_cobra/../src/github.com/spf13/cobra \
-		spf13:jwalterweatherman:v1.1.0:spf13_jwalterweatherman/../src/github.com/spf13/jwalterweatherman \
-		spf13:pflag:v1.0.3:spf13_pflag/../src/github.com/spf13/pflag \
-		spf13:viper:v1.3.2:spf13_viper/../src/github.com/spf13/viper \
-		stretchr:testify:v1.3.0:stretchr_testify/../src/github.com/stretchr/testify
+GH_TAGNAME=	b936445
+GH_TUPLE=	McKael:madon:v2.3.0:McKael_madon/vendor/github.com/McKael/madon/v2 \
+		fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
+		ghodss:yaml:v1.0.0:ghodss_yaml/vendor/github.com/ghodss/yaml \
+		go-yaml:yaml:v2.2.2:goyaml_yaml/vendor/gopkg.in/yaml.v2 \
+		golang:net:ba9fcec:golang_net/vendor/golang.org/x/net \
+		golang:oauth2:0f29369:golang_oauth2/vendor/golang.org/x/oauth2 \
+		golang:sys:749cb33:golang_sys/vendor/golang.org/x/sys \
+		golang:text:3d0f797:golang_text/vendor/golang.org/x/text \
+		gorilla:websocket:v1.4.1:gorilla_websocket/vendor/github.com/gorilla/websocket \
+		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
+		kr:text:v0.1.0:kr_text/vendor/github.com/kr/text \
+		magiconair:properties:v1.8.1:magiconair_properties/vendor/github.com/magiconair/properties \
+		mattn:go:go1.9.1:imattn_go/vendor/github.com/mattn/go \
+		mattn:go-isatty:v0.0.9:mattn_goisatty/vendor/github.com/mattn/go-isatty \
+		mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
+		pelletier:go-toml:v1.4.0:pelletier_gotoml/vendor/github.com/pelletier/go-toml \
+		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
+		sendgrid:rest:v2.4.1:sendgrid_rest/vendor/github.com/sendgrid/rest \
+		sgoertzen:html2text:491ddf8:sgoertzen_html2text/vendor/github.com/sgoertzen/html2text \
+		spf13:afero:v1.2.2:spf13_afero/vendor/github.com/spf13/afero \
+		spf13:cast:v1.3.0:spf13_cast/vendor/github.com/spf13/cast \
+		spf13:cobra:v0.0.5:spf13_cobra/vendor/github.com/spf13/cobra \
+		spf13:jwalterweatherman:v1.1.0:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \
+		spf13:pflag:v1.0.3:spf13_pflag/vendor/github.com/spf13/pflag \
+		spf13:viper:v1.4.0:spf13_viper/vendor/github.com/spf13/viper \
+		stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify
 USE_GITHUB=	yes
 
 do-install:
diff --git a/net/madonctl/distinfo b/net/madonctl/distinfo
index 1ba2c0f499c9..4c40b49e721c 100644
--- a/net/madonctl/distinfo
+++ b/net/madonctl/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1558168986
-SHA256 (McKael-madonctl-v2.3.1_GH0.tar.gz) = f97707a4f96b15a8331a0b3725a43c7717bf068bf9e6c5e885a13dd3016d5cf6
-SIZE (McKael-madonctl-v2.3.1_GH0.tar.gz) = 43395
+TIMESTAMP = 1567842454
+SHA256 (McKael-madonctl-v2.3.1-b936445_GH0.tar.gz) = ec57f582f8de486d277e4f8ccf08e4e10a4649030076e4cae3b79ec3f5f810f8
+SIZE (McKael-madonctl-v2.3.1-b936445_GH0.tar.gz) = 1830510
 SHA256 (McKael-madon-v2.3.0_GH0.tar.gz) = c970cb350b3da734399906e6da4b333d300dbaa820af921cb2c72cc6e533c600
 SIZE (McKael-madon-v2.3.0_GH0.tar.gz) = 17197
 SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd
@@ -9,16 +9,16 @@ SHA256 (ghodss-yaml-v1.0.0_GH0.tar.gz) = 8a76b47cd171944612aae1cfa08bbb971b63fec
 SIZE (ghodss-yaml-v1.0.0_GH0.tar.gz) = 11772
 SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff
 SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656
-SHA256 (golang-net-3ec1911_GH0.tar.gz) = ad1bbf37e8a125a3f989e9f1fbf7f7561a3f275f04baacd9f336367d9fc999c6
-SIZE (golang-net-3ec1911_GH0.tar.gz) = 1096221
-SHA256 (golang-oauth2-950ef44_GH0.tar.gz) = 1b8de4d4502640b84ecc10dc477c281fd3df09609c93a6b9f86693eea9844b8a
-SIZE (golang-oauth2-950ef44_GH0.tar.gz) = 45310
-SHA256 (golang-sys-61b9204_GH0.tar.gz) = a73df35a8c64cf371fda32e00519f15614f4dd5f26cd85d7a4598fa80d51d052
-SIZE (golang-sys-61b9204_GH0.tar.gz) = 1418673
-SHA256 (golang-text-342b2e1_GH0.tar.gz) = ee7a5a3208158692a6fb5b6a54c920cc167da399223a335b3bc2141a43b61a82
-SIZE (golang-text-342b2e1_GH0.tar.gz) = 7168276
-SHA256 (gorilla-websocket-v1.4.0_GH0.tar.gz) = 2b5743c72bd0930c5a80e49c0138b5b7d27fa7c085efd0c86805cccfa7220c9d
-SIZE (gorilla-websocket-v1.4.0_GH0.tar.gz) = 50228
+SHA256 (golang-net-ba9fcec_GH0.tar.gz) = fa35ccfabf7e364a85bfe7ba6e8cb9f5a928e1018ba50a814fa61d6209e02c95
+SIZE (golang-net-ba9fcec_GH0.tar.gz) = 1099861
+SHA256 (golang-oauth2-0f29369_GH0.tar.gz) = 0b2093495f3f8e2938b829c07e768918004b92f8a4d2b5c23fe7de0069821652
+SIZE (golang-oauth2-0f29369_GH0.tar.gz) = 45469
+SHA256 (golang-sys-749cb33_GH0.tar.gz) = 14cd0776aff1de547c3d2501e985917d5843fbbab11c9f8c2ad7bb2c7a1279a8
+SIZE (golang-sys-749cb33_GH0.tar.gz) = 1468012
+SHA256 (golang-text-3d0f797_GH0.tar.gz) = d5cbfc9ac93211708e336c9129947b1f4146ed402b6cd624732e36838e1df4e9
+SIZE (golang-text-3d0f797_GH0.tar.gz) = 7168341
+SHA256 (gorilla-websocket-v1.4.1_GH0.tar.gz) = 9e5bd337d58a978bf4072767252ddb394b53e2b459697633794abd96e8eb3fa6
+SIZE (gorilla-websocket-v1.4.1_GH0.tar.gz) = 54218
 SHA256 (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2
 SIZE (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 70658
 SHA256 (kr-text-v0.1.0_GH0.tar.gz) = b67f2744020b25f9298153af0992db252d195edd7ca5afa3b19d6ac300c2d14e
@@ -27,8 +27,8 @@ SHA256 (magiconair-properties-v1.8.1_GH0.tar.gz) = 4449df3d2be86608bfc997228f66f
 SIZE (magiconair-properties-v1.8.1_GH0.tar.gz) = 29735
 SHA256 (mattn-go-go1.9.1_GH0.tar.gz) = cffb270091d61263254a130543ec7de30e4c3d847d394ea6fb71e09ce22f63fb
 SIZE (mattn-go-go1.9.1_GH0.tar.gz) = 16355327
-SHA256 (mattn-go-isatty-v0.0.7_GH0.tar.gz) = 80b6b3e4fee3b15864f23d622129c17ba222786f8c93bb01f8805f3cb91dfefe
-SIZE (mattn-go-isatty-v0.0.7_GH0.tar.gz) = 3559
+SHA256 (mattn-go-isatty-v0.0.9_GH0.tar.gz) = 71d57a3fb3f990a5a5d1e190ae5112a8aca2fcdda9eb42770bd524076e8f371f
+SIZE (mattn-go-isatty-v0.0.9_GH0.tar.gz) = 3904
 SHA256 (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 53fbc06b125ff1c9c73a4eb1764346932671a29c67a45a92e2ebc6855635069b
 SIZE (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 20980
 SHA256 (pelletier-go-toml-v1.4.0_GH0.tar.gz) = 04fb4855a64495c0c055c83b8a3446cabc6bfa4830eb458816370db38c0e67b0
@@ -43,13 +43,13 @@ SHA256 (spf13-afero-v1.2.2_GH0.tar.gz) = b577afca7e9839aa7cf0ddd712af553aec671b7
 SIZE (spf13-afero-v1.2.2_GH0.tar.gz) = 46157
 SHA256 (spf13-cast-v1.3.0_GH0.tar.gz) = e685282ea33f89e9354d148ad1886f532bcebe86b0b60a167988f7c6d081085f
 SIZE (spf13-cast-v1.3.0_GH0.tar.gz) = 11085
-SHA256 (spf13-cobra-v0.0.3_GH0.tar.gz) = 7eafb953b58fdd738c4db5202d94a0b6ac0de4f07718fc85a80450c2347c2f9c
-SIZE (spf13-cobra-v0.0.3_GH0.tar.gz) = 101526
+SHA256 (spf13-cobra-v0.0.5_GH0.tar.gz) = 79226ce00e2b91306277e679d024eea6d17d0c02fc671555fd25df0c3ea07423
+SIZE (spf13-cobra-v0.0.5_GH0.tar.gz) = 111126
 SHA256 (spf13-jwalterweatherman-v1.1.0_GH0.tar.gz) = 4fd850a792c5738954c4801cf549d8d0bf53edd17139cd39d179aa5abf7ec68d
 SIZE (spf13-jwalterweatherman-v1.1.0_GH0.tar.gz) = 6871
 SHA256 (spf13-pflag-v1.0.3_GH0.tar.gz) = 9e57f86f493f04d9077fccd04e7139ebf243dd544e917ab83d35729b3e54a124
 SIZE (spf13-pflag-v1.0.3_GH0.tar.gz) = 46002
-SHA256 (spf13-viper-v1.3.2_GH0.tar.gz) = 3eb6e09dc9de3d46ad659b97774afa3f27b560b642ca025bee04d14b5aad3b16
-SIZE (spf13-viper-v1.3.2_GH0.tar.gz) = 36932
-SHA256 (stretchr-testify-v1.3.0_GH0.tar.gz) = 0cd9c199a72b8d80621624b37c0ed5ac724352d458506a31dfa86710551e7fc5
-SIZE (stretchr-testify-v1.3.0_GH0.tar.gz) = 102859
+SHA256 (spf13-viper-v1.4.0_GH0.tar.gz) = ee522a00960a36db8f83c820a85fce99a177db2b022697e5c1881cd852d9c4c0
+SIZE (spf13-viper-v1.4.0_GH0.tar.gz) = 44183
+SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698
+SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085
diff --git a/net/nats-streaming-server/Makefile b/net/nats-streaming-server/Makefile
index dc222279d783..0cfd5ec359a4 100644
--- a/net/nats-streaming-server/Makefile
+++ b/net/nats-streaming-server/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Streaming system server for NATS
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	nats-io
 
diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index 69452e7ef8ff..12fceeff3a58 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ntp
 PORTVERSION=	4.3.99
+PORTREVISION=	2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \
 		http://archive.ntp.org/ntp4/ntp-dev/
@@ -18,11 +19,14 @@ CONFLICTS=	ntp-[0-9].* openntpd-*
 
 USES=		cpe pathfix shebangfix libedit libtool localbase:ldflags \
 		pkgconfig gettext-runtime
+USES+=		autoreconf # until rlimit_memlock changes accepted upstream
+
 
 LIB_DEPENDS+=	libdns_sd.so:net/mDNSResponder
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-leap-smear
+CONFIGURE_ARGS=	--enable-leap-smear --enable-trustedbsd-mac \
+		--with-locfile=freebsd --with-memlock=-1
 
 TEST_TARGET=	check
 
diff --git a/net/ntp-devel/files/patch-sntp_m4_ntp__rlimit.m4 b/net/ntp-devel/files/patch-sntp_m4_ntp__rlimit.m4
new file mode 100644
index 000000000000..27d1711d0506
--- /dev/null
+++ b/net/ntp-devel/files/patch-sntp_m4_ntp__rlimit.m4
@@ -0,0 +1,11 @@
+--- sntp/m4/ntp_rlimit.m4.orig	2015-09-23 04:49:10.000000000 -0700
++++ sntp/m4/ntp_rlimit.m4	2019-09-11 20:36:17.291424000 -0700
+@@ -112,7 +112,7 @@
+  yes | no)
+     ans=$ntp_dflt_rlimit_memlock
+     ;;
+- [[1-9]][[0-9]]*) ;;
++ [[1-9]][[0-9]]*|-1) ;;
+  *) AC_MSG_ERROR(["--with-memlock requires an integer argument."])
+      ;;
+ esac
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index f9ea9a782ef9..fe585dedb587 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ntp
 PORTVERSION=	4.2.8p13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
 		http://archive.ntp.org/ntp4/ntp-4.2/ \
@@ -19,11 +19,11 @@ CONFLICTS=	ntp-devel-* openntpd-*
 
 USES=		cpe pathfix shebangfix libedit libtool localbase:ldflags \
 		pkgconfig
-USES+=		autoreconf # until trustedbsd-mac changes accepted upstream
+USES+=		autoreconf # until rlimit_memlock changes accepted upstream
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-leap-smear --enable-trustedbsd-mac \
-		--with-locfile=freebsd
+		--with-locfile=freebsd --with-memlock=-1
 
 TEST_TARGET=	check
 
diff --git a/net/ntp/files/patch-sntp_m4_ntp__rlimit.m4 b/net/ntp/files/patch-sntp_m4_ntp__rlimit.m4
new file mode 100644
index 000000000000..27d1711d0506
--- /dev/null
+++ b/net/ntp/files/patch-sntp_m4_ntp__rlimit.m4
@@ -0,0 +1,11 @@
+--- sntp/m4/ntp_rlimit.m4.orig	2015-09-23 04:49:10.000000000 -0700
++++ sntp/m4/ntp_rlimit.m4	2019-09-11 20:36:17.291424000 -0700
+@@ -112,7 +112,7 @@
+  yes | no)
+     ans=$ntp_dflt_rlimit_memlock
+     ;;
+- [[1-9]][[0-9]]*) ;;
++ [[1-9]][[0-9]]*|-1) ;;
+  *) AC_MSG_ERROR(["--with-memlock requires an integer argument."])
+      ;;
+ esac
diff --git a/net/py-DTLSSocket/Makefile b/net/py-DTLSSocket/Makefile
index 1e90647b5184..57a500a004c0 100644
--- a/net/py-DTLSSocket/Makefile
+++ b/net/py-DTLSSocket/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	DTLSSocket
-DISTVERSION=	0.1.9
+DISTVERSION=	0.1.10
 CATEGORIES=	net
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-DTLSSocket/distinfo b/net/py-DTLSSocket/distinfo
index 56f9ea5ae458..0fe6cdd11b31 100644
--- a/net/py-DTLSSocket/distinfo
+++ b/net/py-DTLSSocket/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556476641
-SHA256 (DTLSSocket-0.1.9.tar.gz) = e05157155e79ebb70e345a9a193cf285f2589ed38436cb3feda0766a31ae75a5
-SIZE (DTLSSocket-0.1.9.tar.gz) = 192894
+TIMESTAMP = 1568089287
+SHA256 (DTLSSocket-0.1.10.tar.gz) = b9721112f9ec38b3b9dba9e00a2cb76965783fec49c30fdec9ea9bfb79f5473a
+SIZE (DTLSSocket-0.1.10.tar.gz) = 192902
diff --git a/net/py-python-novaclient/Makefile b/net/py-python-novaclient/Makefile
index 71316e771638..d662a2a094d4 100644
--- a/net/py-python-novaclient/Makefile
+++ b/net/py-python-novaclient/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	python-novaclient
-PORTVERSION=	15.0.0
+PORTVERSION=	15.1.0
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-python-novaclient/distinfo b/net/py-python-novaclient/distinfo
index f0555a20ea42..23e123b9a3dc 100644
--- a/net/py-python-novaclient/distinfo
+++ b/net/py-python-novaclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567510038
-SHA256 (python-novaclient-15.0.0.tar.gz) = 37d409673541d4aa2ee64a0d8563446c870cc3bbe184971744d37f508d98d99c
-SIZE (python-novaclient-15.0.0.tar.gz) = 321687
+TIMESTAMP = 1568290960
+SHA256 (python-novaclient-15.1.0.tar.gz) = 9d4c9d2213b4f3dd3e5ee72cf0040a976bedf27735346b4526dc25bd56b96a0c
+SIZE (python-novaclient-15.1.0.tar.gz) = 322768
diff --git a/net/py-sshtunnel/Makefile b/net/py-sshtunnel/Makefile
index 66b09d3197e5..2789aa795bea 100644
--- a/net/py-sshtunnel/Makefile
+++ b/net/py-sshtunnel/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sshtunnel
-PORTVERSION=	0.1.4
-PORTREVISION=	1
+PORTVERSION=	0.1.5
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-sshtunnel/distinfo b/net/py-sshtunnel/distinfo
index 70d41fbc069d..61828a91377a 100644
--- a/net/py-sshtunnel/distinfo
+++ b/net/py-sshtunnel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545950236
-SHA256 (sshtunnel-0.1.4.tar.gz) = f29ae41a1bd3afa64e9a31029bece2966e4be9a9641e8262372741e691c40d76
-SIZE (sshtunnel-0.1.4.tar.gz) = 48330
+TIMESTAMP = 1567948002
+SHA256 (sshtunnel-0.1.5.tar.gz) = c813fdcda8e81c3936ffeac47cb69cfb2d1f5e77ad0de656c6dab56aeebd9249
+SIZE (sshtunnel-0.1.5.tar.gz) = 49345
diff --git a/net/py-wsproto/Makefile b/net/py-wsproto/Makefile
index 7b40f912995a..dec4a38d3ac0 100644
--- a/net/py-wsproto/Makefile
+++ b/net/py-wsproto/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wsproto
-PORTVERSION=	0.14.1
+PORTVERSION=	0.15.0
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-wsproto/distinfo b/net/py-wsproto/distinfo
index 71b9a2b1289c..c3f789f588ca 100644
--- a/net/py-wsproto/distinfo
+++ b/net/py-wsproto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1560164026
-SHA256 (wsproto-0.14.1.tar.gz) = ed222c812aaea55d72d18a87df429cfd602e15b6c992a07a53b495858f083a14
-SIZE (wsproto-0.14.1.tar.gz) = 51640
+TIMESTAMP = 1565555356
+SHA256 (wsproto-0.15.0.tar.gz) = 614798c30e5dc2b3f65acc03d2d50842b97621487350ce79a80a711229edfa9d
+SIZE (wsproto-0.15.0.tar.gz) = 51765
diff --git a/net/rubygem-fog-ovirt/Makefile b/net/rubygem-fog-ovirt/Makefile
index 7042c145d21f..beed051e270a 100644
--- a/net/rubygem-fog-ovirt/Makefile
+++ b/net/rubygem-fog-ovirt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fog-ovirt
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
diff --git a/net/rubygem-fog-ovirt/distinfo b/net/rubygem-fog-ovirt/distinfo
index 3bc1d168b026..e2a2fce8c75a 100644
--- a/net/rubygem-fog-ovirt/distinfo
+++ b/net/rubygem-fog-ovirt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558729959
-SHA256 (rubygem/fog-ovirt-1.2.0.gem) = 9ca0f673290daae26f20eb08f0bd1b724755092d1e083996458c424a9a3a4b5c
-SIZE (rubygem/fog-ovirt-1.2.0.gem) = 35840
+TIMESTAMP = 1568290988
+SHA256 (rubygem/fog-ovirt-1.2.1.gem) = f5ed40029aed5311b6443d46503b448074ca1df6ba0872f33412d3ba1d74388c
+SIZE (rubygem/fog-ovirt-1.2.1.gem) = 35840
diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile
index 676e7beef35b..62cc7d647574 100644
--- a/net/rubygem-gitaly/Makefile
+++ b/net/rubygem-gitaly/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-PORTVERSION=	0.30.0
+PORTVERSION=	1.58.1
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
@@ -9,16 +9,15 @@ MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Auto-generated gRPC client for gitaly
 
 LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/ruby/LICENSE.txt
 
 BUILD_DEPENDS=	rubygem-bundler>=1.12:sysutils/rubygem-bundler \
 		rubygem-rake>=10.0:devel/rubygem-rake
-RUN_DEPENDS=	rubygem-google-protobuf>=3.4.0.2:devel/rubygem-google-protobuf \
-		rubygem-grpc>=1.0:net/rubygem-grpc \
+RUN_DEPENDS=	rubygem-grpc>=1.0<2.0:net/rubygem-grpc \
 		gitaly>=0.82.0:devel/gitaly
 
-NO_ARCH=	yes
 USES=		gem
 USE_RUBY=	yes
 
+NO_ARCH=	yes
+
 .include <bsd.port.mk>
diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo
index 3e9c88a22b64..53c7d459bcf5 100644
--- a/net/rubygem-gitaly/distinfo
+++ b/net/rubygem-gitaly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514155028
-SHA256 (rubygem/gitaly-0.30.0.gem) = c7acde727a9b9638e3361be90dbfdef70db22cce015e9675d676e45cf106ca9b
-SIZE (rubygem/gitaly-0.30.0.gem) = 10752
+TIMESTAMP = 1567424058
+SHA256 (rubygem/gitaly-1.58.1.gem) = 2263760613186f989409e0fda1b17df2fa6e9a0f22e522e93ca177dc997fb9fd
+SIZE (rubygem/gitaly-1.58.1.gem) = 18432
diff --git a/net/rubygem-octopress-deploy/Makefile b/net/rubygem-octopress-deploy/Makefile
index d1d45912d00f..bc310a29b53d 100644
--- a/net/rubygem-octopress-deploy/Makefile
+++ b/net/rubygem-octopress-deploy/Makefile
@@ -13,8 +13,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	rubygem-colorator>=0:textproc/rubygem-colorator
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index 98f71300515c..19532e8afd0a 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -1,11 +1,10 @@
 # Created by: vanhu <vanhu@netasq.com>
 # $FreeBSD$
 
-PORTNAME=		scapy
-PORTVERSION=		2.4.2
-DISTVERSIONPREFIX=	v
-PORTREVISION=		2
-CATEGORIES=		net
+PORTNAME=	scapy
+PORTVERSION=	2.4.3
+CATEGORIES=	net python
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
@@ -15,11 +14,9 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libdnet>0:net/py-libdnet@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pcap>0:net/py-pcap@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap@${PY_FLAVOR}
 
 USE_PYTHON=	autoplist distutils
-USE_GITHUB=	yes
-GH_ACCOUNT=	secdev
 
 NO_ARCH=	yes
 
diff --git a/net/scapy/distinfo b/net/scapy/distinfo
index fdfa9b74580d..39c6d8013736 100644
--- a/net/scapy/distinfo
+++ b/net/scapy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552603437
-SHA256 (secdev-scapy-v2.4.2_GH0.tar.gz) = 141ee386cf6f296e8c9fae94a40a5386ac2d9bfa43a3870b13f575200c46b5f8
-SIZE (secdev-scapy-v2.4.2_GH0.tar.gz) = 3330071
+TIMESTAMP = 1568196750
+SHA256 (scapy-2.4.3.tar.gz) = e2f8d11f6a941c14a789ae8b236b27bd634681f1b29b5e893861e284d234f6b0
+SIZE (scapy-2.4.3.tar.gz) = 905334
diff --git a/net/scapy/files/patch-1991.patch b/net/scapy/files/patch-1991.patch
deleted file mode 100644
index 45c0eec19ccf..000000000000
--- a/net/scapy/files/patch-1991.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From 5ff17673eec7fc200a16552e3686015e99d10b5e Mon Sep 17 00:00:00 2001
-From: Pierre LALET <pierre.lalet@cea.fr>
-Date: Tue, 16 Apr 2019 16:08:15 +0200
-Subject: [PATCH 1/2] BPF: fix get_working_ifaces()
-
-It was broken when an interface name did not end by a digit.
-
-It was also incorrect when an interface name ended by more than one
-digit.
----
- scapy/arch/bpf/core.py | 46 ++++++++++++++++++++++++------------------
- test/bpf.uts           |  6 ++----
- 2 files changed, 28 insertions(+), 24 deletions(-)
-
-diff --git scapy/arch/bpf/core.py scapy/arch/bpf/core.py
-index cc4732f52..4c9e9470a 100644
---- scapy/arch/bpf/core.py
-+++ scapy/arch/bpf/core.py
-@@ -5,22 +5,22 @@
- """
- 
- from __future__ import absolute_import
--from scapy.config import conf
--from scapy.error import Scapy_Exception, warning
--from scapy.data import ARPHDR_LOOPBACK, ARPHDR_ETHER
--from scapy.arch.common import get_if, compile_filter
--from scapy.consts import LOOPBACK_NAME
--
--from scapy.arch.bpf.consts import BIOCSETF, SIOCGIFFLAGS, BIOCSETIF
- 
-+from ctypes import cdll, cast, pointer
-+from ctypes import c_int, c_ulong, c_char_p
-+from ctypes.util import find_library
-+import fcntl
- import os
-+import re
- import socket
--import fcntl
- import struct
- 
--from ctypes import cdll, cast, pointer
--from ctypes import c_int, c_ulong, c_char_p
--from ctypes.util import find_library
-+from scapy.arch.bpf.consts import BIOCSETF, SIOCGIFFLAGS, BIOCSETIF
-+from scapy.arch.common import get_if, compile_filter
-+from scapy.config import conf
-+from scapy.consts import LOOPBACK_NAME
-+from scapy.data import ARPHDR_LOOPBACK, ARPHDR_ETHER
-+from scapy.error import Scapy_Exception, warning
- from scapy.modules.six.moves import range
- 
- 
-@@ -126,6 +126,9 @@ def get_if_list():
-     return interfaces
- 
- 
-+_IFNUM = re.compile("([0-9]*)([ab]?)$")
-+
-+
- def get_working_ifaces():
-     """
-     Returns an ordered list of interfaces that could be used with BPF.
-@@ -156,24 +159,27 @@ def get_working_ifaces():
-         if ifflags & 0x1:  # IFF_UP
- 
-             # Get a BPF handle
--            fd, _ = get_dev_bpf()
-+            fd = get_dev_bpf()[0]
-             if fd is None:
-                 raise Scapy_Exception("No /dev/bpf are available !")
- 
-             # Check if the interface can be used
-             try:
--                fcntl.ioctl(fd, BIOCSETIF, struct.pack("16s16x", ifname.encode()))  # noqa: E501
--                interfaces.append((ifname, int(ifname[-1])))
-+                fcntl.ioctl(fd, BIOCSETIF, struct.pack("16s16x",
-+                                                       ifname.encode()))
-             except IOError:
-                 pass
--
--            # Close the file descriptor
--            os.close(fd)
-+            else:
-+                ifnum, ifab = _IFNUM.search(ifname).groups()
-+                interfaces.append((ifname, int(ifnum) if ifnum else -1, ifab))
-+            finally:
-+                # Close the file descriptor
-+                os.close(fd)
- 
-     # Sort to mimic pcap_findalldevs() order
--    interfaces.sort(key=lambda elt: elt[1])
-+    interfaces.sort(key=lambda elt: (elt[1], elt[2], elt[0]))
- 
--    return interfaces
-+    return [iface[0] for iface in interfaces]
- 
- 
- def get_working_if():
-@@ -183,4 +189,4 @@ def get_working_if():
-     if not ifaces:
-         # A better interface will be selected later using the routing table
-         return LOOPBACK_NAME
--    return ifaces[0][0]
-+    return ifaces[0]
-diff --git test/bpf.uts test/bpf.uts
-index 19e06bb14..45d36fd83 100644
---- test/bpf.uts
-+++ test/bpf.uts
-@@ -47,12 +47,10 @@ len(iflist) > 0
- = Get working network interfaces
- ~ needs_root
- 
--from scapy.arch.bpf.core import get_working_ifaces
-+from scapy.arch.bpf.core import get_working_if, get_working_ifaces
- ifworking = get_working_ifaces()
- assert len(ifworking)
--            
--from scapy.arch.bpf.core import get_working_if
--assert len(ifworking) and get_working_if() == ifworking[0][0]
-+assert get_working_if() == ifworking[0]
- 
- 
- = Misc functions
-
-From afa5776ecf83f7a427fc1af763005fe249f450f9 Mon Sep 17 00:00:00 2001
-From: Pierre LALET <pierre.lalet@cea.fr>
-Date: Wed, 17 Apr 2019 10:22:16 +0200
-Subject: [PATCH 2/2] BPF: test get_working_ifaces()
-
----
- test/bpf.uts | 27 +++++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
-diff --git test/bpf.uts test/bpf.uts
-index 45d36fd83..23022530e 100644
---- test/bpf.uts
-+++ test/bpf.uts
-@@ -53,6 +53,33 @@ assert len(ifworking)
- assert get_working_if() == ifworking[0]
- 
- 
-+= Get working network interfaces order
-+
-+import mock
-+from scapy.arch.bpf.core import get_working_ifaces
-+
-+@mock.patch("scapy.arch.bpf.core.os.close")
-+@mock.patch("scapy.arch.bpf.core.fcntl.ioctl")
-+@mock.patch("scapy.arch.bpf.core.get_dev_bpf")
-+@mock.patch("scapy.arch.bpf.core.get_if")
-+@mock.patch("scapy.arch.bpf.core.get_if_list")
-+@mock.patch("scapy.arch.bpf.core.os.getuid")
-+def test_get_working_ifaces(mock_getuid, mock_get_if_list, mock_get_if,
-+                            mock_get_dev_bpf, mock_ioctl, mock_close):
-+    mock_getuid.return_value = 0
-+    mock_get_if_list.return_value = ['igb0', 'em0', 'msk0', 'epair0a', 'igb1',
-+                                     'vlan20', 'igb10', 'igb2']
-+    mock_get_if.return_value = (b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-+                                b'\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00'
-+                                b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-+    mock_get_dev_bpf.return_value = (31337,)
-+    mock_ioctl.return_value = 0
-+    mock_close.return_value = 0
-+    return get_working_ifaces()
-+
-+assert test_get_working_ifaces() == ['em0', 'igb0', 'msk0', 'epair0a', 'igb1',
-+                                     'igb2', 'igb10', 'vlan20']
-+
- = Misc functions
- ~ needs_root
- 
diff --git a/net/scapy/files/patch-scapy_config.py b/net/scapy/files/patch-scapy_config.py
deleted file mode 100644
index 6867f0a8e97a..000000000000
--- a/net/scapy/files/patch-scapy_config.py
+++ /dev/null
@@ -1,23 +0,0 @@
---- scapy/config.py.orig	2019-01-10 18:33:08 UTC
-+++ scapy/config.py
-@@ -16,7 +16,7 @@ import socket
- import sys
- 
- from scapy import VERSION, base_classes
--from scapy.consts import DARWIN, WINDOWS, LINUX
-+from scapy.consts import BSD, DARWIN, WINDOWS, LINUX
- from scapy.data import ETHER_TYPES, IP_PROTOS, TCP_SERVICES, UDP_SERVICES, \
-     MANUFDB
- from scapy.error import log_scapy, warning, ScapyInvalidPlatformException
-@@ -431,9 +431,9 @@ def _set_conf_sockets():
-     """Populate the conf.L2Socket and conf.L3Socket
-     according to the various use_* parameters
-     """
--    if conf.use_bpf and not DARWIN:
-+    if conf.use_bpf and not BSD:
-         Interceptor.set_from_hook(conf, "use_bpf", False)
--        raise ScapyInvalidPlatformException("Darwin (OSX) only !")
-+        raise ScapyInvalidPlatformException("BSD-like (OSX, *BSD...) only !")
-     if conf.use_winpcapy and not WINDOWS:
-         Interceptor.set_from_hook(conf, "use_winpcapy", False)
-         raise ScapyInvalidPlatformException("Windows only !")
diff --git a/net/scapy/pkg-descr b/net/scapy/pkg-descr
index f6c5e9af369c..cd2fed9d9a8f 100644
--- a/net/scapy/pkg-descr
+++ b/net/scapy/pkg-descr
@@ -11,4 +11,4 @@ tools can't handle, like sending invalid frames, injecting your own 802.11
 frames, combining technics (VLAN hopping+ARP cache poisoning, VOIP decoding on
 WEP encrypted channel, ...), etc.
 
-WWW: http://secdev.org/projects/scapy
+WWW: http://scapy.net
diff --git a/net/v2ray/Makefile b/net/v2ray/Makefile
index fecf05fb3149..21f0b5ecd8fc 100644
--- a/net/v2ray/Makefile
+++ b/net/v2ray/Makefile
@@ -11,13 +11,12 @@ COMMENT=	Platform for building proxies to bypass network restrictions
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go
+USES=		go:modules
 USE_GITHUB=	yes
 USE_RC_SUBR=	v2ray
 
 GH_ACCOUNT=	v2ray
 GH_PROJECT=	v2ray-core
-GH_SUBDIR=	src/v2ray.com/core
 GH_TUPLE=	golang:crypto:193df9c0f06f:golang_crypto/vendor/golang.org/x/crypto \
 		golang:mock:v1.2.0:golang_mock/vendor/github.com/golang/mock \
 		golang:net:65e2d4e15006:golang_net/vendor/golang.org/x/net \
@@ -32,7 +31,7 @@ GH_TUPLE=	golang:crypto:193df9c0f06f:golang_crypto/vendor/golang.org/x/crypto \
 		h12w:socks:v1.0.0:h12w_socks/vendor/h12.io/socks \
 		miekg:dns:v1.1.4:miekg_dns/vendor/github.com/miekg/dns
 
-GO_BUILDFLAGS=	--ldflags '-s -w'
+GO_BUILDFLAGS=	-ldflags='-s -w'
 
 USERS=		v2ray
 GROUPS=		v2ray
@@ -41,7 +40,7 @@ SUB_LIST=	USER="${USERS}" \
 		GROUP="${GROUPS}"
 
 do-build:
-	@cd ${GO_WRKSRC} && \
+	cd ${GO_WRKSRC} && \
 	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} -o ${GO_WRKDIR_BIN}/v2ray v2ray.com/core/main && \
 	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} -o ${GO_WRKDIR_BIN}/v2ctl v2ray.com/core/infra/control/main
 
diff --git a/net/wireguard-go/Makefile b/net/wireguard-go/Makefile
index 549d9903203e..68d3643e062c 100644
--- a/net/wireguard-go/Makefile
+++ b/net/wireguard-go/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	wireguard-go
-PORTVERSION=	0.0.20190805
+PORTVERSION=	0.0.20190908
 CATEGORIES=	net net-vpn
 MASTER_SITES=	https://git.zx2c4.com/wireguard-go/snapshot/
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
@@ -15,9 +15,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		gmake go:modules,no_targets tar:xz
 
 USE_GITHUB=	nodefault
-GH_TUPLE=	golang:crypto:57b3e21c3d56:crypto/vendor/golang.org/x/crypto \
-		golang:net:d28f0bde5980:net/vendor/golang.org/x/net \
-		golang:sys:516e3c20635f:sys/vendor/golang.org/x/sys
+GH_TUPLE=	golang:crypto:9756ffdc2472:crypto/vendor/golang.org/x/crypto \
+		golang:net:ba9fcec4b297:net/vendor/golang.org/x/net \
+		golang:sys:19e00faab6ad:sys/vendor/golang.org/x/sys
 
 MAKE_ENV+=	GOFLAGS="${GO_BUILDFLAGS}"
 
diff --git a/net/wireguard-go/distinfo b/net/wireguard-go/distinfo
index f55035c33854..e6dfbee518f5 100644
--- a/net/wireguard-go/distinfo
+++ b/net/wireguard-go/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1565033739
-SHA256 (wireguard-go-0.0.20190805.tar.xz) = 2f56d2c4ebc3e50d581e92c046ebf3c884c703c4d5b3b484e45f55e50c0034da
-SIZE (wireguard-go-0.0.20190805.tar.xz) = 76468
-SHA256 (golang-crypto-57b3e21c3d56_GH0.tar.gz) = da73bb9b39c3573d7d4a3cd36bbb1d0e3084b939302ea1c00de4142cc9d39328
-SIZE (golang-crypto-57b3e21c3d56_GH0.tar.gz) = 1692591
-SHA256 (golang-net-d28f0bde5980_GH0.tar.gz) = 40f4d37b315f4a6867ab5beadf4d73f93b9c1d777b48ec66d59f953a4a19acb4
-SIZE (golang-net-d28f0bde5980_GH0.tar.gz) = 1097062
-SHA256 (golang-sys-516e3c20635f_GH0.tar.gz) = eaee891b6eb487237243f3b5d796ffc96dee770c2433c1efc6860c3e04de77f4
-SIZE (golang-sys-516e3c20635f_GH0.tar.gz) = 1437398
+TIMESTAMP = 1568011747
+SHA256 (wireguard-go-0.0.20190908.tar.xz) = 3c4cc802a521736d01d24bfb4fe29a5e74da07d69637ec7bcdee074decf62c6a
+SIZE (wireguard-go-0.0.20190908.tar.xz) = 79212
+SHA256 (golang-crypto-9756ffdc2472_GH0.tar.gz) = 6af409930c3a9313b33f9b8da1a2c24da8ffa07c4fcd55356a77a2f09a0d6326
+SIZE (golang-crypto-9756ffdc2472_GH0.tar.gz) = 1693048
+SHA256 (golang-net-ba9fcec4b297_GH0.tar.gz) = eae512644d59db05f5420315897daf1315beee1b07c723703922d6174f28b993
+SIZE (golang-net-ba9fcec4b297_GH0.tar.gz) = 1100029
+SHA256 (golang-sys-19e00faab6ad_GH0.tar.gz) = 88c19b89943871777350c4edf0df2ecbe9048f41b87da2183dd9529f42c18ea6
+SIZE (golang-sys-19e00faab6ad_GH0.tar.gz) = 1455676
diff --git a/palm/synce-libsynce/Makefile b/palm/synce-libsynce/Makefile
index 428a833ef14a..4bb3ffb750d4 100644
--- a/palm/synce-libsynce/Makefile
+++ b/palm/synce-libsynce/Makefile
@@ -11,6 +11,9 @@ PKGNAMEPREFIX=	synce-
 MAINTAINER=	webmaster@kibab.com
 COMMENT=	Library to support communication with WinCE devices
 
+DEPRECATED=	obsolete technology
+EXPIRATION_DATE=	2019-10-13
+
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libhal.so:sysutils/hal
 
diff --git a/polish/hunspell/Makefile b/polish/hunspell/Makefile
index 8debe7a84339..c48cd8b066a5 100644
--- a/polish/hunspell/Makefile
+++ b/polish/hunspell/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hunspell
-PORTVERSION=	20190831
+PORTVERSION=	20190907
 CATEGORIES=	polish textproc
 MASTER_SITES=	https://sjp.pl/slownik/ort/ \
 		LOCAL/sunpoet/${PORTNAME}
diff --git a/polish/hunspell/distinfo b/polish/hunspell/distinfo
index d0684ab5059f..923312fd6d6f 100644
--- a/polish/hunspell/distinfo
+++ b/polish/hunspell/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567451256
-SHA256 (hunspell/sjp-myspell-pl-20190831.zip) = 76c47454e98a056393b3d8b5515b608d4d47927a8b0cd7037ec2cc11d4dc2038
-SIZE (hunspell/sjp-myspell-pl-20190831.zip) = 1223517
+TIMESTAMP = 1568051713
+SHA256 (hunspell/sjp-myspell-pl-20190907.zip) = 4190f90fe222d6f63580122e43b9e69dd6812a5d7412973f99a9ed44e368b409
+SIZE (hunspell/sjp-myspell-pl-20190907.zip) = 1223518
diff --git a/ports-mgmt/modules2tuple/Makefile b/ports-mgmt/modules2tuple/Makefile
index d5666040c71c..3a66c3e92837 100644
--- a/ports-mgmt/modules2tuple/Makefile
+++ b/ports-mgmt/modules2tuple/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	modules2tuple
-PORTVERSION=	1.8.0
+PORTVERSION=	1.8.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	ports-mgmt
 
diff --git a/ports-mgmt/modules2tuple/distinfo b/ports-mgmt/modules2tuple/distinfo
index 771a558362e6..611c32307bb8 100644
--- a/ports-mgmt/modules2tuple/distinfo
+++ b/ports-mgmt/modules2tuple/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565626763
-SHA256 (dmgk-modules2tuple-v1.8.0_GH0.tar.gz) = 8c9faaa9fec5e80b1b293a011659c30c378ddcd2d309528b86aabbcd66c732d6
-SIZE (dmgk-modules2tuple-v1.8.0_GH0.tar.gz) = 8045
+TIMESTAMP = 1568303236
+SHA256 (dmgk-modules2tuple-v1.8.1_GH0.tar.gz) = fc8c79c570897b6296aa671b920e014f816445c86fefdc997097df6b53297bd1
+SIZE (dmgk-modules2tuple-v1.8.1_GH0.tar.gz) = 8071
diff --git a/ports-mgmt/portfmt/Makefile b/ports-mgmt/portfmt/Makefile
index fd735153a312..c568b2e34fa8 100644
--- a/ports-mgmt/portfmt/Makefile
+++ b/ports-mgmt/portfmt/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	portfmt
-PORTVERSION=	g20190901
+PORTVERSION=	g20190912
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	tobik@FreeBSD.org
@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	t6
-GH_TAGNAME=	daf287e717afa103406777c210165eb1018619d8
+GH_TAGNAME=	c0656bcd3bc36b65838af8bce5aceb527c80e4d5
 USE_LDCONFIG=	yes
 
 HAS_CONFIGURE=	yes
diff --git a/ports-mgmt/portfmt/distinfo b/ports-mgmt/portfmt/distinfo
index 7a2f7fc3f402..5975ab633803 100644
--- a/ports-mgmt/portfmt/distinfo
+++ b/ports-mgmt/portfmt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567510823
-SHA256 (t6-portfmt-g20190901-daf287e717afa103406777c210165eb1018619d8_GH0.tar.gz) = bc91885a7fad5639e68807f1f5e6c110185e86b12466ff6958f847fa7ce9aeac
-SIZE (t6-portfmt-g20190901-daf287e717afa103406777c210165eb1018619d8_GH0.tar.gz) = 78393
+TIMESTAMP = 1568295633
+SHA256 (t6-portfmt-g20190912-c0656bcd3bc36b65838af8bce5aceb527c80e4d5_GH0.tar.gz) = 12893d82e6808029761b17ac18eb2474cbc6e14d85ecb7cac0eb026cdaebedb1
+SIZE (t6-portfmt-g20190912-c0656bcd3bc36b65838af8bce5aceb527c80e4d5_GH0.tar.gz) = 79108
diff --git a/print/cups-bjnp/Makefile b/print/cups-bjnp/Makefile
index a468b91a114c..b95632226fa2 100644
--- a/print/cups-bjnp/Makefile
+++ b/print/cups-bjnp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cups-bjnp
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.2
 CATEGORIES=	print
 MASTER_SITES=	SF
 
diff --git a/print/cups-bjnp/distinfo b/print/cups-bjnp/distinfo
index 072952e65a01..d2f1eb0ccab8 100644
--- a/print/cups-bjnp/distinfo
+++ b/print/cups-bjnp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519772479
-SHA256 (cups-bjnp-2.0.1.tar.gz) = 95b5940daf6ee46120efef9c05048ade9bb855de36280c140895f9672b2946c0
-SIZE (cups-bjnp-2.0.1.tar.gz) = 143552
+TIMESTAMP = 1568063658
+SHA256 (cups-bjnp-2.0.2.tar.gz) = 586a8e0b2e92d41e85e981a16e3015a240f11a02b1bbbd0b92cd45620f411b0e
+SIZE (cups-bjnp-2.0.2.tar.gz) = 143533
diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
index a1ce670beb4d..a0c1b56a717c 100644
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cups-filters
-PORTVERSION=	1.25.4
+PORTVERSION=	1.25.5
 CATEGORIES=	print
 MASTER_SITES=	https://www.openprinting.org/download/cups-filters/
 
diff --git a/print/cups-filters/distinfo b/print/cups-filters/distinfo
index cfca66ad8865..c427e7d559f0 100644
--- a/print/cups-filters/distinfo
+++ b/print/cups-filters/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567676167
-SHA256 (cups-filters-1.25.4.tar.xz) = cc6bffcbbc0bf827d796f206f070abf7105275c1cb07a2e19a95820e18ba8153
-SIZE (cups-filters-1.25.4.tar.xz) = 1449676
+TIMESTAMP = 1568193723
+SHA256 (cups-filters-1.25.5.tar.xz) = b6e80020aef4fd2ad62674cfde1d68ebadd56ca170293fcba023d4628bef3c1f
+SIZE (cups-filters-1.25.5.tar.xz) = 1450264
diff --git a/print/epson-inkjet-printer-escpr/Makefile b/print/epson-inkjet-printer-escpr/Makefile
index 2212b4f843d2..80579d7b56a5 100644
--- a/print/epson-inkjet-printer-escpr/Makefile
+++ b/print/epson-inkjet-printer-escpr/Makefile
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	epson-inkjet-printer-escpr
-PORTVERSION=	1.6.41
+PORTVERSION=	1.7.3
 DISTVERSIONSUFFIX=	-1lsb3.2
 CATEGORIES=	print
-MASTER_SITES=	https://download3.ebz.epson.net/dsc/f/03/00/09/33/79/927867e2774c98c0fdedb15fc7712f363fe16f41/
+MASTER_SITES=	https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/
 
 MAINTAINER=	tatsuki_makino@hotmail.com
 COMMENT=	Epson Inkjet Printer Driver (ESC/P-R) for Linux
 
 LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcupsimage.so:print/cups
 
 USES=		autoreconf dos2unix gmake libtool
-USE_LDCONFIG=	yes
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+PORTDOCS=	AUTHORS NEWS README README.ja
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-lsb
 INSTALL_TARGET=	install-strip
 SUB_FILES=	pkg-message
-PORTDOCS=	AUTHORS COPYING NEWS README README.ja
+USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/print/epson-inkjet-printer-escpr/distinfo b/print/epson-inkjet-printer-escpr/distinfo
index d53d1509b81e..d096d5333479 100644
--- a/print/epson-inkjet-printer-escpr/distinfo
+++ b/print/epson-inkjet-printer-escpr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559703600
-SHA256 (epson-inkjet-printer-escpr-1.6.41-1lsb3.2.tar.gz) = cafbd7ec0299ccd53a0b92ab04a5f7cfee80a37a6e63119e577bcee80d27b8c6
-SIZE (epson-inkjet-printer-escpr-1.6.41-1lsb3.2.tar.gz) = 4569692
+TIMESTAMP = 1568343600
+SHA256 (epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz) = a810d4b474512411470931e1766e2ada2a53808270fbfb9282398e315d9b7264
+SIZE (epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz) = 4688685
diff --git a/print/epson-inkjet-printer-escpr/files/patch-configure.ac b/print/epson-inkjet-printer-escpr/files/patch-configure.ac
index 6f753cb4eee5..206e78605ddd 100644
--- a/print/epson-inkjet-printer-escpr/files/patch-configure.ac
+++ b/print/epson-inkjet-printer-escpr/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2019-04-08 05:14:01 UTC
+--- configure.ac.orig	2019-08-28 05:40:03 UTC
 +++ configure.ac
-@@ -58,9 +58,9 @@ AC_ARG_WITH([cupsfilterdir],
+@@ -57,9 +57,9 @@ AC_ARG_WITH([cupsfilterdir],
  if test "xno" = "x${with_cupsfilterdir}"; then
     if test "xyes" = "x$have_cups_config" ; then
        dnl `@<:@' , `@:>@' are replaced with  `[' , `]'
@@ -12,7 +12,7 @@
     fi
  else
     CUPS_FILTER_DIR="${with_cupsfilterdir}"
-@@ -72,13 +72,11 @@ AC_ARG_WITH([cupsppddir],
+@@ -71,13 +71,11 @@ AC_ARG_WITH([cupsppddir],
    [],
    [with_cupsppddir=no])
  if test "xno" = "x${with_cupsppddir}"; then
@@ -29,7 +29,7 @@
     fi
  else
     CUPS_PPD_DIR="${with_cupsppddir}"
-@@ -109,6 +107,16 @@ AC_ARG_WITH([internal],
+@@ -108,6 +106,16 @@ AC_ARG_WITH([internal],
  AC_SUBST([INTERNAL_PPD])
  AC_SUBST([INTERNAL_PPD_OPTION])
  
@@ -46,7 +46,7 @@
  dnl Checks for header files.
  AC_HEADER_STDC
  AC_HEADER_STAT
-@@ -116,17 +124,23 @@ AC_HEADER_TIME
+@@ -115,17 +123,23 @@ AC_HEADER_TIME
  AC_STRUCT_TM
  AC_TYPE_PID_T
  AC_TYPE_SIZE_T
@@ -71,7 +71,7 @@
          signal.h \
          stdarg.h \
          stddef.h \
-@@ -137,21 +151,45 @@ AC_CHECK_HEADERS([\
+@@ -136,21 +150,45 @@ AC_CHECK_HEADERS([\
          time.h \
          unistd.h \
          ])
diff --git a/print/epson-inkjet-printer-escpr/files/patch-lib_Makefile.am b/print/epson-inkjet-printer-escpr/files/patch-lib_Makefile.am
index c9a94bfa98b7..b6d222231125 100644
--- a/print/epson-inkjet-printer-escpr/files/patch-lib_Makefile.am
+++ b/print/epson-inkjet-printer-escpr/files/patch-lib_Makefile.am
@@ -1,6 +1,6 @@
---- lib/Makefile.am.orig	2017-03-24 04:35:04 UTC
+--- lib/Makefile.am.orig	2019-07-31 06:49:48 UTC
 +++ lib/Makefile.am
-@@ -44,7 +44,7 @@ DEFINES 		+=	-DGCOMSW_ASYNCJOB_SUPPORT
+@@ -43,7 +43,7 @@ DEFINES 		+=	-DGCOMSW_ASYNCJOB_SUPPORT
  DEFINES 	    +=	-DGCOMSW_RAWFILE_SUPPORT
  
  lib_LTLIBRARIES = libescpr.la
@@ -9,7 +9,7 @@
  ## Make sure these will be cleaned even when they're not built by
  ## default.
  CLEANFILES = libescpr.la
-@@ -71,5 +71,5 @@ libescpr_la_SOURCES = \
+@@ -70,5 +70,5 @@ libescpr_la_SOURCES = \
  	epson-typedefs.h \
  	epson-usb.c epson-usb.h
  
diff --git a/print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am b/print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am
index 2a094cf861f1..fe5caf615fcf 100644
--- a/print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am
+++ b/print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am
@@ -1,6 +1,6 @@
---- ppd/Makefile.am.orig	2019-05-08 06:19:49 UTC
+--- ppd/Makefile.am.orig	2019-08-28 05:35:05 UTC
 +++ ppd/Makefile.am
-@@ -616,8 +616,10 @@ EXTRA_DIST = $(cupsppd_DATA)
+@@ -624,8 +624,10 @@ EXTRA_DIST = $(cupsppd_DATA)
  
  # LSBビルド環境の場合、~/.rpmmacros %adjust_ppds が担っている処理を実施
  install-data-hook:
diff --git a/print/epson-inkjet-printer-escpr/files/patch-src_Makefile.am b/print/epson-inkjet-printer-escpr/files/patch-src_Makefile.am
index 0451d5f930af..d040caf87712 100644
--- a/print/epson-inkjet-printer-escpr/files/patch-src_Makefile.am
+++ b/print/epson-inkjet-printer-escpr/files/patch-src_Makefile.am
@@ -1,6 +1,6 @@
---- src/Makefile.am.orig	2017-03-24 04:35:04 UTC
+--- src/Makefile.am.orig	2019-07-31 06:49:48 UTC
 +++ src/Makefile.am
-@@ -28,7 +28,11 @@ cupsfilter_PROGRAMS =\
+@@ -27,7 +27,11 @@ cupsfilter_PROGRAMS =\
  epson_escpr_wrapper_CFLAGS =\
  	-Wall\
  	-DCUPS_FILTER_NAME=\"epson-escpr\" \
diff --git a/print/epson-inkjet-printer-escpr/files/patch-src_filter.c b/print/epson-inkjet-printer-escpr/files/patch-src_filter.c
index 27af26ccd478..6eef8c20262e 100644
--- a/print/epson-inkjet-printer-escpr/files/patch-src_filter.c
+++ b/print/epson-inkjet-printer-escpr/files/patch-src_filter.c
@@ -1,6 +1,6 @@
---- src/filter.c.orig	2019-01-17 09:25:18 UTC
+--- src/filter.c.orig	2019-07-31 06:49:48 UTC
 +++ src/filter.c
-@@ -33,7 +33,10 @@
+@@ -32,7 +32,10 @@
  
  #include "epson-protocol.h"
  #include "epson-escpr-api.h"
@@ -11,7 +11,7 @@
  
  #include "err.h"
  #include "mem.h"
-@@ -42,6 +45,7 @@
+@@ -41,6 +44,7 @@
  #include "libprtX.h"
  #include "optBase.h"
  #include "linux_cmn.h"
@@ -19,7 +19,7 @@
  
  #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
  
-@@ -381,7 +385,7 @@ main (int argc, char *argv[])
+@@ -380,7 +384,7 @@ main (int argc, char *argv[])
  	}
  	
  	printJob.jobStatus = EPS_STATUS_ESTABLISHED;
@@ -28,7 +28,7 @@
  ///////////////////////////////////////////////////////////////////////////////////////////////////////////	
  
  	print_area_x = printJob.printableAreaWidth;
-@@ -410,7 +414,7 @@ main (int argc, char *argv[])
+@@ -409,7 +413,7 @@ main (int argc, char *argv[])
  	while ((read_page_no = read (STDIN_FILENO, &page_num, 1)) > 0)  // 最初に page番号を読み込み
  	{
  		long x_count, y_count;
@@ -37,7 +37,7 @@
  		y_count = 0;
  		band_line_count = 0;
  
-@@ -498,7 +502,11 @@ main (int argc, char *argv[])
+@@ -497,7 +501,11 @@ main (int argc, char *argv[])
  					pagebuf+= bandBmp.widthBytes;
  					posbuf+=bandBmp.widthBytes;
  
@@ -49,7 +49,7 @@
  					bandBmp.bits += band_line_count;
  					
  				}
-@@ -509,13 +517,17 @@ main (int argc, char *argv[])
+@@ -508,13 +516,17 @@ main (int argc, char *argv[])
  				memcpy(pagebuf, bandBmp.bits, bandBmp.widthBytes);
  				pagebuf+= bandBmp.widthBytes;
  				posbuf+= bandBmp.widthBytes;
@@ -68,7 +68,7 @@
  			for (revert = print_area_y; revert > 0; revert--)
  			{
  				if (3 != byte_par_pixel)
-@@ -659,7 +671,11 @@ main (int argc, char *argv[])
+@@ -658,7 +670,11 @@ main (int argc, char *argv[])
  #endif
  					debug_msg("printHeight = %d\n", printHeight);
  					debug_msg("widthByte = %d\n", bandBmp.widthBytes);
@@ -80,7 +80,7 @@
  					bandBmp.bits += band_line_count;
  				}
  				
-@@ -681,7 +697,11 @@ main (int argc, char *argv[])
+@@ -680,7 +696,11 @@ main (int argc, char *argv[])
  				fprintf(fp, "\n");
  				fclose(fp);
  #endif
@@ -92,7 +92,7 @@
  				bandBmp.bits += band_line_count;
  			}
  
-@@ -880,7 +900,7 @@ EPS_INT32 print_spool_fnc(void* hParam, const EPS_UINT
+@@ -879,7 +899,7 @@ EPS_INT32 print_spool_fnc(void* hParam, const EPS_UINT
  
  //	fwrite (pBuf, cbBuf, 1, outfp);
  
diff --git a/print/epson-inkjet-printer-escpr/files/patch-src_mem.c b/print/epson-inkjet-printer-escpr/files/patch-src_mem.c
index 202d139b7eb4..01458ce444e4 100644
--- a/print/epson-inkjet-printer-escpr/files/patch-src_mem.c
+++ b/print/epson-inkjet-printer-escpr/files/patch-src_mem.c
@@ -1,6 +1,6 @@
---- src/mem.c.orig	2017-03-24 04:35:04 UTC
+--- src/mem.c.orig	2019-07-31 06:49:48 UTC
 +++ src/mem.c
-@@ -24,6 +24,7 @@
+@@ -23,6 +23,7 @@
  
  #include <stdlib.h>
  #include "mem.h"
diff --git a/print/epson-inkjet-printer-escpr/files/patch-src_wrapper.c b/print/epson-inkjet-printer-escpr/files/patch-src_wrapper.c
index 243fcafef622..946b8e24a03e 100644
--- a/print/epson-inkjet-printer-escpr/files/patch-src_wrapper.c
+++ b/print/epson-inkjet-printer-escpr/files/patch-src_wrapper.c
@@ -1,6 +1,6 @@
---- src/wrapper.c.orig	2018-03-08 04:25:02 UTC
+--- src/wrapper.c.orig	2019-07-31 06:49:48 UTC
 +++ src/wrapper.c
-@@ -177,8 +177,8 @@ main (int argc, char *argv[])
+@@ -176,8 +176,8 @@ main (int argc, char *argv[])
  
  	int total_read = 0;
  	int total_read_cache = 0;
diff --git a/print/epson-inkjet-printer-escpr/pkg-descr b/print/epson-inkjet-printer-escpr/pkg-descr
index bf74b3a17891..d83e93c9e27e 100644
--- a/print/epson-inkjet-printer-escpr/pkg-descr
+++ b/print/epson-inkjet-printer-escpr/pkg-descr
@@ -1,11 +1,12 @@
-This software is a filter program used with Common UNIX Printing
-System (CUPS) from the Linux. This can supply the high quality print
-with Seiko Epson Color Ink Jet Printers.
+This software is a filter program used with the Common UNIX Printing
+System (CUPS) on the Linux platform.
+The software offers high quality printing with Seiko Epson color ink jet
+printers.
 
-This product supports only EPSON ESC/P-R printers. This package can be
-used for all EPSON ESC/P-R printers.
+This product can only be used with printers that support the Epson ESC/P-R
+language.
 
-For detail list of supported printer, please refer to below site:
+Please see refer to follows for a list of supported printers.
 http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
 
-WWW: http://download.ebz.epson.net/dsc/search/01/search/
+WWW: http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
diff --git a/print/epson-inkjet-printer-escpr/pkg-plist b/print/epson-inkjet-printer-escpr/pkg-plist
index a75bc40c6470..e703cf99700d 100644
--- a/print/epson-inkjet-printer-escpr/pkg-plist
+++ b/print/epson-inkjet-printer-escpr/pkg-plist
@@ -49,6 +49,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-EP-708A_Series-epson-escpr-en.
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-709A_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-710A_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-711A_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-EP-712A_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-774A-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-775A_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-776A_Series-epson-escpr-en.ppd
@@ -63,6 +64,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-EP-807A_Series-epson-escpr-en.
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-808A_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-810A_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-811A_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-EP-812A_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-901A-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-901F-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-902A-epson-escpr-en.ppd
@@ -98,6 +100,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-ET-7700_Series-epson-escpr-en.
 share/cups/model/epson-inkjet-printer-escpr/Epson-ET-7750_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-ET-M1100_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-ET-M1120_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-EW-052A_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EW-M5071FT_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EW-M571T_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EW-M660FT_Series-epson-escpr-en.ppd
@@ -406,6 +409,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-TX420_NX420-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-TX720_Artisan720-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-TX820_Artisan830-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-100_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-WF-110_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2510_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2520_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2530_Series-epson-escpr-en.ppd
@@ -415,6 +419,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2650_Series-epson-escpr-en.
 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2660_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2750_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2760_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2810_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2830_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2850_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-3010_Series-epson-escpr-en.ppd
@@ -513,6 +518,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-XP-243_245_247_Series-epson-es
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-255_257_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-300_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-302_303_305_306_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-XP-3100_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-310_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-312_313_315_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-320_Series-epson-escpr-en.ppd
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index d119a38d799c..34df32d361d0 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	fontforge
-PORTVERSION=	20190413
+PORTVERSION=	20190801
+PORTREVISION=	1
 CATEGORIES=	print
 
 MAINTAINER=	cyberbotx@cyberbotx.com
@@ -11,30 +12,15 @@ COMMENT=	Type 1/TrueType/OpenType/bitmap font editor
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash \
-		${LOCALBASE}/bin/gnulib-tool:devel/gnulib
-LIB_DEPENDS=	libuninameslist.so:textproc/libuninameslist \
-		libtiff.so:graphics/tiff \
-		libpng.so:graphics/png \
-		libgif.so:graphics/giflib \
-		libspiro.so:graphics/libspiro \
-		libfreetype.so:print/freetype2 \
-		libltdl.so:devel/libltdl \
-		libfontconfig.so:x11-fonts/fontconfig
-
-USES=		autoreconf:build compiler desktop-file-utils gettext \
-		gmake gnome iconv jpeg libtool pkgconfig python \
-		readline:port shared-mime-info shebangfix
-USE_GITHUB=	yes
-USE_XORG=	ice sm x11 xi xkbui xft
-USE_GNOME=	cairo glib20 gtk20 libxml2 pango
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
-SHEBANG_FILES=	pycontrib/gdraw/__init__.py \
-		pycontrib/gdraw/gdraw.py
+USES=		autoreconf compiler gettext gmake gnome iconv:wchar_t libtool \
+		localbase pkgconfig
+USE_GITHUB=	yes
+USE_GNOME=	glib20 libxml2
 
-CONFIGURE_ARGS=	--enable-tile-path --enable-gtk2-use
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+# It seems that iconv is required regardless of this setting, so forcing it on
+CONFIGURE_ARGS=	--with-iconv
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -43,29 +29,78 @@ INSTALLS_ICONS=	yes
 
 PORTDOCS=	* .htaccess
 
-OPTIONS_DEFINE=	DOCS FREETYPE CAIRO PYTHON
+OPTIONS_DEFINE=	CAIRO DOCS FREETYPE GIF JPEG PNG PYTHON READLINE SPIRO TIFF \
+		TILEPATH UNINAMESLIST WOFF2 WRITEPFM
+OPTIONS_GROUP=	GUI
+OPTIONS_GROUP_GUI=	GTK3 X11
+OPTIONS_SINGLE=	THEME
+OPTIONS_SINGLE_THEME=	TANGO 2012
+OPTIONS_DEFAULT=CAIRO GIF GTK3 JPEG PNG PYTHON READLINE SPIRO TANGO TIFF \
+		TILEPATH UNINAMESLIST WOFF2
 OPTIONS_SUB=	yes
-FREETYPE_DESC=	Include freetype's internal debugger
 
+2012_DESC=	Old theme that was used until 2012
+2012_CONFIGURE_ENABLE=	theme-2012
+
+CAIRO_USE=	gnome=cairo,pango
+CAIRO_CONFIGURE_WITH=	cairo
+CAIRO_IMPLIES=	PNG
+
+FREETYPE_DESC=	Include freetype's internal debugger
 FREETYPE_PATCH_DEPENDS=	${NONEXISTENT}:print/freetype2:extract
 FREETYPE_CONFIGURE_ENABLE=	freetype-debugger=${WRKSRC}/freetype
 
-CAIRO_CONFIGURE_WITH=	cairo
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
+GIF_CONFIGURE_WITH=	giflib
+
+GTK3_USE=	gnome=gtk30
+GTK3_CONFIGURE_ENABLE=	gdk
+GTK3_IMPLIES=	CAIRO X11
+
+JPEG_USES=	jpeg
+JPEG_CONFIGURE_WITH=	libjpeg
+
+PNG_LIB_DEPENDS=libpng.so:graphics/png
+PNG_CONFIGURE_WITH=	libpng
 
+PYTHON_USES=	python:3.5-3.7
+PYTHON_USES_OFF=python:3.5-3.7,build
 PYTHON_CONFIGURE_ENABLE=	python-scripting python-extension
 
+READLINE_USES=	readline:port
+READLINE_CONFIGURE_WITH=	libreadline
+
+SPIRO_DESC=	Use libspiro to edit with clothoid splines
+SPIRO_LIB_DEPENDS=	libspiro.so:graphics/libspiro
+SPIRO_CONFIGURE_WITH=	libspiro
+
+TANGO_DESC=	Default theme based on the Tango Desktop Project
+
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
+TIFF_CONFIGURE_WITH=	libtiff
+
+TILEPATH_DESC=	Enable a 'tile path' command (a variant of 'expand stroke')
+TILEPATH_CONFIGURE_ENABLE=	tile-path
+
+UNINAMESLIST_DESC=	Use libuninameslist for Unicode attribute data
+UNINAMESLIST_LIB_DEPENDS=	libuninameslist.so:textproc/libuninameslist
+UNINAMESLIST_CONFIGURE_WITH=	libuninameslist
+
+WOFF2_DESC=	WOFF2 web font support
+WOFF2_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
+			libwoff2dec.so:devel/woff2
+WOFF2_CONFIGURE_ENABLE=	woff2
+
+WRITEPFM_DESC=	Add ability to save PFM file w/o creating associated font file
+WRITEPFM_CONFIGURE_ENABLE=	write-pfm
+
+X11_USES=	desktop-file-utils shared-mime-info xorg
+X11_USE=	gnome=pango xorg=ice,sm,x11,xft,xi
+X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
+X11_RUN_DEPENDS=	${LOCALBASE}/share/fonts/gnu-unifont/unifont.pcf.gz:x11-fonts/gnu-unifont
+X11_CONFIGURE_WITH=	x
+
 post-patch-FREETYPE-on:
 	@${LN} -s $$(${MAKE} -C ${PORTSDIR}/print/freetype2 -V WRKSRC) ${WRKSRC}/freetype
 
-# This is to get around calling fontforge's bootstrap script, as that script fails
-# if git isn't installed on a system DESPITE there being a --skip-git argument that
-# can be passed into it. autoreconf is called here because I want to run it without
-# libtoolize being run along with it.
-pre-configure:
-	(cd ${WRKSRC} && \
-		${SH} -c '. ./bootstrap.conf ; \
-		${LOCALBASE}/bin/libtoolize -i -c -q ; \
-		${LOCALBASE}/bin/gnulib-tool --aux-dir=config --m4-base=m4 --libtool --symlink --import $${gnulib_modules}' ; \
-		export LIBTOOLIZE=true ; ${AUTORECONF} -f -i)
-
 .include <bsd.port.mk>
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 9c353d84e698..a12da1c21ede 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558768709
-SHA256 (fontforge-fontforge-20190413_GH0.tar.gz) = d3b60f22d7a52fc2b11e1bd515ab7ba3176f8a3228330d2aea4d076896fe025d
-SIZE (fontforge-fontforge-20190413_GH0.tar.gz) = 24380527
+TIMESTAMP = 1567124778
+SHA256 (fontforge-fontforge-20190801_GH0.tar.gz) = e4501de5bd8e7f6c68fe7d3abd4667bf44a07b981d342ffa00e8f42e155ce633
+SIZE (fontforge-fontforge-20190801_GH0.tar.gz) = 21082347
diff --git a/print/fontforge/files/patch-Makefile.am b/print/fontforge/files/patch-Makefile.am
deleted file mode 100644
index d999a24c20b6..000000000000
--- a/print/fontforge/files/patch-Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.am.orig	2019-04-13 07:38:39 UTC
-+++ Makefile.am
-@@ -46,7 +46,7 @@ GITIGNOREFILES = \
- AM_CPPFLAGS =
- AM_LDFLAGS =
- 
--BUILT_SOURCES = uthash/src
-+BUILT_SOURCES =
- EXTRA_DIST =
- CLEANFILES =
- MOSTLYCLEANFILES =
-@@ -116,7 +116,6 @@ EXTRA_DIST += \
- 	Packaging/FontForge.spec \
- 	Packaging/FontForge.static.spec \
- 	README \
--	uthash/src \
- 	$(NULL)
- 
- #--------------------------------------------------------------------------
-@@ -132,11 +131,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-theme-2012 --enab
- 
- 
- #--------------------------------------------------------------------------
--uthash/src:
--	if [ ! -e uthash/src ]; then \
--	if [ -e uthash ] ; then rm -r uthash ; fi ; \
--	git clone https://github.com/troydhanson/uthash ; \
--	fi ;
- 
- # We import a selection of targets from Frank's standard packaging Makefile.
- 
diff --git a/print/fontforge/files/patch-fontforge_cvexport.c b/print/fontforge/files/patch-fontforge_cvexport.c
deleted file mode 100644
index 28ebe318255b..000000000000
--- a/print/fontforge/files/patch-fontforge_cvexport.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- fontforge/cvexport.c.orig	2019-04-13 07:38:39 UTC
-+++ fontforge/cvexport.c
-@@ -232,20 +232,7 @@ int _ExportPDF(FILE *pdf,SplineChar *sc,int layer) {
-     fprintf( pdf, "    /CreationDate (D:%04d%02d%02d%02d%02d%02d",
- 	    1900+tm->tm_year, tm->tm_mon+1, tm->tm_mday,
- 	    tm->tm_hour, tm->tm_min, tm->tm_sec );
--#ifdef _NO_TZSET
-     fprintf( pdf, "Z)\n" );
--#else
--    tzset();
--    if ( timezone==0  || getenv("SOURCE_DATE_EPOCH") )
--	fprintf( pdf, "Z)\n" );
--    else {
--	if ( timezone<0 ) /* fprintf bug - this is a kludge to print +/- in front of a %02d-padded value */
--	    fprintf( pdf, "-" );
--	else
--	    fprintf( pdf, "+" );
--	fprintf( pdf, "%02d'%02d')\n", (int)(timezone/3600),(int)(timezone/60-(timezone/3600)*60) );
--    }
--#endif
-     fprintf( pdf, "    /Title (%s from %s)\n", sc->name, sc->parent->fontname );
-     if ( author!=NULL )
- 	fprintf( pdf, "    /Author (%s)\n", author );
diff --git a/print/fontforge/files/patch-fontforge_print.c b/print/fontforge/files/patch-fontforge_print.c
deleted file mode 100644
index 6a5329959754..000000000000
--- a/print/fontforge/files/patch-fontforge_print.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- fontforge/print.c.orig	2019-04-13 07:38:39 UTC
-+++ fontforge/print.c
-@@ -1164,19 +1164,7 @@ static void dump_pdfprologue(PI *pi) {
-     }
-     fprintf( pi->out, "    /CreationDate (D:%04d%02d%02d%02d%02d%02d",
- 	    tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec );
--#ifdef _NO_TZSET
-     fprintf( pi->out, "Z)\n" );
--#else
--    if ( timezone==0 || getenv("SOURCE_DATE_EPOCH") )
--	fprintf( pi->out, "Z)\n" );
--    else {
--	if ( timezone<0 ) /* fprintf bug - this is a kludge to print +/- in front of a %02d-padded value */
--	    fprintf( pi->out, "-" );
--	else
--	    fprintf( pi->out, "+" );
--	fprintf( pi->out, "%02d'%02d')\n", (int)(timezone/3600),(int)(timezone/60-(timezone/3600)*60) );
--    }
--#endif
-     if ( author!=NULL )
- 	fprintf( pi->out, "  /Author (%s)\n", author );
-     fprintf( pi->out, ">>\n" );
diff --git a/print/fontforge/files/patch-fontforge_splinefont.h b/print/fontforge/files/patch-fontforge_splinefont.h
deleted file mode 100644
index 7fc41a7ececf..000000000000
--- a/print/fontforge/files/patch-fontforge_splinefont.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- fontforge/splinefont.h.orig	2015-08-20 03:39:10 UTC
-+++ fontforge/splinefont.h
-@@ -3548,7 +3548,11 @@ char * delimit_null(const char * input, 
- 
- #include "ustring.h"
- 
--#ifdef _WIN32
-+#ifdef __FreeBSD__
-+#include <osreldate.h>
-+#endif
-+
-+#if defined(_WIN32) || (defined(__FreeBSD__) && __FreeBSD_version < 900506)
- #define BAD_LOCALE_HACK
- typedef char* locale_t;
- #define LC_GLOBAL_LOCALE ((locale_t)-1)
diff --git a/print/fontforge/files/patch-m4_fontforge__arg__enable.m4 b/print/fontforge/files/patch-m4_fontforge__arg__enable.m4
new file mode 100644
index 000000000000..b9eba9a9f393
--- /dev/null
+++ b/print/fontforge/files/patch-m4_fontforge__arg__enable.m4
@@ -0,0 +1,11 @@
+--- m4/fontforge_arg_enable.m4.orig	2019-08-01 08:28:36 UTC
++++ m4/fontforge_arg_enable.m4
+@@ -232,7 +232,7 @@ AC_DEFUN([FONTFORGE_ARG_ENABLE_WOFF2],
+ AC_ARG_ENABLE([woff2],
+         [AS_HELP_STRING([--enable-woff2],
+                 [Enable WOFF2 support.])],
+-        [use_woff2=yes])
++        [use_woff2="${enableval}"])
+ if test x$use_woff2 = xyes ; then
+     PKG_CHECK_MODULES([WOFF2],[libwoff2enc,libwoff2dec],
+     [
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index 711bff287889..fc48e75da9ae 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -12,11 +12,8 @@ include/fontforge/bitmapcontrol.h
 include/fontforge/carbon.h
 include/fontforge/chardata.h
 include/fontforge/charset.h
-include/fontforge/configure-fontforge.h
-include/fontforge/cvruler.h
 include/fontforge/delta.h
 include/fontforge/dlist.h
-include/fontforge/dynamic.h
 include/fontforge/edgelist.h
 include/fontforge/edgelist2.h
 include/fontforge/encoding.h
@@ -25,8 +22,8 @@ include/fontforge/ffgdk.h
 include/fontforge/ffglib.h
 include/fontforge/ffpython.h
 include/fontforge/flaglist.h
-include/fontforge/fileutil.h
 include/fontforge/fontforge-config.h
+include/fontforge/fontforge-version-extras.h
 include/fontforge/fontforge.h
 include/fontforge/fontforgevw.h
 include/fontforge/fvmetrics.h
@@ -39,7 +36,6 @@ include/fontforge/gio.h
 include/fontforge/gkeysym.h
 include/fontforge/glif_name_hash.h
 include/fontforge/glyphcomp.h
-include/fontforge/gnetwork.h
 include/fontforge/gprogress.h
 include/fontforge/gresedit.h
 include/fontforge/gresource.h
@@ -47,14 +43,15 @@ include/fontforge/groups.h
 include/fontforge/gutils.h
 include/fontforge/gwidget.h
 include/fontforge/gwwiconv.h
+include/fontforge/hotkeys.h
 include/fontforge/intl.h
-include/fontforge/libffstamp.h
 include/fontforge/lookups.h
 include/fontforge/mem.h
 include/fontforge/mm.h
 include/fontforge/namehash.h
 include/fontforge/nonlineartrans.h
 include/fontforge/ofl.h
+include/fontforge/prefs.h
 include/fontforge/print.h
 include/fontforge/psfont.h
 include/fontforge/savefont.h
@@ -69,8 +66,8 @@ include/fontforge/stemdb.h
 include/fontforge/ttf.h
 include/fontforge/ttfinstrs.h
 include/fontforge/uiinterface.h
+include/fontforge/unicodelibinfo.h
 include/fontforge/unicoderange.h
-include/fontforge/usermenu.h
 include/fontforge/ustring.h
 include/fontforge/utype.h
 include/fontforge/views.h
@@ -82,10 +79,10 @@ lib/libfontforgeexe.a
 lib/libfontforgeexe.so
 lib/libfontforgeexe.so.3
 lib/libfontforgeexe.so.3.0.0
-lib/libgdraw.a
-lib/libgdraw.so
-lib/libgdraw.so.6
-lib/libgdraw.so.6.0.0
+%%X11%%lib/libgdraw.a
+%%X11%%lib/libgdraw.so
+%%X11%%lib/libgdraw.so.6
+%%X11%%lib/libgdraw.so.6.0.0
 lib/libgunicode.a
 lib/libgunicode.so
 lib/libgunicode.so.5
@@ -102,37 +99,22 @@ man/man1/fontforge.1.gz
 man/man1/fontimage.1.gz
 man/man1/fontlint.1.gz
 man/man1/sfddiff.1.gz
-share/appdata/org.fontforge.FontForge.appdata.xml
-share/applications/org.fontforge.FontForge.desktop
+%%X11%%share/appdata/org.fontforge.FontForge.appdata.xml
+%%X11%%share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/hotkeys/default
-%%DATADIR%%/nodejs/collabwebview/client.html
-%%DATADIR%%/nodejs/collabwebview/css/print.css
-%%DATADIR%%/nodejs/collabwebview/css/styles.css
-%%DATADIR%%/nodejs/collabwebview/index.html
-%%DATADIR%%/nodejs/collabwebview/js/constants.js
-%%DATADIR%%/nodejs/collabwebview/js/contentEditable/component.json
-%%DATADIR%%/nodejs/collabwebview/js/contentEditable/contenteditable.jquery.json
-%%DATADIR%%/nodejs/collabwebview/js/contentEditable/example.html
-%%DATADIR%%/nodejs/collabwebview/js/contentEditable/jquery.contenteditable.js
-%%DATADIR%%/nodejs/collabwebview/js/fontdrag.js
-%%DATADIR%%/nodejs/collabwebview/js/jquery-1.9.1.min.js
-%%DATADIR%%/nodejs/collabwebview/js/jquery.masonry.min.js
-%%DATADIR%%/nodejs/collabwebview/js/otfeatures.js
-%%DATADIR%%/nodejs/collabwebview/package.json
-%%DATADIR%%/nodejs/collabwebview/server.js
-%%DATADIR%%/pixmaps/Cantarell-Bold.ttf
-%%DATADIR%%/pixmaps/Cantarell-BoldOblique.ttf
-%%DATADIR%%/pixmaps/Cantarell-Oblique.ttf
-%%DATADIR%%/pixmaps/Cantarell-Regular.ttf
-%%DATADIR%%/pixmaps/Inconsolata-Bold.ttf
-%%DATADIR%%/pixmaps/Inconsolata-Regular.ttf
-%%DATADIR%%/pixmaps/OFL.txt
+%%TANGO%%%%DATADIR%%/pixmaps/Cantarell-Bold.ttf
+%%TANGO%%%%DATADIR%%/pixmaps/Cantarell-BoldOblique.ttf
+%%TANGO%%%%DATADIR%%/pixmaps/Cantarell-Oblique.ttf
+%%TANGO%%%%DATADIR%%/pixmaps/Cantarell-Regular.ttf
+%%TANGO%%%%DATADIR%%/pixmaps/Inconsolata-Bold.ttf
+%%TANGO%%%%DATADIR%%/pixmaps/Inconsolata-Regular.ttf
+%%TANGO%%%%DATADIR%%/pixmaps/OFL.txt
 %%DATADIR%%/pixmaps/changeweight.png
 %%DATADIR%%/pixmaps/charviewicon.xbm
-%%DATADIR%%/pixmaps/check_off_disabled.png
-%%DATADIR%%/pixmaps/check_off.png
-%%DATADIR%%/pixmaps/check_on_disabled.png
-%%DATADIR%%/pixmaps/check_on.png
+%%TANGO%%%%DATADIR%%/pixmaps/check_off.png
+%%TANGO%%%%DATADIR%%/pixmaps/check_off_disabled.png
+%%TANGO%%%%DATADIR%%/pixmaps/check_on.png
+%%TANGO%%%%DATADIR%%/pixmaps/check_on_disabled.png
 %%DATADIR%%/pixmaps/chooseraudio.png
 %%DATADIR%%/pixmaps/chooserback.png
 %%DATADIR%%/pixmaps/chooserbookmark.png
@@ -148,7 +130,7 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/choosermacttf.png
 %%DATADIR%%/pixmaps/choosernobookmark.png
 %%DATADIR%%/pixmaps/chooserobject.png
-%%DATADIR%%/pixmaps/choosersfdir.png
+%%TANGO%%%%DATADIR%%/pixmaps/choosersfdir.png
 %%DATADIR%%/pixmaps/choosertar.png
 %%DATADIR%%/pixmaps/choosertextbdf.png
 %%DATADIR%%/pixmaps/choosertextc.png
@@ -166,7 +148,7 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/chooserupdir.png
 %%DATADIR%%/pixmaps/chooservideo.png
 %%DATADIR%%/pixmaps/colorwheel.png
-%%DATADIR%%/pixmaps/downarrow.png
+%%TANGO%%%%DATADIR%%/pixmaps/downarrow.png
 %%DATADIR%%/pixmaps/editclear.png
 %%DATADIR%%/pixmaps/editclearback.png
 %%DATADIR%%/pixmaps/editcopy.png
@@ -182,7 +164,7 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/editfind.png
 %%DATADIR%%/pixmaps/editjoin.png
 %%DATADIR%%/pixmaps/editmerge.png
-%%DATADIR%%/pixmaps/editmergetoline.png
+%%TANGO%%%%DATADIR%%/pixmaps/editmergetoline.png
 %%DATADIR%%/pixmaps/editpaste.png
 %%DATADIR%%/pixmaps/editpasteafter.png
 %%DATADIR%%/pixmaps/editpasteinto.png
@@ -230,7 +212,14 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/elementvbaselines.png
 %%DATADIR%%/pixmaps/exclude.png
 %%DATADIR%%/pixmaps/extendcondense.png
+%%DATADIR%%/pixmaps/fflogo.png
+%%DATADIR%%/pixmaps/fflogo13.png
+%%DATADIR%%/pixmaps/ffsplash1.png
+%%DATADIR%%/pixmaps/ffsplash2.png
+%%DATADIR%%/pixmaps/ffsplash3.png
 %%DATADIR%%/pixmaps/fileclose.png
+%%TANGO%%%%DATADIR%%/pixmaps/fileclose2.png
+%%DATADIR%%/pixmaps/filedisplay.png
 %%DATADIR%%/pixmaps/fileexecute.png
 %%DATADIR%%/pixmaps/fileexport.png
 %%DATADIR%%/pixmaps/filegenerate.png
@@ -249,13 +238,6 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/filesave.png
 %%DATADIR%%/pixmaps/filesaveall.png
 %%DATADIR%%/pixmaps/filesaveas.png
-%%DATADIR%%/pixmaps/fflogo.png
-%%DATADIR%%/pixmaps/fflogo13.png
-%%DATADIR%%/pixmaps/ffsplash1.png
-%%DATADIR%%/pixmaps/ffsplash2.png
-%%DATADIR%%/pixmaps/ffsplash3.png
-%%DATADIR%%/pixmaps/fileclose2.png
-%%DATADIR%%/pixmaps/filedisplay.png
 %%DATADIR%%/pixmaps/findinter.png
 %%DATADIR%%/pixmaps/fliphor.png
 %%DATADIR%%/pixmaps/flipvert.png
@@ -287,48 +269,48 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/overlapfindinter.png
 %%DATADIR%%/pixmaps/overlapintersection.png
 %%DATADIR%%/pixmaps/overlaprm.png
+%%TANGO%%%%DATADIR%%/pixmaps/palette3drotate-selected.png
 %%DATADIR%%/pixmaps/palette3drotate.png
-%%DATADIR%%/pixmaps/palette3drotate-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettecorner-selected.png
 %%DATADIR%%/pixmaps/palettecorner.png
-%%DATADIR%%/pixmaps/palettecorner-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettecurve-selected.png
 %%DATADIR%%/pixmaps/palettecurve.png
-%%DATADIR%%/pixmaps/palettecurve-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletteelipse-selected.png
 %%DATADIR%%/pixmaps/paletteelipse.png
-%%DATADIR%%/pixmaps/paletteelipse-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletteflip-selected.png
 %%DATADIR%%/pixmaps/paletteflip.png
-%%DATADIR%%/pixmaps/paletteflip-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettefreehand-selected.png
 %%DATADIR%%/pixmaps/palettefreehand.png
-%%DATADIR%%/pixmaps/palettefreehand-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettehand-selected.png
 %%DATADIR%%/pixmaps/palettehand.png
-%%DATADIR%%/pixmaps/palettehand-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettehvcurve-selected.png
 %%DATADIR%%/pixmaps/palettehvcurve.png
-%%DATADIR%%/pixmaps/palettehvcurve-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletteknife-selected.png
 %%DATADIR%%/pixmaps/paletteknife.png
-%%DATADIR%%/pixmaps/paletteknife-selected.png
 %%DATADIR%%/pixmaps/paletteline.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettemagnify-selected.png
 %%DATADIR%%/pixmaps/palettemagnify.png
-%%DATADIR%%/pixmaps/palettemagnify-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettepen-selected.png
 %%DATADIR%%/pixmaps/palettepen.png
-%%DATADIR%%/pixmaps/palettepen-selected.png
 %%DATADIR%%/pixmaps/palettepencil.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletteperspective-selected.png
 %%DATADIR%%/pixmaps/paletteperspective.png
-%%DATADIR%%/pixmaps/paletteperspective-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettepointer-selected.png
 %%DATADIR%%/pixmaps/palettepointer.png
-%%DATADIR%%/pixmaps/palettepointer-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettepoly-selected.png
 %%DATADIR%%/pixmaps/palettepoly.png
-%%DATADIR%%/pixmaps/palettepoly-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletterect-selected.png
 %%DATADIR%%/pixmaps/paletterect.png
-%%DATADIR%%/pixmaps/paletterect-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletterotate-selected.png
 %%DATADIR%%/pixmaps/paletterotate.png
-%%DATADIR%%/pixmaps/paletterotate-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletteruler-selected.png
 %%DATADIR%%/pixmaps/paletteruler.png
-%%DATADIR%%/pixmaps/paletteruler-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettescale-selected.png
 %%DATADIR%%/pixmaps/palettescale.png
-%%DATADIR%%/pixmaps/palettescale-selected.png
-%%DATADIR%%/pixmaps/paletteselectedbg.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletteselectedbg.png
 %%DATADIR%%/pixmaps/paletteshift.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletteskew-selected.png
 %%DATADIR%%/pixmaps/paletteskew.png
-%%DATADIR%%/pixmaps/paletteskew-selected.png
 %%DATADIR%%/pixmaps/palettesmall3drotate.png
 %%DATADIR%%/pixmaps/palettesmallcorner.png
 %%DATADIR%%/pixmaps/palettesmallcurve.png
@@ -355,24 +337,24 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/palettesmallspiroright.png
 %%DATADIR%%/pixmaps/palettesmallstar.png
 %%DATADIR%%/pixmaps/palettesmalltangent.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettespirocorner-selected.png
 %%DATADIR%%/pixmaps/palettespirocorner.png
-%%DATADIR%%/pixmaps/palettespirocorner-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettespirocurve-selected.png
 %%DATADIR%%/pixmaps/palettespirocurve.png
-%%DATADIR%%/pixmaps/palettespirocurve-selected.png
 %%DATADIR%%/pixmaps/palettespirodisabled.png
 %%DATADIR%%/pixmaps/palettespirodown.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettespirog2curve-selected.png
 %%DATADIR%%/pixmaps/palettespirog2curve.png
-%%DATADIR%%/pixmaps/palettespirog2curve-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettespiroleft-selected.png
 %%DATADIR%%/pixmaps/palettespiroleft.png
-%%DATADIR%%/pixmaps/palettespiroleft-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettespiroright-selected.png
 %%DATADIR%%/pixmaps/palettespiroright.png
-%%DATADIR%%/pixmaps/palettespiroright-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettespiroup-selected.png
 %%DATADIR%%/pixmaps/palettespiroup.png
-%%DATADIR%%/pixmaps/palettespiroup-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettestar-selected.png
 %%DATADIR%%/pixmaps/palettestar.png
-%%DATADIR%%/pixmaps/palettestar-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettetangent-selected.png
 %%DATADIR%%/pixmaps/palettetangent.png
-%%DATADIR%%/pixmaps/palettetangent-selected.png
 %%DATADIR%%/pixmaps/pointsG2curve.png
 %%DATADIR%%/pixmaps/pointsaddanchor.png
 %%DATADIR%%/pixmaps/pointscorner.png
@@ -390,11 +372,11 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/ptinfohvcurve.png
 %%DATADIR%%/pixmaps/ptinfotangent.png
 %%DATADIR%%/pixmaps/python.png
-%%DATADIR%%/pixmaps/radio_off_disabled.png
-%%DATADIR%%/pixmaps/radio_off.png
-%%DATADIR%%/pixmaps/radio_on_disabled.png
-%%DATADIR%%/pixmaps/radio_on.png
-%%DATADIR%%/pixmaps/resources
+%%TANGO%%%%DATADIR%%/pixmaps/radio_off.png
+%%TANGO%%%%DATADIR%%/pixmaps/radio_off_disabled.png
+%%TANGO%%%%DATADIR%%/pixmaps/radio_on.png
+%%TANGO%%%%DATADIR%%/pixmaps/radio_on_disabled.png
+%%TANGO%%%%DATADIR%%/pixmaps/resources
 %%DATADIR%%/pixmaps/rmoverlap.png
 %%DATADIR%%/pixmaps/rotate180.png
 %%DATADIR%%/pixmaps/rotateccw.png
@@ -420,7 +402,7 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/stylessmallcaps.png
 %%DATADIR%%/pixmaps/stylessubsuper.png
 %%DATADIR%%/pixmaps/styleswireframe.png
-%%DATADIR%%/pixmaps/text12210.png
+%%TANGO%%%%DATADIR%%/pixmaps/text12210.png
 %%DATADIR%%/pixmaps/tools3drotate.png
 %%DATADIR%%/pixmaps/toolselipse.png
 %%DATADIR%%/pixmaps/toolsflip.png
@@ -473,36 +455,27 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/viewzoomout.png
 %%DATADIR%%/pixmaps/wireframe.png
 %%DATADIR%%/prefs
-%%PYTHON%%%%DATADIR%%/python/collab/sessionjoin-and-change-c.py
-%%PYTHON%%%%DATADIR%%/python/collab/sessionjoin-and-save-to-out.sfd.py
-%%PYTHON%%%%DATADIR%%/python/collab/sessionstart.py
-%%PYTHON%%%%DATADIR%%/python/collab/web-test-collab.py
 %%PYTHON%%%%DATADIR%%/python/excepthook.py
-%%DATADIR%%/python/gdraw/README
-%%DATADIR%%/python/gdraw/__init__.py
-%%DATADIR%%/python/gdraw/_gdraw.py
-%%DATADIR%%/python/gdraw/gdraw.html
-%%DATADIR%%/python/gdraw/gdraw.py
-%%DATADIR%%/python/webcollab.py
 %%PYTHON%%%%DATADIR%%/python/simple/expand-a.py
 %%PYTHON%%%%DATADIR%%/python/simple/load-font-and-show-name.py
 %%PYTHON%%%%DATADIR%%/python/test.sfd
-share/icons/hicolor/128x128/apps/org.fontforge.FontForge.png
-share/icons/hicolor/16x16/apps/org.fontforge.FontForge.png
-share/icons/hicolor/22x22/apps/org.fontforge.FontForge.png
-share/icons/hicolor/24x24/apps/org.fontforge.FontForge.png
-share/icons/hicolor/256x256/apps/org.fontforge.FontForge.png
-share/icons/hicolor/32x32/apps/org.fontforge.FontForge.png
-share/icons/hicolor/48x48/apps/org.fontforge.FontForge.png
-share/icons/hicolor/512x512/apps/org.fontforge.FontForge.png
-share/icons/hicolor/64x64/apps/org.fontforge.FontForge.png
-share/icons/hicolor/scalable/apps/org.fontforge.FontForge.svg
+%%X11%%share/icons/hicolor/128x128/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/16x16/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/22x22/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/24x24/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/256x256/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/32x32/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/48x48/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/512x512/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/64x64/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/scalable/apps/org.fontforge.FontForge.svg
 share/locale/ca/LC_MESSAGES/FontForge.mo
 share/locale/de/LC_MESSAGES/FontForge.mo
 share/locale/el/LC_MESSAGES/FontForge.mo
 share/locale/en_GB/LC_MESSAGES/FontForge.mo
 share/locale/es/LC_MESSAGES/FontForge.mo
 share/locale/fr/LC_MESSAGES/FontForge.mo
+share/locale/hr/LC_MESSAGES/FontForge.mo
 share/locale/it/LC_MESSAGES/FontForge.mo
 share/locale/ja/LC_MESSAGES/FontForge.mo
 share/locale/ko/LC_MESSAGES/FontForge.mo
@@ -514,8 +487,9 @@ share/locale/uk/LC_MESSAGES/FontForge.mo
 share/locale/vi/LC_MESSAGES/FontForge.mo
 share/locale/zh_CN/LC_MESSAGES/FontForge.mo
 share/locale/zh_TW/LC_MESSAGES/FontForge.mo
-share/metainfo/org.fontforge.FontForge.appdata.xml
-share/metainfo/org.fontforge.FontForge.metainfo.xml
-share/mime/packages/fontforge.xml
-share/pixmaps/org.fontforge.FontForge.png
-share/pixmaps/org.fontforge.FontForge.xpm
+%%X11%%share/metainfo/org.fontforge.FontForge.appdata.xml
+%%X11%%share/metainfo/org.fontforge.FontForge.metainfo.xml
+%%X11%%share/mime/packages/fontforge.xml
+%%X11%%share/pixmaps/org.fontforge.FontForge.png
+%%X11%%share/pixmaps/org.fontforge.FontForge.xpm
+%%NO_PYTHON%%@dir %%DATADIR%%/python
diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index 7032c855c2dc..cf985cc83ade 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	foomatic-db
-PORTVERSION=	20190302
+PORTVERSION=	20190909
 CATEGORIES=	print
 MASTER_SITES=	LOCAL/danilo
 DISTNAME=	${PORTNAME}-${FOOMATICVER}-${PORTVERSION}
@@ -10,7 +10,11 @@ DISTNAME=	${PORTNAME}-${FOOMATICVER}-${PORTVERSION}
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Database for integrating printer drivers with common spoolers
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USES=		gmake tar:xz
+
 GNU_CONFIGURE=	yes
 
 FOOMATICVER=	4.0
diff --git a/print/foomatic-db/distinfo b/print/foomatic-db/distinfo
index 016c3a2bac7d..43c7c1ace00f 100644
--- a/print/foomatic-db/distinfo
+++ b/print/foomatic-db/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551565108
-SHA256 (foomatic-db-4.0-20190302.tar.xz) = 5aaf170b702bc1f35e3f578a68b09380da78087642fae2bb346fbdf0c5f517d2
-SIZE (foomatic-db-4.0-20190302.tar.xz) = 6589896
+TIMESTAMP = 1568063805
+SHA256 (foomatic-db-4.0-20190909.tar.xz) = 101f41b36ed53bdda6817d210142864064074339afba83ce04468b7183b64142
+SIZE (foomatic-db-4.0-20190909.tar.xz) = 6845072
diff --git a/print/foomatic-db/pkg-plist b/print/foomatic-db/pkg-plist
index 5bbee7141426..9c6aadd05836 100644
--- a/print/foomatic-db/pkg-plist
+++ b/print/foomatic-db/pkg-plist
@@ -460,6 +460,7 @@ share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm_2640_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm_2650_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm_2660_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-F9199_9199nf_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-GS1227_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-GS3020_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-GS3025_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-GS3030_PS.ppd.gz
@@ -470,6 +471,7 @@ share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-GWD2006_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-GWD3006_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-GWD5100_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-GWD7140_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-IM_2702_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-IM_350_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-IM_430_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-IM_C2000_PS.ppd.gz
@@ -994,6 +996,11 @@ share/foomatic/db/source/PPD/Infotec/PDF/Infotec-Pro_8210S_PDF.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PDF/Infotec-Pro_8210_PDF.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PDF/Infotec-Pro_8220S_PDF.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PDF/Infotec-Pro_8220_PDF.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PDF/Infotec-Pro_8300S_PDF.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PDF/Infotec-Pro_8310S_PDF.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PDF/Infotec-Pro_8310_PDF.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PDF/Infotec-Pro_8320S_PDF.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PDF/Infotec-Pro_8320_PDF.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PDF/Infotec-Pro_906EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PDF/Infotec-Pro_907EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PDF/Infotec-Pro_C5100S_PDF.ppd.gz
@@ -1212,6 +1219,11 @@ share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_8210S_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_8210_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_8220S_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_8220_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_8300S_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_8310S_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_8310_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_8320S_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_8320_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_906EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_907EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_C5100S_PS.ppd.gz
@@ -2122,6 +2134,9 @@ share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_TASKalfa_400ci.ppd.gz
 share/foomatic/db/source/PPD/Kyocera/pt/Kyocera_TASKalfa_500ci.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-IM_350_PDF.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-IM_430_PDF.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PDF/Lanier-IM_550_PDF.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PDF/Lanier-IM_600SR_PDF.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PDF/Lanier-IM_600_PDF.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-IM_C2000_PDF.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-IM_C2500_PDF.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-IM_C3000_PDF.ppd.gz
@@ -2305,6 +2320,11 @@ share/foomatic/db/source/PPD/Lanier/PDF/Lanier-MP_CW2201_PDF.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-MP_W6700_PDF.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-MP_W7100_PDF.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-MP_W8140_PDF.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PDF/Lanier-P_501_PDF.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PDF/Lanier-P_502_PDF.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PDF/Lanier-P_800_PDF.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PDF/Lanier-P_801_PDF.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PDF/Lanier-P_C600_PDF.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-Pro_1106EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-Pro_1107EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-Pro_1356EX_PDF.ppd.gz
@@ -2319,6 +2339,11 @@ share/foomatic/db/source/PPD/Lanier/PDF/Lanier-Pro_8210S_PDF.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-Pro_8210_PDF.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-Pro_8220S_PDF.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-Pro_8220_PDF.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PDF/Lanier-Pro_8300S_PDF.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PDF/Lanier-Pro_8310S_PDF.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PDF/Lanier-Pro_8310_PDF.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PDF/Lanier-Pro_8320S_PDF.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PDF/Lanier-Pro_8320_PDF.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-Pro_906EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-Pro_907EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PDF/Lanier-Pro_C5100S_PDF.ppd.gz
@@ -2378,6 +2403,9 @@ share/foomatic/db/source/PPD/Lanier/PS/Lanier-5635_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-5645_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-IM_350_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-IM_430_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-IM_550_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-IM_600SR_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-IM_600_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-IM_C2000_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-IM_C2500_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-IM_C3000_PS.ppd.gz
@@ -2604,6 +2632,11 @@ share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_CW2201_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_W6700_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_W7100_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_W8140_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-P_501_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-P_502_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-P_800_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-P_801_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-P_C600_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_1106EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_1107EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_1356EX_PS.ppd.gz
@@ -2618,6 +2651,11 @@ share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_8210S_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_8210_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_8220S_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_8220_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_8300S_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_8310S_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_8310_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_8320S_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_8320_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_906EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_907EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_C5100S_PS.ppd.gz
@@ -2660,6 +2698,14 @@ share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_6430DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_8300DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_8400DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_9100_LP275_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C221N_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C222DN_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C222SF_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C231N_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C232DN_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C232SF_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C311N_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C312DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C320DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C340DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_C342DN_PS.ppd.gz
@@ -3034,6 +3080,9 @@ share/foomatic/db/source/PPD/NRG/PDF/NRG-DSm735_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-DSm745_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-IM_350_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-IM_430_PDF.ppd.gz
+share/foomatic/db/source/PPD/NRG/PDF/NRG-IM_550_PDF.ppd.gz
+share/foomatic/db/source/PPD/NRG/PDF/NRG-IM_600SR_PDF.ppd.gz
+share/foomatic/db/source/PPD/NRG/PDF/NRG-IM_600_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-IM_C2000_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-IM_C2500_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-IM_C3000_PDF.ppd.gz
@@ -3193,6 +3242,8 @@ share/foomatic/db/source/PPD/NRG/PDF/NRG-P7527_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-P7527n_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-P7535n_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-P7575_PDF.ppd.gz
+share/foomatic/db/source/PPD/NRG/PDF/NRG-P_800_PDF.ppd.gz
+share/foomatic/db/source/PPD/NRG/PDF/NRG-P_801_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-Pro_1106EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-Pro_1107EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-Pro_1356EX_PDF.ppd.gz
@@ -3207,6 +3258,11 @@ share/foomatic/db/source/PPD/NRG/PDF/NRG-Pro_8210S_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-Pro_8210_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-Pro_8220S_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-Pro_8220_PDF.ppd.gz
+share/foomatic/db/source/PPD/NRG/PDF/NRG-Pro_8300S_PDF.ppd.gz
+share/foomatic/db/source/PPD/NRG/PDF/NRG-Pro_8310S_PDF.ppd.gz
+share/foomatic/db/source/PPD/NRG/PDF/NRG-Pro_8310_PDF.ppd.gz
+share/foomatic/db/source/PPD/NRG/PDF/NRG-Pro_8320S_PDF.ppd.gz
+share/foomatic/db/source/PPD/NRG/PDF/NRG-Pro_8320_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-Pro_906EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-Pro_907EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/NRG/PDF/NRG-Pro_C5100S_PDF.ppd.gz
@@ -3316,8 +3372,12 @@ share/foomatic/db/source/PPD/NRG/PS/NRG-DSm725_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-DSm730_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-DSm735_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-DSm745_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-IM_2702_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-IM_350_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-IM_430_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-IM_550_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-IM_600SR_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-IM_600_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-IM_C2000_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-IM_C2500_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-IM_C3000_PS.ppd.gz
@@ -3487,6 +3547,8 @@ share/foomatic/db/source/PPD/NRG/PS/NRG-P7527_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-P7527n_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-P7535n_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-P7575_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-P_800_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-P_801_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_1106EX_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_1107EX_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_1356EX_PS.ppd.gz
@@ -3501,6 +3563,11 @@ share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_8210S_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_8210_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_8220S_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_8220_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_8300S_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_8310S_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_8310_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_8320S_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_8320_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_906EX_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_907EX_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_C5100S_PS.ppd.gz
@@ -3520,6 +3587,10 @@ share/foomatic/db/source/PPD/NRG/PS/NRG-SP_3400N_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_3400SF_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_3410DN_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_3410SF_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_3500N_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_3500SF_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_3510DN_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_3510SF_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_3600DN_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_3600SF_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_3610SF_PS.ppd.gz
@@ -3544,6 +3615,16 @@ share/foomatic/db/source/PPD/NRG/PS/NRG-SP_8200DN_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_8300DN_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_8400DN_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_9100DN_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C221N_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C222DN_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C222SF_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C231N_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C232DN_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C232SF_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C242DN_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C242SF_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C311N_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C312DN_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C320DN_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C340DN_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C342DN_PS.ppd.gz
@@ -3945,6 +4026,9 @@ share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Aficio_SP_C831DN_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Aficio_SP_W2470_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-IM_350_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-IM_430_PDF.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-IM_550_PDF.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-IM_600SR_PDF.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-IM_600_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-IM_C2000_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-IM_C2500_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-IM_C3000_PDF.ppd.gz
@@ -4031,6 +4115,11 @@ share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-MP_CW2201_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-MP_W6700_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-MP_W7100_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-MP_W8140_PDF.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-P_501_PDF.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-P_502_PDF.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-P_800_PDF.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-P_801_PDF.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-P_C600_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Pro_1106EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Pro_1107EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Pro_1356EX_PDF.ppd.gz
@@ -4045,6 +4134,11 @@ share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Pro_8210S_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Pro_8210_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Pro_8220S_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Pro_8220_PDF.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Pro_8300S_PDF.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Pro_8310S_PDF.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Pro_8310_PDF.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Pro_8320S_PDF.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Pro_8320_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Pro_906EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Pro_907EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PDF/Ricoh-Pro_C5100S_PDF.ppd.gz
@@ -4232,6 +4326,10 @@ share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_3400N_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_3400SF_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_3410DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_3410SF_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_3500N_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_3500SF_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_3510DN_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_3510SF_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_4100NL_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_4100N_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_4110N_PS.ppd.gz
@@ -4247,6 +4345,16 @@ share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_8100DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_8200DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_8300DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_9100DN_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C221N_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C222DN_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C222SF_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C231N_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C232DN_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C232SF_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C242DN_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C242SF_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C311N_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C312DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C320DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C400DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C410DN_PS.ppd.gz
@@ -4268,8 +4376,12 @@ share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-DDP_70_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-DDP_92_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-EMP_156_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-FAX5510L_5510NF_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_2702_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_350_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_430_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_550_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_600SR_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_600_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_C2000_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_C2500_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_C3000_PS.ppd.gz
@@ -4360,6 +4472,17 @@ share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_CW2201_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_W6700_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_W7100_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_W8140_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-M_C250FWB_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-M_C250FW_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-P_501_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-P_502_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-P_800_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-P_801_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-P_C300W_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-P_C301SF_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-P_C301W_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-P_C301_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-P_C600_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_1106EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_1107EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_1356EX_PS.ppd.gz
@@ -4374,6 +4497,11 @@ share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_8210S_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_8210_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_8220S_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_8220_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_8300S_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_8310S_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_8310_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_8320S_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_8320_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_906EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_907EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_C5100S_PS.ppd.gz
@@ -4389,9 +4517,16 @@ share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_C7200S_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_C7200_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_C7210S_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_C7210_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_330DN_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_330SFN_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_330SN_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_3600DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_3600SF_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_3610SF_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_3700SF_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_3700_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_3710DN_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_3710SF_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_400DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_450DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_4510DN_PS.ppd.gz
@@ -4401,6 +4536,10 @@ share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_5300_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_5310_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_6430DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_8400DN_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_C250DN_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_C250SF_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_C252DN_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_C252SF_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_C261DNw_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_C261SFNw_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_C262DNw_PS.ppd.gz
@@ -4536,6 +4675,11 @@ share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-GX_3050SFN_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-GX_5050N_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-GX_E3350N_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-GX_E5550N_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-IPSiO_SP_3400L_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-IPSiO_SP_3410SF_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-IPSiO_SP_3410_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-IPSiO_SP_3510SF_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-IPSiO_SP_3510_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_2001_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_2501_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_2553_PXL.ppd.gz
@@ -4607,6 +4751,29 @@ share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_C7200_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_C7210S_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_C7210_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SG3120BSFNw_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_212Nw_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_212SFNw_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_212SFw_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_212SNw_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_212SUw_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_212w_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_213Nw_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_213SFNw_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_213SFw_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_213SNw_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_213SUw_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_213w_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_2200L_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_2200SFL_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_320DN_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_320SFN_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_320SN_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_325DNw_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_325SFNw_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_325SNw_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_377DNwX_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_377SFNwX_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SP_377SNwX_PXL.ppd.gz
 share/foomatic/db/source/PPD/Samsung/PS/Samsung_C140x_Series.ppd.gz
 share/foomatic/db/source/PPD/Samsung/PS/Samsung_C145x_Series.ppd.gz
 share/foomatic/db/source/PPD/Samsung/PS/Samsung_C1810_Series.ppd.gz
@@ -4797,6 +4964,9 @@ share/foomatic/db/source/PPD/Savin/PDF/Savin-C_240SR_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-C_240_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-IM_350_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-IM_430_PDF.ppd.gz
+share/foomatic/db/source/PPD/Savin/PDF/Savin-IM_550_PDF.ppd.gz
+share/foomatic/db/source/PPD/Savin/PDF/Savin-IM_600SR_PDF.ppd.gz
+share/foomatic/db/source/PPD/Savin/PDF/Savin-IM_600_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-IM_C2000_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-IM_C2500_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-IM_C3000_PDF.ppd.gz
@@ -4891,6 +5061,11 @@ share/foomatic/db/source/PPD/Savin/PDF/Savin-MP_CW2201_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-MP_W6700_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-MP_W7100_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-MP_W8140_PDF.ppd.gz
+share/foomatic/db/source/PPD/Savin/PDF/Savin-P_501_PDF.ppd.gz
+share/foomatic/db/source/PPD/Savin/PDF/Savin-P_502_PDF.ppd.gz
+share/foomatic/db/source/PPD/Savin/PDF/Savin-P_800_PDF.ppd.gz
+share/foomatic/db/source/PPD/Savin/PDF/Savin-P_801_PDF.ppd.gz
+share/foomatic/db/source/PPD/Savin/PDF/Savin-P_C600_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-Pro_1106EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-Pro_1107EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-Pro_1356EX_PDF.ppd.gz
@@ -4905,6 +5080,11 @@ share/foomatic/db/source/PPD/Savin/PDF/Savin-Pro_8210S_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-Pro_8210_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-Pro_8220S_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-Pro_8220_PDF.ppd.gz
+share/foomatic/db/source/PPD/Savin/PDF/Savin-Pro_8300S_PDF.ppd.gz
+share/foomatic/db/source/PPD/Savin/PDF/Savin-Pro_8310S_PDF.ppd.gz
+share/foomatic/db/source/PPD/Savin/PDF/Savin-Pro_8310_PDF.ppd.gz
+share/foomatic/db/source/PPD/Savin/PDF/Savin-Pro_8320S_PDF.ppd.gz
+share/foomatic/db/source/PPD/Savin/PDF/Savin-Pro_8320_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-Pro_906EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-Pro_907EX_PDF.ppd.gz
 share/foomatic/db/source/PPD/Savin/PDF/Savin-Pro_C5100S_PDF.ppd.gz
@@ -5079,6 +5259,9 @@ share/foomatic/db/source/PPD/Savin/PS/Savin-C_240_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-FAX3799_3799nf_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-IM_350_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-IM_430_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-IM_550_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-IM_600SR_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-IM_600_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-IM_C2000_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-IM_C2500_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-IM_C3000_PS.ppd.gz
@@ -5179,6 +5362,11 @@ share/foomatic/db/source/PPD/Savin/PS/Savin-MP_CW2201_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_W6700_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_W7100_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_W8140_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-P_501_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-P_502_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-P_800_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-P_801_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-P_C600_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_1106EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_1107EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_1356EX_PS.ppd.gz
@@ -5193,6 +5381,11 @@ share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_8210S_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_8210_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_8220S_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_8220_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_8300S_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_8310S_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_8310_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_8320S_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_8320_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_906EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_907EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_C5100S_PS.ppd.gz
@@ -7698,6 +7891,7 @@ share/foomatic/db/source/printer/Gestetner-DSm_2640.xml
 share/foomatic/db/source/printer/Gestetner-DSm_2650.xml
 share/foomatic/db/source/printer/Gestetner-DSm_2660.xml
 share/foomatic/db/source/printer/Gestetner-F9199_9199nf.xml
+share/foomatic/db/source/printer/Gestetner-GS1227.xml
 share/foomatic/db/source/printer/Gestetner-GS3020.xml
 share/foomatic/db/source/printer/Gestetner-GS3025.xml
 share/foomatic/db/source/printer/Gestetner-GS3030.xml
@@ -7708,6 +7902,7 @@ share/foomatic/db/source/printer/Gestetner-GWD2006.xml
 share/foomatic/db/source/printer/Gestetner-GWD3006.xml
 share/foomatic/db/source/printer/Gestetner-GWD5100.xml
 share/foomatic/db/source/printer/Gestetner-GWD7140.xml
+share/foomatic/db/source/printer/Gestetner-IM_2702.xml
 share/foomatic/db/source/printer/Gestetner-IM_350.xml
 share/foomatic/db/source/printer/Gestetner-IM_430.xml
 share/foomatic/db/source/printer/Gestetner-IM_C2000.xml
@@ -8684,6 +8879,11 @@ share/foomatic/db/source/printer/Infotec-Pro_8210.xml
 share/foomatic/db/source/printer/Infotec-Pro_8210S.xml
 share/foomatic/db/source/printer/Infotec-Pro_8220.xml
 share/foomatic/db/source/printer/Infotec-Pro_8220S.xml
+share/foomatic/db/source/printer/Infotec-Pro_8300S.xml
+share/foomatic/db/source/printer/Infotec-Pro_8310.xml
+share/foomatic/db/source/printer/Infotec-Pro_8310S.xml
+share/foomatic/db/source/printer/Infotec-Pro_8320.xml
+share/foomatic/db/source/printer/Infotec-Pro_8320S.xml
 share/foomatic/db/source/printer/Infotec-Pro_906EX.xml
 share/foomatic/db/source/printer/Infotec-Pro_907EX.xml
 share/foomatic/db/source/printer/Infotec-Pro_C5100S.xml
@@ -8925,6 +9125,9 @@ share/foomatic/db/source/printer/Lanier-5635.xml
 share/foomatic/db/source/printer/Lanier-5645.xml
 share/foomatic/db/source/printer/Lanier-IM_350.xml
 share/foomatic/db/source/printer/Lanier-IM_430.xml
+share/foomatic/db/source/printer/Lanier-IM_550.xml
+share/foomatic/db/source/printer/Lanier-IM_600.xml
+share/foomatic/db/source/printer/Lanier-IM_600SR.xml
 share/foomatic/db/source/printer/Lanier-IM_C2000.xml
 share/foomatic/db/source/printer/Lanier-IM_C2500.xml
 share/foomatic/db/source/printer/Lanier-IM_C3000.xml
@@ -9151,6 +9354,11 @@ share/foomatic/db/source/printer/Lanier-MP_CW2201.xml
 share/foomatic/db/source/printer/Lanier-MP_W6700.xml
 share/foomatic/db/source/printer/Lanier-MP_W7100.xml
 share/foomatic/db/source/printer/Lanier-MP_W8140.xml
+share/foomatic/db/source/printer/Lanier-P_501.xml
+share/foomatic/db/source/printer/Lanier-P_502.xml
+share/foomatic/db/source/printer/Lanier-P_800.xml
+share/foomatic/db/source/printer/Lanier-P_801.xml
+share/foomatic/db/source/printer/Lanier-P_C600.xml
 share/foomatic/db/source/printer/Lanier-Pro_1106EX.xml
 share/foomatic/db/source/printer/Lanier-Pro_1107EX.xml
 share/foomatic/db/source/printer/Lanier-Pro_1356EX.xml
@@ -9165,6 +9373,11 @@ share/foomatic/db/source/printer/Lanier-Pro_8210.xml
 share/foomatic/db/source/printer/Lanier-Pro_8210S.xml
 share/foomatic/db/source/printer/Lanier-Pro_8220.xml
 share/foomatic/db/source/printer/Lanier-Pro_8220S.xml
+share/foomatic/db/source/printer/Lanier-Pro_8300S.xml
+share/foomatic/db/source/printer/Lanier-Pro_8310.xml
+share/foomatic/db/source/printer/Lanier-Pro_8310S.xml
+share/foomatic/db/source/printer/Lanier-Pro_8320.xml
+share/foomatic/db/source/printer/Lanier-Pro_8320S.xml
 share/foomatic/db/source/printer/Lanier-Pro_906EX.xml
 share/foomatic/db/source/printer/Lanier-Pro_907EX.xml
 share/foomatic/db/source/printer/Lanier-Pro_C5100S.xml
@@ -9210,6 +9423,14 @@ share/foomatic/db/source/printer/Lanier-SP_6430DN.xml
 share/foomatic/db/source/printer/Lanier-SP_8300DN.xml
 share/foomatic/db/source/printer/Lanier-SP_8400DN.xml
 share/foomatic/db/source/printer/Lanier-SP_9100_LP275.xml
+share/foomatic/db/source/printer/Lanier-SP_C221N.xml
+share/foomatic/db/source/printer/Lanier-SP_C222DN.xml
+share/foomatic/db/source/printer/Lanier-SP_C222SF.xml
+share/foomatic/db/source/printer/Lanier-SP_C231N.xml
+share/foomatic/db/source/printer/Lanier-SP_C232DN.xml
+share/foomatic/db/source/printer/Lanier-SP_C232SF.xml
+share/foomatic/db/source/printer/Lanier-SP_C311N.xml
+share/foomatic/db/source/printer/Lanier-SP_C312DN.xml
 share/foomatic/db/source/printer/Lanier-SP_C320DN.xml
 share/foomatic/db/source/printer/Lanier-SP_C340DN.xml
 share/foomatic/db/source/printer/Lanier-SP_C342DN.xml
@@ -9820,8 +10041,12 @@ share/foomatic/db/source/printer/NRG-DSm725.xml
 share/foomatic/db/source/printer/NRG-DSm730.xml
 share/foomatic/db/source/printer/NRG-DSm735.xml
 share/foomatic/db/source/printer/NRG-DSm745.xml
+share/foomatic/db/source/printer/NRG-IM_2702.xml
 share/foomatic/db/source/printer/NRG-IM_350.xml
 share/foomatic/db/source/printer/NRG-IM_430.xml
+share/foomatic/db/source/printer/NRG-IM_550.xml
+share/foomatic/db/source/printer/NRG-IM_600.xml
+share/foomatic/db/source/printer/NRG-IM_600SR.xml
 share/foomatic/db/source/printer/NRG-IM_C2000.xml
 share/foomatic/db/source/printer/NRG-IM_C2500.xml
 share/foomatic/db/source/printer/NRG-IM_C3000.xml
@@ -9991,6 +10216,8 @@ share/foomatic/db/source/printer/NRG-P7527.xml
 share/foomatic/db/source/printer/NRG-P7527n.xml
 share/foomatic/db/source/printer/NRG-P7535n.xml
 share/foomatic/db/source/printer/NRG-P7575.xml
+share/foomatic/db/source/printer/NRG-P_800.xml
+share/foomatic/db/source/printer/NRG-P_801.xml
 share/foomatic/db/source/printer/NRG-Pro_1106EX.xml
 share/foomatic/db/source/printer/NRG-Pro_1107EX.xml
 share/foomatic/db/source/printer/NRG-Pro_1356EX.xml
@@ -10005,6 +10232,11 @@ share/foomatic/db/source/printer/NRG-Pro_8210.xml
 share/foomatic/db/source/printer/NRG-Pro_8210S.xml
 share/foomatic/db/source/printer/NRG-Pro_8220.xml
 share/foomatic/db/source/printer/NRG-Pro_8220S.xml
+share/foomatic/db/source/printer/NRG-Pro_8300S.xml
+share/foomatic/db/source/printer/NRG-Pro_8310.xml
+share/foomatic/db/source/printer/NRG-Pro_8310S.xml
+share/foomatic/db/source/printer/NRG-Pro_8320.xml
+share/foomatic/db/source/printer/NRG-Pro_8320S.xml
 share/foomatic/db/source/printer/NRG-Pro_906EX.xml
 share/foomatic/db/source/printer/NRG-Pro_907EX.xml
 share/foomatic/db/source/printer/NRG-Pro_C5100S.xml
@@ -10027,6 +10259,10 @@ share/foomatic/db/source/printer/NRG-SP_3400N.xml
 share/foomatic/db/source/printer/NRG-SP_3400SF.xml
 share/foomatic/db/source/printer/NRG-SP_3410DN.xml
 share/foomatic/db/source/printer/NRG-SP_3410SF.xml
+share/foomatic/db/source/printer/NRG-SP_3500N.xml
+share/foomatic/db/source/printer/NRG-SP_3500SF.xml
+share/foomatic/db/source/printer/NRG-SP_3510DN.xml
+share/foomatic/db/source/printer/NRG-SP_3510SF.xml
 share/foomatic/db/source/printer/NRG-SP_3600DN.xml
 share/foomatic/db/source/printer/NRG-SP_3600SF.xml
 share/foomatic/db/source/printer/NRG-SP_3610SF.xml
@@ -10051,6 +10287,16 @@ share/foomatic/db/source/printer/NRG-SP_8200DN.xml
 share/foomatic/db/source/printer/NRG-SP_8300DN.xml
 share/foomatic/db/source/printer/NRG-SP_8400DN.xml
 share/foomatic/db/source/printer/NRG-SP_9100DN.xml
+share/foomatic/db/source/printer/NRG-SP_C221N.xml
+share/foomatic/db/source/printer/NRG-SP_C222DN.xml
+share/foomatic/db/source/printer/NRG-SP_C222SF.xml
+share/foomatic/db/source/printer/NRG-SP_C231N.xml
+share/foomatic/db/source/printer/NRG-SP_C232DN.xml
+share/foomatic/db/source/printer/NRG-SP_C232SF.xml
+share/foomatic/db/source/printer/NRG-SP_C242DN.xml
+share/foomatic/db/source/printer/NRG-SP_C242SF.xml
+share/foomatic/db/source/printer/NRG-SP_C311N.xml
+share/foomatic/db/source/printer/NRG-SP_C312DN.xml
 share/foomatic/db/source/printer/NRG-SP_C320DN.xml
 share/foomatic/db/source/printer/NRG-SP_C340DN.xml
 share/foomatic/db/source/printer/NRG-SP_C342DN.xml
@@ -10461,6 +10707,10 @@ share/foomatic/db/source/printer/Ricoh-Aficio_SP_3400N.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_SP_3400SF.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_SP_3410DN.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_SP_3410SF.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_SP_3500N.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_SP_3500SF.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_SP_3510DN.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_SP_3510SF.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_SP_4100N.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_SP_4100NL.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_SP_4110N.xml
@@ -10476,7 +10726,16 @@ share/foomatic/db/source/printer/Ricoh-Aficio_SP_8100DN.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_SP_8200DN.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_SP_8300DN.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_SP_9100DN.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_SP_C221N.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_SP_C222DN.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_SP_C222SF.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_SP_C231N.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_SP_C232DN.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_SP_C232SF.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_SP_C242DN.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_SP_C242SF.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_SP_C311N.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_SP_C312DN.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_SP_C320DN.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_SP_C400DN.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_SP_C410DN.xml
@@ -10501,15 +10760,34 @@ share/foomatic/db/source/printer/Ricoh-GX_3050SFN.xml
 share/foomatic/db/source/printer/Ricoh-GX_5050N.xml
 share/foomatic/db/source/printer/Ricoh-GX_E3350N.xml
 share/foomatic/db/source/printer/Ricoh-GX_E5550N.xml
+share/foomatic/db/source/printer/Ricoh-IM_2702.xml
 share/foomatic/db/source/printer/Ricoh-IM_350.xml
 share/foomatic/db/source/printer/Ricoh-IM_430.xml
+share/foomatic/db/source/printer/Ricoh-IM_430F.xml
+share/foomatic/db/source/printer/Ricoh-IM_550.xml
+share/foomatic/db/source/printer/Ricoh-IM_600.xml
+share/foomatic/db/source/printer/Ricoh-IM_600SR.xml
 share/foomatic/db/source/printer/Ricoh-IM_C2000.xml
+share/foomatic/db/source/printer/Ricoh-IM_C2000_JPN.xml
 share/foomatic/db/source/printer/Ricoh-IM_C2500.xml
+share/foomatic/db/source/printer/Ricoh-IM_C2500_JPN.xml
 share/foomatic/db/source/printer/Ricoh-IM_C3000.xml
+share/foomatic/db/source/printer/Ricoh-IM_C3000_JPN.xml
 share/foomatic/db/source/printer/Ricoh-IM_C3500.xml
+share/foomatic/db/source/printer/Ricoh-IM_C3500_JPN.xml
 share/foomatic/db/source/printer/Ricoh-IM_C4500.xml
+share/foomatic/db/source/printer/Ricoh-IM_C4500A_JPN.xml
+share/foomatic/db/source/printer/Ricoh-IM_C4500_JPN.xml
 share/foomatic/db/source/printer/Ricoh-IM_C5500.xml
+share/foomatic/db/source/printer/Ricoh-IM_C5500A_JPN.xml
+share/foomatic/db/source/printer/Ricoh-IM_C5500_JPN.xml
 share/foomatic/db/source/printer/Ricoh-IM_C6000.xml
+share/foomatic/db/source/printer/Ricoh-IM_C6000_JPN.xml
+share/foomatic/db/source/printer/Ricoh-IPSiO_SP_3400L.xml
+share/foomatic/db/source/printer/Ricoh-IPSiO_SP_3410.xml
+share/foomatic/db/source/printer/Ricoh-IPSiO_SP_3410SF.xml
+share/foomatic/db/source/printer/Ricoh-IPSiO_SP_3510.xml
+share/foomatic/db/source/printer/Ricoh-IPSiO_SP_3510SF.xml
 share/foomatic/db/source/printer/Ricoh-IPSiO_SP_4210.xml
 share/foomatic/db/source/printer/Ricoh-IPSiO_SP_4300.xml
 share/foomatic/db/source/printer/Ricoh-IPSiO_SP_4310.xml
@@ -10551,6 +10829,7 @@ share/foomatic/db/source/printer/Ricoh-IPSiO_SP_C830.xml
 share/foomatic/db/source/printer/Ricoh-IPSiO_SP_C830M.xml
 share/foomatic/db/source/printer/Ricoh-IPSiO_SP_C831.xml
 share/foomatic/db/source/printer/Ricoh-IPSiO_SP_C831M.xml
+share/foomatic/db/source/printer/Ricoh-IP_500SF.xml
 share/foomatic/db/source/printer/Ricoh-LASER_AP2600.xml
 share/foomatic/db/source/printer/Ricoh-LASER_AP2600N.xml
 share/foomatic/db/source/printer/Ricoh-LASER_AP2610.xml
@@ -10673,6 +10952,19 @@ share/foomatic/db/source/printer/Ricoh-MP_CW2201.xml
 share/foomatic/db/source/printer/Ricoh-MP_W6700.xml
 share/foomatic/db/source/printer/Ricoh-MP_W7100.xml
 share/foomatic/db/source/printer/Ricoh-MP_W8140.xml
+share/foomatic/db/source/printer/Ricoh-M_C250FW.xml
+share/foomatic/db/source/printer/Ricoh-M_C250FWB.xml
+share/foomatic/db/source/printer/Ricoh-P_500_JPN.xml
+share/foomatic/db/source/printer/Ricoh-P_501.xml
+share/foomatic/db/source/printer/Ricoh-P_501_JPN.xml
+share/foomatic/db/source/printer/Ricoh-P_502.xml
+share/foomatic/db/source/printer/Ricoh-P_800.xml
+share/foomatic/db/source/printer/Ricoh-P_801.xml
+share/foomatic/db/source/printer/Ricoh-P_C300W.xml
+share/foomatic/db/source/printer/Ricoh-P_C301.xml
+share/foomatic/db/source/printer/Ricoh-P_C301SF.xml
+share/foomatic/db/source/printer/Ricoh-P_C301W.xml
+share/foomatic/db/source/printer/Ricoh-P_C600.xml
 share/foomatic/db/source/printer/Ricoh-Pro_1106EX.xml
 share/foomatic/db/source/printer/Ricoh-Pro_1107EX.xml
 share/foomatic/db/source/printer/Ricoh-Pro_1107EXP.xml
@@ -10705,6 +10997,11 @@ share/foomatic/db/source/printer/Ricoh-Pro_8220HT_JPN.xml
 share/foomatic/db/source/printer/Ricoh-Pro_8220S.xml
 share/foomatic/db/source/printer/Ricoh-Pro_8220S_JPN.xml
 share/foomatic/db/source/printer/Ricoh-Pro_8220Y_JPN.xml
+share/foomatic/db/source/printer/Ricoh-Pro_8300S.xml
+share/foomatic/db/source/printer/Ricoh-Pro_8310.xml
+share/foomatic/db/source/printer/Ricoh-Pro_8310S.xml
+share/foomatic/db/source/printer/Ricoh-Pro_8320.xml
+share/foomatic/db/source/printer/Ricoh-Pro_8320S.xml
 share/foomatic/db/source/printer/Ricoh-Pro_906EX.xml
 share/foomatic/db/source/printer/Ricoh-Pro_907EX.xml
 share/foomatic/db/source/printer/Ricoh-Pro_907EXP.xml
@@ -10733,6 +11030,18 @@ share/foomatic/db/source/printer/Ricoh-RPDL_II_Laser_Printer.xml
 share/foomatic/db/source/printer/Ricoh-RPDL_IV_Laser_Printer.xml
 share/foomatic/db/source/printer/Ricoh-RPDL_I_Laser_Printer.xml
 share/foomatic/db/source/printer/Ricoh-SG3120BSFNw.xml
+share/foomatic/db/source/printer/Ricoh-SP_212Nw.xml
+share/foomatic/db/source/printer/Ricoh-SP_212SFNw.xml
+share/foomatic/db/source/printer/Ricoh-SP_212SFw.xml
+share/foomatic/db/source/printer/Ricoh-SP_212SNw.xml
+share/foomatic/db/source/printer/Ricoh-SP_212SUw.xml
+share/foomatic/db/source/printer/Ricoh-SP_212w.xml
+share/foomatic/db/source/printer/Ricoh-SP_213Nw.xml
+share/foomatic/db/source/printer/Ricoh-SP_213SFNw.xml
+share/foomatic/db/source/printer/Ricoh-SP_213SFw.xml
+share/foomatic/db/source/printer/Ricoh-SP_213SNw.xml
+share/foomatic/db/source/printer/Ricoh-SP_213SUw.xml
+share/foomatic/db/source/printer/Ricoh-SP_213w.xml
 share/foomatic/db/source/printer/Ricoh-SP_2200L.xml
 share/foomatic/db/source/printer/Ricoh-SP_2200SFL.xml
 share/foomatic/db/source/printer/Ricoh-SP_2300L.xml
@@ -10780,6 +11089,10 @@ share/foomatic/db/source/printer/Ricoh-SP_8400M_JPN.xml
 share/foomatic/db/source/printer/Ricoh-SP_8400M_a1_JPN.xml
 share/foomatic/db/source/printer/Ricoh-SP_8400_JPN.xml
 share/foomatic/db/source/printer/Ricoh-SP_8400a1_JPN.xml
+share/foomatic/db/source/printer/Ricoh-SP_C250DN.xml
+share/foomatic/db/source/printer/Ricoh-SP_C250SF.xml
+share/foomatic/db/source/printer/Ricoh-SP_C252DN.xml
+share/foomatic/db/source/printer/Ricoh-SP_C252SF.xml
 share/foomatic/db/source/printer/Ricoh-SP_C261DNw.xml
 share/foomatic/db/source/printer/Ricoh-SP_C261SFNw.xml
 share/foomatic/db/source/printer/Ricoh-SP_C262DNw.xml
@@ -10873,6 +11186,8 @@ share/foomatic/db/source/printer/Ricoh-imagio_MP_C6000.xml
 share/foomatic/db/source/printer/Ricoh-imagio_MP_C6001.xml
 share/foomatic/db/source/printer/Ricoh-imagio_MP_C7500.xml
 share/foomatic/db/source/printer/Ricoh-imagio_MP_C7501.xml
+share/foomatic/db/source/printer/Ricoh-imagio_Neo_452.xml
+share/foomatic/db/source/printer/Ricoh-imagio_Neo_453.xml
 share/foomatic/db/source/printer/Samsung-C140x.xml
 share/foomatic/db/source/printer/Samsung-C145x.xml
 share/foomatic/db/source/printer/Samsung-C1810.xml
@@ -11192,6 +11507,9 @@ share/foomatic/db/source/printer/Savin-C_240SR.xml
 share/foomatic/db/source/printer/Savin-FAX3799_3799nf.xml
 share/foomatic/db/source/printer/Savin-IM_350.xml
 share/foomatic/db/source/printer/Savin-IM_430.xml
+share/foomatic/db/source/printer/Savin-IM_550.xml
+share/foomatic/db/source/printer/Savin-IM_600.xml
+share/foomatic/db/source/printer/Savin-IM_600SR.xml
 share/foomatic/db/source/printer/Savin-IM_C2000.xml
 share/foomatic/db/source/printer/Savin-IM_C2500.xml
 share/foomatic/db/source/printer/Savin-IM_C3000.xml
@@ -11292,6 +11610,11 @@ share/foomatic/db/source/printer/Savin-MP_CW2201.xml
 share/foomatic/db/source/printer/Savin-MP_W6700.xml
 share/foomatic/db/source/printer/Savin-MP_W7100.xml
 share/foomatic/db/source/printer/Savin-MP_W8140.xml
+share/foomatic/db/source/printer/Savin-P_501.xml
+share/foomatic/db/source/printer/Savin-P_502.xml
+share/foomatic/db/source/printer/Savin-P_800.xml
+share/foomatic/db/source/printer/Savin-P_801.xml
+share/foomatic/db/source/printer/Savin-P_C600.xml
 share/foomatic/db/source/printer/Savin-Pro_1106EX.xml
 share/foomatic/db/source/printer/Savin-Pro_1107EX.xml
 share/foomatic/db/source/printer/Savin-Pro_1356EX.xml
@@ -11306,6 +11629,11 @@ share/foomatic/db/source/printer/Savin-Pro_8210.xml
 share/foomatic/db/source/printer/Savin-Pro_8210S.xml
 share/foomatic/db/source/printer/Savin-Pro_8220.xml
 share/foomatic/db/source/printer/Savin-Pro_8220S.xml
+share/foomatic/db/source/printer/Savin-Pro_8300S.xml
+share/foomatic/db/source/printer/Savin-Pro_8310.xml
+share/foomatic/db/source/printer/Savin-Pro_8310S.xml
+share/foomatic/db/source/printer/Savin-Pro_8320.xml
+share/foomatic/db/source/printer/Savin-Pro_8320S.xml
 share/foomatic/db/source/printer/Savin-Pro_906EX.xml
 share/foomatic/db/source/printer/Savin-Pro_907EX.xml
 share/foomatic/db/source/printer/Savin-Pro_C5100S.xml
diff --git a/print/lilypond-devel/files/patch-configure b/print/lilypond-devel/files/patch-configure
index ec85d6c7d6d5..48afff01b139 100644
--- a/print/lilypond-devel/files/patch-configure
+++ b/print/lilypond-devel/files/patch-configure
@@ -1,6 +1,22 @@
---- configure.orig	2017-10-15 16:42:11 UTC
+--- configure.orig	2019-03-20 13:52:23 UTC
 +++ configure
-@@ -11527,75 +11527,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
+@@ -10512,13 +10512,8 @@ $as_echo_n "checking $r version... " >&6; }
+     ## for compatibility reasons.
+ 
+     ## grab the first version number in  --version output.
+-    eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 |
+-		grep -E '(^| )[0-9][0-9]*\.[0-9]' |
+-		head -n 1 |
+-		tr ' ' '\n' |
+-		sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' |
+-		grep -E '(^| )[0-9][0-9]*\.[0-9]' |
+-		head -n 1\`\"
++    eval _ver=\"\`("$exe" --version || "$exe" -V) 2>/dev/null |
++		awk '$1 ~ "fontforge" { print $2 }'\`\"
+ 
+     if test -z "$_ver"; then
+         ## If empty, try date [fontforge]
+@@ -11595,75 +11590,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
  
      if test $? -eq 0 -a -n "0.9.0"; then
  
@@ -26,7 +42,8 @@
 -    ##     gcc (GCC) 3.1.1 20020606 (Debian prerelease)
 -    ##
 -    ## -V: Workaround for python
--
++    $PKG_CONFIG --atleast-pkgconfig-version 0.9.0
+ 
 -    #dnl
 -
 -    ## Assume and hunt for dotted version multiplet.
@@ -73,8 +90,6 @@
 -$as_echo "$ver" >&6; }
 -    if test "$num" -lt "$req"; then
 -
-+    $PKG_CONFIG --atleast-pkgconfig-version 0.9.0
-+    
 +    if test ! $?; then
 +    ver=`$PKG_CONFIG --version`
      eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"
diff --git a/print/lilypond/files/patch-configure b/print/lilypond/files/patch-configure
index 20e7cde5eca3..65b1b290f364 100644
--- a/print/lilypond/files/patch-configure
+++ b/print/lilypond/files/patch-configure
@@ -1,6 +1,22 @@
 --- configure.orig	2014-03-17 15:29:16 UTC
 +++ configure
-@@ -10881,73 +10881,7 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
+@@ -9800,13 +9800,8 @@ $as_echo_n "checking $r version... " >&6; }
+     ## for compatibility reasons.
+ 
+     ## grab the first version number in  --version output.
+-    eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 |
+-		grep -E '(^| )[0-9][0-9]*\.[0-9]' |
+-		head -n 1 |
+-		tr ' ' '\n' |
+-		sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' |
+-		grep -E '(^| )[0-9][0-9]*\.[0-9]' |
+-		head -n 1\`\"
++    eval _ver=\"\`("$exe" --version || "$exe" -V) 2>/dev/null |
++		awk '$1 ~ "fontforge" { print $2 }'\`\"
+ 
+     if test -z "$_ver"; then
+         ## If empty, try date [fontforge]
+@@ -10881,73 +10876,7 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
  
      if test $? -eq 0 -a -n "0.9.0"; then
  
diff --git a/print/photoprint/Makefile b/print/photoprint/Makefile
index 27f23c73efe7..f57f0857474c 100644
--- a/print/photoprint/Makefile
+++ b/print/photoprint/Makefile
@@ -11,6 +11,8 @@ COMMENT=	Utility to print multiple images per sheet
 
 LICENSE=	GPLv2
 
+BROKEN=		fails to build
+
 LIB_DEPENDS=	libcups.so:print/cups \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
index c2ba88087619..d1eeb3b42dc9 100644
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	texinfo
 PORTVERSION=	6.6
-PORTREVISION=	2
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	print
 MASTER_SITES=	GNU \
@@ -44,8 +44,8 @@ USE_TEX=	yes
 INFO=		info-stnd texinfo
 
 HTMLXREF_CNF_RELDATE=	20190611
-TEXI2DVI_RELDATE=	20190331
-TEXINFO_TEX_RELDATE=	20190601
+TEXI2DVI_RELDATE=	20190818
+TEXINFO_TEX_RELDATE=	20190818
 
 CPE_VENDOR=	gnu
 CPE_VERSION=	${PORTVERSION:R}
@@ -59,6 +59,7 @@ post-patch:
 	@${INSTALL_SCRIPT} ${DISTDIR}/${DIST_SUBDIR}/texi2dvi-${TEXI2DVI_RELDATE} ${WRKSRC}/util/texi2dvi
 	@${REINPLACE_CMD} -e '/rm -f $$(DESTDIR)/ s|$$| $$(DESTDIR)$$(xsdir)/XSParagraph.*|' ${WRKSRC}/tp/Texinfo/XS/Makefile.in
 	@${REINPLACE_CMD} -e 's|free (.*)|Safe&|' ${WRKSRC}/tp/Texinfo/XS/misc.c
+	@${REINPLACE_CMD} -e 's/tinfo/tinfow/g' ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/util/htmlxref.cnf ${STAGEDIR}${DATADIR}
diff --git a/print/texinfo/distinfo b/print/texinfo/distinfo
index 09442e5c77f8..447015515121 100644
--- a/print/texinfo/distinfo
+++ b/print/texinfo/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1565193697
+TIMESTAMP = 1568376454
 SHA256 (texinfo/texinfo-6.6.tar.xz) = 9bb9ca00da53f26a7e5725eee49689cd4a1e18d25d5b061ac8b2053018d93d66
 SIZE (texinfo/texinfo-6.6.tar.xz) = 4946900
 SHA256 (texinfo/htmlxref.cnf-20190611) = 2f08396322badedca94e4042ebbc2ab5b90cf144eacd5c1dc0c6549e49b0a717
 SIZE (texinfo/htmlxref.cnf-20190611) = 20112
-SHA256 (texinfo/texi2dvi-20190331) = 71c787b08eec1a71b12ffc0c8c3ab48f5d0ace657e5b1ca102182f4154748e60
-SIZE (texinfo/texi2dvi-20190331) = 60439
-SHA256 (texinfo/texinfo.tex-20190601) = 20ec24cc6e7cf4cee044154e1b26f3f548088d09e8ce0170cfbe8c15cc935030
-SIZE (texinfo/texinfo.tex-20190601) = 376684
+SHA256 (texinfo/texi2dvi-20190818) = 4dbe65a30713365bb54a5d3f7f876015b88954e35fc83099d2265406e38369a0
+SIZE (texinfo/texi2dvi-20190818) = 59831
+SHA256 (texinfo/texinfo.tex-20190818) = f93fefa64b77fb9ba0964a7dad06097cab738e6b3c1ca80c2ab6efadec12a677
+SIZE (texinfo/texinfo.tex-20190818) = 376682
diff --git a/russian/stardict-bars/Makefile b/russian/stardict-bars/Makefile
index 70688badb6d7..9d9af8904736 100644
--- a/russian/stardict-bars/Makefile
+++ b/russian/stardict-bars/Makefile
@@ -3,14 +3,12 @@
 PORTNAME=	stardict-bars
 PORTVERSION=	2.4.2
 CATEGORIES=	russian
-MASTER_SITES=	http://abloz.com/huzheng/stardict-dic/ru/
+MASTER_SITES=	http://download.huzheng.org/ru/
 DISTNAME=	stardict-en-ru-bars-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	New Comprehensive English-Russian dictionary
 
-BROKEN=		unfetchable
-
 USES=		tar:bzip2
 
 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common"
diff --git a/russian/stardict-computer/Makefile b/russian/stardict-computer/Makefile
index 45bfde1eae98..c7f4d28ff1a2 100644
--- a/russian/stardict-computer/Makefile
+++ b/russian/stardict-computer/Makefile
@@ -4,14 +4,12 @@
 PORTNAME=	stardict-computer
 PORTVERSION=	2.4.2
 CATEGORIES=	russian
-MASTER_SITES=	http://abloz.com/huzheng/stardict-dic/ru/
+MASTER_SITES=	http://download.huzheng.org/ru/
 DISTNAME=	${PORTNAME}-ru-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	English-Russian Computer dictionary
 
-BROKEN=		unfetchable
-
 USES=	tar:bzip2
 
 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common"
diff --git a/russian/stardict-dal/Makefile b/russian/stardict-dal/Makefile
index 3b11e7d9a799..390e89aaab8a 100644
--- a/russian/stardict-dal/Makefile
+++ b/russian/stardict-dal/Makefile
@@ -3,14 +3,12 @@
 PORTNAME=	stardict-dal
 PORTVERSION=	2.4.2
 CATEGORIES=	russian
-MASTER_SITES=	http://abloz.com/huzheng/stardict-dic/ru/
+MASTER_SITES=	http://download.huzheng.org/ru/
 DISTNAME=	${PORTNAME}-ru-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dal's Explanatory Dictionary
 
-BROKEN=		unfetchable
-
 USES=		tar:bzip2
 
 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common"
diff --git a/russian/stardict-engcom/Makefile b/russian/stardict-engcom/Makefile
index 376ad76766c3..a6ab308844dd 100644
--- a/russian/stardict-engcom/Makefile
+++ b/russian/stardict-engcom/Makefile
@@ -4,14 +4,12 @@
 PORTNAME=	stardict-engcom
 PORTVERSION=	2.4.2
 CATEGORIES=	russian
-MASTER_SITES=	http://abloz.com/huzheng/stardict-dic/ru/
+MASTER_SITES=	http://download.huzheng.org/ru/
 DISTNAME=	${PORTNAME}-ru-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	English-Russian Dictionary of Computer Terms
 
-BROKEN=		unfetchable
-
 USES=	tar:bzip2
 
 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common"
diff --git a/russian/stardict-mueller7/Makefile b/russian/stardict-mueller7/Makefile
index 7b5bef8068c6..0694bca4d6be 100644
--- a/russian/stardict-mueller7/Makefile
+++ b/russian/stardict-mueller7/Makefile
@@ -3,13 +3,11 @@
 PORTNAME=	stardict-mueller7
 PORTVERSION=	2.4.2
 CATEGORIES=	russian
-MASTER_SITES=	http://abloz.com/huzheng/stardict-dic/ru/
+MASTER_SITES=	http://download.huzheng.org/ru/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mueller English-Russian dictionary
 
-BROKEN=		unfetchable
-
 USES=		tar:bzip2
 
 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common"
diff --git a/russian/stardict-mueller7/files/Makefile.common b/russian/stardict-mueller7/files/Makefile.common
index 7c418c15da79..c14aa635c2ed 100644
--- a/russian/stardict-mueller7/files/Makefile.common
+++ b/russian/stardict-mueller7/files/Makefile.common
@@ -1,5 +1,6 @@
 DIST_SUBDIR=	stardict
 
+NO_ARCH=	yes
 NO_BUILD=	yes
 PKGMESSAGE?=	${.CURDIR}/../../russian/stardict-mueller7/files/pkg-message
 
diff --git a/russian/stardict-mueller7/files/pkg-message b/russian/stardict-mueller7/files/pkg-message
index dd306adbb801..8c00e413b93a 100644
--- a/russian/stardict-mueller7/files/pkg-message
+++ b/russian/stardict-mueller7/files/pkg-message
@@ -4,8 +4,8 @@
 This dictionary can be used with any of the following dictionary
 programs (consider to install one of them):
 
-textproc/goldendict	Goldendict (Qt4)
-textproc/qstardict	StarDict clone (Qt4)
+textproc/goldendict	Goldendict (Qt5)
+textproc/qstardict	StarDict clone (Qt5)
 textproc/stardict3	StarDict 3.x (GTK2)
 EOM
 }
diff --git a/russian/stardict-mueller7accent/Makefile b/russian/stardict-mueller7accent/Makefile
index 745ff4d442e3..7ba831cefe69 100644
--- a/russian/stardict-mueller7accent/Makefile
+++ b/russian/stardict-mueller7accent/Makefile
@@ -3,14 +3,12 @@
 PORTNAME=	stardict-mueller7accent
 PORTVERSION=	2.4.2
 CATEGORIES=	russian
-MASTER_SITES=	http://abloz.com/huzheng/stardict-dic/ru/
+MASTER_SITES=	http://download.huzheng.org/ru/
 DISTNAME=	stardict-Mueller7accentGPL-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mueller English-Russian dictionary with accents
 
-BROKEN=		unfetchable
-
 USES=		tar:bzip2
 
 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common"
diff --git a/russian/stardict-pc/Makefile b/russian/stardict-pc/Makefile
index 928391422357..21af3ecfad07 100644
--- a/russian/stardict-pc/Makefile
+++ b/russian/stardict-pc/Makefile
@@ -4,14 +4,12 @@
 PORTNAME=	stardict-pc
 PORTVERSION=	2.4.2
 CATEGORIES=	russian
-MASTER_SITES=	http://abloz.com/huzheng/stardict-dic/ru/
+MASTER_SITES=	http://download.huzheng.org/ru/
 DISTNAME=	${PORTNAME}-user-ru-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	English-Russian PC-user dictionary
 
-BROKEN=		unfetchable
-
 USES=	tar:bzip2
 
 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common"
diff --git a/science/netcdf-cxx/Makefile b/science/netcdf-cxx/Makefile
index 47c2ab67b880..09b79982ef6f 100644
--- a/science/netcdf-cxx/Makefile
+++ b/science/netcdf-cxx/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	netcdf-cxx
-PORTVERSION=	4.3.0
-PORTREVISION=	2
+PORTVERSION=	4.3.1
 CATEGORIES=	science
 MASTER_SITES=	https://www.unidata.ucar.edu/downloads/netcdf/ftp/ \
 		ftp://ftp.unidata.ucar.edu/pub/netcdf/ \
diff --git a/science/netcdf-cxx/distinfo b/science/netcdf-cxx/distinfo
index b4c9a6f5dac3..cf3d176cfab1 100644
--- a/science/netcdf-cxx/distinfo
+++ b/science/netcdf-cxx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547382903
-SHA256 (netcdf-cxx4-4.3.0.tar.gz) = e34fbc6aba243ec82c23e9ee99db2430555ada849c54c1f3ab081b0ddd0f5f30
-SIZE (netcdf-cxx4-4.3.0.tar.gz) = 500650
+TIMESTAMP = 1568290894
+SHA256 (netcdf-cxx4-4.3.1.tar.gz) = 6a1189a181eed043b5859e15d5c080c30d0e107406fbb212c8fb9814e90f3445
+SIZE (netcdf-cxx4-4.3.1.tar.gz) = 598335
diff --git a/science/netcdf-cxx/pkg-plist b/science/netcdf-cxx/pkg-plist
index f03bb02f6030..4c83ee652a77 100644
--- a/science/netcdf-cxx/pkg-plist
+++ b/science/netcdf-cxx/pkg-plist
@@ -26,8 +26,9 @@ include/ncVar.h
 include/ncVarAtt.h
 include/ncVlenType.h
 include/netcdf
+lib/libh5bzip2.so
 lib/libnetcdf_c++4.a
 lib/libnetcdf_c++4.so
 lib/libnetcdf_c++4.so.1
-lib/libnetcdf_c++4.so.1.0.3
+lib/libnetcdf_c++4.so.1.1.0
 libdata/pkgconfig/netcdf-cxx4.pc
diff --git a/science/py-h5py/Makefile b/science/py-h5py/Makefile
index 78485dfe5654..2268df7e20c8 100644
--- a/science/py-h5py/Makefile
+++ b/science/py-h5py/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	h5py
-PORTVERSION=	2.9.0
-PORTREVISION=	2
+PORTVERSION=	2.10.0
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,7 +19,7 @@ LIB_DEPENDS=	libhdf5.so:science/hdf5
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
 
-USES=		python
+USES=		pkgconfig python
 USE_PYTHON=	autoplist concurrent cython distutils
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
diff --git a/science/py-h5py/distinfo b/science/py-h5py/distinfo
index 9b69845488c3..c9cab68008b0 100644
--- a/science/py-h5py/distinfo
+++ b/science/py-h5py/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546268499
-SHA256 (h5py-2.9.0.tar.gz) = 9d41ca62daf36d6b6515ab8765e4c8c4388ee18e2a665701fef2b41563821002
-SIZE (h5py-2.9.0.tar.gz) = 287853
+TIMESTAMP = 1567842470
+SHA256 (h5py-2.10.0.tar.gz) = 84412798925dc870ffd7107f045d7659e60f5d46d1c70c700375248bf6bf512d
+SIZE (h5py-2.10.0.tar.gz) = 301057
diff --git a/science/py-h5py/pkg-plist b/science/py-h5py/pkg-plist
index 18387219faf6..f2c0c725145d 100644
--- a/science/py-h5py/pkg-plist
+++ b/science/py-h5py/pkg-plist
@@ -1,5 +1,5 @@
-%%PORTDOCS%%%%DOCSDIR%%/README.rst
 %%PORTDOCS%%%%DOCSDIR%%/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/README.rst
 %%PORTDOCS%%%%DOCSDIR%%/build.rst
 %%PORTDOCS%%%%DOCSDIR%%/conf.py
 %%PORTDOCS%%%%DOCSDIR%%/config.rst
@@ -21,6 +21,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/vds.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.0.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.1.rst
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.10.0.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.2.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.3.rst
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.4.rst
diff --git a/science/py-tensorflow/Makefile b/science/py-tensorflow/Makefile
index b1701240fe4c..816af76c22e0 100644
--- a/science/py-tensorflow/Makefile
+++ b/science/py-tensorflow/Makefile
@@ -14,6 +14,7 @@ COMMENT=	Computation using data flow graphs for scalable machine learning
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN=		fails to build
 ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
diff --git a/science/sparta/Makefile b/science/sparta/Makefile
index b2a224d198e6..eaa663ded792 100644
--- a/science/sparta/Makefile
+++ b/science/sparta/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	bash:shells/bash
 
 USES=		compiler:c++11-lang gmake localbase
 USE_GITHUB=	yes
-GH_TAGNAME=	16Apr2019
+GH_TAGNAME=	9Sep2019
 
 CXXFLAGS+=	-DSPARTA_UNORDERED_MAP
 
diff --git a/science/sparta/distinfo b/science/sparta/distinfo
index 83ec5fd84116..f6fcf8bdffa0 100644
--- a/science/sparta/distinfo
+++ b/science/sparta/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556122440
-SHA256 (sparta-sparta-2019.04.16-16Apr2019_GH0.tar.gz) = 017e60f05ff2ff9dafaf43cb2b39618c1fbacbaf0455304011545b8661c09ecc
-SIZE (sparta-sparta-2019.04.16-16Apr2019_GH0.tar.gz) = 20432095
+TIMESTAMP = 1568085320
+SHA256 (sparta-sparta-2019.09.9-9Sep2019_GH0.tar.gz) = 0868a401e5fa535e3b6a067adb7263c7fcccc3768267d12c8a3ced71f32419ac
+SIZE (sparta-sparta-2019.09.9-9Sep2019_GH0.tar.gz) = 20453805
diff --git a/science/xmakemol/Makefile b/science/xmakemol/Makefile
index e498bedf99fc..a1924734015e 100644
--- a/science/xmakemol/Makefile
+++ b/science/xmakemol/Makefile
@@ -10,6 +10,9 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Molecule Viewer Program Based on Motif Widget
 
+DEPRECATED=    Depends on expiring graphics/libGLw
+EXPIRATION_DATE=       2019-11-01
+
 USES=		gmake motif shebangfix
 USE_XORG=	xpm
 USE_GL=		glut glw
diff --git a/security/Makefile b/security/Makefile
index f5c336429100..fe4eb0835527 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -898,6 +898,7 @@
     SUBDIR += py-docker-pycreds
     SUBDIR += py-ecdsa
     SUBDIR += py-ed25519ll
+    SUBDIR += py-exscript
     SUBDIR += py-fail2ban
     SUBDIR += py-fchksum
     SUBDIR += py-fido2
@@ -1278,6 +1279,7 @@
     SUBDIR += tlswrap
     SUBDIR += tor
     SUBDIR += tor-devel
+    SUBDIR += totp-cli
     SUBDIR += tpm-tools
     SUBDIR += trezord
     SUBDIR += trinokiller
@@ -1305,6 +1307,7 @@
     SUBDIR += vxquery
     SUBDIR += w3af
     SUBDIR += wapiti
+    SUBDIR += wazuh-agent
     SUBDIR += webfwlog
     SUBDIR += webscarab
     SUBDIR += whatweb
diff --git a/security/bastillion/Makefile b/security/bastillion/Makefile
index 17265c55aff5..a879029c0706 100644
--- a/security/bastillion/Makefile
+++ b/security/bastillion/Makefile
@@ -2,8 +2,10 @@
 
 PORTNAME=		bastillion
 DISTVERSIONPREFIX=	jetty-v
-DISTVERSION=		3.06_04
-PORTREVISION=		1
+DISTVERSION=		3.08_00
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
+			${PORTNAME}-upgrade-${PORTVERSION}.jar
+PORTREVISION=		2
 CATEGORIES=		security www java
 MASTER_SITES=		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${PORTVERSION}/
 
@@ -65,20 +67,21 @@ do-install:
 	${MKDIR} ${STAGEDIR}/var/log/${PORTNAME}
 	${MKDIR} ${STAGEDIR}/var/run/${PORTNAME}
 	cd ${WRKSRC}; ${COPYTREE_BIN} jetty_bastillion ${STAGEDIR}${PREFIX} "! -name *\.orig"
+	${MKDIR} ${STAGEDIR}${PREFIX}/jetty_bastillion/upgrade
 	cd ${WRKSRC}; ${COPYTREE_SHARE} webapps ${STAGEDIR}${PREFIX}/${WWWDIR} "! -name *\.orig"
 	cd ${WRKSRC}; ${COPYTREE_SHARE} etc ${STAGEDIR}${PREFIX}/${WWWDIR} "! -name *\.orig"
 	${RLN} ${STAGEDIR}${PREFIX}/${WWWDIR}/etc ${STAGEDIR}${PREFIX}/jetty_bastillion/etc
 	${INSTALL_DATA} ${WRKSRC}/start.ini ${STAGEDIR}${PREFIX}/${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${PREFIX}/${WWWDIR}
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.sample ${STAGEDIR}${ETCDIR}/
+	${INSTALL_DATA} ${DISTDIR}/bastillion-upgrade-3.08.00.jar ${STAGEDIR}${PREFIX}/jetty_bastillion/upgrade/
 
 gen-plist:
 	${ECHO} '@sample %%ETCDIR%%/%%APP_NAME%%.sample' >${PLIST}.new
 	${ECHO} '@sample(www,www,644) jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties.sample' >> ${PLIST}.new
 	${ECHO} '@dir(www,www,755) /var/log/%%APP_NAME%%' >> ${PLIST}.new
 	${ECHO} '@dir(www,www,755) /var/run/%%APP_NAME%%' >> ${PLIST}.new
-	${FIND} ${WRKSRC}/jetty_bastillion -type f -a ! -name \*.orig | ${SED} -e "s:${WRKSRC}/::g" | ${SORT} >> ${PLIST}.new
-#	${REINPLACE_CMD} 's:jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties$$:@(www,www,644) jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties:g' ${PLIST}.new
+	${FIND} ${STAGEDIR}${PREFIX}/jetty_bastillion -type f -a ! -name \*.orig -a ! -name \*.sample | ${SED} -e "s:${STAGEDIR}${PREFIX}/::g" | ${SORT} >> ${PLIST}.new
 	${ECHO} '@dir(www,www,755) jetty_bastillion/bastillion/WEB-INF/classes' >> ${PLIST}.new
 	${ECHO} '@dir(www,www,755) %%WWWDIR%%' >> ${PLIST}.new
 	${ECHO} '@dir(www,www,755) %%WWWDIR%%/work' >> ${PLIST}.new
@@ -86,8 +89,8 @@ gen-plist:
 	${ECHO} '%%WWWDIR%%/3rdPartyLicenses.md' >> ${PLIST}.new
 	${ECHO} '%%WWWDIR%%/LICENSE.md' >> ${PLIST}.new
 	${ECHO} '%%WWWDIR%%/README.md' >> ${PLIST}.new
-	${FIND} ${WRKSRC}/webapps -type f -a ! -name \*.orig | ${SED} -e "s:${WRKSRC}/webapps:%%WWWDIR%%/webapps:g" | ${SORT} >> ${PLIST}.new
-	${FIND} ${WRKSRC}/etc -type f -a ! -name \*.orig | ${SED} -e "s:${WRKSRC}/etc:%%WWWDIR%%/etc:g" | ${SORT} >> ${PLIST}.new
+	${FIND} ${STAGEDIR}${PREFIX}/${WWWDIR}/webapps -type f -a ! -name \*.orig | ${SED} -e "s:${STAGEDIR}${PREFIX}/${WWWDIR}:%%WWWDIR%%:g" | ${SORT} >> ${PLIST}.new
+	${FIND} ${STAGEDIR}${PREFIX}/${WWWDIR}/etc -type f -a ! -name \*.orig | ${SED} -e "s:${STAGEDIR}${PREFIX}/${WWWDIR}:%%WWWDIR%%:g" | ${SORT} >> ${PLIST}.new
 	${ECHO} 'jetty_bastillion/etc' >> ${PLIST}.new
 
 .include <bsd.port.mk>
diff --git a/security/bastillion/distinfo b/security/bastillion/distinfo
index 5e5db076ee59..e5a32a814488 100644
--- a/security/bastillion/distinfo
+++ b/security/bastillion/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1565683648
-SHA256 (bastillion-jetty-v3.06_04.tar.gz) = c96a7ea59e300734161723cf96e196dcd277963ff3100fc034142aa2e9425048
-SIZE (bastillion-jetty-v3.06_04.tar.gz) = 18855741
+TIMESTAMP = 1568209294
+SHA256 (bastillion-jetty-v3.08_00.tar.gz) = 8b9d9ffad706b0f2c9b5c04de07500de39e8920aed243fd9f22ca2505feb4ae7
+SIZE (bastillion-jetty-v3.08_00.tar.gz) = 19016030
+SHA256 (bastillion-upgrade-3.08.00.jar) = 8d18adc90d258b9a9de5e5865c9f632c563d0557ad9458b9f1082ede15ed074b
+SIZE (bastillion-upgrade-3.08.00.jar) = 3557485
diff --git a/security/bastillion/files/pkg-message.in b/security/bastillion/files/pkg-message.in
index 32c71f8c3c9c..6a26a0f95ae1 100644
--- a/security/bastillion/files/pkg-message.in
+++ b/security/bastillion/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{
+  message: <<EOT
 Bastille is now installed in %%PREFIX%%/%%WWWDIR%% and %%PREFIX%%/jetty_bastillion.
 
 Before the first start (but not if you update), you have to set a DB password in
@@ -11,4 +14,15 @@ You may want to activate it in /etc/rc.conf:
 
 Once Bastille is started, point your web browser to the login page at
     https://<hostname>:8443/.
-
+EOT
+}
+{
+  type: upgrade
+  maximum_version: "3.08.00"
+  message: <<EOT
+The datastore of bastillion needs to be upgraded (if you do not see users / can not login
+as someone else than admin, you forgot to upgrade it):
+    java -jar %%PREFIX%%/jetty_bastillion/upgrade/bastillion-upgrade-3.08.00.jar %%PREFIX%%/jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties
+EOT
+}
+]
diff --git a/security/bastillion/pkg-plist b/security/bastillion/pkg-plist
index d0fa67e21243..1994b1374e12 100644
--- a/security/bastillion/pkg-plist
+++ b/security/bastillion/pkg-plist
@@ -123,7 +123,7 @@ jetty_bastillion/bastillion/_res/inc/errors.html
 jetty_bastillion/bastillion/_res/inc/header.html
 jetty_bastillion/bastillion/_res/inc/navigation.html
 jetty_bastillion/bastillion/_res/js/bootstrap.js
-jetty_bastillion/bastillion/_res/js/jquery-3.3.1.js
+jetty_bastillion/bastillion/_res/js/jquery-3.4.1.js
 jetty_bastillion/bastillion/_res/js/jquery-ui.js
 jetty_bastillion/bastillion/_res/js/jquery.floatThead.js
 jetty_bastillion/bastillion/_res/js/tty/addons/fit/fit.js
@@ -160,74 +160,74 @@ jetty_bastillion/bastillion/manage/view_terms.html
 jetty_bastillion/bastillion/manage/view_users.html
 jetty_bastillion/bin/jetty.sh
 jetty_bastillion/lib/alpn-api-1.1.3.v20160715.jar
-jetty_bastillion/lib/annotations/asm-7.0.jar
-jetty_bastillion/lib/annotations/asm-analysis-7.0.jar
-jetty_bastillion/lib/annotations/asm-commons-7.0.jar
-jetty_bastillion/lib/annotations/asm-tree-7.0.jar
+jetty_bastillion/lib/annotations/asm-7.1.jar
+jetty_bastillion/lib/annotations/asm-analysis-7.1.jar
+jetty_bastillion/lib/annotations/asm-commons-7.1.jar
+jetty_bastillion/lib/annotations/asm-tree-7.1.jar
 jetty_bastillion/lib/annotations/javax.annotation-api-1.3.jar
-jetty_bastillion/lib/apache-jsp/org.eclipse.jdt.ecj-3.14.0.jar
-jetty_bastillion/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.4.15.v20190215.jar
-jetty_bastillion/lib/apache-jsp/org.mortbay.jasper.apache-el-8.5.35.1.jar
-jetty_bastillion/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.5.35.1.jar
+jetty_bastillion/lib/apache-jsp/org.eclipse.jdt.ecj-3.17.0.jar
+jetty_bastillion/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.4.20.v20190813.jar
+jetty_bastillion/lib/apache-jsp/org.mortbay.jasper.apache-el-8.5.40.jar
+jetty_bastillion/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.5.40.jar
 jetty_bastillion/lib/apache-jstl/org.apache.taglibs.taglibs-standard-impl-1.2.5.jar
 jetty_bastillion/lib/apache-jstl/org.apache.taglibs.taglibs-standard-spec-1.2.5.jar
-jetty_bastillion/lib/cdi-2-9.4.15.v20190215.jar
-jetty_bastillion/lib/cdi-core-9.4.15.v20190215.jar
-jetty_bastillion/lib/cdi-servlet-9.4.15.v20190215.jar
 jetty_bastillion/lib/ext/.donotdelete
-jetty_bastillion/lib/fcgi/fcgi-client-9.4.15.v20190215.jar
-jetty_bastillion/lib/fcgi/fcgi-server-9.4.15.v20190215.jar
-jetty_bastillion/lib/http2/http2-common-9.4.15.v20190215.jar
-jetty_bastillion/lib/http2/http2-hpack-9.4.15.v20190215.jar
-jetty_bastillion/lib/http2/http2-server-9.4.15.v20190215.jar
+jetty_bastillion/lib/fcgi/fcgi-client-9.4.20.v20190813.jar
+jetty_bastillion/lib/fcgi/fcgi-server-9.4.20.v20190813.jar
+jetty_bastillion/lib/http2/http2-common-9.4.20.v20190813.jar
+jetty_bastillion/lib/http2/http2-hpack-9.4.20.v20190813.jar
+jetty_bastillion/lib/http2/http2-server-9.4.20.v20190813.jar
+jetty_bastillion/lib/infinispan-common-9.4.20.v20190813.jar
+jetty_bastillion/lib/infinispan-embedded-query-9.4.20.v20190813.jar
+jetty_bastillion/lib/infinispan-remote-query-9.4.20.v20190813.jar
 jetty_bastillion/lib/jaspi/javax.security.auth.message-1.0.0.v201108011116.jar
-jetty_bastillion/lib/jetty-alpn-conscrypt-server-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-alpn-java-server-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-alpn-openjdk8-server-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-alpn-server-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-annotations-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-client-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-continuation-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-deploy-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-gcloud-session-manager-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-hazelcast-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-http-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-infinispan-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-io-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-jaas-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-jaspi-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-jmx-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-jndi-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-memcached-sessions-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-nosql-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-plus-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-proxy-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-quickstart-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-rewrite-9.4.15.v20190215.jar
+jetty_bastillion/lib/jetty-alpn-conscrypt-server-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-alpn-java-server-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-alpn-openjdk8-server-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-alpn-server-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-annotations-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-cdi-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-client-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-continuation-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-deploy-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-gcloud-session-manager-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-hazelcast-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-http-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-io-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-jaas-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-jaspi-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-jmx-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-jndi-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-memcached-sessions-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-nosql-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-plus-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-proxy-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-quickstart-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-rewrite-9.4.20.v20190813.jar
 jetty_bastillion/lib/jetty-schemas-3.1.jar
-jetty_bastillion/lib/jetty-security-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-server-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-servlet-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-servlets-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-unixsocket-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-util-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-webapp-9.4.15.v20190215.jar
-jetty_bastillion/lib/jetty-xml-9.4.15.v20190215.jar
+jetty_bastillion/lib/jetty-security-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-server-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-servlet-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-servlets-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-unixsocket-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-util-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-webapp-9.4.20.v20190813.jar
+jetty_bastillion/lib/jetty-xml-9.4.20.v20190813.jar
 jetty_bastillion/lib/mail/javax.mail.glassfish-1.4.1.v201005082020.jar
 jetty_bastillion/lib/servlet-api-3.1.jar
 jetty_bastillion/lib/setuid/jetty-setuid-java-1.0.3.jar
 jetty_bastillion/lib/setuid/libsetuid-linux.so
 jetty_bastillion/lib/setuid/libsetuid-osx.so
-jetty_bastillion/lib/spring/jetty-spring-9.4.15.v20190215.jar
+jetty_bastillion/lib/spring/jetty-spring-9.4.20.v20190813.jar
 jetty_bastillion/lib/transactions/javax.transaction-api-1.3.jar
-jetty_bastillion/lib/websocket/javax-websocket-client-impl-9.4.15.v20190215.jar
-jetty_bastillion/lib/websocket/javax-websocket-server-impl-9.4.15.v20190215.jar
+jetty_bastillion/lib/websocket/javax-websocket-client-impl-9.4.20.v20190813.jar
+jetty_bastillion/lib/websocket/javax-websocket-server-impl-9.4.20.v20190813.jar
 jetty_bastillion/lib/websocket/javax.websocket-api-1.0.jar
-jetty_bastillion/lib/websocket/websocket-api-9.4.15.v20190215.jar
-jetty_bastillion/lib/websocket/websocket-client-9.4.15.v20190215.jar
-jetty_bastillion/lib/websocket/websocket-common-9.4.15.v20190215.jar
-jetty_bastillion/lib/websocket/websocket-server-9.4.15.v20190215.jar
-jetty_bastillion/lib/websocket/websocket-servlet-9.4.15.v20190215.jar
+jetty_bastillion/lib/websocket/websocket-api-9.4.20.v20190813.jar
+jetty_bastillion/lib/websocket/websocket-client-9.4.20.v20190813.jar
+jetty_bastillion/lib/websocket/websocket-common-9.4.20.v20190813.jar
+jetty_bastillion/lib/websocket/websocket-server-9.4.20.v20190813.jar
+jetty_bastillion/lib/websocket/websocket-servlet-9.4.20.v20190813.jar
 jetty_bastillion/license-eplv10-aslv20.html
 jetty_bastillion/logs/.donotdelete
 jetty_bastillion/modules/.donotdelete
@@ -256,6 +256,10 @@ jetty_bastillion/modules/alpn-impl/alpn-1.8.0_192.mod
 jetty_bastillion/modules/alpn-impl/alpn-1.8.0_20.mod
 jetty_bastillion/modules/alpn-impl/alpn-1.8.0_201.mod
 jetty_bastillion/modules/alpn-impl/alpn-1.8.0_202.mod
+jetty_bastillion/modules/alpn-impl/alpn-1.8.0_211.mod
+jetty_bastillion/modules/alpn-impl/alpn-1.8.0_212.mod
+jetty_bastillion/modules/alpn-impl/alpn-1.8.0_221.mod
+jetty_bastillion/modules/alpn-impl/alpn-1.8.0_222.mod
 jetty_bastillion/modules/alpn-impl/alpn-1.8.0_25.mod
 jetty_bastillion/modules/alpn-impl/alpn-1.8.0_31.mod
 jetty_bastillion/modules/alpn-impl/alpn-1.8.0_40.mod
@@ -275,14 +279,17 @@ jetty_bastillion/modules/alpn-impl/alpn-10.mod
 jetty_bastillion/modules/alpn-impl/alpn-11.mod
 jetty_bastillion/modules/alpn-impl/alpn-12.mod
 jetty_bastillion/modules/alpn-impl/alpn-13.mod
+jetty_bastillion/modules/alpn-impl/alpn-14.mod
 jetty_bastillion/modules/alpn-impl/alpn-8.mod
 jetty_bastillion/modules/alpn-impl/alpn-9.mod
 jetty_bastillion/modules/alpn.mod
 jetty_bastillion/modules/annotations.mod
 jetty_bastillion/modules/apache-jsp.mod
 jetty_bastillion/modules/apache-jstl.mod
+jetty_bastillion/modules/bytebufferpool.mod
+jetty_bastillion/modules/cdi-decorate.mod
+jetty_bastillion/modules/cdi-spi.mod
 jetty_bastillion/modules/cdi.mod
-jetty_bastillion/modules/cdi1.mod
 jetty_bastillion/modules/cdi2.mod
 jetty_bastillion/modules/client.mod
 jetty_bastillion/modules/connectionlimit.mod
@@ -293,6 +300,7 @@ jetty_bastillion/modules/continuation.mod
 jetty_bastillion/modules/customrequestlog.mod
 jetty_bastillion/modules/debug.mod
 jetty_bastillion/modules/debuglog.mod
+jetty_bastillion/modules/decorate.mod
 jetty_bastillion/modules/deploy.mod
 jetty_bastillion/modules/deprecated.properties
 jetty_bastillion/modules/ext.mod
@@ -307,14 +315,18 @@ jetty_bastillion/modules/global-webapp-common.mod
 jetty_bastillion/modules/gzip.mod
 jetty_bastillion/modules/hawtio.mod
 jetty_bastillion/modules/hawtio/hawtio.xml
-jetty_bastillion/modules/hazelcast-embedded-sessions.mod
-jetty_bastillion/modules/hazelcast-remote-sessions.mod
 jetty_bastillion/modules/home-base-warning.mod
 jetty_bastillion/modules/http-forwarded.mod
 jetty_bastillion/modules/http.mod
 jetty_bastillion/modules/http2.mod
 jetty_bastillion/modules/http2c.mod
 jetty_bastillion/modules/https.mod
+jetty_bastillion/modules/inetaccess.mod
+jetty_bastillion/modules/inetaccess/jetty-inetaccess.xml
+jetty_bastillion/modules/infinispan-embedded-query.mod
+jetty_bastillion/modules/infinispan-embedded.mod
+jetty_bastillion/modules/infinispan-remote-query.mod
+jetty_bastillion/modules/infinispan-remote.mod
 jetty_bastillion/modules/ipaccess.mod
 jetty_bastillion/modules/jaas.mod
 jetty_bastillion/modules/jamon.mod
@@ -376,15 +388,21 @@ jetty_bastillion/modules/session-store-file.mod
 jetty_bastillion/modules/session-store-gcloud.mod
 jetty_bastillion/modules/session-store-hazelcast-embedded.mod
 jetty_bastillion/modules/session-store-hazelcast-remote.mod
-jetty_bastillion/modules/session-store-infinispan-embedded-910.mod
 jetty_bastillion/modules/session-store-infinispan-embedded.mod
-jetty_bastillion/modules/session-store-infinispan-embedded/infinispan-embedded.xml
-jetty_bastillion/modules/session-store-infinispan-remote-910.mod
 jetty_bastillion/modules/session-store-infinispan-remote.mod
-jetty_bastillion/modules/session-store-infinispan-remote/resources/hotrod-client.properties
 jetty_bastillion/modules/session-store-jdbc.mod
 jetty_bastillion/modules/session-store-mongo.mod
 jetty_bastillion/modules/sessions.mod
+jetty_bastillion/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod
+jetty_bastillion/modules/sessions/infinispan/embedded/infinispan-embedded-query-libs.mod
+jetty_bastillion/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod
+jetty_bastillion/modules/sessions/infinispan/embedded/infinispan.xml
+jetty_bastillion/modules/sessions/infinispan/infinispan-common.mod
+jetty_bastillion/modules/sessions/infinispan/remote/infinispan-remote-libs.mod
+jetty_bastillion/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod
+jetty_bastillion/modules/sessions/infinispan/remote/infinispan-remote-serverclasses.mod
+jetty_bastillion/modules/sessions/infinispan/remote/other_proto_marshallers.xml
+jetty_bastillion/modules/sessions/infinispan/remote/resources/hotrod-client.properties
 jetty_bastillion/modules/sessions/jdbc/datasource.mod
 jetty_bastillion/modules/sessions/jdbc/driver.mod
 jetty_bastillion/modules/sessions/mongo/address.mod
@@ -416,6 +434,7 @@ jetty_bastillion/modules/webapp.mod
 jetty_bastillion/modules/websocket.mod
 jetty_bastillion/notice.html
 jetty_bastillion/start.jar
+jetty_bastillion/upgrade/bastillion-upgrade-3.08.00.jar
 @dir(www,www,755) jetty_bastillion/bastillion/WEB-INF/classes
 @dir(www,www,755) %%WWWDIR%%
 @dir(www,www,755) %%WWWDIR%%/work
@@ -426,8 +445,9 @@ jetty_bastillion/start.jar
 %%WWWDIR%%/webapps/README.TXT
 %%WWWDIR%%/webapps/bastillion.xml
 %%WWWDIR%%/etc/README.spnego
-%%WWWDIR%%/etc/cdi2/jetty-cdi2.xml
-%%WWWDIR%%/etc/cdi2/jetty-web-cdi2.xml
+%%WWWDIR%%/etc/cdi/jetty-cdi.xml
+%%WWWDIR%%/etc/cdi/jetty-cdi2.xml
+%%WWWDIR%%/etc/cdi/jetty-web-cdi2.xml
 %%WWWDIR%%/etc/console-capture.xml
 %%WWWDIR%%/etc/example-quickstart.xml
 %%WWWDIR%%/etc/home-base-warning.xml
@@ -435,11 +455,12 @@ jetty_bastillion/start.jar
 %%WWWDIR%%/etc/jetty-acceptratelimit.xml
 %%WWWDIR%%/etc/jetty-alpn.xml
 %%WWWDIR%%/etc/jetty-annotations.xml
-%%WWWDIR%%/etc/jetty-cdi.xml
+%%WWWDIR%%/etc/jetty-bytebufferpool.xml
 %%WWWDIR%%/etc/jetty-connectionlimit.xml
 %%WWWDIR%%/etc/jetty-customrequestlog.xml
 %%WWWDIR%%/etc/jetty-debug.xml
 %%WWWDIR%%/etc/jetty-debuglog.xml
+%%WWWDIR%%/etc/jetty-decorate.xml
 %%WWWDIR%%/etc/jetty-deploy.xml
 %%WWWDIR%%/etc/jetty-gzip.xml
 %%WWWDIR%%/etc/jetty-http-forwarded.xml
@@ -474,6 +495,7 @@ jetty_bastillion/start.jar
 %%WWWDIR%%/etc/jetty-unixsocket-proxy-protocol.xml
 %%WWWDIR%%/etc/jetty-unixsocket-secure.xml
 %%WWWDIR%%/etc/jetty-unixsocket.xml
+%%WWWDIR%%/etc/jetty-web-decorate.xml
 %%WWWDIR%%/etc/jetty-webapp.xml
 %%WWWDIR%%/etc/jetty.conf
 %%WWWDIR%%/etc/jetty.xml
@@ -485,8 +507,11 @@ jetty_bastillion/start.jar
 %%WWWDIR%%/etc/sessions/hazelcast/default.xml
 %%WWWDIR%%/etc/sessions/hazelcast/remote.xml
 %%WWWDIR%%/etc/sessions/id-manager.xml
-%%WWWDIR%%/etc/sessions/infinispan/default.xml
-%%WWWDIR%%/etc/sessions/infinispan/remote.xml
+%%WWWDIR%%/etc/sessions/infinispan/infinispan-common.xml
+%%WWWDIR%%/etc/sessions/infinispan/infinispan-embedded-query.xml
+%%WWWDIR%%/etc/sessions/infinispan/infinispan-embedded.xml
+%%WWWDIR%%/etc/sessions/infinispan/infinispan-remote-query.xml
+%%WWWDIR%%/etc/sessions/infinispan/infinispan-remote.xml
 %%WWWDIR%%/etc/sessions/jdbc/datasource.xml
 %%WWWDIR%%/etc/sessions/jdbc/driver.xml
 %%WWWDIR%%/etc/sessions/jdbc/session-store.xml
diff --git a/security/clamav-unofficial-sigs/Makefile b/security/clamav-unofficial-sigs/Makefile
index cae84ba97d99..9d90d2963375 100644
--- a/security/clamav-unofficial-sigs/Makefile
+++ b/security/clamav-unofficial-sigs/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	clamav-unofficial-sigs
-PORTVERSION=	5.6.2
-PORTREVISION=	1
+PORTVERSION=	6.1.1
 CATEGORIES=	security
 
-MAINTAINER=	sf@maxempire.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Update script for third-party ClamAV databases
 
 LICENSE=	BSD3CLAUSE
@@ -45,10 +44,10 @@ do-install:
 
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/config/master.conf ${STAGEDIR}${ETCDIR}/master.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/config/os.freebsd.conf ${STAGEDIR}${ETCDIR}/os.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/config/os/os.freebsd.conf ${STAGEDIR}${ETCDIR}/os.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/config/user.conf ${STAGEDIR}${ETCDIR}/user.conf.sample
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} INSTALL LICENSE README.md ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} INSTALL.md LICENSE README.md ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/security/clamav-unofficial-sigs/distinfo b/security/clamav-unofficial-sigs/distinfo
index ae4f0d303ae7..6556f6e14c81 100644
--- a/security/clamav-unofficial-sigs/distinfo
+++ b/security/clamav-unofficial-sigs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522164679
-SHA256 (extremeshok-clamav-unofficial-sigs-5.6.2_GH0.tar.gz) = 233404d767fcb7d2b82defef831d584cbbcc7105f6bbc586d69a0a960bc0d4df
-SIZE (extremeshok-clamav-unofficial-sigs-5.6.2_GH0.tar.gz) = 50931
+TIMESTAMP = 1567631464
+SHA256 (extremeshok-clamav-unofficial-sigs-6.1.1_GH0.tar.gz) = bac14809c8106ebae6c13f4db1c330a75f0a284924b3ab3668c49e30619b299f
+SIZE (extremeshok-clamav-unofficial-sigs-6.1.1_GH0.tar.gz) = 55340
diff --git a/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh b/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh
index d83a38beb033..ef1b00671ea9 100644
--- a/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh
+++ b/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh
@@ -1,24 +1,50 @@
---- clamav-unofficial-sigs.sh.orig	2018-11-24 16:35:07 UTC
+--- clamav-unofficial-sigs.sh.orig	2019-09-02 22:41:48 UTC
 +++ clamav-unofficial-sigs.sh
-@@ -1290,7 +1290,7 @@ minimum_required_config_version="72"
- minimum_yara_clamav_version="0.99"
- 
- # Default config files
--config_dir="/etc/clamav-unofficial-sigs"
-+config_dir="%%PREFIX%%/etc/clamav-unofficial-sigs"
- config_files=( "$config_dir/master.conf" "$config_dir/os.conf" "$config_dir/user.conf" )
- 
- # Initialise
-@@ -1302,6 +1302,8 @@ force_updates="no"
+@@ -1422,25 +1422,14 @@ force_wget="no"
  enable_log="no"
  custom_config="no"
  we_have_a_config="0"
 +pkg_mgr="FreeBSD ports"
 +pkg_rm="pkg delete"
  
- # Solaris which function returns garbage when the program is not found
- # only define the new which function if running under Solaris
-@@ -1455,7 +1457,7 @@ for config_file in "${config_files[@]}" 
+-
+-# Attempt to scan for a valid config dir
+-if [ -f "/etc/clamav-unofficial-sigs/master.conf" ] ; then
+-  config_dir="/etc/clamav-unofficial-sigs"
+-elif [ -f "/usr/local/etc/clamav-unofficial-sigs/master.conf" ] ; then
+-  config_dir="/usr/local/etc/clamav-unofficial-sigs/"
+-elif [ -f "/opt/zimbra/config/clamav-unofficial-sigs/master.conf" ] ; then
+-  config_dir="/opt/zimbra/config/clamav-unofficial-sigs/"
+-else
+-  xshok_pretty_echo_and_log "ERROR: config_dir (/etc/clamav-unofficial-sigs/master.conf) could not be found"
+-  exit 1
+-fi
+ # Default config files
++config_dir="%%PREFIX%%/etc/clamav-unofficial-sigs"
+ config_files=("${config_dir}/master.conf")
+-#find the a suitable os.conf or os.*.conf file
+-config_file="$(find "$config_dir" -type f -iname "os.conf" -o -iname "os.*.conf" | tail -n1)"
+-if [ -r "${config_file}" ]; then
+-	config_files+=( "${config_file}" )
++if [ -r "${config_dir}/os.conf" ] ; then
++	config_files+=( "${config_dir}/os.conf" )
+ fi
+ if [ -r "${config_dir}/user.conf" ] ; then
+ 	config_files+=( "${config_dir}/user.conf" )
+@@ -1576,10 +1565,8 @@ if [ "$custom_config" != "no" ] ; then
+ 		else
+ 			xshok_pretty_echo_and_log "WARNING: ${config_dir}/master.conf not found"
+ 		fi
+-		#find the a suitable os.conf or os.*.conf file
+-		config_file="$(find "$config_dir" -type f -iname "os.conf" -o -iname "os.*.conf" | tail -n1)"
+-		if [ -r "${config_file}" ] ; then
+-			config_files+=( "${config_file}" )
++		if [ -r "${config_dir}/os.conf" ] ; then
++			config_files+=( "${config_dir}/os.conf" )
+ 		else
+ 			xshok_pretty_echo_and_log "WARNING: ${config_dir}/os.conf not found"
+ 		fi
+@@ -1625,7 +1612,7 @@ for config_file in "${config_files[@]}" ; do
        # Delete both trailing and leading whitespace
        # Delete all trailing whitespace
        # Delete all empty lines
@@ -27,7 +53,7 @@
      fi
  
      #fix eval of |
-@@ -1470,7 +1472,7 @@ for config_file in "${config_files[@]}" 
+@@ -1640,7 +1627,7 @@ for config_file in "${config_files[@]}" ; do
      fi
  
      # Check there is an = for every set of "" optional whitespace \s* between = and "
@@ -35,27 +61,32 @@
 +    config_check_vars="$(echo "$clean_config" | $grep_bin -c '=[[:space:]]*\"' )"
  
      if [ $(( ${#config_check} / 2 )) -ne "$config_check_vars" ] ; then
-       xshok_pretty_echo_and_log "ERROR: Your configuration has errors, every = requires a pair of \"\"" "="
-@@ -2131,20 +2133,11 @@ if [ "$sanesecurity_enabled" == "yes" ] 
+       xshok_pretty_echo_and_log "ERROR: Your configuration has errors, every = requires a pair of \"\""
+@@ -2316,24 +2303,12 @@ if [ "$sanesecurity_enabled" == "yes" ] ; then
+         echo "$current_time" > "${work_dir_work_configs}/last-ss-update.txt"
          xshok_pretty_echo_and_log "Sanesecurity Database & GPG Signature File Updates" "="
          xshok_pretty_echo_and_log "Checking for Sanesecurity updates..."
- 
--        sanesecurity_mirror_ips="$(dig +ignore +short "$sanesecurity_url")"
+-				# shellcheck disable=SC2086
+-        sanesecurity_mirror_ips="$(dig $dig_proxy +ignore +short "$sanesecurity_url")"
 -        # Add fallback to host if dig returns no records
 -        if [ ${#sanesecurity_mirror_ips} -lt 1 ] ; then
--          sanesecurity_mirror_ips="$(host -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address \([^ ]*\).*/\1/;p;}')"
+-					# shellcheck disable=SC2086
+-          sanesecurity_mirror_ips="$(host $host_proxy -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address \([^ ]*\).*/\1/;p;}')"
 -        fi
-+        sanesecurity_mirror_ips=$(host "$sanesecurity_url" | sed 's/.*[[:space:]]//')
  
++        sanesecurity_mirror_ips=$(host "$sanesecurity_url" | sed 's/.*[[:space:]]//')
++
          if [ ${#sanesecurity_mirror_ips} -ge 1 ] ; then
            for sanesecurity_mirror_ip in $sanesecurity_mirror_ips ; do
 -            sanesecurity_mirror_name=""
--            sanesecurity_mirror_name="$(dig +short -x "$sanesecurity_mirror_ip" | command sed 's/\.$//')"
+-						# shellcheck disable=SC2086
+-            sanesecurity_mirror_name="$(dig $dig_proxy +short -x "$sanesecurity_mirror_ip" | command sed 's/\.$//')"
 -            # Add fallback to host if dig returns no records
 -            if [ -z "$sanesecurity_mirror_name" ] ; then
--              sanesecurity_mirror_name="$(host "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer \([^ ]*\).*\.$/\1/;p;}')"
+-							# shellcheck disable=SC2086
+-              sanesecurity_mirror_name="$(host $host_proxy "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer \([^ ]*\).*\.$/\1/;p;}')"
 -            fi
 +            sanesecurity_mirror_name=$(host "$sanesecurity_mirror_ip" | sed 's/.*[[:space:]]//' | sed 's/\.$//')
              sanesecurity_mirror_site_info="$sanesecurity_mirror_name $sanesecurity_mirror_ip"
-             xshok_pretty_echo_and_log "Sanesecurity mirror site used: $sanesecurity_mirror_site_info"
+             xshok_pretty_echo_and_log "Sanesecurity mirror site used: ${sanesecurity_mirror_site_info}"
              # shellcheck disable=SC2086
diff --git a/security/clamav-unofficial-sigs/files/patch-config_master.conf b/security/clamav-unofficial-sigs/files/patch-config_master.conf
index a4cc571eed81..8da0aa55749a 100644
--- a/security/clamav-unofficial-sigs/files/patch-config_master.conf
+++ b/security/clamav-unofficial-sigs/files/patch-config_master.conf
@@ -1,4 +1,4 @@
---- config/master.conf.orig	2017-03-18 11:57:29 UTC
+--- config/master.conf.orig	2019-09-02 22:41:48 UTC
 +++ config/master.conf
 @@ -63,8 +63,8 @@ clamd_reload_opt="clamdscan --reload"
  work_dir="/var/lib/clamav-unofficial-sigs"   #Top level working directory
@@ -9,14 +9,14 @@
 +logging_enabled="no"
 +log_file_path="/var/log"
  log_file_name="clamav-unofficial-sigs.log"
+ ## Use a program to log messages
+ #log_pipe_cmd="/usr/bin/logger -it 'clamav-unofficial-sigs'"
+@@ -487,8 +487,6 @@ selinux_fixes="no" # Default is "no" ignore ssl errors
+ #rsync_proxy="username:password@proxy_host:proxy_port"
+ #curl_proxy="--proxy http://username:password@proxy_host:proxy_port"
+ #wget_proxy="-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
+-#dig_proxy="@proxy_host -p proxy_host:proxy_port"
+-#host_proxy="@proxy_host" #does not support port
  
- 
-@@ -125,7 +125,7 @@ yararulesproject_enabled="yes"   # Yara-
- additional_enabled="yes"   # Additional Databases
- 
- ## Disabling this will also cause the yararulesproject to be disabled.
--enable_yararules="yes"   #Enables yararules in the various databases, automatically disabled if clamav is older than 0.99
-+enable_yararules="no"   #Enables yararules in the various databases, automatically disabled if clamav is older than 0.99
- 
- # ========================
- # eXtremeSHOK Database format
+ # Custom Cron install settings, these are detected and only used if you want to override
+ # the automatic detection and generation of the values when not set, this is mainly to aid package maintainers
diff --git a/security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf b/security/clamav-unofficial-sigs/files/patch-config_os_os.freebsd.conf
index e2f6d5b49a04..5f210076bc94 100644
--- a/security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf
+++ b/security/clamav-unofficial-sigs/files/patch-config_os_os.freebsd.conf
@@ -1,5 +1,5 @@
---- config/os.freebsd.conf.orig	2017-03-18 11:57:29 UTC
-+++ config/os.freebsd.conf
+--- config/os/os.freebsd.conf.orig	2019-09-02 22:41:48 UTC
++++ config/os/os.freebsd.conf
 @@ -29,8 +29,6 @@ clamd_pid="/var/run/clamav/clamd.pid"
  
  work_dir="/var/db/clamav-unofficial-sigs"
diff --git a/security/clamav-unofficial-sigs/files/patch-config_user.conf b/security/clamav-unofficial-sigs/files/patch-config_user.conf
new file mode 100644
index 000000000000..0d9405cd9576
--- /dev/null
+++ b/security/clamav-unofficial-sigs/files/patch-config_user.conf
@@ -0,0 +1,18 @@
+--- config/user.conf.orig	2019-09-02 22:41:48 UTC
++++ config/user.conf
+@@ -49,14 +49,12 @@
+ #) #END ADDITIONAL DATABASES
+ 
+ # Uncomment the following line to enable the script
+-user_configuration_complete="yes"
++#user_configuration_complete="yes"
+ 
+ # Proxy Support
+ # If necessary to proxy database downloads, define the rsync, curl, wget, dig, hosr proxy settings here.
+ #rsync_proxy="username:password@proxy_host:proxy_port"
+ #curl_proxy="--proxy http://username:password@proxy_host:proxy_port"
+ #wget_proxy="-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
+-#dig_proxy="@proxy_host -p proxy_host:proxy_port"
+-#host_proxy="@proxy_host" #does not support port
+ 
+ # https://eXtremeSHOK.com ######################################################
diff --git a/security/clamav-unofficial-sigs/pkg-plist b/security/clamav-unofficial-sigs/pkg-plist
index 25033b83c066..1c0aced7726a 100644
--- a/security/clamav-unofficial-sigs/pkg-plist
+++ b/security/clamav-unofficial-sigs/pkg-plist
@@ -3,6 +3,6 @@ bin/clamav-unofficial-sigs.sh
 @sample %%ETCDIR%%/os.conf.sample
 @sample %%ETCDIR%%/user.conf.sample
 man/man8/clamav-unofficial-sigs.8.gz
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/security/cyberchef/Makefile b/security/cyberchef/Makefile
index 371c57096993..0ad4abcf3285 100644
--- a/security/cyberchef/Makefile
+++ b/security/cyberchef/Makefile
@@ -2,19 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	cyberchef
-PORTVERSION=	8.24.2
-PORTREVISION=	2
+PORTVERSION=	9.6.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	2
 CATEGORIES=	security
-DISTFILES=	cyberchef.htm
-EXTRACT_ONLY=	# none
+MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${GH_TAGNAME}/
+DISTNAME=	CyberChef_v9.6.0
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Cyber operations within a web browser
 
 LICENSE=	APACHE20
 
-MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${GH_TAGNAME}/
+USES=           zip
+
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	gchq
 GH_PROJECT=	CyberChef
@@ -23,7 +24,10 @@ NO_BUILD=       yes
 NO_ARCH=        yes
 
 do-install:
-	${MKDIR}                            ${STAGEDIR}${WWWDIR}
-	${INSTALL} ${DISTDIR}/cyberchef.htm ${STAGEDIR}${WWWDIR}/index.html
+	${MKDIR} ${STAGEDIR}${WWWDIR}
+	${INSTALL} ${WRKDIR}/${DISTNAME}.html ${STAGEDIR}${WWWDIR}/index.html
+	${CP} -R ${WRKDIR}/images ${STAGEDIR}${WWWDIR}/
+	${CP} -R ${WRKDIR}/modules ${STAGEDIR}${WWWDIR}/
+	${CP} -R ${WRKDIR}/assets ${STAGEDIR}${WWWDIR}/
 
 .include <bsd.port.mk>
diff --git a/security/cyberchef/distinfo b/security/cyberchef/distinfo
index 287a5e0ede21..8e9f408911fa 100644
--- a/security/cyberchef/distinfo
+++ b/security/cyberchef/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551374789
-SHA256 (cyberchef.htm) = cdc1a608d1af21fd9d9b673fd35c603daccaa5ab62fb9ea05617d2c76f6be000
-SIZE (cyberchef.htm) = 11937259
+TIMESTAMP = 1568050222
+SHA256 (CyberChef_v9.6.0.zip) = 7e8b4fb809e2c3856da9ccb465a6ca6092c2c65b325ee01e9a84e97b2e8f448f
+SIZE (CyberChef_v9.6.0.zip) = 16219326
diff --git a/security/cyberchef/pkg-plist b/security/cyberchef/pkg-plist
index 6f232237f9b1..c1985561ef09 100644
--- a/security/cyberchef/pkg-plist
+++ b/security/cyberchef/pkg-plist
@@ -1 +1,34 @@
 %%WWWDIR%%/index.html
+%%WWWDIR%%/assets/fonts/Roboto72White.fnt
+%%WWWDIR%%/assets/fonts/Roboto72White.png
+%%WWWDIR%%/assets/fonts/RobotoBlack72White.fnt
+%%WWWDIR%%/assets/fonts/RobotoBlack72White.png
+%%WWWDIR%%/assets/fonts/RobotoMono72White.fnt
+%%WWWDIR%%/assets/fonts/RobotoMono72White.png
+%%WWWDIR%%/assets/fonts/RobotoSlab72White.fnt
+%%WWWDIR%%/assets/fonts/RobotoSlab72White.png
+%%WWWDIR%%/assets/main.css
+%%WWWDIR%%/assets/main.js
+%%WWWDIR%%/images/cook_male-32x32.png
+%%WWWDIR%%/images/cyberchef-128x128.png
+%%WWWDIR%%/images/file-128x128.png
+%%WWWDIR%%/images/file-32x32.png
+%%WWWDIR%%/images/fork_me.png
+%%WWWDIR%%/images/map.png
+%%WWWDIR%%/modules/BSON.js
+%%WWWDIR%%/modules/Charts.js
+%%WWWDIR%%/modules/Ciphers.js
+%%WWWDIR%%/modules/Code.js
+%%WWWDIR%%/modules/Compression.js
+%%WWWDIR%%/modules/Crypto.js
+%%WWWDIR%%/modules/Diff.js
+%%WWWDIR%%/modules/Encodings.js
+%%WWWDIR%%/modules/Hashing.js
+%%WWWDIR%%/modules/Image.js
+%%WWWDIR%%/modules/PGP.js
+%%WWWDIR%%/modules/PublicKey.js
+%%WWWDIR%%/modules/Regex.js
+%%WWWDIR%%/modules/Shellcode.js
+%%WWWDIR%%/modules/URL.js
+%%WWWDIR%%/modules/UserAgent.js
+%%WWWDIR%%/modules/Yara.js
diff --git a/security/fakeident/Makefile b/security/fakeident/Makefile
index 954c851e34f7..918d44d13186 100644
--- a/security/fakeident/Makefile
+++ b/security/fakeident/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fakeident
-PORTVERSION=	1.7
-PORTREVISION=	3
+PORTVERSION=	2.7
 CATEGORIES=	security
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -15,11 +14,12 @@ COMMENT=	Tool that replies with a standard answer to incoming identd requests
 LICENSE=	GPLv2+
 
 PLIST_FILES=	sbin/identd
+
 USE_RC_SUBR=	fakeidentd
 
 do-build:
-	@${MKDIR} ${WRKSRC}
-	${CC} ${CFLAGS} -o ${WRKSRC}/identd ${FILESDIR}/identd.c
+	@${MKDIR} ${WRKSRC} && ${CP} ${FILESDIR}/identd.c ${WRKSRC}
+	cd ${WRKSRC} && ${SH} identd.c CC=${CC} ${CFLAGS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/identd ${STAGEDIR}${PREFIX}/sbin
diff --git a/security/fakeident/files/fakeidentd.in b/security/fakeident/files/fakeidentd.in
index af8e017db0c9..a9621df55f58 100644
--- a/security/fakeident/files/fakeidentd.in
+++ b/security/fakeident/files/fakeidentd.in
@@ -17,13 +17,14 @@
 # The username does not need to exist anywhere in your system.
 
 name=fakeidentd
+desc="Standalone 'fake' ident daemon"
 rcvar=fakeidentd_enable
 
 load_rc_config $name
 
 : ${fakeidentd_enable:="NO"}
 
-command=%%PREFIX%%/sbin/identd
+command="%%PREFIX%%/sbin/identd"
 pidfile=/var/run/identd.pid
 
 command_args="nobody && echo -n ' fakeidentd'"
diff --git a/security/fakeident/files/identd.c b/security/fakeident/files/identd.c
index 495dc7b22ce0..7d235d78e9b3 100644
--- a/security/fakeident/files/identd.c
+++ b/security/fakeident/files/identd.c
@@ -1,26 +1,46 @@
-#if 0 /*
-#	This program is easy to compile. For example the following ways:
-#		$ sh identd.c
-#		$ sh identd.c -g -DDEBUG
-#		$ sh identd.c -s -DXXXMULTI
-#		$ CC=cc sh identd.c
-#		$ CC=egcs sh identd.c -s -fomit-frame-pointer
-
-NAME=`basename $0 .c`
-[ x`uname` = xSunOS ] && L="-lsocket -lnsl" || L=
-[ x$1 = x ] && set -- -s -O2
-CMDLINE="${CC:-gcc} -Wall $@ -o $NAME $NAME.c $L"
-echo $CMDLINE; exec $CMDLINE; exit -1
-
+#if 0 /* -*-  mode: c; c-file-style: "gnu"; tab-width: 8; -*-
+
+#   This program is easy to compile. For example the following ways:
+#       $ sh identd.c
+#       $ sh identd.c -g -DDEBUG
+#       $ sh identd.c -s -DXXXMULTI
+#       $ sh identd.c TRG=fake_identd -s -DBIND_ADDRESS=127.0.0.1
+#       $ sh identd.c CC=cc
+#       $ sh identd.c CC=egcs -s -fomit-frame-pointer
+
+set -eu
+
+CC= TRG=`basename "$0" .c` OIFS=$IFS
+for arg in "$@" ''
+do case $arg in	TRG=*) TRG=`echo "$arg" | sed 's/TRG=//'`; shift ;;
+		CC=*) CC=`echo "$arg" | sed 's/CC=//'`; shift ;;
+		clean) set -x; exec rm -f "$TRG" ;;
+		readme) set -x; exec sed -n '1,/[e]nd/d;/\*\//q;s/..//p' "$0";;
+		'') set 0 -s -O2; shift; break ;;
+		*) break ;;
+esac; done
+case `uname` in SunOS) L='-lsocket -lnsl' ;; *) L= ;; esac
+
+WARN="-Wall -Wstrict-prototypes -pedantic -Wno-long-long"
+WARN="$WARN -Wcast-align -Wpointer-arith " # -Wfloat-equal #-Werror
+WARN="$WARN -W -Wwrite-strings -Wcast-qual -Wshadow" # -Wconversion
+
+VERSION=`sed -n '/^ [*] Version / {
+	s/.*Version \([^ ]*\)  *\([^ ]*\).*./\1 (\2)/p; q; }' "$0"`
+case $VERSION in '') echo Could not read version information. >&2; exit 1; esac
+TRGNAME=`basename "$TRG"`
+set -x; exec ${CC:-gcc} $WARN "$@" -DTRG="\"$TRGNAME\"" \
+	-DVERSION="\"$VERSION\"" -o "$TRG" "$0" $L
+exit 1
 # */
 #endif
 /*
- * $Id: identd.c,v 1.7 2002/09/29 07:50:20 too Stab $
+ * identd.c 2.6  2012-05-31 20:37:27 UTC
  *
- * Author: Tomi Ollila <too@iki.fi>
+ * Author: Tomi Ollila -- too ät iki fi
  *
- * Created: Sat Nov 25 15:34:07 1995 too
- * Last modified: Sun Sep 29 10:48:42 2002 too
+ * Created: Sat Nov 25 15:34:07 EET 1995 too
+ * Last modified: Thu 31 May 2012 23:37:27 EEST too
  *
  * This program is standalone 'fake' ident daemon. This program does
  * not fork() but is configured to handle up to 20 concurrent connections.
@@ -28,7 +48,7 @@ echo $CMDLINE; exec $CMDLINE; exit -1
  * in use, the next connection will close the oldest connection data
  * has been read. This way this program is not very vulnerable to so
  * called `denial of service' attack, thus making this ideal "identd"
- * to be used in a firewall.
+ * to be used in a firewall, IP masquerading hosts etc.
  *
  * Program takes one (or many) arguments, which if exist, determines the
  * `user' name(s) that is returned for successful ident query.
@@ -44,17 +64,51 @@ echo $CMDLINE; exec $CMDLINE; exit -1
  * GNU General Public License for more details.
  *
  * HISTORY
- * $Log: identd.c,v $
+ *
+ * Version 2.6  2012-05-31 20:37:27 UTC
+ *   Applied patches from the wl500g project, including IPv6 support, with
+ *   minor tweaks (patches provided by Daniel Gimpelevich. Thanks).
+ *
+ * Version 2.5  $Id: identd.c 862 2006-05-18 14:16:34Z too $
+ *   Minor build and readme updates.
+ *
+ * Version 2.4  identd.c 568 2005-09-07 20:18:39Z too
+ *   More compilation warnings options set -- iov.base being non-const
+ *   gives warnings that are hard to avoid...
+ *
+ * Version 2.3  identd.c 564 2005-09-06 19:15:20Z too
+ *   Randident code from  Matthias Jung  tuned in.
+ *
+ * Version 2.2  identd.c 12 2004-09-08 21:46:54Z too
+ *   Fixed getservbyname() to look port for "auth" instead of "identd"
+ *   port. This "bug" also revealed port number byte order handling bug,
+ *   which was fixed.
+ *   Now this file is stored in subversion repository -- I entered
+ *   $ svn propset svn:keywords Id identd.c -- let's see how it works...
+ *   ... ``svn propset svn:keywords 'Id Rev' identd.c'' !!!
+ *
+ * Revision 2.1  2004/01/15 18:14:42  too
+ *   Made BIND_ADDRESS definable (in compiler command line).
+ *   Added some typecasts (using checked_cast() macro).
+ *   Thanks to Jeffrey D. Wheelhouse for his content.
+ *
+ * Revision 2.0  2003/05/05 15:21:01  too
+ *   Major update. Removed fdprintf(); replaced with use of
+ *   writev() and newly added outputstrings().
+ *   Removed many now obsolete defines and converted one to
+ *   constant character string.
+ *   Added one assert() (and left room for more). Did some
+ *   relativily small other adjustments.
  *
  * Revision 1.7  2002/09/29 07:50:20  too
  *   No longer chops up to IDSTR_MAX chars, but uses "%.*s" to limit length;
- *	now works also when XXXMULTI defined.
+ *   now works also when XXXMULTI defined.
  *   Back-hacked self-compilable trick, with more tricks to avoid compiler
- *	warnings.
+ *   warnings.
  *   Removed own define of FD_SETSIZE altogether;
- *	systems has it small to begin with.
+ *   systems has it small to begin with.
  *   Line '415' (or whatever that is now) fixed. () -> (void) in func def.
- *   Some fine tuning.
+ *   Some fine-tuning.
  *   Thanks to Cristian for his patches.
  *
  * Revision 1.6.1  2002-09-28 12:30:29 +0200  cii
@@ -83,40 +137,46 @@ echo $CMDLINE; exec $CMDLINE; exit -1
  *   + added IDENT_SUBSTR
  *
  * Revision 1.6  2002/07/31 16:25:20  too
- * Now works when started as root (in Linux). Stupid me, tested
- * only starting as an ordinary loser.
+ *   Now works when started as root (in Linux). Stupid me, tested
+ *   only starting as an ordinary loser.
  *
  * Revision 1.5  2002/07/29 14:02:42  too
- * Added possibility to have multible reply users, one (pseudo)randomly
- * chosen at each time.
+ *   Added possibility to have multible reply users, one (pseudo)randomly
+ *   chosen at each time.
  *
  * Revision 1.4  2001/02/09 08:45:42  too
- * Now GID is also changed to nobody/nogroup.
+ *   Now GID is also changed to nobody/nogroup.
  *
  * Revision 1.3  2000/06/07 05:55:44  too
- * Fixed some Solaris compilation "bugs".
- * Changed LOG_PERROR to LOG_CONS
+ *   Fixed some Solaris compilation "bugs".
+ *   Changed LOG_PERROR to LOG_CONS
  *
  * Revision 1.2  1999/07/30 04:08:42  too
- * Added printing version string (and exit) with `-V' command line option.
+ *   Added printing version string (and exit) with `-V' command line option.
  *
  * Revision 1.1  1999/04/21 17:23:20  too
  * - Writes process id to /var/run/identd.pid.
  * - Changes (effective) user id to `nobody' after initialization
- *	(binding socket etc.).
+ *      (binding socket etc.).
  * - Ignores some signals (HUP and PIPE).
  * - Handles some signals that aborts by default. The handler function
- *	tries to get rid of the pidfile.
+ *      tries to get rid of the pidfile.
  *
  * Revision 0.9b 1999/04/15 20:45:12  too
- * Not so much spaghetti anymore. Added documentation and more replies.
+ *   Not so much spaghetti anymore. Added documentation and more replies.
  *
  * Revision 0.9  1999/04/12 18:30:00  too
- * Version for unix systems. Standalone, supports 20 concurrent connections.
- * The code is quite a spaghetti. But that does not matter.
- *
+ *   Version for unix systems. Standalone, supports 20 concurrent connections.
+ *   The code is quite a spaghetti. But that does not matter.
  */
 
+#ifdef DEBUG
+#undef ndebug
+#else
+#define ndebug 1
+#endif
+
+#include <assert.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -136,34 +196,87 @@ echo $CMDLINE; exec $CMDLINE; exit -1
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <errno.h>
+#include <arpa/inet.h>
+#include <sys/uio.h>
+
+#include <sys/endian.h>
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+
+#define IPADDR(a,b,c,d) ((in_addr_t)((a << 24) + (b << 16) + (c << 8) + d))
+#define IPPORT(v) ((in_port_t)v)
+#define A_x_256(a)((a<<8))
+
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
 
+#define IPADDR(a,b,c,d) (a + (b << 8) + (c << 16) + (d << 24))
+#define IPPORT(v) ((in_port_t)((v >> 8) | (v << 8)))
+#define A_x_256(a) (a)
 
+#else
+#error unknown ENDIAN
+#endif
+
+#ifndef __STRING
+#define __STRING(x) #x
+#endif
+/* Let's see how long-lived this is... */
+#define __STRINGIFY_MACRO(x) __STRING(x)
+
+#ifndef BIND_ADDRESS
+#define BIND_ADDRESS	0.0.0.0
+#endif
+#ifndef BIND_ADDRESS6
+#define BIND_ADDRESS6	::
+#endif
 #define IDENT_PORT	113
-#define IDENT_SUBSTR	": USERID : UNIX :"
 #define MAXCONNS	20
 #define MAXIDLETIME	45
-#define IDSTR_BUFLEN	128 /*could be dropped down to 64 if tight in memory */
 
-/*
- * format string is: "%d, %d " IDENT_SUBSTR " %.*s\r\n"
- * %d is max 999999999 (allowed by this identd, 
- */
-#define IDSTR_MAX	(IDSTR_BUFLEN - 1) - \
-	9 - 2 - 9 - 1 - (sizeof IDENT_SUBSTR - 1) - 1 - 2
+#ifndef USE_UNIX_OS
+static const char ident_substr[] = " : USERID : OTHER : ";
+#else
+static const char ident_substr[] = " : USERID : UNIX : ";
+#endif
+static const int ident_substr_len = sizeof ident_substr - 1;
+
+#if !defined __cplusplus
+typedef enum { false = 0, true = 1 } bool;
+#endif
+
+#if (__GNUC__ >= 3)
+#define GCCATTR_UNUSED	 __attribute ((unused))
+
+#define from_type(ft, v) \
+  __builtin_choose_expr (__builtin_types_compatible_p (typeof (v), ft), \
+			 (v), (void)0)
+
+#define checked_cast(ft, tt, v) \
+  __builtin_choose_expr (__builtin_types_compatible_p (typeof (v), ft), \
+			 ((tt)(v)), (void)0)
+#else
+#define GCCATTR_UNUSED
+
+#define from_type(ft, v) (v)
+#define checked_cast(ft, tt, v) ((tt)(v))
+#endif
+
+/* ... */
+#define CVP (const void *)
 
 #ifndef DEBUG
 #define FCS		2	/* First Connection Socket */
-#define TRACE(x);
+#define TRACE(x, y);
 #else
 #define FCS		4
-#define TRACE(x)	printf x
+#define TRACE(x, y)	if (x) printf y
 #endif
 
 /* descriptors when debugging:
  *  0 = server socket
  *  1 = standard output (debugging output)
  *  2 = standard error
- *  3 = syslog fd (hopefully -- otherwise this won't work)
+ *  3 = syslog fd (hopefully -- otherwise may work a bit wierdly)
  *  4 - 4 + MAXCONNS = connection sockets
  *
  * descriptors when not debugging
@@ -171,6 +284,10 @@ echo $CMDLINE; exec $CMDLINE; exit -1
  *  1 = syslog fd (hopefully -- otherwise this won't work)
  *  2 = connection socket after detached from tty. standard error before that
  *  3 - 2 + MAXCONNS = rest connection sockets
+ *
+ * To try to make sure that syslog fd is what is "requested", the that fd
+ * is closed before openlog() call. It can only severely fail if fd 0
+ * is initially closed.
  */
 
 /*
@@ -191,11 +308,11 @@ struct {
  * XXX NOTE: multi currently only slightly tested XXXX.
  */
 #ifdef XXXMULTI
-#define IU_IN_STRUCT char ** identuserlist; int identusers
+#define IU_IN_STRUCT const char * const * identuserlist; int identusers
 #define SET_IU(s, c) do { G.identuserlist = &(s); G.identusers = c; } while (0)
 #define IU_IN_USAGESTR "[identuser [identuser2...]]"
 #else
-#define IU_IN_STRUCT char * identuser
+#define IU_IN_STRUCT const char * identuser
 #define SET_IU(s, c) G.identuser = (s)
 #define IU_IN_USAGESTR "[identuser]"
 #endif
@@ -205,82 +322,104 @@ struct {
   IU_IN_STRUCT;
   fd_set	readfds;
   int		conncnt;
+  bool		randident;
 } G;
 
-static const char rcs_id[] =
-/* */ "$Id: identd.c,v 1.7 2002/09/29 07:50:20 too Stab $";
-
-
 /*
  * Prototypes
  */
 static void reply(int s, char * buf);
-static void replyError(int s, char * buf);
+static void replyError(int s, const char * buf);
 static const char * strerrno(void);
 
-const int one = 1;
-char *	  nobodystr = "nobody";
+static const int one = 1;
+static const char * const nobodystr = "nobody";
+static const char * alphanum =
+  "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
-/* a more general name would be `movefd',but we are only moving sockets here */
-static inline void movesocket(int from, int to)
+static inline void movefd(int from, int to)
 {
-  TRACE(("movesocket(from = %d, to = %d)\n", from, to));
-  dup2(from, to);
-  close(from);
+  TRACE(1, ("movefd(from = %d, to = %d)\n", from, to));
+  if (from != to)
+    {
+      dup2(from, to);
+      close(from);
+    }
 }
 
 /*
  * inetbind() must always return 0 or value < 0.
+ * ... i.e. this version -- saves need for storage of the return value.
  */
+
+#if 0 /* unused */
 static int inetbind(int port)
 {
-  int			s;
-  struct sockaddr_in	addr = { 0 };
-  int			len = sizeof addr;
-  
+  return inetbind(htons(port));
+}
+#endif
+
+static int inetbind(int ipport)
+{
+  int s, len;
+  union {
+    struct sockaddr_in	sin4;
+    struct sockaddr_in6 sin6;
+  } addr;
+
   close(0);
-  
-  if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-  {
-      syslog(LOG_CRIT, "cannot create server socket: %s.", strerrno());
+  memset(&addr, 0, sizeof addr);
+
+  if ((s = socket(AF_INET6, SOCK_STREAM, 0)) >= 0)
+    {
+      len = sizeof addr.sin6;
+      inet_pton(AF_INET6, __STRINGIFY_MACRO(BIND_ADDRESS6), &addr.sin6.sin6_addr);
+      addr.sin6.sin6_family = AF_INET6;
+      addr.sin6.sin6_port = ipport;
+    }
+  else
+  if ((s = socket(AF_INET, SOCK_STREAM, 0)) >= 0)
+    {
+      len = sizeof addr.sin4;
+      addr.sin4.sin_addr.s_addr = inet_addr(__STRINGIFY_MACRO(BIND_ADDRESS));
+      addr.sin4.sin_family = AF_INET;
+      addr.sin4.sin_port = ipport;
+    }
+  else
+    {
+      syslog(LOG_CRIT, "Can not create server socket: %s.", strerrno());
       return -1;
-  }
-  
+    }
+
   setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
-  
-  addr.sin_family = AF_INET;
-  addr.sin_port = htons(port);
-  
+
   if (bind(s, (struct sockaddr *)&addr, len) < 0)
-  {
-      syslog(LOG_CRIT, "cannot bind() server socket: %s.", strerrno());
+    {
+      syslog(LOG_CRIT, "Can not bind() server socket: %s.", strerrno());
       return -1;
-  }
-  
+    }
+
   if (listen(s, 5) < 0)
-  {
-      syslog(LOG_CRIT, "cannot listen() server socket: %s.", strerrno());
+    {
+      syslog(LOG_CRIT, "Can not listen() server socket: %s.", strerrno());
       return -1;
-  }
-  
-  if (s != 0)
-  {
-      movesocket(s, 0);
-  }
-  
+    }
+
+  movefd(s, 0);
+
   return 0;
 }
 
 static void deleteConn(int s)
 {
   int i = s - FCS;
-  
-  TRACE(("deleteConn(): socket %d, conncnt %d\n", s, G.conncnt));
-  
+
+  TRACE(1, ("deleteConn(): socket %d, conncnt %d\n", s, G.conncnt));
+
   close(s);
-  
+
   G.conncnt--;
-  
+
   /*
    * Most of the time there is 0 connections. Most often that there
    * is connections, there is just one connection. When this one connection
@@ -294,14 +433,14 @@ static void deleteConn(int s)
    * to be copied over the time all these connections are deleted.
    */
   if (i != G.conncnt)
-  {
+    {
       memcpy(&conns[i], &conns[G.conncnt], sizeof conns[0]);
-      movesocket(G.conncnt + FCS, s);
-  }
-  
-  TRACE(("Clearing fd %d, readfds now 0x%x\n\n",
-	 G.conncnt + FCS, *(int *)&G.readfds));
-  
+      movefd(G.conncnt + FCS, s);
+    }
+
+  TRACE(1, ("Clearing fd %d, readfds now 0x%x\n\n",
+	    G.conncnt + FCS, *(int *)&G.readfds));
+
   FD_CLR(G.conncnt + FCS, &G.readfds);
 }
 
@@ -310,35 +449,28 @@ static int closeOldest(void)
   time_t min = conns[0].lasttime;
   int	 idx = 0;
   int	 i;
-  
+
   for (i = 1; i < MAXCONNS; i++)
-  {
-      if (conns[i].lasttime < min)
-      {
-	  idx = i;
-      }
-  }
-  TRACE(("closeOldest(): index %d, socket %d\n", idx, idx + FCS));
-  
+    if (conns[i].lasttime < min)
+      idx = i;
+
+  TRACE(1, ("closeOldest(): index %d, socket %d\n", idx, idx + FCS));
+
   replyError(idx + FCS, "X-SERVER-TOO-BUSY");
   close(idx + FCS);
-  
+
   return idx;
 }
 
 
-static inline int checkInput(char * buf, int len, int l)
+static int checkInput(char * buf, int len, int l)
 {
   int	i;
-  
+
   for (i = len; i < len + l; i++)
-  {
-      if (buf[i] == '\n')
-      {
-	  return 1;
-      }
-  }
-  
+    if (buf[i] == '\n')
+      return 1;
+
   return 0;
 }
 
@@ -346,57 +478,56 @@ static inline int checkInput(char * buf, int len, int l)
 static int getport(void)
 {
   struct servent * se;
-  
-  if ((se = getservbyname("identd", "tcp")) == NULL)
-  {
-      return IDENT_PORT;
-  }
+
+  if ((se = getservbyname("auth", "tcp")) == NULL)
+    return IPPORT(IDENT_PORT);
   else
-  {
-      return se->s_port;
-  }
+    return se->s_port;
 }
 
 static const char * strerrno()
 {
+#if 1
+  return strerror(errno);
+#else
+  extern char * sys_errlist[];
   return sys_errlist[errno];
+#endif
 }
 
-/* here we trust no-one in this program overflows our data buffer. */
-static void fdprintf(int fd, char * format, ...)
+#define WriteCS(f, s) write(f, s, sizeof s - 1)
+
+static void writestrings(int fd, const char * str, ...)
 {
-  va_list	ap;
-  char		buf[IDSTR_BUFLEN];
-  
-  va_start(ap, format);
-  vsprintf(buf, format, ap);
+  va_list ap;
+
+  va_start(ap, str);
+
+  while (str)
+    {
+      write(fd, str, strlen(str));
+      str = va_arg(ap, const char *);
+    }
   va_end(ap);
-  
-  write(fd, buf, strlen(buf));
 }
 
-
 #ifndef DEBUG
 static void godaemon(void)
 {
   switch(fork())
-  {
-  case -1:
-    exit(-1);
-    
-  case 0:
-    close(1);
-    close(2);
-    setsid();
-    break;
-    
-  default:
-    exit(0);
-  }
+    {
+    case -1:	exit(-1);
+    case 0:	close(1); close(2); setsid();  break;
+    default:	exit(0);
+    }
 }
 #endif
 
+#ifdef TRG
+#define PIDFILE "/var/run/" TRG ".pid"
+#else
 #define PIDFILE "/var/run/identd.pid"
+#endif
 
 static void delpidfile(void)
 {
@@ -405,9 +536,7 @@ static void delpidfile(void)
    * therefore if file cannot be deleted, it is truncated
    */
   if (unlink(PIDFILE) < 0)
-  {
-      close(open(PIDFILE, O_WRONLY|O_CREAT|O_TRUNC, 0644));
-  }
+    close(open(PIDFILE, O_WRONLY|O_CREAT|O_TRUNC, 0644));
 }
 
 static void handlexitsigs(void)
@@ -420,151 +549,119 @@ static void writepid(uid_t nobody, uid_t nogrp)
      /* May succeed. If not, won't care. */
 {
   int fd = open(PIDFILE, O_WRONLY|O_CREAT|O_TRUNC, 0664);
-  
+  char buf[24];
+
   if (fd < 0)
-  {
-      return;
-  }
-  
-  fdprintf(fd, "%d\n", getpid());
+    return;
+
+  /* we don't use snprintf() here since it is not so portable...*/
+  /* Anyway, 64-bit integer is at max 20 characters long. */
+  sprintf(buf, "%d\n", getpid());
+  buf[23] = '\0';
+  write(fd, buf, strlen(buf));
   fchown(fd, nobody, nogrp);
   close(fd);
-  
+
   signal(SIGTERM, (void(*)(int))handlexitsigs);
   signal(SIGINT, (void(*)(int))handlexitsigs);
   signal(SIGQUIT, (void(*)(int))handlexitsigs);
   /* should this handle ILL, ... (see signal(7)) */
 }
 
-/* parses the `rcs_id' string for version information and prints the info. */
-static void printversion(char nameterm)
+static void printversion(void)
 {
-  struct {
-    const char * p;
-    int		 l;
+  struct iovec iv[4];
 
-  } s[4] = { { 0 } };
+  iv[0].iov_base = TRG;
+  iv[0].iov_len = sizeof TRG - 1;
 
-  int		i;
-  const char *	p;
-  
-  for (i = 0, p = rcs_id; *p && i < 4 ; i++)
-  {
-      while (*p != ' ' && *p != '\0')
-      {
-	  p++;
-      }
-      if (*p++ == ' ' && *p != '\0')
-      {
-	  s[i].p = p;
-      }
-  }
-  
-  if (s[0].p)
-  {
-      p = s[0].p;
-      while (*p != nameterm && *p != ' ')
-      {
-	  p++;
-      }
-      s[0].l = p - s[0].p;
-  }
-  else
-  {
-      s[0].p = "unknown";
-      s[0].l = 7;
-  }
-  
-  for (i = 1; i < 3; i++)
-  {
-      if (s[i+1].p)
-      {
-	  s[i].l = s[i+1].p - s[i].p - 1;
-      }
-      else
-      {
-	  s[i].p = "unknown"; s[i].l = 7;
-      }
-  }
-  
-  fdprintf(1, "%.*s %.*s (%.*s)\n",
-	   s[0].l, s[0].p, /**/ s[1].l, s[1].p, /**/ s[2].l, s[2].p);
+  iv[1].iov_base = " ";
+  iv[1].iov_len = 1;
+
+  iv[2].iov_base = VERSION;
+  iv[2].iov_len = sizeof VERSION - 1;
+
+  iv[3].iov_base = ".\n";
+  iv[3].iov_len = 2;
+
+  writev(1, iv, 4);
 }
 
-int main(int argc, char * argv[])
+int main(int argc GCCATTR_UNUSED, const char * argv[])
 {
   uid_t nobody, nogrp;
-  
+
   memset(conns, 0, sizeof conns);
   memset(&G, 0, sizeof G);
   FD_ZERO(&G.readfds);
   FD_SET(0, &G.readfds);
-  
+
+  TRACE(1, ("s: `%s', l = %d\n", ident_substr, ident_substr_len));
+
   if (argv[1])
-  {
-      if (argv[1][0] == '-')
-      {
-	  if (argv[1][1] == 'V')
+    if (argv[1][0] == '-') {
+      if (argv[1][1] == 'V')
+	{
+	  printversion();
+	  return 0;
+	}
+      else
+	{
+        if (argv[1][1] == 'r')
 	  {
-	      printversion('.');
-	      return 0;
+	    G.randident = true;
+	    srand(time(0));
 	  }
-	  else
+	else
 	  {
-	      fdprintf(2, "%s: invalid option -- %c\n", argv[0], argv[1][1]);
-	      fdprintf(2, "Usage: %s [-V] " IU_IN_USAGESTR "\n", argv[0]);
-	      return 1;
+            char b[2]; b[0] = argv[1][1]; b[1]= '\0';
+
+            writestrings(2, argv[0], ": invalid option -- ", b, ".\n",
+                         "Usage: ", argv[0], " [-rV] ", IU_IN_USAGESTR "\n",
+                         NULL);
+            return 1;
 	  }
-      }
-      else
-      {
-	  SET_IU(argv[1], argc - 1);
-      }
-  }
+	}}
+    else
+      SET_IU(argv[1], argc - 1);
   else
-  {
-      SET_IU(nobodystr, 1);
-  }
-  
-  
+    SET_IU(nobodystr, 1);
+
+
 #ifndef DEBUG
   close(1); /* not debugging, openlog() hopefully uses fd 1. */
 #else
   close(3); /* debugging, TRACE uses fd 1, openlog() hopefully fd 3 */
 #endif
-  
+
   openlog("identd", LOG_CONS, LOG_DAEMON);
-  
+
   {
-      struct passwd * pw = getpwnam(nobodystr);
-      
-      if (pw)
+    struct passwd * pw = getpwnam(nobodystr);
+
+    if (pw)
       {
-	  nobody = pw->pw_uid;
-	  nogrp = pw->pw_gid;
+	nobody = pw->pw_uid;
+	nogrp = pw->pw_gid;
       }
-      else
+    else
       {
-	  syslog(LOG_CRIT, "Cannot find user `nobody': %s", strerrno());
-	  return -1;
+	syslog(LOG_CRIT, "Can not find user `nobody': %s,", strerrno());
+	return -1;
       }
   }
-  
+
   if (inetbind(getport()) < 0)
-  {
       return -1;
-  }
-  
+
   /* */
   {
-      int			 i;
-      
-      for (i = FCS; i < MAXCONNS + FCS; i++)
-      {
-	  close(i);
-      }
+    int i;
+
+    for (i = FCS; i < MAXCONNS + FCS; i++)
+      close(i);
   }
-  
+
 #ifdef DEBUG
 #ifndef LOG_PERROR
 #define LOG_PERROR 0
@@ -576,243 +673,244 @@ int main(int argc, char * argv[])
   close(2);
   signal(SIGHUP, SIG_IGN);
 #endif /* DEBUG */
-  
+
   signal(SIGPIPE, SIG_IGN); /* connection closed when writing (raises ???) */
-  
+
   writepid(nobody, nogrp);
-  
+
   setegid(nogrp); setgid(nogrp); setuid(nobody); seteuid(nobody);
-  
+
   {
-      int i;
-      
-      for (i = 0; i < 4; i++)
+    int i;
+
+    for (i = 0; i < 4; i++)
       {
-	  char *	id = (char)NULL;
-	  unsigned int	rv = 0;
-	  
-	  switch (i)
+	const char *	id = NULL;
+	unsigned int	rv = 0;
+
+	switch (i)
 	  {
-	  case 0:
-	    rv = (unsigned int)getegid();
-	    id = "egid";
-	    break;
-	  case 1:
-	    rv = (unsigned int)getgid();
-	    id = "gid";
-	    break;
-	  case 2:
-	    rv = (unsigned int)geteuid();
-	    id = "euid";
-	    break;
-	  case 3:
-	    rv = (unsigned int)getuid();
-	    id = "uid";
-	    break;
+	  case 0: rv = (unsigned int)getegid(); id = "egid"; break;
+	  case 1: rv = (unsigned int)getgid();  id = "gid";  break;
+	  case 2: rv = (unsigned int)geteuid(); id = "euid"; break;
+	  case 3: rv = (unsigned int)getuid();  id = "uid";  break;
 	  }
-	  
-	  if (rv == 0)
+
+	if (rv == 0)
 	  {
-	      syslog(LOG_ERR,
-		     "Can not drop all root privileges (%s) !!! %s !!!",
-		     id, strerrno());
-	      delpidfile();
-	      return -1;
+	    syslog(LOG_ERR,
+		   "Can not drop all root privileges (%s) !!! %s !!!",
+		   id, strerrno());
+	    delpidfile();
+	    return -1;
 	  }
       }
   }
-  
+
   while (2)
   {
-      fd_set		rfds = G.readfds;
-      struct timeval	tv = { 15, 0 };
-      int		i;
-      int		tim = time(NULL);
-      
-      TRACE(("calling select(): n = %d, rfds = 0x%x\n\n",
-	     G.conncnt + FCS, *(int *)&rfds));
-      
-      select(G.conncnt + FCS, &rfds, NULL, NULL, G.conncnt? &tv: NULL);
-      
-      for (i = G.conncnt - 1; i >= 0; i--)
+    fd_set		rfds = G.readfds;
+    struct timeval	tv = { 15, 0 };
+    int			i;
+    int			tim = time(NULL);
+
+    TRACE(1, ("calling select(): n = %d, rfds = 0x%x\n\n",
+	      G.conncnt + FCS, *(int *)&rfds));
+
+    select(G.conncnt + FCS, &rfds, NULL, NULL, G.conncnt? &tv: NULL);
+
+    for (i = G.conncnt - 1; i >= 0; i--)
       {
-	  int s = i + FCS;
-	  
-	  if (FD_ISSET(s, &rfds))
+	int s = i + FCS;
+
+	if (FD_ISSET(s, &rfds))
 	  {
-	      char *		buf = conns[i].buf;
-	      unsigned int	len = conns[i].len;
-	      unsigned int	l;
-	      
-	      TRACE(("data socket fd_isset %d\n", s));
-	      
-	      if ((int)(l = read(s, buf + len, sizeof conns[0].buf - len)) > 0)
+	    char *		buf = conns[i].buf;
+	    unsigned int	len = conns[i].len;
+	    unsigned int	l;
+
+	    TRACE(1, ("data socket fd_isset %d\n", s));
+
+	    if ((int)(l = read(s, buf + len, sizeof conns[0].buf - len)) > 0)
 	      {
-		  if (checkInput(buf, len, l))
-		  {
-		      reply(s, buf);
-		      goto deleteconn;
-		  }
-		  else if (len + l >= sizeof conns[0].buf)
+		if (checkInput(buf, len, l))
 		  {
-		      replyError(s, "X-INVALID-REQUEST");
-		      goto deleteconn;
+		    reply(s, buf);
+		    goto deleteconn;
 		  }
-		  else
+		else if (len + l >= sizeof conns[0].buf)
 		  {
-		      conns[i].len += l;
+		    replyError(s, "X-INVALID-REQUEST");
+		    goto deleteconn;
 		  }
+		else
+		  conns[i].len += l;
 	      }
-	      else
-	      {
-		  goto deleteconn;
-	      }
-	      
-	      conns[i].lasttime = tim;
-	      continue;
-	      
+	    else
+	      goto deleteconn;
+
+	    conns[i].lasttime = tim;
+	    continue;
+
 	  deleteconn:
-	      deleteConn(s);
+	    deleteConn(s);
 	  }
-	  else
+	else
 	  {
-	      /* implement as time_after() in linux kernel sources ... */
-	      if (conns[i].lasttime + MAXIDLETIME <= tim)
+	    /* implement as time_after() in linux kernel sources ... */
+	    if (conns[i].lasttime + MAXIDLETIME <= tim)
 	      {
-		  replyError(s, "X-TIMEOUT");
-		  deleteConn(s);
+		replyError(s, "X-TIMEOUT");
+		deleteConn(s);
 	      }
 	  }
       }
-      
-      if (FD_ISSET(0, &rfds))
+
+    if (FD_ISSET(0, &rfds))
       {
-	  int s = accept(0, NULL, 0);
-	  
-	  TRACE(("server socket fd_isset, %d accepted\n", s));
-	  
-	  if (s < 0)
+	int s = accept(0, NULL, 0);
+
+	TRACE(1, ("server socket fd_isset, %d accepted\n", s));
+
+	if (s < 0)
 	  {
-	      if (errno != EINTR) /* EINTR */
-	      {
-		  syslog(LOG_ERR, "accept: %s", strerrno());
-	      }
+	    if (errno != EINTR) /* EINTR */
+	      syslog(LOG_ERR, "accept: %s", strerrno());
 	  }
-	  else
+	else
 	  {
-	      if (G.conncnt == MAXCONNS)
-	      {
-		  i = closeOldest();
-	      }
-	      else
-	      {
-		  i = G.conncnt++;
-	      }
-	      
-	      if (s != i + FCS)
-	      {
-		  movesocket(s, i + FCS);
-	      }
-	      
-	      FD_SET(i + FCS, &G.readfds);
-	      
-	      conns[i].len = 0;
-	      conns[i].lasttime = time(NULL);
+	    if (G.conncnt == MAXCONNS)
+	      i = closeOldest();
+	    else
+	      i = G.conncnt++;
+
+	    movefd(s, i + FCS); /* move if not already there */
+
+	    FD_SET(i + FCS, &G.readfds);
+
+	    conns[i].len = 0;
+	    conns[i].lasttime = time(NULL);
 	  }
       }
   }
 }
 
-static int parseAddrs(char * ptr, int * myaddr, int * heraddr);
+static int parseAddrs(char * ptr, char ** myaddr, char ** heraddr);
 
-static void replyError(int s, char * buf)
+static void replyError(int s, const char * buf)
 {
-  fdprintf(s, "0, 0 : ERROR : %s\r\n", buf);
+  struct iovec iv[3];
+
+  iv[0].iov_base = "0, 0 : ERROR : ";	iv[0].iov_len = 15;
+  iv[1].iov_base = buf;			iv[1].iov_len = strlen(buf);
+  iv[2].iov_base = "\r\n";		iv[2].iov_len = 2;
+
+  writev(s, iv, 3);
 }
 
 static void reply(int s, char * buf)
 {
-  int myaddr, heraddr;
-  
-  myaddr = heraddr = 0;
-  
+  char * myaddr, *heraddr;
+
+  myaddr = heraddr = NULL;
+
   if (parseAddrs(buf, &myaddr, &heraddr))
-  {
-      replyError(s, "X-INVALID-REQUEST");
-  }
+    replyError(s, "X-INVALID-REQUEST");
   else
-  {
-      fdprintf(s, "%d, %d " IDENT_SUBSTR " %.*s\r\n",
-	       myaddr, heraddr, IDSTR_MAX,
+    {
+      struct iovec iv[6];
+#ifdef XXXMULTI
+      const char * iul = G.identuserlist[random() % G.identusers];
+#endif
+
+      iv[0].iov_base = myaddr;		iv[0].iov_len = strlen(myaddr);
+      iv[1].iov_base = ", ";		iv[1].iov_len = 2;
+      iv[2].iov_base = heraddr;		iv[2].iov_len = strlen(heraddr);
+      iv[3].iov_base = checked_cast(const char[], void *, ident_substr);
+      iv[3].iov_len = ident_substr_len;
 #ifdef XXXMULTI
-	       G.identuserlist[random() % G.identusers]
+      iv[4].iov_base = checked_cast(const char *, void *, iul);
+      iv[4].iov_len = strlen(iul);
 #else
-       	       G.identuser
+      if (G.randident)
+	{
+	  /* generate random string as reply: */
+	  int i;
+	  char randomstring[8];
+	  int randlen = (random() % 6) + 3; /* random string length 3-8 */
+
+	  /* have first char letter... */
+	  randomstring[0] = alphanum[10 + random() % 52];
+
+	  for (i = 1; i < randlen; i++)
+	    randomstring[i] = alphanum[random() % 62];
+
+	  iv[4].iov_base = checked_cast(char [], void *, randomstring);
+	  iv[4].iov_len = randlen;
+	}
+      else
+	{
+          /* use usual behaviour */
+          iv[4].iov_base = checked_cast(const char *, void *, G.identuser);
+          iv[4].iov_len = strlen(G.identuser);
+	}
 #endif
-	       );
-  }
-}
+      iv[5].iov_base = "\r\n";	iv[5].iov_len = 2;
 
+      writev(s, iv, 6);
+    }
+}
 
-static int chmatch(char c, char * chars)
+static int chmatch(char c, const char * chars)
 {
-  while (*chars)
-  {
+  for (; *chars; chars++)
     if (c == *chars)
-    {
-	return 1;
-    }
-    else
-    {
-	chars++;
-    }
-  }
+      return 1;
 
   return 0;
 }
 
-static int skipchars(char ** p, char * chars)
+static int skipchars(char ** p, const char * chars)
 {
   while (chmatch(**p, chars))
-  {
-      (*p)++;
-  }
+    (*p)++;
 
   if (**p == '\r' || **p == '\n')
-  {
-      return -1;
-  }
+    return 0;
 
-  return 0;
+  return 1;
 }
 
-static int parseAddrs(char * ptr, int * myaddr, int * heraddr)
+static int parseAddrs(char * ptr, char ** myaddr, char ** heraddr)
 {
   /* parse <port-on-server> , <port-on-client> */
 
-  if (skipchars(&ptr, " \t") ||
-      (*myaddr = atoi(ptr)) <= 0 ||
-      skipchars(&ptr, "1234567890") ||
-      skipchars(&ptr, " \t,") ||
-      (*heraddr = atoi(ptr)) <= 0)
-  {
-      return -1;
-  }
+  if (! skipchars(&ptr, " \t"))
+    return -1;
 
-  return 0;
-}
+  *myaddr = ptr;
 
+  if (! skipchars(&ptr, "1234567890"))
+    return -1;
 
-/*
- * Variables for Emacs
- *
- * Local variables:
- * mode: c
- * c-file-style: "gnu"
- * c-file-offsets: ( (substatement-open . 0) (statement-block-intro . ++) )
- * tab-width: 8
- * compile-command: "sh identd.c"
- * End:
- */
+  if (! chmatch(*ptr, " \t,"))
+    return -1;
+
+  *ptr++ = '\0';
+
+  if (! skipchars(&ptr, " \t,") )
+    return -1;
+
+  *heraddr = ptr;
+
+  skipchars(&ptr, "1234567890");
+
+  if (! chmatch(*ptr, " \n\r"))
+    return -1;
+
+  *ptr = '\0';
+
+  return 0;
+}
 
 /* EOF */
diff --git a/security/fakeident/pkg-descr b/security/fakeident/pkg-descr
index 747ad28b6281..6c5ffcab6f4d 100644
--- a/security/fakeident/pkg-descr
+++ b/security/fakeident/pkg-descr
@@ -1,5 +1,9 @@
-Fake Identd is a tool that replies with a standard answer to all incoming
-identd requests on a host, making it nearly perfect for a masquerading
-router.
+This program is standalone 'fake' ident daemon. This program does
+not fork() but is configured to handle up to 20 concurrent connections.
+Since one connection should not last long, if all 20 connections are
+in use, the next connection will close the oldest connection data
+has been read. This way this program is not very vulnerable to so
+called `denial of service' attack, thus making this ideal "identd"
+to be used in a firewall, IP masquerading hosts etc.
 
-WWW: http://hangout.de/fakeidentd/index.html
+WWW: http://www.guru-group.fi/~too/sw/identd.readme
diff --git a/security/fsh/files/patch-Makefile.in b/security/fsh/files/patch-Makefile.in
new file mode 100644
index 000000000000..bff959202cb7
--- /dev/null
+++ b/security/fsh/files/patch-Makefile.in
@@ -0,0 +1,71 @@
+--- Makefile.in.orig	2001-12-23 11:10:13 UTC
++++ Makefile.in
+@@ -40,7 +40,7 @@ exec_prefix = @exec_prefix@
+ 
+ bindir = @bindir@
+ sbindir = @sbindir@
+-libexecdir = @libexecdir@
++libexecdir = @ac_libexecdir@
+ datadir = @datadir@
+ sysconfdir = @sysconfdir@
+ sharedstatedir = @sharedstatedir@
+@@ -81,7 +81,7 @@ EXEEXT = @EXEEXT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+-PYTHON = @PYTHON@
++PYTHON = @PYTHON_CMD@
+ VERSION = @VERSION@
+ am__include = @am__include@
+ am__quote = @am__quote@
+@@ -576,16 +576,16 @@ uninstall-am: uninstall-binSCRIPTS uninstall-info-am \
+ 
+ starter: Makefile $(srcdir)/$(PYTHON_SCRIPT_TEMPLATE)
+ 	rm -f $@ $@.tmp
+-	sed -e 's%@\PYTHON@%$(PYTHON)%' \
+-	    -e 's%@\pkgdatadir@%$(pkgdatadir)%' \
++	sed -e 's%@PYTHON@%$(PYTHON)%' \
++	    -e 's%@pkgdatadir@%$(pkgdatadir)%' \
+ 	    < $(srcdir)/$(PYTHON_SCRIPT_TEMPLATE) > $@.tmp
+ 	mv $@.tmp $@
+ 
+ fsh: fsh.in Makefile starter
+ 	rm -f $@ $@.tmp
+ 	cat starter > $@.tmp
+-	sed -e 's%@\PYTHON@%$(PYTHON)%' \
+-	    -e 's%@\pkgdatadir@%$(pkgdatadir)%' \
++	sed -e 's%@PYTHON@%$(PYTHON)%' \
++	    -e 's%@pkgdatadir@%$(pkgdatadir)%' \
+ 	    < $(srcdir)/fsh.in >> $@.tmp
+ 	chmod +x $@.tmp
+ 	mv $@.tmp $@
+@@ -593,8 +593,8 @@ fsh: fsh.in Makefile starter
+ fshd: fshd.in Makefile starter
+ 	rm -f $@ $@.tmp
+ 	cat starter > $@.tmp
+-	sed -e 's%@\PYTHON@%$(PYTHON)%' \
+-	    -e 's%@\pkgdatadir@%$(pkgdatadir)%' \
++	sed -e 's%@PYTHON@%$(PYTHON)%' \
++	    -e 's%@pkgdatadir@%$(pkgdatadir)%' \
+ 	    < $(srcdir)/fshd.in >> $@.tmp
+ 	chmod +x $@.tmp
+ 	mv $@.tmp $@
+@@ -602,15 +602,15 @@ fshd: fshd.in Makefile starter
+ in.fshd: in.fshd.in Makefile starter
+ 	rm -f $@ $@.tmp
+ 	cat starter > $@.tmp
+-	sed -e 's%@\PYTHON@%$(PYTHON)%' \
+-	    -e 's%@\pkgdatadir@%$(pkgdatadir)%' \
++	sed -e 's%@PYTHON@%$(PYTHON)%' \
++	    -e 's%@pkgdatadir@%$(pkgdatadir)%' \
+ 	    < $(srcdir)/in.fshd.in >> $@.tmp
+ 	chmod +x $@.tmp
+ 	mv $@.tmp $@
+ 
+ fcp: fcp.sh Makefile
+ 	rm -f $@ $@.tmp
+-	sed -e 's%@\libexecdir@%$(libexecdir)%g' \
++	sed -e 's%@libexecdir@%$(libexecdir)%g' \
+ 	    < $(srcdir)/fcp.sh > $@.tmp
+ 	chmod +x $@.tmp
+ 	mv $@.tmp $@
diff --git a/security/fsh/files/patch-configure b/security/fsh/files/patch-configure
new file mode 100644
index 000000000000..97c9c2f829b4
--- /dev/null
+++ b/security/fsh/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	2001-12-23 11:10:13 UTC
++++ configure
+@@ -2732,7 +2732,7 @@ s,@prefix@,$prefix,;t t
+ s,@program_transform_name@,$program_transform_name,;t t
+ s,@bindir@,$bindir,;t t
+ s,@sbindir@,$sbindir,;t t
+-s,@libexecdir@,$libexecdir,;t t
++s,@ac_libexecdir@,$libexecdir,;t t
+ s,@datadir@,$datadir,;t t
+ s,@sysconfdir@,$sysconfdir,;t t
+ s,@sharedstatedir@,$sharedstatedir,;t t
+@@ -2778,7 +2778,7 @@ s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
+ s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+ s,@DEPDIR@,$DEPDIR,;t t
+ s,@DEFAULT_FSHD_TIMEOUT@,$DEFAULT_FSHD_TIMEOUT,;t t
+-s,@PYTHON@,$PYTHON,;t t
++s,@PYTHON_CMD@,$PYTHON,;t t
+ s,@PYTHON_SCRIPT_TEMPLATE@,$PYTHON_SCRIPT_TEMPLATE,;t t
+ s,@CC@,$CC,;t t
+ s,@CFLAGS@,$CFLAGS,;t t
diff --git a/security/keybase/Makefile b/security/keybase/Makefile
index 0446f90dda7e..82cdecb39d6f 100644
--- a/security/keybase/Makefile
+++ b/security/keybase/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	keybase
-PORTVERSION=	4.4.0
+PORTVERSION=	4.4.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
diff --git a/security/keybase/distinfo b/security/keybase/distinfo
index 8621b31b496f..5a4f9d178274 100644
--- a/security/keybase/distinfo
+++ b/security/keybase/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567611054
-SHA256 (keybase-client-v4.4.0_GH0.tar.gz) = 9e4d7c8bbf087347fcdb5f150205560a56912848d30e2e0630c1c3469ec07b06
-SIZE (keybase-client-v4.4.0_GH0.tar.gz) = 57824598
+TIMESTAMP = 1568290918
+SHA256 (keybase-client-v4.4.1_GH0.tar.gz) = dfac5ff4ecd5cd75f22ebece24c2e074cc83e38c7b207e074ca2c96ec3c96b7b
+SIZE (keybase-client-v4.4.1_GH0.tar.gz) = 57824646
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 6d1068eab9e2..f007cc634a9a 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openssl
-PORTVERSION=	1.0.2s
+PORTVERSION=	1.0.2t
 PORTEPOCH=	1
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/source/ \
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 27a42a0f8e8c..4257eec68d62 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1559071405
-SHA256 (openssl-1.0.2/openssl-1.0.2s.tar.gz) = cabd5c9492825ce5bd23f3c3aeed6a97f8142f606d893df216411f07d1abab96
-SIZE (openssl-1.0.2/openssl-1.0.2s.tar.gz) = 5349149
+TIMESTAMP = 1568190703
+SHA256 (openssl-1.0.2/openssl-1.0.2t.tar.gz) = 14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc
+SIZE (openssl-1.0.2/openssl-1.0.2t.tar.gz) = 5355422
 SHA256 (openssl-1.0.2/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 2eddcb7ab342285cb637ce6b6be143cca835f449f35dd9bb8c7b9167ba2117a7
 SIZE (openssl-1.0.2/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3717
 SHA256 (openssl-1.0.2/1002-backport-changes-from-upstream-padlock-module.patch) = aee88a24622ce9d71e38deeb874e58435dcf8ff5690f56194f0e4a00fb09b260
diff --git a/security/openssl111/Makefile b/security/openssl111/Makefile
index 6912188e17a1..11182937920d 100644
--- a/security/openssl111/Makefile
+++ b/security/openssl111/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openssl
-PORTVERSION=	1.1.1c
+PORTVERSION=	1.1.1d
 CATEGORIES=	security devel
 MASTER_SITES=	https://www.openssl.org/source/ \
 		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
@@ -66,7 +66,7 @@ GOST_DESC=	GOST (Russian standard)
 HASHES_DESC=	Hash Function Support
 I386_DESC=	i386 (instead of i486+)
 IDEA_DESC=	International Data Encryption Algorithm
-MAN3_DESC=	Install API manpages (section 3)
+MAN3_DESC=	Install API manpages (section 3, 7)
 MD2_DESC=	MD2 (obsolete)
 MD4_DESC=	MD4 (unsafe)
 MDC2_DESC=	MDC-2 (patented, requires DES)
@@ -96,7 +96,7 @@ ${_option:tu}_CONFIGURE_ON=	enable-${_option}
 .endfor
 
 # Upstream default enabled options
-.for _option in aria asm async ct des gost idea md4 mdc2 nextprotoneg \
+.for _option in aria asm async ct des gost idea md4 mdc2 nextprotoneg rc2 rc4 \
 	rfc3779 rmd160 shared sm2 sm3 sm4 sse2 threads tls1 tls1_1 tls1_2
 ${_option:tu}_CONFIGURE_OFF=	no-${_option}
 .endfor
diff --git a/security/openssl111/distinfo b/security/openssl111/distinfo
index 24a7b25412f4..e502f0e44f9c 100644
--- a/security/openssl111/distinfo
+++ b/security/openssl111/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559070548
-SHA256 (openssl-1.1.1c.tar.gz) = f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90
-SIZE (openssl-1.1.1c.tar.gz) = 8864262
+TIMESTAMP = 1568189063
+SHA256 (openssl-1.1.1d.tar.gz) = 1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2
+SIZE (openssl-1.1.1d.tar.gz) = 8845861
diff --git a/security/openssl111/files/extra-patch-util_process__docs.pl b/security/openssl111/files/extra-patch-util_process__docs.pl
index 50887f597e88..d81c00d4656f 100644
--- a/security/openssl111/files/extra-patch-util_process__docs.pl
+++ b/security/openssl111/files/extra-patch-util_process__docs.pl
@@ -5,7 +5,7 @@
  
  unless ($options{section}) {
 -    $options{section} = [ 1, 3, 5, 7 ];
-+    $options{section} = [ 1, 5, 7 ];
++    $options{section} = [ 1, 5 ];
  }
  unless ($options{sourcedir}) {
      $options{sourcedir} = catdir($config{sourcedir}, "doc");
@@ -14,7 +14,7 @@
                         html => ".html" } -> {$options{type}};
          my $generate = { man  => "pod2man --name=$name --section=$podinfo{section} --center=OpenSSL --release=$config{version} \"$podpath\"",
 -                         html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=man1:man3:man5:man7 \"--infile=$podpath\" \"--title=$podname\" --quiet"
-+                         html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=man1:man5:man7 \"--infile=$podpath\" \"--title=$podname\" --quiet"
++                         html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=man1:man5 \"--infile=$podpath\" \"--title=$podname\" --quiet"
                           } -> {$options{type}};
          my $output_dir = catdir($options{destdir}, "man$podinfo{section}");
          my $output_file = $podname . $suffix;
diff --git a/security/openssl111/pkg-plist b/security/openssl111/pkg-plist
index d0d0739083de..1983b830bfd7 100644
--- a/security/openssl111/pkg-plist
+++ b/security/openssl111/pkg-plist
@@ -767,6 +767,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/CRYPTO_mem_leaks.3.gz
 %%MAN3%%man/man3/CRYPTO_mem_leaks_cb.3.gz
 %%MAN3%%man/man3/CRYPTO_mem_leaks_fp.3.gz
+%%MAN3%%man/man3/CRYPTO_memcmp.3.gz
 %%MAN3%%man/man3/CRYPTO_new_ex_data.3.gz
 %%MAN3%%man/man3/CRYPTO_realloc.3.gz
 %%MAN3%%man/man3/CRYPTO_secure_clear_free.3.gz
@@ -3228,6 +3229,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/X509_CRL_add0_revoked.3.gz
 %%MAN3%%man/man3/X509_CRL_add1_ext_i2d.3.gz
 %%MAN3%%man/man3/X509_CRL_add_ext.3.gz
+%%MAN3%%man/man3/X509_CRL_cmp.3.gz
 %%MAN3%%man/man3/X509_CRL_delete_ext.3.gz
 %%MAN3%%man/man3/X509_CRL_digest.3.gz
 %%MAN3%%man/man3/X509_CRL_dup.3.gz
@@ -3248,6 +3250,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/X509_CRL_get_issuer.3.gz
 %%MAN3%%man/man3/X509_CRL_get_signature_nid.3.gz
 %%MAN3%%man/man3/X509_CRL_get_version.3.gz
+%%MAN3%%man/man3/X509_CRL_match.3.gz
 %%MAN3%%man/man3/X509_CRL_new.3.gz
 %%MAN3%%man/man3/X509_CRL_set1_lastUpdate.3.gz
 %%MAN3%%man/man3/X509_CRL_set1_nextUpdate.3.gz
@@ -3312,6 +3315,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/X509_NAME_add_entry_by_NID.3.gz
 %%MAN3%%man/man3/X509_NAME_add_entry_by_OBJ.3.gz
 %%MAN3%%man/man3/X509_NAME_add_entry_by_txt.3.gz
+%%MAN3%%man/man3/X509_NAME_cmp.3.gz
 %%MAN3%%man/man3/X509_NAME_delete_entry.3.gz
 %%MAN3%%man/man3/X509_NAME_digest.3.gz
 %%MAN3%%man/man3/X509_NAME_dup.3.gz
@@ -3513,12 +3517,15 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/X509_check_issued.3.gz
 %%MAN3%%man/man3/X509_check_private_key.3.gz
 %%MAN3%%man/man3/X509_cmp_current_time.3.gz
+%%MAN3%%man/man3/X509_cmp.3.gz
 %%MAN3%%man/man3/X509_cmp_time.3.gz
 %%MAN3%%man/man3/X509_delete_ext.3.gz
 %%MAN3%%man/man3/X509_digest.3.gz
 %%MAN3%%man/man3/X509_dup.3.gz
 %%MAN3%%man/man3/X509_free.3.gz
+%%MAN3%%man/man3/X509_get0_authority_issuer.3.gz
 %%MAN3%%man/man3/X509_get0_authority_key_id.3.gz
+%%MAN3%%man/man3/X509_get0_authority_serial.3.gz
 %%MAN3%%man/man3/X509_get0_extensions.3.gz
 %%MAN3%%man/man3/X509_get0_notAfter.3.gz
 %%MAN3%%man/man3/X509_get0_notBefore.3.gz
@@ -3551,6 +3558,8 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/X509_get_version.3.gz
 %%MAN3%%man/man3/X509_getm_notAfter.3.gz
 %%MAN3%%man/man3/X509_getm_notBefore.3.gz
+%%MAN3%%man/man3/X509_issuer_and_serial_cmp.3.gz
+%%MAN3%%man/man3/X509_issuer_name_cmp.3.gz
 %%MAN3%%man/man3/X509_load_cert_crl_file.3.gz
 %%MAN3%%man/man3/X509_load_cert_file.3.gz
 %%MAN3%%man/man3/X509_load_crl_file.3.gz
@@ -3568,6 +3577,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/X509_set_version.3.gz
 %%MAN3%%man/man3/X509_sign.3.gz
 %%MAN3%%man/man3/X509_sign_ctx.3.gz
+%%MAN3%%man/man3/X509_subject_name_cmp.3.gz
 %%MAN3%%man/man3/X509_time_adj.3.gz
 %%MAN3%%man/man3/X509_time_adj_ex.3.gz
 %%MAN3%%man/man3/X509_up_ref.3.gz
@@ -4012,25 +4022,25 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/ssl_ct_validation_cb.3.gz
 man/man5/config.5.gz
 man/man5/x509v3_config.5.gz
-man/man7/Ed25519.7.gz
-man/man7/Ed448.7.gz
-man/man7/RAND.7.gz
-man/man7/RAND_DRBG.7.gz
-man/man7/RSA-PSS.7.gz
-man/man7/SM2.7.gz
-man/man7/X25519.7.gz
-man/man7/X448.7.gz
-man/man7/bio.7.gz
-man/man7/crypto.7.gz
-man/man7/ct.7.gz
-man/man7/des_modes.7.gz
-man/man7/evp.7.gz
-man/man7/ossl_store.7.gz
-man/man7/ossl_store-file.7.gz
-man/man7/passphrase-encoding.7.gz
-man/man7/scrypt.7.gz
-man/man7/ssl.7.gz
-man/man7/x509.7.gz
+%%MAN3%%man/man7/Ed25519.7.gz
+%%MAN3%%man/man7/Ed448.7.gz
+%%MAN3%%man/man7/RAND.7.gz
+%%MAN3%%man/man7/RAND_DRBG.7.gz
+%%MAN3%%man/man7/RSA-PSS.7.gz
+%%MAN3%%man/man7/SM2.7.gz
+%%MAN3%%man/man7/X25519.7.gz
+%%MAN3%%man/man7/X448.7.gz
+%%MAN3%%man/man7/bio.7.gz
+%%MAN3%%man/man7/crypto.7.gz
+%%MAN3%%man/man7/ct.7.gz
+%%MAN3%%man/man7/des_modes.7.gz
+%%MAN3%%man/man7/evp.7.gz
+%%MAN3%%man/man7/ossl_store.7.gz
+%%MAN3%%man/man7/ossl_store-file.7.gz
+%%MAN3%%man/man7/passphrase-encoding.7.gz
+%%MAN3%%man/man7/scrypt.7.gz
+%%MAN3%%man/man7/ssl.7.gz
+%%MAN3%%man/man7/x509.7.gz
 %%OPENSSLDIR%%/misc/CA.pl
 %%OPENSSLDIR%%/misc/tsget
 @comment %%OPENSSLDIR%%/misc/tsget.pl
diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile
index bc89487807cd..b03136674601 100644
--- a/security/openvpn-devel/Makefile
+++ b/security/openvpn-devel/Makefile
@@ -2,18 +2,22 @@
 # $FreeBSD$
 
 PORTNAME=		openvpn
-DISTVERSION=		201907
+DISTVERSION=		201935
 CATEGORIES=		security net net-vpn
 MASTER_SITES=		https://secure-computing.net/files/openvpn/ \
 			ftp://ftp2.secure-computing.net/pub/FreeBSD/openvpn-devel/
 PKGNAMESUFFIX=		-devel
 
 MAINTAINER=		ecrist@secure-computing.net
+# let's use ?= in spite of portlint WARNings because this might become
+# security/openvpn one day which would then have a slave port:
 COMMENT?=		Secure IP/Ethernet tunnel daemon
 
 LICENSE=		GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT.GPL
 
+IGNORE_SSL=		libressl libressl-devel
+
 USES=			cpe libtool pkgconfig shebangfix tar:xz
 
 CONFLICTS_INSTALL?=	openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* openvpn-devel-[0-9]* openvpn-mbedtls-[0-9]*
@@ -41,7 +45,7 @@ OPTIONS_SINGLE=		SSL
 OPTIONS_SINGLE_SSL=	OPENSSL MBEDTLS
 PKCS11_DESC=		Use security/pkcs11-helper
 EASYRSA_DESC=		Install security/easy-rsa RSA helper package
-MBEDTLS_DESC=		SSL/TLS via mbedTLS
+MBEDTLS_DESC=		SSL/TLS via mbedTLS (lacks TLS v1.3)
 TUNNELBLICK_DESC=	Tunnelblick XOR scramble patch (READ HELP!)
 X509ALTUSERNAME_DESC=	Enable --x509-username-field (OpenSSL only)
 SMALL_DESC=		Build a smaller executable with fewer features
@@ -71,7 +75,6 @@ MBEDTLS_LIB_DEPENDS=	libmbedtls.so:security/mbedtls
 MBEDTLS_CONFIGURE_ON=	--with-crypto-library=mbedtls
 
 USE_RC_SUBR=		openvpn
-USE_LDCONFIG=		${PREFIX}/lib
 
 SUB_FILES=		pkg-message openvpn-client
 
@@ -115,22 +118,11 @@ _tlslibs=libmbedtls libmbedx509 libmbedcrypto
 _tlslibs=libssl libcrypto
 .endif
 
-.if ${SSL_DEFAULT:Mlibressl*} && empty(PORT_OPTIONS:MMBEDTLS)
-pre-everything::
-	@${ECHO_CMD} "WARNING: OpenVPN does not officially support LibreSSL."
-	@${ECHO_CMD} "If things break, rebuild with OpenSSL or mbedTLS."
-	@${ECHO_CMD} "You may wish to change your default SSL library"
-	@${ECHO_CMD} "and press Ctrl+C within the next 10 seconds to abort."
-.  if !(defined(PACKAGE_BUILDING) || defined(BATCH))
-	@sleep 10
-.  endif
-.endif
-
 # sanity check that we don't inherit incompatible SSL libs through,
 # for instance, pkcs11-helper:
 post-build:
-	   @a=$$(LC_ALL=C ldd -f '%o\n' ${WRKSRC}/src/openvpn/openvpn \
-	| ${SORT} -u) ; set -- $$(for i in ${_tlslibs} ; do ${PRINTF} '%s\n' "$$a" | ${GREP} $${i}.so | wc -l ; done | ${SORT} -u) ;\
+	@a=$$(LC_ALL=C ldd -f '%o\n' ${WRKSRC}/src/openvpn/openvpn \
+	|	${SORT} -u) ; set -- $$(for i in ${_tlslibs} ; do ${PRINTF} '%s\n' "$$a" | ${GREP} $${i}.so | wc -l ; done | ${SORT} -u) ;\
 	if test "$$*" != "1" ; then ${ECHO_CMD} >&2 "${.CURDIR} FAILED: either of ${_tlslibs} libraries linked multiple times" ; ${PRINTF} '%s\n' "$$a"; ${RM} ${BUILD_COOKIE} ; exit 1 ; fi
 
 post-install:
diff --git a/security/openvpn-devel/distinfo b/security/openvpn-devel/distinfo
index 54ac2c92d6cd..62ae5f2d2719 100644
--- a/security/openvpn-devel/distinfo
+++ b/security/openvpn-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550580278
-SHA256 (openvpn-201907.tar.xz) = 1e2394ca6582877c90fc3d9948cfb1b1c1aaa2383c02af62410d5a51f812ff68
-SIZE (openvpn-201907.tar.xz) = 995288
+TIMESTAMP = 1567798649
+SHA256 (openvpn-201935.tar.xz) = a34dc87188ae38f148e99cc129db2ed05e33c7b41237373b34b5d711481cfc5f
+SIZE (openvpn-201935.tar.xz) = 1002220
diff --git a/security/openvpn-devel/files/patch-configure b/security/openvpn-devel/files/patch-configure
deleted file mode 100644
index 226436314279..000000000000
--- a/security/openvpn-devel/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2016-08-23 14:19:07 UTC
-+++ configure
-@@ -17160,8 +17160,6 @@ fi
- $as_echo "!! WARNING !! The cmoka git submodule has not been initialized or updated.  Unit testing cannot be performed." >&6; }
-    fi
- else
--   { $as_echo "$as_me:${as_lineno-$LINENO}: result: !! WARNING !! CMake is NOT available.  Unit testing cannot be performed." >&5
--$as_echo "!! WARNING !! CMake is NOT available.  Unit testing cannot be performed." >&6; }
-     if false; then
-   CMOCKA_INITIALIZED_TRUE=
-   CMOCKA_INITIALIZED_FALSE='#'
diff --git a/security/openvpn-devel/files/patch-src_openvpn_openssl__compat.h b/security/openvpn-devel/files/patch-src_openvpn_openssl__compat.h
new file mode 100644
index 000000000000..4f72e79ef421
--- /dev/null
+++ b/security/openvpn-devel/files/patch-src_openvpn_openssl__compat.h
@@ -0,0 +1,20 @@
+--- src/openvpn/openssl_compat.h.orig	2019-02-20 12:28:23 UTC
++++ src/openvpn/openssl_compat.h
+@@ -735,7 +735,7 @@ SSL_CTX_get_max_proto_version(SSL_CTX *ctx)
+ }
+ #endif /* SSL_CTX_get_max_proto_version */
+ 
+-#ifndef SSL_CTX_set_min_proto_version
++#if !defined(SSL_CTX_set_min_proto_version) && !defined(LIBRESSL_VERSION_NUMBER)
+ /** Mimics SSL_CTX_set_min_proto_version for OpenSSL < 1.1 */
+ static inline int
+ SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_ver_min)
+@@ -764,7 +764,7 @@ SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_v
+ }
+ #endif /* SSL_CTX_set_min_proto_version */
+ 
+-#ifndef SSL_CTX_set_max_proto_version
++#if !defined(SSL_CTX_set_max_proto_version) && !defined(LIBRESSL_VERSION_NUMBER)
+ /** Mimics SSL_CTX_set_max_proto_version for OpenSSL < 1.1 */
+ static inline int
+ SSL_CTX_set_max_proto_version(SSL_CTX *ctx, long tls_ver_max)
diff --git a/security/openvpn-devel/pkg-descr b/security/openvpn-devel/pkg-descr
index 6c45b3e18a45..983b0a980f5d 100644
--- a/security/openvpn-devel/pkg-descr
+++ b/security/openvpn-devel/pkg-descr
@@ -10,4 +10,4 @@ there is a good chance this program will not run.
 
 DO NOT USE IN PRODUCTION WITHOUT CAUTION
 
-WWW: http://openvpn.net/
+WWW: http://openvpn.net/index.php/open-source.html
diff --git a/security/openvpn-devel/pkg-help b/security/openvpn-devel/pkg-help
new file mode 100644
index 000000000000..9fd1cd9567bd
--- /dev/null
+++ b/security/openvpn-devel/pkg-help
@@ -0,0 +1,10 @@
+Note that "Tunnelblick" is a controversial option.
+It is included for compatibility, not enabled by default,
+and should only be used with due consideration, and it should not
+replace proper cryptography use in OpenVPN.
+
+Note that this patch does NOT add documentation for the new --scramble
+option, neither to the --help output, nor the manual page.
+
+Please see this website for a more detailed discussion:
+https://tunnelblick.net/cOpenvpn_xorpatch.html
diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile
index ec769d35869b..dc01850e51e2 100644
--- a/security/openvpn/Makefile
+++ b/security/openvpn/Makefile
@@ -23,7 +23,7 @@ SHEBANG_FILES=		sample/sample-scripts/verify-cn \
 			sample/sample-scripts/auth-pam.pl \
 			sample/sample-scripts/ucn.pl
 CONFIGURE_ARGS+=	--enable-strict
-# avoid picking up CMAKE, we don't have cmocka in the tarballs..
+# avoid picking up CMAKE, we don't have cmocka in the tarballs.
 CONFIGURE_ENV+=		ac_cv_prog_CMAKE= CMAKE=
 
 # let OpenVPN's configure script pick up the requisite libraries,
@@ -62,7 +62,6 @@ X509ALTUSERNAME_PREVENTS_MSG=	OpenVPN ${DISTVERSION} cannot use --x509-username-
 
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ON=	--with-crypto-library=openssl
-IGNORE_SSL=		libressl libressl-devel
 
 LZ4_CONFIGURE_OFF=	--disable-lz4
 
@@ -72,7 +71,6 @@ MBEDTLS_LIB_DEPENDS=	libmbedtls.so:security/mbedtls
 MBEDTLS_CONFIGURE_ON=	--with-crypto-library=mbedtls
 
 USE_RC_SUBR=		openvpn
-USE_LDCONFIG=		${PREFIX}/lib
 
 SUB_FILES=		pkg-message openvpn-client
 
diff --git a/security/openvpn/files/patch-libressl b/security/openvpn/files/patch-libressl
new file mode 100644
index 000000000000..d8f9e35cbcdb
--- /dev/null
+++ b/security/openvpn/files/patch-libressl
@@ -0,0 +1,66 @@
+commit 5bc848a02665f26e83e5dbe8f4ef95f55e5e19bd
+Author: Matthias Andree <matthias.andree@gmx.de>
+Date:   Mon Aug 12 23:37:52 2019 +0200
+
+    Fix regression, reinstate LibreSSL support.
+    
+    OpenVPN 2.4.6 could be compiled with LibreSSL, 2.4.7 cannot.  This was broken
+    since 9de7fe0a "Add support for tls-ciphersuites for TLS 1.3".
+    
+    This patch avoids using TLS 1.3 directly, be it that OpenSSL was compiled
+    without TLS 1.3 support, or LibreSSL was used.
+    
+    This patch was based on an OpenBSD patch by
+    Jeremie Courreges-Anglas <jca@openbsd.org>, see
+    https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/openvpn/patches/patch-src_openvpn_ssl_openssl_c
+    but was revised to be more obvious and check actual feature macros,
+    do not rely on current LibreSSL implementation details alone.
+    
+    Franco Fichtner reports that OPNsense has been a long-time user
+    of LibreSSL without reported breakage, see also:
+    https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238382#c10
+    
+    Signed-off-by: Matthias Andree <matthias.andree@gmx.de>
+
+diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c
+index a78dae99..293bb192 100644
+--- ./src/openvpn/ssl_openssl.c
++++ ./src/openvpn/ssl_openssl.c
+@@ -206,7 +206,7 @@ info_callback(INFO_CALLBACK_SSL_CONST SSL *s, int where, int ret)
+ int
+ tls_version_max(void)
+ {
+-#if defined(TLS1_3_VERSION)
++#if defined(TLS1_3_VERSION) && !defined(OPENSSL_NO_TLS1_3)
+     return TLS_VER_1_3;
+ #elif defined(TLS1_2_VERSION) || defined(SSL_OP_NO_TLSv1_2)
+     return TLS_VER_1_2;
+@@ -233,7 +233,7 @@ openssl_tls_version(int ver)
+     {
+         return TLS1_2_VERSION;
+     }
+-#if defined(TLS1_3_VERSION)
++#if defined(TLS1_3_VERSION) && !defined(OPENSSL_NO_TLS1_3)
+     else if (ver == TLS_VER_1_3)
+     {
+         return TLS1_3_VERSION;
+@@ -459,8 +459,8 @@ tls_ctx_restrict_ciphers_tls13(struct tls_root_ctx *ctx, const char *ciphers)
+         return;
+     }
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x1010100fL)
+-        crypto_msg(M_WARN, "Not compiled with OpenSSL 1.1.1 or higher. "
++#if (OPENSSL_VERSION_NUMBER < 0x1010100fL) || !defined(TLS1_3_VERSION) || defined(OPENSSL_NO_TLS1_3)
++        crypto_msg(M_WARN, "Not compiled with OpenSSL 1.1.1 or higher, or without TLS 1.3 support. "
+                        "Ignoring TLS 1.3 only tls-ciphersuites '%s' setting.",
+                         ciphers);
+ #else
+@@ -1846,7 +1846,7 @@ show_available_tls_ciphers_list(const char *cipher_list,
+         crypto_msg(M_FATAL, "Cannot create SSL_CTX object");
+     }
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL)
++#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL) && defined(TLS1_3_VERSION) && !defined(OPENSSL_NO_TLS1_3)
+     if (tls13)
+     {
+         SSL_CTX_set_min_proto_version(tls_ctx.ctx, TLS1_3_VERSION);
diff --git a/security/p11-kit/Makefile b/security/p11-kit/Makefile
index 46ea1a27f2fa..6665c6861908 100644
--- a/security/p11-kit/Makefile
+++ b/security/p11-kit/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	p11-kit
-PORTVERSION=	0.23.16.1
+PORTVERSION=	0.23.17
 CATEGORIES=	security devel
 MASTER_SITES=	https://github.com/p11-glue/p11-kit/releases/download/${PORTVERSION}/
 
diff --git a/security/p11-kit/distinfo b/security/p11-kit/distinfo
index 7590dd14cde7..c01e84a8bb15 100644
--- a/security/p11-kit/distinfo
+++ b/security/p11-kit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558864097
-SHA256 (p11-kit-0.23.16.1.tar.gz) = 4b34e92ae36fa493e0d94366c767f06d5f9951e3d8581d10fd935d738db1574d
-SIZE (p11-kit-0.23.16.1.tar.gz) = 1292783
+TIMESTAMP = 1568263702
+SHA256 (p11-kit-0.23.17.tar.gz) = 5447b25d66c05f86cce5bc8856f7a074be84c186730e32c74069ca03386d7c1e
+SIZE (p11-kit-0.23.17.tar.gz) = 1278291
diff --git a/security/pam_p11/Makefile b/security/pam_p11/Makefile
index 70d7ddaa51fb..b1667561d3f7 100644
--- a/security/pam_p11/Makefile
+++ b/security/pam_p11/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pam_p11
-PORTVERSION=	0.3.0
+PORTVERSION=	0.3.1
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/OpenSC/pam_p11/releases/download/pam_p11-${PORTVERSION}/
 
diff --git a/security/pam_p11/distinfo b/security/pam_p11/distinfo
index 935faf2f4641..55f4b1310d21 100644
--- a/security/pam_p11/distinfo
+++ b/security/pam_p11/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556530943
-SHA256 (pam_p11-0.3.0.tar.gz) = 7b48dc8750af11e16a1a16e7bb775804b5eae4c4b123c24377d6975731da4552
-SIZE (pam_p11-0.3.0.tar.gz) = 422806
+TIMESTAMP = 1568275438
+SHA256 (pam_p11-0.3.1.tar.gz) = f6add2ba4acd3c54995eae2a1a91860943dc696ffd2beb4c3e1dc434fb4405c9
+SIZE (pam_p11-0.3.1.tar.gz) = 422940
diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile
index 4b3652b7f1bc..55a9b5a1e8dc 100644
--- a/security/py-certbot/Makefile
+++ b/security/py-certbot/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	certbot
 PORTVERSION=	${ACME_VERSION}
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
@@ -34,10 +35,17 @@ USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
+SUB_FILES=	500.certbot
+PLIST_FILES=	etc/periodic/weekly/500.certbot
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/certbot/compat/misc.py
 
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/weekly
+	${INSTALL_SCRIPT} ${WRKDIR}/500.certbot \
+		${STAGEDIR}${PREFIX}/etc/periodic/weekly
+
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
diff --git a/security/py-certbot/files/500.certbot.in b/security/py-certbot/files/500.certbot.in
new file mode 100644
index 000000000000..be71c68b549c
--- /dev/null
+++ b/security/py-certbot/files/500.certbot.in
@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Automatically renew Let's Encrypt certificates each week
+#
+# Add the following lines to /etc/periodic.conf:
+#
+# weekly_certbot_enable (bool):	Set to "NO" by default
+# weekly_certbot_service (str):	If defined, certbot will try to
+#					shutdown this this service before
+#					renewing the certificate, and restart
+#					it afterwards.  For example, set to
+#					"nginx" or "apache24"
+
+# If there is a global system configuration file, suck it in.
+#
+if [ -r /etc/defaults/periodic.conf ]
+then
+    . /etc/defaults/periodic.conf
+    source_periodic_confs
+fi
+
+case "$weekly_certbot_enable" in
+    [Yy][Ee][Ss])
+	echo
+	echo "Renewing Let's Encrypt certificates:"
+
+	PRE_HOOK=""
+	POST_HOOK=""
+	if [ -n "$weekly_certbot_service" ]
+	then
+	    if service "$weekly_certbot_service" onestatus
+	    then
+		PRE_HOOK="service $weekly_certbot_service onestop"
+		POST_HOOK="service $weekly_certbot_service onestart"
+	    fi
+	fi
+
+	anticongestion
+	if %%LOCALBASE%%/bin/certbot renew --pre-hook "$PRE_HOOK" \
+	                             --post-hook "$POST_HOOK" \
+	   			     --no-random-sleep-on-renew
+	then
+	    rc=0
+	else
+	    rc=1
+	fi
+	;;
+    *)  rc=0;;
+esac
+
+exit $rc
diff --git a/security/py-certbot/pkg-message b/security/py-certbot/pkg-message
index f064e8dc54cb..691b23b62c27 100644
--- a/security/py-certbot/pkg-message
+++ b/security/py-certbot/pkg-message
@@ -24,6 +24,11 @@ will be made available in the following ports:
 
  * Apache plugin: security/py-certbot-apache
  * Nginx plugin: security/py-certbot-nginx
+
+In order to automatically renew the certificates, add this line to
+/etc/periodic.conf:
+
+    weekly_certbot_enable="YES"
 EOM
 }
 ]
diff --git a/security/py-cybox/Makefile b/security/py-cybox/Makefile
index 756b7dc4a6eb..5c703d8d5828 100644
--- a/security/py-cybox/Makefile
+++ b/security/py-cybox/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cybox
-PORTVERSION=	2.1.0.17
+PORTVERSION=	2.1.0.18
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-cybox/distinfo b/security/py-cybox/distinfo
index 501f93fef457..62c13bc87e85 100644
--- a/security/py-cybox/distinfo
+++ b/security/py-cybox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1520067213
-SHA256 (CybOXProject-python-cybox-v2.1.0.17_GH0.tar.gz) = 598608385f0c0d4f6f6b1cc460ce272951aa4e18a044b43dd61944f1a521756e
-SIZE (CybOXProject-python-cybox-v2.1.0.17_GH0.tar.gz) = 484688
+TIMESTAMP = 1567714779
+SHA256 (CybOXProject-python-cybox-v2.1.0.18_GH0.tar.gz) = 8422e8dde8f5e016e483cf99473c271a3b083ea4c016df2a4c55007febdaba30
+SIZE (CybOXProject-python-cybox-v2.1.0.18_GH0.tar.gz) = 485143
diff --git a/security/py-exscript/Makefile b/security/py-exscript/Makefile
new file mode 100644
index 000000000000..78ac193ebd28
--- /dev/null
+++ b/security/py-exscript/Makefile
@@ -0,0 +1,36 @@
+# $FreeBSD$
+
+PORTNAME=	exscript
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.6
+CATEGORIES=	security python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	jhay@FreeBSD.org
+COMMENT=	Automating Telnet and SSH
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycryptodomex>0:security/py-pycryptodomex@${PY_FLAVOR}
+
+USES=		python
+# Upstream doesn't provide a sdist, yet
+USE_GITHUB=	yes
+GH_ACCOUNT=	knipknap
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		"{s#__version__ = '[^']*'#__version__ = '${PORTVERSION}'#;}" \
+		${BUILD_WRKSRC}/VERSION.in ${BUILD_WRKSRC}/Exscript/version.py
+
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m unittest discover -v tests/Exscript "*Test.py"
+
+.include <bsd.port.mk>
diff --git a/security/py-exscript/distinfo b/security/py-exscript/distinfo
new file mode 100644
index 000000000000..2beea4faca7f
--- /dev/null
+++ b/security/py-exscript/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1565510934
+SHA256 (knipknap-exscript-v2.6_GH0.tar.gz) = e3e2064d0183d30bd9cdb13ee760603e4cd0ff190ae2ac8f97329300967dca90
+SIZE (knipknap-exscript-v2.6_GH0.tar.gz) = 272225
diff --git a/security/py-exscript/pkg-descr b/security/py-exscript/pkg-descr
new file mode 100644
index 000000000000..60217a3e72a1
--- /dev/null
+++ b/security/py-exscript/pkg-descr
@@ -0,0 +1,6 @@
+Exscript is a Python module and a template processor for automating network
+connections over protocols such as Telnet or SSH.
+We attempt to create the best possible set of tools for working with
+Telnet and SSH.
+
+WWW: https://github.com/knipknap/exscript
diff --git a/security/py-maec/Makefile b/security/py-maec/Makefile
index 3262a42c6b5b..9187a960fc30 100644
--- a/security/py-maec/Makefile
+++ b/security/py-maec/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	maec
-PORTVERSION=	4.1.0.14
+PORTVERSION=	4.1.0.15
+DISTVERSIONPREFIX=	v
 CATEGORIES=	security python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	antoine@FreeBSD.org
@@ -18,6 +18,10 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mixbox>=0.0.13:security/py-mixbox@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	MAECProject
+GH_PROJECT=	python-${PORTNAME}
+
 NO_ARCH=	yes
 USES=		python
 USE_PYTHON=	concurrent distutils autoplist
diff --git a/security/py-maec/distinfo b/security/py-maec/distinfo
index 7a183f3bbba2..10f606f0026c 100644
--- a/security/py-maec/distinfo
+++ b/security/py-maec/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1533374447
-SHA256 (maec-4.1.0.14.tar.gz) = 9e997ec9457a7a4bb8626a3f1374939ef20f793755f18accab5579f48114eb75
-SIZE (maec-4.1.0.14.tar.gz) = 154974
+TIMESTAMP = 1567855502
+SHA256 (MAECProject-python-maec-v4.1.0.15_GH0.tar.gz) = 7a9796388c82c7ac62297b90069b51e93a73c9dd5dca83207ca636caee0327da
+SIZE (MAECProject-python-maec-v4.1.0.15_GH0.tar.gz) = 154875
diff --git a/security/py-netmiko/Makefile b/security/py-netmiko/Makefile
index 4bda23903104..ca78feb9b602 100644
--- a/security/py-netmiko/Makefile
+++ b/security/py-netmiko/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	netmiko
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4.1
+DISTVERSION=	2.4.2
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/security/py-netmiko/distinfo b/security/py-netmiko/distinfo
index a81ef6d56781..199a00b3a17f 100644
--- a/security/py-netmiko/distinfo
+++ b/security/py-netmiko/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564514350
-SHA256 (ktbyers-netmiko-v2.4.1_GH0.tar.gz) = 6e42d7aed9ad3f9a766b3a389e9f22b7f3e85f2920f03cea6e6180cffb5cff6a
-SIZE (ktbyers-netmiko-v2.4.1_GH0.tar.gz) = 562838
+TIMESTAMP = 1567932822
+SHA256 (ktbyers-netmiko-v2.4.2_GH0.tar.gz) = 02f6d1eafa5588ae89a7ba01f9a0c65089aded8cfedef7bd8d61a1255bf2b4f7
+SIZE (ktbyers-netmiko-v2.4.2_GH0.tar.gz) = 574322
diff --git a/security/py-stix/Makefile b/security/py-stix/Makefile
index 5797ed630a1b..43c3fdc5932d 100644
--- a/security/py-stix/Makefile
+++ b/security/py-stix/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	stix
-PORTVERSION=	1.2.0.6
+PORTVERSION=	1.2.0.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-stix/distinfo b/security/py-stix/distinfo
index 80ed20789417..ef2f5a458aa5 100644
--- a/security/py-stix/distinfo
+++ b/security/py-stix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524771707
-SHA256 (STIXProject-python-stix-v1.2.0.6_GH0.tar.gz) = 1781723f522d04bf661cb9085c93e540fdd6332acc37a135527817b79e646ef6
-SIZE (STIXProject-python-stix-v1.2.0.6_GH0.tar.gz) = 215431
+TIMESTAMP = 1567837579
+SHA256 (STIXProject-python-stix-v1.2.0.7_GH0.tar.gz) = 9a091e6abb447e63c2b103c0de5eb4d395a01c663d35ddfff3d95d22f6c2a72a
+SIZE (STIXProject-python-stix-v1.2.0.7_GH0.tar.gz) = 215795
diff --git a/security/rubygem-scrypt/Makefile b/security/rubygem-scrypt/Makefile
index aea0330838da..62df296c8390 100644
--- a/security/rubygem-scrypt/Makefile
+++ b/security/rubygem-scrypt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	scrypt
 PORTVERSION=	3.0.6
+PORTREVISION=	1
 CATEGORIES=	security rubygems
 MASTER_SITES=	RG
 
@@ -17,6 +18,4 @@ RUN_DEPENDS=	rubygem-ffi-compiler>=1.0:devel/rubygem-ffi-compiler
 USES=		gem
 USE_RUBY=	yes
 
-NO_ARCH=	yes
-
 .include <bsd.port.mk>
diff --git a/security/scrypt/Makefile b/security/scrypt/Makefile
index 76db811fc93c..8cadcf2126b0 100644
--- a/security/scrypt/Makefile
+++ b/security/scrypt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	scrypt
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3.0
 CATEGORIES=	security
 MASTER_SITES=	http://www.tarsnap.com/scrypt/
 
@@ -12,13 +12,16 @@ COMMENT=	Key Derivation Function
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
+USES=		libtool ssl tar:tgz
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="-I${OPENSSLINC} ${CFLAGS}" \
 		LDFLAGS="-L${OPENSSLLIB} ${LDFLAGS}"
-
-USES=		ssl tar:tgz
+CONFIGURE_ARGS=	--enable-libscrypt-kdf --disable-static
 
 PLIST_FILES=	bin/scrypt \
+		include/scrypt-kdf.h \
+		lib/libscrypt-kdf.so.1.0.0 \
 		man/man1/scrypt.1.gz
 
 .include <bsd.port.mk>
diff --git a/security/scrypt/distinfo b/security/scrypt/distinfo
index d0be64e279b5..e9624ff6e61a 100644
--- a/security/scrypt/distinfo
+++ b/security/scrypt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488663406
-SHA256 (scrypt-1.2.1.tgz) = 4621f5e7da2f802e20850436219370092e9fcda93bd598f6d4236cce33f4c577
-SIZE (scrypt-1.2.1.tgz) = 127619
+TIMESTAMP = 1568411502
+SHA256 (scrypt-1.3.0.tgz) = 263034edd4d1e117d4051d9a9260c74dedb0efaf4491c5152b738978b3f32748
+SIZE (scrypt-1.3.0.tgz) = 380332
diff --git a/security/secpanel/files/pkg-message.in b/security/secpanel/files/pkg-message.in
index 1396f6126c83..a3060db065d6 100644
--- a/security/secpanel/files/pkg-message.in
+++ b/security/secpanel/files/pkg-message.in
@@ -1,13 +1,2 @@
-
-
-################################################################################################################
-
-
 If you don't have already a default.config file, you have to copy "/usr/local/share/secpanel/default.config.sample"
 to "/usr/local/share/secpanel/default.config" Change it as you need or use the config-panel to make changes.
-
-
-#################################################################################################################
-
-
-
diff --git a/security/silktools/Makefile b/security/silktools/Makefile
index a13715c2ab39..59258291e08e 100644
--- a/security/silktools/Makefile
+++ b/security/silktools/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	silktools
-PORTVERSION=	3.18.2
+PORTVERSION=	3.18.3
 CATEGORIES=	security net
 MASTER_SITES=	http://tools.netsa.cert.org/releases/
 DISTNAME=	silk-${PORTVERSION}
diff --git a/security/silktools/distinfo b/security/silktools/distinfo
index 793000cf3171..e4c9ec4e0cf6 100644
--- a/security/silktools/distinfo
+++ b/security/silktools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559120403
-SHA256 (silk-3.18.2.tar.gz) = 855ce1ce862fc2cb7146a04cbe60ba2584ff7df176e07494a2f14d26976b4c2b
-SIZE (silk-3.18.2.tar.gz) = 5593119
+TIMESTAMP = 1567525508
+SHA256 (silk-3.18.3.tar.gz) = 25fc734d6cac7d39285877ff5efd78bd4e5bb34523a6c4f6174afc9e2a87c2a2
+SIZE (silk-3.18.3.tar.gz) = 5593061
diff --git a/security/silktools/pkg-plist b/security/silktools/pkg-plist
index 0071b662abcb..68fb11cc4936 100644
--- a/security/silktools/pkg-plist
+++ b/security/silktools/pkg-plist
@@ -99,7 +99,7 @@ include/silk/utils.h
 %%STATIC%%lib/libflowsource.a
 lib/libflowsource.so
 lib/libflowsource.so.17
-lib/libflowsource.so.17.1.3
+lib/libflowsource.so.17.1.4
 %%STATIC%%lib/libsilk-thrd.a
 lib/libsilk-thrd.so
 lib/libsilk-thrd.so.5
diff --git a/security/totp-cli/Makefile b/security/totp-cli/Makefile
new file mode 100644
index 000000000000..9b3ee73e8f85
--- /dev/null
+++ b/security/totp-cli/Makefile
@@ -0,0 +1,28 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	totp-cli
+PORTVERSION=	1.1.3
+DISTVERSIONPREFIX=	v
+CATEGORIES=	security
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Authy/Google Authenticator like TOTP CLI tool
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+USES=		go:modules
+
+PLIST_FILES=	bin/totp-cli
+
+GH_ACCOUNT=	yitsushi
+GH_TUPLE=	golang:crypto:71b5226:golang_crypto/vendor/golang.org/x/crypto \
+		golang:sys:749cb33:golang_sys/vendor/golang.org/x/sys \
+		kardianos:osext:2bc1f35:kardianos_osext/vendor/github.com/kardianos/osext \
+		mitchellh:go-homedir:v1.1.0:mitchellh_gohomedir/vendor/github.com/mitchellh/go-homedir \
+		yitsushi:github-release-check:v1.0.1:yitsushi_github_release_check/vendor/github.com/yitsushi/github-release-check \
+		yitsushi:go-commander:v1.1.0:yitsushi_go_commander/vendor/github.com/yitsushi/go-commander
+USE_GITHUB=	yes
+
+.include <bsd.port.mk>
diff --git a/security/totp-cli/distinfo b/security/totp-cli/distinfo
new file mode 100644
index 000000000000..2d3e3f613249
--- /dev/null
+++ b/security/totp-cli/distinfo
@@ -0,0 +1,15 @@
+TIMESTAMP = 1568290933
+SHA256 (yitsushi-totp-cli-v1.1.3_GH0.tar.gz) = 6d6108435baf7179152f879df144313b0aaee667a2bc94154f83beb6ae2b6c87
+SIZE (yitsushi-totp-cli-v1.1.3_GH0.tar.gz) = 23146
+SHA256 (golang-crypto-71b5226_GH0.tar.gz) = 7ab66566a1792bf53b26474bf023d0607e59158af6a1321d94c56de433cb083b
+SIZE (golang-crypto-71b5226_GH0.tar.gz) = 1693011
+SHA256 (golang-sys-749cb33_GH0.tar.gz) = 14cd0776aff1de547c3d2501e985917d5843fbbab11c9f8c2ad7bb2c7a1279a8
+SIZE (golang-sys-749cb33_GH0.tar.gz) = 1468012
+SHA256 (kardianos-osext-2bc1f35_GH0.tar.gz) = 1b771589ecc12d1449c5f9f7754b2149369cc76ca42eee0386b8c9a7434ceca9
+SIZE (kardianos-osext-2bc1f35_GH0.tar.gz) = 4899
+SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
+SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362
+SHA256 (yitsushi-github-release-check-v1.0.1_GH0.tar.gz) = 8c651db3bf52967e04c8cead79787de0f4b1e74decbc4ea814b1de4f4de4c760
+SIZE (yitsushi-github-release-check-v1.0.1_GH0.tar.gz) = 1727
+SHA256 (yitsushi-go-commander-v1.1.0_GH0.tar.gz) = 197a9086fcdc81f2eba859a61fd0fe950f46904e3bdc7c2158b36995f953a8aa
+SIZE (yitsushi-go-commander-v1.1.0_GH0.tar.gz) = 23286
diff --git a/security/totp-cli/pkg-descr b/security/totp-cli/pkg-descr
new file mode 100644
index 000000000000..4a6beb2fb579
--- /dev/null
+++ b/security/totp-cli/pkg-descr
@@ -0,0 +1,5 @@
+This is a simple TOTP (Time-based One-time Password) CLI tool. TOTP is the most
+common mechanism for 2FA (Two-Factor-Authentication). You can manage and
+organize your accounts with namespaces and protect your data with a password.
+
+WWW: https://github.com/yitsushi/totp-cli
diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml
index 0c3f6b7f51ef..ebc2b184069c 100644
--- a/security/vuxml/vuln.xml
+++ b/security/vuxml/vuln.xml
@@ -58,6 +58,141 @@ Notes:
   * Do not forget port variants (linux-f10-libxml2, libxml2, etc.)
 -->
 <vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">
+  <vuln vid="9e0c6f7a-d46d-11e9-a1c7-b499baebfeaf">
+    <topic>OpenSSL -- Multiple vulnerabilities</topic>
+    <affects>
+      <package>
+	<name>openssl</name>
+	<range><lt>1.0.2t</lt></range>
+      </package>
+      <package>
+	<name>openssl111</name>
+	<range><lt>1.1.1d</lt></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+	<p>The OpenSSL project reports:</p>
+	<blockquote cite="https://www.openssl.org/news/secadv/20190910.txt">
+	  <p>ECDSA remote timing attack (CVE-2019-1547) [Low]</p>
+	  <p>Fork Protection (CVE-2019-1549) [Low]<br/>
+	    (OpenSSL 1.1.1 only)</p>
+	</blockquote>
+      </body>
+    </description>
+    <references>
+      <url>https://www.openssl.org/news/secadv/20190910.txt</url>
+      <cvename>CVE-2019-1547</cvename>
+      <cvename>CVE-2019-1549</cvename>
+    </references>
+    <dates>
+      <discovery>2019-09-10</discovery>
+      <entry>2019-09-11</entry>
+    </dates>
+  </vuln>
+
+  <vuln vid="c6f19fe6-d42a-11e9-b4f9-6451062f0f7a">
+    <topic>Flash Player -- multiple vulnerabilities</topic>
+    <affects>
+      <package>
+	<name>linux-flashplayer</name>
+	<range><lt>32.0.0.255</lt></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+	<p>Adobe reports:</p>
+	<blockquote cite="https://helpx.adobe.com/security/products/flash-player/apsb19-46.html">
+	  <ul>
+	    <li>This update resolves a same origin method execution
+	      vulnerability that could lead to arbitrary code execution
+	      (CVE-2019-8069).</li>
+	    <li>This update resolves a use-after-free vulnerability that
+	      could lead to arbitrary code execution (CVE-2019-8070).</li>
+	  </ul>
+	</blockquote>
+      </body>
+    </description>
+    <references>
+      <cvename>CVE-2019-8069</cvename>
+      <cvename>CVE-2019-8070</cvename>
+      <url>https://helpx.adobe.com/security/products/flash-player/apsb19-46.html</url>
+    </references>
+    <dates>
+      <discovery>2019-09-10</discovery>
+      <entry>2019-09-10</entry>
+    </dates>
+  </vuln>
+
+  <vuln vid="a8d87c7a-d1b1-11e9-a616-0992a4564e7c">
+    <topic>oniguruma -- multiple vulnerabilities</topic>
+    <affects>
+      <package>
+	<name>oniguruma</name>
+	<range><lt>6.9.3</lt></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+	<blockquote cite="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-13224">
+	  <p>
+	    A use-after-free in onig_new_deluxe() in regext.c in Oniguruma 6.9.2 allows attackers to potentially cause information disclosure, denial of service, or possibly code execution by providing a crafted regular expression. The attacker provides a pair of a regex pattern and a string, with a multi-byte encoding that gets handled by onig_new_deluxe().
+	  </p>
+	</blockquote>
+	<blockquote cite="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-13225">
+	  <p>A NULL Pointer Dereference in match_at() in regexec.c in Oniguruma 6.9.2 allows attackers to potentially cause denial of service by providing a crafted regular expression.</p>
+	  <p>Oniguruma issues often affect Ruby, as well as common optional libraries for PHP and Rust.</p>
+	</blockquote>
+      </body>
+    </description>
+    <references>
+      <cvename>CVE-2019-13224</cvename>
+      <url>https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-13224</url>
+      <url>https://github.com/kkos/oniguruma/commit/0f7f61ed1b7b697e283e37bd2d731d0bd57adb55</url>
+      <cvename>CVE-2019-13225</cvename>
+      <url>https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-13225</url>
+      <url>https://github.com/kkos/oniguruma/commit/c509265c5f6ae7264f7b8a8aae1cfa5fc59d108c</url>
+    </references>
+    <dates>
+      <discovery>2019-07-03</discovery>
+      <entry>2019-09-07</entry>
+    </dates>
+  </vuln>
+
+  <vuln vid="10e1d580-d174-11e9-a87f-a4badb2f4699">
+    <topic>xymon-server -- multiple vulnerabilities</topic>
+    <affects>
+      <package>
+	<name>xymon-server</name>
+	<range><lt>4.3.29</lt></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+	<p>Japheth Cleaver reports:</p>
+	<blockquote cite="https://lists.xymon.com/archive/2019-July/046570.html">
+	  <p>Several buffer overflows were reported by University of
+	    Cambridge Computer Security Incident Response Team.</p>
+	</blockquote>
+      </body>
+    </description>
+    <references>
+      <url>https://lists.xymon.com/archive/2019-July/046570.html</url>
+      <cvename>CVE-2019-13451</cvename>
+      <cvename>CVE-2019-13452</cvename>
+      <cvename>CVE-2019-13455</cvename>
+      <cvename>CVE-2019-13273</cvename>
+      <cvename>CVE-2019-13274</cvename>
+      <cvename>CVE-2019-13484</cvename>
+      <cvename>CVE-2019-13485</cvename>
+      <cvename>CVE-2019-13486</cvename>
+    </references>
+    <dates>
+      <discovery>2019-07-23</discovery>
+      <entry>2019-09-07</entry>
+    </dates>
+  </vuln>
+
   <vuln vid="8a9f86de-d080-11e9-9051-4c72b94353b5">
     <topic>wordpress -- multiple issues</topic>
     <affects>
diff --git a/security/wapiti/Makefile b/security/wapiti/Makefile
index 69f143720c21..d4067d0116ac 100644
--- a/security/wapiti/Makefile
+++ b/security/wapiti/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wapiti
-PORTVERSION=	3.0.1
+PORTVERSION=	3.0.2
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tld>=0:dns/py-tld@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaswfp>=0:graphics/py-yaswfp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} \
diff --git a/security/wapiti/distinfo b/security/wapiti/distinfo
index aa88951af175..6619d3ac53e5 100644
--- a/security/wapiti/distinfo
+++ b/security/wapiti/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1554896146
-SHA256 (wapiti3-3.0.1.tar.gz) = bbb8c8f572afe77319734489a6ca0b211df4b87ad294db79b8bf0bda1c5aff29
-SIZE (wapiti3-3.0.1.tar.gz) = 530486
+TIMESTAMP = 1567689735
+SHA256 (wapiti3-3.0.2.tar.gz) = df86cab9f66c7794cab54fede16029056a764f5da565b2695524f9bd2bc9a384
+SIZE (wapiti3-3.0.2.tar.gz) = 561658
diff --git a/security/wapiti/files/patch-setup.py b/security/wapiti/files/patch-setup.py
index 844b925f0bfd..e01ba7523b9d 100644
--- a/security/wapiti/files/patch-setup.py
+++ b/security/wapiti/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2018-05-11 13:42:27 UTC
+--- setup.py.orig	2019-09-04 12:31:34 UTC
 +++ setup.py
-@@ -23,7 +23,7 @@ doc_and_conf_files = [
+@@ -50,7 +50,7 @@ doc_and_conf_files = [
          ]
      ),
      (
@@ -9,3 +9,10 @@
          [
              "doc/wapiti.1",
              "doc/wapiti-getcookie.1"
+@@ -122,6 +122,5 @@ if a script is vulnerable.""",
+     },
+     # https://buildmedia.readthedocs.org/media/pdf/pytest/3.6.0/pytest.pdf
+     tests_require=["pytest", "responses"],
+-    setup_requires=["pytest-runner"],
+     cmdclass={"test": PyTest}
+ )
diff --git a/security/wazuh-agent/Makefile b/security/wazuh-agent/Makefile
new file mode 100644
index 000000000000..8c1da3dd454e
--- /dev/null
+++ b/security/wazuh-agent/Makefile
@@ -0,0 +1,104 @@
+# $FreeBSD$
+
+PORTNAME=	wazuh
+DISTVERSIONPREFIX=	v
+DISTVERSION=	3.9.5
+CATEGORIES=	security
+MASTER_SITES=	https://packages.wazuh.com/deps/3.9/
+PKGNAMESUFFIX=	-agent
+DISTFILES=	cJSON.tar.gz src_cpython.tar.gz curl.tar.gz libdb.tar.gz libffi.tar.gz \
+		libyaml.tar.gz openssl.tar.gz procps.tar.gz sqlite.tar.gz  zlib.tar.gz \
+		audit-userspace.tar.gz msgpack.tar.gz
+DIST_SUBDIR=	${PORTNAME}-${DISTVERSION}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+
+MAINTAINER=	m.muenz@gmail.com
+COMMENT=	Security tool to monitor and check logs and intrusions
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	curl:ftp/curl
+RUN_DEPENDS=	curl:ftp/curl
+
+USES=		gmake perl5 readline shebangfix uidfix
+
+USE_GITHUB=	yes
+
+CONFLICTS_INSTALL=	ossec-*
+
+SHEBANG_FILES=	${WRKSRC}/contrib/util.sh \
+		${WRKSRC}/src/external/openssl/Configurations/unix-checker.pm \
+		${WRKSRC}/src/init/ossec-client.sh \
+		${WRKSRC}/wodles/oscap/oscap.py \
+		${WRKSRC}/active-response/*.sh
+
+USERS=		ossec ossecm ossecr
+GROUPS=		ossec
+
+OSSEC_GROUP=	ossec
+OSSEC_USER=	ossec
+
+WAZUHPREFIX=	/var/ossec
+
+WAZUHMOD750=	/ /logs/ossec /bin /lib /queue /queue/diff /ruleset /ruleset/sca /wodles \
+		/active-response /active-response/bin /agentless /var /backup /queue/rids \
+		/wodles/oscap /wodles/oscap/content
+
+WAZUHMOD770=	/logs /queue/alerts /queue/ossec /etc /etc/shared /.ssh /var/run /var/upgrade \
+		/var/wodles /var/incoming
+
+# extract all extra distfiles in src/external
+post-extract:
+	@for file in ${DISTFILES}; do \
+		if ! (cd ${WRKSRC}/src/external && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS}); \
+		then \
+			exit 1; \
+		fi; \
+	done
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|g' \
+		${WRKSRC}/src/external/openssl/Makefile \
+		${WRKSRC}/src/external/openssl/configdata.pm
+
+do-build:
+	@cd ${WRKSRC}/src && ${GMAKE} TARGET=agent
+
+do-install:
+	@for mod750 in ${WAZUHMOD750}; do \
+		${MKDIR} -m 0750 ${STAGEDIR}${WAZUHPREFIX}$$mod750; \
+	done
+
+	@for mod770 in ${WAZUHMOD770}; do \
+		${MKDIR} -m 0770 ${STAGEDIR}${WAZUHPREFIX}$$mod770; \
+	done
+
+	${MKDIR} -m 1770 ${STAGEDIR}${WAZUHPREFIX}/tmp
+	${INSTALL_PROGRAM} ${WRKSRC}/src/ossec-logcollector ${STAGEDIR}${WAZUHPREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/ossec-syscheckd ${STAGEDIR}${WAZUHPREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/ossec-execd ${STAGEDIR}${WAZUHPREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/manage_agents ${STAGEDIR}${WAZUHPREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/wazuh-modulesd ${STAGEDIR}${WAZUHPREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/src/ossec-agentd ${STAGEDIR}${WAZUHPREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/libwazuhext.so ${STAGEDIR}${WAZUHPREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/src/agent-auth ${STAGEDIR}${WAZUHPREFIX}/bin
+	${CP} ${WRKSRC}/active-response/*.sh ${STAGEDIR}${WAZUHPREFIX}/active-response/bin/
+	${CP} ${WRKSRC}/active-response/firewalls/*.sh ${STAGEDIR}${WAZUHPREFIX}/active-response/bin/
+	${CP} ${WRKSRC}/etc/internal_options.conf ${STAGEDIR}${WAZUHPREFIX}/etc/
+	${CP} ${WRKSRC}/etc/local_internal_options.conf ${STAGEDIR}${WAZUHPREFIX}/etc/local_internal_options.conf
+	${CP} ${WRKSRC}/etc/ossec-agent.conf ${STAGEDIR}${WAZUHPREFIX}/etc/ossec.conf
+	${CP} ${WRKSRC}/etc/ossec-agent.conf ${STAGEDIR}${WAZUHPREFIX}/etc/ossec.conf.sample
+	${CP} /dev/null ${STAGEDIR}${WAZUHPREFIX}/etc/client.keys
+	${INSTALL_SCRIPT} /dev/null ${STAGEDIR}${WAZUHPREFIX}/logs/ossec.log
+	${INSTALL_SCRIPT} /dev/null ${STAGEDIR}${WAZUHPREFIX}/logs/ossec.json
+	${INSTALL_SCRIPT} /dev/null ${STAGEDIR}${WAZUHPREFIX}/logs/active-responses.log
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/util.sh ${STAGEDIR}${WAZUHPREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/src/init/ossec-client.sh ${STAGEDIR}${WAZUHPREFIX}/bin/ossec-control
+	${INSTALL_SCRIPT} ${WRKSRC}/src/agentlessd/scripts/* ${STAGEDIR}${WAZUHPREFIX}/agentless/
+	${INSTALL_SCRIPT} ${WRKSRC}/src/rootcheck/db/*.txt ${STAGEDIR}${WAZUHPREFIX}/etc/shared/
+	${INSTALL_SCRIPT} ${WRKSRC}/etc/wpk_root.pem ${STAGEDIR}${WAZUHPREFIX}/etc/
+	${INSTALL_SCRIPT} ${WRKSRC}/wodles/oscap/oscap.py ${STAGEDIR}${WAZUHPREFIX}/wodles/oscap
+	${INSTALL_SCRIPT} ${WRKSRC}/wodles/oscap/template_*.xsl ${STAGEDIR}${WAZUHPREFIX}/wodles/oscap
+
+.include <bsd.port.mk>
diff --git a/security/wazuh-agent/distinfo b/security/wazuh-agent/distinfo
new file mode 100644
index 000000000000..9b20610cac40
--- /dev/null
+++ b/security/wazuh-agent/distinfo
@@ -0,0 +1,27 @@
+TIMESTAMP = 1568194130
+SHA256 (wazuh-3.9.5/cJSON.tar.gz) = 8c517c658209cb96c2dcdfdd6bf7bb434adfb2fff3484b3464d2750cafd74e76
+SIZE (wazuh-3.9.5/cJSON.tar.gz) = 20001
+SHA256 (wazuh-3.9.5/src_cpython.tar.gz) = 7df9bf6560b77de0ab0279cb0b9e1f51dd28d0d20c26f640feab976208daf2d7
+SIZE (wazuh-3.9.5/src_cpython.tar.gz) = 78209203
+SHA256 (wazuh-3.9.5/curl.tar.gz) = 78ad4a75fec89dd83c75cf35203c1c757c21cb2a6ff574647b13bf86c8798d66
+SIZE (wazuh-3.9.5/curl.tar.gz) = 3692998
+SHA256 (wazuh-3.9.5/libdb.tar.gz) = 885f01aebcca995bcef48d8dc47acb8c4bd5eab06ec188e76cb5863e4f9b2d9b
+SIZE (wazuh-3.9.5/libdb.tar.gz) = 4283467
+SHA256 (wazuh-3.9.5/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69
+SIZE (wazuh-3.9.5/libffi.tar.gz) = 964576
+SHA256 (wazuh-3.9.5/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a
+SIZE (wazuh-3.9.5/libyaml.tar.gz) = 424656
+SHA256 (wazuh-3.9.5/openssl.tar.gz) = ed55973f4b604b9c27bb660fcdf85f69335b80b07c3bf4c63528ed8fcd74a678
+SIZE (wazuh-3.9.5/openssl.tar.gz) = 5603935
+SHA256 (wazuh-3.9.5/procps.tar.gz) = 87336a7860f5116ac5c5222b6b0d5c892e202ce136947e4776037bb7670ce6e2
+SIZE (wazuh-3.9.5/procps.tar.gz) = 55692
+SHA256 (wazuh-3.9.5/sqlite.tar.gz) = 23e109ee91ed16b4a95b2d361ecfd82820842fc337a80aa8032590b96eebddd2
+SIZE (wazuh-3.9.5/sqlite.tar.gz) = 1980218
+SHA256 (wazuh-3.9.5/zlib.tar.gz) = ddbeac924cc7fc3274ad0d5cfcf2a72792f0500e9607c65d02e8753f3a510a01
+SIZE (wazuh-3.9.5/zlib.tar.gz) = 643568
+SHA256 (wazuh-3.9.5/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434
+SIZE (wazuh-3.9.5/audit-userspace.tar.gz) = 1682820
+SHA256 (wazuh-3.9.5/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2
+SIZE (wazuh-3.9.5/msgpack.tar.gz) = 591294
+SHA256 (wazuh-3.9.5/wazuh-wazuh-v3.9.5_GH0.tar.gz) = 3761377e6e0f639c9b4542a72a5519f36323a251f04eddaf802205ebded42334
+SIZE (wazuh-3.9.5/wazuh-wazuh-v3.9.5_GH0.tar.gz) = 14789176
diff --git a/security/wazuh-agent/files/patch-src_external_openssl_Makefile b/security/wazuh-agent/files/patch-src_external_openssl_Makefile
new file mode 100644
index 000000000000..8585bc999cc4
--- /dev/null
+++ b/security/wazuh-agent/files/patch-src_external_openssl_Makefile
@@ -0,0 +1,11 @@
+--- src/external/openssl/Makefile.orig	2019-09-11 11:27:31 UTC
++++ src/external/openssl/Makefile
+@@ -73,7 +73,7 @@ HTMLSUFFIX=html
+ 
+ CROSS_COMPILE= 
+ CC= $(CROSS_COMPILE)cc
+-CFLAGS=-DNDEBUG -DOPENSSL_NO_DYNAMIC_ENGINE -DOPENSSLDIR="\"$(OPENSSLDIR)\"" -DENGINESDIR="\"$(ENGINESDIR)\"" -O 
++CFLAGS=-DNDEBUG -DOPENSSL_NO_DYNAMIC_ENGINE -DOPENSSLDIR="\"$(OPENSSLDIR)\"" -DENGINESDIR="\"$(ENGINESDIR)\"" -O -fPIC
+ CFLAGS_Q=-DNDEBUG -DOPENSSL_NO_DYNAMIC_ENGINE -DOPENSSLDIR=\"\\\"$(OPENSSLDIR)\\\"\" -DENGINESDIR=\"\\\"$(ENGINESDIR)\\\"\" 
+ LDFLAGS= 
+ PLIB_LDFLAGS= 
diff --git a/security/wazuh-agent/pkg-descr b/security/wazuh-agent/pkg-descr
new file mode 100644
index 000000000000..736827a453f5
--- /dev/null
+++ b/security/wazuh-agent/pkg-descr
@@ -0,0 +1,14 @@
+The Wazuh agent runs on the hosts that you want to monitor.
+It is multi-platform and provides the following capabilities:
+
+- Log and data collection
+- File integrity monitoring
+- Rootkit and malware detection
+- Security policy monitoring.
+- Configuration assessments
+- Software inventory
+
+In addition, it communicates with the Wazuh manager, sending data in near
+real-time through an encrypted and authenticated channel.
+
+WWW: https://github.com/wazuh/wazuh
diff --git a/security/wazuh-agent/pkg-plist b/security/wazuh-agent/pkg-plist
new file mode 100644
index 000000000000..c5d1e9c4e0b8
--- /dev/null
+++ b/security/wazuh-agent/pkg-plist
@@ -0,0 +1,98 @@
+@info(root,ossec,0750) /var/ossec/active-response/bin/default-firewall-drop.sh
+@info(root,ossec,0750) /var/ossec/active-response/bin/disable-account.sh
+@info(root,ossec,0750) /var/ossec/active-response/bin/firewalld-drop.sh
+@info(root,ossec,0750) /var/ossec/active-response/bin/host-deny.sh
+@info(root,ossec,0750) /var/ossec/active-response/bin/ip-customblock.sh
+@info(root,ossec,0750) /var/ossec/active-response/bin/ipfw.sh
+@info(root,ossec,0750) /var/ossec/active-response/bin/ipfw_mac.sh
+@info(root,ossec,0750) /var/ossec/active-response/bin/kaspersky.sh
+@info(root,ossec,0750) /var/ossec/active-response/bin/npf.sh
+@info(root,ossec,0750) /var/ossec/active-response/bin/ossec-slack.sh
+@info(root,ossec,0750) /var/ossec/active-response/bin/ossec-tweeter.sh
+@info(root,ossec,0750) /var/ossec/active-response/bin/pf.sh
+@info(root,ossec,0750) /var/ossec/active-response/bin/restart-ossec.sh
+@info(root,ossec,0750) /var/ossec/active-response/bin/restart.sh
+@info(root,ossec,0750) /var/ossec/active-response/bin/route-null.sh
+@info(root,ossec,0750) /var/ossec/agentless/main.exp
+@info(root,ossec,0750) /var/ossec/agentless/register_host.sh
+@info(root,ossec,0750) /var/ossec/agentless/ssh.exp
+@info(root,ossec,0750) /var/ossec/agentless/ssh_asa-fwsmconfig_diff
+@info(root,ossec,0750) /var/ossec/agentless/ssh_foundry_diff
+@info(root,ossec,0750) /var/ossec/agentless/ssh_generic_diff
+@info(root,ossec,0750) /var/ossec/agentless/ssh_integrity_check_bsd
+@info(root,ossec,0750) /var/ossec/agentless/ssh_integrity_check_linux
+@info(root,ossec,0750) /var/ossec/agentless/ssh_nopass.exp
+@info(root,ossec,0750) /var/ossec/agentless/ssh_pixconfig_diff
+@info(root,ossec,0750) /var/ossec/agentless/sshlogin.exp
+@info(root,ossec,0750) /var/ossec/agentless/su.exp
+@info(root,root,0750) /var/ossec/bin/agent-auth
+@info(root,root,0750) /var/ossec/bin/manage_agents
+@info(root,root,0750) /var/ossec/bin/ossec-agentd
+@info(root,root,0750) /var/ossec/bin/ossec-control
+@info(root,root,0750) /var/ossec/bin/ossec-execd
+@info(root,root,0750) /var/ossec/bin/ossec-logcollector
+@info(root,root,0750) /var/ossec/bin/ossec-syscheckd
+@info(root,root,0750) /var/ossec/bin/util.sh
+@info(root,root,0750) /var/ossec/bin/wazuh-modulesd
+@info(root,ossec,0640) /var/ossec/etc/client.keys
+@info(root,ossec,0640) /var/ossec/etc/internal_options.conf
+@info(root,ossec,0640) /var/ossec/etc/local_internal_options.conf
+@info(root,ossec,0640) /var/ossec/etc/ossec.conf.sample
+@info(root,ossec,0640) /var/ossec/etc/ossec.conf
+@info(root,ossec,0660) /var/ossec/etc/shared/cis_apache2224_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/cis_debian_linux_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/cis_mysql5-6_community_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/cis_mysql5-6_enterprise_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/cis_rhel5_linux_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/cis_rhel6_linux_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/cis_rhel7_linux_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/cis_rhel_linux_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/cis_sles11_linux_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/cis_sles12_linux_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/cis_win2012r2_domainL1_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/cis_win2012r2_domainL2_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/cis_win2012r2_memberL1_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/cis_win2012r2_memberL2_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/rootkit_files.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/rootkit_trojans.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/system_audit_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/system_audit_ssh.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/win_applications_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/win_audit_rcl.txt
+@info(root,ossec,0660) /var/ossec/etc/shared/win_malware_rcl.txt
+@info(root,ossec,0640) /var/ossec/etc/wpk_root.pem
+@info(root,ossec,0750) /var/ossec/lib/libwazuhext.so
+@info(ossec,ossec,0666) /var/ossec/logs/active-responses.log
+@info(ossec,ossec,0666) /var/ossec/logs/ossec.json
+@info(ossec,ossec,0666) /var/ossec/logs/ossec.log
+@info(root,ossec,0750) /var/ossec/wodles/oscap/oscap.py
+@info(root,ossec,0750) /var/ossec/wodles/oscap/template_oval.xsl
+@info(root,ossec,0750) /var/ossec/wodles/oscap/template_xccdf.xsl
+@dir(root,ossec,0770) /var/ossec/.ssh
+@dir(root,ossec,0750) /var/ossec/active-response/bin
+@dir(root,ossec,0750) /var/ossec/active-response
+@dir(root,ossec,0750) /var/ossec/agentless
+@dir(root,ossec,0750) /var/ossec/backup
+@dir(root,wheel,0750) /var/ossec/bin
+@dir(root,ossec,0770) /var/ossec/etc/shared
+@dir(ossec,ossec,0770) /var/ossec/etc
+@dir(root,ossec,0750) /var/ossec/lib
+@dir(ossec,ossec,0750) /var/ossec/logs/ossec
+@dir(ossec,ossec,0770) /var/ossec/logs
+@dir(ossec,ossec,0770) /var/ossec/queue/alerts
+@dir(ossec,ossec,0750) /var/ossec/queue/diff
+@dir(ossec,ossec,0770) /var/ossec/queue/ossec
+@dir(ossec,ossec,0750) /var/ossec/queue/rids
+@dir(root,ossec,0750) /var/ossec/queue
+@dir(root,ossec,0750) /var/ossec/ruleset/sca
+@dir(root,ossec,0750) /var/ossec/ruleset
+@dir(root,ossec,1770) /var/ossec/tmp
+@dir(root,ossec,0770) /var/ossec/var/incoming
+@dir(root,ossec,0770) /var/ossec/var/run
+@dir(root,ossec,0770) /var/ossec/var/upgrade
+@dir(root,ossec,0770) /var/ossec/var/wodles
+@dir(root,ossec,0750) /var/ossec/var
+@dir(root,ossec,0750) /var/ossec/wodles/oscap/content
+@dir(root,ossec,0750) /var/ossec/wodles/oscap
+@dir(root,ossec,0750) /var/ossec/wodles
+@dir(root,ossec,0750) /var/ossec
diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile
index 39f5f7df6a98..5020faf89b7c 100644
--- a/shells/bash-completion/Makefile
+++ b/shells/bash-completion/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bash-completion
 PORTVERSION=	2.9
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	shells
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -41,7 +41,7 @@ USE_GITHUB=	yes
 
 BASH_SHARED_RUN_DEPENDS=bash:shells/bash
 BASH_STATIC_RUN_DEPENDS=bash:shells/bash-static
-FREEBSD_GH_TUPLE=	0mp:bash-completion-freebsd:1.0.3:freebsd/freebsd
+FREEBSD_GH_TUPLE=	0mp:bash-completion-freebsd:1.1.1:freebsd/freebsd
 FREEBSD_VARS=		LICENSE="BSD2CLAUSE GPLv2+" \
 			LICENSE_COMB=multi \
 			LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/freebsd/LICENSE \
diff --git a/shells/bash-completion/distinfo b/shells/bash-completion/distinfo
index 78e74ad5e8ea..322e58e435ff 100644
--- a/shells/bash-completion/distinfo
+++ b/shells/bash-completion/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1556494672
+TIMESTAMP = 1568283389
 SHA256 (scop-bash-completion-2.9_GH0.tar.gz) = fddd9e6739c972eea95d1f0e0e84fa9a17a5935ba21eab37308b27580cc4d790
 SIZE (scop-bash-completion-2.9_GH0.tar.gz) = 346404
-SHA256 (0mp-bash-completion-freebsd-1.0.3_GH0.tar.gz) = 7a6950292b7cf17dd1858896926cb2e0e706aa2b4d8d40f3ad10214c3a215745
-SIZE (0mp-bash-completion-freebsd-1.0.3_GH0.tar.gz) = 7244
+SHA256 (0mp-bash-completion-freebsd-1.1.1_GH0.tar.gz) = f99465748bc02e07a4ad67f60a698c5a7bb5cd62ff63e7c2a4d4f466c45ea8fe
+SIZE (0mp-bash-completion-freebsd-1.1.1_GH0.tar.gz) = 7122
diff --git a/shells/bash-completion/pkg-plist b/shells/bash-completion/pkg-plist
index b8763889bebb..c0f0c1497e1d 100644
--- a/shells/bash-completion/pkg-plist
+++ b/shells/bash-completion/pkg-plist
@@ -1,3 +1,4 @@
+%%FREEBSD%%etc/bash_completion.d/make
 %%FREEBSD%%etc/bash_completion.d/mandoc
 %%FREEBSD%%etc/bash_completion.d/pkg
 %%FREEBSD%%etc/bash_completion.d/service
diff --git a/sysutils/Makefile b/sysutils/Makefile
index c891b60e8c34..8b67aee08800 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -582,7 +582,6 @@
     SUBDIR += libsunacl
     SUBDIR += libsysstat
     SUBDIR += liburcu
-    SUBDIR += libutempter
     SUBDIR += life-preserver
     SUBDIR += lineak-defaultplugin
     SUBDIR += lineak-xosdplugin
diff --git a/sysutils/backuppc-devel/Makefile b/sysutils/backuppc-devel/Makefile
index 5ee487488d56..c947ebfca9a6 100644
--- a/sysutils/backuppc-devel/Makefile
+++ b/sysutils/backuppc-devel/Makefile
@@ -18,13 +18,14 @@ RUN_DEPENDS=	p5-CGI>0:www/p5-CGI \
 		p5-File-Listing>=0:sysutils/p5-File-Listing \
 		p5-BackupPC-XS>=0.57:sysutils/p5-BackupPC-XS
 
+USES=		perl5
+
 .if defined(QEMU_EMULATING) && "${QEMU_EMULATING}" == "1"
 BROKEN=		fails to build under qemu: uncaught target signal 11 (Segmetation fault) - core dumped
 .endif
 
-CONFLICTS=	backuppc backuppc4
+CONFLICTS_INSTALL=	backuppc backuppc4
 
-USES=		perl5
 USE_GITHUB=	yes
 GH_TAGNAME=	3990160
 USE_PERL5=	extract
diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile
index a20d19a6f6bb..9bf3fda9cc99 100644
--- a/sysutils/backuppc/Makefile
+++ b/sysutils/backuppc/Makefile
@@ -18,11 +18,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	p5-CGI>0:www/p5-CGI \
 		p5-File-Listing>=0:sysutils/p5-File-Listing
 
-CONFLICTS=	backuppc-devel-[0-9]*
+USES=		cpe perl5
 
-USE_RC_SUBR=	backuppc
+CONFLICTS_INSTALL=	backuppc4 backuppc-devel
 
-USES=		cpe perl5
+USE_RC_SUBR=	backuppc
 CPE_VENDOR=	craig_barratt
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/sysutils/bsdisks/Makefile b/sysutils/bsdisks/Makefile
index e18aa707f0bc..0f324f514da0 100644
--- a/sysutils/bsdisks/Makefile
+++ b/sysutils/bsdisks/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bsdisks
-DISTVERSION=	0.8
-PORTREVISION=	1
+DISTVERSION=	0.9
 CATEGORIES=	sysutils
 MASTER_SITES=	https://bitbucket.org/arrowd/bsdisks/downloads/
 
diff --git a/sysutils/bsdisks/distinfo b/sysutils/bsdisks/distinfo
index e86e577f12aa..b8746f973bd7 100644
--- a/sysutils/bsdisks/distinfo
+++ b/sysutils/bsdisks/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555260849
-SHA256 (bsdisks-0.8.tar.gz) = 85212f3e88a52691ddb1059eb620416035eec409e302237a1f518b13025743b1
-SIZE (bsdisks-0.8.tar.gz) = 94925
+TIMESTAMP = 1567954257
+SHA256 (bsdisks-0.9.tar.gz) = 273ea0ca76570575786e13167f9c41afe68d611083e943c795db1a989efe800b
+SIZE (bsdisks-0.9.tar.gz) = 101181
diff --git a/sysutils/burp-devel/Makefile b/sysutils/burp-devel/Makefile
index 1d173d607835..f99f15f17ca8 100644
--- a/sysutils/burp-devel/Makefile
+++ b/sysutils/burp-devel/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTVERSION=	2.3.12
+PORTVERSION=	2.3.14
 PKGNAMESUFFIX=	-devel
 
 COMMENT=	Network backup and restore program (development)
diff --git a/sysutils/burp-devel/distinfo b/sysutils/burp-devel/distinfo
index 26519d271eb1..d2d1b4b04627 100644
--- a/sysutils/burp-devel/distinfo
+++ b/sysutils/burp-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565273311
-SHA256 (grke-burp-2.3.12_GH0.tar.gz) = d19cf1471a240ee2de9479527e2dd75b1cea2b1e6d7bb913aab4cad3d028ce16
-SIZE (grke-burp-2.3.12_GH0.tar.gz) = 621358
+TIMESTAMP = 1567498369
+SHA256 (grke-burp-2.3.14_GH0.tar.gz) = 80a37bdc6628fcf11b15bc5bf887be2e2e7d8342eba7229297c914d55f95f86f
+SIZE (grke-burp-2.3.14_GH0.tar.gz) = 621442
diff --git a/sysutils/catfish/Makefile b/sysutils/catfish/Makefile
index 50b6f7bc81a0..3482681c7faf 100644
--- a/sysutils/catfish/Makefile
+++ b/sysutils/catfish/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	catfish
-PORTVERSION=	1.4.8
+PORTVERSION=	1.4.10
 CATEGORIES=	sysutils
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
@@ -14,21 +14,35 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	\
 	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${PY_FLAVOR} \
-	${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \
-	gksu:sysutils/gksu
+	${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		desktop-file-utils gettext-tools gnome python:2.7 tar:bz2
-NO_ARCH=	yes
 USE_PYTHON=	distutils
 USE_GNOME=	gtk30 intltool pygobject3
 
+NO_ARCH=	yes
+INSTALLS_ICONS=	yes
+
 OPTIONS_DEFINE=	DOCS ZEITGEIST
-OPTIONS_DEFAULT=ZEITGEIST
+OPTIONS_DEFAULT=ZEITGEIST POLKIT
+OPTIONS_MULTI=	PRIVILEGES
+OPTIONS_MULTI_PRIVILEGES=	POLKIT SUDO
+
+POLKIT_DESC=	Provide Polkit (pkexec) support
+POLKIT_RUN_DEPENDS=	pkexec:sysutils/polkit
+
+SUDO_DESC=	Provide sudo support
+SUDO_RUN_DEPENDS=	sudo:security/sudo
 
 ZEITGEIST_DESC=	Provide recent search suggestions
 ZEITGEIST_LIB_DEPENDS=	libzeitgeist-2.0.so:sysutils/zeitgeist
 
+post-install:
+	${MV} ${STAGEDIR}${PREFIX}/share/man/man1/catfish.1 ${STAGEDIR}${PREFIX}/man/man1/catfish.1
+	(cd ${STAGEDIR}${PREFIX}/share && ${RMDIR} -p man/man1)
+	${GZIP} ${STAGEDIR}${PREFIX}/man/man1/catfish.1
+
 .include <bsd.port.pre.mk>
 
 PYDISTUTILS_INSTALLARGS=	-c -O1 --prefix=${PREFIX} --root=${STAGEDIR}
diff --git a/sysutils/catfish/distinfo b/sysutils/catfish/distinfo
index c7c4d23c1c4a..53c9f7b34e53 100644
--- a/sysutils/catfish/distinfo
+++ b/sysutils/catfish/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564305030
-SHA256 (xfce4/catfish-1.4.8.tar.bz2) = f3babed77a1059f1894c0ca1792887a6c9c77e76808923c1c6727d5ea59fd84c
-SIZE (xfce4/catfish-1.4.8.tar.bz2) = 181027
+TIMESTAMP = 1568376958
+SHA256 (xfce4/catfish-1.4.10.tar.bz2) = 2573a004105031f871c92fed22a0c4b15bb96f2dff6e36c4f2959f56b62e343d
+SIZE (xfce4/catfish-1.4.10.tar.bz2) = 213951
diff --git a/sysutils/catfish/files/patch-catfish_CatfishWindow.py b/sysutils/catfish/files/patch-catfish_CatfishWindow.py
new file mode 100644
index 000000000000..6121c1d8535f
--- /dev/null
+++ b/sysutils/catfish/files/patch-catfish_CatfishWindow.py
@@ -0,0 +1,28 @@
+--- catfish/CatfishWindow.py.orig	2019-07-27 11:21:22 UTC
++++ catfish/CatfishWindow.py
+@@ -22,6 +22,7 @@ import logging
+ import mimetypes
+ import os
+ import subprocess
++import sys
+ import time
+ from locale import gettext as _
+ from shutil import copy2, rmtree
+@@ -738,9 +739,15 @@ class CatfishWindow(Window):
+         self.update_index_unlock.set_sensitive(False)
+ 
+         if SudoDialog.prefer_pkexec():
+-            self.updatedb_process = SudoDialog.env_spawn('pkexec updatedb', 1)
++            if sys.platform.startswith('linux'):
++                self.updatedb_process = SudoDialog.env_spawn('pkexec updatedb', 1)
++            elif 'bsd' in sys.platform or sys.platform.startswith('dragonfly'):
++                self.updatedb_process = SudoDialog.env_spawn('pkexec /usr/libexec/locate.updatedb', 1)
+         else:
+-            self.updatedb_process = SudoDialog.env_spawn('sudo updatedb', 1)
++            if sys.platform.startswith('linux'):
++                self.updatedb_process = SudoDialog.env_spawn('sudo updatedb', 1)
++            elif 'bsd' in sys.platform or sys.platform.startswith('dragonfly'):
++                self.updatedb_process = SudoDialog.env_spawn('sudo /usr/libexec/locate.updatedb', 1)
+             try:
+                 # Check for password prompt or program exit.
+                 self.updatedb_process.expect(".*ssword.*")
diff --git a/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py b/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py
new file mode 100644
index 000000000000..84829a94cce0
--- /dev/null
+++ b/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py
@@ -0,0 +1,23 @@
+--- catfish_lib/SudoDialog.py.orig	2019-07-27 11:21:22 UTC
++++ catfish_lib/SudoDialog.py
+@@ -18,6 +18,7 @@
+ 
+ from gi.repository import Gtk, GdkPixbuf
+ import os
++import sys
+ 
+ from locale import gettext as _
+ 
+@@ -316,7 +317,11 @@ class SudoDialog(Gtk.Dialog):
+         Return True if successful.
+         '''
+         # Set the pexpect variables and spawn the process.
+-        child = env_spawn('sudo /bin/true', 1)
++        if sys.platform.startswith('linux'):
++            child = env_spawn('sudo /bin/true', 1)
++        elif 'bsd' in sys.platform or sys.platform.startswith('dragonfly'):
++            child = env_spawn('sudo /usr/bin/true', 1)
++
+         try:
+             # Check for password prompt or program exit.
+             child.expect([".*ssword.*", pexpect.EOF])
diff --git a/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py b/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py
new file mode 100644
index 000000000000..7a0e12220ece
--- /dev/null
+++ b/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py
@@ -0,0 +1,22 @@
+--- catfish_lib/catfishconfig.py.orig	2019-08-11 17:51:09 UTC
++++ catfish_lib/catfishconfig.py
+@@ -17,6 +17,7 @@
+ #   with this program.  If not, see <https://www.gnu.org/licenses/>.
+ 
+ import os
++import sys
+ 
+ __all__ = [
+     'project_path_not_found',
+@@ -29,7 +30,10 @@ __all__ = [
+ # files). By default, this is ../data, relative your trunk layout
+ __catfish_data_directory__ = '../data/'
+ # Location of locate.db file
+-__locate_db_path__ = '/var/lib/mlocate/mlocate.db'
++if sys.platform.startswith('linux'):
++    __locate_db_path__ = '/var/lib/mlocate/mlocate.db'
++elif 'bsd' in sys.platform or sys.platform.startswith('dragonfly'):
++    __locate_db_path__ = '/var/db/locate.database'
+ __license__ = 'GPL-3+'
+ __version__ = '1.4.9'
+ 
diff --git a/sysutils/catfish/pkg-plist b/sysutils/catfish/pkg-plist
index 2a54be5a4e01..c520fa29022c 100644
--- a/sysutils/catfish/pkg-plist
+++ b/sysutils/catfish/pkg-plist
@@ -1,7 +1,11 @@
 bin/catfish
+man/man1/catfish.1.gz
 %%PYTHON_SITELIBDIR%%/catfish/AboutCatfishDialog.py
 %%PYTHON_SITELIBDIR%%/catfish/AboutCatfishDialog.pyc
 %%PYTHON_SITELIBDIR%%/catfish/AboutCatfishDialog.pyo
+%%PYTHON_SITELIBDIR%%/catfish/CatfishPrefsDialog.py
+%%PYTHON_SITELIBDIR%%/catfish/CatfishPrefsDialog.pyc
+%%PYTHON_SITELIBDIR%%/catfish/CatfishPrefsDialog.pyo
 %%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.py
 %%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.pyc
 %%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.pyo
@@ -20,6 +24,9 @@ bin/catfish
 %%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.pyc
 %%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.pyo
+%%PYTHON_SITELIBDIR%%/catfish_lib/PrefsDialog.py
+%%PYTHON_SITELIBDIR%%/catfish_lib/PrefsDialog.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/PrefsDialog.pyo
 %%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.pyc
 %%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.pyo
@@ -40,8 +47,12 @@ bin/catfish
 %%PYTHON_SITELIBDIR%%/catfish_lib/helpers.pyo
 share/applications/org.xfce.Catfish.desktop
 %%DATADIR%%/ui/AboutCatfishDialog.ui
+%%DATADIR%%/ui/CatfishPreferences.ui
 %%DATADIR%%/ui/CatfishWindow.ui
 %%DATADIR%%/ui/about_catfish_dialog.xml
+%%DATADIR%%/ui/catfish-wl-headerbar.png
+%%DATADIR%%/ui/catfish-wl-titlebar.png
+%%DATADIR%%/ui/catfish_preferences.xml
 %%DATADIR%%/ui/catfish_window.xml
 %%PORTDOCS%%%%DOCSDIR%%/README
 share/icons/hicolor/scalable/apps/catfish.svg
@@ -93,5 +104,4 @@ share/locale/tr/LC_MESSAGES/catfish.mo
 share/locale/uk/LC_MESSAGES/catfish.mo
 share/locale/zh_CN/LC_MESSAGES/catfish.mo
 share/locale/zh_TW/LC_MESSAGES/catfish.mo
-share/man/man1/catfish.1
 share/metainfo/catfish.appdata.xml
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index dfd57ecc2df3..4938742f6ea0 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cbsd
-DISTVERSION=	12.0.14
+DISTVERSION=	12.1.1
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index 4e6f2166d47f..09465bb935ed 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565785458
-SHA256 (cbsd-cbsd-12.0.14_GH0.tar.gz) = 5b6b8aee2bcc49d72f161dcbc10d1c4c05c9c1cd4a924b16f78aa2a118e836df
-SIZE (cbsd-cbsd-12.0.14_GH0.tar.gz) = 5855012
+TIMESTAMP = 1568407580
+SHA256 (cbsd-cbsd-12.1.1_GH0.tar.gz) = 289c36e47161e4be6712f658ef055a5ac1a6b66a1a05d411dfaab71f8742a484
+SIZE (cbsd-cbsd-12.1.1_GH0.tar.gz) = 5859925
diff --git a/sysutils/cbsd/files/cbsdd.in b/sysutils/cbsd/files/cbsdd.in
index 1df5153cb691..77bc6d165018 100644
--- a/sysutils/cbsd/files/cbsdd.in
+++ b/sysutils/cbsd/files/cbsdd.in
@@ -64,7 +64,6 @@ cbsdd_prestart() {
 	%%PREFIX%%/bin/cbsd sysinv mode=update
 	%%PREFIX%%/bin/cbsd netinv
 	update_netinfo
-	env sqlcolnames="1" ${miscdir}/sqlcli ${dbdir}/local.sqlite "SELECT * FROM local" > ${inventory}
 	${miscdir}/sqlcli ${dbdir}/local.sqlite "UPDATE jails SET status='0' WHERE status='3'"
 	[ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd naton
 	/usr/sbin/daemon -f ${rcddir}/jails-astart start
diff --git a/sysutils/cinnamon-settings-daemon/Makefile b/sysutils/cinnamon-settings-daemon/Makefile
index e99337db15b7..68b315d16aa0 100644
--- a/sysutils/cinnamon-settings-daemon/Makefile
+++ b/sysutils/cinnamon-settings-daemon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cinnamon-settings-daemon
 PORTVERSION=	2.4.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils gnome
 DIST_SUBDIR=	gnome3
 
@@ -33,7 +33,6 @@ USE_GNOME=	gnomeprefix intlhack libgnomekbd \
 		libxslt:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-USE_XORG=	xxf86misc
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/cmdwatch/Makefile b/sysutils/cmdwatch/Makefile
index 1af3da41914e..0076a7a2c914 100644
--- a/sysutils/cmdwatch/Makefile
+++ b/sysutils/cmdwatch/Makefile
@@ -10,6 +10,8 @@ MASTER_SITES=	http://www.chruetertee.ch/files/download/
 MAINTAINER=	beat@FreeBSD.org
 COMMENT=	Watches the output from a command at specified intervals
 
+LICENSE=	GPLv2+
+
 USES=		ncurses
 PLIST_FILES=	bin/cmdwatch man/man1/cmdwatch.1.gz
 
diff --git a/sysutils/consul-replicate/Makefile b/sysutils/consul-replicate/Makefile
index e8a7e549c2b1..bb881fc72cea 100644
--- a/sysutils/consul-replicate/Makefile
+++ b/sysutils/consul-replicate/Makefile
@@ -11,11 +11,17 @@ COMMENT=	Consul cross-DC KV replication daemon
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		compiler go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
-GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
+
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+GO_BUILDFLAGS=	-ldflags="\
+		-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.Version=${PORTVERSION} \
+		-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitCommit=675a2c2 \
+		-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitDescribe=v${PORTVERSION} \
+		"
 
 USE_RC_SUBR=	consul-replicate
 
@@ -24,29 +30,4 @@ PLIST_FILES=	bin/${PORTNAME}
 USERS=		consul
 GROUPS=		consul
 
-post-extract:
-	@${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/
-
-do-build:
-	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; \
-		${SETENV} CGO_ENABLED=0 ${BUILD_ENV} ${MAKE_ENV} GOPATH=${WRKSRC} \
-		go build -v -x -ldflags "\
-		-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.Version=${PORTVERSION}  \
-		-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitCommit=675a2c2  \
-		-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitDescribe=v${PORTVERSION} \
-		" -o bin/${PORTNAME}
-
-do-install:
-	${INSTALL_PROGRAM} \
-		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/bin/${PORTNAME} \
-		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
-.include <bsd.port.pre.mk>
-
-# golang assumes that if clang is in use, it is called "clang" and not "cc". If
-# it's called "cc", go fails.
-.if ${COMPILER_TYPE} == clang
-BUILD_ENV=	CC=clang
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index 89837dc250d6..b93d1c6e2ad6 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -11,11 +11,16 @@ COMMENT=	Service discovery and configuration made easy
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		compiler go
+USES=		go:modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
-GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
+
+GO_BUILDFLAGS=	-ldflags="\
+		-X github.com/hashicorp/consul/version.Version=${PORTVERSION} \
+		-X github.com/hashicorp/consul/version.VersionPrerelease= \
+		-X github.com/hashicorp/consul/version.GitDescribe=v${PORTVERSION} \
+		"
 
 USE_RC_SUBR=	consul
 
@@ -25,26 +30,8 @@ USERS=		consul
 GROUPS=		consul
 
 post-extract:
-	@${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/
-
-do-build:
-	@cd ${WRKSRC}/src/github.com/hashicorp/consul; ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 ${BUILD_ENV} GOPATH=${WRKSRC} go build \
-		-ldflags "\
-		-X github.com/hashicorp/consul/version.Version=${PORTVERSION}  \
-		-X github.com/hashicorp/consul/version.VersionPrerelease=  \
-		-X github.com/hashicorp/consul/version.GitDescribe=v${PORTVERSION} \
-		" \
-		-o bin/consul
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/hashicorp/consul/bin/consul ${STAGEDIR}${PREFIX}/bin/consul
-
-.include <bsd.port.pre.mk>
-
-# golang assumes that if clang is in use, it is called "clang" and not "cc". If
-# it's called "cc", go fails.
-.if ${COMPILER_TYPE} == clang
-BUILD_ENV=	CC=clang
-.endif
+	${MKDIR} ${WRKSRC}/vendor/github.com/${GH_ACCOUNT}/${PORTNAME}
+	${LN} -s ${WRKSRC}/api ${WRKSRC}/vendor/github.com/${GH_ACCOUNT}/${PORTNAME}/api
+	${LN} -s ${WRKSRC}/sdk ${WRKSRC}/vendor/github.com/${GH_ACCOUNT}/${PORTNAME}/sdk
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/eksctl/Makefile b/sysutils/eksctl/Makefile
index 7b17c493fb2b..fa0e8fccc147 100644
--- a/sysutils/eksctl/Makefile
+++ b/sysutils/eksctl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	eksctl
-PORTVERSION=	0.5.0
+PORTVERSION=	0.5.3
 CATEGORIES=	sysutils
 
 MAINTAINER=	danilo@FreeBSD.org
@@ -35,6 +35,7 @@ GH_TUPLE=	\
 		alecthomas:template:a0175ee3bccc:alecthomas_template/vendor/github.com/alecthomas/template \
 		alecthomas:units:2efee857e7cf:alecthomas_units/vendor/github.com/alecthomas/units \
 		apex:log:v1.1.0:apex_log/vendor/github.com/apex/log \
+		aws:aws-sdk-go:v1.23.15:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
 		beorn7:perks:v1.0.0:beorn7_perks/vendor/github.com/beorn7/perks \
 		bep:debounce:v1.2.0:bep_debounce/vendor/github.com/bep/debounce \
 		bep:gitmap:v1.0.0:bep_gitmap/vendor/github.com/bep/gitmap \
@@ -69,7 +70,6 @@ GH_TUPLE=	\
 		docker:spdystream:6480d4af844c:docker_spdystream/vendor/github.com/docker/spdystream \
 		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
 		eknkc:amber:cdade1c07385:eknkc_amber/vendor/github.com/eknkc/amber \
-		errordeveloper:aws-sdk-go:v1.21.99:errordeveloper_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
 		errordeveloper:goformation:a31eae35e596:errordeveloper_goformation/vendor/github.com/awslabs/goformation \
 		evanphx:json-patch:v4.2.0:evanphx_json_patch/vendor/github.com/evanphx/json-patch \
 		fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \
diff --git a/sysutils/eksctl/distinfo b/sysutils/eksctl/distinfo
index 43def55a2753..1191c876b512 100644
--- a/sysutils/eksctl/distinfo
+++ b/sysutils/eksctl/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1567630286
-SHA256 (weaveworks-eksctl-0.5.0_GH0.tar.gz) = 7e3c5d6cd0dcaa92f6d0dc8d37dac375536ab0ffe68ddcba549f501521a7d3b2
-SIZE (weaveworks-eksctl-0.5.0_GH0.tar.gz) = 10079436
+TIMESTAMP = 1568324657
+SHA256 (weaveworks-eksctl-0.5.3_GH0.tar.gz) = 2aaae932a116daa4e5e6cf069f9e2c20b683b7945a0710ac621d8f72c947e5af
+SIZE (weaveworks-eksctl-0.5.3_GH0.tar.gz) = 10085348
 SHA256 (Azure-azure-pipeline-go-v0.1.8_GH0.tar.gz) = b06a891cf8efc3f65ce2b447dc42c7814c23af9c3ea1390135b1a998b4c6ba25
 SIZE (Azure-azure-pipeline-go-v0.1.8_GH0.tar.gz) = 15319
 SHA256 (Azure-azure-storage-blob-go-45d0c5e3638e_GH0.tar.gz) = f926e4803dbcfdc95171e7bd410437b276aa43763559df49e5a0681a109b2848
@@ -29,6 +29,8 @@ SHA256 (alecthomas-units-2efee857e7cf_GH0.tar.gz) = 1e8ded84579a751d732db65a6dc6
 SIZE (alecthomas-units-2efee857e7cf_GH0.tar.gz) = 3442
 SHA256 (apex-log-v1.1.0_GH0.tar.gz) = 167b8a054c047bb868666fa4d231ffb5429eca8de3f463182cbdf7432352d2a1
 SIZE (apex-log-v1.1.0_GH0.tar.gz) = 23983
+SHA256 (aws-aws-sdk-go-v1.23.15_GH0.tar.gz) = 0226da150dcd41d1fac03e6e9b137cc605da8ac11e6a9cbea290588ef9bcfd31
+SIZE (aws-aws-sdk-go-v1.23.15_GH0.tar.gz) = 11855236
 SHA256 (beorn7-perks-v1.0.0_GH0.tar.gz) = b69d92e2e84b7d510dfa6110d3ac4ada0096a6c81190c5e174aa888bfe475cbc
 SIZE (beorn7-perks-v1.0.0_GH0.tar.gz) = 10866
 SHA256 (bep-debounce-v1.2.0_GH0.tar.gz) = 89da4947e4e83af6037ca961d64bdf055a4ae811c4057c16b4c4b354c098862d
@@ -97,8 +99,6 @@ SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c
 SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260
 SHA256 (eknkc-amber-cdade1c07385_GH0.tar.gz) = b7a732710c5483f5e899346b173cd178d090a0a06b6eb40c70bd195e33b62653
 SIZE (eknkc-amber-cdade1c07385_GH0.tar.gz) = 22598
-SHA256 (errordeveloper-aws-sdk-go-v1.21.99_GH0.tar.gz) = d07966defc9311d3939d9d4f9d1325218c815ea3514ce5b94d42f942381a6866
-SIZE (errordeveloper-aws-sdk-go-v1.21.99_GH0.tar.gz) = 11647260
 SHA256 (errordeveloper-goformation-a31eae35e596_GH0.tar.gz) = 0924e9b3910582a38474c66bb6023c185512c67c8324980d157294985aa0b412
 SIZE (errordeveloper-goformation-a31eae35e596_GH0.tar.gz) = 2446380
 SHA256 (evanphx-json-patch-v4.2.0_GH0.tar.gz) = 256711ab08b342be5d7ea7e2d84bf498110641f8fdc0f81806d3e3bb868c2813
diff --git a/sysutils/exfat-utils/Makefile b/sysutils/exfat-utils/Makefile
index 475ab80caff7..43b4c6f4d10c 100644
--- a/sysutils/exfat-utils/Makefile
+++ b/sysutils/exfat-utils/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	exfat
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.8
+DISTVERSION=	1.3.0
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-utils
 
@@ -12,13 +12,13 @@ COMMENT=	Utilities to create, check, label and dump exFAT filesystem
 
 LICENSE=	GPLv2+ MSPAT
 LICENSE_COMB=	multi
-LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 LICENSE_NAME_MSPAT=	Microsoft exFAT Patent License
 LICENSE_TEXT_MSPAT=	It is important to note that open source and other publicly \
 			available implementations of exFAT do not include a patent \
 			license from Microsoft. A license is required in order to \
 			implement exFAT and use it in a product or device. \
 	https://www.microsoft.com/en-us/legal/intellectualproperty/mtl/exfat-licensing.aspx
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 LICENSE_PERMS_MSPAT=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
 
 LIB_DEPENDS=	libublio.so:devel/libublio
diff --git a/sysutils/exfat-utils/distinfo b/sysutils/exfat-utils/distinfo
index 81e96cf87926..f7ef348d5b5e 100644
--- a/sysutils/exfat-utils/distinfo
+++ b/sysutils/exfat-utils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521383513
-SHA256 (relan-exfat-v1.2.8_GH0.tar.gz) = 778474bfbcd92e35bba5b88bd7ad3f6400328256636abb9031bfcc1ce15ed887
-SIZE (relan-exfat-v1.2.8_GH0.tar.gz) = 55911
+TIMESTAMP = 1566154695
+SHA256 (relan-exfat-v1.3.0_GH0.tar.gz) = 689bcb4a639acd2d45e6fa0ff455f7f18edb2421d4f4f42909943775adc0e375
+SIZE (relan-exfat-v1.3.0_GH0.tar.gz) = 57846
diff --git a/sysutils/exfat-utils/files/patch-libexfat_platform.h b/sysutils/exfat-utils/files/patch-libexfat_platform.h
deleted file mode 100644
index 0d0b85daf7c1..000000000000
--- a/sysutils/exfat-utils/files/patch-libexfat_platform.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libexfat/platform.h.orig	2016-06-03 05:30:35 UTC
-+++ libexfat/platform.h
-@@ -46,7 +46,7 @@
- #define EXFAT_LITTLE_ENDIAN LITTLE_ENDIAN
- #define EXFAT_BIG_ENDIAN BIG_ENDIAN
- 
--#elif defined(__FreeBSD__) || defined(__DragonFlyBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
- 
- #include <sys/endian.h>
- #define exfat_bswap16(x) bswap16(x)
diff --git a/sysutils/exfat-utils/files/patch-ublio b/sysutils/exfat-utils/files/patch-ublio
deleted file mode 100644
index 65d36a69bf5c..000000000000
--- a/sysutils/exfat-utils/files/patch-ublio
+++ /dev/null
@@ -1,176 +0,0 @@
-# Revert 3959f7d to restore ublio support and add autoconf glue.
-
-diff --git README.md README.md
-index 60d5c71..81446a6 100644
---- README.md
-+++ README.md
-@@ -7,6 +7,7 @@ Supported operating systems:
- 
- * GNU/Linux
- * Mac OS X 10.5 or later
-+* FreeBSD
- * OpenBSD
- 
- Most GNU/Linux distributions already have fuse-exfat and exfat-utils in their repositories, so you can just install and use them. The next chapter describes how to compile them from source.
-diff --git configure.ac configure.ac
-index b45db3f..2bcda4b 100644
---- configure.ac
-+++ configure.ac
-@@ -31,6 +31,12 @@ AC_PROG_CC_C99
- AC_PROG_RANLIB
- AM_PROG_AR
- AC_SYS_LARGEFILE
-+PKG_CHECK_MODULES([UBLIO], [libublio], [
-+  CFLAGS="$CFLAGS $UBLIO_CFLAGS"
-+  LIBS="$LIBS $UBLIO_LIBS"
-+  AC_DEFINE([USE_UBLIO], [1],
-+    [Define if block devices are not supported.])
-+], [:])
- PKG_CHECK_MODULES([FUSE], [fuse])
- AC_CONFIG_HEADERS([libexfat/config.h])
- AC_CONFIG_FILES([
-diff --git libexfat/io.c libexfat/io.c
-index 60f28e2..14c0151 100644
---- libexfat/io.c	2018-02-03 09:01:42.000000000 +0100
-+++ libexfat/io.c	2018-03-18 15:45:43.573290677 +0100
-@@ -38,12 +38,20 @@
- #elif __linux__
- #include <sys/mount.h>
- #endif
-+#ifdef USE_UBLIO
-+#include <sys/uio.h>
-+#include <ublio.h>
-+#endif
- 
- struct exfat_dev
- {
- 	int fd;
- 	enum exfat_mode mode;
- 	off_t size; /* in bytes */
-+#ifdef USE_UBLIO
-+	off_t pos;
-+	ublio_filehandle_t ufh;
-+#endif
- };
- 
- static bool is_open(int fd)
-@@ -80,6 +88,9 @@
- {
- 	struct exfat_dev* dev;
- 	struct stat stbuf;
-+#ifdef USE_UBLIO
-+	struct ublio_param up;
-+#endif
- 
- 	/* The system allocates file descriptors sequentially. If we have been
- 	   started with stdin (0), stdout (1) or stderr (2) closed, the system
-@@ -235,6 +246,24 @@
- 		}
- 	}
- 
-+#ifdef USE_UBLIO
-+	memset(&up, 0, sizeof(struct ublio_param));
-+	up.up_blocksize = 256 * 1024;
-+	up.up_items = 64;
-+	up.up_grace = 32;
-+	up.up_priv = &dev->fd;
-+
-+	dev->pos = 0;
-+	dev->ufh = ublio_open(&up);
-+	if (dev->ufh == NULL)
-+	{
-+		close(dev->fd);
-+		free(dev);
-+		exfat_error("failed to initialize ublio");
-+		return NULL;
-+	}
-+#endif
-+
- 	return dev;
- }
- 
-@@ -242,6 +271,13 @@
- {
- 	int rc = 0;
- 
-+#ifdef USE_UBLIO
-+	if (ublio_close(dev->ufh) != 0)
-+	{
-+		exfat_error("failed to close ublio");
-+		rc = -EIO;
-+	}
-+#endif
- 	if (close(dev->fd) != 0)
- 	{
- 		exfat_error("failed to close device: %s", strerror(errno));
-@@ -255,6 +291,13 @@
- {
- 	int rc = 0;
- 
-+#ifdef USE_UBLIO
-+	if (ublio_fsync(dev->ufh) != 0)
-+	{
-+		exfat_error("ublio fsync failed");
-+		rc = -EIO;
-+	}
-+#endif
- 	if (fsync(dev->fd) != 0)
- 	{
- 		exfat_error("fsync failed: %s", strerror(errno));
-@@ -275,29 +318,56 @@
- 
- off_t exfat_seek(struct exfat_dev* dev, off_t offset, int whence)
- {
-+#ifdef USE_UBLIO
-+	/* XXX SEEK_CUR will be handled incorrectly */
-+	return dev->pos = lseek(dev->fd, offset, whence);
-+#else
- 	return lseek(dev->fd, offset, whence);
-+#endif
- }
- 
- ssize_t exfat_read(struct exfat_dev* dev, void* buffer, size_t size)
- {
-+#ifdef USE_UBLIO
-+	ssize_t result = ublio_pread(dev->ufh, buffer, size, dev->pos);
-+	if (result >= 0)
-+		dev->pos += size;
-+	return result;
-+#else
- 	return read(dev->fd, buffer, size);
-+#endif
- }
- 
- ssize_t exfat_write(struct exfat_dev* dev, const void* buffer, size_t size)
- {
-+#ifdef USE_UBLIO
-+	ssize_t result = ublio_pwrite(dev->ufh, buffer, size, dev->pos);
-+	if (result >= 0)
-+		dev->pos += size;
-+	return result;
-+#else
- 	return write(dev->fd, buffer, size);
-+#endif
- }
- 
- ssize_t exfat_pread(struct exfat_dev* dev, void* buffer, size_t size,
- 		off_t offset)
- {
-+#ifdef USE_UBLIO
-+	return ublio_pread(dev->ufh, buffer, size, offset);
-+#else
- 	return pread(dev->fd, buffer, size, offset);
-+#endif
- }
- 
- ssize_t exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size,
- 		off_t offset)
- {
-+#ifdef USE_UBLIO
-+	return ublio_pwrite(dev->ufh, buffer, size, offset);
-+#else
- 	return pwrite(dev->fd, buffer, size, offset);
-+#endif
- }
- 
- ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node,
diff --git a/sysutils/fusefs-exfat/Makefile b/sysutils/fusefs-exfat/Makefile
index 63519b7e09fc..ad8b83d5a03e 100644
--- a/sysutils/fusefs-exfat/Makefile
+++ b/sysutils/fusefs-exfat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	exfat
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.8
+DISTVERSION=	1.3.0
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	fusefs-
 
@@ -12,13 +12,13 @@ COMMENT=	Full-featured exFAT FS implementation as a FUSE module
 
 LICENSE=	GPLv2+ MSPAT
 LICENSE_COMB=	multi
-LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 LICENSE_NAME_MSPAT=	Microsoft exFAT Patent License
 LICENSE_TEXT_MSPAT=	It is important to note that open source and other publicly \
 			available implementations of exFAT do not include a patent \
 			license from Microsoft. A license is required in order to \
 			implement exFAT and use it in a product or device. \
 	https://www.microsoft.com/en-us/legal/intellectualproperty/mtl/exfat-licensing.aspx
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 LICENSE_PERMS_MSPAT=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
 
 LIB_DEPENDS=	libublio.so:devel/libublio
diff --git a/sysutils/fusefs-exfat/distinfo b/sysutils/fusefs-exfat/distinfo
index f91a3e0b187d..9cca7d02e16b 100644
--- a/sysutils/fusefs-exfat/distinfo
+++ b/sysutils/fusefs-exfat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521383763
-SHA256 (relan-exfat-v1.2.8_GH0.tar.gz) = 778474bfbcd92e35bba5b88bd7ad3f6400328256636abb9031bfcc1ce15ed887
-SIZE (relan-exfat-v1.2.8_GH0.tar.gz) = 55911
+TIMESTAMP = 1566155165
+SHA256 (relan-exfat-v1.3.0_GH0.tar.gz) = 689bcb4a639acd2d45e6fa0ff455f7f18edb2421d4f4f42909943775adc0e375
+SIZE (relan-exfat-v1.3.0_GH0.tar.gz) = 57846
diff --git a/sysutils/fusefs-exfat/files/patch-libexfat_platform.h b/sysutils/fusefs-exfat/files/patch-libexfat_platform.h
deleted file mode 100644
index 0d0b85daf7c1..000000000000
--- a/sysutils/fusefs-exfat/files/patch-libexfat_platform.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libexfat/platform.h.orig	2016-06-03 05:30:35 UTC
-+++ libexfat/platform.h
-@@ -46,7 +46,7 @@
- #define EXFAT_LITTLE_ENDIAN LITTLE_ENDIAN
- #define EXFAT_BIG_ENDIAN BIG_ENDIAN
- 
--#elif defined(__FreeBSD__) || defined(__DragonFlyBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
- 
- #include <sys/endian.h>
- #define exfat_bswap16(x) bswap16(x)
diff --git a/sysutils/fusefs-exfat/files/patch-ublio b/sysutils/fusefs-exfat/files/patch-ublio
deleted file mode 100644
index 65d36a69bf5c..000000000000
--- a/sysutils/fusefs-exfat/files/patch-ublio
+++ /dev/null
@@ -1,176 +0,0 @@
-# Revert 3959f7d to restore ublio support and add autoconf glue.
-
-diff --git README.md README.md
-index 60d5c71..81446a6 100644
---- README.md
-+++ README.md
-@@ -7,6 +7,7 @@ Supported operating systems:
- 
- * GNU/Linux
- * Mac OS X 10.5 or later
-+* FreeBSD
- * OpenBSD
- 
- Most GNU/Linux distributions already have fuse-exfat and exfat-utils in their repositories, so you can just install and use them. The next chapter describes how to compile them from source.
-diff --git configure.ac configure.ac
-index b45db3f..2bcda4b 100644
---- configure.ac
-+++ configure.ac
-@@ -31,6 +31,12 @@ AC_PROG_CC_C99
- AC_PROG_RANLIB
- AM_PROG_AR
- AC_SYS_LARGEFILE
-+PKG_CHECK_MODULES([UBLIO], [libublio], [
-+  CFLAGS="$CFLAGS $UBLIO_CFLAGS"
-+  LIBS="$LIBS $UBLIO_LIBS"
-+  AC_DEFINE([USE_UBLIO], [1],
-+    [Define if block devices are not supported.])
-+], [:])
- PKG_CHECK_MODULES([FUSE], [fuse])
- AC_CONFIG_HEADERS([libexfat/config.h])
- AC_CONFIG_FILES([
-diff --git libexfat/io.c libexfat/io.c
-index 60f28e2..14c0151 100644
---- libexfat/io.c	2018-02-03 09:01:42.000000000 +0100
-+++ libexfat/io.c	2018-03-18 15:45:43.573290677 +0100
-@@ -38,12 +38,20 @@
- #elif __linux__
- #include <sys/mount.h>
- #endif
-+#ifdef USE_UBLIO
-+#include <sys/uio.h>
-+#include <ublio.h>
-+#endif
- 
- struct exfat_dev
- {
- 	int fd;
- 	enum exfat_mode mode;
- 	off_t size; /* in bytes */
-+#ifdef USE_UBLIO
-+	off_t pos;
-+	ublio_filehandle_t ufh;
-+#endif
- };
- 
- static bool is_open(int fd)
-@@ -80,6 +88,9 @@
- {
- 	struct exfat_dev* dev;
- 	struct stat stbuf;
-+#ifdef USE_UBLIO
-+	struct ublio_param up;
-+#endif
- 
- 	/* The system allocates file descriptors sequentially. If we have been
- 	   started with stdin (0), stdout (1) or stderr (2) closed, the system
-@@ -235,6 +246,24 @@
- 		}
- 	}
- 
-+#ifdef USE_UBLIO
-+	memset(&up, 0, sizeof(struct ublio_param));
-+	up.up_blocksize = 256 * 1024;
-+	up.up_items = 64;
-+	up.up_grace = 32;
-+	up.up_priv = &dev->fd;
-+
-+	dev->pos = 0;
-+	dev->ufh = ublio_open(&up);
-+	if (dev->ufh == NULL)
-+	{
-+		close(dev->fd);
-+		free(dev);
-+		exfat_error("failed to initialize ublio");
-+		return NULL;
-+	}
-+#endif
-+
- 	return dev;
- }
- 
-@@ -242,6 +271,13 @@
- {
- 	int rc = 0;
- 
-+#ifdef USE_UBLIO
-+	if (ublio_close(dev->ufh) != 0)
-+	{
-+		exfat_error("failed to close ublio");
-+		rc = -EIO;
-+	}
-+#endif
- 	if (close(dev->fd) != 0)
- 	{
- 		exfat_error("failed to close device: %s", strerror(errno));
-@@ -255,6 +291,13 @@
- {
- 	int rc = 0;
- 
-+#ifdef USE_UBLIO
-+	if (ublio_fsync(dev->ufh) != 0)
-+	{
-+		exfat_error("ublio fsync failed");
-+		rc = -EIO;
-+	}
-+#endif
- 	if (fsync(dev->fd) != 0)
- 	{
- 		exfat_error("fsync failed: %s", strerror(errno));
-@@ -275,29 +318,56 @@
- 
- off_t exfat_seek(struct exfat_dev* dev, off_t offset, int whence)
- {
-+#ifdef USE_UBLIO
-+	/* XXX SEEK_CUR will be handled incorrectly */
-+	return dev->pos = lseek(dev->fd, offset, whence);
-+#else
- 	return lseek(dev->fd, offset, whence);
-+#endif
- }
- 
- ssize_t exfat_read(struct exfat_dev* dev, void* buffer, size_t size)
- {
-+#ifdef USE_UBLIO
-+	ssize_t result = ublio_pread(dev->ufh, buffer, size, dev->pos);
-+	if (result >= 0)
-+		dev->pos += size;
-+	return result;
-+#else
- 	return read(dev->fd, buffer, size);
-+#endif
- }
- 
- ssize_t exfat_write(struct exfat_dev* dev, const void* buffer, size_t size)
- {
-+#ifdef USE_UBLIO
-+	ssize_t result = ublio_pwrite(dev->ufh, buffer, size, dev->pos);
-+	if (result >= 0)
-+		dev->pos += size;
-+	return result;
-+#else
- 	return write(dev->fd, buffer, size);
-+#endif
- }
- 
- ssize_t exfat_pread(struct exfat_dev* dev, void* buffer, size_t size,
- 		off_t offset)
- {
-+#ifdef USE_UBLIO
-+	return ublio_pread(dev->ufh, buffer, size, offset);
-+#else
- 	return pread(dev->fd, buffer, size, offset);
-+#endif
- }
- 
- ssize_t exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size,
- 		off_t offset)
- {
-+#ifdef USE_UBLIO
-+	return ublio_pwrite(dev->ufh, buffer, size, offset);
-+#else
- 	return pwrite(dev->fd, buffer, size, offset);
-+#endif
- }
- 
- ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node,
diff --git a/sysutils/go-wtf/Makefile b/sysutils/go-wtf/Makefile
index 73824a94ccf2..ad9b35c2f730 100644
--- a/sysutils/go-wtf/Makefile
+++ b/sysutils/go-wtf/Makefile
@@ -18,84 +18,6 @@ CONFLICTS=	wtf
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wtfutil
-GH_TUPLE=	\
-		PagerDuty:go-pagerduty:cf1437c7c8d6:pagerduty_go_pagerduty/vendor/github.com/PagerDuty/go-pagerduty \
-		PuerkitoBio:goquery:v1.5.0:puerkitobio_goquery/vendor/github.com/PuerkitoBio/goquery \
-		StackExchange:wmi:cbe66965904d:stackexchange_wmi/vendor/github.com/StackExchange/wmi \
-		adlio:trello:v1.0.0:adlio_trello/vendor/github.com/adlio/trello \
-		alecthomas:chroma:v0.6.3:alecthomas_chroma/vendor/github.com/alecthomas/chroma \
-		andybalholm:cascadia:v1.0.0:andybalholm_cascadia/vendor/github.com/andybalholm/cascadia \
-		andygrunwald:go-gerrit:64931d233c2d:andygrunwald_go_gerrit/vendor/github.com/andygrunwald/go-gerrit \
-		briandowns:openweathermap:5f41b7c9d92d:briandowns_openweathermap/vendor/github.com/briandowns/openweathermap \
-		cenkalti:backoff:v2.2.0:cenkalti_backoff/vendor/github.com/cenkalti/backoff \
-		census-instrumentation:opencensus-go:v0.22.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
-		danwakefield:fnmatch:cbb64ac3d964:danwakefield_fnmatch/vendor/github.com/danwakefield/fnmatch \
-		darkSasori:todoist:ec6b38b374ab:darksasori_todoist/vendor/github.com/darkSasori/todoist \
-		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		dlclark:regexp2:v1.1.6:dlclark_regexp2/vendor/github.com/dlclark/regexp2 \
-		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
-		gdamore:encoding:v1.0.0:gdamore_encoding/vendor/github.com/gdamore/encoding \
-		gdamore:tcell:v1.1.4:gdamore_tcell/vendor/github.com/gdamore/tcell \
-		go-ole:go-ole:v1.2.4:go_ole_go_ole/vendor/github.com/go-ole/go-ole \
-		go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		go-inf:inf:v0.9.0:go_yaml_yaml/vendor/gopkg.in/inf.v0 \
-		godbus:dbus:v5.0.1:godbus_dbus/vendor/github.com/godbus/dbus \
-		gogo:protobuf:65acae22fc9d:gogo_protobuf/vendor/github.com/gogo/protobuf \
-		golang:appengine:v1.6.1:golang_appengine/vendor/google.golang.org/appengine \
-		golang:crypto:4def268fd1a4:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:da137c7871d7:golang_net/vendor/golang.org/x/net \
-		golang:oauth2:0f29369cfe45:golang_oauth2/vendor/golang.org/x/oauth2 \
-		golang:protobuf:v1.3.1:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:6a60838ec25:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
-		golang:time:85acf8d2951c:golang_time/vendor/golang.org/x/time \
-		google:go-genproto:eb59cef1c072:google_go_genproto/vendor/google.golang.org/genproto \
-		google:go-github:v26.0.9:google_go_github/vendor/github.com/google/go-github/v26 \
-		google:go-querystring:v1.0.0:google_go_querystring/vendor/github.com/google/go-querystring \
-		google:gofuzz:v1.0.0:google_gofuzz/vendor/github.com/google/gofuzz \
-		googleapis:gnostic:0c5108395e2d:googleapis_gnostic/vendor/github.com/googleapis/gnostic \
-		googleapis:google-api-go-client:v0.7.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
-		googleapis:google-cloud-go:v0.40.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
-		grpc:grpc-go:v1.21.1:grpc_grpc_go/vendor/google.golang.org/grpc \
-		hashicorp:go-cleanhttp:v0.5.1:hashicorp_go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \
-		hashicorp:golang-lru:v0.5.1:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
-		hekmon:cunits:v2.0.1:hekmon_cunits/vendor/github.com/hekmon/cunits \
-		hekmon:transmissionrpc:1d589625bacd:hekmon_transmissionrpc/vendor/github.com/hekmon/transmissionrpc \
-		imdario:mergo:v0.3.5:imdario_mergo//vendor/github.com/imdario/mergo \
-		json-iterator:go:v1.1.6:json_iterator_go/vendor/github.com/json-iterator/go \
-		jessevdk:go-flags:v1.4.0:jessevdk_go_flags/vendor/github.com/jessevdk/go-flags \
-		kubernetes:api:7cf5895f2711:k8s_io_api/vendor/k8s.io/api \
-		kubernetes:apimachinery:6fa4771c83b3:k8s_io_apimachinery/vendor/k8s.io/apimachinery \
-		kubernetes:client-go:v12.0.0:k8s_io_client_go/vendor/k8s.io/client-go \
-		kubernetes:gengo:0689ccc1d7d6:k8s_io_gengo/vendor/k8s.io/gengo \
-		kubernetes:klog:v0.3.1:k8s_io_klog/vendor/k8s.io/klog \
-		kubernetes:kube-openapi:b3a7cee44a30:k8s_io_kube_openapi/vendor/k8s.io/kube-openapi \
-		kubernetes:utils:c2654d5206da:k8s_io_utils/vendor/k8s.io/utils \
-		kubernetes-sigs:yaml:v1.1.0:sigs_k8s_io_yaml/vendor/sigs.k8s.io/yaml \
-		logrusorgru:aurora:cea283e61946:logrusorgru_aurora/vendor/github.com/logrusorgru/aurora \
-		lucasb-eyer:go-colorful:v1.0.2:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
-		mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
-		mmcdole:gofeed:0e68beaf6fdf:mmcdole_gofeed/vendor/github.com/mmcdole/gofeed \
-		mmcdole:goxpp:0068e33feabf:mmcdole_goxpp/vendor/github.com/mmcdole/goxpp \
-		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
-		modern-go:reflect2:v1.0.1:modern_go_reflect/vendor/github.com/modern-go/reflect2 \
-		olebedev:config:364964f3a8e4:olebedev_config/vendor/github.com/olebedev/config \
-		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
-		pkg:profile:v1.3.0:pkg_profile/vendor/github.com/pkg/profile \
-		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		radovskyb:watcher:v1.0.6:radovskyb_watcher/vendor/github.com/radovskyb/watcher \
-		rivo:tview:2e907d29e475:rivo_tview/vendor/github.com/rivo/tview \
-		rivo:uniseg:v0.1.0:rivo_uniseg/vendor/github.com/rivo/uniseg \
-		shirou:gopsutil:v2.18.12:shirou_gopsutil/vendor/github.com/shirou/gopsutil \
-		spf13:pflag:v1.0.3:spf13_pflag/vendor/github.com/spf13/pflag \
-		sticreations:spotigopher:98632f6f94b0:sticreations_spotigopher/vendor/github.com/sticreations/spotigopher \
-		stretchr:testify:v1.3.0:stretchr_testify/vendor/github.com/stretchr/testify \
-		xanzy:go-gitlab:v0.18.0:xanzy_go_gitlab/vendor/github.com/xanzy/go-gitlab \
-		zmb3:spotify:158b1863f5b5:zmb3_spotify/vendor/github.com/zmb3/spotify \
-		zorkian:go-datadog-api:v2.21.0:zorkian_go_datadog_api/vendor/github.com/zorkian/go-datadog-api
-
-# this is missing, so use the local vendor copy
-#		yfronto:newrelic:7c9c2852e8f9:yfronto_newrelic/vendor/github.com/yfronto/newrelic
 
 GO_BUILDFLAGS=	-ldflags "-X main.version=${DISTVERSION}"
 
diff --git a/sysutils/go-wtf/distinfo b/sysutils/go-wtf/distinfo
index e12e8085dfc2..5bd5f4a40220 100644
--- a/sysutils/go-wtf/distinfo
+++ b/sysutils/go-wtf/distinfo
@@ -1,149 +1,3 @@
-TIMESTAMP = 1567399058
+TIMESTAMP = 1567513605
 SHA256 (wtfutil-wtf-v0.21.0_GH0.tar.gz) = f1a5267f5b534026d7ae75ee2c13b4d3e08643b8f5b52637b41fb6c4fea1838d
 SIZE (wtfutil-wtf-v0.21.0_GH0.tar.gz) = 11162170
-SHA256 (PagerDuty-go-pagerduty-cf1437c7c8d6_GH0.tar.gz) = fc022e2ffdddf610a29a657382c7d4b4dc8227eb521693801988889e2d206b13
-SIZE (PagerDuty-go-pagerduty-cf1437c7c8d6_GH0.tar.gz) = 27616
-SHA256 (PuerkitoBio-goquery-v1.5.0_GH0.tar.gz) = 0307341d56ae12648584b3990fb1e84f465870247e46aff00381c98c5ad231c7
-SIZE (PuerkitoBio-goquery-v1.5.0_GH0.tar.gz) = 100975
-SHA256 (StackExchange-wmi-cbe66965904d_GH0.tar.gz) = 14dbc4af6952acdb1b941d002cd36fd2299aa6b3144cbcbddbb032c47f816da5
-SIZE (StackExchange-wmi-cbe66965904d_GH0.tar.gz) = 11279
-SHA256 (adlio-trello-v1.0.0_GH0.tar.gz) = bf1b7fd57502754858264684e42189dbd0e844826e2c64982404088f4122fb22
-SIZE (adlio-trello-v1.0.0_GH0.tar.gz) = 124693
-SHA256 (alecthomas-chroma-v0.6.3_GH0.tar.gz) = 4f60270c67a7e5327075b909f2fb0a0f3a8479941ef4257f346b6b2db9f38175
-SIZE (alecthomas-chroma-v0.6.3_GH0.tar.gz) = 359394
-SHA256 (andybalholm-cascadia-v1.0.0_GH0.tar.gz) = 00ab6f915e958c9e0509836cd67082a802513459c12c4aa6e7a28ef37743ce52
-SIZE (andybalholm-cascadia-v1.0.0_GH0.tar.gz) = 13232
-SHA256 (andygrunwald-go-gerrit-64931d233c2d_GH0.tar.gz) = bdd89141d5e9c06d0b2cbc4f601660bd899d83221784f184d86fc46939eb0384
-SIZE (andygrunwald-go-gerrit-64931d233c2d_GH0.tar.gz) = 77358
-SHA256 (briandowns-openweathermap-5f41b7c9d92d_GH0.tar.gz) = 9181d7c24cdc7561fa69233a0625255f1a40efb98950d72c88b417ea85af7816
-SIZE (briandowns-openweathermap-5f41b7c9d92d_GH0.tar.gz) = 23744
-SHA256 (cenkalti-backoff-v2.2.0_GH0.tar.gz) = 6bbccd84a9a9a750cbed930e38a96fd10b6a3116c588b8f8ca97acd92c87a760
-SIZE (cenkalti-backoff-v2.2.0_GH0.tar.gz) = 8677
-SHA256 (census-instrumentation-opencensus-go-v0.22.0_GH0.tar.gz) = 4213d120fd3b7f9c39470babed3cfe5770d6d16be252cdcf4c62a747f19b8ca9
-SIZE (census-instrumentation-opencensus-go-v0.22.0_GH0.tar.gz) = 162290
-SHA256 (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 7ebff38d382142f9220d2cfcb4731d0ae90cdef71238c94a15c35f8aa746007f
-SIZE (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 4955
-SHA256 (darkSasori-todoist-ec6b38b374ab_GH0.tar.gz) = 58a66fe57a76414b2ef064dda2010e703d5b91277caf65d1c63a0f465bdff381
-SIZE (darkSasori-todoist-ec6b38b374ab_GH0.tar.gz) = 6185
-SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
-SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (dlclark-regexp2-v1.1.6_GH0.tar.gz) = 81ede5b49ff46bd1c686416c52605aa4698b9dce07d011581c49a1d35b8a5239
-SIZE (dlclark-regexp2-v1.1.6_GH0.tar.gz) = 203691
-SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba
-SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260
-SHA256 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013
-SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886
-SHA256 (gdamore-tcell-v1.1.4_GH0.tar.gz) = 76db686196f24b20f11a0091e5300197cc8f7792fd6d0eb0e0f2aaad27ba8444
-SIZE (gdamore-tcell-v1.1.4_GH0.tar.gz) = 747882
-SHA256 (go-ole-go-ole-v1.2.4_GH0.tar.gz) = 1f30df494ffc50c133c5f276f64c94820046b1a3a660c0cca49a5c3a8106db11
-SIZE (go-ole-go-ole-v1.2.4_GH0.tar.gz) = 51655
-SHA256 (go-inf-inf-v0.9.0_GH0.tar.gz) = baa5f86ae50e08e0b88b8da3891c6d2071ce47cafe0e4ed99f9c45bc49cf5aab
-SIZE (go-inf-inf-v0.9.0_GH0.tar.gz) = 13075
-SHA256 (godbus-dbus-v5.0.1_GH0.tar.gz) = d5ea4142fe51b852185e8022edea673467a41295654a59dca377cff84bd22cb9
-SIZE (godbus-dbus-v5.0.1_GH0.tar.gz) = 59417
-SHA256 (gogo-protobuf-65acae22fc9d_GH0.tar.gz) = 75d042b916d4508afd65e383e0a95951bdbf009db5d5350eea948aac068a790b
-SIZE (gogo-protobuf-65acae22fc9d_GH0.tar.gz) = 2045290
-SHA256 (golang-appengine-v1.6.1_GH0.tar.gz) = 1755aaf4c6246579337bf1bc4f834ef00c56216da87b20456863ca91985b5afa
-SIZE (golang-appengine-v1.6.1_GH0.tar.gz) = 333353
-SHA256 (golang-crypto-4def268fd1a4_GH0.tar.gz) = eaf2ba9df95911f41a340478d1fbb540d7bc21939e4688273995dabf58e8c7b0
-SIZE (golang-crypto-4def268fd1a4_GH0.tar.gz) = 1693117
-SHA256 (golang-net-da137c7871d7_GH0.tar.gz) = 543c21f0d8b70fbfadb8b629e74ed620daf8514f94d7c0bf743e68ab9252d4ab
-SIZE (golang-net-da137c7871d7_GH0.tar.gz) = 1099325
-SHA256 (golang-oauth2-0f29369cfe45_GH0.tar.gz) = 468421ddfe905216454006b309ebda6e97aa6089265b995bce4259d6a9efd141
-SIZE (golang-oauth2-0f29369cfe45_GH0.tar.gz) = 45498
-SHA256 (golang-protobuf-v1.3.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf
-SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884
-SHA256 (golang-sys-6a60838ec25_GH0.tar.gz) = dfb58293a96bc2b659b96826dc4af810068d31ab3dd49ff63cee2f1c3e0ddde7
-SIZE (golang-sys-6a60838ec25_GH0.tar.gz) = 1424751
-SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
-SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
-SHA256 (golang-time-85acf8d2951c_GH0.tar.gz) = 96c2a33d1f1409b7db0a71ca73748e7cbac8b8878430de82c76e408a08f76fd1
-SIZE (golang-time-85acf8d2951c_GH0.tar.gz) = 9266
-SHA256 (google-go-genproto-eb59cef1c072_GH0.tar.gz) = 1ab1070fa98a1eef2b21ba4b20e9748645f6cc6767583e032957c94d30f5f867
-SIZE (google-go-genproto-eb59cef1c072_GH0.tar.gz) = 4173505
-SHA256 (google-go-github-v26.0.9_GH0.tar.gz) = 22e9d7f226f2230580807ec5e4ed86dc89f8adde3ecd14384c731e3aba6ed151
-SIZE (google-go-github-v26.0.9_GH0.tar.gz) = 251484
-SHA256 (google-go-querystring-v1.0.0_GH0.tar.gz) = 59fdfd4d740c85c60c35d3e09b587cfa2b435e78178ac4a23950afbece7118ed
-SIZE (google-go-querystring-v1.0.0_GH0.tar.gz) = 7529
-SHA256 (google-gofuzz-v1.0.0_GH0.tar.gz) = c614b23263110dcf0881f13e9cac482ca01b222cd4a2664827574867a5437c66
-SIZE (google-gofuzz-v1.0.0_GH0.tar.gz) = 13201
-SHA256 (googleapis-gnostic-0c5108395e2d_GH0.tar.gz) = e43de452b39ce224dae1547787297fc9a1ab2c977d92cde87939b99f0adb68d2
-SIZE (googleapis-gnostic-0c5108395e2d_GH0.tar.gz) = 300472
-SHA256 (googleapis-google-api-go-client-v0.7.0_GH0.tar.gz) = cb0cd7649e80342940800f2f1e9cc8018c178e840e291589e24cbb65c1c73ac6
-SIZE (googleapis-google-api-go-client-v0.7.0_GH0.tar.gz) = 12103399
-SHA256 (googleapis-google-cloud-go-v0.40.0_GH0.tar.gz) = 0d071f37137e1fdf75ca39cf19ce3fd966a1e2e28091e01c4ecd4e6437c2cd72
-SIZE (googleapis-google-cloud-go-v0.40.0_GH0.tar.gz) = 2090665
-SHA256 (grpc-grpc-go-v1.21.1_GH0.tar.gz) = b2fee68665f5874a812ef1987fbe5e758279e225cf8d0352c2fa56531c99d602
-SIZE (grpc-grpc-go-v1.21.1_GH0.tar.gz) = 730964
-SHA256 (hashicorp-go-cleanhttp-v0.5.1_GH0.tar.gz) = 24dedefe5edc4698dfa7e15a472369078a3447e8096e6d856549341c873c4a0b
-SIZE (hashicorp-go-cleanhttp-v0.5.1_GH0.tar.gz) = 8069
-SHA256 (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 3bf57512af746dc0338651ba1c35c65fe907ff214ccb22d679539f7ea791511e
-SIZE (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 12982
-SHA256 (hekmon-cunits-v2.0.1_GH0.tar.gz) = ac4208c2fc6d80db15bcaad1da1495f694f4583b277937ac6eb454d227894ca6
-SIZE (hekmon-cunits-v2.0.1_GH0.tar.gz) = 4903
-SHA256 (hekmon-transmissionrpc-1d589625bacd_GH0.tar.gz) = 9129abac3a5da37f06cc3614b6ae8086d945ee352bcdf8085e53ff739e535e34
-SIZE (hekmon-transmissionrpc-1d589625bacd_GH0.tar.gz) = 18306
-SHA256 (imdario-mergo-v0.3.5_GH0.tar.gz) = 0e39c5cb0ee73c1f759d9b9260f3c82cc4ca7757c9f07713e9487c4b126da205
-SIZE (imdario-mergo-v0.3.5_GH0.tar.gz) = 15920
-SHA256 (json-iterator-go-v1.1.6_GH0.tar.gz) = fc04b16a3d3798aca44e644d85c1cf5a10faf294ed69a9f44ca57c6dfa6856e2
-SIZE (json-iterator-go-v1.1.6_GH0.tar.gz) = 76814
-SHA256 (jessevdk-go-flags-v1.4.0_GH0.tar.gz) = 3be7e8fb4b63887e8aeb55878244c04b7dcbe5ac77211c73ee35e38ca681e611
-SIZE (jessevdk-go-flags-v1.4.0_GH0.tar.gz) = 55452
-SHA256 (kubernetes-api-7cf5895f2711_GH0.tar.gz) = 6d64bc0712959949d1f8f0c6c640611f59cb1d303c1c259fe6350384bc3a0322
-SIZE (kubernetes-api-7cf5895f2711_GH0.tar.gz) = 1445747
-SHA256 (kubernetes-apimachinery-6fa4771c83b3_GH0.tar.gz) = ce0cb040bcc3b08c8d956a220a2c885e5f363803d0e0f118097f488b21655ffc
-SIZE (kubernetes-apimachinery-6fa4771c83b3_GH0.tar.gz) = 496564
-SHA256 (kubernetes-client-go-v12.0.0_GH0.tar.gz) = adba207eef3032491d3c6c22deb4353bebd670172970cfd1023fcc8bf9309c57
-SIZE (kubernetes-client-go-v12.0.0_GH0.tar.gz) = 560672
-SHA256 (kubernetes-gengo-0689ccc1d7d6_GH0.tar.gz) = c01d149698c36f361eada6a47c6c09b64d7635d61c5cd5fefd0b894d0d1aa7d1
-SIZE (kubernetes-gengo-0689ccc1d7d6_GH0.tar.gz) = 79468
-SHA256 (kubernetes-klog-v0.3.1_GH0.tar.gz) = fa64aad2df750ca2938188883109d83ef6183039f3a8b19bdf0993b10cd604e6
-SIZE (kubernetes-klog-v0.3.1_GH0.tar.gz) = 28851
-SHA256 (kubernetes-kube-openapi-b3a7cee44a30_GH0.tar.gz) = d7bd1631cfcb0efbfa26e96cc246aa816accf3353986108b682256a456daf253
-SIZE (kubernetes-kube-openapi-b3a7cee44a30_GH0.tar.gz) = 728810
-SHA256 (kubernetes-utils-c2654d5206da_GH0.tar.gz) = 8b33978b2ef98b36ad153aee99e3da1d5f81871df965d8a37d68cae547beeb75
-SIZE (kubernetes-utils-c2654d5206da_GH0.tar.gz) = 41745
-SHA256 (kubernetes-sigs-yaml-v1.1.0_GH0.tar.gz) = 0ee3cfa6e0c3178df07213443ebac0d6ecc1178147f43f848ea7114acf621953
-SIZE (kubernetes-sigs-yaml-v1.1.0_GH0.tar.gz) = 14890
-SHA256 (logrusorgru-aurora-cea283e61946_GH0.tar.gz) = f0e72328579f38ab9bf60267c94305ef0646a3345566de05d4c4a17d31d59dbf
-SIZE (logrusorgru-aurora-cea283e61946_GH0.tar.gz) = 133110
-SHA256 (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 9ca738f5e694587af132cdfedefe1c8fbc5e2fe4339286884fe051742d970140
-SIZE (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 430545
-SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe
-SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827
-SHA256 (mmcdole-gofeed-0e68beaf6fdf_GH0.tar.gz) = 3ba8dad2b0ac79d439dc4e78ac7d0fee27f1cc7eccd1a442899c99ea9ed0e2d7
-SIZE (mmcdole-gofeed-0e68beaf6fdf_GH0.tar.gz) = 110479
-SHA256 (mmcdole-goxpp-0068e33feabf_GH0.tar.gz) = 432aadb22bc36d15d405c8b08a2c44dfd6f73508c49971e5a773cb6683f124ab
-SIZE (mmcdole-goxpp-0068e33feabf_GH0.tar.gz) = 5167
-SHA256 (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = d673e902118a6ece63198dc7e0961e904d0410f142726df0936ec1a52035a60f
-SIZE (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = 7526
-SHA256 (modern-go-reflect2-v1.0.1_GH0.tar.gz) = d24e856d9aa8fd51b9e6c2cdd712a44c8d18cb8b72802f1bd16e0470322363fd
-SIZE (modern-go-reflect2-v1.0.1_GH0.tar.gz) = 14394
-SHA256 (olebedev-config-364964f3a8e4_GH0.tar.gz) = d2b01cca2284cede5ba34ee56d19a1c705f7b2a1db35b44541354f0460fde765
-SIZE (olebedev-config-364964f3a8e4_GH0.tar.gz) = 9093
-SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
-SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
-SHA256 (pkg-profile-v1.3.0_GH0.tar.gz) = 6af6c06236d24dbabe7d943e08b1bbf24da3ce74985dbb1579ce494548973006
-SIZE (pkg-profile-v1.3.0_GH0.tar.gz) = 5822
-SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
-SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (radovskyb-watcher-v1.0.6_GH0.tar.gz) = 7469dfb353fccd7f6f7bdbf57104e5f58892fcafe01d79481771ad253ca31d6e
-SIZE (radovskyb-watcher-v1.0.6_GH0.tar.gz) = 12561
-SHA256 (rivo-tview-2e907d29e475_GH0.tar.gz) = e8c23abb8ed6f98ccace925c819257057f9b1f34c0e128206c49124daf74f887
-SIZE (rivo-tview-2e907d29e475_GH0.tar.gz) = 2853227
-SHA256 (rivo-uniseg-v0.1.0_GH0.tar.gz) = b80dffa6c757687cc997b77efbd32435361829cb085b913424b9b2bfebc19655
-SIZE (rivo-uniseg-v0.1.0_GH0.tar.gz) = 43971
-SHA256 (shirou-gopsutil-v2.18.12_GH0.tar.gz) = 70e291291c1e2363c1b8d7656c394cbfc8a67c93eb95a861abdcd7644562afba
-SIZE (shirou-gopsutil-v2.18.12_GH0.tar.gz) = 117507
-SHA256 (spf13-pflag-v1.0.3_GH0.tar.gz) = 9e57f86f493f04d9077fccd04e7139ebf243dd544e917ab83d35729b3e54a124
-SIZE (spf13-pflag-v1.0.3_GH0.tar.gz) = 46002
-SHA256 (sticreations-spotigopher-98632f6f94b0_GH0.tar.gz) = 43b4d99993ca6427e339b1109e26a8a76dfc40ad359b7f17ed60afe12cc1f2ba
-SIZE (sticreations-spotigopher-98632f6f94b0_GH0.tar.gz) = 14201
-SHA256 (stretchr-testify-v1.3.0_GH0.tar.gz) = 0cd9c199a72b8d80621624b37c0ed5ac724352d458506a31dfa86710551e7fc5
-SIZE (stretchr-testify-v1.3.0_GH0.tar.gz) = 102859
-SHA256 (xanzy-go-gitlab-v0.18.0_GH0.tar.gz) = c6f8a75b954e89deef98b5a1cf04b4beee2302f1a79b5925209d8ba93488139c
-SIZE (xanzy-go-gitlab-v0.18.0_GH0.tar.gz) = 129904
-SHA256 (zmb3-spotify-158b1863f5b5_GH0.tar.gz) = 3b8c1ea9f696112204f1e8fb2f635b84e1f8bfe73ff2f95e3bea1e0b7d66ae2c
-SIZE (zmb3-spotify-158b1863f5b5_GH0.tar.gz) = 111025
-SHA256 (zorkian-go-datadog-api-v2.21.0_GH0.tar.gz) = 02781384fbc28e781c9b9d21fb2e790a4056652c5dc3e04e58182ced684a995f
-SIZE (zorkian-go-datadog-api-v2.21.0_GH0.tar.gz) = 145772
diff --git a/sysutils/hfm/Makefile b/sysutils/hfm/Makefile
index 8dc7223b97f1..0e91ce2d59d4 100644
--- a/sysutils/hfm/Makefile
+++ b/sysutils/hfm/Makefile
@@ -11,6 +11,8 @@ COMMENT=	Run tests in parallel at high frequency
 
 LICENSE=	BSD2CLAUSE
 
+BROKEN=		fails to build
+
 # gb 0.4 includes FreeBSD-specific fixes that this port requires
 #   https://github.com/constabulary/gb/issues/506
 BUILD_DEPENDS=	gb>=0.4:devel/gb \
diff --git a/sysutils/ipfs-go/Makefile b/sysutils/ipfs-go/Makefile
index 878f934bef57..b158e96a3eef 100644
--- a/sysutils/ipfs-go/Makefile
+++ b/sysutils/ipfs-go/Makefile
@@ -18,9 +18,8 @@ LICENSE_FILE_APACHE=	${WRKSRC}/LICENSE-APACHE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USES=		go
+USES=		go:modules
 
-GO_PKGNAME=	github.com/ipfs/go-ipfs
 GO_TARGET=	./cmd/ipfs
 
 NO_WRKSUBDIR=	yes
@@ -44,6 +43,15 @@ GROUPS=		${IPFS_GROUP}
 
 FULLNAME=	${PORTNAME}${PKGNAMESUFFIX}
 
+# unbreak vendored golang.org/x/xerrors with go1.13
+# can be removed after vendor/golang.org/x/xerrors is updated to a985d3407aa7 or later
+post-patch:
+	@${RM} ${WRKSRC}/vendor/golang.org/x/xerrors/adaptor_go1_13.go
+	@${RM} ${WRKSRC}/vendor/golang.org/x/xerrors/format_go1_13.go
+	@${REINPLACE_CMD} '/build !go1.13/d' ${WRKSRC}/vendor/golang.org/x/xerrors/adaptor_go1_12.go
+	@${REINPLACE_CMD} '/build !go1.13/d' ${WRKSRC}/vendor/golang.org/x/xerrors/format_go1_12.go
+	@${REINPLACE_CMD} '/build !go1.13/d' ${WRKSRC}/vendor/golang.org/x/xerrors/frame_go1_12.go
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${IPFS_HOME}
 	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/ipfs ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
diff --git a/sysutils/libutempter/Makefile b/sysutils/libutempter/Makefile
deleted file mode 100644
index bd2fa7dddcfd..000000000000
--- a/sysutils/libutempter/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Michael Nottebrock <lofi@FreeBSD.org>,
-# $FreeBSD$
-
-PORTNAME=	libutempter
-PORTVERSION=	1.1.5
-PORTREVISION=	2
-CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.altlinux.org/pub/people/ldv/utempter/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Interface to record user sessions to utmp and wtmp files
-
-USES=		gmake tar:bzip2
-USE_LDCONFIG=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD
-IGNORE=		is now contained in the base system
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/libutempter/distinfo b/sysutils/libutempter/distinfo
deleted file mode 100644
index b813edee4581..000000000000
--- a/sysutils/libutempter/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (libutempter-1.1.5.tar.bz2) = 73d0576b16caeb22874dc80d0ce7a6aeebb3181b117e95c147cd8d29df99e70e
-SIZE (libutempter-1.1.5.tar.bz2) = 14588
diff --git a/sysutils/libutempter/files/patch-Makefile b/sysutils/libutempter/files/patch-Makefile
deleted file mode 100644
index 47025fc6dda0..000000000000
--- a/sysutils/libutempter/files/patch-Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
---- Makefile.orig	2007-02-19 12:14:08 UTC
-+++ Makefile
-@@ -30,9 +30,9 @@ MAP = lib$(PROJECT).map
- TARGETS = $(PROJECT) $(SHAREDLIB) $(STATICLIB)
- 
- INSTALL = install
--libdir = /usr/lib
--libexecdir = /usr/lib
--includedir = /usr/include
-+libdir = $(PREFIX)/lib
-+libexecdir = $(PREFIX)/libexec
-+includedir = $(PREFIX)/include
- DESTDIR =
- 
- WARNINGS = -W -Wall -Waggregate-return -Wcast-align -Wconversion \
-@@ -40,8 +40,8 @@ WARNINGS = -W -Wall -Waggregate-return -
- 	-Wmissing-format-attribute -Wmissing-noreturn \
- 	-Wmissing-prototypes -Wpointer-arith -Wredundant-decls \
- 	-Wshadow -Wstrict-prototypes -Wwrite-strings
--CPPFLAGS = -std=gnu99 $(WARNINGS) -DLIBEXECDIR=\"$(libexecdir)\"
--CFLAGS = $(RPM_OPT_FLAGS)
-+CPPFLAGS = -std=gnu99 $(WARNINGS)
-+CFLAGS+= -DLIBEXECDIR=\"$(libexecdir)\"
- LDLIBS =
- 
- all: $(TARGETS)
-@@ -63,15 +63,20 @@ $(STATICLIB): iface.o
- 
- iface.o: iface.c utempter.h
- 
-+$(PROJECT).o: $(PROJECT).c
-+
-+$(PROJECT): $(PROJECT).o
-+	$(LINK.o) $(PROJECT).o -o $(PROJECT) -lutil
-+
- install:
- 	mkdir -p $(DESTDIR)$(libexecdir)/$(PROJECT) $(DESTDIR)$(includedir) \
- 		$(DESTDIR)$(libdir)
--	$(INSTALL) -p -m2711 $(PROJECT) $(DESTDIR)$(libexecdir)/$(PROJECT)/
--	$(INSTALL) -p -m644 $(PROJECT).h $(DESTDIR)$(includedir)/
--	$(INSTALL) -p -m755 $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SHAREDLIB).$(VERSION)
--	$(INSTALL) -p -m644 $(STATICLIB) $(DESTDIR)$(libdir)/
--	ln -s $(SHAREDLIB).$(VERSION) $(DESTDIR)$(libdir)/$(SONAME)
--	ln -s $(SONAME) $(DESTDIR)$(libdir)/$(SHAREDLIB)
-+	$(INSTALL) -m4711 $(PROJECT) $(DESTDIR)$(libexecdir)/$(PROJECT)/$(PROJECT)
-+	$(INSTALL) -m644 $(PROJECT).h $(DESTDIR)$(includedir)/$(PROJECT).h
-+	$(INSTALL) -m755 $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SHAREDLIB).$(VERSION)
-+	$(INSTALL) -m644 $(STATICLIB) $(DESTDIR)$(libdir)/$(STATICLIB)
-+	ln -sf $(SHAREDLIB).$(VERSION) $(DESTDIR)$(libdir)/$(SONAME)
-+	ln -sf $(SONAME) $(DESTDIR)$(libdir)/$(SHAREDLIB)
- 
- clean:
--	$(RM) $(TARGETS) iface.o iface.os core *~
-+	$(RM) $(TARGETS) $(PROJECT).o iface.o iface.os core *~
diff --git a/sysutils/libutempter/files/patch-utempter.c b/sysutils/libutempter/files/patch-utempter.c
deleted file mode 100644
index 4de9d2f14a25..000000000000
--- a/sysutils/libutempter/files/patch-utempter.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- utempter.c.orig	2007-02-19 12:14:08.000000000 +0000
-+++ utempter.c
-@@ -36,7 +36,7 @@
- 
- #ifdef __GLIBC__
- # include <pty.h>
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- # include <libutil.h>
- #else
- # error Unsupported platform
-@@ -157,7 +157,7 @@ write_uwtmp_record(const char *user, con
- 
- 	(void) updwtmp(_PATH_WTMP, &ut);
- 
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 
- 	ut.ut_time = tv.tv_sec;
- 
diff --git a/sysutils/libutempter/pkg-descr b/sysutils/libutempter/pkg-descr
deleted file mode 100644
index 78235d39adaa..000000000000
--- a/sysutils/libutempter/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-The libutempter library provides interface for terminal emulators such as
-screen and xterm to record user sessions to utmp and wtmp files.
-
-The utempter is a privileged helper used by libutempter library to manipulate
-utmp and wtmp files.
-
-This implementation is based on ideas of RedHat's utempter by Erik Troan
-(version 0.5.2 at the moment of writing).
-
-There are two interfaces supported: old and new.
-New API is recommended for new applications, old - for compatibility with
-old software.
diff --git a/sysutils/libutempter/pkg-plist b/sysutils/libutempter/pkg-plist
deleted file mode 100644
index 900cb13fc828..000000000000
--- a/sysutils/libutempter/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-include/utempter.h
-lib/libutempter.a
-lib/libutempter.so
-lib/libutempter.so.0
-lib/libutempter.so.1.1.5
-libexec/utempter/utempter
diff --git a/sysutils/mate-control-center/Makefile b/sysutils/mate-control-center/Makefile
index 0f61965aa1c0..4150e50e2e06 100644
--- a/sysutils/mate-control-center/Makefile
+++ b/sysutils/mate-control-center/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mate-control-center
 PORTVERSION=	1.22.1
+PORTREVISION=	1
 CATEGORIES=	sysutils mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -28,9 +29,9 @@ LIB_DEPENDS=	libcanberra-gtk.so:audio/libcanberra \
 PORTSCOUT=	limitw:1,even
 
 USES=		desktop-file-utils gettext gmake libtool localbase \
-		pathfix pkgconfig shared-mime-info tar:xz
+		pathfix pkgconfig shared-mime-info tar:xz xorg
 USE_MATE=	desktop libmatekbd marco menus settingsdaemon
-USE_XORG=	ice sm x11 xcursor xext xxf86misc xft xi xrandr xscrnsaver
+USE_XORG=	ice sm x11 xcursor xext xft xi xrandr xscrnsaver
 USE_GNOME=	cairo dconf glib20 gtk30 intlhack libxml2 librsvg2 pango
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/mate-settings-daemon/Makefile b/sysutils/mate-settings-daemon/Makefile
index 7e26dcf68e17..ac421b5c01be 100644
--- a/sysutils/mate-settings-daemon/Makefile
+++ b/sysutils/mate-settings-daemon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mate-settings-daemon
 PORTVERSION=	1.22.0
+PORTREVISION=	1
 CATEGORIES=	sysutils mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -27,9 +28,9 @@ RUN_DEPENDS=	xrdb:x11/xrdb
 PORTSCOUT=	limitw:1,even
 
 USES=		gettext gmake libtool localbase pathfix \
-		pkgconfig tar:xz
+		pkgconfig tar:xz xorg
 USE_MATE=	desktop libmatekbd mixer
-USE_XORG=	ice sm x11 xext xi xxf86misc
+USE_XORG=	ice sm x11 xext xi
 USE_GNOME=	cairo dconf gtk30 intlhack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/mdf2iso/Makefile b/sysutils/mdf2iso/Makefile
index 4dd99f090db0..36cd47016028 100644
--- a/sysutils/mdf2iso/Makefile
+++ b/sysutils/mdf2iso/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	mdf2iso
 PORTVERSION=	0.3.1
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/m/${PORTNAME}
+MASTER_SITES=	DEBIAN
 DISTFILES=	${PORTNAME}_${PORTVERSION}.orig.tar.gz ${PORTNAME}_${PORTVERSION}-${DEBIANVERSION}.debian.tar.xz  
 
 MAINTAINER=	portmaster@BSDforge.com
diff --git a/sysutils/minimunin/Makefile b/sysutils/minimunin/Makefile
index d04c3a96bdb9..0bb19ca178f9 100644
--- a/sysutils/minimunin/Makefile
+++ b/sysutils/minimunin/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	minimunin
-PORTVERSION=	0.4
+PORTVERSION=	0.5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://erdgeist.org/arts/software/minimunin/
 
diff --git a/sysutils/minimunin/distinfo b/sysutils/minimunin/distinfo
index f693a0137d50..7ebc101841a1 100644
--- a/sysutils/minimunin/distinfo
+++ b/sysutils/minimunin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555183997
-SHA256 (minimunin-0.4.tar.bz2) = 99cb530b365e79ba4e657cb0eae783d71908b7bf23e78d95490b81ee09a1353f
-SIZE (minimunin-0.4.tar.bz2) = 4703
+TIMESTAMP = 1568203361
+SHA256 (minimunin-0.5.tar.bz2) = 4d853e09f55a0119cc72bd8621df3e2db9bdbbc8ba42584ed11f380e76d6b298
+SIZE (minimunin-0.5.tar.bz2) = 4730
diff --git a/sysutils/openzfs-kmod/Makefile b/sysutils/openzfs-kmod/Makefile
index 5c368160d318..3bb1d30ee247 100644
--- a/sysutils/openzfs-kmod/Makefile
+++ b/sysutils/openzfs-kmod/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openzfs
-PORTVERSION=	2019080800
+PORTVERSION=	2019091000
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-kmod
@@ -15,7 +15,7 @@ USES=		kmod
 USE_GITHUB=	yes
 GH_ACCOUNT=	zfsonfreebsd
 GH_PROJECT=	ZoF
-GH_TAGNAME=	df21d39
+GH_TAGNAME=	27703da
 KMODTARGET?=	openzfs.ko
 
 PLIST_FILES=	${KMODDIR}/${KMODTARGET}
diff --git a/sysutils/openzfs-kmod/distinfo b/sysutils/openzfs-kmod/distinfo
index 44058965a0ac..78b77a24f532 100644
--- a/sysutils/openzfs-kmod/distinfo
+++ b/sysutils/openzfs-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565284791
-SHA256 (zfsonfreebsd-ZoF-v2019080800-df21d39_GH0.tar.gz) = 11e9eb5ab3b3494b1cc0adb59669aa205ed8f9521641d5dbf601eac0d428a728
-SIZE (zfsonfreebsd-ZoF-v2019080800-df21d39_GH0.tar.gz) = 6826581
+TIMESTAMP = 1568142563
+SHA256 (zfsonfreebsd-ZoF-v2019091000-27703da_GH0.tar.gz) = dddf56b37df7209c834d0d1d4da2f06137576ff40e83a9236db45546d67017d3
+SIZE (zfsonfreebsd-ZoF-v2019091000-27703da_GH0.tar.gz) = 6826482
diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile
index 9246fdf30aba..15432c319805 100644
--- a/sysutils/openzfs/Makefile
+++ b/sysutils/openzfs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openzfs
-PORTVERSION=	2019080800
+PORTVERSION=	2019091000
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -25,7 +25,7 @@ OPTIONS_SUB=    yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	zfsonfreebsd
 GH_PROJECT=	ZoF
-GH_TAGNAME=	df21d39
+GH_TAGNAME=	27703da
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/openzfs/distinfo b/sysutils/openzfs/distinfo
index 5bb9a4f7b8f1..14bb9c46cec2 100644
--- a/sysutils/openzfs/distinfo
+++ b/sysutils/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565284980
-SHA256 (zfsonfreebsd-ZoF-v2019080800-df21d39_GH0.tar.gz) = 11e9eb5ab3b3494b1cc0adb59669aa205ed8f9521641d5dbf601eac0d428a728
-SIZE (zfsonfreebsd-ZoF-v2019080800-df21d39_GH0.tar.gz) = 6826581
+TIMESTAMP = 1568142557
+SHA256 (zfsonfreebsd-ZoF-v2019091000-27703da_GH0.tar.gz) = dddf56b37df7209c834d0d1d4da2f06137576ff40e83a9236db45546d67017d3
+SIZE (zfsonfreebsd-ZoF-v2019091000-27703da_GH0.tar.gz) = 6826482
diff --git a/sysutils/py-azure-cli-acs/Makefile b/sysutils/py-azure-cli-acs/Makefile
index 98acc002cd06..586d3e631ae7 100644
--- a/sysutils/py-azure-cli-acs/Makefile
+++ b/sysutils/py-azure-cli-acs/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools ACS Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-authorization>=0.50.0:devel/py-azure-mgmt-authorization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-compute>=5.0.0:devel/py-azure-mgmt-compute@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerservice>=5.2.0:devel/py-azure-mgmt-containerservice@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-advisor/Makefile b/sysutils/py-azure-cli-advisor/Makefile
index 915f51289156..ab5f28d6cab3 100644
--- a/sysutils/py-azure-cli-advisor/Makefile
+++ b/sysutils/py-azure-cli-advisor/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Advisor Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-advisor>=2.0.1:devel/py-azure-mgmt-advisor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-ams/Makefile b/sysutils/py-azure-cli-ams/Makefile
index cfbd36c0eed0..3c001b21a931 100644
--- a/sysutils/py-azure-cli-ams/Makefile
+++ b/sysutils/py-azure-cli-ams/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools AMS Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-media>=1.1.1:devel/py-azure-mgmt-media@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-graphrbac>=0.60.0:devel/py-azure-graphrbac@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-appservice/Makefile b/sysutils/py-azure-cli-appservice/Makefile
index 514759ebc029..73243a359552 100644
--- a/sysutils/py-azure-cli-appservice/Makefile
+++ b/sysutils/py-azure-cli-appservice/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools AppService Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.1.1:devel/py-azure-mgmt-storage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-web>=0.40.0:devel/py-azure-mgmt-web@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerregistry>=2.7.0:devel/py-azure-mgmt-containerregistry@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-backup/Makefile b/sysutils/py-azure-cli-backup/Makefile
index f0140ff0d8de..18f79dcfbd87 100644
--- a/sysutils/py-azure-cli-backup/Makefile
+++ b/sysutils/py-azure-cli-backup/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Recovery Services Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-recoveryservices>=0.1.1:devel/py-azure-mgmt-recoveryservices@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-recoveryservicesbackup>=0.1.2:devel/py-azure-mgmt-recoveryservicesbackup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-batch/Makefile b/sysutils/py-azure-cli-batch/Makefile
index 44aa8625fec5..65fd895f8f97 100644
--- a/sysutils/py-azure-cli-batch/Makefile
+++ b/sysutils/py-azure-cli-batch/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Batch Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-batch>=6.0.0:devel/py-azure-mgmt-batch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-batch>=6.0.0:devel/py-azure-batch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-batchai/Makefile b/sysutils/py-azure-cli-batchai/Makefile
index 6cbbae41a84b..5fae23f5ce7a 100644
--- a/sysutils/py-azure-cli-batchai/Makefile
+++ b/sysutils/py-azure-cli-batchai/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Batch AI Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.3.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-batchai>=2.0.0:devel/py-azure-mgmt-batchai@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-storage-blob>=1.3.1:devel/py-azure-storage-blob@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-billing/Makefile b/sysutils/py-azure-cli-billing/Makefile
index 7383216918ae..4a35ae3b8c7b 100644
--- a/sysutils/py-azure-cli-billing/Makefile
+++ b/sysutils/py-azure-cli-billing/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Billing Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-billing>=0.2.0:devel/py-azure-mgmt-billing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-botservice/Makefile b/sysutils/py-azure-cli-botservice/Makefile
index 50211e20685f..d62fb0e6e716 100644
--- a/sysutils/py-azure-cli-botservice/Makefile
+++ b/sysutils/py-azure-cli-botservice/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Bot Services Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-botservice>=0:devel/py-azure-mgmt-botservice@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-web>=0.42.0:devel/py-azure-mgmt-web@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-cdn/Makefile b/sysutils/py-azure-cli-cdn/Makefile
index 7ddc1bfc829d..5993c62c9a13 100644
--- a/sysutils/py-azure-cli-cdn/Makefile
+++ b/sysutils/py-azure-cli-cdn/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools CDN Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-cdn>=3.1.0:devel/py-azure-mgmt-cdn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-cloud/Makefile b/sysutils/py-azure-cli-cloud/Makefile
index b40a7c7c6008..80586dc8136a 100644
--- a/sysutils/py-azure-cli-cloud/Makefile
+++ b/sysutils/py-azure-cli-cloud/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Cloud Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
 USES=		azurepy python
diff --git a/sysutils/py-azure-cli-cognitiveservices/Makefile b/sysutils/py-azure-cli-cognitiveservices/Makefile
index 7b8f07ae9499..08c492405acc 100644
--- a/sysutils/py-azure-cli-cognitiveservices/Makefile
+++ b/sysutils/py-azure-cli-cognitiveservices/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Cognitive Services Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-cognitiveservices>=3.0.0:devel/py-azure-mgmt-cognitiveservices@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-configure/Makefile b/sysutils/py-azure-cli-configure/Makefile
index cd6e9fe7dabe..16f7f1c5a468 100644
--- a/sysutils/py-azure-cli-configure/Makefile
+++ b/sysutils/py-azure-cli-configure/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Configure Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
 USES=		azurepy python
diff --git a/sysutils/py-azure-cli-consumption/Makefile b/sysutils/py-azure-cli-consumption/Makefile
index 768af22839f5..28dc85c91837 100644
--- a/sysutils/py-azure-cli-consumption/Makefile
+++ b/sysutils/py-azure-cli-consumption/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Consumption Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-consumption>=2.0.0:devel/py-azure-mgmt-consumption@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-container/Makefile b/sysutils/py-azure-cli-container/Makefile
index 4a1560748301..03c0c88f911a 100644
--- a/sysutils/py-azure-cli-container/Makefile
+++ b/sysutils/py-azure-cli-container/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools container Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerinstance>=1.4.0:devel/py-azure-mgmt-containerinstance@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-loganalytics>=0.2.0:devel/py-azure-mgmt-loganalytics@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-resource>=2.0.0:devel/py-azure-mgmt-resource@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-core/Makefile b/sysutils/py-azure-cli-core/Makefile
index 54d24294598e..0aa934e4634a 100644
--- a/sysutils/py-azure-cli-core/Makefile
+++ b/sysutils/py-azure-cli-core/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-cli-core
-PORTVERSION=	2.0.67
+PORTVERSION=	2.0.73
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,8 +11,8 @@ COMMENT=	Microsoft Azure Command-Line Tools Core Module
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}adal>=1.2.0:net-mgmt/py-adal@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}argcomplete>=1.8.0:devel/py-argcomplete@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}adal>=1.2:net-mgmt/py-adal@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}argcomplete>=1.8:devel/py-argcomplete@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-telemetry>=0:sysutils/py-azure-cli-telemetry@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0.3.9:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}humanfriendly>=4.7:textproc/py-humanfriendly@${PY_FLAVOR} \
@@ -21,18 +21,13 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}adal>=1.2.0:net-mgmt/py-adal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msrest>=0.4.4:net-mgmt/py-msrest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.25:net-mgmt/py-msrestazure@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>=2.0.8:security/py-paramiko@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=17.1.0:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.20.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.7:devel/py-tabulate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0.30.0:devel/py-wheel@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-mgmt-resource>=2.1.0:devel/py-azure-mgmt-resource@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyperclip>=1.7.0:devel/py-pyperclip@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}psutil>=5.6.1:sysutils/py-psutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-resource>=3.1:devel/py-azure-mgmt-resource@${PY_FLAVOR} \
 		${PY_ENUM34} \
 		${PY_FUTURES}
 
diff --git a/sysutils/py-azure-cli-core/distinfo b/sysutils/py-azure-cli-core/distinfo
index 7e79d613535f..0c787d7698b6 100644
--- a/sysutils/py-azure-cli-core/distinfo
+++ b/sysutils/py-azure-cli-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561042044
-SHA256 (azure-cli-core-2.0.67.tar.gz) = af52a0af876ca1153ff71d2d320234e681c35a8cbdcf14336edd55e57b9ab565
-SIZE (azure-cli-core-2.0.67.tar.gz) = 109441
+TIMESTAMP = 1568330193
+SHA256 (azure-cli-core-2.0.73.tar.gz) = 8cf73790355c921f67de9d2a7ec894d8be91fdc1d57db2111acd473beed9c5a9
+SIZE (azure-cli-core-2.0.73.tar.gz) = 111005
diff --git a/sysutils/py-azure-cli-cosmosdb/Makefile b/sysutils/py-azure-cli-cosmosdb/Makefile
index da2e9a3b2b8d..d448ddf028c5 100644
--- a/sysutils/py-azure-cli-cosmosdb/Makefile
+++ b/sysutils/py-azure-cli-cosmosdb/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Cosmos DB Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-cosmosdb>=0.6.1:devel/py-azure-mgmt-cosmosdb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cosmos>=3.0.2:devel/py-azure-cosmos@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-dla/Makefile b/sysutils/py-azure-cli-dla/Makefile
index dbd68a1aaf9b..be866906d710 100644
--- a/sysutils/py-azure-cli-dla/Makefile
+++ b/sysutils/py-azure-cli-dla/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Data Lake Analytics Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-datalake-store>=0.5.0:devel/py-azure-mgmt-datalake-store@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-datalake-analytics>=0.2.1:devel/py-azure-mgmt-datalake-analytics@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-dls/Makefile b/sysutils/py-azure-cli-dls/Makefile
index 78ed1f5bb77e..c165c3232c4c 100644
--- a/sysutils/py-azure-cli-dls/Makefile
+++ b/sysutils/py-azure-cli-dls/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Data Lake Store Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-datalake-store>=0.5.0:devel/py-azure-mgmt-datalake-store@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-datalake-store>=0.0.39:devel/py-azure-datalake-store@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-dms/Makefile b/sysutils/py-azure-cli-dms/Makefile
index 13cf0231cbc0..c318baf446f4 100644
--- a/sysutils/py-azure-cli-dms/Makefile
+++ b/sysutils/py-azure-cli-dms/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools for the Data Migration Service (DMS)
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-datamigration>=0.1.0:devel/py-azure-mgmt-datamigration@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-eventgrid/Makefile b/sysutils/py-azure-cli-eventgrid/Makefile
index d2f17b098b41..af6161a684d0 100644
--- a/sysutils/py-azure-cli-eventgrid/Makefile
+++ b/sysutils/py-azure-cli-eventgrid/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools EventGrid Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-eventgrid>=2.2.0:devel/py-azure-mgmt-eventgrid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-eventhubs/Makefile b/sysutils/py-azure-cli-eventhubs/Makefile
index c1f89f023156..194d51af66fb 100644
--- a/sysutils/py-azure-cli-eventhubs/Makefile
+++ b/sysutils/py-azure-cli-eventhubs/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Event Hubs Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-eventhub>=2.6.0:devel/py-azure-mgmt-eventhub@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-extension/Makefile b/sysutils/py-azure-cli-extension/Makefile
index 44e08d26d490..59783b69629c 100644
--- a/sysutils/py-azure-cli-extension/Makefile
+++ b/sysutils/py-azure-cli-extension/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Extension Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
 USES=		azurepy python
diff --git a/sysutils/py-azure-cli-feedback/Makefile b/sysutils/py-azure-cli-feedback/Makefile
index 2aad2ca7e11a..2b389704b7d8 100644
--- a/sysutils/py-azure-cli-feedback/Makefile
+++ b/sysutils/py-azure-cli-feedback/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Feedback Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
 USES=		azurepy python
diff --git a/sysutils/py-azure-cli-find/Makefile b/sysutils/py-azure-cli-find/Makefile
index 4b3bc36590e2..695fc2835483 100644
--- a/sysutils/py-azure-cli-find/Makefile
+++ b/sysutils/py-azure-cli-find/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Find Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
 USES=		azurepy python
diff --git a/sysutils/py-azure-cli-hdinsight/Makefile b/sysutils/py-azure-cli-hdinsight/Makefile
index 8dc78237cf62..2e3dcfbb7984 100644
--- a/sysutils/py-azure-cli-hdinsight/Makefile
+++ b/sysutils/py-azure-cli-hdinsight/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools HDInsight Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-hdinsight>=0.2.1:devel/py-azure-mgmt-hdinsight@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.3.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-network>=3.0.0:devel/py-azure-mgmt-network@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-interactive/Makefile b/sysutils/py-azure-cli-interactive/Makefile
index 5af2266a3382..9148b0895b7e 100644
--- a/sysutils/py-azure-cli-interactive/Makefile
+++ b/sysutils/py-azure-cli-interactive/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Interactive Shell
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt_toolkit1>=1.0.15:devel/py-prompt_toolkit1@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-iot/Makefile b/sysutils/py-azure-cli-iot/Makefile
index 335f6efdecae..c82ef3774949 100644
--- a/sysutils/py-azure-cli-iot/Makefile
+++ b/sysutils/py-azure-cli-iot/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools IoT Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-iothub>=0.8.2:devel/py-azure-mgmt-iothub@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-iothubprovisioningservices>=0.2.0:devel/py-azure-mgmt-iothubprovisioningservices@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-iotcentral/Makefile b/sysutils/py-azure-cli-iotcentral/Makefile
index 86d16001ac1a..573c75a917ac 100644
--- a/sysutils/py-azure-cli-iotcentral/Makefile
+++ b/sysutils/py-azure-cli-iotcentral/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools IoT Central Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-iotcentral>=1.0.0:devel/py-azure-mgmt-iotcentral@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-keyvault/Makefile b/sysutils/py-azure-cli-keyvault/Makefile
index 56e57173176c..1d9c38bb669c 100644
--- a/sysutils/py-azure-cli-keyvault/Makefile
+++ b/sysutils/py-azure-cli-keyvault/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Keyvault Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-keyvault>=1.1.0:devel/py-azure-mgmt-keyvault@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-keyvault>=1.1.0:devel/py-azure-keyvault@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-graphrbac>=0.60.0:devel/py-azure-graphrbac@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-kusto/Makefile b/sysutils/py-azure-cli-kusto/Makefile
index 14c179242606..8664122c8717 100644
--- a/sysutils/py-azure-cli-kusto/Makefile
+++ b/sysutils/py-azure-cli-kusto/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools KUSTO Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-kusto>=0.3.0:devel/py-azure-mgmt-kusto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-lab/Makefile b/sysutils/py-azure-cli-lab/Makefile
index b769e9488e6c..f0c165956751 100644
--- a/sysutils/py-azure-cli-lab/Makefile
+++ b/sysutils/py-azure-cli-lab/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools DevTestLabs Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-devtestlabs>=2.2.0:devel/py-azure-mgmt-devtestlabs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-graphrbac>=0.60.0:devel/py-azure-graphrbac@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-maps/Makefile b/sysutils/py-azure-cli-maps/Makefile
index 243e75075bd2..4fa61937281e 100644
--- a/sysutils/py-azure-cli-maps/Makefile
+++ b/sysutils/py-azure-cli-maps/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Maps Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-maps>=0.1.0:devel/py-azure-mgmt-maps@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-monitor/Makefile b/sysutils/py-azure-cli-monitor/Makefile
index 1b31a1822cf0..5581de4f532d 100644
--- a/sysutils/py-azure-cli-monitor/Makefile
+++ b/sysutils/py-azure-cli-monitor/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Monitor Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-monitor>=0.5.2:devel/py-azure-mgmt-monitor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-network/Makefile b/sysutils/py-azure-cli-network/Makefile
index 0463fa2e3810..8992811edc47 100644
--- a/sysutils/py-azure-cli-network/Makefile
+++ b/sysutils/py-azure-cli-network/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Network Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-network>=3.0.0:devel/py-azure-mgmt-network@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-trafficmanager>=0.51.0:devel/py-azure-mgmt-trafficmanager@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-dns>=2.1.0:devel/py-azure-mgmt-dns@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-policyinsights/Makefile b/sysutils/py-azure-cli-policyinsights/Makefile
index e614cc504fc7..0d78dd2c027b 100644
--- a/sysutils/py-azure-cli-policyinsights/Makefile
+++ b/sysutils/py-azure-cli-policyinsights/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Policy Insights Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-policyinsights>=0.3.1:devel/py-azure-mgmt-policyinsights@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-profile/Makefile b/sysutils/py-azure-cli-profile/Makefile
index 61bfc733a66f..eddfd3d3615b 100644
--- a/sysutils/py-azure-cli-profile/Makefile
+++ b/sysutils/py-azure-cli-profile/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Profile Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
 USES=		azurepy python
diff --git a/sysutils/py-azure-cli-rdbms/Makefile b/sysutils/py-azure-cli-rdbms/Makefile
index 4e8f4881759f..6172eb4dc248 100644
--- a/sysutils/py-azure-cli-rdbms/Makefile
+++ b/sysutils/py-azure-cli-rdbms/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools MySQL and PostgreSQL Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-rdbms>=1.8.0:devel/py-azure-mgmt-rdbms@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-redis/Makefile b/sysutils/py-azure-cli-redis/Makefile
index 3e150571f1f1..32d5fc8a9fa6 100644
--- a/sysutils/py-azure-cli-redis/Makefile
+++ b/sysutils/py-azure-cli-redis/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Redis Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-redis>=6.0.0:devel/py-azure-mgmt-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-relay/Makefile b/sysutils/py-azure-cli-relay/Makefile
index 693407fc180a..f7931be9a1fe 100644
--- a/sysutils/py-azure-cli-relay/Makefile
+++ b/sysutils/py-azure-cli-relay/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Relay Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-relay>=0.1.0:devel/py-azure-mgmt-relay@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-reservations/Makefile b/sysutils/py-azure-cli-reservations/Makefile
index b50337953514..1bf960d93b99 100644
--- a/sysutils/py-azure-cli-reservations/Makefile
+++ b/sysutils/py-azure-cli-reservations/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Reservations Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-reservations>=0.3.1:devel/py-azure-mgmt-reservations@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-resource/Makefile b/sysutils/py-azure-cli-resource/Makefile
index a6acbeb967c6..31ee400a693f 100644
--- a/sysutils/py-azure-cli-resource/Makefile
+++ b/sysutils/py-azure-cli-resource/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Resource Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-authorization>=0.50.0:devel/py-azure-mgmt-authorization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-managementgroups>=0.1.0:devel/py-azure-mgmt-managementgroups@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-role/Makefile b/sysutils/py-azure-cli-role/Makefile
index 7f2d3ba9277a..0239df2de24c 100644
--- a/sysutils/py-azure-cli-role/Makefile
+++ b/sysutils/py-azure-cli-role/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Role Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-authorization>=0.50.0:devel/py-azure-mgmt-authorization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-monitor>=0.5.2:devel/py-azure-mgmt-monitor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-search/Makefile b/sysutils/py-azure-cli-search/Makefile
index b74c3dc43e08..289faa05f13e 100644
--- a/sysutils/py-azure-cli-search/Makefile
+++ b/sysutils/py-azure-cli-search/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Search Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-search>=2.0.0:devel/py-azure-mgmt-search@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-security/Makefile b/sysutils/py-azure-cli-security/Makefile
index 08adb959cd95..ca172143d517 100644
--- a/sysutils/py-azure-cli-security/Makefile
+++ b/sysutils/py-azure-cli-security/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Azure Security Center
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-security>=0.1.0:devel/py-azure-mgmt-security@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-servicebus/Makefile b/sysutils/py-azure-cli-servicebus/Makefile
index 3e3d4f27c781..bcf9706dbbc1 100644
--- a/sysutils/py-azure-cli-servicebus/Makefile
+++ b/sysutils/py-azure-cli-servicebus/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Service Bus Command-Line Tools
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-servicebus>=0.6.0:devel/py-azure-mgmt-servicebus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-servicefabric/Makefile b/sysutils/py-azure-cli-servicefabric/Makefile
index 2df37a1cd8f6..9b7aa127289a 100644
--- a/sysutils/py-azure-cli-servicefabric/Makefile
+++ b/sysutils/py-azure-cli-servicefabric/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Service Fabric Command-Line Tools
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-graphrbac>=0.60.0:devel/py-azure-graphrbac@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-keyvault>=1.1.0:devel/py-azure-keyvault@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-network>=3.0.0:devel/py-azure-mgmt-network@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-signalr/Makefile b/sysutils/py-azure-cli-signalr/Makefile
index 38fe4541de64..1c078fe8a0f6 100644
--- a/sysutils/py-azure-cli-signalr/Makefile
+++ b/sysutils/py-azure-cli-signalr/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools SignalR Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-signalr>=0.1.1:devel/py-azure-mgmt-signalr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-sql/Makefile b/sysutils/py-azure-cli-sql/Makefile
index 45f2cd496cc2..cb0c9b39390c 100644
--- a/sysutils/py-azure-cli-sql/Makefile
+++ b/sysutils/py-azure-cli-sql/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools SQL Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.3.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-sql>=0.12.0:devel/py-azure-mgmt-sql@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli-sqlvm/Makefile b/sysutils/py-azure-cli-sqlvm/Makefile
index ad83a5d944ca..81d327d11839 100644
--- a/sysutils/py-azure-cli-sqlvm/Makefile
+++ b/sysutils/py-azure-cli-sqlvm/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools SQL virtual machine Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-sqlvirtualmachine>=0.3.0:devel/py-azure-mgmt-sqlvirtualmachine@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
 
diff --git a/sysutils/py-azure-cli-storage/Makefile b/sysutils/py-azure-cli-storage/Makefile
index 8e173db9db5c..2720440805c3 100644
--- a/sysutils/py-azure-cli-storage/Makefile
+++ b/sysutils/py-azure-cli-storage/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools Storage Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.3.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-multiapi-storage>=0.2.3:devel/py-azure-multiapi-storage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
diff --git a/sysutils/py-azure-cli-telemetry/Makefile b/sysutils/py-azure-cli-telemetry/Makefile
index 76f612c61afc..dc2daac76699 100644
--- a/sysutils/py-azure-cli-telemetry/Makefile
+++ b/sysutils/py-azure-cli-telemetry/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-cli-telemetry
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.3
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,7 @@ COMMENT=	Microsoft Azure CLI Telemetry Package
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}applicationinsights>=0.11.1:devel/py-applicationinsights@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}portalocker>=1.2.1:devel/py-portalocker@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}portalocker>=1.2:devel/py-portalocker@${PY_FLAVOR}
 
 USES=		azurepy python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/sysutils/py-azure-cli-telemetry/distinfo b/sysutils/py-azure-cli-telemetry/distinfo
index 8404be58b712..a77bcf17095f 100644
--- a/sysutils/py-azure-cli-telemetry/distinfo
+++ b/sysutils/py-azure-cli-telemetry/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553900854
-SHA256 (azure-cli-telemetry-1.0.2.tar.gz) = c0141ddeed1319bcc3179617f74859e5f17477ce676051a4ead1d29c75eb9593
-SIZE (azure-cli-telemetry-1.0.2.tar.gz) = 8252
+TIMESTAMP = 1567880508
+SHA256 (azure-cli-telemetry-1.0.3.tar.gz) = d4e6948f49768b28edc22a05405de214431a9bb5873cdd2d037014f3d93dc269
+SIZE (azure-cli-telemetry-1.0.3.tar.gz) = 8318
diff --git a/sysutils/py-azure-cli-vm/Makefile b/sysutils/py-azure-cli-vm/Makefile
index 505c3105cc68..5c987fd97cba 100644
--- a/sysutils/py-azure-cli-vm/Makefile
+++ b/sysutils/py-azure-cli-vm/Makefile
@@ -11,6 +11,9 @@ COMMENT=	Microsoft Azure Command-Line Tools VM Command Module
 
 LICENSE=	MIT
 
+DEPRECATED=	Incorporated into azure-cli package
+EXPIRATION_DATE=2019-09-30
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-msi>=0.2.0:devel/py-azure-mgmt-msi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-authorization>=0.50.0:devel/py-azure-mgmt-authorization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-compute>=5.0.0:devel/py-azure-mgmt-compute@${PY_FLAVOR} \
diff --git a/sysutils/py-azure-cli/Makefile b/sysutils/py-azure-cli/Makefile
index 4226d1088ceb..35b425502455 100644
--- a/sysutils/py-azure-cli/Makefile
+++ b/sysutils/py-azure-cli/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-cli
-PORTVERSION=	2.0.67
+PORTVERSION=	2.0.73
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,60 +12,98 @@ COMMENT=	Microsoft Azure Command-Line Tools
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	bash:shells/bash \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=2.0.67:sysutils/py-azure-cli-core@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-profile>=2.1.5:sysutils/py-azure-cli-profile@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-resource>=2.1.16:sysutils/py-azure-cli-resource@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-monitor>=0.2.15:sysutils/py-azure-cli-monitor@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-vm>=2.2.23:sysutils/py-azure-cli-vm@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-batch>=8.0:devel/py-azure-batch@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=2.0.73:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-telemetry>=1.0.2:sysutils/py-azure-cli-telemetry@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-storage>=2.4.3:sysutils/py-azure-cli-storage@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-sql>=2.2.5:sysutils/py-azure-cli-sql@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-sqlvm>=0.2.0:sysutils/py-azure-cli-sqlvm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-signalr>=1.0.1:sysutils/py-azure-cli-signalr@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-servicefabric>=0.1.20:sysutils/py-azure-cli-servicefabric@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-servicebus>=0.3.6:sysutils/py-azure-cli-servicebus@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-security>=0.1.2:sysutils/py-azure-cli-security@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-search>=0.1.2:sysutils/py-azure-cli-search@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-role>=2.6.4:sysutils/py-azure-cli-role@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-reservations>=0.4.3:sysutils/py-azure-cli-reservations@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-relay>=0.1.5:sysutils/py-azure-cli-relay@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-redis>=0.4.4:sysutils/py-azure-cli-redis@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-rdbms>=0.3.12:sysutils/py-azure-cli-rdbms@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-policyinsights>=0.1.4:sysutils/py-azure-cli-policyinsights@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-network>=2.5.2:sysutils/py-azure-cli-network@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-maps>=0.3.5:sysutils/py-azure-cli-maps@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-lab>=0.1.8:sysutils/py-azure-cli-lab@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-kusto>=0.2.3:sysutils/py-azure-cli-kusto@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-keyvault>=2.2.16:sysutils/py-azure-cli-keyvault@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-iotcentral>=0.1.7:sysutils/py-azure-cli-iotcentral@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-iot>=0.3.11:sysutils/py-azure-cli-iot@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-interactive>=0.4.5:sysutils/py-azure-cli-interactive@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-hdinsight>=0.3.5:sysutils/py-azure-cli-hdinsight@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-find>=0.3.4:sysutils/py-azure-cli-find@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-feedback>=2.2.1:sysutils/py-azure-cli-feedback@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-extension>=0.2.5:sysutils/py-azure-cli-extension@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-eventhubs>=0.3.7:sysutils/py-azure-cli-eventhubs@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-eventgrid>=0.2.4:sysutils/py-azure-cli-eventgrid@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-dms>=0.1.4:sysutils/py-azure-cli-dms@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-dls>=0.1.10:sysutils/py-azure-cli-dls@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-dla>=0.2.6:sysutils/py-azure-cli-dla@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-cosmosdb>=0.2.11:sysutils/py-azure-cli-cosmosdb@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-container>=0.3.18:sysutils/py-azure-cli-container@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-consumption>=0.4.4:sysutils/py-azure-cli-consumption@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-configure>=2.0.24:sysutils/py-azure-cli-configure@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-cognitiveservices>=0.2.6:sysutils/py-azure-cli-cognitiveservices@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-cloud>=2.1.1:sysutils/py-azure-cli-cloud@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-cdn>=0.2.4:sysutils/py-azure-cli-cdn@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-botservice>=0.2.2:sysutils/py-azure-cli-botservice@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-billing>=0.2.2:sysutils/py-azure-cli-billing@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-batchai>=0.4.10:sysutils/py-azure-cli-batchai@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-batch>=4.0.3:sysutils/py-azure-cli-batch@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-backup>=1.2.5:sysutils/py-azure-cli-backup@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-ams>=0.4.7:sysutils/py-azure-cli-ams@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-advisor>=2.0.1:sysutils/py-azure-cli-advisor@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-acs>=2.4.4:sysutils/py-azure-cli-acs@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-acr>=2.2.9:sysutils/py-azure-cli-acr@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}azure-cosmos>=3.0.2:devel/py-azure-cosmos@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-datalake-store>=0.0.45:devel/py-azure-datalake-store@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-functions-devops-build>=0.0.22:devel/py-azure-functions-devops-build@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-graphrbac>=0.60.0:devel/py-azure-graphrbac@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-keyvault>=1.1:devel/py-azure-keyvault@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-advisor>=2.0.1:devel/py-azure-mgmt-advisor@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-apimanagement>=0.1.0:devel/py-azure-mgmt-apimanagement@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-applicationinsights>=0.1.1:devel/py-azure-mgmt-applicationinsights@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-appconfiguration>=0.1.0:devel/py-azure-mgmt-appconfiguration@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-authorization>=0.52.0:devel/py-azure-mgmt-authorization@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-batch>=7.0:devel/py-azure-mgmt-batch@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-batchai>=2.0:devel/py-azure-mgmt-batchai@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-billing>=0.2:devel/py-azure-mgmt-billing@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-botservice>=0.2.0:devel/py-azure-mgmt-botservice@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-cdn>=3.1:devel/py-azure-mgmt-cdn@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-cognitiveservices>=5.0.0:devel/py-azure-mgmt-cognitiveservices@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-compute>=7.0:devel/py-azure-mgmt-compute@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-consumption>=2.0:devel/py-azure-mgmt-consumption@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerinstance>=1.4:devel/py-azure-mgmt-containerinstance@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerregistry>=3.0.0.r5:devel/py-azure-mgmt-containerregistry@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerservice>=5.2:devel/py-azure-mgmt-containerservice@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-cosmosdb>=0.8.0:devel/py-azure-mgmt-cosmosdb@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-datalake-analytics>=0.2.1:devel/py-azure-mgmt-datalake-analytics@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-datalake-store>=0.5.0:devel/py-azure-mgmt-datalake-store@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-datamigration>=0.1.0:devel/py-azure-mgmt-datamigration@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-deploymentmanager>=0.1.0:devel/py-azure-mgmt-deploymentmanager@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-devtestlabs>=2.2:devel/py-azure-mgmt-devtestlabs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-dns>=2.1:devel/py-azure-mgmt-dns@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-eventgrid>=2.2:devel/py-azure-mgmt-eventgrid@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-eventhub>=2.6:devel/py-azure-mgmt-eventhub@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-hdinsight>=1.1.0:devel/py-azure-mgmt-hdinsight@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-imagebuilder>=0.2.1:devel/py-azure-mgmt-imagebuilder@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-iotcentral>=1.0:devel/py-azure-mgmt-iotcentral@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-iothub>=0.8.2:devel/py-azure-mgmt-iothub@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-iothubprovisioningservices>=0.2.0:devel/py-azure-mgmt-iothubprovisioningservices@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-keyvault>=1.1:devel/py-azure-mgmt-keyvault@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-kusto>=0.3.0:devel/py-azure-mgmt-kusto@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-loganalytics>=0.2:devel/py-azure-mgmt-loganalytics@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-managedservices>=1.0:devel/py-azure-mgmt-managedservices@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-managementgroups>=0.1:devel/py-azure-mgmt-managementgroups@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-maps>=0.1.0:devel/py-azure-mgmt-maps@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-marketplaceordering>=0.1:devel/py-azure-mgmt-marketplaceordering@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-media>=1.1:devel/py-azure-mgmt-media@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-monitor>=0.5.2:devel/py-azure-mgmt-monitor@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-msi>=0.2:devel/py-azure-mgmt-msi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-network>=4.0:devel/py-azure-mgmt-network@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-netapp>=0.5.0:devel/py-azure-mgmt-netapp@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-policyinsights>=0.3.1:devel/py-azure-mgmt-policyinsights@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-privatedns>=0.1.0:devel/py-azure-mgmt-privatedns@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-rdbms>=1.8:devel/py-azure-mgmt-rdbms@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-recoveryservices>=0.4.0:devel/py-azure-mgmt-recoveryservices@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-recoveryservicesbackup>=0.4.0:devel/py-azure-mgmt-recoveryservicesbackup@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-redis>=6.0:devel/py-azure-mgmt-redis@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-relay>=0.1.0:devel/py-azure-mgmt-relay@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-reservations>=0.3.1:devel/py-azure-mgmt-reservations@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-resource>=3.1:devel/py-azure-mgmt-resource@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-search>=2.0:devel/py-azure-mgmt-search@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-security>=0.1.0:devel/py-azure-mgmt-security@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-servicebus>=0.6.0:devel/py-azure-mgmt-servicebus@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-servicefabric>=0.2.0:devel/py-azure-mgmt-servicefabric@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-signalr>=0.3.0:devel/py-azure-mgmt-signalr@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-sql>=0.12:devel/py-azure-mgmt-sql@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-sqlvirtualmachine>=0.4.0:devel/py-azure-mgmt-sqlvirtualmachine@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=4.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-trafficmanager>=0.51.0:devel/py-azure-mgmt-trafficmanager@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-web>=0.42.0:devel/py-azure-mgmt-web@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-multiapi-storage>=0.2.4:devel/py-azure-multiapi-storage@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-storage-blob>=1.3.1:devel/py-azure-storage-blob@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}colorama>=0.4.1:devel/py-colorama@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cryptography>=2.3.1:security/py-cryptography@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fabric>=2.4:devel/py-fabric@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}knack>=0.6.3:devel/py-knack@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>=2.0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}paramiko>=2.0.8:security/py-paramiko@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pygments>=2.4:textproc/py-pygments@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}openssl>=17.1.0:security/py-openssl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}psutil>=5.6:sysutils/py-psutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}scp>=0.13.2:security/py-scp@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.12:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sshtunnel>=0.1.4:net/py-sshtunnel@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}urllib3>=1.18:net/py-urllib3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}vsts-cd-manager>=1.0.0:devel/py-vsts-cd-manager@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}websocket-client>=0.56.0:www/py-websocket-client@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xmltodict>=0.12:devel/py-xmltodict@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}javaproperties>=0.5.1:devel/py-javaproperties@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsondiff>=1.2.0:devel/py-jsondiff@${PY_FLAVOR}
 
 USES=		azurepy python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/sysutils/py-azure-cli/distinfo b/sysutils/py-azure-cli/distinfo
index a301985811b2..df9cd640d2a7 100644
--- a/sysutils/py-azure-cli/distinfo
+++ b/sysutils/py-azure-cli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561042718
-SHA256 (azure-cli-2.0.67.tar.gz) = 4c7e87f8bb6f6143f5a2c2bc9c2e7e7d56f6836dbb658cca00452cfd09194ec5
-SIZE (azure-cli-2.0.67.tar.gz) = 8603
+TIMESTAMP = 1568330527
+SHA256 (azure-cli-2.0.73.tar.gz) = 500775ef323668264b315284b8534d744fe1b018818aa9de2c513e52dd30adae
+SIZE (azure-cli-2.0.73.tar.gz) = 1028533
diff --git a/sysutils/py-azure-cli/pkg-message b/sysutils/py-azure-cli/pkg-message
index 9d3c309ac66b..8fbcf6d56586 100644
--- a/sysutils/py-azure-cli/pkg-message
+++ b/sysutils/py-azure-cli/pkg-message
@@ -1,8 +1,6 @@
 [
 {
 	message: <<EOM
-================================================================================
-
 Welcome to the Azure CLI! The CLI is a tool designed to get you working quickly
 and efficiently with Azure services, with an emphasis on automation.
 
@@ -15,8 +13,6 @@ https://docs.microsoft.com/en-us/cli/azure/azure-cli-vm-tutorial
 In this tutorial, you learn all of the steps involved in setting up a virtual
 machine with the Azure CLI. The tutorial also covers output queries, Azure
 resource reuse, and resource cleanup.
-
-================================================================================
 EOM
 	type: install
 }
diff --git a/sysutils/py-ezjailremote/Makefile b/sysutils/py-ezjailremote/Makefile
index 8823ed47d85f..25a4f999ce71 100644
--- a/sysutils/py-ezjailremote/Makefile
+++ b/sysutils/py-ezjailremote/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ezjailremote
 PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -13,13 +13,15 @@ COMMENT=	Remote control and convenience wrapper for ezjail
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	ezjail-admin:sysutils/ezjail \
-		${PYTHON_PKGNAMEPREFIX}fabric>0:devel/py-fabric@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}fabric1>0:devel/py-fabric1@${PY_FLAVOR}
+
+USES=		python:2.7
+USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tomster
 GH_PROJECT=	ezjail-remote
 
-USES=		python:2.7
-USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-ploy_fabric/Makefile b/sysutils/py-ploy_fabric/Makefile
index da8846515f7e..bf36305fc447 100644
--- a/sysutils/py-ploy_fabric/Makefile
+++ b/sysutils/py-ploy_fabric/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ploy_fabric
 DISTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,9 +15,11 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fabric>=1.4.0,1:devel/py-fabric@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}fabric1>=1.4.0,1:devel/py-fabric1@${PY_FLAVOR}
 
 USES=		python:-2.7 zip
 USE_PYTHON=	autoplist distutils
 
+NO_ARCH=	yes
+
 .include <bsd.port.mk>
diff --git a/sysutils/py-pytsk/Makefile b/sysutils/py-pytsk/Makefile
index 93f857d147d7..e2cc90bd5cf7 100644
--- a/sysutils/py-pytsk/Makefile
+++ b/sysutils/py-pytsk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pytsk
 PORTVERSION=	20190507
+PORTREVISION=	1
 CATEGORIES=	sysutils security devel python
 MASTER_SITES=	CHEESESHOP \
 		https://github.com/py4n6/pytsk/releases/download/${PORTVERSION}/
diff --git a/sysutils/reggae/Makefile b/sysutils/reggae/Makefile
index ebfea2961ef2..4410c08694de 100644
--- a/sysutils/reggae/Makefile
+++ b/sysutils/reggae/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	reggae
-PORTVERSION=	0.1.6
+PORTVERSION=	0.1.7
 CATEGORIES=	sysutils
 
 MAINTAINER=	meka@tilda.center
diff --git a/sysutils/reggae/distinfo b/sysutils/reggae/distinfo
index d92db9d00612..51b9906f04f9 100644
--- a/sysutils/reggae/distinfo
+++ b/sysutils/reggae/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564335629
-SHA256 (cbsd-reggae-0.1.6_GH0.tar.gz) = 897bd6cc710ed5a23f41d0805220a594fb418d8f4d04d81f9a0ac7823540f923
-SIZE (cbsd-reggae-0.1.6_GH0.tar.gz) = 38239
+TIMESTAMP = 1568075969
+SHA256 (cbsd-reggae-0.1.7_GH0.tar.gz) = bf89741aefe9e1c20888f90604e23e6f29183d1416ec97ab34231013a3783f3d
+SIZE (cbsd-reggae-0.1.7_GH0.tar.gz) = 38018
diff --git a/sysutils/reggae/pkg-plist b/sysutils/reggae/pkg-plist
index 0f274721f228..053fcb06606e 100644
--- a/sysutils/reggae/pkg-plist
+++ b/sysutils/reggae/pkg-plist
@@ -94,7 +94,6 @@ man/man1/reggae.1.gz
 %%DATADIR%%/templates/cbsd.conf.tpl
 %%DATADIR%%/templates/dhcpd-hook.sh
 %%DATADIR%%/templates/dhcpd.conf
-%%DATADIR%%/templates/empty.jconf
 %%DATADIR%%/templates/export-ports.sh
 %%DATADIR%%/templates/freebsd-update.conf
 %%DATADIR%%/templates/gitignore
diff --git a/sysutils/sleuthkit/Makefile b/sysutils/sleuthkit/Makefile
index 83e16b337139..505d200e43b0 100644
--- a/sysutils/sleuthkit/Makefile
+++ b/sysutils/sleuthkit/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sleuthkit
-PORTVERSION=	4.6.6
-PORTREVISION=	1
+PORTVERSION=	4.6.7
 CATEGORIES=	sysutils security
 MASTER_SITES=	https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-${PORTVERSION}/
 
diff --git a/sysutils/sleuthkit/distinfo b/sysutils/sleuthkit/distinfo
index 133305af8d77..f0feca05fa2b 100644
--- a/sysutils/sleuthkit/distinfo
+++ b/sysutils/sleuthkit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556316781
-SHA256 (sleuthkit-4.6.6.tar.gz) = cfc9cd1e777ec2d13f0422cba4583d0279315e406e2e37cbb153b3d07faf11c6
-SIZE (sleuthkit-4.6.6.tar.gz) = 8668433
+TIMESTAMP = 1564845724
+SHA256 (sleuthkit-4.6.7.tar.gz) = 525fced79117929621fb583ed4a554a01a07e8739e9c000507acfa793f8d6915
+SIZE (sleuthkit-4.6.7.tar.gz) = 8672554
diff --git a/sysutils/sleuthkit/pkg-plist b/sysutils/sleuthkit/pkg-plist
index bc949ac22ff1..7443bae4d9e0 100644
--- a/sysutils/sleuthkit/pkg-plist
+++ b/sysutils/sleuthkit/pkg-plist
@@ -56,7 +56,7 @@ include/tsk/vs/tsk_vs.h
 lib/libtsk.a
 lib/libtsk.so
 lib/libtsk.so.13
-lib/libtsk.so.13.4.7
+lib/libtsk.so.13.5.0
 man/man1/blkcalc.1.gz
 man/man1/blkcat.1.gz
 man/man1/blkls.1.gz
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 40fbe4bb58e9..bd20d3e4394d 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-VERSIONS=		315 317 318 319 320 321 322 323
-SYSLOG_NG_VERSION?=	322
+VERSIONS=		320 321 322 323
+SYSLOG_NG_VERSION?=	323
 
 MASTERDIR=		${.CURDIR}/../syslog-ng${SYSLOG_NG_VERSION}
 
diff --git a/sysutils/syslog-ng311/Makefile b/sysutils/syslog-ng311/Makefile
index 1e74adcd0d9c..80e893823fea 100644
--- a/sysutils/syslog-ng311/Makefile
+++ b/sysutils/syslog-ng311/Makefile
@@ -15,6 +15,9 @@ COMMENT=	Powerful syslogd replacement
 
 BROKEN_sparc64=		fails to link: Internal error: Segmentation fault (program ld)
 
+DEPRECATED=	No longer supported by Balabit
+EXPIRATION_DATE=	2019-12-31
+
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libuuid.so:misc/e2fsprogs-libuuid
 
diff --git a/sysutils/syslog-ng315/Makefile b/sysutils/syslog-ng315/Makefile
index 2722690ecfe3..41e800e1e6e8 100644
--- a/sysutils/syslog-ng315/Makefile
+++ b/sysutils/syslog-ng315/Makefile
@@ -15,6 +15,9 @@ COMMENT=	Powerful syslogd replacement
 
 BROKEN_sparc64=		fails to link: Internal error: Segmentation fault (program ld)
 
+DEPRECATED=	No longer supported by Balabit
+EXPIRATION_DATE=	2019-12-31
+
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libuuid.so:misc/e2fsprogs-libuuid
 
diff --git a/sysutils/syslog-ng317/Makefile b/sysutils/syslog-ng317/Makefile
index cca058e99f82..8776f6975169 100644
--- a/sysutils/syslog-ng317/Makefile
+++ b/sysutils/syslog-ng317/Makefile
@@ -15,6 +15,9 @@ COMMENT=	Powerful syslogd replacement
 
 BROKEN_sparc64=		fails to link: Internal error: Segmentation fault (program ld)
 
+DEPRECATED=	No longer supported by Balabit
+EXPIRATION_DATE=	2019-12-31
+
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libuuid.so:misc/e2fsprogs-libuuid
 
diff --git a/sysutils/syslog-ng318/Makefile b/sysutils/syslog-ng318/Makefile
index b204da5ff4d5..2b45dd267168 100644
--- a/sysutils/syslog-ng318/Makefile
+++ b/sysutils/syslog-ng318/Makefile
@@ -15,6 +15,9 @@ COMMENT=	Powerful syslogd replacement
 
 BROKEN_sparc64=		fails to link: Internal error: Segmentation fault (program ld)
 
+DEPRECATED=	No longer supported by Balabit
+EXPIRATION_DATE=	2019-12-31
+
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libuuid.so:misc/e2fsprogs-libuuid
 
diff --git a/sysutils/syslog-ng319/Makefile b/sysutils/syslog-ng319/Makefile
index c25eb82307fa..54eb327469fd 100644
--- a/sysutils/syslog-ng319/Makefile
+++ b/sysutils/syslog-ng319/Makefile
@@ -15,6 +15,9 @@ COMMENT=	Powerful syslogd replacement
 
 BROKEN_sparc64=		fails to link: Internal error: Segmentation fault (program ld)
 
+DEPRECATED=	No longer supported by Balabit
+EXPIRATION_DATE=	2019-12-31
+
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libuuid.so:misc/e2fsprogs-libuuid
 
diff --git a/sysutils/syslog-ng320/Makefile b/sysutils/syslog-ng320/Makefile
index a399eed19e3a..341c19cc70a3 100644
--- a/sysutils/syslog-ng320/Makefile
+++ b/sysutils/syslog-ng320/Makefile
@@ -15,6 +15,8 @@ COMMENT=	Powerful syslogd replacement
 
 BROKEN_sparc64=		fails to link: Internal error: Segmentation fault (program ld)
 
+DEPRECATED=	Agreed upon upstream six month deprecation policy
+EXPIRATION_DATE=	2020-03-03
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libuuid.so:misc/e2fsprogs-libuuid
 
diff --git a/sysutils/uefi-edk2-qemu/Makefile b/sysutils/uefi-edk2-qemu/Makefile
index a614c5cc5dfc..62a6b63413c1 100644
--- a/sysutils/uefi-edk2-qemu/Makefile
+++ b/sysutils/uefi-edk2-qemu/Makefile
@@ -14,17 +14,17 @@ ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	bash:shells/bash \
 		nasm:devel/nasm \
+		gcc${GCC_DEFAULT}:lang/gcc${GCC_DEFAULT} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3@${PY_FLAVOR}
 
 FLAVORS=	x86_64 i386
 
-x86_64_PKGNAMESUFFIX=	-x86_64
-i386_PKGNAMESUFFIX=	-i386
-
 USES=		gmake \
 		python:2.7,build
 
-USE_GCC=	8+
+x86_64_PKGNAMESUFFIX=	-x86_64
+i386_PKGNAMESUFFIX=	-i386
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	tianocore openssl:ssl
 GH_PROJECT=	edk2 openssl:ssl
diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile
index 5491bd978f3b..897173617eae 100644
--- a/sysutils/xfce4-diskperf-plugin/Makefile
+++ b/sysutils/xfce4-diskperf-plugin/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-diskperf-plugin
-PORTVERSION=	2.6.1
+PORTVERSION=	2.6.2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
diff --git a/sysutils/xfce4-diskperf-plugin/distinfo b/sysutils/xfce4-diskperf-plugin/distinfo
index c88163982615..b7bd41b9fa51 100644
--- a/sysutils/xfce4-diskperf-plugin/distinfo
+++ b/sysutils/xfce4-diskperf-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488231478
-SHA256 (xfce4/xfce4-diskperf-plugin-2.6.1.tar.bz2) = 212ddc742be3eecb6ad5554e1b1df03d5685cb71f48a558d5f895de37c57e4fa
-SIZE (xfce4/xfce4-diskperf-plugin-2.6.1.tar.bz2) = 338723
+TIMESTAMP = 1568063916
+SHA256 (xfce4/xfce4-diskperf-plugin-2.6.2.tar.bz2) = fd2e9843da5822de96a7829e50ba496c34a50fb8492d5b5f792558c6b7ce9644
+SIZE (xfce4/xfce4-diskperf-plugin-2.6.2.tar.bz2) = 347244
diff --git a/sysutils/xfce4-diskperf-plugin/pkg-plist b/sysutils/xfce4-diskperf-plugin/pkg-plist
index 7176882476b2..2e15674f2bd6 100644
--- a/sysutils/xfce4-diskperf-plugin/pkg-plist
+++ b/sysutils/xfce4-diskperf-plugin/pkg-plist
@@ -1,6 +1,7 @@
 lib/xfce4/panel/plugins/libdiskperf.so
 %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-diskperf-plugin.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-diskperf-plugin.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-diskperf-plugin.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/xfce4-diskperf-plugin.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-diskperf-plugin.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-diskperf-plugin.mo
diff --git a/textproc/Makefile b/textproc/Makefile
index 0198354d47b9..593c8d2dee33 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -143,6 +143,7 @@
     SUBDIR += docbook2X
     SUBDIR += docbook2mdoc
     SUBDIR += docbook2odf
+    SUBDIR += docbookrx
     SUBDIR += doclifter
     SUBDIR += docproj
     SUBDIR += dom4j
@@ -1558,11 +1559,14 @@
     SUBDIR += rubygem-jekyll-paginate
     SUBDIR += rubygem-jekyll-redirect-from
     SUBDIR += rubygem-jekyll-sass-converter
+    SUBDIR += rubygem-jekyll-sass-converter1
     SUBDIR += rubygem-jekyll-sitemap
     SUBDIR += rubygem-jemoji
     SUBDIR += rubygem-js_regex
     SUBDIR += rubygem-jsmin
     SUBDIR += rubygem-kramdown
+    SUBDIR += rubygem-kramdown-parser-gfm
+    SUBDIR += rubygem-kramdown1
     SUBDIR += rubygem-kwalify
     SUBDIR += rubygem-libxml-ruby
     SUBDIR += rubygem-linguistics
diff --git a/textproc/R-cran-rmarkdown/Makefile b/textproc/R-cran-rmarkdown/Makefile
index b64891fd69a6..59aeea33dd56 100644
--- a/textproc/R-cran-rmarkdown/Makefile
+++ b/textproc/R-cran-rmarkdown/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rmarkdown
-PORTVERSION=	1.14
-PORTREVISION=	1
+PORTVERSION=	1.15
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/textproc/R-cran-rmarkdown/distinfo b/textproc/R-cran-rmarkdown/distinfo
index c0fa9b0e831f..a4c29f0d5b44 100644
--- a/textproc/R-cran-rmarkdown/distinfo
+++ b/textproc/R-cran-rmarkdown/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563082717
-SHA256 (rmarkdown_1.14.tar.gz) = f636b1048c5be56e06aa0b2b4342ad5c8192734f1e9b27468fef62be672edc61
-SIZE (rmarkdown_1.14.tar.gz) = 3163022
+TIMESTAMP = 1567915316
+SHA256 (rmarkdown_1.15.tar.gz) = bcb2193dea04621fa1f530ea986ac0c839676bd7a753a1c35a864db567ff6e3a
+SIZE (rmarkdown_1.15.tar.gz) = 3174782
diff --git a/textproc/confget/Makefile b/textproc/confget/Makefile
index e93e92063dde..4623cbd8cefa 100644
--- a/textproc/confget/Makefile
+++ b/textproc/confget/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	confget
-PORTVERSION=	2.2.0
+PORTVERSION=	2.3.0
 CATEGORIES=	textproc
 MASTER_SITES=	https://devel.ringlet.net/files/textproc/confget/ \
 		LOCAL/sunpoet
diff --git a/textproc/confget/distinfo b/textproc/confget/distinfo
index 8fee29c7882f..25c2abac682e 100644
--- a/textproc/confget/distinfo
+++ b/textproc/confget/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547477323
-SHA256 (confget-2.2.0.tar.xz) = 0f6e1629f31ef71a26d506d9fd84ea4374e7d6ff30f07631702b608fe080e4c5
-SIZE (confget-2.2.0.tar.xz) = 31796
+TIMESTAMP = 1568290936
+SHA256 (confget-2.3.0.tar.xz) = 50fac234109256855443ea871c015945dfa53fc8243adcfbae0ce634a934d0f6
+SIZE (confget-2.3.0.tar.xz) = 32552
diff --git a/textproc/docbookrx/Makefile b/textproc/docbookrx/Makefile
new file mode 100644
index 000000000000..39733803fa9b
--- /dev/null
+++ b/textproc/docbookrx/Makefile
@@ -0,0 +1,75 @@
+# $FreeBSD$
+
+PORTNAME=	docbookrx
+DISTVERSION=	1.0.0.dev
+CATEGORIES=	textproc
+
+MAINTAINER=	swills@FreeBSD.org
+COMMENT=	DocBook to AsciiDoc converter
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${LOCALBASE}/bin/rake:devel/rubygem-rake \
+		gem:devel/ruby-gems \
+		rubygem-bundler>=1.16:sysutils/rubygem-bundler \
+		rubygem-rspec>=1.2.2:devel/rubygem-rspec
+RUN_DEPENDS=	rubygem-nokogiri>=1.8:textproc/rubygem-nokogiri
+
+USE_RUBY=	yes
+USE_GITHUB=	yes
+
+OPTIONS_DEFINE=	DOCS
+
+GH_ACCOUNT=	allanjude
+GH_PROJECT=	docbookrx
+GH_TAGNAME=	06cae39
+
+GEM_ENV+=	RB_USER_INSTALL=yes
+USE_LOCALE?=	en_US.UTF-8
+GEM_ENV+=	LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
+RUBYGEM_ARGS=	-l --no-update-sources --ignore-dependencies \
+		--install-dir  ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} \
+		--bindir=${STAGEDIR}${PREFIX}/bin
+
+RUBYGEMBIN=	${LOCALBASE}/bin/gem${RUBY_VER:S/.//}
+GEMS_BASE_DIR=	lib/ruby/gems/${RUBY_VER}
+GEMS_DIR=	${GEMS_BASE_DIR}/gems
+DOC_DIR=	${GEMS_BASE_DIR}/doc
+CACHE_DIR=	${GEMS_BASE_DIR}/cache
+EXT_DIR=	${GEMS_BASE_DIR}/extensions
+GEM_LIB_DIR?=	${GEMS_DIR}/${PORTNAME}-${DISTVERSION}
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+RUBYGEM_ARGS+=	--document rdoc,ri
+.else
+RUBYGEM_ARGS+=	--no-document
+.endif
+
+do-build:
+	cd ${BUILD_WRKSRC} && ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} build --force ${PORTNAME}.gemspec
+
+do-install:
+	cd ${INSTALL_WRKSRC} && ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} ${PORTNAME}-${DISTVERSION}.gem -- ${CONFIGURE_ARGS}
+	${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info
+	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f -name '*.so' -exec ${STRIP_CMD} {} +
+	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f \( -name mkmf.log -or -name gem_make.out \) -delete
+	${RM} -r ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/extensions \
+	${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null || ${TRUE}
+	${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null || ${TRUE}
+	${ECHO} bin/docbookrx >> ${TMPPLIST}
+	${ECHO} ${GEMS_BASE_DIR}/specifications/${PORTNAME}-${DISTVERSION}.gemspec >> ${TMPPLIST}
+.if ${PORT_OPTIONS:MDOCS}
+	${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print | ${SED} -E -e \
+		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
+.endif
+	${FIND} -ds ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR} -type f -print | ${SED} -E -e \
+		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
+		@if [ -d ${STAGEDIR}${PREFIX}/${EXT_DIR} ]; then \
+			${FIND} -ds ${STAGEDIR}${PREFIX}/${EXT_DIR} -type f -print | ${SED} -E -e \
+			's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} ; \
+		fi
+
+.include <bsd.port.mk>
diff --git a/textproc/docbookrx/distinfo b/textproc/docbookrx/distinfo
new file mode 100644
index 000000000000..d98eb74dd5f4
--- /dev/null
+++ b/textproc/docbookrx/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1568045667
+SHA256 (allanjude-docbookrx-1.0.0.dev-06cae39_GH0.tar.gz) = 8222a6c8c1f0fa4ee2081b625b97dc8574fb158d173271efb5c6d3875fa5d407
+SIZE (allanjude-docbookrx-1.0.0.dev-06cae39_GH0.tar.gz) = 151430
diff --git a/textproc/docbookrx/pkg-descr b/textproc/docbookrx/pkg-descr
new file mode 100644
index 000000000000..92a9f666e7a3
--- /dev/null
+++ b/textproc/docbookrx/pkg-descr
@@ -0,0 +1,9 @@
+DocBookRx is the prescription you need to get rid of your DocBook pain. This
+tool converts DocBook XML to AsciiDoc.
+
+DocBookRx is the start of a DocBook to AsciiDoc converter written in Ruby. This
+converter is far from perfect at the moment and some of the conversion is done
+hastily. The plan is to evolve it into a robust library for performing this
+conversion in a reliable way.
+
+WWW: https://github.com/asciidoctor/docbookrx
diff --git a/textproc/ibus-typing-booster/Makefile b/textproc/ibus-typing-booster/Makefile
index e9ed667d63d8..3fac84838150 100644
--- a/textproc/ibus-typing-booster/Makefile
+++ b/textproc/ibus-typing-booster/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ibus-typing-booster
-PORTVERSION=	2.6.5
+PORTVERSION=	2.6.6
 CATEGORIES=	textproc
 
 MAINTAINER=	thierry@FreeBSD.org
diff --git a/textproc/ibus-typing-booster/distinfo b/textproc/ibus-typing-booster/distinfo
index 208cafbb3d10..002d07eb492a 100644
--- a/textproc/ibus-typing-booster/distinfo
+++ b/textproc/ibus-typing-booster/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567101497
-SHA256 (mike-fabian-ibus-typing-booster-2.6.5_GH0.tar.gz) = 04b4a928dc91b47533c3aa472c6f6d4d1c87859c7a8760ec4151ecc14490f3d7
-SIZE (mike-fabian-ibus-typing-booster-2.6.5_GH0.tar.gz) = 6911996
+TIMESTAMP = 1568228778
+SHA256 (mike-fabian-ibus-typing-booster-2.6.6_GH0.tar.gz) = e8d4885f46aa2fd231a93792dc10c02215d244e152bc8fcd77a371dd08f43039
+SIZE (mike-fabian-ibus-typing-booster-2.6.6_GH0.tar.gz) = 7169313
diff --git a/textproc/ibus-typing-booster/pkg-plist b/textproc/ibus-typing-booster/pkg-plist
index 0a6bd9389d53..e594330a4e68 100644
--- a/textproc/ibus-typing-booster/pkg-plist
+++ b/textproc/ibus-typing-booster/pkg-plist
@@ -89,10 +89,11 @@ share/applications/ibus-setup-typing-booster.desktop
 %%DATADIR%%/data/annotations/ccp.xml
 %%DATADIR%%/data/annotations/ccp_BD.xml
 %%DATADIR%%/data/annotations/ccp_IN.xml
-%%DATADIR%%/data/annotations/ce.xml
 %%DATADIR%%/data/annotations/ce_RU.xml
-%%DATADIR%%/data/annotations/cgg.xml
+%%DATADIR%%/data/annotations/ce.xml
+%%DATADIR%%/data/annotations/ceb.xml
 %%DATADIR%%/data/annotations/cgg_UG.xml
+%%DATADIR%%/data/annotations/cgg.xml
 %%DATADIR%%/data/annotations/chr.xml
 %%DATADIR%%/data/annotations/chr_US.xml
 %%DATADIR%%/data/annotations/ckb.xml
diff --git a/textproc/mdocml/Makefile b/textproc/mdocml/Makefile
index a4d21e19e0b5..6611081cfa51 100644
--- a/textproc/mdocml/Makefile
+++ b/textproc/mdocml/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mdocml
-PORTVERSION=	1.14.4
+PORTVERSION=	1.14.5
 CATEGORIES=	textproc
 MASTER_SITES=	http://mdocml.bsd.lv/snapshots/ \
 		LOCAL/uqs
diff --git a/textproc/mdocml/distinfo b/textproc/mdocml/distinfo
index f201d31d6c6a..2b2dab6dd0b8 100644
--- a/textproc/mdocml/distinfo
+++ b/textproc/mdocml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534190995
-SHA256 (mandoc-1.14.4.tar.gz) = 24eb72103768987dcc63b53d27fdc085796330782f44b3b40c4660b1e1ee9b9c
-SIZE (mandoc-1.14.4.tar.gz) = 627229
+TIMESTAMP = 1568404392
+SHA256 (mandoc-1.14.5.tar.gz) = 8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7
+SIZE (mandoc-1.14.5.tar.gz) = 651846
diff --git a/textproc/p5-PDF-Table/Makefile b/textproc/p5-PDF-Table/Makefile
index 2130935f7916..bfd9d7765ba5 100644
--- a/textproc/p5-PDF-Table/Makefile
+++ b/textproc/p5-PDF-Table/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	PDF-Table
-DISTVERSION=	0.10.1
+DISTVERSION=	0.11.0
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-PDF-Table/distinfo b/textproc/p5-PDF-Table/distinfo
index 7a2217eebf10..160c61b18407 100644
--- a/textproc/p5-PDF-Table/distinfo
+++ b/textproc/p5-PDF-Table/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525282987
-SHA256 (PDF-Table-0.10.1.tar.gz) = fb2d369d09797ee9cf79811ff85061bba8e56c61e65c13aca674b532105a2713
-SIZE (PDF-Table-0.10.1.tar.gz) = 28459
+TIMESTAMP = 1568064142
+SHA256 (PDF-Table-0.11.0.tar.gz) = 914b5c4671da400ace15aec32244a0bd1596e22b34e4b341a7f28b25ecb4bd98
+SIZE (PDF-Table-0.11.0.tar.gz) = 29930
diff --git a/textproc/p5-PPIx-Regexp/Makefile b/textproc/p5-PPIx-Regexp/Makefile
index be833cbcc56d..91d0f78e65fa 100644
--- a/textproc/p5-PPIx-Regexp/Makefile
+++ b/textproc/p5-PPIx-Regexp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	PPIx-Regexp
-PORTVERSION=	0.065
+PORTVERSION=	0.067
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:WYANT
diff --git a/textproc/p5-PPIx-Regexp/distinfo b/textproc/p5-PPIx-Regexp/distinfo
index 436de219be5b..c4bb323c1455 100644
--- a/textproc/p5-PPIx-Regexp/distinfo
+++ b/textproc/p5-PPIx-Regexp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561752330
-SHA256 (PPIx-Regexp-0.065.tar.gz) = eb4a56858c077d9e6a859c4f29d7659ed40ea588d21cfe7193dd91143a8e843e
-SIZE (PPIx-Regexp-0.065.tar.gz) = 227250
+TIMESTAMP = 1568031447
+SHA256 (PPIx-Regexp-0.067.tar.gz) = 1aa8dee5bdefdfdbfedd3d829932cedc57502552572739766148c6ac6cc6c3f0
+SIZE (PPIx-Regexp-0.067.tar.gz) = 228297
diff --git a/textproc/p5-Text-Template/Makefile b/textproc/p5-Text-Template/Makefile
index db5950576063..ed404cafe5f1 100644
--- a/textproc/p5-Text-Template/Makefile
+++ b/textproc/p5-Text-Template/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Text-Template
-PORTVERSION=	1.56
+PORTVERSION=	1.57
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-Text-Template/distinfo b/textproc/p5-Text-Template/distinfo
index 89f7dd24799a..3eadaa390ce4 100644
--- a/textproc/p5-Text-Template/distinfo
+++ b/textproc/p5-Text-Template/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562773490
-SHA256 (Text-Template-1.56.tar.gz) = 09aaa095c562d22824daf849378a58632446093f397d8c7acb37c25a7f37e646
-SIZE (Text-Template-1.56.tar.gz) = 49602
+TIMESTAMP = 1568291000
+SHA256 (Text-Template-1.57.tar.gz) = 3efc81b58bb710a1984b7007d6d06640d2901ea8c2c0e3d2e841f138f45d190c
+SIZE (Text-Template-1.57.tar.gz) = 49605
diff --git a/textproc/py-ocrmypdf/Makefile b/textproc/py-ocrmypdf/Makefile
index deef9938d5b5..a65d1bdb2882 100644
--- a/textproc/py-ocrmypdf/Makefile
+++ b/textproc/py-ocrmypdf/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ocrmypdf
-DISTVERSION=	9.0.2
+DISTVERSION=	9.0.3
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -57,12 +57,14 @@ NO_ARCH=	yes
 
 PLIST_FILES=	etc/bash_completion.d/ocrmypdf.bash share/fish/vendor_completions.d/ocrmypdf.fish
 
-OPTIONS_DEFINE=	PNGQUANT
-OPTIONS_DEFAULT=PNGQUANT
+OPTIONS_DEFINE=	PNGQUANT UNPAPER
+OPTIONS_DEFAULT=PNGQUANT UNPAPER
 
 PNGQUANT_DESC=	Optimizes the encoding of PNG-style images in PDFs
+UNPAPER_DESC=	Deskew and clean up pages before OCR processing
 
 PNGQUANT_RUN_DEPENDS=	pngquant:graphics/pngquant
+UNPAPER_RUN_DEPENDS=	unpaper:graphics/unpaper
 
 # This workaround copes with the files that are generated in the CFFI
 # out-of-line ABI mode (through devel/py-cffi). Those files are installed but
diff --git a/textproc/py-ocrmypdf/distinfo b/textproc/py-ocrmypdf/distinfo
index b8b360625451..115eb5642cca 100644
--- a/textproc/py-ocrmypdf/distinfo
+++ b/textproc/py-ocrmypdf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567617015
-SHA256 (ocrmypdf-9.0.2.tar.gz) = d3a986234995302f284d7cb1fcbc046a1ff49face7f6a0a02e6be87c8f210ec1
-SIZE (ocrmypdf-9.0.2.tar.gz) = 7643561
+TIMESTAMP = 1567867813
+SHA256 (ocrmypdf-9.0.3.tar.gz) = 3d9b92f6a01d0711e4156c6b36638d9d946d010e2925ec473ec7f666096cceeb
+SIZE (ocrmypdf-9.0.3.tar.gz) = 7643541
diff --git a/textproc/py-pikepdf/Makefile b/textproc/py-pikepdf/Makefile
index cda66d6a015a..adc012783c49 100644
--- a/textproc/py-pikepdf/Makefile
+++ b/textproc/py-pikepdf/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pikepdf
-DISTVERSION=	1.6.3
+DISTVERSION=	1.6.4
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-pikepdf/distinfo b/textproc/py-pikepdf/distinfo
index 988d9652ba5c..99d2be10f8aa 100644
--- a/textproc/py-pikepdf/distinfo
+++ b/textproc/py-pikepdf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567416522
-SHA256 (pikepdf-1.6.3.tar.gz) = 550bb6d09f037732c51397dbcf8b1326cbb96b33060ca7a7c1a13674dde4ded9
-SIZE (pikepdf-1.6.3.tar.gz) = 1650792
+TIMESTAMP = 1568272823
+SHA256 (pikepdf-1.6.4.tar.gz) = 50ad2f2903db21b9105c1092ef947b456134a77355b4386535492dc28a6a4e52
+SIZE (pikepdf-1.6.4.tar.gz) = 1651400
diff --git a/textproc/py-sphinx-tabs/Makefile b/textproc/py-sphinx-tabs/Makefile
index 0081d40447e2..671f5ebaf065 100644
--- a/textproc/py-sphinx-tabs/Makefile
+++ b/textproc/py-sphinx-tabs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sphinx-tabs
-PORTVERSION=	1.1.12
+PORTVERSION=	1.1.13
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-sphinx-tabs/distinfo b/textproc/py-sphinx-tabs/distinfo
index 49a5bcc0bfc7..c059e63694a2 100644
--- a/textproc/py-sphinx-tabs/distinfo
+++ b/textproc/py-sphinx-tabs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567191938
-SHA256 (sphinx-tabs-1.1.12.tar.gz) = 0e9e79817910c1011c141ef46becdfcb67cb356f1cdcad326107176ce9cb4d3a
-SIZE (sphinx-tabs-1.1.12.tar.gz) = 21302
+TIMESTAMP = 1568290962
+SHA256 (sphinx-tabs-1.1.13.tar.gz) = 7ad881daa4d18799b254db4aa7feeb9d30256cbccf7d4f3de746d9fcc14e0196
+SIZE (sphinx-tabs-1.1.13.tar.gz) = 21332
diff --git a/textproc/re-flex/Makefile b/textproc/re-flex/Makefile
index 3ab99b576ced..15133c317c19 100644
--- a/textproc/re-flex/Makefile
+++ b/textproc/re-flex/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	re-flex
-PORTVERSION=	1.3.8
+PORTVERSION=	1.4.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
 
diff --git a/textproc/re-flex/distinfo b/textproc/re-flex/distinfo
index 5f55c7053be0..b35f9bd4e4bc 100644
--- a/textproc/re-flex/distinfo
+++ b/textproc/re-flex/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566203956
-SHA256 (Genivia-RE-flex-v1.3.8_GH0.tar.gz) = a6cc075014558698494db93a452df3122c6f92c6d51156461607bf10653fbf9e
-SIZE (Genivia-RE-flex-v1.3.8_GH0.tar.gz) = 4200522
+TIMESTAMP = 1568199377
+SHA256 (Genivia-RE-flex-v1.4.1_GH0.tar.gz) = fac66fc34ddea026b9aafab39b9b65388aaa10c7013d0bc6186c9201a8193072
+SIZE (Genivia-RE-flex-v1.4.1_GH0.tar.gz) = 4446449
diff --git a/textproc/retext/Makefile b/textproc/retext/Makefile
index c3b2b8d6ead6..811008ef2248 100644
--- a/textproc/retext/Makefile
+++ b/textproc/retext/Makefile
@@ -31,4 +31,7 @@ BINARY_ALIAS=	lrelease=${LRELEASE}
 
 NO_ARCH=	yes
 
+post-patch:
+	${REINPLACE_CMD} -e "s,lrelease,${LOCALBASE}/bin/lrelease," ${WRKSRC}/setup.py
+
 .include <bsd.port.mk>
diff --git a/textproc/retext/files/patch-setup.py b/textproc/retext/files/patch-setup.py
new file mode 100644
index 000000000000..fef973a8c849
--- /dev/null
+++ b/textproc/retext/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2019-09-09 20:33:15.181197000 +0200
++++ setup.py	2019-09-09 20:37:49.730010000 +0200
+@@ -57,7 +57,7 @@
+ 	def run(self):
+ 		for ts_file in glob(join('locale', '*.ts')):
+ 			try:
+-				check_call(('lrelease', ts_file), env={'QT_SELECT': '5'})
++				check_call(('lrelease', ts_file), env={'QT_SELECT': 'qt5'})
+ 			except Exception as e:
+ 				log.warn('Failed to build translations: %s', e)
+ 				break
diff --git a/textproc/ruby-htree/Makefile b/textproc/ruby-htree/Makefile
index 2254cff3967e..a23b00e40671 100644
--- a/textproc/ruby-htree/Makefile
+++ b/textproc/ruby-htree/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	htree
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	textproc www ruby
 MASTER_SITES=	http://www.a-k-r.org/htree/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -11,6 +12,8 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Ruby library to manipulate HTML/XML tree data structure
 
+BUILD_DEPENDS=	rubygem-rdoc>=0.a:devel/rubygem-rdoc
+
 OPTIONS_DEFINE=	DOCS
 
 USE_RUBY=	yes
diff --git a/textproc/rubygem-cld3/Makefile b/textproc/rubygem-cld3/Makefile
index b9f18d2e55f6..0225307d1780 100644
--- a/textproc/rubygem-cld3/Makefile
+++ b/textproc/rubygem-cld3/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cld3
 DISTVERSION=	3.2.4
+PORTREVISION=	1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
@@ -12,22 +13,9 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	protobuf>0:devel/protobuf \
-		rubygem-ffi110>1.1.0<1.11.0:devel/rubygem-ffi110
+		rubygem-ffi110>=1.1.0<1.11.0:devel/rubygem-ffi110
 
 USES=		gem pkgconfig
 USE_RUBY=	yes
 
-## do-install here to prevent removal of ext
-do-install:
-	(cd ${BUILD_WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install \
-		${RUBYGEM_ARGS} ${GEMFILES} -- ${CONFIGURE_ARGS})
-	${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/
-	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f -name '*.so' \
-		-exec ${STRIP_CMD} {} +
-	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f \
-		\( -name mkmf.log -or -name gem_make.out \) -delete
-	${RM} -r ${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null || ${TRUE}
-	${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR} 2> /dev/null || ${TRUE}
-	${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null || ${TRUE}
-
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-colorator/Makefile b/textproc/rubygem-colorator/Makefile
index 9f5e50d4cfb3..c2542b212734 100644
--- a/textproc/rubygem-colorator/Makefile
+++ b/textproc/rubygem-colorator/Makefile
@@ -6,14 +6,15 @@ PORTVERSION=	1.1.0
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ruby@FreeBSD.org
-COMMENT=	Colorize your text in a terminal with a simple API
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Colorize your text in the terminal
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-jekyll-assets/Makefile b/textproc/rubygem-jekyll-assets/Makefile
index c33eb1318cb3..22379181ccc3 100644
--- a/textproc/rubygem-jekyll-assets/Makefile
+++ b/textproc/rubygem-jekyll-assets/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jekyll-assets
 PORTVERSION=	3.0.12
+PORTREVISION=	1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
@@ -12,16 +13,16 @@ COMMENT=	Create javascript/CSS assets for Jekyll sites
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport5>=5.0:devel/rubygem-activesupport5 \
-		rubygem-execjs>=2.7:devel/rubygem-execjs \
-		rubygem-extras>=0.2:devel/rubygem-extras \
-		rubygem-fastimage>=2.0:graphics/rubygem-fastimage \
-		rubygem-jekyll>=3.5:www/rubygem-jekyll \
-		rubygem-jekyll-sanity>=1.2:www/rubygem-jekyll-sanity \
-		rubygem-liquid-tag-parser>=1.0:textproc/rubygem-liquid-tag-parser \
-		rubygem-nokogiri>=1.8:textproc/rubygem-nokogiri \
-		rubygem-pathutil>=0.16:devel/rubygem-pathutil \
-		rubygem-sprockets3>=3.3:devel/rubygem-sprockets3
+RUN_DEPENDS=	rubygem-activesupport5>=5.0<6:devel/rubygem-activesupport5 \
+		rubygem-execjs>=2.7<3:devel/rubygem-execjs \
+		rubygem-extras>=0.2<1:devel/rubygem-extras \
+		rubygem-fastimage>=2.0<3:graphics/rubygem-fastimage \
+		rubygem-jekyll3>=3.5<4.0:www/rubygem-jekyll3 \
+		rubygem-jekyll-sanity>=1.2<2:www/rubygem-jekyll-sanity \
+		rubygem-liquid-tag-parser>=1.0<2:textproc/rubygem-liquid-tag-parser \
+		rubygem-nokogiri>=1.8<2:textproc/rubygem-nokogiri \
+		rubygem-pathutil>=0.16<1:devel/rubygem-pathutil \
+		rubygem-sprockets3>=3.3<4.1:devel/rubygem-sprockets3
 
 USES=		gem
 USE_RUBY=	yes
diff --git a/textproc/rubygem-jekyll-feed/Makefile b/textproc/rubygem-jekyll-feed/Makefile
index 7f3ca754232e..3e9e2511b104 100644
--- a/textproc/rubygem-jekyll-feed/Makefile
+++ b/textproc/rubygem-jekyll-feed/Makefile
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
 PORTNAME=	jekyll-feed
-PORTVERSION=	0.11.0
+PORTVERSION=	0.12.1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ruby@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Generates an Atom feed from Jekyll posts
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-jekyll>=3.3:www/rubygem-jekyll
+RUN_DEPENDS=	rubygem-jekyll>=3.7<5.0:www/rubygem-jekyll
 
 USES=		gem shebangfix
 USE_RUBY=	yes
diff --git a/textproc/rubygem-jekyll-feed/distinfo b/textproc/rubygem-jekyll-feed/distinfo
index 201d7cac9c05..3b1dd96e1a5e 100644
--- a/textproc/rubygem-jekyll-feed/distinfo
+++ b/textproc/rubygem-jekyll-feed/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536592004
-SHA256 (rubygem/jekyll-feed-0.11.0.gem) = 97c52f737f6ff7c442277c1f2e525c6b1c76b699654bd711f4b6b53a17c6b486
-SIZE (rubygem/jekyll-feed-0.11.0.gem) = 18944
+TIMESTAMP = 1567842494
+SHA256 (rubygem/jekyll-feed-0.12.1.gem) = e3514d6fb1529a685f36d3260dcfa2f51f1fd53592229b604b0c8fdce48ec005
+SIZE (rubygem/jekyll-feed-0.12.1.gem) = 19456
diff --git a/textproc/rubygem-jekyll-gist/Makefile b/textproc/rubygem-jekyll-gist/Makefile
index 05b3923c67ba..57f65d8b7e17 100644
--- a/textproc/rubygem-jekyll-gist/Makefile
+++ b/textproc/rubygem-jekyll-gist/Makefile
@@ -12,11 +12,12 @@ COMMENT=	Liquid tag for displaying GitHub Gists in Jekyll sites
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-octokit>=4.2:net/rubygem-octokit
+RUN_DEPENDS=	rubygem-octokit>=4.2<5:net/rubygem-octokit
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem shebangfix
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 SHEBANG_FILES=	script/*
 
diff --git a/textproc/rubygem-jekyll-mentions/Makefile b/textproc/rubygem-jekyll-mentions/Makefile
index 1e51f5792c18..97bcc95025e0 100644
--- a/textproc/rubygem-jekyll-mentions/Makefile
+++ b/textproc/rubygem-jekyll-mentions/Makefile
@@ -1,20 +1,21 @@
 # $FreeBSD$
 
 PORTNAME=	jekyll-mentions
-PORTVERSION=	1.4.1
+PORTVERSION=	1.5.1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ruby@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	At-mention support for Jekyll sites
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-html-pipeline>=2.3:textproc/rubygem-html-pipeline \
-		rubygem-jekyll>=3.0:www/rubygem-jekyll
+RUN_DEPENDS=	rubygem-html-pipeline>=2.3<3:textproc/rubygem-html-pipeline \
+		rubygem-jekyll>=3.7<5.0:www/rubygem-jekyll
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-jekyll-mentions/distinfo b/textproc/rubygem-jekyll-mentions/distinfo
index d3b1f8ec7f76..35f9aee06cf6 100644
--- a/textproc/rubygem-jekyll-mentions/distinfo
+++ b/textproc/rubygem-jekyll-mentions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1533819589
-SHA256 (rubygem/jekyll-mentions-1.4.1.gem) = 0ef3689f762629312b4a9b4d6848089fc54129cd84565fbe30358aa032cde141
-SIZE (rubygem/jekyll-mentions-1.4.1.gem) = 6144
+TIMESTAMP = 1567842496
+SHA256 (rubygem/jekyll-mentions-1.5.1.gem) = fb98cb0e7a5c035c831ab6ddd972e0e110c567f277ddab654144a354f8b201e5
+SIZE (rubygem/jekyll-mentions-1.5.1.gem) = 6144
diff --git a/textproc/rubygem-jekyll-paginate/Makefile b/textproc/rubygem-jekyll-paginate/Makefile
index 7bbd9ef03c90..4f6c09e71cd1 100644
--- a/textproc/rubygem-jekyll-paginate/Makefile
+++ b/textproc/rubygem-jekyll-paginate/Makefile
@@ -13,12 +13,11 @@ COMMENT=	Built-in Pagination Generator for Jekyll
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
+USES=		gem shebangfix
+USE_RUBY=	yes
+
 NO_ARCH=	yes
 
-USE_RUBY=	yes
-USES=		gem shebangfix
-SHEBANG_FILES=	script/bootstrap \
-		script/cibuild \
-		script/unbundle
+SHEBANG_FILES=	script/*
 
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-jekyll-redirect-from/Makefile b/textproc/rubygem-jekyll-redirect-from/Makefile
index 768b159ad4ab..efb25f6ebc5a 100644
--- a/textproc/rubygem-jekyll-redirect-from/Makefile
+++ b/textproc/rubygem-jekyll-redirect-from/Makefile
@@ -1,21 +1,22 @@
 # $FreeBSD$
 
 PORTNAME=	jekyll-redirect-from
-PORTVERSION=	0.14.0
+PORTVERSION=	0.15.0
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ruby@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Handles redirection URLs for jekyll pages and posts
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-jekyll>=3.3:www/rubygem-jekyll
+RUN_DEPENDS=	rubygem-jekyll>=3.3<5.0:www/rubygem-jekyll
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem shebangfix
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 SHEBANG_FILES=	script/*
 
diff --git a/textproc/rubygem-jekyll-redirect-from/distinfo b/textproc/rubygem-jekyll-redirect-from/distinfo
index fa807ef4829c..9d17c4ab3a1d 100644
--- a/textproc/rubygem-jekyll-redirect-from/distinfo
+++ b/textproc/rubygem-jekyll-redirect-from/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532976161
-SHA256 (rubygem/jekyll-redirect-from-0.14.0.gem) = 44f5077b292cfff47938144e98bcd09c589c8169c4eabefcd40633bcdd69ae23
-SIZE (rubygem/jekyll-redirect-from-0.14.0.gem) = 15872
+TIMESTAMP = 1567842498
+SHA256 (rubygem/jekyll-redirect-from-0.15.0.gem) = 4bcb490d362cc6792c28bab70bbb40ac29ee11ddf902536d4059e5787ec897b3
+SIZE (rubygem/jekyll-redirect-from-0.15.0.gem) = 16896
diff --git a/textproc/rubygem-jekyll-sass-converter/Makefile b/textproc/rubygem-jekyll-sass-converter/Makefile
index 5da055d1224f..a771c3fedd8a 100644
--- a/textproc/rubygem-jekyll-sass-converter/Makefile
+++ b/textproc/rubygem-jekyll-sass-converter/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jekyll-sass-converter
-PORTVERSION=	1.5.2
+PORTVERSION=	2.0.0
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
@@ -11,10 +11,11 @@ COMMENT=	Basic Sass converter for Jekyll
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-sass>=3.4:textproc/rubygem-sass
+RUN_DEPENDS=	rubygem-sassc>=2.1.0<3.0:textproc/rubygem-sassc
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-jekyll-sass-converter/distinfo b/textproc/rubygem-jekyll-sass-converter/distinfo
index a12a4501bf69..dd89a6000f1a 100644
--- a/textproc/rubygem-jekyll-sass-converter/distinfo
+++ b/textproc/rubygem-jekyll-sass-converter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517741492
-SHA256 (rubygem/jekyll-sass-converter-1.5.2.gem) = 53773669e414dc3bb070113befacb808576025a28cfa4a4accc682e90a9c1101
-SIZE (rubygem/jekyll-sass-converter-1.5.2.gem) = 5632
+TIMESTAMP = 1567842500
+SHA256 (rubygem/jekyll-sass-converter-2.0.0.gem) = a229262039933d3f482dc4a73f4dce508e392566ead5cbd1abdfe38d6e116c39
+SIZE (rubygem/jekyll-sass-converter-2.0.0.gem) = 7680
diff --git a/textproc/rubygem-jekyll-sass-converter1/Makefile b/textproc/rubygem-jekyll-sass-converter1/Makefile
new file mode 100644
index 000000000000..26aa3da0748f
--- /dev/null
+++ b/textproc/rubygem-jekyll-sass-converter1/Makefile
@@ -0,0 +1,24 @@
+# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	jekyll-sass-converter
+PORTVERSION=	1.5.2
+CATEGORIES=	textproc rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	1
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Basic Sass converter for Jekyll
+
+LICENSE=	MIT
+
+RUN_DEPENDS=	rubygem-sass>=3.4<4:textproc/rubygem-sass
+
+USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^1\.
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-jekyll-sass-converter1/distinfo b/textproc/rubygem-jekyll-sass-converter1/distinfo
new file mode 100644
index 000000000000..a12a4501bf69
--- /dev/null
+++ b/textproc/rubygem-jekyll-sass-converter1/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1517741492
+SHA256 (rubygem/jekyll-sass-converter-1.5.2.gem) = 53773669e414dc3bb070113befacb808576025a28cfa4a4accc682e90a9c1101
+SIZE (rubygem/jekyll-sass-converter-1.5.2.gem) = 5632
diff --git a/textproc/rubygem-jekyll-sass-converter1/pkg-descr b/textproc/rubygem-jekyll-sass-converter1/pkg-descr
new file mode 100644
index 000000000000..e3efa3e03970
--- /dev/null
+++ b/textproc/rubygem-jekyll-sass-converter1/pkg-descr
@@ -0,0 +1,3 @@
+rubygem-jekyll-sass-converter is a basic Sass converter for Jekyll.
+
+WWW: https://github.com/jekyll/jekyll-sass-converter
diff --git a/textproc/rubygem-jekyll-sitemap/Makefile b/textproc/rubygem-jekyll-sitemap/Makefile
index bec6a844c6e0..f812366e36c7 100644
--- a/textproc/rubygem-jekyll-sitemap/Makefile
+++ b/textproc/rubygem-jekyll-sitemap/Makefile
@@ -1,21 +1,22 @@
 # $FreeBSD$
 
 PORTNAME=	jekyll-sitemap
-PORTVERSION=	1.2.0
+PORTVERSION=	1.3.1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ruby@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Automatically generate a sitemap.xml for Jekyll sites
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-jekyll>=3.3:www/rubygem-jekyll
+RUN_DEPENDS=	rubygem-jekyll>=3.7<5.0:www/rubygem-jekyll
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem shebangfix
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 SHEBANG_FILES=	script/*
 
diff --git a/textproc/rubygem-jekyll-sitemap/distinfo b/textproc/rubygem-jekyll-sitemap/distinfo
index 244c186e4ca1..8ad0cd8949c8 100644
--- a/textproc/rubygem-jekyll-sitemap/distinfo
+++ b/textproc/rubygem-jekyll-sitemap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516969900
-SHA256 (rubygem/jekyll-sitemap-1.2.0.gem) = 3621d68ef09a4f6f65a0577c01a76e4049aaf566de39bb602719e140b51fc977
-SIZE (rubygem/jekyll-sitemap-1.2.0.gem) = 71680
+TIMESTAMP = 1567842502
+SHA256 (rubygem/jekyll-sitemap-1.3.1.gem) = b528e0bbd6eb3d4906b9df5fc3ad33d4710b615990f5309e22629d61d7c67c34
+SIZE (rubygem/jekyll-sitemap-1.3.1.gem) = 72192
diff --git a/textproc/rubygem-jemoji/Makefile b/textproc/rubygem-jemoji/Makefile
index 81bf061f3cc3..9ef0d6c8a6e4 100644
--- a/textproc/rubygem-jemoji/Makefile
+++ b/textproc/rubygem-jemoji/Makefile
@@ -1,18 +1,18 @@
 # $FreeBSD$
 
 PORTNAME=	jemoji
-PORTVERSION=	0.11.0
+PORTVERSION=	0.11.1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ruby@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	GitHub-flavored emoji plugin for Jekyll
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-gemoji>=3.0:textproc/rubygem-gemoji \
-		rubygem-html-pipeline>=2.2:textproc/rubygem-html-pipeline \
-		rubygem-jekyll>=3.0:www/rubygem-jekyll
+RUN_DEPENDS=	rubygem-gemoji>=3.0<4:textproc/rubygem-gemoji \
+		rubygem-html-pipeline>=2.2<3:textproc/rubygem-html-pipeline \
+		rubygem-jekyll>=3.0<5.0:www/rubygem-jekyll
 
 USES=		gem
 USE_RUBY=	yes
diff --git a/textproc/rubygem-jemoji/distinfo b/textproc/rubygem-jemoji/distinfo
index b9438a0fd6bc..58e9412614f7 100644
--- a/textproc/rubygem-jemoji/distinfo
+++ b/textproc/rubygem-jemoji/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556384326
-SHA256 (rubygem/jemoji-0.11.0.gem) = 3325badd68342c2793d4aa4df34ce9936ef7087c0d5cf5af716a46a40c1d8674
-SIZE (rubygem/jemoji-0.11.0.gem) = 5632
+TIMESTAMP = 1567842506
+SHA256 (rubygem/jemoji-0.11.1.gem) = 061a0de9977de055290cdb9eac832dd703f2de30df5c868b832cc12d4b3ea7f9
+SIZE (rubygem/jemoji-0.11.1.gem) = 5632
diff --git a/textproc/rubygem-kramdown-parser-gfm/Makefile b/textproc/rubygem-kramdown-parser-gfm/Makefile
new file mode 100644
index 000000000000..59603d96c92c
--- /dev/null
+++ b/textproc/rubygem-kramdown-parser-gfm/Makefile
@@ -0,0 +1,22 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	kramdown-parser-gfm
+PORTVERSION=	1.1.0
+CATEGORIES=	textproc rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Kramdown parser for the GFM dialect of Markdown
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+RUN_DEPENDS=	rubygem-kramdown>=2.0<3:textproc/rubygem-kramdown
+
+USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-kramdown-parser-gfm/distinfo b/textproc/rubygem-kramdown-parser-gfm/distinfo
new file mode 100644
index 000000000000..41dcbef3ee66
--- /dev/null
+++ b/textproc/rubygem-kramdown-parser-gfm/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1567842450
+SHA256 (rubygem/kramdown-parser-gfm-1.1.0.gem) = fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729
+SIZE (rubygem/kramdown-parser-gfm-1.1.0.gem) = 11776
diff --git a/textproc/rubygem-kramdown-parser-gfm/pkg-descr b/textproc/rubygem-kramdown-parser-gfm/pkg-descr
new file mode 100644
index 000000000000..bd84ee032904
--- /dev/null
+++ b/textproc/rubygem-kramdown-parser-gfm/pkg-descr
@@ -0,0 +1,4 @@
+This is a parser for kramdown that converts Markdown documents in the GFM
+dialect to HTML.
+
+WWW: https://github.com/kramdown/parser-gfm
diff --git a/textproc/rubygem-kramdown/Makefile b/textproc/rubygem-kramdown/Makefile
index 5badced6e99d..54c81a290410 100644
--- a/textproc/rubygem-kramdown/Makefile
+++ b/textproc/rubygem-kramdown/Makefile
@@ -2,22 +2,21 @@
 # $FreeBSD$
 
 PORTNAME=	kramdown
-PORTVERSION=	1.17.0
+PORTVERSION=	2.1.0
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ruby@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Yet-another-markdown-parser but fast, pure Ruby
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-NO_ARCH=	yes
+USES=		gem
 USE_RUBY=	yes
-USES=		gem shebangfix
 
-PLIST_FILES=	bin/kramdown
+NO_ARCH=	yes
 
-SHEBANG_FILES=	benchmark/*.sh
+PLIST_FILES=	bin/kramdown
 
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-kramdown/distinfo b/textproc/rubygem-kramdown/distinfo
index b5c4697261f6..6a3bc384773b 100644
--- a/textproc/rubygem-kramdown/distinfo
+++ b/textproc/rubygem-kramdown/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527784979
-SHA256 (rubygem/kramdown-1.17.0.gem) = 5862410a2c1692fde2fcc86d78d2265777c22bd101f11c76442f1698ab242cd8
-SIZE (rubygem/kramdown-1.17.0.gem) = 260608
+TIMESTAMP = 1567842508
+SHA256 (rubygem/kramdown-2.1.0.gem) = 089956b32ef77cf85136553b392635d9e2b8b6c7bd8e470db6a9a1be172088b6
+SIZE (rubygem/kramdown-2.1.0.gem) = 119808
diff --git a/textproc/rubygem-kramdown1/Makefile b/textproc/rubygem-kramdown1/Makefile
new file mode 100644
index 000000000000..b3dc91ff4fac
--- /dev/null
+++ b/textproc/rubygem-kramdown1/Makefile
@@ -0,0 +1,28 @@
+# Created by: Steve Wills <swills@rubick>
+# $FreeBSD$
+
+PORTNAME=	kramdown
+PORTVERSION=	1.17.0
+CATEGORIES=	textproc rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	1
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Yet-another-markdown-parser but fast, pure Ruby
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		gem shebangfix
+USE_RUBY=	yes
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^1\.
+
+SHEBANG_FILES=	benchmark/*.sh
+
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/bin/kramdown
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-kramdown1/distinfo b/textproc/rubygem-kramdown1/distinfo
new file mode 100644
index 000000000000..b5c4697261f6
--- /dev/null
+++ b/textproc/rubygem-kramdown1/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1527784979
+SHA256 (rubygem/kramdown-1.17.0.gem) = 5862410a2c1692fde2fcc86d78d2265777c22bd101f11c76442f1698ab242cd8
+SIZE (rubygem/kramdown-1.17.0.gem) = 260608
diff --git a/textproc/rubygem-kramdown1/pkg-descr b/textproc/rubygem-kramdown1/pkg-descr
new file mode 100644
index 000000000000..76a5411a058f
--- /dev/null
+++ b/textproc/rubygem-kramdown1/pkg-descr
@@ -0,0 +1,4 @@
+kramdown is yet-another-markdown-parser but fast, pure Ruby, using a strict
+syntax definition and supporting several common extensions.
+
+WWW: https://kramdown.gettalong.org/
diff --git a/textproc/rubygem-liquid-tag-parser/Makefile b/textproc/rubygem-liquid-tag-parser/Makefile
index eb064ae916cf..9957374c5f26 100644
--- a/textproc/rubygem-liquid-tag-parser/Makefile
+++ b/textproc/rubygem-liquid-tag-parser/Makefile
@@ -12,13 +12,14 @@ COMMENT=	Parse liquid tags easily
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-extras>=0.3:devel/rubygem-extras \
-		rubygem-liquid>=3.0:textproc/rubygem-liquid
+RUN_DEPENDS=	rubygem-extras>=0.3<1:devel/rubygem-extras \
+		rubygem-liquid>=3.0<5.0:textproc/rubygem-liquid
 
-NO_ARCH=	yes
-USES=		compiler:c++11-lang gem
+USES=		gem
 USE_RUBY=	yes
 
+NO_ARCH=	yes
+
 # Disable rdoc
 OPTIONS_EXCLUDE=DOCS
 
diff --git a/textproc/rubygem-liquid/Makefile b/textproc/rubygem-liquid/Makefile
index e0cdb597977d..23d3d418ed4f 100644
--- a/textproc/rubygem-liquid/Makefile
+++ b/textproc/rubygem-liquid/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	liquid
-PORTVERSION=	4.0.1
+PORTVERSION=	4.0.3
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ruby@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library for rendering safe templates
 
 LICENSE=	MIT
diff --git a/textproc/rubygem-liquid/distinfo b/textproc/rubygem-liquid/distinfo
index 6cce4be2ef86..0475b11a35f7 100644
--- a/textproc/rubygem-liquid/distinfo
+++ b/textproc/rubygem-liquid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539426292
-SHA256 (rubygem/liquid-4.0.1.gem) = dc9eb4519c913b4914f621ce9f2ac76534588f4b40ba6fce243a09f97ad5492f
-SIZE (rubygem/liquid-4.0.1.gem) = 72704
+TIMESTAMP = 1567842510
+SHA256 (rubygem/liquid-4.0.3.gem) = 7e15a957fbeb424dec15b52311880524954ce6e384ba9171e21ff98f142c0f7e
+SIZE (rubygem/liquid-4.0.3.gem) = 76288
diff --git a/textproc/rubygem-liquid/pkg-descr b/textproc/rubygem-liquid/pkg-descr
index 2ef98bfeef3c..23220761243f 100644
--- a/textproc/rubygem-liquid/pkg-descr
+++ b/textproc/rubygem-liquid/pkg-descr
@@ -1,4 +1,8 @@
-Ruby library for rendering safe templates which cannot affect the
-security of the server they are rendered on.
+Liquid is an open-source template language created by Shopify and written in
+Ruby. It is the backbone of Shopify themes and is used to load dynamic content
+on storefronts.
 
-WWW: http://www.liquidmarkup.org
+Liquid has been in production use at Shopify since 2006 and is now used by many
+other hosted web applications.
+
+WWW: https://shopify.github.io/liquid/
diff --git a/textproc/rubygem-octopress-escape-code/Makefile b/textproc/rubygem-octopress-escape-code/Makefile
index 483f620834e8..0d29b4a7739d 100644
--- a/textproc/rubygem-octopress-escape-code/Makefile
+++ b/textproc/rubygem-octopress-escape-code/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	octopress-escape-code
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
@@ -11,10 +12,11 @@ COMMENT=	Adds escape sequences for code blocks in Jekyll
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-jekyll>=3.0:www/rubygem-jekyll
+RUN_DEPENDS=	rubygem-jekyll3>=3.0<4:www/rubygem-jekyll3
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-ox/Makefile b/textproc/rubygem-ox/Makefile
index 5267daed2ff6..19dc99f6c77b 100644
--- a/textproc/rubygem-ox/Makefile
+++ b/textproc/rubygem-ox/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ox
 PORTVERSION=	2.10.0
+PORTREVISION=	1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
@@ -13,13 +14,4 @@ LICENSE=	MIT
 USES=		gem
 USE_RUBY=	yes
 
-# The original gem depends on ext/ox/ox.so,
-# but the ext directory is eliminated by FreeBSD's Uses/gem.mk framework.
-# The workaround below is to create symlink lib/ox/ox.so pointing to lib/ox.so.
-
-PLIST_FILES=	${GEM_LIB_DIR}/lib/ox/ox.so
-
-post-install:
-	${LN} -s ../ox.so ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/lib/ox
-
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-ox/files/patch-gemspec b/textproc/rubygem-ox/files/patch-gemspec
deleted file mode 100644
index 2af70f8a92c8..000000000000
--- a/textproc/rubygem-ox/files/patch-gemspec
+++ /dev/null
@@ -1,11 +0,0 @@
---- ox.gemspec.orig	2016-05-23 07:20:09 UTC
-+++ ox.gemspec
-@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
-   s.version = "2.4.1"
- 
-   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
--  s.require_paths = ["lib".freeze, "ext".freeze]
-+  s.require_paths = ["lib".freeze]
-   s.authors = ["Peter Ohler".freeze]
-   s.date = "2016-04-30"
-   s.description = "A fast XML parser and object serializer that uses only standard C lib.\n            \nOptimized XML (Ox), as the name implies was written to provide speed optimized\nXML handling. It was designed to be an alternative to Nokogiri and other Ruby\nXML parsers for generic XML parsing and as an alternative to Marshal for Object\nserialization. ".freeze
diff --git a/textproc/rubygem-sassc/Makefile b/textproc/rubygem-sassc/Makefile
index 6fa203befa96..73edc29eb28d 100644
--- a/textproc/rubygem-sassc/Makefile
+++ b/textproc/rubygem-sassc/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sassc
-PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
@@ -13,17 +12,9 @@ COMMENT=	Use libsass with Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake
-RUN_DEPENDS=	rubygem-ffi>=1.9.6:devel/rubygem-ffi \
-		rubygem-rake>=0:devel/rubygem-rake
-LIB_DEPENDS=	libsass.so:textproc/libsass
+RUN_DEPENDS=	rubygem-ffi>=1.9<2:devel/rubygem-ffi
 
 USES=		gem gmake
 USE_RUBY=	yes
 
-NO_ARCH=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|#{gem_root}/ext/libsass|${LOCALBASE}|g' ${WRKSRC}/lib/sassc/native.rb
-
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-sassc/distinfo b/textproc/rubygem-sassc/distinfo
index 550d9862aa76..592901c5dd04 100644
--- a/textproc/rubygem-sassc/distinfo
+++ b/textproc/rubygem-sassc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557684430
-SHA256 (rubygem/sassc-2.0.1.gem) = 047e9391863429d7f188ab9912c97dbfb8cba87a1a549dfba159739a8b4024eb
-SIZE (rubygem/sassc-2.0.1.gem) = 357888
+TIMESTAMP = 1568290990
+SHA256 (rubygem/sassc-2.2.0.gem) = 6e7e4fe5eae9593c29e5dd6c830b91530b92e044b3d3efa89898fca22a75119d
+SIZE (rubygem/sassc-2.2.0.gem) = 302080
diff --git a/textproc/rubygem-sassc/files/patch-ext-extconf.rb b/textproc/rubygem-sassc/files/patch-ext-extconf.rb
new file mode 100644
index 000000000000..16ed910acb90
--- /dev/null
+++ b/textproc/rubygem-sassc/files/patch-ext-extconf.rb
@@ -0,0 +1,11 @@
+--- ext/extconf.rb.orig	2019-09-07 21:32:44 UTC
++++ ext/extconf.rb
+@@ -28,7 +28,7 @@ end
+ if enable_config('lto', true)
+   $CFLAGS << ' -flto'
+   $CXXFLAGS << ' -flto'
+-  $LDFLAGS << ' -flto'
++  $LDFLAGS << ' -flto -fuse-ld=lld'
+ end
+ 
+ # Disable noisy compilation warnings.
diff --git a/textproc/rubygem-terminal-table/Makefile b/textproc/rubygem-terminal-table/Makefile
index 3aa562fc7e86..f632664770ca 100644
--- a/textproc/rubygem-terminal-table/Makefile
+++ b/textproc/rubygem-terminal-table/Makefile
@@ -10,11 +10,13 @@ MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Simple, feature rich ASCII table generation library
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-unicode-display_width>=1.1.1:devel/rubygem-unicode-display_width
+RUN_DEPENDS=	rubygem-unicode-display_width>=1.1.1<2:devel/rubygem-unicode-display_width
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-terminal-table/pkg-descr b/textproc/rubygem-terminal-table/pkg-descr
index 02dd6fbadaa7..1de9b1f77ee8 100644
--- a/textproc/rubygem-terminal-table/pkg-descr
+++ b/textproc/rubygem-terminal-table/pkg-descr
@@ -1,8 +1,10 @@
-Simple, feature rich ascii table generation library.
+Terminal Table is a fast and simple, yet feature rich ASCII table generator
+written in Ruby.
 
- - Optional headings
- - Alignment of columns, headings, or cells
- - Supports column span
- - Easy modification of table strings (+, -, |)
+Features:
+- Optional headings
+- Alignment of columns, headings, or cells
+- Supports column span
+- Easy modification of table strings (+, -, |)
 
 WWW: https://github.com/tj/terminal-table
diff --git a/textproc/sift/Makefile b/textproc/sift/Makefile
index 259d70e5448d..5279964378dd 100644
--- a/textproc/sift/Makefile
+++ b/textproc/sift/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	sift
 PORTVERSION=	0.9.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -20,8 +20,8 @@ GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 PLIST_FILES=	bin/sift
 
 GH_ACCOUNT=	svent
-GH_TUPLE=	golang:crypto:22d7a77:golang_crypto/../src/golang.org/x/crypto \
-		golang:sys:61b9204:golang_sys/../src/golang.org/x/sys \
+GH_TUPLE=	golang:crypto:71b5226:golang_crypto/../src/golang.org/x/crypto \
+		golang:sys:749cb33:golang_sys/../src/golang.org/x/sys \
 		svent:go-flags:4bcbad3:svent_goflags/../src/github.com/svent/go-flags \
 		svent:go-nbreader:7cef48d:svent_gonbreader/../src/github.com/svent/go-nbreader
 USE_GITHUB=	yes
diff --git a/textproc/sift/distinfo b/textproc/sift/distinfo
index 18ad917dc8f0..e7efb8cb7ab9 100644
--- a/textproc/sift/distinfo
+++ b/textproc/sift/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1555712791
+TIMESTAMP = 1567842456
 SHA256 (svent-sift-v0.9.0_GH0.tar.gz) = bbbd5c472c36b78896cd7ae673749d3943621a6d5523d47973ed2fc6800ae4c8
 SIZE (svent-sift-v0.9.0_GH0.tar.gz) = 37442
-SHA256 (golang-crypto-22d7a77_GH0.tar.gz) = f4841ec4826e71e428a300f2c4990382a68e5a9890876b18f360b3c47404198d
-SIZE (golang-crypto-22d7a77_GH0.tar.gz) = 1685051
-SHA256 (golang-sys-61b9204_GH0.tar.gz) = a73df35a8c64cf371fda32e00519f15614f4dd5f26cd85d7a4598fa80d51d052
-SIZE (golang-sys-61b9204_GH0.tar.gz) = 1418673
+SHA256 (golang-crypto-71b5226_GH0.tar.gz) = 7ab66566a1792bf53b26474bf023d0607e59158af6a1321d94c56de433cb083b
+SIZE (golang-crypto-71b5226_GH0.tar.gz) = 1693011
+SHA256 (golang-sys-749cb33_GH0.tar.gz) = 14cd0776aff1de547c3d2501e985917d5843fbbab11c9f8c2ad7bb2c7a1279a8
+SIZE (golang-sys-749cb33_GH0.tar.gz) = 1468012
 SHA256 (svent-go-flags-4bcbad3_GH0.tar.gz) = 8fb342e5d1ad220c7040a6f185f39a38679f9c88e24716fcc6f2fef2ee09825a
 SIZE (svent-go-flags-4bcbad3_GH0.tar.gz) = 45988
 SHA256 (svent-go-nbreader-7cef48d_GH0.tar.gz) = 62e0248ba434aa54461f554afc532cd5a4393ce55c35fdf750175fa14f997448
diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
index a183c5a74132..92800d50392f 100644
--- a/textproc/sigil/Makefile
+++ b/textproc/sigil/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sigil
-PORTVERSION=	0.9.17
+PORTVERSION=	0.9.18
 CATEGORIES=	textproc
 
 MAINTAINER=	jonc@chen.org.nz
diff --git a/textproc/sigil/distinfo b/textproc/sigil/distinfo
index c89dd23e097e..6e98e4fb9d12 100644
--- a/textproc/sigil/distinfo
+++ b/textproc/sigil/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565486996
-SHA256 (Sigil-Ebook-Sigil-0.9.17_GH0.tar.gz) = 25ef68f979c3daca9b2a869a5ca3919b0a0f965ae2ba176f34ff93a641c3e2b2
-SIZE (Sigil-Ebook-Sigil-0.9.17_GH0.tar.gz) = 21262675
+TIMESTAMP = 1568231108
+SHA256 (Sigil-Ebook-Sigil-0.9.18_GH0.tar.gz) = d4ac2d178fd154d9892fcb552304b20fc12d9eb4b2be5a222c6421c18720cca6
+SIZE (Sigil-Ebook-Sigil-0.9.18_GH0.tar.gz) = 21396185
diff --git a/textproc/sigil/pkg-plist b/textproc/sigil/pkg-plist
index b763180aff62..aca5b2183440 100644
--- a/textproc/sigil/pkg-plist
+++ b/textproc/sigil/pkg-plist
@@ -40,63 +40,6 @@ share/pixmaps/sigil.png
 %%DATADIR%%/hunspell_dictionaries/license.txt
 %%DATADIR%%/plugin_launchers/python/bookcontainer.py
 %%DATADIR%%/plugin_launchers/python/compatibility_utils.py
-%%DATADIR%%/plugin_launchers/python/css_parser/COPYING
-%%DATADIR%%/plugin_launchers/python/css_parser/COPYING.LESSER
-%%DATADIR%%/plugin_launchers/python/css_parser/CSSUTILS_README.txt
-%%DATADIR%%/plugin_launchers/python/css_parser/README.md
-%%DATADIR%%/plugin_launchers/python/css_parser/__init__.py
-%%DATADIR%%/plugin_launchers/python/css_parser/_codec2.py
-%%DATADIR%%/plugin_launchers/python/css_parser/_codec3.py
-%%DATADIR%%/plugin_launchers/python/css_parser/_fetch.py
-%%DATADIR%%/plugin_launchers/python/css_parser/_fetchgae.py
-%%DATADIR%%/plugin_launchers/python/css_parser/codec.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/__init__.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/colors.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/csscharsetrule.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/csscomment.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/cssfontfacerule.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/cssimportrule.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/cssmediarule.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/cssnamespacerule.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/csspagerule.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/cssproperties.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/cssrule.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/cssrulelist.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/cssstyledeclaration.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/cssstylerule.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/cssstylesheet.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/cssunknownrule.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/cssvalue.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/cssvariablesdeclaration.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/cssvariablesrule.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/marginrule.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/property.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/selector.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/selectorlist.py
-%%DATADIR%%/plugin_launchers/python/css_parser/css/value.py
-%%DATADIR%%/plugin_launchers/python/css_parser/cssproductions.py
-%%DATADIR%%/plugin_launchers/python/css_parser/encutils/__init__.py
-%%DATADIR%%/plugin_launchers/python/css_parser/errorhandler.py
-%%DATADIR%%/plugin_launchers/python/css_parser/helper.py
-%%DATADIR%%/plugin_launchers/python/css_parser/parse.py
-%%DATADIR%%/plugin_launchers/python/css_parser/prodparser.py
-%%DATADIR%%/plugin_launchers/python/css_parser/profiles.py
-%%DATADIR%%/plugin_launchers/python/css_parser/sac.py
-%%DATADIR%%/plugin_launchers/python/css_parser/script.py
-%%DATADIR%%/plugin_launchers/python/css_parser/scripts/__init__.py
-%%DATADIR%%/plugin_launchers/python/css_parser/scripts/csscapture.py
-%%DATADIR%%/plugin_launchers/python/css_parser/scripts/csscombine.py
-%%DATADIR%%/plugin_launchers/python/css_parser/scripts/cssparse.py
-%%DATADIR%%/plugin_launchers/python/css_parser/serialize.py
-%%DATADIR%%/plugin_launchers/python/css_parser/settings.py
-%%DATADIR%%/plugin_launchers/python/css_parser/stylesheets/__init__.py
-%%DATADIR%%/plugin_launchers/python/css_parser/stylesheets/medialist.py
-%%DATADIR%%/plugin_launchers/python/css_parser/stylesheets/mediaquery.py
-%%DATADIR%%/plugin_launchers/python/css_parser/stylesheets/stylesheet.py
-%%DATADIR%%/plugin_launchers/python/css_parser/stylesheets/stylesheetlist.py
-%%DATADIR%%/plugin_launchers/python/css_parser/tokenize2.py
-%%DATADIR%%/plugin_launchers/python/css_parser/util.py
-%%DATADIR%%/plugin_launchers/python/css_parser/version.py
 %%DATADIR%%/plugin_launchers/python/epub_utils.py
 %%DATADIR%%/plugin_launchers/python/inputcontainer.py
 %%DATADIR%%/plugin_launchers/python/launcher.py
@@ -308,6 +251,7 @@ share/pixmaps/sigil.png
 %%DATADIR%%/translations/sigil_az.qm
 %%DATADIR%%/translations/sigil_ca.qm
 %%DATADIR%%/translations/sigil_cs.qm
+%%DATADIR%%/translations/sigil_da_DK.qm
 %%DATADIR%%/translations/sigil_de.qm
 %%DATADIR%%/translations/sigil_en.qm
 %%DATADIR%%/translations/sigil_es.qm
@@ -319,6 +263,8 @@ share/pixmaps/sigil.png
 %%DATADIR%%/translations/sigil_pl.qm
 %%DATADIR%%/translations/sigil_ru.qm
 %%DATADIR%%/translations/sigil_sr.qm
+%%DATADIR%%/translations/sigil_sv.qm
 %%DATADIR%%/translations/sigil_th.qm
+%%DATADIR%%/translations/sigil_uk_UA.qm
 %%DATADIR%%/translations/sigil_zh.qm
 %%DATADIR%%/translations/sigil_zh_TW.qm
diff --git a/textproc/stardict-dictd_mova/Makefile b/textproc/stardict-dictd_mova/Makefile
index 8924e1b5b3c5..87cc4c5feb5d 100644
--- a/textproc/stardict-dictd_mova/Makefile
+++ b/textproc/stardict-dictd_mova/Makefile
@@ -5,14 +5,12 @@ PORTNAME=	stardict-dictd_mova
 PORTVERSION=	2.4.2
 PORTREVISION=	8
 CATEGORIES=	textproc
-MASTER_SITES=	http://abloz.com/huzheng/stardict-dic/mova.org/
+MASTER_SITES=	http://download.huzheng.org/mova.org/
 DIST_SUBDIR=	stardict
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dictionaries from www.mova.org for StarDict
 
-BROKEN=		unfetchable
-
 NO_BUILD=	yes
 NO_ARCH=	yes
 USES=		tar:bzip2
diff --git a/textproc/stardict-quick/Makefile b/textproc/stardict-quick/Makefile
index 43b73163ad6f..21ada15864c1 100644
--- a/textproc/stardict-quick/Makefile
+++ b/textproc/stardict-quick/Makefile
@@ -5,14 +5,12 @@ PORTNAME=	stardict-quick
 PORTVERSION=	2.4.2
 PORTREVISION=	9
 CATEGORIES=	textproc
-MASTER_SITES=	http://abloz.com/huzheng/stardict-dic/Quick/
+MASTER_SITES=	http://download.huzheng.org/Quick/
 DIST_SUBDIR=	stardict
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dictionaries from Quick for StarDict
 
-BROKEN=		unfetchable
-
 NO_BUILD=	yes
 NO_ARCH=	yes
 USES=		tar:bzip2
diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index 256903bcf390..3ae7c25db8fb 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xml2rfc
-PORTVERSION=	2.26.0
+PORTVERSION=	2.27.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://tools.ietf.org/tools/xml2rfc2/cli/
 
diff --git a/textproc/xml2rfc/distinfo b/textproc/xml2rfc/distinfo
index b2c79e39d42b..1fb13506cf40 100644
--- a/textproc/xml2rfc/distinfo
+++ b/textproc/xml2rfc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567785453
-SHA256 (xml2rfc-2.26.0.tar.gz) = 89bd9baea8d9c1c4f0a9c4eaf12b9fbe1b1996e1923254d140cbe595b56d9559
-SIZE (xml2rfc-2.26.0.tar.gz) = 3910653
+TIMESTAMP = 1568128813
+SHA256 (xml2rfc-2.27.0.tar.gz) = ae53b83c00396e9e03a4d854512fa2385fc2ab2a125837c8e06c81d8ff09ae04
+SIZE (xml2rfc-2.27.0.tar.gz) = 3920130
diff --git a/www/Makefile b/www/Makefile
index 539f056d0cf7..0288ff431d30 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -200,6 +200,7 @@
     SUBDIR += gitlab-pages
     SUBDIR += gitlab-workhorse
     SUBDIR += glassfish
+    SUBDIR += glassfish5
     SUBDIR += glpi
     SUBDIR += gnome-user-share
     SUBDIR += go-appengine-sdk
@@ -1444,6 +1445,7 @@
     SUBDIR += py-amf
     SUBDIR += py-apachelog
     SUBDIR += py-arxiv
+    SUBDIR += py-asgiref
     SUBDIR += py-autobahn
     SUBDIR += py-aws-requests-auth
     SUBDIR += py-azure-common
@@ -2061,6 +2063,7 @@
     SUBDIR += rubygem-jekyll
     SUBDIR += rubygem-jekyll-sanity
     SUBDIR += rubygem-jekyll-watch
+    SUBDIR += rubygem-jekyll3
     SUBDIR += rubygem-journey
     SUBDIR += rubygem-jquery-atwho-rails
     SUBDIR += rubygem-jquery-rails
diff --git a/www/cplanet/Makefile b/www/cplanet/Makefile
index 92e4f9b320c5..57a5a2c43957 100644
--- a/www/cplanet/Makefile
+++ b/www/cplanet/Makefile
@@ -9,12 +9,13 @@ MASTER_SITES=	http://files.etoilebsd.net/cplanet/
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	RSS Feed Aggregator that generate static html
 
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/libneo_cs.a:www/clearsilver
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libcurl.so:ftp/curl
 
-LICENSE=	BSD2CLAUSE
-
 OPTIONS_DEFINE=	EXAMPLES
 
 do-install:
diff --git a/www/cplanet/pkg-descr b/www/cplanet/pkg-descr
index 103d9468b9f3..6397286897f7 100644
--- a/www/cplanet/pkg-descr
+++ b/www/cplanet/pkg-descr
@@ -1,4 +1,4 @@
 cplanet is a RSS/ATOM feed aggregator written in C that generate static
 html files.
 
-WWW: http://fossil.etoilebsd.net/cplanet
+WWW: https://fossil.etoilebsd.net/cplanet/
diff --git a/www/ddgr/Makefile b/www/ddgr/Makefile
index 2b45cd42ddd1..e15675450aea 100644
--- a/www/ddgr/Makefile
+++ b/www/ddgr/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ddgr
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR}
 USE_GITHUB=	yes
 GH_ACCOUNT=	jarun
 
-USES=		python:3.4+ shebangfix
+USES=		python:3.5+ shebangfix
 SHEBANG_FILES=	${PORTNAME}
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/www/ddgr/distinfo b/www/ddgr/distinfo
index f92116604e8d..d03b03002e41 100644
--- a/www/ddgr/distinfo
+++ b/www/ddgr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542460000
-SHA256 (jarun-ddgr-v1.6_GH0.tar.gz) = eae7ff1ab44dfda168a8bbe46593e80ca4a26ab45a9efbab13e6f466349e0e5c
-SIZE (jarun-ddgr-v1.6_GH0.tar.gz) = 42933
+TIMESTAMP = 1567801297
+SHA256 (jarun-ddgr-v1.7_GH0.tar.gz) = 1e3d01dc71337b2a59b96ab89ee422a7ef9e6ddcd42813ac08d57db194bc4fea
+SIZE (jarun-ddgr-v1.7_GH0.tar.gz) = 43838
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 431d27725781..f5d6da8cc5da 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	68.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
diff --git a/www/firefox-esr/files/patch-cubeb-dlopen b/www/firefox-esr/files/patch-cubeb-dlopen
new file mode 100644
index 000000000000..9314ede79256
--- /dev/null
+++ b/www/firefox-esr/files/patch-cubeb-dlopen
@@ -0,0 +1,793 @@
+https://github.com/kinetiknz/cubeb/pull/539
+
+diff --git media/libcubeb/gtest/moz.build media/libcubeb/gtest/moz.build
+index 1ff0c02545251..ca364d1ef7845 100644
+--- media/libcubeb/gtest/moz.build
++++ media/libcubeb/gtest/moz.build
+@@ -67,13 +67,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
+       '-framework CoreFoundation',
+       '-framework AudioToolbox',
+     ]
+-elif CONFIG['OS_TARGET'] == 'OpenBSD':
+-    OS_LIBS += [
+-        'sndio',
+-    ]
+-else:
+-    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+-    OS_LIBS += CONFIG['MOZ_PULSEAUDIO_LIBS']
+ 
+ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
+     CXXFLAGS += ['-Wno-error=shadow']
+diff --git media/libcubeb/src/cubeb.c media/libcubeb/src/cubeb.c
+index 98a735f..db294b3 100644
+--- media/libcubeb/src/cubeb.c
++++ media/libcubeb/src/cubeb.c
+@@ -180,6 +180,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
+ #if defined(USE_JACK)
+     jack_init,
+ #endif
++#if defined(USE_SNDIO)
++    sndio_init,
++#endif
+ #if defined(USE_ALSA)
+     alsa_init,
+ #endif
+@@ -192,9 +195,6 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
+ #if defined(USE_WINMM)
+     winmm_init,
+ #endif
+-#if defined(USE_SNDIO)
+-    sndio_init,
+-#endif
+ #if defined(USE_OPENSL)
+     opensl_init,
+ #endif
+diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c
+index bfd4d8f..a29eed0 100644
+--- media/libcubeb/src/cubeb_alsa.c
++++ media/libcubeb/src/cubeb_alsa.c
+@@ -14,10 +14,58 @@
+ #include <limits.h>
+ #include <poll.h>
+ #include <unistd.h>
++#include <dlfcn.h>
+ #include <alsa/asoundlib.h>
+ #include "cubeb/cubeb.h"
+ #include "cubeb-internal.h"
+ 
++#ifdef DISABLE_LIBASOUND_DLOPEN
++#define WRAP(x) x
++#else
++#define WRAP(x) cubeb_##x
++#define LIBASOUND_API_VISIT(X)                   \
++  X(snd_config)                                  \
++  X(snd_config_add)                              \
++  X(snd_config_copy)                             \
++  X(snd_config_delete)                           \
++  X(snd_config_get_id)                           \
++  X(snd_config_get_string)                       \
++  X(snd_config_imake_integer)                    \
++  X(snd_config_search)                           \
++  X(snd_config_search_definition)                \
++  X(snd_lib_error_set_handler)                   \
++  X(snd_pcm_avail_update)                        \
++  X(snd_pcm_close)                               \
++  X(snd_pcm_delay)                               \
++  X(snd_pcm_drain)                               \
++  X(snd_pcm_frames_to_bytes)                     \
++  X(snd_pcm_get_params)                          \
++  X(snd_pcm_hw_params_any)                       \
++  X(snd_pcm_hw_params_get_channels_max)          \
++  X(snd_pcm_hw_params_get_rate)                  \
++  X(snd_pcm_hw_params_set_rate_near)             \
++  X(snd_pcm_hw_params_sizeof)                    \
++  X(snd_pcm_nonblock)                            \
++  X(snd_pcm_open)                                \
++  X(snd_pcm_open_lconf)                          \
++  X(snd_pcm_pause)                               \
++  X(snd_pcm_poll_descriptors)                    \
++  X(snd_pcm_poll_descriptors_count)              \
++  X(snd_pcm_poll_descriptors_revents)            \
++  X(snd_pcm_readi)                               \
++  X(snd_pcm_recover)                             \
++  X(snd_pcm_set_params)                          \
++  X(snd_pcm_start)                               \
++  X(snd_pcm_state)                               \
++  X(snd_pcm_writei)                              \
++
++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x;
++LIBASOUND_API_VISIT(MAKE_TYPEDEF);
++#undef MAKE_TYPEDEF
++/* snd_pcm_hw_params_alloca is actually a macro */
++#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof
++#endif
++
+ #define CUBEB_STREAM_MAX 16
+ #define CUBEB_WATCHDOG_MS 10000
+ 
+@@ -36,6 +84,7 @@ static struct cubeb_ops const alsa_ops;
+ 
+ struct cubeb {
+   struct cubeb_ops const * ops;
++  void * libasound;
+ 
+   pthread_t thread;
+ 
+@@ -245,8 +294,8 @@ set_timeout(struct timeval * timeout, unsigned int ms)
+ static void
+ stream_buffer_decrement(cubeb_stream * stm, long count)
+ {
+-  char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count);
+-  memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count));
++  char * bufremains = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count);
++  memmove(stm->buffer, bufremains, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes - count));
+   stm->bufframes -= count;
+ }
+ 
+@@ -278,9 +327,9 @@ alsa_process_stream(cubeb_stream * stm)
+   /* Call _poll_descriptors_revents() even if we don't use it
+      to let underlying plugins clear null events.  Otherwise poll()
+      may wake up again and again, producing unnecessary CPU usage. */
+-  snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents);
++  WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents);
+ 
+-  avail = snd_pcm_avail_update(stm->pcm);
++  avail = WRAP(snd_pcm_avail_update)(stm->pcm);
+ 
+   /* Got null event? Bail and wait for another wakeup. */
+   if (avail == 0) {
+@@ -303,7 +352,7 @@ alsa_process_stream(cubeb_stream * stm)
+       // TODO: should it be marked as DRAINING?
+     }
+ 
+-    got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail);
++    got = WRAP(snd_pcm_readi)(stm->pcm, stm->buffer+stm->bufframes, avail);
+ 
+     if (got < 0) {
+       avail = got; // the error handler below will recover us
+@@ -347,7 +396,7 @@ alsa_process_stream(cubeb_stream * stm)
+       (!stm->other_stream || stm->other_stream->bufframes > 0)) {
+     long got = avail - stm->bufframes;
+     void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL;
+-    char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);
++    char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
+ 
+     /* Correct read size to the other stream available frames */
+     if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) {
+@@ -374,8 +423,8 @@ alsa_process_stream(cubeb_stream * stm)
+     long drain_frames = avail - stm->bufframes;
+     double drain_time = (double) drain_frames / stm->params.rate;
+ 
+-    char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);
+-    memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames));
++    char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
++    memset(buftail, 0, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, drain_frames));
+     stm->bufframes = avail;
+ 
+     /* Mark as draining, unless we're waiting for capture */
+@@ -402,7 +451,7 @@ alsa_process_stream(cubeb_stream * stm)
+       }
+     }
+ 
+-    wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail);
++    wrote = WRAP(snd_pcm_writei)(stm->pcm, stm->buffer, avail);
+     if (wrote < 0) {
+       avail = wrote; // the error handler below will recover us
+     } else {
+@@ -415,13 +464,13 @@ alsa_process_stream(cubeb_stream * stm)
+ 
+   /* Got some error? Let's try to recover the stream. */
+   if (avail < 0) {
+-    avail = snd_pcm_recover(stm->pcm, avail, 0);
++    avail = WRAP(snd_pcm_recover)(stm->pcm, avail, 0);
+ 
+     /* Capture pcm must be started after initial setup/recover */
+     if (avail >= 0 &&
+         stm->stream_type == SND_PCM_STREAM_CAPTURE &&
+-        snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {
+-      avail = snd_pcm_start(stm->pcm);
++        WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) {
++      avail = WRAP(snd_pcm_start)(stm->pcm);
+     }
+   }
+ 
+@@ -537,26 +586,26 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm)
+ 
+   slave_def = NULL;
+ 
+-  r = snd_config_search(root_pcm, "slave", &slave_pcm);
++  r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm);
+   if (r < 0) {
+     return NULL;
+   }
+ 
+-  r = snd_config_get_string(slave_pcm, &string);
++  r = WRAP(snd_config_get_string)(slave_pcm, &string);
+   if (r >= 0) {
+-    r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def);
++    r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def);
+     if (r < 0) {
+       return NULL;
+     }
+   }
+ 
+   do {
+-    r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
++    r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string);
++    r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -565,7 +614,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm)
+     if (r < 0 || r > (int) sizeof(node_name)) {
+       break;
+     }
+-    r = snd_config_search(lconf, node_name, &pcm);
++    r = WRAP(snd_config_search)(lconf, node_name, &pcm);
+     if (r < 0) {
+       break;
+     }
+@@ -574,7 +623,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm)
+   } while (0);
+ 
+   if (slave_def) {
+-    snd_config_delete(slave_def);
++    WRAP(snd_config_delete)(slave_def);
+   }
+ 
+   return NULL;
+@@ -597,22 +646,22 @@ init_local_config_with_workaround(char const * pcm_name)
+ 
+   lconf = NULL;
+ 
+-  if (snd_config == NULL) {
++  if (*WRAP(snd_config) == NULL) {
+     return NULL;
+   }
+ 
+-  r = snd_config_copy(&lconf, snd_config);
++  r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config));
+   if (r < 0) {
+     return NULL;
+   }
+ 
+   do {
+-    r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node);
++    r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_id(pcm_node, &string);
++    r = WRAP(snd_config_get_id)(pcm_node, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -621,7 +670,7 @@ init_local_config_with_workaround(char const * pcm_name)
+     if (r < 0 || r > (int) sizeof(node_name)) {
+       break;
+     }
+-    r = snd_config_search(lconf, node_name, &pcm_node);
++    r = WRAP(snd_config_search)(lconf, node_name, &pcm_node);
+     if (r < 0) {
+       break;
+     }
+@@ -632,12 +681,12 @@ init_local_config_with_workaround(char const * pcm_name)
+     }
+ 
+     /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
+-    r = snd_config_search(pcm_node, "type", &node);
++    r = WRAP(snd_config_search)(pcm_node, "type", &node);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_string(node, &string);
++    r = WRAP(snd_config_get_string)(node, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -648,18 +697,18 @@ init_local_config_with_workaround(char const * pcm_name)
+ 
+     /* Don't clobber an explicit existing handle_underrun value, set it only
+        if it doesn't already exist. */
+-    r = snd_config_search(pcm_node, "handle_underrun", &node);
++    r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node);
+     if (r != -ENOENT) {
+       break;
+     }
+ 
+     /* Disable pcm_pulse's asynchronous underrun handling. */
+-    r = snd_config_imake_integer(&node, "handle_underrun", 0);
++    r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_add(pcm_node, node);
++    r = WRAP(snd_config_add)(pcm_node, node);
+     if (r < 0) {
+       break;
+     }
+@@ -667,7 +716,7 @@ init_local_config_with_workaround(char const * pcm_name)
+     return lconf;
+   } while (0);
+ 
+-  snd_config_delete(lconf);
++  WRAP(snd_config_delete)(lconf);
+ 
+   return NULL;
+ }
+@@ -679,9 +728,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, char const * pcm_name, snd_pcm_stream_t s
+ 
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+   if (local_config) {
+-    r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);
++    r = WRAP(snd_pcm_open_lconf)(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);
+   } else {
+-    r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK);
++    r = WRAP(snd_pcm_open)(pcm, pcm_name, stream, SND_PCM_NONBLOCK);
+   }
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+ 
+@@ -694,7 +743,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
+   int r;
+ 
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+-  r = snd_pcm_close(pcm);
++  r = WRAP(snd_pcm_close)(pcm);
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+ 
+   return r;
+@@ -750,6 +799,7 @@ silent_error_handler(char const * file, int line, char const * function,
+ alsa_init(cubeb ** context, char const * context_name)
+ {
+   (void)context_name;
++  void * libasound = NULL;
+   cubeb * ctx;
+   int r;
+   int i;
+@@ -760,9 +810,27 @@ alsa_init(cubeb ** context, char const * context_name)
+   assert(context);
+   *context = NULL;
+ 
++#ifndef DISABLE_LIBASOUND_DLOPEN
++  libasound = dlopen("libasound.so", RTLD_LAZY);
++  if (!libasound) {
++    return CUBEB_ERROR;
++  }
++
++#define LOAD(x) {                               \
++    cubeb_##x = dlsym(libasound, #x);            \
++    if (!cubeb_##x) {                           \
++      dlclose(libasound);                        \
++      return CUBEB_ERROR;                       \
++    }                                           \
++  }
++
++  LIBASOUND_API_VISIT(LOAD);
++#undef LOAD
++#endif
++
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+   if (!cubeb_alsa_error_handler_set) {
+-    snd_lib_error_set_handler(silent_error_handler);
++    WRAP(snd_lib_error_set_handler)(silent_error_handler);
+     cubeb_alsa_error_handler_set = 1;
+   }
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+@@ -771,6 +839,7 @@ alsa_init(cubeb ** context, char const * context_name)
+   assert(ctx);
+ 
+   ctx->ops = &alsa_ops;
++  ctx->libasound = libasound;
+ 
+   r = pthread_mutex_init(&ctx->mutex, NULL);
+   assert(r == 0);
+@@ -819,7 +888,7 @@ alsa_init(cubeb ** context, char const * context_name)
+        config fails with EINVAL, the PA PCM is too old for this workaround. */
+     if (r == -EINVAL) {
+       pthread_mutex_lock(&cubeb_alsa_mutex);
+-      snd_config_delete(ctx->local_config);
++      WRAP(snd_config_delete)(ctx->local_config);
+       pthread_mutex_unlock(&cubeb_alsa_mutex);
+       ctx->local_config = NULL;
+     } else if (r >= 0) {
+@@ -861,10 +930,14 @@ alsa_destroy(cubeb * ctx)
+ 
+   if (ctx->local_config) {
+     pthread_mutex_lock(&cubeb_alsa_mutex);
+-    snd_config_delete(ctx->local_config);
++    WRAP(snd_config_delete)(ctx->local_config);
+     pthread_mutex_unlock(&cubeb_alsa_mutex);
+   }
+ 
++  if (ctx->libasound) {
++    dlclose(ctx->libasound);
++  }
++
+   free(ctx);
+ }
+ 
+@@ -948,7 +1021,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_nonblock(stm->pcm, 1);
++  r = WRAP(snd_pcm_nonblock)(stm->pcm, 1);
+   assert(r == 0);
+ 
+   latency_us = latency_frames * 1e6 / stm->params.rate;
+@@ -961,7 +1034,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream
+     latency_us = latency_us < min_latency ? min_latency: latency_us;
+   }
+ 
+-  r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
++  r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
+                          stm->params.channels, stm->params.rate, 1,
+                          latency_us);
+   if (r < 0) {
+@@ -969,20 +1042,20 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream
+     return CUBEB_ERROR_INVALID_FORMAT;
+   }
+ 
+-  r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size);
++  r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size);
+   assert(r == 0);
+ 
+   /* Double internal buffer size to have enough space when waiting for the other side of duplex connection */
+   stm->buffer_size *= 2;
+-  stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size));
++  stm->buffer = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->buffer_size));
+   assert(stm->buffer);
+ 
+-  stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm);
++  stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm);
+   assert(stm->nfds > 0);
+ 
+   stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd));
+   assert(stm->saved_fds);
+-  r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds);
++  r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds);
+   assert((nfds_t) r == stm->nfds);
+ 
+   if (alsa_register_stream(ctx, stm) != 0) {
+@@ -1054,7 +1127,7 @@ alsa_stream_destroy(cubeb_stream * stm)
+   pthread_mutex_lock(&stm->mutex);
+   if (stm->pcm) {
+     if (stm->state == DRAINING) {
+-      snd_pcm_drain(stm->pcm);
++      WRAP(snd_pcm_drain)(stm->pcm);
+     }
+     alsa_locked_pcm_close(stm->pcm);
+     stm->pcm = NULL;
+@@ -1100,12 +1173,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels)
+ 
+   assert(stm);
+ 
+-  r = snd_pcm_hw_params_any(stm->pcm, hw_params);
++  r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
+   if (r < 0) {
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels);
++  r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels);
+   if (r < 0) {
+     return CUBEB_ERROR;
+   }
+@@ -1126,34 +1199,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) {
+ 
+   /* get a pcm, disabling resampling, so we get a rate the
+    * hardware/dmix/pulse/etc. supports. */
+-  r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE);
++  r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE);
+   if (r < 0) {
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_hw_params_any(pcm, hw_params);
++  r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params);
+   if (r < 0) {
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir);
++  r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir);
+   if (r >= 0) {
+     /* There is a default rate: use it. */
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_OK;
+   }
+ 
+   /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */
+   *rate = 44100;
+ 
+-  r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL);
++  r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL);
+   if (r < 0) {
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_ERROR;
+   }
+ 
+-  snd_pcm_close(pcm);
++  WRAP(snd_pcm_close)(pcm);
+ 
+   return CUBEB_OK;
+ }
+@@ -1186,10 +1259,10 @@ alsa_stream_start(cubeb_stream * stm)
+   pthread_mutex_lock(&stm->mutex);
+   /* Capture pcm must be started after initial setup/recover */
+   if (stm->stream_type == SND_PCM_STREAM_CAPTURE &&
+-      snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {
+-    snd_pcm_start(stm->pcm);
++      WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) {
++    WRAP(snd_pcm_start)(stm->pcm);
+   }
+-  snd_pcm_pause(stm->pcm, 0);
++  WRAP(snd_pcm_pause)(stm->pcm, 0);
+   gettimeofday(&stm->last_activity, NULL);
+   pthread_mutex_unlock(&stm->mutex);
+ 
+@@ -1229,7 +1302,7 @@ alsa_stream_stop(cubeb_stream * stm)
+   pthread_mutex_unlock(&ctx->mutex);
+ 
+   pthread_mutex_lock(&stm->mutex);
+-  snd_pcm_pause(stm->pcm, 1);
++  WRAP(snd_pcm_pause)(stm->pcm, 1);
+   pthread_mutex_unlock(&stm->mutex);
+ 
+   return CUBEB_OK;
+@@ -1245,8 +1318,8 @@ alsa_stream_get_position(cubeb_stream * stm, uint64_t * position)
+   pthread_mutex_lock(&stm->mutex);
+ 
+   delay = -1;
+-  if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING ||
+-      snd_pcm_delay(stm->pcm, &delay) != 0) {
++  if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING ||
++      WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) {
+     *position = stm->last_position;
+     pthread_mutex_unlock(&stm->mutex);
+     return CUBEB_OK;
+@@ -1271,7 +1344,7 @@ alsa_stream_get_latency(cubeb_stream * stm, uint32_t * latency)
+   snd_pcm_sframes_t delay;
+   /* This function returns the delay in frames until a frame written using
+      snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */
+-  if (snd_pcm_delay(stm->pcm, &delay)) {
++  if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) {
+     return CUBEB_ERROR;
+   }
+ 
+diff --git media/libcubeb/src/cubeb_sndio.c media/libcubeb/src/cubeb_sndio.c
+index 9e99b2c..0559af4 100644
+--- media/libcubeb/src/cubeb_sndio.c
++++ media/libcubeb/src/cubeb_sndio.c
+@@ -12,6 +12,7 @@
+ #include <stdbool.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <dlfcn.h>
+ #include <assert.h>
+ #include "cubeb/cubeb.h"
+ #include "cubeb-internal.h"
+@@ -22,10 +23,35 @@
+ #define DPR(...) do {} while(0)
+ #endif
+ 
++#ifdef DISABLE_LIBSNDIO_DLOPEN
++#define WRAP(x) x
++#else
++#define WRAP(x) cubeb_##x
++#define LIBSNDIO_API_VISIT(X)                   \
++  X(sio_close)                               \
++  X(sio_eof)                                 \
++  X(sio_getpar)                              \
++  X(sio_initpar)                             \
++  X(sio_onmove)                              \
++  X(sio_open)                                \
++  X(sio_pollfd)                              \
++  X(sio_read)                                \
++  X(sio_revents)                             \
++  X(sio_setpar)                              \
++  X(sio_start)                               \
++  X(sio_stop)                                \
++  X(sio_write)                               \
++
++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x;
++LIBSNDIO_API_VISIT(MAKE_TYPEDEF);
++#undef MAKE_TYPEDEF
++#endif
++
+ static struct cubeb_ops const sndio_ops;
+ 
+ struct cubeb {
+   struct cubeb_ops const * ops;
++  void * libsndio;
+ };
+ 
+ struct cubeb_stream {
+@@ -119,7 +145,7 @@ sndio_mainloop(void *arg)
+   DPR("sndio_mainloop()\n");
+   s->state_cb(s, s->arg, CUBEB_STATE_STARTED);
+   pthread_mutex_lock(&s->mtx);
+-  if (!sio_start(s->hdl)) {
++  if (!WRAP(sio_start)(s->hdl)) {
+     pthread_mutex_unlock(&s->mtx);
+     return NULL;
+   }
+@@ -203,7 +229,7 @@ sndio_mainloop(void *arg)
+       events |= POLLIN;
+     if ((s->mode & SIO_PLAY) && pstart < pend)
+       events |= POLLOUT;
+-    nfds = sio_pollfd(s->hdl, pfds, events);
++    nfds = WRAP(sio_pollfd)(s->hdl, pfds, events);
+ 
+     if (nfds > 0) {
+       pthread_mutex_unlock(&s->mtx);
+@@ -213,7 +239,7 @@ sndio_mainloop(void *arg)
+         continue;
+     }
+ 
+-    revents = sio_revents(s->hdl, pfds);
++    revents = WRAP(sio_revents)(s->hdl, pfds);
+ 
+     if (revents & POLLHUP) {
+       state = CUBEB_STATE_ERROR;
+@@ -221,8 +247,8 @@ sndio_mainloop(void *arg)
+     }
+ 
+     if (revents & POLLOUT) {
+-      n = sio_write(s->hdl, s->pbuf + pstart, pend - pstart);
+-      if (n == 0 && sio_eof(s->hdl)) {
++      n = WRAP(sio_write)(s->hdl, s->pbuf + pstart, pend - pstart);
++      if (n == 0 && WRAP(sio_eof)(s->hdl)) {
+         DPR("sndio_mainloop() werr\n");
+         state = CUBEB_STATE_ERROR;
+         break;
+@@ -231,8 +257,8 @@ sndio_mainloop(void *arg)
+     }
+ 
+     if (revents & POLLIN) {
+-      n = sio_read(s->hdl, s->rbuf + rstart, rend - rstart);
+-      if (n == 0 && sio_eof(s->hdl)) {
++      n = WRAP(sio_read)(s->hdl, s->rbuf + rstart, rend - rstart);
++      if (n == 0 && WRAP(sio_eof)(s->hdl)) {
+         DPR("sndio_mainloop() rerr\n");
+         state = CUBEB_STATE_ERROR;
+         break;
+@@ -244,7 +270,7 @@ sndio_mainloop(void *arg)
+     if (prime > 0 && (s->mode & SIO_REC))
+       rstart = rend;
+   }
+-  sio_stop(s->hdl);
++  WRAP(sio_stop)(s->hdl);
+   s->hwpos = s->swpos;
+   pthread_mutex_unlock(&s->mtx);
+   s->state_cb(s, s->arg, state);
+@@ -254,8 +280,31 @@ sndio_mainloop(void *arg)
+ /*static*/ int
+ sndio_init(cubeb **context, char const *context_name)
+ {
++  void * libsndio = NULL;
++
++#ifndef DISABLE_LIBSNDIO_DLOPEN
++  libsndio = dlopen("libsndio.so", RTLD_LAZY);
++  if (!libsndio) {
++    DPR("sndio_init(%s) failed dlopen(libsndio.so)\n", context_name);
++    return CUBEB_ERROR;
++  }
++
++#define LOAD(x) {                               \
++    cubeb_##x = dlsym(libsndio, #x);            \
++    if (!cubeb_##x) {                           \
++      DPR("sndio_init(%s) failed dlsym(%s)\n", context_name, #x); \
++      dlclose(libsndio);                        \
++      return CUBEB_ERROR;                       \
++    }                                           \
++  }
++
++  LIBSNDIO_API_VISIT(LOAD);
++#undef LOAD
++#endif
++
+   DPR("sndio_init(%s)\n", context_name);
+   *context = malloc(sizeof(*context));
++  (*context)->libsndio = libsndio;
+   (*context)->ops = &sndio_ops;
+   (void)context_name;
+   return CUBEB_OK;
+@@ -271,6 +320,8 @@ static void
+ sndio_destroy(cubeb *context)
+ {
+   DPR("sndio_destroy()\n");
++  if (context->libsndio)
++    dlclose(context->libsndio);
+   free(context);
+ }
+ 
+@@ -323,12 +374,12 @@ sndio_stream_init(cubeb * context,
+     goto err;
+   }
+   s->context = context;
+-  s->hdl = sio_open(NULL, s->mode, 1);
++  s->hdl = WRAP(sio_open)(NULL, s->mode, 1);
+   if (s->hdl == NULL) {
+     DPR("sndio_stream_init(), sio_open() failed\n");
+     goto err;
+   }
+-  sio_initpar(&wpar);
++  WRAP(sio_initpar)(&wpar);
+   wpar.sig = 1;
+   wpar.bits = 16;
+   switch (format) {
+@@ -351,7 +402,7 @@ sndio_stream_init(cubeb * context,
+   if (s->mode & SIO_PLAY)
+     wpar.pchan = output_stream_params->channels;
+   wpar.appbufsz = latency_frames;
+-  if (!sio_setpar(s->hdl, &wpar) || !sio_getpar(s->hdl, &rpar)) {
++  if (!WRAP(sio_setpar)(s->hdl, &wpar) || !WRAP(sio_getpar)(s->hdl, &rpar)) {
+     DPR("sndio_stream_init(), sio_setpar() failed\n");
+     goto err;
+   }
+@@ -362,7 +413,7 @@ sndio_stream_init(cubeb * context,
+     DPR("sndio_stream_init() unsupported params\n");
+     goto err;
+   }
+-  sio_onmove(s->hdl, sndio_onmove, s);
++  WRAP(sio_onmove)(s->hdl, sndio_onmove, s);
+   s->active = 0;
+   s->nfr = rpar.round;
+   s->rbpf = rpar.bps * rpar.rchan;
+@@ -400,7 +451,7 @@ sndio_stream_init(cubeb * context,
+   return CUBEB_OK;
+ err:
+   if (s->hdl)
+-    sio_close(s->hdl);
++    WRAP(sio_close)(s->hdl);
+   if (s->pbuf)
+     free(s->pbuf);
+   if (s->rbuf)
+@@ -446,7 +497,7 @@ static void
+ sndio_stream_destroy(cubeb_stream *s)
+ {
+   DPR("sndio_stream_destroy()\n");
+-  sio_close(s->hdl);
++  WRAP(sio_close)(s->hdl);
+   if (s->mode & SIO_PLAY)
+     free(s->pbuf);
+   if (s->mode & SIO_REC)
+diff --git toolkit/library/moz.build toolkit/library/moz.build
+index 8ce595ff96bff..c318e96a1fdfc 100644
+--- toolkit/library/moz.build
++++ toolkit/library/moz.build
+@@ -231,9 +231,6 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
+ if not CONFIG['MOZ_TREE_PIXMAN']:
+     OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
+ 
+-if CONFIG['MOZ_ALSA']:
+-    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+-
+ if CONFIG['HAVE_CLOCK_MONOTONIC']:
+     OS_LIBS += CONFIG['REALTIME_LIBS']
+ 
+@@ -242,11 +239,6 @@ OS_LIBS += CONFIG['ICONV_LIBS']
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
+     OS_LIBS += CONFIG['TK_LIBS']
+ 
+-if CONFIG['OS_ARCH'] == 'OpenBSD':
+-    OS_LIBS += [
+-        'sndio',
+-    ]
+-
+ if CONFIG['MOZ_ENABLE_DBUS']:
+     OS_LIBS += CONFIG['MOZ_DBUS_GLIB_LIBS']
+ 
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index bbebd5046f32..dcfef1de663e 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	69.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options
index cbb4e78f5a7e..bdf91ec17c4f 100644
--- a/www/firefox/Makefile.options
+++ b/www/firefox/Makefile.options
@@ -4,13 +4,10 @@ OPTIONS_DEFINE+= 	CANBERRA DBUS DEBUG FFMPEG GCONF \
 			LIBPROXY OPTIMIZED_CFLAGS PROFILE TEST
 
 OPTIONS_DEFAULT+=	DBUS FFMPEG GCONF OPTIMIZED_CFLAGS PROFILE \
-			${OPTIONS_MULTI_AUDIO:NSNDIO}
+			${OPTIONS_GROUP_AUDIO}
 
-OPTIONS_MULTI+=		AUDIO
-OPTIONS_MULTI_AUDIO=	ALSA JACK PULSEAUDIO SNDIO
-
-# WebRTC legacy audio library only supports ALSA and PulseAudio
-JACK_IMPLIES=		ALSA
+OPTIONS_GROUP+=		AUDIO
+OPTIONS_GROUP_AUDIO=	ALSA JACK PULSEAUDIO SNDIO
 
 CANBERRA_DESC?=		Sound theme alerts
 LIBPROXY_DESC?=		Proxy support via libproxy
diff --git a/www/firefox/files/patch-cubeb-dlopen b/www/firefox/files/patch-cubeb-dlopen
new file mode 100644
index 000000000000..cdf25e433802
--- /dev/null
+++ b/www/firefox/files/patch-cubeb-dlopen
@@ -0,0 +1,793 @@
+https://github.com/kinetiknz/cubeb/pull/539
+
+diff --git media/libcubeb/gtest/moz.build media/libcubeb/gtest/moz.build
+index 1ff0c02545251..ca364d1ef7845 100644
+--- media/libcubeb/gtest/moz.build
++++ media/libcubeb/gtest/moz.build
+@@ -67,13 +67,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
+       '-framework CoreFoundation',
+       '-framework AudioToolbox',
+     ]
+-elif CONFIG['OS_TARGET'] == 'OpenBSD':
+-    OS_LIBS += [
+-        'sndio',
+-    ]
+-else:
+-    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+-    OS_LIBS += CONFIG['MOZ_PULSEAUDIO_LIBS']
+ 
+ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
+     CXXFLAGS += ['-Wno-error=shadow']
+diff --git media/libcubeb/src/cubeb.c media/libcubeb/src/cubeb.c
+index 422f7c6..caac869 100644
+--- media/libcubeb/src/cubeb.c
++++ media/libcubeb/src/cubeb.c
+@@ -194,6 +194,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
+ #if defined(USE_JACK)
+     jack_init,
+ #endif
++#if defined(USE_SNDIO)
++    sndio_init,
++#endif
+ #if defined(USE_ALSA)
+     alsa_init,
+ #endif
+@@ -209,9 +212,6 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
+ #if defined(USE_WINMM)
+     winmm_init,
+ #endif
+-#if defined(USE_SNDIO)
+-    sndio_init,
+-#endif
+ #if defined(USE_SUN)
+     sun_init,
+ #endif
+diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c
+index bfd4d8f..a29eed0 100644
+--- media/libcubeb/src/cubeb_alsa.c
++++ media/libcubeb/src/cubeb_alsa.c
+@@ -14,10 +14,58 @@
+ #include <limits.h>
+ #include <poll.h>
+ #include <unistd.h>
++#include <dlfcn.h>
+ #include <alsa/asoundlib.h>
+ #include "cubeb/cubeb.h"
+ #include "cubeb-internal.h"
+ 
++#ifdef DISABLE_LIBASOUND_DLOPEN
++#define WRAP(x) x
++#else
++#define WRAP(x) cubeb_##x
++#define LIBASOUND_API_VISIT(X)                   \
++  X(snd_config)                                  \
++  X(snd_config_add)                              \
++  X(snd_config_copy)                             \
++  X(snd_config_delete)                           \
++  X(snd_config_get_id)                           \
++  X(snd_config_get_string)                       \
++  X(snd_config_imake_integer)                    \
++  X(snd_config_search)                           \
++  X(snd_config_search_definition)                \
++  X(snd_lib_error_set_handler)                   \
++  X(snd_pcm_avail_update)                        \
++  X(snd_pcm_close)                               \
++  X(snd_pcm_delay)                               \
++  X(snd_pcm_drain)                               \
++  X(snd_pcm_frames_to_bytes)                     \
++  X(snd_pcm_get_params)                          \
++  X(snd_pcm_hw_params_any)                       \
++  X(snd_pcm_hw_params_get_channels_max)          \
++  X(snd_pcm_hw_params_get_rate)                  \
++  X(snd_pcm_hw_params_set_rate_near)             \
++  X(snd_pcm_hw_params_sizeof)                    \
++  X(snd_pcm_nonblock)                            \
++  X(snd_pcm_open)                                \
++  X(snd_pcm_open_lconf)                          \
++  X(snd_pcm_pause)                               \
++  X(snd_pcm_poll_descriptors)                    \
++  X(snd_pcm_poll_descriptors_count)              \
++  X(snd_pcm_poll_descriptors_revents)            \
++  X(snd_pcm_readi)                               \
++  X(snd_pcm_recover)                             \
++  X(snd_pcm_set_params)                          \
++  X(snd_pcm_start)                               \
++  X(snd_pcm_state)                               \
++  X(snd_pcm_writei)                              \
++
++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x;
++LIBASOUND_API_VISIT(MAKE_TYPEDEF);
++#undef MAKE_TYPEDEF
++/* snd_pcm_hw_params_alloca is actually a macro */
++#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof
++#endif
++
+ #define CUBEB_STREAM_MAX 16
+ #define CUBEB_WATCHDOG_MS 10000
+ 
+@@ -36,6 +84,7 @@ static struct cubeb_ops const alsa_ops;
+ 
+ struct cubeb {
+   struct cubeb_ops const * ops;
++  void * libasound;
+ 
+   pthread_t thread;
+ 
+@@ -245,8 +294,8 @@ set_timeout(struct timeval * timeout, unsigned int ms)
+ static void
+ stream_buffer_decrement(cubeb_stream * stm, long count)
+ {
+-  char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count);
+-  memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count));
++  char * bufremains = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count);
++  memmove(stm->buffer, bufremains, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes - count));
+   stm->bufframes -= count;
+ }
+ 
+@@ -278,9 +327,9 @@ alsa_process_stream(cubeb_stream * stm)
+   /* Call _poll_descriptors_revents() even if we don't use it
+      to let underlying plugins clear null events.  Otherwise poll()
+      may wake up again and again, producing unnecessary CPU usage. */
+-  snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents);
++  WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents);
+ 
+-  avail = snd_pcm_avail_update(stm->pcm);
++  avail = WRAP(snd_pcm_avail_update)(stm->pcm);
+ 
+   /* Got null event? Bail and wait for another wakeup. */
+   if (avail == 0) {
+@@ -303,7 +352,7 @@ alsa_process_stream(cubeb_stream * stm)
+       // TODO: should it be marked as DRAINING?
+     }
+ 
+-    got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail);
++    got = WRAP(snd_pcm_readi)(stm->pcm, stm->buffer+stm->bufframes, avail);
+ 
+     if (got < 0) {
+       avail = got; // the error handler below will recover us
+@@ -347,7 +396,7 @@ alsa_process_stream(cubeb_stream * stm)
+       (!stm->other_stream || stm->other_stream->bufframes > 0)) {
+     long got = avail - stm->bufframes;
+     void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL;
+-    char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);
++    char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
+ 
+     /* Correct read size to the other stream available frames */
+     if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) {
+@@ -374,8 +423,8 @@ alsa_process_stream(cubeb_stream * stm)
+     long drain_frames = avail - stm->bufframes;
+     double drain_time = (double) drain_frames / stm->params.rate;
+ 
+-    char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);
+-    memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames));
++    char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
++    memset(buftail, 0, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, drain_frames));
+     stm->bufframes = avail;
+ 
+     /* Mark as draining, unless we're waiting for capture */
+@@ -402,7 +451,7 @@ alsa_process_stream(cubeb_stream * stm)
+       }
+     }
+ 
+-    wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail);
++    wrote = WRAP(snd_pcm_writei)(stm->pcm, stm->buffer, avail);
+     if (wrote < 0) {
+       avail = wrote; // the error handler below will recover us
+     } else {
+@@ -415,13 +464,13 @@ alsa_process_stream(cubeb_stream * stm)
+ 
+   /* Got some error? Let's try to recover the stream. */
+   if (avail < 0) {
+-    avail = snd_pcm_recover(stm->pcm, avail, 0);
++    avail = WRAP(snd_pcm_recover)(stm->pcm, avail, 0);
+ 
+     /* Capture pcm must be started after initial setup/recover */
+     if (avail >= 0 &&
+         stm->stream_type == SND_PCM_STREAM_CAPTURE &&
+-        snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {
+-      avail = snd_pcm_start(stm->pcm);
++        WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) {
++      avail = WRAP(snd_pcm_start)(stm->pcm);
+     }
+   }
+ 
+@@ -537,26 +586,26 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm)
+ 
+   slave_def = NULL;
+ 
+-  r = snd_config_search(root_pcm, "slave", &slave_pcm);
++  r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm);
+   if (r < 0) {
+     return NULL;
+   }
+ 
+-  r = snd_config_get_string(slave_pcm, &string);
++  r = WRAP(snd_config_get_string)(slave_pcm, &string);
+   if (r >= 0) {
+-    r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def);
++    r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def);
+     if (r < 0) {
+       return NULL;
+     }
+   }
+ 
+   do {
+-    r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
++    r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string);
++    r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -565,7 +614,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm)
+     if (r < 0 || r > (int) sizeof(node_name)) {
+       break;
+     }
+-    r = snd_config_search(lconf, node_name, &pcm);
++    r = WRAP(snd_config_search)(lconf, node_name, &pcm);
+     if (r < 0) {
+       break;
+     }
+@@ -574,7 +623,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm)
+   } while (0);
+ 
+   if (slave_def) {
+-    snd_config_delete(slave_def);
++    WRAP(snd_config_delete)(slave_def);
+   }
+ 
+   return NULL;
+@@ -597,22 +646,22 @@ init_local_config_with_workaround(char const * pcm_name)
+ 
+   lconf = NULL;
+ 
+-  if (snd_config == NULL) {
++  if (*WRAP(snd_config) == NULL) {
+     return NULL;
+   }
+ 
+-  r = snd_config_copy(&lconf, snd_config);
++  r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config));
+   if (r < 0) {
+     return NULL;
+   }
+ 
+   do {
+-    r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node);
++    r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_id(pcm_node, &string);
++    r = WRAP(snd_config_get_id)(pcm_node, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -621,7 +670,7 @@ init_local_config_with_workaround(char const * pcm_name)
+     if (r < 0 || r > (int) sizeof(node_name)) {
+       break;
+     }
+-    r = snd_config_search(lconf, node_name, &pcm_node);
++    r = WRAP(snd_config_search)(lconf, node_name, &pcm_node);
+     if (r < 0) {
+       break;
+     }
+@@ -632,12 +681,12 @@ init_local_config_with_workaround(char const * pcm_name)
+     }
+ 
+     /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
+-    r = snd_config_search(pcm_node, "type", &node);
++    r = WRAP(snd_config_search)(pcm_node, "type", &node);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_string(node, &string);
++    r = WRAP(snd_config_get_string)(node, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -648,18 +697,18 @@ init_local_config_with_workaround(char const * pcm_name)
+ 
+     /* Don't clobber an explicit existing handle_underrun value, set it only
+        if it doesn't already exist. */
+-    r = snd_config_search(pcm_node, "handle_underrun", &node);
++    r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node);
+     if (r != -ENOENT) {
+       break;
+     }
+ 
+     /* Disable pcm_pulse's asynchronous underrun handling. */
+-    r = snd_config_imake_integer(&node, "handle_underrun", 0);
++    r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_add(pcm_node, node);
++    r = WRAP(snd_config_add)(pcm_node, node);
+     if (r < 0) {
+       break;
+     }
+@@ -667,7 +716,7 @@ init_local_config_with_workaround(char const * pcm_name)
+     return lconf;
+   } while (0);
+ 
+-  snd_config_delete(lconf);
++  WRAP(snd_config_delete)(lconf);
+ 
+   return NULL;
+ }
+@@ -679,9 +728,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, char const * pcm_name, snd_pcm_stream_t s
+ 
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+   if (local_config) {
+-    r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);
++    r = WRAP(snd_pcm_open_lconf)(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);
+   } else {
+-    r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK);
++    r = WRAP(snd_pcm_open)(pcm, pcm_name, stream, SND_PCM_NONBLOCK);
+   }
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+ 
+@@ -694,7 +743,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
+   int r;
+ 
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+-  r = snd_pcm_close(pcm);
++  r = WRAP(snd_pcm_close)(pcm);
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+ 
+   return r;
+@@ -750,6 +799,7 @@ silent_error_handler(char const * file, int line, char const * function,
+ alsa_init(cubeb ** context, char const * context_name)
+ {
+   (void)context_name;
++  void * libasound = NULL;
+   cubeb * ctx;
+   int r;
+   int i;
+@@ -760,9 +810,27 @@ alsa_init(cubeb ** context, char const * context_name)
+   assert(context);
+   *context = NULL;
+ 
++#ifndef DISABLE_LIBASOUND_DLOPEN
++  libasound = dlopen("libasound.so", RTLD_LAZY);
++  if (!libasound) {
++    return CUBEB_ERROR;
++  }
++
++#define LOAD(x) {                               \
++    cubeb_##x = dlsym(libasound, #x);            \
++    if (!cubeb_##x) {                           \
++      dlclose(libasound);                        \
++      return CUBEB_ERROR;                       \
++    }                                           \
++  }
++
++  LIBASOUND_API_VISIT(LOAD);
++#undef LOAD
++#endif
++
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+   if (!cubeb_alsa_error_handler_set) {
+-    snd_lib_error_set_handler(silent_error_handler);
++    WRAP(snd_lib_error_set_handler)(silent_error_handler);
+     cubeb_alsa_error_handler_set = 1;
+   }
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+@@ -771,6 +839,7 @@ alsa_init(cubeb ** context, char const * context_name)
+   assert(ctx);
+ 
+   ctx->ops = &alsa_ops;
++  ctx->libasound = libasound;
+ 
+   r = pthread_mutex_init(&ctx->mutex, NULL);
+   assert(r == 0);
+@@ -819,7 +888,7 @@ alsa_init(cubeb ** context, char const * context_name)
+        config fails with EINVAL, the PA PCM is too old for this workaround. */
+     if (r == -EINVAL) {
+       pthread_mutex_lock(&cubeb_alsa_mutex);
+-      snd_config_delete(ctx->local_config);
++      WRAP(snd_config_delete)(ctx->local_config);
+       pthread_mutex_unlock(&cubeb_alsa_mutex);
+       ctx->local_config = NULL;
+     } else if (r >= 0) {
+@@ -861,10 +930,14 @@ alsa_destroy(cubeb * ctx)
+ 
+   if (ctx->local_config) {
+     pthread_mutex_lock(&cubeb_alsa_mutex);
+-    snd_config_delete(ctx->local_config);
++    WRAP(snd_config_delete)(ctx->local_config);
+     pthread_mutex_unlock(&cubeb_alsa_mutex);
+   }
+ 
++  if (ctx->libasound) {
++    dlclose(ctx->libasound);
++  }
++
+   free(ctx);
+ }
+ 
+@@ -948,7 +1021,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_nonblock(stm->pcm, 1);
++  r = WRAP(snd_pcm_nonblock)(stm->pcm, 1);
+   assert(r == 0);
+ 
+   latency_us = latency_frames * 1e6 / stm->params.rate;
+@@ -961,7 +1034,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream
+     latency_us = latency_us < min_latency ? min_latency: latency_us;
+   }
+ 
+-  r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
++  r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
+                          stm->params.channels, stm->params.rate, 1,
+                          latency_us);
+   if (r < 0) {
+@@ -969,20 +1042,20 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream
+     return CUBEB_ERROR_INVALID_FORMAT;
+   }
+ 
+-  r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size);
++  r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size);
+   assert(r == 0);
+ 
+   /* Double internal buffer size to have enough space when waiting for the other side of duplex connection */
+   stm->buffer_size *= 2;
+-  stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size));
++  stm->buffer = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->buffer_size));
+   assert(stm->buffer);
+ 
+-  stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm);
++  stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm);
+   assert(stm->nfds > 0);
+ 
+   stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd));
+   assert(stm->saved_fds);
+-  r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds);
++  r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds);
+   assert((nfds_t) r == stm->nfds);
+ 
+   if (alsa_register_stream(ctx, stm) != 0) {
+@@ -1054,7 +1127,7 @@ alsa_stream_destroy(cubeb_stream * stm)
+   pthread_mutex_lock(&stm->mutex);
+   if (stm->pcm) {
+     if (stm->state == DRAINING) {
+-      snd_pcm_drain(stm->pcm);
++      WRAP(snd_pcm_drain)(stm->pcm);
+     }
+     alsa_locked_pcm_close(stm->pcm);
+     stm->pcm = NULL;
+@@ -1100,12 +1173,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels)
+ 
+   assert(stm);
+ 
+-  r = snd_pcm_hw_params_any(stm->pcm, hw_params);
++  r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
+   if (r < 0) {
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels);
++  r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels);
+   if (r < 0) {
+     return CUBEB_ERROR;
+   }
+@@ -1126,34 +1199,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) {
+ 
+   /* get a pcm, disabling resampling, so we get a rate the
+    * hardware/dmix/pulse/etc. supports. */
+-  r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE);
++  r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE);
+   if (r < 0) {
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_hw_params_any(pcm, hw_params);
++  r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params);
+   if (r < 0) {
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir);
++  r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir);
+   if (r >= 0) {
+     /* There is a default rate: use it. */
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_OK;
+   }
+ 
+   /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */
+   *rate = 44100;
+ 
+-  r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL);
++  r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL);
+   if (r < 0) {
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_ERROR;
+   }
+ 
+-  snd_pcm_close(pcm);
++  WRAP(snd_pcm_close)(pcm);
+ 
+   return CUBEB_OK;
+ }
+@@ -1186,10 +1259,10 @@ alsa_stream_start(cubeb_stream * stm)
+   pthread_mutex_lock(&stm->mutex);
+   /* Capture pcm must be started after initial setup/recover */
+   if (stm->stream_type == SND_PCM_STREAM_CAPTURE &&
+-      snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {
+-    snd_pcm_start(stm->pcm);
++      WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) {
++    WRAP(snd_pcm_start)(stm->pcm);
+   }
+-  snd_pcm_pause(stm->pcm, 0);
++  WRAP(snd_pcm_pause)(stm->pcm, 0);
+   gettimeofday(&stm->last_activity, NULL);
+   pthread_mutex_unlock(&stm->mutex);
+ 
+@@ -1229,7 +1302,7 @@ alsa_stream_stop(cubeb_stream * stm)
+   pthread_mutex_unlock(&ctx->mutex);
+ 
+   pthread_mutex_lock(&stm->mutex);
+-  snd_pcm_pause(stm->pcm, 1);
++  WRAP(snd_pcm_pause)(stm->pcm, 1);
+   pthread_mutex_unlock(&stm->mutex);
+ 
+   return CUBEB_OK;
+@@ -1245,8 +1318,8 @@ alsa_stream_get_position(cubeb_stream * stm, uint64_t * position)
+   pthread_mutex_lock(&stm->mutex);
+ 
+   delay = -1;
+-  if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING ||
+-      snd_pcm_delay(stm->pcm, &delay) != 0) {
++  if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING ||
++      WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) {
+     *position = stm->last_position;
+     pthread_mutex_unlock(&stm->mutex);
+     return CUBEB_OK;
+@@ -1271,7 +1344,7 @@ alsa_stream_get_latency(cubeb_stream * stm, uint32_t * latency)
+   snd_pcm_sframes_t delay;
+   /* This function returns the delay in frames until a frame written using
+      snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */
+-  if (snd_pcm_delay(stm->pcm, &delay)) {
++  if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) {
+     return CUBEB_ERROR;
+   }
+ 
+diff --git media/libcubeb/src/cubeb_sndio.c media/libcubeb/src/cubeb_sndio.c
+index 9e99b2c..0559af4 100644
+--- media/libcubeb/src/cubeb_sndio.c
++++ media/libcubeb/src/cubeb_sndio.c
+@@ -12,6 +12,7 @@
+ #include <stdbool.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <dlfcn.h>
+ #include <assert.h>
+ #include "cubeb/cubeb.h"
+ #include "cubeb-internal.h"
+@@ -22,10 +23,35 @@
+ #define DPR(...) do {} while(0)
+ #endif
+ 
++#ifdef DISABLE_LIBSNDIO_DLOPEN
++#define WRAP(x) x
++#else
++#define WRAP(x) cubeb_##x
++#define LIBSNDIO_API_VISIT(X)                   \
++  X(sio_close)                               \
++  X(sio_eof)                                 \
++  X(sio_getpar)                              \
++  X(sio_initpar)                             \
++  X(sio_onmove)                              \
++  X(sio_open)                                \
++  X(sio_pollfd)                              \
++  X(sio_read)                                \
++  X(sio_revents)                             \
++  X(sio_setpar)                              \
++  X(sio_start)                               \
++  X(sio_stop)                                \
++  X(sio_write)                               \
++
++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x;
++LIBSNDIO_API_VISIT(MAKE_TYPEDEF);
++#undef MAKE_TYPEDEF
++#endif
++
+ static struct cubeb_ops const sndio_ops;
+ 
+ struct cubeb {
+   struct cubeb_ops const * ops;
++  void * libsndio;
+ };
+ 
+ struct cubeb_stream {
+@@ -119,7 +145,7 @@ sndio_mainloop(void *arg)
+   DPR("sndio_mainloop()\n");
+   s->state_cb(s, s->arg, CUBEB_STATE_STARTED);
+   pthread_mutex_lock(&s->mtx);
+-  if (!sio_start(s->hdl)) {
++  if (!WRAP(sio_start)(s->hdl)) {
+     pthread_mutex_unlock(&s->mtx);
+     return NULL;
+   }
+@@ -203,7 +229,7 @@ sndio_mainloop(void *arg)
+       events |= POLLIN;
+     if ((s->mode & SIO_PLAY) && pstart < pend)
+       events |= POLLOUT;
+-    nfds = sio_pollfd(s->hdl, pfds, events);
++    nfds = WRAP(sio_pollfd)(s->hdl, pfds, events);
+ 
+     if (nfds > 0) {
+       pthread_mutex_unlock(&s->mtx);
+@@ -213,7 +239,7 @@ sndio_mainloop(void *arg)
+         continue;
+     }
+ 
+-    revents = sio_revents(s->hdl, pfds);
++    revents = WRAP(sio_revents)(s->hdl, pfds);
+ 
+     if (revents & POLLHUP) {
+       state = CUBEB_STATE_ERROR;
+@@ -221,8 +247,8 @@ sndio_mainloop(void *arg)
+     }
+ 
+     if (revents & POLLOUT) {
+-      n = sio_write(s->hdl, s->pbuf + pstart, pend - pstart);
+-      if (n == 0 && sio_eof(s->hdl)) {
++      n = WRAP(sio_write)(s->hdl, s->pbuf + pstart, pend - pstart);
++      if (n == 0 && WRAP(sio_eof)(s->hdl)) {
+         DPR("sndio_mainloop() werr\n");
+         state = CUBEB_STATE_ERROR;
+         break;
+@@ -231,8 +257,8 @@ sndio_mainloop(void *arg)
+     }
+ 
+     if (revents & POLLIN) {
+-      n = sio_read(s->hdl, s->rbuf + rstart, rend - rstart);
+-      if (n == 0 && sio_eof(s->hdl)) {
++      n = WRAP(sio_read)(s->hdl, s->rbuf + rstart, rend - rstart);
++      if (n == 0 && WRAP(sio_eof)(s->hdl)) {
+         DPR("sndio_mainloop() rerr\n");
+         state = CUBEB_STATE_ERROR;
+         break;
+@@ -244,7 +270,7 @@ sndio_mainloop(void *arg)
+     if (prime > 0 && (s->mode & SIO_REC))
+       rstart = rend;
+   }
+-  sio_stop(s->hdl);
++  WRAP(sio_stop)(s->hdl);
+   s->hwpos = s->swpos;
+   pthread_mutex_unlock(&s->mtx);
+   s->state_cb(s, s->arg, state);
+@@ -254,8 +280,31 @@ sndio_mainloop(void *arg)
+ /*static*/ int
+ sndio_init(cubeb **context, char const *context_name)
+ {
++  void * libsndio = NULL;
++
++#ifndef DISABLE_LIBSNDIO_DLOPEN
++  libsndio = dlopen("libsndio.so", RTLD_LAZY);
++  if (!libsndio) {
++    DPR("sndio_init(%s) failed dlopen(libsndio.so)\n", context_name);
++    return CUBEB_ERROR;
++  }
++
++#define LOAD(x) {                               \
++    cubeb_##x = dlsym(libsndio, #x);            \
++    if (!cubeb_##x) {                           \
++      DPR("sndio_init(%s) failed dlsym(%s)\n", context_name, #x); \
++      dlclose(libsndio);                        \
++      return CUBEB_ERROR;                       \
++    }                                           \
++  }
++
++  LIBSNDIO_API_VISIT(LOAD);
++#undef LOAD
++#endif
++
+   DPR("sndio_init(%s)\n", context_name);
+   *context = malloc(sizeof(*context));
++  (*context)->libsndio = libsndio;
+   (*context)->ops = &sndio_ops;
+   (void)context_name;
+   return CUBEB_OK;
+@@ -271,6 +320,8 @@ static void
+ sndio_destroy(cubeb *context)
+ {
+   DPR("sndio_destroy()\n");
++  if (context->libsndio)
++    dlclose(context->libsndio);
+   free(context);
+ }
+ 
+@@ -323,12 +374,12 @@ sndio_stream_init(cubeb * context,
+     goto err;
+   }
+   s->context = context;
+-  s->hdl = sio_open(NULL, s->mode, 1);
++  s->hdl = WRAP(sio_open)(NULL, s->mode, 1);
+   if (s->hdl == NULL) {
+     DPR("sndio_stream_init(), sio_open() failed\n");
+     goto err;
+   }
+-  sio_initpar(&wpar);
++  WRAP(sio_initpar)(&wpar);
+   wpar.sig = 1;
+   wpar.bits = 16;
+   switch (format) {
+@@ -351,7 +402,7 @@ sndio_stream_init(cubeb * context,
+   if (s->mode & SIO_PLAY)
+     wpar.pchan = output_stream_params->channels;
+   wpar.appbufsz = latency_frames;
+-  if (!sio_setpar(s->hdl, &wpar) || !sio_getpar(s->hdl, &rpar)) {
++  if (!WRAP(sio_setpar)(s->hdl, &wpar) || !WRAP(sio_getpar)(s->hdl, &rpar)) {
+     DPR("sndio_stream_init(), sio_setpar() failed\n");
+     goto err;
+   }
+@@ -362,7 +413,7 @@ sndio_stream_init(cubeb * context,
+     DPR("sndio_stream_init() unsupported params\n");
+     goto err;
+   }
+-  sio_onmove(s->hdl, sndio_onmove, s);
++  WRAP(sio_onmove)(s->hdl, sndio_onmove, s);
+   s->active = 0;
+   s->nfr = rpar.round;
+   s->rbpf = rpar.bps * rpar.rchan;
+@@ -400,7 +451,7 @@ sndio_stream_init(cubeb * context,
+   return CUBEB_OK;
+ err:
+   if (s->hdl)
+-    sio_close(s->hdl);
++    WRAP(sio_close)(s->hdl);
+   if (s->pbuf)
+     free(s->pbuf);
+   if (s->rbuf)
+@@ -446,7 +497,7 @@ static void
+ sndio_stream_destroy(cubeb_stream *s)
+ {
+   DPR("sndio_stream_destroy()\n");
+-  sio_close(s->hdl);
++  WRAP(sio_close)(s->hdl);
+   if (s->mode & SIO_PLAY)
+     free(s->pbuf);
+   if (s->mode & SIO_REC)
+diff --git toolkit/library/moz.build toolkit/library/moz.build
+index 8ce595ff96bff..c318e96a1fdfc 100644
+--- toolkit/library/moz.build
++++ toolkit/library/moz.build
+@@ -231,9 +231,6 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
+ if not CONFIG['MOZ_TREE_PIXMAN']:
+     OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
+ 
+-if CONFIG['MOZ_ALSA']:
+-    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+-
+ if CONFIG['HAVE_CLOCK_MONOTONIC']:
+     OS_LIBS += CONFIG['REALTIME_LIBS']
+ 
+@@ -242,11 +239,6 @@ OS_LIBS += CONFIG['ICONV_LIBS']
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
+     OS_LIBS += CONFIG['TK_LIBS']
+ 
+-if CONFIG['OS_ARCH'] == 'OpenBSD':
+-    OS_LIBS += [
+-        'sndio',
+-    ]
+-
+ if CONFIG['MOZ_ENABLE_DBUS']:
+     OS_LIBS += CONFIG['MOZ_DBUS_GLIB_LIBS']
+ 
diff --git a/www/flashplayer/Makefile b/www/flashplayer/Makefile
index 074f31846087..482e8c8c7edf 100644
--- a/www/flashplayer/Makefile
+++ b/www/flashplayer/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	flashplayer
 PORTVERSION=	32.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	www multimedia
 DISTFILES=
 
diff --git a/www/gitea/Makefile b/www/gitea/Makefile
index 6fb9a077f9fe..d8d6a06e4a5c 100644
--- a/www/gitea/Makefile
+++ b/www/gitea/Makefile
@@ -1,9 +1,9 @@
-# Created by: Stefan Bethke <stb@lassitu.de>
+
 # $FreeBSD$
 
 PORTNAME=	gitea
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.9.2
+DISTVERSION=	1.9.3
 CATEGORIES=	www
 
 MAINTAINER=	stb@lassitu.de
diff --git a/www/gitea/distinfo b/www/gitea/distinfo
index 7521e5161633..80a2f5d32259 100644
--- a/www/gitea/distinfo
+++ b/www/gitea/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566506495
-SHA256 (go-gitea-gitea-v1.9.2_GH0.tar.gz) = 229e3614bf50bc9fee7f378d422b4dea18d6cf607f94f100070fdfec6d0f2c05
-SIZE (go-gitea-gitea-v1.9.2_GH0.tar.gz) = 24073823
+TIMESTAMP = 1568133836
+SHA256 (go-gitea-gitea-v1.9.3_GH0.tar.gz) = e7a97f694a13a44b929b86f53d66e75043bf7b8793727f4fcf399da324abad0a
+SIZE (go-gitea-gitea-v1.9.3_GH0.tar.gz) = 24064564
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 556458a3c663..f5d7f256ea33 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-ce
-PORTVERSION=	12.1.8
+PORTVERSION=	12.2.4
 PORTREVISION=	0
 CATEGORIES=	www devel
 
@@ -14,201 +14,199 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # the rubygems of RUN_DEPENDS matches the order of the Gemfile
 # which makes maintaining this long list much easier!
-# only rubygem-pg is defined later as RUN_DEPENDS
-# for the options
 MY_DEPENDS=	git>=2.21.0:devel/git \
 	gitlab-shell>=9.3.0:devel/gitlab-shell \
-	gitlab-workhorse>=8.7.1:www/gitlab-workhorse \
-	gitaly>=1.53.3:devel/gitaly \
+	gitlab-workhorse>=8.8.1:www/gitlab-workhorse \
+	gitaly>=1.59.2:devel/gitaly \
 	gitlab-pages>=1.7.1:www/gitlab-pages \
 	redis>=3.2.12:databases/redis \
 	yarn>=1.10.0:www/yarn \
 	rubygem-rails52>=5.2.3:www/rubygem-rails52 \
-	rubygem-nakayoshi_fork>=0.0.4:devel/rubygem-nakayoshi_fork \
-	rubygem-responders2-rails52>=2.0:www/rubygem-responders2-rails52 \
-	rubygem-sprockets3>=3.7:devel/rubygem-sprockets3 \
+	rubygem-bootsnap>=1.4<2.0:devel/rubygem-bootsnap \
+	rubygem-nakayoshi_fork>=0.0.4<0.1.0:devel/rubygem-nakayoshi_fork \
+	rubygem-responders2-rails52>=2.0<3.0:www/rubygem-responders2-rails52 \
+	rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \
 	rubygem-default_value_for32>=3.2.0<3.3.0:devel/rubygem-default_value_for32 \
-	rubygem-pg>=1.1.0:databases/rubygem-pg \
-	rubygem-rugged>=0.28.0:devel/rubygem-rugged \
-	rubygem-grape-path-helpers>=1.1:devel/rubygem-grape-path-helpers \
-	rubygem-faraday>=0.12.0:www/rubygem-faraday \
-	rubygem-devise-rails52>=4.6:devel/rubygem-devise-rails52 \
-	rubygem-doorkeeper43>=4.3:security/rubygem-doorkeeper43 \
-	rubygem-doorkeeper-openid_connect>=1.5:security/rubygem-doorkeeper-openid_connect \
-	rubygem-omniauth>=1.8:security/rubygem-omniauth \
-	rubygem-omniauth-auth0>=2.0.0:net/rubygem-omniauth-auth0 \
-	rubygem-omniauth-azure-oauth2>=0.0.9:net/rubygem-omniauth-azure-oauth2 \
-	rubygem-omniauth-cas3>=1.1.4:security/rubygem-omniauth-cas3 \
-	rubygem-omniauth-facebook4>=4.0.0:net/rubygem-omniauth-facebook4 \
-	rubygem-omniauth-github>=1.3.0:net/rubygem-omniauth-github \
-	rubygem-omniauth-gitlab>=1.0.2:security/rubygem-omniauth-gitlab \
-	rubygem-omniauth-google-oauth2>=0.6.0:net/rubygem-omniauth-google-oauth2 \
-	rubygem-omniauth-kerberos>=0.3.0:net/rubygem-omniauth-kerberos \
-	rubygem-omniauth-oauth2-generic>=0.2.2:security/rubygem-omniauth-oauth2-generic \
-	rubygem-omniauth-saml>=1.10:security/rubygem-omniauth-saml \
-	rubygem-omniauth-shibboleth>=1.3.0:security/rubygem-omniauth-shibboleth \
-	rubygem-omniauth-twitter>=1.4:net/rubygem-omniauth-twitter \
-	rubygem-omniauth_crowd22>=2.2.0:devel/rubygem-omniauth_crowd22 \
-	rubygem-omniauth-authentiq>=0.3.3:net/rubygem-omniauth-authentiq \
-	rubygem-omniauth_openid_connect>=0.3.1:net/rubygem-omniauth_openid_connect \
-	rubygem-omniauth-ultraauth>=0.0.2:net/rubygem-omniauth-ultraauth \
-	rubygem-omniauth-salesforce>=1.0.5:net/rubygem-omniauth-salesforce \
-	rubygem-rack-oauth2>=1.9.3:security/rubygem-rack-oauth2 \
-	rubygem-jwt21>=2.1.0:www/rubygem-jwt21 \
-	rubygem-recaptcha>=4.11:devel/rubygem-recaptcha \
-	rubygem-akismet>=2.0:devel/rubygem-akismet \
-	rubygem-devise-two-factor30-rails52>=3.0.0:security/rubygem-devise-two-factor30-rails52 \
-	rubygem-rqrcode-rails3>=0.1.7:www/rubygem-rqrcode-rails3 \
-	rubygem-attr_encrypted>=3.1.0:security/rubygem-attr_encrypted \
-	rubygem-u2f0>=0.2.1:net/rubygem-u2f0 \
-	rubygem-validates_hostname>=1.0.6:dns/rubygem-validates_hostname \
-	rubygem-rubyzip>=1.2.2:archivers/rubygem-rubyzip \
-	rubygem-acme-client>=2.0.2:security/rubygem-acme-client \
-	rubygem-browser>=2.5:www/rubygem-browser \
-	rubygem-gpgme>=2.0.18:security/rubygem-gpgme \
-	rubygem-gitlab_omniauth-ldap>=2.1.1:net/rubygem-gitlab_omniauth-ldap \
-	rubygem-net-ldap>=0.16.0:net/rubygem-net-ldap \
-	rubygem-grape11>=1.1:devel/rubygem-grape11 \
-	rubygem-grape-entity>=0.7.1:devel/rubygem-grape-entity \
-	rubygem-rack-cors>=1.0.0:www/rubygem-rack-cors \
-	rubygem-graphql>=1.8.0:devel/rubygem-graphql \
-	rubygem-graphiql-rails>=1.4.10:devel/rubygem-graphiql-rails \
-	rubygem-apollo_upload_server>=2.0.0.b.3:net/rubygem-apollo_upload_server \
-	rubygem-hashie-forbidden_attributes>=0:devel/rubygem-hashie-forbidden_attributes \
-	rubygem-kaminari-rails52>=1.0:www/rubygem-kaminari-rails52 \
-	rubygem-hamlit>=2.8.8:www/rubygem-hamlit \
-	rubygem-carrierwave>=1.3.0:www/rubygem-carrierwave \
-	rubygem-mini_magick>=0:graphics/rubygem-mini_magick \
-	rubygem-fog-aws>=3.5:net/rubygem-fog-aws \
-	rubygem-fog-core210>=2.1.0:devel/rubygem-fog-core210 \
-	rubygem-fog-google>=1.8:net/rubygem-fog-google \
-	rubygem-fog-local>=0.6:net/rubygem-fog-local \
-	rubygem-fog-openstack>=1.0:net/rubygem-fog-openstack \
-	rubygem-fog-rackspace>=0.1.1:net/rubygem-fog-rackspace \
-	rubygem-fog-aliyun>=0.3:net/rubygem-fog-aliyun \
-	rubygem-google-api-client>=0.23:devel/rubygem-google-api-client \
-	rubygem-unf>=0.1.4:textproc/rubygem-unf \
-	rubygem-seed-fu>=2.3.7:databases/rubygem-seed-fu \
+	rubygem-pg>=1.1<2:databases/rubygem-pg \
+	rubygem-rugged>=0.28<1.0:devel/rubygem-rugged \
+	rubygem-grape-path-helpers>=1.1<2.0:devel/rubygem-grape-path-helpers \
+	rubygem-faraday>=0.12<1.0:www/rubygem-faraday \
+	rubygem-devise-rails52>=4.6<5.0:devel/rubygem-devise-rails52 \
+	rubygem-doorkeeper43>=4.3<5.0:security/rubygem-doorkeeper43 \
+	rubygem-doorkeeper-openid_connect>=1.5<2.0:security/rubygem-doorkeeper-openid_connect \
+	rubygem-omniauth>=1.8<2.0:security/rubygem-omniauth \
+	rubygem-omniauth-auth0>=2.0.0<2.1.0:net/rubygem-omniauth-auth0 \
+	rubygem-omniauth-azure-oauth2>=0.0.9<0.1.0:net/rubygem-omniauth-azure-oauth2 \
+	rubygem-omniauth-cas3>=1.1.4<1.2.0:security/rubygem-omniauth-cas3 \
+	rubygem-omniauth-facebook4>=4.0.0<4.1.0:net/rubygem-omniauth-facebook4 \
+	rubygem-omniauth-github>=1.3.0<2.0:net/rubygem-omniauth-github \
+	rubygem-omniauth-gitlab>=1.0.2<1.1.0:security/rubygem-omniauth-gitlab \
+	rubygem-omniauth-google-oauth2>=0.6.0<0.7.0:net/rubygem-omniauth-google-oauth2 \
+	rubygem-omniauth-kerberos>=0.3.0<0.4.0:net/rubygem-omniauth-kerberos \
+	rubygem-omniauth-oauth2-generic>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic \
+	rubygem-omniauth-saml>=1.10<2.0:security/rubygem-omniauth-saml \
+	rubygem-omniauth-shibboleth>=1.3.0<1.4.0:security/rubygem-omniauth-shibboleth \
+	rubygem-omniauth-twitter>=1.4<2.0:net/rubygem-omniauth-twitter \
+	rubygem-omniauth_crowd22>=2.2.0<2.3.0:devel/rubygem-omniauth_crowd22 \
+	rubygem-omniauth-authentiq>=0.3.3<0.4.0:net/rubygem-omniauth-authentiq \
+	rubygem-omniauth_openid_connect>=0.3.1<0.4.0:net/rubygem-omniauth_openid_connect \
+	rubygem-omniauth-ultraauth>=0.0.2<0.1.0:net/rubygem-omniauth-ultraauth \
+	rubygem-omniauth-salesforce>=1.0.5<1.1.0:net/rubygem-omniauth-salesforce \
+	rubygem-rack-oauth2>=1.9.3<1.10.0:security/rubygem-rack-oauth2 \
+	rubygem-jwt21>=2.1.0<2.2.0:www/rubygem-jwt21 \
+	rubygem-recaptcha>=4.11<5.0:devel/rubygem-recaptcha \
+	rubygem-akismet>=2.0<3.0:devel/rubygem-akismet \
+	rubygem-invisible_captcha>=0.12.1<0.13.0:graphics/rubygem-invisible_captcha \
+	rubygem-devise-two-factor30-rails52>=3.0.0<3.1.0:security/rubygem-devise-two-factor30-rails52 \
+	rubygem-rqrcode-rails3>=0.1.7<0.2.0:www/rubygem-rqrcode-rails3 \
+	rubygem-attr_encrypted>=3.1.0<3.2.0:security/rubygem-attr_encrypted \
+	rubygem-u2f0>=0.2.1<0.3.0:net/rubygem-u2f0 \
+	rubygem-validates_hostname>=1.0.6<1.1.0:dns/rubygem-validates_hostname \
+	rubygem-rubyzip>=1.2.2<1.3.0:archivers/rubygem-rubyzip \
+	rubygem-acme-client>=2.0.2<2.1.0:security/rubygem-acme-client \
+	rubygem-browser>=2.5<3.0:www/rubygem-browser \
+	rubygem-gpgme>=2.0.18<2.1.0:security/rubygem-gpgme \
+	rubygem-gitlab_omniauth-ldap>=2.1.1<2.2.0:net/rubygem-gitlab_omniauth-ldap \
+	rubygem-net-ldap>0:net/rubygem-net-ldap \
+	rubygem-grape11>=1.1.0<1.2.0:devel/rubygem-grape11 \
+	rubygem-grape-entity>=0.7.1<0.8.0,1:devel/rubygem-grape-entity \
+	rubygem-rack-cors>=1.0.0<1.1.0:www/rubygem-rack-cors \
+	rubygem-graphql>=1.8.0<1.9.0:devel/rubygem-graphql \
+	rubygem-graphiql-rails>=1.4.10<1.5.0:devel/rubygem-graphiql-rails \
+	rubygem-apollo_upload_server>=2.0.0.b.3<2.1.0:net/rubygem-apollo_upload_server \
+	rubygem-graphql-docs>=1.6.0<1.7.0:devel/rubygem-graphql-docs \
+	rubygem-hashie-forbidden_attributes>0:devel/rubygem-hashie-forbidden_attributes \
+	rubygem-kaminari-rails52>=1.0<2.0:www/rubygem-kaminari-rails52 \
+	rubygem-hamlit>=2.8.8<2.9.0:www/rubygem-hamlit \
+	rubygem-carrierwave>=1.3<2.0:www/rubygem-carrierwave \
+	rubygem-mini_magick>0:graphics/rubygem-mini_magick \
+	rubygem-fog-aws>=3.5<4.0:net/rubygem-fog-aws \
+	rubygem-fog-core210=2.1.0:devel/rubygem-fog-core210 \
+	rubygem-fog-google>=1.8<2.0:net/rubygem-fog-google \
+	rubygem-fog-local>=0.6<1.0:net/rubygem-fog-local \
+	rubygem-fog-openstack>=1.0<2.0:net/rubygem-fog-openstack \
+	rubygem-fog-rackspace>=0.1.1<1.2.0:net/rubygem-fog-rackspace \
+	rubygem-fog-aliyun>=0.3<1.0:net/rubygem-fog-aliyun \
+	rubygem-google-api-client>=0.23<1.0:devel/rubygem-google-api-client \
+	rubygem-unf>=0.1.4<0.2.0:textproc/rubygem-unf \
+	rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \
 	rubygem-html-pipeline>=2.8:textproc/rubygem-html-pipeline \
-	rubygem-deckar01-task_list>=2.2.0:www/rubygem-deckar01-task_list \
-	rubygem-gitlab-markup>=1.7.0:textproc/rubygem-gitlab-markup \
-	rubygem-github-markup17>=1.7.0:textproc/rubygem-github-markup17 \
-	rubygem-commonmarker>=0.17:textproc/rubygem-commonmarker \
-	rubygem-redcloth>=4.3.2:www/rubygem-redcloth \
-	rubygem-rdoc>=6.0:devel/rubygem-rdoc \
-	rubygem-org-ruby>=0.9.12:textproc/rubygem-org-ruby \
-	rubygem-creole>=0.5.0:textproc/rubygem-creole \
-	rubygem-wikicloth081>=0.8.1:textproc/rubygem-wikicloth081 \
-	rubygem-asciidoctor>=2.0.10:textproc/rubygem-asciidoctor \
-	rubygem-asciidoctor-include-ext>=0.3.1:textproc/rubygem-asciidoctor-include-ext \
-	rubygem-asciidoctor-plantuml>=0.0.9:textproc/rubygem-asciidoctor-plantuml \
-	rubygem-rouge>=3.5:textproc/rubygem-rouge \
-	rubygem-truncato>=0.7.11:textproc/rubygem-truncato \
-	rubygem-bootstrap_form>=4.2.0:devel/rubygem-bootstrap_form \
-	rubygem-nokogiri>=1.10.3:textproc/rubygem-nokogiri \
-	rubygem-escape_utils>=1.1:textproc/rubygem-escape_utils \
+	rubygem-deckar01-task_list>=2.2.0<2.3.0:www/rubygem-deckar01-task_list \
+	rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \
+	rubygem-github-markup17>=1.7.0<1.8.0:textproc/rubygem-github-markup17 \
+	rubygem-commonmarker>=0.17<1.0:textproc/rubygem-commonmarker \
+	rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \
+	rubygem-rdoc>=6.0<7.0:devel/rubygem-rdoc \
+	rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \
+	rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \
+	rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \
+	rubygem-asciidoctor>=2.0.10<2.1.0:textproc/rubygem-asciidoctor \
+	rubygem-asciidoctor-include-ext>=0.3.1<0.4.0:textproc/rubygem-asciidoctor-include-ext \
+	rubygem-asciidoctor-plantuml=0.0.9.:textproc/rubygem-asciidoctor-plantuml \
+	rubygem-rouge>=3.7<4.0:textproc/rubygem-rouge \
+	rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \
+	rubygem-bootstrap_form>=4.2.0<4.3.0:devel/rubygem-bootstrap_form \
+	rubygem-nokogiri>=1.10.4<1.11.0:textproc/rubygem-nokogiri \
+	rubygem-escape_utils>=1.1<2.0:textproc/rubygem-escape_utils \
 	rubygem-icalendar>=0:devel/rubygem-icalendar \
-	rubygem-diffy31>=3.1.0:textproc/rubygem-diffy31 \
-	rubygem-rack>=2.0.7:www/rubygem-rack \
-	rubygem-unicorn>=5.4.1:www/rubygem-unicorn \
-	rubygem-unicorn-worker-killer>=0.4.4:www/rubygem-unicorn-worker-killer \
-	rubygem-puma>=3.12:www/rubygem-puma \
+	rubygem-diffy31>=3.1.0<3.2.0:textproc/rubygem-diffy31 \
+	rubygem-rack>=2.0.7<2.1.0,3:www/rubygem-rack \
+	rubygem-unicorn>=5.4.1<5.5.0:www/rubygem-unicorn \
+	rubygem-unicorn-worker-killer>=0.4.4<0.5.0:www/rubygem-unicorn-worker-killer \
+	rubygem-puma>=3.12<4.0:www/rubygem-puma \
 	rubygem-puma_worker_killer>=0:www/rubygem-puma_worker_killer \
 	rubygem-rack-timeout>=0:www/rubygem-rack-timeout \
-	rubygem-state_machines-activerecord05>=0.5.1:databases/rubygem-state_machines-activerecord05 \
-	rubygem-acts-as-taggable-on>=6.0:www/rubygem-acts-as-taggable-on \
-	rubygem-sidekiq>=5.2.7:devel/rubygem-sidekiq \
-	rubygem-sidekiq-cron>=1.0.0:devel/rubygem-sidekiq-cron \
-	rubygem-redis-namespace>=1.6.0:databases/rubygem-redis-namespace \
-	rubygem-gitlab-sidekiq-fetcher>=0.4.0:devel/rubygem-gitlab-sidekiq-fetcher \
-	rubygem-fugit12>=1.2.1:devel/rubygem-fugit12 \
-	rubygem-httparty>=0.16.4:www/rubygem-httparty \
-	rubygem-rainbow>=3.0:devel/rubygem-rainbow \
+	rubygem-state_machines-activerecord05>=0.5.1<6.0.0:databases/rubygem-state_machines-activerecord05 \
+	rubygem-acts-as-taggable-on>=6.0<7.0:www/rubygem-acts-as-taggable-on \
+	rubygem-sidekiq>=5.2.7<5.3.0:devel/rubygem-sidekiq \
+	rubygem-sidekiq-cron>=1.0<2.0:devel/rubygem-sidekiq-cron \
+	rubygem-redis-namespace>=1.6.0<1.7.0:databases/rubygem-redis-namespace \
+	rubygem-gitlab-sidekiq-fetcher=0.5.1:devel/rubygem-gitlab-sidekiq-fetcher \
+	rubygem-fugit12>=1.2.1<1.3.0:devel/rubygem-fugit12 \
+	rubygem-httparty>=0.16.4<0.17.0:www/rubygem-httparty \
+	rubygem-rainbow>=3.0<4.0:devel/rubygem-rainbow \
 	rubygem-ruby-progressbar>=0:devel/rubygem-ruby-progressbar \
-	rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \
-	rubygem-re2>=1.1.1:devel/rubygem-re2 \
-	rubygem-version_sorter>=2.2.4:textproc/rubygem-version_sorter \
-	rubygem-js_regex>=3.1.0:textproc/rubygem-js_regex \
+	rubygem-settingslogic>=2.0.9<2.1.0:devel/rubygem-settingslogic \
+	rubygem-re2>=1.1.1<1.2.0:devel/rubygem-re2 \
+	rubygem-version_sorter>=2.2.4<2.3.0:textproc/rubygem-version_sorter \
+	rubygem-js_regex>=3.1<4.0:textproc/rubygem-js_regex \
 	rubygem-device_detector>=0:devel/rubygem-device_detector \
-	rubygem-redis-rails-rails52>=5.0.1:www/rubygem-redis-rails-rails52 \
-	rubygem-redis3>=3.2:databases/rubygem-redis3 \
-	rubygem-connection_pool>=2.0:net/rubygem-connection_pool \
-	rubygem-discordrb-webhooks-blackst0ne>=3.3.0:net-im/rubygem-discordrb-webhooks-blackst0ne \
-	rubygem-hipchat>=1.5.0:net-im/rubygem-hipchat \
-	rubygem-jira-ruby>=1.4:devel/rubygem-jira-ruby \
-	rubygem-flowdock>=0.7:www/rubygem-flowdock \
-	rubygem-slack-notifier1>=1.5.1:devel/rubygem-slack-notifier1 \
-	rubygem-hangouts-chat>=0.0.5:net/rubygem-hangouts-chat \
-	rubygem-asana>=0.8.1:www/rubygem-asana \
-	rubygem-ruby-fogbugz021>=0.2.1:devel/rubygem-ruby-fogbugz021 \
-	rubygem-kubeclient>=4.2.2:www/rubygem-kubeclient \
-	rubygem-sanitize>=4.6:textproc/rubygem-sanitize \
-	rubygem-babosa>=1.0.2:textproc/rubygem-babosa \
-	rubygem-loofah>=2.2:textproc/rubygem-loofah \
-	rubygem-licensee8>=8.9:devel/rubygem-licensee8 \
-	rubygem-rack-attack44>=4.4.1:www/rubygem-rack-attack44 \
-	rubygem-ace-rails-ap>=4.1.0:www/rubygem-ace-rails-ap \
-	rubygem-charlock_holmes>=0.7.5:textproc/rubygem-charlock_holmes \
-	rubygem-mimemagic>=0.3.2:misc/rubygem-mimemagic \
+	rubygem-redis>=4.0<5.0:databases/rubygem-redis \
+	rubygem-connection_pool>=2.0<3.0:net/rubygem-connection_pool \
+	rubygem-redis-rails-rails52>=5.0.2<5.1:www/rubygem-redis-rails-rails52 \
+	rubygem-discordrb-webhooks-blackst0ne>=3.3<4.0:net-im/rubygem-discordrb-webhooks-blackst0ne \
+	rubygem-hipchat>=1.6.0<1.7.0:net-im/rubygem-hipchat \
+	rubygem-jira-ruby>=1.4<2.0:devel/rubygem-jira-ruby \
+	rubygem-flowdock>=0.7<1.0:www/rubygem-flowdock \
+	rubygem-slack-notifier1>=1.5.1<1.6.0:devel/rubygem-slack-notifier1 \
+	rubygem-hangouts-chat>=0.0.5<0.1.0:net/rubygem-hangouts-chat \
+	rubygem-asana>=0.8.1<0.9.0:www/rubygem-asana \
+	rubygem-ruby-fogbugz021>=0.2.1<0.3.0:devel/rubygem-ruby-fogbugz021 \
+	rubygem-kubeclient>=4.2.2<4.3.0:www/rubygem-kubeclient \
+	rubygem-sanitize>=4.6<5.0:textproc/rubygem-sanitize \
+	rubygem-babosa>=1.0.2<1.1.0:textproc/rubygem-babosa \
+	rubygem-loofah>=2.2<3.0:textproc/rubygem-loofah \
+	rubygem-licensee8>=8.9<9.0:devel/rubygem-licensee8 \
+	rubygem-rack-attack44>=4.4.1<4.5.0:www/rubygem-rack-attack44 \
+	rubygem-ace-rails-ap>=4.1.0<4.2.0:www/rubygem-ace-rails-ap \
+	rubygem-charlock_holmes>=0.7.5<0.8.0:textproc/rubygem-charlock_holmes \
+	rubygem-mimemagic>=0.3.2<0.4.0:misc/rubygem-mimemagic \
 	rubygem-fast_blank>=0:devel/rubygem-fast_blank \
-	rubygem-chronic>=0.10.2:devel/rubygem-chronic \
-	rubygem-chronic_duration>=0.10.6:devel/rubygem-chronic_duration \
-	rubygem-webpack-rails-rails52>=0.9.10:www/rubygem-webpack-rails-rails52 \
-	rubygem-rack-proxy>=0.6.0:www/rubygem-rack-proxy \
-	rubygem-sassc-rails>=2.1.0:textproc/rubygem-sassc-rails \
-	rubygem-uglifier27>=2.7.2:www/rubygem-uglifier27 \
-	rubygem-addressable25>=2.5.2:www/rubygem-addressable25 \
-	rubygem-font-awesome-rails-rails52>=4.7:devel/rubygem-font-awesome-rails-rails52 \
-	rubygem-gemojione>=3.3:graphics/rubygem-gemojione \
-	rubygem-gon-rails52>=6.2.0:www/rubygem-gon-rails52 \
-	rubygem-request_store>=1.3:devel/rubygem-request_store \
-	rubygem-virtus>=1.0.1:devel/rubygem-virtus \
-	rubygem-base32>=0.3.0:converters/rubygem-base32 \
-	rubygem-sentry-raven>=2.9:devel/rubygem-sentry-raven \
-	rubygem-premailer-rails19-rails52>=1.9.7:mail/rubygem-premailer-rails19-rails52 \
-	rubygem-gitlab-labkit>=0.3.0:devel/rubygem-gitlab-labkit \
-	rubygem-ruby_parser>=3.8.4:devel/rubygem-ruby_parser \
-	rubygem-rails-i18n-rails52>=5.1.0:devel/rubygem-rails-i18n-rails52 \
-	rubygem-gettext_i18n_rails>=1.8.0:devel/rubygem-gettext_i18n_rails \
-	rubygem-gettext_i18n_rails_js-rails52>=1.3:devel/rubygem-gettext_i18n_rails_js-rails52 \
-	rubygem-gettext>=3.2.2:devel/rubygem-gettext \
-	rubygem-batch-loader>=1.4.0:devel/rubygem-batch-loader \
-	rubygem-peek-rails52>=1.0.1:devel/rubygem-peek-rails52 \
-	rubygem-peek-gc-rails52>=0.0.2:devel/rubygem-peek-gc-rails52 \
-	rubygem-peek-pg-rails52>=1.3.0:databases/rubygem-peek-pg-rails52 \
-	rubygem-peek-rblineprof-rails52>=0.2.0:devel/rubygem-peek-rblineprof-rails52 \
-	rubygem-peek-redis-rails52>=1.2.0:devel/rubygem-peek-redis-rails52 \
+	rubygem-chronic>=0.10.2<0.11.0:devel/rubygem-chronic \
+	rubygem-chronic_duration>=0.10.6<0.11.0:devel/rubygem-chronic_duration \
+	rubygem-webpack-rails-rails52>=0.9.10<0.10.0:www/rubygem-webpack-rails-rails52 \
+	rubygem-rack-proxy>=0.6.0<0.7.0:www/rubygem-rack-proxy \
+	rubygem-sassc-rails>=2.1.0<2.2.0:textproc/rubygem-sassc-rails \
+	rubygem-uglifier27>=2.7.2<2.8.0:www/rubygem-uglifier27 \
+	rubygem-addressable25>=2.5.2<2.6.0:www/rubygem-addressable25 \
+	rubygem-font-awesome-rails-rails52>=4.7<5.0:devel/rubygem-font-awesome-rails-rails52 \
+	rubygem-gemojione>=3.3<4.0:graphics/rubygem-gemojione \
+	rubygem-gon-rails52>=6.2<7.0:www/rubygem-gon-rails52 \
+	rubygem-request_store>=1.3<2.0:devel/rubygem-request_store \
+	rubygem-virtus>=1.0.1<1.1.0:devel/rubygem-virtus \
+	rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \
+	rubygem-sentry-raven>=2.9<3.0:devel/rubygem-sentry-raven \
+	rubygem-premailer-rails19-rails52>=1.9.7<1.10.0:mail/rubygem-premailer-rails19-rails52 \
+	rubygem-gitlab-labkit>=0.4.2<0.5.0:devel/rubygem-gitlab-labkit \
+	rubygem-ruby_parser>=3.8<4.0:devel/rubygem-ruby_parser \
+	rubygem-rails-i18n-rails52>=5.1<6.0:devel/rubygem-rails-i18n-rails52 \
+	rubygem-gettext_i18n_rails>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails \
+	rubygem-gettext_i18n_rails_js-rails52>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails52 \
+	rubygem-gettext>=3.2.2<3.3.0:devel/rubygem-gettext \
+	rubygem-batch-loader>=1.4.0<1.5.0:devel/rubygem-batch-loader \
+	rubygem-peek-rails52>=1.0.1<1.1.0:devel/rubygem-peek-rails52 \
+	rubygem-snowplow-tracker>=0.6.1<0.7.0:devel/rubygem-snowplow-tracker \
 	rubygem-derailed_benchmarks>0:benchmarks/rubygem-derailed_benchmarks \
-	rubygem-method_source>=0.8:devel/rubygem-method_source \
-	rubygem-influxdb>=0.2:databases/rubygem-influxdb \
-	rubygem-prometheus-client-mmap>=0.9.8:devel/rubygem-prometheus-client-mmap \
-	rubygem-octokit>=4.9:net/rubygem-octokit \
-	rubygem-mail_room>=0.9.1:mail/rubygem-mail_room \
-	rubygem-email_reply_trimmer>=0.1:mail/rubygem-email_reply_trimmer \
+	rubygem-method_source>=0.8<1.0:devel/rubygem-method_source \
+	rubygem-influxdb>=0.2<1.0:databases/rubygem-influxdb \
+	rubygem-prometheus-client-mmap>=0.9.8<0.10.0:devel/rubygem-prometheus-client-mmap \
+	rubygem-raindrops>=0.18<1.0:www/rubygem-raindrops \
+	rubygem-octokit>=4.9<5.0:net/rubygem-octokit \
+	rubygem-mail_room>=0.9.1<0.10.0:mail/rubygem-mail_room \
+	rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \
 	rubygem-html2text>=0:textproc/rubygem-html2text \
-	rubygem-ruby-prof>=0.17.0:devel/rubygem-ruby-prof \
-	rubygem-rbtrace>=0.4:devel/rubygem-rbtrace \
-	rubygem-memory_profiler>=0.9:devel/rubygem-memory_profiler \
-	rubygem-benchmark-memory>=0.1:benchmarks/rubygem-benchmark-memory \
-	rubygem-activerecord-explain-analyze>=0.1:databases/rubygem-activerecord-explain-analyze \
-	rubygem-oauth2>=1.4.0:net/rubygem-oauth2 \
-	rubygem-health_check26-rails52>=2.6.0:devel/rubygem-health_check26-rails52 \
-	rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \
-	rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \
-	rubygem-net-ssh>=5.2:security/rubygem-net-ssh \
-	rubygem-sshkey>=2.0:security/rubygem-sshkey \
-	rubygem-ed25519>=1.2:security/rubygem-ed25519 \
-	rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \
-	rubygem-gitaly-proto>=1.37.0:net/rubygem-gitaly-proto \
-	rubygem-grpc>=1.19.0:net/rubygem-grpc \
-	rubygem-gitaly>=0.8.0:net/rubygem-gitaly \
-	rubygem-google-protobuf371>=3.7.1:devel/rubygem-google-protobuf371 \
-	rubygem-toml-rb10>=1.0.0:www/rubygem-toml-rb10 \
-	rubygem-flipper013>=0.13.0:devel/rubygem-flipper013 \
-	rubygem-flipper-active_record013>=0.13.0:databases/rubygem-flipper-active_record013 \
-	rubygem-flipper-active_support_cache_store013>=0.13.0:devel/rubygem-flipper-active_support_cache_store013 \
-	rubygem-lograge-rails52>=0.5:www/rubygem-lograge-rails52 \
-	rubygem-grape_logging>=1.7:devel/rubygem-grape_logging
+	rubygem-ruby-prof>=0.17.0<0.18.0:devel/rubygem-ruby-prof \
+	rubygem-rbtrace>=0.4<1.0:devel/rubygem-rbtrace \
+	rubygem-memory_profiler>=0.9<1.0:devel/rubygem-memory_profiler \
+	rubygem-benchmark-memory>=0.1<1.0:benchmarks/rubygem-benchmark-memory \
+	rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \
+	rubygem-oauth2>=1.4<2.0:net/rubygem-oauth2 \
+	rubygem-health_check26-rails52>=2.6.0<2.7.0:devel/rubygem-health_check26-rails52 \
+	rubygem-vmstat>=2.3.0<2.4.0:sysutils/rubygem-vmstat \
+	rubygem-sys-filesystem>=1.1.6<1.2.0:sysutils/rubygem-sys-filesystem \
+	rubygem-net-ssh>=5.2<6.0,2:security/rubygem-net-ssh \
+	rubygem-sshkey>=2.0<3.0:security/rubygem-sshkey \
+	rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \
+	rubygem-bcrypt_pbkdf>=1.0<2.0:security/rubygem-bcrypt_pbkdf \
+	rubygem-gitaly>=1.58.0<1.59.0:net/rubygem-gitaly \
+	rubygem-grpc>=1.19.0<1.20.0:net/rubygem-grpc \
+	rubygem-google-protobuf371>=3.7.1<3.8.0:devel/rubygem-google-protobuf371 \
+	rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \
+	rubygem-flipper013>=0.13.0<0.14.0:devel/rubygem-flipper013 \
+	rubygem-flipper-active_record013>=0.13.0<0.14.0:databases/rubygem-flipper-active_record013 \
+	rubygem-flipper-active_support_cache_store013>=0.13.0<0.14.0:devel/rubygem-flipper-active_support_cache_store013 \
+	rubygem-lograge-rails52>=0.5<1.0:www/rubygem-lograge-rails52 \
+	rubygem-grape_logging181>=1.7<2.0:devel/rubygem-grape_logging181
 
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 	${MY_DEPENDS}
@@ -227,7 +225,7 @@ USE_RC_SUBR=	gitlab
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags
-GL_COMMIT=	99e208281768e5414e3be694023c3e776efb1e24
+GL_COMMIT=	fcd107681ab480f87d5328367d25734ef5b81046
 
 USERS=	git
 GROUPS=	git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index fdc90cd73a7a..0c4f53cca2b6 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567142558
-SHA256 (gitlab-org-gitlab-ce-99e208281768e5414e3be694023c3e776efb1e24_GL0.tar.gz) = 5ae014172ecd2af590c2ad4943023b486c5631e5345deeec8267eccb7bcd7d50
-SIZE (gitlab-org-gitlab-ce-99e208281768e5414e3be694023c3e776efb1e24_GL0.tar.gz) = 80893091
+TIMESTAMP = 1568022609
+SHA256 (gitlab-org-gitlab-ce-fcd107681ab480f87d5328367d25734ef5b81046_GL0.tar.gz) = 685f777499b6689282d0743d38e06e6cdf7756226248c0356cac15485548e85c
+SIZE (gitlab-org-gitlab-ce-fcd107681ab480f87d5328367d25734ef5b81046_GL0.tar.gz) = 76157261
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index 783878279ae4..1c1fd810dbe2 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,14 +1,6 @@
---- Gemfile.orig	2019-08-12 15:15:49 UTC
+--- Gemfile.orig	2019-08-23 17:24:08 UTC
 +++ Gemfile
-@@ -14,7 +14,6 @@ gem 'sprockets', '~> 3.7.0'
- gem 'default_value_for', '~> 3.2.0'
- 
- # Supported DBs
--gem 'mysql2', '~> 0.4.10', group: :mysql
- gem 'pg', '~> 1.1', group: :postgres
- 
- gem 'rugged', '~> 0.28'
-@@ -84,7 +83,6 @@ gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
+@@ -86,7 +86,6 @@ gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
  gem 'graphql', '~> 1.8.0'
  gem 'graphiql-rails', '~> 1.4.10'
  gem 'apollo_upload_server', '~> 2.0.0.beta3'
@@ -16,7 +8,7 @@
  
  # Disable strong_params so that Mash does not respond to :permitted?
  gem 'hashie-forbidden_attributes'
-@@ -210,7 +208,7 @@ gem 'connection_pool', '~> 2.0'
+@@ -212,7 +211,7 @@ gem 'redis-rails', '~> 5.0.2'
  gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
  
  # HipChat integration
@@ -25,15 +17,7 @@
  
  # Jira integration
  gem 'jira-ruby', '~> 1.4'
-@@ -296,7 +294,6 @@ gem 'batch-loader', '~> 1.4.0'
- # Perf bar
- gem 'peek', '~> 1.0.1'
- gem 'peek-gc', '~> 0.0.2'
--gem 'peek-mysql2', '~> 1.2.0', group: :mysql
- gem 'peek-pg', '~> 1.3.0', group: :postgres
- gem 'peek-rblineprof', '~> 0.2.0'
- gem 'peek-redis', '~> 1.2.0'
-@@ -312,89 +309,6 @@ group :metrics do
+@@ -312,87 +311,6 @@ group :metrics do
    # Prometheus
    gem 'prometheus-client-mmap', '~> 0.9.8'
    gem 'raindrops', '~> 0.18'
@@ -55,7 +39,6 @@
 -end
 -
 -group :development, :test do
--  gem 'bootsnap', '~> 1.4'
 -  gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
 -  gem 'pry-byebug', '~> 3.5.1', platform: :mri
 -  gem 'pry-rails', '~> 0.3.4'
@@ -116,7 +99,6 @@
 -  gem 'json-schema', '~> 2.8.0'
 -  gem 'webmock', '~> 3.5.1'
 -  gem 'rails-controller-testing'
--  gem 'sham_rack', '~> 1.3.6'
 -  gem 'concurrent-ruby', '~> 1.1'
 -  gem 'test-prof', '~> 0.2.5'
 -  gem 'rspec_junit_formatter'
diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist
index cc2642e6abca..391c1f9b245e 100644
--- a/www/gitlab-ce/pkg-plist
+++ b/www/gitlab-ce/pkg-plist
@@ -1,5 +1,6 @@
 %%WWWDIR%%/.codeclimate.yml
 %%WWWDIR%%/.csscomb.json
+%%WWWDIR%%/.dockerignore
 %%WWWDIR%%/.eslintignore
 %%WWWDIR%%/.eslintrc.yml
 %%WWWDIR%%/.foreman
@@ -1963,6 +1964,7 @@
 %%WWWDIR%%/app/assets/images/white-scheme-preview.png
 %%WWWDIR%%/app/assets/javascripts/activities.js
 %%WWWDIR%%/app/assets/javascripts/ajax_loading_spinner.js
+%%WWWDIR%%/app/assets/javascripts/analytics/cycle_analytics/mixins/filter_mixins.js
 %%WWWDIR%%/app/assets/javascripts/api.js
 %%WWWDIR%%/app/assets/javascripts/autosave.js
 %%WWWDIR%%/app/assets/javascripts/avatar_picker.js
@@ -2031,6 +2033,7 @@
 %%WWWDIR%%/app/assets/javascripts/behaviors/markdown/render_gfm.js
 %%WWWDIR%%/app/assets/javascripts/behaviors/markdown/render_math.js
 %%WWWDIR%%/app/assets/javascripts/behaviors/markdown/render_mermaid.js
+%%WWWDIR%%/app/assets/javascripts/behaviors/markdown/render_metrics.js
 %%WWWDIR%%/app/assets/javascripts/behaviors/markdown/schema.js
 %%WWWDIR%%/app/assets/javascripts/behaviors/markdown/serializer.js
 %%WWWDIR%%/app/assets/javascripts/behaviors/preview_markdown.js
@@ -2097,6 +2100,7 @@
 %%WWWDIR%%/app/assets/javascripts/boards/components/project_select.vue
 %%WWWDIR%%/app/assets/javascripts/boards/components/sidebar/remove_issue.vue
 %%WWWDIR%%/app/assets/javascripts/boards/config_toggle.js
+%%WWWDIR%%/app/assets/javascripts/boards/ee_functions.js
 %%WWWDIR%%/app/assets/javascripts/boards/eventhub.js
 %%WWWDIR%%/app/assets/javascripts/boards/filtered_search_boards.js
 %%WWWDIR%%/app/assets/javascripts/boards/filters/due_date_filters.js
@@ -2220,6 +2224,7 @@
 %%WWWDIR%%/app/assets/javascripts/diffs/components/diff_content.vue
 %%WWWDIR%%/app/assets/javascripts/diffs/components/diff_discussion_reply.vue
 %%WWWDIR%%/app/assets/javascripts/diffs/components/diff_discussions.vue
+%%WWWDIR%%/app/assets/javascripts/diffs/components/diff_expansion_cell.vue
 %%WWWDIR%%/app/assets/javascripts/diffs/components/diff_file.vue
 %%WWWDIR%%/app/assets/javascripts/diffs/components/diff_file_header.vue
 %%WWWDIR%%/app/assets/javascripts/diffs/components/diff_gutter_avatars.vue
@@ -2232,10 +2237,12 @@
 %%WWWDIR%%/app/assets/javascripts/diffs/components/hidden_files_warning.vue
 %%WWWDIR%%/app/assets/javascripts/diffs/components/image_diff_overlay.vue
 %%WWWDIR%%/app/assets/javascripts/diffs/components/inline_diff_comment_row.vue
+%%WWWDIR%%/app/assets/javascripts/diffs/components/inline_diff_expansion_row.vue
 %%WWWDIR%%/app/assets/javascripts/diffs/components/inline_diff_table_row.vue
 %%WWWDIR%%/app/assets/javascripts/diffs/components/inline_diff_view.vue
 %%WWWDIR%%/app/assets/javascripts/diffs/components/no_changes.vue
 %%WWWDIR%%/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue
+%%WWWDIR%%/app/assets/javascripts/diffs/components/parallel_diff_expansion_row.vue
 %%WWWDIR%%/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
 %%WWWDIR%%/app/assets/javascripts/diffs/components/parallel_diff_view.vue
 %%WWWDIR%%/app/assets/javascripts/diffs/components/settings_dropdown.vue
@@ -2377,6 +2384,7 @@
 %%WWWDIR%%/app/assets/javascripts/gl_field_errors.js
 %%WWWDIR%%/app/assets/javascripts/gl_form.js
 %%WWWDIR%%/app/assets/javascripts/gpg_badges.js
+%%WWWDIR%%/app/assets/javascripts/graphql_shared/fragments/pageInfo.fragment.graphql
 %%WWWDIR%%/app/assets/javascripts/group.js
 %%WWWDIR%%/app/assets/javascripts/group_label_subscription.js
 %%WWWDIR%%/app/assets/javascripts/groups/components/app.vue
@@ -2604,6 +2612,7 @@
 %%WWWDIR%%/app/assets/javascripts/jobs/components/job_log.vue
 %%WWWDIR%%/app/assets/javascripts/jobs/components/job_log_controllers.vue
 %%WWWDIR%%/app/assets/javascripts/jobs/components/jobs_container.vue
+%%WWWDIR%%/app/assets/javascripts/jobs/components/manual_variables_form.vue
 %%WWWDIR%%/app/assets/javascripts/jobs/components/sidebar.vue
 %%WWWDIR%%/app/assets/javascripts/jobs/components/sidebar_detail_row.vue
 %%WWWDIR%%/app/assets/javascripts/jobs/components/stages_dropdown.vue
@@ -2636,16 +2645,19 @@
 %%WWWDIR%%/app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/cache.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/chart_utils.js
+%%WWWDIR%%/app/assets/javascripts/lib/utils/color_utils.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/common_utils.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/constants.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/csrf.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/datetime_utility.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/dom_utils.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/file_upload.js
+%%WWWDIR%%/app/assets/javascripts/lib/utils/forms.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/grammar.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/highlight.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/http_status.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/icon_utils.js
+%%WWWDIR%%/app/assets/javascripts/lib/utils/icons_path.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/image_utility.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/invalid_url.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/keycodes.js
@@ -2693,8 +2705,10 @@
 %%WWWDIR%%/app/assets/javascripts/mirrors/ssh_mirror.js
 %%WWWDIR%%/app/assets/javascripts/monitoring/components/charts/area.vue
 %%WWWDIR%%/app/assets/javascripts/monitoring/components/charts/column.vue
+%%WWWDIR%%/app/assets/javascripts/monitoring/components/charts/empty_chart.vue
 %%WWWDIR%%/app/assets/javascripts/monitoring/components/charts/single_stat.vue
 %%WWWDIR%%/app/assets/javascripts/monitoring/components/dashboard.vue
+%%WWWDIR%%/app/assets/javascripts/monitoring/components/embed.vue
 %%WWWDIR%%/app/assets/javascripts/monitoring/components/empty_state.vue
 %%WWWDIR%%/app/assets/javascripts/monitoring/components/graph_group.vue
 %%WWWDIR%%/app/assets/javascripts/monitoring/components/panel_type.vue
@@ -2743,6 +2757,7 @@
 %%WWWDIR%%/app/assets/javascripts/notes/components/discussion_filter.vue
 %%WWWDIR%%/app/assets/javascripts/notes/components/discussion_filter_note.vue
 %%WWWDIR%%/app/assets/javascripts/notes/components/discussion_jump_to_next_button.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/discussion_keyboard_navigator.vue
 %%WWWDIR%%/app/assets/javascripts/notes/components/discussion_locked_widget.vue
 %%WWWDIR%%/app/assets/javascripts/notes/components/discussion_notes.vue
 %%WWWDIR%%/app/assets/javascripts/notes/components/discussion_notes_replies_wrapper.vue
@@ -3014,6 +3029,7 @@
 %%WWWDIR%%/app/assets/javascripts/pages/root/index.js
 %%WWWDIR%%/app/assets/javascripts/pages/search/init_filtered_search.js
 %%WWWDIR%%/app/assets/javascripts/pages/search/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/search/show/refresh_counts.js
 %%WWWDIR%%/app/assets/javascripts/pages/search/show/search.js
 %%WWWDIR%%/app/assets/javascripts/pages/sessions/index.js
 %%WWWDIR%%/app/assets/javascripts/pages/sessions/new/index.js
@@ -3074,6 +3090,7 @@
 %%WWWDIR%%/app/assets/javascripts/pipelines/services/pipelines_service.js
 %%WWWDIR%%/app/assets/javascripts/pipelines/stores/pipeline_store.js
 %%WWWDIR%%/app/assets/javascripts/pipelines/stores/pipelines_store.js
+%%WWWDIR%%/app/assets/javascripts/privacy_policy_update_callout.js
 %%WWWDIR%%/app/assets/javascripts/profile/account/components/delete_account_modal.vue
 %%WWWDIR%%/app/assets/javascripts/profile/account/components/update_username.vue
 %%WWWDIR%%/app/assets/javascripts/profile/account/index.js
@@ -3100,6 +3117,7 @@
 %%WWWDIR%%/app/assets/javascripts/projects/gke_cluster_dropdowns/store/mutation_types.js
 %%WWWDIR%%/app/assets/javascripts/projects/gke_cluster_dropdowns/store/mutations.js
 %%WWWDIR%%/app/assets/javascripts/projects/gke_cluster_dropdowns/store/state.js
+%%WWWDIR%%/app/assets/javascripts/projects/gke_cluster_namespace/index.js
 %%WWWDIR%%/app/assets/javascripts/projects/project_import_gitlab_project.js
 %%WWWDIR%%/app/assets/javascripts/projects/project_new.js
 %%WWWDIR%%/app/assets/javascripts/projects/projects_filterable_list.js
@@ -3267,6 +3285,7 @@
 %%WWWDIR%%/app/assets/javascripts/test_utils/simulate_drag.js
 %%WWWDIR%%/app/assets/javascripts/test_utils/simulate_input.js
 %%WWWDIR%%/app/assets/javascripts/toggle_buttons.js
+%%WWWDIR%%/app/assets/javascripts/tracking.js
 %%WWWDIR%%/app/assets/javascripts/tree.js
 %%WWWDIR%%/app/assets/javascripts/u2f/authenticate.js
 %%WWWDIR%%/app/assets/javascripts/u2f/error.js
@@ -3280,14 +3299,21 @@
 %%WWWDIR%%/app/assets/javascripts/validators/input_validator.js
 %%WWWDIR%%/app/assets/javascripts/version_check_image.js
 %%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/components/comment.js
-%%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/components/constants.js
+%%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/components/comment_mr_note.js
+%%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/components/comment_post.js
+%%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/components/comment_storage.js
+%%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/components/form_elements.js
 %%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/components/index.js
 %%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/components/login.js
+%%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/components/mr_id.js
 %%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/components/note.js
 %%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/components/utils.js
 %%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/components/wrapper.js
 %%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/components/wrapper_icons.js
 %%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/index.js
+%%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/shared/constants.js
+%%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/shared/index.js
+%%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/shared/storage_utils.js
 %%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/store/events.js
 %%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/store/index.js
 %%WWWDIR%%/app/assets/javascripts/visual_review_toolbar/store/state.js
@@ -3470,6 +3496,7 @@
 %%WWWDIR%%/app/assets/javascripts/vuex_shared/modules/modal/state.js
 %%WWWDIR%%/app/assets/javascripts/webpack.js
 %%WWWDIR%%/app/assets/javascripts/zen_mode.js
+%%WWWDIR%%/app/assets/stylesheets/_ee/application_ee.scss
 %%WWWDIR%%/app/assets/stylesheets/application.scss
 %%WWWDIR%%/app/assets/stylesheets/behaviors.scss
 %%WWWDIR%%/app/assets/stylesheets/bootstrap_migration.scss
@@ -3613,6 +3640,7 @@
 %%WWWDIR%%/app/assets/stylesheets/pages/todos.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/tree.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/ui_dev_kit.scss
+%%WWWDIR%%/app/assets/stylesheets/pages/users.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/wiki.scss
 %%WWWDIR%%/app/assets/stylesheets/performance_bar.scss
 %%WWWDIR%%/app/assets/stylesheets/print.scss
@@ -3668,6 +3696,7 @@
 %%WWWDIR%%/app/controllers/concerns/boards_actions.rb
 %%WWWDIR%%/app/controllers/concerns/boards_responses.rb
 %%WWWDIR%%/app/controllers/concerns/checks_collaboration.rb
+%%WWWDIR%%/app/controllers/concerns/confirm_email_warning.rb
 %%WWWDIR%%/app/controllers/concerns/continue_params.rb
 %%WWWDIR%%/app/controllers/concerns/controller_with_cross_project_access_check.rb
 %%WWWDIR%%/app/controllers/concerns/creates_commit.rb
@@ -3679,6 +3708,7 @@
 %%WWWDIR%%/app/controllers/concerns/hooks_execution.rb
 %%WWWDIR%%/app/controllers/concerns/import_url_params.rb
 %%WWWDIR%%/app/controllers/concerns/internal_redirect.rb
+%%WWWDIR%%/app/controllers/concerns/invisible_captcha.rb
 %%WWWDIR%%/app/controllers/concerns/issuable_actions.rb
 %%WWWDIR%%/app/controllers/concerns/issuable_collections.rb
 %%WWWDIR%%/app/controllers/concerns/issuable_collections_action.rb
@@ -3867,6 +3897,7 @@
 %%WWWDIR%%/app/controllers/projects/settings/repository_controller.rb
 %%WWWDIR%%/app/controllers/projects/snippets_controller.rb
 %%WWWDIR%%/app/controllers/projects/stages_controller.rb
+%%WWWDIR%%/app/controllers/projects/starrers_controller.rb
 %%WWWDIR%%/app/controllers/projects/tags/releases_controller.rb
 %%WWWDIR%%/app/controllers/projects/tags_controller.rb
 %%WWWDIR%%/app/controllers/projects/templates_controller.rb
@@ -3907,11 +3938,13 @@
 %%WWWDIR%%/app/finders/branches_finder.rb
 %%WWWDIR%%/app/finders/cluster_ancestors_finder.rb
 %%WWWDIR%%/app/finders/clusters/knative_services_finder.rb
+%%WWWDIR%%/app/finders/clusters/kubernetes_namespace_finder.rb
 %%WWWDIR%%/app/finders/clusters_finder.rb
 %%WWWDIR%%/app/finders/concerns/created_at_filter.rb
 %%WWWDIR%%/app/finders/concerns/custom_attributes_filter.rb
 %%WWWDIR%%/app/finders/concerns/finder_methods.rb
 %%WWWDIR%%/app/finders/concerns/finder_with_cross_project_access.rb
+%%WWWDIR%%/app/finders/container_repositories_finder.rb
 %%WWWDIR%%/app/finders/contributed_projects_finder.rb
 %%WWWDIR%%/app/finders/environments_finder.rb
 %%WWWDIR%%/app/finders/events_finder.rb
@@ -3941,9 +3974,9 @@
 %%WWWDIR%%/app/finders/projects/serverless/functions_finder.rb
 %%WWWDIR%%/app/finders/projects_finder.rb
 %%WWWDIR%%/app/finders/releases_finder.rb
-%%WWWDIR%%/app/finders/remote_mirror_finder.rb
 %%WWWDIR%%/app/finders/runner_jobs_finder.rb
 %%WWWDIR%%/app/finders/snippets_finder.rb
+%%WWWDIR%%/app/finders/starred_projects_finder.rb
 %%WWWDIR%%/app/finders/tags_finder.rb
 %%WWWDIR%%/app/finders/template_finder.rb
 %%WWWDIR%%/app/finders/todos_finder.rb
@@ -3951,6 +3984,7 @@
 %%WWWDIR%%/app/finders/user_finder.rb
 %%WWWDIR%%/app/finders/user_recent_events_finder.rb
 %%WWWDIR%%/app/finders/users_finder.rb
+%%WWWDIR%%/app/finders/users_star_projects_finder.rb
 %%WWWDIR%%/app/finders/users_with_pending_todos_finder.rb
 %%WWWDIR%%/app/graphql/functions/base_function.rb
 %%WWWDIR%%/app/graphql/functions/echo.rb
@@ -4123,6 +4157,7 @@
 %%WWWDIR%%/app/helpers/search_helper.rb
 %%WWWDIR%%/app/helpers/selects_helper.rb
 %%WWWDIR%%/app/helpers/services_helper.rb
+%%WWWDIR%%/app/helpers/sessions_helper.rb
 %%WWWDIR%%/app/helpers/sidekiq_helper.rb
 %%WWWDIR%%/app/helpers/snippets_helper.rb
 %%WWWDIR%%/app/helpers/sorting_helper.rb
@@ -4166,6 +4201,8 @@
 %%WWWDIR%%/app/models/ability.rb
 %%WWWDIR%%/app/models/abuse_report.rb
 %%WWWDIR%%/app/models/active_session.rb
+%%WWWDIR%%/app/models/analytics/cycle_analytics.rb
+%%WWWDIR%%/app/models/analytics/cycle_analytics/project_stage.rb
 %%WWWDIR%%/app/models/appearance.rb
 %%WWWDIR%%/app/models/application_record.rb
 %%WWWDIR%%/app/models/application_setting.rb
@@ -4225,6 +4262,7 @@
 %%WWWDIR%%/app/models/ci/bridge.rb
 %%WWWDIR%%/app/models/ci/build.rb
 %%WWWDIR%%/app/models/ci/build_metadata.rb
+%%WWWDIR%%/app/models/ci/build_need.rb
 %%WWWDIR%%/app/models/ci/build_runner_session.rb
 %%WWWDIR%%/app/models/ci/build_trace_chunk.rb
 %%WWWDIR%%/app/models/ci/build_trace_chunks/database.rb
@@ -4235,6 +4273,7 @@
 %%WWWDIR%%/app/models/ci/group.rb
 %%WWWDIR%%/app/models/ci/group_variable.rb
 %%WWWDIR%%/app/models/ci/job_artifact.rb
+%%WWWDIR%%/app/models/ci/job_variable.rb
 %%WWWDIR%%/app/models/ci/legacy_stage.rb
 %%WWWDIR%%/app/models/ci/pipeline.rb
 %%WWWDIR%%/app/models/ci/pipeline_chat_data.rb
@@ -4296,7 +4335,6 @@
 %%WWWDIR%%/app/models/concerns/deployable.rb
 %%WWWDIR%%/app/models/concerns/deployment_platform.rb
 %%WWWDIR%%/app/models/concerns/deprecated_assignee.rb
-%%WWWDIR%%/app/models/concerns/descendant.rb
 %%WWWDIR%%/app/models/concerns/diff_file.rb
 %%WWWDIR%%/app/models/concerns/diff_positionable_note.rb
 %%WWWDIR%%/app/models/concerns/discussion_on_diff.rb
@@ -4310,6 +4348,7 @@
 %%WWWDIR%%/app/models/concerns/from_union.rb
 %%WWWDIR%%/app/models/concerns/ghost_user.rb
 %%WWWDIR%%/app/models/concerns/group_descendant.rb
+%%WWWDIR%%/app/models/concerns/has_environment_scope.rb
 %%WWWDIR%%/app/models/concerns/has_ref.rb
 %%WWWDIR%%/app/models/concerns/has_status.rb
 %%WWWDIR%%/app/models/concerns/has_variable.rb
@@ -4326,6 +4365,7 @@
 %%WWWDIR%%/app/models/concerns/mentionable/reference_regexes.rb
 %%WWWDIR%%/app/models/concerns/milestoneish.rb
 %%WWWDIR%%/app/models/concerns/mirror_authentication.rb
+%%WWWDIR%%/app/models/concerns/new_has_variable.rb
 %%WWWDIR%%/app/models/concerns/note_on_diff.rb
 %%WWWDIR%%/app/models/concerns/noteable.rb
 %%WWWDIR%%/app/models/concerns/optionally_search.rb
@@ -4378,7 +4418,8 @@
 %%WWWDIR%%/app/models/conversational_development_index/card.rb
 %%WWWDIR%%/app/models/conversational_development_index/idea_to_production_step.rb
 %%WWWDIR%%/app/models/conversational_development_index/metric.rb
-%%WWWDIR%%/app/models/cycle_analytics/base.rb
+%%WWWDIR%%/app/models/cycle_analytics/group_level.rb
+%%WWWDIR%%/app/models/cycle_analytics/level_base.rb
 %%WWWDIR%%/app/models/cycle_analytics/project_level.rb
 %%WWWDIR%%/app/models/dashboard_group_milestone.rb
 %%WWWDIR%%/app/models/dashboard_milestone.rb
@@ -4534,7 +4575,6 @@
 %%WWWDIR%%/app/models/project_services/issue_tracker_service.rb
 %%WWWDIR%%/app/models/project_services/jira_service.rb
 %%WWWDIR%%/app/models/project_services/jira_tracker_data.rb
-%%WWWDIR%%/app/models/project_services/kubernetes_service.rb
 %%WWWDIR%%/app/models/project_services/mattermost_service.rb
 %%WWWDIR%%/app/models/project_services/mattermost_slash_commands_service.rb
 %%WWWDIR%%/app/models/project_services/microsoft_teams_service.rb
@@ -4760,6 +4800,8 @@
 %%WWWDIR%%/app/serializers/error_tracking/error_serializer.rb
 %%WWWDIR%%/app/serializers/error_tracking/project_entity.rb
 %%WWWDIR%%/app/serializers/error_tracking/project_serializer.rb
+%%WWWDIR%%/app/serializers/group_analytics_stage_entity.rb
+%%WWWDIR%%/app/serializers/group_analytics_stage_serializer.rb
 %%WWWDIR%%/app/serializers/group_child_entity.rb
 %%WWWDIR%%/app/serializers/group_child_serializer.rb
 %%WWWDIR%%/app/serializers/group_entity.rb
@@ -4789,6 +4831,8 @@
 %%WWWDIR%%/app/serializers/merge_request_diff_entity.rb
 %%WWWDIR%%/app/serializers/merge_request_for_pipeline_entity.rb
 %%WWWDIR%%/app/serializers/merge_request_metrics_entity.rb
+%%WWWDIR%%/app/serializers/merge_request_poll_cached_widget_entity.rb
+%%WWWDIR%%/app/serializers/merge_request_poll_widget_entity.rb
 %%WWWDIR%%/app/serializers/merge_request_serializer.rb
 %%WWWDIR%%/app/serializers/merge_request_sidebar_extras_entity.rb
 %%WWWDIR%%/app/serializers/merge_request_user_entity.rb
@@ -4903,6 +4947,7 @@
 %%WWWDIR%%/app/services/clusters/applications/uninstall_service.rb
 %%WWWDIR%%/app/services/clusters/applications/update_service.rb
 %%WWWDIR%%/app/services/clusters/applications/upgrade_service.rb
+%%WWWDIR%%/app/services/clusters/build_kubernetes_namespace_service.rb
 %%WWWDIR%%/app/services/clusters/build_service.rb
 %%WWWDIR%%/app/services/clusters/create_service.rb
 %%WWWDIR%%/app/services/clusters/gcp/fetch_operation_service.rb
@@ -4913,7 +4958,6 @@
 %%WWWDIR%%/app/services/clusters/gcp/kubernetes/fetch_kubernetes_token_service.rb
 %%WWWDIR%%/app/services/clusters/gcp/provision_service.rb
 %%WWWDIR%%/app/services/clusters/gcp/verify_provision_status_service.rb
-%%WWWDIR%%/app/services/clusters/refresh_service.rb
 %%WWWDIR%%/app/services/clusters/update_service.rb
 %%WWWDIR%%/app/services/cohorts_service.rb
 %%WWWDIR%%/app/services/commits/change_service.rb
@@ -5043,6 +5087,13 @@
 %%WWWDIR%%/app/services/merge_requests/squash_service.rb
 %%WWWDIR%%/app/services/merge_requests/update_service.rb
 %%WWWDIR%%/app/services/merge_requests/working_copy_base_service.rb
+%%WWWDIR%%/app/services/metrics/dashboard/base_embed_service.rb
+%%WWWDIR%%/app/services/metrics/dashboard/base_service.rb
+%%WWWDIR%%/app/services/metrics/dashboard/custom_metric_embed_service.rb
+%%WWWDIR%%/app/services/metrics/dashboard/default_embed_service.rb
+%%WWWDIR%%/app/services/metrics/dashboard/dynamic_embed_service.rb
+%%WWWDIR%%/app/services/metrics/dashboard/project_dashboard_service.rb
+%%WWWDIR%%/app/services/metrics/dashboard/system_dashboard_service.rb
 %%WWWDIR%%/app/services/metrics_service.rb
 %%WWWDIR%%/app/services/milestones/base_service.rb
 %%WWWDIR%%/app/services/milestones/close_service.rb
@@ -5212,6 +5263,7 @@
 %%WWWDIR%%/app/services/wiki_pages/destroy_service.rb
 %%WWWDIR%%/app/services/wiki_pages/update_service.rb
 %%WWWDIR%%/app/services/wikis/create_attachment_service.rb
+%%WWWDIR%%/app/services/zoom_notes_service.rb
 %%WWWDIR%%/app/uploaders/attachment_uploader.rb
 %%WWWDIR%%/app/uploaders/avatar_uploader.rb
 %%WWWDIR%%/app/uploaders/external_diff_uploader.rb
@@ -5246,7 +5298,9 @@
 %%WWWDIR%%/app/validators/namespace_path_validator.rb
 %%WWWDIR%%/app/validators/project_path_validator.rb
 %%WWWDIR%%/app/validators/public_url_validator.rb
+%%WWWDIR%%/app/validators/qualified_domain_array_validator.rb
 %%WWWDIR%%/app/validators/sha_validator.rb
+%%WWWDIR%%/app/validators/system_hook_url_validator.rb
 %%WWWDIR%%/app/validators/top_level_group_validator.rb
 %%WWWDIR%%/app/validators/variable_duplicates_validator.rb
 %%WWWDIR%%/app/validators/x509_certificate_credentials_validator.rb
@@ -5284,6 +5338,7 @@
 %%WWWDIR%%/app/views/admin/application_settings/_repository_storage.html.haml
 %%WWWDIR%%/app/views/admin/application_settings/_signin.html.haml
 %%WWWDIR%%/app/views/admin/application_settings/_signup.html.haml
+%%WWWDIR%%/app/views/admin/application_settings/_snowplow.html.haml
 %%WWWDIR%%/app/views/admin/application_settings/_spam.html.haml
 %%WWWDIR%%/app/views/admin/application_settings/_terminal.html.haml
 %%WWWDIR%%/app/views/admin/application_settings/_terms.html.haml
@@ -5376,6 +5431,8 @@
 %%WWWDIR%%/app/views/ci/status/_dropdown_graph_badge.html.haml
 %%WWWDIR%%/app/views/ci/status/_icon.html.haml
 %%WWWDIR%%/app/views/ci/variables/_content.html.haml
+%%WWWDIR%%/app/views/ci/variables/_environment_scope.html.haml
+%%WWWDIR%%/app/views/ci/variables/_environment_scope_header.html.haml
 %%WWWDIR%%/app/views/ci/variables/_header.html.haml
 %%WWWDIR%%/app/views/ci/variables/_index.html.haml
 %%WWWDIR%%/app/views/ci/variables/_variable_header.html.haml
@@ -5387,6 +5444,7 @@
 %%WWWDIR%%/app/views/clusters/clusters/_empty_state.html.haml
 %%WWWDIR%%/app/views/clusters/clusters/_form.html.haml
 %%WWWDIR%%/app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml
+%%WWWDIR%%/app/views/clusters/clusters/_namespace.html.haml
 %%WWWDIR%%/app/views/clusters/clusters/_sidebar.html.haml
 %%WWWDIR%%/app/views/clusters/clusters/gcp/_form.html.haml
 %%WWWDIR%%/app/views/clusters/clusters/gcp/_header.html.haml
@@ -5553,6 +5611,7 @@
 %%WWWDIR%%/app/views/groups/settings/_lfs.html.haml
 %%WWWDIR%%/app/views/groups/settings/_permissions.html.haml
 %%WWWDIR%%/app/views/groups/settings/_project_creation_level.html.haml
+%%WWWDIR%%/app/views/groups/settings/_subgroup_creation_level.html.haml
 %%WWWDIR%%/app/views/groups/settings/_two_factor_auth.html.haml
 %%WWWDIR%%/app/views/groups/settings/badges/index.html.haml
 %%WWWDIR%%/app/views/groups/settings/ci_cd/_auto_devops_form.html.haml
@@ -5625,6 +5684,7 @@
 %%WWWDIR%%/app/views/layouts/_piwik.html.haml
 %%WWWDIR%%/app/views/layouts/_recaptcha_verification.html.haml
 %%WWWDIR%%/app/views/layouts/_search.html.haml
+%%WWWDIR%%/app/views/layouts/_snowplow.html.haml
 %%WWWDIR%%/app/views/layouts/admin.html.haml
 %%WWWDIR%%/app/views/layouts/application.html.haml
 %%WWWDIR%%/app/views/layouts/dashboard.html.haml
@@ -5781,9 +5841,6 @@
 %%WWWDIR%%/app/views/notify/resolved_all_discussions_email.html.haml
 %%WWWDIR%%/app/views/notify/resolved_all_discussions_email.text.erb
 %%WWWDIR%%/app/views/peek/_bar.html.haml
-%%WWWDIR%%/app/views/peek/views/_gc.html.haml
-%%WWWDIR%%/app/views/peek/views/_redis.html.haml
-%%WWWDIR%%/app/views/peek/views/_sidekiq.html.haml
 %%WWWDIR%%/app/views/profiles/_email_settings.html.haml
 %%WWWDIR%%/app/views/profiles/_event_table.html.haml
 %%WWWDIR%%/app/views/profiles/accounts/_providers.html.haml
@@ -6222,6 +6279,8 @@
 %%WWWDIR%%/app/views/projects/snippets/show.html.haml
 %%WWWDIR%%/app/views/projects/snippets/verify.html.haml
 %%WWWDIR%%/app/views/projects/stage/_stage.html.haml
+%%WWWDIR%%/app/views/projects/starrers/_starrer.html.haml
+%%WWWDIR%%/app/views/projects/starrers/index.html.haml
 %%WWWDIR%%/app/views/projects/tags/_tag.atom.builder
 %%WWWDIR%%/app/views/projects/tags/_tag.html.haml
 %%WWWDIR%%/app/views/projects/tags/destroy.js.haml
@@ -6623,6 +6682,11 @@
 %%WWWDIR%%/app/workers/build_queue_worker.rb
 %%WWWDIR%%/app/workers/build_success_worker.rb
 %%WWWDIR%%/app/workers/build_trace_sections_worker.rb
+%%WWWDIR%%/app/workers/chaos/cpu_spin_worker.rb
+%%WWWDIR%%/app/workers/chaos/db_spin_worker.rb
+%%WWWDIR%%/app/workers/chaos/kill_worker.rb
+%%WWWDIR%%/app/workers/chaos/leak_mem_worker.rb
+%%WWWDIR%%/app/workers/chaos/sleep_worker.rb
 %%WWWDIR%%/app/workers/chat_notification_worker.rb
 %%WWWDIR%%/app/workers/ci/archive_traces_cron_worker.rb
 %%WWWDIR%%/app/workers/ci/build_prepare_worker.rb
@@ -6641,6 +6705,7 @@
 %%WWWDIR%%/app/workers/clusters/applications/wait_for_uninstall_app_worker.rb
 %%WWWDIR%%/app/workers/concerns/application_worker.rb
 %%WWWDIR%%/app/workers/concerns/auto_devops_queue.rb
+%%WWWDIR%%/app/workers/concerns/chaos_queue.rb
 %%WWWDIR%%/app/workers/concerns/cluster_applications.rb
 %%WWWDIR%%/app/workers/concerns/cluster_queue.rb
 %%WWWDIR%%/app/workers/concerns/cronjob_queue.rb
@@ -6816,7 +6881,6 @@
 %%WWWDIR%%/config/boot.rb
 %%WWWDIR%%/config/brakeman.ignore
 %%WWWDIR%%/config/database.yml.env
-%%WWWDIR%%/config/database.yml.mysql
 %%WWWDIR%%/config/database.yml.postgresql
 %%WWWDIR%%/config/database_geo.yml.postgresql
 %%WWWDIR%%/config/dependency_decisions.yml
@@ -6829,6 +6893,7 @@
 %%WWWDIR%%/config/initializers/0_acts_as_taggable.rb
 %%WWWDIR%%/config/initializers/0_as_concern.rb
 %%WWWDIR%%/config/initializers/0_inflections.rb
+%%WWWDIR%%/config/initializers/0_inject_enterprise_edition_module.rb
 %%WWWDIR%%/config/initializers/0_license.rb
 %%WWWDIR%%/config/initializers/0_post_deployment_migrations.rb
 %%WWWDIR%%/config/initializers/0_thread_cache.rb
@@ -6847,14 +6912,10 @@
 %%WWWDIR%%/config/initializers/active_record_build_select.rb
 %%WWWDIR%%/config/initializers/active_record_data_types.rb
 %%WWWDIR%%/config/initializers/active_record_lifecycle.rb
-%%WWWDIR%%/config/initializers/active_record_migration.rb
-%%WWWDIR%%/config/initializers/active_record_mysql_timestamp.rb
 %%WWWDIR%%/config/initializers/active_record_preloader.rb
 %%WWWDIR%%/config/initializers/active_record_query_cache.rb
 %%WWWDIR%%/config/initializers/active_record_schema_ignore_tables.rb
 %%WWWDIR%%/config/initializers/active_record_table_definition.rb
-%%WWWDIR%%/config/initializers/ar_mysql_jsonb_support.rb
-%%WWWDIR%%/config/initializers/ar_native_database_types.rb
 %%WWWDIR%%/config/initializers/ar_speed_up_migration_checking.rb
 %%WWWDIR%%/config/initializers/asset_proxy_settings.rb
 %%WWWDIR%%/config/initializers/attr_encrypted_no_db_connection.rb
@@ -6864,8 +6925,8 @@
 %%WWWDIR%%/config/initializers/bullet.rb
 %%WWWDIR%%/config/initializers/chronic_duration.rb
 %%WWWDIR%%/config/initializers/config_initializers_active_record_locking.rb
-%%WWWDIR%%/config/initializers/connection_fix.rb
 %%WWWDIR%%/config/initializers/console_message.rb
+%%WWWDIR%%/config/initializers/content_security_policy.rb
 %%WWWDIR%%/config/initializers/cookies_serializer.rb
 %%WWWDIR%%/config/initializers/correlation_id.rb
 %%WWWDIR%%/config/initializers/date_time_formats.rb
@@ -6895,6 +6956,7 @@
 %%WWWDIR%%/config/initializers/hipchat_client_patch.rb
 %%WWWDIR%%/config/initializers/http_hostname_override.rb
 %%WWWDIR%%/config/initializers/httpclient_patch.rb
+%%WWWDIR%%/config/initializers/invisible_captcha.rb
 %%WWWDIR%%/config/initializers/jira.rb
 %%WWWDIR%%/config/initializers/kaminari_active_record_relation_methods_with_limit.rb
 %%WWWDIR%%/config/initializers/kaminari_config.rb
@@ -6903,8 +6965,6 @@
 %%WWWDIR%%/config/initializers/macos.rb
 %%WWWDIR%%/config/initializers/mime_types.rb
 %%WWWDIR%%/config/initializers/mini_magick.rb
-%%WWWDIR%%/config/initializers/mysql_ignore_postgresql_options.rb
-%%WWWDIR%%/config/initializers/mysql_set_length_for_binary_indexes.rb
 %%WWWDIR%%/config/initializers/new_framework_defaults.rb
 %%WWWDIR%%/config/initializers/octokit.rb
 %%WWWDIR%%/config/initializers/omniauth.rb
@@ -6912,7 +6972,6 @@
 %%WWWDIR%%/config/initializers/peek.rb
 %%WWWDIR%%/config/initializers/postgresql_cte.rb
 %%WWWDIR%%/config/initializers/postgresql_limit_fix.rb
-%%WWWDIR%%/config/initializers/postgresql_opclasses_support.rb
 %%WWWDIR%%/config/initializers/premailer.rb
 %%WWWDIR%%/config/initializers/query_limiting.rb
 %%WWWDIR%%/config/initializers/rack_attack_git_basic_auth.rb
@@ -6948,6 +7007,7 @@
 %%WWWDIR%%/config/initializers/zz_metrics.rb
 %%WWWDIR%%/config/jsdocs.config.js
 %%WWWDIR%%/config/karma.config.js
+%%WWWDIR%%/config/knative/api_resources.yml
 %%WWWDIR%%/config/license_finder.yml
 %%WWWDIR%%/config/locales/carrierwave.en.yml
 %%WWWDIR%%/config/locales/de.yml
@@ -6955,6 +7015,7 @@
 %%WWWDIR%%/config/locales/doorkeeper.en.yml
 %%WWWDIR%%/config/locales/en.yml
 %%WWWDIR%%/config/locales/es.yml
+%%WWWDIR%%/config/locales/invisible_captcha.en.yml
 %%WWWDIR%%/config/locales/sherlock.en.yml
 %%WWWDIR%%/config/mail_room.yml
 %%WWWDIR%%/config/no_todos_messages.yml
@@ -7106,7 +7167,6 @@
 %%WWWDIR%%/db/migrate/20180330121048_add_issue_due_to_notification_settings.rb
 %%WWWDIR%%/db/migrate/20180403035759_create_project_ci_cd_settings.rb
 %%WWWDIR%%/db/migrate/20180405142733_create_project_deploy_tokens.rb
-%%WWWDIR%%/db/migrate/20180406204716_add_limits_ci_build_trace_chunks_raw_data_for_mysql.rb
 %%WWWDIR%%/db/migrate/20180408143354_rename_users_rss_token_to_feed_token.rb
 %%WWWDIR%%/db/migrate/20180413022611_create_missing_namespace_for_internal_users.rb
 %%WWWDIR%%/db/migrate/20180416155103_add_further_scope_columns_to_internal_id_table.rb
@@ -7144,7 +7204,6 @@
 %%WWWDIR%%/db/migrate/20180515005612_add_squash_to_merge_requests.rb
 %%WWWDIR%%/db/migrate/20180515121227_create_notes_diff_files.rb
 %%WWWDIR%%/db/migrate/20180517082340_add_not_null_constraints_to_project_authorizations.rb
-%%WWWDIR%%/db/migrate/20180521171529_increase_mysql_text_limit_for_gpg_keys.rb
 %%WWWDIR%%/db/migrate/20180523042841_rename_merge_requests_allow_maintainer_to_push.rb
 %%WWWDIR%%/db/migrate/20180524132016_merge_requests_target_id_iid_state_partial_index.rb
 %%WWWDIR%%/db/migrate/20180529093006_ensure_remote_mirror_columns.rb
@@ -7184,7 +7243,7 @@
 %%WWWDIR%%/db/migrate/20180815160409_add_file_location_to_ci_job_artifacts.rb
 %%WWWDIR%%/db/migrate/20180815170510_add_partial_index_to_ci_builds_artifacts_file.rb
 %%WWWDIR%%/db/migrate/20180815175440_add_index_on_list_type.rb
-%%WWWDIR%%/db/migrate/20180831164904_fix_prometheus_metric_query_limits.rb
+%%WWWDIR%%/db/migrate/20180824202952_add_outbound_requests_whitelist_to_application_settings.rb
 %%WWWDIR%%/db/migrate/20180831164905_add_common_to_prometheus_metrics.rb
 %%WWWDIR%%/db/migrate/20180831164907_add_index_on_common_for_prometheus_metrics.rb
 %%WWWDIR%%/db/migrate/20180831164908_add_identifier_to_prometheus_metric.rb
@@ -7358,7 +7417,11 @@
 %%WWWDIR%%/db/migrate/20190607205656_add_wiki_columns_to_index_status.rb
 %%WWWDIR%%/db/migrate/20190610142825_add_index_to_members_invite_email.rb
 %%WWWDIR%%/db/migrate/20190611090827_add_time_tracking_limit_to_hours_to_application_settings.rb
+%%WWWDIR%%/db/migrate/20190611100201_add_geo_container_repository_updated_events_table.rb
+%%WWWDIR%%/db/migrate/20190611100202_add_index_to_geo_event_log.rb
 %%WWWDIR%%/db/migrate/20190611161641_add_target_project_id_to_merge_trains.rb
+%%WWWDIR%%/db/migrate/20190612111201_add_geo_container_repository_counters.rb
+%%WWWDIR%%/db/migrate/20190612111404_add_geo_container_sync_capacity.rb
 %%WWWDIR%%/db/migrate/20190613030606_enable_hashed_storage_by_default.rb
 %%WWWDIR%%/db/migrate/20190613044655_add_username_to_deploy_tokens.rb
 %%WWWDIR%%/db/migrate/20190613073003_create_project_aliases.rb
@@ -7369,21 +7432,48 @@
 %%WWWDIR%%/db/migrate/20190623212503_add_cluster_id_to_deployments.rb
 %%WWWDIR%%/db/migrate/20190624123615_add_grafana_url_to_settings.rb
 %%WWWDIR%%/db/migrate/20190625115224_add_description_to_services.rb
+%%WWWDIR%%/db/migrate/20190626175626_add_group_creation_level_to_namespaces.rb
 %%WWWDIR%%/db/migrate/20190627051902_add_cluster_id_index_fk_to_deployments.rb
+%%WWWDIR%%/db/migrate/20190627100221_add_mr_productivity_metrics.rb
+%%WWWDIR%%/db/migrate/20190627122264_add_foreign_keys_for_container_repository.rb
 %%WWWDIR%%/db/migrate/20190628145246_add_strategies_to_operations_feature_flag_scopes.rb
 %%WWWDIR%%/db/migrate/20190628185000_add_released_at_to_releases_table.rb
 %%WWWDIR%%/db/migrate/20190628185004_backfill_and_add_not_null_constraint_to_released_at_column_on_releases_table.rb
+%%WWWDIR%%/db/migrate/20190703043358_add_commit_id_to_draft_notes.rb
 %%WWWDIR%%/db/migrate/20190703130053_remove_gitaly_feature_flags.rb
 %%WWWDIR%%/db/migrate/20190709204413_add_rule_type_to_approval_project_rules.rb
+%%WWWDIR%%/db/migrate/20190709220014_import_common_metrics_y_axis.rb
+%%WWWDIR%%/db/migrate/20190709220143_add_index_to_issues_relative_position.rb
 %%WWWDIR%%/db/migrate/20190710151229_add_index_to_approval_project_rules_rule_type.rb
+%%WWWDIR%%/db/migrate/20190711124721_create_job_variables.rb
+%%WWWDIR%%/db/migrate/20190712040400_add_environment_id_to_clusters_kubernetes_namespaces.rb
+%%WWWDIR%%/db/migrate/20190712040412_index_clusters_kubernetes_namespaces_on_environment_id.rb
+%%WWWDIR%%/db/migrate/20190712064021_add_namespace_per_environment_flag_to_clusters.rb
+%%WWWDIR%%/db/migrate/20190715042813_add_issue_id_to_versions.rb
+%%WWWDIR%%/db/migrate/20190715043954_set_issue_id_for_all_versions.rb
+%%WWWDIR%%/db/migrate/20190715140740_add_event_type_to_design_management_designs_versions.rb
+%%WWWDIR%%/db/migrate/20190715142138_add_raw_blob_request_limit_to_application_settings.rb
+%%WWWDIR%%/db/migrate/20190715173819_add_object_storage_flag_to_geo_node.rb
+%%WWWDIR%%/db/migrate/20190715215532_add_project_emails_disabled.rb
+%%WWWDIR%%/db/migrate/20190715215549_add_group_emails_disabled.rb
+%%WWWDIR%%/db/migrate/20190716144222_create_analytics_cycle_analytics_project_stages.rb
 %%WWWDIR%%/db/migrate/20190719122333_add_login_recaptcha_protection_enabled_to_application_settings.rb
+%%WWWDIR%%/db/migrate/20190723153247_create_allowed_email_domains_for_groups.rb
+%%WWWDIR%%/db/migrate/20190724112147_add_column_for_self_monitoring_project_id.rb
+%%WWWDIR%%/db/migrate/20190725012225_change_outbound_local_requests_whitelist_default.rb
+%%WWWDIR%%/db/migrate/20190726101050_rename_allow_local_requests_from_hooks_and_services_application_setting.rb
+%%WWWDIR%%/db/migrate/20190726101133_add_allow_local_requests_from_system_hooks_to_application_settings.rb
+%%WWWDIR%%/db/migrate/20190729062536_create_analytics_cycle_analytics_group_stages.rb
+%%WWWDIR%%/db/migrate/20190729090456_add_index_on_environments_with_state.rb
+%%WWWDIR%%/db/migrate/20190731084415_add_build_need.rb
+%%WWWDIR%%/db/migrate/20190801060809_delete_kubernetes_services.rb
+%%WWWDIR%%/db/migrate/20190801193427_rename_application_settings_snowplow_collector_uri_column.rb
+%%WWWDIR%%/db/migrate/20190802012622_reorder_issues_project_id_relative_position_index.rb
+%%WWWDIR%%/db/migrate/20190802195602_add_timestamps_columns_to_geo_nodes.rb
+%%WWWDIR%%/db/migrate/20190806071559_remove_epic_issues_default_relative_position.rb
+%%WWWDIR%%/db/migrate/20190815093936_add_index_notes_on_project_id_and_id_and_system_false.rb
+%%WWWDIR%%/db/migrate/20190815093949_remove_index_notes_on_noteable_type.rb
 %%WWWDIR%%/db/migrate/20190816151221_add_active_jobs_limit_to_plans.rb
-%%WWWDIR%%/db/migrate/gpg_keys_limits_to_mysql.rb
-%%WWWDIR%%/db/migrate/limits_ci_build_trace_chunks_raw_data_for_mysql.rb
-%%WWWDIR%%/db/migrate/limits_to_mysql.rb
-%%WWWDIR%%/db/migrate/markdown_cache_limits_to_mysql.rb
-%%WWWDIR%%/db/migrate/merge_request_diff_file_limits_to_mysql.rb
-%%WWWDIR%%/db/migrate/prometheus_metrics_limits_to_mysql.rb
 %%WWWDIR%%/db/optional_migrations/composite_primary_keys.rb
 %%WWWDIR%%/db/post_migrate/20180104131052_schedule_set_confidential_note_events_on_webhooks.rb
 %%WWWDIR%%/db/post_migrate/20180119121225_remove_redundant_pipeline_stages.rb
@@ -7479,7 +7569,14 @@
 %%WWWDIR%%/db/post_migrate/20190628191740_schedule_fixing_names_of_user_namespaces.rb
 %%WWWDIR%%/db/post_migrate/20190702173936_populate_remaining_merge_request_assignees.rb
 %%WWWDIR%%/db/post_migrate/20190703185326_fix_wrong_pages_access_level.rb
+%%WWWDIR%%/db/post_migrate/20190715043944_remove_sha_index_from_versions.rb
+%%WWWDIR%%/db/post_migrate/20190715044501_add_unique_issue_id_sha_index_to_versions.rb
 %%WWWDIR%%/db/post_migrate/20190715114644_drop_project_features_pages_access_level_default.rb
+%%WWWDIR%%/db/post_migrate/20190723105753_add_index_on_identities_lower_extern_uid_and_provider.rb
+%%WWWDIR%%/db/post_migrate/20190801114109_cleanup_allow_local_requests_from_hooks_and_services_application_setting_rename.rb
+%%WWWDIR%%/db/post_migrate/20190802091750_cleanup_application_settings_snowplow_collector_uri_rename.rb
+%%WWWDIR%%/db/post_migrate/20190802235445_add_index_on_id_and_type_and_public_to_keys.rb
+%%WWWDIR%%/db/post_migrate/20190812070645_migrate_private_profile_nulls.rb
 @(git,,) %%WWWDIR%%/db/schema.rb
 %%WWWDIR%%/db/seeds.rb
 %%WWWDIR%%/doc/README.md
@@ -7591,6 +7688,7 @@
 %%WWWDIR%%/doc/administration/maven_repository.md
 %%WWWDIR%%/doc/administration/merge_request_diffs.md
 %%WWWDIR%%/doc/administration/monitoring/github_imports.md
+%%WWWDIR%%/doc/administration/monitoring/gitlab_instance_administration_project/index.md
 %%WWWDIR%%/doc/administration/monitoring/index.md
 %%WWWDIR%%/doc/administration/monitoring/ip_whitelist.md
 %%WWWDIR%%/doc/administration/monitoring/performance/gitlab_configuration.md
@@ -7604,7 +7702,8 @@
 %%WWWDIR%%/doc/administration/monitoring/performance/img/performance_bar.png
 %%WWWDIR%%/doc/administration/monitoring/performance/img/performance_bar_configuration_settings.png
 %%WWWDIR%%/doc/administration/monitoring/performance/img/performance_bar_gitaly_calls.png
-%%WWWDIR%%/doc/administration/monitoring/performance/img/performance_bar_line_profiling.png
+%%WWWDIR%%/doc/administration/monitoring/performance/img/performance_bar_redis_calls.png
+%%WWWDIR%%/doc/administration/monitoring/performance/img/performance_bar_rugged_calls.png
 %%WWWDIR%%/doc/administration/monitoring/performance/img/performance_bar_sql_queries.png
 %%WWWDIR%%/doc/administration/monitoring/performance/img/request_profile_result.png
 %%WWWDIR%%/doc/administration/monitoring/performance/img/request_profiling_token.png
@@ -7660,7 +7759,10 @@
 %%WWWDIR%%/doc/administration/repository_storages.md
 %%WWWDIR%%/doc/administration/restart_gitlab.md
 %%WWWDIR%%/doc/administration/troubleshooting/debug.md
+%%WWWDIR%%/doc/administration/troubleshooting/diagnostics_tools.md
+%%WWWDIR%%/doc/administration/troubleshooting/elasticsearch.md
 %%WWWDIR%%/doc/administration/troubleshooting/gdb-stuck-ruby.txt
+%%WWWDIR%%/doc/administration/troubleshooting/kubernetes_cheat_sheet.md
 %%WWWDIR%%/doc/administration/troubleshooting/sidekiq.md
 %%WWWDIR%%/doc/administration/uploads.md
 %%WWWDIR%%/doc/administration/user_settings.md
@@ -7668,6 +7770,7 @@
 %%WWWDIR%%/doc/analytics/contribution_analytics.md
 %%WWWDIR%%/doc/api/README.md
 %%WWWDIR%%/doc/api/access_requests.md
+%%WWWDIR%%/doc/api/api_resources.md
 %%WWWDIR%%/doc/api/applications.md
 %%WWWDIR%%/doc/api/avatar.md
 %%WWWDIR%%/doc/api/award_emoji.md
@@ -7791,6 +7894,7 @@
 %%WWWDIR%%/doc/ci/ci_cd_for_external_repos/img/github_push_webhook.png
 %%WWWDIR%%/doc/ci/ci_cd_for_external_repos/img/github_repo_list.png
 %%WWWDIR%%/doc/ci/ci_cd_for_external_repos/index.md
+%%WWWDIR%%/doc/ci/directed_acyclic_graph/index.md
 %%WWWDIR%%/doc/ci/docker/README.md
 %%WWWDIR%%/doc/ci/docker/using_docker_build.md
 %%WWWDIR%%/doc/ci/docker/using_docker_images.md
@@ -7864,6 +7968,7 @@
 %%WWWDIR%%/doc/ci/img/environments_terminal_page.png
 %%WWWDIR%%/doc/ci/img/job_failure_reason.png
 %%WWWDIR%%/doc/ci/img/junit_test_report.png
+%%WWWDIR%%/doc/ci/img/manual_job_variables.png
 %%WWWDIR%%/doc/ci/img/metrics_reports.png
 %%WWWDIR%%/doc/ci/img/multi_pipeline_mini_graph.gif
 %%WWWDIR%%/doc/ci/img/multi_project_pipeline_graph.png
@@ -7884,6 +7989,7 @@
 %%WWWDIR%%/doc/ci/introduction/img/pipeline_status.png
 %%WWWDIR%%/doc/ci/introduction/img/rollback.png
 %%WWWDIR%%/doc/ci/introduction/index.md
+%%WWWDIR%%/doc/ci/jenkins/index.md
 %%WWWDIR%%/doc/ci/junit_test_reports.md
 %%WWWDIR%%/doc/ci/large_repositories/index.md
 %%WWWDIR%%/doc/ci/merge_request_pipelines/img/merge_request.png
@@ -7893,6 +7999,9 @@
 %%WWWDIR%%/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
 %%WWWDIR%%/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/img/merge_train_cancel_v12_0.png
 %%WWWDIR%%/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/img/merge_train_config_v12_0.png
+%%WWWDIR%%/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/img/merge_train_failure.png
+%%WWWDIR%%/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/img/merge_train_immediate_merge.png
+%%WWWDIR%%/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/img/merge_train_position_v12_0.png
 %%WWWDIR%%/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/img/merge_train_start_v12_0.png
 %%WWWDIR%%/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/img/merge_train_start_when_pipeline_succeeds_v12_0.png
 %%WWWDIR%%/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md
@@ -7994,6 +8103,7 @@
 %%WWWDIR%%/doc/development/database_debugging.md
 %%WWWDIR%%/doc/development/database_helpers.md
 %%WWWDIR%%/doc/development/database_merge_request_checklist.md
+%%WWWDIR%%/doc/development/database_review.md
 %%WWWDIR%%/doc/development/db_dump.md
 %%WWWDIR%%/doc/development/diffs.md
 %%WWWDIR%%/doc/development/distributed_tracing.md
@@ -8043,6 +8153,7 @@
 %%WWWDIR%%/doc/development/feature_flags/index.md
 %%WWWDIR%%/doc/development/feature_flags/process.md
 %%WWWDIR%%/doc/development/file_storage.md
+%%WWWDIR%%/doc/development/filtering_by_label.md
 %%WWWDIR%%/doc/development/foreign_keys.md
 %%WWWDIR%%/doc/development/frontend.md
 %%WWWDIR%%/doc/development/gemfile.md
@@ -8071,6 +8182,7 @@
 %%WWWDIR%%/doc/development/import_export.md
 %%WWWDIR%%/doc/development/instrumentation.md
 %%WWWDIR%%/doc/development/integrations/jira_connect.md
+%%WWWDIR%%/doc/development/interacting_components.md
 %%WWWDIR%%/doc/development/iterating_tables_in_batches.md
 %%WWWDIR%%/doc/development/kubernetes.md
 %%WWWDIR%%/doc/development/lfs.md
@@ -8122,6 +8234,7 @@
 %%WWWDIR%%/doc/development/sha1_as_binary.md
 %%WWWDIR%%/doc/development/shared_files.md
 %%WWWDIR%%/doc/development/shell_commands.md
+%%WWWDIR%%/doc/development/shell_scripting_guide/index.md
 %%WWWDIR%%/doc/development/sidekiq_debugging.md
 %%WWWDIR%%/doc/development/sidekiq_style_guide.md
 %%WWWDIR%%/doc/development/single_table_inheritance.md
@@ -8426,12 +8539,14 @@
 %%WWWDIR%%/doc/security/README.md
 %%WWWDIR%%/doc/security/asset_proxy.md
 %%WWWDIR%%/doc/security/crime_vulnerability.md
-%%WWWDIR%%/doc/security/img/outbound_requests_section.png
+%%WWWDIR%%/doc/security/img/outbound_requests_section_v12_2.png
 %%WWWDIR%%/doc/security/img/ssh_keys_restricted_key_icon.png
 %%WWWDIR%%/doc/security/img/ssh_keys_restrictions_settings.png
+%%WWWDIR%%/doc/security/img/whitelist.png
 %%WWWDIR%%/doc/security/information_exclusivity.md
 %%WWWDIR%%/doc/security/password_length_limits.md
 %%WWWDIR%%/doc/security/rack_attack.md
+%%WWWDIR%%/doc/security/rate_limits.md
 %%WWWDIR%%/doc/security/reset_root_password.md
 %%WWWDIR%%/doc/security/ssh_keys_restrictions.md
 %%WWWDIR%%/doc/security/two_factor_authentication.md
@@ -8440,7 +8555,9 @@
 %%WWWDIR%%/doc/security/user_file_uploads.md
 %%WWWDIR%%/doc/security/webhooks.md
 %%WWWDIR%%/doc/ssh/README.md
-%%WWWDIR%%/doc/subscriptions/billing_table.png
+%%WWWDIR%%/doc/subscriptions/img/additional_minutes.png
+%%WWWDIR%%/doc/subscriptions/img/buy_btn.png
+%%WWWDIR%%/doc/subscriptions/img/buy_minutes_card.png
 %%WWWDIR%%/doc/subscriptions/index.md
 %%WWWDIR%%/doc/system_hooks/system_hooks.md
 %%WWWDIR%%/doc/tools/email.md
@@ -8474,11 +8591,14 @@
 %%WWWDIR%%/doc/topics/autodevops/quick_start_guide.md
 %%WWWDIR%%/doc/topics/git/how_to_install_git/index.md
 %%WWWDIR%%/doc/topics/git/index.md
+%%WWWDIR%%/doc/topics/git/migrate_to_git_lfs/index.md
 %%WWWDIR%%/doc/topics/git/numerous_undo_possibilities_in_git/img/branching.png
 %%WWWDIR%%/doc/topics/git/numerous_undo_possibilities_in_git/img/rebase_reset.png
 %%WWWDIR%%/doc/topics/git/numerous_undo_possibilities_in_git/img/revert.png
 %%WWWDIR%%/doc/topics/git/numerous_undo_possibilities_in_git/index.md
+%%WWWDIR%%/doc/topics/git/partial_clone.md
 %%WWWDIR%%/doc/topics/git/troubleshooting_git.md
+%%WWWDIR%%/doc/topics/git/useful_git_commands.md
 %%WWWDIR%%/doc/topics/index.md
 %%WWWDIR%%/doc/university/README.md
 %%WWWDIR%%/doc/university/bookclub/booklist.md
@@ -8696,14 +8816,11 @@
 %%WWWDIR%%/doc/user/admin_area/settings/email.md
 %%WWWDIR%%/doc/user/admin_area/settings/external_authorization.md
 %%WWWDIR%%/doc/user/admin_area/settings/img/access_restrictions.png
-%%WWWDIR%%/doc/user/admin_area/settings/img/additional_minutes.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/admin_project_quota_view.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/admin_required_pipeline.png
-%%WWWDIR%%/doc/user/admin_area/settings/img/buy_btn.png
-%%WWWDIR%%/doc/user/admin_area/settings/img/buy_minutes_card.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/classification_label_on_project_page.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/domain_blacklist.png
-%%WWWDIR%%/doc/user/admin_area/settings/img/email_settings.png
+%%WWWDIR%%/doc/user/admin_area/settings/img/email_confirmation.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/enforce_terms.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/external_authorization_service_settings.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/file_template_admin_area.png
@@ -8711,23 +8828,31 @@
 %%WWWDIR%%/doc/user/admin_area/settings/img/group_pipelines_quota.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/import_sources.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/mirror_settings.png
+%%WWWDIR%%/doc/user/admin_area/settings/img/rate_limits_on_raw_endpoints.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/respond_to_terms.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/restricted_url.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/sign_up_terms.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/update-available.png
+%%WWWDIR%%/doc/user/admin_area/settings/img/user_and_ip_rate_limits.png
 %%WWWDIR%%/doc/user/admin_area/settings/index.md
 %%WWWDIR%%/doc/user/admin_area/settings/instance_template_repository.md
+%%WWWDIR%%/doc/user/admin_area/settings/rate_limits_on_raw_endpoints.md
 %%WWWDIR%%/doc/user/admin_area/settings/sign_up_restrictions.md
 %%WWWDIR%%/doc/user/admin_area/settings/terms.md
 %%WWWDIR%%/doc/user/admin_area/settings/third_party_offers.md
 %%WWWDIR%%/doc/user/admin_area/settings/usage_statistics.md
+%%WWWDIR%%/doc/user/admin_area/settings/user_and_ip_rate_limits.md
 %%WWWDIR%%/doc/user/admin_area/settings/visibility_and_access_controls.md
 %%WWWDIR%%/doc/user/admin_area/user_cohorts.md
+%%WWWDIR%%/doc/user/analytics/cycle_analytics.md
+%%WWWDIR%%/doc/user/analytics/index.md
 %%WWWDIR%%/doc/user/application_security/container_scanning/img/container_scanning.png
 %%WWWDIR%%/doc/user/application_security/container_scanning/index.md
 %%WWWDIR%%/doc/user/application_security/dast/img/dast_all.png
 %%WWWDIR%%/doc/user/application_security/dast/img/dast_single.png
 %%WWWDIR%%/doc/user/application_security/dast/index.md
+%%WWWDIR%%/doc/user/application_security/dependency_list/img/dependency_list_v12_2.png
+%%WWWDIR%%/doc/user/application_security/dependency_list/index.md
 %%WWWDIR%%/doc/user/application_security/dependency_scanning/analyzers.md
 %%WWWDIR%%/doc/user/application_security/dependency_scanning/img/dependency_scanning.png
 %%WWWDIR%%/doc/user/application_security/dependency_scanning/index.md
@@ -8744,10 +8869,11 @@
 %%WWWDIR%%/doc/user/application_security/license_management/img/license_management_search.png
 %%WWWDIR%%/doc/user/application_security/license_management/img/license_management_settings.png
 %%WWWDIR%%/doc/user/application_security/license_management/index.md
+%%WWWDIR%%/doc/user/application_security/sast/analyzers.md
 %%WWWDIR%%/doc/user/application_security/sast/img/sast.png
 %%WWWDIR%%/doc/user/application_security/sast/img/security_report.png
 %%WWWDIR%%/doc/user/application_security/sast/index.md
-%%WWWDIR%%/doc/user/application_security/security_dashboard/img/dashboard.png
+%%WWWDIR%%/doc/user/application_security/security_dashboard/img/group_security_dashboard.png
 %%WWWDIR%%/doc/user/application_security/security_dashboard/img/project_security_dashboard.png
 %%WWWDIR%%/doc/user/application_security/security_dashboard/index.md
 %%WWWDIR%%/doc/user/asciidoc.md
@@ -8812,6 +8938,8 @@
 %%WWWDIR%%/doc/user/discussions/index.md
 %%WWWDIR%%/doc/user/feature_highlight.md
 %%WWWDIR%%/doc/user/gitlab_com/index.md
+%%WWWDIR%%/doc/user/group/bulk_editing/img/bulk-editing.png
+%%WWWDIR%%/doc/user/group/bulk_editing/index.md
 %%WWWDIR%%/doc/user/group/clusters/index.md
 %%WWWDIR%%/doc/user/group/contribution_analytics/img/group_stats_cal.png
 %%WWWDIR%%/doc/user/group/contribution_analytics/img/group_stats_graph.png
@@ -8820,6 +8948,7 @@
 %%WWWDIR%%/doc/user/group/custom_project_templates.md
 %%WWWDIR%%/doc/user/group/dependency_proxy/img/group_dependency_proxy.png
 %%WWWDIR%%/doc/user/group/dependency_proxy/index.md
+%%WWWDIR%%/doc/user/group/epics/img/bulk_editing.png
 %%WWWDIR%%/doc/user/group/epics/img/button_close_epic.png
 %%WWWDIR%%/doc/user/group/epics/img/button_reopen_epic.png
 %%WWWDIR%%/doc/user/group/epics/img/child_epics_roadmap.png
@@ -8862,6 +8991,8 @@
 %%WWWDIR%%/doc/user/group/saml_sso/img/group_saml_settings.png
 %%WWWDIR%%/doc/user/group/saml_sso/img/scim_advanced.png
 %%WWWDIR%%/doc/user/group/saml_sso/img/scim_attribute_mapping.png
+%%WWWDIR%%/doc/user/group/saml_sso/img/scim_name_identifier_mapping.png
+%%WWWDIR%%/doc/user/group/saml_sso/img/scim_provisioning_status.png
 %%WWWDIR%%/doc/user/group/saml_sso/img/scim_token.png
 %%WWWDIR%%/doc/user/group/saml_sso/img/unlink_group_saml.png
 %%WWWDIR%%/doc/user/group/saml_sso/index.md
@@ -8956,13 +9087,12 @@
 %%WWWDIR%%/doc/user/project/img/autocomplete_characters_example1_v12_0.png
 %%WWWDIR%%/doc/user/project/img/autocomplete_characters_example2_v12_0.png
 %%WWWDIR%%/doc/user/project/img/bulk-editing.png
-%%WWWDIR%%/doc/user/project/img/container_registry.png
-%%WWWDIR%%/doc/user/project/img/cycle_analytics_landing_page.png
 %%WWWDIR%%/doc/user/project/img/deploy_boards_canary_deployments.png
 %%WWWDIR%%/doc/user/project/img/deploy_boards_kubernetes_label.png
 %%WWWDIR%%/doc/user/project/img/deploy_boards_landing_page.png
 %%WWWDIR%%/doc/user/project/img/description_templates.png
-%%WWWDIR%%/doc/user/project/img/description_templates_default_settings.png
+%%WWWDIR%%/doc/user/project/img/description_templates_issue_settings.png
+%%WWWDIR%%/doc/user/project/img/description_templates_merge_request_settings.png
 %%WWWDIR%%/doc/user/project/img/file_lock.png
 %%WWWDIR%%/doc/user/project/img/file_lock_merge_request_error_message.png
 %%WWWDIR%%/doc/user/project/img/file_lock_repository_view.png
@@ -8983,22 +9113,24 @@
 %%WWWDIR%%/doc/user/project/img/issue_boards_multiple.png
 %%WWWDIR%%/doc/user/project/img/issue_boards_premium.png
 %%WWWDIR%%/doc/user/project/img/issue_boards_remove_issue.png
-%%WWWDIR%%/doc/user/project/img/key_value_labels.png
-%%WWWDIR%%/doc/user/project/img/labels_default.png
-%%WWWDIR%%/doc/user/project/img/labels_epic_sidebar.png
-%%WWWDIR%%/doc/user/project/img/labels_generate_default.png
-%%WWWDIR%%/doc/user/project/img/labels_group_issues.png
-%%WWWDIR%%/doc/user/project/img/labels_list.png
-%%WWWDIR%%/doc/user/project/img/labels_prioritized.png
+%%WWWDIR%%/doc/user/project/img/labels_default_v12_1.png
+%%WWWDIR%%/doc/user/project/img/labels_delete_v12_1.png
+%%WWWDIR%%/doc/user/project/img/labels_drag_priority_v12_1.gif
+%%WWWDIR%%/doc/user/project/img/labels_epic_sidebar_v12_1.png
+%%WWWDIR%%/doc/user/project/img/labels_generate_default_v12_1.png
+%%WWWDIR%%/doc/user/project/img/labels_group_issues_v12_1.png
+%%WWWDIR%%/doc/user/project/img/labels_key_value_v12_1.png
+%%WWWDIR%%/doc/user/project/img/labels_list_v12_1.png
+%%WWWDIR%%/doc/user/project/img/labels_new_label_from_sidebar.gif
+%%WWWDIR%%/doc/user/project/img/labels_prioritized_v12_1.png
 %%WWWDIR%%/doc/user/project/img/labels_project_list_search.png
-%%WWWDIR%%/doc/user/project/img/labels_promotion.png
+%%WWWDIR%%/doc/user/project/img/labels_promotion_v12_1.png
 %%WWWDIR%%/doc/user/project/img/labels_sidebar.png
 %%WWWDIR%%/doc/user/project/img/labels_sidebar_assign.png
 %%WWWDIR%%/doc/user/project/img/labels_sort_label_priority.png
 %%WWWDIR%%/doc/user/project/img/labels_sort_priority.png
-%%WWWDIR%%/doc/user/project/img/labels_subscriptions.png
+%%WWWDIR%%/doc/user/project/img/labels_subscriptions_v12_1.png
 %%WWWDIR%%/doc/user/project/img/mitmproxy-docker.png
-%%WWWDIR%%/doc/user/project/img/new_label_from_sidebar.gif
 %%WWWDIR%%/doc/user/project/img/project_overview_badges.png
 %%WWWDIR%%/doc/user/project/img/project_repository_settings.png
 %%WWWDIR%%/doc/user/project/img/protected_branches_delete.png
@@ -9031,7 +9163,7 @@
 %%WWWDIR%%/doc/user/project/import/img/bitbucket_import_grant_access.png
 %%WWWDIR%%/doc/user/project/import/img/bitbucket_import_select_project.png
 %%WWWDIR%%/doc/user/project/import/img/bitbucket_server_import_credentials.png
-%%WWWDIR%%/doc/user/project/import/img/bitbucket_server_import_select_project.png
+%%WWWDIR%%/doc/user/project/import/img/bitbucket_server_import_select_project_v12_3.png
 %%WWWDIR%%/doc/user/project/import/img/fogbugz_import_finished.png
 %%WWWDIR%%/doc/user/project/import/img/fogbugz_import_login.png
 %%WWWDIR%%/doc/user/project/import/img/fogbugz_import_select_fogbogz.png
@@ -9058,6 +9190,7 @@
 %%WWWDIR%%/doc/user/project/import/repo_by_url.md
 %%WWWDIR%%/doc/user/project/import/svn.md
 %%WWWDIR%%/doc/user/project/import/tfs.md
+%%WWWDIR%%/doc/user/project/import/tfvc.md
 %%WWWDIR%%/doc/user/project/index.md
 %%WWWDIR%%/doc/user/project/insights/img/insights_example_bar_chart.png
 %%WWWDIR%%/doc/user/project/insights/img/insights_example_bar_time_series_chart.png
@@ -9076,8 +9209,11 @@
 %%WWWDIR%%/doc/user/project/integrations/gitlab_slack_application.md
 %%WWWDIR%%/doc/user/project/integrations/hangouts_chat.md
 %%WWWDIR%%/doc/user/project/integrations/hipchat.md
+%%WWWDIR%%/doc/user/project/integrations/img/download_as_csv.png
 %%WWWDIR%%/doc/user/project/integrations/img/emails_on_push_email.png
 %%WWWDIR%%/doc/user/project/integrations/img/emails_on_push_service.png
+%%WWWDIR%%/doc/user/project/integrations/img/embed_metrics.png
+%%WWWDIR%%/doc/user/project/integrations/img/generate_link_to_chart.png
 %%WWWDIR%%/doc/user/project/integrations/img/github_configuration.png
 %%WWWDIR%%/doc/user/project/integrations/img/github_status_check_pipeline_update.png
 %%WWWDIR%%/doc/user/project/integrations/img/gitlab_slack_app_landing_page.png
@@ -9094,7 +9230,7 @@
 %%WWWDIR%%/doc/user/project/integrations/img/jira_merge_request_close.png
 %%WWWDIR%%/doc/user/project/integrations/img/jira_project_settings.png
 %%WWWDIR%%/doc/user/project/integrations/img/jira_service_close_issue.png
-%%WWWDIR%%/doc/user/project/integrations/img/jira_service_page.png
+%%WWWDIR%%/doc/user/project/integrations/img/jira_service_page_v12_2.png
 %%WWWDIR%%/doc/user/project/integrations/img/jira_user_management_link.png
 %%WWWDIR%%/doc/user/project/integrations/img/mattermost_add_slash_command.png
 %%WWWDIR%%/doc/user/project/integrations/img/mattermost_bot_auth.png
@@ -9161,7 +9297,10 @@
 %%WWWDIR%%/doc/user/project/issues/csv_export.md
 %%WWWDIR%%/doc/user/project/issues/csv_import.md
 %%WWWDIR%%/doc/user/project/issues/deleting_issues.md
+%%WWWDIR%%/doc/user/project/issues/design_management.md
 %%WWWDIR%%/doc/user/project/issues/due_dates.md
+%%WWWDIR%%/doc/user/project/issues/img/adding_note_to_design_1.png
+%%WWWDIR%%/doc/user/project/issues/img/adding_note_to_design_2.png
 %%WWWDIR%%/doc/user/project/issues/img/button_close_issue.png
 %%WWWDIR%%/doc/user/project/issues/img/close_issue_from_board.gif
 %%WWWDIR%%/doc/user/project/issues/img/closing_and_related_issues.png
@@ -9172,11 +9311,14 @@
 %%WWWDIR%%/doc/user/project/issues/img/confidential_issues_search_guest.png
 %%WWWDIR%%/doc/user/project/issues/img/confidential_issues_search_master.png
 %%WWWDIR%%/doc/user/project/issues/img/confidential_issues_system_notes.png
+%%WWWDIR%%/doc/user/project/issues/img/confidential_mr_branch_dropdown_v12_1.png
+%%WWWDIR%%/doc/user/project/issues/img/confidential_mr_dropdown_v12_1.png
 %%WWWDIR%%/doc/user/project/issues/img/create_issue_from_group_level_issue_tracker.png
 %%WWWDIR%%/doc/user/project/issues/img/create_mr_from_issue.png
 %%WWWDIR%%/doc/user/project/issues/img/csv_export_button.png
 %%WWWDIR%%/doc/user/project/issues/img/csv_export_modal.png
 %%WWWDIR%%/doc/user/project/issues/img/delete_issue.png
+%%WWWDIR%%/doc/user/project/issues/img/design_management_v12_2.png
 %%WWWDIR%%/doc/user/project/issues/img/due_dates_create.png
 %%WWWDIR%%/doc/user/project/issues/img/due_dates_edit_sidebar.png
 %%WWWDIR%%/doc/user/project/issues/img/due_dates_issues_index_page.png
@@ -9216,6 +9358,7 @@
 %%WWWDIR%%/doc/user/project/issues/multiple_assignees_for_issues.md
 %%WWWDIR%%/doc/user/project/issues/related_issues.md
 %%WWWDIR%%/doc/user/project/issues/similar_issues.md
+%%WWWDIR%%/doc/user/project/issues/sorting_issue_lists.md
 %%WWWDIR%%/doc/user/project/labels.md
 %%WWWDIR%%/doc/user/project/maven_packages.md
 %%WWWDIR%%/doc/user/project/members/img/access_requests_management.png
@@ -9263,11 +9406,15 @@
 %%WWWDIR%%/doc/user/project/merge_requests/img/comment-on-any-diff-line.png
 %%WWWDIR%%/doc/user/project/merge_requests/img/conflict_section.png
 %%WWWDIR%%/doc/user/project/merge_requests/img/create_from_email.png
+%%WWWDIR%%/doc/user/project/merge_requests/img/cross_project_dependencies_edit_inaccessible_v12_2.png
+%%WWWDIR%%/doc/user/project/merge_requests/img/cross_project_dependencies_edit_v12_2.png
+%%WWWDIR%%/doc/user/project/merge_requests/img/cross_project_dependencies_view_v12_2.png
 %%WWWDIR%%/doc/user/project/merge_requests/img/ff_merge_rebase.png
 %%WWWDIR%%/doc/user/project/merge_requests/img/ff_merge_rebase_locally.png
 %%WWWDIR%%/doc/user/project/merge_requests/img/filter_approver_merge_requests.png
 %%WWWDIR%%/doc/user/project/merge_requests/img/filter_wip_merge_requests.png
 %%WWWDIR%%/doc/user/project/merge_requests/img/group_merge_requests_list_view.png
+%%WWWDIR%%/doc/user/project/merge_requests/img/incrementally_expand_merge_request_diffs_v12_2.png
 %%WWWDIR%%/doc/user/project/merge_requests/img/merge_conflict_editor.png
 %%WWWDIR%%/doc/user/project/merge_requests/img/merge_request.png
 %%WWWDIR%%/doc/user/project/merge_requests/img/merge_request_diff.png
@@ -9296,6 +9443,7 @@
 %%WWWDIR%%/doc/user/project/merge_requests/license_management.md
 %%WWWDIR%%/doc/user/project/merge_requests/maintainer_access.md
 %%WWWDIR%%/doc/user/project/merge_requests/merge_request_approvals.md
+%%WWWDIR%%/doc/user/project/merge_requests/merge_request_dependencies.md
 %%WWWDIR%%/doc/user/project/merge_requests/merge_request_discussion_resolution.md
 %%WWWDIR%%/doc/user/project/merge_requests/merge_when_build_succeeds.md
 %%WWWDIR%%/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
@@ -9321,6 +9469,7 @@
 %%WWWDIR%%/doc/user/project/operations/img/external_dashboard_settings.png
 %%WWWDIR%%/doc/user/project/operations/img/feature_flags_list.png
 %%WWWDIR%%/doc/user/project/operations/img/specs_list.png
+%%WWWDIR%%/doc/user/project/operations/img/target_users_v12_2.png
 %%WWWDIR%%/doc/user/project/operations/index.md
 %%WWWDIR%%/doc/user/project/operations/linking_to_an_external_dashboard.md
 %%WWWDIR%%/doc/user/project/operations/tracing.md
@@ -9384,6 +9533,7 @@
 %%WWWDIR%%/doc/user/project/releases/img/releases.png
 %%WWWDIR%%/doc/user/project/releases/index.md
 %%WWWDIR%%/doc/user/project/repository/branches/img/branch_filter_search_box.png
+%%WWWDIR%%/doc/user/project/repository/branches/img/compare_branches.png
 %%WWWDIR%%/doc/user/project/repository/branches/img/delete_merged_branches.png
 %%WWWDIR%%/doc/user/project/repository/branches/index.md
 %%WWWDIR%%/doc/user/project/repository/gpg_signed_commits/img/profile_settings_gpg_keys_paste_pub.png
@@ -9392,7 +9542,6 @@
 %%WWWDIR%%/doc/user/project/repository/gpg_signed_commits/img/project_signed_commit_unverified_signature.png
 %%WWWDIR%%/doc/user/project/repository/gpg_signed_commits/img/project_signed_commit_verified_signature.png
 %%WWWDIR%%/doc/user/project/repository/gpg_signed_commits/index.md
-%%WWWDIR%%/doc/user/project/repository/img/compare_branches.png
 %%WWWDIR%%/doc/user/project/repository/img/contributors_graph.png
 %%WWWDIR%%/doc/user/project/repository/img/download_source_code.png
 %%WWWDIR%%/doc/user/project/repository/img/jupyter_notebook.png
@@ -9578,7 +9727,6 @@
 %%WWWDIR%%/lib/api/broadcast_messages.rb
 %%WWWDIR%%/lib/api/commit_statuses.rb
 %%WWWDIR%%/lib/api/commits.rb
-%%WWWDIR%%/lib/api/container_registry.rb
 %%WWWDIR%%/lib/api/custom_attributes_endpoints.rb
 %%WWWDIR%%/lib/api/deploy_keys.rb
 %%WWWDIR%%/lib/api/deployments.rb
@@ -9591,6 +9739,7 @@
 %%WWWDIR%%/lib/api/files.rb
 %%WWWDIR%%/lib/api/group_boards.rb
 %%WWWDIR%%/lib/api/group_clusters.rb
+%%WWWDIR%%/lib/api/group_container_repositories.rb
 %%WWWDIR%%/lib/api/group_labels.rb
 %%WWWDIR%%/lib/api/group_milestones.rb
 %%WWWDIR%%/lib/api/group_variables.rb
@@ -9622,7 +9771,6 @@
 %%WWWDIR%%/lib/api/helpers/services_helpers.rb
 %%WWWDIR%%/lib/api/helpers/settings_helpers.rb
 %%WWWDIR%%/lib/api/helpers/users_helpers.rb
-%%WWWDIR%%/lib/api/helpers/variables_helpers.rb
 %%WWWDIR%%/lib/api/helpers/version.rb
 %%WWWDIR%%/lib/api/import_github.rb
 %%WWWDIR%%/lib/api/internal.rb
@@ -9645,6 +9793,7 @@
 %%WWWDIR%%/lib/api/pipeline_schedules.rb
 %%WWWDIR%%/lib/api/pipelines.rb
 %%WWWDIR%%/lib/api/project_clusters.rb
+%%WWWDIR%%/lib/api/project_container_repositories.rb
 %%WWWDIR%%/lib/api/project_events.rb
 %%WWWDIR%%/lib/api/project_export.rb
 %%WWWDIR%%/lib/api/project_hooks.rb
@@ -9932,6 +10081,9 @@
 %%WWWDIR%%/lib/gitlab/background_migration/fix_pages_access_level.rb
 %%WWWDIR%%/lib/gitlab/background_migration/fix_user_namespace_names.rb
 %%WWWDIR%%/lib/gitlab/background_migration/fix_user_project_route_names.rb
+%%WWWDIR%%/lib/gitlab/background_migration/legacy_upload_mover.rb
+%%WWWDIR%%/lib/gitlab/background_migration/legacy_uploads_migrator.rb
+%%WWWDIR%%/lib/gitlab/background_migration/logger.rb
 %%WWWDIR%%/lib/gitlab/background_migration/merge_request_assignees_migration_progress_check.rb
 %%WWWDIR%%/lib/gitlab/background_migration/migrate_build_stage.rb
 %%WWWDIR%%/lib/gitlab/background_migration/migrate_build_stage_id_reference.rb
@@ -9980,6 +10132,7 @@
 %%WWWDIR%%/lib/gitlab/cache/ci/project_pipeline_status.rb
 %%WWWDIR%%/lib/gitlab/cache/request_cache.rb
 %%WWWDIR%%/lib/gitlab/changes_list.rb
+%%WWWDIR%%/lib/gitlab/chaos.rb
 %%WWWDIR%%/lib/gitlab/chat.rb
 %%WWWDIR%%/lib/gitlab/chat/command.rb
 %%WWWDIR%%/lib/gitlab/chat/output.rb
@@ -10255,6 +10408,7 @@
 %%WWWDIR%%/lib/gitlab/conflict/file.rb
 %%WWWDIR%%/lib/gitlab/conflict/file_collection.rb
 %%WWWDIR%%/lib/gitlab/content_disposition.rb
+%%WWWDIR%%/lib/gitlab/content_security_policy/config_loader.rb
 %%WWWDIR%%/lib/gitlab/contributions_calendar.rb
 %%WWWDIR%%/lib/gitlab/contributor.rb
 %%WWWDIR%%/lib/gitlab/correlation_id.rb
@@ -10272,6 +10426,8 @@
 %%WWWDIR%%/lib/gitlab/cycle_analytics/code_helper.rb
 %%WWWDIR%%/lib/gitlab/cycle_analytics/code_stage.rb
 %%WWWDIR%%/lib/gitlab/cycle_analytics/event_fetcher.rb
+%%WWWDIR%%/lib/gitlab/cycle_analytics/group_projects_provider.rb
+%%WWWDIR%%/lib/gitlab/cycle_analytics/group_stage_summary.rb
 %%WWWDIR%%/lib/gitlab/cycle_analytics/issue_event_fetcher.rb
 %%WWWDIR%%/lib/gitlab/cycle_analytics/issue_helper.rb
 %%WWWDIR%%/lib/gitlab/cycle_analytics/issue_stage.rb
@@ -10293,6 +10449,9 @@
 %%WWWDIR%%/lib/gitlab/cycle_analytics/summary/base.rb
 %%WWWDIR%%/lib/gitlab/cycle_analytics/summary/commit.rb
 %%WWWDIR%%/lib/gitlab/cycle_analytics/summary/deploy.rb
+%%WWWDIR%%/lib/gitlab/cycle_analytics/summary/group/base.rb
+%%WWWDIR%%/lib/gitlab/cycle_analytics/summary/group/deploy.rb
+%%WWWDIR%%/lib/gitlab/cycle_analytics/summary/group/issue.rb
 %%WWWDIR%%/lib/gitlab/cycle_analytics/summary/issue.rb
 %%WWWDIR%%/lib/gitlab/cycle_analytics/test_event_fetcher.rb
 %%WWWDIR%%/lib/gitlab/cycle_analytics/test_helper.rb
@@ -10501,7 +10660,6 @@
 %%WWWDIR%%/lib/gitlab/gitaly_client/diff_stitcher.rb
 %%WWWDIR%%/lib/gitlab/gitaly_client/health_check_service.rb
 %%WWWDIR%%/lib/gitlab/gitaly_client/namespace_service.rb
-%%WWWDIR%%/lib/gitlab/gitaly_client/notification_service.rb
 %%WWWDIR%%/lib/gitlab/gitaly_client/object_pool_service.rb
 %%WWWDIR%%/lib/gitlab/gitaly_client/operation_service.rb
 %%WWWDIR%%/lib/gitlab/gitaly_client/queue_enumerator.rb
@@ -10684,6 +10842,7 @@
 %%WWWDIR%%/lib/gitlab/import_sources.rb
 %%WWWDIR%%/lib/gitlab/incoming_email.rb
 %%WWWDIR%%/lib/gitlab/insecure_key_fingerprint.rb
+%%WWWDIR%%/lib/gitlab/instrumentation_helper.rb
 %%WWWDIR%%/lib/gitlab/issuable_metadata.rb
 %%WWWDIR%%/lib/gitlab/issuable_sorter.rb
 %%WWWDIR%%/lib/gitlab/issuables_count_for_state.rb
@@ -10695,6 +10854,7 @@
 %%WWWDIR%%/lib/gitlab/kubernetes.rb
 %%WWWDIR%%/lib/gitlab/kubernetes/cluster_role_binding.rb
 %%WWWDIR%%/lib/gitlab/kubernetes/config_map.rb
+%%WWWDIR%%/lib/gitlab/kubernetes/default_namespace.rb
 %%WWWDIR%%/lib/gitlab/kubernetes/errors.rb
 %%WWWDIR%%/lib/gitlab/kubernetes/helm.rb
 %%WWWDIR%%/lib/gitlab/kubernetes/helm/api.rb
@@ -10705,7 +10865,9 @@
 %%WWWDIR%%/lib/gitlab/kubernetes/helm/init_command.rb
 %%WWWDIR%%/lib/gitlab/kubernetes/helm/install_command.rb
 %%WWWDIR%%/lib/gitlab/kubernetes/helm/pod.rb
+%%WWWDIR%%/lib/gitlab/kubernetes/helm/reset_command.rb
 %%WWWDIR%%/lib/gitlab/kubernetes/kube_client.rb
+%%WWWDIR%%/lib/gitlab/kubernetes/kubectl_cmd.rb
 %%WWWDIR%%/lib/gitlab/kubernetes/logger.rb
 %%WWWDIR%%/lib/gitlab/kubernetes/namespace.rb
 %%WWWDIR%%/lib/gitlab/kubernetes/pod.rb
@@ -10748,18 +10910,17 @@
 %%WWWDIR%%/lib/gitlab/markup_helper.rb
 %%WWWDIR%%/lib/gitlab/metrics.rb
 %%WWWDIR%%/lib/gitlab/metrics/background_transaction.rb
-%%WWWDIR%%/lib/gitlab/metrics/dashboard/base_service.rb
 %%WWWDIR%%/lib/gitlab/metrics/dashboard/cache.rb
-%%WWWDIR%%/lib/gitlab/metrics/dashboard/dynamic_dashboard_service.rb
+%%WWWDIR%%/lib/gitlab/metrics/dashboard/defaults.rb
+%%WWWDIR%%/lib/gitlab/metrics/dashboard/errors.rb
 %%WWWDIR%%/lib/gitlab/metrics/dashboard/finder.rb
 %%WWWDIR%%/lib/gitlab/metrics/dashboard/processor.rb
-%%WWWDIR%%/lib/gitlab/metrics/dashboard/project_dashboard_service.rb
+%%WWWDIR%%/lib/gitlab/metrics/dashboard/service_selector.rb
 %%WWWDIR%%/lib/gitlab/metrics/dashboard/stages/base_stage.rb
 %%WWWDIR%%/lib/gitlab/metrics/dashboard/stages/common_metrics_inserter.rb
 %%WWWDIR%%/lib/gitlab/metrics/dashboard/stages/endpoint_inserter.rb
 %%WWWDIR%%/lib/gitlab/metrics/dashboard/stages/project_metrics_inserter.rb
 %%WWWDIR%%/lib/gitlab/metrics/dashboard/stages/sorter.rb
-%%WWWDIR%%/lib/gitlab/metrics/dashboard/system_dashboard_service.rb
 %%WWWDIR%%/lib/gitlab/metrics/dashboard/url.rb
 %%WWWDIR%%/lib/gitlab/metrics/delta.rb
 %%WWWDIR%%/lib/gitlab/metrics/influx_db.rb
@@ -10813,7 +10974,6 @@
 %%WWWDIR%%/lib/gitlab/patch/sprockets_base_file_digest_key.rb
 %%WWWDIR%%/lib/gitlab/path_regex.rb
 %%WWWDIR%%/lib/gitlab/performance_bar.rb
-%%WWWDIR%%/lib/gitlab/performance_bar/peek_query_tracker.rb
 %%WWWDIR%%/lib/gitlab/performance_bar/redis_adapter_when_peek_enabled.rb
 %%WWWDIR%%/lib/gitlab/phabricator_import.rb
 %%WWWDIR%%/lib/gitlab/phabricator_import/base_worker.rb
@@ -10843,8 +11003,7 @@
 %%WWWDIR%%/lib/gitlab/private_commit_email.rb
 %%WWWDIR%%/lib/gitlab/profiler.rb
 %%WWWDIR%%/lib/gitlab/profiler/total_time_flat_printer.rb
-%%WWWDIR%%/lib/gitlab/project_authorizations/with_nested_groups.rb
-%%WWWDIR%%/lib/gitlab/project_authorizations/without_nested_groups.rb
+%%WWWDIR%%/lib/gitlab/project_authorizations.rb
 %%WWWDIR%%/lib/gitlab/project_search_results.rb
 %%WWWDIR%%/lib/gitlab/project_service_logger.rb
 %%WWWDIR%%/lib/gitlab/project_template.rb
@@ -10899,6 +11058,7 @@
 %%WWWDIR%%/lib/gitlab/request_profiler/profile.rb
 %%WWWDIR%%/lib/gitlab/route_map.rb
 %%WWWDIR%%/lib/gitlab/routing.rb
+%%WWWDIR%%/lib/gitlab/rugged_instrumentation.rb
 %%WWWDIR%%/lib/gitlab/safe_request_store.rb
 %%WWWDIR%%/lib/gitlab/sanitizers/exif.rb
 %%WWWDIR%%/lib/gitlab/sanitizers/svg.rb
@@ -10933,7 +11093,9 @@
 %%WWWDIR%%/lib/gitlab/sidekiq_middleware/batch_loader.rb
 %%WWWDIR%%/lib/gitlab/sidekiq_middleware/correlation_injector.rb
 %%WWWDIR%%/lib/gitlab/sidekiq_middleware/correlation_logger.rb
+%%WWWDIR%%/lib/gitlab/sidekiq_middleware/instrumentation_logger.rb
 %%WWWDIR%%/lib/gitlab/sidekiq_middleware/memory_killer.rb
+%%WWWDIR%%/lib/gitlab/sidekiq_middleware/metrics.rb
 %%WWWDIR%%/lib/gitlab/sidekiq_middleware/request_store_middleware.rb
 %%WWWDIR%%/lib/gitlab/sidekiq_signals.rb
 %%WWWDIR%%/lib/gitlab/sidekiq_status.rb
@@ -10964,7 +11126,9 @@
 %%WWWDIR%%/lib/gitlab/slash_commands/presenters/run.rb
 %%WWWDIR%%/lib/gitlab/slash_commands/result.rb
 %%WWWDIR%%/lib/gitlab/slash_commands/run.rb
+%%WWWDIR%%/lib/gitlab/slug/environment.rb
 %%WWWDIR%%/lib/gitlab/snippet_search_results.rb
+%%WWWDIR%%/lib/gitlab/snowplow_tracker.rb
 %%WWWDIR%%/lib/gitlab/sql/cte.rb
 %%WWWDIR%%/lib/gitlab/sql/glob.rb
 %%WWWDIR%%/lib/gitlab/sql/pattern.rb
@@ -11005,8 +11169,15 @@
 %%WWWDIR%%/lib/gitlab/url_helpers.rb
 %%WWWDIR%%/lib/gitlab/url_sanitizer.rb
 %%WWWDIR%%/lib/gitlab/usage_data.rb
+%%WWWDIR%%/lib/gitlab/usage_data_counters/base_counter.rb
+%%WWWDIR%%/lib/gitlab/usage_data_counters/cycle_analytics_counter.rb
+%%WWWDIR%%/lib/gitlab/usage_data_counters/note_counter.rb
 %%WWWDIR%%/lib/gitlab/usage_data_counters/redis_counter.rb
+%%WWWDIR%%/lib/gitlab/usage_data_counters/search_counter.rb
+%%WWWDIR%%/lib/gitlab/usage_data_counters/snippet_counter.rb
+%%WWWDIR%%/lib/gitlab/usage_data_counters/source_code_counter.rb
 %%WWWDIR%%/lib/gitlab/usage_data_counters/web_ide_counter.rb
+%%WWWDIR%%/lib/gitlab/usage_data_counters/wiki_page_counter.rb
 %%WWWDIR%%/lib/gitlab/user_access.rb
 %%WWWDIR%%/lib/gitlab/utils.rb
 %%WWWDIR%%/lib/gitlab/utils/deep_size.rb
@@ -11045,15 +11216,17 @@
 %%WWWDIR%%/lib/microsoft_teams/activity.rb
 %%WWWDIR%%/lib/microsoft_teams/notifier.rb
 %%WWWDIR%%/lib/milestone_array.rb
-%%WWWDIR%%/lib/mysql_zero_date.rb
 %%WWWDIR%%/lib/object_storage/direct_upload.rb
 %%WWWDIR%%/lib/omni_auth/strategies/bitbucket.rb
 %%WWWDIR%%/lib/omni_auth/strategies/jwt.rb
-%%WWWDIR%%/lib/peek/rblineprof/custom_controller_helpers.rb
+%%WWWDIR%%/lib/peek/views/active_record.rb
+%%WWWDIR%%/lib/peek/views/detailed_view.rb
 %%WWWDIR%%/lib/peek/views/gitaly.rb
 %%WWWDIR%%/lib/peek/views/host.rb
-%%WWWDIR%%/lib/peek/views/redis.rb
+%%WWWDIR%%/lib/peek/views/redis_detailed.rb
+%%WWWDIR%%/lib/peek/views/rugged.rb
 %%WWWDIR%%/lib/peek/views/tracing.rb
+%%WWWDIR%%/lib/prometheus/pid_provider.rb
 %%WWWDIR%%/lib/quality/helm_client.rb
 %%WWWDIR%%/lib/quality/kubernetes_client.rb
 %%WWWDIR%%/lib/quality/seeders/issues.rb
@@ -11132,6 +11305,7 @@
 %%WWWDIR%%/lib/tasks/downtime_check.rake
 %%WWWDIR%%/lib/tasks/ee_compat_check.rake
 %%WWWDIR%%/lib/tasks/eslint.rake
+%%WWWDIR%%/lib/tasks/frontend.rake
 %%WWWDIR%%/lib/tasks/gemojione.rake
 %%WWWDIR%%/lib/tasks/gettext.rake
 %%WWWDIR%%/lib/tasks/gitlab/artifacts/check.rake
@@ -11168,6 +11342,7 @@
 %%WWWDIR%%/lib/tasks/gitlab/two_factor.rake
 %%WWWDIR%%/lib/tasks/gitlab/update_templates.rake
 %%WWWDIR%%/lib/tasks/gitlab/uploads/check.rake
+%%WWWDIR%%/lib/tasks/gitlab/uploads/legacy.rake
 %%WWWDIR%%/lib/tasks/gitlab/uploads/migrate.rake
 %%WWWDIR%%/lib/tasks/gitlab/uploads/sanitize.rake
 %%WWWDIR%%/lib/tasks/gitlab/web_hook.rake
@@ -11177,7 +11352,6 @@
 %%WWWDIR%%/lib/tasks/import.rake
 %%WWWDIR%%/lib/tasks/karma.rake
 %%WWWDIR%%/lib/tasks/lint.rake
-%%WWWDIR%%/lib/tasks/migrate/add_limits_mysql.rake
 %%WWWDIR%%/lib/tasks/migrate/composite_primary_keys.rake
 %%WWWDIR%%/lib/tasks/migrate/migrate_iids.rake
 %%WWWDIR%%/lib/tasks/migrate/schema_check.rake
@@ -11281,6 +11455,7 @@
 %%WWWDIR%%/qa/knapsack/gitlab-ce/review-qa-all_master_report.json
 %%WWWDIR%%/qa/load/artillery.yml
 %%WWWDIR%%/qa/qa.rb
+%%WWWDIR%%/qa/qa/ce/knapsack/nightly_master_report.json
 %%WWWDIR%%/qa/qa/ce/strategy.rb
 %%WWWDIR%%/qa/qa/fixtures/auto_devops_rack/Dockerfile
 %%WWWDIR%%/qa/qa/fixtures/auto_devops_rack/Gemfile
@@ -11384,6 +11559,7 @@
 %%WWWDIR%%/qa/qa/page/project/wiki/edit.rb
 %%WWWDIR%%/qa/qa/page/project/wiki/new.rb
 %%WWWDIR%%/qa/qa/page/project/wiki/show.rb
+%%WWWDIR%%/qa/qa/page/search/results.rb
 %%WWWDIR%%/qa/qa/page/settings/common.rb
 %%WWWDIR%%/qa/qa/page/validatable.rb
 %%WWWDIR%%/qa/qa/page/validator.rb
@@ -11459,6 +11635,7 @@
 %%WWWDIR%%/qa/qa/specs/features/api/1_manage/users_spec.rb
 %%WWWDIR%%/qa/qa/specs/features/api/3_create/repository/files_spec.rb
 %%WWWDIR%%/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb
+%%WWWDIR%%/qa/qa/specs/features/browser_ui/1_manage/group/create_group_with_mattermost_team_spec.rb
 %%WWWDIR%%/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb
 %%WWWDIR%%/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb
 %%WWWDIR%%/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
@@ -11505,7 +11682,6 @@
 %%WWWDIR%%/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb
 %%WWWDIR%%/qa/qa/specs/features/browser_ui/6_release/deploy_token/add_deploy_token_spec.rb
 %%WWWDIR%%/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
-%%WWWDIR%%/qa/qa/specs/features/browser_ui/7_configure/mattermost/create_group_with_mattermost_team_spec.rb
 %%WWWDIR%%/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb
 %%WWWDIR%%/qa/qa/specs/features/sanity/framework_spec.rb
 %%WWWDIR%%/qa/qa/specs/helpers/quarantine.rb
@@ -11613,6 +11789,7 @@
 %%WWWDIR%%/rubocop/cop/qa/element_with_pattern.rb
 %%WWWDIR%%/rubocop/cop/rspec/env_assignment.rb
 %%WWWDIR%%/rubocop/cop/rspec/factories_in_migration_specs.rb
+%%WWWDIR%%/rubocop/cop/rspec/top_level_describe_path.rb
 %%WWWDIR%%/rubocop/cop/ruby_interpolation_in_translation.rb
 %%WWWDIR%%/rubocop/cop/safe_params.rb
 %%WWWDIR%%/rubocop/cop/sidekiq_options_queue.rb
@@ -11622,10 +11799,10 @@
 %%WWWDIR%%/rubocop/spec_helpers.rb
 %%WWWDIR%%/scripts/build_assets_image
 %%WWWDIR%%/scripts/clean-old-cached-assets
-%%WWWDIR%%/scripts/create_mysql_user.sh
 %%WWWDIR%%/scripts/create_postgres_user.sh
 %%WWWDIR%%/scripts/detect-new-flaky-examples
 %%WWWDIR%%/scripts/frontend/extract_gettext_all.js
+%%WWWDIR%%/scripts/frontend/file_test_coverage.js
 %%WWWDIR%%/scripts/frontend/frontend_script_utils.js
 %%WWWDIR%%/scripts/frontend/postinstall.js
 %%WWWDIR%%/scripts/frontend/prettier.js
@@ -11643,7 +11820,6 @@
 %%WWWDIR%%/scripts/gitaly-test-spawn
 %%WWWDIR%%/scripts/gitaly_test.rb
 %%WWWDIR%%/scripts/insert-rspec-profiling-data
-%%WWWDIR%%/scripts/lint-changelog-yaml
 %%WWWDIR%%/scripts/lint-conflicts.sh
 %%WWWDIR%%/scripts/lint-doc.sh
 %%WWWDIR%%/scripts/lint-rugged
@@ -11692,14 +11868,17 @@
 %%WWWDIR%%/spec/controllers/autocomplete_controller_spec.rb
 %%WWWDIR%%/spec/controllers/boards/issues_controller_spec.rb
 %%WWWDIR%%/spec/controllers/boards/lists_controller_spec.rb
+%%WWWDIR%%/spec/controllers/chaos_controller_spec.rb
 %%WWWDIR%%/spec/controllers/concerns/boards_responses_spec.rb
 %%WWWDIR%%/spec/controllers/concerns/checks_collaboration_spec.rb
+%%WWWDIR%%/spec/controllers/concerns/confirm_email_warning_spec.rb
 %%WWWDIR%%/spec/controllers/concerns/continue_params_spec.rb
 %%WWWDIR%%/spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb
 %%WWWDIR%%/spec/controllers/concerns/enforces_admin_authentication_spec.rb
 %%WWWDIR%%/spec/controllers/concerns/group_tree_spec.rb
 %%WWWDIR%%/spec/controllers/concerns/import_url_params_spec.rb
 %%WWWDIR%%/spec/controllers/concerns/internal_redirect_spec.rb
+%%WWWDIR%%/spec/controllers/concerns/issuable_actions_spec.rb
 %%WWWDIR%%/spec/controllers/concerns/issuable_collections_spec.rb
 %%WWWDIR%%/spec/controllers/concerns/lfs_request_spec.rb
 %%WWWDIR%%/spec/controllers/concerns/project_unauthorized_spec.rb
@@ -11732,6 +11911,7 @@
 %%WWWDIR%%/spec/controllers/health_check_controller_spec.rb
 %%WWWDIR%%/spec/controllers/health_controller_spec.rb
 %%WWWDIR%%/spec/controllers/help_controller_spec.rb
+%%WWWDIR%%/spec/controllers/ide_controller_spec.rb
 %%WWWDIR%%/spec/controllers/import/bitbucket_controller_spec.rb
 %%WWWDIR%%/spec/controllers/import/bitbucket_server_controller_spec.rb
 %%WWWDIR%%/spec/controllers/import/fogbugz_controller_spec.rb
@@ -11774,6 +11954,7 @@
 %%WWWDIR%%/spec/controllers/projects/commit_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/commits_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/compare_controller_spec.rb
+%%WWWDIR%%/spec/controllers/projects/cycle_analytics/events_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/cycle_analytics_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/deploy_keys_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/deployments_controller_spec.rb
@@ -11824,6 +12005,7 @@
 %%WWWDIR%%/spec/controllers/projects/settings/repository_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/snippets_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/stages_controller_spec.rb
+%%WWWDIR%%/spec/controllers/projects/starrers_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/tags/releases_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/tags_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/templates_controller_spec.rb
@@ -11861,11 +12043,13 @@
 %%WWWDIR%%/spec/factories/chat_names.rb
 %%WWWDIR%%/spec/factories/chat_teams.rb
 %%WWWDIR%%/spec/factories/ci/bridge.rb
+%%WWWDIR%%/spec/factories/ci/build_need.rb
 %%WWWDIR%%/spec/factories/ci/build_trace_chunks.rb
 %%WWWDIR%%/spec/factories/ci/build_trace_section_names.rb
 %%WWWDIR%%/spec/factories/ci/builds.rb
 %%WWWDIR%%/spec/factories/ci/group_variables.rb
 %%WWWDIR%%/spec/factories/ci/job_artifacts.rb
+%%WWWDIR%%/spec/factories/ci/job_variables.rb
 %%WWWDIR%%/spec/factories/ci/pipeline_schedule.rb
 %%WWWDIR%%/spec/factories/ci/pipeline_schedule_variables.rb
 %%WWWDIR%%/spec/factories/ci/pipeline_variables.rb
@@ -12028,6 +12212,7 @@
 %%WWWDIR%%/spec/features/boards/issue_ordering_spec.rb
 %%WWWDIR%%/spec/features/boards/keyboard_shortcut_spec.rb
 %%WWWDIR%%/spec/features/boards/modal_filter_spec.rb
+%%WWWDIR%%/spec/features/boards/multiple_boards_spec.rb
 %%WWWDIR%%/spec/features/boards/new_issue_spec.rb
 %%WWWDIR%%/spec/features/boards/reload_boards_on_browser_back_spec.rb
 %%WWWDIR%%/spec/features/boards/sidebar_spec.rb
@@ -12091,7 +12276,7 @@
 %%WWWDIR%%/spec/features/groups/labels/search_labels_spec.rb
 %%WWWDIR%%/spec/features/groups/labels/sort_labels_spec.rb
 %%WWWDIR%%/spec/features/groups/labels/subscription_spec.rb
-%%WWWDIR%%/spec/features/groups/labels/user_sees_links_to_issuables.rb
+%%WWWDIR%%/spec/features/groups/labels/user_sees_links_to_issuables_spec.rb
 %%WWWDIR%%/spec/features/groups/members/filter_members_spec.rb
 %%WWWDIR%%/spec/features/groups/members/leave_group_spec.rb
 %%WWWDIR%%/spec/features/groups/members/list_members_spec.rb
@@ -12119,7 +12304,7 @@
 %%WWWDIR%%/spec/features/import/manifest_import_spec.rb
 %%WWWDIR%%/spec/features/instance_statistics/cohorts_spec.rb
 %%WWWDIR%%/spec/features/instance_statistics/conversational_development_index_spec.rb
-%%WWWDIR%%/spec/features/instance_statistics/instance_statistics.rb
+%%WWWDIR%%/spec/features/instance_statistics/instance_statistics_spec.rb
 %%WWWDIR%%/spec/features/invites_spec.rb
 %%WWWDIR%%/spec/features/issuables/close_reopen_report_toggle_spec.rb
 %%WWWDIR%%/spec/features/issuables/discussion_lock_spec.rb
@@ -12176,6 +12361,7 @@
 %%WWWDIR%%/spec/features/markdown/markdown_spec.rb
 %%WWWDIR%%/spec/features/markdown/math_spec.rb
 %%WWWDIR%%/spec/features/markdown/mermaid_spec.rb
+%%WWWDIR%%/spec/features/markdown/metrics_spec.rb
 %%WWWDIR%%/spec/features/merge_request/maintainer_edits_fork_spec.rb
 %%WWWDIR%%/spec/features/merge_request/user_accepts_merge_request_spec.rb
 %%WWWDIR%%/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb
@@ -12344,7 +12530,7 @@
 %%WWWDIR%%/spec/features/projects/files/template_selector_menu_spec.rb
 %%WWWDIR%%/spec/features/projects/files/template_type_dropdown_spec.rb
 %%WWWDIR%%/spec/features/projects/files/undo_template_spec.rb
-%%WWWDIR%%/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder.rb
+%%WWWDIR%%/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb
 %%WWWDIR%%/spec/features/projects/files/user_browses_files_spec.rb
 %%WWWDIR%%/spec/features/projects/files/user_browses_lfs_files_spec.rb
 %%WWWDIR%%/spec/features/projects/files/user_creates_directory_spec.rb
@@ -12380,7 +12566,7 @@
 %%WWWDIR%%/spec/features/projects/labels/user_promotes_label_spec.rb
 %%WWWDIR%%/spec/features/projects/labels/user_removes_labels_spec.rb
 %%WWWDIR%%/spec/features/projects/labels/user_sees_breadcrumb_links_spec.rb
-%%WWWDIR%%/spec/features/projects/labels/user_sees_links_to_issuables.rb
+%%WWWDIR%%/spec/features/projects/labels/user_sees_links_to_issuables_spec.rb
 %%WWWDIR%%/spec/features/projects/labels/user_views_labels_spec.rb
 %%WWWDIR%%/spec/features/projects/members/anonymous_user_sees_members_spec.rb
 %%WWWDIR%%/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb
@@ -12410,6 +12596,7 @@
 %%WWWDIR%%/spec/features/projects/pipeline_schedules_spec.rb
 %%WWWDIR%%/spec/features/projects/pipelines/pipeline_spec.rb
 %%WWWDIR%%/spec/features/projects/pipelines/pipelines_spec.rb
+%%WWWDIR%%/spec/features/projects/raw/user_interacts_with_raw_endpoint_spec.rb
 %%WWWDIR%%/spec/features/projects/releases/user_views_releases_spec.rb
 %%WWWDIR%%/spec/features/projects/remote_mirror_spec.rb
 %%WWWDIR%%/spec/features/projects/serverless/functions_spec.rb
@@ -12542,7 +12729,6 @@
 %%WWWDIR%%/spec/features/snippets/user_creates_snippet_spec.rb
 %%WWWDIR%%/spec/features/snippets/user_deletes_snippet_spec.rb
 %%WWWDIR%%/spec/features/snippets/user_edits_snippet_spec.rb
-%%WWWDIR%%/spec/features/snippets/user_sees_breadcrumb_links.rb
 %%WWWDIR%%/spec/features/snippets/user_snippets_spec.rb
 %%WWWDIR%%/spec/features/snippets_spec.rb
 %%WWWDIR%%/spec/features/tags/developer_creates_tag_spec.rb
@@ -12558,11 +12744,11 @@
 %%WWWDIR%%/spec/features/uploads/user_uploads_file_to_note_spec.rb
 %%WWWDIR%%/spec/features/usage_stats_consent_spec.rb
 %%WWWDIR%%/spec/features/user_can_display_performance_bar_spec.rb
-%%WWWDIR%%/spec/features/user_opens_link_to_comment.rb
+%%WWWDIR%%/spec/features/user_opens_link_to_comment_spec.rb
 %%WWWDIR%%/spec/features/user_sees_revert_modal_spec.rb
 %%WWWDIR%%/spec/features/user_sorts_things_spec.rb
 %%WWWDIR%%/spec/features/users/active_sessions_spec.rb
-%%WWWDIR%%/spec/features/users/add_email_to_existing_account.rb
+%%WWWDIR%%/spec/features/users/add_email_to_existing_account_spec.rb
 %%WWWDIR%%/spec/features/users/login_spec.rb
 %%WWWDIR%%/spec/features/users/logout_spec.rb
 %%WWWDIR%%/spec/features/users/overview_spec.rb
@@ -12586,9 +12772,11 @@
 %%WWWDIR%%/spec/finders/branches_finder_spec.rb
 %%WWWDIR%%/spec/finders/cluster_ancestors_finder_spec.rb
 %%WWWDIR%%/spec/finders/clusters/knative_services_finder_spec.rb
+%%WWWDIR%%/spec/finders/clusters/kubernetes_namespace_finder_spec.rb
 %%WWWDIR%%/spec/finders/clusters_finder_spec.rb
 %%WWWDIR%%/spec/finders/concerns/finder_methods_spec.rb
 %%WWWDIR%%/spec/finders/concerns/finder_with_cross_project_access_spec.rb
+%%WWWDIR%%/spec/finders/container_repositories_finder_spec.rb
 %%WWWDIR%%/spec/finders/contributed_projects_finder_spec.rb
 %%WWWDIR%%/spec/finders/environments_finder_spec.rb
 %%WWWDIR%%/spec/finders/events_finder_spec.rb
@@ -12617,12 +12805,14 @@
 %%WWWDIR%%/spec/finders/releases_finder_spec.rb
 %%WWWDIR%%/spec/finders/runner_jobs_finder_spec.rb
 %%WWWDIR%%/spec/finders/snippets_finder_spec.rb
+%%WWWDIR%%/spec/finders/starred_projects_finder_spec.rb
 %%WWWDIR%%/spec/finders/tags_finder_spec.rb
 %%WWWDIR%%/spec/finders/template_finder_spec.rb
 %%WWWDIR%%/spec/finders/todos_finder_spec.rb
 %%WWWDIR%%/spec/finders/user_finder_spec.rb
 %%WWWDIR%%/spec/finders/user_recent_events_finder_spec.rb
 %%WWWDIR%%/spec/finders/users_finder_spec.rb
+%%WWWDIR%%/spec/finders/users_star_projects_finder_spec.rb
 %%WWWDIR%%/spec/finders/users_with_pending_todos_finder_spec.rb
 %%WWWDIR%%/spec/fixtures/GoogleCodeProjectHosting.json
 %%WWWDIR%%/spec/fixtures/aosp_manifest.xml
@@ -12641,6 +12831,8 @@
 %%WWWDIR%%/spec/fixtures/api/schemas/entities/diff_line.json
 %%WWWDIR%%/spec/fixtures/api/schemas/entities/diff_line_parallel.json
 %%WWWDIR%%/spec/fixtures/api/schemas/entities/diff_viewer.json
+%%WWWDIR%%/spec/fixtures/api/schemas/entities/discussion.json
+%%WWWDIR%%/spec/fixtures/api/schemas/entities/discussions.json
 %%WWWDIR%%/spec/fixtures/api/schemas/entities/issuable_sidebar_todo.json
 %%WWWDIR%%/spec/fixtures/api/schemas/entities/issue.json
 %%WWWDIR%%/spec/fixtures/api/schemas/entities/issue_board.json
@@ -12650,6 +12842,8 @@
 %%WWWDIR%%/spec/fixtures/api/schemas/entities/label.json
 %%WWWDIR%%/spec/fixtures/api/schemas/entities/merge_request_basic.json
 %%WWWDIR%%/spec/fixtures/api/schemas/entities/merge_request_metrics.json
+%%WWWDIR%%/spec/fixtures/api/schemas/entities/merge_request_poll_cached_widget.json
+%%WWWDIR%%/spec/fixtures/api/schemas/entities/merge_request_poll_widget.json
 %%WWWDIR%%/spec/fixtures/api/schemas/entities/merge_request_sidebar.json
 %%WWWDIR%%/spec/fixtures/api/schemas/entities/merge_request_sidebar_extras.json
 %%WWWDIR%%/spec/fixtures/api/schemas/entities/merge_request_widget.json
@@ -12701,11 +12895,14 @@
 %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/commits_with_stats.json
 %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/deployment.json
 %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/environment.json
-%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/group_labels.json
 %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/issue.json
 %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/issues.json
 %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/job.json
 %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/label_basic.json
+%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/labels/label.json
+%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/labels/label_with_counts.json
+%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/labels/project_label.json
+%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/labels/project_label_with_counts.json
 %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/license.json
 %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/merge_request.json
 %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/merge_requests.json
@@ -12763,6 +12960,7 @@
 %%WWWDIR%%/spec/fixtures/ci_build_artifacts.zip
 %%WWWDIR%%/spec/fixtures/ci_build_artifacts_metadata.gz
 %%WWWDIR%%/spec/fixtures/clusters/sample_cert.pem
+%%WWWDIR%%/spec/fixtures/clusters/sample_key.key
 %%WWWDIR%%/spec/fixtures/codequality/codequality.json
 %%WWWDIR%%/spec/fixtures/codequality/codequality.json.gz
 %%WWWDIR%%/spec/fixtures/config/kubeconfig-without-ca.yml
@@ -12928,6 +13126,7 @@
 %%WWWDIR%%/spec/frontend/activities_spec.js
 %%WWWDIR%%/spec/frontend/api_spec.js
 %%WWWDIR%%/spec/frontend/autosave_spec.js
+%%WWWDIR%%/spec/frontend/behaviors/markdown/render_metrics_spec.js
 %%WWWDIR%%/spec/frontend/behaviors/secret_values_spec.js
 %%WWWDIR%%/spec/frontend/blob/blob_fork_suggestion_spec.js
 %%WWWDIR%%/spec/frontend/boards/modal_store_spec.js
@@ -12962,6 +13161,8 @@
 %%WWWDIR%%/spec/frontend/diffs/components/no_changes_spec.js
 %%WWWDIR%%/spec/frontend/diffs/mock_data/diff_discussions.js
 %%WWWDIR%%/spec/frontend/environment.js
+%%WWWDIR%%/spec/frontend/environments/confirm_rollback_modal_spec.js
+%%WWWDIR%%/spec/frontend/environments/environment_rollback_spec.js
 %%WWWDIR%%/spec/frontend/error_tracking/components/error_tracking_list_spec.js
 %%WWWDIR%%/spec/frontend/error_tracking/store/mutation_spec.js
 %%WWWDIR%%/spec/frontend/error_tracking_settings/components/app_spec.js
@@ -12976,6 +13177,61 @@
 %%WWWDIR%%/spec/frontend/filtered_search/filtered_search_token_keys_spec.js
 %%WWWDIR%%/spec/frontend/filtered_search/services/recent_searches_service_error_spec.js
 %%WWWDIR%%/spec/frontend/filtered_search/stores/recent_searches_store_spec.js
+%%WWWDIR%%/spec/frontend/fixtures/abuse_reports.rb
+%%WWWDIR%%/spec/frontend/fixtures/admin_users.rb
+%%WWWDIR%%/spec/frontend/fixtures/application_settings.rb
+%%WWWDIR%%/spec/frontend/fixtures/autocomplete_sources.rb
+%%WWWDIR%%/spec/frontend/fixtures/blob.rb
+%%WWWDIR%%/spec/frontend/fixtures/boards.rb
+%%WWWDIR%%/spec/frontend/fixtures/branches.rb
+%%WWWDIR%%/spec/frontend/fixtures/clusters.rb
+%%WWWDIR%%/spec/frontend/fixtures/commit.rb
+%%WWWDIR%%/spec/frontend/fixtures/deploy_keys.rb
+%%WWWDIR%%/spec/frontend/fixtures/groups.rb
+%%WWWDIR%%/spec/frontend/fixtures/issues.rb
+%%WWWDIR%%/spec/frontend/fixtures/jobs.rb
+%%WWWDIR%%/spec/frontend/fixtures/labels.rb
+%%WWWDIR%%/spec/frontend/fixtures/merge_requests.rb
+%%WWWDIR%%/spec/frontend/fixtures/merge_requests_diffs.rb
+%%WWWDIR%%/spec/frontend/fixtures/pipeline_schedules.rb
+%%WWWDIR%%/spec/frontend/fixtures/pipelines.rb
+%%WWWDIR%%/spec/frontend/fixtures/projects.rb
+%%WWWDIR%%/spec/frontend/fixtures/prometheus_service.rb
+%%WWWDIR%%/spec/frontend/fixtures/raw.rb
+%%WWWDIR%%/spec/frontend/fixtures/search.rb
+%%WWWDIR%%/spec/frontend/fixtures/services.rb
+%%WWWDIR%%/spec/frontend/fixtures/sessions.rb
+%%WWWDIR%%/spec/frontend/fixtures/snippet.rb
+%%WWWDIR%%/spec/frontend/fixtures/static/README.md
+%%WWWDIR%%/spec/frontend/fixtures/static/ajax_loading_spinner.html
+%%WWWDIR%%/spec/frontend/fixtures/static/balsamiq_viewer.html
+%%WWWDIR%%/spec/frontend/fixtures/static/create_item_dropdown.html
+%%WWWDIR%%/spec/frontend/fixtures/static/environments/table.html
+%%WWWDIR%%/spec/frontend/fixtures/static/environments_logs.html
+%%WWWDIR%%/spec/frontend/fixtures/static/event_filter.html
+%%WWWDIR%%/spec/frontend/fixtures/static/gl_dropdown.html
+%%WWWDIR%%/spec/frontend/fixtures/static/gl_field_errors.html
+%%WWWDIR%%/spec/frontend/fixtures/static/images/green_box.png
+%%WWWDIR%%/spec/frontend/fixtures/static/images/one_white_pixel.png
+%%WWWDIR%%/spec/frontend/fixtures/static/images/red_box.png
+%%WWWDIR%%/spec/frontend/fixtures/static/issuable_filter.html
+%%WWWDIR%%/spec/frontend/fixtures/static/issue_sidebar_label.html
+%%WWWDIR%%/spec/frontend/fixtures/static/line_highlighter.html
+%%WWWDIR%%/spec/frontend/fixtures/static/linked_tabs.html
+%%WWWDIR%%/spec/frontend/fixtures/static/merge_requests_show.html
+%%WWWDIR%%/spec/frontend/fixtures/static/mini_dropdown_graph.html
+%%WWWDIR%%/spec/frontend/fixtures/static/notebook_viewer.html
+%%WWWDIR%%/spec/frontend/fixtures/static/oauth_remember_me.html
+%%WWWDIR%%/spec/frontend/fixtures/static/pdf_viewer.html
+%%WWWDIR%%/spec/frontend/fixtures/static/pipeline_graph.html
+%%WWWDIR%%/spec/frontend/fixtures/static/pipelines.html
+%%WWWDIR%%/spec/frontend/fixtures/static/project_select_combo_button.html
+%%WWWDIR%%/spec/frontend/fixtures/static/projects.json
+%%WWWDIR%%/spec/frontend/fixtures/static/search_autocomplete.html
+%%WWWDIR%%/spec/frontend/fixtures/static/signin_tabs.html
+%%WWWDIR%%/spec/frontend/fixtures/static/sketch_viewer.html
+%%WWWDIR%%/spec/frontend/fixtures/todos.rb
+%%WWWDIR%%/spec/frontend/fixtures/u2f.rb
 %%WWWDIR%%/spec/frontend/frequent_items/store/getters_spec.js
 %%WWWDIR%%/spec/frontend/gfm_auto_complete_spec.js
 %%WWWDIR%%/spec/frontend/helpers/class_spec_helper.js
@@ -12994,6 +13250,7 @@
 %%WWWDIR%%/spec/frontend/helpers/vue_mount_component_helper.js
 %%WWWDIR%%/spec/frontend/helpers/vue_resource_helper.js
 %%WWWDIR%%/spec/frontend/helpers/vue_test_utils_helper.js
+%%WWWDIR%%/spec/frontend/helpers/vue_test_utils_helper_spec.js
 %%WWWDIR%%/spec/frontend/helpers/vuex_action_helper.js
 %%WWWDIR%%/spec/frontend/helpers/vuex_action_helper_spec.js
 %%WWWDIR%%/spec/frontend/helpers/wait_for_attribute_change.js
@@ -13025,7 +13282,6 @@
 %%WWWDIR%%/spec/frontend/issuable_suggestions/components/item_spec.js
 %%WWWDIR%%/spec/frontend/issuable_suggestions/mock_data.js
 %%WWWDIR%%/spec/frontend/issue_show/components/pinned_links_spec.js
-%%WWWDIR%%/spec/frontend/jobs/components/empty_state_spec.js
 %%WWWDIR%%/spec/frontend/jobs/components/erased_block_spec.js
 %%WWWDIR%%/spec/frontend/jobs/components/sidebar_detail_row_spec.js
 %%WWWDIR%%/spec/frontend/jobs/components/stuck_block_spec.js
@@ -13035,7 +13291,9 @@
 %%WWWDIR%%/spec/frontend/lib/utils/ajax_cache_spec.js
 %%WWWDIR%%/spec/frontend/lib/utils/autosave_spec.js
 %%WWWDIR%%/spec/frontend/lib/utils/cache_spec.js
+%%WWWDIR%%/spec/frontend/lib/utils/color_utils_spec.js
 %%WWWDIR%%/spec/frontend/lib/utils/datetime_utility_spec.js
+%%WWWDIR%%/spec/frontend/lib/utils/forms_spec.js
 %%WWWDIR%%/spec/frontend/lib/utils/grammar_spec.js
 %%WWWDIR%%/spec/frontend/lib/utils/image_utility_spec.js
 %%WWWDIR%%/spec/frontend/lib/utils/number_utility_spec.js
@@ -13043,6 +13301,7 @@
 %%WWWDIR%%/spec/frontend/lib/utils/url_utility_spec.js
 %%WWWDIR%%/spec/frontend/locale/ensure_single_line_spec.js
 %%WWWDIR%%/spec/frontend/locale/sprintf_spec.js
+%%WWWDIR%%/spec/frontend/matchers.js
 %%WWWDIR%%/spec/frontend/mocks/ce/lib/utils/axios_utils.js
 %%WWWDIR%%/spec/frontend/mocks/mocks_helper.js
 %%WWWDIR%%/spec/frontend/mocks/mocks_helper_spec.js
@@ -13050,6 +13309,8 @@
 %%WWWDIR%%/spec/frontend/mocks_spec.js
 %%WWWDIR%%/spec/frontend/monitoring/__snapshots__/dashboard_state_spec.js.snap
 %%WWWDIR%%/spec/frontend/monitoring/dashboard_state_spec.js
+%%WWWDIR%%/spec/frontend/monitoring/embed/embed_spec.js
+%%WWWDIR%%/spec/frontend/monitoring/embed/mock_data.js
 %%WWWDIR%%/spec/frontend/mr_popover/__snapshots__/mr_popover_spec.js.snap
 %%WWWDIR%%/spec/frontend/mr_popover/index_spec.js
 %%WWWDIR%%/spec/frontend/mr_popover/mr_popover_spec.js
@@ -13057,6 +13318,7 @@
 %%WWWDIR%%/spec/frontend/notes/components/__snapshots__/discussion_jump_to_next_button_spec.js.snap
 %%WWWDIR%%/spec/frontend/notes/components/discussion_actions_spec.js
 %%WWWDIR%%/spec/frontend/notes/components/discussion_jump_to_next_button_spec.js
+%%WWWDIR%%/spec/frontend/notes/components/discussion_keyboard_navigator_spec.js
 %%WWWDIR%%/spec/frontend/notes/components/discussion_notes_replies_wrapper_spec.js
 %%WWWDIR%%/spec/frontend/notes/components/discussion_notes_spec.js
 %%WWWDIR%%/spec/frontend/notes/components/discussion_reply_placeholder_spec.js
@@ -13070,11 +13332,14 @@
 %%WWWDIR%%/spec/frontend/operation_settings/store/mutations_spec.js
 %%WWWDIR%%/spec/frontend/pages/admin/abuse_reports/abuse_reports_spec.js
 %%WWWDIR%%/spec/frontend/pages/profiles/show/emoji_menu_spec.js
+%%WWWDIR%%/spec/frontend/pages/search/show/__snapshots__/refresh_counts_spec.js.snap
+%%WWWDIR%%/spec/frontend/pages/search/show/refresh_counts_spec.js
 %%WWWDIR%%/spec/frontend/performance_bar/services/performance_bar_service_spec.js
 %%WWWDIR%%/spec/frontend/pipelines/blank_state_spec.js
 %%WWWDIR%%/spec/frontend/pipelines/empty_state_spec.js
 %%WWWDIR%%/spec/frontend/pipelines/pipeline_store_spec.js
 %%WWWDIR%%/spec/frontend/pipelines/pipelines_store_spec.js
+%%WWWDIR%%/spec/frontend/projects/gke_cluster_namespace/gke_cluster_namespace_spec.js
 %%WWWDIR%%/spec/frontend/projects/projects_filterable_list_spec.js
 %%WWWDIR%%/spec/frontend/registry/getters_spec.js
 %%WWWDIR%%/spec/frontend/reports/components/report_item_spec.js
@@ -13109,6 +13374,7 @@
 %%WWWDIR%%/spec/frontend/sidebar/confidential_edit_form_buttons_spec.js
 %%WWWDIR%%/spec/frontend/sidebar/lock/edit_form_spec.js
 %%WWWDIR%%/spec/frontend/test_setup.js
+%%WWWDIR%%/spec/frontend/tracking_spec.js
 %%WWWDIR%%/spec/frontend/u2f/util_spec.js
 %%WWWDIR%%/spec/frontend/vue_mr_widget/components/mr_widget_container_spec.js
 %%WWWDIR%%/spec/frontend/vue_mr_widget/components/mr_widget_icon_spec.js
@@ -13119,6 +13385,7 @@
 %%WWWDIR%%/spec/frontend/vue_shared/components/__snapshots__/file_row_header_spec.js.snap
 %%WWWDIR%%/spec/frontend/vue_shared/components/__snapshots__/resizable_chart_container_spec.js.snap
 %%WWWDIR%%/spec/frontend/vue_shared/components/callout_spec.js
+%%WWWDIR%%/spec/frontend/vue_shared/components/changed_file_icon_spec.js
 %%WWWDIR%%/spec/frontend/vue_shared/components/code_block_spec.js
 %%WWWDIR%%/spec/frontend/vue_shared/components/diff_viewer/viewers/mode_changed_spec.js
 %%WWWDIR%%/spec/frontend/vue_shared/components/file_row_header_spec.js
@@ -13266,6 +13533,7 @@
 %%WWWDIR%%/spec/helpers/rss_helper_spec.rb
 %%WWWDIR%%/spec/helpers/runners_helper_spec.rb
 %%WWWDIR%%/spec/helpers/search_helper_spec.rb
+%%WWWDIR%%/spec/helpers/sessions_helper_spec.rb
 %%WWWDIR%%/spec/helpers/sidekiq_helper_spec.rb
 %%WWWDIR%%/spec/helpers/snippets_helper_spec.rb
 %%WWWDIR%%/spec/helpers/sorting_helper_spec.rb
@@ -13368,6 +13636,7 @@
 %%WWWDIR%%/spec/javascripts/diffs/components/compare_versions_spec.js
 %%WWWDIR%%/spec/javascripts/diffs/components/diff_content_spec.js
 %%WWWDIR%%/spec/javascripts/diffs/components/diff_discussions_spec.js
+%%WWWDIR%%/spec/javascripts/diffs/components/diff_expansion_cell_spec.js
 %%WWWDIR%%/spec/javascripts/diffs/components/diff_file_header_spec.js
 %%WWWDIR%%/spec/javascripts/diffs/components/diff_file_spec.js
 %%WWWDIR%%/spec/javascripts/diffs/components/diff_line_gutter_content_spec.js
@@ -13375,8 +13644,10 @@
 %%WWWDIR%%/spec/javascripts/diffs/components/diff_table_cell_spec.js
 %%WWWDIR%%/spec/javascripts/diffs/components/file_row_stats_spec.js
 %%WWWDIR%%/spec/javascripts/diffs/components/image_diff_overlay_spec.js
+%%WWWDIR%%/spec/javascripts/diffs/components/inline_diff_expansion_row_spec.js
 %%WWWDIR%%/spec/javascripts/diffs/components/inline_diff_table_row_spec.js
 %%WWWDIR%%/spec/javascripts/diffs/components/inline_diff_view_spec.js
+%%WWWDIR%%/spec/javascripts/diffs/components/parallel_diff_expansion_row_spec.js
 %%WWWDIR%%/spec/javascripts/diffs/components/parallel_diff_table_row_spec.js
 %%WWWDIR%%/spec/javascripts/diffs/components/parallel_diff_view_spec.js
 %%WWWDIR%%/spec/javascripts/diffs/components/settings_dropdown_spec.js
@@ -13402,13 +13673,11 @@
 %%WWWDIR%%/spec/javascripts/droplab/plugins/input_setter_spec.js
 %%WWWDIR%%/spec/javascripts/dropzone_input_spec.js
 %%WWWDIR%%/spec/javascripts/emoji_spec.js
-%%WWWDIR%%/spec/javascripts/environments/confirm_rollback_modal_spec.js
 %%WWWDIR%%/spec/javascripts/environments/emtpy_state_spec.js
 %%WWWDIR%%/spec/javascripts/environments/environment_actions_spec.js
 %%WWWDIR%%/spec/javascripts/environments/environment_external_url_spec.js
 %%WWWDIR%%/spec/javascripts/environments/environment_item_spec.js
 %%WWWDIR%%/spec/javascripts/environments/environment_monitoring_spec.js
-%%WWWDIR%%/spec/javascripts/environments/environment_rollback_spec.js
 %%WWWDIR%%/spec/javascripts/environments/environment_stop_spec.js
 %%WWWDIR%%/spec/javascripts/environments/environment_table_spec.js
 %%WWWDIR%%/spec/javascripts/environments/environment_terminal_button_spec.js
@@ -13429,60 +13698,6 @@
 %%WWWDIR%%/spec/javascripts/filtered_search/recent_searches_root_spec.js
 %%WWWDIR%%/spec/javascripts/filtered_search/services/recent_searches_service_spec.js
 %%WWWDIR%%/spec/javascripts/filtered_search/visual_token_value_spec.js
-%%WWWDIR%%/spec/javascripts/fixtures/abuse_reports.rb
-%%WWWDIR%%/spec/javascripts/fixtures/admin_users.rb
-%%WWWDIR%%/spec/javascripts/fixtures/application_settings.rb
-%%WWWDIR%%/spec/javascripts/fixtures/autocomplete_sources.rb
-%%WWWDIR%%/spec/javascripts/fixtures/blob.rb
-%%WWWDIR%%/spec/javascripts/fixtures/boards.rb
-%%WWWDIR%%/spec/javascripts/fixtures/branches.rb
-%%WWWDIR%%/spec/javascripts/fixtures/clusters.rb
-%%WWWDIR%%/spec/javascripts/fixtures/commit.rb
-%%WWWDIR%%/spec/javascripts/fixtures/deploy_keys.rb
-%%WWWDIR%%/spec/javascripts/fixtures/groups.rb
-%%WWWDIR%%/spec/javascripts/fixtures/issues.rb
-%%WWWDIR%%/spec/javascripts/fixtures/jobs.rb
-%%WWWDIR%%/spec/javascripts/fixtures/labels.rb
-%%WWWDIR%%/spec/javascripts/fixtures/merge_requests.rb
-%%WWWDIR%%/spec/javascripts/fixtures/merge_requests_diffs.rb
-%%WWWDIR%%/spec/javascripts/fixtures/pipeline_schedules.rb
-%%WWWDIR%%/spec/javascripts/fixtures/pipelines.rb
-%%WWWDIR%%/spec/javascripts/fixtures/projects.rb
-%%WWWDIR%%/spec/javascripts/fixtures/prometheus_service.rb
-%%WWWDIR%%/spec/javascripts/fixtures/raw.rb
-%%WWWDIR%%/spec/javascripts/fixtures/search.rb
-%%WWWDIR%%/spec/javascripts/fixtures/services.rb
-%%WWWDIR%%/spec/javascripts/fixtures/sessions.rb
-%%WWWDIR%%/spec/javascripts/fixtures/snippet.rb
-%%WWWDIR%%/spec/javascripts/fixtures/static/README.md
-%%WWWDIR%%/spec/javascripts/fixtures/static/ajax_loading_spinner.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/balsamiq_viewer.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/create_item_dropdown.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/environments/table.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/event_filter.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/gl_dropdown.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/gl_field_errors.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/images/green_box.png
-%%WWWDIR%%/spec/javascripts/fixtures/static/images/one_white_pixel.png
-%%WWWDIR%%/spec/javascripts/fixtures/static/images/red_box.png
-%%WWWDIR%%/spec/javascripts/fixtures/static/issuable_filter.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/issue_sidebar_label.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/line_highlighter.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/linked_tabs.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/merge_requests_show.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/mini_dropdown_graph.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/notebook_viewer.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/oauth_remember_me.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/pdf_viewer.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/pipeline_graph.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/pipelines.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/project_select_combo_button.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/projects.json
-%%WWWDIR%%/spec/javascripts/fixtures/static/search_autocomplete.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/signin_tabs.html
-%%WWWDIR%%/spec/javascripts/fixtures/static/sketch_viewer.html
-%%WWWDIR%%/spec/javascripts/fixtures/todos.rb
-%%WWWDIR%%/spec/javascripts/fixtures/u2f.rb
 %%WWWDIR%%/spec/javascripts/flash_spec.js
 %%WWWDIR%%/spec/javascripts/fly_out_nav_spec.js
 %%WWWDIR%%/spec/javascripts/frequent_items/components/app_spec.js
@@ -13526,7 +13741,6 @@
 %%WWWDIR%%/spec/javascripts/helpers/vue_mount_component_helper.js
 %%WWWDIR%%/spec/javascripts/helpers/vue_resource_helper.js
 %%WWWDIR%%/spec/javascripts/helpers/vue_test_utils_helper.js
-%%WWWDIR%%/spec/javascripts/helpers/vue_test_utils_helper_spec.js
 %%WWWDIR%%/spec/javascripts/helpers/vuex_action_helper.js
 %%WWWDIR%%/spec/javascripts/helpers/vuex_action_helper_spec.js
 %%WWWDIR%%/spec/javascripts/helpers/wait_for_attribute_change.js
@@ -13636,12 +13850,14 @@
 %%WWWDIR%%/spec/javascripts/issue_spec.js
 %%WWWDIR%%/spec/javascripts/jobs/components/artifacts_block_spec.js
 %%WWWDIR%%/spec/javascripts/jobs/components/commit_block_spec.js
+%%WWWDIR%%/spec/javascripts/jobs/components/empty_state_spec.js
 %%WWWDIR%%/spec/javascripts/jobs/components/environments_block_spec.js
 %%WWWDIR%%/spec/javascripts/jobs/components/job_app_spec.js
 %%WWWDIR%%/spec/javascripts/jobs/components/job_container_item_spec.js
 %%WWWDIR%%/spec/javascripts/jobs/components/job_log_controllers_spec.js
 %%WWWDIR%%/spec/javascripts/jobs/components/job_log_spec.js
 %%WWWDIR%%/spec/javascripts/jobs/components/jobs_container_spec.js
+%%WWWDIR%%/spec/javascripts/jobs/components/manual_variables_form_spec.js
 %%WWWDIR%%/spec/javascripts/jobs/components/sidebar_spec.js
 %%WWWDIR%%/spec/javascripts/jobs/components/stages_dropdown_spec.js
 %%WWWDIR%%/spec/javascripts/jobs/components/trigger_block_spec.js
@@ -13675,10 +13891,12 @@
 %%WWWDIR%%/spec/javascripts/mini_pipeline_graph_dropdown_spec.js
 %%WWWDIR%%/spec/javascripts/monitoring/charts/area_spec.js
 %%WWWDIR%%/spec/javascripts/monitoring/charts/column_spec.js
+%%WWWDIR%%/spec/javascripts/monitoring/charts/empty_chart_spec.js
 %%WWWDIR%%/spec/javascripts/monitoring/charts/single_stat_spec.js
 %%WWWDIR%%/spec/javascripts/monitoring/dashboard_spec.js
 %%WWWDIR%%/spec/javascripts/monitoring/helpers.js
 %%WWWDIR%%/spec/javascripts/monitoring/mock_data.js
+%%WWWDIR%%/spec/javascripts/monitoring/panel_type_spec.js
 %%WWWDIR%%/spec/javascripts/monitoring/store/actions_spec.js
 %%WWWDIR%%/spec/javascripts/monitoring/store/mutations_spec.js
 %%WWWDIR%%/spec/javascripts/monitoring/store/utils_spec.js
@@ -13871,7 +14089,6 @@
 %%WWWDIR%%/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
 %%WWWDIR%%/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
 %%WWWDIR%%/spec/javascripts/vue_shared/components/bar_chart_spec.js
-%%WWWDIR%%/spec/javascripts/vue_shared/components/changed_file_icon_spec.js
 %%WWWDIR%%/spec/javascripts/vue_shared/components/ci_badge_link_spec.js
 %%WWWDIR%%/spec/javascripts/vue_shared/components/ci_icon_spec.js
 %%WWWDIR%%/spec/javascripts/vue_shared/components/clipboard_button_spec.js
@@ -14091,6 +14308,8 @@
 %%WWWDIR%%/spec/lib/gitlab/background_migration/fix_cross_project_label_links_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/background_migration/fix_user_namespace_names_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/background_migration/fix_user_project_route_names_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/background_migration/legacy_upload_mover_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/background_migration/legacy_uploads_migrator_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/background_migration/merge_request_assignees_migration_progress_check_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/background_migration/migrate_build_stage_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/background_migration/migrate_legacy_artifacts_spec.rb
@@ -14310,6 +14529,7 @@
 %%WWWDIR%%/spec/lib/gitlab/config/loader/yaml_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/conflict/file_collection_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/conflict/file_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/content_security_policy/config_loader_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/contributions_calendar_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/cross_project_access/check_collection_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/cross_project_access/check_info_spec.rb
@@ -14321,6 +14541,7 @@
 %%WWWDIR%%/spec/lib/gitlab/cycle_analytics/code_event_fetcher_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/cycle_analytics/code_stage_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/cycle_analytics/events_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/cycle_analytics/group_stage_summary_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/cycle_analytics/issue_event_fetcher_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/cycle_analytics/issue_stage_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/cycle_analytics/permissions_spec.rb
@@ -14354,7 +14575,6 @@
 %%WWWDIR%%/spec/lib/gitlab/database/count/tablesample_count_strategy_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/database/count_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/database/grant_spec.rb
-%%WWWDIR%%/spec/lib/gitlab/database/median_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/database/migration_helpers_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/database/multi_threaded_migration_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb
@@ -14476,6 +14696,7 @@
 %%WWWDIR%%/spec/lib/gitlab/git/wraps_gitaly_errors_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/git_access_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/git_access_wiki_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/git_post_receive_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/git_ref_validator_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/git_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/gitaly_client/blob_service_spec.rb
@@ -14487,7 +14708,6 @@
 %%WWWDIR%%/spec/lib/gitlab/gitaly_client/diff_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/gitaly_client/diff_stitcher_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/gitaly_client/health_check_service_spec.rb
-%%WWWDIR%%/spec/lib/gitlab/gitaly_client/notification_service_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/gitaly_client/object_pool_service_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/gitaly_client/operation_service_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/gitaly_client/ref_service_spec.rb
@@ -14646,6 +14866,7 @@
 %%WWWDIR%%/spec/lib/gitlab/json_logger_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/kubernetes/cluster_role_binding_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/kubernetes/config_map_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/kubernetes/default_namespace_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/kubernetes/helm/api_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/kubernetes/helm/base_command_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/kubernetes/helm/certificate_spec.rb
@@ -14653,7 +14874,9 @@
 %%WWWDIR%%/spec/lib/gitlab/kubernetes/helm/init_command_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/kubernetes/helm/pod_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/kubernetes/helm/reset_command_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/kubernetes/kube_client_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/kubernetes/kubectl_cmd_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/kubernetes/namespace_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/kubernetes/role_binding_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/kubernetes/role_spec.rb
@@ -14690,11 +14913,10 @@
 %%WWWDIR%%/spec/lib/gitlab/markdown_cache/redis/store_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/markup_helper_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/metrics/background_transaction_spec.rb
-%%WWWDIR%%/spec/lib/gitlab/metrics/dashboard/dynamic_dashboard_service_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/metrics/dashboard/defaults_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/metrics/dashboard/finder_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/metrics/dashboard/processor_spec.rb
-%%WWWDIR%%/spec/lib/gitlab/metrics/dashboard/project_dashboard_service_spec.rb
-%%WWWDIR%%/spec/lib/gitlab/metrics/dashboard/system_dashboard_service_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/metrics/dashboard/service_selector_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/metrics/dashboard/url_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/metrics/delta_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/metrics/instrumentation_spec.rb
@@ -14795,9 +15017,11 @@
 %%WWWDIR%%/spec/lib/gitlab/repository_cache_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/request_context_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/request_forgery_protection_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/request_profiler/profile_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/request_profiler_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/route_map_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/routing_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/rugged_instrumentation_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/safe_request_store_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/sanitizers/exif_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/sanitizers/svg_spec.rb
@@ -14824,6 +15048,7 @@
 %%WWWDIR%%/spec/lib/gitlab/sidekiq_middleware/correlation_injector_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/sidekiq_middleware/correlation_logger_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/sidekiq_middleware/metrics_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/sidekiq_signals_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/sidekiq_status/client_middleware_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/sidekiq_status/server_middleware_spec.rb
@@ -14846,7 +15071,9 @@
 %%WWWDIR%%/spec/lib/gitlab/slash_commands/presenters/issue_show_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/slash_commands/presenters/run_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/slash_commands/run_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/slug/environment_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/snippet_search_results_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/snowplow_tracker_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/sql/cte_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/sql/glob_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/sql/pattern_spec.rb
@@ -14874,7 +15101,14 @@
 %%WWWDIR%%/spec/lib/gitlab/url_blocker_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/url_builder_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/url_sanitizer_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/usage_data_counters/cycle_analytics_counter_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/usage_data_counters/note_counter_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/usage_data_counters/redis_counter_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/usage_data_counters/search_counter_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/usage_data_counters/snippet_counter_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/usage_data_counters/source_code_counter_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/usage_data_counters/web_ide_counter_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/usage_data_counters/wiki_page_counter_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/usage_data_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/user_access_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/utils/deep_size_spec.rb
@@ -14912,6 +15146,8 @@
 %%WWWDIR%%/spec/lib/object_storage/direct_upload_spec.rb
 %%WWWDIR%%/spec/lib/omni_auth/strategies/jwt_spec.rb
 %%WWWDIR%%/spec/lib/peek/views/redis_detailed_spec.rb
+%%WWWDIR%%/spec/lib/peek/views/rugged_spec.rb
+%%WWWDIR%%/spec/lib/prometheus/pid_provider_spec.rb
 %%WWWDIR%%/spec/lib/quality/helm_client_spec.rb
 %%WWWDIR%%/spec/lib/quality/kubernetes_client_spec.rb
 %%WWWDIR%%/spec/lib/quality/seeders/issues_spec.rb
@@ -14959,6 +15195,7 @@
 %%WWWDIR%%/spec/migrations/backfill_store_project_full_path_in_repo_spec.rb
 %%WWWDIR%%/spec/migrations/backport_enterprise_schema_spec.rb
 %%WWWDIR%%/spec/migrations/change_default_value_for_dsa_key_restriction_spec.rb
+%%WWWDIR%%/spec/migrations/change_outbound_local_requests_whitelist_default_spec.rb
 %%WWWDIR%%/spec/migrations/change_packages_size_defaults_in_project_statistics_spec.rb
 %%WWWDIR%%/spec/migrations/clean_up_noteable_id_for_notes_on_commits_spec.rb
 %%WWWDIR%%/spec/migrations/cleanup_build_stage_migration_spec.rb
@@ -15007,12 +15244,14 @@
 %%WWWDIR%%/spec/migrations/schedule_sync_issuables_state_id_spec.rb
 %%WWWDIR%%/spec/migrations/schedule_sync_issuables_state_id_where_nil_spec.rb
 %%WWWDIR%%/spec/migrations/schedule_to_archive_legacy_traces_spec.rb
+%%WWWDIR%%/spec/migrations/set_issue_id_for_all_versions_spec.rb
 %%WWWDIR%%/spec/migrations/steal_fill_store_upload_spec.rb
 %%WWWDIR%%/spec/migrations/truncate_user_fullname_spec.rb
 %%WWWDIR%%/spec/migrations/update_project_import_visibility_level_spec.rb
 %%WWWDIR%%/spec/models/ability_spec.rb
 %%WWWDIR%%/spec/models/abuse_report_spec.rb
 %%WWWDIR%%/spec/models/active_session_spec.rb
+%%WWWDIR%%/spec/models/analytics/cycle_analytics/project_stage_spec.rb
 %%WWWDIR%%/spec/models/appearance_spec.rb
 %%WWWDIR%%/spec/models/application_record_spec.rb
 %%WWWDIR%%/spec/models/application_setting/term_spec.rb
@@ -15043,6 +15282,7 @@
 %%WWWDIR%%/spec/models/ci/artifact_blob_spec.rb
 %%WWWDIR%%/spec/models/ci/bridge_spec.rb
 %%WWWDIR%%/spec/models/ci/build_metadata_spec.rb
+%%WWWDIR%%/spec/models/ci/build_need_spec.rb
 %%WWWDIR%%/spec/models/ci/build_runner_session_spec.rb
 %%WWWDIR%%/spec/models/ci/build_spec.rb
 %%WWWDIR%%/spec/models/ci/build_trace_chunk_spec.rb
@@ -15054,6 +15294,7 @@
 %%WWWDIR%%/spec/models/ci/group_spec.rb
 %%WWWDIR%%/spec/models/ci/group_variable_spec.rb
 %%WWWDIR%%/spec/models/ci/job_artifact_spec.rb
+%%WWWDIR%%/spec/models/ci/job_variable_spec.rb
 %%WWWDIR%%/spec/models/ci/legacy_stage_spec.rb
 %%WWWDIR%%/spec/models/ci/pipeline_schedule_spec.rb
 %%WWWDIR%%/spec/models/ci/pipeline_schedule_variable_spec.rb
@@ -15104,6 +15345,7 @@
 %%WWWDIR%%/spec/models/concerns/feature_gate_spec.rb
 %%WWWDIR%%/spec/models/concerns/from_union_spec.rb
 %%WWWDIR%%/spec/models/concerns/group_descendant_spec.rb
+%%WWWDIR%%/spec/models/concerns/has_environment_scope_spec.rb
 %%WWWDIR%%/spec/models/concerns/has_ref_spec.rb
 %%WWWDIR%%/spec/models/concerns/has_status_spec.rb
 %%WWWDIR%%/spec/models/concerns/has_variable_spec.rb
@@ -15126,7 +15368,6 @@
 %%WWWDIR%%/spec/models/concerns/reactive_caching_spec.rb
 %%WWWDIR%%/spec/models/concerns/redactable_spec.rb
 %%WWWDIR%%/spec/models/concerns/redis_cacheable_spec.rb
-%%WWWDIR%%/spec/models/concerns/relative_positioning_spec.rb
 %%WWWDIR%%/spec/models/concerns/resolvable_discussion_spec.rb
 %%WWWDIR%%/spec/models/concerns/resolvable_note_spec.rb
 %%WWWDIR%%/spec/models/concerns/routable_spec.rb
@@ -15144,6 +15385,7 @@
 %%WWWDIR%%/spec/models/container_repository_spec.rb
 %%WWWDIR%%/spec/models/conversational_development_index/metric_spec.rb
 %%WWWDIR%%/spec/models/cycle_analytics/code_spec.rb
+%%WWWDIR%%/spec/models/cycle_analytics/group_level_spec.rb
 %%WWWDIR%%/spec/models/cycle_analytics/issue_spec.rb
 %%WWWDIR%%/spec/models/cycle_analytics/plan_spec.rb
 %%WWWDIR%%/spec/models/cycle_analytics/production_spec.rb
@@ -15269,7 +15511,6 @@
 %%WWWDIR%%/spec/models/project_services/issue_tracker_service_spec.rb
 %%WWWDIR%%/spec/models/project_services/jira_service_spec.rb
 %%WWWDIR%%/spec/models/project_services/jira_tracker_data_spec.rb
-%%WWWDIR%%/spec/models/project_services/kubernetes_service_spec.rb
 %%WWWDIR%%/spec/models/project_services/mattermost_service_spec.rb
 %%WWWDIR%%/spec/models/project_services/mattermost_slash_commands_service_spec.rb
 %%WWWDIR%%/spec/models/project_services/microsoft_teams_service_spec.rb
@@ -15403,7 +15644,6 @@
 %%WWWDIR%%/spec/requests/api/broadcast_messages_spec.rb
 %%WWWDIR%%/spec/requests/api/commit_statuses_spec.rb
 %%WWWDIR%%/spec/requests/api/commits_spec.rb
-%%WWWDIR%%/spec/requests/api/container_registry_spec.rb
 %%WWWDIR%%/spec/requests/api/deploy_keys_spec.rb
 %%WWWDIR%%/spec/requests/api/deployments_spec.rb
 %%WWWDIR%%/spec/requests/api/discussions_spec.rb
@@ -15438,6 +15678,7 @@
 %%WWWDIR%%/spec/requests/api/graphql_spec.rb
 %%WWWDIR%%/spec/requests/api/group_boards_spec.rb
 %%WWWDIR%%/spec/requests/api/group_clusters_spec.rb
+%%WWWDIR%%/spec/requests/api/group_container_repositories_spec.rb
 %%WWWDIR%%/spec/requests/api/group_labels_spec.rb
 %%WWWDIR%%/spec/requests/api/group_milestones_spec.rb
 %%WWWDIR%%/spec/requests/api/group_variables_spec.rb
@@ -15469,6 +15710,7 @@
 %%WWWDIR%%/spec/requests/api/pipeline_schedules_spec.rb
 %%WWWDIR%%/spec/requests/api/pipelines_spec.rb
 %%WWWDIR%%/spec/requests/api/project_clusters_spec.rb
+%%WWWDIR%%/spec/requests/api/project_container_repositories_spec.rb
 %%WWWDIR%%/spec/requests/api/project_events_spec.rb
 %%WWWDIR%%/spec/requests/api/project_export_spec.rb
 %%WWWDIR%%/spec/requests/api/project_hooks_spec.rb
@@ -15517,6 +15759,7 @@
 %%WWWDIR%%/spec/requests/user_activity_spec.rb
 %%WWWDIR%%/spec/routing/admin_routing_spec.rb
 %%WWWDIR%%/spec/routing/environments_spec.rb
+%%WWWDIR%%/spec/routing/git_http_routing_spec.rb
 %%WWWDIR%%/spec/routing/group_routing_spec.rb
 %%WWWDIR%%/spec/routing/import_routing_spec.rb
 %%WWWDIR%%/spec/routing/instance_statistics_routing_spec.rb
@@ -15568,6 +15811,7 @@
 %%WWWDIR%%/spec/rubocop/cop/qa/element_with_pattern_spec.rb
 %%WWWDIR%%/spec/rubocop/cop/rspec/env_assignment_spec.rb
 %%WWWDIR%%/spec/rubocop/cop/rspec/factories_in_migration_specs_spec.rb
+%%WWWDIR%%/spec/rubocop/cop/rspec/top_level_describe_path_spec.rb
 %%WWWDIR%%/spec/rubocop/cop/ruby_interpolation_in_translation_spec.rb
 %%WWWDIR%%/spec/rubocop/cop/safe_params_spec.rb
 %%WWWDIR%%/spec/rubocop/cop/sidekiq_options_queue_spec.rb
@@ -15651,6 +15895,7 @@
 %%WWWDIR%%/spec/serializers/test_suite_comparer_entity_spec.rb
 %%WWWDIR%%/spec/serializers/trigger_variable_entity_spec.rb
 %%WWWDIR%%/spec/serializers/user_entity_spec.rb
+%%WWWDIR%%/spec/serializers/user_serializer_spec.rb
 %%WWWDIR%%/spec/serializers/variable_entity_spec.rb
 %%WWWDIR%%/spec/services/access_token_validation_service_spec.rb
 %%WWWDIR%%/spec/services/application_settings/update_service_spec.rb
@@ -15707,6 +15952,7 @@
 %%WWWDIR%%/spec/services/clusters/applications/uninstall_service_spec.rb
 %%WWWDIR%%/spec/services/clusters/applications/update_service_spec.rb
 %%WWWDIR%%/spec/services/clusters/applications/upgrade_service_spec.rb
+%%WWWDIR%%/spec/services/clusters/build_kubernetes_namespace_service_spec.rb
 %%WWWDIR%%/spec/services/clusters/build_service_spec.rb
 %%WWWDIR%%/spec/services/clusters/create_service_spec.rb
 %%WWWDIR%%/spec/services/clusters/gcp/fetch_operation_service_spec.rb
@@ -15716,7 +15962,6 @@
 %%WWWDIR%%/spec/services/clusters/gcp/kubernetes/fetch_kubernetes_token_service_spec.rb
 %%WWWDIR%%/spec/services/clusters/gcp/provision_service_spec.rb
 %%WWWDIR%%/spec/services/clusters/gcp/verify_provision_status_service_spec.rb
-%%WWWDIR%%/spec/services/clusters/refresh_service_spec.rb
 %%WWWDIR%%/spec/services/clusters/update_service_spec.rb
 %%WWWDIR%%/spec/services/cohorts_service_spec.rb
 %%WWWDIR%%/spec/services/commits/commit_patch_service_spec.rb
@@ -15815,6 +16060,11 @@
 %%WWWDIR%%/spec/services/merge_requests/resolved_discussion_notification_service_spec.rb
 %%WWWDIR%%/spec/services/merge_requests/squash_service_spec.rb
 %%WWWDIR%%/spec/services/merge_requests/update_service_spec.rb
+%%WWWDIR%%/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb
+%%WWWDIR%%/spec/services/metrics/dashboard/default_embed_service_spec.rb
+%%WWWDIR%%/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb
+%%WWWDIR%%/spec/services/metrics/dashboard/project_dashboard_service_spec.rb
+%%WWWDIR%%/spec/services/metrics/dashboard/system_dashboard_service_spec.rb
 %%WWWDIR%%/spec/services/milestones/close_service_spec.rb
 %%WWWDIR%%/spec/services/milestones/create_service_spec.rb
 %%WWWDIR%%/spec/services/milestones/destroy_service_spec.rb
@@ -15958,10 +16208,12 @@
 %%WWWDIR%%/spec/services/users/update_service_spec.rb
 %%WWWDIR%%/spec/services/verify_pages_domain_service_spec.rb
 %%WWWDIR%%/spec/services/web_hook_service_spec.rb
+%%WWWDIR%%/spec/services/wiki_pages/base_service_spec.rb
 %%WWWDIR%%/spec/services/wiki_pages/create_service_spec.rb
 %%WWWDIR%%/spec/services/wiki_pages/destroy_service_spec.rb
 %%WWWDIR%%/spec/services/wiki_pages/update_service_spec.rb
 %%WWWDIR%%/spec/services/wikis/create_attachment_service_spec.rb
+%%WWWDIR%%/spec/services/zoom_notes_service_spec.rb
 %%WWWDIR%%/spec/sidekiq/cron/job_gem_dependency_spec.rb
 %%WWWDIR%%/spec/simplecov_env.rb
 %%WWWDIR%%/spec/spec_helper.rb
@@ -16030,6 +16282,7 @@
 %%WWWDIR%%/spec/support/helpers/exclusive_lease_helpers.rb
 %%WWWDIR%%/spec/support/helpers/expect_next_instance_of.rb
 %%WWWDIR%%/spec/support/helpers/expect_offense.rb
+%%WWWDIR%%/spec/support/helpers/expect_request_with_status.rb
 %%WWWDIR%%/spec/support/helpers/fake_blob_helpers.rb
 %%WWWDIR%%/spec/support/helpers/fake_migration_classes.rb
 %%WWWDIR%%/spec/support/helpers/fake_u2f_device.rb
@@ -16179,10 +16432,12 @@
 %%WWWDIR%%/spec/support/shared_contexts/services_shared_context.rb
 %%WWWDIR%%/spec/support/shared_contexts/url_shared_context.rb
 %%WWWDIR%%/spec/support/shared_examples/application_setting_examples.rb
+%%WWWDIR%%/spec/support/shared_examples/boards/multiple_issue_boards_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/chat_slash_commands_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/ci/stage_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/ci_trace_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/common_system_notes_examples.rb
+%%WWWDIR%%/spec/support/shared_examples/container_repositories_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/controllers/external_authorization_service_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/controllers/issuable_notes_filter_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/controllers/repository_lfs_file_load_examples.rb
@@ -16192,6 +16447,7 @@
 %%WWWDIR%%/spec/support/shared_examples/controllers/variables_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/diff_file_collections.rb
 %%WWWDIR%%/spec/support/shared_examples/dirty_submit_form_shared_examples.rb
+%%WWWDIR%%/spec/support/shared_examples/discussions_provider_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/email_format_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/fast_destroy_all.rb
 %%WWWDIR%%/spec/support/shared_examples/features/comments_on_merge_request_files_shared_examples.rb
@@ -16222,6 +16478,7 @@
 %%WWWDIR%%/spec/support/shared_examples/legacy_path_redirect_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/lib/banzai/filters/reference_filter_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/lib/gitlab/background_migration/backfill_project_repositories_examples.rb
+%%WWWDIR%%/spec/support/shared_examples/lib/gitlab/usage_data_counters/a_redis_counter.rb
 %%WWWDIR%%/spec/support/shared_examples/malicious_regexp_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/mentionable_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/milestone_tabs_examples.rb
@@ -16234,6 +16491,7 @@
 %%WWWDIR%%/spec/support/shared_examples/models/cluster_application_status_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/models/cluster_application_version_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/models/concern/issuable_shared_examples.rb
+%%WWWDIR%%/spec/support/shared_examples/models/diff_positionable_note_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/models/issuable_hook_data_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/models/label_note_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/models/member_shared_examples.rb
@@ -16246,6 +16504,7 @@
 %%WWWDIR%%/spec/support/shared_examples/policies/clusterable_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/policies/project_policy_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/position_formatters.rb
+%%WWWDIR%%/spec/support/shared_examples/project_latest_successful_build_for_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/project_list_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/quick_actions/commit/tag_quick_action_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/quick_actions/issuable/close_quick_action_shared_examples.rb
@@ -16257,6 +16516,7 @@
 %%WWWDIR%%/spec/support/shared_examples/quick_actions/issue/move_quick_action_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/reference_parser_shared_examples.rb
+%%WWWDIR%%/spec/support/shared_examples/relative_positioning_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/requests/api/custom_attributes_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/requests/api/diff_discussions.rb
 %%WWWDIR%%/spec/support/shared_examples/requests/api/discussions.rb
@@ -16267,6 +16527,7 @@
 %%WWWDIR%%/spec/support/shared_examples/requests/api/resolvable_discussions.rb
 %%WWWDIR%%/spec/support/shared_examples/requests/api/status_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/requests/graphql_shared_examples.rb
+%%WWWDIR%%/spec/support/shared_examples/resource_label_events_api.rb
 %%WWWDIR%%/spec/support/shared_examples/serializers/diff_file_entity_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/serializers/note_entity_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/services/base_helm_service_shared_examples.rb
@@ -16279,6 +16540,7 @@
 %%WWWDIR%%/spec/support/shared_examples/services/boards/lists_move_service.rb
 %%WWWDIR%%/spec/support/shared_examples/services/check_ingress_ip_address_service_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/services/gitlab_projects_import_service_shared_examples.rb
+%%WWWDIR%%/spec/support/shared_examples/services/notification_service_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/showing_user_status_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/slack_mattermost_notifications_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/snippet_visibility_shared_examples.rb
@@ -16314,11 +16576,11 @@
 %%WWWDIR%%/spec/tasks/gitlab/ldap_rake_spec.rb
 %%WWWDIR%%/spec/tasks/gitlab/lfs/check_rake_spec.rb
 %%WWWDIR%%/spec/tasks/gitlab/lfs/migrate_rake_spec.rb
-%%WWWDIR%%/spec/tasks/gitlab/mail_google_schema_whitelisting.rb
 %%WWWDIR%%/spec/tasks/gitlab/shell_rake_spec.rb
 %%WWWDIR%%/spec/tasks/gitlab/storage_rake_spec.rb
 %%WWWDIR%%/spec/tasks/gitlab/task_helpers_spec.rb
 %%WWWDIR%%/spec/tasks/gitlab/traces_rake_spec.rb
+%%WWWDIR%%/spec/tasks/gitlab/update_templates_rake_spec.rb
 %%WWWDIR%%/spec/tasks/gitlab/uploads/check_rake_spec.rb
 %%WWWDIR%%/spec/tasks/gitlab/uploads/migrate_rake_spec.rb
 %%WWWDIR%%/spec/tasks/gitlab/web_hook_rake_spec.rb
@@ -16349,14 +16611,16 @@
 %%WWWDIR%%/spec/validators/namespace_path_validator_spec.rb
 %%WWWDIR%%/spec/validators/project_path_validator_spec.rb
 %%WWWDIR%%/spec/validators/public_url_validator_spec.rb
+%%WWWDIR%%/spec/validators/qualified_domain_array_validator_spec.rb
 %%WWWDIR%%/spec/validators/sha_validator_spec.rb
+%%WWWDIR%%/spec/validators/system_hook_url_validator_spec.rb
 %%WWWDIR%%/spec/validators/variable_duplicates_validator_spec.rb
 %%WWWDIR%%/spec/validators/x509_certificate_credentials_validator_spec.rb
 %%WWWDIR%%/spec/views/admin/dashboard/index.html.haml_spec.rb
 %%WWWDIR%%/spec/views/ci/status/_badge.html.haml_spec.rb
 %%WWWDIR%%/spec/views/ci/status/_icon.html.haml_spec.rb
-%%WWWDIR%%/spec/views/dashboard/projects/_blank_state_admin_welcome.haml.rb
-%%WWWDIR%%/spec/views/dashboard/projects/_nav.html.haml.rb
+%%WWWDIR%%/spec/views/dashboard/projects/_blank_state_admin_welcome.haml_spec.rb
+%%WWWDIR%%/spec/views/dashboard/projects/_nav.html.haml_spec.rb
 %%WWWDIR%%/spec/views/devise/shared/_signin_box.html.haml_spec.rb
 %%WWWDIR%%/spec/views/errors/access_denied.html.haml_spec.rb
 %%WWWDIR%%/spec/views/events/event/_push.html.haml_spec.rb
@@ -16384,7 +16648,7 @@
 %%WWWDIR%%/spec/views/projects/commit/branches.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/commit/show.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/commits/_commit.html.haml_spec.rb
-%%WWWDIR%%/spec/views/projects/deployments/_confirm_rollback_modal_spec.html.rb
+%%WWWDIR%%/spec/views/projects/deployments/_confirm_rollback_modal_spec.html_spec.rb
 %%WWWDIR%%/spec/views/projects/diffs/_stats.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/diffs/_viewer.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/edit.html.haml_spec.rb
@@ -16409,10 +16673,13 @@
 %%WWWDIR%%/spec/views/projects/tags/index.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/tree/_tree_row.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/tree/show.html.haml_spec.rb
-%%WWWDIR%%/spec/views/shared/_label_row.html.haml.rb
-%%WWWDIR%%/spec/views/shared/milestones/_issuable.html.haml.rb
-%%WWWDIR%%/spec/views/shared/milestones/_issuables.html.haml.rb
-%%WWWDIR%%/spec/views/shared/milestones/_top.html.haml.rb
+%%WWWDIR%%/spec/views/search/_filter.html.haml_spec.rb
+%%WWWDIR%%/spec/views/search/_form.html.haml_spec.rb
+%%WWWDIR%%/spec/views/search/show.html.haml_spec.rb
+%%WWWDIR%%/spec/views/shared/_label_row.html.haml_spec.rb
+%%WWWDIR%%/spec/views/shared/milestones/_issuable.html.haml_spec.rb
+%%WWWDIR%%/spec/views/shared/milestones/_issuables.html.haml_spec.rb
+%%WWWDIR%%/spec/views/shared/milestones/_top.html.haml_spec.rb
 %%WWWDIR%%/spec/views/shared/notes/_form.html.haml_spec.rb
 %%WWWDIR%%/spec/views/shared/projects/_project.html.haml_spec.rb
 %%WWWDIR%%/spec/views/shared/runners/show.html.haml_spec.rb
@@ -16432,8 +16699,6 @@
 %%WWWDIR%%/spec/workers/ci/build_prepare_worker_spec.rb
 %%WWWDIR%%/spec/workers/ci/build_schedule_worker_spec.rb
 %%WWWDIR%%/spec/workers/cleanup_container_repository_worker_spec.rb
-%%WWWDIR%%/spec/workers/cluster_configure_worker_spec.rb
-%%WWWDIR%%/spec/workers/cluster_project_configure_worker_spec.rb
 %%WWWDIR%%/spec/workers/cluster_provision_worker_spec.rb
 %%WWWDIR%%/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb
 %%WWWDIR%%/spec/workers/clusters/applications/wait_for_uninstall_app_worker_spec.rb
@@ -16667,6 +16932,7 @@
 @dir(,,700) %%WWWDIR%%/shared/tmp
 @dir(,,700) %%WWWDIR%%/shared/lfs-objects
 @dir(,,700) %%WWWDIR%%/shared/registry
+@dir(,,700) %%WWWDIR%%/spec/javascripts/fixtures
 @dir(,,770) %%WWWDIR%%/tmp
 @dir(,,770) %%WWWDIR%%/tmp/backups
 @dir(,,770) %%WWWDIR%%/tmp/cache
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 16af060caa83..f7f50aa0e84e 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	8.7.1
+PORTVERSION=	8.8.1
 CATEGORIES=	www
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -19,7 +19,7 @@ USE_GITLAB=	yes
 
 GL_ACCOUNT=	gitlab-org
 # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-workhorse/tags
-GL_COMMIT=	bab62a589d902785ac90792a6367ddf495ee8bbb
+GL_COMMIT=	febcb163140c1d54f153f868f7b811cbd174c952
 MAKE_JOBS_UNSAFE=yes
 
 PLIST_FILES=	bin/gitlab-workhorse \
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index e8f998857555..c6b8e3870a83 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567144133
-SHA256 (gitlab-org-gitlab-workhorse-bab62a589d902785ac90792a6367ddf495ee8bbb_GL0.tar.gz) = 92edca23319652f868e984c977c29ad12179f68885155f7743407d85006a85c3
-SIZE (gitlab-org-gitlab-workhorse-bab62a589d902785ac90792a6367ddf495ee8bbb_GL0.tar.gz) = 2951315
+TIMESTAMP = 1567414389
+SHA256 (gitlab-org-gitlab-workhorse-febcb163140c1d54f153f868f7b811cbd174c952_GL0.tar.gz) = c81d65488126f97479b03fef65e92d607310f661653afecd07acbee13820c469
+SIZE (gitlab-org-gitlab-workhorse-febcb163140c1d54f153f868f7b811cbd174c952_GL0.tar.gz) = 2955428
diff --git a/www/glassfish5/Makefile b/www/glassfish5/Makefile
new file mode 100644
index 000000000000..d617fc0ecb9f
--- /dev/null
+++ b/www/glassfish5/Makefile
@@ -0,0 +1,44 @@
+# Created by: cjr@cruwe.de
+# $FreeBSD$
+
+PORTNAME=	glassfish
+PORTVERSION=	5.0
+CATEGORIES=	www java
+MASTER_SITES=	http://download.oracle.com/glassfish/${PORTVERSION}/release/
+PKGNAMESUFFIX=	5
+
+MAINTAINER=	jmd@FreeBSD.org
+COMMENT=	Reference implementation of the Java EE application server
+
+LICENSE=	CDDL
+
+USES=		zip
+USE_JAVA=	yes
+
+JAVA_VERSION=	11+
+NO_BUILD=	yes
+
+CONFLICTS_INSTALL=	glassfish
+
+WRKSRC=		${WRKDIR}/glassfish5
+DATADIR=	${PREFIX}/${PORTNAME}-${PORTVERSION}
+
+# Since we USE_JAVA, we propagate the received JAVA_HOME variable to the
+# template files, since it is used by the rc script.
+SUB_LIST=	GLASSFISHVERSION=${PORTVERSION} \
+		JAVA_HOME=${JAVA_HOME}
+
+USE_RC_SUBR=	glassfish
+GLASSFISH_BIN_FILES=	appclient asadmin capture-schema jspc package-appclient schemagen startserv stopserv wscompile wsdeploy wsgen wsimport xjc
+
+do-install:
+	@${FIND} ${WRKSRC} -name '*.bat' -delete
+	@${FIND} ${WRKSRC} -name '*.exe' -delete
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
+	@${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/bin/*
+	@${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/mq/bin/*
+.for x in ${GLASSFISH_BIN_FILES}
+	@${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/glassfish/bin/${x}
+.endfor
+
+.include <bsd.port.mk>
diff --git a/www/glassfish5/distinfo b/www/glassfish5/distinfo
new file mode 100644
index 000000000000..4ea7f216d8c5
--- /dev/null
+++ b/www/glassfish5/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1568211939
+SHA256 (glassfish-5.0.zip) = 85450f0cd4875729d64be6bcbf7ed8f61009ea0f23d3be453c6f3d1dbab02420
+SIZE (glassfish-5.0.zip) = 119735241
diff --git a/www/glassfish5/files/glassfish.in b/www/glassfish5/files/glassfish.in
new file mode 100644
index 000000000000..e8e4afc883e9
--- /dev/null
+++ b/www/glassfish5/files/glassfish.in
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: glassfish
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# glassfish_enable (bool):
+#   Set to NO by default.
+#   Set it to YES to enable glassfish. 
+#
+# glassfish_java_home (string):
+#   Used to set JAVA_HOME (optional).
+#
+# glassfish_java_opts (string):
+#   Used to set JAVA_OPTS (optional).
+#
+# glassfish_domain_name (string):
+#   Set the name of the Glassfish domain to start (default: domain1).
+
+. /etc/rc.subr
+
+name=glassfish
+rcvar=glassfish_enable
+
+load_rc_config $name
+
+: ${glassfish_enable:=NO}
+: ${glassfish_java_home=""}
+: ${glassfish_java_opts=""}
+: ${glassfish_domain_name="domain1"}
+: ${glassfish_home="%%DATADIR%%/glassfish"}
+
+procname="${glassfish_java_home}/bin/java"
+
+# Since we receive the JAVA_HOME variable by default from the Java package
+# we depend on, we override JAVA_HOME only if the user overrid it.
+if [ ! -z ${glassfish_java_home} ] ; then
+  export JAVA_HOME=${glassfish_java_home}
+else
+  export JAVA_HOME=%%JAVA_HOME%%
+fi
+
+export PATH=${JAVA_HOME}/bin:${PATH}
+export JAVA_OPTS=${glassfish_java_opts}
+
+start_precmd="glassfish_prestart"
+start_cmd="${glassfish_home}/bin/asadmin start-domain ${glassfish_domain_name}"
+stop_cmd="${glassfish_home}/bin/asadmin stop-domain ${glassfish_domain_name}"
+status_cmd="glassfish_status"
+
+glassfish_prestart()
+{
+  if [ -z ${glassfish_domain_name} ] ; then
+    warn "Glassfish domain name cannot be empty, Glassfish will NOT start."
+    return 1
+  fi
+}
+
+glassfish_status()
+{
+  # The output of list-domains -l in glassfish 4.1 is the following:
+  # 
+  # DOMAIN   ADMIN_HOST  ADMIN_PORT  RUNNING  RESTART_REQUIRED
+  # domain1  localhost   4848        true     false
+  IS_DOMAIN_RUNNING=$(${glassfish_home}/bin/asadmin list-domains -l | grep "^${glassfish_domain_name}" | awk '{ print $4; }')
+  if checkyesno IS_DOMAIN_RUNNING ; then
+    echo Glassfish is running.
+    return 0
+  else
+    echo Glassfish is not running.
+    return 1
+  fi
+}
+
+run_rc_command "$1"
diff --git a/www/glassfish5/pkg-descr b/www/glassfish5/pkg-descr
new file mode 100644
index 000000000000..18fa455b69d9
--- /dev/null
+++ b/www/glassfish5/pkg-descr
@@ -0,0 +1,4 @@
+The Glassfish Java Application Server is the reference implementation for a
+Java EE Application server.
+
+WWW: http://glassfish.java.net/
diff --git a/www/glassfish5/pkg-message b/www/glassfish5/pkg-message
new file mode 100644
index 000000000000..48f4178b5c18
--- /dev/null
+++ b/www/glassfish5/pkg-message
@@ -0,0 +1,10 @@
+[
+{ type: install
+  message: <<EOM
+To run the glassfish java application server from startup,
+add glassfish_enable="YES" in your /etc/rc.conf.
+
+Extra options can be found in startup script.
+EOM
+}
+]
diff --git a/www/glassfish5/pkg-plist b/www/glassfish5/pkg-plist
new file mode 100644
index 000000000000..39288712233d
--- /dev/null
+++ b/www/glassfish5/pkg-plist
@@ -0,0 +1,994 @@
+etc/rc.d/glassfish
+%%DATADIR%%/README.txt
+%%DATADIR%%/bin/asadmin
+%%DATADIR%%/glassfish/bin/appclient
+%%DATADIR%%/glassfish/bin/appclient.js
+%%DATADIR%%/glassfish/bin/asadmin
+%%DATADIR%%/glassfish/bin/capture-schema
+%%DATADIR%%/glassfish/bin/capture-schema.1m
+%%DATADIR%%/glassfish/bin/jspc
+%%DATADIR%%/glassfish/bin/package-appclient
+%%DATADIR%%/glassfish/bin/schemagen
+%%DATADIR%%/glassfish/bin/startserv
+%%DATADIR%%/glassfish/bin/stopserv
+%%DATADIR%%/glassfish/bin/wscompile
+%%DATADIR%%/glassfish/bin/wsdeploy
+%%DATADIR%%/glassfish/bin/wsgen
+%%DATADIR%%/glassfish/bin/wsimport
+%%DATADIR%%/glassfish/bin/xjc
+%%DATADIR%%/glassfish/common/templates/gf/appserver-domain.jar
+%%DATADIR%%/glassfish/common/templates/gf/nucleus-domain.jar
+%%DATADIR%%/glassfish/config/asenv.conf
+%%DATADIR%%/glassfish/config/branding/glassfish-version.properties
+%%DATADIR%%/glassfish/config/client-jnlp-config.properties
+%%DATADIR%%/glassfish/config/glassfish.container
+%%DATADIR%%/glassfish/config/osgi.properties
+%%DATADIR%%/glassfish/docs/about.html
+%%DATADIR%%/glassfish/docs/copyright.html
+%%DATADIR%%/glassfish/docs/css/default.css
+%%DATADIR%%/glassfish/docs/features.html
+%%DATADIR%%/glassfish/docs/quickstart.html
+%%DATADIR%%/glassfish/domains/domain1/config/admin-keyfile
+%%DATADIR%%/glassfish/domains/domain1/config/cacerts.jks
+%%DATADIR%%/glassfish/domains/domain1/config/default-logging.properties
+%%DATADIR%%/glassfish/domains/domain1/config/default-web.xml
+%%DATADIR%%/glassfish/domains/domain1/config/domain-passwords
+%%DATADIR%%/glassfish/domains/domain1/config/domain.xml
+%%DATADIR%%/glassfish/domains/domain1/config/glassfish-acc.xml
+%%DATADIR%%/glassfish/domains/domain1/config/javaee.server.policy
+%%DATADIR%%/glassfish/domains/domain1/config/keyfile
+%%DATADIR%%/glassfish/domains/domain1/config/keystore.jks
+%%DATADIR%%/glassfish/domains/domain1/config/logging.properties
+%%DATADIR%%/glassfish/domains/domain1/config/login.conf
+%%DATADIR%%/glassfish/domains/domain1/config/restrict.server.policy
+%%DATADIR%%/glassfish/domains/domain1/config/server.policy
+%%DATADIR%%/glassfish/domains/domain1/config/wss-server-config-1.0.xml
+%%DATADIR%%/glassfish/domains/domain1/config/wss-server-config-2.0.xml
+%%DATADIR%%/glassfish/domains/domain1/docroot/index.html
+%%DATADIR%%/glassfish/domains/domain1/init-info/domain-info.xml
+%%DATADIR%%/glassfish/glassfish/.gitkeep_empty_dir
+%%DATADIR%%/glassfish/legal/3RD-PARTY-LICENSE-WEB-PROFILE.txt
+%%DATADIR%%/glassfish/legal/3RD-PARTY-LICENSE.txt
+%%DATADIR%%/glassfish/legal/LICENSE.txt
+%%DATADIR%%/glassfish/lib/appclient/appclientlogin.conf
+%%DATADIR%%/glassfish/lib/appclient/client.policy
+%%DATADIR%%/glassfish/lib/appclient/javaee.client.policy
+%%DATADIR%%/glassfish/lib/appclient/restrict.client.policy
+%%DATADIR%%/glassfish/lib/appclient/weld-se-shaded.jar
+%%DATADIR%%/glassfish/lib/appclient/wss-client-config-1.0.xml
+%%DATADIR%%/glassfish/lib/appclient/wss-client-config-2.0.xml
+%%DATADIR%%/glassfish/lib/appserv-rt.jar
+%%DATADIR%%/glassfish/lib/asadmin/cli-optional.jar
+%%DATADIR%%/glassfish/lib/asadmin/cluster-cli.jar
+%%DATADIR%%/glassfish/lib/asadmin/osgi-cli-interactive.jar
+%%DATADIR%%/glassfish/lib/asadmin/server-mgmt.jar
+%%DATADIR%%/glassfish/lib/client/appserver-cli.jar
+%%DATADIR%%/glassfish/lib/deployment/sun-as-jsr88-dm.jar
+%%DATADIR%%/glassfish/lib/dtds/application-client_1_2.dtd
+%%DATADIR%%/glassfish/lib/dtds/application-client_1_3.dtd
+%%DATADIR%%/glassfish/lib/dtds/application_1_2.dtd
+%%DATADIR%%/glassfish/lib/dtds/application_1_3.dtd
+%%DATADIR%%/glassfish/lib/dtds/connector_1_0.dtd
+%%DATADIR%%/glassfish/lib/dtds/connector_1_5.dtd
+%%DATADIR%%/glassfish/lib/dtds/connector_1_6.dtd
+%%DATADIR%%/glassfish/lib/dtds/ejb-jar_1_1.dtd
+%%DATADIR%%/glassfish/lib/dtds/ejb-jar_2_0.dtd
+%%DATADIR%%/glassfish/lib/dtds/glassfish-application-client-container_1_3.dtd
+%%DATADIR%%/glassfish/lib/dtds/glassfish-application-client_6_0-1.dtd
+%%DATADIR%%/glassfish/lib/dtds/glassfish-application-client_6_0-2.dtd
+%%DATADIR%%/glassfish/lib/dtds/glassfish-application_6_0-1.dtd
+%%DATADIR%%/glassfish/lib/dtds/glassfish-ejb-jar_3_1-1.dtd
+%%DATADIR%%/glassfish/lib/dtds/glassfish-resources_1_5.dtd
+%%DATADIR%%/glassfish/lib/dtds/glassfish-web-app_3_0-1.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-application-client-container_1_0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-application-client-container_1_1.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-application-client-container_1_2.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-application-client_1_3-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-application-client_1_4-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-application-client_1_4-1.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-application-client_5_0-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-application-client_6_0-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-application_1_3-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-application_1_4-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-application_5_0-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-application_6_0-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-cmp-mapping_1_0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-cmp-mapping_1_1.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-cmp-mapping_1_2.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-connector_1_0-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-connector_1_5-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-ejb-jar_2_0-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-ejb-jar_2_0-1.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-ejb-jar_2_1-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-ejb-jar_2_1-1.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-ejb-jar_3_0-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-ejb-jar_3_1-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-loadbalancer_1_0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-loadbalancer_1_1.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-resources_1_0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-resources_1_1.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-resources_1_2.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-resources_1_3.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-resources_1_4.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-server_1_0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-web-app_2_3-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-web-app_2_3-1.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-web-app_2_4-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-web-app_2_4-1.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-web-app_2_5-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/sun-web-app_3_0-0.dtd
+%%DATADIR%%/glassfish/lib/dtds/web-app_2_2.dtd
+%%DATADIR%%/glassfish/lib/dtds/web-app_2_3.dtd
+%%DATADIR%%/glassfish/lib/dtds/web-jsptaglibrary_1_1.dtd
+%%DATADIR%%/glassfish/lib/dtds/web-jsptaglibrary_1_2.dtd
+%%DATADIR%%/glassfish/lib/dtds/wls810/dtd/weblogic-application_2_0.dtd
+%%DATADIR%%/glassfish/lib/embedded/glassfish-embedded-shell.jar
+%%DATADIR%%/glassfish/lib/embedded/glassfish-embedded-static-shell.jar
+%%DATADIR%%/glassfish/lib/gf-client.jar
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/3rd-party-license
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/META-INF/MANIFEST.MF
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/META-INF/context.xml
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/META-INF/maven/org.glassfish.main.admingui/war/pom.properties
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/META-INF/maven/org.glassfish.main.admingui/war/pom.xml
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/commons-fileupload-1.3.3.jar
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/commons-io-2.5.jar
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/dojo-ajax-nodemo-0.4.1.jar
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/json-1.0.jar
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/prototype-1.5.0.jar
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/webui-jsf-4.0.2.10.jar
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/webui-jsf-suntheme-4.0.2.10.jar
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/faces-config.xml
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/lib/.gitkeep_empty_dir
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/lib/console-core-5.0.jar
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/sun-web.xml
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/web.xml
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/index.jsf
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/j_security_check
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/resources/yui/assets/layout-core.css
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/resources/yui/assets/resize-core.css
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/resources/yui/assets/skins/sam/layout-skin.css
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/resources/yui/assets/skins/sam/layout.css
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/resources/yui/assets/skins/sam/layout_sprite.png
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/resources/yui/assets/skins/sam/resize-skin.css
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/resources/yui/assets/skins/sam/resize.css
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/resources/yui/assets/skins/sam/sprite.png
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/resources/yui/connection-min.js
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/resources/yui/dragdrop-min.js
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/resources/yui/element-min.js
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/resources/yui/layout-min.js
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/resources/yui/reset-fonts-grids.css
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/resources/yui/resize-min.js
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/resources/yui/yahoo-dom-event.js
+%%DATADIR%%/glassfish/lib/install/applications/__cp_jdbc_ra/META-INF/MANIFEST.MF
+%%DATADIR%%/glassfish/lib/install/applications/__cp_jdbc_ra/__cp_jdbc_ra.jar
+%%DATADIR%%/glassfish/lib/install/applications/__dm_jdbc_ra/META-INF/MANIFEST.MF
+%%DATADIR%%/glassfish/lib/install/applications/__dm_jdbc_ra/__dm_jdbc_ra.jar
+%%DATADIR%%/glassfish/lib/install/applications/__ds_jdbc_ra/META-INF/MANIFEST.MF
+%%DATADIR%%/glassfish/lib/install/applications/__ds_jdbc_ra/__ds_jdbc_ra.jar
+%%DATADIR%%/glassfish/lib/install/applications/__xa_jdbc_ra/META-INF/MANIFEST.MF
+%%DATADIR%%/glassfish/lib/install/applications/__xa_jdbc_ra/__xa_jdbc_ra.jar
+%%DATADIR%%/glassfish/lib/install/applications/ejb-timer-service-app.war
+%%DATADIR%%/glassfish/lib/install/applications/jaxr-ra/META-INF/MANIFEST.MF
+%%DATADIR%%/glassfish/lib/install/applications/jaxr-ra/META-INF/ra.xml
+%%DATADIR%%/glassfish/lib/install/applications/jaxr-ra/jaxr-ra.jar
+%%DATADIR%%/glassfish/lib/install/applications/jmsra/META-INF/MANIFEST.MF
+%%DATADIR%%/glassfish/lib/install/applications/jmsra/META-INF/ra.xml
+%%DATADIR%%/glassfish/lib/install/applications/jmsra/fscontext.jar
+%%DATADIR%%/glassfish/lib/install/applications/jmsra/imqbroker.jar
+%%DATADIR%%/glassfish/lib/install/applications/jmsra/imqjmsbridge.jar
+%%DATADIR%%/glassfish/lib/install/applications/jmsra/imqjmsra.jar
+%%DATADIR%%/glassfish/lib/install/applications/jmsra/imqjmx.jar
+%%DATADIR%%/glassfish/lib/install/applications/jmsra/imqstomp.jar
+%%DATADIR%%/glassfish/lib/install/applications/mejb.jar
+%%DATADIR%%/glassfish/lib/install/applications/metro/wstx-services.war
+%%DATADIR%%/glassfish/lib/install/databases/dbvendormapping/cpds.properties
+%%DATADIR%%/glassfish/lib/install/databases/dbvendormapping/dbvendor.properties
+%%DATADIR%%/glassfish/lib/install/databases/dbvendormapping/driver.properties
+%%DATADIR%%/glassfish/lib/install/databases/dbvendormapping/ds.properties
+%%DATADIR%%/glassfish/lib/install/databases/dbvendormapping/validationclassnames.properties
+%%DATADIR%%/glassfish/lib/install/databases/dbvendormapping/xads.properties
+%%DATADIR%%/glassfish/lib/install/databases/ejbtimer_db2.sql
+%%DATADIR%%/glassfish/lib/install/databases/ejbtimer_derby.sql
+%%DATADIR%%/glassfish/lib/install/databases/ejbtimer_mssqlserver.sql
+%%DATADIR%%/glassfish/lib/install/databases/ejbtimer_mysql.sql
+%%DATADIR%%/glassfish/lib/install/databases/ejbtimer_oracle.sql
+%%DATADIR%%/glassfish/lib/install/databases/ejbtimer_pointbase.sql
+%%DATADIR%%/glassfish/lib/install/databases/ejbtimer_sybase.sql
+%%DATADIR%%/glassfish/lib/install/databases/ejbtimer_symfoware.sql
+%%DATADIR%%/glassfish/lib/install/databases/jsr352-db2.sql
+%%DATADIR%%/glassfish/lib/install/databases/jsr352-derby.sql
+%%DATADIR%%/glassfish/lib/install/databases/jsr352-mssqlserver.sql
+%%DATADIR%%/glassfish/lib/install/databases/jsr352-mysql.sql
+%%DATADIR%%/glassfish/lib/install/databases/jsr352-oracle.sql
+%%DATADIR%%/glassfish/lib/install/databases/jsr352-postgresql.sql
+%%DATADIR%%/glassfish/lib/install/databases/jsr352-sybase-ace.sql
+%%DATADIR%%/glassfish/lib/install/databases/oracle/checkpoint_data_ddl.sql
+%%DATADIR%%/glassfish/lib/install/databases/oracle/create-all-tables.sql
+%%DATADIR%%/glassfish/lib/install/databases/oracle/drop-all-tables.sql
+%%DATADIR%%/glassfish/lib/install/databases/oracle/execution_instance_data_ddl.sql
+%%DATADIR%%/glassfish/lib/install/databases/oracle/job_instance_data_ddl.sql
+%%DATADIR%%/glassfish/lib/install/databases/oracle/job_status_ddl.sql
+%%DATADIR%%/glassfish/lib/install/databases/oracle/step_execution_instance_data_ddl.sql
+%%DATADIR%%/glassfish/lib/install/databases/oracle/step_status_ddl.sql
+%%DATADIR%%/glassfish/lib/install/databases/upgrade/ejbtimer_upgrade_db2.sql
+%%DATADIR%%/glassfish/lib/install/databases/upgrade/ejbtimer_upgrade_derby.sql
+%%DATADIR%%/glassfish/lib/install/databases/upgrade/ejbtimer_upgrade_mssqlserver.sql
+%%DATADIR%%/glassfish/lib/install/databases/upgrade/ejbtimer_upgrade_mysql.sql
+%%DATADIR%%/glassfish/lib/install/databases/upgrade/ejbtimer_upgrade_oracle.sql
+%%DATADIR%%/glassfish/lib/install/databases/upgrade/ejbtimer_upgrade_pointbase.sql
+%%DATADIR%%/glassfish/lib/install/databases/upgrade/ejbtimer_upgrade_sybase.sql
+%%DATADIR%%/glassfish/lib/install/databases/upgrade/ejbtimer_upgrade_symfoware.sql
+%%DATADIR%%/glassfish/lib/install/templates/Domain-service-smf.xml.template
+%%DATADIR%%/glassfish/lib/install/templates/Domain-service-winsw.xml.template
+%%DATADIR%%/glassfish/lib/install/templates/linux-service.template
+%%DATADIR%%/glassfish/lib/install/templates/resources/custom/README
+%%DATADIR%%/glassfish/lib/install/templates/resources/custom/javabean_custom_resource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/custom/primitives_string_custom_resource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/custom/properties_custom_resource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/custom/url_custom-resource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/README
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/db2_dd_datasource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/db2_jcc_datasource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/javadb_type4_datasource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/microsoft_dd_datasource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/microsoft_inet_datasource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/microsoft_jtds_datasource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/microsoft_sqlserver2000_datasource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/microsoft_sqlserver2005_datasource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/mysql_type4_datasource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/oracle_dd_datasource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/oracle_inet_datasource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/oracle_type4_datasource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/postgresql_type4_datasource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/sybase_dd_datasource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/sybase_inet_datasource.xml
+%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/sybase_jconn_datasource.xml
+%%DATADIR%%/glassfish/lib/javaee.jar
+%%DATADIR%%/glassfish/lib/jndi-properties.jar
+%%DATADIR%%/glassfish/lib/monitor/flashlight-agent.jar
+%%DATADIR%%/glassfish/lib/nadmin
+%%DATADIR%%/glassfish/lib/package-appclient.xml
+%%DATADIR%%/glassfish/lib/registration/servicetag-registry.xml
+%%DATADIR%%/glassfish/lib/schemas/1.0/domain.xsd
+%%DATADIR%%/glassfish/lib/schemas/1.0/security.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.0/persistence-configuration.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.0/weblogic-appclient.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.0/weblogic-ejb-jar.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.0/weblogic-javaee.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/deployment-plan/1.0/deployment-plan.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/jdbc-data-source/1.0/jdbc-data-source.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/persistence-configuration/1.0/persistence-configuration.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-application-client/1.0/weblogic-application-client.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-application/1.0/weblogic-application.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-connector/1.0/weblogic-connector.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-diagnostics/1.1/weblogic-diagnostics.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-ejb-jar/1.0/weblogic-ejb-jar.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-extension/1.0/weblogic-extension.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-interception/1.0/weblogic-interception.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-javaee/1.0/weblogic-javaee.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-jms/1.0/weblogic-jms.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-pubsub/1.0/weblogic-pubsub.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-rdbms-jar/1.0/weblogic-rdbms-jar.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-web-app/1.0/weblogic-web-app.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-webservices/1.0/weblogic-webservices.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-wsee-clienthandlerchain/1.0/weblogic-wsee-clienthandlerchain.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-wsee-standaloneclient/1.0/weblogic-wsee-standaloneclient.xsd
+%%DATADIR%%/glassfish/lib/schemas/10.3/webservice-policy-ref/1.0/webservice-policy-ref.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/diagnostics.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/diagnostics/accessor/export.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/domain.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/security.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/security/wls.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/security/xacml.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-annotation.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-appclient.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-application.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-deployment-plan.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-ejb-jar.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-extension.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-interception.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-j2ee.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-jdbc.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-jmsmd.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-ra-ext.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-ra.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-rdbms11-persistence.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-rdbms20-persistence.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-standalone-wsclient.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-web-app.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-ws-policy.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-wsee-clienthandlerchain.xsd
+%%DATADIR%%/glassfish/lib/schemas/90/weblogic-wsee.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/diagnostics-image.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/diagnostics.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/domain.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/security.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-annotation.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-appclient.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-application.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-deployment-plan.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-ejb-jar.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-extension.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-interception.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-j2ee.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-jdbc.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-jmsmd.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-ra-ext.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-ra.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-rdbms11-persistence.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-rdbms20-persistence.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-standalone-wsclient.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-web-app.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-ws-policy.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-wsee-clienthandlerchain.xsd
+%%DATADIR%%/glassfish/lib/schemas/910/weblogic-wsee.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/diagnostics-image.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/diagnostics.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/domain.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/security.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/security/medrec.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-annotation.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-appclient.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-application.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-deployment-plan.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-ejb-jar.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-extension.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-interception.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-j2ee.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-jdbc.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-jmsmd.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-ra-ext.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-ra.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-rdbms11-persistence.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-rdbms20-persistence.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-standalone-wsclient.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-web-app.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-ws-policy.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-wsee-clienthandlerchain.xsd
+%%DATADIR%%/glassfish/lib/schemas/920/weblogic-wsee.xsd
+%%DATADIR%%/glassfish/lib/schemas/XMLSchema.dtd
+%%DATADIR%%/glassfish/lib/schemas/application-client_1_4.xsd
+%%DATADIR%%/glassfish/lib/schemas/application-client_5.xsd
+%%DATADIR%%/glassfish/lib/schemas/application-client_6.xsd
+%%DATADIR%%/glassfish/lib/schemas/application-client_7.xsd
+%%DATADIR%%/glassfish/lib/schemas/application_1_4.xsd
+%%DATADIR%%/glassfish/lib/schemas/application_5.xsd
+%%DATADIR%%/glassfish/lib/schemas/application_6.xsd
+%%DATADIR%%/glassfish/lib/schemas/application_7.xsd
+%%DATADIR%%/glassfish/lib/schemas/beans_1_0.xsd
+%%DATADIR%%/glassfish/lib/schemas/connector_1_5.xsd
+%%DATADIR%%/glassfish/lib/schemas/connector_1_6.xsd
+%%DATADIR%%/glassfish/lib/schemas/connector_1_7.xsd
+%%DATADIR%%/glassfish/lib/schemas/datatypes.dtd
+%%DATADIR%%/glassfish/lib/schemas/deployment-plan/1.0/deployment-plan.xsd
+%%DATADIR%%/glassfish/lib/schemas/deployment-plan/index.html
+%%DATADIR%%/glassfish/lib/schemas/domain/1.0/domain.xsd
+%%DATADIR%%/glassfish/lib/schemas/domain/index_0.html
+%%DATADIR%%/glassfish/lib/schemas/ejb-jar_2_1.xsd
+%%DATADIR%%/glassfish/lib/schemas/ejb-jar_3_0.xsd
+%%DATADIR%%/glassfish/lib/schemas/ejb-jar_3_1.xsd
+%%DATADIR%%/glassfish/lib/schemas/ejb-jar_3_2.xsd
+%%DATADIR%%/glassfish/lib/schemas/j2ee_1_4.xsd
+%%DATADIR%%/glassfish/lib/schemas/j2ee_jaxrpc_mapping_1_1.xsd
+%%DATADIR%%/glassfish/lib/schemas/j2ee_web_services_1_1.xsd
+%%DATADIR%%/glassfish/lib/schemas/j2ee_web_services_client_1_1.xsd
+%%DATADIR%%/glassfish/lib/schemas/javaee_5.xsd
+%%DATADIR%%/glassfish/lib/schemas/javaee_6.xsd
+%%DATADIR%%/glassfish/lib/schemas/javaee_7.xsd
+%%DATADIR%%/glassfish/lib/schemas/javaee_8.xsd
+%%DATADIR%%/glassfish/lib/schemas/javaee_web_services_1_2.xsd
+%%DATADIR%%/glassfish/lib/schemas/javaee_web_services_1_3.xsd
+%%DATADIR%%/glassfish/lib/schemas/javaee_web_services_1_4.xsd
+%%DATADIR%%/glassfish/lib/schemas/javaee_web_services_client_1_2.xsd
+%%DATADIR%%/glassfish/lib/schemas/javaee_web_services_client_1_3.xsd
+%%DATADIR%%/glassfish/lib/schemas/javaee_web_services_client_1_4.xsd
+%%DATADIR%%/glassfish/lib/schemas/jax-rpc-ri-config.xsd
+%%DATADIR%%/glassfish/lib/schemas/jdbc-data-source.xsd
+%%DATADIR%%/glassfish/lib/schemas/jdbc-data-source/1.0/jdbc-data-source.xsd
+%%DATADIR%%/glassfish/lib/schemas/jdbc-data-source/1.1/jdbc-data-source.xsd
+%%DATADIR%%/glassfish/lib/schemas/jdbc-data-source/1.2/jdbc-data-source.xsd
+%%DATADIR%%/glassfish/lib/schemas/jdbc-data-source/index.html
+%%DATADIR%%/glassfish/lib/schemas/jsp_2_0.xsd
+%%DATADIR%%/glassfish/lib/schemas/jsp_2_1.xsd
+%%DATADIR%%/glassfish/lib/schemas/jsp_2_2.xsd
+%%DATADIR%%/glassfish/lib/schemas/jsp_2_3.xsd
+%%DATADIR%%/glassfish/lib/schemas/orm_1_0.xsd
+%%DATADIR%%/glassfish/lib/schemas/orm_2_0.xsd
+%%DATADIR%%/glassfish/lib/schemas/orm_2_1.xsd
+%%DATADIR%%/glassfish/lib/schemas/orm_2_2.xsd
+%%DATADIR%%/glassfish/lib/schemas/permissions_7.xsd
+%%DATADIR%%/glassfish/lib/schemas/persistence-configuration/1.0/persistence-configuration.xsd
+%%DATADIR%%/glassfish/lib/schemas/persistence-configuration/index.html
+%%DATADIR%%/glassfish/lib/schemas/persistence_1_0.xsd
+%%DATADIR%%/glassfish/lib/schemas/persistence_2_0.xsd
+%%DATADIR%%/glassfish/lib/schemas/persistence_2_1.xsd
+%%DATADIR%%/glassfish/lib/schemas/persistence_2_2.xsd
+%%DATADIR%%/glassfish/lib/schemas/security/1.0/security.xsd
+%%DATADIR%%/glassfish/lib/schemas/security/index.html
+%%DATADIR%%/glassfish/lib/schemas/security/wls/1.0/wls.xsd
+%%DATADIR%%/glassfish/lib/schemas/security/wls/index.html
+%%DATADIR%%/glassfish/lib/schemas/security/xacml/1.0/xacml.xsd
+%%DATADIR%%/glassfish/lib/schemas/security/xacml/index.html
+%%DATADIR%%/glassfish/lib/schemas/servers/portal/weblogic-portal/8.0/netuix-config.xsd
+%%DATADIR%%/glassfish/lib/schemas/servers/portal/weblogic-portlet/8.0/weblogic-portlet.xsd
+%%DATADIR%%/glassfish/lib/schemas/servers/weblogic/url-template-config/8.0/url-template-config.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-app_2_4.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-app_2_5.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-app_3_0.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-app_3_1.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-app_4_0.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-common_3_0.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-common_3_1.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-common_4_0.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-facelettaglibrary_2_0.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-facelettaglibrary_2_2.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-facesconfig_1_2.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-facesconfig_2_0.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-facesconfig_2_1.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-facesconfig_2_2.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-fragment_3_0.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-fragment_3_1.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-fragment_4_0.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-jsptaglibrary_2_0.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-jsptaglibrary_2_1.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-partialresponse_2_2.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-application-client/1.0/weblogic-application-client.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-application-client/1.1/weblogic-application-client.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-application-client/1.2/weblogic-application-client.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-application-client/1.3/weblogic-application-client.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-application-client/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-application/1.0/weblogic-application.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-application/1.1/weblogic-application.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-application/1.2/weblogic-application.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-application/1.3/weblogic-application.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-application/1.4/weblogic-application.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-application/1.5/weblogic-application.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-application/1.6/weblogic-application.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-application/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-connector/1.0/weblogic-connector.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-connector/1.2/weblogic-connector.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-connector/1.3/weblogic-connector.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-connector/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-diagnostics-image/1.0/weblogic-diagnostics-image.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-diagnostics-image/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-diagnostics/1.0/weblogic-diagnostics.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-diagnostics/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-ejb-jar/1.0/weblogic-ejb-jar.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-ejb-jar/1.1/weblogic-ejb-jar.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-ejb-jar/1.2/weblogic-ejb-jar.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-ejb-jar/1.3/weblogic-ejb-jar.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-ejb-jar/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-interception/1.0/weblogic-interception.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-interception/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-javaee/1.0/weblogic-javaee.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-javaee/1.1/weblogic-javaee.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-javaee/1.2/weblogic-javaee.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-javaee/1.3/weblogic-javaee.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-javaee/1.4/weblogic-javaee.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-javaee/1.5/weblogic-javaee.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-javaee/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-jms/1.0/weblogic-jms.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-jms/1.1/weblogic-jms.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-jms/1.2/weblogic-jms.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-jms/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-pubsub/1.0/weblogic-pubsub.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-pubsub/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-rdbms-jar/1.0/weblogic-rdbms-jar.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-rdbms-jar/1.1/weblogic-rdbms-jar.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-rdbms-jar/1.2/weblogic-rdbms-jar.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-rdbms-jar/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-sca-binding/1.0/weblogic-sca-binding.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-sca-binding/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-sca/1.0/weblogic-sca.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-sca/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-web-app/1.0/weblogic-web-app.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-web-app/1.1/weblogic-web-app.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-web-app/1.2/weblogic-web-app.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-web-app/1.3/weblogic-web-app.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-web-app/1.4/weblogic-web-app.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-web-app/1.5/weblogic-web-application.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-web-app/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-webservices/1.0/weblogic-webservices.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-webservices/1.1/weblogic-webservices.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-webservices/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-wsee-clienthandlerchain/1.0/weblogic-wsee-clienthandlerchain.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-wsee-clienthandlerchain/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-wsee-databinding/1.0/weblogic-wsee-databinding.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-wsee-databinding/1.1/weblogic-wsee-databinding.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-wsee-databinding/1.2/weblogic-wsee-databinding.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-wsee-databinding/index.html
+%%DATADIR%%/glassfish/lib/schemas/weblogic-wsee-standaloneclient/1.0/weblogic-wsee-standaloneclient.xsd
+%%DATADIR%%/glassfish/lib/schemas/weblogic-wsee-standaloneclient/index.html
+%%DATADIR%%/glassfish/lib/schemas/webservice-policy-ref/1.0/webservice-policy-ref.xsd
+%%DATADIR%%/glassfish/lib/schemas/webservice-policy-ref/1.1/webservice-policy-ref.xsd
+%%DATADIR%%/glassfish/lib/schemas/webservice-policy-ref/index.html
+%%DATADIR%%/glassfish/lib/schemas/xml.xsd
+%%DATADIR%%/glassfish/modules/acc-config.jar
+%%DATADIR%%/glassfish/modules/admin-cli.jar
+%%DATADIR%%/glassfish/modules/admin-core.jar
+%%DATADIR%%/glassfish/modules/admin-util.jar
+%%DATADIR%%/glassfish/modules/amx-core.jar
+%%DATADIR%%/glassfish/modules/amx-javaee.jar
+%%DATADIR%%/glassfish/modules/annotation-framework.jar
+%%DATADIR%%/glassfish/modules/ant.jar
+%%DATADIR%%/glassfish/modules/antlr.jar
+%%DATADIR%%/glassfish/modules/aopalliance-repackaged.jar
+%%DATADIR%%/glassfish/modules/api-exporter.jar
+%%DATADIR%%/glassfish/modules/appclient-connector.jar
+%%DATADIR%%/glassfish/modules/appclient-server-core.jar
+%%DATADIR%%/glassfish/modules/appclient.security.jar
+%%DATADIR%%/glassfish/modules/asm-all-repackaged.jar
+%%DATADIR%%/glassfish/modules/asm-all.jar
+%%DATADIR%%/glassfish/modules/autostart/org.apache.felix.configadmin.jar
+%%DATADIR%%/glassfish/modules/autostart/org.apache.felix.eventadmin.jar
+%%DATADIR%%/glassfish/modules/autostart/org.apache.felix.fileinstall.jar
+%%DATADIR%%/glassfish/modules/autostart/org.apache.felix.gogo.command.jar
+%%DATADIR%%/glassfish/modules/autostart/org.apache.felix.gogo.runtime.jar
+%%DATADIR%%/glassfish/modules/autostart/org.apache.felix.gogo.shell.jar
+%%DATADIR%%/glassfish/modules/autostart/org.apache.felix.scr.jar
+%%DATADIR%%/glassfish/modules/autostart/osgi-cdi.jar
+%%DATADIR%%/glassfish/modules/autostart/osgi-ee-resources.jar
+%%DATADIR%%/glassfish/modules/autostart/osgi-ejb-container.jar
+%%DATADIR%%/glassfish/modules/autostart/osgi-http.jar
+%%DATADIR%%/glassfish/modules/autostart/osgi-javaee-base.jar
+%%DATADIR%%/glassfish/modules/autostart/osgi-jdbc.jar
+%%DATADIR%%/glassfish/modules/autostart/osgi-jpa.jar
+%%DATADIR%%/glassfish/modules/autostart/osgi-jta.jar
+%%DATADIR%%/glassfish/modules/autostart/osgi-web-container.jar
+%%DATADIR%%/glassfish/modules/backup.jar
+%%DATADIR%%/glassfish/modules/bean-validator-cdi.jar
+%%DATADIR%%/glassfish/modules/bean-validator.jar
+%%DATADIR%%/glassfish/modules/cdi-api-fragment.jar
+%%DATADIR%%/glassfish/modules/cdi-api.jar
+%%DATADIR%%/glassfish/modules/class-model.jar
+%%DATADIR%%/glassfish/modules/classmate.jar
+%%DATADIR%%/glassfish/modules/cluster-admin.jar
+%%DATADIR%%/glassfish/modules/cluster-common.jar
+%%DATADIR%%/glassfish/modules/cluster-ssh.jar
+%%DATADIR%%/glassfish/modules/cmp-ejb-mapping.jar
+%%DATADIR%%/glassfish/modules/cmp-enhancer.jar
+%%DATADIR%%/glassfish/modules/cmp-generator-database.jar
+%%DATADIR%%/glassfish/modules/cmp-internal-api.jar
+%%DATADIR%%/glassfish/modules/cmp-model.jar
+%%DATADIR%%/glassfish/modules/cmp-support-ejb.jar
+%%DATADIR%%/glassfish/modules/cmp-support-sqlstore.jar
+%%DATADIR%%/glassfish/modules/cmp-utility.jar
+%%DATADIR%%/glassfish/modules/com.ibm.jbatch.container.jar
+%%DATADIR%%/glassfish/modules/com.ibm.jbatch.spi.jar
+%%DATADIR%%/glassfish/modules/common-util.jar
+%%DATADIR%%/glassfish/modules/concurrent-connector.jar
+%%DATADIR%%/glassfish/modules/concurrent-impl.jar
+%%DATADIR%%/glassfish/modules/config-api.jar
+%%DATADIR%%/glassfish/modules/config-types.jar
+%%DATADIR%%/glassfish/modules/connectors-admin.jar
+%%DATADIR%%/glassfish/modules/connectors-inbound-runtime.jar
+%%DATADIR%%/glassfish/modules/connectors-internal-api.jar
+%%DATADIR%%/glassfish/modules/connectors-runtime.jar
+%%DATADIR%%/glassfish/modules/console-cluster-plugin.jar
+%%DATADIR%%/glassfish/modules/console-common-full-plugin.jar
+%%DATADIR%%/glassfish/modules/console-common.jar
+%%DATADIR%%/glassfish/modules/console-community-branding-plugin.jar
+%%DATADIR%%/glassfish/modules/console-concurrent-plugin.jar
+%%DATADIR%%/glassfish/modules/console-corba-plugin.jar
+%%DATADIR%%/glassfish/modules/console-ejb-lite-plugin.jar
+%%DATADIR%%/glassfish/modules/console-ejb-plugin.jar
+%%DATADIR%%/glassfish/modules/console-jca-plugin.jar
+%%DATADIR%%/glassfish/modules/console-jdbc-plugin.jar
+%%DATADIR%%/glassfish/modules/console-jms-plugin.jar
+%%DATADIR%%/glassfish/modules/console-jts-plugin.jar
+%%DATADIR%%/glassfish/modules/console-plugin-service.jar
+%%DATADIR%%/glassfish/modules/console-updatecenter-plugin.jar
+%%DATADIR%%/glassfish/modules/console-web-plugin.jar
+%%DATADIR%%/glassfish/modules/container-common.jar
+%%DATADIR%%/glassfish/modules/dataprovider.jar
+%%DATADIR%%/glassfish/modules/dbschema-repackaged.jar
+%%DATADIR%%/glassfish/modules/deployment-admin.jar
+%%DATADIR%%/glassfish/modules/deployment-autodeploy.jar
+%%DATADIR%%/glassfish/modules/deployment-client.jar
+%%DATADIR%%/glassfish/modules/deployment-common.jar
+%%DATADIR%%/glassfish/modules/deployment-javaee-core.jar
+%%DATADIR%%/glassfish/modules/deployment-javaee-full.jar
+%%DATADIR%%/glassfish/modules/dol.jar
+%%DATADIR%%/glassfish/modules/ejb-client.jar
+%%DATADIR%%/glassfish/modules/ejb-container.jar
+%%DATADIR%%/glassfish/modules/ejb-full-container.jar
+%%DATADIR%%/glassfish/modules/ejb-internal-api.jar
+%%DATADIR%%/glassfish/modules/ejb.security.jar
+%%DATADIR%%/glassfish/modules/endorsed/grizzly-npn-bootstrap.jar
+%%DATADIR%%/glassfish/modules/endorsed/javax.annotation-api.jar
+%%DATADIR%%/glassfish/modules/endorsed/jaxb-api.jar
+%%DATADIR%%/glassfish/modules/endorsed/webservices-api-osgi.jar
+%%DATADIR%%/glassfish/modules/entitybean-container.jar
+%%DATADIR%%/glassfish/modules/flashlight-extra-jdk-packages.jar
+%%DATADIR%%/glassfish/modules/flashlight-framework.jar
+%%DATADIR%%/glassfish/modules/gf-admingui-connector.jar
+%%DATADIR%%/glassfish/modules/gf-client-module.jar
+%%DATADIR%%/glassfish/modules/gf-connectors-connector.jar
+%%DATADIR%%/glassfish/modules/gf-ejb-connector.jar
+%%DATADIR%%/glassfish/modules/gf-jms-connector.jar
+%%DATADIR%%/glassfish/modules/gf-jms-injection.jar
+%%DATADIR%%/glassfish/modules/gf-jpa-connector.jar
+%%DATADIR%%/glassfish/modules/gf-load-balancer-connector.jar
+%%DATADIR%%/glassfish/modules/gf-restadmin-connector.jar
+%%DATADIR%%/glassfish/modules/gf-web-connector.jar
+%%DATADIR%%/glassfish/modules/gf-weld-connector.jar
+%%DATADIR%%/glassfish/modules/glassfish-api.jar
+%%DATADIR%%/glassfish/modules/glassfish-batch-commands.jar
+%%DATADIR%%/glassfish/modules/glassfish-batch-connector.jar
+%%DATADIR%%/glassfish/modules/glassfish-corba-csiv2-idl.jar
+%%DATADIR%%/glassfish/modules/glassfish-corba-internal-api.jar
+%%DATADIR%%/glassfish/modules/glassfish-corba-omgapi.jar
+%%DATADIR%%/glassfish/modules/glassfish-corba-orb.jar
+%%DATADIR%%/glassfish/modules/glassfish-ee-api.jar
+%%DATADIR%%/glassfish/modules/glassfish-extra-jre-packages.jar
+%%DATADIR%%/glassfish/modules/glassfish-grizzly-extra-all.jar
+%%DATADIR%%/glassfish/modules/glassfish-mbeanserver.jar
+%%DATADIR%%/glassfish/modules/glassfish-naming.jar
+%%DATADIR%%/glassfish/modules/glassfish-oracle-jdbc-driver-packages.jar
+%%DATADIR%%/glassfish/modules/glassfish-registration.jar
+%%DATADIR%%/glassfish/modules/glassfish.jar
+%%DATADIR%%/glassfish/modules/gmbal.jar
+%%DATADIR%%/glassfish/modules/gms-adapter.jar
+%%DATADIR%%/glassfish/modules/gms-bootstrap.jar
+%%DATADIR%%/glassfish/modules/grizzly-npn-osgi.jar
+%%DATADIR%%/glassfish/modules/guava.jar
+%%DATADIR%%/glassfish/modules/ha-api.jar
+%%DATADIR%%/glassfish/modules/ha-file-store.jar
+%%DATADIR%%/glassfish/modules/ha-shoal-cache-bootstrap.jar
+%%DATADIR%%/glassfish/modules/ha-shoal-cache-store.jar
+%%DATADIR%%/glassfish/modules/hk2-api.jar
+%%DATADIR%%/glassfish/modules/hk2-config.jar
+%%DATADIR%%/glassfish/modules/hk2-core.jar
+%%DATADIR%%/glassfish/modules/hk2-locator.jar
+%%DATADIR%%/glassfish/modules/hk2-runlevel.jar
+%%DATADIR%%/glassfish/modules/hk2-utils.jar
+%%DATADIR%%/glassfish/modules/hk2.jar
+%%DATADIR%%/glassfish/modules/inmemory.jacc.provider.jar
+%%DATADIR%%/glassfish/modules/internal-api.jar
+%%DATADIR%%/glassfish/modules/jackson-annotations.jar
+%%DATADIR%%/glassfish/modules/jackson-core.jar
+%%DATADIR%%/glassfish/modules/jackson-databind.jar
+%%DATADIR%%/glassfish/modules/jackson-module-jaxb-annotations.jar
+%%DATADIR%%/glassfish/modules/jaspic.provider.framework.jar
+%%DATADIR%%/glassfish/modules/javaee-kernel.jar
+%%DATADIR%%/glassfish/modules/javamail-connector.jar
+%%DATADIR%%/glassfish/modules/javamail-runtime.jar
+%%DATADIR%%/glassfish/modules/javassist.jar
+%%DATADIR%%/glassfish/modules/javax.batch-api.jar
+%%DATADIR%%/glassfish/modules/javax.ejb-api.jar
+%%DATADIR%%/glassfish/modules/javax.el.jar
+%%DATADIR%%/glassfish/modules/javax.enterprise.concurrent-api.jar
+%%DATADIR%%/glassfish/modules/javax.enterprise.concurrent.jar
+%%DATADIR%%/glassfish/modules/javax.enterprise.deploy-api.jar
+%%DATADIR%%/glassfish/modules/javax.faces.jar
+%%DATADIR%%/glassfish/modules/javax.inject.jar
+%%DATADIR%%/glassfish/modules/javax.interceptor-api.jar
+%%DATADIR%%/glassfish/modules/javax.jms-api.jar
+%%DATADIR%%/glassfish/modules/javax.json.bind-api.jar
+%%DATADIR%%/glassfish/modules/javax.json.jar
+%%DATADIR%%/glassfish/modules/javax.mail.jar
+%%DATADIR%%/glassfish/modules/javax.management.j2ee-api.jar
+%%DATADIR%%/glassfish/modules/javax.persistence.jar
+%%DATADIR%%/glassfish/modules/javax.resource-api.jar
+%%DATADIR%%/glassfish/modules/javax.security.auth.message-api.jar
+%%DATADIR%%/glassfish/modules/javax.security.enterprise-api.jar
+%%DATADIR%%/glassfish/modules/javax.security.enterprise.jar
+%%DATADIR%%/glassfish/modules/javax.security.jacc-api.jar
+%%DATADIR%%/glassfish/modules/javax.servlet-api.jar
+%%DATADIR%%/glassfish/modules/javax.servlet.jsp-api.jar
+%%DATADIR%%/glassfish/modules/javax.servlet.jsp.jar
+%%DATADIR%%/glassfish/modules/javax.servlet.jsp.jstl-api.jar
+%%DATADIR%%/glassfish/modules/javax.servlet.jsp.jstl.jar
+%%DATADIR%%/glassfish/modules/javax.transaction-api.jar
+%%DATADIR%%/glassfish/modules/javax.websocket-api.jar
+%%DATADIR%%/glassfish/modules/javax.ws.rs-api.jar
+%%DATADIR%%/glassfish/modules/javax.xml.registry-api.jar
+%%DATADIR%%/glassfish/modules/javax.xml.rpc-api.jar
+%%DATADIR%%/glassfish/modules/jaxb-extra-osgi.jar
+%%DATADIR%%/glassfish/modules/jaxb-osgi.jar
+%%DATADIR%%/glassfish/modules/jboss-classfilewriter.jar
+%%DATADIR%%/glassfish/modules/jboss-logging.jar
+%%DATADIR%%/glassfish/modules/jdbc-admin.jar
+%%DATADIR%%/glassfish/modules/jdbc-config.jar
+%%DATADIR%%/glassfish/modules/jdbc-runtime.jar
+%%DATADIR%%/glassfish/modules/jersey-bean-validation.jar
+%%DATADIR%%/glassfish/modules/jersey-cdi1x-servlet.jar
+%%DATADIR%%/glassfish/modules/jersey-cdi1x-transaction.jar
+%%DATADIR%%/glassfish/modules/jersey-cdi1x.jar
+%%DATADIR%%/glassfish/modules/jersey-client.jar
+%%DATADIR%%/glassfish/modules/jersey-common.jar
+%%DATADIR%%/glassfish/modules/jersey-container-grizzly2-http.jar
+%%DATADIR%%/glassfish/modules/jersey-container-servlet-core.jar
+%%DATADIR%%/glassfish/modules/jersey-container-servlet.jar
+%%DATADIR%%/glassfish/modules/jersey-entity-filtering.jar
+%%DATADIR%%/glassfish/modules/jersey-gf-ejb.jar
+%%DATADIR%%/glassfish/modules/jersey-hk2.jar
+%%DATADIR%%/glassfish/modules/jersey-media-jaxb.jar
+%%DATADIR%%/glassfish/modules/jersey-media-json-binding.jar
+%%DATADIR%%/glassfish/modules/jersey-media-json-jackson.jar
+%%DATADIR%%/glassfish/modules/jersey-media-json-jettison.jar
+%%DATADIR%%/glassfish/modules/jersey-media-json-processing.jar
+%%DATADIR%%/glassfish/modules/jersey-media-moxy.jar
+%%DATADIR%%/glassfish/modules/jersey-media-multipart.jar
+%%DATADIR%%/glassfish/modules/jersey-media-sse.jar
+%%DATADIR%%/glassfish/modules/jersey-mvc-connector.jar
+%%DATADIR%%/glassfish/modules/jersey-mvc-jsp.jar
+%%DATADIR%%/glassfish/modules/jersey-mvc.jar
+%%DATADIR%%/glassfish/modules/jersey-server.jar
+%%DATADIR%%/glassfish/modules/jettison.jar
+%%DATADIR%%/glassfish/modules/jms-admin.jar
+%%DATADIR%%/glassfish/modules/jms-core.jar
+%%DATADIR%%/glassfish/modules/jmxremote_optional-repackaged.jar
+%%DATADIR%%/glassfish/modules/jpa-container.jar
+%%DATADIR%%/glassfish/modules/jsf-connector.jar
+%%DATADIR%%/glassfish/modules/jsftemplating.jar
+%%DATADIR%%/glassfish/modules/jsonp-jaxrs.jar
+%%DATADIR%%/glassfish/modules/jspcaching-connector.jar
+%%DATADIR%%/glassfish/modules/jsr109-impl.jar
+%%DATADIR%%/glassfish/modules/jstl-connector.jar
+%%DATADIR%%/glassfish/modules/jta.jar
+%%DATADIR%%/glassfish/modules/jts.jar
+%%DATADIR%%/glassfish/modules/kernel.jar
+%%DATADIR%%/glassfish/modules/launcher.jar
+%%DATADIR%%/glassfish/modules/ldapbp-repackaged.jar
+%%DATADIR%%/glassfish/modules/libpam4j.jar
+%%DATADIR%%/glassfish/modules/load-balancer-admin.jar
+%%DATADIR%%/glassfish/modules/logging.jar
+%%DATADIR%%/glassfish/modules/management-api.jar
+%%DATADIR%%/glassfish/modules/metro-glue.jar
+%%DATADIR%%/glassfish/modules/mimepull.jar
+%%DATADIR%%/glassfish/modules/monitoring-core.jar
+%%DATADIR%%/glassfish/modules/nucleus-grizzly-all.jar
+%%DATADIR%%/glassfish/modules/nucleus-resources.jar
+%%DATADIR%%/glassfish/modules/orb-connector.jar
+%%DATADIR%%/glassfish/modules/orb-enabler.jar
+%%DATADIR%%/glassfish/modules/orb-iiop.jar
+%%DATADIR%%/glassfish/modules/org.apache.felix.bundlerepository.jar
+%%DATADIR%%/glassfish/modules/org.eclipse.persistence.antlr.jar
+%%DATADIR%%/glassfish/modules/org.eclipse.persistence.asm.jar
+%%DATADIR%%/glassfish/modules/org.eclipse.persistence.core.jar
+%%DATADIR%%/glassfish/modules/org.eclipse.persistence.dbws.jar
+%%DATADIR%%/glassfish/modules/org.eclipse.persistence.jpa.jar
+%%DATADIR%%/glassfish/modules/org.eclipse.persistence.jpa.jpql.jar
+%%DATADIR%%/glassfish/modules/org.eclipse.persistence.jpa.modelgen.processor.jar
+%%DATADIR%%/glassfish/modules/org.eclipse.persistence.moxy.jar
+%%DATADIR%%/glassfish/modules/org.eclipse.persistence.oracle.jar
+%%DATADIR%%/glassfish/modules/osgi-adapter.jar
+%%DATADIR%%/glassfish/modules/osgi-cli-remote.jar
+%%DATADIR%%/glassfish/modules/osgi-container.jar
+%%DATADIR%%/glassfish/modules/osgi-jpa-extension.jar
+%%DATADIR%%/glassfish/modules/osgi-resource-locator.jar
+%%DATADIR%%/glassfish/modules/persistence-common.jar
+%%DATADIR%%/glassfish/modules/pfl-asm.jar
+%%DATADIR%%/glassfish/modules/pfl-basic-tools.jar
+%%DATADIR%%/glassfish/modules/pfl-basic.jar
+%%DATADIR%%/glassfish/modules/pfl-dynamic.jar
+%%DATADIR%%/glassfish/modules/pfl-tf-tools.jar
+%%DATADIR%%/glassfish/modules/pfl-tf.jar
+%%DATADIR%%/glassfish/modules/pkg-client.jar
+%%DATADIR%%/glassfish/modules/registration-api.jar
+%%DATADIR%%/glassfish/modules/registration-impl.jar
+%%DATADIR%%/glassfish/modules/resources-connector.jar
+%%DATADIR%%/glassfish/modules/resources-runtime.jar
+%%DATADIR%%/glassfish/modules/rest-client.jar
+%%DATADIR%%/glassfish/modules/rest-service.jar
+%%DATADIR%%/glassfish/modules/scattered-archive-api.jar
+%%DATADIR%%/glassfish/modules/schema2beans-repackaged.jar
+%%DATADIR%%/glassfish/modules/security-ee.jar
+%%DATADIR%%/glassfish/modules/security-services.jar
+%%DATADIR%%/glassfish/modules/security.jar
+%%DATADIR%%/glassfish/modules/shoal-cache.jar
+%%DATADIR%%/glassfish/modules/shoal-gms-api.jar
+%%DATADIR%%/glassfish/modules/shoal-gms-impl.jar
+%%DATADIR%%/glassfish/modules/simple-glassfish-api.jar
+%%DATADIR%%/glassfish/modules/soap-tcp.jar
+%%DATADIR%%/glassfish/modules/ssl-impl.jar
+%%DATADIR%%/glassfish/modules/stats77.jar
+%%DATADIR%%/glassfish/modules/stax2-api.jar
+%%DATADIR%%/glassfish/modules/transaction-internal-api.jar
+%%DATADIR%%/glassfish/modules/trilead-ssh2.jar
+%%DATADIR%%/glassfish/modules/tyrus-client.jar
+%%DATADIR%%/glassfish/modules/tyrus-container-glassfish-cdi.jar
+%%DATADIR%%/glassfish/modules/tyrus-container-glassfish-ejb.jar
+%%DATADIR%%/glassfish/modules/tyrus-container-grizzly-client.jar
+%%DATADIR%%/glassfish/modules/tyrus-container-servlet.jar
+%%DATADIR%%/glassfish/modules/tyrus-core.jar
+%%DATADIR%%/glassfish/modules/tyrus-server.jar
+%%DATADIR%%/glassfish/modules/tyrus-spi.jar
+%%DATADIR%%/glassfish/modules/war-util.jar
+%%DATADIR%%/glassfish/modules/web-cli.jar
+%%DATADIR%%/glassfish/modules/web-core.jar
+%%DATADIR%%/glassfish/modules/web-embed-api.jar
+%%DATADIR%%/glassfish/modules/web-glue.jar
+%%DATADIR%%/glassfish/modules/web-gui-plugin-common.jar
+%%DATADIR%%/glassfish/modules/web-ha.jar
+%%DATADIR%%/glassfish/modules/web-naming.jar
+%%DATADIR%%/glassfish/modules/web-sse.jar
+%%DATADIR%%/glassfish/modules/websecurity.jar
+%%DATADIR%%/glassfish/modules/webservices-connector.jar
+%%DATADIR%%/glassfish/modules/webservices-extra-jdk-packages.jar
+%%DATADIR%%/glassfish/modules/webservices-osgi.jar
+%%DATADIR%%/glassfish/modules/webservices.security.jar
+%%DATADIR%%/glassfish/modules/weld-integration-fragment.jar
+%%DATADIR%%/glassfish/modules/weld-integration.jar
+%%DATADIR%%/glassfish/modules/weld-osgi-bundle.jar
+%%DATADIR%%/glassfish/modules/woodstox-core-asl.jar
+%%DATADIR%%/glassfish/modules/work-management.jar
+%%DATADIR%%/glassfish/modules/yasson.jar
+%%DATADIR%%/glassfish/osgi/felix/bin/felix.jar
+%%DATADIR%%/javadb/KEYS
+%%DATADIR%%/javadb/LICENSE
+%%DATADIR%%/javadb/NOTICE
+%%DATADIR%%/javadb/RELEASE-NOTES.html
+%%DATADIR%%/javadb/bin/NetworkServerControl
+%%DATADIR%%/javadb/bin/dblook
+%%DATADIR%%/javadb/bin/ij
+%%DATADIR%%/javadb/bin/setEmbeddedCP
+%%DATADIR%%/javadb/bin/setNetworkClientCP
+%%DATADIR%%/javadb/bin/setNetworkServerCP
+%%DATADIR%%/javadb/bin/startNetworkServer
+%%DATADIR%%/javadb/bin/stopNetworkServer
+%%DATADIR%%/javadb/bin/sysinfo
+%%DATADIR%%/javadb/index.html
+%%DATADIR%%/javadb/lib/derby.jar
+%%DATADIR%%/javadb/lib/derby.war
+%%DATADIR%%/javadb/lib/derbyLocale_cs.jar
+%%DATADIR%%/javadb/lib/derbyLocale_de_DE.jar
+%%DATADIR%%/javadb/lib/derbyLocale_es.jar
+%%DATADIR%%/javadb/lib/derbyLocale_fr.jar
+%%DATADIR%%/javadb/lib/derbyLocale_hu.jar
+%%DATADIR%%/javadb/lib/derbyLocale_it.jar
+%%DATADIR%%/javadb/lib/derbyLocale_ja_JP.jar
+%%DATADIR%%/javadb/lib/derbyLocale_ko_KR.jar
+%%DATADIR%%/javadb/lib/derbyLocale_pl.jar
+%%DATADIR%%/javadb/lib/derbyLocale_pt_BR.jar
+%%DATADIR%%/javadb/lib/derbyLocale_ru.jar
+%%DATADIR%%/javadb/lib/derbyLocale_zh_CN.jar
+%%DATADIR%%/javadb/lib/derbyLocale_zh_TW.jar
+%%DATADIR%%/javadb/lib/derbyclient.jar
+%%DATADIR%%/javadb/lib/derbynet.jar
+%%DATADIR%%/javadb/lib/derbyoptionaltools.jar
+%%DATADIR%%/javadb/lib/derbyrun.jar
+%%DATADIR%%/javadb/lib/derbytools.jar
+%%DATADIR%%/mq/bin/imqadmin
+%%DATADIR%%/mq/bin/imqbridgemgr
+%%DATADIR%%/mq/bin/imqbrokerd
+%%DATADIR%%/mq/bin/imqcmd
+%%DATADIR%%/mq/bin/imqdbmgr
+%%DATADIR%%/mq/bin/imqkeytool
+%%DATADIR%%/mq/bin/imqobjmgr
+%%DATADIR%%/mq/bin/imqusermgr
+%%DATADIR%%/mq/etc/imqbrokerd.conf
+%%DATADIR%%/mq/etc/imqenv.conf
+%%DATADIR%%/mq/etc/passfile.sample
+%%DATADIR%%/mq/etc/rc/imq
+%%DATADIR%%/mq/etc/registry/servicetag.xml
+%%DATADIR%%/mq/etc/xml/com.sun.cmm.mq.xml
+%%DATADIR%%/mq/etc/xml/template/com.sun.cmm.mq.xml
+%%DATADIR%%/mq/legal/LICENSE.txt
+%%DATADIR%%/mq/lib/dtd/sun_jmsbridge_1_0.dtd
+%%DATADIR%%/mq/lib/ext/README
+%%DATADIR%%/mq/lib/fscontext.jar
+%%DATADIR%%/mq/lib/glassfish-api.jar
+%%DATADIR%%/mq/lib/grizzly-framework.jar
+%%DATADIR%%/mq/lib/grizzly-http-server.jar
+%%DATADIR%%/mq/lib/grizzly-http-servlet.jar
+%%DATADIR%%/mq/lib/grizzly-http.jar
+%%DATADIR%%/mq/lib/grizzly-portunif.jar
+%%DATADIR%%/mq/lib/grizzly-websockets.jar
+%%DATADIR%%/mq/lib/help/Master.hs
+%%DATADIR%%/mq/lib/help/en/Master.jhm
+%%DATADIR%%/mq/lib/help/en/MasterTOC.xml
+%%DATADIR%%/mq/lib/help/en/add_broker.htm
+%%DATADIR%%/mq/lib/help/en/add_broker_destination.htm
+%%DATADIR%%/mq/lib/help/en/add_connection_fact.htm
+%%DATADIR%%/mq/lib/help/en/add_connfact_clientid.htm
+%%DATADIR%%/mq/lib/help/en/add_connfact_handling.htm
+%%DATADIR%%/mq/lib/help/en/add_connfact_handling_old.htm
+%%DATADIR%%/mq/lib/help/en/add_connfact_jmsx.htm
+%%DATADIR%%/mq/lib/help/en/add_connfact_message_header_overrides.htm
+%%DATADIR%%/mq/lib/help/en/add_connfact_queue.htm
+%%DATADIR%%/mq/lib/help/en/add_connfact_rel.htm
+%%DATADIR%%/mq/lib/help/en/add_destination_obj.htm
+%%DATADIR%%/mq/lib/help/en/add_object_store.htm
+%%DATADIR%%/mq/lib/help/en/broker_config_basic.htm
+%%DATADIR%%/mq/lib/help/en/broker_config_logging.htm
+%%DATADIR%%/mq/lib/help/en/broker_config_messaging.htm
+%%DATADIR%%/mq/lib/help/en/broker_configuration.htm
+%%DATADIR%%/mq/lib/help/en/broker_dest_basic.htm
+%%DATADIR%%/mq/lib/help/en/broker_dest_durable.htm
+%%DATADIR%%/mq/lib/help/en/broker_destination_properties.htm
+%%DATADIR%%/mq/lib/help/en/broker_index.htm
+%%DATADIR%%/mq/lib/help/en/broker_information.htm
+%%DATADIR%%/mq/lib/help/en/conndis_broker.htm
+%%DATADIR%%/mq/lib/help/en/conndis_object_store.htm
+%%DATADIR%%/mq/lib/help/en/connection_factory_prop.htm
+%%DATADIR%%/mq/lib/help/en/connfact_clientid.htm
+%%DATADIR%%/mq/lib/help/en/connfact_handling.htm
+%%DATADIR%%/mq/lib/help/en/connfact_handling_old.htm
+%%DATADIR%%/mq/lib/help/en/connfact_jmsx.htm
+%%DATADIR%%/mq/lib/help/en/connfact_message_header_overrides.htm
+%%DATADIR%%/mq/lib/help/en/connfact_queue.htm
+%%DATADIR%%/mq/lib/help/en/connfact_rel.htm
+%%DATADIR%%/mq/lib/help/en/destination_obj_properties.htm
+%%DATADIR%%/mq/lib/help/en/ide.css
+%%DATADIR%%/mq/lib/help/en/imq_index.htm
+%%DATADIR%%/mq/lib/help/en/message_server_syntax.htm
+%%DATADIR%%/mq/lib/help/en/object_store_properties.htm
+%%DATADIR%%/mq/lib/help/en/os_index.htm
+%%DATADIR%%/mq/lib/help/en/overview.htm
+%%DATADIR%%/mq/lib/help/en/service_properties.htm
+%%DATADIR%%/mq/lib/help/images/AppIcon16xCDE.gif
+%%DATADIR%%/mq/lib/help/images/Broker16X.gif
+%%DATADIR%%/mq/lib/help/images/BrokerX16X.gif
+%%DATADIR%%/mq/lib/help/images/ObjectStore16x.gif
+%%DATADIR%%/mq/lib/help/images/ObjectStoreX16X.gif
+%%DATADIR%%/mq/lib/help/images/console.gif
+%%DATADIR%%/mq/lib/hk2-api.jar
+%%DATADIR%%/mq/lib/images/admin/AboutBox48x.gif
+%%DATADIR%%/mq/lib/images/admin/Add24.gif
+%%DATADIR%%/mq/lib/images/admin/AdminConnectBroker24x.gif
+%%DATADIR%%/mq/lib/images/admin/AdminConnectToObjectStore24x.gif
+%%DATADIR%%/mq/lib/images/admin/AdminDisConnectBroker24x.gif
+%%DATADIR%%/mq/lib/images/admin/AdminDisConnectToObjectStore24x.gif
+%%DATADIR%%/mq/lib/images/admin/AppIcon48x.gif
+%%DATADIR%%/mq/lib/images/admin/Broker16X.gif
+%%DATADIR%%/mq/lib/images/admin/BrokerDestinationList16x.gif
+%%DATADIR%%/mq/lib/images/admin/BrokerQuery24X.gif
+%%DATADIR%%/mq/lib/images/admin/BrokerX16X.gif
+%%DATADIR%%/mq/lib/images/admin/CollapseAll24x.gif
+%%DATADIR%%/mq/lib/images/admin/CollectionOfBrokers16x.gif
+%%DATADIR%%/mq/lib/images/admin/CollectionOfObjectStores16x.gif
+%%DATADIR%%/mq/lib/images/admin/Delete24.gif
+%%DATADIR%%/mq/lib/images/admin/ExpandAll24x.gif
+%%DATADIR%%/mq/lib/images/admin/ObjectStore16x.gif
+%%DATADIR%%/mq/lib/images/admin/ObjectStoreCFDestination16xList.gif
+%%DATADIR%%/mq/lib/images/admin/ObjectStoreX16X.gif
+%%DATADIR%%/mq/lib/images/admin/Pause24.gif
+%%DATADIR%%/mq/lib/images/admin/Play24.gif
+%%DATADIR%%/mq/lib/images/admin/Preferences24.gif
+%%DATADIR%%/mq/lib/images/admin/Properties24.gif
+%%DATADIR%%/mq/lib/images/admin/Purge24x.gif
+%%DATADIR%%/mq/lib/images/admin/Refresh24.gif
+%%DATADIR%%/mq/lib/images/admin/Restart24x.gif
+%%DATADIR%%/mq/lib/images/admin/ServiceList16x.gif
+%%DATADIR%%/mq/lib/images/admin/Shutdown24x.gif
+%%DATADIR%%/mq/lib/images/admin/dot.gif
+%%DATADIR%%/mq/lib/images/admin/folder.gif
+%%DATADIR%%/mq/lib/images/admin/splash_block.gif
+%%DATADIR%%/mq/lib/images/admin/splash_comm.gif
+%%DATADIR%%/mq/lib/images/admin/splash_openmq.gif
+%%DATADIR%%/mq/lib/imq.jar
+%%DATADIR%%/mq/lib/imqadmin.jar
+%%DATADIR%%/mq/lib/imqbridgemgr.jar
+%%DATADIR%%/mq/lib/imqbroker.jar
+%%DATADIR%%/mq/lib/imqhttp.war
+%%DATADIR%%/mq/lib/imqhttps.war
+%%DATADIR%%/mq/lib/imqinit
+%%DATADIR%%/mq/lib/imqjmsbridge.jar
+%%DATADIR%%/mq/lib/imqjmsra.rar
+%%DATADIR%%/mq/lib/imqjmx.jar
+%%DATADIR%%/mq/lib/imqservlet.jar
+%%DATADIR%%/mq/lib/imqstomp.jar
+%%DATADIR%%/mq/lib/imqums.war
+%%DATADIR%%/mq/lib/imqutil.jar
+%%DATADIR%%/mq/lib/imqxm.jar
+%%DATADIR%%/mq/lib/javax.json.jar
+%%DATADIR%%/mq/lib/javax.servlet-api.jar
+%%DATADIR%%/mq/lib/javax.transaction-api.jar
+%%DATADIR%%/mq/lib/jaxm-api.jar
+%%DATADIR%%/mq/lib/jhall.jar
+%%DATADIR%%/mq/lib/jms.jar
+%%DATADIR%%/mq/lib/props/broker/default.properties
+%%DATADIR%%/mq/lib/props/broker/install.properties
+%%DATADIR%%/mq/lib/tyrus-standalone-client.jar
+@dir %%DATADIR%%/glassfish/domains/domain1/applications
+@dir %%DATADIR%%/glassfish/domains/domain1/autodeploy/.autodeploystatus
+@dir %%DATADIR%%/glassfish/domains/domain1/autodeploy/bundles
+@dir %%DATADIR%%/glassfish/domains/domain1/bin
+@dir %%DATADIR%%/glassfish/domains/domain1/lib/applibs
+@dir %%DATADIR%%/glassfish/domains/domain1/lib/classes
+@dir %%DATADIR%%/glassfish/domains/domain1/lib/databases
+@dir %%DATADIR%%/glassfish/domains/domain1/lib/ext
+@dir %%DATADIR%%/glassfish/domains/domain1/logs
+@dir %%DATADIR%%/glassfish/lib/endorsed
diff --git a/www/grafana6/Makefile b/www/grafana6/Makefile
index 936fb64549ec..53dce85cc4ee 100644
--- a/www/grafana6/Makefile
+++ b/www/grafana6/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	grafana
-PORTVERSION=	6.3.3
-PORTREVISION=	1
+PORTVERSION=	6.3.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES+=	https://s3-us-west-2.amazonaws.com/grafana-releases/release/:public
@@ -18,13 +17,16 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USES=		compiler go
+USES=		go:modules
 USE_RC_SUBR=	grafana
 
 USE_GITHUB=	yes
-GH_SUBDIR=	src/github.com/${PORTNAME}/${PORTNAME}
 TAG=		9504db8
 
+GO_TARGET=	./pkg/cmd/grafana-server \
+		./pkg/cmd/grafana-cli
+GO_BUILDFLAGS=	-ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}"
+
 GRAFANA_USER?=	grafana
 GRAFANA_GROUP?=	grafana
 
@@ -51,19 +53,20 @@ SUB_LIST+=	GRAFANA_USER=${GRAFANA_USER} \
 PLIST_SUB+=	GRAFANAHOMEDIR=${GRAFANAHOMEDIR}
 
 post-extract:
-	@${RM} -r ${WRKSRC}/src/github.com/grafana/grafana/public
+	@${RM} -r ${WRKSRC}/public
 	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/grafana-${PORTVERSION}.linux-amd64${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS} grafana-${PORTVERSION}/public)
 
-do-build:
-	@cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-server ./pkg/cmd/grafana-server
-	@cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-cli ./pkg/cmd/grafana-cli
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-server \
-		${STAGEDIR}${PREFIX}/bin/grafana-server
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-cli \
-		${STAGEDIR}${PREFIX}/bin/grafana-cli
-	cd ${WRKSRC}/src/github.com/grafana/grafana && \
+# unbreak vendored golang.org/x/xerrors with go1.13
+# can be removed after vendor/golang.org/x/xerrors is updated to a985d3407aa7 or later
+post-patch:
+	@${RM} ${WRKSRC}/vendor/golang.org/x/xerrors/adaptor_go1_13.go
+	@${RM} ${WRKSRC}/vendor/golang.org/x/xerrors/format_go1_13.go
+	@${REINPLACE_CMD} '/build !go1.13/d' ${WRKSRC}/vendor/golang.org/x/xerrors/adaptor_go1_12.go
+	@${REINPLACE_CMD} '/build !go1.13/d' ${WRKSRC}/vendor/golang.org/x/xerrors/format_go1_12.go
+	@${REINPLACE_CMD} '/build !go1.13/d' ${WRKSRC}/vendor/golang.org/x/xerrors/frame_go1_12.go
+
+post-install:
+	cd ${WRKSRC} && \
 		${COPYTREE_SHARE} public ${STAGEDIR}${PREFIX}/share/grafana
 	${MKDIR} ${STAGEDIR}${GRAFANAPIDDIR}
 	${MKDIR} ${STAGEDIR}${GRAFANALOGDIR}
@@ -74,14 +77,8 @@ do-install:
 	${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/conf
 	${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data
 	${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data/log
-	${INSTALL_DATA} ${WRKSRC}/src/github.com/grafana/grafana/conf/defaults.ini \
+	${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini \
 		${STAGEDIR}${GRAFANAHOMEDIR}/conf/defaults.ini
 	${INSTALL_DATA} ${WRKDIR}/grafana.conf ${STAGEDIR}${PREFIX}/etc/grafana.conf.sample
 
-.include <bsd.port.pre.mk>
-
-.if ${COMPILER_TYPE} == clang
-BUILD_ENV=	CC=clang
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/grafana6/distinfo b/www/grafana6/distinfo
index 637222aa799c..62b6a0f28644 100644
--- a/www/grafana6/distinfo
+++ b/www/grafana6/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1566784975
-SHA256 (grafana-6.3.3.linux-amd64.tar.gz) = ee3ea26e70ca1f144922f365418bd7f83dd931450a05be11e803db35e49f8e58
-SIZE (grafana-6.3.3.linux-amd64.tar.gz) = 58755664
-SHA256 (grafana-grafana-v6.3.3_GH0.tar.gz) = 7768ec1fa17f3ee2a28b94a49b2bc95fafa1d63d1766ca5a0e10d9dbee9869c0
-SIZE (grafana-grafana-v6.3.3_GH0.tar.gz) = 13489985
+TIMESTAMP = 1568018550
+SHA256 (grafana-6.3.5.linux-amd64.tar.gz) = 0104bfe14444cea2fa3f021b9a75fc78f66434f2ca8f3d0bdd422d108ce682e7
+SIZE (grafana-6.3.5.linux-amd64.tar.gz) = 58756804
+SHA256 (grafana-grafana-v6.3.5_GH0.tar.gz) = 193974115bf868272dbff08e53fdc0c97af3a07a24758390178ce53e5c9e179b
+SIZE (grafana-grafana-v6.3.5_GH0.tar.gz) = 13490877
diff --git a/www/grafana6/pkg-plist b/www/grafana6/pkg-plist
index dcd41608ae69..24ba955dce02 100644
--- a/www/grafana6/pkg-plist
+++ b/www/grafana6/pkg-plist
@@ -998,6 +998,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/prometheus/partials/config.html
 %%DATADIR%%/public/app/plugins/datasource/prometheus/plugin.json
 %%DATADIR%%/public/app/plugins/datasource/prometheus/promql.ts
+%%DATADIR%%/public/app/plugins/datasource/prometheus/query_hints.test.ts
 %%DATADIR%%/public/app/plugins/datasource/prometheus/query_hints.ts
 %%DATADIR%%/public/app/plugins/datasource/prometheus/result_transformer.ts
 %%DATADIR%%/public/app/plugins/datasource/prometheus/specs/add_label_to_query.test.ts
@@ -1263,18 +1264,18 @@ bin/grafana-server
 %%DATADIR%%/public/app/types/teams.ts
 %%DATADIR%%/public/app/types/templates.ts
 %%DATADIR%%/public/app/types/user.ts
-%%DATADIR%%/public/build/app.995dde94d6d99b780ce7.js
-%%DATADIR%%/public/build/app.995dde94d6d99b780ce7.js.map
-%%DATADIR%%/public/build/dark.995dde94d6d99b780ce7.js
-%%DATADIR%%/public/build/dark.995dde94d6d99b780ce7.js.map
-%%DATADIR%%/public/build/explore.995dde94d6d99b780ce7.js
-%%DATADIR%%/public/build/explore.995dde94d6d99b780ce7.js.map
-%%DATADIR%%/public/build/grafana.dark.995dde94d6d99b780ce7.css
-%%DATADIR%%/public/build/grafana.light.995dde94d6d99b780ce7.css
-%%DATADIR%%/public/build/light.995dde94d6d99b780ce7.js
-%%DATADIR%%/public/build/light.995dde94d6d99b780ce7.js.map
-%%DATADIR%%/public/build/vendor.995dde94d6d99b780ce7.js
-%%DATADIR%%/public/build/vendor.995dde94d6d99b780ce7.js.map
+%%DATADIR%%/public/build/app.75ccb77dbb4b5e3c9285.js
+%%DATADIR%%/public/build/app.75ccb77dbb4b5e3c9285.js.map
+%%DATADIR%%/public/build/dark.75ccb77dbb4b5e3c9285.js
+%%DATADIR%%/public/build/dark.75ccb77dbb4b5e3c9285.js.map
+%%DATADIR%%/public/build/explore.75ccb77dbb4b5e3c9285.js
+%%DATADIR%%/public/build/explore.75ccb77dbb4b5e3c9285.js.map
+%%DATADIR%%/public/build/grafana.dark.75ccb77dbb4b5e3c9285.css
+%%DATADIR%%/public/build/grafana.light.75ccb77dbb4b5e3c9285.css
+%%DATADIR%%/public/build/light.75ccb77dbb4b5e3c9285.js
+%%DATADIR%%/public/build/light.75ccb77dbb4b5e3c9285.js.map
+%%DATADIR%%/public/build/vendor.75ccb77dbb4b5e3c9285.js
+%%DATADIR%%/public/build/vendor.75ccb77dbb4b5e3c9285.js.map
 %%DATADIR%%/public/dashboards/default.json
 %%DATADIR%%/public/dashboards/home.json
 %%DATADIR%%/public/dashboards/scripted.js
diff --git a/www/linux-flashplayer/Makefile b/www/linux-flashplayer/Makefile
index ae3bd3ee33f2..2c005895c06b 100644
--- a/www/linux-flashplayer/Makefile
+++ b/www/linux-flashplayer/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flashplayer
-PORTVERSION=	32.0.0.238
+PORTVERSION=	32.0.0.255
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/
 PKGNAMEPREFIX=	linux-
diff --git a/www/linux-flashplayer/distinfo b/www/linux-flashplayer/distinfo
index df1159a340e6..ff1c76178291 100644
--- a/www/linux-flashplayer/distinfo
+++ b/www/linux-flashplayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565720441
-SHA256 (flashplayer/32.0.0.238/flash_player_npapi_linux.i386.tar.gz) = e08807dcf17b68721658e5d91de781626acc5efb00946508efdde5021ffc871a
-SIZE (flashplayer/32.0.0.238/flash_player_npapi_linux.i386.tar.gz) = 8537560
+TIMESTAMP = 1568160925
+SHA256 (flashplayer/32.0.0.255/flash_player_npapi_linux.i386.tar.gz) = a5e1c0d2aaabc1b5ca8659af83070ea984b62f4a7f435f043a2f603b94aa7461
+SIZE (flashplayer/32.0.0.255/flash_player_npapi_linux.i386.tar.gz) = 8538367
diff --git a/www/mod_limitipconn2/Makefile b/www/mod_limitipconn2/Makefile
index 713e12940416..14df1b3543e9 100644
--- a/www/mod_limitipconn2/Makefile
+++ b/www/mod_limitipconn2/Makefile
@@ -14,17 +14,18 @@ MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Allows you to limit the number of simultaneous connexions
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		apache:2.2+ tar:bzip2
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
-PORTDOCS=	ChangeLog INSTALL README
+PORTDOCS=	ChangeLog README
 
 OPTIONS_DEFINE=	DOCS
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/
 
diff --git a/www/mod_limitipconn2/files/patch-mod_limitipconn.c b/www/mod_limitipconn2/files/patch-mod_limitipconn.c
index af596ca30217..5643466183ae 100644
--- a/www/mod_limitipconn2/files/patch-mod_limitipconn.c
+++ b/www/mod_limitipconn2/files/patch-mod_limitipconn.c
@@ -1,6 +1,6 @@
---- ./mod_limitipconn.c.orig	2012-04-26 00:19:48.000000000 +0200
-+++ ./mod_limitipconn.c	2014-02-02 16:47:28.000000000 +0100
-@@ -42,6 +42,9 @@
+--- mod_limitipconn.c.orig	2012-04-25 22:19:48 UTC
++++ mod_limitipconn.c
+@@ -42,6 +42,9 @@ typedef struct {
      /* array of MIME types to limit check; all other types are exempt */
      apr_array_header_t *excl_limit;
  
@@ -10,7 +10,7 @@
  } limitipconn_config;
  
  static limitipconn_config *create_config(apr_pool_t *p)
-@@ -53,6 +56,7 @@
+@@ -53,6 +56,7 @@ static limitipconn_config *create_config(apr_pool_t *p
      cfg->limit = 0;
      cfg->no_limit = apr_array_make(p, 0, sizeof(char *));
      cfg->excl_limit = apr_array_make(p, 0, sizeof(char *));
@@ -18,7 +18,7 @@
  
      return cfg;
  }
-@@ -75,6 +79,7 @@
+@@ -75,6 +79,7 @@ static int check_limit(request_rec *r, limitipconn_con
      /* convert Apache arrays to normal C arrays */
      char **nolim = (char **) cfg->no_limit->elts;
      char **exlim = (char **) cfg->excl_limit->elts;
@@ -26,7 +26,7 @@
  
      const char *address;
  
-@@ -112,7 +117,7 @@
+@@ -112,7 +117,7 @@ static int check_limit(request_rec *r, limitipconn_con
  
      /* Only check the MIME-type if we have MIME-type stuff in our config.
         The extra subreq can be quite expensive. */
@@ -35,7 +35,7 @@
          /* Look up the Content-type of this request. We need a subrequest
           * here since this module might be called before the URI has been
           * translated into a MIME type. */
-@@ -129,6 +134,20 @@
+@@ -129,6 +134,20 @@ static int check_limit(request_rec *r, limitipconn_con
                  "mod_limitipconn: uri: %s  Content-Type: %s", 
                  r->uri, content_type);
  
@@ -56,7 +56,7 @@
          /* Cycle through the exempt list; if our content_type is exempt,
           * return OK */
  #if AP_MODULE_MAGIC_AT_LEAST(20090131, 0)
-@@ -328,6 +347,24 @@
+@@ -328,6 +347,24 @@ static const char *excl_limit_config_cmd(cmd_parms *pa
      return NULL;
  }
  
@@ -81,7 +81,7 @@
  /* Array describing structure of configuration directives */
  static command_rec limitipconn_cmds[] = {
      AP_INIT_TAKE1("MaxConnPerIP", limit_config_cmd, NULL, OR_LIMIT|RSRC_CONF,
-@@ -336,6 +373,8 @@
+@@ -336,6 +373,8 @@ static command_rec limitipconn_cmds[] = {
       "MIME types for which limit checking is disabled"),
      AP_INIT_ITERATE("OnlyIPLimit", excl_limit_config_cmd, NULL,
       OR_LIMIT|RSRC_CONF, "restrict limit checking to these MIME types only"),
diff --git a/www/mod_limitipconn2/pkg-descr b/www/mod_limitipconn2/pkg-descr
index 1713329f2cb3..9efaaba6ab3b 100644
--- a/www/mod_limitipconn2/pkg-descr
+++ b/www/mod_limitipconn2/pkg-descr
@@ -3,4 +3,4 @@ to limit the number of simultaneous downloads permitted from a single
 IP address.
 Proxy tracking possibility is not supported yet since apache isn't patched.
 
-WWW: http://dominia.org/djao/limitipconn2.html
+WWW: https://dominia.org/djao/limitipconn2.html
diff --git a/www/moodle35/Makefile b/www/moodle35/Makefile
index 4e2b4b932cde..dc80cf3eac71 100644
--- a/www/moodle35/Makefile
+++ b/www/moodle35/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moodle
-PORTVERSION=	3.5.7
+PORTVERSION=	3.5.8
 CATEGORIES=	www
 MASTER_SITES=	SF/moodle/Moodle/stable35/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}${PHP_PKGNAMESUFFIX}
diff --git a/www/moodle35/distinfo b/www/moodle35/distinfo
index 304592f648cc..4bdd5d113f29 100644
--- a/www/moodle35/distinfo
+++ b/www/moodle35/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562726350
-SHA256 (moodle-3.5.7.tgz) = 76f5c8155f5bff5883d7e239b5a5ed9c9735348811318c9ae50986242f726507
-SIZE (moodle-3.5.7.tgz) = 46717307
+TIMESTAMP = 1568185575
+SHA256 (moodle-3.5.8.tgz) = 3ebb922079f76a30eb84926e6e2e762536c9bae927351f5d114dd84605432109
+SIZE (moodle-3.5.8.tgz) = 46729651
diff --git a/www/moodle36/Makefile b/www/moodle36/Makefile
index 20161c5d92a5..01ce14eb30c7 100644
--- a/www/moodle36/Makefile
+++ b/www/moodle36/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moodle
-PORTVERSION=	3.6.5
+PORTVERSION=	3.6.6
 CATEGORIES=	www
 MASTER_SITES=	SF/moodle/Moodle/stable36/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}${PHP_PKGNAMESUFFIX}
diff --git a/www/moodle36/distinfo b/www/moodle36/distinfo
index fd0638979d42..a52c865463e3 100644
--- a/www/moodle36/distinfo
+++ b/www/moodle36/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562722886
-SHA256 (moodle-3.6.5.tgz) = de37eaccdb66e21f05bcc12cbd9c133a71946347a9f0ab6ddc35c9a848d21fa6
-SIZE (moodle-3.6.5.tgz) = 47773277
+TIMESTAMP = 1568182991
+SHA256 (moodle-3.6.6.tgz) = 86975f8f63ae32b9db6cfa4186e5b41bf909fda8a9bbb6cb2909aa617f6b814a
+SIZE (moodle-3.6.6.tgz) = 47777341
diff --git a/www/moodle37/Makefile b/www/moodle37/Makefile
index 6d7b5996eb05..1e0d9e8f83de 100644
--- a/www/moodle37/Makefile
+++ b/www/moodle37/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moodle
-PORTVERSION=	3.7.1
+PORTVERSION=	3.7.2
 CATEGORIES=	www
 MASTER_SITES=	SF/moodle/Moodle/stable37/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}${PHP_PKGNAMESUFFIX}
diff --git a/www/moodle37/distinfo b/www/moodle37/distinfo
index ce37d19c39bd..4f18956f29a3 100644
--- a/www/moodle37/distinfo
+++ b/www/moodle37/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562722361
-SHA256 (moodle-3.7.1.tgz) = ad761d43be432ea307d78843259c1429b4cb99128fc72d1985c92967018fd975
-SIZE (moodle-3.7.1.tgz) = 45741077
+TIMESTAMP = 1568174023
+SHA256 (moodle-3.7.2.tgz) = 39223db63c7f6767457b8cdbe30e39361daaece314444caf3ff57c36f1ad79d7
+SIZE (moodle-3.7.2.tgz) = 45744766
diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index 46f0a33b220e..b68819d4533d 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	netsurf
-PORTVERSION=	3.8
+PORTVERSION=	3.9
 CATEGORIES=	www
 MASTER_SITES=	http://download.netsurf-browser.org/netsurf/releases/source/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -15,7 +15,8 @@ LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	duk:lang/duktape \
 		nsgenbind:devel/nsgenbind \
-		p5-HTML-Parser>=3.72:www/p5-HTML-Parser
+		p5-HTML-Parser>=3.72:www/p5-HTML-Parser \
+		xxd:editors/vim-console
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpng.so:graphics/png \
 		libnsutils.so:devel/libnsutils \
diff --git a/www/netsurf/distinfo b/www/netsurf/distinfo
index 2477e6332cc9..d44180c63caa 100644
--- a/www/netsurf/distinfo
+++ b/www/netsurf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1537061947
-SHA256 (netsurf-3.8-src.tar.gz) = a00ee6f3e7ea7ae50c6c1f95c81d381359171bf6874e58891f21c550090c5542
-SIZE (netsurf-3.8-src.tar.gz) = 3945752
+TIMESTAMP = 1567621226
+SHA256 (netsurf-3.9-src.tar.gz) = d72f1c6f6113a01e541f8476a93c347235068779140090df55ba402eb4a8ecc3
+SIZE (netsurf-3.9-src.tar.gz) = 3989742
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 3b3622085a22..faeb9f38b032 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -82,14 +82,14 @@ OPTIONS_GROUP_HTTPGRP+=	AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE CT DEVEL_KIT \
 	ARRAYVAR DRIZZLE DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION FASTDFS FORMINPUT \
 	GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST HTTP_AUTH_KRB5 \
 	HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL HTTP_FANCYINDEX \
-	HTTP_FOOTER HTTP_GEOIP2 HTTP_JSON_STATUS HTTP_MOGILEFS HTTP_MP4_H264 \
-	HTTP_NOTICE HTTP_PUSH HTTP_PUSH_STREAM HTTP_REDIS HTTP_RESPONSE \
-	HTTP_SUBS_FILTER HTTP_TARANTOOL HTTP_UPLOAD HTTP_UPLOAD_PROGRESS \
-	HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR HTTP_UPSTREAM_STICKY \
-	HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LUA MEMC MODSECURITY \
-	MODSECURITY3 NAXSI NJS PASSENGER POSTGRES RDS_CSV RDS_JSON REDIS2 RTMP \
-	SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SMALL_LIGHT SRCACHE VOD VTS XSS \
-	WEBSOCKIFY
+	HTTP_FOOTER HTTP_GEOIP2 HTTP_IP2LOCATION HTTP_IP2PROXY HTTP_JSON_STATUS \
+	HTTP_MOGILEFS HTTP_MP4_H264 HTTP_NOTICE HTTP_PUSH HTTP_PUSH_STREAM \
+	HTTP_REDIS HTTP_RESPONSE HTTP_SUBS_FILTER HTTP_TARANTOOL HTTP_UPLOAD \
+	HTTP_UPLOAD_PROGRESS HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR \
+	HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LUA \
+	MEMC MODSECURITY MODSECURITY3 NAXSI NJS PASSENGER POSTGRES RDS_CSV \
+	RDS_JSON REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE \
+	SMALL_LIGHT SRCACHE VOD VTS XSS WEBSOCKIFY
 OPTIONS_GROUP_MAILGRP=	MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
 OPTIONS_DEFINE=	DEBUG DEBUGLOG DSO FILE_AIO IPV6 THREADS WWW
 OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index 007e766af6b6..e50bc69611ee 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -108,6 +108,14 @@ HTTP_GEOIP2_CFLAGS=		-I${LOCALBASE}/include
 HTTP_GEOIP2_VARS=		DSO_EXTMODS+=geoip2
 HTTP_GEOIP2_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
+HTTP_IP2LOCATION_GH_TUPLE=	ip2location:ip2location-nginx:d47d248:ip2location
+HTTP_IP2LOCATION_LIB_DEPENDS=	libIP2Location.so:net/ip2location
+HTTP_IP2LOCATION_CONFIGURE_ON=	--add-module=${WRKSRC_ip2location}
+
+HTTP_IP2PROXY_GH_TUPLE=		ip2location:ip2proxy-nginx:d6fd05a:ip2proxy
+HTTP_IP2PROXY_LIB_DEPENDS=	libIP2Proxy.so:net/ip2proxy
+HTTP_IP2PROXY_CONFIGURE_ON=	--add-module=${WRKSRC_ip2proxy}
+
 HTTP_JSON_STATUS_GH_TUPLE=	nginx-modules:ngx_http_json_status_module:1d2f303:json_status
 HTTP_JSON_STATUS_CONFIGURE_ON=	--add-module=${WRKSRC_json_status}
 
@@ -195,8 +203,8 @@ LET_GH_TUPLE=		arut:nginx-let-module:v0.0.4:let
 LET_CONFIGURE_ON=	--add-module=${WRKSRC_let}
 
 LUA_IMPLIES=		DEVEL_KIT
-LUA_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
-LUA_CONFIGURE_ENV=	LUAJIT_INC=${LOCALBASE}/include/luajit-2.0 \
+LUA_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
+LUA_CONFIGURE_ENV=	LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
 			LUAJIT_LIB=${LOCALBASE}/lib
 LUA_GH_TUPLE=		openresty:lua-nginx-module:v0.10.15:lua
 LUA_VARS=		DSO_EXTMODS+=lua
@@ -255,7 +263,7 @@ RDS_JSON_CONFIGURE_ON=	--add-module=${WRKSRC_rdsjson}
 REDIS2_GH_TUPLE=	openresty:redis2-nginx-module:v0.15:redis2
 REDIS2_VARS=		DSO_EXTMODS+=redis2
 
-RTMP_GH_TUPLE=		arut:nginx-rtmp-module:v1.2.1:rtmp
+RTMP_GH_TUPLE=		ut0mt8:nginx-rtmp-module:f0ea623:rtmp
 RTMP_VARS=		DSO_EXTMODS+=rtmp
 
 SET_MISC_IMPLIES=	DEVEL_KIT
diff --git a/www/nginx/Makefile.options.desc b/www/nginx/Makefile.options.desc
index 86b868ba8d0c..22051948cf76 100644
--- a/www/nginx/Makefile.options.desc
+++ b/www/nginx/Makefile.options.desc
@@ -43,6 +43,8 @@ HTTP_GEOIP2_DESC=		3rd party geoip2 module
 HTTP_GUNZIP_FILTER_DESC=	Enable http_gunzip_filter module
 HTTP_GZIP_STATIC_DESC=		Enable http_gzip_static module
 HTTP_IMAGE_FILTER_DESC=		Enable http_image_filter module
+HTTP_IP2LOCATION_DESC=		3rd party ip2location-nginx module
+HTTP_IP2PROXY_DESC=		3rd party ip2proxy-nginx module
 HTTP_JSON_STATUS_DESC=		3rd party http_json_status module
 HTTP_MOGILEFS_DESC=		3rd party mogilefs module
 HTTP_MP4_DESC=			Enable http_mp4 module
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 2fe2447a2249..5ceec8f18e7a 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1565945621
+TIMESTAMP = 1568029112
 SHA256 (nginx-1.16.1.tar.gz) = f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b
 SIZE (nginx-1.16.1.tar.gz) = 1032630
 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@@ -117,8 +117,8 @@ SHA256 (openresty-rds-json-nginx-module-v0.14_GH0.tar.gz) = 99aedf222a9664484918
 SIZE (openresty-rds-json-nginx-module-v0.14_GH0.tar.gz) = 33496
 SHA256 (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = d255571bcfb9939b78099df39cb4d42f174d789aec8c8e5e47b93942b0299438
 SIZE (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = 25471
-SHA256 (arut-nginx-rtmp-module-v1.2.1_GH0.tar.gz) = 87aa597400b0b5a05274ee2d23d8cb8224e12686227a0abe31d783b3a645ea37
-SIZE (arut-nginx-rtmp-module-v1.2.1_GH0.tar.gz) = 519919
+SHA256 (ut0mt8-nginx-rtmp-module-f0ea623_GH0.tar.gz) = a66fc786e17c84a85db5e9598007b5934405945f19d4b9c5af1e12460bb649d9
+SIZE (ut0mt8-nginx-rtmp-module-f0ea623_GH0.tar.gz) = 563795
 SHA256 (openresty-set-misc-nginx-module-cda7e50_GH0.tar.gz) = 6fb2c99d4aecdd0335f55493b0dd4170efa46b0014a4c2e41f2ea519b633aca2
 SIZE (openresty-set-misc-nginx-module-cda7e50_GH0.tar.gz) = 29291
 SHA256 (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 95efdb1f6cfd6c32c577707f693eb6795c6f21ae062842bf84fe762d8b842955
@@ -137,3 +137,7 @@ SHA256 (tg123-websockify-nginx-module-e82d254_GH0.tar.gz) = 1ea0fd35e3bed61c822a
 SIZE (tg123-websockify-nginx-module-e82d254_GH0.tar.gz) = 14378
 SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf
 SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477
+SHA256 (ip2location-ip2location-nginx-d47d248_GH0.tar.gz) = ae45341c361fb4ab11f8415c5d85b51ea1aa1027f8ab4fa9524df2074080bb9c
+SIZE (ip2location-ip2location-nginx-d47d248_GH0.tar.gz) = 5542
+SHA256 (ip2location-ip2proxy-nginx-d6fd05a_GH0.tar.gz) = 7b8df48216cd258d770b084b1768d6963a1ec850a748944f896098ce0fa0d993
+SIZE (ip2location-ip2proxy-nginx-d6fd05a_GH0.tar.gz) = 4573
diff --git a/www/npm/Makefile b/www/npm/Makefile
index 3f37d613437c..830d9589c2fa 100644
--- a/www/npm/Makefile
+++ b/www/npm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	npm
-PORTVERSION=	6.11.2
+PORTVERSION=	6.11.3
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/sunpoet
 
diff --git a/www/npm/distinfo b/www/npm/distinfo
index dba1447b07b6..83553f14fce3 100644
--- a/www/npm/distinfo
+++ b/www/npm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567275631
-SHA256 (npm-6.11.2.tar.xz) = eb1a0d4a6515d454a9d858297f3e808ce743ce7e496d5c6ab0e05ac05027d6c4
-SIZE (npm-6.11.2.tar.xz) = 3416704
+TIMESTAMP = 1567943276
+SHA256 (npm-6.11.3.tar.xz) = 52e7c76415af828a32467a811a59705020bb1659c0ab73d1933d3a2e20fd0219
+SIZE (npm-6.11.3.tar.xz) = 3390588
diff --git a/www/npm/pkg-plist b/www/npm/pkg-plist
index 1e789d4676a8..5dfbe5d817af 100644
--- a/www/npm/pkg-plist
+++ b/www/npm/pkg-plist
@@ -3269,7 +3269,6 @@ lib/node_modules/npm/node_modules/read-cmd-shim/LICENSE
 lib/node_modules/npm/node_modules/read-cmd-shim/README.md
 lib/node_modules/npm/node_modules/read-cmd-shim/index.js
 lib/node_modules/npm/node_modules/read-cmd-shim/package.json
-lib/node_modules/npm/node_modules/read-cmd-shim/test/integration.js
 lib/node_modules/npm/node_modules/read-installed/.npmignore
 lib/node_modules/npm/node_modules/read-installed/.travis.yml
 lib/node_modules/npm/node_modules/read-installed/LICENSE
diff --git a/www/p5-CGI-Simple/Makefile b/www/p5-CGI-Simple/Makefile
index 74020b2b61b0..83281718b460 100644
--- a/www/p5-CGI-Simple/Makefile
+++ b/www/p5-CGI-Simple/Makefile
@@ -2,13 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	CGI-Simple
-PORTVERSION=	1.210
+PORTVERSION=	1.220
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:C|0$||}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S|0$||}
 
-MAINTAINER=	perl@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Simple totally OO CGI interface that is CGI.pm compliant
 
 LICENSE=	ART10 GPLv1+
@@ -18,8 +18,9 @@ TEST_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy \
 		p5-Test-Exception>=0:devel/p5-Test-Exception \
 		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
-NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
+NO_ARCH=	yes
+
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Simple/distinfo b/www/p5-CGI-Simple/distinfo
index 208a6c8e5e93..7cff6ac20d13 100644
--- a/www/p5-CGI-Simple/distinfo
+++ b/www/p5-CGI-Simple/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538984375
-SHA256 (CGI-Simple-1.21.tar.gz) = 4f1b2f7a1fa5c7e8e3f61a426c21d2335d22d8417a43e5fe91154ea25f14ecf3
-SIZE (CGI-Simple-1.21.tar.gz) = 87306
+TIMESTAMP = 1567842464
+SHA256 (CGI-Simple-1.22.tar.gz) = f611a6a35bf0eb637d3d72c30cf400f0e2199844f11eb414087e6e652d8f878d
+SIZE (CGI-Simple-1.22.tar.gz) = 87400
diff --git a/www/p5-CGI-Simple/pkg-descr b/www/p5-CGI-Simple/pkg-descr
index be5c59fb73f6..b999c36642bb 100644
--- a/www/p5-CGI-Simple/pkg-descr
+++ b/www/p5-CGI-Simple/pkg-descr
@@ -1,7 +1,15 @@
-CGI::Simple provides a relatively lightweight drop in replacement
-for CGI.pm. It shares an identical OO interface to CGI.pm for
-parameter parsing, file upload, cookie handling and header generation.
-This module is entirely object oriented, however a complete functional
-interface is available by using the CGI::Simple::Standard module.
+CGI::Simple provides a relatively lightweight drop in replacement for CGI.pm. It
+shares an identical OO interface to CGI.pm for parameter parsing, file upload,
+cookie handling and header generation. This module is entirely object oriented,
+however a complete functional interface is available by using the
+CGI::Simple::Standard module.
+
+Essentially everything in CGI.pm that relates to the CGI (not HTML) side of
+things is available. There are even a few new methods and additions to old ones!
+If you are interested in what has gone on under the hood see the Compatibility
+with CGI.pm section at the end.
+
+In practical testing this module loads and runs about twice as fast as CGI.pm
+depending on the precise task.
 
 WWW: https://metacpan.org/release/CGI-Simple
diff --git a/www/p5-HTML-Clean/Makefile b/www/p5-HTML-Clean/Makefile
index 4e6ae5453a92..72803bb13e76 100644
--- a/www/p5-HTML-Clean/Makefile
+++ b/www/p5-HTML-Clean/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	HTML-Clean
-PORTVERSION=	0.9
+PORTVERSION=	1.2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-HTML-Clean/distinfo b/www/p5-HTML-Clean/distinfo
index cfae13f7dd76..6e9cc5ad3470 100644
--- a/www/p5-HTML-Clean/distinfo
+++ b/www/p5-HTML-Clean/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567547617
-SHA256 (HTML-Clean-0.9.tar.gz) = 31ecec3e9a664e624c22cdd37b4e02ade68364069873aa9048fda13cf4ef9b94
-SIZE (HTML-Clean-0.9.tar.gz) = 48592
+TIMESTAMP = 1568200708
+SHA256 (HTML-Clean-1.2.tar.gz) = 525d3f6bf4034d5c10c3a0a30c7330bfce40e20e7c2128a793df5c2ec60a6eb2
+SIZE (HTML-Clean-1.2.tar.gz) = 48583
diff --git a/www/p5-Mojolicious/Makefile b/www/p5-Mojolicious/Makefile
index 9b8d36af8252..e21f6166b526 100644
--- a/www/p5-Mojolicious/Makefile
+++ b/www/p5-Mojolicious/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Mojolicious
-PORTVERSION=	8.23
+PORTVERSION=	8.24
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Mojolicious/distinfo b/www/p5-Mojolicious/distinfo
index caf0e868d660..ea9e3e1bbd6b 100644
--- a/www/p5-Mojolicious/distinfo
+++ b/www/p5-Mojolicious/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565703409
-SHA256 (Mojolicious-8.23.tar.gz) = 6d40c51ee338fc0a3f081d3dffa266f026762357e57ce7d4f55169f0213091dc
-SIZE (Mojolicious-8.23.tar.gz) = 765863
+TIMESTAMP = 1568248089
+SHA256 (Mojolicious-8.24.tar.gz) = 0ce8786e629a74a6f05abb8d5c39df6afe4ae2bdc8681d1e6f1224f7cb482601
+SIZE (Mojolicious-8.24.tar.gz) = 767501
diff --git a/www/p5-PocketIO/Makefile b/www/p5-PocketIO/Makefile
index a9e120843cac..4b2765fd174c 100644
--- a/www/p5-PocketIO/Makefile
+++ b/www/p5-PocketIO/Makefile
@@ -23,8 +23,9 @@ RUN_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
 TEST_DEPENDS=	p5-Plack>=0:www/p5-Plack \
 		p5-Twiggy>=0:www/p5-Twiggy
 
-NO_ARCH=	yes
-USE_PERL5=	modbuild
 USES=		perl5
+USE_PERL5=	modbuild
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/p5-WebService-Linode/Makefile b/www/p5-WebService-Linode/Makefile
index ea446cb2a72f..8ec29a315004 100644
--- a/www/p5-WebService-Linode/Makefile
+++ b/www/p5-WebService-Linode/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	WebService-Linode
-PORTVERSION=	0.28
+PORTVERSION=	0.29
 CATEGORIES=	www
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,14 +14,14 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
-		p5-JSON>=0:converters/p5-JSON \
-		p5-Mozilla-CA>=0:www/p5-Mozilla-CA \
+RUN_DEPENDS=	p5-JSON>=2.00:converters/p5-JSON \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
 		p5-libwww>=0:www/p5-libwww
 TEST_DEPENDS=	p5-Test-MockObject>=0:devel/p5-Test-MockObject
 
-NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	modbuildtiny
 
+NO_ARCH=	yes
+
 .include <bsd.port.mk>
diff --git a/www/p5-WebService-Linode/distinfo b/www/p5-WebService-Linode/distinfo
index 6df3d2a6cbf2..fda03221d387 100644
--- a/www/p5-WebService-Linode/distinfo
+++ b/www/p5-WebService-Linode/distinfo
@@ -1,2 +1,3 @@
-SHA256 (WebService-Linode-0.28.tar.gz) = 66a315016999c0d2043caae86e664dad10c6613708f33a2f56aae8030326c509
-SIZE (WebService-Linode-0.28.tar.gz) = 33775
+TIMESTAMP = 1567842518
+SHA256 (WebService-Linode-0.29.tar.gz) = 103aab245304f08e9e87ac7bc884ddb44a630de6bac077dc921f716d71154922
+SIZE (WebService-Linode-0.29.tar.gz) = 32855
diff --git a/www/py-asgiref/Makefile b/www/py-asgiref/Makefile
new file mode 100644
index 000000000000..592be632e539
--- /dev/null
+++ b/www/py-asgiref/Makefile
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+PORTNAME=	asgiref
+PORTVERSION=	3.2.2
+CATEGORIES=	www python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	wen@FreeBSD.org
+COMMENT=	ASGI specs, helper code, and adapters
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=4.3.0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0.10.0:devel/py-pytest-asyncio@${PY_FLAVOR}
+
+USES=		python:3.5+
+USE_PYTHON=	distutils autoplist
+
+NO_ARCH=	yes
+
+do-test:
+	(cd ${WRKSRC} && pytest)
+
+.include <bsd.port.mk>
diff --git a/www/py-asgiref/distinfo b/www/py-asgiref/distinfo
new file mode 100644
index 000000000000..2b5656cabff1
--- /dev/null
+++ b/www/py-asgiref/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1568247840
+SHA256 (asgiref-3.2.2.tar.gz) = f62b1c88ebf5fe95db202a372982970edcf375c1513d7e70717df0750f5c2b98
+SIZE (asgiref-3.2.2.tar.gz) = 16370
diff --git a/www/py-asgiref/pkg-descr b/www/py-asgiref/pkg-descr
new file mode 100644
index 000000000000..dbdbb1a9f0af
--- /dev/null
+++ b/www/py-asgiref/pkg-descr
@@ -0,0 +1,5 @@
+ASGI is a standard for Python asynchronous web apps and servers to
+communicate with each other, and positioned as an asynchronous
+successor to WSGI.
+
+WWW: https://github.com/django/asgiref/
diff --git a/www/py-azure-common/Makefile b/www/py-azure-common/Makefile
index e85033f0c0b0..07d78b7f15d5 100644
--- a/www/py-azure-common/Makefile
+++ b/www/py-azure-common/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	azure-common
-PORTVERSION=	1.1.22
+PORTVERSION=	1.1.23
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-azure-common/distinfo b/www/py-azure-common/distinfo
index 3067ae3a2aa3..4c2e5641dfe6 100644
--- a/www/py-azure-common/distinfo
+++ b/www/py-azure-common/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561043381
-SHA256 (azure-common-1.1.22.zip) = c8e4a7bf15f139f779a415d2d3c371738b1e9f5e14abd9c18af6b9bed3babf35
-SIZE (azure-common-1.1.22.zip) = 17065
+TIMESTAMP = 1567881102
+SHA256 (azure-common-1.1.23.zip) = 53b1195b8f20943ccc0e71a17849258f7781bc6db1c72edc7d6c055f79bd54e3
+SIZE (azure-common-1.1.23.zip) = 17297
diff --git a/www/py-beautifulsoup/Makefile b/www/py-beautifulsoup/Makefile
index 8437218252ed..65c7a5f4ed06 100644
--- a/www/py-beautifulsoup/Makefile
+++ b/www/py-beautifulsoup/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	beautifulsoup
-PORTVERSION=	4.7.1
-PORTREVISION=	1
+PORTVERSION=	4.8.0
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-beautifulsoup/distinfo b/www/py-beautifulsoup/distinfo
index d66c64ff13d1..49104f6c516b 100644
--- a/www/py-beautifulsoup/distinfo
+++ b/www/py-beautifulsoup/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1554433166
-SHA256 (beautifulsoup4-4.7.1.tar.gz) = 945065979fb8529dd2f37dbb58f00b661bdbcbebf954f93b32fdf5263ef35348
-SIZE (beautifulsoup4-4.7.1.tar.gz) = 167065
+TIMESTAMP = 1567929824
+SHA256 (beautifulsoup4-4.8.0.tar.gz) = 25288c9e176f354bf277c0a10aa96c782a6a18a17122dba2e8cec4a97e03343b
+SIZE (beautifulsoup4-4.8.0.tar.gz) = 170919
diff --git a/www/py-dj21-drf-yasg/Makefile b/www/py-dj21-drf-yasg/Makefile
index cae1f6bbe42b..3241a6f8429c 100644
--- a/www/py-dj21-drf-yasg/Makefile
+++ b/www/py-dj21-drf-yasg/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	drf-yasg
-DISTVERSION=	1.16.0
+DISTVERSION=	1.16.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj21-
@@ -21,7 +21,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django21>=1.11.7:www/py-django21@${PY_FLAVOR
 		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15.34:devel/py-ruamel.yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}swagger-spec-validator>=2.1.0:devel/py-swagger-spec-validator@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-dj21-drf-yasg/distinfo b/www/py-dj21-drf-yasg/distinfo
index 7b95aa7a7d91..983b7a3c1ac4 100644
--- a/www/py-dj21-drf-yasg/distinfo
+++ b/www/py-dj21-drf-yasg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561074540
-SHA256 (drf-yasg-1.16.0.tar.gz) = 82b535a22fc13e0a202217df4c6470c40b54d21f742e69798f53c69afccbfdac
-SIZE (drf-yasg-1.16.0.tar.gz) = 1288698
+TIMESTAMP = 1567915504
+SHA256 (drf-yasg-1.16.1.tar.gz) = 68fded2ffdf46e03f33e766184b7d8f1e1a5236f94acfd0c4ba932a57b812566
+SIZE (drf-yasg-1.16.1.tar.gz) = 1289575
diff --git a/www/py-dj22-drf-yasg/Makefile b/www/py-dj22-drf-yasg/Makefile
index c046b2fb9b1e..866cac325f2a 100644
--- a/www/py-dj22-drf-yasg/Makefile
+++ b/www/py-dj22-drf-yasg/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	drf-yasg
-DISTVERSION=	1.16.0
+DISTVERSION=	1.16.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj22-
@@ -21,7 +21,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.11.7:www/py-django22@${PY_FLAVOR
 		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15.34:devel/py-ruamel.yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}swagger-spec-validator>=2.1.0:devel/py-swagger-spec-validator@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-dj22-drf-yasg/distinfo b/www/py-dj22-drf-yasg/distinfo
index 7b95aa7a7d91..6f7939ff8b38 100644
--- a/www/py-dj22-drf-yasg/distinfo
+++ b/www/py-dj22-drf-yasg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561074540
-SHA256 (drf-yasg-1.16.0.tar.gz) = 82b535a22fc13e0a202217df4c6470c40b54d21f742e69798f53c69afccbfdac
-SIZE (drf-yasg-1.16.0.tar.gz) = 1288698
+TIMESTAMP = 1567914984
+SHA256 (drf-yasg-1.16.1.tar.gz) = 68fded2ffdf46e03f33e766184b7d8f1e1a5236f94acfd0c4ba932a57b812566
+SIZE (drf-yasg-1.16.1.tar.gz) = 1289575
diff --git a/www/py-drf-yasg/Makefile b/www/py-drf-yasg/Makefile
index f9e2c79f9835..483bc0e530cc 100644
--- a/www/py-drf-yasg/Makefile
+++ b/www/py-drf-yasg/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	drf-yasg
-DISTVERSION=	1.16.0
+DISTVERSION=	1.16.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,7 +21,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.11.7:www/py-django111@${PY_FLAV
 		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15.34:devel/py-ruamel.yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}swagger-spec-validator>=2.1.0:devel/py-swagger-spec-validator@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-drf-yasg/distinfo b/www/py-drf-yasg/distinfo
index 7b95aa7a7d91..adfbc70698bf 100644
--- a/www/py-drf-yasg/distinfo
+++ b/www/py-drf-yasg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561074540
-SHA256 (drf-yasg-1.16.0.tar.gz) = 82b535a22fc13e0a202217df4c6470c40b54d21f742e69798f53c69afccbfdac
-SIZE (drf-yasg-1.16.0.tar.gz) = 1288698
+TIMESTAMP = 1567914095
+SHA256 (drf-yasg-1.16.1.tar.gz) = 68fded2ffdf46e03f33e766184b7d8f1e1a5236f94acfd0c4ba932a57b812566
+SIZE (drf-yasg-1.16.1.tar.gz) = 1289575
diff --git a/www/py-google-resumable-media/Makefile b/www/py-google-resumable-media/Makefile
index 1c723044f478..2b5b60706566 100644
--- a/www/py-google-resumable-media/Makefile
+++ b/www/py-google-resumable-media/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	google-resumable-media
-PORTVERSION=	0.3.3
+PORTVERSION=	0.4.0
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-google-resumable-media/distinfo b/www/py-google-resumable-media/distinfo
index d10b3a159fa4..bda0045d7a82 100644
--- a/www/py-google-resumable-media/distinfo
+++ b/www/py-google-resumable-media/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567016151
-SHA256 (google-resumable-media-0.3.3.tar.gz) = 49493999cf046b5a02f648e201f0c2fc718c5969c53326b4d2c0693b01bdc8bb
-SIZE (google-resumable-media-0.3.3.tar.gz) = 2114537
+TIMESTAMP = 1567842472
+SHA256 (google-resumable-media-0.4.0.tar.gz) = 46ee131e55d16e350cf9dc7de6fc0653b55314e8645e2deb0633394adcd7e9c0
+SIZE (google-resumable-media-0.4.0.tar.gz) = 2112552
diff --git a/www/py-instabot/Makefile b/www/py-instabot/Makefile
index 76aef5703ddb..64e3b2b0c024 100644
--- a/www/py-instabot/Makefile
+++ b/www/py-instabot/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	instabot
-PORTVERSION=	0.55.0
+PORTVERSION=	0.57.0
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-instabot/distinfo b/www/py-instabot/distinfo
index 8f1886225f38..c489f302f22e 100644
--- a/www/py-instabot/distinfo
+++ b/www/py-instabot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567611072
-SHA256 (instabot-0.55.0.tar.gz) = 43ee7210d557a3629bf580c188a0f16931d80a3944420d91a6967e20c9ce58f0
-SIZE (instabot-0.55.0.tar.gz) = 75876
+TIMESTAMP = 1568051703
+SHA256 (instabot-0.57.0.tar.gz) = da752e2f6f608d20173774e0eabc8e49f5873a653cd0f672bb10cc8f5dac8879
+SIZE (instabot-0.57.0.tar.gz) = 75884
diff --git a/www/py-soupsieve/Makefile b/www/py-soupsieve/Makefile
index a0828d5709cc..fa2fee055062 100644
--- a/www/py-soupsieve/Makefile
+++ b/www/py-soupsieve/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	soupsieve
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,8 +13,23 @@ COMMENT=	CSS4 selector implementation for BeautifulSoup
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>4:www/py-beautifulsoup@${PY_FLAVOR}
+
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
+
 NO_ARCH=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_VER} < 3
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>0:devel/py-backports.functools_lru_cache@${PY_FLAVOR}
+.endif
+
+do-test:
+	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
+
+.include <bsd.port.post.mk>
diff --git a/www/rubygem-gollum/Makefile b/www/rubygem-gollum/Makefile
index 0ec856ca2cd3..1125e7e329e6 100644
--- a/www/rubygem-gollum/Makefile
+++ b/www/rubygem-gollum/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gollum
 PORTVERSION=	4.1.4
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
@@ -15,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	git:devel/git \
 		rubygem-gemojione>=3.2:graphics/rubygem-gemojione \
 		rubygem-gollum-lib>=4.2.10:www/rubygem-gollum-lib \
-		rubygem-kramdown>=1.9.0:textproc/rubygem-kramdown \
+		rubygem-kramdown1>=1.9.0:textproc/rubygem-kramdown1 \
 		rubygem-mustache0>=0.99.5:devel/rubygem-mustache0 \
 		rubygem-sinatra1>=1.4.4:www/rubygem-sinatra1 \
 		rubygem-useragent>=0.16.2:devel/rubygem-useragent
diff --git a/www/rubygem-jekyll-sanity/Makefile b/www/rubygem-jekyll-sanity/Makefile
index 2d9ccaad9cf2..209dc5d91dc1 100644
--- a/www/rubygem-jekyll-sanity/Makefile
+++ b/www/rubygem-jekyll-sanity/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jekyll-sanity
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
@@ -11,10 +12,11 @@ COMMENT=	Patches to make Jekyll less insane and easier
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-jekyll>=3.1:www/rubygem-jekyll
+RUN_DEPENDS=	rubygem-jekyll3>=3.1<4:www/rubygem-jekyll3
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-jekyll-watch/Makefile b/www/rubygem-jekyll-watch/Makefile
index a84cd9d91ee2..af453633c3ae 100644
--- a/www/rubygem-jekyll-watch/Makefile
+++ b/www/rubygem-jekyll-watch/Makefile
@@ -2,16 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	jekyll-watch
-PORTVERSION=	2.1.2
+PORTVERSION=	2.2.1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ruby@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Handles rebuilding of Jekyll sites when a file changes
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-listen>=3.0:devel/rubygem-listen
+RUN_DEPENDS=	rubygem-listen>=3.0<4:devel/rubygem-listen
 
 USES=		gem
 USE_RUBY=	yes
diff --git a/www/rubygem-jekyll-watch/distinfo b/www/rubygem-jekyll-watch/distinfo
index 967e04466030..e99c071a7c6f 100644
--- a/www/rubygem-jekyll-watch/distinfo
+++ b/www/rubygem-jekyll-watch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1540041703
-SHA256 (rubygem/jekyll-watch-2.1.2.gem) = fbb72f0bbadb8b593f255039f14da5a8750285ef2238d7de5e54a1ab07f234e9
-SIZE (rubygem/jekyll-watch-2.1.2.gem) = 6144
+TIMESTAMP = 1567842504
+SHA256 (rubygem/jekyll-watch-2.2.1.gem) = bc44ed43f5e0a552836245a54dbff3ea7421ecc2856707e8a1ee203a8387a7e1
+SIZE (rubygem/jekyll-watch-2.2.1.gem) = 6144
diff --git a/www/rubygem-jekyll/Makefile b/www/rubygem-jekyll/Makefile
index 8539898f2b0c..dfec6544c4fe 100644
--- a/www/rubygem-jekyll/Makefile
+++ b/www/rubygem-jekyll/Makefile