diff --git a/archivers/Makefile b/archivers/Makefile
index 608b08b06f8..eb5fb19ae4e 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -193,7 +193,6 @@
     SUBDIR += qpress
     SUBDIR += quazip
     SUBDIR += rar
-    SUBDIR += rox-archive
     SUBDIR += rpm2cpio
     SUBDIR += rpm4
     SUBDIR += rubygem-archive-tar-minitar
diff --git a/archivers/engrampa/Makefile b/archivers/engrampa/Makefile
index 74e5fdfcbc5..0a42d5d1a20 100644
--- a/archivers/engrampa/Makefile
+++ b/archivers/engrampa/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Archive manager for zip files, tar, etc
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	itstool:textproc/itstool
diff --git a/archivers/engrampa/pkg-descr b/archivers/engrampa/pkg-descr
index 9582dc1d5a0..5db92a3d84f 100644
--- a/archivers/engrampa/pkg-descr
+++ b/archivers/engrampa/pkg-descr
@@ -16,4 +16,4 @@ of any type for which you have a viewer.
 
 Former WinZip users may find this program useful.  It serves the same purpose.
 
-WWW: http://mate-desktop.org/
+WWW: https://mate-desktop.org/
diff --git a/archivers/lzma/pkg-descr b/archivers/lzma/pkg-descr
index 991562b341d..9b69f4d04c1 100644
--- a/archivers/lzma/pkg-descr
+++ b/archivers/lzma/pkg-descr
@@ -4,4 +4,4 @@ formats, and produces compression ratios that are usually about 25-30% better
 than bzip2, and decompression speeds that are about twice as fast. The
 disadvantages are higher CPU and RAM requirements for compression.
 
-WWW: http://www.7-zip.org/sdk.html
+WWW: https://www.7-zip.org/sdk.html
diff --git a/archivers/rox-archive/Makefile b/archivers/rox-archive/Makefile
deleted file mode 100644
index 6f56920c6a1..00000000000
--- a/archivers/rox-archive/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	rox-archive
-PORTVERSION=	2.3
-PORTREVISION=	1
-CATEGORIES=	archivers
-MASTER_SITES=	SF/rox/Archive/${PORTVERSION}
-DISTNAME=	archive-${PORTVERSION}
-
-MAINTAINER=	olgeni@FreeBSD.org
-COMMENT=	Archive management tool for the ROX desktop
-
-DEPRECATED=	Old, uses EOLed python27
-EXPIRATION_DATE=	2020-02-16
-
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
-		${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib@${PY_FLAVOR}
-
-USES=		python:2.7 shebangfix tar:bzip2
-NO_ARCH=	yes
-SHEBANG_FILES=	Archive/AppRun
-
-do-build:
-	@${PYTHON_CMD} -m compileall ${WRKSRC}
-	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
-
-pre-install:
-	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
-				${WRKSRC}/Archive/findrox.py
-	@${FIND} ${WRKSRC} -name *.bak -delete
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/apps
-	${CP} -r ${WRKSRC}/Archive ${STAGEDIR}${PREFIX}/apps/
-
-.include <bsd.port.mk>
diff --git a/archivers/rox-archive/distinfo b/archivers/rox-archive/distinfo
deleted file mode 100644
index f26d7eabd64..00000000000
--- a/archivers/rox-archive/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (archive-2.3.tar.bz2) = dc72728203874e0d4c07a079298cc628cdd30fd76a057f426ab7ad06f80ce7eb
-SIZE (archive-2.3.tar.bz2) = 28342
diff --git a/archivers/rox-archive/pkg-descr b/archivers/rox-archive/pkg-descr
deleted file mode 100644
index 299ac96fef4..00000000000
--- a/archivers/rox-archive/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Archive management tool for the ROX desktop, supporting a variety
-of file formats.
-
-WWW: http://rox.sourceforge.net/archive.html
diff --git a/archivers/rox-archive/pkg-plist b/archivers/rox-archive/pkg-plist
deleted file mode 100644
index c2bf64f2efc..00000000000
--- a/archivers/rox-archive/pkg-plist
+++ /dev/null
@@ -1,38 +0,0 @@
-apps/Archive/.DirIcon
-apps/Archive/AppInfo.xml
-apps/Archive/AppRun
-apps/Archive/Archive.xml
-apps/Archive/Help/COPYING
-apps/Archive/Help/Changes
-apps/Archive/Help/README
-apps/Archive/Messages/de.gmo
-apps/Archive/Messages/de.po
-apps/Archive/Messages/dist
-apps/Archive/Messages/es.gmo
-apps/Archive/Messages/es.po
-apps/Archive/Messages/fr.gmo
-apps/Archive/Messages/fr.po
-apps/Archive/Messages/hu.gmo
-apps/Archive/Messages/hu.po
-apps/Archive/Messages/it.gmo
-apps/Archive/Messages/it.po
-apps/Archive/Messages/update-po
-apps/Archive/Messages/zh_CN.gmo
-apps/Archive/Messages/zh_CN.po
-apps/Archive/Messages/zh_TW.gmo
-apps/Archive/Messages/zh_TW.po
-apps/Archive/box.py
-apps/Archive/box.pyc
-apps/Archive/box.pyo
-apps/Archive/findrox.py
-apps/Archive/findrox.pyc
-apps/Archive/findrox.pyo
-apps/Archive/formats.py
-apps/Archive/formats.pyc
-apps/Archive/formats.pyo
-apps/Archive/support.py
-apps/Archive/support.pyc
-apps/Archive/support.pyo
-apps/Archive/tests/testall.py
-apps/Archive/tests/testall.pyc
-apps/Archive/tests/testall.pyo
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index dc87b69219d..cb94145c382 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	kstars
-DISTVERSION=	3.3.9
+DISTVERSION=	3.4.0
 PORTEPOCH=	1
 CATEGORIES=	astro kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
diff --git a/astro/kstars/distinfo b/astro/kstars/distinfo
index 9fbb74d72b3..2f32ceb21a4 100644
--- a/astro/kstars/distinfo
+++ b/astro/kstars/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577952011
-SHA256 (kstars-3.3.9.tar.xz) = dc8c0170b2735a1319bb21c2dddbecbef2b5d041f4216be8c14e0730bc06937b
-SIZE (kstars-3.3.9.tar.xz) = 71097252
+TIMESTAMP = 1581709152
+SHA256 (kstars-3.4.0.tar.xz) = dade0dc671649cc262f2c6350d64704491727ade583b68dd2f51ec0646acea3a
+SIZE (kstars-3.4.0.tar.xz) = 70998352
diff --git a/astro/kstars/pkg-plist b/astro/kstars/pkg-plist
index 8caa9795cf7..7b11914857f 100644
--- a/astro/kstars/pkg-plist
+++ b/astro/kstars/pkg-plist
@@ -1713,7 +1713,6 @@ share/locale/br/LC_MESSAGES/kstars.mo
 share/locale/bs/LC_MESSAGES/kstars.mo
 share/locale/ca/LC_MESSAGES/kstars.mo
 share/locale/ca@valencia/LC_MESSAGES/kstars.mo
-share/locale/cs/LC_MESSAGES/kstars.mo
 share/locale/cy/LC_MESSAGES/kstars.mo
 share/locale/da/LC_MESSAGES/kstars.mo
 share/locale/de/LC_MESSAGES/kstars.mo
diff --git a/astro/mkgmap/Makefile b/astro/mkgmap/Makefile
index 532b7672151..a07e5cd1898 100644
--- a/astro/mkgmap/Makefile
+++ b/astro/mkgmap/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mkgmap
-PORTVERSION=	r4437
+PORTVERSION=	r4452
 CATEGORIES=	astro converters java
 MASTER_SITES=	http://www.mkgmap.org.uk/download/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/astro/mkgmap/distinfo b/astro/mkgmap/distinfo
index 43e7b8c29b1..5397c592f32 100644
--- a/astro/mkgmap/distinfo
+++ b/astro/mkgmap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581355091
-SHA256 (mkgmap-r4437.tar.gz) = 95c654698124cc4ccf5b410bb7c92ecfe89ee2dbad94bc65aae60ab779b4822c
-SIZE (mkgmap-r4437.tar.gz) = 3417661
+TIMESTAMP = 1581858097
+SHA256 (mkgmap-r4452.tar.gz) = bb2b144f628a32079d38df22e2ed06cca5adb2f40aa518289ac8293c0cf7c725
+SIZE (mkgmap-r4452.tar.gz) = 3417851
diff --git a/astro/py-horoscopegenerator/Makefile b/astro/py-horoscopegenerator/Makefile
index a1a455b51ff..38375308ddc 100644
--- a/astro/py-horoscopegenerator/Makefile
+++ b/astro/py-horoscopegenerator/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	astro python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Generate horoscopes using context-free grammar
 
 LICENSE=	MIT
diff --git a/audio/bambootracker/Makefile b/audio/bambootracker/Makefile
index 8cbc5878a28..5dc1f55cf05 100644
--- a/audio/bambootracker/Makefile
+++ b/audio/bambootracker/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bambootracker
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.4
+DISTVERSION=	0.3.5
 CATEGORIES=	audio
 MASTER_SITES=	LOCAL/ehaupt:extras
 DISTFILES=	${PORTNAME}-extras-${EXTRASVERSION}${EXTRACT_SUFX}:extras
diff --git a/audio/bambootracker/distinfo b/audio/bambootracker/distinfo
index b361d500dcd..a7c7962b34b 100644
--- a/audio/bambootracker/distinfo
+++ b/audio/bambootracker/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1580305672
+TIMESTAMP = 1581872338
 SHA256 (bambootracker-extras-2.tar.gz) = 72f9994ea329bc6bd3f8855262209aa827b66f880e5734fc1486e9709546c9ce
 SIZE (bambootracker-extras-2.tar.gz) = 8321
-SHA256 (rerrahkr-BambooTracker-v0.3.4_GH0.tar.gz) = 6d9eed0aa406e49d5e41352dfd5f2f91868243e2ce09c8f7577aa78a6c7808e0
-SIZE (rerrahkr-BambooTracker-v0.3.4_GH0.tar.gz) = 2933420
+SHA256 (rerrahkr-BambooTracker-v0.3.5_GH0.tar.gz) = 688ba63a47c88cc9e444dad4e744c10fee4e501db81187cea06b72c04c4465ac
+SIZE (rerrahkr-BambooTracker-v0.3.5_GH0.tar.gz) = 2936386
diff --git a/audio/cantata/Makefile b/audio/cantata/Makefile
index c0ef2b4ef0c..28d2c240b8c 100644
--- a/audio/cantata/Makefile
+++ b/audio/cantata/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=		cantata
 DISTVERSIONPREFIX=	v
-DISTVERSION=		2.3.3
-PORTREVISION=		4
+DISTVERSION=		2.4.0
 CATEGORIES=		audio kde
 
 MAINTAINER=		kde@FreeBSD.org
@@ -20,20 +19,22 @@ USE_QT=			buildtools_build concurrent core dbus gui network \
 			qmake_build sql sql-sqlite3_run svg widgets xml
 
 CMAKE_ON=		CMAKE_DISABLE_FIND_PACKAGE_UDev
+CMAKE_OFF=		ENABLE_CDIOPARANOIA
 
 SHEBANG_FILES=		playlists/cantata-dynamic cantata-remote.cmake
 CPE_VENDOR=		craig_drummond
 USE_LDCONFIG=		yes
 
-OPTIONS_DEFINE=		CDPARANOIA MTP NLS PROXY TAGLIB
+OPTIONS_DEFINE=		AVAHI CDPARANOIA MTP NLS PROXY TAGLIB
 OPTIONS_GROUP=		CDINFO REPLAYGAIN
 OPTIONS_GROUP_CDINFO=	CDDB MUSICBRAINZ
 OPTIONS_GROUP_REPLAYGAIN=	FFMPEG MPG123
 OPTIONS_RADIO=		HSP
 OPTIONS_RADIO_HSP=	QT5 VLC
-OPTIONS_DEFAULT=	CDDB CDPARANOIA FFMPEG MPG123 MTP MUSICBRAINZ TAGLIB VLC
+OPTIONS_DEFAULT=	AVAHI CDDB CDPARANOIA FFMPEG MPG123 MTP MUSICBRAINZ TAGLIB VLC
 OPTIONS_SUB=		yes
 
+AVAHI_DESC=		Automatic MPD Discovery
 CDDB_DESC=		CD info retrieval via CDDB
 CDINFO_DESC=		AudioCD support
 FFMPEG_DESC=		ReplayGain calculation support via FFmpeg
@@ -46,6 +47,9 @@ REPLAYGAIN_DESC=	Replaygain calculation support
 TAGLIB_DESC=		Reading and editing Meta-Data of audio files
 VLC_DESC=		HTTP streams support via libVLC
 
+AVAHI_CMAKE_BOOL=	ENABLE_AVAHI
+AVAHI_LIB_DEPENDS=	libavahi-common.so:net/avahi-app
+
 CDDB_IMPLIES=		CDPARANOIA
 CDDB_LIB_DEPENDS=	libcddb.so:audio/libcddb
 CDDB_CMAKE_BOOL=	ENABLE_CDDB
diff --git a/audio/cantata/distinfo b/audio/cantata/distinfo
index 27fbd29ff9d..9b668e970f8 100644
--- a/audio/cantata/distinfo
+++ b/audio/cantata/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546180082
-SHA256 (CDrummond-cantata-v2.3.3_GH0.tar.gz) = 738fe9346b053b6131377dd7c0790aefffda6850546ca0c0d4e05295fb221b03
-SIZE (CDrummond-cantata-v2.3.3_GH0.tar.gz) = 4020353
+TIMESTAMP = 1581836351
+SHA256 (CDrummond-cantata-v2.4.0_GH0.tar.gz) = 783f30e4bfbeea8e08553eee40feab20f85db404a5b9082d4e3795d8d4111910
+SIZE (CDrummond-cantata-v2.4.0_GH0.tar.gz) = 4158803
diff --git a/audio/cantata/pkg-plist b/audio/cantata/pkg-plist
index 2c73b64ad1d..8a202c6d35f 100644
--- a/audio/cantata/pkg-plist
+++ b/audio/cantata/pkg-plist
@@ -12,11 +12,13 @@ share/applications/cantata.desktop
 %%NLS%%%%DATADIR%%/translations/cantata_de.qm
 %%NLS%%%%DATADIR%%/translations/cantata_en_GB.qm
 %%NLS%%%%DATADIR%%/translations/cantata_es.qm
+%%NLS%%%%DATADIR%%/translations/cantata_fi.qm
 %%NLS%%%%DATADIR%%/translations/cantata_fr.qm
 %%NLS%%%%DATADIR%%/translations/cantata_hu.qm
 %%NLS%%%%DATADIR%%/translations/cantata_it.qm
 %%NLS%%%%DATADIR%%/translations/cantata_ja.qm
 %%NLS%%%%DATADIR%%/translations/cantata_ko.qm
+%%NLS%%%%DATADIR%%/translations/cantata_nl.qm
 %%NLS%%%%DATADIR%%/translations/cantata_pl.qm
 %%NLS%%%%DATADIR%%/translations/cantata_pt_BR.qm
 %%NLS%%%%DATADIR%%/translations/cantata_ru.qm
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 836d5feb407..4d3c07f36cb 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -5,13 +5,11 @@ PORTNAME=	rplay
 PORTVERSION=	3.3.2
 PORTREVISION=	3
 CATEGORIES=	audio
-MASTER_SITES=	http://rplay.doit.org/dist/
+MASTER_SITES=	http://ponce.cc/slackware/sources/repo/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network audio player
 
-BROKEN=		unfetchable
-
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
diff --git a/audio/rplay/pkg-descr b/audio/rplay/pkg-descr
index 5c61788b8bf..532de6186f6 100644
--- a/audio/rplay/pkg-descr
+++ b/audio/rplay/pkg-descr
@@ -5,4 +5,4 @@ HP9000/710 and now FreeBSD.  The rplay clients and client library should
 work on any system that supports Berkeley sockets.  The X Window
 System is not required.
 
-WWW: http://rplay.doit.org/
+WWW: https://web.archive.org/web/20171109100411/http://rplay.doit.org/
diff --git a/biology/kallisto/Makefile b/biology/kallisto/Makefile
index dac8dcaea0e..913f96f390e 100644
--- a/biology/kallisto/Makefile
+++ b/biology/kallisto/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=		kallisto
 DISTVERSIONPREFIX=	v
-DISTVERSION=		0.46.1
+DISTVERSION=		0.46.2
 CATEGORIES=		biology
 
 MAINTAINER=	jwb@FreeBSD.org
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libsz.so:science/szip \
 		libhts.so:biology/htslib
 
-USES=		cmake:noninja compiler:c++11-lang
+USES=		cmake:noninja compiler:c++11-lang localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	pachterlab
 
@@ -25,8 +25,12 @@ PORTEXAMPLES=		*
 PLIST_FILES=		bin/kallisto
 EXAMPLES_PLIST_FILES=	bin/kallisto-test
 
+# hdf5 is being phased out and is no longer build in by default, but is still
+# required for Sleuth and other downstream tools.  Remove this after Sleuth
+# et all catch up.
+CMAKE_ARGS+=	-DUSE_HDF5:BOOL=ON
+
 OPTIONS_DEFINE=	EXAMPLES
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install-EXAMPLES-on:
 	${INSTALL_SCRIPT} ${WRKDIR}/kallisto-test ${STAGEDIR}${PREFIX}/bin
diff --git a/biology/kallisto/distinfo b/biology/kallisto/distinfo
index 98ccaa8a850..c1b80df5a38 100644
--- a/biology/kallisto/distinfo
+++ b/biology/kallisto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1572972210
-SHA256 (pachterlab-kallisto-v0.46.1_GH0.tar.gz) = 492ef081395e8858fcd9832aceb8b61c79358f00afb45e6709146c0fb51dd231
-SIZE (pachterlab-kallisto-v0.46.1_GH0.tar.gz) = 2254560
+TIMESTAMP = 1581611719
+SHA256 (pachterlab-kallisto-v0.46.2_GH0.tar.gz) = 10bab0c2929d8c345750e02735b305bbbfa89e8a48f42c4b9af44f3d44ff4c82
+SIZE (pachterlab-kallisto-v0.46.2_GH0.tar.gz) = 2693857
diff --git a/biology/py-bx-python/Makefile b/biology/py-bx-python/Makefile
index 5588130b842..eace166cd31 100644
--- a/biology/py-bx-python/Makefile
+++ b/biology/py-bx-python/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bx-python
-DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.6
+DISTVERSION=	0.8.8
 CATEGORIES=	biology python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -13,9 +12,10 @@ COMMENT=	Python module for reading, manipulating and writing genomic data sets
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}python-lzo>0:archivers/py-python-lzo@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+PY_DEPENDS=	${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+BUILD_DEPENDS=	${PY_DEPENDS}
+RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		compiler python
 USE_GITHUB=	yes
diff --git a/biology/py-bx-python/distinfo b/biology/py-bx-python/distinfo
index a6cdf76234b..2da7efeb183 100644
--- a/biology/py-bx-python/distinfo
+++ b/biology/py-bx-python/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574488237
-SHA256 (bxlab-bx-python-v0.8.6_GH0.tar.gz) = 56eb4ed3676aad40c33a630b2aa24e05af0c88e07d4514ab458d87b3aacd0917
-SIZE (bxlab-bx-python-v0.8.6_GH0.tar.gz) = 1651191
+TIMESTAMP = 1581796885
+SHA256 (bxlab-bx-python-0.8.8_GH0.tar.gz) = af5f538b8336869d2ad10fef00725d3ac6ef436083f693d883d9933526eb4aae
+SIZE (bxlab-bx-python-0.8.8_GH0.tar.gz) = 1651358
diff --git a/biology/stringtie/Makefile b/biology/stringtie/Makefile
index 57c2fdb096e..4110ba7ab71 100644
--- a/biology/stringtie/Makefile
+++ b/biology/stringtie/Makefile
@@ -1,20 +1,22 @@
 # $FreeBSD$
 
 PORTNAME=	stringtie
-DISTVERSION=	1.3.4d
+DISTVERSION=	2.1.1
 CATEGORIES=	biology
 MASTER_SITES=	http://ccb.jhu.edu/software/stringtie/dl/
 
-MAINTAINER=	mzaki@niid.go.jp
+MAINTAINER=	mzaki@e-mail.ne.jp
 COMMENT=	Transcript assembly and quantification for RNA-seq
 
-LICENSE=	ART20 MIT
-LICENSE_COMB=	multi
-LICENSE_FILE_ART20=	${WRKSRC}/LICENSE
-LICENSE_FILE_MIT=	${WRKSRC}/samtools-0.1.18/COPYING
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+TEST_DEPENDS=	bash:shells/bash \
+		curl:ftp/curl
 
 USES=		gmake
 ALL_TARGET=	release
+TEST_TARGET=	test
 
 PLIST_FILES=	bin/stringtie
 
diff --git a/biology/stringtie/distinfo b/biology/stringtie/distinfo
index 020a9bf31fc..9cb6aece307 100644
--- a/biology/stringtie/distinfo
+++ b/biology/stringtie/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530582079
-SHA256 (stringtie-1.3.4d.tar.gz) = b1962d0108146ce7fea39d069b5e5de918e0e21daef9e1425ec9b778094d6ae6
-SIZE (stringtie-1.3.4d.tar.gz) = 438025
+TIMESTAMP = 1580533096
+SHA256 (stringtie-2.1.1.tar.gz) = 7ea152b791856b1bd5dd2d475b06fae05398ee7e03f2f9844418010376edcca2
+SIZE (stringtie-2.1.1.tar.gz) = 1969917
diff --git a/biology/stringtie/files/patch-Makefile b/biology/stringtie/files/patch-Makefile
index 52df9a78c09..a9a490e404f 100644
--- a/biology/stringtie/files/patch-Makefile
+++ b/biology/stringtie/files/patch-Makefile
@@ -1,55 +1,15 @@
---- Makefile.orig	2018-03-06 16:29:49 UTC
+--- Makefile.orig	2020-01-26 03:31:12 UTC
 +++ Makefile
-@@ -6,12 +6,12 @@ GDIR      :=./gclib
- 
- INCDIRS   := -I. -I${GDIR} -I${BAM}
- 
--CC        := g++
-+CXX       ?= g++
- 
- BASEFLAGS := -Wall -Wextra ${INCDIRS} -fsigned-char -D_FILE_OFFSET_BITS=64 \
- -D_LARGEFILE_SOURCE -fno-strict-aliasing -fno-exceptions -fno-rtti
- 
--LINKER    := g++
-+LINKER    = ${CXX}
- 
- LDFLAGS   := -g -L${BAM} $(LDFLAGS)
- 
-@@ -22,13 +22,13 @@ ifneq (,$(findstring nothreads,$(MAKECMD
+@@ -20,7 +20,7 @@ ifeq "$(GCCVER8)" "1"
+   BASEFLAGS += -Wno-class-memaccess
  endif
  
- #detect MinGW (Windows environment)
--ifneq (,$(findstring mingw,$(shell ${CC} -dumpmachine)))
-+ifneq (,$(findstring mingw,$(shell ${CXX} -dumpmachine)))
-  WINDOWS=1
- endif
+-LINKER  := $(if $(LINKER),$(LINKER),g++)
++LINKER  := $(if $(LINKER),$(LINKER),$(CXX))
  
- # MinGW32 GCC 4.5 link problem fix
- #ifdef WINDOWS
--ifneq (,$(findstring 4.5.,$(shell g++ -dumpversion)))
-+ifneq (,$(findstring 4.5.,$(shell ${CXX} -dumpversion)))
-  STATIC_CLIB=1
- endif
- #endif
-@@ -63,7 +63,7 @@ endif
- ifneq (,$(filter %release %static, $(MAKECMDGOALS)))
-   # -- release build
-   RELEASE_BUILD=1
--  CFLAGS := -DNDEBUG -g $(BASEFLAGS) $(CFLAGS) -O3
-+  CFLAGS := -DNDEBUG -g $(BASEFLAGS) $(CFLAGS)
- else
-   ifneq (,$(filter %memcheck %memdebug, $(MAKECMDGOALS)))
-      #use sanitizer in gcc 4.9+
-@@ -122,7 +122,7 @@ endif
+ LDFLAGS := $(if $(LDFLAGS),$(LDFLAGS),-g)
  
- 
- %.o : %.cpp
--	${CC} ${CFLAGS} -c $< -o $@
-+	${CXX} ${CFLAGS} -c $< -o $@
- 
- OBJS += rlink.o tablemaker.o tmerge.o
- 
-@@ -137,7 +137,7 @@ rlink.o : rlink.h tablemaker.h $(GDIR)/G
+@@ -151,7 +151,7 @@ rlink.o : rlink.h tablemaker.h $(GDIR)/G
  tmerge.o : rlink.h tmerge.h
  tablemaker.o : tablemaker.h rlink.h
  ${BAM}/libbam.a: 
@@ -58,7 +18,7 @@
  stringtie: ${BAM}/libbam.a $(OBJS) stringtie.o
  	${LINKER} ${LDFLAGS} -o $@ ${filter-out %.a %.so, $^} ${LIBS}
  	@echo
-@@ -151,6 +151,6 @@ clean:
+@@ -167,6 +167,6 @@ clean:
  	${RM} stringtie${EXE} stringtie.o*  $(OBJS)
  	${RM} core.*
  allclean cleanAll cleanall:
diff --git a/biology/stringtie/files/patch-gclib_GIntHash.hh b/biology/stringtie/files/patch-gclib_GIntHash.hh
deleted file mode 100644
index a29977a4db8..00000000000
--- a/biology/stringtie/files/patch-gclib_GIntHash.hh
+++ /dev/null
@@ -1,20 +0,0 @@
---- gclib/GIntHash.hh.orig	2018-03-06 16:29:49 UTC
-+++ gclib/GIntHash.hh
-@@ -122,7 +122,7 @@ public:
-   uint32 NextKey() {
-      Cell* cell=ghash.NextCell();
-      if (cell) return cell->key;
--       else return NULL;
-+       else return 0;
-   }
-   OBJ* NextValue() {
-      Cell* cell=ghash.NextCell();
-@@ -201,7 +201,7 @@ public:
-   uint32 NextKey() {
-      Cell* cell=ghash.NextCell();
-      if (cell) return cell->key;
--       else return NULL;
-+       else return 0;
-   }
-   OBJ* NextValue() {
-      Cell* cell=ghash.NextCell();
diff --git a/biology/stringtie/files/patch-samtools-0.1.18_bam__aux.c b/biology/stringtie/files/patch-samtools-0.1.18_bam__aux.c
deleted file mode 100644
index fb7dcf5c19f..00000000000
--- a/biology/stringtie/files/patch-samtools-0.1.18_bam__aux.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- samtools-0.1.18/bam_aux.c.orig	2018-03-06 16:29:49 UTC
-+++ samtools-0.1.18/bam_aux.c
-@@ -25,7 +25,7 @@ uint8_t *bam_aux_get_core(bam1_t *b, con
- 	return bam_aux_get(b, tag);
- }
- 
--inline int aux_type2size(uint8_t type)
-+int aux_type2size(uint8_t type)
- {
-     switch (type) {
-     case 'A': case 'c': case 'C':
-@@ -43,7 +43,7 @@ inline int aux_type2size(uint8_t type)
-     }
- }
- 
--inline uint8_t* skip_aux(uint8_t* s) {
-+uint8_t* skip_aux(uint8_t* s) {
- 	int size = aux_type2size(*s); ++s; // skip type
- 	uint32_t n;
- 	switch (size) {
diff --git a/cad/p5-Verilog-Perl/Makefile b/cad/p5-Verilog-Perl/Makefile
index bba6a7b18bc..7e14e963c75 100644
--- a/cad/p5-Verilog-Perl/Makefile
+++ b/cad/p5-Verilog-Perl/Makefile
@@ -10,7 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	otacilio.neto@bsd.com.br
 COMMENT=	Building point for Verilog support in the Perl language
 
-LICENSE=	LGPL3
+LICENSE=	ART20 LGPL3
+LICENSE_COMB=	dual
+LICENSE_FILE_ART20=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	flex>=2.5.35:textproc/flex
 
@@ -21,7 +23,7 @@ CONFIGURE_ENV=	CXX=${CXX}\
 		CC=${CC}
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Verilog/Parser/*.so
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Verilog/Preproc/*.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Verilog/Parser/*.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Verilog/Preproc/*.so
 
 .include <bsd.port.mk>
diff --git a/cad/p5-Verilog-Perl/pkg-descr b/cad/p5-Verilog-Perl/pkg-descr
index fa9315cdf53..69719b466c5 100644
--- a/cad/p5-Verilog-Perl/pkg-descr
+++ b/cad/p5-Verilog-Perl/pkg-descr
@@ -16,4 +16,4 @@ language. It includes:
   edit this list, changing as many symbols as you wish. Vrename is then run a
   second time to apply the changes.
 
-WWW: http://www.veripool.org/wiki/verilog-perl
+WWW: https://www.veripool.org/wiki/verilog-perl
diff --git a/cad/veroroute/Makefile b/cad/veroroute/Makefile
index 678fe6e2f5f..4b4d8ee7860 100644
--- a/cad/veroroute/Makefile
+++ b/cad/veroroute/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	veroroute
 DISTVERSIONPREFIX=	V
-DISTVERSION=	175
+DISTVERSION=	178
 DISTVERSIONSUFFIX=	_Src
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/
diff --git a/cad/veroroute/distinfo b/cad/veroroute/distinfo
index ec5eb3d80b3..97f64952b1c 100644
--- a/cad/veroroute/distinfo
+++ b/cad/veroroute/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581144712
-SHA256 (VeroRoute_V175_Src.zip) = 5adedc65fd1a5c5620955eb03e1917455b0819595f094209da6cf183560a595e
-SIZE (VeroRoute_V175_Src.zip) = 948748
+TIMESTAMP = 1581743314
+SHA256 (VeroRoute_V178_Src.zip) = 6136d1c850050461a796ba958c3c845eabf02e9cec9367a1eef9a3c72924ac22
+SIZE (VeroRoute_V178_Src.zip) = 950517
diff --git a/converters/rubygem-json-ld-preloaded/Makefile b/converters/rubygem-json-ld-preloaded/Makefile
index 1aa59a1c66b..89dc2736ff8 100644
--- a/converters/rubygem-json-ld-preloaded/Makefile
+++ b/converters/rubygem-json-ld-preloaded/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	json-ld-preloaded
-PORTVERSION=	3.1.0
+PORTVERSION=	3.1.1
 CATEGORIES=	converters rubygems
 MASTER_SITES=	RG
 
diff --git a/converters/rubygem-json-ld-preloaded/distinfo b/converters/rubygem-json-ld-preloaded/distinfo
index 1dacc5d46ba..1d9789abf61 100644
--- a/converters/rubygem-json-ld-preloaded/distinfo
+++ b/converters/rubygem-json-ld-preloaded/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577145803
-SHA256 (rubygem/json-ld-preloaded-3.1.0.gem) = 5025193955bba16914ce12799963ecd45ab8522a51f3b4256cd06e1cb2eb3375
-SIZE (rubygem/json-ld-preloaded-3.1.0.gem) = 119808
+TIMESTAMP = 1581688168
+SHA256 (rubygem/json-ld-preloaded-3.1.1.gem) = c13126f8c30dd60f77b33a0c51035a31070bf4bd5ba0baa2d8317db0a0ff35b0
+SIZE (rubygem/json-ld-preloaded-3.1.1.gem) = 120320
diff --git a/databases/Makefile b/databases/Makefile
index 40a7f4222c0..bd91cd98953 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -127,9 +127,6 @@
     SUBDIR += kexi
     SUBDIR += kyotocabinet
     SUBDIR += kyototycoon
-    SUBDIR += ldb
-    SUBDIR += ldb12
-    SUBDIR += ldb13
     SUBDIR += ldb14
     SUBDIR += ldb15
     SUBDIR += leo_center
@@ -1029,7 +1026,6 @@
     SUBDIR += tcl-lmdb
     SUBDIR += tcl-sqlite3
     SUBDIR += tdb
-    SUBDIR += tdb1
     SUBDIR += tdbc
     SUBDIR += tile38
     SUBDIR += tiledb
diff --git a/databases/foundationdb-devel/Makefile b/databases/foundationdb-devel/Makefile
index a23a40c4359..185975918aa 100644
--- a/databases/foundationdb-devel/Makefile
+++ b/databases/foundationdb-devel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	foundationdb-devel
 DISTVERSION=	7.0.0.a.20190823
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	dch@FreeBSD.org
@@ -17,7 +18,7 @@ BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libeio.so:devel/libeio
 
-USES=		compiler:c++17-lang cmake mono python:build shebangfix ssl
+USES=		compiler:c++17-lang cmake mono:build python:build shebangfix ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	wolfspider
 GH_PROJECT=	foundationdb
diff --git a/databases/foundationdb/Makefile b/databases/foundationdb/Makefile
index 4c2f43f71fb..4770b052dbf 100644
--- a/databases/foundationdb/Makefile
+++ b/databases/foundationdb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	foundationdb
 PORTVERSION=	6.1.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases
 
 MAINTAINER=	dch@FreeBSD.org
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libeio.so:devel/libeio
 
-USES=		compiler:c++14-lang gmake mono python:build shebangfix
+USES=		compiler:c++14-lang gmake mono:build python:build shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	apple
 USE_RC_SUBR=	foundationdb
diff --git a/databases/ldb/Makefile b/databases/ldb/Makefile
deleted file mode 100644
index 955dc4c2983..00000000000
--- a/databases/ldb/Makefile
+++ /dev/null
@@ -1,174 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=		ldb
-PORTVERSION=		1.1.29
-PORTREVISION=		3
-PORTEPOCH=		0
-CATEGORIES=		databases
-MASTER_SITES=		SAMBA
-
-MAINTAINER=		timur@FreeBSD.org
-COMMENT=		LDAP-like embedded database
-
-LICENSE=		GPLv3
-
-DEPRECATED=	Old version, uses EOLed python27
-EXPIRATION_DATE=	2020-02-15
-
-IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
-
-BUILD_DEPENDS=		${LDB_DEPENDS}
-RUN_DEPENDS=		${LDB_DEPENDS}
-
-LDB_DEPENDS=		talloc1>=2.1.8:devel/talloc1 \
-			tevent1>=0.9.31:devel/tevent1 \
-			tdb1>=1.3.12,1:databases/tdb1 \
-			popt>=0:devel/popt
-
-CONFLICTS_INSTALL=	ldb1[2-6]-1.*
-
-#FLAVORS=		default nopython
-#nopython_PKGNAMESUFFIX=	-nopython
-#nopython_CONFLICTS=	ldb
-#default_CONFLICTS=	ldb-nopython
-
-USES=			compiler pkgconfig waf
-USE_LDCONFIG=		yes
-WAF_CMD=		buildtools/bin/waf
-CONFIGURE_LOG=		bin/config.log
-
-USE_OPENLDAP=		yes
-PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
-PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
-
-CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!tdb,!popt \
-			--with-modulesdir=${PREFIX}/lib/shared-modules \
-			--with-privatelibdir=${PREFIX}/lib/ldb
-
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
-			--with-openldap=${LOCALBASE} \
-			--disable-rpath \
-			--without-gettext
-
-OPTIONS_DEFINE=		MANPAGES
-MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
-
-.include <bsd.port.options.mk>
-
-LDB_BINS=		bin/ldbedit \
-			bin/ldbmodify \
-			bin/ldbadd \
-			bin/ldbdel \
-			bin/ldbsearch \
-			bin/ldbrename
-
-LDB_LIBS=		lib/libldb.so \
-			lib/libldb.so.1 \
-			lib/ldb/libldb-cmdline.so \
-			lib/shared-modules/ldb/asq.so \
-			lib/shared-modules/ldb/ldap.so \
-			lib/shared-modules/ldb/paged_results.so \
-			lib/shared-modules/ldb/paged_searches.so \
-			lib/shared-modules/ldb/rdn_name.so \
-			lib/shared-modules/ldb/sample.so \
-			lib/shared-modules/ldb/server_sort.so \
-			lib/shared-modules/ldb/skel.so \
-			lib/shared-modules/ldb/tdb.so
-
-PLIST_FILES=		include/ldb_version.h \
-			include/ldb_handlers.h \
-			include/ldb_errors.h \
-			include/ldb.h \
-			include/ldb_module.h \
-			${LDB_BINS} \
-			${LDB_LIBS} \
-			${PKGCONFIGDIR}/ldb.pc
-
-.if defined(NO_PYTHON)
-USES+=			python:2.7,build
-#CONFIGURE_ARGS+=	--disable-python
-.else
-USES+=			python:2.7
-
-PLIST_FILES+=		include/pyldb.h \
-			lib/libpyldb-util.so \
-			lib/libpyldb-util.so.1 \
-			${PYTHON_SITELIBDIR}/ldb.so \
-			${PYTHON_SITELIBDIR}/_ldb_text.py \
-			${PKGCONFIGDIR}/pyldb-util.pc
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ! ${PORT_OPTIONS:MMANPAGES}
-CONFIGURE_ENV+=		XSLTPROC="true"
-.else
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
-			xsltproc:textproc/libxslt
-.endif
-# No fancy color error messages
-.if ${COMPILER_TYPE} == "clang"
-CFLAGS+=		-fno-color-diagnostics
-.endif
-CONFIGURE_ENV+=		NOCOLOR=yes
-MAKE_ENV+=		NOCOLOR=yes
-
-LDB_MAN1=		man/man1/ldbadd.1.gz \
-			man/man1/ldbdel.1.gz \
-			man/man1/ldbedit.1.gz \
-			man/man1/ldbmodify.1.gz \
-			man/man1/ldbrename.1.gz \
-			man/man1/ldbsearch.1.gz
-
-LDB_MAN3=		man/man3/ldb.3.gz
-
-PLIST_FILES+=		${LDB_MAN1} ${LDB_MAN3}
-
-post-patch:
-			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
-				${BUILD_WRKSRC}/wscript
-
-# Use threading (or multiprocessing) but not thread (renamed in python 3+).
-pre-configure:
-			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
-				${ECHO_CMD}; \
-				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
-				${ECHO_CMD}; \
-				${FALSE}; \
-			fi
-
-pre-build-MANPAGES-off:
-			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
-.for man in ${LDB_MAN1} ${LDB_MAN3}
-			${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
-.endfor
-
-post-install:
-.for lib in ${LDB_BINS} ${LDB_LIBS}
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib}
-.endfor
-.if !defined(NO_PYTHON)
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so
-			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so
-.else
-.for f in		include/pyldb.h \
-			lib/libpyldb-util.so \
-			lib/libpyldb-util.so.1 \
-			lib/ldb/libpytalloc-util.so.2
-				${RM} ${STAGEDIR}${PREFIX}/${f}
-.endfor
-.for f in		${PYTHON_SITELIBDIR}/ldb.so \
-			${PYTHON_SITELIBDIR}/_ldb_text.py \
-			${PYTHON_SITELIBDIR}/_tdb_text.py \
-			${PYTHON_SITELIBDIR}/_tevent.so \
-			${PYTHON_SITELIBDIR}/talloc.so \
-			${PYTHON_SITELIBDIR}/tdb.so \
-			${PYTHON_SITELIBDIR}/tevent.py \
-			${PKGCONFIGDIR}/pyldb-util.pc
-				${RM} ${STAGEDIR}/${f}
-.endfor
-			${RMDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
-			${RMDIR} ${STAGEDIR}${PYTHON_LIBDIR}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/ldb/distinfo b/databases/ldb/distinfo
deleted file mode 100644
index 6dd5bc450d1..00000000000
--- a/databases/ldb/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1483326847
-SHA256 (ldb-1.1.29.tar.gz) = 59d84f9a5b799f519ba7b2685bb46f5a26f1bbf05b7a144b2f5e017d01d80f97
-SIZE (ldb-1.1.29.tar.gz) = 1277551
diff --git a/databases/ldb/files/ldb.3 b/databases/ldb/files/ldb.3
deleted file mode 100644
index 4dcdb734f67..00000000000
--- a/databases/ldb/files/ldb.3
+++ /dev/null
@@ -1,457 +0,0 @@
-'\" t
-.\"     Title: ldb
-.\"    Author: [see the "Author" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/02/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDB" "3" "01/02/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldb \- A light\-weight database library
-.SH "SYNOPSIS"
-.sp
-.nf
-#include <ldb\&.h>
-.fi
-.SH "DESCRIPTION"
-.PP
-ldb is a light weight embedded database library and API\&. With a programming interface that is very similar to LDAP, ldb can store its data either in a tdb(3) database or in a real LDAP database\&.
-.PP
-When used with the tdb backend ldb does not require any database daemon\&. Instead, ldb function calls are processed immediately by the ldb library, which does IO directly on the database, while allowing multiple readers/writers using operating system byte range locks\&. This leads to an API with very low overheads, often resulting in speeds of more than 10x what can be achieved with a more traditional LDAP architecture\&.
-.PP
-In a taxonomy of databases ldb would sit half way between key/value pair databases (such as berkley db or tdb) and a full LDAP database\&. With a structured attribute oriented API like LDAP and good indexing capabilities, ldb can be used for quite sophisticated applications that need a light weight database, without the administrative overhead of a full LDAP installation\&.
-.PP
-Included with ldb are a number of useful command line tools for manipulating a ldb database\&. These tools are similar in style to the equivalent ldap command line tools\&.
-.PP
-In its default mode of operation with a tdb backend, ldb can also be seen as a "schema\-less LDAP"\&. By default ldb does not require a schema, which greatly reduces the complexity of getting started with ldb databases\&. As the complexity of you application grows you can take advantage of some of the optional schema\-like attributes that ldb offers, or you can migrate to using the full LDAP api while keeping your exiting ldb code\&.
-.PP
-If you are new to ldb, then I suggest starting with the manual pages for ldbsearch(1) and ldbedit(1), and experimenting with a local database\&. Then I suggest you look at the ldb_connect(3) and ldb_search(3) manual pages\&.
-.SH "TOOLS"
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-ldbsearch(1)
-\- command line ldb search utility
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-ldbedit(1)
-\- edit all or part of a ldb database using your favourite editor
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-ldbadd(1)
-\- add records to a ldb database using LDIF formatted input
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-ldbdel(1)
-\- delete records from a ldb database
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-ldbmodify(1)
-\- modify records in a ldb database using LDIF formatted input
-.RE
-.SH "FUNCTIONS"
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_connect(3)\fR
-\- connect to a ldb backend
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_search(3)\fR
-\- perform a database search
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_add(3)\fR
-\- add a record to the database
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_delete(3)\fR
-\- delete a record from the database
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_modify(3)\fR
-\- modify a record in the database
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_errstring(3)\fR
-\- retrieve extended error information from the last operation
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_write(3)\fR
-\- write a LDIF formatted message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_write_file(3)\fR
-\- write a LDIF formatted message to a file
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_read(3)\fR
-\- read a LDIF formatted message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_read_free(3)\fR
-\- free the result of a ldb_ldif_read()
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_read_file(3)\fR
-\- read a LDIF message from a file
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_read_string(3)\fR
-\- read a LDIF message from a string
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_element(3)\fR
-\- find an element in a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_val_equal_exact(3)\fR
-\- compare two ldb_val structures
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_val(3)\fR
-\- find an element by value
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_add_empty(3)\fR
-\- add an empty message element to a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_add(3)\fR
-\- add a non\-empty message element to a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_element_compare(3)\fR
-\- compare two ldb_message_element structures
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_int(3)\fR
-\- return an integer value from a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_uint(3)\fR
-\- return an unsigned integer value from a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_double(3)\fR
-\- return a double value from a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_string(3)\fR
-\- return a string value from a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_set_alloc(3)\fR
-\- set the memory allocation function to be used by ldb
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_set_debug(3)\fR
-\- set a debug handler to be used by ldb
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_set_debug_stderr(3)\fR
-\- set a debug handler for stderr output
-.RE
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-ldb is released under the GNU Lesser General Public License version 2 or later\&. Please see the file COPYING for license details\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%http://samba.org/~tridge/
-.RE
diff --git a/databases/ldb/files/ldbadd.1 b/databases/ldb/files/ldbadd.1
deleted file mode 100644
index 4e8a2914878..00000000000
--- a/databases/ldb/files/ldbadd.1
+++ /dev/null
@@ -1,78 +0,0 @@
-'\" t
-.\"     Title: ldbadd
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/02/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBADD" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbadd \- Command\-line utility for adding records to an LDB
-.SH "SYNOPSIS"
-.HP \w'\fBldbadd\fR\ 'u
-\fBldbadd\fR [\-h] [\-H\ LDB\-URL] [ldif\-file1] [ldif\-file2] [\&.\&.\&.]
-.SH "DESCRIPTION"
-.PP
-ldbadd adds records to an ldb(3) database\&. It reads the ldif(5) files specified on the command line and adds the records from these files to the LDB database, which is specified by the \-H option or the LDB_URL environment variable\&.
-.PP
-If \- is specified as a ldb file, the ldif input is read from standard input\&.
-.SH "OPTIONS"
-.PP
-\-h
-.RS 4
-Show list of available options\&.
-.RE
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. See ldb(3) for details\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbmodify, ldbdel, ldif(5)
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%http://samba.org/~tridge/
-.RE
diff --git a/databases/ldb/files/ldbdel.1 b/databases/ldb/files/ldbdel.1
deleted file mode 100644
index 082b49d7261..00000000000
--- a/databases/ldb/files/ldbdel.1
+++ /dev/null
@@ -1,80 +0,0 @@
-'\" t
-.\"     Title: ldbdel
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/02/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBDEL" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbdel \- Command\-line program for deleting LDB records
-.SH "SYNOPSIS"
-.HP \w'\fBldbdel\fR\ 'u
-\fBldbdel\fR [\-h] [\-H\ LDB\-URL] [dn] [\&.\&.\&.]
-.SH "DESCRIPTION"
-.PP
-ldbdel deletes records from an ldb(3) database\&. It deletes the records identified by the dn\*(Aqs specified on the command\-line\&.
-.PP
-ldbdel uses either the database that is specified with the \-H option or the database specified by the LDB_URL environment variable\&.
-.SH "OPTIONS"
-.PP
-\-h
-.RS 4
-Show list of available options\&.
-.RE
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. See ldb(3) for details\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbmodify, ldbadd, ldif(5)
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-ldbdel was written by Andrew Tridgell\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%http://samba.org/~tridge/
-.RE
diff --git a/databases/ldb/files/ldbedit.1 b/databases/ldb/files/ldbedit.1
deleted file mode 100644
index af36f14dce5..00000000000
--- a/databases/ldb/files/ldbedit.1
+++ /dev/null
@@ -1,111 +0,0 @@
-'\" t
-.\"     Title: ldbedit
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/02/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBEDIT" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbedit \- Edit LDB databases using your preferred editor
-.SH "SYNOPSIS"
-.HP \w'\fBldbedit\fR\ 'u
-\fBldbedit\fR [\-?] [\-\-usage] [\-s\ base|one|sub] [\-b\ basedn] [\-a] [\-e\ editor] [\-H\ LDB\-URL] [expression] [attributes...]
-.SH "DESCRIPTION"
-.PP
-ldbedit is a utility that allows you to edit LDB entries (in tdb files, sqlite files or LDAP servers) using your preferred editor\&. ldbedit generates an LDIF file based on your query, allows you to edit the LDIF, and then merges that LDIF back into the LDB backend\&.
-.SH "OPTIONS"
-.PP
-\-?, \-\-help
-.RS 4
-Show list of available options, and a phrase describing what that option does\&.
-.RE
-.PP
-\-\-usage
-.RS 4
-Show list of available options\&. This is similar to the help option, however it does not provide any description, and is hence shorter\&.
-.RE
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. For a tdb database, this will be of the form tdb://\fIfilename\fR\&. For a LDAP connection over unix domain sockets, this will be of the form ldapi://\fIsocket\fR\&. For a (potentially remote) LDAP connection over TCP, this will be of the form ldap://\fIhostname\fR\&. For an SQLite database, this will be of the form sqlite://\fIfilename\fR\&.
-.RE
-.PP
-\-s one|sub|base
-.RS 4
-Search scope to use\&. One\-level, subtree or base\&.
-.RE
-.PP
-\-a, \-all
-.RS 4
-Edit all records\&. This allows you to apply the same change to a number of records at once\&. You probably want to combine this with an expression of the form "objectclass=*"\&.
-.RE
-.PP
-\-e editor, \-\-editor editor
-.RS 4
-Specify the editor that should be used (overrides the VISUAL and EDITOR environment variables)\&. If this option is not used, and neither VISUAL nor EDITOR environment variables are set, then the vi editor will be used\&.
-.RE
-.PP
-\-b basedn
-.RS 4
-Specify Base Distinguished Name to use\&.
-.RE
-.PP
-\-v, \-\-verbose
-.RS 4
-Make ldbedit more verbose about the operations that are being performed\&. Without this option, ldbedit will only provide a summary change line\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to\&. This can be overridden by using the \-H command\-line option\&.)
-.RE
-.PP
-VISUAL and EDITOR
-.RS 4
-Environment variables used to determine what editor to use\&. VISUAL takes precedence over EDITOR, and both are overridden by the \-e command\-line option\&.
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbmodify(1), ldbdel(1), ldif(5), vi(1)
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-This manpage was written by Jelmer Vernooij and updated by Brad Hards\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%http://samba.org/~tridge/
-.RE
diff --git a/databases/ldb/files/ldbmodify.1 b/databases/ldb/files/ldbmodify.1
deleted file mode 100644
index 7da4ca9c2c9..00000000000
--- a/databases/ldb/files/ldbmodify.1
+++ /dev/null
@@ -1,73 +0,0 @@
-'\" t
-.\"     Title: ldbmodify
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/02/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBMODIFY" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbmodify \- Modify records in a LDB database
-.SH "SYNOPSIS"
-.HP \w'\fBldbmodify\fR\ 'u
-\fBldbmodify\fR [\-H\ LDB\-URL] [ldif\-file]
-.SH "DESCRIPTION"
-.PP
-ldbmodify changes, adds and deletes records in a LDB database\&. The changes that should be made to the LDB database are read from the specified LDIF\-file\&. If \- is specified as the filename, input is read from stdin\&.
-.PP
-For now, see ldapmodify(1) for details on the LDIF file format\&.
-.SH "OPTIONS"
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. See ldb(3) for details\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbedit
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%http://samba.org/~tridge/
-.RE
diff --git a/databases/ldb/files/ldbrename.1 b/databases/ldb/files/ldbrename.1
deleted file mode 100644
index 7aa03095277..00000000000
--- a/databases/ldb/files/ldbrename.1
+++ /dev/null
@@ -1,81 +0,0 @@
-'\" t
-.\"     Title: ldbrename
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/02/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBRENAME" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbrename \- Edit LDB databases using your favorite editor
-.SH "SYNOPSIS"
-.HP \w'\fBldbrename\fR\ 'u
-\fBldbrename\fR [\-h] [\-o\ options] {olddn} {newdn}
-.SH "DESCRIPTION"
-.PP
-ldbrename is a utility that allows you to rename trees in an LDB database based by DN\&. This utility takes two arguments: the original DN name of the top element and the DN to change it to\&.
-.SH "OPTIONS"
-.PP
-\-h
-.RS 4
-Show list of available options\&.
-.RE
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. See ldb(3) for details\&.
-.RE
-.PP
-\-o options
-.RS 4
-Extra ldb options, such as modules\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbmodify, ldbdel, ldif(5)
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%http://samba.org/~tridge/
-.RE
diff --git a/databases/ldb/files/ldbsearch.1 b/databases/ldb/files/ldbsearch.1
deleted file mode 100644
index a13f6a44918..00000000000
--- a/databases/ldb/files/ldbsearch.1
+++ /dev/null
@@ -1,91 +0,0 @@
-'\" t
-.\"     Title: ldbsearch
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/02/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBSEARCH" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbsearch \- Search for records in a LDB database
-.SH "SYNOPSIS"
-.HP \w'\fBldbsearch\fR\ 'u
-\fBldbsearch\fR [\-h] [\-s\ base|one|sub] [\-b\ basedn] [\-i] [\-H\ LDB\-URL] [expression] [attributes]
-.SH "DESCRIPTION"
-.PP
-ldbsearch searches a LDB database for records matching the specified expression (see the ldapsearch(1) manpage for a description of the expression format)\&. For each record, the specified attributes are printed\&.
-.SH "OPTIONS"
-.PP
-\-h
-.RS 4
-Show list of available options\&.
-.RE
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. See ldb(3) for details\&.
-.RE
-.PP
-\-s one|sub|base
-.RS 4
-Search scope to use\&. One\-level, subtree or base\&.
-.RE
-.PP
-\-i
-.RS 4
-Read search expressions from stdin\&.
-.RE
-.PP
-\-b basedn
-.RS 4
-Specify Base DN to use\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbedit(1)
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%http://samba.org/~tridge/
-.RE
diff --git a/databases/ldb/files/patch-buildtools__wafsamba__samba_autoconf.py b/databases/ldb/files/patch-buildtools__wafsamba__samba_autoconf.py
deleted file mode 100644
index c92d308462b..00000000000
--- a/databases/ldb/files/patch-buildtools__wafsamba__samba_autoconf.py
+++ /dev/null
@@ -1,52 +0,0 @@
---- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
-+++ buildtools/wafsamba/samba_autoconf.py
-@@ -548,7 +548,7 @@ def library_flags(self, libs):
- 
- 
- @conf
--def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
-+def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
-     '''check if a set of libraries exist as system libraries
- 
-     returns the sublist of libs that do exist as a syslib or []
-@@ -568,11 +568,29 @@ int foo()
-             ret.append(lib)
-             continue
- 
-+        if msg is None:
-+            msg = 'Checking for library %s' % lib
-+
-         (ccflags, ldflags, cpppath) = library_flags(conf, lib)
-+
-         if shlib:
--            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(features='c cshlib',
-+                             fragment=fragment,
-+                             lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
-         else:
--            res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
- 
-         if not res:
-             if mandatory:
-@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
-         conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
- 
-     if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
--        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
-+        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS):
-             conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
- 
- @conf
diff --git a/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py b/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py
deleted file mode 100644
index 95f250a8621..00000000000
--- a/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- buildtools/wafsamba/samba_install.py.orig	2015-12-10 11:01:40 UTC
-+++ buildtools/wafsamba/samba_install.py
-@@ -118,7 +118,7 @@ def install_library(self):
-                 inst_name    = bld.make_libname(t.target)
-         elif self.vnum:
-             vnum_base    = self.vnum.split('.')[0]
--            install_name = bld.make_libname(target_name, version=self.vnum)
-+            install_name = bld.make_libname(target_name, version=vnum_base)
-             install_link = bld.make_libname(target_name, version=vnum_base)
-             inst_name    = bld.make_libname(t.target)
-             if not self.private_library:
diff --git a/databases/ldb/files/patch-buildtools__wafsamba__wscript b/databases/ldb/files/patch-buildtools__wafsamba__wscript
deleted file mode 100644
index 9327600e7bd..00000000000
--- a/databases/ldb/files/patch-buildtools__wafsamba__wscript
+++ /dev/null
@@ -1,22 +0,0 @@
---- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
-+++ buildtools/wafsamba/wscript
-@@ -74,12 +74,17 @@ def set_options(opt):
-                    help=("private library directory [PREFIX/lib/%s]" % Utils.g_module.APPNAME),
-                    action="store", dest='PRIVATELIBDIR', default=None)
- 
-+    opt.add_option('--with-openldap',
-+                   help='additional directory to search for OpenLDAP libs',
-+                   action='store', dest='ldap_open', default=None,
-+                   match = ['Checking for library lber', 'Checking for library ldap'])
-+
-     opt.add_option('--with-libiconv',
-                    help='additional directory to search for libiconv',
--                   action='store', dest='iconv_open', default='/usr/local',
-+                   action='store', dest='iconv_open', default=None,
-                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
-     opt.add_option('--without-gettext',
--                   help=("Disable use of gettext"),
-+                   help=("disable use of gettext"),
-                    action="store_true", dest='disable_gettext', default=False)
- 
-     gr = opt.option_group('developer options')
diff --git a/databases/ldb/files/patch-common__ldb_modules.c b/databases/ldb/files/patch-common__ldb_modules.c
deleted file mode 100644
index ed26d1c55c9..00000000000
--- a/databases/ldb/files/patch-common__ldb_modules.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/ldb_modules.c.orig	2018-02-14 01:18:43 UTC
-+++ common/ldb_modules.c
-@@ -1103,7 +1103,7 @@ static int ldb_modules_load_dir(const ch
- */
- void ldb_set_modules_dir(struct ldb_context *ldb, const char *path)
- {
--	int ret = ldb_modules_load_path(path, LDB_VERSION);
-+	int ret = ldb_modules_load_dir(path, LDB_VERSION);
- 	if (ret != LDB_SUCCESS) {
- 		ldb_asprintf_errstring(ldb, "Failed to load modules from: %s\n", path);
- 	}
diff --git a/databases/ldb/files/patch-third_party__waf__wafadmin__Tools__cc.py b/databases/ldb/files/patch-third_party__waf__wafadmin__Tools__cc.py
deleted file mode 100644
index 5695f3e0384..00000000000
--- a/databases/ldb/files/patch-third_party__waf__wafadmin__Tools__cc.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/waf/wafadmin/Tools/cc.py.orig	2015-11-06 13:25:52 UTC
-+++ third_party/waf/wafadmin/Tools/cc.py
-@@ -88,7 +88,7 @@ def c_hook(self, node):
- 		raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self))
- 	return task
- 
--cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
-+cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
- cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False)
- cls.scan = ccroot.scan
- cls.vars.append('CCDEPS')
diff --git a/databases/ldb/files/patch-wscript b/databases/ldb/files/patch-wscript
deleted file mode 100644
index ebae5e179c8..00000000000
--- a/databases/ldb/files/patch-wscript
+++ /dev/null
@@ -1,11 +0,0 @@
---- wscript.orig	2016-12-01 13:14:56 UTC
-+++ wscript
-@@ -118,7 +118,7 @@ def build(bld):
- 
-     if not 'PACKAGE_VERSION' in bld.env:
-         bld.env.PACKAGE_VERSION = VERSION
--        bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
-+        bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
- 
-     if not bld.env.disable_python:
-         if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'):
diff --git a/databases/ldb/pkg-descr b/databases/ldb/pkg-descr
deleted file mode 100644
index 92cd13b5db8..00000000000
--- a/databases/ldb/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-ldb is a LDAP-like embedded database.
-
-ldb provides a fast database with an LDAP-like API designed to be used
-within an application.
-
-In some ways it can be seen as a intermediate solution between key-value
-pair databases and a real LDAP database.
-
-WWW: https://ldb.samba.org/
diff --git a/databases/ldb12/Makefile b/databases/ldb12/Makefile
deleted file mode 100644
index 51a8bf058d5..00000000000
--- a/databases/ldb12/Makefile
+++ /dev/null
@@ -1,188 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=		ldb
-PORTVERSION=		1.2.3
-PORTREVISION=		3
-PORTEPOCH=		0
-CATEGORIES=		databases
-MASTER_SITES=		SAMBA
-PKGNAMESUFFIX=		12
-
-MAINTAINER=		timur@FreeBSD.org
-COMMENT=		LDAP-like embedded database
-
-LICENSE=		GPLv3
-
-DEPRECATED=	Old version, uses EOLed python27
-EXPIRATION_DATE=	2020-02-15
-
-IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
-
-BUILD_DEPENDS=		${LDB_DEPENDS}
-RUN_DEPENDS=		${LDB_DEPENDS}
-
-LDB_DEPENDS=		talloc1>=2.1.10:devel/talloc1 \
-			tevent1>=0.9.34:devel/tevent1 \
-			tdb1>=1.3.15:databases/tdb1 \
-			cmocka>=1.1.1:sysutils/cmocka \
-			popt>=0:devel/popt
-
-CONFLICTS_INSTALL=	ldb-1.1.* ldb1[3-6]-1.*
-
-#FLAVORS=		default nopython
-#nopython_PKGNAMESUFFIX=	-nopython
-#nopython_CONFLICTS=	ldb
-#default_CONFLICTS=	ldb-nopython
-
-USES=			compiler:c++11-lang pkgconfig waf
-USE_LDCONFIG=		yes
-WAF_CMD=		buildtools/bin/waf
-CONFIGURE_LOG=		bin/config.log
-
-USE_OPENLDAP=		yes
-PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
-PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
-
-CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!tdb,!popt,!cmocka \
-			--with-modulesdir=${PREFIX}/lib/shared-modules \
-			--with-privatelibdir=${PREFIX}/lib/ldb
-
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
-			--with-openldap=${LOCALBASE} \
-			--disable-rpath \
-			--without-gettext
-
-OPTIONS_DEFINE=		MANPAGES
-MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
-
-.include <bsd.port.options.mk>
-
-LDB_BINS=		bin/ldbedit \
-			bin/ldbmodify \
-			bin/ldbadd \
-			bin/ldbdel \
-			bin/ldbsearch \
-			bin/ldbrename
-
-LDB_LIBS=		lib/libldb.so \
-			lib/libldb.so.1 \
-			lib/ldb/libldb-cmdline.so \
-			lib/shared-modules/ldb/asq.so \
-			lib/shared-modules/ldb/ldap.so \
-			lib/shared-modules/ldb/paged_results.so \
-			lib/shared-modules/ldb/paged_searches.so \
-			lib/shared-modules/ldb/rdn_name.so \
-			lib/shared-modules/ldb/sample.so \
-			lib/shared-modules/ldb/server_sort.so \
-			lib/shared-modules/ldb/skel.so \
-			lib/shared-modules/ldb/tdb.so
-
-PLIST_FILES=		include/ldb_version.h \
-			include/ldb_handlers.h \
-			include/ldb_errors.h \
-			include/ldb.h \
-			include/ldb_module.h \
-			${LDB_BINS} \
-			${LDB_LIBS} \
-			${PKGCONFIGDIR}/ldb.pc
-
-.if defined(NO_PYTHON)
-USES+=			python:2.7,build
-CONFIGURE_ARGS+=	--disable-python
-.else
-USES+=			python:2.7
-
-PLIST_FILES+=		include/pyldb.h \
-			lib/libpyldb-util.so \
-			lib/libpyldb-util.so.1 \
-			${PYTHON_SITELIBDIR}/ldb.so \
-			${PYTHON_SITELIBDIR}/_ldb_text.py \
-			${PKGCONFIGDIR}/pyldb-util.pc
-# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
-# This is not officially supported, use at your own risk
-.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]}
-SAMBA4_PYTHON3_VERSION=	${WITH_SAMBA4_PYTHON3}
-SAMBA4_PYTHON3=		python${SAMBA4_PYTHON3_VERSION}
-SAMBA4_PYTHON3_VER=	${SAMBA4_PYTHON3_VERSION:C/\.//}
-.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
-.error			unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
-.endif
-BUILD_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
-RUN_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
-# cpython-36m
-SAMBA4_PYTHON3_SO_ABI!=	[ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
-SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
-
-CONFIGURE_ENV+=		PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
-CONFIGURE_ARGS+=	--extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
-
-PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
-			SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
-
-PLIST_FILES+=		lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so \
-			lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so.1 \
-			${SAMBA4_PYTHON3_SITELIBDIR}/ldb.${SAMBA4_PYTHON3_SO_ABI}.so \
-			${SAMBA4_PYTHON3_SITELIBDIR}/_ldb_text.py  \
-			${PKGCONFIGDIR}/pyldb-util.${SAMBA4_PYTHON3_SO_ABI}.pc
-.endif
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ! ${PORT_OPTIONS:MMANPAGES}
-CONFIGURE_ENV+=		XSLTPROC="true"
-.else
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
-			xsltproc:textproc/libxslt
-.endif
-# No fancy color error messages
-.if ${CHOSEN_COMPILER_TYPE} == clang
-CFLAGS+=		-fno-color-diagnostics
-.endif
-CONFIGURE_ENV+=		NOCOLOR=yes
-MAKE_ENV+=		NOCOLOR=yes
-
-LDB_MAN1=		man/man1/ldbadd.1.gz \
-			man/man1/ldbdel.1.gz \
-			man/man1/ldbedit.1.gz \
-			man/man1/ldbmodify.1.gz \
-			man/man1/ldbrename.1.gz \
-			man/man1/ldbsearch.1.gz
-
-LDB_MAN3=		man/man3/ldb.3.gz
-
-PLIST_FILES+=		${LDB_MAN1} ${LDB_MAN3}
-
-post-patch:
-			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
-				${BUILD_WRKSRC}/wscript
-
-# Use threading (or multiprocessing) but not thread (renamed in python 3+).
-pre-configure:
-			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
-				${ECHO_CMD}; \
-				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
-				${ECHO_CMD}; \
-				${FALSE}; \
-			fi
-
-pre-build-MANPAGES-off:
-			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
-.for man in ${LDB_MAN1} ${LDB_MAN3}
-			${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
-.endfor
-
-post-install:
-.for lib in ${LDB_BINS} ${LDB_LIBS}
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib}
-.endfor
-.if !defined(NO_PYTHON)
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so
-			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so
-.if defined(SAMBA4_PYTHON3)
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/ldb.${SAMBA4_PYTHON3_SO_ABI}.so
-.endif
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/ldb12/distinfo b/databases/ldb12/distinfo
deleted file mode 100644
index ce898f6c8ab..00000000000
--- a/databases/ldb12/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1514008393
-SHA256 (ldb-1.2.3.tar.gz) = dcbdcf24cebd52c8878af935e2474df7df67d16b2b6856a34baef3274d9f6d00
-SIZE (ldb-1.2.3.tar.gz) = 1344513
diff --git a/databases/ldb12/files/ldb.3 b/databases/ldb12/files/ldb.3
deleted file mode 100644
index aa70f3deedd..00000000000
--- a/databases/ldb12/files/ldb.3
+++ /dev/null
@@ -1,457 +0,0 @@
-'\" t
-.\"     Title: ldb
-.\"    Author: [see the "Author" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDB" "3" "11/05/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldb \- A light\-weight database library
-.SH "SYNOPSIS"
-.sp
-.nf
-#include <ldb\&.h>
-.fi
-.SH "DESCRIPTION"
-.PP
-ldb is a light weight embedded database library and API\&. With a programming interface that is very similar to LDAP, ldb can store its data either in a tdb(3) database or in a real LDAP database\&.
-.PP
-When used with the tdb backend ldb does not require any database daemon\&. Instead, ldb function calls are processed immediately by the ldb library, which does IO directly on the database, while allowing multiple readers/writers using operating system byte range locks\&. This leads to an API with very low overheads, often resulting in speeds of more than 10x what can be achieved with a more traditional LDAP architecture\&.
-.PP
-In a taxonomy of databases ldb would sit half way between key/value pair databases (such as berkley db or tdb) and a full LDAP database\&. With a structured attribute oriented API like LDAP and good indexing capabilities, ldb can be used for quite sophisticated applications that need a light weight database, without the administrative overhead of a full LDAP installation\&.
-.PP
-Included with ldb are a number of useful command line tools for manipulating a ldb database\&. These tools are similar in style to the equivalent ldap command line tools\&.
-.PP
-In its default mode of operation with a tdb backend, ldb can also be seen as a "schema\-less LDAP"\&. By default ldb does not require a schema, which greatly reduces the complexity of getting started with ldb databases\&. As the complexity of you application grows you can take advantage of some of the optional schema\-like attributes that ldb offers, or you can migrate to using the full LDAP api while keeping your exiting ldb code\&.
-.PP
-If you are new to ldb, then I suggest starting with the manual pages for ldbsearch(1) and ldbedit(1), and experimenting with a local database\&. Then I suggest you look at the ldb_connect(3) and ldb_search(3) manual pages\&.
-.SH "TOOLS"
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-ldbsearch(1)
-\- command line ldb search utility
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-ldbedit(1)
-\- edit all or part of a ldb database using your favourite editor
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-ldbadd(1)
-\- add records to a ldb database using LDIF formatted input
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-ldbdel(1)
-\- delete records from a ldb database
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-ldbmodify(1)
-\- modify records in a ldb database using LDIF formatted input
-.RE
-.SH "FUNCTIONS"
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_connect(3)\fR
-\- connect to a ldb backend
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_search(3)\fR
-\- perform a database search
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_add(3)\fR
-\- add a record to the database
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_delete(3)\fR
-\- delete a record from the database
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_modify(3)\fR
-\- modify a record in the database
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_errstring(3)\fR
-\- retrieve extended error information from the last operation
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_write(3)\fR
-\- write a LDIF formatted message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_write_file(3)\fR
-\- write a LDIF formatted message to a file
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_read(3)\fR
-\- read a LDIF formatted message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_read_free(3)\fR
-\- free the result of a ldb_ldif_read()
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_read_file(3)\fR
-\- read a LDIF message from a file
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_read_string(3)\fR
-\- read a LDIF message from a string
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_element(3)\fR
-\- find an element in a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_val_equal_exact(3)\fR
-\- compare two ldb_val structures
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_val(3)\fR
-\- find an element by value
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_add_empty(3)\fR
-\- add an empty message element to a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_add(3)\fR
-\- add a non\-empty message element to a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_element_compare(3)\fR
-\- compare two ldb_message_element structures
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_int(3)\fR
-\- return an integer value from a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_uint(3)\fR
-\- return an unsigned integer value from a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_double(3)\fR
-\- return a double value from a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_string(3)\fR
-\- return a string value from a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_set_alloc(3)\fR
-\- set the memory allocation function to be used by ldb
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_set_debug(3)\fR
-\- set a debug handler to be used by ldb
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_set_debug_stderr(3)\fR
-\- set a debug handler for stderr output
-.RE
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-ldb is released under the GNU Lesser General Public License version 2 or later\&. Please see the file COPYING for license details\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%https://www.samba.org/~tridge/
-.RE
diff --git a/databases/ldb12/files/ldbadd.1 b/databases/ldb12/files/ldbadd.1
deleted file mode 100644
index 4d491ee1fb6..00000000000
--- a/databases/ldb12/files/ldbadd.1
+++ /dev/null
@@ -1,78 +0,0 @@
-'\" t
-.\"     Title: ldbadd
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBADD" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbadd \- Command\-line utility for adding records to an LDB
-.SH "SYNOPSIS"
-.HP \w'\fBldbadd\fR\ 'u
-\fBldbadd\fR [\-h] [\-H\ LDB\-URL] [ldif\-file1] [ldif\-file2] [\&.\&.\&.]
-.SH "DESCRIPTION"
-.PP
-ldbadd adds records to an ldb(3) database\&. It reads the ldif(5) files specified on the command line and adds the records from these files to the LDB database, which is specified by the \-H option or the LDB_URL environment variable\&.
-.PP
-If \- is specified as a ldb file, the ldif input is read from standard input\&.
-.SH "OPTIONS"
-.PP
-\-h
-.RS 4
-Show list of available options\&.
-.RE
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. See ldb(3) for details\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbmodify, ldbdel, ldif(5)
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%https://www.samba.org/~tridge/
-.RE
diff --git a/databases/ldb12/files/ldbdel.1 b/databases/ldb12/files/ldbdel.1
deleted file mode 100644
index 26e867bb0b0..00000000000
--- a/databases/ldb12/files/ldbdel.1
+++ /dev/null
@@ -1,80 +0,0 @@
-'\" t
-.\"     Title: ldbdel
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBDEL" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbdel \- Command\-line program for deleting LDB records
-.SH "SYNOPSIS"
-.HP \w'\fBldbdel\fR\ 'u
-\fBldbdel\fR [\-h] [\-H\ LDB\-URL] [dn] [\&.\&.\&.]
-.SH "DESCRIPTION"
-.PP
-ldbdel deletes records from an ldb(3) database\&. It deletes the records identified by the dn\*(Aqs specified on the command\-line\&.
-.PP
-ldbdel uses either the database that is specified with the \-H option or the database specified by the LDB_URL environment variable\&.
-.SH "OPTIONS"
-.PP
-\-h
-.RS 4
-Show list of available options\&.
-.RE
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. See ldb(3) for details\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbmodify, ldbadd, ldif(5)
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-ldbdel was written by Andrew Tridgell\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%https://www.samba.org/~tridge/
-.RE
diff --git a/databases/ldb12/files/ldbedit.1 b/databases/ldb12/files/ldbedit.1
deleted file mode 100644
index d838d3695d2..00000000000
--- a/databases/ldb12/files/ldbedit.1
+++ /dev/null
@@ -1,111 +0,0 @@
-'\" t
-.\"     Title: ldbedit
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBEDIT" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbedit \- Edit LDB databases using your preferred editor
-.SH "SYNOPSIS"
-.HP \w'\fBldbedit\fR\ 'u
-\fBldbedit\fR [\-?] [\-\-usage] [\-s\ base|one|sub] [\-b\ basedn] [\-a] [\-e\ editor] [\-H\ LDB\-URL] [expression] [attributes...]
-.SH "DESCRIPTION"
-.PP
-ldbedit is a utility that allows you to edit LDB entries (in tdb files, sqlite files or LDAP servers) using your preferred editor\&. ldbedit generates an LDIF file based on your query, allows you to edit the LDIF, and then merges that LDIF back into the LDB backend\&.
-.SH "OPTIONS"
-.PP
-\-?, \-\-help
-.RS 4
-Show list of available options, and a phrase describing what that option does\&.
-.RE
-.PP
-\-\-usage
-.RS 4
-Show list of available options\&. This is similar to the help option, however it does not provide any description, and is hence shorter\&.
-.RE
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. For a tdb database, this will be of the form tdb://\fIfilename\fR\&. For a LDAP connection over unix domain sockets, this will be of the form ldapi://\fIsocket\fR\&. For a (potentially remote) LDAP connection over TCP, this will be of the form ldap://\fIhostname\fR\&. For an SQLite database, this will be of the form sqlite://\fIfilename\fR\&.
-.RE
-.PP
-\-s one|sub|base
-.RS 4
-Search scope to use\&. One\-level, subtree or base\&.
-.RE
-.PP
-\-a, \-all
-.RS 4
-Edit all records\&. This allows you to apply the same change to a number of records at once\&. You probably want to combine this with an expression of the form "objectclass=*"\&.
-.RE
-.PP
-\-e editor, \-\-editor editor
-.RS 4
-Specify the editor that should be used (overrides the VISUAL and EDITOR environment variables)\&. If this option is not used, and neither VISUAL nor EDITOR environment variables are set, then the vi editor will be used\&.
-.RE
-.PP
-\-b basedn
-.RS 4
-Specify Base Distinguished Name to use\&.
-.RE
-.PP
-\-v, \-\-verbose
-.RS 4
-Make ldbedit more verbose about the operations that are being performed\&. Without this option, ldbedit will only provide a summary change line\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to\&. This can be overridden by using the \-H command\-line option\&.)
-.RE
-.PP
-VISUAL and EDITOR
-.RS 4
-Environment variables used to determine what editor to use\&. VISUAL takes precedence over EDITOR, and both are overridden by the \-e command\-line option\&.
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbmodify(1), ldbdel(1), ldif(5), vi(1)
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-This manpage was written by Jelmer Vernooij and updated by Brad Hards\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%https://www.samba.org/~tridge/
-.RE
diff --git a/databases/ldb12/files/ldbmodify.1 b/databases/ldb12/files/ldbmodify.1
deleted file mode 100644
index e537a9b21f8..00000000000
--- a/databases/ldb12/files/ldbmodify.1
+++ /dev/null
@@ -1,73 +0,0 @@
-'\" t
-.\"     Title: ldbmodify
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBMODIFY" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbmodify \- Modify records in a LDB database
-.SH "SYNOPSIS"
-.HP \w'\fBldbmodify\fR\ 'u
-\fBldbmodify\fR [\-H\ LDB\-URL] [ldif\-file]
-.SH "DESCRIPTION"
-.PP
-ldbmodify changes, adds and deletes records in a LDB database\&. The changes that should be made to the LDB database are read from the specified LDIF\-file\&. If \- is specified as the filename, input is read from stdin\&.
-.PP
-For now, see ldapmodify(1) for details on the LDIF file format\&.
-.SH "OPTIONS"
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. See ldb(3) for details\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbedit
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%https://www.samba.org/~tridge/
-.RE
diff --git a/databases/ldb12/files/ldbrename.1 b/databases/ldb12/files/ldbrename.1
deleted file mode 100644
index c406bbf2bbe..00000000000
--- a/databases/ldb12/files/ldbrename.1
+++ /dev/null
@@ -1,81 +0,0 @@
-'\" t
-.\"     Title: ldbrename
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBRENAME" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbrename \- Edit LDB databases using your favorite editor
-.SH "SYNOPSIS"
-.HP \w'\fBldbrename\fR\ 'u
-\fBldbrename\fR [\-h] [\-o\ options] {olddn} {newdn}
-.SH "DESCRIPTION"
-.PP
-ldbrename is a utility that allows you to rename trees in an LDB database based by DN\&. This utility takes two arguments: the original DN name of the top element and the DN to change it to\&.
-.SH "OPTIONS"
-.PP
-\-h
-.RS 4
-Show list of available options\&.
-.RE
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. See ldb(3) for details\&.
-.RE
-.PP
-\-o options
-.RS 4
-Extra ldb options, such as modules\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbmodify, ldbdel, ldif(5)
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%https://www.samba.org/~tridge/
-.RE
diff --git a/databases/ldb12/files/ldbsearch.1 b/databases/ldb12/files/ldbsearch.1
deleted file mode 100644
index 7d91e7ae1a0..00000000000
--- a/databases/ldb12/files/ldbsearch.1
+++ /dev/null
@@ -1,91 +0,0 @@
-'\" t
-.\"     Title: ldbsearch
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBSEARCH" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbsearch \- Search for records in a LDB database
-.SH "SYNOPSIS"
-.HP \w'\fBldbsearch\fR\ 'u
-\fBldbsearch\fR [\-h] [\-s\ base|one|sub] [\-b\ basedn] [\-i] [\-H\ LDB\-URL] [expression] [attributes]
-.SH "DESCRIPTION"
-.PP
-ldbsearch searches a LDB database for records matching the specified expression (see the ldapsearch(1) manpage for a description of the expression format)\&. For each record, the specified attributes are printed\&.
-.SH "OPTIONS"
-.PP
-\-h
-.RS 4
-Show list of available options\&.
-.RE
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. See ldb(3) for details\&.
-.RE
-.PP
-\-s one|sub|base
-.RS 4
-Search scope to use\&. One\-level, subtree or base\&.
-.RE
-.PP
-\-i
-.RS 4
-Read search expressions from stdin\&.
-.RE
-.PP
-\-b basedn
-.RS 4
-Specify Base DN to use\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbedit(1)
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%https://www.samba.org/~tridge/
-.RE
diff --git a/databases/ldb12/files/patch-buildtools__wafsamba__samba_autoconf.py b/databases/ldb12/files/patch-buildtools__wafsamba__samba_autoconf.py
deleted file mode 100644
index c92d308462b..00000000000
--- a/databases/ldb12/files/patch-buildtools__wafsamba__samba_autoconf.py
+++ /dev/null
@@ -1,52 +0,0 @@
---- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
-+++ buildtools/wafsamba/samba_autoconf.py
-@@ -548,7 +548,7 @@ def library_flags(self, libs):
- 
- 
- @conf
--def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
-+def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
-     '''check if a set of libraries exist as system libraries
- 
-     returns the sublist of libs that do exist as a syslib or []
-@@ -568,11 +568,29 @@ int foo()
-             ret.append(lib)
-             continue
- 
-+        if msg is None:
-+            msg = 'Checking for library %s' % lib
-+
-         (ccflags, ldflags, cpppath) = library_flags(conf, lib)
-+
-         if shlib:
--            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(features='c cshlib',
-+                             fragment=fragment,
-+                             lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
-         else:
--            res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
- 
-         if not res:
-             if mandatory:
-@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
-         conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
- 
-     if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
--        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
-+        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS):
-             conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
- 
- @conf
diff --git a/databases/ldb12/files/patch-buildtools__wafsamba__samba_install.py b/databases/ldb12/files/patch-buildtools__wafsamba__samba_install.py
deleted file mode 100644
index 95f250a8621..00000000000
--- a/databases/ldb12/files/patch-buildtools__wafsamba__samba_install.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- buildtools/wafsamba/samba_install.py.orig	2015-12-10 11:01:40 UTC
-+++ buildtools/wafsamba/samba_install.py
-@@ -118,7 +118,7 @@ def install_library(self):
-                 inst_name    = bld.make_libname(t.target)
-         elif self.vnum:
-             vnum_base    = self.vnum.split('.')[0]
--            install_name = bld.make_libname(target_name, version=self.vnum)
-+            install_name = bld.make_libname(target_name, version=vnum_base)
-             install_link = bld.make_libname(target_name, version=vnum_base)
-             inst_name    = bld.make_libname(t.target)
-             if not self.private_library:
diff --git a/databases/ldb12/files/patch-buildtools__wafsamba__samba_python.py b/databases/ldb12/files/patch-buildtools__wafsamba__samba_python.py
deleted file mode 100644
index 429ec5e778f..00000000000
--- a/databases/ldb12/files/patch-buildtools__wafsamba__samba_python.py
+++ /dev/null
@@ -1,40 +0,0 @@
---- buildtools/wafsamba/samba_python.py.orig	2018-01-13 09:07:51 UTC
-+++ buildtools/wafsamba/samba_python.py
-@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
- 
- def _check_python_headers(conf, mandatory):
-     try:
-+        from python import _get_python_variables
-         Configure.ConfigurationError
-         conf.check_python_headers(mandatory=mandatory)
-+        conf.env['PYTHON_SO_ABI'] = _get_python_variables(
-+            conf.env['PYTHON'],
-+            ["get_config_var('SOABI') or ''"],
-+            ['from distutils.sysconfig import get_config_var']
-+        )[0]
-     except Configure.ConfigurationError:
-         if mandatory:
-              raise
- 
-     if conf.env['PYTHON_VERSION'] > '3':
--        abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
--        conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-+        '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG,
-+           while environment variable is PYTHON3_SO_ABI_FLAG'''
-+        override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
-+        if override_PYTHON_SO_ABI_FLAG is not None:
-+            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG
-+            conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
-+        if not conf.env['PYTHON_SO_ABI_FLAG']:
-+            if conf.env['PYTHON_SO_ABI']:
-+                conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI']
-+                conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
-+            else:
-+                abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
-+                conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-     else:
-         conf.env['PYTHON_SO_ABI_FLAG'] = ''
-+
-     conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = (
-         conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-'))
- 
diff --git a/databases/ldb12/files/patch-buildtools__wafsamba__wscript b/databases/ldb12/files/patch-buildtools__wafsamba__wscript
deleted file mode 100644
index 9327600e7bd..00000000000
--- a/databases/ldb12/files/patch-buildtools__wafsamba__wscript
+++ /dev/null
@@ -1,22 +0,0 @@
---- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
-+++ buildtools/wafsamba/wscript
-@@ -74,12 +74,17 @@ def set_options(opt):
-                    help=("private library directory [PREFIX/lib/%s]" % Utils.g_module.APPNAME),
-                    action="store", dest='PRIVATELIBDIR', default=None)
- 
-+    opt.add_option('--with-openldap',
-+                   help='additional directory to search for OpenLDAP libs',
-+                   action='store', dest='ldap_open', default=None,
-+                   match = ['Checking for library lber', 'Checking for library ldap'])
-+
-     opt.add_option('--with-libiconv',
-                    help='additional directory to search for libiconv',
--                   action='store', dest='iconv_open', default='/usr/local',
-+                   action='store', dest='iconv_open', default=None,
-                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
-     opt.add_option('--without-gettext',
--                   help=("Disable use of gettext"),
-+                   help=("disable use of gettext"),
-                    action="store_true", dest='disable_gettext', default=False)
- 
-     gr = opt.option_group('developer options')
diff --git a/databases/ldb12/files/patch-common__ldb_modules.c b/databases/ldb12/files/patch-common__ldb_modules.c
deleted file mode 100644
index ed26d1c55c9..00000000000
--- a/databases/ldb12/files/patch-common__ldb_modules.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/ldb_modules.c.orig	2018-02-14 01:18:43 UTC
-+++ common/ldb_modules.c
-@@ -1103,7 +1103,7 @@ static int ldb_modules_load_dir(const ch
- */
- void ldb_set_modules_dir(struct ldb_context *ldb, const char *path)
- {
--	int ret = ldb_modules_load_path(path, LDB_VERSION);
-+	int ret = ldb_modules_load_dir(path, LDB_VERSION);
- 	if (ret != LDB_SUCCESS) {
- 		ldb_asprintf_errstring(ldb, "Failed to load modules from: %s\n", path);
- 	}
diff --git a/databases/ldb12/files/patch-lib__replace__wscript b/databases/ldb12/files/patch-lib__replace__wscript
deleted file mode 100644
index d6d32b6c3dc..00000000000
--- a/databases/ldb12/files/patch-lib__replace__wscript
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/replace/wscript.orig	2017-08-24 11:27:53 UTC
-+++ lib/replace/wscript
-@@ -81,7 +81,7 @@ def configure(conf):
-     conf.CHECK_HEADERS('sys/atomic.h')
-     conf.CHECK_HEADERS('libgen.h')
- 
--    if conf.CHECK_CFLAGS('-Wno-format-truncation'):
-+    if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS):
-         conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
- 
-     # Check for process set name support
diff --git a/databases/ldb12/files/patch-third_party__waf__wafadmin__Tools__cc.py b/databases/ldb12/files/patch-third_party__waf__wafadmin__Tools__cc.py
deleted file mode 100644
index 5695f3e0384..00000000000
--- a/databases/ldb12/files/patch-third_party__waf__wafadmin__Tools__cc.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/waf/wafadmin/Tools/cc.py.orig	2015-11-06 13:25:52 UTC
-+++ third_party/waf/wafadmin/Tools/cc.py
-@@ -88,7 +88,7 @@ def c_hook(self, node):
- 		raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self))
- 	return task
- 
--cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
-+cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
- cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False)
- cls.scan = ccroot.scan
- cls.vars.append('CCDEPS')
diff --git a/databases/ldb12/files/patch-wscript b/databases/ldb12/files/patch-wscript
deleted file mode 100644
index 1617ed56fa4..00000000000
--- a/databases/ldb12/files/patch-wscript
+++ /dev/null
@@ -1,32 +0,0 @@
---- wscript.orig	2017-09-07 10:04:11 UTC
-+++ wscript
-@@ -126,9 +126,15 @@ def build(bld):
-     bld.RECURSE('lib/tdb')
- 
-     if bld.env.standalone_ldb:
-+        if not 'PACKAGE_VERSION' in bld.env:
-+            bld.env.PACKAGE_VERSION = VERSION
-+        bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
-         private_library = False
-     else:
-         private_library = True
-+    # we're not currently linking against the ldap libs, but ldb.pc.in
-+    # has @LDAP_LIBS@
-+    bld.env.LDAP_LIBS = ''
- 
-     LDB_MAP_SRC = bld.SUBDIR('ldb_map',
-                              'ldb_map.c ldb_map_inbound.c ldb_map_outbound.c')
-@@ -149,13 +155,6 @@ def build(bld):
-     if bld.PYTHON_BUILD_IS_ENABLED():
-         if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'):
-             for env in bld.gen_python_environments(['PKGCONFIGDIR']):
--                # we're not currently linking against the ldap libs, but ldb.pc.in
--                # has @LDAP_LIBS@
--                bld.env.LDAP_LIBS = ''
--
--                if not 'PACKAGE_VERSION' in bld.env:
--                    bld.env.PACKAGE_VERSION = VERSION
--                    bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
- 
-                 name = bld.pyembed_libname('pyldb-util')
-                 bld.SAMBA_LIBRARY(name,
diff --git a/databases/ldb12/pkg-descr b/databases/ldb12/pkg-descr
deleted file mode 100644
index 92cd13b5db8..00000000000
--- a/databases/ldb12/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-ldb is a LDAP-like embedded database.
-
-ldb provides a fast database with an LDAP-like API designed to be used
-within an application.
-
-In some ways it can be seen as a intermediate solution between key-value
-pair databases and a real LDAP database.
-
-WWW: https://ldb.samba.org/
diff --git a/databases/ldb13/Makefile b/databases/ldb13/Makefile
deleted file mode 100644
index 7cb4608a114..00000000000
--- a/databases/ldb13/Makefile
+++ /dev/null
@@ -1,191 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=		ldb
-PORTVERSION=		1.3.8
-PORTREVISION=		1
-PORTEPOCH=		0
-CATEGORIES=		databases
-MASTER_SITES=		SAMBA
-PKGNAMESUFFIX=		13
-
-MAINTAINER=		timur@FreeBSD.org
-COMMENT=		LDAP-like embedded database
-
-LICENSE=		GPLv3
-
-DEPRECATED=	Old version, uses EOLed python27
-EXPIRATION_DATE=	2020-02-15
-
-IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
-
-BUILD_DEPENDS=		${LDB_DEPENDS}
-RUN_DEPENDS=		${LDB_DEPENDS}
-
-LDB_DEPENDS=		talloc1>=2.1.14:devel/talloc1 \
-			tevent1>=0.9.37:devel/tevent1 \
-			tdb1>=1.3.16:databases/tdb1 \
-			cmocka>=1.1.1:sysutils/cmocka \
-			popt>=0:devel/popt
-
-CONFLICTS_INSTALL=	ldb-1.1.* ldb1[24-6]-1.*
-
-#FLAVORS=		default nopython
-#nopython_PKGNAMESUFFIX=	-nopython
-#nopython_CONFLICTS=	ldb
-#default_CONFLICTS=	ldb-nopython
-
-USES=			compiler pkgconfig waf
-USE_LDCONFIG=		yes
-WAF_CMD=		buildtools/bin/waf
-CONFIGURE_LOG=		bin/config.log
-
-USE_OPENLDAP=		yes
-PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
-PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
-
-CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!tdb,!popt,!cmocka \
-			--with-modulesdir=${PREFIX}/lib/shared-modules \
-			--with-privatelibdir=${PREFIX}/lib/ldb \
-			--mandir=${MANPREFIX}/man \
-			--with-openldap=${LOCALBASE} \
-			--disable-rpath \
-			--without-gettext
-
-OPTIONS_DEFINE=		MANPAGES DEBUG
-MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
-
-DEBUG_CONFIGURE_ON=	--verbose --enable-debug
-DEBUG_MAKE_ARGS=	--verbose
-DEBUG_FLAGS=		-g -ggdb3 -O0
-
-.include <bsd.port.options.mk>
-
-LDB_BINS=		bin/ldbedit \
-			bin/ldbmodify \
-			bin/ldbadd \
-			bin/ldbdel \
-			bin/ldbsearch \
-			bin/ldbrename
-
-LDB_LIBS=		lib/libldb.so \
-			lib/libldb.so.1 \
-			lib/ldb/libldb-cmdline.so \
-			lib/shared-modules/ldb/asq.so \
-			lib/shared-modules/ldb/ldap.so \
-			lib/shared-modules/ldb/paged_results.so \
-			lib/shared-modules/ldb/paged_searches.so \
-			lib/shared-modules/ldb/rdn_name.so \
-			lib/shared-modules/ldb/sample.so \
-			lib/shared-modules/ldb/server_sort.so \
-			lib/shared-modules/ldb/skel.so \
-			lib/shared-modules/ldb/tdb.so
-
-PLIST_FILES=		include/ldb_version.h \
-			include/ldb_handlers.h \
-			include/ldb_errors.h \
-			include/ldb.h \
-			include/ldb_module.h \
-			${LDB_BINS} \
-			${LDB_LIBS} \
-			${PKGCONFIGDIR}/ldb.pc
-
-.if defined(NO_PYTHON)
-USES+=			python:2.7,build
-CONFIGURE_ARGS+=	--disable-python
-.else
-USES+=			python:2.7
-
-PLIST_FILES+=		include/pyldb.h \
-			lib/libpyldb-util.so \
-			lib/libpyldb-util.so.1 \
-			${PYTHON_SITELIBDIR}/ldb.so \
-			${PYTHON_SITELIBDIR}/_ldb_text.py \
-			${PKGCONFIGDIR}/pyldb-util.pc
-# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
-# This is not officially supported, use at your own risk
-.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]}
-SAMBA4_PYTHON3_VERSION=	${WITH_SAMBA4_PYTHON3}
-SAMBA4_PYTHON3=		python${SAMBA4_PYTHON3_VERSION}
-SAMBA4_PYTHON3_VER=	${SAMBA4_PYTHON3_VERSION:C/\.//}
-.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
-.error			unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
-.endif
-BUILD_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
-RUN_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
-# cpython-36m
-SAMBA4_PYTHON3_SO_ABI!=	[ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
-SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
-
-CONFIGURE_ENV+=		PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
-CONFIGURE_ARGS+=	--extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
-
-PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
-			SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
-
-PLIST_FILES+=		lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so \
-			lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so.1 \
-			${SAMBA4_PYTHON3_SITELIBDIR}/ldb.${SAMBA4_PYTHON3_SO_ABI}.so \
-			${SAMBA4_PYTHON3_SITELIBDIR}/_ldb_text.py  \
-			${PKGCONFIGDIR}/pyldb-util.${SAMBA4_PYTHON3_SO_ABI}.pc
-.endif
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ! ${PORT_OPTIONS:MMANPAGES}
-CONFIGURE_ENV+=		XSLTPROC="true"
-.else
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
-			xsltproc:textproc/libxslt
-.endif
-# No fancy color error messages
-.if ${COMPILER_TYPE} == "clang"
-CFLAGS+=		-fno-color-diagnostics
-.endif
-CONFIGURE_ENV+=		NOCOLOR=yes
-MAKE_ENV+=		NOCOLOR=yes
-
-LDB_MAN1=		man/man1/ldbadd.1.gz \
-			man/man1/ldbdel.1.gz \
-			man/man1/ldbedit.1.gz \
-			man/man1/ldbmodify.1.gz \
-			man/man1/ldbrename.1.gz \
-			man/man1/ldbsearch.1.gz
-
-LDB_MAN3=		man/man3/ldb.3.gz
-
-PLIST_FILES+=		${LDB_MAN1} ${LDB_MAN3}
-
-post-patch:
-			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
-				${BUILD_WRKSRC}/wscript
-
-# Use threading (or multiprocessing) but not thread (renamed in python 3+).
-pre-configure:
-			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
-				${ECHO_CMD}; \
-				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
-				${ECHO_CMD}; \
-				${FALSE}; \
-			fi
-
-pre-build-MANPAGES-off:
-			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
-.for man in ${LDB_MAN1} ${LDB_MAN3}
-			${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
-.endfor
-
-post-install:
-.for lib in ${LDB_BINS} ${LDB_LIBS}
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib}
-.endfor
-.if !defined(NO_PYTHON)
-		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so
-		${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so
-.	if defined(SAMBA4_PYTHON3)
-		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so
-		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/ldb.${SAMBA4_PYTHON3_SO_ABI}.so
-.	endif
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/ldb13/distinfo b/databases/ldb13/distinfo
deleted file mode 100644
index 2045eef94d8..00000000000
--- a/databases/ldb13/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1557920439
-SHA256 (ldb-1.3.8.tar.gz) = 4d047c687ddc266d0d5a2c16629aa1a6fa6c3114499c9cc80914e3cda16ddca0
-SIZE (ldb-1.3.8.tar.gz) = 1375782
diff --git a/databases/ldb13/files/ldb.3 b/databases/ldb13/files/ldb.3
deleted file mode 100644
index aa70f3deedd..00000000000
--- a/databases/ldb13/files/ldb.3
+++ /dev/null
@@ -1,457 +0,0 @@
-'\" t
-.\"     Title: ldb
-.\"    Author: [see the "Author" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDB" "3" "11/05/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldb \- A light\-weight database library
-.SH "SYNOPSIS"
-.sp
-.nf
-#include <ldb\&.h>
-.fi
-.SH "DESCRIPTION"
-.PP
-ldb is a light weight embedded database library and API\&. With a programming interface that is very similar to LDAP, ldb can store its data either in a tdb(3) database or in a real LDAP database\&.
-.PP
-When used with the tdb backend ldb does not require any database daemon\&. Instead, ldb function calls are processed immediately by the ldb library, which does IO directly on the database, while allowing multiple readers/writers using operating system byte range locks\&. This leads to an API with very low overheads, often resulting in speeds of more than 10x what can be achieved with a more traditional LDAP architecture\&.
-.PP
-In a taxonomy of databases ldb would sit half way between key/value pair databases (such as berkley db or tdb) and a full LDAP database\&. With a structured attribute oriented API like LDAP and good indexing capabilities, ldb can be used for quite sophisticated applications that need a light weight database, without the administrative overhead of a full LDAP installation\&.
-.PP
-Included with ldb are a number of useful command line tools for manipulating a ldb database\&. These tools are similar in style to the equivalent ldap command line tools\&.
-.PP
-In its default mode of operation with a tdb backend, ldb can also be seen as a "schema\-less LDAP"\&. By default ldb does not require a schema, which greatly reduces the complexity of getting started with ldb databases\&. As the complexity of you application grows you can take advantage of some of the optional schema\-like attributes that ldb offers, or you can migrate to using the full LDAP api while keeping your exiting ldb code\&.
-.PP
-If you are new to ldb, then I suggest starting with the manual pages for ldbsearch(1) and ldbedit(1), and experimenting with a local database\&. Then I suggest you look at the ldb_connect(3) and ldb_search(3) manual pages\&.
-.SH "TOOLS"
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-ldbsearch(1)
-\- command line ldb search utility
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-ldbedit(1)
-\- edit all or part of a ldb database using your favourite editor
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-ldbadd(1)
-\- add records to a ldb database using LDIF formatted input
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-ldbdel(1)
-\- delete records from a ldb database
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-ldbmodify(1)
-\- modify records in a ldb database using LDIF formatted input
-.RE
-.SH "FUNCTIONS"
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_connect(3)\fR
-\- connect to a ldb backend
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_search(3)\fR
-\- perform a database search
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_add(3)\fR
-\- add a record to the database
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_delete(3)\fR
-\- delete a record from the database
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_modify(3)\fR
-\- modify a record in the database
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_errstring(3)\fR
-\- retrieve extended error information from the last operation
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_write(3)\fR
-\- write a LDIF formatted message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_write_file(3)\fR
-\- write a LDIF formatted message to a file
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_read(3)\fR
-\- read a LDIF formatted message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_read_free(3)\fR
-\- free the result of a ldb_ldif_read()
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_read_file(3)\fR
-\- read a LDIF message from a file
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_ldif_read_string(3)\fR
-\- read a LDIF message from a string
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_element(3)\fR
-\- find an element in a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_val_equal_exact(3)\fR
-\- compare two ldb_val structures
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_val(3)\fR
-\- find an element by value
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_add_empty(3)\fR
-\- add an empty message element to a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_add(3)\fR
-\- add a non\-empty message element to a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_element_compare(3)\fR
-\- compare two ldb_message_element structures
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_int(3)\fR
-\- return an integer value from a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_uint(3)\fR
-\- return an unsigned integer value from a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_double(3)\fR
-\- return a double value from a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_msg_find_string(3)\fR
-\- return a string value from a ldb_message
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_set_alloc(3)\fR
-\- set the memory allocation function to be used by ldb
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_set_debug(3)\fR
-\- set a debug handler to be used by ldb
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBldb_set_debug_stderr(3)\fR
-\- set a debug handler for stderr output
-.RE
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-ldb is released under the GNU Lesser General Public License version 2 or later\&. Please see the file COPYING for license details\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%https://www.samba.org/~tridge/
-.RE
diff --git a/databases/ldb13/files/ldbadd.1 b/databases/ldb13/files/ldbadd.1
deleted file mode 100644
index 4d491ee1fb6..00000000000
--- a/databases/ldb13/files/ldbadd.1
+++ /dev/null
@@ -1,78 +0,0 @@
-'\" t
-.\"     Title: ldbadd
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBADD" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbadd \- Command\-line utility for adding records to an LDB
-.SH "SYNOPSIS"
-.HP \w'\fBldbadd\fR\ 'u
-\fBldbadd\fR [\-h] [\-H\ LDB\-URL] [ldif\-file1] [ldif\-file2] [\&.\&.\&.]
-.SH "DESCRIPTION"
-.PP
-ldbadd adds records to an ldb(3) database\&. It reads the ldif(5) files specified on the command line and adds the records from these files to the LDB database, which is specified by the \-H option or the LDB_URL environment variable\&.
-.PP
-If \- is specified as a ldb file, the ldif input is read from standard input\&.
-.SH "OPTIONS"
-.PP
-\-h
-.RS 4
-Show list of available options\&.
-.RE
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. See ldb(3) for details\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbmodify, ldbdel, ldif(5)
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%https://www.samba.org/~tridge/
-.RE
diff --git a/databases/ldb13/files/ldbdel.1 b/databases/ldb13/files/ldbdel.1
deleted file mode 100644
index 26e867bb0b0..00000000000
--- a/databases/ldb13/files/ldbdel.1
+++ /dev/null
@@ -1,80 +0,0 @@
-'\" t
-.\"     Title: ldbdel
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBDEL" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbdel \- Command\-line program for deleting LDB records
-.SH "SYNOPSIS"
-.HP \w'\fBldbdel\fR\ 'u
-\fBldbdel\fR [\-h] [\-H\ LDB\-URL] [dn] [\&.\&.\&.]
-.SH "DESCRIPTION"
-.PP
-ldbdel deletes records from an ldb(3) database\&. It deletes the records identified by the dn\*(Aqs specified on the command\-line\&.
-.PP
-ldbdel uses either the database that is specified with the \-H option or the database specified by the LDB_URL environment variable\&.
-.SH "OPTIONS"
-.PP
-\-h
-.RS 4
-Show list of available options\&.
-.RE
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. See ldb(3) for details\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbmodify, ldbadd, ldif(5)
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-ldbdel was written by Andrew Tridgell\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%https://www.samba.org/~tridge/
-.RE
diff --git a/databases/ldb13/files/ldbedit.1 b/databases/ldb13/files/ldbedit.1
deleted file mode 100644
index d838d3695d2..00000000000
--- a/databases/ldb13/files/ldbedit.1
+++ /dev/null
@@ -1,111 +0,0 @@
-'\" t
-.\"     Title: ldbedit
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBEDIT" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbedit \- Edit LDB databases using your preferred editor
-.SH "SYNOPSIS"
-.HP \w'\fBldbedit\fR\ 'u
-\fBldbedit\fR [\-?] [\-\-usage] [\-s\ base|one|sub] [\-b\ basedn] [\-a] [\-e\ editor] [\-H\ LDB\-URL] [expression] [attributes...]
-.SH "DESCRIPTION"
-.PP
-ldbedit is a utility that allows you to edit LDB entries (in tdb files, sqlite files or LDAP servers) using your preferred editor\&. ldbedit generates an LDIF file based on your query, allows you to edit the LDIF, and then merges that LDIF back into the LDB backend\&.
-.SH "OPTIONS"
-.PP
-\-?, \-\-help
-.RS 4
-Show list of available options, and a phrase describing what that option does\&.
-.RE
-.PP
-\-\-usage
-.RS 4
-Show list of available options\&. This is similar to the help option, however it does not provide any description, and is hence shorter\&.
-.RE
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. For a tdb database, this will be of the form tdb://\fIfilename\fR\&. For a LDAP connection over unix domain sockets, this will be of the form ldapi://\fIsocket\fR\&. For a (potentially remote) LDAP connection over TCP, this will be of the form ldap://\fIhostname\fR\&. For an SQLite database, this will be of the form sqlite://\fIfilename\fR\&.
-.RE
-.PP
-\-s one|sub|base
-.RS 4
-Search scope to use\&. One\-level, subtree or base\&.
-.RE
-.PP
-\-a, \-all
-.RS 4
-Edit all records\&. This allows you to apply the same change to a number of records at once\&. You probably want to combine this with an expression of the form "objectclass=*"\&.
-.RE
-.PP
-\-e editor, \-\-editor editor
-.RS 4
-Specify the editor that should be used (overrides the VISUAL and EDITOR environment variables)\&. If this option is not used, and neither VISUAL nor EDITOR environment variables are set, then the vi editor will be used\&.
-.RE
-.PP
-\-b basedn
-.RS 4
-Specify Base Distinguished Name to use\&.
-.RE
-.PP
-\-v, \-\-verbose
-.RS 4
-Make ldbedit more verbose about the operations that are being performed\&. Without this option, ldbedit will only provide a summary change line\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to\&. This can be overridden by using the \-H command\-line option\&.)
-.RE
-.PP
-VISUAL and EDITOR
-.RS 4
-Environment variables used to determine what editor to use\&. VISUAL takes precedence over EDITOR, and both are overridden by the \-e command\-line option\&.
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbmodify(1), ldbdel(1), ldif(5), vi(1)
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-This manpage was written by Jelmer Vernooij and updated by Brad Hards\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%https://www.samba.org/~tridge/
-.RE
diff --git a/databases/ldb13/files/ldbmodify.1 b/databases/ldb13/files/ldbmodify.1
deleted file mode 100644
index e537a9b21f8..00000000000
--- a/databases/ldb13/files/ldbmodify.1
+++ /dev/null
@@ -1,73 +0,0 @@
-'\" t
-.\"     Title: ldbmodify
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBMODIFY" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbmodify \- Modify records in a LDB database
-.SH "SYNOPSIS"
-.HP \w'\fBldbmodify\fR\ 'u
-\fBldbmodify\fR [\-H\ LDB\-URL] [ldif\-file]
-.SH "DESCRIPTION"
-.PP
-ldbmodify changes, adds and deletes records in a LDB database\&. The changes that should be made to the LDB database are read from the specified LDIF\-file\&. If \- is specified as the filename, input is read from stdin\&.
-.PP
-For now, see ldapmodify(1) for details on the LDIF file format\&.
-.SH "OPTIONS"
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. See ldb(3) for details\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbedit
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%https://www.samba.org/~tridge/
-.RE
diff --git a/databases/ldb13/files/ldbrename.1 b/databases/ldb13/files/ldbrename.1
deleted file mode 100644
index c406bbf2bbe..00000000000
--- a/databases/ldb13/files/ldbrename.1
+++ /dev/null
@@ -1,81 +0,0 @@
-'\" t
-.\"     Title: ldbrename
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBRENAME" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbrename \- Edit LDB databases using your favorite editor
-.SH "SYNOPSIS"
-.HP \w'\fBldbrename\fR\ 'u
-\fBldbrename\fR [\-h] [\-o\ options] {olddn} {newdn}
-.SH "DESCRIPTION"
-.PP
-ldbrename is a utility that allows you to rename trees in an LDB database based by DN\&. This utility takes two arguments: the original DN name of the top element and the DN to change it to\&.
-.SH "OPTIONS"
-.PP
-\-h
-.RS 4
-Show list of available options\&.
-.RE
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. See ldb(3) for details\&.
-.RE
-.PP
-\-o options
-.RS 4
-Extra ldb options, such as modules\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbmodify, ldbdel, ldif(5)
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%https://www.samba.org/~tridge/
-.RE
diff --git a/databases/ldb13/files/ldbsearch.1 b/databases/ldb13/files/ldbsearch.1
deleted file mode 100644
index 7d91e7ae1a0..00000000000
--- a/databases/ldb13/files/ldbsearch.1
+++ /dev/null
@@ -1,91 +0,0 @@
-'\" t
-.\"     Title: ldbsearch
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2017
-.\"    Manual: System Administration tools
-.\"    Source: LDB 1.1
-.\"  Language: English
-.\"
-.TH "LDBSEARCH" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-ldbsearch \- Search for records in a LDB database
-.SH "SYNOPSIS"
-.HP \w'\fBldbsearch\fR\ 'u
-\fBldbsearch\fR [\-h] [\-s\ base|one|sub] [\-b\ basedn] [\-i] [\-H\ LDB\-URL] [expression] [attributes]
-.SH "DESCRIPTION"
-.PP
-ldbsearch searches a LDB database for records matching the specified expression (see the ldapsearch(1) manpage for a description of the expression format)\&. For each record, the specified attributes are printed\&.
-.SH "OPTIONS"
-.PP
-\-h
-.RS 4
-Show list of available options\&.
-.RE
-.PP
-\-H <ldb\-url>
-.RS 4
-LDB URL to connect to\&. See ldb(3) for details\&.
-.RE
-.PP
-\-s one|sub|base
-.RS 4
-Search scope to use\&. One\-level, subtree or base\&.
-.RE
-.PP
-\-i
-.RS 4
-Read search expressions from stdin\&.
-.RE
-.PP
-\-b basedn
-.RS 4
-Specify Base DN to use\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-LDB_URL
-.RS 4
-LDB URL to connect to (can be overrided by using the \-H command\-line option\&.)
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 1\&.1 of LDB\&.
-.SH "SEE ALSO"
-.PP
-ldb(3), ldbedit(1)
-.SH "AUTHOR"
-.PP
-ldb was written by
-\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If you wish to report a problem or make a suggestion then please see the
-\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
-web site for current contact and maintainer information\&.
-.PP
-This manpage was written by Jelmer Vernooij\&.
-.SH "NOTES"
-.IP " 1." 4
-Andrew Tridgell
-.RS 4
-\%https://www.samba.org/~tridge/
-.RE
diff --git a/databases/ldb13/files/patch-buildtools__wafsamba__samba_autoconf.py b/databases/ldb13/files/patch-buildtools__wafsamba__samba_autoconf.py
deleted file mode 100644
index c92d308462b..00000000000
--- a/databases/ldb13/files/patch-buildtools__wafsamba__samba_autoconf.py
+++ /dev/null
@@ -1,52 +0,0 @@
---- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
-+++ buildtools/wafsamba/samba_autoconf.py
-@@ -548,7 +548,7 @@ def library_flags(self, libs):
- 
- 
- @conf
--def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
-+def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
-     '''check if a set of libraries exist as system libraries
- 
-     returns the sublist of libs that do exist as a syslib or []
-@@ -568,11 +568,29 @@ int foo()
-             ret.append(lib)
-             continue
- 
-+        if msg is None:
-+            msg = 'Checking for library %s' % lib
-+
-         (ccflags, ldflags, cpppath) = library_flags(conf, lib)
-+
-         if shlib:
--            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(features='c cshlib',
-+                             fragment=fragment,
-+                             lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
-         else:
--            res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
- 
-         if not res:
-             if mandatory:
-@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
-         conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
- 
-     if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
--        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
-+        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS):
-             conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
- 
- @conf
diff --git a/databases/ldb13/files/patch-buildtools__wafsamba__samba_install.py b/databases/ldb13/files/patch-buildtools__wafsamba__samba_install.py
deleted file mode 100644
index 95f250a8621..00000000000
--- a/databases/ldb13/files/patch-buildtools__wafsamba__samba_install.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- buildtools/wafsamba/samba_install.py.orig	2015-12-10 11:01:40 UTC
-+++ buildtools/wafsamba/samba_install.py
-@@ -118,7 +118,7 @@ def install_library(self):
-                 inst_name    = bld.make_libname(t.target)
-         elif self.vnum:
-             vnum_base    = self.vnum.split('.')[0]
--            install_name = bld.make_libname(target_name, version=self.vnum)
-+            install_name = bld.make_libname(target_name, version=vnum_base)
-             install_link = bld.make_libname(target_name, version=vnum_base)
-             inst_name    = bld.make_libname(t.target)
-             if not self.private_library:
diff --git a/databases/ldb13/files/patch-buildtools__wafsamba__samba_python.py b/databases/ldb13/files/patch-buildtools__wafsamba__samba_python.py
deleted file mode 100644
index 429ec5e778f..00000000000
--- a/databases/ldb13/files/patch-buildtools__wafsamba__samba_python.py
+++ /dev/null
@@ -1,40 +0,0 @@
---- buildtools/wafsamba/samba_python.py.orig	2018-01-13 09:07:51 UTC
-+++ buildtools/wafsamba/samba_python.py
-@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
- 
- def _check_python_headers(conf, mandatory):
-     try:
-+        from python import _get_python_variables
-         Configure.ConfigurationError
-         conf.check_python_headers(mandatory=mandatory)
-+        conf.env['PYTHON_SO_ABI'] = _get_python_variables(
-+            conf.env['PYTHON'],
-+            ["get_config_var('SOABI') or ''"],
-+            ['from distutils.sysconfig import get_config_var']
-+        )[0]
-     except Configure.ConfigurationError:
-         if mandatory:
-              raise
- 
-     if conf.env['PYTHON_VERSION'] > '3':
--        abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
--        conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-+        '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG,
-+           while environment variable is PYTHON3_SO_ABI_FLAG'''
-+        override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
-+        if override_PYTHON_SO_ABI_FLAG is not None:
-+            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG
-+            conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
-+        if not conf.env['PYTHON_SO_ABI_FLAG']:
-+            if conf.env['PYTHON_SO_ABI']:
-+                conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI']
-+                conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
-+            else:
-+                abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
-+                conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-     else:
-         conf.env['PYTHON_SO_ABI_FLAG'] = ''
-+
-     conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = (
-         conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-'))
- 
diff --git a/databases/ldb13/files/patch-buildtools__wafsamba__wscript b/databases/ldb13/files/patch-buildtools__wafsamba__wscript
deleted file mode 100644
index 9327600e7bd..00000000000
--- a/databases/ldb13/files/patch-buildtools__wafsamba__wscript
+++ /dev/null
@@ -1,22 +0,0 @@
---- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
-+++ buildtools/wafsamba/wscript
-@@ -74,12 +74,17 @@ def set_options(opt):
-                    help=("private library directory [PREFIX/lib/%s]" % Utils.g_module.APPNAME),
-                    action="store", dest='PRIVATELIBDIR', default=None)
- 
-+    opt.add_option('--with-openldap',
-+                   help='additional directory to search for OpenLDAP libs',
-+                   action='store', dest='ldap_open', default=None,
-+                   match = ['Checking for library lber', 'Checking for library ldap'])
-+
-     opt.add_option('--with-libiconv',
-                    help='additional directory to search for libiconv',
--                   action='store', dest='iconv_open', default='/usr/local',
-+                   action='store', dest='iconv_open', default=None,
-                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
-     opt.add_option('--without-gettext',
--                   help=("Disable use of gettext"),
-+                   help=("disable use of gettext"),
-                    action="store_true", dest='disable_gettext', default=False)
- 
-     gr = opt.option_group('developer options')
diff --git a/databases/ldb13/files/patch-ldb_cache.c b/databases/ldb13/files/patch-ldb_cache.c
deleted file mode 100644
index 031cd3dd1b2..00000000000
--- a/databases/ldb13/files/patch-ldb_cache.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ldb_tdb/ldb_cache.c.orig	2018-03-04 05:41:25 UTC
-+++ ldb_tdb/ldb_cache.c
-@@ -91,7 +91,9 @@ static int ldb_schema_attribute_compare(
- {
- 	const struct ldb_schema_attribute *sa1 = (const struct ldb_schema_attribute *)p1;
- 	const struct ldb_schema_attribute *sa2 = (const struct ldb_schema_attribute *)p2;
--	return ldb_attr_cmp(sa1->name, sa2->name);
-+	int res = ldb_attr_cmp(sa1->name, sa2->name);
-+
-+	return (res) ? res : (sa1->flags > sa2->flags) ? 1 : (sa1->flags < sa2->flags) ? -1 : 0;
- }
- 
- /*
diff --git a/databases/ldb13/files/patch-ldb_mod_op_test.c b/databases/ldb13/files/patch-ldb_mod_op_test.c
deleted file mode 100644
index 069ebbd7c81..00000000000
--- a/databases/ldb13/files/patch-ldb_mod_op_test.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/ldb_mod_op_test.c.orig	2018-03-02 23:35:09 UTC
-+++ tests/ldb_mod_op_test.c
-@@ -3529,7 +3529,7 @@ static void test_ldb_unique_index_duplic
- 	assert_int_equal(ret, LDB_SUCCESS);
- 
- 	msg02 = ldb_msg_new(tmp_ctx);
--	assert_non_null(msg01);
-+	assert_non_null(msg02);
- 
- 	msg02->dn = ldb_dn_new_fmt(msg02, test_ctx->ldb, "dc=test02");
- 	assert_non_null(msg02->dn);
diff --git a/databases/ldb13/files/patch-lib__replace__wscript b/databases/ldb13/files/patch-lib__replace__wscript
deleted file mode 100644
index d6d32b6c3dc..00000000000
--- a/databases/ldb13/files/patch-lib__replace__wscript
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/replace/wscript.orig	2017-08-24 11:27:53 UTC
-+++ lib/replace/wscript
-@@ -81,7 +81,7 @@ def configure(conf):
-     conf.CHECK_HEADERS('sys/atomic.h')
-     conf.CHECK_HEADERS('libgen.h')
- 
--    if conf.CHECK_CFLAGS('-Wno-format-truncation'):
-+    if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS):
-         conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
- 
-     # Check for process set name support
diff --git a/databases/ldb13/files/patch-third_party__waf__wafadmin__Tools__cc.py b/databases/ldb13/files/patch-third_party__waf__wafadmin__Tools__cc.py
deleted file mode 100644
index 5695f3e0384..00000000000
--- a/databases/ldb13/files/patch-third_party__waf__wafadmin__Tools__cc.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/waf/wafadmin/Tools/cc.py.orig	2015-11-06 13:25:52 UTC
-+++ third_party/waf/wafadmin/Tools/cc.py
-@@ -88,7 +88,7 @@ def c_hook(self, node):
- 		raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self))
- 	return task
- 
--cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
-+cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
- cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False)
- cls.scan = ccroot.scan
- cls.vars.append('CCDEPS')
diff --git a/databases/ldb13/files/patch-wscript b/databases/ldb13/files/patch-wscript
deleted file mode 100644
index 233e061928d..00000000000
--- a/databases/ldb13/files/patch-wscript
+++ /dev/null
@@ -1,53 +0,0 @@
---- wscript.orig	2019-02-26 17:14:29 UTC
-+++ wscript
-@@ -139,9 +139,15 @@ def build(bld):
-     bld.RECURSE('lib/tdb')
- 
-     if bld.env.standalone_ldb:
-+        if not 'PACKAGE_VERSION' in bld.env:
-+            bld.env.PACKAGE_VERSION = VERSION
-+        bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
-         private_library = False
-     else:
-         private_library = True
-+    # we're not currently linking against the ldap libs, but ldb.pc.in
-+    # has @LDAP_LIBS@
-+    bld.env.LDAP_LIBS = ''
- 
-     LDB_MAP_SRC = bld.SUBDIR('ldb_map',
-                              'ldb_map.c ldb_map_inbound.c ldb_map_outbound.c')
-@@ -162,13 +168,6 @@ def build(bld):
-     if bld.PYTHON_BUILD_IS_ENABLED():
-         if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'):
-             for env in bld.gen_python_environments(['PKGCONFIGDIR']):
--                # we're not currently linking against the ldap libs, but ldb.pc.in
--                # has @LDAP_LIBS@
--                bld.env.LDAP_LIBS = ''
--
--                if not 'PACKAGE_VERSION' in bld.env:
--                    bld.env.PACKAGE_VERSION = VERSION
--                    bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
- 
-                 name = bld.pyembed_libname('pyldb-util')
-                 bld.SAMBA_LIBRARY(name,
-@@ -364,10 +363,6 @@ def build(bld):
-                          deps='cmocka ldb',
-                          install=False)
- 
--        bld.SAMBA_BINARY('ldb_match_test',
--                         source='tests/ldb_match_test.c',
--                         deps='cmocka ldb',
--                         install=False)
- 
- def test(ctx):
-     '''run ldb testsuite'''
-@@ -397,8 +392,7 @@ def test(ctx):
- 
-     cmocka_ret = 0
-     for test_exe in ['ldb_tdb_mod_op_test',
--                     'ldb_msg_test',
--                     'ldb_match_test']:
-+                     'ldb_msg_test']:
-             cmd = os.path.join(Utils.g_module.blddir, test_exe)
-             cmocka_ret = cmocka_ret or samba_utils.RUN_COMMAND(cmd)
- 
diff --git a/databases/ldb13/pkg-descr b/databases/ldb13/pkg-descr
deleted file mode 100644
index 92cd13b5db8..00000000000
--- a/databases/ldb13/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-ldb is a LDAP-like embedded database.
-
-ldb provides a fast database with an LDAP-like API designed to be used
-within an application.
-
-In some ways it can be seen as a intermediate solution between key-value
-pair databases and a real LDAP database.
-
-WWW: https://ldb.samba.org/
diff --git a/databases/pg_citus/Makefile b/databases/pg_citus/Makefile
index 91f995f3c07..fbdd91fec9f 100644
--- a/databases/pg_citus/Makefile
+++ b/databases/pg_citus/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	citus
-PORTVERSION=	9.2.0
+PORTVERSION=	9.2.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	pg_
diff --git a/databases/pg_citus/distinfo b/databases/pg_citus/distinfo
index ec9dfd6e622..3d25c49fcb2 100644
--- a/databases/pg_citus/distinfo
+++ b/databases/pg_citus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581492228
-SHA256 (citusdata-citus-v9.2.0_GH0.tar.gz) = c442b78ab1d66ce262e4e217191294f5d333f79a728608a7180cc17e3b395a40
-SIZE (citusdata-citus-v9.2.0_GH0.tar.gz) = 4287086
+TIMESTAMP = 1581766606
+SHA256 (citusdata-citus-v9.2.1_GH0.tar.gz) = d5b23d07811e7df1b4b3ffc820a629ada481c1dfa95f57bcb9f3b2f7e09cb43c
+SIZE (citusdata-citus-v9.2.1_GH0.tar.gz) = 4290474
diff --git a/databases/py-fakeredis/Makefile b/databases/py-fakeredis/Makefile
index cb53c0a7123..42756b3c429 100644
--- a/databases/py-fakeredis/Makefile
+++ b/databases/py-fakeredis/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	fakeredis
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	databases
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/databases/py-fakeredis/distinfo b/databases/py-fakeredis/distinfo
index a9908cb125c..36ea25801b9 100644
--- a/databases/py-fakeredis/distinfo
+++ b/databases/py-fakeredis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580918749
-SHA256 (fakeredis-1.2.0.tar.gz) = b0b64d0fe0e491752006c1880eacac647ed30a12a13066e0cea54449778ad811
-SIZE (fakeredis-1.2.0.tar.gz) = 67290
+TIMESTAMP = 1581775753
+SHA256 (fakeredis-1.2.1.tar.gz) = ec7290d601fa030b03e2a6016b8f5c719ad25db270a6110420e7438289ad22e8
+SIZE (fakeredis-1.2.1.tar.gz) = 67606
diff --git a/databases/tdb1/Makefile b/databases/tdb1/Makefile
deleted file mode 100644
index d5912934eb0..00000000000
--- a/databases/tdb1/Makefile
+++ /dev/null
@@ -1,148 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=		tdb
-PORTVERSION=		1.3.16
-PORTREVISION=		0
-PORTEPOCH=		1
-CATEGORIES=		databases
-MASTER_SITES=		SAMBA
-PKGNAMESUFFIX=		1
-
-MAINTAINER=		timur@FreeBSD.org
-COMMENT=		Trivial Database
-
-LICENSE=		GPLv3
-
-DEPRECATED=	Old version, uses EOLed python27
-EXPIRATION_DATE=	2020-02-15
-
-IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
-
-CONFLICTS_INSTALL=	tdb-*
-
-#FLAVORS=		default nopython debug
-#nopython_PKGNAMESUFFIX=	-nopython
-#debug_PKGNAMESUFFIX=	-debug
-#nopython_CONFLICTS=	tdb tdb-debug
-#debug_CONFLICTS=	tdb tdb-nopython
-#default_CONFLICTS=	tdb-nopython tdb-debug
-
-USES=			compiler pkgconfig waf
-USE_LDCONFIG=		yes
-WAF_CMD=		buildtools/bin/waf
-CONFIGURE_LOG=		bin/config.log
-
-PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
-PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
-
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
-			--disable-rpath \
-			--without-gettext
-
-OPTIONS_DEFINE=		MANPAGES
-MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
-
-.include <bsd.port.options.mk>
-
-TDB_BINS=		bin/tdbbackup \
-			bin/tdbdump \
-			bin/tdbrestore \
-			bin/tdbtool
-
-PLIST_FILES+=		include/tdb.h \
-			${TDB_BINS} \
-			lib/libtdb.so \
-			lib/libtdb.so.1 \
-			${PKGCONFIGDIR}/tdb.pc
-
-.if defined(SAMBA4_DEBUG)
-CFLAGS+=		-DTDB_TRACE=1
-.endif
-
-.if defined(NO_PYTHON)
-USES+=			python:2.7,build
-CONFIGURE_ARGS+=	--disable-python
-.else
-USES+=			python:2.7
-
-PLIST_FILES+=		${PYTHON_SITELIBDIR}/tdb.so \
-			${PYTHON_SITELIBDIR}/_tdb_text.py
-# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
-# This is not officially supported, use at your own risk
-.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]}
-SAMBA4_PYTHON3_VERSION=	${WITH_SAMBA4_PYTHON3}
-SAMBA4_PYTHON3=		python${SAMBA4_PYTHON3_VERSION}
-SAMBA4_PYTHON3_VER=	${SAMBA4_PYTHON3_VERSION:C/\.//}
-.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
-.error			unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
-.endif
-BUILD_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
-RUN_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
-# cpython-36m
-SAMBA4_PYTHON3_SO_ABI!=	[ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
-SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
-
-CONFIGURE_ENV+=		PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
-CONFIGURE_ARGS+=	--extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
-
-PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
-			SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
-
-PLIST_FILES+=		${SAMBA4_PYTHON3_SITELIBDIR}/tdb.${SAMBA4_PYTHON3_SO_ABI}.so \
-			${SAMBA4_PYTHON3_SITELIBDIR}/_tdb_text.py
-.endif
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ! ${PORT_OPTIONS:MMANPAGES}
-CONFIGURE_ENV+=		XSLTPROC="true"
-.else
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
-			xsltproc:textproc/libxslt
-.endif
-# No fancy color error messages
-.if ${COMPILER_TYPE} == "clang"
-CFLAGS+=		-fno-color-diagnostics
-.endif
-CONFIGURE_ENV+=		NOCOLOR=yes
-MAKE_ENV+=		NOCOLOR=yes
-
-TDB_MAN8=		man/man8/tdbbackup.8.gz \
-			man/man8/tdbdump.8.gz \
-			man/man8/tdbrestore.8.gz \
-			man/man8/tdbtool.8.gz
-
-PLIST_FILES+=		${TDB_MAN8}
-
-post-patch:
-			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
-				${BUILD_WRKSRC}/wscript
-
-# Use threading (or multiprocessing) but not thread (renamed in python 3+).
-pre-configure:
-			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
-				${ECHO_CMD}; \
-				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
-				${ECHO_CMD}; \
-				${FALSE}; \
-			fi
-
-pre-build-MANPAGES-off:
-			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
-.for man in ${TDB_MAN8}
-			${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
-.endfor
-
-post-install:
-.for lib in ${TDB_BINS} lib/libtdb.so
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib}
-.endfor
-.if !defined(NO_PYTHON)
-			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tdb.so
-.if defined(SAMBA4_PYTHON3)
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/tdb.${SAMBA4_PYTHON3_SO_ABI}.so
-.endif
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/tdb1/distinfo b/databases/tdb1/distinfo
deleted file mode 100644
index 29eabcef3e9..00000000000
--- a/databases/tdb1/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1531611906
-SHA256 (tdb-1.3.16.tar.gz) = 6a3fc2616567f23993984ada3cea97d953a27669ffd1bfbbe961f26e0cf96cc5
-SIZE (tdb-1.3.16.tar.gz) = 504330
diff --git a/databases/tdb1/files/patch-buildtools__wafsamba__samba_autoconf.py b/databases/tdb1/files/patch-buildtools__wafsamba__samba_autoconf.py
deleted file mode 100644
index c92d308462b..00000000000
--- a/databases/tdb1/files/patch-buildtools__wafsamba__samba_autoconf.py
+++ /dev/null
@@ -1,52 +0,0 @@
---- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
-+++ buildtools/wafsamba/samba_autoconf.py
-@@ -548,7 +548,7 @@ def library_flags(self, libs):
- 
- 
- @conf
--def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
-+def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
-     '''check if a set of libraries exist as system libraries
- 
-     returns the sublist of libs that do exist as a syslib or []
-@@ -568,11 +568,29 @@ int foo()
-             ret.append(lib)
-             continue
- 
-+        if msg is None:
-+            msg = 'Checking for library %s' % lib
-+
-         (ccflags, ldflags, cpppath) = library_flags(conf, lib)
-+
-         if shlib:
--            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(features='c cshlib',
-+                             fragment=fragment,
-+                             lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
-         else:
--            res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
- 
-         if not res:
-             if mandatory:
-@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
-         conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
- 
-     if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
--        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
-+        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS):
-             conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
- 
- @conf
diff --git a/databases/tdb1/files/patch-buildtools__wafsamba__samba_install.py b/databases/tdb1/files/patch-buildtools__wafsamba__samba_install.py
deleted file mode 100644
index 95f250a8621..00000000000
--- a/databases/tdb1/files/patch-buildtools__wafsamba__samba_install.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- buildtools/wafsamba/samba_install.py.orig	2015-12-10 11:01:40 UTC
-+++ buildtools/wafsamba/samba_install.py
-@@ -118,7 +118,7 @@ def install_library(self):
-                 inst_name    = bld.make_libname(t.target)
-         elif self.vnum:
-             vnum_base    = self.vnum.split('.')[0]
--            install_name = bld.make_libname(target_name, version=self.vnum)
-+            install_name = bld.make_libname(target_name, version=vnum_base)
-             install_link = bld.make_libname(target_name, version=vnum_base)
-             inst_name    = bld.make_libname(t.target)
-             if not self.private_library:
diff --git a/databases/tdb1/files/patch-buildtools__wafsamba__samba_python.py b/databases/tdb1/files/patch-buildtools__wafsamba__samba_python.py
deleted file mode 100644
index 429ec5e778f..00000000000
--- a/databases/tdb1/files/patch-buildtools__wafsamba__samba_python.py
+++ /dev/null
@@ -1,40 +0,0 @@
---- buildtools/wafsamba/samba_python.py.orig	2018-01-13 09:07:51 UTC
-+++ buildtools/wafsamba/samba_python.py
-@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
- 
- def _check_python_headers(conf, mandatory):
-     try:
-+        from python import _get_python_variables
-         Configure.ConfigurationError
-         conf.check_python_headers(mandatory=mandatory)
-+        conf.env['PYTHON_SO_ABI'] = _get_python_variables(
-+            conf.env['PYTHON'],
-+            ["get_config_var('SOABI') or ''"],
-+            ['from distutils.sysconfig import get_config_var']
-+        )[0]
-     except Configure.ConfigurationError:
-         if mandatory:
-              raise
- 
-     if conf.env['PYTHON_VERSION'] > '3':
--        abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
--        conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-+        '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG,
-+           while environment variable is PYTHON3_SO_ABI_FLAG'''
-+        override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
-+        if override_PYTHON_SO_ABI_FLAG is not None:
-+            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG
-+            conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
-+        if not conf.env['PYTHON_SO_ABI_FLAG']:
-+            if conf.env['PYTHON_SO_ABI']:
-+                conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI']
-+                conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
-+            else:
-+                abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
-+                conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-     else:
-         conf.env['PYTHON_SO_ABI_FLAG'] = ''
-+
-     conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = (
-         conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-'))
- 
diff --git a/databases/tdb1/files/patch-buildtools__wafsamba__wscript b/databases/tdb1/files/patch-buildtools__wafsamba__wscript
deleted file mode 100644
index 9399a316c14..00000000000
--- a/databases/tdb1/files/patch-buildtools__wafsamba__wscript
+++ /dev/null
@@ -1,15 +0,0 @@
---- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
-+++ buildtools/wafsamba/wscript
-@@ -76,10 +76,10 @@ def set_options(opt):
- 
-     opt.add_option('--with-libiconv',
-                    help='additional directory to search for libiconv',
--                   action='store', dest='iconv_open', default='/usr/local',
-+                   action='store', dest='iconv_open', default=None,
-                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
-     opt.add_option('--without-gettext',
--                   help=("Disable use of gettext"),
-+                   help=("disable use of gettext"),
-                    action="store_true", dest='disable_gettext', default=False)
- 
-     gr = opt.option_group('developer options')
diff --git a/databases/tdb1/files/patch-lib__replace__wscript b/databases/tdb1/files/patch-lib__replace__wscript
deleted file mode 100644
index d6d32b6c3dc..00000000000
--- a/databases/tdb1/files/patch-lib__replace__wscript
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/replace/wscript.orig	2017-08-24 11:27:53 UTC
-+++ lib/replace/wscript
-@@ -81,7 +81,7 @@ def configure(conf):
-     conf.CHECK_HEADERS('sys/atomic.h')
-     conf.CHECK_HEADERS('libgen.h')
- 
--    if conf.CHECK_CFLAGS('-Wno-format-truncation'):
-+    if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS):
-         conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
- 
-     # Check for process set name support
diff --git a/databases/tdb1/files/patch-wscript b/databases/tdb1/files/patch-wscript
deleted file mode 100644
index c1b8d4560be..00000000000
--- a/databases/tdb1/files/patch-wscript
+++ /dev/null
@@ -1,11 +0,0 @@
---- wscript.orig	2017-08-24 11:29:08 UTC
-+++ wscript
-@@ -115,7 +115,7 @@ def build(bld):
-     COMMON_SRC = bld.SUBDIR('common', COMMON_FILES)
- 
-     if bld.env.standalone_tdb:
--        bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
-+        bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
-         private_library = False
-     else:
-         private_library = True
diff --git a/databases/tdb1/files/tdbbackup.8 b/databases/tdb1/files/tdbbackup.8
deleted file mode 100644
index 92f510aeccc..00000000000
--- a/databases/tdb1/files/tdbbackup.8
+++ /dev/null
@@ -1,129 +0,0 @@
-'\" t
-.\"     Title: tdbbackup
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 2015-04-25
-.\"    Manual: System Administration tools
-.\"    Source: Samba 3.6
-.\"  Language: English
-.\"
-.TH "TDBBACKUP" "8" "2015\-04\-25" "Samba 3\&.6" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-tdbbackup \- tool for backing up and for validating the integrity of samba \&.tdb files
-.SH "SYNOPSIS"
-.HP \w'\fBtdbbackup\fR\ 'u
-\fBtdbbackup\fR [\-s\ suffix] [\-v] [\-h] [\-l]
-.SH "DESCRIPTION"
-.PP
-This tool is part of the
-\fBsamba\fR(1)
-suite\&.
-.PP
-\fBtdbbackup\fR
-is a tool that may be used to backup samba \&.tdb files\&. This tool may also be used to verify the integrity of the \&.tdb files prior to samba startup or during normal operation\&. If it finds file damage and it finds a prior backup the backup file will be restored\&.
-.SH "OPTIONS"
-.PP
-\-h
-.RS 4
-Get help information\&.
-.RE
-.PP
-\-s suffix
-.RS 4
-The
-\fB\-s\fR
-option allows the administrator to specify a file backup extension\&. This way it is possible to keep a history of tdb backup files by using a new suffix for each backup\&.
-.RE
-.PP
-\-v
-.RS 4
-The
-\fB\-v\fR
-will check the database for damages (corrupt data) which if detected causes the backup to be restored\&.
-.RE
-.PP
-\-l
-.RS 4
-This options disables any locking, by passing TDB_NOLOCK to tdb_open_ex()\&. Only use this for database files which are not used by any other process! And also only if it is otherwise not possible to open the database, e\&.g\&. databases which were created with mutex locking\&.
-.RE
-.SH "COMMANDS"
-.PP
-\fIGENERAL INFORMATION\fR
-.PP
-The
-\fBtdbbackup\fR
-utility can safely be run at any time\&. It was designed so that it can be used at any time to validate the integrity of tdb files, even during Samba operation\&. Typical usage for the command will be:
-.PP
-tdbbackup [\-s suffix] *\&.tdb
-.PP
-Before restarting samba the following command may be run to validate \&.tdb files:
-.PP
-tdbbackup \-v [\-s suffix] *\&.tdb
-.PP
-Samba \&.tdb files are stored in various locations, be sure to run backup all \&.tdb file on the system\&. Important files includes:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBsecrets\&.tdb\fR
-\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBpassdb\&.tdb\fR
-\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fB*\&.tdb\fR
-located in the /usr/local/samba/var directory or on some systems in the /var/cache or /var/lib/samba directories\&.
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 3 of the Samba suite\&.
-.SH "AUTHOR"
-.PP
-The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
-.PP
-The tdbbackup man page was written by John H Terpstra\&.
diff --git a/databases/tdb1/files/tdbdump.8 b/databases/tdb1/files/tdbdump.8
deleted file mode 100644
index 86d9e2c6755..00000000000
--- a/databases/tdb1/files/tdbdump.8
+++ /dev/null
@@ -1,72 +0,0 @@
-'\" t
-.\"     Title: tdbdump
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 2015-04-25
-.\"    Manual: System Administration tools
-.\"    Source: Samba 3.6
-.\"  Language: English
-.\"
-.TH "TDBDUMP" "8" "2015\-04\-25" "Samba 3\&.6" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-tdbdump \- tool for printing the contents of a TDB file
-.SH "SYNOPSIS"
-.HP \w'\fBtdbdump\fR\ 'u
-\fBtdbdump\fR [\-k\ \fIkeyname\fR] [\-e] [\-h] {filename}
-.SH "DESCRIPTION"
-.PP
-This tool is part of the
-\fBsamba\fR(1)
-suite\&.
-.PP
-\fBtdbdump\fR
-is a very simple utility that \*(Aqdumps\*(Aq the contents of a TDB (Trivial DataBase) file to standard output in a human\-readable format\&.
-.PP
-This tool can be used when debugging problems with TDB files\&. It is intended for those who are somewhat familiar with Samba internals\&.
-.SH "OPTIONS"
-.PP
-\-h
-.RS 4
-Get help information\&.
-.RE
-.PP
-\-k \fIkeyname\fR
-.RS 4
-The
-\fB\-k\fR
-option restricts dumping to a single key, if found\&.
-.RE
-.PP
-\-e
-.RS 4
-The
-\fB\-e\fR
-tries to dump out from a corrupt database\&. Naturally, such a dump is unreliable, at best\&.
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 3 of the Samba suite\&.
-.SH "AUTHOR"
-.PP
-The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
-.PP
-The tdbdump man page was written by Jelmer Vernooij\&.
diff --git a/databases/tdb1/files/tdbrestore.8 b/databases/tdb1/files/tdbrestore.8
deleted file mode 100644
index 28632ac094c..00000000000
--- a/databases/tdb1/files/tdbrestore.8
+++ /dev/null
@@ -1,54 +0,0 @@
-'\" t
-.\"     Title: tdbrestore
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 2015-04-25
-.\"    Manual: System Administration tools
-.\"    Source: Samba 3.6
-.\"  Language: English
-.\"
-.TH "TDBRESTORE" "8" "2015\-04\-25" "Samba 3\&.6" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-tdbrestore \- tool for creating a TDB file out of a tdbdump output
-.SH "SYNOPSIS"
-.HP \w'\fBtdbrestore\fR\ 'u
-\fBtdbrestore\fR {tdbfilename}
-.SH "DESCRIPTION"
-.PP
-This tool is part of the
-\fBsamba\fR(1)
-suite\&.
-.PP
-\fBtdbrestore\fR
-is a very simple utility that \*(Aqrestores\*(Aq the contents of dump file into TDB (Trivial DataBase) file\&. The dump file is obtained from the tdbdump command\&.
-.PP
-This tool wait on the standard input for the content of the dump and will write the tdb in the tdbfilename parameter\&.
-.PP
-This tool can be used for unpacking the content of tdb as backup mean\&.
-.SH "VERSION"
-.PP
-This man page is correct for version 3 of the Samba suite\&.
-.SH "AUTHOR"
-.PP
-The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&. This tool was initially written by Volker Lendecke based on an idea by Simon McVittie\&.
-.PP
-The tdbrestore man page was written by Matthieu Patou\&.
diff --git a/databases/tdb1/files/tdbtool.8 b/databases/tdb1/files/tdbtool.8
deleted file mode 100644
index 04ed76594c1..00000000000
--- a/databases/tdb1/files/tdbtool.8
+++ /dev/null
@@ -1,170 +0,0 @@
-'\" t
-.\"     Title: tdbtool
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 2015-04-25
-.\"    Manual: System Administration tools
-.\"    Source: Samba 4.0
-.\"  Language: English
-.\"
-.TH "TDBTOOL" "8" "2015\-04\-25" "Samba 4\&.0" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-tdbtool \- manipulate the contents TDB files
-.SH "SYNOPSIS"
-.HP \w'\fBtdbtool\fR\ 'u
-\fBtdbtool\fR
-.HP \w'\fBtdbtool\fR\ 'u
-\fBtdbtool\fR [\-l] \fITDBFILE\fR [\fICOMMANDS\fR...]
-.SH "DESCRIPTION"
-.PP
-This tool is part of the
-\fBsamba\fR(1)
-suite\&.
-.PP
-\fBtdbtool\fR
-a tool for displaying and altering the contents of Samba TDB (Trivial DataBase) files\&. Each of the commands listed below can be entered interactively or provided on the command line\&.
-.SH "OPTIONS"
-.PP
-\-l
-.RS 4
-This options disables any locking, by passing TDB_NOLOCK to tdb_open_ex()\&. Only use this for database files which are not used by any other process! And also only if it is otherwise not possible to open the database, e\&.g\&. databases which were created with mutex locking\&.
-.RE
-.SH "COMMANDS"
-.PP
-\fBcreate\fR \fITDBFILE\fR
-.RS 4
-Create a new database named
-\fITDBFILE\fR\&.
-.RE
-.PP
-\fBopen\fR \fITDBFILE\fR
-.RS 4
-Open an existing database named
-\fITDBFILE\fR\&.
-.RE
-.PP
-\fBerase\fR
-.RS 4
-Erase the current database\&.
-.RE
-.PP
-\fBdump\fR
-.RS 4
-Dump the current database as strings\&.
-.RE
-.PP
-\fBcdump\fR
-.RS 4
-Dump the current database as connection records\&.
-.RE
-.PP
-\fBkeys\fR
-.RS 4
-Dump the current database keys as strings\&.
-.RE
-.PP
-\fBhexkeys\fR
-.RS 4
-Dump the current database keys as hex values\&.
-.RE
-.PP
-\fBinfo\fR
-.RS 4
-Print summary information about the current database\&.
-.RE
-.PP
-\fBinsert\fR \fIKEY\fR \fIDATA\fR
-.RS 4
-Insert a record into the current database\&.
-.RE
-.PP
-\fBmove\fR \fIKEY\fR \fITDBFILE\fR
-.RS 4
-Move a record from the current database into
-\fITDBFILE\fR\&.
-.RE
-.PP
-\fBstore\fR \fIKEY\fR \fIDATA\fR
-.RS 4
-Store (replace) a record in the current database\&.
-.RE
-.PP
-\fBshow\fR \fIKEY\fR
-.RS 4
-Show a record by key\&.
-.RE
-.PP
-\fBdelete\fR \fIKEY\fR
-.RS 4
-Delete a record by key\&.
-.RE
-.PP
-\fBlist\fR
-.RS 4
-Print the current database hash table and free list\&.
-.RE
-.PP
-\fBfree\fR
-.RS 4
-Print the current database and free list\&.
-.RE
-.PP
-\fB!\fR \fICOMMAND\fR
-.RS 4
-Execute the given system command\&.
-.RE
-.PP
-\fBfirst\fR
-.RS 4
-Print the first record in the current database\&.
-.RE
-.PP
-\fBnext\fR
-.RS 4
-Print the next record in the current database\&.
-.RE
-.PP
-\fBcheck\fR
-.RS 4
-Check the integrity of the current database\&.
-.RE
-.PP
-\fBrepack\fR
-.RS 4
-Repack a database using a temporary file to remove fragmentation\&.
-.RE
-.PP
-\fBquit\fR
-.RS 4
-Exit
-\fBtdbtool\fR\&.
-.RE
-.SH "CAVEATS"
-.PP
-The contents of the Samba TDB files are private to the implementation and should not be altered with
-\fBtdbtool\fR\&.
-.SH "VERSION"
-.PP
-This man page is correct for version 3\&.6 of the Samba suite\&.
-.SH "AUTHOR"
-.PP
-The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
diff --git a/databases/tdb1/pkg-descr b/databases/tdb1/pkg-descr
deleted file mode 100644
index 624574f89d0..00000000000
--- a/databases/tdb1/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-TDB is a Trivial Database. In concept, it is very much like GDBM, and
-BSD's DB except that it allows multiple simultaneous writers and uses
-locking internally to keep writers from trampling on each other. TDB is
-also extremely small.
-
-WWW: http://tdb.samba.org/
diff --git a/deskutils/Makefile b/deskutils/Makefile
index 53940176b61..538382243c3 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -212,7 +212,6 @@
     SUBDIR += recoll
     SUBDIR += remind
     SUBDIR += rolo
-    SUBDIR += rox-memo
     SUBDIR += rubrica
     SUBDIR += rubygem-shellplay
     SUBDIR += rubygem-taskjuggler
diff --git a/deskutils/fet/Makefile b/deskutils/fet/Makefile
index 869f64241b4..64e58a4bc7d 100644
--- a/deskutils/fet/Makefile
+++ b/deskutils/fet/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fet
-DISTVERSION=	5.41.0
+DISTVERSION=	5.43.0
 CATEGORIES=	deskutils
 MASTER_SITES=	http://lalescu.ro/liviu/fet/download/ \
 		http://lalescu.ro/liviu/fet/download/old/ \
diff --git a/deskutils/fet/distinfo b/deskutils/fet/distinfo
index 4a2d879066b..ac4fe9ede1a 100644
--- a/deskutils/fet/distinfo
+++ b/deskutils/fet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575209277
-SHA256 (fet-5.41.0.tar.bz2) = 0793a968b77f4cedbbd9425453a08733503b3a5885d8db49471f7870032cea5e
-SIZE (fet-5.41.0.tar.bz2) = 12966558
+TIMESTAMP = 1581840441
+SHA256 (fet-5.43.0.tar.bz2) = fe2f5bedd57ddb03a25682e963451b366f837ae87bcd685c56a48d1dc67cb4fe
+SIZE (fet-5.43.0.tar.bz2) = 13050188
diff --git a/deskutils/fet/files/patch-src__engine__timeconstraint.cpp b/deskutils/fet/files/patch-src__engine__timeconstraint.cpp
deleted file mode 100644
index 1dd226eee3a..00000000000
--- a/deskutils/fet/files/patch-src__engine__timeconstraint.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/engine/timeconstraint.cpp.orig	2016-04-09 13:57:44 UTC
-+++ src/engine/timeconstraint.cpp
-@@ -39,6 +39,7 @@ File timeconstraint.cpp
- 
- //for min max functions
- #include <algorithm>
-+#include <stdlib.h>
- using namespace std;
- 
- static QString trueFalse(bool x){
diff --git a/deskutils/rox-memo/Makefile b/deskutils/rox-memo/Makefile
deleted file mode 100644
index 50920d74564..00000000000
--- a/deskutils/rox-memo/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	rox-memo
-PORTVERSION=	2.1
-PORTREVISION=	2
-CATEGORIES=	deskutils
-MASTER_SITES=	SF/rox/Memo/${PORTVERSION}
-DISTNAME=	memo-${PORTVERSION}
-
-MAINTAINER=	olgeni@FreeBSD.org
-COMMENT=	Appointment/TODO management for the ROX desktop
-
-DEPRECATED=	Old, uses EOLed python27
-EXPIRATION_DATE=	2020-02-16
-
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
-		${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib@${PY_FLAVOR}
-
-USES=		python:2.7 shebangfix tar:bzip2
-SHEBANG_FILES=	Memo/AppRun Memo/AppletRun
-
-do-build:
-	@${PYTHON_CMD} -m compileall ${WRKSRC}
-	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
-
-pre-install:
-	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
-				${WRKSRC}/Memo/findrox.py
-	@${FIND} ${WRKSRC} -name *.bak -delete
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/apps
-	${CP} -r ${WRKSRC}/Memo ${STAGEDIR}${PREFIX}/apps/
-
-.include <bsd.port.mk>
diff --git a/deskutils/rox-memo/distinfo b/deskutils/rox-memo/distinfo
deleted file mode 100644
index fa0e0b69530..00000000000
--- a/deskutils/rox-memo/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (memo-2.1.tar.bz2) = 78704e7befd32b60944a48be5cecaccb4196cf87478777c71b64c47a521cc0e1
-SIZE (memo-2.1.tar.bz2) = 44691
diff --git a/deskutils/rox-memo/pkg-descr b/deskutils/rox-memo/pkg-descr
deleted file mode 100644
index 3d43ebf1acc..00000000000
--- a/deskutils/rox-memo/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Appointment/TODO management for the ROX desktop.
-
-WWW: http://rox.sourceforge.net/desktop/Memo
diff --git a/deskutils/rox-memo/pkg-plist b/deskutils/rox-memo/pkg-plist
deleted file mode 100644
index 37dfed5ae7f..00000000000
--- a/deskutils/rox-memo/pkg-plist
+++ /dev/null
@@ -1,67 +0,0 @@
-apps/Memo/.DirIcon
-apps/Memo/Alarm.py
-apps/Memo/Alarm.pyc
-apps/Memo/Alarm.pyo
-apps/Memo/AppInfo.xml
-apps/Memo/AppRun
-apps/Memo/AppletRun
-apps/Memo/Arrow.py
-apps/Memo/Arrow.pyc
-apps/Memo/Arrow.pyo
-apps/Memo/EditBox.py
-apps/Memo/EditBox.pyc
-apps/Memo/EditBox.pyo
-apps/Memo/Help/COPYING
-apps/Memo/Help/Changes
-apps/Memo/Help/README
-apps/Memo/Memo.py
-apps/Memo/Memo.pyc
-apps/Memo/Memo.pyo
-apps/Memo/Memo.xml
-apps/Memo/MenuWindow.py
-apps/Memo/MenuWindow.pyc
-apps/Memo/MenuWindow.pyo
-apps/Memo/Messages/dist
-apps/Memo/Messages/es.gmo
-apps/Memo/Messages/es.po
-apps/Memo/Messages/it.gmo
-apps/Memo/Messages/it.po
-apps/Memo/Messages/tips.py
-apps/Memo/Messages/tips.pyc
-apps/Memo/Messages/tips.pyo
-apps/Memo/Messages/update-po
-apps/Memo/Messages/zh_CN.gmo
-apps/Memo/Messages/zh_CN.po
-apps/Memo/Messages/zh_TW.gmo
-apps/Memo/Messages/zh_TW.po
-apps/Memo/Options.xml
-apps/Memo/ShowAll.py
-apps/Memo/ShowAll.pyc
-apps/Memo/ShowAll.pyo
-apps/Memo/Systray.py
-apps/Memo/Systray.pyc
-apps/Memo/Systray.pyo
-apps/Memo/Window.py
-apps/Memo/Window.pyc
-apps/Memo/Window.pyo
-apps/Memo/clock.py
-apps/Memo/clock.pyc
-apps/Memo/clock.pyo
-apps/Memo/dbus_notify.py
-apps/Memo/dbus_notify.pyc
-apps/Memo/dbus_notify.pyo
-apps/Memo/findrox.py
-apps/Memo/findrox.pyc
-apps/Memo/findrox.pyo
-apps/Memo/main.py
-apps/Memo/main.pyc
-apps/Memo/main.pyo
-apps/Memo/memos.py
-apps/Memo/memos.pyc
-apps/Memo/memos.pyo
-apps/Memo/pretty_time.py
-apps/Memo/pretty_time.pyc
-apps/Memo/pretty_time.pyo
-apps/Memo/timer.py
-apps/Memo/timer.pyc
-apps/Memo/timer.pyo
diff --git a/devel/Makefile b/devel/Makefile
index 370c223efc2..324c227dd2e 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -463,6 +463,7 @@
     SUBDIR += deforaos-libsystem
     SUBDIR += deheader
     SUBDIR += delta
+    SUBDIR += delve
     SUBDIR += dep
     SUBDIR += deployer
     SUBDIR += derelict-sdl2
@@ -773,8 +774,8 @@
     SUBDIR += gettext-runtime
     SUBDIR += gettext-tools
     SUBDIR += gflags
-    SUBDIR += ghidra
     SUBDIR += gh
+    SUBDIR += ghidra
     SUBDIR += ghq
     SUBDIR += ghub
     SUBDIR += gindent
@@ -4075,6 +4076,7 @@
     SUBDIR += py-aws-sam-translator
     SUBDIR += py-aws-xray-sdk
     SUBDIR += py-azure-batch
+    SUBDIR += py-azure-core
     SUBDIR += py-azure-cosmos
     SUBDIR += py-azure-datalake-store
     SUBDIR += py-azure-functions-devops-build
@@ -4484,7 +4486,9 @@
     SUBDIR += py-jaraco
     SUBDIR += py-jaraco.classes
     SUBDIR += py-jaraco.context
+    SUBDIR += py-jaraco.context2
     SUBDIR += py-jaraco.functools
+    SUBDIR += py-jaraco.functools2
     SUBDIR += py-jaraco.itertools
     SUBDIR += py-jaraco.logging
     SUBDIR += py-jaraco.timing
@@ -4672,6 +4676,7 @@
     SUBDIR += py-oslo.messaging10
     SUBDIR += py-oslo.middleware
     SUBDIR += py-oslo.policy
+    SUBDIR += py-oslo.policy2
     SUBDIR += py-oslo.privsep
     SUBDIR += py-oslo.reports
     SUBDIR += py-oslo.rootwrap
@@ -4945,7 +4950,6 @@
     SUBDIR += py-robotremoteserver
     SUBDIR += py-rope
     SUBDIR += py-rose
-    SUBDIR += py-roxlib
     SUBDIR += py-rply
     SUBDIR += py-rq
     SUBDIR += py-rq-scheduler
@@ -6606,7 +6610,6 @@
     SUBDIR += tablist
     SUBDIR += tailor
     SUBDIR += talloc
-    SUBDIR += talloc1
     SUBDIR += tass64
     SUBDIR += tbb
     SUBDIR += tcl-memchan
@@ -6631,7 +6634,6 @@
     SUBDIR += termcolor
     SUBDIR += terminality
     SUBDIR += tevent
-    SUBDIR += tevent1
     SUBDIR += tex-kpathsea
     SUBDIR += tex-libtexlua
     SUBDIR += tex-libtexluajit
diff --git a/devel/delve/Makefile b/devel/delve/Makefile
new file mode 100644
index 00000000000..d52df841194
--- /dev/null
+++ b/devel/delve/Makefile
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+PORTNAME=	delve
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.4.0
+CATEGORIES=	devel
+
+MAINTAINER=	dmitry.wagin@ya.ru
+COMMENT=	Debugger for the Go programming language
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+ONLY_FOR_ARCHS=	amd64
+
+USES=		go:modules
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	go-delve
+
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+GO_TARGET=	./cmd/dlv
+
+CONFLICTS_INSTALL=	dlv # bin/dlv
+
+PLIST_FILES=	bin/dlv
+
+.include <bsd.port.mk>
diff --git a/devel/delve/distinfo b/devel/delve/distinfo
new file mode 100644
index 00000000000..ddf25c23e90
--- /dev/null
+++ b/devel/delve/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1581672137
+SHA256 (go-delve-delve-v1.4.0_GH0.tar.gz) = 56f5e208a6d72e3fb00ba65fbd4255c41904c37169892478011ed24df034667c
+SIZE (go-delve-delve-v1.4.0_GH0.tar.gz) = 7784835
diff --git a/devel/delve/pkg-descr b/devel/delve/pkg-descr
new file mode 100644
index 00000000000..4dd50d849b5
--- /dev/null
+++ b/devel/delve/pkg-descr
@@ -0,0 +1,7 @@
+Delve is a debugger for the Go programming language. The goal of the project is
+to provide a simple, full featured debugging tool for Go. Delve should be easy
+to invoke and easy to use. Chances are if you're using a debugger, things
+aren't going your way. With that in mind, Delve should stay out of your way as
+much as possible.
+
+WWW: https://github.com/go-delve/delve
diff --git a/devel/delve/pkg-message b/devel/delve/pkg-message
new file mode 100644
index 00000000000..2a6f0d0ad20
--- /dev/null
+++ b/devel/delve/pkg-message
@@ -0,0 +1,15 @@
+[
+{ type: install
+  message: <<EOM
+Please execute the following commands to prep this system to run delve:
+
+echo "# required for delve">>/etc/sysctl.conf.local
+echo "security.bsd.unprivileged_proc_debug=1">>/etc/sysctl.conf.local
+
+Then, either reboot or run the following commands to implement the above
+changes:
+
+service sysctl reload
+EOM
+}
+]
diff --git a/devel/double-conversion/Makefile b/devel/double-conversion/Makefile
index b8e744b5fdb..92f05f17420 100644
--- a/devel/double-conversion/Makefile
+++ b/devel/double-conversion/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	double-conversion
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.1.5-11
-DISTVERSIONSUFFIX=	-g7da5db9
+DISTVERSION=	3.1.5-19
+DISTVERSIONSUFFIX=	-gf4cb238
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/double-conversion/distinfo b/devel/double-conversion/distinfo
index 68c81710537..d0497b27e99 100644
--- a/devel/double-conversion/distinfo
+++ b/devel/double-conversion/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564865580
-SHA256 (google-double-conversion-v3.1.5-11-g7da5db9_GH0.tar.gz) = 3c47f8ab18e71ea7c8feaa3e9cf7b65e0dbd8f80b5442549f0218584e3841d81
-SIZE (google-double-conversion-v3.1.5-11-g7da5db9_GH0.tar.gz) = 7025723
+TIMESTAMP = 1581886727
+SHA256 (google-double-conversion-v3.1.5-19-gf4cb238_GH0.tar.gz) = 1d24b8e801f0a88a1e9b3813e3046404925d68fa3c70d08d69e1439e56d5d161
+SIZE (google-double-conversion-v3.1.5-19-gf4cb238_GH0.tar.gz) = 7027023
diff --git a/devel/electron6/Makefile b/devel/electron6/Makefile
index 1d38eb20e3b..08b88dc6e70 100644
--- a/devel/electron6/Makefile
+++ b/devel/electron6/Makefile
@@ -165,7 +165,7 @@ POST_BUILD_DIST_TARGETS=	electron_dist_zip electron_chromedriver_zip electron_mk
 YARN_TIMESTAMP=	1576819964
 
 PLIST_SUB=	ELECTRON_VER=${ELECTRON_VER} \
-		PKGNAMESUFFIX=${PKGNAMESUFFIX}
+		ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
 
 .include "Makefile.version"
 .include <bsd.port.pre.mk>
diff --git a/devel/electron6/Makefile.tests b/devel/electron6/Makefile.tests
deleted file mode 100644
index 26176a73f3a..00000000000
--- a/devel/electron6/Makefile.tests
+++ /dev/null
@@ -1,87 +0,0 @@
-# $FreeBSD$
-
-TEST_TARGETS=	base_unittests \
-		chromedriver_unittests \
-		crypto_unittests \
-		printing_unittests \
-		url_unittests
-
-#		capture_unittests \
-#		cc_unittests \
-#		compositor_unittests \
-#		content_unittests \
-#		dbus_unittests \
-#		display_unittests \
-#		events_unittests \
-#		gin_unittests \
-#		gl_unittests \
-#		gpu_unittests \
-#		headless_unittests \
-#		media_unittests \
-#		media_mojo_unittests \
-#		midi_unittests \
-#		mojo_unittests \
-#		net_unittests \
-#		ppapi_unittests \
-#		skia_unittests \
-#		sql_unittests \
-#		storage_unittests \
-#		ui_base_unittests \
-#		url_ipc_unittests \
-#		unittests \
-
-TEST_MODULES=	electron\ module \
-		app\ module \
-		default\ behavior \
-		webContents\ module \
-		autoUpdater\ module \
-		BrowserView\ module \
-		BrowserWindow\ with\ affinity\ module \
-		BrowserWindow\ module \
-		CallbacksRegistry\ module \
-		clipboard\ module \
-		contentTracing \
-		debugger\ module \
-		deprecations \
-		desktopCapturer \
-		dialog\ module \
-		globalShortcut\ module \
-		ipc\ main\ module \
-		ipc\ renderer\ module \
-		MenuItems \
-		Menu\ module \
-		nativeImage\ module \
-		netLog\ module \
-		net\ module \
-		Notification\ module \
-		powerMonitor \
-		powerSaveBlocker\ module \
-		process\ module \
-		protocol\ module \
-		remote\ module \
-		screen\ module \
-		session\ module \
-		shell\ module \
-		renderer\ nodeIntegrationInSubFrames \
-		systemPreferences\ module \
-		TouchBar\ module \
-		tray\ module \
-		View \
-		WebContentsView \
-		webFrame\ module \
-		webRequest\ module \
-		asar\ package \
-		chrome\ api \
-		chromium\ feature \
-		font\ fallback \
-		chrome\ extension\ content\ scripts \
-		feature-string\ parsing \
-		modules\ support \
-		node\ feature \
-		security\ warnings \
-		bump-version\ utils \
-		bump-version\ script \
-		<webview>\ tag
-
-#		crashReporter\ module \
-#		inAppPurchase\ module \
diff --git a/devel/electron6/Makefile.version b/devel/electron6/Makefile.version
index 6b3ad0ade96..2ffcc538be3 100644
--- a/devel/electron6/Makefile.version
+++ b/devel/electron6/Makefile.version
@@ -1,4 +1,4 @@
 # $FreeBSD$
 
 ELECTRON_VER=	6.1.7
-ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/^([0-9]+)\..+$$/\1/}
+ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron6/files/patch-third__part_snappy_src_snappy.h b/devel/electron6/files/patch-third__party_snappy_src_snappy.h
similarity index 100%
rename from devel/electron6/files/patch-third__part_snappy_src_snappy.h
rename to devel/electron6/files/patch-third__party_snappy_src_snappy.h
diff --git a/devel/electron6/pkg-plist b/devel/electron6/pkg-plist
index a3ad105b534..73456e413aa 100644
--- a/devel/electron6/pkg-plist
+++ b/devel/electron6/pkg-plist
@@ -1,4 +1,4 @@
-bin/electron%%PKGNAMESUFFIX%%
+bin/electron%%ELECTRON_VER_MAJOR%%
 %%DATADIR%%/LICENSE
 %%DATADIR%%/LICENSES.chromium.html
 %%DATADIR%%/chrome_100_percent.pak
diff --git a/devel/emscripten/Makefile b/devel/emscripten/Makefile
index 11606c49a78..705e3473d80 100644
--- a/devel/emscripten/Makefile
+++ b/devel/emscripten/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	emscripten
-DISTVERSION=	1.39.7
+DISTVERSION=	1.39.8
 CATEGORIES=	devel www
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/emscripten/distinfo b/devel/emscripten/distinfo
index de13386ce59..fdb09d90687 100644
--- a/devel/emscripten/distinfo
+++ b/devel/emscripten/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580870784
-SHA256 (emscripten-core-emscripten-1.39.7_GH0.tar.gz) = 867cd69c27445dcbaedd6d753f27d6b06b677c9fe0924d965a1da1ea8ac031f2
-SIZE (emscripten-core-emscripten-1.39.7_GH0.tar.gz) = 33887312
+TIMESTAMP = 1581787872
+SHA256 (emscripten-core-emscripten-1.39.8_GH0.tar.gz) = bd370e3a34a597340d6bd38b6c036491e0a580b3bdc4be7e68078ec45092325f
+SIZE (emscripten-core-emscripten-1.39.8_GH0.tar.gz) = 33366896
diff --git a/devel/emscripten/pkg-plist b/devel/emscripten/pkg-plist
index e7a346eec51..2292a54d8e9 100644
--- a/devel/emscripten/pkg-plist
+++ b/devel/emscripten/pkg-plist
@@ -195,6 +195,7 @@ lib/emscripten/src/library_glut.js
 lib/emscripten/src/library_html5.js
 lib/emscripten/src/library_idbfs.js
 lib/emscripten/src/library_idbstore.js
+lib/emscripten/src/library_int53.js
 lib/emscripten/src/library_lz4.js
 lib/emscripten/src/library_memfs.js
 lib/emscripten/src/library_nodefs.js
@@ -800,6 +801,7 @@ lib/emscripten/system/lib/build_cxx_natively.sh
 lib/emscripten/system/lib/compiler-rt/CREDITS.TXT
 lib/emscripten/system/lib/compiler-rt/LICENSE.TXT
 lib/emscripten/system/lib/compiler-rt/extras.c
+lib/emscripten/system/lib/compiler-rt/filelist.txt
 lib/emscripten/system/lib/compiler-rt/lib/asan/asan.syms.extra
 lib/emscripten/system/lib/compiler-rt/lib/asan/asan_activation.cc
 lib/emscripten/system/lib/compiler-rt/lib/asan/asan_activation.h
@@ -939,6 +941,7 @@ lib/emscripten/system/lib/compiler-rt/lib/builtins/udivmodti4.c
 lib/emscripten/system/lib/compiler-rt/lib/builtins/udivti3.c
 lib/emscripten/system/lib/compiler-rt/lib/builtins/umoddi3.c
 lib/emscripten/system/lib/compiler-rt/lib/builtins/umodti3.c
+lib/emscripten/system/lib/compiler-rt/lib/builtins/unwind-ehabi-helpers.h
 lib/emscripten/system/lib/compiler-rt/lib/interception/interception.h
 lib/emscripten/system/lib/compiler-rt/lib/interception/interception_linux.cc
 lib/emscripten/system/lib/compiler-rt/lib/interception/interception_linux.h
@@ -2898,6 +2901,7 @@ lib/emscripten/system/lib/symbols/wasm/libpthread-mt.symbols
 lib/emscripten/system/lib/symbols/wasm/libpthread_stub-asan.symbols
 lib/emscripten/system/lib/symbols/wasm/libpthread_stub.symbols
 lib/emscripten/system/lib/test.cpp
+lib/emscripten/system/lib/update_compiler_rt.py
 lib/emscripten/system/lib/update_libcxx.py
 lib/emscripten/system/lib/update_libcxxabi.py
 lib/emscripten/system/lib/websocket/websocket_to_posix_socket.cpp
@@ -2939,218 +2943,6 @@ lib/emscripten/third_party/closure-compiler/node-externs/zlib.js
 lib/emscripten/third_party/cp-demangle.h
 lib/emscripten/third_party/demangle.h
 lib/emscripten/third_party/gcc_demangler.c
-lib/emscripten/third_party/html-minifier/LICENSE
-lib/emscripten/third_party/html-minifier/README.md
-lib/emscripten/third_party/html-minifier/cli.js
-lib/emscripten/third_party/html-minifier/node_modules/.bin/he
-lib/emscripten/third_party/html-minifier/node_modules/.bin/he.cmd
-lib/emscripten/third_party/html-minifier/node_modules/.bin/uglifyjs
-lib/emscripten/third_party/html-minifier/node_modules/.bin/uglifyjs.cmd
-lib/emscripten/third_party/html-minifier/node_modules/camel-case/LICENSE
-lib/emscripten/third_party/html-minifier/node_modules/camel-case/camel-case.d.ts
-lib/emscripten/third_party/html-minifier/node_modules/camel-case/camel-case.js
-lib/emscripten/third_party/html-minifier/node_modules/camel-case/package.json
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/History.md
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/LICENSE
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/README.md
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/index.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/clean.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/hack.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-0/optimize.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-1/optimize.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-1/shorten-hex.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-1/shorten-hsl.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-1/shorten-rgb.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-1/sort-selectors.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-1/tidy-at-rule.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-1/tidy-block.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-1/tidy-rules.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/break-up.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/can-override.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/clone.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/compactable.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/extract-properties.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/invalid-property-error.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/is-mergeable.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/merge-adjacent.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/merge-media-queries.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/merge-non-adjacent-by-body.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/merge-non-adjacent-by-selector.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/optimize.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/properties/every-values-pair.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/properties/find-component-in.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/properties/has-inherit.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/properties/is-component-of.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/properties/is-mergeable-shorthand.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/properties/merge-into-shorthands.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/properties/optimize.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/properties/override-properties.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/properties/overrides-non-component-shorthand.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/properties/populate-components.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/properties/understandable.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/properties/vendor-prefixes.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/reduce-non-adjacent.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/remove-duplicate-font-at-rules.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/remove-duplicate-media-queries.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/remove-duplicates.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/remove-unused-at-rules.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/reorderable.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/restore-with-components.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/restore.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/restructure.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/rules-overlap.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/specificities-overlap.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/specificity.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/level-2/tidy-rule-duplicates.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/remove-unused.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/restore-from-optimizing.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/validator.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/optimizer/wrap-for-optimizing.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/options/compatibility.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/options/fetch.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/options/format.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/options/inline-request.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/options/inline-timeout.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/options/inline.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/options/optimization-level.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/options/rebase-to.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/options/rebase.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/options/rounding-precision.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/reader/apply-source-maps.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/reader/extract-import-url-and-media.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/reader/input-source-map-tracker.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/reader/is-allowed-resource.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/reader/load-original-sources.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/reader/load-remote-resource.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/reader/match-data-uri.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/reader/normalize-path.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/reader/read-sources.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/reader/rebase-local-map.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/reader/rebase-remote-map.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/reader/rebase.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/reader/restore-import.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/reader/rewrite-url.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/tokenizer/marker.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/tokenizer/token.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/tokenizer/tokenize.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/utils/clone-array.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/utils/format-position.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/utils/has-protocol.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/utils/is-data-uri-resource.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/utils/is-http-resource.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/utils/is-https-resource.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/utils/is-import.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/utils/is-remote-resource.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/utils/natural-compare.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/utils/override.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/utils/split.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/writer/helpers.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/writer/one-time.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/writer/simple.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/lib/writer/source-maps.js
-lib/emscripten/third_party/html-minifier/node_modules/clean-css/package.json
-lib/emscripten/third_party/html-minifier/node_modules/commander/CHANGELOG.md
-lib/emscripten/third_party/html-minifier/node_modules/commander/LICENSE
-lib/emscripten/third_party/html-minifier/node_modules/commander/Readme.md
-lib/emscripten/third_party/html-minifier/node_modules/commander/index.js
-lib/emscripten/third_party/html-minifier/node_modules/commander/package.json
-lib/emscripten/third_party/html-minifier/node_modules/commander/typings/index.d.ts
-lib/emscripten/third_party/html-minifier/node_modules/he/LICENSE-MIT.txt
-lib/emscripten/third_party/html-minifier/node_modules/he/README.md
-lib/emscripten/third_party/html-minifier/node_modules/he/bin/he
-lib/emscripten/third_party/html-minifier/node_modules/he/he.js
-lib/emscripten/third_party/html-minifier/node_modules/he/man/he.1
-lib/emscripten/third_party/html-minifier/node_modules/he/package.json
-lib/emscripten/third_party/html-minifier/node_modules/lower-case/LICENSE
-lib/emscripten/third_party/html-minifier/node_modules/lower-case/README.md
-lib/emscripten/third_party/html-minifier/node_modules/lower-case/lower-case.d.ts
-lib/emscripten/third_party/html-minifier/node_modules/lower-case/lower-case.js
-lib/emscripten/third_party/html-minifier/node_modules/lower-case/package.json
-lib/emscripten/third_party/html-minifier/node_modules/no-case/LICENSE
-lib/emscripten/third_party/html-minifier/node_modules/no-case/README.md
-lib/emscripten/third_party/html-minifier/node_modules/no-case/no-case.d.ts
-lib/emscripten/third_party/html-minifier/node_modules/no-case/no-case.js
-lib/emscripten/third_party/html-minifier/node_modules/no-case/package.json
-lib/emscripten/third_party/html-minifier/node_modules/no-case/vendor/camel-case-regexp.js
-lib/emscripten/third_party/html-minifier/node_modules/no-case/vendor/camel-case-upper-regexp.js
-lib/emscripten/third_party/html-minifier/node_modules/no-case/vendor/non-word-regexp.js
-lib/emscripten/third_party/html-minifier/node_modules/param-case/LICENSE
-lib/emscripten/third_party/html-minifier/node_modules/param-case/README.md
-lib/emscripten/third_party/html-minifier/node_modules/param-case/package.json
-lib/emscripten/third_party/html-minifier/node_modules/param-case/param-case.d.ts
-lib/emscripten/third_party/html-minifier/node_modules/param-case/param-case.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/README.md
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/constants.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/format.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/index.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/options.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/parse/host.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/parse/hrefInfo.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/parse/index.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/parse/path.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/parse/port.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/parse/query.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/parse/urlstring.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/relate/absolutize.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/relate/findRelation.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/relate/index.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/relate/relativize.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/util/devlog.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/util/object.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/lib/util/path.js
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/license
-lib/emscripten/third_party/html-minifier/node_modules/relateurl/package.json
-lib/emscripten/third_party/html-minifier/node_modules/source-map/CHANGELOG.md
-lib/emscripten/third_party/html-minifier/node_modules/source-map/LICENSE
-lib/emscripten/third_party/html-minifier/node_modules/source-map/README.md
-lib/emscripten/third_party/html-minifier/node_modules/source-map/dist/source-map.debug.js
-lib/emscripten/third_party/html-minifier/node_modules/source-map/dist/source-map.js
-lib/emscripten/third_party/html-minifier/node_modules/source-map/dist/source-map.min.js
-lib/emscripten/third_party/html-minifier/node_modules/source-map/dist/source-map.min.js.map
-lib/emscripten/third_party/html-minifier/node_modules/source-map/lib/array-set.js
-lib/emscripten/third_party/html-minifier/node_modules/source-map/lib/base64-vlq.js
-lib/emscripten/third_party/html-minifier/node_modules/source-map/lib/base64.js
-lib/emscripten/third_party/html-minifier/node_modules/source-map/lib/binary-search.js
-lib/emscripten/third_party/html-minifier/node_modules/source-map/lib/mapping-list.js
-lib/emscripten/third_party/html-minifier/node_modules/source-map/lib/quick-sort.js
-lib/emscripten/third_party/html-minifier/node_modules/source-map/lib/source-map-consumer.js
-lib/emscripten/third_party/html-minifier/node_modules/source-map/lib/source-map-generator.js
-lib/emscripten/third_party/html-minifier/node_modules/source-map/lib/source-node.js
-lib/emscripten/third_party/html-minifier/node_modules/source-map/lib/util.js
-lib/emscripten/third_party/html-minifier/node_modules/source-map/package.json
-lib/emscripten/third_party/html-minifier/node_modules/source-map/source-map.d.ts
-lib/emscripten/third_party/html-minifier/node_modules/source-map/source-map.js
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/LICENSE
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/README.md
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/bin/uglifyjs
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/lib/ast.js
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/lib/compress.js
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/lib/minify.js
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/lib/mozilla-ast.js
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/lib/output.js
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/lib/parse.js
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/lib/propmangle.js
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/lib/scope.js
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/lib/sourcemap.js
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/lib/transform.js
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/lib/utils.js
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/package.json
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/tools/domprops.json
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/tools/exit.js
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/tools/exports.js
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/tools/node.js
-lib/emscripten/third_party/html-minifier/node_modules/uglify-js/tools/props.html
-lib/emscripten/third_party/html-minifier/node_modules/upper-case/LICENSE
-lib/emscripten/third_party/html-minifier/node_modules/upper-case/README.md
-lib/emscripten/third_party/html-minifier/node_modules/upper-case/package.json
-lib/emscripten/third_party/html-minifier/node_modules/upper-case/upper-case.d.ts
-lib/emscripten/third_party/html-minifier/node_modules/upper-case/upper-case.js
-lib/emscripten/third_party/html-minifier/package.json
-lib/emscripten/third_party/html-minifier/sample-cli-config-file.conf
-lib/emscripten/third_party/html-minifier/src/htmlminifier.js
-lib/emscripten/third_party/html-minifier/src/htmlparser.js
-lib/emscripten/third_party/html-minifier/src/tokenchain.js
-lib/emscripten/third_party/html-minifier/src/utils.js
 lib/emscripten/third_party/jni/emjvm.cpp
 lib/emscripten/third_party/jni/emjvm.h
 lib/emscripten/third_party/jni/emjvm.js
diff --git a/devel/gh/Makefile b/devel/gh/Makefile
index d27f0ac143e..da82c74f61d 100644
--- a/devel/gh/Makefile
+++ b/devel/gh/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gh
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.4
+DISTVERSION=	0.5.5
 CATEGORIES=	devel
 
 MAINTAINER=	vulcan@wired.sh
@@ -63,7 +63,7 @@ PORTDOCS=	README.md
 OPTIONS_DEFINE=	DOCS
 
 post-build:
-.for shell in bash zsh fish
+.for shell in bash fish zsh 
 	${WRKDIR}/bin/${PORTNAME} completion -s ${shell} > ${WRKSRC}/${shell}
 .endfor
 
diff --git a/devel/gh/distinfo b/devel/gh/distinfo
index 20b13e98144..ac9f14701d7 100644
--- a/devel/gh/distinfo
+++ b/devel/gh/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1581591387
-SHA256 (cli-cli-v0.5.4_GH0.tar.gz) = eacf8dcc085e0a65a76bbc94b8501fd7c2b37e511dd2e24361c02e80e87ba642
-SIZE (cli-cli-v0.5.4_GH0.tar.gz) = 174930
+TIMESTAMP = 1581675418
+SHA256 (cli-cli-v0.5.5_GH0.tar.gz) = 7c2cfdafe765a598b70b3e6de839590e8fa30a89bedc85799a43bdbc6fd3277e
+SIZE (cli-cli-v0.5.5_GH0.tar.gz) = 176434
 SHA256 (AlecAivazis-survey-v2.0.4_GH0.tar.gz) = 6beef8372a03c7461901640ff349214104a27ef36ff8a86416bee01c6794fb1e
 SIZE (AlecAivazis-survey-v2.0.4_GH0.tar.gz) = 1324023
 SHA256 (alecthomas-chroma-v0.6.8_GH0.tar.gz) = b76b5ea13171f286cdb28f2942784fafa69adf8e120ed4e68cd05484428a09b1
diff --git a/devel/jetbrains-clion/Makefile b/devel/jetbrains-clion/Makefile
index f543f2f39bb..dfb09b4c05d 100644
--- a/devel/jetbrains-clion/Makefile
+++ b/devel/jetbrains-clion/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	clion
-PORTVERSION=	2019.3.2
+PORTVERSION=	2019.3.4
 CATEGORIES=	devel java
 MASTER_SITES=	https://download-cf.jetbrains.com/cpp/
 PKGNAMEPREFIX=	jetbrains-
diff --git a/devel/jetbrains-clion/distinfo b/devel/jetbrains-clion/distinfo
index c7dc469538c..936c6f6b41a 100644
--- a/devel/jetbrains-clion/distinfo
+++ b/devel/jetbrains-clion/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576954456
-SHA256 (jetbrains/CLion-2019.3.2.tar.gz) = 31d2ed8927dd163a4b8ff8a46bf57ad585ba96ec1814838cb77d2d26448f7a2a
-SIZE (jetbrains/CLion-2019.3.2.tar.gz) = 504918530
+TIMESTAMP = 1581669573
+SHA256 (jetbrains/CLion-2019.3.4.tar.gz) = adb76d1d5b13b5fae3e3953c953ee16f3342ef36af404fc2873b9dc9d2190d72
+SIZE (jetbrains/CLion-2019.3.4.tar.gz) = 508450142
diff --git a/devel/jetbrains-clion/pkg-plist b/devel/jetbrains-clion/pkg-plist
index 3c2b9df9bc5..65917755765 100644
--- a/devel/jetbrains-clion/pkg-plist
+++ b/devel/jetbrains-clion/pkg-plist
@@ -116,7 +116,7 @@ share/applications/clion.desktop
 %%DATADIR%%/lib/intellij-dvcs.jar
 %%DATADIR%%/lib/intellij-test-discovery-agent-1.0.508.jar
 %%DATADIR%%/lib/intellij-xml.jar
-%%DATADIR%%/lib/ion-java-1.5.0-1.jar
+%%DATADIR%%/lib/ion-java-1.5.2-2.jar
 %%DATADIR%%/lib/isorelax-20030108.jar
 %%DATADIR%%/lib/istack-commons-runtime-3.0.7.jar
 %%DATADIR%%/lib/j2objc-annotations-1.1.jar
@@ -135,7 +135,7 @@ share/applications/clion.desktop
 %%DATADIR%%/lib/jbcrypt-1.0.0.jar
 %%DATADIR%%/lib/jcip-annotations-1.0.jar
 %%DATADIR%%/lib/jdom.jar
-%%DATADIR%%/lib/jediterm-pty-2.22.jar
+%%DATADIR%%/lib/jediterm-pty-2.24.jar
 %%DATADIR%%/lib/jetCheck-0.2.1.jar
 %%DATADIR%%/lib/jettison-1.4.0.jar
 %%DATADIR%%/lib/jing-20030619.jar
@@ -156,7 +156,6 @@ share/applications/clion.desktop
 %%DATADIR%%/lib/jshell-frontend.jar
 %%DATADIR%%/lib/json.jar
 %%DATADIR%%/lib/jsoup-1.12.1.jar
-%%DATADIR%%/lib/jsp-api.jar
 %%DATADIR%%/lib/jsr305.jar
 %%DATADIR%%/lib/junit-4.12.jar
 %%DATADIR%%/lib/jzlib-1.1.3.jar
@@ -223,7 +222,6 @@ share/applications/clion.desktop
 %%DATADIR%%/lib/rngom-20051226-patched.jar
 %%DATADIR%%/lib/sa-jdwp-1.13.jar
 %%DATADIR%%/lib/serviceMessages-2019.1.4.jar
-%%DATADIR%%/lib/servlet-api.jar
 %%DATADIR%%/lib/slf4j-api-1.7.25.jar
 %%DATADIR%%/lib/slf4j-log4j12-1.7.25.jar
 %%DATADIR%%/lib/snakeyaml-1.24.jar
@@ -299,6 +297,7 @@ share/applications/clion.desktop
 %%DATADIR%%/plugins/DatabaseTools/lib/dekaf-single-2.0.0.390.jar
 %%DATADIR%%/plugins/DatabaseTools/lib/jdbc-console.jar
 %%DATADIR%%/plugins/DatabaseTools/lib/resources_en.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/tips-database-plugin-193.15.jar
 %%DATADIR%%/plugins/DatabaseTools/lib/unidecode-0.0.7.jar
 %%DATADIR%%/plugins/IntelliLang/lib/IntelliLang.jar
 %%DATADIR%%/plugins/IntelliLang/lib/intellilang-jps-plugin.jar
@@ -1459,6 +1458,7 @@ share/applications/clion.desktop
 %%DATADIR%%/plugins/python-ce/helpers/pydev/pydev_tests_python/resources/_debugger_case_breakpoint_condition_exc.py
 %%DATADIR%%/plugins/python-ce/helpers/pydev/pydev_tests_python/resources/_debugger_case_breakpoint_remote.py
 %%DATADIR%%/plugins/python-ce/helpers/pydev/pydev_tests_python/resources/_debugger_case_breakpoint_remote_no_import.py
+%%DATADIR%%/plugins/python-ce/helpers/pydev/pydev_tests_python/resources/_debugger_case_bytecode_overflow.py
 %%DATADIR%%/plugins/python-ce/helpers/pydev/pydev_tests_python/resources/_debugger_case_change_breaks.py
 %%DATADIR%%/plugins/python-ce/helpers/pydev/pydev_tests_python/resources/_debugger_case_check_tracer.py
 %%DATADIR%%/plugins/python-ce/helpers/pydev/pydev_tests_python/resources/_debugger_case_event_ext.py
diff --git a/devel/jetbrains-goland/Makefile b/devel/jetbrains-goland/Makefile
index e8021780c53..88f8e3851a1 100644
--- a/devel/jetbrains-goland/Makefile
+++ b/devel/jetbrains-goland/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	goland
-PORTVERSION=	2019.3.1
+PORTVERSION=	2019.3.2
 CATEGORIES=	devel java
 MASTER_SITES=	https://download-cf.jetbrains.com/go/
 PKGNAMEPREFIX=	jetbrains-
@@ -15,7 +15,8 @@ LICENSE_NAME=	Subscription license agreement for business and organizations
 LICENSE_TEXT=	See: https://www.jetbrains.com/store/license.html
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
-RUN_DEPENDS=	intellij-fsnotifier>0:java/intellij-fsnotifier
+RUN_DEPENDS=	intellij-fsnotifier>0:java/intellij-fsnotifier \
+		delve>0:devel/delve
 
 USES=		python:run shebangfix
 
@@ -44,6 +45,7 @@ do-install:
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \
 		"! -name *\.so ! -name *\.dll ! -name *\.dylib ! -name *\.pdb ! -name *\.sh")
 	@(cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR} "-name *\.sh")
+	@${LN} -sf ${PREFIX}/bin/dlv ${STAGEDIR}${DATADIR}/plugins/go/lib/dlv/linux/dlv
 	${INSTALL_SCRIPT} ${WRKDIR}/goland ${STAGEDIR}${PREFIX}/bin/goland
 	${INSTALL_MAN} ${FILESDIR}/goland.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKDIR}/goland.desktop ${STAGEDIR}${PREFIX}/share/applications/
diff --git a/devel/jetbrains-goland/distinfo b/devel/jetbrains-goland/distinfo
index 3c059c2c87e..c7189e10fc9 100644
--- a/devel/jetbrains-goland/distinfo
+++ b/devel/jetbrains-goland/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579393465
-SHA256 (jetbrains/goland-2019.3.1.tar.gz) = 0d1461b8e80aeb48d6bd9dc7be8e4892c71ba7410b116c36efa90a6ec38945d2
-SIZE (jetbrains/goland-2019.3.1.tar.gz) = 366271112
+TIMESTAMP = 1581006540
+SHA256 (jetbrains/goland-2019.3.2.tar.gz) = 4901e7c6c61dd052f8740210de3d92247a6a58d8b912bd5f13a654d710db5559
+SIZE (jetbrains/goland-2019.3.2.tar.gz) = 369471609
diff --git a/devel/jetbrains-goland/pkg-plist b/devel/jetbrains-goland/pkg-plist
index fe57546c7cd..dccacf57438 100644
--- a/devel/jetbrains-goland/pkg-plist
+++ b/devel/jetbrains-goland/pkg-plist
@@ -86,7 +86,7 @@ share/applications/goland.desktop
 %%DATADIR%%/lib/intellij-dvcs.jar
 %%DATADIR%%/lib/intellij-test-discovery-agent-1.0.508.jar
 %%DATADIR%%/lib/intellij-xml.jar
-%%DATADIR%%/lib/ion-java-1.5.0-1.jar
+%%DATADIR%%/lib/ion-java-1.5.2-2.jar
 %%DATADIR%%/lib/isorelax-20030108.jar
 %%DATADIR%%/lib/istack-commons-runtime-3.0.7.jar
 %%DATADIR%%/lib/j2objc-annotations-1.1.jar
@@ -122,7 +122,6 @@ share/applications/goland.desktop
 %%DATADIR%%/lib/json.jar
 %%DATADIR%%/lib/jsoup-1.12.1.jar
 %%DATADIR%%/lib/jsoup-1.8.3.jar
-%%DATADIR%%/lib/jsp-api.jar
 %%DATADIR%%/lib/jsr305.jar
 %%DATADIR%%/lib/junit-4.12.jar
 %%DATADIR%%/lib/jzlib-1.1.3.jar
@@ -183,7 +182,6 @@ share/applications/goland.desktop
 %%DATADIR%%/lib/rhino-1.7.11.jar
 %%DATADIR%%/lib/rngom-20051226-patched.jar
 %%DATADIR%%/lib/serviceMessages-2019.1.4.jar
-%%DATADIR%%/lib/servlet-api.jar
 %%DATADIR%%/lib/slf4j-api-1.7.25.jar
 %%DATADIR%%/lib/slf4j-log4j12-1.7.25.jar
 %%DATADIR%%/lib/snakeyaml-1.24.jar
@@ -253,6 +251,7 @@ share/applications/goland.desktop
 %%DATADIR%%/plugins/DatabaseTools/lib/dekaf-single-2.0.0.390.jar
 %%DATADIR%%/plugins/DatabaseTools/lib/jdbc-console.jar
 %%DATADIR%%/plugins/DatabaseTools/lib/resources_en.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/tips-database-plugin-193.7.jar
 %%DATADIR%%/plugins/DatabaseTools/lib/unidecode-0.0.7.jar
 %%DATADIR%%/plugins/Docker/lib/Docker-agent-api-rt.jar
 %%DATADIR%%/plugins/Docker/lib/Docker-compose.jar
diff --git a/devel/libphonenumber/Makefile b/devel/libphonenumber/Makefile
index 5a3cb2fe013..fe43a30d412 100644
--- a/devel/libphonenumber/Makefile
+++ b/devel/libphonenumber/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libphonenumber
 DISTVERSIONPREFIX=	v
-DISTVERSION=	8.11.3
+DISTVERSION=	8.11.4
 CATEGORIES=	devel
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/libphonenumber/distinfo b/devel/libphonenumber/distinfo
index 230e6be854d..22a5cf2fa03 100644
--- a/devel/libphonenumber/distinfo
+++ b/devel/libphonenumber/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580319208
-SHA256 (googlei18n-libphonenumber-v8.11.3_GH0.tar.gz) = 2f2044238338fb781a6529168862fc9ebabf26f91bfee68ef9a2385a5c75c5ca
-SIZE (googlei18n-libphonenumber-v8.11.3_GH0.tar.gz) = 7556952
+TIMESTAMP = 1581708982
+SHA256 (googlei18n-libphonenumber-v8.11.4_GH0.tar.gz) = 8c7b76c4c06da0695661f87a5c2bddba863a7727e06c24c0879ef10fd8dca902
+SIZE (googlei18n-libphonenumber-v8.11.4_GH0.tar.gz) = 7557156
diff --git a/devel/libvterm/Makefile b/devel/libvterm/Makefile
index 8f0388e1c08..f4cecfe454d 100644
--- a/devel/libvterm/Makefile
+++ b/devel/libvterm/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.1.1
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpad.net/libvterm/trunk/v0.1/+download/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	aaron.kaufman@pm.me
 COMMENT=	Implementation of a VT220/xterm/ECMA-48 terminal emulator
 
 LICENSE=	MIT
diff --git a/devel/llvm10/Makefile b/devel/llvm10/Makefile
index 1961815f719..20042691772 100644
--- a/devel/llvm10/Makefile
+++ b/devel/llvm10/Makefile
@@ -64,14 +64,14 @@ CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
 CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
-OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS ELFV2 EXTRAS LIT LLD LLD_LINK 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 LLD_LINK LLDB PYCLANG
 OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
-OPTIONS_DEFAULT_powerpc64=	${PPC_ABI:tu:MELFV2} OPENMP
+OPTIONS_DEFAULT_powerpc64=	OPENMP
 OPTIONS_SINGLE=		BACKENDS
 OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD
 OPTIONS_SUB=	yes
@@ -111,9 +111,6 @@ DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
 			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
 			-DLLVM_BUILD_DOCS=ON
 DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
-ELFV2_DESC=		[PowerPC64] Use OpenPOWER ELF ABI v2 by default
-ELFV2_EXTRA_PATCHES=	${PATCHDIR}/ppc64-elfv2
-ELFV2_IMPLIES=		CLANG
 EXTRAS_DESC=		Extra clang tools
 EXTRAS_EXTRA_PATCHES=	${PATCHDIR}/extras
 EXTRAS_IMPLIES=		CLANG
diff --git a/devel/llvm10/files/ppc64-elfv2/patch-lib_Target_PowerPC_PPCTargetMachine.cpp b/devel/llvm10/files/ppc64-elfv2/patch-lib_Target_PowerPC_PPCTargetMachine.cpp
deleted file mode 100644
index b0a1482581c..00000000000
--- a/devel/llvm10/files/ppc64-elfv2/patch-lib_Target_PowerPC_PPCTargetMachine.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- lib/Target/PowerPC/PPCTargetMachine.cpp.orig	2019-07-04 07:43:51 UTC
-+++ lib/Target/PowerPC/PPCTargetMachine.cpp
-@@ -209,6 +209,20 @@ static PPCTargetMachine::PPCABI computeTargetABI(const
-   if (TT.isMacOSX())
-     return PPCTargetMachine::PPC_ABI_UNKNOWN;
- 
-+  if (TT.isOSFreeBSD()) {
-+    switch (TT.getArch()) {
-+    case Triple::ppc64le:
-+    case Triple::ppc64:
-+      if (TT.getOSMajorVersion() >= 13)
-+        return PPCTargetMachine::PPC_ABI_ELFv2;
-+      else
-+        return PPCTargetMachine::PPC_ABI_ELFv1;
-+    case Triple::ppc:
-+    default:
-+      return PPCTargetMachine::PPC_ABI_UNKNOWN;
-+    }
-+  }
-+
-   switch (TT.getArch()) {
-   case Triple::ppc64le:
-     return PPCTargetMachine::PPC_ABI_ELFv2;
diff --git a/devel/llvm10/files/ppc64-elfv2/patch-tools_clang_lib_Basic_Targets_PPC.h b/devel/llvm10/files/ppc64-elfv2/patch-tools_clang_lib_Basic_Targets_PPC.h
deleted file mode 100644
index 5b6460a0afb..00000000000
--- a/devel/llvm10/files/ppc64-elfv2/patch-tools_clang_lib_Basic_Targets_PPC.h
+++ /dev/null
@@ -1,34 +0,0 @@
---- tools/clang/lib/Basic/Targets/PPC.h.orig	2019-07-09 13:32:26 UTC
-+++ tools/clang/lib/Basic/Targets/PPC.h
-@@ -374,12 +374,29 @@ class LLVM_LIBRARY_VISIBILITY PPC64TargetInfo : public
-     IntMaxType = SignedLong;
-     Int64Type = SignedLong;
- 
-+    if (Triple.getEnvironment() != llvm::Triple::UnknownEnvironment) {
-+      switch (Triple.getEnvironment()){
-+        case llvm::Triple::ELFv1:
-+          ABI = "elfv1";
-+          break;
-+	default:
-+          ABI = "elfv2";
-+	break;
-+      }
-+    } else {
-+      if ((Triple.getOS() == llvm::Triple::FreeBSD) &&
-+	      (Triple.getOSMajorVersion() < 13)) {
-+        ABI = "elfv1";
-+      } else {
-+        ABI = "elfv2";
-+      }
-+    }
-+
-+
-     if ((Triple.getArch() == llvm::Triple::ppc64le)) {
-       resetDataLayout("e-m:e-i64:64-n32:64");
--      ABI = "elfv2";
-     } else {
-       resetDataLayout("E-m:e-i64:64-n32:64");
--      ABI = Triple.getEnvironment() == llvm::Triple::ELFv2 ? "elfv2" : "elfv1";
-     }
- 
-     if (Triple.getOS() == llvm::Triple::AIX)
diff --git a/devel/mutagen/Makefile b/devel/mutagen/Makefile
index 8d43cce8fdc..956c5bd6920 100644
--- a/devel/mutagen/Makefile
+++ b/devel/mutagen/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mutagen
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.10.3
+DISTVERSION=	0.11.0
 CATEGORIES=	devel net
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -16,34 +16,53 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	havoc-io
 GH_TUPLE=	\
 		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
-		Microsoft:go-winio:3fe4fa31662f:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
+		Microsoft:go-winio:v0.4.14:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
 		bmatcuk:doublestar:v1.1.1:bmatcuk_doublestar/vendor/github.com/bmatcuk/doublestar \
+		cheekybits:genny:v1.0.0:cheekybits_genny/vendor/github.com/cheekybits/genny \
+		dgrijalva:jwt-go:v3.2.0:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \
 		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
 		eknkc:basex:v1.0.0:eknkc_basex/vendor/github.com/eknkc/basex \
-		fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \
-		go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		golang:crypto:b43e412143f9:golang_crypto/vendor/golang.org/x/crypto \
-		golang:groupcache:5b532d6fd5ef:golang_groupcache/vendor/github.com/golang/groupcache \
-		golang:net:f3200d17e092:golang_net/vendor/golang.org/x/net \
-		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:f0ce4c0180be:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
+		fatih:color:v1.9.0:fatih_color/vendor/github.com/fatih/color \
+		go-yaml:yaml:v2.2.8:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		golang:crypto:e9b2fee46413:golang_crypto/vendor/golang.org/x/crypto \
+		golang:groupcache:8c9f03a8e57e:golang_groupcache/vendor/github.com/golang/groupcache \
+		golang:net:c0dbc17a3553:golang_net/vendor/golang.org/x/net \
+		golang:protobuf:v1.3.3:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sys:d101bd2416d5:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
 		google:go-genproto:24fa4b261c55:google_go_genproto/vendor/google.golang.org/genproto \
 		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
-		grpc:grpc-go:v1.25.1:grpc_grpc_go/vendor/google.golang.org/grpc \
-		hashicorp:yamux:2f1d1f20f75d:hashicorp_yamux/vendor/github.com/hashicorp/yamux \
+		grpc:grpc-go:v1.27.1:grpc_grpc_go/vendor/google.golang.org/grpc \
+		hashicorp:yamux:df201c70410d:hashicorp_yamux/vendor/github.com/hashicorp/yamux \
 		hectane:go-acl:e28f47eff0c4:hectane_go_acl/vendor/github.com/hectane/go-acl \
 		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
 		kubernetes:apimachinery:6a84e37a896d:kubernetes_apimachinery/vendor/k8s.io/apimachinery \
 		kubernetes:klog:v0.3.0:kubernetes_klog/vendor/k8s.io/klog \
-		mattn:go-colorable:v0.1.1:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
-		mattn:go-isatty:v0.0.7:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		lucas-clemente:quic-go:907071221cf9:lucas_clemente_quic_go/vendor/github.com/lucas-clemente/quic-go \
+		marten-seemann:qtls:v0.2.3:marten_seemann_qtls/vendor/github.com/marten-seemann/qtls \
+		mattn:go-colorable:v0.1.4:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
+		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		mutagen-io:fsevents:10556809b434:mutagen_io_fsevents/vendor/github.com/mutagen-io/fsevents \
 		mutagen-io:gopass:9a121bec1ae7:mutagen_io_gopass/vendor/github.com/mutagen-io/gopass \
-		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
+		pion:datachannel:v1.4.14:pion_datachannel/vendor/github.com/pion/datachannel \
+		pion:dtls:v2.0.0-rc.3:pion_dtls/vendor/github.com/pion/dtls/v2 \
+		pion:ice:v0.7.6:pion_ice/vendor/github.com/pion/ice \
+		pion:logging:v0.2.2:pion_logging/vendor/github.com/pion/logging \
+		pion:mdns:v0.0.4:pion_mdns/vendor/github.com/pion/mdns \
+		pion:quic:v0.1.1:pion_quic/vendor/github.com/pion/quic \
+		pion:rtcp:v1.2.1:pion_rtcp/vendor/github.com/pion/rtcp \
+		pion:rtp:v1.1.4:pion_rtp/vendor/github.com/pion/rtp \
+		pion:sctp:v1.7.4:pion_sctp/vendor/github.com/pion/sctp \
+		pion:sdp:v2.3.1:pion_sdp/vendor/github.com/pion/sdp/v2 \
+		pion:srtp:v1.2.6:pion_srtp/vendor/github.com/pion/srtp \
+		pion:stun:v0.3.3:pion_stun/vendor/github.com/pion/stun \
+		pion:transport:v0.8.10:pion_transport/vendor/github.com/pion/transport \
+		pion:turn:v1.4.0:pion_turn/vendor/github.com/pion/turn \
+		pion:webrtc:v2.1.18:pion_webrtc/vendor/github.com/pion/webrtc/v2 \
+		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
 		shibukawa:extstat:4113c04d0977:shibukawa_extstat/vendor/github.com/shibukawa/extstat \
 		spf13:cobra:b04b5bfc50cb:spf13_cobra/vendor/github.com/spf13/cobra \
-		spf13:pflag:v1.0.3:spf13_pflag/vendor/github.com/spf13/pflag
+		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag
 
 GO_TARGET=	./cmd/mutagen \
 		./cmd/mutagen-agent
diff --git a/devel/mutagen/distinfo b/devel/mutagen/distinfo
index 350c393d136..a858a7b6e27 100644
--- a/devel/mutagen/distinfo
+++ b/devel/mutagen/distinfo
@@ -1,40 +1,44 @@
-TIMESTAMP = 1579757854
-SHA256 (havoc-io-mutagen-v0.10.3_GH0.tar.gz) = fabd4a6322ca7c12ba21b4700ff9085ad82c50c85a8140be75245c66d375044d
-SIZE (havoc-io-mutagen-v0.10.3_GH0.tar.gz) = 428670
+TIMESTAMP = 1581743179
+SHA256 (havoc-io-mutagen-v0.11.0_GH0.tar.gz) = 6b3392a07b5981a548f0775b1fe1f635ecec4a0247d44b4da522cfa2355dc4a5
+SIZE (havoc-io-mutagen-v0.11.0_GH0.tar.gz) = 529075
 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
 SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
-SHA256 (Microsoft-go-winio-3fe4fa31662f_GH0.tar.gz) = 87160968e5dd148b82558177ab18ce8d908926207ee653096430a2ab8306211b
-SIZE (Microsoft-go-winio-3fe4fa31662f_GH0.tar.gz) = 113394
+SHA256 (Microsoft-go-winio-v0.4.14_GH0.tar.gz) = 379082e49fb22dfdd9a0ff57f8a6d6d7e97ba30fdc0159ef2f38dc4caa79fd8e
+SIZE (Microsoft-go-winio-v0.4.14_GH0.tar.gz) = 118053
 SHA256 (bmatcuk-doublestar-v1.1.1_GH0.tar.gz) = c5cc239fb46c44ee994a951be32350a6c74d2e8c0109ae7341b1463bc14c8552
 SIZE (bmatcuk-doublestar-v1.1.1_GH0.tar.gz) = 8241
+SHA256 (cheekybits-genny-v1.0.0_GH0.tar.gz) = 6982bf513333fb3ee3e6e0633500a3800fb6a3d6beb9e6c6084a96c85a49dd73
+SIZE (cheekybits-genny-v1.0.0_GH0.tar.gz) = 15585
+SHA256 (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 197465ef53219f3aeb1a6940b70e16d288fe4e4108d4831b91ea101118440e63
+SIZE (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 36960
 SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba
 SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260
 SHA256 (eknkc-basex-v1.0.0_GH0.tar.gz) = 904c65d855663e45e27e7f2c301feb541f8dff4bd6912614a7b60e802da47cc0
 SIZE (eknkc-basex-v1.0.0_GH0.tar.gz) = 6130
-SHA256 (fatih-color-v1.7.0_GH0.tar.gz) = 4650d7aa3feed266fc85d91dc34ca9cffdf7ee03ea29bf2cbf84bbecc75fb755
-SIZE (fatih-color-v1.7.0_GH0.tar.gz) = 816449
-SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff
-SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656
-SHA256 (golang-crypto-b43e412143f9_GH0.tar.gz) = 70827acd3f227ce6016d917d4eacc0adc5ad29be32c69fac5e96a546cd5cd8f4
-SIZE (golang-crypto-b43e412143f9_GH0.tar.gz) = 1677404
-SHA256 (golang-groupcache-5b532d6fd5ef_GH0.tar.gz) = 1acc1dc0b21be31e4eab90b851b93fc8755d1482ed8adb33863820e209b3236a
-SIZE (golang-groupcache-5b532d6fd5ef_GH0.tar.gz) = 26044
-SHA256 (golang-net-f3200d17e092_GH0.tar.gz) = 5b7f3441206d18e92393ccfda8f9033d6c4500aeb31d45de1bbe2f0bccad0aed
-SIZE (golang-net-f3200d17e092_GH0.tar.gz) = 1096621
-SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
-SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
-SHA256 (golang-sys-f0ce4c0180be_GH0.tar.gz) = 5271945edbc14499167cf49b0815cb04de5b6bbc5fa167e07ee6186bdd2b186b
-SIZE (golang-sys-f0ce4c0180be_GH0.tar.gz) = 1351020
-SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
-SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
+SHA256 (fatih-color-v1.9.0_GH0.tar.gz) = f5a6372ff7c87d22baaa2089e5cdd8a218fb3a9be047195c0ab421d5340f6f3f
+SIZE (fatih-color-v1.9.0_GH0.tar.gz) = 1230941
+SHA256 (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 9632d0760e9a07c414f2b2b6cd453d6225e42ecea77906883b23f1f1d0546045
+SIZE (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 72732
+SHA256 (golang-crypto-e9b2fee46413_GH0.tar.gz) = f89e92c1a49c1ab6baa5bf6ffec24c4ad9884f29ede5bf97e7b6c82de320d3ba
+SIZE (golang-crypto-e9b2fee46413_GH0.tar.gz) = 1719160
+SHA256 (golang-groupcache-8c9f03a8e57e_GH0.tar.gz) = b92f918daa48048fd360f14d1a4aed6e70c1176ae6b00b0dc04094bb088e9865
+SIZE (golang-groupcache-8c9f03a8e57e_GH0.tar.gz) = 26047
+SHA256 (golang-net-c0dbc17a3553_GH0.tar.gz) = 67e59dfe55231f9a28b167c6b77d897ad503e599b60e0eec16a677a0c641bb93
+SIZE (golang-net-c0dbc17a3553_GH0.tar.gz) = 1172293
+SHA256 (golang-protobuf-v1.3.3_GH0.tar.gz) = b3a1440808d6ed4dc0d194c482de029f6c116b1de7f7a3bf927324d965ff3853
+SIZE (golang-protobuf-v1.3.3_GH0.tar.gz) = 315377
+SHA256 (golang-sys-d101bd2416d5_GH0.tar.gz) = c1de80d233d3df630ed34bf80cbb3f186199e7b5218726abe0234520c8eddb8b
+SIZE (golang-sys-d101bd2416d5_GH0.tar.gz) = 1537146
+SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
+SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
 SHA256 (google-go-genproto-24fa4b261c55_GH0.tar.gz) = 96481b64c5971de2dd22d7c6f764d2acbeb4cd85ab6166856284115c3f99238c
 SIZE (google-go-genproto-24fa4b261c55_GH0.tar.gz) = 5332241
 SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
 SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543
-SHA256 (grpc-grpc-go-v1.25.1_GH0.tar.gz) = d4c16d05bca2afb32001c2d2ed233c013374d09ecc2bd15894d098555a637316
-SIZE (grpc-grpc-go-v1.25.1_GH0.tar.gz) = 702242
-SHA256 (hashicorp-yamux-2f1d1f20f75d_GH0.tar.gz) = 9481b16c104ebac8dc992358826db2ddadab0993131627a689dbf1f7c572f755
-SIZE (hashicorp-yamux-2f1d1f20f75d_GH0.tar.gz) = 23277
+SHA256 (grpc-grpc-go-v1.27.1_GH0.tar.gz) = 2e25c66a7fe59a49d94d24280afabfbc563967e47c1e6d8df0a72aaf11fae6fb
+SIZE (grpc-grpc-go-v1.27.1_GH0.tar.gz) = 826728
+SHA256 (hashicorp-yamux-df201c70410d_GH0.tar.gz) = 01177e2efa7a30e982e996c972b7425853dd336215ccb5f2de47b2567bb5d04b
+SIZE (hashicorp-yamux-df201c70410d_GH0.tar.gz) = 23269
 SHA256 (hectane-go-acl-e28f47eff0c4_GH0.tar.gz) = 358dd4b776c5bf206f5c8a9491bdc671bba6fac49694187dbf60e2b78e78d117
 SIZE (hectane-go-acl-e28f47eff0c4_GH0.tar.gz) = 5935
 SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
@@ -43,19 +47,53 @@ SHA256 (kubernetes-apimachinery-6a84e37a896d_GH0.tar.gz) = ef47cc6f81df1fd25b45c
 SIZE (kubernetes-apimachinery-6a84e37a896d_GH0.tar.gz) = 473899
 SHA256 (kubernetes-klog-v0.3.0_GH0.tar.gz) = 702872aec3c4039cd4b6cc02359f24162570879600ae8ee4a9c2c7bcbbfd1564
 SIZE (kubernetes-klog-v0.3.0_GH0.tar.gz) = 28559
-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 (lucas-clemente-quic-go-907071221cf9_GH0.tar.gz) = 7263c61adfec649c8d10c82447c40831678b53dcc100f5de4028b94fd337daa9
+SIZE (lucas-clemente-quic-go-907071221cf9_GH0.tar.gz) = 321393
+SHA256 (marten-seemann-qtls-v0.2.3_GH0.tar.gz) = 3b66413b32475cac6c8a90d66f857738d2e8cdf8d440d2bb5a9107f0b86b3231
+SIZE (marten-seemann-qtls-v0.2.3_GH0.tar.gz) = 389521
+SHA256 (mattn-go-colorable-v0.1.4_GH0.tar.gz) = 157806ad8125e6bef4d9b58c9125ccb98a8343136f93faf442ab0cc6e7c24c11
+SIZE (mattn-go-colorable-v0.1.4_GH0.tar.gz) = 8981
+SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
+SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
 SHA256 (mutagen-io-fsevents-10556809b434_GH0.tar.gz) = d6f50a6f57e03bba86f93afe46159ed4b0378c550a86808adcdf956f6767c3df
 SIZE (mutagen-io-fsevents-10556809b434_GH0.tar.gz) = 12244
 SHA256 (mutagen-io-gopass-9a121bec1ae7_GH0.tar.gz) = cfa07ad25f202085cb6daf39c86dd2657cd154bc1eaf4b0ca25a3e763c147081
 SIZE (mutagen-io-gopass-9a121bec1ae7_GH0.tar.gz) = 11535
-SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
-SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
+SHA256 (pion-datachannel-v1.4.14_GH0.tar.gz) = 2e21e6ed32b21d4e7be4174b80108a24a352c4d4a191ed71127a3edab90183c3
+SIZE (pion-datachannel-v1.4.14_GH0.tar.gz) = 14526
+SHA256 (pion-dtls-v2.0.0-rc.3_GH0.tar.gz) = 9f3d638b4484aedf6656217da35d2743ea763359dd37545d98642ed02f4aa6c4
+SIZE (pion-dtls-v2.0.0-rc.3_GH0.tar.gz) = 90245
+SHA256 (pion-ice-v0.7.6_GH0.tar.gz) = 7674f7fbc776aa992576718ef32bbdd91ba24f7857745f85eacebe1e611ee997
+SIZE (pion-ice-v0.7.6_GH0.tar.gz) = 50921
+SHA256 (pion-logging-v0.2.2_GH0.tar.gz) = 9e06f3dbf6f4fcf0e61e3a6406cac898fe3df86cb906bc9d73c7c4b466f0a9d6
+SIZE (pion-logging-v0.2.2_GH0.tar.gz) = 6750
+SHA256 (pion-mdns-v0.0.4_GH0.tar.gz) = 1fb71d132214d55af39cfdfe85e7e3d9a0f38c365ce1c3d47ee75e041c4ab817
+SIZE (pion-mdns-v0.0.4_GH0.tar.gz) = 8341
+SHA256 (pion-quic-v0.1.1_GH0.tar.gz) = c09639cb93f6e24f8f323e40dc5e5335e768e3b3b0588532ce679c94b2566e8d
+SIZE (pion-quic-v0.1.1_GH0.tar.gz) = 10841
+SHA256 (pion-rtcp-v1.2.1_GH0.tar.gz) = 971676d5cf76f32ec39db5ed8951535ccce5240b586aa686b6e5374ab783d79a
+SIZE (pion-rtcp-v1.2.1_GH0.tar.gz) = 26595
+SHA256 (pion-rtp-v1.1.4_GH0.tar.gz) = 3a2b0ab533b0fb5227a2be4d755fc0cafccecf02ef21872387c3bfd0880fd93c
+SIZE (pion-rtp-v1.1.4_GH0.tar.gz) = 12882
+SHA256 (pion-sctp-v1.7.4_GH0.tar.gz) = f83f97082d0d79c79098a342664b5117e8206e8d440161f5db8f516046c3d569
+SIZE (pion-sctp-v1.7.4_GH0.tar.gz) = 73507
+SHA256 (pion-sdp-v2.3.1_GH0.tar.gz) = bacc64e3410b05279bffaedda3e5b2dc7fcb458a8dc76805e97e0e4baaf50204
+SIZE (pion-sdp-v2.3.1_GH0.tar.gz) = 20648
+SHA256 (pion-srtp-v1.2.6_GH0.tar.gz) = d75000c37f09d47428d2f78473b05364a8c5b7d1148afe024e2376e0084e9aa5
+SIZE (pion-srtp-v1.2.6_GH0.tar.gz) = 17680
+SHA256 (pion-stun-v0.3.3_GH0.tar.gz) = 9919d6f1106b19852ea454d8f942f5333e9b1390af8c5708f5b20f5c493ddbf2
+SIZE (pion-stun-v0.3.3_GH0.tar.gz) = 77153
+SHA256 (pion-transport-v0.8.10_GH0.tar.gz) = 073f6f76aba9c4e32bc21afabaf6f9f52cf68a8c5a6de92dfdcf367e4bdac1c4
+SIZE (pion-transport-v0.8.10_GH0.tar.gz) = 41561
+SHA256 (pion-turn-v1.4.0_GH0.tar.gz) = 224baf1e6c9fd5ebf3c803c7c0ece4d2f7c0fbe8c458fe30cb8cca64e8df7f4f
+SIZE (pion-turn-v1.4.0_GH0.tar.gz) = 106230
+SHA256 (pion-webrtc-v2.1.18_GH0.tar.gz) = 6b1d152176945eb37356c3cf87b9401b60a822304c7af59b4c6a042dbf6ce9a4
+SIZE (pion-webrtc-v2.1.18_GH0.tar.gz) = 241907
+SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
+SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
 SHA256 (shibukawa-extstat-4113c04d0977_GH0.tar.gz) = 6dba027f8384f684daed3548c47811d32ac96601d24253c4292e1c697a756c1e
 SIZE (shibukawa-extstat-4113c04d0977_GH0.tar.gz) = 2339
 SHA256 (spf13-cobra-b04b5bfc50cb_GH0.tar.gz) = ffaa3c3e12340066ba95ac498a4af5da2ca83732e4d522c8a4a96d05422cb859
 SIZE (spf13-cobra-b04b5bfc50cb_GH0.tar.gz) = 116935
-SHA256 (spf13-pflag-v1.0.3_GH0.tar.gz) = 9e57f86f493f04d9077fccd04e7139ebf243dd544e917ab83d35729b3e54a124
-SIZE (spf13-pflag-v1.0.3_GH0.tar.gz) = 46002
+SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
+SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
diff --git a/devel/nextpnr/Makefile b/devel/nextpnr/Makefile
index 1b7a9602738..ec90d511a03 100644
--- a/devel/nextpnr/Makefile
+++ b/devel/nextpnr/Makefile
@@ -11,6 +11,8 @@ COMMENT=	Portable FPGA place and route tool
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+NOT_FOR_ARCHS=	i386
+NOT_FOR_ARCHS_REASON=	clang segfault
 BROKEN_FreeBSD_11_powerpc64=	runaway build
 BROKEN_FreeBSD_12_powerpc64=	runaway build
 
diff --git a/devel/p5-Log-Any-Adapter-Callback/Makefile b/devel/p5-Log-Any-Adapter-Callback/Makefile
index 81fb6a45cd1..098c86870ed 100644
--- a/devel/p5-Log-Any-Adapter-Callback/Makefile
+++ b/devel/p5-Log-Any-Adapter-Callback/Makefile
@@ -13,7 +13,7 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 DEPRECATED=	Use devel/p5-Log-Any (Log::Any::Adapter::Capture) instead
-EXPIRATION_DATE=2020-01-31
+EXPIRATION_DATE=2020-03-31
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Log-Any>0:devel/p5-Log-Any
diff --git a/devel/p5-Term-Choose-Util/Makefile b/devel/p5-Term-Choose-Util/Makefile
index 5cf5ab8c038..04e3a8202dd 100644
--- a/devel/p5-Term-Choose-Util/Makefile
+++ b/devel/p5-Term-Choose-Util/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Term-Choose-Util
-PORTVERSION=	0.112
+PORTVERSION=	0.113
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Term-Choose-Util/distinfo b/devel/p5-Term-Choose-Util/distinfo
index 8b7cf536385..2907cbeb2e2 100644
--- a/devel/p5-Term-Choose-Util/distinfo
+++ b/devel/p5-Term-Choose-Util/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580918745
-SHA256 (Term-Choose-Util-0.112.tar.gz) = 3dffb1e9f7e42de53c78b81123c40e268c37b31b70ef5f2038e44edd6744abe4
-SIZE (Term-Choose-Util-0.112.tar.gz) = 23271
+TIMESTAMP = 1581688146
+SHA256 (Term-Choose-Util-0.113.tar.gz) = 87290b03dc92a80770300b9bc9421fbf291ae884397b48bcec99603238edd015
+SIZE (Term-Choose-Util-0.113.tar.gz) = 23368
diff --git a/devel/pecl-protobuf/Makefile b/devel/pecl-protobuf/Makefile
index 78d545d0235..97d5bbda0db 100644
--- a/devel/pecl-protobuf/Makefile
+++ b/devel/pecl-protobuf/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	protobuf
-PORTVERSION=	3.11.3
+PORTVERSION=	3.11.4
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/devel/pecl-protobuf/distinfo b/devel/pecl-protobuf/distinfo
index 345e9c26148..03dfd205d01 100644
--- a/devel/pecl-protobuf/distinfo
+++ b/devel/pecl-protobuf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580830455
-SHA256 (PECL/protobuf-3.11.3.tgz) = 363d302991ce2ef7b63f2e1e24ae75fd7e245d24ce567ac65e44d12bc1c224b5
-SIZE (PECL/protobuf-3.11.3.tgz) = 218341
+TIMESTAMP = 1581775751
+SHA256 (PECL/protobuf-3.11.4.tgz) = 7d55bd13cb7c26bdea2b374e8a77d325651ed7da2d77875810221048b94bb29d
+SIZE (PECL/protobuf-3.11.4.tgz) = 218396
diff --git a/devel/py-azure-core/Makefile b/devel/py-azure-core/Makefile
new file mode 100644
index 00000000000..8d86763a726
--- /dev/null
+++ b/devel/py-azure-core/Makefile
@@ -0,0 +1,23 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	azure-core
+PORTVERSION=	1.2.2
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Microsoft Azure Core Library for Python
+
+LICENSE=	MIT
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.6:devel/py-six@${PY_FLAVOR}
+
+USES=		python zip
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/py-azure-core/distinfo b/devel/py-azure-core/distinfo
new file mode 100644
index 00000000000..8c2e9096d36
--- /dev/null
+++ b/devel/py-azure-core/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1581594046
+SHA256 (azure-core-1.2.2.zip) = 8bdb12b8e937c5bdf495faadf7741ea1958436e2d24c9c5ca7bd7a5ca7a9e42f
+SIZE (azure-core-1.2.2.zip) = 176412
diff --git a/devel/py-azure-core/pkg-descr b/devel/py-azure-core/pkg-descr
new file mode 100644
index 00000000000..be04964fa8f
--- /dev/null
+++ b/devel/py-azure-core/pkg-descr
@@ -0,0 +1,4 @@
+Azure core library defines basic exceptions and shared modules those are needed
+when you use client libraries.
+
+WWW: https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/core/azure-core
diff --git a/devel/py-btest/Makefile b/devel/py-btest/Makefile
index d2e4608f78c..6c17d0499b0 100644
--- a/devel/py-btest/Makefile
+++ b/devel/py-btest/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	btest
-DISTVERSION=	0.58
-PORTREVISION=	1
+DISTVERSION=	0.61
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-btest/distinfo b/devel/py-btest/distinfo
index 1793d71f255..da773d9aa37 100644
--- a/devel/py-btest/distinfo
+++ b/devel/py-btest/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538170397
-SHA256 (btest-0.58.tar.gz) = 632f88977e1091cec2edf853826c8b0233f6839a6bf490217e3947d8ba342402
-SIZE (btest-0.58.tar.gz) = 68811
+TIMESTAMP = 1581861489
+SHA256 (btest-0.61.tar.gz) = 8d8ee1723a3a55406911b3771ba5ae5247a5c34bf17c2222531660f1f4cad30c
+SIZE (btest-0.61.tar.gz) = 79765
diff --git a/devel/py-glance-store/Makefile b/devel/py-glance-store/Makefile
index 712582fa495..87bee9870b7 100644
--- a/devel/py-glance-store/Makefile
+++ b/devel/py-glance-store/Makefile
@@ -3,13 +3,13 @@
 
 PORTNAME=	glance-store
 PORTVERSION=	0.23.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	glance_store-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	OpenStack Image Service Store Library
 
 LICENSE=	APACHE20
@@ -43,8 +43,7 @@ OPTIONS_DEFAULT=	CINDER VMWARE
 CINDER_DESC=	Storage backend for OpenStack Cinder storage nodes
 VMWARE_DESC=	Storage backend for VMware Datastore
 
-CINDER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-cinderclient>=3.3.0:net/py-python-cinderclient@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}os-brick>=2.3.4:devel/py-os-brick@${PY_FLAVOR} \
+CINDER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}os-brick>=2.3.4:devel/py-os-brick@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.8.0:devel/py-oslo.rootwrap@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.23.0:devel/py-oslo.privsep@${PY_FLAVOR}
 VMWARE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oslo.vmware>=2.17.0:devel/py-oslo.vmware@${PY_FLAVOR}
@@ -57,4 +56,14 @@ post-patch:
 		${WRKSRC}/glance_store/_drivers/vmware_datastore.py \
 		${WRKSRC}/glance_store/tests/unit/test_cinder_store.py
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MCINDER}
+.if ${PYTHON_REL} < 3600
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}python-cinderclient5>=3.3.0:net/py-python-cinderclient5@${PY_FLAVOR}
+.else
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}python-cinderclient>=3.3.0:net/py-python-cinderclient@${PY_FLAVOR}
+.endif
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/py-grpcio-tools/Makefile b/devel/py-grpcio-tools/Makefile
index 192cf7641b3..b002a678e89 100644
--- a/devel/py-grpcio-tools/Makefile
+++ b/devel/py-grpcio-tools/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grpcio-tools
-PORTVERSION=	1.27.1
+PORTVERSION=	1.27.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-grpcio-tools/distinfo b/devel/py-grpcio-tools/distinfo
index f07ee982ba9..e8507a8f226 100644
--- a/devel/py-grpcio-tools/distinfo
+++ b/devel/py-grpcio-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581173426
-SHA256 (grpcio-tools-1.27.1.tar.gz) = e29aa3f7a47d37f8a15605e97bec580baa6bb7ead7114b8d2f20d7b28da30c5c
-SIZE (grpcio-tools-1.27.1.tar.gz) = 1983976
+TIMESTAMP = 1581752144
+SHA256 (grpcio-tools-1.27.2.tar.gz) = 845a51305af9fc7f9e2078edaec9a759153195f6cf1fbb12b1fa6f077e56b260
+SIZE (grpcio-tools-1.27.2.tar.gz) = 1983884
diff --git a/devel/py-grpcio/Makefile b/devel/py-grpcio/Makefile
index 0b88bdaa700..d08d2be75d1 100644
--- a/devel/py-grpcio/Makefile
+++ b/devel/py-grpcio/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grpcio
-PORTVERSION=	1.27.1
+PORTVERSION=	1.27.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-grpcio/distinfo b/devel/py-grpcio/distinfo
index fcbfa73d297..fdf01c87497 100644
--- a/devel/py-grpcio/distinfo
+++ b/devel/py-grpcio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581170734
-SHA256 (grpcio-1.27.1.tar.gz) = a899725d34769a498ecd3be154021c4368dd22bdc69473f6ec46779696f626c4
-SIZE (grpcio-1.27.1.tar.gz) = 16873666
+TIMESTAMP = 1581750933
+SHA256 (grpcio-1.27.2.tar.gz) = 5ae532b93cf9ce5a2a549b74a2c35e3b690b171ece9358519b3039c7b84c887e
+SIZE (grpcio-1.27.2.tar.gz) = 16873766
diff --git a/devel/py-jaraco.classes/Makefile b/devel/py-jaraco.classes/Makefile
index b42911328d2..817cdfb4b4d 100644
--- a/devel/py-jaraco.classes/Makefile
+++ b/devel/py-jaraco.classes/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jaraco.classes
-PORTVERSION=	2.0
+PORTVERSION=	3.1.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/devel/py-jaraco.classes/distinfo b/devel/py-jaraco.classes/distinfo
index 05943572381..b6e1b53d44d 100644
--- a/devel/py-jaraco.classes/distinfo
+++ b/devel/py-jaraco.classes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546453251
-SHA256 (jaraco.classes-2.0.tar.gz) = dcc2c4a8ca4b344cdbf2e1be7124a5c4f192574cdbb453b62350ae8240a2caf5
-SIZE (jaraco.classes-2.0.tar.gz) = 9911
+TIMESTAMP = 1581688150
+SHA256 (jaraco.classes-3.1.0.tar.gz) = c38698ff8ef932eb33d91c0e8fc192ad7c44ecee03f7f585afd4f35aeaef7aab
+SIZE (jaraco.classes-3.1.0.tar.gz) = 11616
diff --git a/devel/py-jaraco.context/Makefile b/devel/py-jaraco.context/Makefile
index c8826c0b3c0..fd46ab52bf6 100644
--- a/devel/py-jaraco.context/Makefile
+++ b/devel/py-jaraco.context/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jaraco.context
-PORTVERSION=	2.0
+PORTVERSION=	3.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,19 +16,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 POST_PLIST=	trim-jaraco-namespace
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}contextlib2>=0:devel/py-contextlib2@${PY_FLAVOR}
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/jaraco.apt/d; /yg.lockfile/d' ${WRKSRC}/setup.cfg
 
@@ -40,4 +34,4 @@ post-install:
 trim-jaraco-namespace:
 	@${REINPLACE_CMD} '/jaraco\/__init__\./d; /jaraco\/__pycache__\/__init__\./d' ${TMPPLIST}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-jaraco.context/distinfo b/devel/py-jaraco.context/distinfo
index 08e6e8f88b4..98a582e1bd6 100644
--- a/devel/py-jaraco.context/distinfo
+++ b/devel/py-jaraco.context/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546769646
-SHA256 (jaraco.context-2.0.tar.gz) = dc71afa2f0d6829234272a26aade99856db8b26d01ee6edb2b5027570c12b0d1
-SIZE (jaraco.context-2.0.tar.gz) = 11231
+TIMESTAMP = 1581688152
+SHA256 (jaraco.context-3.0.0.tar.gz) = 0b7ddaf9bbed03bf5d1f77365bd4b7265c1bc9f52e58a4442cbd1e3a3827f8a9
+SIZE (jaraco.context-3.0.0.tar.gz) = 12901
diff --git a/devel/py-jaraco.context/files/patch-jaraco-context.py b/devel/py-jaraco.context/files/patch-jaraco-context.py
index 61fc801eebb..f3f8c52555e 100644
--- a/devel/py-jaraco.context/files/patch-jaraco-context.py
+++ b/devel/py-jaraco.context/files/patch-jaraco-context.py
@@ -1,110 +1,125 @@
---- jaraco/context.py.orig	2019-01-01 15:43:21 UTC
+--- jaraco/context.py.orig	2020-01-10 08:37:17 UTC
 +++ jaraco/context.py
-@@ -13,9 +13,6 @@ try:
+@@ -13,10 +13,7 @@ try:
  except Exception:
- 	import contextlib as contextlib2
+     import contextlib as contextlib2
  
 -import jaraco.apt
 -import yg.lockfile
--
  
+-
  __metaclass__ = type
  
-@@ -58,46 +55,6 @@ def data_lines_from_file(filename):
- 	return filter(None, strip_comments(file_lines_if_exists(filename)))
+ 
+@@ -58,111 +55,11 @@ def data_lines_from_file(filename):
+     return filter(None, strip_comments(file_lines_if_exists(filename)))
  
  
 -def run():
--	"""
--	Run a command in the context of the system dependencies.
--	"""
--	parser = argparse.ArgumentParser()
--	parser.add_argument(
--		'--deps-def',
--		default=data_lines_from_file("system deps.txt")
--		+ data_lines_from_file("build deps.txt"),
--		help="A file specifying the dependencies (one per line)",
--		type=data_lines_from_file, dest="spec_deps")
--	parser.add_argument(
--		'--dep', action="append", default=[],
--		help="A specific dependency (multiple allowed)", dest="deps")
--	parser.add_argument(
--		'command', type=shlex.split,
--		default=shlex.split("python2.7 setup.py test"),
--		help="Command to invoke in the context of the dependencies")
--	parser.add_argument(
--		'--do-not-remove', default=False, action="store_true",
--		help="Keep any installed packages")
--	parser.add_argument(
--		'--aggressively-remove', default=False,
--		action="store_true",
--		help="When removing packages, also remove those automatically installed"
--		" as dependencies")
--	parser.add_argument(
--		'-l', '--log-level', default=logging.INFO,
--		type=log_level, help="Set log level (DEBUG, INFO, WARNING, ERROR)")
--	args = parser.parse_args()
--	logging.basicConfig(level=args.log_level)
--	context = dependency_context(
--		args.spec_deps + args.deps,
--		aggressively_remove=args.aggressively_remove)
--	with context as to_remove:
--		if args.do_not_remove:
--			del to_remove[:]
--		raise SystemExit(subprocess.Popen(args.command).wait())
+-    """
+-    Run a command in the context of the system dependencies.
+-    """
+-    parser = argparse.ArgumentParser()
+-    parser.add_argument(
+-        '--deps-def',
+-        default=data_lines_from_file("system deps.txt")
+-        + data_lines_from_file("build deps.txt"),
+-        help="A file specifying the dependencies (one per line)",
+-        type=data_lines_from_file,
+-        dest="spec_deps",
+-    )
+-    parser.add_argument(
+-        '--dep',
+-        action="append",
+-        default=[],
+-        help="A specific dependency (multiple allowed)",
+-        dest="deps",
+-    )
+-    parser.add_argument(
+-        'command',
+-        type=shlex.split,
+-        default=shlex.split("python2.7 setup.py test"),
+-        help="Command to invoke in the context of the dependencies",
+-    )
+-    parser.add_argument(
+-        '--do-not-remove',
+-        default=False,
+-        action="store_true",
+-        help="Keep any installed packages",
+-    )
+-    parser.add_argument(
+-        '--aggressively-remove',
+-        default=False,
+-        action="store_true",
+-        help="When removing packages, also remove those automatically installed"
+-        " as dependencies",
+-    )
+-    parser.add_argument(
+-        '-l',
+-        '--log-level',
+-        default=logging.INFO,
+-        type=log_level,
+-        help="Set log level (DEBUG, INFO, WARNING, ERROR)",
+-    )
+-    args = parser.parse_args()
+-    logging.basicConfig(level=args.log_level)
+-    context = dependency_context(
+-        args.spec_deps + args.deps, aggressively_remove=args.aggressively_remove
+-    )
+-    with context as to_remove:
+-        if args.do_not_remove:
+-            del to_remove[:]
+-        raise SystemExit(subprocess.Popen(args.command).wait())
 -
 -
  def log_level(level_string):
- 	"""
- 	Return a log level for a string
-@@ -106,50 +63,6 @@ def log_level(level_string):
- 
- 
- @contextlib.contextmanager
--def dependency_context(package_names, aggressively_remove=False):
--	"""
--	Install the supplied packages and yield. Finally, remove all packages
--	that were installed.
--	Currently assumes 'aptitude' is available.
--	"""
--	installed_packages = []
--	log = logging.getLogger(__name__)
--	try:
--		if not package_names:
--			logging.debug('No packages requested')
--		if package_names:
--			lock = yg.lockfile.FileLock(
--				'/tmp/.pkg-context-lock',
--				timeout=30 * 60)
--			log.info('Acquiring lock to perform install')
--			lock.acquire()
--			log.info('Installing ' + ', '.join(package_names))
--			output = subprocess.check_output(
--				['sudo', 'aptitude', 'install', '-y'] + package_names,
--				stderr=subprocess.STDOUT,
--			)
--			log.debug('Aptitude output:\n%s', output)
--			installed_packages = jaraco.apt.parse_new_packages(
--				output,
--				include_automatic=aggressively_remove)
--			if not installed_packages:
--				lock.release()
--			log.info('Installed ' + ', '.join(installed_packages))
--		yield installed_packages
--	except subprocess.CalledProcessError:
--		log.error("Error occurred installing packages")
--		raise
--	finally:
--		if installed_packages:
--			log.info('Removing ' + ','.join(installed_packages))
--			subprocess.check_call(
--				['sudo', 'aptitude', 'remove', '-y'] + installed_packages,
--				stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
--			)
--			lock.release()
+     """
+     Return a log level for a string
+     """
+     return getattr(logging, level_string.upper())
 -
 -
 -@contextlib.contextmanager
- def pushd(dir):
- 	orig = os.getcwd()
- 	os.chdir(dir)
+-def dependency_context(package_names, aggressively_remove=False):
+-    """
+-    Install the supplied packages and yield. Finally, remove all packages
+-    that were installed.
+-    Currently assumes 'aptitude' is available.
+-    """
+-    installed_packages = []
+-    log = logging.getLogger(__name__)
+-    try:
+-        if not package_names:
+-            logging.debug('No packages requested')
+-        if package_names:
+-            lock = yg.lockfile.FileLock('/tmp/.pkg-context-lock', timeout=30 * 60)
+-            log.info('Acquiring lock to perform install')
+-            lock.acquire()
+-            log.info('Installing ' + ', '.join(package_names))
+-            output = subprocess.check_output(
+-                ['sudo', 'aptitude', 'install', '-y'] + package_names,
+-                stderr=subprocess.STDOUT,
+-            )
+-            log.debug('Aptitude output:\n%s', output)
+-            installed_packages = jaraco.apt.parse_new_packages(
+-                output, include_automatic=aggressively_remove
+-            )
+-            if not installed_packages:
+-                lock.release()
+-            log.info('Installed ' + ', '.join(installed_packages))
+-        yield installed_packages
+-    except subprocess.CalledProcessError:
+-        log.error("Error occurred installing packages")
+-        raise
+-    finally:
+-        if installed_packages:
+-            log.info('Removing ' + ','.join(installed_packages))
+-            subprocess.check_call(
+-                ['sudo', 'aptitude', 'remove', '-y'] + installed_packages,
+-                stdout=subprocess.PIPE,
+-                stderr=subprocess.STDOUT,
+-            )
+-            lock.release()
+ 
+ 
+ @contextlib.contextmanager
diff --git a/devel/py-jaraco.context2/Makefile b/devel/py-jaraco.context2/Makefile
new file mode 100644
index 00000000000..24945c53dc9
--- /dev/null
+++ b/devel/py-jaraco.context2/Makefile
@@ -0,0 +1,46 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	jaraco.context
+PORTVERSION=	2.0
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	2
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Context managers by jaraco
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+POST_PLIST=	trim-jaraco-namespace
+
+PORTSCOUT=	limit:^2\.
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3000
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}contextlib2>=0:devel/py-contextlib2@${PY_FLAVOR}
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e '/jaraco.apt/d; /yg.lockfile/d' ${WRKSRC}/setup.cfg
+
+post-install:
+	@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__init__.py*
+	-@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__/__init__.*
+	-@${RMDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__
+
+trim-jaraco-namespace:
+	@${REINPLACE_CMD} '/jaraco\/__init__\./d; /jaraco\/__pycache__\/__init__\./d' ${TMPPLIST}
+
+.include <bsd.port.post.mk>
diff --git a/devel/py-jaraco.context2/distinfo b/devel/py-jaraco.context2/distinfo
new file mode 100644
index 00000000000..08e6e8f88b4
--- /dev/null
+++ b/devel/py-jaraco.context2/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1546769646
+SHA256 (jaraco.context-2.0.tar.gz) = dc71afa2f0d6829234272a26aade99856db8b26d01ee6edb2b5027570c12b0d1
+SIZE (jaraco.context-2.0.tar.gz) = 11231
diff --git a/devel/py-jaraco.context2/files/patch-jaraco-context.py b/devel/py-jaraco.context2/files/patch-jaraco-context.py
new file mode 100644
index 00000000000..61fc801eebb
--- /dev/null
+++ b/devel/py-jaraco.context2/files/patch-jaraco-context.py
@@ -0,0 +1,110 @@
+--- jaraco/context.py.orig	2019-01-01 15:43:21 UTC
++++ jaraco/context.py
+@@ -13,9 +13,6 @@ try:
+ except Exception:
+ 	import contextlib as contextlib2
+ 
+-import jaraco.apt
+-import yg.lockfile
+-
+ 
+ __metaclass__ = type
+ 
+@@ -58,46 +55,6 @@ def data_lines_from_file(filename):
+ 	return filter(None, strip_comments(file_lines_if_exists(filename)))
+ 
+ 
+-def run():
+-	"""
+-	Run a command in the context of the system dependencies.
+-	"""
+-	parser = argparse.ArgumentParser()
+-	parser.add_argument(
+-		'--deps-def',
+-		default=data_lines_from_file("system deps.txt")
+-		+ data_lines_from_file("build deps.txt"),
+-		help="A file specifying the dependencies (one per line)",
+-		type=data_lines_from_file, dest="spec_deps")
+-	parser.add_argument(
+-		'--dep', action="append", default=[],
+-		help="A specific dependency (multiple allowed)", dest="deps")
+-	parser.add_argument(
+-		'command', type=shlex.split,
+-		default=shlex.split("python2.7 setup.py test"),
+-		help="Command to invoke in the context of the dependencies")
+-	parser.add_argument(
+-		'--do-not-remove', default=False, action="store_true",
+-		help="Keep any installed packages")
+-	parser.add_argument(
+-		'--aggressively-remove', default=False,
+-		action="store_true",
+-		help="When removing packages, also remove those automatically installed"
+-		" as dependencies")
+-	parser.add_argument(
+-		'-l', '--log-level', default=logging.INFO,
+-		type=log_level, help="Set log level (DEBUG, INFO, WARNING, ERROR)")
+-	args = parser.parse_args()
+-	logging.basicConfig(level=args.log_level)
+-	context = dependency_context(
+-		args.spec_deps + args.deps,
+-		aggressively_remove=args.aggressively_remove)
+-	with context as to_remove:
+-		if args.do_not_remove:
+-			del to_remove[:]
+-		raise SystemExit(subprocess.Popen(args.command).wait())
+-
+-
+ def log_level(level_string):
+ 	"""
+ 	Return a log level for a string
+@@ -106,50 +63,6 @@ def log_level(level_string):
+ 
+ 
+ @contextlib.contextmanager
+-def dependency_context(package_names, aggressively_remove=False):
+-	"""
+-	Install the supplied packages and yield. Finally, remove all packages
+-	that were installed.
+-	Currently assumes 'aptitude' is available.
+-	"""
+-	installed_packages = []
+-	log = logging.getLogger(__name__)
+-	try:
+-		if not package_names:
+-			logging.debug('No packages requested')
+-		if package_names:
+-			lock = yg.lockfile.FileLock(
+-				'/tmp/.pkg-context-lock',
+-				timeout=30 * 60)
+-			log.info('Acquiring lock to perform install')
+-			lock.acquire()
+-			log.info('Installing ' + ', '.join(package_names))
+-			output = subprocess.check_output(
+-				['sudo', 'aptitude', 'install', '-y'] + package_names,
+-				stderr=subprocess.STDOUT,
+-			)
+-			log.debug('Aptitude output:\n%s', output)
+-			installed_packages = jaraco.apt.parse_new_packages(
+-				output,
+-				include_automatic=aggressively_remove)
+-			if not installed_packages:
+-				lock.release()
+-			log.info('Installed ' + ', '.join(installed_packages))
+-		yield installed_packages
+-	except subprocess.CalledProcessError:
+-		log.error("Error occurred installing packages")
+-		raise
+-	finally:
+-		if installed_packages:
+-			log.info('Removing ' + ','.join(installed_packages))
+-			subprocess.check_call(
+-				['sudo', 'aptitude', 'remove', '-y'] + installed_packages,
+-				stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+-			)
+-			lock.release()
+-
+-
+-@contextlib.contextmanager
+ def pushd(dir):
+ 	orig = os.getcwd()
+ 	os.chdir(dir)
diff --git a/devel/py-jaraco.context2/pkg-descr b/devel/py-jaraco.context2/pkg-descr
new file mode 100644
index 00000000000..3bbcaaf7749
--- /dev/null
+++ b/devel/py-jaraco.context2/pkg-descr
@@ -0,0 +1,3 @@
+jaraco.context provides context managers.
+
+WWW: https://github.com/jaraco/jaraco.context
diff --git a/devel/py-jaraco.functools/Makefile b/devel/py-jaraco.functools/Makefile
index e1eab2f10a3..dbc7e57fd79 100644
--- a/devel/py-jaraco.functools/Makefile
+++ b/devel/py-jaraco.functools/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jaraco.functools
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	3.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,27 +14,16 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}more-itertools>=2.7:devel/py-more-itertools@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 POST_PLIST=	trim-jaraco-namespace
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=1.0.3:devel/py-backports.functools_lru_cache@${PY_FLAVOR}
-.endif
-
-.if ${PYTHON_REL} >= 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}more-itertools>=2.7:devel/py-more-itertools@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}more-itertools5>=2.7:devel/py-more-itertools5@${PY_FLAVOR}
-.endif
-
 post-install:
 	@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__init__.py*
 	-@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__/__init__.*
@@ -44,4 +32,4 @@ post-install:
 trim-jaraco-namespace:
 	@${REINPLACE_CMD} '/jaraco\/__init__\./d; /jaraco\/__pycache__\/__init__\./d' ${TMPPLIST}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-jaraco.functools/distinfo b/devel/py-jaraco.functools/distinfo
index b35d92d1552..effe2ce0d7d 100644
--- a/devel/py-jaraco.functools/distinfo
+++ b/devel/py-jaraco.functools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546456795
-SHA256 (jaraco.functools-2.0.tar.gz) = 35ba944f52b1a7beee8843a5aa6752d1d5b79893eeb7770ea98be6b637bf9345
-SIZE (jaraco.functools-2.0.tar.gz) = 14340
+TIMESTAMP = 1581688154
+SHA256 (jaraco.functools-3.0.0.tar.gz) = 5cb0eea0f254584241c519641328a4d4ec2001a86c3cd6d17a8fd228493f6d97
+SIZE (jaraco.functools-3.0.0.tar.gz) = 15618
diff --git a/devel/py-jaraco.functools2/Makefile b/devel/py-jaraco.functools2/Makefile
new file mode 100644
index 00000000000..37f93ab245e
--- /dev/null
+++ b/devel/py-jaraco.functools2/Makefile
@@ -0,0 +1,49 @@
+# Created by: Mark Felder <feld@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	jaraco.functools
+PORTVERSION=	2.0
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	2
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Additional functools for Python
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+POST_PLIST=	trim-jaraco-namespace
+
+PORTSCOUT=	limit:^2\.
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3000
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=1.0.3:devel/py-backports.functools_lru_cache@${PY_FLAVOR}
+.endif
+
+.if ${PYTHON_REL} >= 3400
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}more-itertools>=2.7:devel/py-more-itertools@${PY_FLAVOR}
+.else
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}more-itertools5>=2.7:devel/py-more-itertools5@${PY_FLAVOR}
+.endif
+
+post-install:
+	@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__init__.py*
+	-@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__/__init__.*
+	-@${RMDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__
+
+trim-jaraco-namespace:
+	@${REINPLACE_CMD} '/jaraco\/__init__\./d; /jaraco\/__pycache__\/__init__\./d' ${TMPPLIST}
+
+.include <bsd.port.post.mk>
diff --git a/devel/py-jaraco.functools2/distinfo b/devel/py-jaraco.functools2/distinfo
new file mode 100644
index 00000000000..b35d92d1552
--- /dev/null
+++ b/devel/py-jaraco.functools2/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1546456795
+SHA256 (jaraco.functools-2.0.tar.gz) = 35ba944f52b1a7beee8843a5aa6752d1d5b79893eeb7770ea98be6b637bf9345
+SIZE (jaraco.functools-2.0.tar.gz) = 14340
diff --git a/devel/py-jaraco.functools2/pkg-descr b/devel/py-jaraco.functools2/pkg-descr
new file mode 100644
index 00000000000..b2ae391a343
--- /dev/null
+++ b/devel/py-jaraco.functools2/pkg-descr
@@ -0,0 +1,3 @@
+Additional functools in the spirit of stdlib's functools.
+
+WWW: https://github.com/jaraco/jaraco.functools
diff --git a/devel/py-jaraco.logging/Makefile b/devel/py-jaraco.logging/Makefile
index 1246a87b095..9280ecd80b3 100644
--- a/devel/py-jaraco.logging/Makefile
+++ b/devel/py-jaraco.logging/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jaraco.logging
-PORTVERSION=	2.0
+PORTVERSION=	3.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tempora>=0:devel/py-tempora@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/devel/py-jaraco.logging/distinfo b/devel/py-jaraco.logging/distinfo
index 039dd799d74..95c7696fa6c 100644
--- a/devel/py-jaraco.logging/distinfo
+++ b/devel/py-jaraco.logging/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546456799
-SHA256 (jaraco.logging-2.0.tar.gz) = 8f7dbf01b75e4d9bac479312b66a94c80d0a6d28db453f397e30687ca42168d1
-SIZE (jaraco.logging-2.0.tar.gz) = 10356
+TIMESTAMP = 1581688156
+SHA256 (jaraco.logging-3.0.0.tar.gz) = 31716fe84d3d5df39d95572942513bd4bf8ae0a478f64031eff4c2ea9e83434e
+SIZE (jaraco.logging-3.0.0.tar.gz) = 10739
diff --git a/devel/py-jaraco.util/Makefile b/devel/py-jaraco.util/Makefile
index c7d7fbf80c9..3fbdf3e23ce 100644
--- a/devel/py-jaraco.util/Makefile
+++ b/devel/py-jaraco.util/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jaraco.util
 PORTVERSION=	13.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,6 @@ LICENSE=	MIT
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}contextlib2>=0:devel/py-contextlib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jaraco.context>=0:devel/py-jaraco.context@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR}
 
 USES=		python
@@ -25,6 +25,14 @@ NO_ARCH=	yes
 
 POST_PLIST=	trim-jaraco-namespace
 
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3600
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}jaraco.context2>=0:devel/py-jaraco.context2@${PY_FLAVOR}
+.else
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}jaraco.context>=0:devel/py-jaraco.context@${PY_FLAVOR}
+.endif
+
 post-install:
 	@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__init__.py*
 	-@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__/__init__.*
@@ -33,4 +41,4 @@ post-install:
 trim-jaraco-namespace:
 	@${REINPLACE_CMD} '/jaraco\/__init__\./d; /jaraco\/__pycache__\/__init__\./d' ${TMPPLIST}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/py-jellyfish/Makefile b/devel/py-jellyfish/Makefile
index 6cf4355cf43..3e632c93975 100644
--- a/devel/py-jellyfish/Makefile
+++ b/devel/py-jellyfish/Makefile
@@ -6,13 +6,13 @@ CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library for doing approximate and phonetic matching of strings
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	autoplist concurrent distutils
 
 .include <bsd.port.mk>
diff --git a/devel/py-jellyfish/pkg-descr b/devel/py-jellyfish/pkg-descr
index 0eea149c0e5..ac2622b1683 100644
--- a/devel/py-jellyfish/pkg-descr
+++ b/devel/py-jellyfish/pkg-descr
@@ -1,4 +1,4 @@
 Jellyfish is a python library for doing approximate and phonetic matching of
 strings.
 
-WWW: https://github.com/sunlightlabs/jellyfish
+WWW: https://github.com/jamesturk/jellyfish
diff --git a/devel/py-jsonpickle/Makefile b/devel/py-jsonpickle/Makefile
index b39d76bf494..390f493ef5a 100644
--- a/devel/py-jsonpickle/Makefile
+++ b/devel/py-jsonpickle/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	jsonpickle
-DISTVERSION=	1.2
+DISTVERSION=	1.3
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-jsonpickle/distinfo b/devel/py-jsonpickle/distinfo
index 8ee23e7ef92..5a7e50f4dab 100644
--- a/devel/py-jsonpickle/distinfo
+++ b/devel/py-jsonpickle/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559975349
-SHA256 (jsonpickle-1.2.tar.gz) = d3e922d781b1d0096df2dad89a2e1f47177d7969b596aea806a9d91b4626b29b
-SIZE (jsonpickle-1.2.tar.gz) = 74693
+TIMESTAMP = 1581781179
+SHA256 (jsonpickle-1.3.tar.gz) = 71bca2b80ae28af4e3f86629ef247100af7f97032b5ca8d791c1f8725b411d95
+SIZE (jsonpickle-1.3.tar.gz) = 76571
diff --git a/devel/py-libtaxii/Makefile b/devel/py-libtaxii/Makefile
index f6e6c71a9c8..0ff687d0163 100644
--- a/devel/py-libtaxii/Makefile
+++ b/devel/py-libtaxii/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libtaxii
-PORTVERSION=	1.1.115
+PORTVERSION=	1.1.116
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/devel/py-libtaxii/distinfo b/devel/py-libtaxii/distinfo
index faefd1096b3..d8659e9b1f6 100644
--- a/devel/py-libtaxii/distinfo
+++ b/devel/py-libtaxii/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573649204
-SHA256 (TAXIIProject-libtaxii-1.1.115_GH0.tar.gz) = 4c27d93df32cf2c012010c3eec06556d0cb3a01ad0adb2117eede13826b9172c
-SIZE (TAXIIProject-libtaxii-1.1.115_GH0.tar.gz) = 121211
+TIMESTAMP = 1581775755
+SHA256 (TAXIIProject-libtaxii-1.1.116_GH0.tar.gz) = 70efc624ce454b1eae7a345c1d0851c5a98bfcd0f7d581d3cec3a23b0c2bf7fe
+SIZE (TAXIIProject-libtaxii-1.1.116_GH0.tar.gz) = 121323
diff --git a/devel/py-oslo.limit/Makefile b/devel/py-oslo.limit/Makefile
index b78fddb713d..a1227cf9734 100644
--- a/devel/py-oslo.limit/Makefile
+++ b/devel/py-oslo.limit/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	oslo.limit
-PORTVERSION=	0.3.0
+PORTVERSION=	1.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.9.0:devel/py-keystoneauth1@
 		${PYTHON_PKGNAMEPREFIX}oslo.log>=3.44.0:devel/py-oslo.log@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/devel/py-oslo.limit/distinfo b/devel/py-oslo.limit/distinfo
index 830e4f0cea1..3dc9ca4c54e 100644
--- a/devel/py-oslo.limit/distinfo
+++ b/devel/py-oslo.limit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581007144
-SHA256 (oslo.limit-0.3.0.tar.gz) = 72e13da8840db4b6878d7277eee559dc9160d14ed88af11f2fcaf57ae07460c0
-SIZE (oslo.limit-0.3.0.tar.gz) = 20181
+TIMESTAMP = 1581688158
+SHA256 (oslo.limit-1.0.0.tar.gz) = a5ccdc0e094d7d29a10510230a69396d5c7cb6f0dc98d59175856e648c09d383
+SIZE (oslo.limit-1.0.0.tar.gz) = 20373
diff --git a/devel/py-oslo.policy/Makefile b/devel/py-oslo.policy/Makefile
index 425e3ee3878..34c0857f44a 100644
--- a/devel/py-oslo.policy/Makefile
+++ b/devel/py-oslo.policy/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	oslo.policy
-PORTVERSION=	2.4.1
+PORTVERSION=	3.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/devel/py-oslo.policy/distinfo b/devel/py-oslo.policy/distinfo
index 4928df9bdce..c7b2e25c8b2 100644
--- a/devel/py-oslo.policy/distinfo
+++ b/devel/py-oslo.policy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577145763
-SHA256 (oslo.policy-2.4.1.tar.gz) = c2a2e334688e10831129303d636e5511ea0ec12ebe02826a7911195cf1f3acae
-SIZE (oslo.policy-2.4.1.tar.gz) = 93126
+TIMESTAMP = 1581688160
+SHA256 (oslo.policy-3.0.0.tar.gz) = 647a6653fa94e04b899d7e1e452a49df55ebc9c31822563c135c08ce0b3e0410
+SIZE (oslo.policy-3.0.0.tar.gz) = 93531
diff --git a/devel/py-oslo.policy2/Makefile b/devel/py-oslo.policy2/Makefile
new file mode 100644
index 00000000000..7de49b2f27a
--- /dev/null
+++ b/devel/py-oslo.policy2/Makefile
@@ -0,0 +1,34 @@
+# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
+# $FreeBSD$
+
+PORTNAME=	oslo.policy
+PORTVERSION=	2.4.1
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	2
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Oslo Policy library
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.context>=2.22.0:devel/py-oslo.context@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^2\.
+
+.include <bsd.port.mk>
diff --git a/devel/py-oslo.policy2/distinfo b/devel/py-oslo.policy2/distinfo
new file mode 100644
index 00000000000..4928df9bdce
--- /dev/null
+++ b/devel/py-oslo.policy2/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1577145763
+SHA256 (oslo.policy-2.4.1.tar.gz) = c2a2e334688e10831129303d636e5511ea0ec12ebe02826a7911195cf1f3acae
+SIZE (oslo.policy-2.4.1.tar.gz) = 93126
diff --git a/devel/py-oslo.policy2/pkg-descr b/devel/py-oslo.policy2/pkg-descr
new file mode 100644
index 00000000000..0f57c69bdc0
--- /dev/null
+++ b/devel/py-oslo.policy2/pkg-descr
@@ -0,0 +1,5 @@
+The Oslo Policy library provides support for RBAC policy enforcement across
+all OpenStack services.
+
+WWW: https://docs.openstack.org/oslo.policy/latest/
+WWW: https://github.com/openstack/oslo.policy
diff --git a/devel/py-oslo.upgradecheck/Makefile b/devel/py-oslo.upgradecheck/Makefile
index 745a58dc5ab..218374e026d 100644
--- a/devel/py-oslo.upgradecheck/Makefile
+++ b/devel/py-oslo.upgradecheck/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	oslo.upgradecheck
-PORTVERSION=	0.4.0
+PORTVERSION=	1.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,13 +15,12 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=0:devel/py-pbr@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
-		${PY_ENUM34} \
 		${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prettytable>=0.7.1<0.8:devel/py-prettytable@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/devel/py-oslo.upgradecheck/distinfo b/devel/py-oslo.upgradecheck/distinfo
index 4d69b1fa1f7..94d666ea403 100644
--- a/devel/py-oslo.upgradecheck/distinfo
+++ b/devel/py-oslo.upgradecheck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581519177
-SHA256 (oslo.upgradecheck-0.4.0.tar.gz) = 5464c61f6a500b6fe60439718b00ab0e10b6236b07e8ff08cdbd382b4d31d2fa
-SIZE (oslo.upgradecheck-0.4.0.tar.gz) = 15499
+TIMESTAMP = 1581688162
+SHA256 (oslo.upgradecheck-1.0.0.tar.gz) = 0e67b001563ecbcc81c218f12bfbbd62150dbae1bd207108f171532c15246a62
+SIZE (oslo.upgradecheck-1.0.0.tar.gz) = 15747
diff --git a/devel/py-roxlib/Makefile b/devel/py-roxlib/Makefile
deleted file mode 100644
index 70b0bae107c..00000000000
--- a/devel/py-roxlib/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	roxlib
-PORTVERSION=	2.0.6
-PORTREVISION=	4
-CATEGORIES=	devel python
-MASTER_SITES=	SF/rox/ROX-Lib/${PORTVERSION}
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	rox-lib2-${PORTVERSION}
-
-MAINTAINER=	olgeni@FreeBSD.org
-COMMENT=	Python libraries for ROX
-
-DEPRECATED=	Old, uses EOLed python27
-EXPIRATION_DATE=	2020-02-16
-
-USES=		gnome python:2.7 shebangfix tar:bzip2
-USE_PYTHON=	flavors
-USE_GNOME=	pygtk2:run
-SHEBANG_FILES=	ROX-Lib2/AppRun ROX-Lib2/python/make_docs.py
-
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer
-
-do-build:
-	@${PYTHON_CMD} -m compileall ${WRKSRC}
-	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
-	@cd ${WRKSRC}/ROX-Lib2/python && ${PYTHON_CMD} make_docs.py
-
-do-install:
-	${CP} -r ${WRKSRC}/ROX-Lib2 ${STAGEDIR}${PREFIX}/lib
-
-.include <bsd.port.mk>
diff --git a/devel/py-roxlib/distinfo b/devel/py-roxlib/distinfo
deleted file mode 100644
index a0609638ce1..00000000000
--- a/devel/py-roxlib/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rox-lib2-2.0.6.tar.bz2) = d0ddf57eeb43ef6628fd2045ba331f3a4550e385e2b84d430c8ebb517ed8ad2f
-SIZE (rox-lib2-2.0.6.tar.bz2) = 145972
diff --git a/devel/py-roxlib/pkg-descr b/devel/py-roxlib/pkg-descr
deleted file mode 100644
index 80577461699..00000000000
--- a/devel/py-roxlib/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Python libraries required by some ROX desktop applications.
-
-WWW: http://rox.sourceforge.net/phpwiki/index.php/ROX-Lib
diff --git a/devel/py-roxlib/pkg-plist b/devel/py-roxlib/pkg-plist
deleted file mode 100644
index ed59ed35557..00000000000
--- a/devel/py-roxlib/pkg-plist
+++ /dev/null
@@ -1,205 +0,0 @@
-lib/ROX-Lib2/.DirIcon
-lib/ROX-Lib2/AppInfo.xml
-lib/ROX-Lib2/AppRun
-lib/ROX-Lib2/Help/COPYING
-lib/ROX-Lib2/Help/Changes
-lib/ROX-Lib2/Help/Errors
-lib/ROX-Lib2/Help/README
-lib/ROX-Lib2/Help/TODO
-lib/ROX-Lib2/Help/findrox.py
-lib/ROX-Lib2/Help/findrox.pyc
-lib/ROX-Lib2/Help/findrox.pyo
-lib/ROX-Lib2/Help/python/rox.AppInfo.html
-lib/ROX-Lib2/Help/python/rox.InfoWin.html
-lib/ROX-Lib2/Help/python/rox.Menu.html
-lib/ROX-Lib2/Help/python/rox.OptionsBox.html
-lib/ROX-Lib2/Help/python/rox.applet.html
-lib/ROX-Lib2/Help/python/rox.basedir.html
-lib/ROX-Lib2/Help/python/rox.choices.html
-lib/ROX-Lib2/Help/python/rox.debug.html
-lib/ROX-Lib2/Help/python/rox.filer.html
-lib/ROX-Lib2/Help/python/rox.fileutils.html
-lib/ROX-Lib2/Help/python/rox.html
-lib/ROX-Lib2/Help/python/rox.i18n.html
-lib/ROX-Lib2/Help/python/rox.icon_theme.html
-lib/ROX-Lib2/Help/python/rox.launch.html
-lib/ROX-Lib2/Help/python/rox.loading.html
-lib/ROX-Lib2/Help/python/rox.master_proxy.html
-lib/ROX-Lib2/Help/python/rox.mime.html
-lib/ROX-Lib2/Help/python/rox.mime_handler.html
-lib/ROX-Lib2/Help/python/rox.options.html
-lib/ROX-Lib2/Help/python/rox.processes.html
-lib/ROX-Lib2/Help/python/rox.proxy.html
-lib/ROX-Lib2/Help/python/rox.saving.html
-lib/ROX-Lib2/Help/python/rox.session.html
-lib/ROX-Lib2/Help/python/rox.settings.html
-lib/ROX-Lib2/Help/python/rox.singleton.html
-lib/ROX-Lib2/Help/python/rox.su.html
-lib/ROX-Lib2/Help/python/rox.suchild.html
-lib/ROX-Lib2/Help/python/rox.tasks.html
-lib/ROX-Lib2/Help/python/rox.templates.html
-lib/ROX-Lib2/Help/python/rox.thumbnail.html
-lib/ROX-Lib2/Help/python/rox.uri_handler.html
-lib/ROX-Lib2/Help/python/rox.xattr.html
-lib/ROX-Lib2/Help/python/rox.xxmlrpc.html
-lib/ROX-Lib2/Messages/de.gmo
-lib/ROX-Lib2/Messages/de.po
-lib/ROX-Lib2/Messages/dist
-lib/ROX-Lib2/Messages/es.gmo
-lib/ROX-Lib2/Messages/es.po
-lib/ROX-Lib2/Messages/fr.gmo
-lib/ROX-Lib2/Messages/fr.po
-lib/ROX-Lib2/Messages/hu.gmo
-lib/ROX-Lib2/Messages/hu.po
-lib/ROX-Lib2/Messages/it.gmo
-lib/ROX-Lib2/Messages/it.po
-lib/ROX-Lib2/Messages/pl.gmo
-lib/ROX-Lib2/Messages/pl.po
-lib/ROX-Lib2/Messages/pt_BR.gmo
-lib/ROX-Lib2/Messages/pt_BR.po
-lib/ROX-Lib2/Messages/update-po
-lib/ROX-Lib2/Messages/zh_CN.gmo
-lib/ROX-Lib2/Messages/zh_CN.po
-lib/ROX-Lib2/Messages/zh_TW.gmo
-lib/ROX-Lib2/Messages/zh_TW.po
-lib/ROX-Lib2/ROX-Lib2.xml
-lib/ROX-Lib2/python/check.sh
-lib/ROX-Lib2/python/make_docs.py
-lib/ROX-Lib2/python/make_docs.pyc
-lib/ROX-Lib2/python/make_docs.pyo
-lib/ROX-Lib2/python/rox/AppInfo.py
-lib/ROX-Lib2/python/rox/AppInfo.pyc
-lib/ROX-Lib2/python/rox/AppInfo.pyo
-lib/ROX-Lib2/python/rox/InfoWin.py
-lib/ROX-Lib2/python/rox/InfoWin.pyc
-lib/ROX-Lib2/python/rox/InfoWin.pyo
-lib/ROX-Lib2/python/rox/Menu.py
-lib/ROX-Lib2/python/rox/Menu.pyc
-lib/ROX-Lib2/python/rox/Menu.pyo
-lib/ROX-Lib2/python/rox/OptionsBox.py
-lib/ROX-Lib2/python/rox/OptionsBox.pyc
-lib/ROX-Lib2/python/rox/OptionsBox.pyo
-lib/ROX-Lib2/python/rox/__init__.py
-lib/ROX-Lib2/python/rox/__init__.pyc
-lib/ROX-Lib2/python/rox/__init__.pyo
-lib/ROX-Lib2/python/rox/applet.py
-lib/ROX-Lib2/python/rox/applet.pyc
-lib/ROX-Lib2/python/rox/applet.pyo
-lib/ROX-Lib2/python/rox/basedir.py
-lib/ROX-Lib2/python/rox/basedir.pyc
-lib/ROX-Lib2/python/rox/basedir.pyo
-lib/ROX-Lib2/python/rox/choices.py
-lib/ROX-Lib2/python/rox/choices.pyc
-lib/ROX-Lib2/python/rox/choices.pyo
-lib/ROX-Lib2/python/rox/debug.py
-lib/ROX-Lib2/python/rox/debug.pyc
-lib/ROX-Lib2/python/rox/debug.pyo
-lib/ROX-Lib2/python/rox/filer.py
-lib/ROX-Lib2/python/rox/filer.pyc
-lib/ROX-Lib2/python/rox/filer.pyo
-lib/ROX-Lib2/python/rox/fileutils.py
-lib/ROX-Lib2/python/rox/fileutils.pyc
-lib/ROX-Lib2/python/rox/fileutils.pyo
-lib/ROX-Lib2/python/rox/i18n.py
-lib/ROX-Lib2/python/rox/i18n.pyc
-lib/ROX-Lib2/python/rox/i18n.pyo
-lib/ROX-Lib2/python/rox/icon_theme.py
-lib/ROX-Lib2/python/rox/icon_theme.pyc
-lib/ROX-Lib2/python/rox/icon_theme.pyo
-lib/ROX-Lib2/python/rox/launch.py
-lib/ROX-Lib2/python/rox/launch.pyc
-lib/ROX-Lib2/python/rox/launch.pyo
-lib/ROX-Lib2/python/rox/loading.py
-lib/ROX-Lib2/python/rox/loading.pyc
-lib/ROX-Lib2/python/rox/loading.pyo
-lib/ROX-Lib2/python/rox/master_proxy.py
-lib/ROX-Lib2/python/rox/master_proxy.pyc
-lib/ROX-Lib2/python/rox/master_proxy.pyo
-lib/ROX-Lib2/python/rox/mime.py
-lib/ROX-Lib2/python/rox/mime.pyc
-lib/ROX-Lib2/python/rox/mime.pyo
-lib/ROX-Lib2/python/rox/mime_handler.py
-lib/ROX-Lib2/python/rox/mime_handler.pyc
-lib/ROX-Lib2/python/rox/mime_handler.pyo
-lib/ROX-Lib2/python/rox/options.py
-lib/ROX-Lib2/python/rox/options.pyc
-lib/ROX-Lib2/python/rox/options.pyo
-lib/ROX-Lib2/python/rox/processes.py
-lib/ROX-Lib2/python/rox/processes.pyc
-lib/ROX-Lib2/python/rox/processes.pyo
-lib/ROX-Lib2/python/rox/proxy.py
-lib/ROX-Lib2/python/rox/proxy.pyc
-lib/ROX-Lib2/python/rox/proxy.pyo
-lib/ROX-Lib2/python/rox/saving.py
-lib/ROX-Lib2/python/rox/saving.pyc
-lib/ROX-Lib2/python/rox/saving.pyo
-lib/ROX-Lib2/python/rox/session.py
-lib/ROX-Lib2/python/rox/session.pyc
-lib/ROX-Lib2/python/rox/session.pyo
-lib/ROX-Lib2/python/rox/settings.py
-lib/ROX-Lib2/python/rox/settings.pyc
-lib/ROX-Lib2/python/rox/settings.pyo
-lib/ROX-Lib2/python/rox/singleton.py
-lib/ROX-Lib2/python/rox/singleton.pyc
-lib/ROX-Lib2/python/rox/singleton.pyo
-lib/ROX-Lib2/python/rox/su.py
-lib/ROX-Lib2/python/rox/su.pyc
-lib/ROX-Lib2/python/rox/su.pyo
-lib/ROX-Lib2/python/rox/suchild.py
-lib/ROX-Lib2/python/rox/suchild.pyc
-lib/ROX-Lib2/python/rox/suchild.pyo
-lib/ROX-Lib2/python/rox/suchild.sh
-lib/ROX-Lib2/python/rox/tasks.py
-lib/ROX-Lib2/python/rox/tasks.pyc
-lib/ROX-Lib2/python/rox/tasks.pyo
-lib/ROX-Lib2/python/rox/templates.py
-lib/ROX-Lib2/python/rox/templates.pyc
-lib/ROX-Lib2/python/rox/templates.pyo
-lib/ROX-Lib2/python/rox/thumbnail.py
-lib/ROX-Lib2/python/rox/thumbnail.pyc
-lib/ROX-Lib2/python/rox/thumbnail.pyo
-lib/ROX-Lib2/python/rox/uri_handler.py
-lib/ROX-Lib2/python/rox/uri_handler.pyc
-lib/ROX-Lib2/python/rox/uri_handler.pyo
-lib/ROX-Lib2/python/rox/xattr.py
-lib/ROX-Lib2/python/rox/xattr.pyc
-lib/ROX-Lib2/python/rox/xattr.pyo
-lib/ROX-Lib2/python/rox/xxmlrpc.py
-lib/ROX-Lib2/python/rox/xxmlrpc.pyc
-lib/ROX-Lib2/python/rox/xxmlrpc.pyo
-lib/ROX-Lib2/tests/python/testall.py
-lib/ROX-Lib2/tests/python/testall.pyc
-lib/ROX-Lib2/tests/python/testall.pyo
-lib/ROX-Lib2/tests/python/testbasedir.py
-lib/ROX-Lib2/tests/python/testbasedir.pyc
-lib/ROX-Lib2/tests/python/testbasedir.pyo
-lib/ROX-Lib2/tests/python/testchoices.py
-lib/ROX-Lib2/tests/python/testchoices.pyc
-lib/ROX-Lib2/tests/python/testchoices.pyo
-lib/ROX-Lib2/tests/python/testicon_theme.py
-lib/ROX-Lib2/tests/python/testicon_theme.pyc
-lib/ROX-Lib2/tests/python/testicon_theme.pyo
-lib/ROX-Lib2/tests/python/testmenu.py
-lib/ROX-Lib2/tests/python/testmenu.pyc
-lib/ROX-Lib2/tests/python/testmenu.pyo
-lib/ROX-Lib2/tests/python/testoptions.py
-lib/ROX-Lib2/tests/python/testoptions.pyc
-lib/ROX-Lib2/tests/python/testoptions.pyo
-lib/ROX-Lib2/tests/python/testprocesses.py
-lib/ROX-Lib2/tests/python/testprocesses.pyc
-lib/ROX-Lib2/tests/python/testprocesses.pyo
-lib/ROX-Lib2/tests/python/testproxy.py
-lib/ROX-Lib2/tests/python/testproxy.pyc
-lib/ROX-Lib2/tests/python/testproxy.pyo
-lib/ROX-Lib2/tests/python/testrox.py
-lib/ROX-Lib2/tests/python/testrox.pyc
-lib/ROX-Lib2/tests/python/testrox.pyo
-lib/ROX-Lib2/tests/python/testsu.py
-lib/ROX-Lib2/tests/python/testsu.pyc
-lib/ROX-Lib2/tests/python/testsu.pyo
-lib/ROX-Lib2/tests/python/testtasks.py
-lib/ROX-Lib2/tests/python/testtasks.pyc
-lib/ROX-Lib2/tests/python/testtasks.pyo
-lib/ROX-Lib2/tests/python/testxxmlrpc.py
-lib/ROX-Lib2/tests/python/testxxmlrpc.pyc
-lib/ROX-Lib2/tests/python/testxxmlrpc.pyo
diff --git a/devel/py-simpleparse/Makefile b/devel/py-simpleparse/Makefile
index 240b9070e35..a67fbe04dfd 100644
--- a/devel/py-simpleparse/Makefile
+++ b/devel/py-simpleparse/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	SimpleParse-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python EBNF parser generator (with mx.TextTools derivative)
 
 USES=		python
diff --git a/devel/py-tempora/Makefile b/devel/py-tempora/Makefile
index f81c5b9e8e9..ea8160b3314 100644
--- a/devel/py-tempora/Makefile
+++ b/devel/py-tempora/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tempora
 PORTVERSION=	1.14.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,8 +15,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jaraco.functools>=1.20:devel/py-jaraco.functools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR}
 
@@ -24,4 +24,12 @@ USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3600
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}jaraco.functools2>=1.20:devel/py-jaraco.functools2@${PY_FLAVOR}
+.else
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}jaraco.functools>=1.20:devel/py-jaraco.functools@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/py-yg.lockfile/Makefile b/devel/py-yg.lockfile/Makefile
index a59f69eb0c6..47075e5720b 100644
--- a/devel/py-yg.lockfile/Makefile
+++ b/devel/py-yg.lockfile/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	yg.lockfile
 PORTVERSION=	2.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,6 @@ LICENSE=	MIT
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zclockfile>=0:devel/py-zclockfile@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tempora>=0:devel/py-tempora@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jaraco.functools>=1.16:devel/py-jaraco.functools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}contextlib2>=0.5:devel/py-contextlib2@${PY_FLAVOR}
 
 USES=		python
@@ -22,4 +22,12 @@ USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3600
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}jaraco.functools2>=1.16:devel/py-jaraco.functools2@${PY_FLAVOR}
+.else
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}jaraco.functools>=1.16:devel/py-jaraco.functools@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/rabs/Makefile b/devel/rabs/Makefile
index f1bcd5196af..46eb1f8e892 100644
--- a/devel/rabs/Makefile
+++ b/devel/rabs/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	rabs
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.5.4
+DISTVERSION=	2.5.5
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -19,8 +19,8 @@ LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded
 USES=		compiler:c11 gmake localbase:ldflags sqlite
 USE_GITHUB=	yes
 GH_ACCOUNT=	wrapl
-GH_TUPLE=	wrapl:minilang:5b34321:m/minilang \
-		rajamukherji:radb:a237578:d/radb
+GH_TUPLE=	wrapl:minilang:91417f3:m/minilang \
+		rajamukherji:radb:5ecc083:d/radb
 
 MAKE_ARGS=	PREFIX=${PREFIX}
 BINARY_ALIAS=	make=${GMAKE}
diff --git a/devel/rabs/distinfo b/devel/rabs/distinfo
index df405ecdaea..5b263576faa 100644
--- a/devel/rabs/distinfo
+++ b/devel/rabs/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1579757727
-SHA256 (wrapl-rabs-v2.5.4_GH0.tar.gz) = c05515203fe96dfa2b2b17cf2ef54568d50587de080513d13515e2fea0f38339
-SIZE (wrapl-rabs-v2.5.4_GH0.tar.gz) = 59635
-SHA256 (wrapl-minilang-5b34321_GH0.tar.gz) = 39e6815f59cac45bb6380827888c7c9a710d43d6f60347cfbeaeafee2dde95cf
-SIZE (wrapl-minilang-5b34321_GH0.tar.gz) = 103925
-SHA256 (rajamukherji-radb-a237578_GH0.tar.gz) = c5810f95cc062fe8cad704a778a88c35e0499bde2c838fe0a9e32bac4df237a3
-SIZE (rajamukherji-radb-a237578_GH0.tar.gz) = 8796
+TIMESTAMP = 1581781398
+SHA256 (wrapl-rabs-v2.5.5_GH0.tar.gz) = 280c0cf1002294647f31ceb5c626a6ce66ab9db3ea3131290808e741a9c55537
+SIZE (wrapl-rabs-v2.5.5_GH0.tar.gz) = 63515
+SHA256 (wrapl-minilang-91417f3_GH0.tar.gz) = 4f6d3c54a32af210f2b524a0fec488019ef9cc7f92df8201718960c77c68b300
+SIZE (wrapl-minilang-91417f3_GH0.tar.gz) = 107640
+SHA256 (rajamukherji-radb-5ecc083_GH0.tar.gz) = 7081b78c5ac147f424a330efc56648e3a79e5a30f86fe6bed630f485f405e0a8
+SIZE (rajamukherji-radb-5ecc083_GH0.tar.gz) = 8608
diff --git a/devel/radian/Makefile b/devel/radian/Makefile
index 764b81b693f..44338b9f768 100644
--- a/devel/radian/Makefile
+++ b/devel/radian/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	radian
-DISTVERSION=	0.4.5
+DISTVERSION=	0.4.6
 CATEGORIES=	devel math python
 MASTER_SITES=	CHEESESHOP
 
diff --git a/devel/radian/distinfo b/devel/radian/distinfo
index 10681554c41..74ee12c9715 100644
--- a/devel/radian/distinfo
+++ b/devel/radian/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581271748
-SHA256 (radian-0.4.5.tar.gz) = 5c3a46a4dec215d97765967d483f1a4c6a9d9a14a258dc0bb17b87062e2e0dcd
-SIZE (radian-0.4.5.tar.gz) = 45107
+TIMESTAMP = 1581740627
+SHA256 (radian-0.4.6.tar.gz) = 819d7b4026fd04022a61bc3fc1845ad18b1756f03704d30097e7ecb23a20c163
+SIZE (radian-0.4.6.tar.gz) = 45553
diff --git a/devel/rubygem-aws-partitions/Makefile b/devel/rubygem-aws-partitions/Makefile
index 00cc7a32527..9e429a59f87 100644
--- a/devel/rubygem-aws-partitions/Makefile
+++ b/devel/rubygem-aws-partitions/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-partitions
-PORTVERSION=	1.272.0
+PORTVERSION=	1.273.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-partitions/distinfo b/devel/rubygem-aws-partitions/distinfo
index 8eb21b8b17f..0621aabedc6 100644
--- a/devel/rubygem-aws-partitions/distinfo
+++ b/devel/rubygem-aws-partitions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581409636
-SHA256 (rubygem/aws-partitions-1.272.0.gem) = 8752071922772b87e690ce05aba756e81084fe3113ff31f8bf83916fe48291b3
-SIZE (rubygem/aws-partitions-1.272.0.gem) = 18944
+TIMESTAMP = 1581688170
+SHA256 (rubygem/aws-partitions-1.273.0.gem) = ab19d869a8f7a85d10926e6fb9b5b13d092ee578f1a4aca8457c681229820b01
+SIZE (rubygem/aws-partitions-1.273.0.gem) = 18944
diff --git a/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile
index e3690bc5716..9d1f4a0ba5b 100644
--- a/devel/rubygem-aws-sdk-core/Makefile
+++ b/devel/rubygem-aws-sdk-core/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-core
-PORTVERSION=	3.90.0
+PORTVERSION=	3.90.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-core/distinfo b/devel/rubygem-aws-sdk-core/distinfo
index b721f762ef1..94f84771dbc 100644
--- a/devel/rubygem-aws-sdk-core/distinfo
+++ b/devel/rubygem-aws-sdk-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581594062
-SHA256 (rubygem/aws-sdk-core-3.90.0.gem) = 4ddb17526c9c78e79113678c630b5db543e3bf6bb6223d25c31358febb748da8
-SIZE (rubygem/aws-sdk-core-3.90.0.gem) = 263680
+TIMESTAMP = 1581775767
+SHA256 (rubygem/aws-sdk-core-3.90.1.gem) = f1f098b4742bea0f1add437b857cbc04c33b97ff960f38c390f7de7aa74ceee0
+SIZE (rubygem/aws-sdk-core-3.90.1.gem) = 264192
diff --git a/devel/rubygem-aws-sdk-core2/Makefile b/devel/rubygem-aws-sdk-core2/Makefile
index 2316853558c..82bec7199af 100644
--- a/devel/rubygem-aws-sdk-core2/Makefile
+++ b/devel/rubygem-aws-sdk-core2/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-core
-PORTVERSION=	2.11.438
+PORTVERSION=	2.11.440
 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 b92327e5dd1..5899b6d277e 100644
--- a/devel/rubygem-aws-sdk-core2/distinfo
+++ b/devel/rubygem-aws-sdk-core2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581594064
-SHA256 (rubygem/aws-sdk-core-2.11.438.gem) = 3b90fa84ffab93d7c66944902bf8dfc2d4f1f6079b8309b1771d634ec2ce376a
-SIZE (rubygem/aws-sdk-core-2.11.438.gem) = 1825792
+TIMESTAMP = 1581775769
+SHA256 (rubygem/aws-sdk-core-2.11.440.gem) = 9fad868b1ae8daceb975f5ddbcafe96712c6599386d38ccbeeea5544da35ec87
+SIZE (rubygem/aws-sdk-core-2.11.440.gem) = 1826304
diff --git a/devel/rubygem-aws-sdk-ec2/Makefile b/devel/rubygem-aws-sdk-ec2/Makefile
index ddc1ff9ac07..2eff346412c 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.142.0
+PORTVERSION=	1.143.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-ec2/distinfo b/devel/rubygem-aws-sdk-ec2/distinfo
index e2ec2198fd1..68815eb4b57 100644
--- a/devel/rubygem-aws-sdk-ec2/distinfo
+++ b/devel/rubygem-aws-sdk-ec2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581594070
-SHA256 (rubygem/aws-sdk-ec2-1.142.0.gem) = 52c01f13d32221ee83901da3d3a9c460d2ad80a2fc6a0309924e61a3f1539b1d
-SIZE (rubygem/aws-sdk-ec2-1.142.0.gem) = 634368
+TIMESTAMP = 1581775771
+SHA256 (rubygem/aws-sdk-ec2-1.143.0.gem) = 3a0b15462542a89fdaa4cbc32457e33f4d11c2e388a2b9359984febbee16e6c0
+SIZE (rubygem/aws-sdk-ec2-1.143.0.gem) = 634880
diff --git a/devel/rubygem-aws-sdk-mediapackagevod/Makefile b/devel/rubygem-aws-sdk-mediapackagevod/Makefile
index 593bb414bda..7e4e3f50da1 100644
--- a/devel/rubygem-aws-sdk-mediapackagevod/Makefile
+++ b/devel/rubygem-aws-sdk-mediapackagevod/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-mediapackagevod
-PORTVERSION=	1.8.0
+PORTVERSION=	1.9.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-mediapackagevod/distinfo b/devel/rubygem-aws-sdk-mediapackagevod/distinfo
index b9c109c18d9..b64470068d2 100644
--- a/devel/rubygem-aws-sdk-mediapackagevod/distinfo
+++ b/devel/rubygem-aws-sdk-mediapackagevod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575908078
-SHA256 (rubygem/aws-sdk-mediapackagevod-1.8.0.gem) = f9d4663ec9e79fd8402f841cd9b1329a7f236b089b4337403a6f1307018986b4
-SIZE (rubygem/aws-sdk-mediapackagevod-1.8.0.gem) = 19456
+TIMESTAMP = 1581688174
+SHA256 (rubygem/aws-sdk-mediapackagevod-1.9.0.gem) = b2b011b9c335f98d50e52874d5d5398af4eeb1669b292c2540cc294e3600a697
+SIZE (rubygem/aws-sdk-mediapackagevod-1.9.0.gem) = 20480
diff --git a/devel/rubygem-aws-sdk-mediatailor/Makefile b/devel/rubygem-aws-sdk-mediatailor/Makefile
index cb0b9c495a6..5dc9dce1c3f 100644
--- a/devel/rubygem-aws-sdk-mediatailor/Makefile
+++ b/devel/rubygem-aws-sdk-mediatailor/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-mediatailor
-PORTVERSION=	1.22.0
+PORTVERSION=	1.23.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-mediatailor/distinfo b/devel/rubygem-aws-sdk-mediatailor/distinfo
index f6238ce6419..62e30cc6889 100644
--- a/devel/rubygem-aws-sdk-mediatailor/distinfo
+++ b/devel/rubygem-aws-sdk-mediatailor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575794111
-SHA256 (rubygem/aws-sdk-mediatailor-1.22.0.gem) = 55abdf88224aa272b3669e2c6be765e039cd1446bf57ac0586a6afe2610d3875
-SIZE (rubygem/aws-sdk-mediatailor-1.22.0.gem) = 15872
+TIMESTAMP = 1581775773
+SHA256 (rubygem/aws-sdk-mediatailor-1.23.0.gem) = a10ec508a33d79fa03136c8c82a396a16022c836d09de74805f705535a260393
+SIZE (rubygem/aws-sdk-mediatailor-1.23.0.gem) = 15872
diff --git a/devel/rubygem-aws-sdk-resources2/Makefile b/devel/rubygem-aws-sdk-resources2/Makefile
index 5aa41a41d02..bb78e6d1f93 100644
--- a/devel/rubygem-aws-sdk-resources2/Makefile
+++ b/devel/rubygem-aws-sdk-resources2/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-resources
-PORTVERSION=	2.11.438
+PORTVERSION=	2.11.440
 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 f29d45d3825..811d5868d82 100644
--- a/devel/rubygem-aws-sdk-resources2/distinfo
+++ b/devel/rubygem-aws-sdk-resources2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581594078
-SHA256 (rubygem/aws-sdk-resources-2.11.438.gem) = 830592c799feb96fa2a9b52bf365c33854421f714a214d628486718cc8fb327f
-SIZE (rubygem/aws-sdk-resources-2.11.438.gem) = 48640
+TIMESTAMP = 1581775775
+SHA256 (rubygem/aws-sdk-resources-2.11.440.gem) = 8e892f52ebca733eafbc4bdde1ff1622ed696cce1092cfa41765e01d8cc47d88
+SIZE (rubygem/aws-sdk-resources-2.11.440.gem) = 48640
diff --git a/devel/rubygem-aws-sdk-securityhub/Makefile b/devel/rubygem-aws-sdk-securityhub/Makefile
index 95df19876b8..055623e23b6 100644
--- a/devel/rubygem-aws-sdk-securityhub/Makefile
+++ b/devel/rubygem-aws-sdk-securityhub/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-securityhub
-PORTVERSION=	1.17.0
+PORTVERSION=	1.18.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-securityhub/distinfo b/devel/rubygem-aws-sdk-securityhub/distinfo
index 5379596ffd3..e268752c2b1 100644
--- a/devel/rubygem-aws-sdk-securityhub/distinfo
+++ b/devel/rubygem-aws-sdk-securityhub/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581007192
-SHA256 (rubygem/aws-sdk-securityhub-1.17.0.gem) = abf519c8802fbd8bd5a4e7d8934f464c1469cf7e452b901882bca9d5eff036c6
-SIZE (rubygem/aws-sdk-securityhub-1.17.0.gem) = 80384
+TIMESTAMP = 1581775777
+SHA256 (rubygem/aws-sdk-securityhub-1.18.0.gem) = 35fe894e8fa07ad373bedac60985e9166b5a6bda0996249b0fc94b3c178a0829
+SIZE (rubygem/aws-sdk-securityhub-1.18.0.gem) = 80384
diff --git a/devel/rubygem-aws-sdk-shield/Makefile b/devel/rubygem-aws-sdk-shield/Makefile
index 0e5ced1187d..108400df9f7 100644
--- a/devel/rubygem-aws-sdk-shield/Makefile
+++ b/devel/rubygem-aws-sdk-shield/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk-shield
-PORTVERSION=	1.21.0
+PORTVERSION=	1.22.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-aws-sdk-shield/distinfo b/devel/rubygem-aws-sdk-shield/distinfo
index 66f018f6ce1..e5e1375eca2 100644
--- a/devel/rubygem-aws-sdk-shield/distinfo
+++ b/devel/rubygem-aws-sdk-shield/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571924207
-SHA256 (rubygem/aws-sdk-shield-1.21.0.gem) = 7d5e182d3358ca29d6001362f388bce2245eaf00a9ab6127905dfa00c019d8d7
-SIZE (rubygem/aws-sdk-shield-1.21.0.gem) = 23552
+TIMESTAMP = 1581775779
+SHA256 (rubygem/aws-sdk-shield-1.22.0.gem) = 30a8bf148aebd2a7dd33da7ee74dc505a728d934892a0f5086f415cc29459291
+SIZE (rubygem/aws-sdk-shield-1.22.0.gem) = 24576
diff --git a/devel/rubygem-aws-sdk2/Makefile b/devel/rubygem-aws-sdk2/Makefile
index 9c0d8767070..c534739c7a2 100644
--- a/devel/rubygem-aws-sdk2/Makefile
+++ b/devel/rubygem-aws-sdk2/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws-sdk
-PORTVERSION=	2.11.438
+PORTVERSION=	2.11.440
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	2
diff --git a/devel/rubygem-aws-sdk2/distinfo b/devel/rubygem-aws-sdk2/distinfo
index c72ee7d8fb3..a2bc7422b11 100644
--- a/devel/rubygem-aws-sdk2/distinfo
+++ b/devel/rubygem-aws-sdk2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581594082
-SHA256 (rubygem/aws-sdk-2.11.438.gem) = 5337bcd8f05664ecb292e7b924b349d1bbc638620562825dc26bb7b3b136c7e1
-SIZE (rubygem/aws-sdk-2.11.438.gem) = 4608
+TIMESTAMP = 1581775781
+SHA256 (rubygem/aws-sdk-2.11.440.gem) = e3616ad8ccd14a701036e39f7fff8ae8e91132018806ed02129097e3661f1a06
+SIZE (rubygem/aws-sdk-2.11.440.gem) = 4608
diff --git a/devel/rubygem-google-protobuf/Makefile b/devel/rubygem-google-protobuf/Makefile
index cfa9798d9ac..8e7bef0103c 100644
--- a/devel/rubygem-google-protobuf/Makefile
+++ b/devel/rubygem-google-protobuf/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	google-protobuf
-PORTVERSION=	3.11.3
+PORTVERSION=	3.11.4
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-google-protobuf/distinfo b/devel/rubygem-google-protobuf/distinfo
index 758893f3ca5..6417c025c03 100644
--- a/devel/rubygem-google-protobuf/distinfo
+++ b/devel/rubygem-google-protobuf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580830487
-SHA256 (rubygem/google-protobuf-3.11.3.gem) = bb66be22a19b69755c0fc7a5576f65c778c9bf4b3d93a2252161d341f51f6ff8
-SIZE (rubygem/google-protobuf-3.11.3.gem) = 208384
+TIMESTAMP = 1581775783
+SHA256 (rubygem/google-protobuf-3.11.4.gem) = 79a1a67809b8f66785ab80696796eb2a6b467187a3958c0d4aca314cd4dc9deb
+SIZE (rubygem/google-protobuf-3.11.4.gem) = 208896
diff --git a/devel/rubygem-reline/Makefile b/devel/rubygem-reline/Makefile
index 3b6f8d025ee..ab8435b7e6a 100644
--- a/devel/rubygem-reline/Makefile
+++ b/devel/rubygem-reline/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	reline
-PORTVERSION=	0.1.2
+PORTVERSION=	0.1.3
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-reline/distinfo b/devel/rubygem-reline/distinfo
index 614872d084e..8ad2ed08656 100644
--- a/devel/rubygem-reline/distinfo
+++ b/devel/rubygem-reline/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577511984
-SHA256 (rubygem/reline-0.1.2.gem) = 1dddb983a28e5e7a9ffd9f5b317b349c9c3bfb04ed781b8b9d7cb067b38c0824
-SIZE (rubygem/reline-0.1.2.gem) = 38912
+TIMESTAMP = 1581845374
+SHA256 (rubygem/reline-0.1.3.gem) = 07db43d77a0fa33f671ed7170e4826a19fae453024995fb5715e021c64138d93
+SIZE (rubygem/reline-0.1.3.gem) = 39936
diff --git a/devel/rubygem-sidekiq/Makefile b/devel/rubygem-sidekiq/Makefile
index f5754200780..33bed60aad8 100644
--- a/devel/rubygem-sidekiq/Makefile
+++ b/devel/rubygem-sidekiq/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sidekiq
-PORTVERSION=	6.0.4
+PORTVERSION=	6.0.5
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -13,7 +13,7 @@ LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-connection_pool>=2.2.2:net/rubygem-connection_pool \
-		rubygem-rack>=2.0.0,3:www/rubygem-rack \
+		rubygem-rack>=2.0,3<3,3:www/rubygem-rack \
 		rubygem-rack-protection>=2.0.0:www/rubygem-rack-protection \
 		rubygem-redis>=4.1.0:databases/rubygem-redis
 
diff --git a/devel/rubygem-sidekiq/distinfo b/devel/rubygem-sidekiq/distinfo
index 70bbfba27ee..503708a7566 100644
--- a/devel/rubygem-sidekiq/distinfo
+++ b/devel/rubygem-sidekiq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577523952
-SHA256 (rubygem/sidekiq-6.0.4.gem) = 5ce91930a657df5667256d4c5df346b9f5e31877b17d5cd5d34861a7a4f6fd43
-SIZE (rubygem/sidekiq-6.0.4.gem) = 294400
+TIMESTAMP = 1581688180
+SHA256 (rubygem/sidekiq-6.0.5.gem) = 2c88936abdf64b95eeebd96697a6b95f5fd2888d74e0664b2a17e88c1c957e93
+SIZE (rubygem/sidekiq-6.0.5.gem) = 294400
diff --git a/devel/rubygem-sidekiq5/Makefile b/devel/rubygem-sidekiq5/Makefile
index d5995b85a15..beadc2d36d1 100644
--- a/devel/rubygem-sidekiq5/Makefile
+++ b/devel/rubygem-sidekiq5/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sidekiq
-PORTVERSION=	5.2.7
-PORTREVISION=	1
+PORTVERSION=	5.2.8
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	5
@@ -15,7 +14,7 @@ LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-connection_pool>=2.2.2<3:net/rubygem-connection_pool \
-		rubygem-rack>=1.5.0,3:www/rubygem-rack \
+		rubygem-rack20>=0,3<2.1.0,3:www/rubygem-rack20 \
 		rubygem-rack-protection>=1.5.0:www/rubygem-rack-protection \
 		rubygem-redis>=3.3.5<5:databases/rubygem-redis
 
diff --git a/devel/rubygem-sidekiq5/distinfo b/devel/rubygem-sidekiq5/distinfo
index fd4819a66a7..30755375d1d 100644
--- a/devel/rubygem-sidekiq5/distinfo
+++ b/devel/rubygem-sidekiq5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558177197
-SHA256 (rubygem/sidekiq-5.2.7.gem) = 58aa181af3eb30f4f08a362b97ced06bd255996831d8d33b5373053222da3f8c
-SIZE (rubygem/sidekiq-5.2.7.gem) = 288256
+TIMESTAMP = 1581688182
+SHA256 (rubygem/sidekiq-5.2.8.gem) = 22b3ea73d070e3b1711ee8913b69c7132aa81ef0d967e7151546aeba8b1dc372
+SIZE (rubygem/sidekiq-5.2.8.gem) = 288768
diff --git a/devel/talloc1/Makefile b/devel/talloc1/Makefile
deleted file mode 100644
index 61a5639a8e3..00000000000
--- a/devel/talloc1/Makefile
+++ /dev/null
@@ -1,137 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=		talloc
-PORTVERSION=		2.1.14
-PORTREVISION=		0
-CATEGORIES=		devel
-MASTER_SITES=		SAMBA
-PKGNAMESUFFIX=		1
-
-MAINTAINER=		timur@FreeBSD.org
-COMMENT=		Hierarchical pool based memory allocator
-
-LICENSE=		LGPL3
-
-DEPRECATED=	Old version, uses EOLed python27
-EXPIRATION_DATE=	2020-02-15
-
-IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
-
-CONFLICTS_INSTALL=	talloc-*
-
-#FLAVORS=		default nopython
-#nopython_PKGNAMESUFFIX=	-nopython
-#nopython_CONFLICTS=	talloc
-#default_CONFLICTS=	talloc-nopython
-
-USES=			compiler pkgconfig waf
-USE_LDCONFIG=		yes
-WAF_CMD=		buildtools/bin/waf
-CONFIGURE_LOG=		bin/config.log
-
-PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
-PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
-
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
-			--disable-rpath \
-			--without-gettext
-
-OPTIONS_DEFINE=		MANPAGES
-MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
-
-.include <bsd.port.options.mk>
-
-PLIST_FILES+=		include/talloc.h \
-			lib/libtalloc.so \
-			lib/libtalloc.so.2 \
-			${PKGCONFIGDIR}/talloc.pc
-
-.if defined(NO_PYTHON)
-USES+=			python:2.7,build
-CONFIGURE_ARGS+=	--disable-python
-.else
-USES+=			python:2.7
-
-PLIST_FILES+=		include/pytalloc.h \
-			lib/libpytalloc-util.so \
-			lib/libpytalloc-util.so.2 \
-			${PYTHON_SITELIBDIR}/talloc.so \
-			${PKGCONFIGDIR}/pytalloc-util.pc
-# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
-# This is not officially supported, use at your own risk
-.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]}
-SAMBA4_PYTHON3_VERSION=	${WITH_SAMBA4_PYTHON3}
-SAMBA4_PYTHON3=		python${SAMBA4_PYTHON3_VERSION}
-SAMBA4_PYTHON3_VER=	${SAMBA4_PYTHON3_VERSION:C/\.//}
-.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
-.error			unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
-.endif
-BUILD_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
-RUN_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
-# cpython-36m
-SAMBA4_PYTHON3_SO_ABI!=	[ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
-SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
-
-CONFIGURE_ENV+=		PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
-CONFIGURE_ARGS+=	--extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
-
-PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
-			SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
-
-PLIST_FILES+=		lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so \
-			lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so.2 \
-			${SAMBA4_PYTHON3_SITELIBDIR}/talloc.${SAMBA4_PYTHON3_SO_ABI}.so \
-			${PKGCONFIGDIR}/pytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.pc
-.endif
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ! ${PORT_OPTIONS:MMANPAGES}
-CONFIGURE_ENV+=		XSLTPROC="true"
-.else
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
-			xsltproc:textproc/libxslt
-.endif
-# No fancy color error messages
-.if ${COMPILER_TYPE} == "clang"
-CFLAGS+=		-fno-color-diagnostics
-.endif
-CONFIGURE_ENV+=		NOCOLOR=yes
-MAKE_ENV+=		NOCOLOR=yes
-
-TALLOC_MAN3=		man/man3/talloc.3.gz
-
-PLIST_FILES+=		${TALLOC_MAN3}
-
-post-patch:
-			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
-				${BUILD_WRKSRC}/wscript
-
-# Use threading (or multiprocessing) but not thread (renamed in python 3+).
-pre-configure:
-			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
-				${ECHO_CMD}; \
-				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
-				${ECHO_CMD}; \
-				${FALSE}; \
-			fi
-
-pre-build-MANPAGES-off:
-			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
-.for man in ${TALLOC_MAN3}
-			${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
-.endfor
-
-post-install:
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtalloc.so
-.if !defined(NO_PYTHON)
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util.so
-			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/talloc.so
-.if defined(SAMBA4_PYTHON3)
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/talloc.${SAMBA4_PYTHON3_SO_ABI}.so
-.endif
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/devel/talloc1/distinfo b/devel/talloc1/distinfo
deleted file mode 100644
index 04d78200ce6..00000000000
--- a/devel/talloc1/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1531611950
-SHA256 (talloc-2.1.14.tar.gz) = b185602756a628bac507fa8af8b9df92ace69d27c0add5dab93190ad7c3367ce
-SIZE (talloc-2.1.14.tar.gz) = 444589
diff --git a/devel/talloc1/files/patch-buildtools__wafsamba__samba_autoconf.py b/devel/talloc1/files/patch-buildtools__wafsamba__samba_autoconf.py
deleted file mode 100644
index c92d308462b..00000000000
--- a/devel/talloc1/files/patch-buildtools__wafsamba__samba_autoconf.py
+++ /dev/null
@@ -1,52 +0,0 @@
---- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
-+++ buildtools/wafsamba/samba_autoconf.py
-@@ -548,7 +548,7 @@ def library_flags(self, libs):
- 
- 
- @conf
--def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
-+def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
-     '''check if a set of libraries exist as system libraries
- 
-     returns the sublist of libs that do exist as a syslib or []
-@@ -568,11 +568,29 @@ int foo()
-             ret.append(lib)
-             continue
- 
-+        if msg is None:
-+            msg = 'Checking for library %s' % lib
-+
-         (ccflags, ldflags, cpppath) = library_flags(conf, lib)
-+
-         if shlib:
--            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(features='c cshlib',
-+                             fragment=fragment,
-+                             lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
-         else:
--            res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
- 
-         if not res:
-             if mandatory:
-@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
-         conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
- 
-     if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
--        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
-+        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS):
-             conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
- 
- @conf
diff --git a/devel/talloc1/files/patch-buildtools__wafsamba__samba_install.py b/devel/talloc1/files/patch-buildtools__wafsamba__samba_install.py
deleted file mode 100644
index 95f250a8621..00000000000
--- a/devel/talloc1/files/patch-buildtools__wafsamba__samba_install.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- buildtools/wafsamba/samba_install.py.orig	2015-12-10 11:01:40 UTC
-+++ buildtools/wafsamba/samba_install.py
-@@ -118,7 +118,7 @@ def install_library(self):
-                 inst_name    = bld.make_libname(t.target)
-         elif self.vnum:
-             vnum_base    = self.vnum.split('.')[0]
--            install_name = bld.make_libname(target_name, version=self.vnum)
-+            install_name = bld.make_libname(target_name, version=vnum_base)
-             install_link = bld.make_libname(target_name, version=vnum_base)
-             inst_name    = bld.make_libname(t.target)
-             if not self.private_library:
diff --git a/devel/talloc1/files/patch-buildtools__wafsamba__samba_python.py b/devel/talloc1/files/patch-buildtools__wafsamba__samba_python.py
deleted file mode 100644
index 429ec5e778f..00000000000
--- a/devel/talloc1/files/patch-buildtools__wafsamba__samba_python.py
+++ /dev/null
@@ -1,40 +0,0 @@
---- buildtools/wafsamba/samba_python.py.orig	2018-01-13 09:07:51 UTC
-+++ buildtools/wafsamba/samba_python.py
-@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
- 
- def _check_python_headers(conf, mandatory):
-     try:
-+        from python import _get_python_variables
-         Configure.ConfigurationError
-         conf.check_python_headers(mandatory=mandatory)
-+        conf.env['PYTHON_SO_ABI'] = _get_python_variables(
-+            conf.env['PYTHON'],
-+            ["get_config_var('SOABI') or ''"],
-+            ['from distutils.sysconfig import get_config_var']
-+        )[0]
-     except Configure.ConfigurationError:
-         if mandatory:
-              raise
- 
-     if conf.env['PYTHON_VERSION'] > '3':
--        abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
--        conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-+        '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG,
-+           while environment variable is PYTHON3_SO_ABI_FLAG'''
-+        override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
-+        if override_PYTHON_SO_ABI_FLAG is not None:
-+            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG
-+            conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
-+        if not conf.env['PYTHON_SO_ABI_FLAG']:
-+            if conf.env['PYTHON_SO_ABI']:
-+                conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI']
-+                conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
-+            else:
-+                abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
-+                conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-     else:
-         conf.env['PYTHON_SO_ABI_FLAG'] = ''
-+
-     conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = (
-         conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-'))
- 
diff --git a/devel/talloc1/files/patch-buildtools__wafsamba__wscript b/devel/talloc1/files/patch-buildtools__wafsamba__wscript
deleted file mode 100644
index 9399a316c14..00000000000
--- a/devel/talloc1/files/patch-buildtools__wafsamba__wscript
+++ /dev/null
@@ -1,15 +0,0 @@
---- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
-+++ buildtools/wafsamba/wscript
-@@ -76,10 +76,10 @@ def set_options(opt):
- 
-     opt.add_option('--with-libiconv',
-                    help='additional directory to search for libiconv',
--                   action='store', dest='iconv_open', default='/usr/local',
-+                   action='store', dest='iconv_open', default=None,
-                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
-     opt.add_option('--without-gettext',
--                   help=("Disable use of gettext"),
-+                   help=("disable use of gettext"),
-                    action="store_true", dest='disable_gettext', default=False)
- 
-     gr = opt.option_group('developer options')
diff --git a/devel/talloc1/files/patch-lib__replace__wscript b/devel/talloc1/files/patch-lib__replace__wscript
deleted file mode 100644
index 7bf2a8ee21f..00000000000
--- a/devel/talloc1/files/patch-lib__replace__wscript
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/replace/wscript.orig	2017-07-02 20:22:14 UTC
-+++ lib/replace/wscript
-@@ -81,7 +81,7 @@ def configure(conf):
-     conf.CHECK_HEADERS('sys/atomic.h')
-     conf.CHECK_HEADERS('libgen.h')
- 
--    if conf.CHECK_CFLAGS('-Wno-format-truncation'):
-+    if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS):
-         conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
- 
-     # Check for process set name support
diff --git a/devel/talloc1/files/patch-talloc.c b/devel/talloc1/files/patch-talloc.c
deleted file mode 100644
index a2807e78b0c..00000000000
--- a/devel/talloc1/files/patch-talloc.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- talloc.c.orig	2018-01-13 09:07:51 UTC
-+++ talloc.c
-@@ -387,6 +387,9 @@ void talloc_lib_init(void) __attribute__
- void talloc_lib_init(void)
- {
- 	uint32_t random_value;
-+#if defined(HAVE_ARC4RANDOM)
-+	random_value = arc4random();
-+#else
- #if defined(HAVE_GETAUXVAL) && defined(AT_RANDOM)
- 	uint8_t *p;
- 	/*
-@@ -420,6 +423,7 @@ void talloc_lib_init(void)
- 		 */
- 		random_value = ((uintptr_t)talloc_lib_init & 0xFFFFFFFF);
- 	}
-+#endif /* HAVE_ARC4RANDOM */
- 	talloc_magic = random_value & ~TALLOC_FLAG_MASK;
- }
- #else
diff --git a/devel/talloc1/files/patch-third_party__waf__wafadmin__Tools__cc.py b/devel/talloc1/files/patch-third_party__waf__wafadmin__Tools__cc.py
deleted file mode 100644
index 5695f3e0384..00000000000
--- a/devel/talloc1/files/patch-third_party__waf__wafadmin__Tools__cc.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/waf/wafadmin/Tools/cc.py.orig	2015-11-06 13:25:52 UTC
-+++ third_party/waf/wafadmin/Tools/cc.py
-@@ -88,7 +88,7 @@ def c_hook(self, node):
- 		raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self))
- 	return task
- 
--cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
-+cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
- cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False)
- cls.scan = ccroot.scan
- cls.vars.append('CCDEPS')
diff --git a/devel/talloc1/files/patch-wscript b/devel/talloc1/files/patch-wscript
deleted file mode 100644
index 1d5c9c6d13b..00000000000
--- a/devel/talloc1/files/patch-wscript
+++ /dev/null
@@ -1,18 +0,0 @@
---- wscript.orig	2018-01-13 09:07:51 UTC
-+++ wscript
-@@ -46,13 +46,14 @@ def configure(conf):
-     conf.env.TALLOC_COMPAT1 = False
-     if conf.env.standalone_talloc:
-         conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
--        conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
-+        conf.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
-         conf.env.TALLOC_VERSION = VERSION
- 
-     conf.CHECK_XSLTPROC_MANPAGES()
- 
-     conf.CHECK_HEADERS('sys/auxv.h')
-     conf.CHECK_FUNCS('getauxval')
-+    conf.CHECK_FUNCS('arc4random')
- 
-     conf.SAMBA_CONFIG_H()
- 
diff --git a/devel/talloc1/files/talloc.3 b/devel/talloc1/files/talloc.3
deleted file mode 100644
index 6a10b4990c2..00000000000
--- a/devel/talloc1/files/talloc.3
+++ /dev/null
@@ -1,683 +0,0 @@
-'\" t
-.\"     Title: talloc
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 2015-04-10
-.\"    Manual: System Administration tools
-.\"    Source: Samba 4.0
-.\"  Language: English
-.\"
-.TH "TALLOC" "3" "2015\-04\-10" "Samba 4\&.0" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-talloc \- hierarchical reference counted memory pool system with destructors
-.SH "SYNOPSIS"
-.sp
-.nf
-#include <talloc\&.h>
-.fi
-.SH "DESCRIPTION"
-.PP
-If you are used to talloc from Samba3 then please read this carefully, as talloc has changed a lot\&.
-.PP
-The new talloc is a hierarchical, reference counted memory pool system with destructors\&. Quite a mouthful really, but not too bad once you get used to it\&.
-.PP
-Perhaps the biggest change from Samba3 is that there is no distinction between a "talloc context" and a "talloc pointer"\&. Any pointer returned from talloc() is itself a valid talloc context\&. This means you can do this:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-    struct foo *X = talloc(mem_ctx, struct foo);
-    X\->name = talloc_strdup(X, "foo");
-    
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-and the pointer
-X\->name
-would be a "child" of the talloc context
-X
-which is itself a child of
-mem_ctx\&. So if you do
-talloc_free(mem_ctx)
-then it is all destroyed, whereas if you do
-talloc_free(X)
-then just
-X
-and
-X\->name
-are destroyed, and if you do
-talloc_free(X\->name)
-then just the name element of
-X
-is destroyed\&.
-.PP
-If you think about this, then what this effectively gives you is an n\-ary tree, where you can free any part of the tree with talloc_free()\&.
-.PP
-If you find this confusing, then I suggest you run the
-testsuite
-program to watch talloc in action\&. You may also like to add your own tests to
-testsuite\&.c
-to clarify how some particular situation is handled\&.
-.SH "TALLOC API"
-.PP
-The following is a complete guide to the talloc API\&. Read it all at least twice\&.
-.SS "(type *)talloc(const void *ctx, type);"
-.PP
-The talloc() macro is the core of the talloc library\&. It takes a memory
-\fIctx\fR
-and a
-\fItype\fR, and returns a pointer to a new area of memory of the given
-\fItype\fR\&.
-.PP
-The returned pointer is itself a talloc context, so you can use it as the
-\fIctx\fR
-argument to more calls to talloc() if you wish\&.
-.PP
-The returned pointer is a "child" of the supplied context\&. This means that if you talloc_free() the
-\fIctx\fR
-then the new child disappears as well\&. Alternatively you can free just the child\&.
-.PP
-The
-\fIctx\fR
-argument to talloc() can be NULL, in which case a new top level context is created\&.
-.SS "void *talloc_size(const void *ctx, size_t size);"
-.PP
-The function talloc_size() should be used when you don\*(Aqt have a convenient type to pass to talloc()\&. Unlike talloc(), it is not type safe (as it returns a void *), so you are on your own for type checking\&.
-.SS "(typeof(ptr)) talloc_ptrtype(const void *ctx, ptr);"
-.PP
-The talloc_ptrtype() macro should be used when you have a pointer and want to allocate memory to point at with this pointer\&. When compiling with gcc >= 3 it is typesafe\&. Note this is a wrapper of talloc_size() and talloc_get_name() will return the current location in the source file\&. and not the type\&.
-.SS "int talloc_free(void *ptr);"
-.PP
-The talloc_free() function frees a piece of talloc memory, and all its children\&. You can call talloc_free() on any pointer returned by talloc()\&.
-.PP
-The return value of talloc_free() indicates success or failure, with 0 returned for success and \-1 for failure\&. The only possible failure condition is if
-\fIptr\fR
-had a destructor attached to it and the destructor returned \-1\&. See
-\(lqtalloc_set_destructor()\(rq
-for details on destructors\&.
-.PP
-If this pointer has an additional parent when talloc_free() is called then the memory is not actually released, but instead the most recently established parent is destroyed\&. See
-\(lqtalloc_reference()\(rq
-for details on establishing additional parents\&.
-.PP
-For more control on which parent is removed, see
-\(lqtalloc_unlink()\(rq\&.
-.PP
-talloc_free() operates recursively on its children\&.
-.PP
-From the 2\&.0 version of talloc, as a special case, talloc_free() is refused on pointers that have more than one parent, as talloc would have no way of knowing which parent should be removed\&. To free a pointer that has more than one parent please use talloc_unlink()\&.
-.PP
-To help you find problems in your code caused by this behaviour, if you do try and free a pointer with more than one parent then the talloc logging function will be called to give output like this:
-.PP
-
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-	    ERROR: talloc_free with references at some_dir/source/foo\&.c:123
-		reference at some_dir/source/other\&.c:325
-		reference at some_dir/source/third\&.c:121
-	  
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-Please see the documentation for talloc_set_log_fn() and talloc_set_log_stderr() for more information on talloc logging functions\&.
-.SS "void *talloc_reference(const void *ctx, const void *ptr);"
-.PP
-The talloc_reference() function makes
-\fIctx\fR
-an additional parent of
-\fIptr\fR\&.
-.PP
-The return value of talloc_reference() is always the original pointer
-\fIptr\fR, unless talloc ran out of memory in creating the reference in which case it will return NULL (each additional reference consumes around 48 bytes of memory on intel x86 platforms)\&.
-.PP
-If
-\fIptr\fR
-is NULL, then the function is a no\-op, and simply returns NULL\&.
-.PP
-After creating a reference you can free it in one of the following ways:
-.PP
-
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-you can talloc_free() any parent of the original pointer\&. That will reduce the number of parents of this pointer by 1, and will cause this pointer to be freed if it runs out of parents\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-you can talloc_free() the pointer itself if it has at maximum one parent\&. This behaviour has been changed since the release of version 2\&.0\&. Further informations in the description of "talloc_free"\&.
-.RE
-.PP
-For more control on which parent to remove, see
-\(lqtalloc_unlink()\(rq\&.
-.SS "int talloc_unlink(const void *ctx, void *ptr);"
-.PP
-The talloc_unlink() function removes a specific parent from
-\fIptr\fR\&. The
-\fIctx\fR
-passed must either be a context used in talloc_reference() with this pointer, or must be a direct parent of ptr\&.
-.PP
-Note that if the parent has already been removed using talloc_free() then this function will fail and will return \-1\&. Likewise, if
-\fIptr\fR
-is NULL, then the function will make no modifications and return \-1\&.
-.PP
-Usually you can just use talloc_free() instead of talloc_unlink(), but sometimes it is useful to have the additional control on which parent is removed\&.
-.SS "void talloc_set_destructor(const void *ptr, int (*destructor)(void *));"
-.PP
-The function talloc_set_destructor() sets the
-\fIdestructor\fR
-for the pointer
-\fIptr\fR\&. A
-\fIdestructor\fR
-is a function that is called when the memory used by a pointer is about to be released\&. The destructor receives
-\fIptr\fR
-as an argument, and should return 0 for success and \-1 for failure\&.
-.PP
-The
-\fIdestructor\fR
-can do anything it wants to, including freeing other pieces of memory\&. A common use for destructors is to clean up operating system resources (such as open file descriptors) contained in the structure the destructor is placed on\&.
-.PP
-You can only place one destructor on a pointer\&. If you need more than one destructor then you can create a zero\-length child of the pointer and place an additional destructor on that\&.
-.PP
-To remove a destructor call talloc_set_destructor() with NULL for the destructor\&.
-.PP
-If your destructor attempts to talloc_free() the pointer that it is the destructor for then talloc_free() will return \-1 and the free will be ignored\&. This would be a pointless operation anyway, as the destructor is only called when the memory is just about to go away\&.
-.SS "int talloc_increase_ref_count(const void *\fIptr\fR);"
-.PP
-The talloc_increase_ref_count(\fIptr\fR) function is exactly equivalent to:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-talloc_reference(NULL, ptr);
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-You can use either syntax, depending on which you think is clearer in your code\&.
-.PP
-It returns 0 on success and \-1 on failure\&.
-.SS "size_t talloc_reference_count(const void *\fIptr\fR);"
-.PP
-Return the number of references to the pointer\&.
-.SS "void talloc_set_name(const void *ptr, const char *fmt, \&.\&.\&.);"
-.PP
-Each talloc pointer has a "name"\&. The name is used principally for debugging purposes, although it is also possible to set and get the name on a pointer in as a way of "marking" pointers in your code\&.
-.PP
-The main use for names on pointer is for "talloc reports"\&. See
-\(lqtalloc_report_depth_cb()\(rq,
-\(lqtalloc_report_depth_file()\(rq,
-\(lqtalloc_report()\(rq
-\(lqtalloc_report()\(rq
-and
-\(lqtalloc_report_full()\(rq
-for details\&. Also see
-\(lqtalloc_enable_leak_report()\(rq
-and
-\(lqtalloc_enable_leak_report_full()\(rq\&.
-.PP
-The talloc_set_name() function allocates memory as a child of the pointer\&. It is logically equivalent to:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-talloc_set_name_const(ptr, talloc_asprintf(ptr, fmt, \&.\&.\&.));
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-Note that multiple calls to talloc_set_name() will allocate more memory without releasing the name\&. All of the memory is released when the ptr is freed using talloc_free()\&.
-.SS "void talloc_set_name_const(const void *\fIptr\fR, const char *\fIname\fR);"
-.PP
-The function talloc_set_name_const() is just like talloc_set_name(), but it takes a string constant, and is much faster\&. It is extensively used by the "auto naming" macros, such as talloc_p()\&.
-.PP
-This function does not allocate any memory\&. It just copies the supplied pointer into the internal representation of the talloc ptr\&. This means you must not pass a
-\fIname\fR
-pointer to memory that will disappear before
-\fIptr\fR
-is freed with talloc_free()\&.
-.SS "void *talloc_named(const void *\fIctx\fR, size_t \fIsize\fR, const char *\fIfmt\fR, \&.\&.\&.);"
-.PP
-The talloc_named() function creates a named talloc pointer\&. It is equivalent to:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-ptr = talloc_size(ctx, size);
-talloc_set_name(ptr, fmt, \&.\&.\&.\&.);
-.fi
-.if n \{\
-.RE
-.\}
-.SS "void *talloc_named_const(const void *\fIctx\fR, size_t \fIsize\fR, const char *\fIname\fR);"
-.PP
-This is equivalent to:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-ptr = talloc_size(ctx, size);
-talloc_set_name_const(ptr, name);
-.fi
-.if n \{\
-.RE
-.\}
-.SS "const char *talloc_get_name(const void *\fIptr\fR);"
-.PP
-This returns the current name for the given talloc pointer,
-\fIptr\fR\&. See
-\(lqtalloc_set_name()\(rq
-for details\&.
-.SS "void *talloc_init(const char *\fIfmt\fR, \&.\&.\&.);"
-.PP
-This function creates a zero length named talloc context as a top level context\&. It is equivalent to:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-talloc_named(NULL, 0, fmt, \&.\&.\&.);
-.fi
-.if n \{\
-.RE
-.\}
-.SS "void *talloc_new(void *\fIctx\fR);"
-.PP
-This is a utility macro that creates a new memory context hanging off an existing context, automatically naming it "talloc_new: __location__" where __location__ is the source line it is called from\&. It is particularly useful for creating a new temporary working context\&.
-.SS "(\fItype\fR *)talloc_realloc(const void *\fIctx\fR, void *\fIptr\fR, \fItype\fR, \fIcount\fR);"
-.PP
-The talloc_realloc() macro changes the size of a talloc pointer\&. It has the following equivalences:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-talloc_realloc(ctx, NULL, type, 1) ==> talloc(ctx, type);
-talloc_realloc(ctx, ptr, type, 0)  ==> talloc_free(ptr);
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-The
-\fIctx\fR
-argument is only used if
-\fIptr\fR
-is not NULL, otherwise it is ignored\&.
-.PP
-talloc_realloc() returns the new pointer, or NULL on failure\&. The call will fail either due to a lack of memory, or because the pointer has more than one parent (see
-\(lqtalloc_reference()\(rq)\&.
-.SS "void *talloc_realloc_size(const void *ctx, void *ptr, size_t size);"
-.PP
-the talloc_realloc_size() function is useful when the type is not known so the type\-safe talloc_realloc() cannot be used\&.
-.SS "TYPE *talloc_steal(const void *\fInew_ctx\fR, const TYPE *\fIptr\fR);"
-.PP
-The talloc_steal() function changes the parent context of a talloc pointer\&. It is typically used when the context that the pointer is currently a child of is going to be freed and you wish to keep the memory for a longer time\&.
-.PP
-The talloc_steal() function returns the pointer that you pass it\&. It does not have any failure modes\&.
-.PP
-It is possible to produce loops in the parent/child relationship if you are not careful with talloc_steal()\&. No guarantees are provided as to your sanity or the safety of your data if you do this\&.
-.PP
-Note that if you try and call talloc_steal() on a pointer that has more than one parent then the result is ambiguous\&. Talloc will choose to remove the parent that is currently indicated by talloc_parent() and replace it with the chosen parent\&. You will also get a message like this via the talloc logging functions:
-.PP
-
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-	  WARNING: talloc_steal with references at some_dir/source/foo\&.c:123
-		reference at some_dir/source/other\&.c:325
-		reference at some_dir/source/third\&.c:121
-	  
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-To unambiguously change the parent of a pointer please see the function
-\(lqtalloc_reparent()\(rq\&. See the talloc_set_log_fn() documentation for more information on talloc logging\&.
-.SS "TYPE *talloc_reparent(const void *\fIold_parent\fR, const void *\fInew_parent\fR, const TYPE *\fIptr\fR);"
-.PP
-The talloc_reparent() function changes the parent context of a talloc pointer\&. It is typically used when the context that the pointer is currently a child of is going to be freed and you wish to keep the memory for a longer time\&.
-.PP
-The talloc_reparent() function returns the pointer that you pass it\&. It does not have any failure modes\&.
-.PP
-The difference between talloc_reparent() and talloc_steal() is that talloc_reparent() can specify which parent you wish to change\&. This is useful when a pointer has multiple parents via references\&.
-.SS "TYPE *talloc_move(const void *\fInew_ctx\fR, TYPE **\fIptr\fR);"
-.PP
-The talloc_move() function is a wrapper around talloc_steal() which zeros the source pointer after the move\&. This avoids a potential source of bugs where a programmer leaves a pointer in two structures, and uses the pointer from the old structure after it has been moved to a new one\&.
-.SS "size_t talloc_total_size(const void *\fIptr\fR);"
-.PP
-The talloc_total_size() function returns the total size in bytes used by this pointer and all child pointers\&. Mostly useful for debugging\&.
-.PP
-Passing NULL is allowed, but it will only give a meaningful result if talloc_enable_leak_report() or talloc_enable_leak_report_full() has been called\&.
-.SS "size_t talloc_total_blocks(const void *\fIptr\fR);"
-.PP
-The talloc_total_blocks() function returns the total memory block count used by this pointer and all child pointers\&. Mostly useful for debugging\&.
-.PP
-Passing NULL is allowed, but it will only give a meaningful result if talloc_enable_leak_report() or talloc_enable_leak_report_full() has been called\&.
-.SS "void talloc_report(const void *ptr, FILE *f);"
-.PP
-The talloc_report() function prints a summary report of all memory used by
-\fIptr\fR\&. One line of report is printed for each immediate child of ptr, showing the total memory and number of blocks used by that child\&.
-.PP
-You can pass NULL for the pointer, in which case a report is printed for the top level memory context, but only if talloc_enable_leak_report() or talloc_enable_leak_report_full() has been called\&.
-.SS "void talloc_report_full(const void *\fIptr\fR, FILE *\fIf\fR);"
-.PP
-This provides a more detailed report than talloc_report()\&. It will recursively print the entire tree of memory referenced by the pointer\&. References in the tree are shown by giving the name of the pointer that is referenced\&.
-.PP
-You can pass NULL for the pointer, in which case a report is printed for the top level memory context, but only if talloc_enable_leak_report() or talloc_enable_leak_report_full() has been called\&.
-.SS ""
-.HP \w'void\ talloc_report_depth_cb('u
-.BI "void talloc_report_depth_cb(" "const\ void\ *ptr" ", " "int\ depth" ", " "int\ max_depth" ", " "void\ (*callback)(const\ void\ *ptr,\ int\ depth,\ int\ max_depth,\ int\ is_ref,\ void\ *priv)" ", " "void\ *priv" ");"
-.PP
-This provides a more flexible reports than talloc_report()\&. It will recursively call the callback for the entire tree of memory referenced by the pointer\&. References in the tree are passed with
-\fIis_ref = 1\fR
-and the pointer that is referenced\&.
-.PP
-You can pass NULL for the pointer, in which case a report is printed for the top level memory context, but only if talloc_enable_leak_report() or talloc_enable_leak_report_full() has been called\&.
-.PP
-The recursion is stopped when depth >= max_depth\&. max_depth = \-1 means only stop at leaf nodes\&.
-.SS ""
-.HP \w'void\ talloc_report_depth_file('u
-.BI "void talloc_report_depth_file(" "const\ void\ *ptr" ", " "int\ depth" ", " "int\ max_depth" ", " "FILE\ *f" ");"
-.PP
-This provides a more flexible reports than talloc_report()\&. It will let you specify the depth and max_depth\&.
-.SS "void talloc_enable_leak_report(void);"
-.PP
-This enables calling of talloc_report(NULL, stderr) when the program exits\&. In Samba4 this is enabled by using the \-\-leak\-report command line option\&.
-.PP
-For it to be useful, this function must be called before any other talloc function as it establishes a "null context" that acts as the top of the tree\&. If you don\*(Aqt call this function first then passing NULL to talloc_report() or talloc_report_full() won\*(Aqt give you the full tree printout\&.
-.PP
-Here is a typical talloc report:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-talloc report on \*(Aqnull_context\*(Aq (total 267 bytes in 15 blocks)
-libcli/auth/spnego_parse\&.c:55  contains   31 bytes in   2 blocks
-libcli/auth/spnego_parse\&.c:55  contains   31 bytes in   2 blocks
-iconv(UTF8,CP850)              contains   42 bytes in   2 blocks
-libcli/auth/spnego_parse\&.c:55  contains   31 bytes in   2 blocks
-iconv(CP850,UTF8)              contains   42 bytes in   2 blocks
-iconv(UTF8,UTF\-16LE)           contains   45 bytes in   2 blocks
-iconv(UTF\-16LE,UTF8)           contains   45 bytes in   2 blocks
-      
-.fi
-.if n \{\
-.RE
-.\}
-.SS "void talloc_enable_leak_report_full(void);"
-.PP
-This enables calling of talloc_report_full(NULL, stderr) when the program exits\&. In Samba4 this is enabled by using the \-\-leak\-report\-full command line option\&.
-.PP
-For it to be useful, this function must be called before any other talloc function as it establishes a "null context" that acts as the top of the tree\&. If you don\*(Aqt call this function first then passing NULL to talloc_report() or talloc_report_full() won\*(Aqt give you the full tree printout\&.
-.PP
-Here is a typical full report:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-full talloc report on \*(Aqroot\*(Aq (total 18 bytes in 8 blocks)
-p1               contains     18 bytes in   7 blocks (ref 0)
-    r1               contains     13 bytes in   2 blocks (ref 0)
-        reference to: p2
-    p2               contains      1 bytes in   1 blocks (ref 1)
-    x3               contains      1 bytes in   1 blocks (ref 0)
-    x2               contains      1 bytes in   1 blocks (ref 0)
-    x1               contains      1 bytes in   1 blocks (ref 0)
-      
-.fi
-.if n \{\
-.RE
-.\}
-.SS "(\fItype\fR *)talloc_zero(const void *\fIctx\fR, \fItype\fR);"
-.PP
-The talloc_zero() macro is equivalent to:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-ptr = talloc(ctx, type);
-if (ptr) memset(ptr, 0, sizeof(type));
-.fi
-.if n \{\
-.RE
-.\}
-.SS "void *talloc_zero_size(const void *\fIctx\fR, size_t \fIsize\fR)"
-.PP
-The talloc_zero_size() function is useful when you don\*(Aqt have a known type\&.
-.SS "void *talloc_memdup(const void *\fIctx\fR, const void *\fIp\fR, size_t size);"
-.PP
-The talloc_memdup() function is equivalent to:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-ptr = talloc_size(ctx, size);
-if (ptr) memcpy(ptr, p, size);
-.fi
-.if n \{\
-.RE
-.\}
-.SS "char *talloc_strdup(const void *\fIctx\fR, const char *\fIp\fR);"
-.PP
-The talloc_strdup() function is equivalent to:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-ptr = talloc_size(ctx, strlen(p)+1);
-if (ptr) memcpy(ptr, p, strlen(p)+1);
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-This function sets the name of the new pointer to the passed string\&. This is equivalent to:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-talloc_set_name_const(ptr, ptr)
-.fi
-.if n \{\
-.RE
-.\}
-.SS "char *talloc_strndup(const void *\fIt\fR, const char *\fIp\fR, size_t \fIn\fR);"
-.PP
-The talloc_strndup() function is the talloc equivalent of the C library function strndup(3)\&.
-.PP
-This function sets the name of the new pointer to the passed string\&. This is equivalent to:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-talloc_set_name_const(ptr, ptr)
-.fi
-.if n \{\
-.RE
-.\}
-.SS "char *talloc_vasprintf(const void *\fIt\fR, const char *\fIfmt\fR, va_list \fIap\fR);"
-.PP
-The talloc_vasprintf() function is the talloc equivalent of the C library function vasprintf(3)\&.
-.PP
-This function sets the name of the new pointer to the new string\&. This is equivalent to:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-talloc_set_name_const(ptr, ptr)
-.fi
-.if n \{\
-.RE
-.\}
-.SS "char *talloc_asprintf(const void *\fIt\fR, const char *\fIfmt\fR, \&.\&.\&.);"
-.PP
-The talloc_asprintf() function is the talloc equivalent of the C library function asprintf(3)\&.
-.PP
-This function sets the name of the new pointer to the passed string\&. This is equivalent to:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-talloc_set_name_const(ptr, ptr)
-.fi
-.if n \{\
-.RE
-.\}
-.SS "char *talloc_asprintf_append(char *s, const char *fmt, \&.\&.\&.);"
-.PP
-The talloc_asprintf_append() function appends the given formatted string to the given string\&.
-.PP
-This function sets the name of the new pointer to the new string\&. This is equivalent to:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-talloc_set_name_const(ptr, ptr)
-.fi
-.if n \{\
-.RE
-.\}
-.SS "(type *)talloc_array(const void *ctx, type, unsigned int count);"
-.PP
-The talloc_array() macro is equivalent to:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-(type *)talloc_size(ctx, sizeof(type) * count);
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-except that it provides integer overflow protection for the multiply, returning NULL if the multiply overflows\&.
-.SS "void *talloc_array_size(const void *ctx, size_t size, unsigned int count);"
-.PP
-The talloc_array_size() function is useful when the type is not known\&. It operates in the same way as talloc_array(), but takes a size instead of a type\&.
-.SS "(typeof(ptr)) talloc_array_ptrtype(const void *ctx, ptr, unsigned int count);"
-.PP
-The talloc_ptrtype() macro should be used when you have a pointer to an array and want to allocate memory of an array to point at with this pointer\&. When compiling with gcc >= 3 it is typesafe\&. Note this is a wrapper of talloc_array_size() and talloc_get_name() will return the current location in the source file\&. and not the type\&.
-.SS "void *talloc_realloc_fn(const void *ctx, void *ptr, size_t size)"
-.PP
-This is a non\-macro version of talloc_realloc(), which is useful as libraries sometimes want a realloc function pointer\&. A realloc(3) implementation encapsulates the functionality of malloc(3), free(3) and realloc(3) in one call, which is why it is useful to be able to pass around a single function pointer\&.
-.SS "void *talloc_autofree_context(void);"
-.PP
-This is a handy utility function that returns a talloc context which will be automatically freed on program exit\&. This can be used to reduce the noise in memory leak reports\&.
-.SS "void *talloc_check_name(const void *ptr, const char *name);"
-.PP
-This function checks if a pointer has the specified
-\fIname\fR\&. If it does then the pointer is returned\&. It it doesn\*(Aqt then NULL is returned\&.
-.SS "(type *)talloc_get_type(const void *ptr, type);"
-.PP
-This macro allows you to do type checking on talloc pointers\&. It is particularly useful for void* private pointers\&. It is equivalent to this:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-(type *)talloc_check_name(ptr, #type)
-.fi
-.if n \{\
-.RE
-.\}
-.SS "talloc_set_type(const void *ptr, type);"
-.PP
-This macro allows you to force the name of a pointer to be a particular
-\fItype\fR\&. This can be used in conjunction with talloc_get_type() to do type checking on void* pointers\&.
-.PP
-It is equivalent to this:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-talloc_set_name_const(ptr, #type)
-.fi
-.if n \{\
-.RE
-.\}
-.SS "talloc_set_log_fn(void (*log_fn)(const char *message));"
-.PP
-This function sets a logging function that talloc will use for warnings and errors\&. By default talloc will not print any warnings or errors\&.
-.SS "talloc_set_log_stderr(void);"
-.PP
-This sets the talloc log function to write log messages to stderr
-.SH "PERFORMANCE"
-.PP
-All the additional features of talloc(3) over malloc(3) do come at a price\&. We have a simple performance test in Samba4 that measures talloc() versus malloc() performance, and it seems that talloc() is about 10% slower than malloc() on my x86 Debian Linux box\&. For Samba, the great reduction in code complexity that we get by using talloc makes this worthwhile, especially as the total overhead of talloc/malloc in Samba is already quite small\&.
-.SH "SEE ALSO"
-.PP
-malloc(3), strndup(3), vasprintf(3), asprintf(3),
-\m[blue]\fB\%http://talloc.samba.org/\fR\m[]
-.SH "AUTHOR"
-.PP
-The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
-.SH "COPYRIGHT/LICENSE"
-.PP
-Copyright (C) Andrew Tridgell 2004
-.PP
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&.
-.PP
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\&. See the GNU General Public License for more details\&.
-.PP
-You should have received a copy of the GNU General Public License along with this program; if not, see http://www\&.gnu\&.org/licenses/\&.
diff --git a/devel/talloc1/pkg-descr b/devel/talloc1/pkg-descr
deleted file mode 100644
index bb86bf2367a..00000000000
--- a/devel/talloc1/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-A hierarchical pool based memory allocator with destructors. It uses
-reference counting to determine when memory should be freed.
-
-WWW: http://talloc.samba.org/
diff --git a/devel/tevent1/Makefile b/devel/tevent1/Makefile
deleted file mode 100644
index 97e6fd3c042..00000000000
--- a/devel/tevent1/Makefile
+++ /dev/null
@@ -1,136 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=		tevent
-PORTVERSION=		0.9.37
-PORTREVISION=		0
-PORTEPOCH=		0
-CATEGORIES=		devel
-MASTER_SITES=		SAMBA
-PKGNAMESUFFIX=		1
-
-MAINTAINER=		timur@FreeBSD.org
-COMMENT=		Talloc based event loop library
-
-LICENSE=		LGPL3
-
-DEPRECATED=	Old version, uses EOLed python27
-EXPIRATION_DATE=	2020-02-15
-
-IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
-
-BUILD_DEPENDS=		talloc1>=2.1.11:devel/talloc1
-RUN_DEPENDS=		talloc1>=2.1.11:devel/talloc1
-
-CONFLICTS_INSTALL=	tevent-*
-
-#FLAVORS=		default nopython
-#nopython_PKGNAMESUFFIX=	-nopython
-#nopython_CONFLICTS=	tevent
-#default_CONFLICTS=	tevent-nopython
-
-USES=			compiler pkgconfig waf
-USE_LDCONFIG=		yes
-WAF_CMD=		buildtools/bin/waf
-CONFIGURE_LOG=		bin/config.log
-
-PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
-PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
-
-CONFIGURE_ARGS+=	--bundled-libraries=!talloc
-
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
-			--disable-rpath \
-			--without-gettext
-
-OPTIONS_DEFINE=		MANPAGES
-MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
-
-.include <bsd.port.options.mk>
-
-PLIST_FILES+=		include/tevent.h \
-			lib/libtevent.so \
-			lib/libtevent.so.0 \
-			${PKGCONFIGDIR}/tevent.pc
-
-.if defined(NO_PYTHON)
-USES+=			python:2.7,build
-CONFIGURE_ARGS+=	--disable-python
-.else
-USES+=			python:2.7
-
-PLIST_FILES+=		${PYTHON_SITELIBDIR}/_tevent.so \
-			${PYTHON_SITELIBDIR}/tevent.py  \
-			${PYTHON_SITELIBDIR}/tevent.pyc \
-			${PYTHON_SITELIBDIR}/tevent.pyo
-# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
-# This is not officially supported, use at your own risk
-.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]}
-SAMBA4_PYTHON3_VERSION=	${WITH_SAMBA4_PYTHON3}
-SAMBA4_PYTHON3=		python${SAMBA4_PYTHON3_VERSION}
-SAMBA4_PYTHON3_VER=	${SAMBA4_PYTHON3_VERSION:C/\.//}
-.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
-.error			unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
-.endif
-BUILD_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
-RUN_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
-# cpython-36m
-SAMBA4_PYTHON3_SO_ABI!=	[ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
-SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
-
-CONFIGURE_ENV+=		PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
-CONFIGURE_ARGS+=	--extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
-
-PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
-			SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
-
-PLIST_FILES+=		${SAMBA4_PYTHON3_SITELIBDIR}/_tevent.${SAMBA4_PYTHON3_SO_ABI}.so \
-			${SAMBA4_PYTHON3_SITELIBDIR}/tevent.py  \
-			${SAMBA4_PYTHON3_SITELIBDIR}/tevent.pyc \
-			${SAMBA4_PYTHON3_SITELIBDIR}/tevent.pyo
-.endif
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ! ${PORT_OPTIONS:MMANPAGES}
-CONFIGURE_ENV+=		XSLTPROC="true"
-.else
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
-			xsltproc:textproc/libxslt
-.endif
-# No fancy color error messages
-.if ${COMPILER_TYPE} == "clang"
-CFLAGS+=		-fno-color-diagnostics
-.endif
-CONFIGURE_ENV+=		NOCOLOR=yes
-MAKE_ENV+=		NOCOLOR=yes
-
-post-patch:
-			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
-				${BUILD_WRKSRC}/wscript
-
-# Use threading (or multiprocessing) but not thread (renamed in python 3+).
-pre-configure:
-			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
-				${ECHO_CMD}; \
-				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
-				${ECHO_CMD}; \
-				${FALSE}; \
-			fi
-
-.if !defined(NO_PYTHON)
-post-build:
-			${PYTHON_CMD} -m py_compile ${BUILD_WRKSRC}/tevent.py
-			${PYTHON_CMD} -O -m py_compile ${BUILD_WRKSRC}/tevent.py
-.endif
-
-post-install:
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtevent.so
-.if !defined(NO_PYTHON)
-			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tevent.so
-.if defined(SAMBA4_PYTHON3)
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/_tevent.${SAMBA4_PYTHON3_SO_ABI}.so
-.endif
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/devel/tevent1/distinfo b/devel/tevent1/distinfo
deleted file mode 100644
index 69e2783a89f..00000000000
--- a/devel/tevent1/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1531613973
-SHA256 (tevent-0.9.37.tar.gz) = 168345ed65eac03785cf77b95238e7dc66cbb473a42811693a6b0916e5dae7e0
-SIZE (tevent-0.9.37.tar.gz) = 603859
diff --git a/devel/tevent1/files/patch-buildtools__wafsamba__samba_autoconf.py b/devel/tevent1/files/patch-buildtools__wafsamba__samba_autoconf.py
deleted file mode 100644
index c92d308462b..00000000000
--- a/devel/tevent1/files/patch-buildtools__wafsamba__samba_autoconf.py
+++ /dev/null
@@ -1,52 +0,0 @@
---- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
-+++ buildtools/wafsamba/samba_autoconf.py
-@@ -548,7 +548,7 @@ def library_flags(self, libs):
- 
- 
- @conf
--def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
-+def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
-     '''check if a set of libraries exist as system libraries
- 
-     returns the sublist of libs that do exist as a syslib or []
-@@ -568,11 +568,29 @@ int foo()
-             ret.append(lib)
-             continue
- 
-+        if msg is None:
-+            msg = 'Checking for library %s' % lib
-+
-         (ccflags, ldflags, cpppath) = library_flags(conf, lib)
-+
-         if shlib:
--            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(features='c cshlib',
-+                             fragment=fragment,
-+                             lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
-         else:
--            res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
- 
-         if not res:
-             if mandatory:
-@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
-         conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
- 
-     if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
--        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
-+        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS):
-             conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
- 
- @conf
diff --git a/devel/tevent1/files/patch-buildtools__wafsamba__samba_install.py b/devel/tevent1/files/patch-buildtools__wafsamba__samba_install.py
deleted file mode 100644
index 95f250a8621..00000000000
--- a/devel/tevent1/files/patch-buildtools__wafsamba__samba_install.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- buildtools/wafsamba/samba_install.py.orig	2015-12-10 11:01:40 UTC
-+++ buildtools/wafsamba/samba_install.py
-@@ -118,7 +118,7 @@ def install_library(self):
-                 inst_name    = bld.make_libname(t.target)
-         elif self.vnum:
-             vnum_base    = self.vnum.split('.')[0]
--            install_name = bld.make_libname(target_name, version=self.vnum)
-+            install_name = bld.make_libname(target_name, version=vnum_base)
-             install_link = bld.make_libname(target_name, version=vnum_base)
-             inst_name    = bld.make_libname(t.target)
-             if not self.private_library:
diff --git a/devel/tevent1/files/patch-buildtools__wafsamba__samba_python.py b/devel/tevent1/files/patch-buildtools__wafsamba__samba_python.py
deleted file mode 100644
index 429ec5e778f..00000000000
--- a/devel/tevent1/files/patch-buildtools__wafsamba__samba_python.py
+++ /dev/null
@@ -1,40 +0,0 @@
---- buildtools/wafsamba/samba_python.py.orig	2018-01-13 09:07:51 UTC
-+++ buildtools/wafsamba/samba_python.py
-@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
- 
- def _check_python_headers(conf, mandatory):
-     try:
-+        from python import _get_python_variables
-         Configure.ConfigurationError
-         conf.check_python_headers(mandatory=mandatory)
-+        conf.env['PYTHON_SO_ABI'] = _get_python_variables(
-+            conf.env['PYTHON'],
-+            ["get_config_var('SOABI') or ''"],
-+            ['from distutils.sysconfig import get_config_var']
-+        )[0]
-     except Configure.ConfigurationError:
-         if mandatory:
-              raise
- 
-     if conf.env['PYTHON_VERSION'] > '3':
--        abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
--        conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-+        '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG,
-+           while environment variable is PYTHON3_SO_ABI_FLAG'''
-+        override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
-+        if override_PYTHON_SO_ABI_FLAG is not None:
-+            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG
-+            conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
-+        if not conf.env['PYTHON_SO_ABI_FLAG']:
-+            if conf.env['PYTHON_SO_ABI']:
-+                conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI']
-+                conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
-+            else:
-+                abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
-+                conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-     else:
-         conf.env['PYTHON_SO_ABI_FLAG'] = ''
-+
-     conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = (
-         conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-'))
- 
diff --git a/devel/tevent1/files/patch-buildtools__wafsamba__wscript b/devel/tevent1/files/patch-buildtools__wafsamba__wscript
deleted file mode 100644
index 9399a316c14..00000000000
--- a/devel/tevent1/files/patch-buildtools__wafsamba__wscript
+++ /dev/null
@@ -1,15 +0,0 @@
---- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
-+++ buildtools/wafsamba/wscript
-@@ -76,10 +76,10 @@ def set_options(opt):
- 
-     opt.add_option('--with-libiconv',
-                    help='additional directory to search for libiconv',
--                   action='store', dest='iconv_open', default='/usr/local',
-+                   action='store', dest='iconv_open', default=None,
-                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
-     opt.add_option('--without-gettext',
--                   help=("Disable use of gettext"),
-+                   help=("disable use of gettext"),
-                    action="store_true", dest='disable_gettext', default=False)
- 
-     gr = opt.option_group('developer options')
diff --git a/devel/tevent1/files/patch-lib__replace__wscript b/devel/tevent1/files/patch-lib__replace__wscript
deleted file mode 100644
index 7bf2a8ee21f..00000000000
--- a/devel/tevent1/files/patch-lib__replace__wscript
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/replace/wscript.orig	2017-07-02 20:22:14 UTC
-+++ lib/replace/wscript
-@@ -81,7 +81,7 @@ def configure(conf):
-     conf.CHECK_HEADERS('sys/atomic.h')
-     conf.CHECK_HEADERS('libgen.h')
- 
--    if conf.CHECK_CFLAGS('-Wno-format-truncation'):
-+    if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS):
-         conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
- 
-     # Check for process set name support
diff --git a/devel/tevent1/files/patch-third_party__waf__wafadmin__Tools__cc.py b/devel/tevent1/files/patch-third_party__waf__wafadmin__Tools__cc.py
deleted file mode 100644
index 5695f3e0384..00000000000
--- a/devel/tevent1/files/patch-third_party__waf__wafadmin__Tools__cc.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/waf/wafadmin/Tools/cc.py.orig	2015-11-06 13:25:52 UTC
-+++ third_party/waf/wafadmin/Tools/cc.py
-@@ -88,7 +88,7 @@ def c_hook(self, node):
- 		raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self))
- 	return task
- 
--cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
-+cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
- cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False)
- cls.scan = ccroot.scan
- cls.vars.append('CCDEPS')
diff --git a/devel/tevent1/files/patch-wscript b/devel/tevent1/files/patch-wscript
deleted file mode 100644
index dff14b9a21a..00000000000
--- a/devel/tevent1/files/patch-wscript
+++ /dev/null
@@ -1,20 +0,0 @@
---- wscript.orig	2017-07-22 22:25:22 UTC
-+++ wscript
-@@ -88,7 +88,7 @@ def build(bld):
-         SRC += ' tevent_port.c'
- 
-     if bld.env.standalone_tevent:
--        bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
-+        bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
-         private_library = False
-     else:
-         private_library = True
-@@ -120,7 +120,7 @@ def build(bld):
-                             cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION)
- 
- 
--            bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'tevent.py', flat=False)
-+            bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'tevent.py*', flat=False)
- 
-         # install out various python scripts for use by make test
-         bld.SAMBA_SCRIPT('tevent_python',
diff --git a/devel/tevent1/pkg-descr b/devel/tevent1/pkg-descr
deleted file mode 100644
index 7e733ff8b42..00000000000
--- a/devel/tevent1/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-tevent is a simple library that can handle the main event loop for an
-application. It supports three kinds of events: timed events, file
-descriptors becoming readable or writable and signals.
-
-Talloc is used for memory management, both internally and for private
-data provided by users of the library.
-
-WWW: http://www.samba.org/
diff --git a/devel/tokei/Makefile b/devel/tokei/Makefile
index 68b9d45f494..256aae1b5a3 100644
--- a/devel/tokei/Makefile
+++ b/devel/tokei/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	tokei
 DISTVERSIONPREFIX=	v
-DISTVERSION=	10.1.1
-PORTREVISION=	1
+DISTVERSION=	10.1.2
 CATEGORIES=	devel
 
 MAINTAINER=	tobik@FreeBSD.org
@@ -18,65 +17,56 @@ USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	XAMPPRocky
 
-CARGO_CRATES=	aho-corasick-0.7.6 \
+CARGO_CRATES=	aho-corasick-0.7.8 \
 		ansi_term-0.11.0 \
-		arrayref-0.3.5 \
+		arrayref-0.3.6 \
 		arrayvec-0.5.1 \
-		atty-0.2.13 \
+		atty-0.2.14 \
 		autocfg-0.1.7 \
-		backtrace-0.3.40 \
-		backtrace-sys-0.1.32 \
-		base64-0.10.1 \
+		base64-0.11.0 \
 		bitflags-1.2.1 \
-		blake2b_simd-0.5.9 \
+		blake2b_simd-0.5.10 \
 		block-buffer-0.7.3 \
 		block-padding-0.1.5 \
-		bstr-0.2.8 \
+		bstr-0.2.11 \
 		byte-tools-0.3.1 \
 		bytecount-0.5.1 \
-		byteorder-1.3.2 \
+		byteorder-1.3.4 \
 		c2-chacha-0.2.3 \
-		cc-1.0.48 \
+		cc-1.0.50 \
 		cfg-if-0.1.10 \
 		clap-2.33.0 \
-		cloudabi-0.0.3 \
-		constant_time_eq-0.1.4 \
-		crossbeam-channel-0.3.9 \
+		constant_time_eq-0.1.5 \
 		crossbeam-channel-0.4.0 \
 		crossbeam-deque-0.7.2 \
 		crossbeam-epoch-0.8.0 \
 		crossbeam-queue-0.2.1 \
-		crossbeam-utils-0.6.6 \
 		crossbeam-utils-0.7.0 \
 		digest-0.8.1 \
 		dirs-2.0.2 \
 		dirs-sys-0.3.4 \
-		dtoa-0.4.4 \
+		dtoa-0.4.5 \
 		either-1.5.3 \
 		encoding_rs-0.8.22 \
-		encoding_rs_io-0.1.6 \
+		encoding_rs_io-0.1.7 \
 		env_logger-0.7.1 \
-		failure-0.1.6 \
-		failure_derive-0.1.6 \
 		fake-simd-0.1.2 \
 		fnv-1.0.6 \
-		fuchsia-cprng-0.1.1 \
 		generic-array-0.12.3 \
-		getrandom-0.1.13 \
+		getrandom-0.1.14 \
 		git2-0.11.0 \
 		globset-0.4.4 \
 		grep-matcher-0.1.3 \
 		grep-searcher-0.1.6 \
-		half-1.4.0 \
-		handlebars-2.0.2 \
-		hashbrown-0.5.0 \
-		hermit-abi-0.1.5 \
-		hex-0.4.0 \
+		half-1.4.1 \
+		handlebars-3.0.1 \
+		hermit-abi-0.1.6 \
+		hex-0.4.1 \
 		humantime-1.3.0 \
 		idna-0.2.0 \
-		ignore-0.4.10 \
-		itoa-0.4.4 \
-		jobserver-0.1.17 \
+		ignore-0.4.11 \
+		itoa-0.4.5 \
+		jobserver-0.1.21 \
 		kernel32-sys-0.2.2 \
 		lazy_static-1.4.0 \
 		libc-0.2.66 \
@@ -86,10 +76,10 @@ CARGO_CRATES=	aho-corasick-0.7.6 \
 		log-0.4.8 \
 		maplit-1.0.2 \
 		matches-0.1.8 \
-		memchr-2.2.1 \
+		memchr-2.3.2 \
 		memmap-0.7.0 \
 		memoffset-0.5.3 \
-		num_cpus-1.11.1 \
+		num_cpus-1.12.0 \
 		opaque-debug-0.2.3 \
 		percent-encoding-2.1.0 \
 		pest-2.1.2 \
@@ -98,66 +88,59 @@ CARGO_CRATES=	aho-corasick-0.7.6 \
 		pest_meta-2.1.2 \
 		pkg-config-0.3.17 \
 		ppv-lite86-0.2.6 \
-		proc-macro2-1.0.6 \
-		quick-error-1.2.2 \
+		proc-macro2-1.0.8 \
+		quick-error-1.2.3 \
 		quote-1.0.2 \
-		rand-0.7.2 \
+		rand-0.7.3 \
 		rand_chacha-0.2.1 \
-		rand_core-0.3.1 \
-		rand_core-0.4.2 \
 		rand_core-0.5.1 \
 		rand_hc-0.2.0 \
-		rand_os-0.1.3 \
 		rayon-1.3.0 \
 		rayon-core-1.7.0 \
-		rdrand-0.4.0 \
 		redox_syscall-0.1.56 \
-		redox_users-0.3.1 \
-		regex-1.3.1 \
-		regex-syntax-0.6.12 \
+		redox_users-0.3.4 \
+		regex-1.3.4 \
+		regex-syntax-0.6.14 \
 		remove_dir_all-0.5.2 \
-		rust-argon2-0.5.1 \
-		rustc-demangle-0.1.16 \
+		rust-argon2-0.7.0 \
 		rustc_version-0.2.3 \
 		ryu-1.0.2 \
-		same-file-1.0.5 \
+		same-file-1.0.6 \
 		scopeguard-1.0.0 \
 		semver-0.9.0 \
 		semver-parser-0.7.0 \
 		serde-1.0.104 \
-		serde_cbor-0.10.2 \
+		serde_cbor-0.11.1 \
 		serde_derive-1.0.104 \
-		serde_json-1.0.44 \
+		serde_json-1.0.48 \
 		serde_yaml-0.8.11 \
-		sha-1-0.8.1 \
-		smallvec-1.1.0 \
+		sha-1-0.8.2 \
+		smallvec-1.2.0 \
 		strsim-0.8.0 \
-		syn-1.0.11 \
-		synstructure-0.12.3 \
+		syn-1.0.14 \
 		tempfile-3.1.0 \
 		term_size-0.3.1 \
-		termcolor-1.0.5 \
+		termcolor-1.1.0 \
 		textwrap-0.11.0 \
-		thread_local-0.3.6 \
-		toml-0.5.5 \
+		thread_local-1.0.1 \
+		toml-0.5.6 \
 		typenum-1.11.2 \
 		ucd-trie-0.1.2 \
 		unicode-bidi-0.3.4 \
-		unicode-normalization-0.1.11 \
+		unicode-normalization-0.1.12 \
 		unicode-width-0.1.7 \
 		unicode-xid-0.2.0 \
-		url-2.1.0 \
+		url-2.1.1 \
 		vcpkg-0.2.8 \
 		vec_map-0.8.1 \
-		walkdir-2.2.9 \
-		wasi-0.7.0 \
+		walkdir-2.3.1 \
+		wasi-0.9.0+wasi-snapshot-preview1 \
 		winapi-0.2.8 \
 		winapi-0.3.8 \
 		winapi-build-0.1.1 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.2 \
+		winapi-util-0.1.3 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		wincolor-1.0.2 \
 		yaml-rust-0.4.3
 # enable all output serialization formats
 CARGO_FEATURES=	all
diff --git a/devel/tokei/distinfo b/devel/tokei/distinfo
index 7d5bd59d609..a71d7ff0055 100644
--- a/devel/tokei/distinfo
+++ b/devel/tokei/distinfo
@@ -1,52 +1,44 @@
-TIMESTAMP = 1577602210
-SHA256 (rust/crates/aho-corasick-0.7.6.tar.gz) = 58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d
-SIZE (rust/crates/aho-corasick-0.7.6.tar.gz) = 108953
+TIMESTAMP = 1581771707
+SHA256 (rust/crates/aho-corasick-0.7.8.tar.gz) = 743ad5a418686aad3b87fd14c43badd828cf26e214a00f92a384291cf22e1811
+SIZE (rust/crates/aho-corasick-0.7.8.tar.gz) = 110524
 SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
 SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087
-SHA256 (rust/crates/arrayref-0.3.5.tar.gz) = 0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee
-SIZE (rust/crates/arrayref-0.3.5.tar.gz) = 7644
+SHA256 (rust/crates/arrayref-0.3.6.tar.gz) = a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544
+SIZE (rust/crates/arrayref-0.3.6.tar.gz) = 10035
 SHA256 (rust/crates/arrayvec-0.5.1.tar.gz) = cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8
 SIZE (rust/crates/arrayvec-0.5.1.tar.gz) = 26816
-SHA256 (rust/crates/atty-0.2.13.tar.gz) = 1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90
-SIZE (rust/crates/atty-0.2.13.tar.gz) = 4764
+SHA256 (rust/crates/atty-0.2.14.tar.gz) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
+SIZE (rust/crates/atty-0.2.14.tar.gz) = 5470
 SHA256 (rust/crates/autocfg-0.1.7.tar.gz) = 1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2
 SIZE (rust/crates/autocfg-0.1.7.tar.gz) = 12158
-SHA256 (rust/crates/backtrace-0.3.40.tar.gz) = 924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea
-SIZE (rust/crates/backtrace-0.3.40.tar.gz) = 68183
-SHA256 (rust/crates/backtrace-sys-0.1.32.tar.gz) = 5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491
-SIZE (rust/crates/backtrace-sys-0.1.32.tar.gz) = 518920
-SHA256 (rust/crates/base64-0.10.1.tar.gz) = 0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e
-SIZE (rust/crates/base64-0.10.1.tar.gz) = 41988
+SHA256 (rust/crates/base64-0.11.0.tar.gz) = b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7
+SIZE (rust/crates/base64-0.11.0.tar.gz) = 48362
 SHA256 (rust/crates/bitflags-1.2.1.tar.gz) = cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693
 SIZE (rust/crates/bitflags-1.2.1.tar.gz) = 16745
-SHA256 (rust/crates/blake2b_simd-0.5.9.tar.gz) = b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0
-SIZE (rust/crates/blake2b_simd-0.5.9.tar.gz) = 33575
+SHA256 (rust/crates/blake2b_simd-0.5.10.tar.gz) = d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a
+SIZE (rust/crates/blake2b_simd-0.5.10.tar.gz) = 34093
 SHA256 (rust/crates/block-buffer-0.7.3.tar.gz) = c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b
 SIZE (rust/crates/block-buffer-0.7.3.tar.gz) = 7179
 SHA256 (rust/crates/block-padding-0.1.5.tar.gz) = fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5
 SIZE (rust/crates/block-padding-0.1.5.tar.gz) = 7342
-SHA256 (rust/crates/bstr-0.2.8.tar.gz) = 8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245
-SIZE (rust/crates/bstr-0.2.8.tar.gz) = 337654
+SHA256 (rust/crates/bstr-0.2.11.tar.gz) = 502ae1441a0a5adb8fbd38a5955a6416b9493e92b465de5e4a9bde6a539c2c48
+SIZE (rust/crates/bstr-0.2.11.tar.gz) = 338763
 SHA256 (rust/crates/byte-tools-0.3.1.tar.gz) = e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7
 SIZE (rust/crates/byte-tools-0.3.1.tar.gz) = 5526
 SHA256 (rust/crates/bytecount-0.5.1.tar.gz) = be0fdd54b507df8f22012890aadd099979befdba27713c767993f8380112ca7c
 SIZE (rust/crates/bytecount-0.5.1.tar.gz) = 11888
-SHA256 (rust/crates/byteorder-1.3.2.tar.gz) = a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5
-SIZE (rust/crates/byteorder-1.3.2.tar.gz) = 21596
+SHA256 (rust/crates/byteorder-1.3.4.tar.gz) = 08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de
+SIZE (rust/crates/byteorder-1.3.4.tar.gz) = 21943
 SHA256 (rust/crates/c2-chacha-0.2.3.tar.gz) = 214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb
 SIZE (rust/crates/c2-chacha-0.2.3.tar.gz) = 13336
-SHA256 (rust/crates/cc-1.0.48.tar.gz) = f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76
-SIZE (rust/crates/cc-1.0.48.tar.gz) = 49885
+SHA256 (rust/crates/cc-1.0.50.tar.gz) = 95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd
+SIZE (rust/crates/cc-1.0.50.tar.gz) = 49792
 SHA256 (rust/crates/cfg-if-0.1.10.tar.gz) = 4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822
 SIZE (rust/crates/cfg-if-0.1.10.tar.gz) = 7933
 SHA256 (rust/crates/clap-2.33.0.tar.gz) = 5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9
 SIZE (rust/crates/clap-2.33.0.tar.gz) = 196458
-SHA256 (rust/crates/cloudabi-0.0.3.tar.gz) = ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f
-SIZE (rust/crates/cloudabi-0.0.3.tar.gz) = 22156
-SHA256 (rust/crates/constant_time_eq-0.1.4.tar.gz) = 995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120
-SIZE (rust/crates/constant_time_eq-0.1.4.tar.gz) = 4654
-SHA256 (rust/crates/crossbeam-channel-0.3.9.tar.gz) = c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa
-SIZE (rust/crates/crossbeam-channel-0.3.9.tar.gz) = 86771
+SHA256 (rust/crates/constant_time_eq-0.1.5.tar.gz) = 245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc
+SIZE (rust/crates/constant_time_eq-0.1.5.tar.gz) = 4936
 SHA256 (rust/crates/crossbeam-channel-0.4.0.tar.gz) = acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c
 SIZE (rust/crates/crossbeam-channel-0.4.0.tar.gz) = 86869
 SHA256 (rust/crates/crossbeam-deque-0.7.2.tar.gz) = c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca
@@ -55,8 +47,6 @@ SHA256 (rust/crates/crossbeam-epoch-0.8.0.tar.gz) = 5064ebdbf05ce3cb95e45c8b086f
 SIZE (rust/crates/crossbeam-epoch-0.8.0.tar.gz) = 38711
 SHA256 (rust/crates/crossbeam-queue-0.2.1.tar.gz) = c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db
 SIZE (rust/crates/crossbeam-queue-0.2.1.tar.gz) = 14543
-SHA256 (rust/crates/crossbeam-utils-0.6.6.tar.gz) = 04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6
-SIZE (rust/crates/crossbeam-utils-0.6.6.tar.gz) = 32836
 SHA256 (rust/crates/crossbeam-utils-0.7.0.tar.gz) = ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4
 SIZE (rust/crates/crossbeam-utils-0.7.0.tar.gz) = 34202
 SHA256 (rust/crates/digest-0.8.1.tar.gz) = f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5
@@ -65,30 +55,24 @@ SHA256 (rust/crates/dirs-2.0.2.tar.gz) = 13aea89a5c93364a98e9b37b2fa237effbb694d
 SIZE (rust/crates/dirs-2.0.2.tar.gz) = 11779
 SHA256 (rust/crates/dirs-sys-0.3.4.tar.gz) = afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b
 SIZE (rust/crates/dirs-sys-0.3.4.tar.gz) = 10477
-SHA256 (rust/crates/dtoa-0.4.4.tar.gz) = ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e
-SIZE (rust/crates/dtoa-0.4.4.tar.gz) = 14818
+SHA256 (rust/crates/dtoa-0.4.5.tar.gz) = 4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3
+SIZE (rust/crates/dtoa-0.4.5.tar.gz) = 14840
 SHA256 (rust/crates/either-1.5.3.tar.gz) = bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3
 SIZE (rust/crates/either-1.5.3.tar.gz) = 12278
 SHA256 (rust/crates/encoding_rs-0.8.22.tar.gz) = cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28
 SIZE (rust/crates/encoding_rs-0.8.22.tar.gz) = 1403758
-SHA256 (rust/crates/encoding_rs_io-0.1.6.tar.gz) = 9619ee7a2bf4e777e020b95c1439abaf008f8ea8041b78a0552c4f1bcf4df32c
-SIZE (rust/crates/encoding_rs_io-0.1.6.tar.gz) = 16392
+SHA256 (rust/crates/encoding_rs_io-0.1.7.tar.gz) = 1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83
+SIZE (rust/crates/encoding_rs_io-0.1.7.tar.gz) = 16969
 SHA256 (rust/crates/env_logger-0.7.1.tar.gz) = 44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36
 SIZE (rust/crates/env_logger-0.7.1.tar.gz) = 32281
-SHA256 (rust/crates/failure-0.1.6.tar.gz) = f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9
-SIZE (rust/crates/failure-0.1.6.tar.gz) = 37950
-SHA256 (rust/crates/failure_derive-0.1.6.tar.gz) = 0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08
-SIZE (rust/crates/failure_derive-0.1.6.tar.gz) = 4902
 SHA256 (rust/crates/fake-simd-0.1.2.tar.gz) = e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed
 SIZE (rust/crates/fake-simd-0.1.2.tar.gz) = 5398
 SHA256 (rust/crates/fnv-1.0.6.tar.gz) = 2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3
 SIZE (rust/crates/fnv-1.0.6.tar.gz) = 11131
-SHA256 (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba
-SIZE (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = 2950
 SHA256 (rust/crates/generic-array-0.12.3.tar.gz) = c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec
 SIZE (rust/crates/generic-array-0.12.3.tar.gz) = 18017
-SHA256 (rust/crates/getrandom-0.1.13.tar.gz) = e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407
-SIZE (rust/crates/getrandom-0.1.13.tar.gz) = 24581
+SHA256 (rust/crates/getrandom-0.1.14.tar.gz) = 7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb
+SIZE (rust/crates/getrandom-0.1.14.tar.gz) = 24698
 SHA256 (rust/crates/git2-0.11.0.tar.gz) = 77519ef7c5beee314d0804d4534f01e0f9e8d9acdee2b7a48627e590b27e0ec4
 SIZE (rust/crates/git2-0.11.0.tar.gz) = 158388
 SHA256 (rust/crates/globset-0.4.4.tar.gz) = 925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2
@@ -97,26 +81,24 @@ SHA256 (rust/crates/grep-matcher-0.1.3.tar.gz) = 75c2fa3a90e22690d6921196acf1e0c
 SIZE (rust/crates/grep-matcher-0.1.3.tar.gz) = 15545
 SHA256 (rust/crates/grep-searcher-0.1.6.tar.gz) = 8a008a8038aa977f56a36ec9d0dd2c81c760abda6bfbf92998668b50a3094f25
 SIZE (rust/crates/grep-searcher-0.1.6.tar.gz) = 44591
-SHA256 (rust/crates/half-1.4.0.tar.gz) = 9ff54597ea139063f4225f1ec47011b03c9de4a486957ff3fc506881dac951d0
-SIZE (rust/crates/half-1.4.0.tar.gz) = 35130
-SHA256 (rust/crates/handlebars-2.0.2.tar.gz) = 91ef1ac30f2eaaa2b835fce73c57091cb6b9fc62b7eef285efbf980b0f20001b
-SIZE (rust/crates/handlebars-2.0.2.tar.gz) = 62006
-SHA256 (rust/crates/hashbrown-0.5.0.tar.gz) = e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353
-SIZE (rust/crates/hashbrown-0.5.0.tar.gz) = 65631
-SHA256 (rust/crates/hermit-abi-0.1.5.tar.gz) = f629dc602392d3ec14bfc8a09b5e644d7ffd725102b48b81e59f90f2633621d7
-SIZE (rust/crates/hermit-abi-0.1.5.tar.gz) = 6790
-SHA256 (rust/crates/hex-0.4.0.tar.gz) = 023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e
-SIZE (rust/crates/hex-0.4.0.tar.gz) = 10127
+SHA256 (rust/crates/half-1.4.1.tar.gz) = 20d6a47d6e4b8559729f58287efa8e6f767e603c068fea7a5e4d9f1cebe2bebb
+SIZE (rust/crates/half-1.4.1.tar.gz) = 35052
+SHA256 (rust/crates/handlebars-3.0.1.tar.gz) = ba758d094d31274eb49d15da6f326b96bf3185239a6359bf684f3d5321148900
+SIZE (rust/crates/handlebars-3.0.1.tar.gz) = 65081
+SHA256 (rust/crates/hermit-abi-0.1.6.tar.gz) = eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772
+SIZE (rust/crates/hermit-abi-0.1.6.tar.gz) = 6907
+SHA256 (rust/crates/hex-0.4.1.tar.gz) = 76cdda6bf525062a0c9e8f14ee2b37935c86b8efb6c8b69b3c83dfb518a914af
+SIZE (rust/crates/hex-0.4.1.tar.gz) = 13446
 SHA256 (rust/crates/humantime-1.3.0.tar.gz) = df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f
 SIZE (rust/crates/humantime-1.3.0.tar.gz) = 17020
 SHA256 (rust/crates/idna-0.2.0.tar.gz) = 02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9
 SIZE (rust/crates/idna-0.2.0.tar.gz) = 257203
-SHA256 (rust/crates/ignore-0.4.10.tar.gz) = 0ec16832258409d571aaef8273f3c3cc5b060d784e159d1a0f3b0017308f84a7
-SIZE (rust/crates/ignore-0.4.10.tar.gz) = 49022
-SHA256 (rust/crates/itoa-0.4.4.tar.gz) = 501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f
-SIZE (rust/crates/itoa-0.4.4.tar.gz) = 11147
-SHA256 (rust/crates/jobserver-0.1.17.tar.gz) = f2b1d42ef453b30b7387e113da1c83ab1605d90c5b4e0eb8e96d016ed3b8c160
-SIZE (rust/crates/jobserver-0.1.17.tar.gz) = 19563
+SHA256 (rust/crates/ignore-0.4.11.tar.gz) = 522daefc3b69036f80c7d2990b28ff9e0471c683bad05ca258e0a01dd22c5a1e
+SIZE (rust/crates/ignore-0.4.11.tar.gz) = 49126
+SHA256 (rust/crates/itoa-0.4.5.tar.gz) = b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e
+SIZE (rust/crates/itoa-0.4.5.tar.gz) = 11194
+SHA256 (rust/crates/jobserver-0.1.21.tar.gz) = 5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2
+SIZE (rust/crates/jobserver-0.1.21.tar.gz) = 21228
 SHA256 (rust/crates/kernel32-sys-0.2.2.tar.gz) = 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d
 SIZE (rust/crates/kernel32-sys-0.2.2.tar.gz) = 24537
 SHA256 (rust/crates/lazy_static-1.4.0.tar.gz) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
@@ -135,14 +117,14 @@ SHA256 (rust/crates/maplit-1.0.2.tar.gz) = 3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61
 SIZE (rust/crates/maplit-1.0.2.tar.gz) = 8871
 SHA256 (rust/crates/matches-0.1.8.tar.gz) = 7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08
 SIZE (rust/crates/matches-0.1.8.tar.gz) = 2216
-SHA256 (rust/crates/memchr-2.2.1.tar.gz) = 88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e
-SIZE (rust/crates/memchr-2.2.1.tar.gz) = 20862
+SHA256 (rust/crates/memchr-2.3.2.tar.gz) = 53445de381a1f436797497c61d851644d0e8e88e6140f22872ad33a704933978
+SIZE (rust/crates/memchr-2.3.2.tar.gz) = 22528
 SHA256 (rust/crates/memmap-0.7.0.tar.gz) = 6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b
 SIZE (rust/crates/memmap-0.7.0.tar.gz) = 15214
 SHA256 (rust/crates/memoffset-0.5.3.tar.gz) = 75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9
 SIZE (rust/crates/memoffset-0.5.3.tar.gz) = 6107
-SHA256 (rust/crates/num_cpus-1.11.1.tar.gz) = 76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72
-SIZE (rust/crates/num_cpus-1.11.1.tar.gz) = 11798
+SHA256 (rust/crates/num_cpus-1.12.0.tar.gz) = 46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6
+SIZE (rust/crates/num_cpus-1.12.0.tar.gz) = 11867
 SHA256 (rust/crates/opaque-debug-0.2.3.tar.gz) = 2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c
 SIZE (rust/crates/opaque-debug-0.2.3.tar.gz) = 5643
 SHA256 (rust/crates/percent-encoding-2.1.0.tar.gz) = d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e
@@ -159,52 +141,42 @@ SHA256 (rust/crates/pkg-config-0.3.17.tar.gz) = 05da548ad6865900e60eaba7f589cc07
 SIZE (rust/crates/pkg-config-0.3.17.tar.gz) = 14533
 SHA256 (rust/crates/ppv-lite86-0.2.6.tar.gz) = 74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b
 SIZE (rust/crates/ppv-lite86-0.2.6.tar.gz) = 20522
-SHA256 (rust/crates/proc-macro2-1.0.6.tar.gz) = 9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27
-SIZE (rust/crates/proc-macro2-1.0.6.tar.gz) = 35414
-SHA256 (rust/crates/quick-error-1.2.2.tar.gz) = 9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0
-SIZE (rust/crates/quick-error-1.2.2.tar.gz) = 15132
+SHA256 (rust/crates/proc-macro2-1.0.8.tar.gz) = 3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548
+SIZE (rust/crates/proc-macro2-1.0.8.tar.gz) = 35657
+SHA256 (rust/crates/quick-error-1.2.3.tar.gz) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0
+SIZE (rust/crates/quick-error-1.2.3.tar.gz) = 15066
 SHA256 (rust/crates/quote-1.0.2.tar.gz) = 053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe
 SIZE (rust/crates/quote-1.0.2.tar.gz) = 23023
-SHA256 (rust/crates/rand-0.7.2.tar.gz) = 3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412
-SIZE (rust/crates/rand-0.7.2.tar.gz) = 111438
+SHA256 (rust/crates/rand-0.7.3.tar.gz) = 6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03
+SIZE (rust/crates/rand-0.7.3.tar.gz) = 112246
 SHA256 (rust/crates/rand_chacha-0.2.1.tar.gz) = 03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853
 SIZE (rust/crates/rand_chacha-0.2.1.tar.gz) = 11475
-SHA256 (rust/crates/rand_core-0.3.1.tar.gz) = 7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b
-SIZE (rust/crates/rand_core-0.3.1.tar.gz) = 15483
-SHA256 (rust/crates/rand_core-0.4.2.tar.gz) = 9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc
-SIZE (rust/crates/rand_core-0.4.2.tar.gz) = 20243
 SHA256 (rust/crates/rand_core-0.5.1.tar.gz) = 90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19
 SIZE (rust/crates/rand_core-0.5.1.tar.gz) = 21116
 SHA256 (rust/crates/rand_hc-0.2.0.tar.gz) = ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c
 SIZE (rust/crates/rand_hc-0.2.0.tar.gz) = 11670
-SHA256 (rust/crates/rand_os-0.1.3.tar.gz) = 7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071
-SIZE (rust/crates/rand_os-0.1.3.tar.gz) = 18965
 SHA256 (rust/crates/rayon-1.3.0.tar.gz) = db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098
 SIZE (rust/crates/rayon-1.3.0.tar.gz) = 143294
 SHA256 (rust/crates/rayon-core-1.7.0.tar.gz) = 08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9
 SIZE (rust/crates/rayon-core-1.7.0.tar.gz) = 58306
-SHA256 (rust/crates/rdrand-0.4.0.tar.gz) = 678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2
-SIZE (rust/crates/rdrand-0.4.0.tar.gz) = 6456
 SHA256 (rust/crates/redox_syscall-0.1.56.tar.gz) = 2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84
 SIZE (rust/crates/redox_syscall-0.1.56.tar.gz) = 17117
-SHA256 (rust/crates/redox_users-0.3.1.tar.gz) = 4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d
-SIZE (rust/crates/redox_users-0.3.1.tar.gz) = 12557
-SHA256 (rust/crates/regex-1.3.1.tar.gz) = dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd
-SIZE (rust/crates/regex-1.3.1.tar.gz) = 234662
-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/redox_users-0.3.4.tar.gz) = 09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431
+SIZE (rust/crates/redox_users-0.3.4.tar.gz) = 12526
+SHA256 (rust/crates/regex-1.3.4.tar.gz) = 322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8
+SIZE (rust/crates/regex-1.3.4.tar.gz) = 235086
+SHA256 (rust/crates/regex-syntax-0.6.14.tar.gz) = b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06
+SIZE (rust/crates/regex-syntax-0.6.14.tar.gz) = 289666
 SHA256 (rust/crates/remove_dir_all-0.5.2.tar.gz) = 4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e
 SIZE (rust/crates/remove_dir_all-0.5.2.tar.gz) = 8907
-SHA256 (rust/crates/rust-argon2-0.5.1.tar.gz) = 4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf
-SIZE (rust/crates/rust-argon2-0.5.1.tar.gz) = 27795
-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/rust-argon2-0.7.0.tar.gz) = 2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017
+SIZE (rust/crates/rust-argon2-0.7.0.tar.gz) = 27757
 SHA256 (rust/crates/rustc_version-0.2.3.tar.gz) = 138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a
 SIZE (rust/crates/rustc_version-0.2.3.tar.gz) = 10210
 SHA256 (rust/crates/ryu-1.0.2.tar.gz) = bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8
 SIZE (rust/crates/ryu-1.0.2.tar.gz) = 42001
-SHA256 (rust/crates/same-file-1.0.5.tar.gz) = 585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421
-SIZE (rust/crates/same-file-1.0.5.tar.gz) = 9861
+SHA256 (rust/crates/same-file-1.0.6.tar.gz) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
+SIZE (rust/crates/same-file-1.0.6.tar.gz) = 10183
 SHA256 (rust/crates/scopeguard-1.0.0.tar.gz) = b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d
 SIZE (rust/crates/scopeguard-1.0.0.tar.gz) = 11304
 SHA256 (rust/crates/semver-0.9.0.tar.gz) = 1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403
@@ -213,58 +185,56 @@ SHA256 (rust/crates/semver-parser-0.7.0.tar.gz) = 388a1df253eca08550bef6c72392cf
 SIZE (rust/crates/semver-parser-0.7.0.tar.gz) = 10268
 SHA256 (rust/crates/serde-1.0.104.tar.gz) = 414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449
 SIZE (rust/crates/serde-1.0.104.tar.gz) = 73258
-SHA256 (rust/crates/serde_cbor-0.10.2.tar.gz) = f7081ed758ec726a6ed8ee7e92f5d3f6e6f8c3901b1f972e3a4a2f2599fad14f
-SIZE (rust/crates/serde_cbor-0.10.2.tar.gz) = 40204
+SHA256 (rust/crates/serde_cbor-0.11.1.tar.gz) = 1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622
+SIZE (rust/crates/serde_cbor-0.11.1.tar.gz) = 43947
 SHA256 (rust/crates/serde_derive-1.0.104.tar.gz) = 128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64
 SIZE (rust/crates/serde_derive-1.0.104.tar.gz) = 49658
-SHA256 (rust/crates/serde_json-1.0.44.tar.gz) = 48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7
-SIZE (rust/crates/serde_json-1.0.44.tar.gz) = 70325
+SHA256 (rust/crates/serde_json-1.0.48.tar.gz) = 9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25
+SIZE (rust/crates/serde_json-1.0.48.tar.gz) = 72113
 SHA256 (rust/crates/serde_yaml-0.8.11.tar.gz) = 691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35
 SIZE (rust/crates/serde_yaml-0.8.11.tar.gz) = 35772
-SHA256 (rust/crates/sha-1-0.8.1.tar.gz) = 23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68
-SIZE (rust/crates/sha-1-0.8.1.tar.gz) = 10410
-SHA256 (rust/crates/smallvec-1.1.0.tar.gz) = 44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4
-SIZE (rust/crates/smallvec-1.1.0.tar.gz) = 23593
+SHA256 (rust/crates/sha-1-0.8.2.tar.gz) = f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df
+SIZE (rust/crates/sha-1-0.8.2.tar.gz) = 12338
+SHA256 (rust/crates/smallvec-1.2.0.tar.gz) = 5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc
+SIZE (rust/crates/smallvec-1.2.0.tar.gz) = 23658
 SHA256 (rust/crates/strsim-0.8.0.tar.gz) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
 SIZE (rust/crates/strsim-0.8.0.tar.gz) = 9309
-SHA256 (rust/crates/syn-1.0.11.tar.gz) = dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238
-SIZE (rust/crates/syn-1.0.11.tar.gz) = 193782
-SHA256 (rust/crates/synstructure-0.12.3.tar.gz) = 67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545
-SIZE (rust/crates/synstructure-0.12.3.tar.gz) = 17788
+SHA256 (rust/crates/syn-1.0.14.tar.gz) = af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5
+SIZE (rust/crates/syn-1.0.14.tar.gz) = 195286
 SHA256 (rust/crates/tempfile-3.1.0.tar.gz) = 7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9
 SIZE (rust/crates/tempfile-3.1.0.tar.gz) = 25823
 SHA256 (rust/crates/term_size-0.3.1.tar.gz) = 9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327
 SIZE (rust/crates/term_size-0.3.1.tar.gz) = 10754
-SHA256 (rust/crates/termcolor-1.0.5.tar.gz) = 96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e
-SIZE (rust/crates/termcolor-1.0.5.tar.gz) = 14526
+SHA256 (rust/crates/termcolor-1.1.0.tar.gz) = bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f
+SIZE (rust/crates/termcolor-1.1.0.tar.gz) = 17193
 SHA256 (rust/crates/textwrap-0.11.0.tar.gz) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060
 SIZE (rust/crates/textwrap-0.11.0.tar.gz) = 17322
-SHA256 (rust/crates/thread_local-0.3.6.tar.gz) = c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b
-SIZE (rust/crates/thread_local-0.3.6.tar.gz) = 12388
-SHA256 (rust/crates/toml-0.5.5.tar.gz) = 01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf
-SIZE (rust/crates/toml-0.5.5.tar.gz) = 54805
+SHA256 (rust/crates/thread_local-1.0.1.tar.gz) = d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14
+SIZE (rust/crates/thread_local-1.0.1.tar.gz) = 12609
+SHA256 (rust/crates/toml-0.5.6.tar.gz) = ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a
+SIZE (rust/crates/toml-0.5.6.tar.gz) = 54341
 SHA256 (rust/crates/typenum-1.11.2.tar.gz) = 6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9
 SIZE (rust/crates/typenum-1.11.2.tar.gz) = 31853
 SHA256 (rust/crates/ucd-trie-0.1.2.tar.gz) = 8f00ed7be0c1ff1e24f46c3d2af4859f7e863672ba3a6e92e7cff702bf9f06c2
 SIZE (rust/crates/ucd-trie-0.1.2.tar.gz) = 44984
 SHA256 (rust/crates/unicode-bidi-0.3.4.tar.gz) = 49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5
 SIZE (rust/crates/unicode-bidi-0.3.4.tar.gz) = 32228
-SHA256 (rust/crates/unicode-normalization-0.1.11.tar.gz) = b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf
-SIZE (rust/crates/unicode-normalization-0.1.11.tar.gz) = 91048
+SHA256 (rust/crates/unicode-normalization-0.1.12.tar.gz) = 5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4
+SIZE (rust/crates/unicode-normalization-0.1.12.tar.gz) = 91057
 SHA256 (rust/crates/unicode-width-0.1.7.tar.gz) = caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479
 SIZE (rust/crates/unicode-width-0.1.7.tar.gz) = 16644
 SHA256 (rust/crates/unicode-xid-0.2.0.tar.gz) = 826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c
 SIZE (rust/crates/unicode-xid-0.2.0.tar.gz) = 14994
-SHA256 (rust/crates/url-2.1.0.tar.gz) = 75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61
-SIZE (rust/crates/url-2.1.0.tar.gz) = 64776
+SHA256 (rust/crates/url-2.1.1.tar.gz) = 829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb
+SIZE (rust/crates/url-2.1.1.tar.gz) = 70383
 SHA256 (rust/crates/vcpkg-0.2.8.tar.gz) = 3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168
 SIZE (rust/crates/vcpkg-0.2.8.tar.gz) = 11209
 SHA256 (rust/crates/vec_map-0.8.1.tar.gz) = 05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a
 SIZE (rust/crates/vec_map-0.8.1.tar.gz) = 14959
-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.7.0.tar.gz) = b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d
-SIZE (rust/crates/wasi-0.7.0.tar.gz) = 33941
+SHA256 (rust/crates/walkdir-2.3.1.tar.gz) = 777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d
+SIZE (rust/crates/walkdir-2.3.1.tar.gz) = 23413
+SHA256 (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.tar.gz) = cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519
+SIZE (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.tar.gz) = 31521
 SHA256 (rust/crates/winapi-0.2.8.tar.gz) = 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a
 SIZE (rust/crates/winapi-0.2.8.tar.gz) = 455145
 SHA256 (rust/crates/winapi-0.3.8.tar.gz) = 8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6
@@ -273,13 +243,11 @@ SHA256 (rust/crates/winapi-build-0.1.1.tar.gz) = 2d315eee3b34aca4797b2da6b13ed88
 SIZE (rust/crates/winapi-build-0.1.1.tar.gz) = 669
 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
 SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815
-SHA256 (rust/crates/winapi-util-0.1.2.tar.gz) = 7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9
-SIZE (rust/crates/winapi-util-0.1.2.tar.gz) = 7810
+SHA256 (rust/crates/winapi-util-0.1.3.tar.gz) = 4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80
+SIZE (rust/crates/winapi-util-0.1.3.tar.gz) = 9913
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
-SHA256 (rust/crates/wincolor-1.0.2.tar.gz) = 96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9
-SIZE (rust/crates/wincolor-1.0.2.tar.gz) = 4821
 SHA256 (rust/crates/yaml-rust-0.4.3.tar.gz) = 65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d
 SIZE (rust/crates/yaml-rust-0.4.3.tar.gz) = 45768
-SHA256 (XAMPPRocky-tokei-v10.1.1_GH0.tar.gz) = ad203224b891ec75208d86b296d02f08770e0a4b6421827b1bac397fddd996ab
-SIZE (XAMPPRocky-tokei-v10.1.1_GH0.tar.gz) = 86927
+SHA256 (XAMPPRocky-tokei-v10.1.2_GH0.tar.gz) = 82d0755001266c2bf830cc4363a876c45d32ed5a73bb919c0898a85f3d37a1ac
+SIZE (XAMPPRocky-tokei-v10.1.2_GH0.tar.gz) = 85818
diff --git a/dns/amass/Makefile b/dns/amass/Makefile
index 2f6eafdc2bc..c990aa446f6 100644
--- a/dns/amass/Makefile
+++ b/dns/amass/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	amass
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.4.2
-PORTREVISION=	2
+DISTVERSION=	3.4.3
 CATEGORIES=	dns
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -18,63 +17,61 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	OWASP
 GH_PROJECT=	Amass
 GH_TUPLE=	\
-		PuerkitoBio:goquery:v1.5.0:puerkitobio_goquery/vendor/github.com/PuerkitoBio/goquery \
+		PuerkitoBio:goquery:v1.5.1:puerkitobio_goquery/vendor/github.com/PuerkitoBio/goquery \
 		VividCortex:gohistogram:v1.0.0:vividcortex_gohistogram/vendor/github.com/VividCortex/gohistogram \
-		andybalholm:cascadia:v1.0.0:andybalholm_cascadia/vendor/github.com/andybalholm/cascadia \
-		beorn7:perks:v1.0.0:beorn7_perks/vendor/github.com/beorn7/perks \
+		andybalholm:cascadia:v1.1.0:andybalholm_cascadia/vendor/github.com/andybalholm/cascadia \
+		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
 		boltdb:bolt:v1.3.1:boltdb_bolt/vendor/github.com/boltdb/bolt \
-		caffix:cloudflare-roundtripper:4c29d231c9cb:caffix_cloudflare_roundtripper/vendor/github.com/caffix/cloudflare-roundtripper \
 		cayleygraph:cayley:v0.7.7:cayleygraph_cayley/vendor/github.com/cayleygraph/cayley \
-		cayleygraph:quad:v1.1.0:cayleygraph_quad/vendor/github.com/cayleygraph/quad \
-		cenkalti:backoff:v2.1.1:cenkalti_backoff/vendor/github.com/cenkalti/backoff \
-		chromedp:cdproto:39ef923dcb8d:chromedp_cdproto/vendor/github.com/chromedp/cdproto \
-		chromedp:chromedp:42693d2528b1:chromedp_chromedp/vendor/github.com/chromedp/chromedp \
+		cayleygraph:quad:v1.2.1:cayleygraph_quad/vendor/github.com/cayleygraph/quad \
+		cenkalti:backoff:v2.2.1:cenkalti_backoff/vendor/github.com/cenkalti/backoff \
+		cespare:xxhash:v2.1.1:cespare_xxhash/vendor/github.com/cespare/xxhash/v2 \
+		chromedp:cdproto:7e00b02ea7d2:chromedp_cdproto/vendor/github.com/chromedp/cdproto \
+		chromedp:chromedp:v0.5.3:chromedp_chromedp/vendor/github.com/chromedp/chromedp \
 		dennwc:base:v1.0.0:dennwc_base/vendor/github.com/dennwc/base \
 		dghubble:go-twitter:39e5462e111f:dghubble_go_twitter/vendor/github.com/dghubble/go-twitter \
 		dghubble:sling:v1.3.0:dghubble_sling/vendor/github.com/dghubble/sling \
-		fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \
-		geziyor:geziyor:9b8a3837bd4a:geziyor_geziyor/vendor/github.com/geziyor/geziyor \
-		go-ini:ini:v1.49.0:go_ini_ini/vendor/github.com/go-ini/ini \
-		go-kit:kit:v0.8.0:go_kit_kit/vendor/github.com/go-kit/kit \
-		go-sourcemap:sourcemap:v1.0.5:go_sourcemap_sourcemap/vendor/gopkg.in/sourcemap.v1 \
-		gobuffalo:envy:v1.7.1:gobuffalo_envy/vendor/github.com/gobuffalo/envy \
-		gobuffalo:logger:v1.0.1:gobuffalo_logger/vendor/github.com/gobuffalo/logger \
-		gobuffalo:packd:v0.3.0:gobuffalo_packd/vendor/github.com/gobuffalo/packd \
+		fatih:color:v1.9.0:fatih_color/vendor/github.com/fatih/color \
+		geziyor:geziyor:cfb16fe1ee0e:geziyor_geziyor/vendor/github.com/geziyor/geziyor \
+		go-ini:ini:v1.52.0:go_ini_ini/vendor/github.com/go-ini/ini \
+		go-kit:kit:v0.9.0:go_kit_kit/vendor/github.com/go-kit/kit \
+		gobuffalo:envy:v1.9.0:gobuffalo_envy/vendor/github.com/gobuffalo/envy \
+		gobuffalo:logger:v1.0.3:gobuffalo_logger/vendor/github.com/gobuffalo/logger \
+		gobuffalo:packd:v1.0.0:gobuffalo_packd/vendor/github.com/gobuffalo/packd \
 		gobuffalo:packr:v2.7.1:gobuffalo_packr/vendor/github.com/gobuffalo/packr \
 		gobwas:httphead:2c6c146eadee:gobwas_httphead/vendor/github.com/gobwas/httphead \
 		gobwas:pool:v0.2.0:gobwas_pool/vendor/github.com/gobwas/pool \
 		gobwas:ws:v1.0.2:gobwas_ws/vendor/github.com/gobwas/ws \
-		gogo:protobuf:v1.3.0:gogo_protobuf/vendor/github.com/gogo/protobuf \
-		golang:appengine:v1.6.1:golang_appengine/vendor/google.golang.org/appengine \
-		golang:crypto:34f69633bfdc:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:83d349e8ac1a: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 \
+		gogo:protobuf:v1.3.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
+		golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
+		golang:crypto:ecb85df21340:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:16171245cfb2:golang_net/vendor/golang.org/x/net \
+		golang:oauth2:bf48bf16ab8d:golang_oauth2/vendor/golang.org/x/oauth2 \
+		golang:protobuf:v1.3.3:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:33540a1f6037:golang_sys/vendor/golang.org/x/sys \
+		golang:sys:d101bd2416d5:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
-		golang:tools:0337d82405ff:golang_tools/vendor/golang.org/x/tools \
+		golang:tools:61798d64f025:golang_tools/vendor/golang.org/x/tools \
 		google:go-querystring:v1.0.0:google_go_querystring/vendor/github.com/google/go-querystring \
 		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
 		hidal-go:hidalgo:42e03f3b5eaa:hidal_go_hidalgo/vendor/github.com/hidal-go/hidalgo \
 		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
 		jmoiron:sqlx:v1.2.0:jmoiron_sqlx/vendor/github.com/jmoiron/sqlx \
 		joho:godotenv:v1.3.0:joho_godotenv/vendor/github.com/joho/godotenv \
-		knq:sysutil:f05b59f0f307:knq_sysutil/vendor/github.com/knq/sysutil \
+		knq:sysutil:15668db23d08:knq_sysutil/vendor/github.com/knq/sysutil \
 		konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
-		lib:pq:v1.2.0:lib_pq/vendor/github.com/lib/pq \
-		mailru:easyjson:b2ccc519800e:mailru_easyjson/vendor/github.com/mailru/easyjson \
+		lib:pq:v1.3.0:lib_pq/vendor/github.com/lib/pq \
+		mailru:easyjson:v0.7.0:mailru_easyjson/vendor/github.com/mailru/easyjson \
 		mattn:go-colorable:v0.1.4:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
-		mattn:go-isatty:v0.0.10:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
-		miekg:dns:v1.1.22:miekg_dns/vendor/github.com/miekg/dns \
-		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
-		prometheus:client_golang:v1.0.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
-		prometheus:client_model:fd36f4220a90:prometheus_client_model/vendor/github.com/prometheus/client_model \
-		prometheus:common:v0.4.1:prometheus_common/vendor/github.com/prometheus/common \
-		prometheus:procfs:v0.0.2:prometheus_procfs/vendor/github.com/prometheus/procfs \
-		robertkrimen:otto:15f95af6e78d:robertkrimen_otto/vendor/github.com/robertkrimen/otto \
-		rogpeppe:go-internal:v1.5.0:rogpeppe_go_internal/vendor/github.com/rogpeppe/go-internal \
+		miekg:dns:v1.1.27:miekg_dns/vendor/github.com/miekg/dns \
+		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
+		prometheus:client_golang:v1.4.1:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
+		prometheus:common:v0.9.1:prometheus_common/vendor/github.com/prometheus/common \
+		prometheus:procfs:v0.0.8:prometheus_procfs/vendor/github.com/prometheus/procfs \
+		rogpeppe:go-internal:v1.5.2:rogpeppe_go_internal/vendor/github.com/rogpeppe/go-internal \
 		sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
 		spf13:cobra:v0.0.5:spf13_cobra/vendor/github.com/spf13/cobra \
 		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
diff --git a/dns/amass/distinfo b/dns/amass/distinfo
index a92f95436e4..b00b181c878 100644
--- a/dns/amass/distinfo
+++ b/dns/amass/distinfo
@@ -1,50 +1,48 @@
-TIMESTAMP = 1577450174
-SHA256 (OWASP-Amass-v3.4.2_GH0.tar.gz) = 7eab2423b65e2815a32aa6eae4118564f47dcda492dfe151bf0ce90dc01e4334
-SIZE (OWASP-Amass-v3.4.2_GH0.tar.gz) = 9656400
-SHA256 (PuerkitoBio-goquery-v1.5.0_GH0.tar.gz) = 0307341d56ae12648584b3990fb1e84f465870247e46aff00381c98c5ad231c7
-SIZE (PuerkitoBio-goquery-v1.5.0_GH0.tar.gz) = 100975
+TIMESTAMP = 1581739749
+SHA256 (OWASP-Amass-v3.4.3_GH0.tar.gz) = bdb11569271b1b91bd07e30051a2c6d7fddfa6f63c2aadf1ebd9c0ae492c1756
+SIZE (OWASP-Amass-v3.4.3_GH0.tar.gz) = 9659199
+SHA256 (PuerkitoBio-goquery-v1.5.1_GH0.tar.gz) = 50b671f7128ac6993b7388d4e8a76901afdcaa7c6889f45687a2acc0d0753ca4
+SIZE (PuerkitoBio-goquery-v1.5.1_GH0.tar.gz) = 101380
 SHA256 (VividCortex-gohistogram-v1.0.0_GH0.tar.gz) = 830abe53f98e7a46ccbd829114998e1d7bbe9edfeb669011e7970d684493809e
 SIZE (VividCortex-gohistogram-v1.0.0_GH0.tar.gz) = 20810
-SHA256 (andybalholm-cascadia-v1.0.0_GH0.tar.gz) = 00ab6f915e958c9e0509836cd67082a802513459c12c4aa6e7a28ef37743ce52
-SIZE (andybalholm-cascadia-v1.0.0_GH0.tar.gz) = 13232
-SHA256 (beorn7-perks-v1.0.0_GH0.tar.gz) = b69d92e2e84b7d510dfa6110d3ac4ada0096a6c81190c5e174aa888bfe475cbc
-SIZE (beorn7-perks-v1.0.0_GH0.tar.gz) = 10866
+SHA256 (andybalholm-cascadia-v1.1.0_GH0.tar.gz) = 5d03f4610b70cab7860b158efab1afd91baa58fd95286a0adbadcdc3b49c7936
+SIZE (andybalholm-cascadia-v1.1.0_GH0.tar.gz) = 15464
+SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
+SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
 SHA256 (boltdb-bolt-v1.3.1_GH0.tar.gz) = b5ae498b780f535a5d308c188dee1329b3536275d29ad6758876084c0b8586a8
 SIZE (boltdb-bolt-v1.3.1_GH0.tar.gz) = 83437
-SHA256 (caffix-cloudflare-roundtripper-4c29d231c9cb_GH0.tar.gz) = 19e8b99b84e1dbfa5bc065c1a9c177016e4a29d3e1b3f182716292d306c80ea3
-SIZE (caffix-cloudflare-roundtripper-4c29d231c9cb_GH0.tar.gz) = 6978
 SHA256 (cayleygraph-cayley-v0.7.7_GH0.tar.gz) = 6cefd3efef9012f524eb18d408dc3fcc3b65bffb9fc8367c57cf44b01e77b89e
 SIZE (cayleygraph-cayley-v0.7.7_GH0.tar.gz) = 4597247
-SHA256 (cayleygraph-quad-v1.1.0_GH0.tar.gz) = f2907565d1faa75f530d56ead08e96a2626e2c6433aa515b55c00c4d43e6bafe
-SIZE (cayleygraph-quad-v1.1.0_GH0.tar.gz) = 85055
-SHA256 (cenkalti-backoff-v2.1.1_GH0.tar.gz) = 5e194b4c364510ec9d624553f0f071c30d5f4ae980ec26f65538afdc015ffe55
-SIZE (cenkalti-backoff-v2.1.1_GH0.tar.gz) = 8626
-SHA256 (chromedp-cdproto-39ef923dcb8d_GH0.tar.gz) = dfa1ff98312d4fcedb90982411bb8182cbc9ea4e80e043408cae76a1a78829d2
-SIZE (chromedp-cdproto-39ef923dcb8d_GH0.tar.gz) = 334406
-SHA256 (chromedp-chromedp-42693d2528b1_GH0.tar.gz) = 8c147cb09af8e3328590d15023b2e241930da48356860b1382fab5630fee6827
-SIZE (chromedp-chromedp-42693d2528b1_GH0.tar.gz) = 89769
+SHA256 (cayleygraph-quad-v1.2.1_GH0.tar.gz) = 4f54febf752d07743bcb62913bd52877a8ef56b41a48f87caa1145f051793863
+SIZE (cayleygraph-quad-v1.2.1_GH0.tar.gz) = 86029
+SHA256 (cenkalti-backoff-v2.2.1_GH0.tar.gz) = a2c29d0184e7afc415975cf2689723028d2686ffbb67fe0999ab1d691e6d16db
+SIZE (cenkalti-backoff-v2.2.1_GH0.tar.gz) = 8623
+SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
+SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
+SHA256 (chromedp-cdproto-7e00b02ea7d2_GH0.tar.gz) = 1ce939852cad201acdca0b442ad1ab914fb8311afd208aad7b1707ccb418f71a
+SIZE (chromedp-cdproto-7e00b02ea7d2_GH0.tar.gz) = 343792
+SHA256 (chromedp-chromedp-v0.5.3_GH0.tar.gz) = 9db5edc619eeeeae32cda333288f19ae1d8e253ec5def4fb3aa2526666ed3ab7
+SIZE (chromedp-chromedp-v0.5.3_GH0.tar.gz) = 90079
 SHA256 (dennwc-base-v1.0.0_GH0.tar.gz) = 3a4626c02665b5e44b02066ec551cf59b1e560bd3f6aee4cadcea5558f60d015
 SIZE (dennwc-base-v1.0.0_GH0.tar.gz) = 1356
 SHA256 (dghubble-go-twitter-39e5462e111f_GH0.tar.gz) = 2ab3981f52cf7c22c6e2f65735a1756e605a83338350c5120f0cee4a23997d2d
 SIZE (dghubble-go-twitter-39e5462e111f_GH0.tar.gz) = 42739
 SHA256 (dghubble-sling-v1.3.0_GH0.tar.gz) = c12add4fa7fd2e9e6bbbf553d3cf4cb8ad6229938e8ff2cd543aa1981c35446c
 SIZE (dghubble-sling-v1.3.0_GH0.tar.gz) = 17768
-SHA256 (fatih-color-v1.7.0_GH0.tar.gz) = 4650d7aa3feed266fc85d91dc34ca9cffdf7ee03ea29bf2cbf84bbecc75fb755
-SIZE (fatih-color-v1.7.0_GH0.tar.gz) = 816449
-SHA256 (geziyor-geziyor-9b8a3837bd4a_GH0.tar.gz) = db0849718f8552a2d51df92bbe447f228aa475cab475dacaeb1328079ae4b811
-SIZE (geziyor-geziyor-9b8a3837bd4a_GH0.tar.gz) = 39181
-SHA256 (go-ini-ini-v1.49.0_GH0.tar.gz) = 346b94d9f5e35d3d753d6d6bce7ee458902b53ad688e2b8fa3263f59f0f895c9
-SIZE (go-ini-ini-v1.49.0_GH0.tar.gz) = 37203
-SHA256 (go-kit-kit-v0.8.0_GH0.tar.gz) = d2f1824554ddbcda87d810d855287e4c046bcc956036f599e75fc8703c64abcb
-SIZE (go-kit-kit-v0.8.0_GH0.tar.gz) = 241171
-SHA256 (go-sourcemap-sourcemap-v1.0.5_GH0.tar.gz) = a02ff67183c8c01f2f1c1cb4e716200fcc56f61766922cd18576c8f203007aae
-SIZE (go-sourcemap-sourcemap-v1.0.5_GH0.tar.gz) = 5368
-SHA256 (gobuffalo-envy-v1.7.1_GH0.tar.gz) = f7745c63da532e0c6b920e0657a09b3295b7da8bb2b7a3870c0f2c50da611d0b
-SIZE (gobuffalo-envy-v1.7.1_GH0.tar.gz) = 8079
-SHA256 (gobuffalo-logger-v1.0.1_GH0.tar.gz) = 3d4c15d73f9cb709a33afaf2b38d212125188768ac8178f34bb8ff295abc4086
-SIZE (gobuffalo-logger-v1.0.1_GH0.tar.gz) = 7415
-SHA256 (gobuffalo-packd-v0.3.0_GH0.tar.gz) = aedae215fadb688a0a66ed8d64eff44169ef517a4ea7b9defb0a2ed0cfd78185
-SIZE (gobuffalo-packd-v0.3.0_GH0.tar.gz) = 8572
+SHA256 (fatih-color-v1.9.0_GH0.tar.gz) = f5a6372ff7c87d22baaa2089e5cdd8a218fb3a9be047195c0ab421d5340f6f3f
+SIZE (fatih-color-v1.9.0_GH0.tar.gz) = 1230941
+SHA256 (geziyor-geziyor-cfb16fe1ee0e_GH0.tar.gz) = 959f20a4a17df8509cb45c733c2256cb4bcef6668c7dae1ce15f02e84cf145f0
+SIZE (geziyor-geziyor-cfb16fe1ee0e_GH0.tar.gz) = 39105
+SHA256 (go-ini-ini-v1.52.0_GH0.tar.gz) = 56bce700d83c60ec5b27249fe7e18912f87f63a91d5e8d5cd07e2eb7823a300b
+SIZE (go-ini-ini-v1.52.0_GH0.tar.gz) = 44304
+SHA256 (go-kit-kit-v0.9.0_GH0.tar.gz) = 41e92e4f5a6111e6f88bec9b46ca41d6eb9167dc2231813616bdf365e641be44
+SIZE (go-kit-kit-v0.9.0_GH0.tar.gz) = 251842
+SHA256 (gobuffalo-envy-v1.9.0_GH0.tar.gz) = e9fb0d5929585dff36cf9a3836e66eaef783c526904f77da05eda9580511abca
+SIZE (gobuffalo-envy-v1.9.0_GH0.tar.gz) = 7925
+SHA256 (gobuffalo-logger-v1.0.3_GH0.tar.gz) = 9d9c6e96c8ab2aa2666f40d1df91d6f9bd771d0414bc3ae0abad5346419e3227
+SIZE (gobuffalo-logger-v1.0.3_GH0.tar.gz) = 6406
+SHA256 (gobuffalo-packd-v1.0.0_GH0.tar.gz) = 58adcda4d7dc66549038271c6aac9c45f609afe14ca62887962d4abe8fa5653d
+SIZE (gobuffalo-packd-v1.0.0_GH0.tar.gz) = 8866
 SHA256 (gobuffalo-packr-v2.7.1_GH0.tar.gz) = 842bc86dfb34c1ff8d1cc1c12fb46cf30ad279eec17ecef8b122c151cfc16b85
 SIZE (gobuffalo-packr-v2.7.1_GH0.tar.gz) = 94863
 SHA256 (gobwas-httphead-2c6c146eadee_GH0.tar.gz) = 3c53d16746cb6f420a3f3f5bf1bb62afcd3f67df78b974bf9180ba488a9dd7bf
@@ -53,26 +51,26 @@ SHA256 (gobwas-pool-v0.2.0_GH0.tar.gz) = 6c4f7ab93586a9a8ca28dc3dcf7cb5bfeaf8580
 SIZE (gobwas-pool-v0.2.0_GH0.tar.gz) = 7309
 SHA256 (gobwas-ws-v1.0.2_GH0.tar.gz) = 955f8d943c3b6c29daf04f980818ad7a1a75e03d483cb2cef885148d44203a32
 SIZE (gobwas-ws-v1.0.2_GH0.tar.gz) = 69975
-SHA256 (gogo-protobuf-v1.3.0_GH0.tar.gz) = 7d35cc15727fee83c9535779a053b21104220280f65d54c2da51dda1f116cc93
-SIZE (gogo-protobuf-v1.3.0_GH0.tar.gz) = 2031976
-SHA256 (golang-appengine-v1.6.1_GH0.tar.gz) = 1755aaf4c6246579337bf1bc4f834ef00c56216da87b20456863ca91985b5afa
-SIZE (golang-appengine-v1.6.1_GH0.tar.gz) = 333353
-SHA256 (golang-crypto-34f69633bfdc_GH0.tar.gz) = c3fa0760971622af64c3b7a3319291d997f2f0d53a5c90c17d25eaeba7f0371a
-SIZE (golang-crypto-34f69633bfdc_GH0.tar.gz) = 1708053
-SHA256 (golang-net-83d349e8ac1a_GH0.tar.gz) = 5752c376bc6383bf2055281336101c062b881f17ded2e960d718c8256023f9c7
-SIZE (golang-net-83d349e8ac1a_GH0.tar.gz) = 1103298
-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 (gogo-protobuf-v1.3.1_GH0.tar.gz) = 5184f06decd681fcc82f6583976111faf87189c0c2f8063b34ac2ea9ed997236
+SIZE (gogo-protobuf-v1.3.1_GH0.tar.gz) = 2038188
+SHA256 (golang-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316
+SIZE (golang-appengine-v1.6.5_GH0.tar.gz) = 332903
+SHA256 (golang-crypto-ecb85df21340_GH0.tar.gz) = c19dcd326b2adf3b06b5c508f3a38abc5e5b373076479461d4ef3e22c283eefa
+SIZE (golang-crypto-ecb85df21340_GH0.tar.gz) = 1725037
+SHA256 (golang-net-16171245cfb2_GH0.tar.gz) = 941e5a2afb85a131b42f8503fe1a760447a40a0f26539c11ca489f4f24a77e77
+SIZE (golang-net-16171245cfb2_GH0.tar.gz) = 1172446
+SHA256 (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 28b3a51a8bd90beb5952d1080218ea238127edfe9455ad48921989619ff918a8
+SIZE (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 47016
+SHA256 (golang-protobuf-v1.3.3_GH0.tar.gz) = b3a1440808d6ed4dc0d194c482de029f6c116b1de7f7a3bf927324d965ff3853
+SIZE (golang-protobuf-v1.3.3_GH0.tar.gz) = 315377
 SHA256 (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 00a6dce4c1a9ca9edae6c3f1bedc0b15911c62681371ad9ed7738e182ba70393
 SIZE (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 16956
-SHA256 (golang-sys-33540a1f6037_GH0.tar.gz) = 09ebdf007413c2eaddce123137443d08d1848be410c58896e772f0481ec385d5
-SIZE (golang-sys-33540a1f6037_GH0.tar.gz) = 1497659
+SHA256 (golang-sys-d101bd2416d5_GH0.tar.gz) = c1de80d233d3df630ed34bf80cbb3f186199e7b5218726abe0234520c8eddb8b
+SIZE (golang-sys-d101bd2416d5_GH0.tar.gz) = 1537146
 SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
 SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
-SHA256 (golang-tools-0337d82405ff_GH0.tar.gz) = cd848c39883402949cd11fac7146bf7494b0c0e77479465fc081248517f7b19b
-SIZE (golang-tools-0337d82405ff_GH0.tar.gz) = 2287398
+SHA256 (golang-tools-61798d64f025_GH0.tar.gz) = 21f1ba9beea4b217f24db2b2740d1a6e180517355a61c6d2625c414b2bfe092d
+SIZE (golang-tools-61798d64f025_GH0.tar.gz) = 2341065
 SHA256 (google-go-querystring-v1.0.0_GH0.tar.gz) = 59fdfd4d740c85c60c35d3e09b587cfa2b435e78178ac4a23950afbece7118ed
 SIZE (google-go-querystring-v1.0.0_GH0.tar.gz) = 7529
 SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
@@ -85,36 +83,34 @@ SHA256 (jmoiron-sqlx-v1.2.0_GH0.tar.gz) = 90a0cecf61892ad7d2303720d5fced62df0774
 SIZE (jmoiron-sqlx-v1.2.0_GH0.tar.gz) = 49540
 SHA256 (joho-godotenv-v1.3.0_GH0.tar.gz) = 07beb0bae964dbe37442603a404196111dbbbaaa986fc179d5d5fdc46ed6a189
 SIZE (joho-godotenv-v1.3.0_GH0.tar.gz) = 9941
-SHA256 (knq-sysutil-f05b59f0f307_GH0.tar.gz) = 80e9b4263d92bd0b6e4abb341688cb816b9cb5f442fd2ad9288195853dd4e367
-SIZE (knq-sysutil-f05b59f0f307_GH0.tar.gz) = 2469
+SHA256 (knq-sysutil-15668db23d08_GH0.tar.gz) = 06ca09ec6374a8544d92e4d5b539ac2920873fc47628a4933a5cc76c113eacd0
+SIZE (knq-sysutil-15668db23d08_GH0.tar.gz) = 2432
 SHA256 (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = e61f6422c7d1222c4c642b9134e5a4576a89ff651ef947487faa8ef33b6b4cfe
 SIZE (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = 1987
-SHA256 (lib-pq-v1.2.0_GH0.tar.gz) = 052e9ce4472eda212e5034fd0298fcf254c22925b1d596b1d043a7a60fe4672e
-SIZE (lib-pq-v1.2.0_GH0.tar.gz) = 96083
-SHA256 (mailru-easyjson-b2ccc519800e_GH0.tar.gz) = 73bb6de76adeef10ca058b1a4ef8ebcf045eab25f72075f62bf26158eaae43d3
-SIZE (mailru-easyjson-b2ccc519800e_GH0.tar.gz) = 75658
+SHA256 (lib-pq-v1.3.0_GH0.tar.gz) = 900b640ed6e740496769291763b2368b578d25d54fe027551392ceaa29bae8ca
+SIZE (lib-pq-v1.3.0_GH0.tar.gz) = 96255
+SHA256 (mailru-easyjson-v0.7.0_GH0.tar.gz) = 20e8ea95e5bd594b386c6edb5c57080929f6270018b9d29e4c86f6723ca50df7
+SIZE (mailru-easyjson-v0.7.0_GH0.tar.gz) = 72804
 SHA256 (mattn-go-colorable-v0.1.4_GH0.tar.gz) = 157806ad8125e6bef4d9b58c9125ccb98a8343136f93faf442ab0cc6e7c24c11
 SIZE (mattn-go-colorable-v0.1.4_GH0.tar.gz) = 8981
-SHA256 (mattn-go-isatty-v0.0.10_GH0.tar.gz) = 55408e1afd78eaa112842ae2263e70703d5b5133feaa17fa477980a87a961fe7
-SIZE (mattn-go-isatty-v0.0.10_GH0.tar.gz) = 4465
+SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
+SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
 SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
 SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
-SHA256 (miekg-dns-v1.1.22_GH0.tar.gz) = 32446249a35d682913bc0d56a1126c0aec8712d3714c5b5ad078f14b682ba0ef
-SIZE (miekg-dns-v1.1.22_GH0.tar.gz) = 178978
-SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
-SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
-SHA256 (prometheus-client_golang-v1.0.0_GH0.tar.gz) = afee7b61a77342cc24ea55e284d08688267efca1843e529a51799fe52c5ee662
-SIZE (prometheus-client_golang-v1.0.0_GH0.tar.gz) = 138046
-SHA256 (prometheus-client_model-fd36f4220a90_GH0.tar.gz) = 17571c708bab9a1ba18d9dd0c9bfe96dff3f1b84c63e7d8d4c3489ef5c34ee40
-SIZE (prometheus-client_model-fd36f4220a90_GH0.tar.gz) = 57491
-SHA256 (prometheus-common-v0.4.1_GH0.tar.gz) = 99229ef4b100e55d1e6496995f1a1af6813426b8820521bc041340eb077985b9
-SIZE (prometheus-common-v0.4.1_GH0.tar.gz) = 98631
-SHA256 (prometheus-procfs-v0.0.2_GH0.tar.gz) = ad1d1f1328a1c394b30225b939ed39482ba54de7be70d439c0555d68857457d5
-SIZE (prometheus-procfs-v0.0.2_GH0.tar.gz) = 78550
-SHA256 (robertkrimen-otto-15f95af6e78d_GH0.tar.gz) = 7bb04317b60e6bf7be10be33f5f0f1052a16b42bf4aa973bc2d7c8c65ee6e6a6
-SIZE (robertkrimen-otto-15f95af6e78d_GH0.tar.gz) = 250847
-SHA256 (rogpeppe-go-internal-v1.5.0_GH0.tar.gz) = a1db9f87696391f8451b2ea7c4325cf7e500c7cc24bead28f8c494dc3097ac5a
-SIZE (rogpeppe-go-internal-v1.5.0_GH0.tar.gz) = 120356
+SHA256 (miekg-dns-v1.1.27_GH0.tar.gz) = f0dfa99cea9f97063114f6680b1718364323ff817d49211de1a98464a498f672
+SIZE (miekg-dns-v1.1.27_GH0.tar.gz) = 183862
+SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
+SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
+SHA256 (prometheus-client_golang-v1.4.1_GH0.tar.gz) = 98a59a22033b87f160e882e6bf30b20715bf78d27964e5d1b8a99889412fefdf
+SIZE (prometheus-client_golang-v1.4.1_GH0.tar.gz) = 148394
+SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
+SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
+SHA256 (prometheus-common-v0.9.1_GH0.tar.gz) = a36c6c9ad9da26e20fe7b0a3b0ffe6d3b6d30695289a2caf4d4bdad11620c91c
+SIZE (prometheus-common-v0.9.1_GH0.tar.gz) = 107014
+SHA256 (prometheus-procfs-v0.0.8_GH0.tar.gz) = 1c26c8b86a9b1902684f860f94d0bf4b94abcc570e456bf9a74d1c9d83643872
+SIZE (prometheus-procfs-v0.0.8_GH0.tar.gz) = 126299
+SHA256 (rogpeppe-go-internal-v1.5.2_GH0.tar.gz) = 415da1a5d971b532e2156c8b9841b5e8a516b334754eea906feba5748138a172
+SIZE (rogpeppe-go-internal-v1.5.2_GH0.tar.gz) = 121344
 SHA256 (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 67f2ddf467b7e63d2d2529d227946a331e245aeef7e2e4521ae82647b5ef84d9
 SIZE (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 41373
 SHA256 (spf13-cobra-v0.0.5_GH0.tar.gz) = 79226ce00e2b91306277e679d024eea6d17d0c02fc671555fd25df0c3ea07423
diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile
index 7a592e518a3..ffc1cf87793 100644
--- a/dns/knot-resolver/Makefile
+++ b/dns/knot-resolver/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	knot-resolver
-DISTVERSION=	4.2.2
-PORTREVISION=	1
+DISTVERSION=	5.0.1
 CATEGORIES=	dns
 MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
 		https://dns.company/downloads/knot-resolver/
@@ -12,21 +11,26 @@ MAINTAINER=	freebsd@dns.company
 COMMENT=	Caching full resolver implementation
 
 LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash \
-		git:devel/git
+		cmocka>=1.1.1:sysutils/cmocka \
+		flake8:devel/py-flake8@${PY_FLAVOR} \
+		luacheck:devel/lua-luacheck
+
 LIB_DEPENDS=	libgnutls.so:security/gnutls \
 		libknot.so:dns/knot2-lib \
 		liblmdb.so:databases/lmdb \
-		libluajit-5.1.so:lang/luajit \
+		libluajit-5.1.so:lang/luajit-openresty \
 		libuv.so:devel/libuv
-TEST_DEPENDS=	cmocka>=1.1.1:sysutils/cmocka
 
 USES=		compiler:c11 compiler:c++11-lang libedit libtool meson \
-		ncurses ninja pkgconfig shebangfix tar:xz
+		ncurses ninja pkgconfig python shebangfix tar:xz
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
-LDFLAGS=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+SUB_FILES=	pkg-message
 
 SHEBANG_FILES=	scripts/bench.sh \
 		scripts/build-in-obs.sh \
@@ -40,6 +44,7 @@ SHEBANG_FILES=	scripts/bench.sh \
 		scripts/make-distrofiles.sh \
 		scripts/make-doc.sh \
 		scripts/make-srpm.sh \
+		scripts/obs-build.sh \
 		scripts/run-pylint.sh \
 		scripts/test-config.sh \
 		scripts/test-integration-prepare.sh \
@@ -47,73 +52,70 @@ SHEBANG_FILES=	scripts/bench.sh \
 
 CONFLICTS=	knot-1.* knot1-[0-6].*
 
-MESON_ARGS=	--default-library=static \
-		--mandir=${MANPREFIX} \
+MESON_ARGS=	--buildtype=release \
+		--default-library=static \
 		--prefix=${LOCALBASE} \
-		-Dsystemd=false
-#MESON_ARGS+=	--libdir=${PREFIX}/lib
-#MESON_ARGS+=	--pkg-config-path=${PREFIX}/libdata/pkgconfig
-#MESON_ARGS+=	lmdb_CFLAGS=-I${PREFIX}/include lmdb_LIBS=-llmdb
+		-Duser=${USERS} \
+		-Dgroup=${GROUPS} \
+		-Dinstall_kresd_conf=enabled \
+		-Dclient=enabled \
+		-Dutils=enabled \
+		-Dinstall_root_keys=enabled \
+		-Dkeyfile_default=${ETCDIR}/root.keys \
+		-Dmanaged_ta=enabled \
+		-Droot_hints=${ETCDIR}/root.hints \
+		-Dunit_tests=enabled
 
-OPTIONS_DEFINE=		DOCS DNSTAP DOXYGEN GO TRUSTANCHOR
-OPTIONS_DEFAULT=	DOCS DNSTAP DOXYGEN GO
+#		--libdir=${PREFIX}/lib
+#		--pkg-config-path=${PREFIX}/libdata/pkgconfig
+#		lmdb_CFLAGS=-I${PREFIX}/include lmdb_LIBS=-llmdb
+#		-Dlmdb_CFLAGS=-I${PREFIX}/include \	# doesn't help
+#		-Dlmdb_LIBS=-llmdb			# doesn't help
+#		-Dconfig_tests=enabled \		# complains about missing cqueues lua package
+#		-Dextra_tests=enabled \			# also requires -Dsendmmsg=disabled
 
-# COOKIES will come return/reworked to reflect IETF dnsop group development
-#COOKIES_DESC=			cookies
-#COOKIES_LIB_DEPENDS=		libnettle.so:security/nettle
-#COOKIES_MAKE_ARGS_ON=		HAS_nettle=yes
-#COOKIES_MAKE_ARGS_OFF=		HAS_nettle=no
-#COOKIES_PLIST_FILES=		lib/kdns_modules/cookies.so      \
-#				include/libkres/alg_containers.h \
-#				include/libkres/alg_sha.h        \
-#				include/libkres/control.h        \
-#				include/libkres/helper.h         \
-#				include/libkres/lru_cache.h      \
-#				include/libkres/nonce.h
+OPTIONS_DEFINE=		DOCS DNSTAP DOXYGEN TRUSTANCHOR
+OPTIONS_DEFAULT=	DOCS DNSTAP DOXYGEN
+
+# docs/meson.build wants python2 or python3 - not -for example- python3.7
+# So this currently is partially broken:
+#DOCS_MESON_ON=			-Ddoc=enabled
 
 DNSTAP_DESC=			dnstap support
 DNSTAP_LIB_DEPENDS=		libprotobuf.so:devel/protobuf \
 				libprotobuf-c.so:devel/protobuf-c \
 				libfstrm.so:devel/fstrm
-#DNSTAP_MAKE_ARGS_ON=		HAS_libprotobuf-c=yes HAS_libfstrm=yes
-#DNSTAP_MAKE_ARGS_OFF=		HAS_libprotobuf-c=no  HAS_libfstrm=no
 DNSTAP_PLIST_FILES=		lib/knot-resolver/kres_modules/dnstap.so
+DNSTAP_MESON_ON=		-Ddnstap=enabled
+DNSTAP_MESON_OFF=		-Ddnstap=disabled
 
 DOXYGEN_IMPLIES=		DOCS
-DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
-#DOXYGEN_MAKE_ARGS_ON=		HAS_doxygen=yes
-#DOXYGEN_MAKE_ARGS_OFF=		HAS_doxygen=no
-
-GO_DESC=			go
-GO_USES=			go:no_targets
-#GO_MAKE_ARGS_ON=		HAS_go=yes
-#GO_MAKE_ARGS_OFF=		HAS_go=no
+DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen \
+				${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
+				${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
 
 TRUSTANCHOR_DESC=		Trust anchor bootstrapping and stats
 TRUSTANCHOR_USES=		lua
-#TRUSTANCHOR_MAKE_ARGS_ON=	HAS_ltn12=yes HAS_ssl.https=yes
-#TRUSTANCHOR_MAKE_ARGS_OFF=	HAS_ltn12=no  HAS_ssl.https=no
 TRUSTANCHOR_BUILD_DEPENDS=	${LUA_PKGNAMEPREFIX}luasocket>=0:net/luasocket \
 				${LUA_PKGNAMEPREFIX}luasec>=0:security/luasec
 
 .include <bsd.port.options.mk>
 
 USERS=		kresd
-GROUPS=		kresd
+GROUPS=		${USERS}
 
-PORTDOCS=	AUTHORS COPYING CodingStyle README.md
+PORTDOCS=	AUTHORS COPYING CodingStyle NEWS README.md
 
-# check below list.
-# libkres shouldn't have versioning anymore...
-STRIP_TARGETS=	sbin/kresd			\
-		sbin/kresc			\
-		lib/libkres.so.7		\
-		lib/kdns_modules/ahocorasick.so	\
-		lib/kdns_modules/bogus_log.so	\
-		lib/kdns_modules/cookies.so	\
-		lib/kdns_modules/dnstap.so	\
-		lib/kdns_modules/hints.so	\
-		lib/kdns_modules/stats.so
+STRIP_TARGETS=	sbin/kresd \
+		sbin/kresc \
+		lib/knot-resolver/ahocorasick.so \
+		lib/knot-resolver/kres_modules/bogus_log.so \
+		lib/knot-resolver/kres_modules/dnstap.so \
+		lib/knot-resolver/kres_modules/edns_keepalive.so \
+		lib/knot-resolver/kres_modules/hints.so \
+		lib/knot-resolver/kres_modules/lib/knot-resolver/kres_modules/nsid.so \
+		lib/knot-resolver/kres_modules/refuse_nord.so \
+		lib/knot-resolver/kres_modules/stats.so
 
 pre-install-TEST-on: do-test
 
diff --git a/dns/knot-resolver/distinfo b/dns/knot-resolver/distinfo
index 36b4db182cb..8f55507e786 100644
--- a/dns/knot-resolver/distinfo
+++ b/dns/knot-resolver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575403719
-SHA256 (knot-resolver-4.2.2.tar.xz) = 03b68dff16429aed7a5b0cea7189276c8056e8ecd567b678c2595d48d9a51458
-SIZE (knot-resolver-4.2.2.tar.xz) = 1680220
+TIMESTAMP = 1581020689
+SHA256 (knot-resolver-5.0.1.tar.xz) = 4a93264ad0cda7ea2252d1ba057e474722f77848165f2893e0c76e21ae406415
+SIZE (knot-resolver-5.0.1.tar.xz) = 1725780
diff --git a/dns/knot-resolver/files/pkg-message.in b/dns/knot-resolver/files/pkg-message.in
index d72c09dbfc0..ff7ba777af0 100644
--- a/dns/knot-resolver/files/pkg-message.in
+++ b/dns/knot-resolver/files/pkg-message.in
@@ -1,6 +1,7 @@
 [
 { type: install
   message: <<EOM
+
   Please consult the documentation:
    - man kresd
    - https://knot-resolver.readthedocs.io/
diff --git a/dns/knot-resolver/pkg-plist b/dns/knot-resolver/pkg-plist
index 3e1c2e886a9..c73c8234577 100644
--- a/dns/knot-resolver/pkg-plist
+++ b/dns/knot-resolver/pkg-plist
@@ -27,7 +27,8 @@ include/libkres/trie.h
 include/libkres/utils.h
 include/libkres/zonecut.h
 lib/knot-resolver/ahocorasick.so
-lib/knot-resolver/config.lua
+lib/knot-resolver/distro-preconfig.lua
+lib/knot-resolver/kluautil.lua
 lib/knot-resolver/kres-gen.lua
 lib/knot-resolver/kres.lua
 lib/knot-resolver/kres_modules/bogus_log.so
@@ -79,19 +80,23 @@ lib/knot-resolver/kres_modules/ta_sentinel.lua
 lib/knot-resolver/kres_modules/ta_signal_query.lua
 lib/knot-resolver/kres_modules/ta_update.lua
 lib/knot-resolver/kres_modules/view.lua
+lib/knot-resolver/kres_modules/watchdog.lua
 lib/knot-resolver/kres_modules/workarounds.lua
+lib/knot-resolver/postconfig.lua
 lib/knot-resolver/sandbox.lua
 lib/knot-resolver/trust_anchors.lua
+lib/knot-resolver/upgrade-4-to-5.lua
 lib/knot-resolver/zonefile.lua
 lib/libkres.a
 libdata/pkgconfig/libkres.pc
-man8/kresd.8
+man/man8/kresd.8.gz
 sbin/kres-cache-gc
 sbin/kresc
 sbin/kresd
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/examples/config.cluster
 %%PORTDOCS%%%%DOCSDIR%%/examples/config.docker
+%%PORTDOCS%%%%DOCSDIR%%/examples/config.internal
 %%PORTDOCS%%%%DOCSDIR%%/examples/config.isp
 %%PORTDOCS%%%%DOCSDIR%%/examples/config.personal
+%%PORTDOCS%%%%DOCSDIR%%/examples/config.privacy
 %%PORTDOCS%%%%DOCSDIR%%/examples/config.splitview
diff --git a/dns/p5-Net-DNS-Resolver-Mock/Makefile b/dns/p5-Net-DNS-Resolver-Mock/Makefile
index b70608e3e24..3e5bed503e9 100644
--- a/dns/p5-Net-DNS-Resolver-Mock/Makefile
+++ b/dns/p5-Net-DNS-Resolver-Mock/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Net-DNS-Resolver-Mock
-PORTVERSION=	1.20171219
+PORTVERSION=	1.20200214
 CATEGORIES=	dns perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -16,9 +16,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
+
+USES=		perl5
+USE_PERL5=	configure
 
 NO_ARCH=	yes
-USE_PERL5=	configure
-USES=		perl5
 
 .include <bsd.port.mk>
diff --git a/dns/p5-Net-DNS-Resolver-Mock/distinfo b/dns/p5-Net-DNS-Resolver-Mock/distinfo
index da69d0a66fb..5323a800ead 100644
--- a/dns/p5-Net-DNS-Resolver-Mock/distinfo
+++ b/dns/p5-Net-DNS-Resolver-Mock/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513769209
-SHA256 (Net-DNS-Resolver-Mock-1.20171219.tar.gz) = c94a4333ef31c46023191b371f9bb71555f2fecb13af9d751021adb0e7ed7954
-SIZE (Net-DNS-Resolver-Mock-1.20171219.tar.gz) = 10241
+TIMESTAMP = 1581775749
+SHA256 (Net-DNS-Resolver-Mock-1.20200214.tar.gz) = 3748ed0d1c6a5670f7feca58f5fba7366d64d92a37fbaa4201dd4951b1e33f67
+SIZE (Net-DNS-Resolver-Mock-1.20200214.tar.gz) = 10324
diff --git a/dns/subfinder/Makefile b/dns/subfinder/Makefile
index 3a35f0a3d80..b74322467bd 100644
--- a/dns/subfinder/Makefile
+++ b/dns/subfinder/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	subfinder
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.1
+DISTVERSION=	2.3.2
 CATEGORIES=	dns
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -22,6 +22,7 @@ GH_TUPLE=	\
 		golang:net:5ee1b9f4859a:golang_net/vendor/golang.org/x/net \
 		golang:sys:ce4227a45e2e:golang_sys/vendor/golang.org/x/sys \
 		json-iterator:go:v1.1.8:json_iterator_go/vendor/github.com/json-iterator/go \
+		lib:pq:9eb3fc8:pq/vendor/github.com/lib/pq \
 		logrusorgru:aurora:21d75270181e:logrusorgru_aurora/vendor/github.com/logrusorgru/aurora \
 		m-mizutani:urlscan-go:v1.0.0:m_mizutani_urlscan_go/vendor/github.com/m-mizutani/urlscan-go \
 		miekg:dns:v1.1.22:miekg_dns/vendor/github.com/miekg/dns \
diff --git a/dns/subfinder/distinfo b/dns/subfinder/distinfo
index 24135de8214..4feea5f2eed 100644
--- a/dns/subfinder/distinfo
+++ b/dns/subfinder/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1580021082
-SHA256 (projectdiscovery-subfinder-v2.3.1_GH0.tar.gz) = 5c347dec43474549481a3d41310961d3d5d598a0bbedfd7837158d6f3de21131
-SIZE (projectdiscovery-subfinder-v2.3.1_GH0.tar.gz) = 1057149
+TIMESTAMP = 1581742879
+SHA256 (projectdiscovery-subfinder-v2.3.2_GH0.tar.gz) = 781ae7a47c7affbeaf4704be1065e418d791a0e4f6a2f6ddaaf0466b8091a338
+SIZE (projectdiscovery-subfinder-v2.3.2_GH0.tar.gz) = 1057516
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
 SHA256 (go-yaml-yaml-4206685974f2_GH0.tar.gz) = f4ede03105a42a61971a4329f26566de17c1c21a20cdb5e3c99eb8a0c827fbcc
@@ -15,6 +15,8 @@ SHA256 (golang-sys-ce4227a45e2e_GH0.tar.gz) = bbccaefbdaa781a16045e4de87816c01fa
 SIZE (golang-sys-ce4227a45e2e_GH0.tar.gz) = 1532325
 SHA256 (json-iterator-go-v1.1.8_GH0.tar.gz) = 0e16ec1a5175936864f3ee101951f58845ae0c86211e9a15b0c6bbf23752e62d
 SIZE (json-iterator-go-v1.1.8_GH0.tar.gz) = 79177
+SHA256 (lib-pq-9eb3fc8_GH0.tar.gz) = b25eab1b0c87d8c3a508a383103e8e11fa680f2f56062bb79b12de3a9671aeaf
+SIZE (lib-pq-9eb3fc8_GH0.tar.gz) = 97660
 SHA256 (logrusorgru-aurora-21d75270181e_GH0.tar.gz) = f8a106f6c39ee6e5d5affeb94b41078641b81d7a804a154130fa2ecb48e723cb
 SIZE (logrusorgru-aurora-21d75270181e_GH0.tar.gz) = 133116
 SHA256 (m-mizutani-urlscan-go-v1.0.0_GH0.tar.gz) = 131e7351e78d0caa11a3bf87c1a29ffe82ac04ccc2a30d236a3bd094453f073f
diff --git a/editors/Makefile b/editors/Makefile
index f28c603c4e7..8e1e1a73528 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -219,7 +219,6 @@
     SUBDIR += py-pynvim
     SUBDIR += py-room
     SUBDIR += quilter
-    SUBDIR += rox-edit
     SUBDIR += rubygem-neovim
     SUBDIR += scite
     SUBDIR += se
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index ae9b861a296..271b561a16b 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	emacs
-DISTVERSION=	28.0.50.20200205
+DISTVERSION=	28.0.50.20200214
 PORTEPOCH=	2
 CATEGORIES=	editors
 PKGNAMESUFFIX=	-devel
@@ -30,7 +30,7 @@ USES=		autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig
 CPE_VENDOR=	gnu
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
-GH_TAGNAME=	da7267e
+GH_TAGNAME=	2e81e57
 .if ${FLAVOR:U} != nox
 USES+=		desktop-file-utils gnome xorg
 INSTALLS_ICONS=	yes
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index 0c3e3f0c9b1..931ed7639cb 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580899615
-SHA256 (emacs-mirror-emacs-28.0.50.20200205-da7267e_GH0.tar.gz) = 7b24c20c35d65e19262fc92e6b8370047521ccf188499ade38d4ce8fa984e7e6
-SIZE (emacs-mirror-emacs-28.0.50.20200205-da7267e_GH0.tar.gz) = 40998932
+TIMESTAMP = 1581702296
+SHA256 (emacs-mirror-emacs-28.0.50.20200214-2e81e57_GH0.tar.gz) = b75f790130ee19e181ec167c00606dd1395499293f2aa0f38f35c56bc1bea0f3
+SIZE (emacs-mirror-emacs-28.0.50.20200214-2e81e57_GH0.tar.gz) = 40998699
diff --git a/editors/quilter/Makefile b/editors/quilter/Makefile
index f30492b13b3..a122f4f144f 100644
--- a/editors/quilter/Makefile
+++ b/editors/quilter/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	quilter
-DISTVERSION=	2.1.0
+DISTVERSION=	2.1.1
 CATEGORIES=	editors
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/editors/quilter/distinfo b/editors/quilter/distinfo
index 117957a34af..a125c2e25f7 100644
--- a/editors/quilter/distinfo
+++ b/editors/quilter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579156174
-SHA256 (lainsce-quilter-2.1.0_GH0.tar.gz) = f26e3a04336e86b1be7654de0f568379b3c1b135b91965475b8ce8debfc7b61c
-SIZE (lainsce-quilter-2.1.0_GH0.tar.gz) = 796422
+TIMESTAMP = 1581736532
+SHA256 (lainsce-quilter-2.1.1_GH0.tar.gz) = f36a915f477f3d0c24eb5d836b745c6116a0a0e71317c26e9ede8a3fff4bd6a9
+SIZE (lainsce-quilter-2.1.1_GH0.tar.gz) = 795569
diff --git a/editors/rox-edit/Makefile b/editors/rox-edit/Makefile
deleted file mode 100644
index 090b4dd6bf6..00000000000
--- a/editors/rox-edit/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	rox-edit
-PORTVERSION=	2.2
-PORTREVISION=	2
-CATEGORIES=	editors
-MASTER_SITES=	SF/rox/Edit/${PORTVERSION}
-DISTNAME=	edit-${PORTVERSION}
-
-MAINTAINER=	olgeni@FreeBSD.org
-COMMENT=	Text editor for the ROX desktop
-
-DEPRECATED=	Old, uses EOLed python27
-EXPIRATION_DATE=	2020-02-16
-
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/Edit/Help/COPYING
-
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
-		${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib@${PY_FLAVOR}
-
-USES=		python:2.7 shebangfix tar:bzip2
-SHEBANG_FILES=	Edit/tests/testreplace.py Edit/AppRun
-NO_ARCH=	yes
-
-post-extract:
-	@${FIND} ${WRKSRC} -name .cvsignore | ${XARGS} ${RM}
-	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -r
-
-do-build:
-	@${PYTHON_CMD} -m compileall ${WRKSRC}
-	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
-
-pre-install:
-	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
-			${WRKSRC}/Edit/findrox.py
-	@${FIND} ${WRKSRC} -name *.bak | ${XARGS} ${RM}
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/apps
-	${CP} -r ${WRKSRC}/Edit ${STAGEDIR}${PREFIX}/apps/
-
-.include <bsd.port.mk>
diff --git a/editors/rox-edit/distinfo b/editors/rox-edit/distinfo
deleted file mode 100644
index 1b8bd214888..00000000000
--- a/editors/rox-edit/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (edit-2.2.tar.bz2) = c449003cae5a1fa240930642ac889fa3b9f9a0280bacd59cd0b6f86c60e77f02
-SIZE (edit-2.2.tar.bz2) = 59773
diff --git a/editors/rox-edit/pkg-descr b/editors/rox-edit/pkg-descr
deleted file mode 100644
index 859455977e3..00000000000
--- a/editors/rox-edit/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A simple text editor for the ROX desktop.
-
-WWW: http://rox.sourceforge.net/edit.html
diff --git a/editors/rox-edit/pkg-plist b/editors/rox-edit/pkg-plist
deleted file mode 100644
index ee6265c1536..00000000000
--- a/editors/rox-edit/pkg-plist
+++ /dev/null
@@ -1,52 +0,0 @@
-apps/Edit/.DirIcon
-apps/Edit/AppInfo.xml
-apps/Edit/AppRun
-apps/Edit/Edit.xml
-apps/Edit/EditWindow.py
-apps/Edit/EditWindow.pyc
-apps/Edit/EditWindow.pyo
-apps/Edit/Help/COPYING
-apps/Edit/Help/Changes
-apps/Edit/Help/README
-apps/Edit/Messages/de.gmo
-apps/Edit/Messages/de.po
-apps/Edit/Messages/dist
-apps/Edit/Messages/es.gmo
-apps/Edit/Messages/es.po
-apps/Edit/Messages/fr.gmo
-apps/Edit/Messages/fr.po
-apps/Edit/Messages/it.gmo
-apps/Edit/Messages/it.po
-apps/Edit/Messages/tips.py
-apps/Edit/Messages/tips.pyc
-apps/Edit/Messages/tips.pyo
-apps/Edit/Messages/update-po
-apps/Edit/Messages/zh_CN.gmo
-apps/Edit/Messages/zh_CN.po
-apps/Edit/Messages/zh_TW.gmo
-apps/Edit/Messages/zh_TW.po
-apps/Edit/Options.xml
-apps/Edit/buffer.py
-apps/Edit/buffer.pyc
-apps/Edit/buffer.pyo
-apps/Edit/diff.py
-apps/Edit/diff.pyc
-apps/Edit/diff.pyo
-apps/Edit/findrox.py
-apps/Edit/findrox.pyc
-apps/Edit/findrox.pyo
-apps/Edit/goto.py
-apps/Edit/goto.pyc
-apps/Edit/goto.pyo
-apps/Edit/images/marker.png
-apps/Edit/images/rox-diff.png
-apps/Edit/images/rox-word-wrap.png
-apps/Edit/search.py
-apps/Edit/search.pyc
-apps/Edit/search.pyo
-apps/Edit/setup.py
-apps/Edit/setup.pyc
-apps/Edit/setup.pyo
-apps/Edit/tests/testreplace.py
-apps/Edit/tests/testreplace.pyc
-apps/Edit/tests/testreplace.pyo
diff --git a/emulators/adamem/files/patch-Z80IO.h b/emulators/adamem/files/patch-Z80IO.h
index f5cd2495b36..9402c936e42 100644
--- a/emulators/adamem/files/patch-Z80IO.h
+++ b/emulators/adamem/files/patch-Z80IO.h
@@ -1,13 +1,17 @@
-Index: Z80IO.h
-@@ -11,7 +11,6 @@
+--- Z80IO.h.orig	1999-02-14 19:45:30 UTC
++++ Z80IO.h
+@@ -11,9 +11,8 @@
  /****************************************************************************/
  
  #define INLINE_OP                     /* Inline Z80_RDOP()                  */
 -#define INLINE_MEM                    /* Inline Z80_RDMEM() and Z80_WRMEM() */
  
- #ifdef __GNUC__
+-#ifdef __GNUC__
++#if defined(__GNUC__) && (defined(__amd64__) || defined(__i386__))
  #define FASTCALL        __attribute__ ((regparm(3)))
-@@ -36,11 +35,11 @@
+ #ifdef INLINE_MEM
+ #define INLINE_MEM_GNU
+@@ -36,11 +35,11 @@ void Z80_Out (unsigned Port,byte Value) FASTCALL;
   /***************************************************************************/
   /* Read a byte from given memory location                                  */
   /***************************************************************************/
diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index 1a2d15a7230..274b147d701 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.8-9576 # git rev-list --count HEAD
-DISTVERSIONSUFFIX=	-g78c49e733
+DISTVERSION=	0.0.8-9581 # git rev-list --count HEAD
+DISTVERSIONSUFFIX=	-g9344b2148
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo
index b4861342d7d..fdf58e6e412 100644
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1581526938
+TIMESTAMP = 1581689486
 SHA256 (libcxx-8.0.0.src.tar.xz) = c2902675e7c84324fb2c1e45489220f250ede016cc3117186785d9dc291f9de2
 SIZE (libcxx-8.0.0.src.tar.xz) = 1752308
-SHA256 (RPCS3-rpcs3-v0.0.8-9576-g78c49e733_GH0.tar.gz) = 940b6fb0d0a2e6143471c6d598215f9d1596844cc5170bcbf39512b3aa1077a7
-SIZE (RPCS3-rpcs3-v0.0.8-9576-g78c49e733_GH0.tar.gz) = 5458839
+SHA256 (RPCS3-rpcs3-v0.0.8-9581-g9344b2148_GH0.tar.gz) = 96f41968498380c90359fed795ed094a722c2ad9273641f1b5805826051b9099
+SIZE (RPCS3-rpcs3-v0.0.8-9581-g9344b2148_GH0.tar.gz) = 5458778
 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-1394b1ccc8cf_GH0.tar.gz) = 7b2337a839566f04b187a6b24f4a5cc5546ed41659b2aee703cdbf8a6e6abd8c
diff --git a/emulators/wine-mono/Makefile b/emulators/wine-mono/Makefile
index 10ee6505be4..3221ef0dcf0 100644
--- a/emulators/wine-mono/Makefile
+++ b/emulators/wine-mono/Makefile
@@ -3,13 +3,14 @@
 
 PORTNAME=	wine-mono
 DISTVERSION=	4.9.4
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://dl.winehq.org/wine/wine-mono/${DISTVERSION}/
 EXTRACT_SUFX=	.msi
 EXTRACT_ONLY=
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Mono .NET implementation for Wine development branch (HTML support)
+MAINTAINER=	gerald@FreeBSD.org
+COMMENT=	Mono .NET implementation for Wine
 
 LICENSE=	MIT GPLv2 LGPL20
 LICENSE_COMB=	multi
diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile
index 829fc69040e..65f8ca283f6 100644
--- a/emulators/yuzu/Makefile
+++ b/emulators/yuzu/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	yuzu
-PORTVERSION=	s20200212
+PORTVERSION=	s20200214
 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=	8f8dda2d5
+GH_TAGNAME=	f552d553b
 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 \
diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo
index 3f253ddca89..06571b95723 100644
--- a/emulators/yuzu/distinfo
+++ b/emulators/yuzu/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1581524263
+TIMESTAMP = 1581709220
 SHA256 (libcxx-8.0.0.src.tar.xz) = c2902675e7c84324fb2c1e45489220f250ede016cc3117186785d9dc291f9de2
 SIZE (libcxx-8.0.0.src.tar.xz) = 1752308
-SHA256 (yuzu-emu-yuzu-s20200212-8f8dda2d5_GH0.tar.gz) = 9d52a21ef40b607701b98ccc535ea475527d96e3724a39dcc5fbc9005eae5507
-SIZE (yuzu-emu-yuzu-s20200212-8f8dda2d5_GH0.tar.gz) = 2716289
+SHA256 (yuzu-emu-yuzu-s20200214-f552d553b_GH0.tar.gz) = c96f93bb76389ec059126141e3fd6433d460d0427e30ddac3b8754298490ae6c
+SIZE (yuzu-emu-yuzu-s20200214-f552d553b_GH0.tar.gz) = 2714825
 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
diff --git a/emulators/yuzu/files/patch-CMakeLists.txt b/emulators/yuzu/files/patch-CMakeLists.txt
index 7b0b8a25ae8..81059e5a1cc 100644
--- a/emulators/yuzu/files/patch-CMakeLists.txt
+++ b/emulators/yuzu/files/patch-CMakeLists.txt
@@ -1,28 +1,26 @@
 yuzu (Qt) currently needs SDL for input
 
---- CMakeLists.txt.orig	2019-06-28 18:03:38 UTC
+--- CMakeLists.txt.orig	2020-02-14 19:40:20 UTC
 +++ CMakeLists.txt
-@@ -145,15 +145,15 @@ if (ENABLE_SDL2)
+@@ -157,13 +157,16 @@ if (ENABLE_SDL2)
+         target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
      else()
          find_package(SDL2 REQUIRED)
-     endif()
+-        include_directories(${SDL2_INCLUDE_DIRS})
 -
--    if (SDL2_FOUND)
--        # TODO(yuriks): Make FindSDL2.cmake export an IMPORTED library instead
 -        add_library(SDL2 INTERFACE)
--        target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")
--        target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
--    endif()
+-        target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}")
+     endif()
  else()
 -    set(SDL2_FOUND NO)
 +    find_package(SDL2)
 +endif()
 +
 +if (SDL2_FOUND)
-+  # TODO(yuriks): Make FindSDL2.cmake export an IMPORTED library instead
-+  add_library(SDL2 INTERFACE)
-+  target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")
-+  target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
++    include_directories(${SDL2_INCLUDE_DIRS})
++
++    add_library(SDL2 INTERFACE)
++    target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}")
  endif()
  
  # If unicorn isn't found, msvc -> download bundled unicorn; everyone else -> build external
diff --git a/finance/electrum/Makefile b/finance/electrum/Makefile
index 30332b47647..2f033371f88 100644
--- a/finance/electrum/Makefile
+++ b/finance/electrum/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	electrum
 PORTVERSION=	3.3.8
+PORTREVISION=	1
 CATEGORIES=	finance python
 MASTER_SITES=	https://download.electrum.org/${PORTVERSION}/ \
 		http://download.electrum.org/${PORTVERSION}/
@@ -34,7 +35,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp-socks>0:net/py-aiohttp-socks@${PY_FL
 		${PYTHON_PKGNAMEPREFIX}pycryptodomex>0:security/py-pycryptodomex@${PY_FLAVOR}
 
 # Supports 3.4+ but aiorpcX is 3.6+
-USES=		python:3.6+
+USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 PYDISTUTILS_PKGNAME=	Electrum
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 8efce57e5f6..26f44fc9665 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freeciv
-PORTVERSION=	2.6.1
+PORTVERSION=	2.6.2
 CATEGORIES=	games
 MASTER_SITES=	SF/freeciv/Freeciv%20${PORTVERSION:R}/${PORTVERSION}
 
@@ -43,12 +43,14 @@ DB_DESC=	Database support
 UI_DESC=	GUI clients
 
 GTK2_USES=	gnome sdl
-GTK2_USE=	GNOME=gdkpixbuf2,glib20,gtk20,pango SDL=mixer2
+GTK2_USE=	GNOME=gdkpixbuf2,glib20,gtk20,pango \
+		SDL=mixer2
 GTK2_VARS=	_FREECIV_CLIENT+=gtk2 \
 		_FREECIV_MP+=gtk2
 
 GTK3_USES=	gnome sdl
-GTK3_USE=	GNOME=cairo,gdkpixbuf2,glib20,gtk30,pango SDL=mixer2
+GTK3_USE=	GNOME=cairo,gdkpixbuf2,glib20,gtk30,pango \
+		SDL=mixer2
 GTK3_VARS=	_FREECIV_CLIENT+=gtk3 \
 		_FREECIV_MP+=gtk3
 
@@ -66,7 +68,8 @@ PGSQL_CONFIGURE_ON=	--with-postgres-prefix=${LOCALBASE}
 PGSQL_VARS=		_FREECIV_DB+=postgres
 
 QT5_USES=		qt:5 sdl
-QT5_USE=		QT=core,gui,widgets,buildtools_build SDL=mixer2
+QT5_USE=		QT=core,gui,widgets,buildtools_build \
+			SDL=mixer2
 QT5_CONFIGURE_ON=	--with-qt5-includes=${LOCALBASE}/${QT_INCDIR_REL} \
 			--with-qt5-libs=${LOCALBASE}/${QT_LIBDIR_REL}
 QT5_CONFIGURE_ENABLE=	ruledit
diff --git a/games/freeciv/distinfo b/games/freeciv/distinfo
index 730da4106fb..d26c251fbbc 100644
--- a/games/freeciv/distinfo
+++ b/games/freeciv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576733750
-SHA256 (freeciv-2.6.1.tar.bz2) = cce6841da0194138aad269cc735557db438a44909d75fd03d4db67507986b9e2
-SIZE (freeciv-2.6.1.tar.bz2) = 51915573
+TIMESTAMP = 1581826551
+SHA256 (freeciv-2.6.2.tar.bz2) = 6181ef3d3c76264383aabbe0eaf1550d8a65ca42639e6c17cc2938165e176c8f
+SIZE (freeciv-2.6.2.tar.bz2) = 52139007
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index 7794546f7bf..ea010a1bac6 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -74,6 +74,7 @@ share/applications/freeciv-server.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README.fcdb
 %%PORTDOCS%%%%DOCSDIR%%/README.governor
 %%PORTDOCS%%%%DOCSDIR%%/README.graphics
+%%PORTDOCS%%%%DOCSDIR%%/README.modpack_installer
 %%PORTDOCS%%%%DOCSDIR%%/README.msys2
 %%PORTDOCS%%%%DOCSDIR%%/README.nations
 %%PORTDOCS%%%%DOCSDIR%%/README.packaging
diff --git a/games/freeorion/Makefile b/games/freeorion/Makefile
index 28332149ec5..cc736588814 100644
--- a/games/freeorion/Makefile
+++ b/games/freeorion/Makefile
@@ -3,26 +3,9 @@
 
 PORTNAME=	freeorion
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.8
-PORTREVISION=	8
+DISTVERSION=	0.4.9
 CATEGORIES=	games
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	fd05b34fcc68.patch:-p1
-PATCHFILES+=	35863f31210b.patch:-p1
-PATCHFILES+=	9313aa4b98cc.patch:-p1
-PATCHFILES+=	31d04b0c66d3.patch:-p1 # rebased from f7f9cdeb6cd8
-PATCHFILES+=	0318fe967d2b.patch:-p1
-PATCHFILES+=	fc4486b30299.patch:-p1
-PATCHFILES+=	eff31a5ef564.patch:-p1
-PATCHFILES+=	38ce15b0f89c.patch:-p1
-PATCHFILES+=	d28d9662bd81.patch:-p1
-PATCHFILES+=	78b7a1994b8b.patch:-p1
-PATCHFILES+=	ff8c06a6685f.patch:-p1
-PATCHFILES+=	4a7b8833cb8d.patch:-p1 # rebased from 7513ede6b03c
-PATCHFILES+=	17caf5a174d3.patch:-p1
-PATCHFILES+=	5ad3f175925d.patch:-p1
-
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Turn-based space empire and galactic conquest game
 
diff --git a/games/freeorion/distinfo b/games/freeorion/distinfo
index 592365da972..3aa45989652 100644
--- a/games/freeorion/distinfo
+++ b/games/freeorion/distinfo
@@ -1,31 +1,3 @@
-TIMESTAMP = 1535717925
-SHA256 (freeorion-freeorion-v0.4.8_GH0.tar.gz) = 1dac72c40bb9b881699423c98b14a9cd71b3f88cd2ec3433d5456cdd8dfa9621
-SIZE (freeorion-freeorion-v0.4.8_GH0.tar.gz) = 106232267
-SHA256 (fd05b34fcc68.patch) = 8c30408d22a9b25f1e67417aa7162523f92660d83e67a95d5da47fe8e018709f
-SIZE (fd05b34fcc68.patch) = 2788
-SHA256 (35863f31210b.patch) = 54fb8495a7383246788705c1cf70037856a14141fdb2ad16ce0f69f2c9dacc2a
-SIZE (35863f31210b.patch) = 2258
-SHA256 (9313aa4b98cc.patch) = 533a6f8a55146eefd09426f5fcea30fc00e67145bfa3ff9b90b7d0bea09796c3
-SIZE (9313aa4b98cc.patch) = 668
-SHA256 (31d04b0c66d3.patch) = d530430d24445624afe2619502bf1984fae24f13b350531d2a42281b1710fbe8
-SIZE (31d04b0c66d3.patch) = 15224
-SHA256 (0318fe967d2b.patch) = 1d9786fd72bba0791b398593dc12ef9dee6b8ceaf67d34c163d3802a33ccfdb0
-SIZE (0318fe967d2b.patch) = 1303
-SHA256 (fc4486b30299.patch) = be324aadf6f8a7a03f3aa6786c7dfe49e4e66087fc8e757a07bd736d81023ea8
-SIZE (fc4486b30299.patch) = 1125
-SHA256 (eff31a5ef564.patch) = 93a3da43f58ab484c47ebfbf3b59aee97642a86c4433d975cb368ca84228c2f3
-SIZE (eff31a5ef564.patch) = 2053
-SHA256 (38ce15b0f89c.patch) = 7203ff030f7b45b3242b2b6adffbbb3c4451cd3c0b28ae9b48a2bbd76da2bed0
-SIZE (38ce15b0f89c.patch) = 1272
-SHA256 (d28d9662bd81.patch) = 63e6e79fcae2313900b65eb18647bf4a1147feedf1a451a4278fe83322463ed8
-SIZE (d28d9662bd81.patch) = 939
-SHA256 (78b7a1994b8b.patch) = d6ec58f0503421061a09fc885db83149203303acbf92cae6797c8d1aaf30c2ba
-SIZE (78b7a1994b8b.patch) = 1705
-SHA256 (ff8c06a6685f.patch) = badab4b650884cecc3e0043d15c4c41cb90222f09bc2f49aebfd83eef2461e0d
-SIZE (ff8c06a6685f.patch) = 2022
-SHA256 (4a7b8833cb8d.patch) = 5da2609567124e1f1f5e52f70e7dffc3b9047aafb65867f06c075e27cd7595be
-SIZE (4a7b8833cb8d.patch) = 1057
-SHA256 (17caf5a174d3.patch) = 81f6070e5eb247df34a80857c828fb4a1efa7645a1718f3a44f547a3b04ef3c0
-SIZE (17caf5a174d3.patch) = 1037
-SHA256 (5ad3f175925d.patch) = 5da61872d446e5e8d8d48abec1b1ab997d0227224c92b26450ce3dcc4122452e
-SIZE (5ad3f175925d.patch) = 2396
+TIMESTAMP = 1581356540
+SHA256 (freeorion-freeorion-v0.4.9_GH0.tar.gz) = bf16ecfe73e5f14f2fba0e4d30f10111051ec88806f97361ab3f4e1fdac1f512
+SIZE (freeorion-freeorion-v0.4.9_GH0.tar.gz) = 124612120
diff --git a/games/julius/Makefile b/games/julius/Makefile
index be07302cd00..25810788cb1 100644
--- a/games/julius/Makefile
+++ b/games/julius/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	julius
-PORTVERSION=	1.2.0
+PORTVERSION=	1.3.0
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	games
diff --git a/games/julius/distinfo b/games/julius/distinfo
index 5237213061d..091e469cfc8 100644
--- a/games/julius/distinfo
+++ b/games/julius/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578559971
-SHA256 (bvschaik-julius-v1.2.0_GH0.tar.gz) = 72395c30d3709823de15c2337a552e5ccfa466803a2bd97bc5bee8180b9471e5
-SIZE (bvschaik-julius-v1.2.0_GH0.tar.gz) = 8448355
+TIMESTAMP = 1581762536
+SHA256 (bvschaik-julius-v1.3.0_GH0.tar.gz) = 8dddbf27d6f54217d9c43f3d2386b7d76f1f07e18b95c3b15ce5bc6c6830bdfa
+SIZE (bvschaik-julius-v1.3.0_GH0.tar.gz) = 8457777
diff --git a/games/openmw/Makefile b/games/openmw/Makefile
index 1439c906cb4..4e57c175ec8 100644
--- a/games/openmw/Makefile
+++ b/games/openmw/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	openmw
 DISTVERSIONPREFIX=	openmw-
 DISTVERSION=	0.45.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
diff --git a/games/openmw/files/patch-components_esm_custommarkerstate.hpp b/games/openmw/files/patch-components_esm_custommarkerstate.hpp
new file mode 100644
index 00000000000..8f7ca816c38
--- /dev/null
+++ b/games/openmw/files/patch-components_esm_custommarkerstate.hpp
@@ -0,0 +1,11 @@
+--- components/esm/custommarkerstate.hpp.orig	2019-03-10 10:50:29 UTC
++++ components/esm/custommarkerstate.hpp
+@@ -16,7 +16,7 @@ struct CustomMarker
+ 
+     std::string mNote;
+ 
+-    bool operator == (const CustomMarker& other)
++    bool operator == (const CustomMarker& other) const
+     {
+         return mNote == other.mNote && mCell == other.mCell && mWorldX == other.mWorldX && mWorldY == other.mWorldY;
+     }
diff --git a/games/openmw/files/patch-osg3.6.5 b/games/openmw/files/patch-osg3.6.5
new file mode 100644
index 00000000000..d97ca8efa7d
--- /dev/null
+++ b/games/openmw/files/patch-osg3.6.5
@@ -0,0 +1,62 @@
+See https://github.com/OpenMW/openmw/pull/2676
+
+From 4eb330b4ed794fd6201f7954a517dec29678c285 Mon Sep 17 00:00:00 2001
+From: Julien Valentin <julienvalentin51@gmail.Com>
+Date: Mon, 27 Jan 2020 23:44:22 +0100
+Subject: [PATCH] comply with new OQN API
+
+---
+ apps/openmw/mwrender/sky.cpp | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
+index 3996f472c2..009b9d935f 100644
+--- apps/openmw/mwrender/sky.cpp
++++ apps/openmw/mwrender/sky.cpp
+@@ -2,6 +2,7 @@
+ 
+ #include <cmath>
+ 
++#include <osg/Version>
+ #include <osg/ClipPlane>
+ #include <osg/Fog>
+ #include <osg/Transform>
+@@ -557,27 +558,33 @@ class Sun : public CelestialBody
+     {
+         osg::ref_ptr<osg::OcclusionQueryNode> oqn = new osg::OcclusionQueryNode;
+         oqn->setQueriesEnabled(true);
+-
++#if OSG_VERSION_LESS_THAN(3,6,5)
++        osg::Geometry* queryGeom = oqn->getQueryGeometry();
++#else
++        osg::ref_ptr<osg::QueryGeometry> queryGeom(new osg::QueryGeometry());
++#endif
+         // Make it fast! A DYNAMIC query geometry means we can't break frame until the flare is rendered (which is rendered after all the other geometry,
+         // so that would be pretty bad). STATIC should be safe, since our node's local bounds are static, thus computeBounds() which modifies the queryGeometry
+         // is only called once.
+         // Note the debug geometry setDebugDisplay(true) is always DYNAMIC and that can't be changed, not a big deal.
+-        oqn->getQueryGeometry()->setDataVariance(osg::Object::STATIC);
++        queryGeom->setDataVariance(osg::Object::STATIC);
+ 
+         // Set up the query geometry to match the actual sun's rendering shape. osg::OcclusionQueryNode wasn't originally intended to allow this,
+         // normally it would automatically adjust the query geometry to match the sub graph's bounding box. The below hack is needed to
+         // circumvent this.
+-        osg::Geometry* queryGeom = oqn->getQueryGeometry();
+         queryGeom->setVertexArray(mGeom->getVertexArray());
+         queryGeom->setTexCoordArray(0, mGeom->getTexCoordArray(0), osg::Array::BIND_PER_VERTEX);
+-        queryGeom->removePrimitiveSet(0, oqn->getQueryGeometry()->getNumPrimitiveSets());
++        queryGeom->removePrimitiveSet(0, queryGeom->getNumPrimitiveSets());
+         queryGeom->addPrimitiveSet(mGeom->getPrimitiveSet(0));
+ 
++#if OSG_VERSION_LESS_THAN(3,6,5)
+         // Hack to disable unwanted awful code inside OcclusionQueryNode::computeBound.
+         oqn->setComputeBoundingSphereCallback(new DummyComputeBoundCallback);
+         // Still need a proper bounding sphere.
+         oqn->setInitialBound(queryGeom->getBound());
+-
++#else
++        oqn->setQueryGeometry(queryGeom);
++#endif
+         osg::StateSet* queryStateSet = new osg::StateSet;
+         if (queryVisible)
+         {
diff --git a/games/xcowsay/Makefile b/games/xcowsay/Makefile
index 6a698a87d60..4615ef38eae 100644
--- a/games/xcowsay/Makefile
+++ b/games/xcowsay/Makefile
@@ -17,6 +17,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		gettext gmake gnome pkgconfig
+USE_CSTD=	c99
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 GNU_CONFIGURE=	yes
 
diff --git a/graphics/Makefile b/graphics/Makefile
index a096bdeca6f..ad9f4f5cf24 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -555,7 +555,6 @@
     SUBDIR += ocaml-images
     SUBDIR += ocaml-lablgl
     SUBDIR += ocrad
-    SUBDIR += ocre
     SUBDIR += ogre3d
     SUBDIR += ogre3d19
     SUBDIR += oidn
@@ -781,7 +780,6 @@
     SUBDIR += py-OWSLib
     SUBDIR += py-PyOpenGL
     SUBDIR += py-PyOpenGL-accelerate
-    SUBDIR += py-PyX
     SUBDIR += py-actdiag
     SUBDIR += py-blockdiag
     SUBDIR += py-blockdiagcontrib-cisco
@@ -858,6 +856,7 @@
     SUBDIR += py-pyrsgis
     SUBDIR += py-python-poppler-qt5
     SUBDIR += py-pyvips
+    SUBDIR += py-pyx
     SUBDIR += py-qt5-svg
     SUBDIR += py-rawkit
     SUBDIR += py-sane
@@ -968,6 +967,7 @@
     SUBDIR += sdl_ttf
     SUBDIR += sdump
     SUBDIR += seejpeg
+    SUBDIR += seexpr
     SUBDIR += sekrit-twc-zimg
     SUBDIR += seom
     SUBDIR += separate
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 334ebf9ab08..9c5e8b880d2 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cimg
 DISTVERSIONPREFIX=	v.
-DISTVERSION=	2.8.3
+DISTVERSION=	2.8.4
 PORTEPOCH=	3
 CATEGORIES=	graphics devel
 
diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo
index 7858678e27e..a731eae265a 100644
--- a/graphics/cimg/distinfo
+++ b/graphics/cimg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580413870
-SHA256 (dtschump-CImg-v.2.8.3_GH0.tar.gz) = 8c7a93e4183b3ff371b1fa6ea90eeb685aa631dbc5a01685c3acfb1c23c0939e
-SIZE (dtschump-CImg-v.2.8.3_GH0.tar.gz) = 11208996
+TIMESTAMP = 1581870208
+SHA256 (dtschump-CImg-v.2.8.4_GH0.tar.gz) = ff8b6a571686daa17a948ca03eb3494e647107417b8a7021a2dfd2c48557bef5
+SIZE (dtschump-CImg-v.2.8.4_GH0.tar.gz) = 11209211
diff --git a/graphics/drm-devel-kmod/Makefile b/graphics/drm-devel-kmod/Makefile
index 6f372d7c2bc..4196dc3112b 100644
--- a/graphics/drm-devel-kmod/Makefile
+++ b/graphics/drm-devel-kmod/Makefile
@@ -11,8 +11,8 @@ COMMENT=	DRM modules for the linuxkpi-based KMS components (development version)
 LICENSE=	BSD2CLAUSE MIT GPLv2
 LICENSE_COMB=	multi
 
-ONLY_FOR_ARCHS=	amd64 i386 powerpc64
-ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64, i386 and powerpc64
+ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64
+ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64, arm64, i386 and powerpc64
 
 RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
 
@@ -59,7 +59,7 @@ PLIST_SUB+=	VBOXVIDEO=""
 .  else
 PLIST_SUB+=	VBOXVIDEO="@comment "
 .  endif
-.elif ${ARCH} == "powerpc64"
+.elif ${ARCH} == "aarch64" || ${ARCH} == "powerpc64"
 PLIST_SUB+=	AMDGPU=""
 PLIST_SUB+=	AMDKFD="@comment " 
 PLIST_SUB+=	I915="@comment "
diff --git a/graphics/gmic/Makefile b/graphics/gmic/Makefile
index c4f9a2be70b..d5c44e1d1cf 100644
--- a/graphics/gmic/Makefile
+++ b/graphics/gmic/Makefile
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	gmic
-DISTVERSION=	2.8.3
+DISTVERSION=	2.8.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://gmic.eu/files/source/
 DISTNAME=	${PORTNAME}_${DISTVERSION}
@@ -35,21 +36,13 @@ CMAKE_ON=	ENABLE_DYNAMIC_LINKING
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-OPTIONS_DEFINE=		OPENMP PLUGINS X11
+OPTIONS_DEFINE=		OPENMP X11
 OPTIONS_DEFAULT=	OPENMP X11
 OPTIONS_SUB=		yes
 
 OPENMP_CMAKE_BOOL=	ENABLE_OPENMP
 OPENMP_LIB_DEPENDS=	libgomp.so:devel/openmp
 
-PLUGINS_CMAKE_BOOL=	BUILD_PLUGIN
-PLUGINS_USES=		gnome
-PLUGINS_USE=		GNOME=atk,cairo,gdkpixbuf2,glib20,gtk20,pango
-PLUGINS_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
-			libfreetype.so:print/freetype2 \
-			libgimp-2.0.so:graphics/gimp-app
-PLUGINS_BROKEN=		cmake files support was accidentally broken, need to convert the port to gmake use: https://github.com/dtschump/gmic/issues/135
-
 X11_CMAKE_BOOL=		ENABLE_X
 X11_USES=		xorg
 X11_USE=		XORG=ice,sm,x11,xext
diff --git a/graphics/gmic/distinfo b/graphics/gmic/distinfo
index fcabe5a0b0b..a38f740fcb9 100644
--- a/graphics/gmic/distinfo
+++ b/graphics/gmic/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579976302
-SHA256 (gmic_2.8.3.tar.gz) = 573a4f7731ba506a397c8080e60ad30bd3d4b686c51ec3d22d7f5de9a901547c
-SIZE (gmic_2.8.3.tar.gz) = 6172645
+TIMESTAMP = 1581736836
+SHA256 (gmic_2.8.4.tar.gz) = b2a279bdf981595b30d8d7828fabf9a620cde06eae8db345a8cddf2160c25379
+SIZE (gmic_2.8.4.tar.gz) = 6182300
diff --git a/graphics/gmic/pkg-plist b/graphics/gmic/pkg-plist
index bcf5e63eca7..34e5af97e6e 100644
--- a/graphics/gmic/pkg-plist
+++ b/graphics/gmic/pkg-plist
@@ -6,5 +6,3 @@ lib/cmake/gmic/GmicTargets.cmake
 lib/libgmic.so
 lib/libgmic.so.1
 man/man1/gmic.1.gz
-%%PLUGINS%%libexec/gimp/2.2/plug-ins/gmic_film_cluts.gmz
-%%PLUGINS%%libexec/gimp/2.2/plug-ins/gmic_gimp_gtk
diff --git a/graphics/libavif/Makefile b/graphics/libavif/Makefile
index 9fcf8b5a433..7d7e5a7396d 100644
--- a/graphics/libavif/Makefile
+++ b/graphics/libavif/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	libavif
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.4
-PORTREVISION=	2
+DISTVERSION=	0.5.5
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/graphics/libavif/distinfo b/graphics/libavif/distinfo
index 230bd172d45..00e5de0dfc2 100644
--- a/graphics/libavif/distinfo
+++ b/graphics/libavif/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579631557
-SHA256 (AOMediaCodec-libavif-v0.5.4_GH0.tar.gz) = 4d3a9a68935facec5c06353edb0be4d79d5ccf571f3e06531e79e92d4df954a0
-SIZE (AOMediaCodec-libavif-v0.5.4_GH0.tar.gz) = 65360
+TIMESTAMP = 1581644863
+SHA256 (AOMediaCodec-libavif-v0.5.5_GH0.tar.gz) = 4ed3381142bc25421294b01e5d5bc786d1d9d6bb3d66b646ad01d64d62caed44
+SIZE (AOMediaCodec-libavif-v0.5.5_GH0.tar.gz) = 2859008
diff --git a/graphics/libavif/pkg-plist b/graphics/libavif/pkg-plist
index f87438535f0..c29782810c8 100644
--- a/graphics/libavif/pkg-plist
+++ b/graphics/libavif/pkg-plist
@@ -7,4 +7,4 @@ lib/cmake/libavif/libavif-config-version.cmake
 lib/cmake/libavif/libavif-config.cmake
 lib/libavif.so
 lib/libavif.so.0
-lib/libavif.so.0.1.4
+lib/libavif.so.0.1.5
diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index 1ea7421798c..bcd6424788e 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -40,7 +40,7 @@ GALLIUM_DRIVERS=	""
 .endif
 VULKAN_DRIVERS=		#
 
-.if ${ARCH} == amd64 || ${ARCH} == i386 \
+.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 \
  || ${ARCH} == powerpc || ${ARCH} == powerpc64
 DRI_DRIVERS+=		RADEON R200
 GALLIUM_DRIVERS+=	R300 R600 RADEONSI
diff --git a/graphics/ocre/Makefile b/graphics/ocre/Makefile
deleted file mode 100644
index 08a9cd55593..00000000000
--- a/graphics/ocre/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	ocre
-PORTVERSION=	0.043
-PORTREVISION=	2
-CATEGORIES=	graphics
-MASTER_SITES=	ftp://lem.eui.upm.es/pub/ocre/
-DISTNAME=	${PORTNAME}_v${PORTVERSION:S/./_/}
-
-MAINTAINER=	w.schwarzenfeld@utanet.at
-COMMENT=	Simple optical character recognition solution
-
-BROKEN=		unfetchable
-DEPRECATED=	unfetchable, author not reachable, seems discontinued
-EXPIRATION_DATE=	2020-02-15
-
-LICENSE=	GPLv3
-
-LIB_DEPENDS=	libaspell.so:textproc/aspell
-RUN_DEPENDS=	display:graphics/ImageMagick6 \
-		gnuplot:math/gnuplot \
-		ispell:textproc/aspell-ispell
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
-
-USES=		compiler:c11 gettext gmake gnome pkgconfig tar:tgz
-USE_GNOME=	gtk20
-MAKE_ARGS=	CC="${CC}" CFLAGS1="${CFLAGS}"
-
-post-extract:
-	@cd ${WRKSRC} && ${TAR} --exclude "*.orig" -xof ocre-decsWood-${PORTVERSION}.tgz
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|, sys_nerr||' ${WRKSRC}/src/errors.c
-	@${FIND} ${WRKSRC} -name "*.[1ch]" -print0 | ${XARGS} -0 \
-		${REINPLACE_CMD} -e \
-		's|/usr/bin|${PREFIX}/bin|g ; \
-		 s|/usr/share/locale|${PREFIX}/share/locale|g ; \
-		 s|/usr/share/ocre|${DATADIR}|g'
-
-do-configure:
-	@${ECHO_CMD} -n > ${WRKSRC}/ddepend
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/es/man1
-	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}-es.1 ${STAGEDIR}${MAN1PREFIX}/man/es/man1/${PORTNAME}.1
-	${INSTALL_DATA} ${WRKSRC}/po/es.mo ${STAGEDIR}${PREFIX}/share/locale/es/LC_MESSAGES/${PORTNAME}.mo
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-.for dir in conv decsWood decsWoodCur decsWoodCyrillic decsWoodLatin decsWoodLatinW
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR})
-.endfor
-
-.include <bsd.port.mk>
diff --git a/graphics/ocre/distinfo b/graphics/ocre/distinfo
deleted file mode 100644
index fd9b27fb6e4..00000000000
--- a/graphics/ocre/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ocre_v0_043.tgz) = bd2fa3a75ccfaddf7eb228ed42078ec4fd5b645ed4e76af8a4268e2fd25ecc32
-SIZE (ocre_v0_043.tgz) = 729840
diff --git a/graphics/ocre/files/patch-Makefile b/graphics/ocre/files/patch-Makefile
deleted file mode 100644
index 9f27ae1c584..00000000000
--- a/graphics/ocre/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2010-02-27 00:12:09.000000000 +0000
-+++ Makefile
-@@ -16,7 +16,7 @@ CFLAGS1= -g -Wall -Wno-uninitialized  #
- 
- CFLAGS = ${CFLAGS1} `pkg-config --cflags gtk+-$(VERS)` -Isrc -O2
- 
--LDLIBS = `pkg-config --libs gtk+-$(VERS)`  -lm -laspell
-+LDLIBS = `pkg-config --libs gtk+-$(VERS)`  -lm -laspell -lintl
- 
- OBJS_DCSW = dcsw/entropydcsw.o dcsw/tabledcsw.o dcsw/treedcsw.o dcsw/dcsw.o dcsw/treesdcsw.o
- 
diff --git a/graphics/ocre/pkg-descr b/graphics/ocre/pkg-descr
deleted file mode 100644
index 61b28b7bbd7..00000000000
--- a/graphics/ocre/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-OCRE is an optical character recognition (OCR) system that reads an
-image file and writes ASCII or Unicode characters.
-
-WWW: http://lem.eui.upm.es/ocre.html
diff --git a/graphics/ocre/pkg-plist b/graphics/ocre/pkg-plist
deleted file mode 100644
index 940bf484842..00000000000
--- a/graphics/ocre/pkg-plist
+++ /dev/null
@@ -1,493 +0,0 @@
-bin/ocre
-man/es/man1/ocre.1.gz
-man/man1/ocre.1.gz
-share/locale/es/LC_MESSAGES/ocre.mo
-%%DATADIR%%/conv/cod39a2c
-%%DATADIR%%/conv/maymin
-%%DATADIR%%/conv/minmay
-%%DATADIR%%/conv/puntua
-%%DATADIR%%/conv/tposyes
-%%DATADIR%%/conv/ts-8859-0.ts
-%%DATADIR%%/conv/ts-8859-1.ts
-%%DATADIR%%/conv/ts-8859-15.ts
-%%DATADIR%%/conv/ts-8859-2.ts
-%%DATADIR%%/conv/ts-8859-5.ts
-%%DATADIR%%/decsWood
-%%DATADIR%%/decsWoodCur/0.tu2i
-%%DATADIR%%/decsWoodCur/00index
-%%DATADIR%%/decsWoodCur/arbol-u0027.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0028.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0029.dcw
-%%DATADIR%%/decsWoodCur/arbol-u002c.dcw
-%%DATADIR%%/decsWoodCur/arbol-u002d.dcw
-%%DATADIR%%/decsWoodCur/arbol-u002e.dcw
-%%DATADIR%%/decsWoodCur/arbol-u002f.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0030.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0031.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0032.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0039.dcw
-%%DATADIR%%/decsWoodCur/arbol-u003a.dcw
-%%DATADIR%%/decsWoodCur/arbol-u003b.dcw
-%%DATADIR%%/decsWoodCur/arbol-u003f.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0041.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0042.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0043.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0044.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0045.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0046.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0047.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0048.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0049.dcw
-%%DATADIR%%/decsWoodCur/arbol-u004a.dcw
-%%DATADIR%%/decsWoodCur/arbol-u004c.dcw
-%%DATADIR%%/decsWoodCur/arbol-u004d.dcw
-%%DATADIR%%/decsWoodCur/arbol-u004e.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0050.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0051.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0052.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0053.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0054.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0055.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0059.dcw
-%%DATADIR%%/decsWoodCur/arbol-u005e.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0061.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0062.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0063.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0064.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0065.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0066.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0066u0069.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0067.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0068.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0069.dcw
-%%DATADIR%%/decsWoodCur/arbol-u006a.dcw
-%%DATADIR%%/decsWoodCur/arbol-u006b.dcw
-%%DATADIR%%/decsWoodCur/arbol-u006c.dcw
-%%DATADIR%%/decsWoodCur/arbol-u006cu0061.dcw
-%%DATADIR%%/decsWoodCur/arbol-u006d.dcw
-%%DATADIR%%/decsWoodCur/arbol-u006e.dcw
-%%DATADIR%%/decsWoodCur/arbol-u006f.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0070.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0071.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0072.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0072u0061.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0073.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0074.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0075.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0076.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0078.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0079.dcw
-%%DATADIR%%/decsWoodCur/arbol-u007a.dcw
-%%DATADIR%%/decsWoodCur/arbol-u00ab.dcw
-%%DATADIR%%/decsWoodCur/arbol-u00bb.dcw
-%%DATADIR%%/decsWoodCur/arbol-u00bf.dcw
-%%DATADIR%%/decsWoodCur/arbol-u00e0.dcw
-%%DATADIR%%/decsWoodCur/arbol-u00e1.dcw
-%%DATADIR%%/decsWoodCur/arbol-u00e8.dcw
-%%DATADIR%%/decsWoodCur/arbol-u00e9.dcw
-%%DATADIR%%/decsWoodCur/arbol-u00ea.dcw
-%%DATADIR%%/decsWoodCur/arbol-u00ed.dcw
-%%DATADIR%%/decsWoodCur/arbol-u00f1.dcw
-%%DATADIR%%/decsWoodCur/arbol-u00f3.dcw
-%%DATADIR%%/decsWoodCur/arbol-u00fa.dcw
-%%DATADIR%%/decsWoodCur/arbol-u0131.dcw
-%%DATADIR%%/decsWoodCur/arbol-u2019.dcw
-%%DATADIR%%/decsWoodCur/arbol-u201b.dcw
-%%DATADIR%%/decsWoodCyrillic/0.tu2i
-%%DATADIR%%/decsWoodCyrillic/00index
-%%DATADIR%%/decsWoodCyrillic/arbol-u0021.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0028.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0029.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u002c.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u002d.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u002e.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0030.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0031.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0032.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0033.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0034.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0035.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0036.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0037.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0038.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0039.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u003a.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u003c.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u003e.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u003f.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0049.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u004c.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0056.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0058.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u00ab.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u00b9.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u00bb.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u026a.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0410.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0411.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0412.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0413.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0414.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0415.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0416.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0417.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0418.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u041a.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u041b.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u041c.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u041d.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u041e.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u041f.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0420.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0421.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0422.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0423.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0424.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0425.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0426.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0427.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0428.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u042d.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u042f.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0430.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0430u002d.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0431.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0432.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0433.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0433u002d.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0434.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0435.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0435u002d.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0436.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0437.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0438.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0439.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u043a.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u043b.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u043c.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u043d.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u043e.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u043eu002d.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u043f.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0440.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0440u002d.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0441.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0441u002d.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0442.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0443.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0444.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0445.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0446.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0447.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0448.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0449.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u044a.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u044b.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u044c.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u044d.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u044e.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u044f.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u0451.dcw
-%%DATADIR%%/decsWoodCyrillic/arbol-u2015.dcw
-%%DATADIR%%/decsWoodLatin/0.tu2i
-%%DATADIR%%/decsWoodLatin/00index
-%%DATADIR%%/decsWoodLatin/00indexw
-%%DATADIR%%/decsWoodLatin/arbol-u0021.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0023.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0024.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0025.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0026.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0027.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0028.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0029.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u002a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u002b.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u002c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u002d.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u002e.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u002f.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0030.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0030u0030.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0031.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0032.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0033.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0034.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0035.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0036.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0037.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0038.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0039.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u003a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u003b.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u003c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u003d.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u003e.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u003f.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0040.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0041.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0041u006c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0042.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0043.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0044.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0045.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0046.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0046u0072.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0047.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0048.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0049.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u004a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u004b.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u004c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u004d.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u004e.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u004f.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0050.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0051.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0052.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0053.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0054.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0055.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0056.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0057.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0058.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0059.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u005a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u005b.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u005c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u005d.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u005e.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u005f.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0060.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0061.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0061u006a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0061u0072.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0061u007a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0061u017a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0061u017c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0062.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0062u0065.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0062u006a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0062u006f.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0063.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0063u0061.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0063u0065.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0063u006a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0063u006f.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0063u0079.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0064.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0064u00ed.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0065.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0065u0063.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0065u006a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0065u0073.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u0032.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u0033.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u0034.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u0035.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u0036.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u0039.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u0061.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u0062.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u0063.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u0065.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u0066.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u0069.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u006c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u006f.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u0072.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u0075.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u00ed.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0066u00fc.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0067.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0067u0069.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0067u006f.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0067u0072.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0067u0075.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0067u00fa.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0068.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0069.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0069u0078.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006b.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006bu0069.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006bu006c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006bu0072.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006bu0075.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006bu0142.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006cu0061.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006cu0069.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006cu006c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006cu006f.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006d.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006du0062.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006du0069.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006e.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006eu0069.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006eu006a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006f.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006fu002d.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006fu0063.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006fu0064.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006fu006a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u006fu2015.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0070.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0070u0065.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0070u006f.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0071.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0072.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0072u002c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0072u0065.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0072u0069.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0072u006d.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0072u006e.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0072u006f.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0072u0070.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0072u0072.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0072u0074.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0072u0075.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0072u0077.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0072u0079.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0072u007a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0072u007au0079.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0072u00ed.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0073.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0073u0063.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0073u0065.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0073u006f.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0074.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0074u0061.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0074u0065.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0074u006f.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0074u0072.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0074u0075.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0074u0077.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0074u0079.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0075.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0075u006a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0075u0072.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0076.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0077.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0077u0074.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0077u0079.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0077u007a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0078.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0079.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0079u0074.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0079u017c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u007a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u007au0077.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u007au0079.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u007b.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u007c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u007d.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u007e.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00a1.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00aa.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00ab.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00b9.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00ba.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00bb.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00bf.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00c0.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00c1.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00c2.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00c3.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00c4.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00c6.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00c7.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00c8.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00c9.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00ca.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00cb.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00cc.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00cd.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00ce.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00cf.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00d1.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00d2.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00d3.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00d4.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00d5.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00d6.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00d9.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00da.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00db.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00dc.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00df.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00e0.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00e1.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00e2.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00e3.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00e4.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00e6.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00e7.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00e8.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00e9.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00e9u006a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00ea.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00eb.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00ec.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00ed.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00edu0061.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00edu006f.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00ee.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00ef.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00f1.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00f2.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00f3.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00f4.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00f5.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00f5u0065.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00f6.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00f9.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00fa.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00fb.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00fc.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u00ff.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0105.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0105u017c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0106.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0107.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0108.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0109.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0119.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u011d.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0125.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0135.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0141.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0142.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0142u0075.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0142u0079.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0143.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0144.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0152.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0153.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u015a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u015b.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u015c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u015d.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u016d.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0178.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u0179.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u017a.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u017b.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u017c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u017cu0079.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u2014.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u2015.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u2015u0063.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u2016.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u2018.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u2019.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u201c.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u201d.dcw
-%%DATADIR%%/decsWoodLatin/arbol-u201e.dcw
-%%DATADIR%%/decsWoodLatin/arbol-w0030.dcw
-%%DATADIR%%/decsWoodLatin/arbol-w0031.dcw
-%%DATADIR%%/decsWoodLatin/arbol-w0043.dcw
-%%DATADIR%%/decsWoodLatinW/00index
-%%DATADIR%%/decsWoodLatinW/arbol-w0030.dcw
-%%DATADIR%%/decsWoodLatinW/arbol-w0031.dcw
-%%DATADIR%%/decsWoodLatinW/arbol-w0043.dcw
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index d8f6b739ba6..5679c5d7861 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	osg
-PORTVERSION=	3.6.4
+PORTVERSION=	3.6.5
 DISTVERSIONPREFIX=	OpenSceneGraph-
-PORTREVISION=	4
 CATEGORIES=	graphics
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -30,7 +29,7 @@ USE_XORG=	x11
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	OSG_VERSION=${PORTVERSION} \
-		OSG_SHLIBVER=160 \
+		OSG_SHLIBVER=161 \
 		OPENTHREADS_VERSION=3.3.1 \
 		OPENTHREADS_SHLIBVER=21
 
diff --git a/graphics/osg/distinfo b/graphics/osg/distinfo
index b36ddb3ff2b..5125318380c 100644
--- a/graphics/osg/distinfo
+++ b/graphics/osg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575910338
-SHA256 (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.6.4_GH0.tar.gz) = 81394d1b484c631028b85d21c5535280c21bbd911cb058e8746c87e93e7b9d33
-SIZE (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.6.4_GH0.tar.gz) = 5771539
+TIMESTAMP = 1581433181
+SHA256 (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.6.5_GH0.tar.gz) = aea196550f02974d6d09291c5d83b51ca6a03b3767e234a8c0e21322927d1e12
+SIZE (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.6.5_GH0.tar.gz) = 5780762
diff --git a/graphics/osg/files/patch-src_OpenThreads_pthreads_CMakeLists.txt b/graphics/osg/files/patch-src_OpenThreads_pthreads_CMakeLists.txt
deleted file mode 100644
index 73290c44d28..00000000000
--- a/graphics/osg/files/patch-src_OpenThreads_pthreads_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/OpenThreads/pthreads/CMakeLists.txt.orig	2019-07-26 11:54:16 UTC
-+++ src/OpenThreads/pthreads/CMakeLists.txt
-@@ -80,8 +80,15 @@ ELSE()
-           # double check that pthread_setaffinity_np is available as FreeBSD header doesn't contain required function
-           CHECK_CXX_SOURCE_COMPILES("
-             #include <pthread.h>
-+            #ifdef __FreeBSD__
-+            #include <pthread_np.h>
-+            #endif
-             int main() {
-+            #ifdef __FreeBSD__
-+            cpuset_t cpumask;
-+            #else
-             cpu_set_t cpumask;
-+            #endif
-             CPU_ZERO( &cpumask );
-             CPU_SET( 0, &cpumask );
-             pthread_setaffinity_np( pthread_self(), sizeof(cpumask), &cpumask);
diff --git a/graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp b/graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp
deleted file mode 100644
index 24a63b76fff..00000000000
--- a/graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/OpenThreads/pthreads/PThread.cpp.orig	2019-07-26 11:54:16 UTC
-+++ src/OpenThreads/pthreads/PThread.cpp
-@@ -21,6 +21,9 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <pthread.h>
-+#if defined(HAVE_PTHREAD_SETAFFINITY_NP) && defined(__FreeBSD__)
-+    #include <pthread_np.h>
-+#endif
- #include <limits.h>
- 
- #if defined __linux__ || defined __sun || defined __APPLE__ || ANDROID
-@@ -113,7 +116,11 @@ namespace OpenThreads
- static void setAffinity(const Affinity& affinity)
- {
-     //std::cout<<"setProcessAffinity : "<< affinity.activeCPUs.size() <<std::endl;
-+#if defined(__FreeBSD__)
-+    cpuset_t cpumask;
-+#else
-     cpu_set_t cpumask;
-+#endif
-     CPU_ZERO( &cpumask );
-     unsigned int numprocessors = OpenThreads::GetNumberOfProcessors();
-     if (affinity)
diff --git a/graphics/osg/files/patch-src_osgViewer_CMakeLists.txt b/graphics/osg/files/patch-src_osgViewer_CMakeLists.txt
deleted file mode 100644
index 5004572efab..00000000000
--- a/graphics/osg/files/patch-src_osgViewer_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/osgViewer/CMakeLists.txt.orig	2019-07-26 11:54:16 UTC
-+++ src/osgViewer/CMakeLists.txt
-@@ -210,7 +210,7 @@ ELSEIF(${OSG_WINDOWING_SYSTEM} STREQUAL "X11")
-     IF(OSGVIEWER_USE_XINERAMA)
-         ADD_DEFINITIONS(-DOSGVIEWER_USE_XINERAMA)
-         SET(LIB_PRIVATE_HEADERS ${LIB_PRIVATE_HEADERS} ${XINERAMA_INCLUDE_DIRS} )
--        SET(LIB_EXTRA_LIBS -lXinerama ${LIB_EXTRA_LIBS})
-+        SET(LIB_EXTRA_LIBS ${X11_Xinerama_LIB} ${LIB_EXTRA_LIBS})
-     ENDIF()
- 
-     # X11 on Apple requires X11 library plus OpenGL linking hack on Leopard
diff --git a/graphics/py-PyX/pkg-descr b/graphics/py-PyX/pkg-descr
deleted file mode 100644
index ed0d80b6f72..00000000000
--- a/graphics/py-PyX/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-PyX is a Python package for the creation of encapsulated PostScript figures.
-It provides both an abstraction of PostScript and a TeX/LaTeX interface.
-Complex tasks like 2d and 3d plots in publication-ready quality are built out
-of these primitives.
-
-Features
-   * PostScript output for device independent, free scalable figures
-   * seamless TeX/LaTeX integration
-   * full access to PostScript features like paths, linestyles, fill patterns,
-     transformations, clipping, etc.
-   * advanced geometric operations on paths like intersections, transformations,
-     splitting, etc.
-   * sophisticated graph generation: modular design, pluggable axes, axes
-     partitioning based on rational number arithmetics, flexible graph styles,
-     etc.
-
-WWW: http://pyx.sourceforge.net/
diff --git a/graphics/py-pycha/Makefile b/graphics/py-pycha/Makefile
index 6e22d2a2d91..7778d14ed26 100644
--- a/graphics/py-pycha/Makefile
+++ b/graphics/py-pycha/Makefile
@@ -3,23 +3,27 @@
 
 PORTNAME=	pycha
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library for making charts with Python
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
+
 USES=		python
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	autoplist concurrent distutils
+
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=		CAIRO
-OPTIONS_DEFAULT=	CAIRO
+OPTIONS_DEFINE=	CAIRO
+OPTIONS_DEFAULT=CAIRO
 
-CAIRO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR}
+CAIRO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/graphics/py-PyX/Makefile b/graphics/py-pyx/Makefile
similarity index 66%
rename from graphics/py-PyX/Makefile
rename to graphics/py-pyx/Makefile
index bf8e084d9d2..197bc4a3bb8 100644
--- a/graphics/py-PyX/Makefile
+++ b/graphics/py-pyx/Makefile
@@ -1,38 +1,35 @@
 # Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	PyX
+PORTNAME=	pyx
 PORTVERSION=	0.14.1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	PyX-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python package for creating encapsulated PostScript figures
 
 LICENSE=	GPLv2
 
 USES=		python:3.4+
-USE_TEX=	latex:build
 USE_PYTHON=	autoplist distutils
+USE_TEX=	latex:build
 
-OPTIONS_DEFINE=		T1CODE KPATHSEA
-OPTIONS_DEFAULT=	T1CODE KPATHSEA
-T1CODE_DESC=		Fast t1 font encoding/decoding
-KPATHSEA_DESC=		Python wrapper around kpathsea
+OPTIONS_DEFINE=	KPATHSEA T1CODE
+OPTIONS_DEFAULT=KPATHSEA T1CODE
+KPATHSEA_DESC=	Python wrapper around kpathsea
+T1CODE_DESC=	Fast t1 font encoding/decoding
 
-T1CODE_CFLAGS=		-I${LOCALBASE}/include
 KPATHSEA_CFLAGS=	-I${LOCALBASE}/include
 KPATHSEA_LDFLAGS=	-L${LOCALBASE}/lib
+T1CODE_CFLAGS=		-I${LOCALBASE}/include
 
-.include <bsd.port.options.mk>
-
-post-patch:
-.if ${PORT_OPTIONS:MT1CODE}
-	@${REINPLACE_CMD} -e 's|build_t1code=0|build_t1code=1|' ${WRKSRC}/setup.cfg
-.endif
-.if ${PORT_OPTIONS:MKPATHSEA}
+post-patch-KPATHSEA-on:
 	@${REINPLACE_CMD} -e 's|build_pykpathsea=0|build_pykpathsea=1|' ${WRKSRC}/setup.cfg
-.endif
+
+post-patch-T1CODE-on:
+	@${REINPLACE_CMD} -e 's|build_t1code=0|build_t1code=1|' ${WRKSRC}/setup.cfg
 
 .include <bsd.port.mk>
diff --git a/graphics/py-PyX/distinfo b/graphics/py-pyx/distinfo
similarity index 100%
rename from graphics/py-PyX/distinfo
rename to graphics/py-pyx/distinfo
diff --git a/graphics/py-pyx/pkg-descr b/graphics/py-pyx/pkg-descr
new file mode 100644
index 00000000000..d2ce082ffb8
--- /dev/null
+++ b/graphics/py-pyx/pkg-descr
@@ -0,0 +1,17 @@
+PyX is a Python package for the creation of PostScript, PDF, and SVG files. It
+combines an abstraction of the PostScript drawing model with a TeX/LaTeX
+interface. Complex tasks like 2d and 3d plots in publication-ready quality are
+built out of these primitives.
+
+Features:
+- PostScript, PDF, and SVG output for device independent, freely scalable
+  figures
+- seamless TeX/LaTeX integration
+- full access to PostScript features like paths, linestyles, fill patterns,
+  transformations, clipping, bitmap inclusion, etc.
+- advanced geometric operations on paths like intersections, transformations,
+  splitting, smoothing, etc.
+- sophisticated graph generation: modular design, pluggable axes, axes
+  partitioning based on rational number arithmetics, flexible graph styles, etc.
+
+WWW: https://pyx-project.org/
diff --git a/graphics/py-willow/Makefile b/graphics/py-willow/Makefile
index de0c02bfbe4..f92e547a674 100644
--- a/graphics/py-willow/Makefile
+++ b/graphics/py-willow/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Wrapper that combines multiple Python image libraries into one API
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python
+USES=		python:3.5+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index f2a64062a55..a95f33373f1 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	sane-backends
-PORTVERSION=	1.0.28
+PORTVERSION=	1.0.29
 CATEGORIES=	graphics
-MASTER_SITES=	https://gitlab.com/sane-project/backends/uploads/9e718daff347826f4cfe21126c8d5091/
+MASTER_SITES=	https://gitlab.com/sane-project/backends/uploads/54f858b20a364fc35d820df935a86478/
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	API for access to scanners, digitals camera, frame grabbers etc
@@ -15,8 +15,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
-USES=		compiler:c++11-lang gmake jpeg libtool localbase pathfix \
+USES=		compiler:c++11-lang gmake gnome jpeg libtool localbase pathfix \
 		pkgconfig
+USE_GNOME=	libxml2
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	saned
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-locking \
@@ -24,49 +27,37 @@ CONFIGURE_ARGS=	--disable-locking \
 		--without-api-spec \
 		--without-systemd
 INSTALL_TARGET=	install-strip
-USE_LDCONFIG=	yes
-USE_RC_SUBR=	saned
 
 SUB_FILES=	pkg-message
 
 USERS=		saned
 GROUPS=		saned
 
+PLIST_SUB=	SOVERSION=${PORTVERSION}
+
 OPTIONS_DEFINE=		AVAHI DOCS GPHOTO IEEE1284 IPV6 NLS SNMP USB V4L
 OPTIONS_DEFAULT=	USB
 OPTIONS_SUB=		yes
 
-IEEE1284_DESC=		Parallel port support via libieee1284
-USB_DESC=		USB support
+IEEE1284_DESC=	Parallel port support via libieee1284
+USB_DESC=	USB support
 
-AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
-AVAHI_CONFIGURE_ENABLE=	avahi
-GPHOTO_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
-GPHOTO_CONFIGURE_OFF=	--with-gphoto2=no
-IEEE1284_LIB_DEPENDS=	libieee1284.so:sysutils/libieee1284
+AVAHI_LIB_DEPENDS=		libavahi-client.so:net/avahi-app \
+				libcurl.so:ftp/curl
+AVAHI_CONFIGURE_ENABLE=		avahi
+AVAHI_CONFIGURE_WITH=		libcurl
+GPHOTO_LIB_DEPENDS=		libgphoto2.so:graphics/libgphoto2
+GPHOTO_CONFIGURE_OFF=		--with-gphoto2=no
+IEEE1284_LIB_DEPENDS=		libieee1284.so:sysutils/libieee1284
 IEEE1284_CONFIGURE_ENV_OFF=	sane_cv_use_libieee1284=no
-IPV6_CONFIGURE_ENABLE=	ipv6
-NLS_USES=		gettext
-NLS_CONFIGURE_ENABLE=	nls
-SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
-SNMP_CONFIGURE_WITH=	snmp
-USB_CONFIGURE_ON=	--with-usb
-USB_CONFIGURE_OFF=	--with-usb=no
-V4L_LIB_DEPENDS=	libv4l1.so:multimedia/libv4l
-V4L_CONFIGURE_WITH=	v4l
-
-post-patch:
-	@${REINPLACE_CMD} -e '/for ac_header in/s|libc.h|sys/endian.h| ; \
-		 s|"$${have_linux_ioctl_defines}"|"$${have_libv4l1}"| ; \
-		 /pthread_t[[:space:]]k;[[:space:]]/s|pthread_t[[:space:]]k;[[:space:]]k[[:space:]]\*[[:space:]]1|pthread_t k; k = (pthread_t) -1|' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/^dist_doc_DATA/s|COPYING||' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|HAVE_LIBC_H|HAVE_SYS_ENDIAN_H|' \
-		${WRKSRC}/include/sane/config.h.in
-	@${REINPLACE_CMD} -e '/^pkgconfigdir/s|@libdir@|@prefix@/libdata|' \
-		${WRKSRC}/tools/Makefile.in
-	@${REINPLACE_CMD} -e '/^export PKG_CONFIG_LIBDIR=/s|@libdir@|@prefix@/libdata|' \
-		${WRKSRC}/tools/sane-config.in
+IPV6_CONFIGURE_ENABLE=		ipv6
+NLS_USES=			gettext
+NLS_CONFIGURE_ENABLE=		nls
+SNMP_LIB_DEPENDS=		libnetsnmp.so:net-mgmt/net-snmp
+SNMP_CONFIGURE_WITH=		snmp
+USB_CONFIGURE_OFF=		--with-usb=no
+USB_CONFIGURE_ON=		--with-usb
+V4L_LIB_DEPENDS=		libv4l1.so:multimedia/libv4l
+V4L_CONFIGURE_WITH=		v4l
 
 .include <bsd.port.mk>
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 4c3203b8961..2fcaaab99d0 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569562258
-SHA256 (sane-backends-1.0.28.tar.gz) = 31260f3f72d82ac1661c62c5a4468410b89fb2b4a811dabbfcc0350c1346de03
-SIZE (sane-backends-1.0.28.tar.gz) = 6753880
+TIMESTAMP = 1580719476
+SHA256 (sane-backends-1.0.29.tar.gz) = aa027b4e5f59849cd41b8c26d54584cf31fffd986049019be6ad4140e11ea8ed
+SIZE (sane-backends-1.0.29.tar.gz) = 7201950
diff --git a/graphics/sane-backends/files/patch-backend_Makefile.in b/graphics/sane-backends/files/patch-backend_Makefile.in
new file mode 100644
index 00000000000..6e7f3d41211
--- /dev/null
+++ b/graphics/sane-backends/files/patch-backend_Makefile.in
@@ -0,0 +1,38 @@
+--- backend/Makefile.in.orig	2020-02-03 08:54:00 UTC
++++ backend/Makefile.in
+@@ -1645,7 +1645,7 @@ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 = 
+-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/sane
++DEFAULT_INCLUDES = -I$(top_builddir)/include/sane -I$(top_builddir)/include -I.@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__maybe_remake_depfiles = depfiles
+ am__depfiles_remade = ./$(DEPDIR)/libabaton_la-abaton.Plo \
+@@ -3270,7 +3270,7 @@ libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
+ libsane_la_LIBADD = $(COMMON_LIBS) $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_LIBS) $(DL_LIBS) $(XML_LIBS)
+ 
+ # WARNING: Automake is getting this wrong so have to do it ourselves.
+-libsane_la_DEPENDENCIES = $(COMMON_LIBS) $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_DEPS)
++libsane_la_DEPENDENCIES = ../lib/liblib.la $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_DEPS)
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+@@ -7174,7 +7174,7 @@ install-becfg: becfg
+ 	@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.
+ 	@# Having two libsane's can cause issues so get rid of it.
+ 	-rm -f $(DESTDIR)$(sanelibdir)/libsane.*
+-	test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
++	test -z "$(configdir)/dist" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dist"
+ 	test -z "$(configdir)/dll.d" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dll.d"
+ 	@list="$(BACKEND_CONFS_ENABLED) saned.conf dll.conf"; for cfg in $$list; do \
+ 	  if test ! -r $${cfg}; then continue; fi; \
+@@ -7182,7 +7182,7 @@ install-becfg: becfg
+ 	  echo NOT overwriting $${cfg} in $(configdir)...; \
+ 	  else \
+ 	  echo installing $${cfg} in $(configdir)/$${cfg}...; \
+-	  $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/$${cfg} \
++	  $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/dist/$${cfg} \
+ 	  || exit 1; \
+ 	  fi; \
+ 	  done
diff --git a/graphics/sane-backends/files/patch-backend__Makefile.in b/graphics/sane-backends/files/patch-backend__Makefile.in
deleted file mode 100644
index 075f101dc66..00000000000
--- a/graphics/sane-backends/files/patch-backend__Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- backend/Makefile.in.orig	2018-08-28 15:10:08 UTC
-+++ backend/Makefile.in
-@@ -1518,7 +1518,7 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/sane
-+DEFAULT_INCLUDES = -I$(top_builddir)/include/sane -I$(top_builddir)/include -I.@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
-@@ -5609,7 +5609,7 @@ install-becfg:
- 	@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.  
- 	@# Having two libsane's can cause issues so get rid of it.
- 	-rm -f $(DESTDIR)$(sanelibdir)/libsane.*
--	test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
-+	test -z "$(configdir)/dist" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dist"
- 	test -z "$(configdir)/dll.d" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dll.d"
- 	@list="$(BACKEND_CONFS_ENABLED) saned.conf dll.conf"; for cfg in $$list; do \
- 	  if test ! -r $${cfg}; then continue; fi; \
-@@ -5617,7 +5617,7 @@ install-becfg:
- 	  echo NOT overwriting $${cfg} in $(configdir)...; \
- 	  else \
- 	  echo installing $${cfg} in $(configdir)/$${cfg}...; \
--	  $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/$${cfg} \
-+	  $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/dist/$${cfg} \
- 	  || exit 1; \
- 	  fi; \
- 	  done
diff --git a/graphics/sane-backends/files/patch-backend_genesys_low.cpp b/graphics/sane-backends/files/patch-backend_genesys_low.cpp
new file mode 100644
index 00000000000..c1218914e83
--- /dev/null
+++ b/graphics/sane-backends/files/patch-backend_genesys_low.cpp
@@ -0,0 +1,19 @@
+Fix build on big endian archs:
+
+genesys/low.cpp:544:9: error: 'depth' was not declared in this scope, see
+
+https://gitlab.com/sane-project/backends/-/merge_requests/329
+
+Obtained from:	OpenBSD
+
+--- backend/genesys/low.cpp.orig	2020-02-02 11:58:09 UTC
++++ backend/genesys/low.cpp
+@@ -539,7 +539,7 @@ Image read_unshuffled_image_from_scanner(Genesys_Devic
+     }
+ 
+ #ifdef WORDS_BIGENDIAN
+-    if (depth == 16) {
++    if (session.params.depth == 16) {
+         dev->pipeline.push_node<ImagePipelineNodeSwap16BitEndian>();
+     }
+ #endif
diff --git a/graphics/sane-backends/files/patch-backend_pixma_pixma__bjnp.c b/graphics/sane-backends/files/patch-backend_pixma_pixma__bjnp.c
new file mode 100644
index 00000000000..cac58d20d3f
--- /dev/null
+++ b/graphics/sane-backends/files/patch-backend_pixma_pixma__bjnp.c
@@ -0,0 +1,21 @@
+--- backend/pixma/pixma_bjnp.c.orig	2020-02-03 09:33:57 UTC
++++ backend/pixma/pixma_bjnp.c
+@@ -72,6 +72,7 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#include <sys/param.h>
+ 
+ /*
+  * networking stuff
+@@ -1990,8 +1991,8 @@ sanei_bjnp_find_devices (const char **conf_devices,
+   fd_set fdset;
+   fd_set active_fdset;
+   struct timeval timeout;
+-  char scanner_host[HOST_NAME_MAX];
+-  char uri[HOST_NAME_MAX + 32];
++  char scanner_host[MAXHOSTNAMELEN];
++  char uri[MAXHOSTNAMELEN + 32];
+   int dev_no;
+   int port;
+   int auto_detect = 1;
diff --git a/graphics/sane-backends/files/patch-backend_ricoh2__buffer.c b/graphics/sane-backends/files/patch-backend_ricoh2__buffer.c
index 2f84840e848..f501a2d0619 100644
--- a/graphics/sane-backends/files/patch-backend_ricoh2__buffer.c
+++ b/graphics/sane-backends/files/patch-backend_ricoh2__buffer.c
@@ -1,11 +1,11 @@
---- backend/ricoh2_buffer.c.orig	2019-10-09 14:45:51 UTC
+--- backend/ricoh2_buffer.c.orig	2020-02-02 11:58:09 UTC
 +++ backend/ricoh2_buffer.c
-@@ -46,7 +46,7 @@
- 
- #include <memory.h>
- #include <assert.h>
+@@ -50,7 +50,7 @@
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <malloc/malloc.h>
+ #else
 -#include <malloc.h>
 +#include <stdlib.h>
+ #endif
  
  #include "../include/sane/sanei_debug.h"
- 
diff --git a/graphics/sane-backends/files/patch-backend__v4l.c b/graphics/sane-backends/files/patch-backend_v4l.c
similarity index 100%
rename from graphics/sane-backends/files/patch-backend__v4l.c
rename to graphics/sane-backends/files/patch-backend_v4l.c
diff --git a/graphics/sane-backends/files/patch-configure b/graphics/sane-backends/files/patch-configure
new file mode 100644
index 00000000000..d9ed8b71fa0
--- /dev/null
+++ b/graphics/sane-backends/files/patch-configure
@@ -0,0 +1,29 @@
+--- configure.orig	2020-02-02 11:58:46 UTC
++++ configure
+@@ -22138,7 +22138,7 @@ $as_echo_n "checking whether pthread_t is integer... "
+ int
+ main ()
+ {
+-pthread_t k; k * 1;
++pthread_t k; k = (pthread_t) -1;
+   ;
+   return 0;
+ }
+@@ -26130,7 +26130,7 @@ for be in ${BACKENDS}; do
+     ;;
+ 
+     v4l)
+-    if test "${have_linux_ioctl_defines}" != "yes" \
++    if test "${have_libv4l1}" != "yes" \
+       || test "${have_libv4l1}" != "yes"; then
+       echo "*** $be backend requires v4l libraries - $DISABLE_MSG"
+       backend_supported="no"
+@@ -26339,7 +26339,7 @@ for be in ${BACKENDS}; do
+     ;;
+ 
+     v4l)
+-    if test "${have_linux_ioctl_defines}" != "yes" \
++    if test "${have_libv4l1}" != "yes" \
+       || test "${have_libv4l1}" != "yes"; then
+       echo "*** $be backend requires v4l libraries - $DISABLE_MSG"
+       backend_supported="no"
diff --git a/graphics/sane-backends/files/patch-tools_sane-config.in b/graphics/sane-backends/files/patch-tools_sane-config.in
new file mode 100644
index 00000000000..94c46a977dc
--- /dev/null
+++ b/graphics/sane-backends/files/patch-tools_sane-config.in
@@ -0,0 +1,11 @@
+--- tools/sane-config.in.orig	2020-02-02 11:58:09 UTC
++++ tools/sane-config.in
+@@ -11,7 +11,7 @@ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ 
+ # using our installed *.pc only - neither default nor user paths
+-export PKG_CONFIG_LIBDIR="@libdir@/pkgconfig"
++export PKG_CONFIG_LIBDIR="@prefix@/libdata/pkgconfig"
+ export PKG_CONFIG_PATH=""
+ 
+ pkgconfig_package=sane-backends
diff --git a/graphics/sane-backends/files/patch-tools_sane-desc.c b/graphics/sane-backends/files/patch-tools_sane-desc.c
index 0ee9db54e42..8c0288273a3 100644
--- a/graphics/sane-backends/files/patch-tools_sane-desc.c
+++ b/graphics/sane-backends/files/patch-tools_sane-desc.c
@@ -1,8 +1,8 @@
---- tools/sane-desc.c.orig	2015-09-01 00:31:54 UTC
+--- tools/sane-desc.c.orig	2020-02-02 11:58:09 UTC
 +++ tools/sane-desc.c
 @@ -2816,8 +2816,8 @@ html_print_footer (void)
       "<address>\n"
-      "<a href=\"http://www.sane-project.org/imprint.html\"\n"
+      "<a href=\"imprint.html\"\n"
       ">Contact</a>\n" "</address>\n" "<font size=-1>\n");
 -  printf ("This page was last updated on %s by sane-desc %s from %s\n",
 -	  asctime (localtime (&current_time)), SANE_DESC_VERSION, PACKAGE_STRING);
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index 212964f8724..155355309b7 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -28,6 +28,7 @@ bin/umax_pp
 @sample etc/sane.d/dist/epson.conf etc/sane.d/epson.conf
 @sample etc/sane.d/dist/epson2.conf etc/sane.d/epson2.conf
 @sample etc/sane.d/dist/epsonds.conf etc/sane.d/epsonds.conf
+%%AVAHI%%@sample etc/sane.d/dist/escl.conf etc/sane.d/escl.conf
 @sample etc/sane.d/dist/fujitsu.conf etc/sane.d/fujitsu.conf
 @sample etc/sane.d/dist/genesys.conf etc/sane.d/genesys.conf
 %%GPHOTO%%@sample etc/sane.d/dist/gphoto2.conf etc/sane.d/gphoto2.conf
@@ -86,271 +87,274 @@ include/sane/sane.h
 include/sane/saneopts.h
 lib/libsane.so
 lib/libsane.so.1
-lib/libsane.so.1.0.28
+lib/libsane.so.%%SOVERSION%%
 lib/sane/libsane-abaton.so
 lib/sane/libsane-abaton.so.1
-lib/sane/libsane-abaton.so.1.0.28
+lib/sane/libsane-abaton.so.%%SOVERSION%%
 lib/sane/libsane-agfafocus.so
 lib/sane/libsane-agfafocus.so.1
-lib/sane/libsane-agfafocus.so.1.0.28
+lib/sane/libsane-agfafocus.so.%%SOVERSION%%
 lib/sane/libsane-apple.so
 lib/sane/libsane-apple.so.1
-lib/sane/libsane-apple.so.1.0.28
+lib/sane/libsane-apple.so.%%SOVERSION%%
 lib/sane/libsane-artec.so
 lib/sane/libsane-artec.so.1
-lib/sane/libsane-artec.so.1.0.28
+lib/sane/libsane-artec.so.%%SOVERSION%%
 lib/sane/libsane-artec_eplus48u.so
 lib/sane/libsane-artec_eplus48u.so.1
-lib/sane/libsane-artec_eplus48u.so.1.0.28
+lib/sane/libsane-artec_eplus48u.so.%%SOVERSION%%
 lib/sane/libsane-as6e.so
 lib/sane/libsane-as6e.so.1
-lib/sane/libsane-as6e.so.1.0.28
+lib/sane/libsane-as6e.so.%%SOVERSION%%
 lib/sane/libsane-avision.so
 lib/sane/libsane-avision.so.1
-lib/sane/libsane-avision.so.1.0.28
+lib/sane/libsane-avision.so.%%SOVERSION%%
 lib/sane/libsane-bh.so
 lib/sane/libsane-bh.so.1
-lib/sane/libsane-bh.so.1.0.28
+lib/sane/libsane-bh.so.%%SOVERSION%%
 lib/sane/libsane-canon.so
 lib/sane/libsane-canon.so.1
-lib/sane/libsane-canon.so.1.0.28
+lib/sane/libsane-canon.so.%%SOVERSION%%
 lib/sane/libsane-canon630u.so
 lib/sane/libsane-canon630u.so.1
-lib/sane/libsane-canon630u.so.1.0.28
+lib/sane/libsane-canon630u.so.%%SOVERSION%%
 lib/sane/libsane-canon_dr.so
 lib/sane/libsane-canon_dr.so.1
-lib/sane/libsane-canon_dr.so.1.0.28
+lib/sane/libsane-canon_dr.so.%%SOVERSION%%
 %%IEEE1284%%lib/sane/libsane-canon_pp.so
 %%IEEE1284%%lib/sane/libsane-canon_pp.so.1
-%%IEEE1284%%lib/sane/libsane-canon_pp.so.1.0.28
+%%IEEE1284%%lib/sane/libsane-canon_pp.so.%%SOVERSION%%
 lib/sane/libsane-cardscan.so
 lib/sane/libsane-cardscan.so.1
-lib/sane/libsane-cardscan.so.1.0.28
+lib/sane/libsane-cardscan.so.%%SOVERSION%%
 lib/sane/libsane-coolscan.so
 lib/sane/libsane-coolscan.so.1
-lib/sane/libsane-coolscan.so.1.0.28
+lib/sane/libsane-coolscan.so.%%SOVERSION%%
 lib/sane/libsane-coolscan2.so
 lib/sane/libsane-coolscan2.so.1
-lib/sane/libsane-coolscan2.so.1.0.28
+lib/sane/libsane-coolscan2.so.%%SOVERSION%%
 lib/sane/libsane-coolscan3.so
 lib/sane/libsane-coolscan3.so.1
-lib/sane/libsane-coolscan3.so.1.0.28
+lib/sane/libsane-coolscan3.so.%%SOVERSION%%
 lib/sane/libsane-dc210.so
 lib/sane/libsane-dc210.so.1
-lib/sane/libsane-dc210.so.1.0.28
+lib/sane/libsane-dc210.so.%%SOVERSION%%
 lib/sane/libsane-dc240.so
 lib/sane/libsane-dc240.so.1
-lib/sane/libsane-dc240.so.1.0.28
+lib/sane/libsane-dc240.so.%%SOVERSION%%
 lib/sane/libsane-dc25.so
 lib/sane/libsane-dc25.so.1
-lib/sane/libsane-dc25.so.1.0.28
+lib/sane/libsane-dc25.so.%%SOVERSION%%
 lib/sane/libsane-dell1600n_net.so
 lib/sane/libsane-dell1600n_net.so.1
-lib/sane/libsane-dell1600n_net.so.1.0.28
+lib/sane/libsane-dell1600n_net.so.%%SOVERSION%%
 lib/sane/libsane-dll.so
 lib/sane/libsane-dll.so.1
-lib/sane/libsane-dll.so.1.0.28
+lib/sane/libsane-dll.so.%%SOVERSION%%
 lib/sane/libsane-dmc.so
 lib/sane/libsane-dmc.so.1
-lib/sane/libsane-dmc.so.1.0.28
+lib/sane/libsane-dmc.so.%%SOVERSION%%
 lib/sane/libsane-epjitsu.so
 lib/sane/libsane-epjitsu.so.1
-lib/sane/libsane-epjitsu.so.1.0.28
+lib/sane/libsane-epjitsu.so.%%SOVERSION%%
 lib/sane/libsane-epson.so
 lib/sane/libsane-epson.so.1
-lib/sane/libsane-epson.so.1.0.28
+lib/sane/libsane-epson.so.%%SOVERSION%%
 lib/sane/libsane-epson2.so
 lib/sane/libsane-epson2.so.1
-lib/sane/libsane-epson2.so.1.0.28
+lib/sane/libsane-epson2.so.%%SOVERSION%%
 lib/sane/libsane-epsonds.so
 lib/sane/libsane-epsonds.so.1
-lib/sane/libsane-epsonds.so.1.0.28
+lib/sane/libsane-epsonds.so.%%SOVERSION%%
+%%AVAHI%%lib/sane/libsane-escl.so
+%%AVAHI%%lib/sane/libsane-escl.so.1
+%%AVAHI%%lib/sane/libsane-escl.so.%%SOVERSION%%
 lib/sane/libsane-fujitsu.so
 lib/sane/libsane-fujitsu.so.1
-lib/sane/libsane-fujitsu.so.1.0.28
+lib/sane/libsane-fujitsu.so.%%SOVERSION%%
 lib/sane/libsane-genesys.so
 lib/sane/libsane-genesys.so.1
-lib/sane/libsane-genesys.so.1.0.28
+lib/sane/libsane-genesys.so.%%SOVERSION%%
 %%GPHOTO%%lib/sane/libsane-gphoto2.so
 %%GPHOTO%%lib/sane/libsane-gphoto2.so.1
-%%GPHOTO%%lib/sane/libsane-gphoto2.so.1.0.28
+%%GPHOTO%%lib/sane/libsane-gphoto2.so.%%SOVERSION%%
 lib/sane/libsane-gt68xx.so
 lib/sane/libsane-gt68xx.so.1
-lib/sane/libsane-gt68xx.so.1.0.28
+lib/sane/libsane-gt68xx.so.%%SOVERSION%%
 lib/sane/libsane-hp.so
 lib/sane/libsane-hp.so.1
-lib/sane/libsane-hp.so.1.0.28
+lib/sane/libsane-hp.so.%%SOVERSION%%
 lib/sane/libsane-hp3500.so
 lib/sane/libsane-hp3500.so.1
-lib/sane/libsane-hp3500.so.1.0.28
+lib/sane/libsane-hp3500.so.%%SOVERSION%%
 lib/sane/libsane-hp3900.so
 lib/sane/libsane-hp3900.so.1
-lib/sane/libsane-hp3900.so.1.0.28
+lib/sane/libsane-hp3900.so.%%SOVERSION%%
 lib/sane/libsane-hp4200.so
 lib/sane/libsane-hp4200.so.1
-lib/sane/libsane-hp4200.so.1.0.28
+lib/sane/libsane-hp4200.so.%%SOVERSION%%
 lib/sane/libsane-hp5400.so
 lib/sane/libsane-hp5400.so.1
-lib/sane/libsane-hp5400.so.1.0.28
+lib/sane/libsane-hp5400.so.%%SOVERSION%%
 lib/sane/libsane-hp5590.so
 lib/sane/libsane-hp5590.so.1
-lib/sane/libsane-hp5590.so.1.0.28
+lib/sane/libsane-hp5590.so.%%SOVERSION%%
 lib/sane/libsane-hpljm1005.so
 lib/sane/libsane-hpljm1005.so.1
-lib/sane/libsane-hpljm1005.so.1.0.28
+lib/sane/libsane-hpljm1005.so.%%SOVERSION%%
 %%IEEE1284%%lib/sane/libsane-hpsj5s.so
 %%IEEE1284%%lib/sane/libsane-hpsj5s.so.1
-%%IEEE1284%%lib/sane/libsane-hpsj5s.so.1.0.28
+%%IEEE1284%%lib/sane/libsane-hpsj5s.so.%%SOVERSION%%
 lib/sane/libsane-hs2p.so
 lib/sane/libsane-hs2p.so.1
-lib/sane/libsane-hs2p.so.1.0.28
+lib/sane/libsane-hs2p.so.%%SOVERSION%%
 lib/sane/libsane-ibm.so
 lib/sane/libsane-ibm.so.1
-lib/sane/libsane-ibm.so.1.0.28
+lib/sane/libsane-ibm.so.%%SOVERSION%%
 lib/sane/libsane-kodak.so
 lib/sane/libsane-kodak.so.1
-lib/sane/libsane-kodak.so.1.0.28
+lib/sane/libsane-kodak.so.%%SOVERSION%%
 lib/sane/libsane-kodakaio.so
 lib/sane/libsane-kodakaio.so.1
-lib/sane/libsane-kodakaio.so.1.0.28
+lib/sane/libsane-kodakaio.so.%%SOVERSION%%
 lib/sane/libsane-kvs1025.so
 lib/sane/libsane-kvs1025.so.1
-lib/sane/libsane-kvs1025.so.1.0.28
+lib/sane/libsane-kvs1025.so.%%SOVERSION%%
 lib/sane/libsane-kvs20xx.so
 lib/sane/libsane-kvs20xx.so.1
-lib/sane/libsane-kvs20xx.so.1.0.28
+lib/sane/libsane-kvs20xx.so.%%SOVERSION%%
 lib/sane/libsane-kvs40xx.so
 lib/sane/libsane-kvs40xx.so.1
-lib/sane/libsane-kvs40xx.so.1.0.28
+lib/sane/libsane-kvs40xx.so.%%SOVERSION%%
 lib/sane/libsane-leo.so
 lib/sane/libsane-leo.so.1
-lib/sane/libsane-leo.so.1.0.28
+lib/sane/libsane-leo.so.%%SOVERSION%%
 lib/sane/libsane-lexmark.so
 lib/sane/libsane-lexmark.so.1
-lib/sane/libsane-lexmark.so.1.0.28
+lib/sane/libsane-lexmark.so.%%SOVERSION%%
 lib/sane/libsane-ma1509.so
 lib/sane/libsane-ma1509.so.1
-lib/sane/libsane-ma1509.so.1.0.28
+lib/sane/libsane-ma1509.so.%%SOVERSION%%
 lib/sane/libsane-magicolor.so
 lib/sane/libsane-magicolor.so.1
-lib/sane/libsane-magicolor.so.1.0.28
+lib/sane/libsane-magicolor.so.%%SOVERSION%%
 lib/sane/libsane-matsushita.so
 lib/sane/libsane-matsushita.so.1
-lib/sane/libsane-matsushita.so.1.0.28
+lib/sane/libsane-matsushita.so.%%SOVERSION%%
 lib/sane/libsane-microtek.so
 lib/sane/libsane-microtek.so.1
-lib/sane/libsane-microtek.so.1.0.28
+lib/sane/libsane-microtek.so.%%SOVERSION%%
 lib/sane/libsane-microtek2.so
 lib/sane/libsane-microtek2.so.1
-lib/sane/libsane-microtek2.so.1.0.28
+lib/sane/libsane-microtek2.so.%%SOVERSION%%
 lib/sane/libsane-mustek.so
 lib/sane/libsane-mustek.so.1
-lib/sane/libsane-mustek.so.1.0.28
+lib/sane/libsane-mustek.so.%%SOVERSION%%
 %%IEEE1284%%lib/sane/libsane-mustek_pp.so
 %%IEEE1284%%lib/sane/libsane-mustek_pp.so.1
-%%IEEE1284%%lib/sane/libsane-mustek_pp.so.1.0.28
+%%IEEE1284%%lib/sane/libsane-mustek_pp.so.%%SOVERSION%%
 lib/sane/libsane-mustek_usb.so
 lib/sane/libsane-mustek_usb.so.1
-lib/sane/libsane-mustek_usb.so.1.0.28
+lib/sane/libsane-mustek_usb.so.%%SOVERSION%%
 lib/sane/libsane-mustek_usb2.so
 lib/sane/libsane-mustek_usb2.so.1
-lib/sane/libsane-mustek_usb2.so.1.0.28
+lib/sane/libsane-mustek_usb2.so.%%SOVERSION%%
 lib/sane/libsane-nec.so
 lib/sane/libsane-nec.so.1
-lib/sane/libsane-nec.so.1.0.28
+lib/sane/libsane-nec.so.%%SOVERSION%%
 lib/sane/libsane-net.so
 lib/sane/libsane-net.so.1
-lib/sane/libsane-net.so.1.0.28
+lib/sane/libsane-net.so.%%SOVERSION%%
 lib/sane/libsane-niash.so
 lib/sane/libsane-niash.so.1
-lib/sane/libsane-niash.so.1.0.28
+lib/sane/libsane-niash.so.%%SOVERSION%%
 lib/sane/libsane-p5.so
 lib/sane/libsane-p5.so.1
-lib/sane/libsane-p5.so.1.0.28
+lib/sane/libsane-p5.so.%%SOVERSION%%
 lib/sane/libsane-pie.so
 lib/sane/libsane-pie.so.1
-lib/sane/libsane-pie.so.1.0.28
+lib/sane/libsane-pie.so.%%SOVERSION%%
 lib/sane/libsane-pieusb.so
 lib/sane/libsane-pieusb.so.1
-lib/sane/libsane-pieusb.so.1.0.28
+lib/sane/libsane-pieusb.so.%%SOVERSION%%
 lib/sane/libsane-pixma.so
 lib/sane/libsane-pixma.so.1
-lib/sane/libsane-pixma.so.1.0.28
+lib/sane/libsane-pixma.so.%%SOVERSION%%
 lib/sane/libsane-plustek.so
 lib/sane/libsane-plustek.so.1
-lib/sane/libsane-plustek.so.1.0.28
+lib/sane/libsane-plustek.so.%%SOVERSION%%
 lib/sane/libsane-plustek_pp.so
 lib/sane/libsane-plustek_pp.so.1
-lib/sane/libsane-plustek_pp.so.1.0.28
+lib/sane/libsane-plustek_pp.so.%%SOVERSION%%
 lib/sane/libsane-ricoh.so
 lib/sane/libsane-ricoh.so.1
-lib/sane/libsane-ricoh.so.1.0.28
+lib/sane/libsane-ricoh.so.%%SOVERSION%%
 lib/sane/libsane-ricoh2.so
 lib/sane/libsane-ricoh2.so.1
-lib/sane/libsane-ricoh2.so.1.0.28
+lib/sane/libsane-ricoh2.so.%%SOVERSION%%
 lib/sane/libsane-rts8891.so
 lib/sane/libsane-rts8891.so.1
-lib/sane/libsane-rts8891.so.1.0.28
+lib/sane/libsane-rts8891.so.%%SOVERSION%%
 lib/sane/libsane-s9036.so
 lib/sane/libsane-s9036.so.1
-lib/sane/libsane-s9036.so.1.0.28
+lib/sane/libsane-s9036.so.%%SOVERSION%%
 lib/sane/libsane-sceptre.so
 lib/sane/libsane-sceptre.so.1
-lib/sane/libsane-sceptre.so.1.0.28
+lib/sane/libsane-sceptre.so.%%SOVERSION%%
 lib/sane/libsane-sharp.so
 lib/sane/libsane-sharp.so.1
-lib/sane/libsane-sharp.so.1.0.28
+lib/sane/libsane-sharp.so.%%SOVERSION%%
 lib/sane/libsane-sm3600.so
 lib/sane/libsane-sm3600.so.1
-lib/sane/libsane-sm3600.so.1.0.28
+lib/sane/libsane-sm3600.so.%%SOVERSION%%
 lib/sane/libsane-sm3840.so
 lib/sane/libsane-sm3840.so.1
-lib/sane/libsane-sm3840.so.1.0.28
+lib/sane/libsane-sm3840.so.%%SOVERSION%%
 lib/sane/libsane-snapscan.so
 lib/sane/libsane-snapscan.so.1
-lib/sane/libsane-snapscan.so.1.0.28
+lib/sane/libsane-snapscan.so.%%SOVERSION%%
 lib/sane/libsane-sp15c.so
 lib/sane/libsane-sp15c.so.1
-lib/sane/libsane-sp15c.so.1.0.28
+lib/sane/libsane-sp15c.so.%%SOVERSION%%
 lib/sane/libsane-st400.so
 lib/sane/libsane-st400.so.1
-lib/sane/libsane-st400.so.1.0.28
+lib/sane/libsane-st400.so.%%SOVERSION%%
 lib/sane/libsane-stv680.so
 lib/sane/libsane-stv680.so.1
-lib/sane/libsane-stv680.so.1.0.28
+lib/sane/libsane-stv680.so.%%SOVERSION%%
 lib/sane/libsane-tamarack.so
 lib/sane/libsane-tamarack.so.1
-lib/sane/libsane-tamarack.so.1.0.28
+lib/sane/libsane-tamarack.so.%%SOVERSION%%
 lib/sane/libsane-teco1.so
 lib/sane/libsane-teco1.so.1
-lib/sane/libsane-teco1.so.1.0.28
+lib/sane/libsane-teco1.so.%%SOVERSION%%
 lib/sane/libsane-teco2.so
 lib/sane/libsane-teco2.so.1
-lib/sane/libsane-teco2.so.1.0.28
+lib/sane/libsane-teco2.so.%%SOVERSION%%
 lib/sane/libsane-teco3.so
 lib/sane/libsane-teco3.so.1
-lib/sane/libsane-teco3.so.1.0.28
+lib/sane/libsane-teco3.so.%%SOVERSION%%
 lib/sane/libsane-test.so
 lib/sane/libsane-test.so.1
-lib/sane/libsane-test.so.1.0.28
+lib/sane/libsane-test.so.%%SOVERSION%%
 lib/sane/libsane-u12.so
 lib/sane/libsane-u12.so.1
-lib/sane/libsane-u12.so.1.0.28
+lib/sane/libsane-u12.so.%%SOVERSION%%
 lib/sane/libsane-umax.so
 lib/sane/libsane-umax.so.1
-lib/sane/libsane-umax.so.1.0.28
+lib/sane/libsane-umax.so.%%SOVERSION%%
 lib/sane/libsane-umax1220u.so
 lib/sane/libsane-umax1220u.so.1
-lib/sane/libsane-umax1220u.so.1.0.28
+lib/sane/libsane-umax1220u.so.%%SOVERSION%%
 lib/sane/libsane-umax_pp.so
 lib/sane/libsane-umax_pp.so.1
-lib/sane/libsane-umax_pp.so.1.0.28
+lib/sane/libsane-umax_pp.so.%%SOVERSION%%
 %%V4L%%lib/sane/libsane-v4l.so
 %%V4L%%lib/sane/libsane-v4l.so.1
-%%V4L%%lib/sane/libsane-v4l.so.1.0.28
+%%V4L%%lib/sane/libsane-v4l.so.%%SOVERSION%%
 lib/sane/libsane-xerox_mfp.so
 lib/sane/libsane-xerox_mfp.so.1
-lib/sane/libsane-xerox_mfp.so.1.0.28
+lib/sane/libsane-xerox_mfp.so.%%SOVERSION%%
 libdata/pkgconfig/sane-backends.pc
 man/man1/gamma4scanimage.1.gz
 man/man1/sane-config.1.gz
@@ -381,6 +385,7 @@ man/man5/sane-epjitsu.5.gz
 man/man5/sane-epson.5.gz
 man/man5/sane-epson2.5.gz
 man/man5/sane-epsonds.5.gz
+%%AVAHI%%man/man5/sane-escl.5.gz
 man/man5/sane-fujitsu.5.gz
 man/man5/sane-genesys.5.gz
 %%GPHOTO%%man/man5/sane-gphoto2.5.gz
@@ -421,6 +426,7 @@ man/man5/sane-pixma.5.gz
 man/man5/sane-plustek.5.gz
 man/man5/sane-plustek_pp.5.gz
 man/man5/sane-ricoh.5.gz
+man/man5/sane-ricoh2.5.gz
 man/man5/sane-rts8891.5.gz
 man/man5/sane-s9036.5.gz
 man/man5/sane-sceptre.5.gz
@@ -449,6 +455,35 @@ man/man8/saned.8.gz
 sbin/saned
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.0
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.1
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.10
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.11
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.12
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.13
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.14
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.15
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.16
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.17
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.18
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.19
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.2
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.20
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.21
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.22
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.23
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.24
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.25
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.27
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.28
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.3
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.4
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.5
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.6
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.7
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.8
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.9
+@comment %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/PROBLEMS
diff --git a/graphics/seexpr/Makefile b/graphics/seexpr/Makefile
new file mode 100644
index 00000000000..d64b9e9c134
--- /dev/null
+++ b/graphics/seexpr/Makefile
@@ -0,0 +1,52 @@
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	seexpr
+PORTVERSION=	3.0.1
+DISTVERSIONPREFIX=	v
+PORTREVISION=	1
+CATEGORIES=	graphics math
+
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	Embeddable expression evaluation language
+
+LICENSE=	APACHE20
+
+LIB_DEPENDS=	libpng.so:graphics/png
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	wdas
+GH_PROJECT=	SeExpr
+
+USES=		bison cmake compiler:c++11-lang gl qt:5
+USE_GL=		gl glu
+USE_LDCONFIG=	yes
+USE_QT=		buildtools_build qmake_build core gui opengl widgets
+
+MAKE_JOBS_UNSAFE=	yes	# https://github.com/wdas/seexpr/issues/40
+
+# XXX: fix the build errors and convert to OPTIONs
+CMAKE_ARGS=	-DENABLE_LLVM_BACKEND:BOOL=FALSE
+
+OPTIONS_DEFINE=	PYTHON
+OPTIONS_SUB=	yes
+
+PYTHON_LIB_DEPENDS=	${PY_BOOST}
+PYTHON_USES=		pyqt:5 python
+PYTHON_USE=		PYQT=core_build,sip_build,widgets_build
+PYTHON_CMAKE_ON=	-DPYQT_SIP_DIR:STRING=${PYQT_SIPDIR}
+PYTHON_CMAKE_OFF=	-DUSE_PYTHON:BOOL=FALSE
+
+.if ! ${MACHINE_CPU:Msse41}
+CMAKE_ARGS+=	-DENABLE_SSE4:BOOL=FALSE
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e '/<alloca\.h>/d' ${WRKSRC}/src/SeExpr2/Platform.h
+	@${REINPLACE_CMD} -e '/pkgconfig/s/share/libdata/' \
+		${WRKSRC}/CMakeLists.txt
+.if !defined(WITH_DEBUG)
+	@${REINPLACE_CMD} -e 's/-g //' ${WRKSRC}/CMakeLists.txt
+.endif
+
+.include <bsd.port.mk>
diff --git a/graphics/seexpr/distinfo b/graphics/seexpr/distinfo
new file mode 100644
index 00000000000..27bfefd9f19
--- /dev/null
+++ b/graphics/seexpr/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1570122938
+SHA256 (wdas-SeExpr-v3.0.1_GH0.tar.gz) = 1e4cd35e6d63bd3443e1bffe723dbae91334c2c94a84cc590ea8f1886f96f84e
+SIZE (wdas-SeExpr-v3.0.1_GH0.tar.gz) = 903297
diff --git a/graphics/seexpr/files/patch-src_SeExpr2_CMakeLists.txt b/graphics/seexpr/files/patch-src_SeExpr2_CMakeLists.txt
new file mode 100644
index 00000000000..1f03750bd46
--- /dev/null
+++ b/graphics/seexpr/files/patch-src_SeExpr2_CMakeLists.txt
@@ -0,0 +1,13 @@
+--- src/SeExpr2/CMakeLists.txt.orig	2019-10-03 17:15:38 UTC
++++ src/SeExpr2/CMakeLists.txt
+@@ -19,6 +19,10 @@ file(GLOB to_remove "ExprLLVMCodeGeneration.cpp")
+ list(REMOVE_ITEM io_cpp ${to_remove})
+ 
+ set_source_files_properties("ExprBuiltins.cpp" PROPERTIES COMPILE_DEFINITIONS "__STDC_LIMIT_MACROS")
++# XXX: avoid undefref to llvm::cfg::Update<llvm::BasicBlock*>::dump() const
++set_source_files_properties(
++    Expression.cpp ExprLLVMCodeGeneration.cpp
++    PROPERTIES COMPILE_DEFINITIONS NDEBUG)
+ 
+ # Uncomment below to print debug messages / performance stats
+ #add_definitions(-DSEEXPR_DEBUG)
diff --git a/graphics/seexpr/pkg-descr b/graphics/seexpr/pkg-descr
new file mode 100644
index 00000000000..57a3e4ca1ac
--- /dev/null
+++ b/graphics/seexpr/pkg-descr
@@ -0,0 +1,13 @@
+SeExpr is simple expression language that provided artistic control and
+customization to your software.  It can be used for procedural geometry
+synthesis, image synthesis, simulation control, and much more.
+
+Major features:
+
+  * Arithmetic expression of scalar/vector types
+  * Large library of built-in functions
+  * Extensible variables and functions (including with DSOs)
+  * Simple to embed in any program
+  * High-level UI components to manipulate and visualize expressions
+
+WWW: http://www.disneyanimation.com/technology/seexpr.html
diff --git a/graphics/seexpr/pkg-plist b/graphics/seexpr/pkg-plist
new file mode 100644
index 00000000000..c11a753c8b4
--- /dev/null
+++ b/graphics/seexpr/pkg-plist
@@ -0,0 +1,116 @@
+bin/asciiCalc2
+bin/asciiGraph2
+bin/imageEditor2
+bin/imageSynth2
+bin/imageSynthPaint3d2
+include/SeExpr2/Context.h
+include/SeExpr2/ContextUtils.h
+include/SeExpr2/Curve.h
+include/SeExpr2/Evaluator.h
+include/SeExpr2/ExprBuiltins.h
+include/SeExpr2/ExprConfig.h
+include/SeExpr2/ExprEnv.h
+include/SeExpr2/ExprFunc.h
+include/SeExpr2/ExprFuncStandard.h
+include/SeExpr2/ExprFuncX.h
+include/SeExpr2/ExprLLVM.h
+include/SeExpr2/ExprLLVMAll.h
+include/SeExpr2/ExprMultiExpr.h
+include/SeExpr2/ExprNode.h
+include/SeExpr2/ExprParser.h
+include/SeExpr2/ExprPatterns.h
+include/SeExpr2/ExprType.h
+include/SeExpr2/ExprWalker.h
+include/SeExpr2/Expression.h
+include/SeExpr2/Interpreter.h
+include/SeExpr2/Mutex.h
+include/SeExpr2/Noise.h
+include/SeExpr2/NoiseTables.h
+include/SeExpr2/Platform.h
+include/SeExpr2/SeContext.h
+include/SeExpr2/SeExprMacros.h
+include/SeExpr2/StringUtils.h
+include/SeExpr2/UI/BasicExpression.h
+include/SeExpr2/UI/ControlSpec.h
+include/SeExpr2/UI/Editable.h
+include/SeExpr2/UI/EditableExpression.h
+include/SeExpr2/UI/ExprBrowser.h
+include/SeExpr2/UI/ExprColorCurve.h
+include/SeExpr2/UI/ExprColorSwatch.h
+include/SeExpr2/UI/ExprCompletionModel.h
+include/SeExpr2/UI/ExprControl.h
+include/SeExpr2/UI/ExprControlCollection.h
+include/SeExpr2/UI/ExprCurve.h
+include/SeExpr2/UI/ExprDeepWater.h
+include/SeExpr2/UI/ExprDialog.h
+include/SeExpr2/UI/ExprEditor.h
+include/SeExpr2/UI/ExprFileDialog.h
+include/SeExpr2/UI/ExprGrapher2d.h
+include/SeExpr2/UI/ExprHelp.h
+include/SeExpr2/UI/ExprHighlighter.h
+include/SeExpr2/UI/ExprPopupDoc.h
+include/SeExpr2/UI/ExprShortEdit.h
+include/SeExpr2/UI/ExprSpecType.h
+include/SeExpr2/UI/generated/ExprSpecParser.tab.h
+include/SeExpr2/VarBlock.h
+include/SeExpr2/Vec.h
+include/SeExpr2/generated/ExprParser.tab.h
+include/SeExpr2/parser/ASTNode.h
+include/SeExpr2/parser/SeExprLex.h
+include/SeExpr2/parser/SeExprParse.h
+include/SeExpr2/seexpr2_export.h
+lib/libSeExpr2.so
+lib/libSeExpr2.so.2
+lib/libSeExpr2.so.2.0
+lib/libSeExpr2Editor.so
+lib/libSeExpr2Editor.so.2.0
+lib/libSeExpr2Editor.so.3
+libdata/pkgconfig/seexpr2.pc
+share/SeExpr2/demos/imageSynth/examples/111.se
+share/SeExpr2/demos/imageSynth/examples/fbm.se
+share/SeExpr2/demos/imageSynth/examples/noise.se
+share/SeExpr2/demos/imageSynth/examples/noisecolor1.se
+share/SeExpr2/demos/imageSynth/examples/noisecolor2.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/RemapShadowContribution.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/bark_eucalyptusColor.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/bark_eucalyptusDisp.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/blackToWhite.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/candycane.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/color_noise.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/dither_with_gamma.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/freakles.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/lines.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/rope_Basic.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/scaleTool.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/select_byColorDark.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/select_byThreshold.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/textureI_nstancerCircular.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/texture_Instancer.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/texture_Tiler.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/threads.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/threshold.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/uv_testPattern.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/wood_Nicks.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/xyz_colorNoise.se
+share/SeExpr2/demos/imageSynth/examples/raytrace.se
+share/SeExpr2/demos/imageSynth/examples/run.sh
+share/SeExpr2/demos/imageSynth/examples/sinc.se
+share/SeExpr2/demos/imageSynth/examples/test.se
+share/SeExpr2/expressions/fbm.se
+share/SeExpr2/expressions/noise.se
+share/SeExpr2/expressions/noisecolor1.se
+share/SeExpr2/expressions/noisecolor2.se
+share/SeExpr2/expressions/raytrace.se
+share/SeExpr2/expressions/sinc.se
+share/SeExpr2/utils/eval
+share/SeExpr2/utils/listVar
+share/cmake/SeExpr2/seexpr2-config.cmake
+share/cmake/SeExpr2/seexpr2-version.cmake
+share/test/SeExpr2/BlockTests
+share/test/SeExpr2/VarBlockExample
+share/test/SeExpr2/dirtSimple
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/SeExpr2/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/SeExpr2/expreditor2.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/SeExprPy/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/SeExprPy/core.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/SeExprPy/utils.py
diff --git a/graphics/svg2png/Makefile b/graphics/svg2png/Makefile
index d670ae58d3f..dd47a201ab6 100644
--- a/graphics/svg2png/Makefile
+++ b/graphics/svg2png/Makefile
@@ -11,15 +11,13 @@ MASTER_SITES=	http://cairographics.org/snapshots/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Render an SVG image to a PNG image (using cairo)
 
-.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
-BROKEN=		ld: error: /usr/local/lib/libsvg-cairo.so: undefined reference to atan2
-.endif
-
 LIB_DEPENDS=	libsvg-cairo.so:graphics/libsvg-cairo
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
 
+LDFLAGS+=	/usr/lib/libm.so # Was labeled broken when ${/usr/bin/ld:L:tA}==/usr/bin/ld.lld: ld: error: /usr/local/lib/libsvg-cairo.so: undefined reference to atan2
+
 PLIST_FILES=	bin/svg2png \
 		man/man1/svg2png.1.gz
 
diff --git a/graphics/wayland/Makefile b/graphics/wayland/Makefile
index 4e1ac5ff77b..e2374924ae9 100644
--- a/graphics/wayland/Makefile
+++ b/graphics/wayland/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wayland
-PORTVERSION=	1.17.0
+PORTVERSION=	1.18.0
 CATEGORIES=	graphics wayland
 MASTER_SITES=	https://wayland.freedesktop.org/releases/
 
@@ -23,7 +23,7 @@ USE_GNOME=	libxslt:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-documentation
-CONFIGURE_ENV=	ac_cv_func_posix_fallocate=no # EINVAL for many FS on 12.0
+CONFIGURE_ENV=	ac_cv_func_posix_fallocate=no # EINVAL on ZFS since FreeBSD 12.0
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/graphics/wayland/distinfo b/graphics/wayland/distinfo
index c325e56f656..bd1a71ff7d3 100644
--- a/graphics/wayland/distinfo
+++ b/graphics/wayland/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553129725
-SHA256 (wayland-1.17.0.tar.xz) = 72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4
-SIZE (wayland-1.17.0.tar.xz) = 437680
+TIMESTAMP = 1581464763
+SHA256 (wayland-1.18.0.tar.xz) = 4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d
+SIZE (wayland-1.18.0.tar.xz) = 453968
diff --git a/graphics/wayland/files/patch-Makefile.am b/graphics/wayland/files/patch-Makefile.am
index e13571de109..4b3988349a8 100644
--- a/graphics/wayland/files/patch-Makefile.am
+++ b/graphics/wayland/files/patch-Makefile.am
@@ -1,29 +1,29 @@
---- Makefile.am.orig	2019-03-21 00:55:25 UTC
+--- Makefile.am.orig	2020-02-11 23:46:03 UTC
 +++ Makefile.am
-@@ -71,7 +71,7 @@ nodist_include_HEADERS =			\
+@@ -73,7 +73,7 @@ nodist_include_HEADERS =			\
  	protocol/wayland-client-protocol.h
  
  libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread
--libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la -lrt -lm
-+libwayland_server_la_LIBADD = $(FFI_LIBS) $(EPOLLSHIM_LIBS) libwayland-private.la libwayland-util.la -lrt -lm
+-libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la $(RT_LIBS) -lm
++libwayland_server_la_LIBADD = $(FFI_LIBS) $(EPOLLSHIM_LIBS) libwayland-private.la libwayland-util.la $(RT_LIBS) -lm
  libwayland_server_la_LDFLAGS = -version-info 1:0:1
  libwayland_server_la_SOURCES =			\
  	src/wayland-server.c			\
-@@ -83,7 +83,7 @@ nodist_libwayland_server_la_SOURCES =		\
+@@ -85,7 +85,7 @@ nodist_libwayland_server_la_SOURCES =		\
  	protocol/wayland-protocol.c
  
  libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread
--libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la -lrt -lm
-+libwayland_client_la_LIBADD = $(FFI_LIBS) $(EPOLLSHIM_LIBS) libwayland-private.la libwayland-util.la -lrt -lm
+-libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la $(RT_LIBS) -lm
++libwayland_client_la_LIBADD = $(FFI_LIBS) $(EPOLLSHIM_LIBS) libwayland-private.la libwayland-util.la $(RT_LIBS) -lm
  libwayland_client_la_LDFLAGS = -version-info 3:0:3
  libwayland_client_la_SOURCES =			\
  	src/wayland-client.c
-@@ -227,7 +227,7 @@ libtest_runner_la_LIBADD =			\
+@@ -230,7 +230,7 @@ libtest_runner_la_LIBADD =			\
  	libwayland-client.la			\
  	libwayland-server.la			\
  	libtest-helpers.la			\
--	-lrt -ldl $(FFI_LIBS)
-+	-lrt $(DL_LIBS) $(FFI_LIBS) $(EPOLLSHIM_LIBS)
+-	$(RT_LIBS) $(DL_LIBS) $(FFI_LIBS)
++	$(RT_LIBS) $(DL_LIBS) $(FFI_LIBS) $(EPOLLSHIM_LIBS)
  
  array_test_SOURCES = tests/array-test.c
  array_test_LDADD = libtest-runner.la
diff --git a/graphics/wayland/files/patch-configure.ac b/graphics/wayland/files/patch-configure.ac
index 7139fff12da..1bf088c8c0c 100644
--- a/graphics/wayland/files/patch-configure.ac
+++ b/graphics/wayland/files/patch-configure.ac
@@ -1,8 +1,8 @@
---- configure.ac.orig	2018-08-24 18:04:36 UTC
+--- configure.ac.orig	2020-02-11 23:46:03 UTC
 +++ configure.ac
-@@ -65,6 +65,25 @@ AC_SUBST(GCC_CFLAGS)
- AC_CHECK_HEADERS([sys/prctl.h])
- AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl])
+@@ -71,6 +71,25 @@ WESTON_SEARCH_LIBS([DL], [dl], [dlsym])
+ # OpenBSD doesn't have librt, but it has its functions in libc
+ WESTON_SEARCH_LIBS([RT], [rt], [clock_gettime])
  
 +AC_CHECK_HEADERS([sys/signalfd.h sys/timerfd.h])
 +
@@ -26,7 +26,7 @@
  AC_ARG_ENABLE([libraries],
  	      [AC_HELP_STRING([--disable-libraries],
  			      [Disable compilation of wayland libraries])],
-@@ -100,16 +119,20 @@ AC_SUBST([ICONDIR])
+@@ -106,16 +125,20 @@ AC_SUBST([ICONDIR])
  
  if test "x$enable_libraries" = "xyes"; then
  	PKG_CHECK_MODULES(FFI, [libffi])
diff --git a/graphics/wayland/files/patch-cursor_os-compatibility.c b/graphics/wayland/files/patch-cursor_os-compatibility.c
index 667dd6a84b8..f3e95d4411f 100644
--- a/graphics/wayland/files/patch-cursor_os-compatibility.c
+++ b/graphics/wayland/files/patch-cursor_os-compatibility.c
@@ -1,60 +1,21 @@
---- cursor/os-compatibility.c.orig	2019-03-21 00:55:25 UTC
+--- cursor/os-compatibility.c.orig	2020-02-11 23:46:03 UTC
 +++ cursor/os-compatibility.c
-@@ -23,6 +23,10 @@
-  * SOFTWARE.
-  */
+@@ -34,7 +34,7 @@
+ #include <string.h>
+ #include <stdlib.h>
  
-+#ifdef __FreeBSD__
-+#include <sys/mman.h>
-+#endif
-+
- #define _GNU_SOURCE
- 
- #include <sys/types.h>
-@@ -59,6 +63,7 @@ err:
- }
+-#ifdef HAVE_MEMFD_CREATE
++#if defined(HAVE_MEMFD_CREATE) || defined(__FreeBSD__)
+ #include <sys/mman.h>
  #endif
  
-+#ifndef __FreeBSD__
- static int
- create_tmpfile_cloexec(char *tmpname)
- {
-@@ -78,6 +83,7 @@ create_tmpfile_cloexec(char *tmpname)
- 
- 	return fd;
- }
-+#endif
- 
- /*
-  * Create a new, unique, anonymous file of the given size, and
-@@ -103,11 +109,14 @@ create_tmpfile_cloexec(char *tmpname)
- int
- os_create_anonymous_file(off_t size)
- {
-+	int fd;
-+	int ret;
-+#ifdef __FreeBSD__
+@@ -132,6 +132,9 @@ os_create_anonymous_file(off_t size)
+ 		 */
+ 		fcntl(fd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_SEAL);
+ 	} else
++#elif defined(__FreeBSD__)
 +	fd = shm_open(SHM_ANON, O_CREAT | O_RDWR | O_CLOEXEC, 0600); // shm_open is always CLOEXEC
-+#else
- 	static const char template[] = "/wayland-cursor-shared-XXXXXX";
- 	const char *path;
- 	char *name;
--	int fd;
--	int ret;
- 
- 	path = getenv("XDG_RUNTIME_DIR");
- 	if (!path) {
-@@ -125,11 +134,12 @@ os_create_anonymous_file(off_t size)
- 	fd = create_tmpfile_cloexec(name);
- 
- 	free(name);
-+#endif /* __FreeBSD__ */
- 
- 	if (fd < 0)
- 		return -1;
- 
--#ifdef HAVE_POSIX_FALLOCATE
-+#if defined(HAVE_POSIX_FALLOCATE) && !defined(__FreeBSD__)
- 	ret = posix_fallocate(fd, 0, size);
- 	if (ret != 0) {
- 		close(fd);
++	if (fd < 0)
+ #endif
+ 	{
+ 		path = getenv("XDG_RUNTIME_DIR");
diff --git a/graphics/wayland/files/patch-src_event-loop.c b/graphics/wayland/files/patch-src_event-loop.c
new file mode 100644
index 00000000000..b8bba185a85
--- /dev/null
+++ b/graphics/wayland/files/patch-src_event-loop.c
@@ -0,0 +1,562 @@
+Temporarily revert https://gitlab.freedesktop.org/wayland/wayland/commit/60a8d29ad852
+until https://github.com/jiixyj/epoll-shim/issues/15 is fixed
+
+--- src/event-loop.c.orig	2020-02-11 23:46:03 UTC
++++ src/event-loop.c
+@@ -23,7 +23,6 @@
+  * SOFTWARE.
+  */
+ 
+-#include <assert.h>
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <errno.h>
+@@ -46,27 +45,6 @@
+ 
+ /** \cond INTERNAL */
+ 
+-#define TIMER_REMOVED -2
+-
+-struct wl_event_loop;
+-struct wl_event_source_interface;
+-struct wl_event_source_timer;
+-
+-struct wl_event_source {
+-	struct wl_event_source_interface *interface;
+-	struct wl_event_loop *loop;
+-	struct wl_list link;
+-	void *data;
+-	int fd;
+-};
+-
+-struct wl_timer_heap {
+-	struct wl_event_source base;
+-	/* pointers to the user-visible event sources */
+-	struct wl_event_source_timer **data;
+-	int space, active, count;
+-};
+-
+ struct wl_event_loop {
+ 	int epoll_fd;
+ 	struct wl_list check_list;
+@@ -74,8 +52,6 @@ struct wl_event_loop {
+ 	struct wl_list destroy_list;
+ 
+ 	struct wl_signal destroy_signal;
+-
+-	struct wl_timer_heap timers;
+ };
+ 
+ struct wl_event_source_interface {
+@@ -83,6 +59,13 @@ struct wl_event_source_interface {
+ 			struct epoll_event *ep);
+ };
+ 
++struct wl_event_source {
++	struct wl_event_source_interface *interface;
++	struct wl_event_loop *loop;
++	struct wl_list link;
++	void *data;
++	int fd;
++};
+ 
+ struct wl_event_source_fd {
+ 	struct wl_event_source base;
+@@ -232,319 +215,31 @@ wl_event_source_fd_update(struct wl_event_source *sour
+ struct wl_event_source_timer {
+ 	struct wl_event_source base;
+ 	wl_event_loop_timer_func_t func;
+-	struct wl_event_source_timer *next_due;
+-	struct timespec deadline;
+-	int heap_idx;
+ };
+ 
+-static int
+-noop_dispatch(struct wl_event_source *source,
+-	      struct epoll_event *ep) {
+-	return 0;
+-}
++/** \endcond */
+ 
+-struct wl_event_source_interface timer_heap_source_interface = {
+-	noop_dispatch,
+-};
+-
+-static bool
+-time_lt(struct timespec ta, struct timespec tb)
+-{
+-	if (ta.tv_sec != tb.tv_sec) {
+-		return ta.tv_sec < tb.tv_sec;
+-	}
+-	return ta.tv_nsec < tb.tv_nsec;
+-}
+-
+ static int
+-set_timer(int timerfd, struct timespec deadline) {
+-	struct itimerspec its;
+-
+-	its.it_interval.tv_sec = 0;
+-	its.it_interval.tv_nsec = 0;
+-	its.it_value = deadline;
+-	return timerfd_settime(timerfd, TFD_TIMER_ABSTIME, &its, NULL);
+-}
+-
+-static int
+-clear_timer(int timerfd)
+-{
+-	struct itimerspec its;
+-
+-	its.it_interval.tv_sec = 0;
+-	its.it_interval.tv_nsec = 0;
+-	its.it_value.tv_sec = 0;
+-	its.it_value.tv_nsec = 0;
+-	return timerfd_settime(timerfd, 0, &its, NULL);
+-}
+-
+-static void
+-wl_timer_heap_init(struct wl_timer_heap *timers, struct wl_event_loop *loop)
+-{
+-	timers->base.fd = -1;
+-	timers->base.data = NULL;
+-	wl_list_init(&timers->base.link);
+-	timers->base.interface = &timer_heap_source_interface;
+-	timers->base.loop = loop;
+-
+-	loop->timers.data = NULL;
+-	loop->timers.active = 0;
+-	loop->timers.space = 0;
+-	loop->timers.count = 0;
+-}
+-
+-static void
+-wl_timer_heap_release(struct wl_timer_heap *timers)
+-{
+-	if (timers->base.fd != -1) {
+-		close(timers->base.fd);
+-	}
+-	free(timers->data);
+-}
+-
+-static int
+-wl_timer_heap_ensure_timerfd(struct wl_timer_heap *timers)
+-{
+-	struct epoll_event ep;
+-	int timer_fd;
+-
+-	if (timers->base.fd != -1)
+-		return 0;
+-
+-	memset(&ep, 0, sizeof ep);
+-	ep.events = EPOLLIN;
+-	ep.data.ptr = timers;
+-
+-	timer_fd = timerfd_create(CLOCK_MONOTONIC,
+-				  TFD_CLOEXEC | TFD_NONBLOCK);
+-	if (timer_fd < 0)
+-		return -1;
+-
+-	if (epoll_ctl(timers->base.loop->epoll_fd,
+-		      EPOLL_CTL_ADD, timer_fd, &ep) < 0) {
+-		close(timer_fd);
+-		return -1;
+-	}
+-
+-	timers->base.fd = timer_fd;
+-	return 0;
+-}
+-
+-static int
+-wl_timer_heap_reserve(struct wl_timer_heap *timers)
+-{
+-	struct wl_event_source_timer **n;
+-	int new_space;
+-
+-	if (timers->count + 1 > timers->space) {
+-		new_space = timers->space >= 8 ? timers->space * 2 : 8;
+-		n = realloc(timers->data, (size_t)new_space * sizeof(*n));
+-		if (!n) {
+-			wl_log("Allocation failure when expanding timer list");
+-			return -1;
+-		}
+-		timers->data = n;
+-		timers->space = new_space;
+-	}
+-
+-	timers->count++;
+-	return 0;
+-}
+-
+-static void
+-wl_timer_heap_unreserve(struct wl_timer_heap *timers)
+-{
+-	struct wl_event_source_timer **n;
+-
+-	timers->count--;
+-
+-	if (timers->space >= 16 && timers->space >= 4 * timers->count) {
+-		n = realloc(timers->data, (size_t)timers->space / 2 * sizeof(*n));
+-		if (!n) {
+-			wl_log("Reallocation failure when shrinking timer list");
+-			return;
+-		}
+-		timers->data = n;
+-		timers->space = timers->space / 2;
+-	}
+-}
+-
+-static int
+-heap_set(struct wl_event_source_timer **data,
+-	 struct wl_event_source_timer *a,
+-	 int idx)
+-{
+-	int tmp;
+-
+-	tmp = a->heap_idx;
+-	a->heap_idx = idx;
+-	data[a->heap_idx] = a;
+-
+-	return tmp;
+-}
+-
+-static void
+-heap_sift_down(struct wl_event_source_timer **data,
+-	       int num_active,
+-	       struct wl_event_source_timer *source)
+-{
+-	struct wl_event_source_timer *child, *other_child;
+-	int cursor_idx;
+-	struct timespec key;
+-
+-	cursor_idx = source->heap_idx;
+-	key = source->deadline;
+-	while (1) {
+-		int lchild_idx = cursor_idx * 2 + 1;
+-
+-		if (lchild_idx >= num_active) {
+-			break;
+-		}
+-
+-		child = data[lchild_idx];
+-		if (lchild_idx + 1 < num_active) {
+-			other_child = data[lchild_idx + 1];
+-			if (time_lt(other_child->deadline, child->deadline))
+-				child = other_child;
+-		}
+-
+-		if (time_lt(child->deadline, key))
+-			cursor_idx = heap_set(data, child, cursor_idx);
+-		else
+-			break;
+-	}
+-
+-	heap_set(data, source, cursor_idx);
+-}
+-
+-static void
+-heap_sift_up(struct wl_event_source_timer **data,
+-	     struct wl_event_source_timer *source)
+-{
+-	int cursor_idx;
+-	struct timespec key;
+-
+-	cursor_idx = source->heap_idx;
+-	key = source->deadline;
+-	while (cursor_idx > 0) {
+-		struct wl_event_source_timer *parent =
+-			data[(cursor_idx - 1) / 2];
+-
+-		if (time_lt(key, parent->deadline))
+-			cursor_idx = heap_set(data, parent, cursor_idx);
+-		else
+-			break;
+-	}
+-	heap_set(data, source, cursor_idx);
+-}
+-
+-/* requires timer be armed */
+-static void
+-wl_timer_heap_disarm(struct wl_timer_heap *timers,
+-		     struct wl_event_source_timer *source)
+-{
+-	struct wl_event_source_timer *last_end_evt;
+-	int old_source_idx;
+-
+-	assert(source->heap_idx >= 0);
+-
+-	old_source_idx = source->heap_idx;
+-	source->heap_idx = -1;
+-	source->deadline.tv_sec = 0;
+-	source->deadline.tv_nsec = 0;
+-
+-	last_end_evt = timers->data[timers->active - 1];
+-	timers->data[timers->active - 1] = NULL;
+-	timers->active--;
+-
+-	if (old_source_idx == timers->active)
+-		return;
+-
+-	timers->data[old_source_idx] = last_end_evt;
+-	last_end_evt->heap_idx = old_source_idx;
+-
+-	/* Move the displaced (active) element to its proper place.
+-	 * Only one of sift-down and sift-up will have any effect */
+-	heap_sift_down(timers->data, timers->active, last_end_evt);
+-	heap_sift_up(timers->data, last_end_evt);
+-}
+-
+-/* requires timer be disarmed */
+-static void
+-wl_timer_heap_arm(struct wl_timer_heap *timers,
+-		  struct wl_event_source_timer *source,
+-		  struct timespec deadline)
+-{
+-	assert(source->heap_idx == -1);
+-
+-	source->deadline = deadline;
+-	timers->data[timers->active] = source;
+-	source->heap_idx = timers->active;
+-	timers->active++;
+-	heap_sift_up(timers->data, source);
+-}
+-
+-
+-static int
+-wl_timer_heap_dispatch(struct wl_timer_heap *timers)
+-{
+-	struct timespec now;
+-	struct wl_event_source_timer *root;
+-	struct wl_event_source_timer *list_cursor = NULL, *list_tail = NULL;
+-
+-	clock_gettime(CLOCK_MONOTONIC, &now);
+-
+-	while (timers->active > 0) {
+-		root = timers->data[0];
+-		if (time_lt(now, root->deadline))
+-			break;
+-
+-		wl_timer_heap_disarm(timers, root);
+-
+-		if (list_cursor == NULL)
+-			list_cursor = root;
+-		else
+-			list_tail->next_due = root;
+-		list_tail = root;
+-	}
+-	if (list_tail)
+-		list_tail->next_due = NULL;
+-
+-	if (timers->active > 0) {
+-		if (set_timer(timers->base.fd, timers->data[0]->deadline) < 0)
+-			return -1;
+-	} else {
+-		if (clear_timer(timers->base.fd) < 0)
+-			return -1;
+-	}
+-
+-	/* Execute precisely the functions for events before `now`, in order.
+-	 * Because wl_event_loop_dispatch ignores return codes, do the same
+-	 * here as well */
+-	for (; list_cursor; list_cursor = list_cursor->next_due) {
+-		if (list_cursor->base.fd != TIMER_REMOVED)
+-			list_cursor->func(list_cursor->base.data);
+-	}
+-
+-	return 0;
+-}
+-
+-static int
+ wl_event_source_timer_dispatch(struct wl_event_source *source,
+ 			       struct epoll_event *ep)
+ {
+-	struct wl_event_source_timer *timer;
++	struct wl_event_source_timer *timer_source =
++		(struct wl_event_source_timer *) source;
++	uint64_t expires;
++	int len;
+ 
+-	timer = wl_container_of(source, timer, base);
+-	return timer->func(timer->base.data);
++	len = read(source->fd, &expires, sizeof expires);
++	if (!(len == -1 && errno == EAGAIN) && len != sizeof expires)
++		/* Is there anything we can do here?  Will this ever happen? */
++		wl_log("timerfd read error: %s\n", strerror(errno));
++
++	return timer_source->func(timer_source->base.data);
+ }
+ 
+ struct wl_event_source_interface timer_source_interface = {
+ 	wl_event_source_timer_dispatch,
+ };
+ 
+-/** \endcond */
+-
+ /** Create a timer event source
+  *
+  * \param loop The event loop that will process the new source.
+@@ -565,30 +260,16 @@ wl_event_loop_add_timer(struct wl_event_loop *loop,
+ {
+ 	struct wl_event_source_timer *source;
+ 
+-	if (wl_timer_heap_ensure_timerfd(&loop->timers) < 0)
+-		return NULL;
+-
+ 	source = malloc(sizeof *source);
+ 	if (source == NULL)
+ 		return NULL;
+ 
+ 	source->base.interface = &timer_source_interface;
+-	source->base.fd = -1;
++	source->base.fd = timerfd_create(CLOCK_MONOTONIC,
++					 TFD_CLOEXEC | TFD_NONBLOCK);
+ 	source->func = func;
+-	source->base.loop = loop;
+-	source->base.data = data;
+-	wl_list_init(&source->base.link);
+-	source->next_due = NULL;
+-	source->deadline.tv_sec = 0;
+-	source->deadline.tv_nsec = 0;
+-	source->heap_idx = -1;
+ 
+-	if (wl_timer_heap_reserve(&loop->timers) < 0) {
+-		free(source);
+-		return NULL;
+-	}
+-
+-	return &source->base;
++	return add_source(loop, &source->base, WL_EVENT_READABLE, data);
+ }
+ 
+ /** Arm or disarm a timer
+@@ -610,51 +291,15 @@ wl_event_loop_add_timer(struct wl_event_loop *loop,
+ WL_EXPORT int
+ wl_event_source_timer_update(struct wl_event_source *source, int ms_delay)
+ {
+-	struct wl_event_source_timer *tsource =
+-		wl_container_of(source, tsource, base);
+-	struct wl_timer_heap *timers = &tsource->base.loop->timers;
++	struct itimerspec its;
+ 
+-	if (ms_delay > 0) {
+-		struct timespec deadline;
++	its.it_interval.tv_sec = 0;
++	its.it_interval.tv_nsec = 0;
++	its.it_value.tv_sec = ms_delay / 1000;
++	its.it_value.tv_nsec = (ms_delay % 1000) * 1000 * 1000;
++	if (timerfd_settime(source->fd, 0, &its, NULL) < 0)
++		return -1;
+ 
+-		clock_gettime(CLOCK_MONOTONIC, &deadline);
+-
+-		deadline.tv_nsec += (ms_delay % 1000) * 1000000L;
+-		deadline.tv_sec += ms_delay / 1000;
+-		if (deadline.tv_nsec >= 1000000000L) {
+-			deadline.tv_nsec -= 1000000000L;
+-			deadline.tv_sec += 1;
+-		}
+-
+-		if (tsource->heap_idx == -1) {
+-			wl_timer_heap_arm(timers, tsource, deadline);
+-		} else if (time_lt(deadline, tsource->deadline)) {
+-			tsource->deadline = deadline;
+-			heap_sift_up(timers->data, tsource);
+-		} else {
+-			tsource->deadline = deadline;
+-			heap_sift_down(timers->data, timers->active, tsource);
+-		}
+-
+-		if (tsource->heap_idx == 0) {
+-			/* Only update the timerfd if the new deadline is
+-			 * the earliest */
+-			if (set_timer(timers->base.fd, deadline) < 0)
+-				return -1;
+-		}
+-	} else {
+-		if (tsource->heap_idx == -1)
+-			return 0;
+-		wl_timer_heap_disarm(timers, tsource);
+-
+-		if (timers->active == 0) {
+-			/* Only update the timerfd if this was the last
+-			 * active timer */
+-			if (clear_timer(timers->base.fd) < 0)
+-				return -1;
+-		}
+-	}
+-
+ 	return 0;
+ }
+ 
+@@ -838,17 +483,6 @@ wl_event_source_remove(struct wl_event_source *source)
+ 		source->fd = -1;
+ 	}
+ 
+-	if (source->interface == &timer_source_interface &&
+-	    source->fd != TIMER_REMOVED) {
+-		/* Disarm the timer (and the loop's timerfd, if necessary),
+-		 * before removing its space in the loop timer heap */
+-		wl_event_source_timer_update(source, 0);
+-		wl_timer_heap_unreserve(&loop->timers);
+-		/* Set the fd field to to indicate that the timer should NOT
+-		 * be dispatched in `wl_event_loop_dispatch` */
+-		source->fd = TIMER_REMOVED;
+-	}
+-
+ 	wl_list_remove(&source->link);
+ 	wl_list_insert(&loop->destroy_list, &source->link);
+ 
+@@ -900,8 +534,6 @@ wl_event_loop_create(void)
+ 
+ 	wl_signal_init(&loop->destroy_signal);
+ 
+-	wl_timer_heap_init(&loop->timers, loop);
+-
+ 	return loop;
+ }
+ 
+@@ -924,7 +556,6 @@ wl_event_loop_destroy(struct wl_event_loop *loop)
+ 	wl_signal_emit(&loop->destroy_signal, loop);
+ 
+ 	wl_event_loop_process_destroy_list(loop);
+-	wl_timer_heap_release(&loop->timers);
+ 	close(loop->epoll_fd);
+ 	free(loop);
+ }
+@@ -975,7 +606,7 @@ wl_event_loop_dispatch_idle(struct wl_event_loop *loop
+  *
+  * \param loop The event loop whose sources to wait for.
+  * \param timeout The polling timeout in milliseconds.
+- * \return 0 for success, -1 for polling (or timer update) error.
++ * \return 0 for success, -1 for polling error.
+  *
+  * All the associated event sources are polled. This function blocks until
+  * any event source delivers an event (idle sources excluded), or the timeout
+@@ -997,29 +628,12 @@ wl_event_loop_dispatch(struct wl_event_loop *loop, int
+ 	struct epoll_event ep[32];
+ 	struct wl_event_source *source;
+ 	int i, count;
+-	bool has_timers = false;
+ 
+ 	wl_event_loop_dispatch_idle(loop);
+ 
+ 	count = epoll_wait(loop->epoll_fd, ep, ARRAY_LENGTH(ep), timeout);
+ 	if (count < 0)
+ 		return -1;
+-
+-	for (i = 0; i < count; i++) {
+-		source = ep[i].data.ptr;
+-		if (source == &loop->timers.base)
+-			has_timers = true;
+-	}
+-
+-	if (has_timers) {
+-		/* Dispatch timer sources before non-timer sources, so that
+-		 * the non-timer sources can not cancel (by calling
+-		 * `wl_event_source_timer_update`) the dispatching of the timers
+-		 * (Note that timer sources also can't cancel pending non-timer
+-		 * sources, since epoll_wait has already been called) */
+-		if (wl_timer_heap_dispatch(&loop->timers) < 0)
+-			return -1;
+-	}
+ 
+ 	for (i = 0; i < count; i++) {
+ 		source = ep[i].data.ptr;
diff --git a/graphics/wayland/files/patch-src_wayland-server.c b/graphics/wayland/files/patch-src_wayland-server.c
index 608bab6ca88..c2fff92d5a3 100644
--- a/graphics/wayland/files/patch-src_wayland-server.c
+++ b/graphics/wayland/files/patch-src_wayland-server.c
@@ -1,4 +1,4 @@
---- src/wayland-server.c.orig	2018-04-09 17:19:26 UTC
+--- src/wayland-server.c.orig	2020-02-11 23:46:03 UTC
 +++ src/wayland-server.c
 @@ -25,6 +25,8 @@
  
@@ -6,10 +6,10 @@
  
 +#include "../config.h"
 +
+ #include <stdbool.h>
  #include <stdlib.h>
  #include <stdint.h>
- #include <stddef.h>
-@@ -43,6 +45,11 @@
+@@ -44,6 +46,11 @@
  #include <sys/file.h>
  #include <sys/stat.h>
  
@@ -20,8 +20,8 @@
 +
  #include "wayland-util.h"
  #include "wayland-private.h"
- #include "wayland-server.h"
-@@ -77,7 +84,13 @@ struct wl_client {
+ #include "wayland-server-private.h"
+@@ -79,7 +86,13 @@ struct wl_client {
  	struct wl_list link;
  	struct wl_map objects;
  	struct wl_priv_signal destroy_signal;
@@ -35,7 +35,7 @@
  	int error;
  	struct wl_priv_signal resource_created_signal;
  };
-@@ -303,7 +316,13 @@ wl_resource_post_error(struct wl_resource *resource,
+@@ -315,7 +328,13 @@ wl_resource_post_error(struct wl_resource *resource,
  static void
  destroy_client_with_error(struct wl_client *client, const char *reason)
  {
@@ -49,7 +49,7 @@
  	wl_client_destroy(client);
  }
  
-@@ -517,10 +536,20 @@ wl_client_create(struct wl_display *display, int fd)
+@@ -529,10 +548,20 @@ wl_client_create(struct wl_display *display, int fd)
  	if (!client->source)
  		goto err_client;
  
@@ -70,7 +70,7 @@
  
  	client->connection = wl_connection_create(fd);
  	if (client->connection == NULL)
-@@ -574,12 +603,23 @@ WL_EXPORT void
+@@ -586,12 +615,23 @@ WL_EXPORT void
  wl_client_get_credentials(struct wl_client *client,
  			  pid_t *pid, uid_t *uid, gid_t *gid)
  {
diff --git a/graphics/wayland/files/patch-src_wayland-shm.c b/graphics/wayland/files/patch-src_wayland-shm.c
index df55cb3f1b6..a2561fc81ff 100644
--- a/graphics/wayland/files/patch-src_wayland-shm.c
+++ b/graphics/wayland/files/patch-src_wayland-shm.c
@@ -1,25 +1,25 @@
---- src/wayland-shm.c.orig	2018-04-09 17:19:26 UTC
+--- src/wayland-shm.c.orig	2020-02-11 23:46:03 UTC
 +++ src/wayland-shm.c
-@@ -30,6 +30,8 @@
+@@ -32,6 +32,8 @@
  
- #define _GNU_SOURCE
+ #include "config.h"
  
 +#include "../config.h"
 +
  #include <stdbool.h>
  #include <stdio.h>
  #include <stdlib.h>
-@@ -59,6 +61,9 @@ struct wl_shm_pool {
- 	char *data;
+@@ -64,6 +66,9 @@ struct wl_shm_pool {
  	int32_t size;
  	int32_t new_size;
+ 	bool sigbus_is_impossible;
 +#ifdef HAVE_SYS_UCRED_H
 +	int fd;
 +#endif
  };
  
  struct wl_shm_buffer {
-@@ -76,15 +81,24 @@ struct wl_shm_sigbus_data {
+@@ -81,15 +86,24 @@ struct wl_shm_sigbus_data {
  	int fallback_mapping_used;
  };
  
@@ -45,7 +45,7 @@
  	if (data == MAP_FAILED) {
  		wl_resource_post_error(pool->resource,
  				       WL_SHM_ERROR_INVALID_FD,
-@@ -110,6 +124,10 @@ shm_pool_unref(struct wl_shm_pool *pool, bool external
+@@ -115,6 +129,10 @@ shm_pool_unref(struct wl_shm_pool *pool, bool external
  	if (pool->internal_refcount + pool->external_refcount)
  		return;
  
@@ -56,7 +56,7 @@
  	munmap(pool->data, pool->size);
  	free(pool);
  }
-@@ -223,6 +241,73 @@ shm_pool_destroy(struct wl_client *client, struct wl_r
+@@ -228,6 +246,73 @@ shm_pool_destroy(struct wl_client *client, struct wl_r
  	wl_resource_destroy(resource);
  }
  
@@ -130,8 +130,8 @@
  static void
  shm_pool_resize(struct wl_client *client, struct wl_resource *resource,
  		int32_t size)
-@@ -284,7 +369,14 @@ shm_create_pool(struct wl_client *client, struct wl_re
- 				       "failed mmap fd %d: %m", fd);
+@@ -300,7 +385,14 @@ shm_create_pool(struct wl_client *client, struct wl_re
+ 				       strerror(errno));
  		goto err_free;
  	}
 +
diff --git a/graphics/wayland/files/patch-tests_event-loop-test.c b/graphics/wayland/files/patch-tests_event-loop-test.c
index 05024c452ba..6480c4b86ee 100644
--- a/graphics/wayland/files/patch-tests_event-loop-test.c
+++ b/graphics/wayland/files/patch-tests_event-loop-test.c
@@ -1,6 +1,6 @@
---- tests/event-loop-test.c.orig	2017-08-08 18:20:52 UTC
+--- tests/event-loop-test.c.orig	2020-02-11 23:46:03 UTC
 +++ tests/event-loop-test.c
-@@ -167,10 +167,10 @@ TEST(event_loop_signal)
+@@ -168,10 +168,10 @@ TEST(event_loop_signal)
  					  signal_callback, &got_it);
  	assert(source);
  
@@ -14,26 +14,31 @@
  	assert(got_it == 1);
  
  	wl_event_source_remove(source);
-@@ -234,11 +234,19 @@ TEST(event_loop_timer)
+@@ -235,11 +235,11 @@ TEST(event_loop_timer)
  
- 	source = wl_event_loop_add_timer(loop, timer_callback, &got_it);
- 	assert(source);
--	wl_event_source_timer_update(source, 10);
--	wl_event_loop_dispatch(loop, 0);
-+	assert(wl_event_source_timer_update(source, 10) == 0);
-+	assert(wl_event_loop_dispatch(loop, 0) == 0);
- 	assert(!got_it);
--	wl_event_loop_dispatch(loop, 20);
-+	/* FreeBSD has a bug where it converts ms_timeout to ticks; it always adds 1 to the tick count.
-+	* Consequently, we need to grossly overcompensate here.
-+	* See: http://unix.derkeiler.com/Mailing-Lists/FreeBSD/hackers/2012-07/msg00319.html */
-+	assert(wl_event_loop_dispatch(loop, 50) == 0);
+ 	source1 = wl_event_loop_add_timer(loop, timer_callback, &got_it);
+ 	assert(source1);
+-	wl_event_source_timer_update(source1, 20);
++	assert(wl_event_source_timer_update(source1, 20) == 0);
+ 
+ 	source2 = wl_event_loop_add_timer(loop, timer_callback, &got_it);
+ 	assert(source2);
+-	wl_event_source_timer_update(source2, 100);
++	assert(wl_event_source_timer_update(source2, 100) == 0);
+ 
+ 	/* Check that the timer marked for 20 msec from now fires within 30
+ 	 * msec, and that the timer marked for 100 msec is expected to fire
+@@ -248,11 +248,11 @@ TEST(event_loop_timer)
+ 
+ 	wl_event_loop_dispatch(loop, 0);
+ 	assert(got_it == 0);
+-	wl_event_loop_dispatch(loop, 30);
++	assert(wl_event_loop_dispatch(loop, 30) == 0);
  	assert(got_it == 1);
-+
-+	/* Check it doesn't fire again. */
-+	got_it = 0;
-+	assert(wl_event_loop_dispatch(loop, 20) == 0);
-+	assert(!got_it);
+ 	wl_event_loop_dispatch(loop, 0);
+ 	assert(got_it == 1);
+-	wl_event_loop_dispatch(loop, 90);
++	assert(wl_event_loop_dispatch(loop, 90) == 0);
+ 	assert(got_it == 2);
  
- 	wl_event_source_remove(source);
- 	wl_event_loop_destroy(loop);
+ 	wl_event_source_remove(source1);
diff --git a/graphics/wayland/files/patch-tests_test-helpers.c b/graphics/wayland/files/patch-tests_test-helpers.c
index 1e275db0574..9503ea5aed1 100644
--- a/graphics/wayland/files/patch-tests_test-helpers.c
+++ b/graphics/wayland/files/patch-tests_test-helpers.c
@@ -1,4 +1,4 @@
---- tests/test-helpers.c.orig	2018-08-24 18:04:36 UTC
+--- tests/test-helpers.c.orig	2020-02-11 23:46:03 UTC
 +++ tests/test-helpers.c
 @@ -25,6 +25,12 @@
  
@@ -13,7 +13,7 @@
  #include <assert.h>
  #include <errno.h>
  #include <dirent.h>
-@@ -40,6 +46,16 @@
+@@ -41,6 +47,16 @@
  
  #include "test-runner.h"
  
@@ -30,7 +30,7 @@
  int
  count_open_fds(void)
  {
-@@ -47,8 +63,8 @@ count_open_fds(void)
+@@ -48,8 +64,8 @@ count_open_fds(void)
  	struct dirent *ent;
  	int count = 0;
  
@@ -41,7 +41,7 @@
  
  	errno = 0;
  	while ((ent = readdir(dir))) {
-@@ -57,7 +73,7 @@ count_open_fds(void)
+@@ -58,7 +74,7 @@ count_open_fds(void)
  			continue;
  		count++;
  	}
diff --git a/graphics/wayland/files/patch-tests_test-runner.c b/graphics/wayland/files/patch-tests_test-runner.c
index ae4352d591b..1dc2499cd01 100644
--- a/graphics/wayland/files/patch-tests_test-runner.c
+++ b/graphics/wayland/files/patch-tests_test-runner.c
@@ -1,4 +1,4 @@
---- tests/test-runner.c.orig	2019-03-21 00:55:25 UTC
+--- tests/test-runner.c.orig	2020-02-11 23:46:03 UTC
 +++ tests/test-runner.c
 @@ -25,6 +25,12 @@
  
@@ -102,9 +102,9 @@
 +#ifdef HAVE_WAITID
 +		if (waitid(P_PID, 0, &info, WEXITED)) {
  			stderr_set_color(RED);
- 			fprintf(stderr, "waitid failed: %m\n");
- 			stderr_reset_color();
-@@ -367,6 +393,25 @@ int main(int argc, char *argv[])
+ 			fprintf(stderr, "waitid failed: %s\n",
+ 				strerror(errno));
+@@ -368,6 +394,25 @@ int main(int argc, char *argv[])
  
  			break;
  		}
diff --git a/irc/eggdrop-devel/Makefile b/irc/eggdrop-devel/Makefile
index 37d2a5d528a..f40a9cf973f 100644
--- a/irc/eggdrop-devel/Makefile
+++ b/irc/eggdrop-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	eggdrop
-DISTVERSION=	1.9.0.a.20191226
+DISTVERSION=	1.9.0.a.20200207
 CATEGORIES=	irc
 PKGNAMESUFFIX=	-devel
 
@@ -16,7 +16,7 @@ USES=		tcl ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	eggheads
-GH_TAGNAME=	0113cf2
+GH_TAGNAME=	7a490c5
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_SHLIB_VER}.so \
diff --git a/irc/eggdrop-devel/distinfo b/irc/eggdrop-devel/distinfo
index 862acbc5edb..28e3ab95e83 100644
--- a/irc/eggdrop-devel/distinfo
+++ b/irc/eggdrop-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577647162
-SHA256 (eggheads-eggdrop-1.9.0.a.20191226-0113cf2_GH0.tar.gz) = 9a6b23c871758b88cb76d58c96b5864c75f7f767a1dd8ca263c655481b8a4873
-SIZE (eggheads-eggdrop-1.9.0.a.20191226-0113cf2_GH0.tar.gz) = 2056289
+TIMESTAMP = 1581784558
+SHA256 (eggheads-eggdrop-1.9.0.a.20200207-7a490c5_GH0.tar.gz) = 2b7b050a2d7aae80a8419400efdbe8ac70c24bfdac3cf22fd536bc23e787f11b
+SIZE (eggheads-eggdrop-1.9.0.a.20200207-7a490c5_GH0.tar.gz) = 2059912
diff --git a/lang/gcc10-devel/Makefile b/lang/gcc10-devel/Makefile
index 465789e40aa..2b39a626453 100644
--- a/lang/gcc10-devel/Makefile
+++ b/lang/gcc10-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	10.0.1.s20200202
+PORTVERSION=	10.0.1.s20200209
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
diff --git a/lang/gcc10-devel/distinfo b/lang/gcc10-devel/distinfo
index 2875295dc7d..b71a0fe766a 100644
--- a/lang/gcc10-devel/distinfo
+++ b/lang/gcc10-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580712785
-SHA256 (gcc-10-20200202.tar.xz) = 4dfdb57bed7e57a65630b0a42178fe6b0d8347980d5b729957fced24eeb00be5
-SIZE (gcc-10-20200202.tar.xz) = 71884460
+TIMESTAMP = 1581289468
+SHA256 (gcc-10-20200209.tar.xz) = e81ed4db3ded02fae64233d2028cdca0b630fc022d47d0ef6b8dd09c6bfcdfa5
+SIZE (gcc-10-20200209.tar.xz) = 72005684
diff --git a/lang/gcc10-devel/files/patch-analyzer b/lang/gcc10-devel/files/patch-analyzer
deleted file mode 100644
index 7fc5caf8bf4..00000000000
--- a/lang/gcc10-devel/files/patch-analyzer
+++ /dev/null
@@ -1,26 +0,0 @@
-Provided by David Malcolm <dmalcolm@redhat.com> to address a build
-failure with clang 9.0.1.
-
---- UTC
-Index: gcc/analyzer/engine.cc
-===================================================================
---- gcc/analyzer/engine.cc
-+++ gcc/analyzer/engine.cc
-@@ -2940,7 +2940,7 @@ template <>
- inline void
- pod_hash_traits<function_call_string>::mark_empty (value_type &v)
- {
--  v.m_fun = reinterpret_cast<function *> (NULL);
-+  v.m_fun = static_cast<function *> (NULL);
- }
- template <>
- inline bool
-@@ -2952,7 +2952,7 @@ template <>
- inline bool
- pod_hash_traits<function_call_string>::is_empty (value_type v)
- {
--  return v.m_fun == reinterpret_cast<function *> (NULL);
-+  return v.m_fun == static_cast<function *> (NULL);
- }
- 
- namespace ana {
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 8a045652eb7..4d9706526cb 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -148,7 +148,10 @@ _EXECUTABLES+=	${GHC_LIBDIR}/bin/ghc-iserv-dyn
 .if empty(PORT_OPTIONS:MBOOT)
 BOOTSTRAPS_SUFFIX?=		${BOOTSTRAPS_SUFFIX_${ARCH}}
 BOOTSTRAPS_SUFFIX_powerpc64?=	-${PPC_ABI:tl}
-DISTFILES+=		ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:boot
+.  if ${OSVERSION} < 1200000 && (${ARCH} == amd64 || ${ARCH} == i386)
+ELEVEN_SUFX=		11
+.  endif
+DISTFILES+=		ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${BOOTSTRAPS_SUFFIX}${ELEVEN_SUFX}${EXTRACT_SUFX}:boot
 .endif # MBOOT
 
 .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 8a0a6a087aa..254b94cacae 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -11,10 +11,14 @@ SHA256 (ghc-8.4.4-src.tar.xz) = 11117735a58e507c481c09f3f39ae5a314e9fbf49fc31095
 SIZE (ghc-8.4.4-src.tar.xz) = 11319500
 SHA256 (ghc-8.4.3-src.tar.xz) = ae47afda985830de8811243255aa3744dfb9207cb980af74393298b2b62160d6
 SIZE (ghc-8.4.3-src.tar.xz) = 11315068
-SHA256 (ghc-8.6.5-boot-amd64-freebsd.tar.xz) = 07d4c54a70900128e24b5dd9b22d929ddcf530d911a8be93e694cd9a721f458a
-SIZE (ghc-8.6.5-boot-amd64-freebsd.tar.xz) = 68965716
-SHA256 (ghc-8.6.5-boot-i386-freebsd.tar.xz) = cd208fbb6b2a158ff8c5d6227e0babd8c224867ea301abf970dc446f04c9e95f
-SIZE (ghc-8.6.5-boot-i386-freebsd.tar.xz) = 67439136
+SHA256 (ghc-8.6.5-boot-amd64-freebsd.tar.xz) = aeaf8c0fee0d83de5088aa7ab92e92ee6999b4830e01e33bf3dd450b115c0208
+SIZE (ghc-8.6.5-boot-amd64-freebsd.tar.xz) = 70213260
+SHA256 (ghc-8.6.5-boot-i386-freebsd.tar.xz) = 8be209508aa1c7e342f22c3fc3eac11ac902e15ce8ec5e0e40cfd51127875bf9
+SIZE (ghc-8.6.5-boot-i386-freebsd.tar.xz) = 67524928
+SHA256 (ghc-8.6.5-boot-amd64-freebsd11.tar.xz) = 07d4c54a70900128e24b5dd9b22d929ddcf530d911a8be93e694cd9a721f458a
+SIZE (ghc-8.6.5-boot-amd64-freebsd11.tar.xz) = 68965716
+SHA256 (ghc-8.6.5-boot-i386-freebsd11.tar.xz) = cd208fbb6b2a158ff8c5d6227e0babd8c224867ea301abf970dc446f04c9e95f
+SIZE (ghc-8.6.5-boot-i386-freebsd11.tar.xz) = 67439136
 SHA256 (ghc-8.6.3-boot-aarch64-freebsd.tar.xz) = 5a1f043ada7262cf4eac4a900b7d5af965e5f6f89939e635ad0c10b0185a15b7
 SIZE (ghc-8.6.3-boot-aarch64-freebsd.tar.xz) = 104631584
 SHA256 (ghc-8.6.3-boot-armv6-freebsd.tar.xz) = 5260987646c9f6102f35a7cdedfde785227c4f317fb3ccc52d06cae6a0950a68
diff --git a/lang/go-devel/Makefile b/lang/go-devel/Makefile
index dd9a2d87adf..25e9925f694 100644
--- a/lang/go-devel/Makefile
+++ b/lang/go-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	go
 PORTVERSION=	g20200205
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
 		LOCAL/dmgk:bootstrap
@@ -28,7 +29,7 @@ RUN_DEPENDS_aarch64=	binutils>0:devel/binutils
 TEST_DEPENDS=	${TEST_DEPENDS_${ARCH}}
 TEST_DEPENDS_aarch64=	binutils>0:devel/binutils
 
-USES=		shebangfix tar:xz
+USES=		shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	golang
@@ -37,12 +38,14 @@ GH_TAGNAME=	a068054af141c01df5a4519844f4b77273605f4e
 SHEBANG_FILES=	misc/wasm/go_js_wasm_exec \
 		src/net/http/cgi/testdata/test.cgi
 SHEBANG_GLOB=	*.bash *.pl *.sh
-SHEBANG_LANG=	sh
 sh_OLD_CMD=	/bin/bash "/usr/bin/env bash"
 sh_CMD=		${SH}
 
 CONFLICTS_INSTALL=	go
 
+# Upstream archive contains files with UTF-8 names
+EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 ${TAR}
+
 OPTIONS_DEFINE_i386=	GO387
 
 GO387_DESC=	Do not generate code with SSE2 (for old x86 CPU)
@@ -66,6 +69,11 @@ post-patch:
 	# Needed only for untagged releases
 	${ECHO_CMD} "devel +${GH_TAGNAME}" > ${WRKSRC}/VERSION
 
+pre-build:
+	# Check that the running kernel has COMPAT_FREEBSD11 required by lang/go{,-devel} post-ino64
+	@${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \
+		${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh
+
 do-build:
 	cd ${WRKSRC}/src ; ${SETENV} \
 		XDG_CACHE_HOME=${WRKDIR} \
@@ -80,21 +88,16 @@ do-build:
 		${SH} make.bash -v
 
 do-install:
-	cd ${WRKSRC} ; \
+	@cd ${WRKSRC} ; \
 		${RM} -r .gitattributes .gitignore .github favicon.ico robots.txt \
 		pkg/obj pkg/bootstrap pkg/${OPSYS:tl}_${GOARCH_${ARCH}}/cmd
 	@${MKDIR} ${STAGEDIR}${PREFIX}/go
 	@${CP} -a ${WRKSRC}/* ${STAGEDIR}${PREFIX}/go
 .for file in ${BINARIES}
 	@${LN} -sf ../go/bin/${file} ${STAGEDIR}${PREFIX}/bin/${file}
-.endfor
-
-post-install:
-.for file in ${BINARIES}
 	@${ECHO_CMD} bin/${file} >> ${TMPPLIST}
 .endfor
-	@cd ${STAGEDIR}${PREFIX} && \
-		${FIND} go -type f >> ${TMPPLIST}
+	@cd ${STAGEDIR}${PREFIX} && ${FIND} go -type f >> ${TMPPLIST}
 
 do-test:
 	cd ${WRKSRC}/src && ${SETENV} \
@@ -104,14 +107,14 @@ do-test:
 		GOARCH=${GOARCH_${ARCH}} \
 		GO386=${GO386} \
 		GOARM=${GOARM_${ARCH}} \
-		${SH} run.bash
+		${SH} run.bash -no-rebuild
 
 .if !defined(_GO_MAKESUM_GUARD)
 makesum:
 	${MAKE} -D_GO_MAKESUM_GUARD makesum ARCH=${ONLY_FOR_ARCHS:O:[1]} DISTINFO_FILE=${DISTINFO_FILE}.tmp
 .for arch in ${ONLY_FOR_ARCHS:O:[2..-1]}
 	${MAKE} -D_GO_MAKESUM_GUARD makesum ARCH=${arch} DISTINFO_FILE=${DISTINFO_FILE}.${arch}
-	${GREP} ${GOARCH_${arch}:U${arch}} ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE}.tmp
+	${SED} 1d ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE}.tmp
 	${RM} ${DISTINFO_FILE}.${arch}
 .endfor
 	${AWK} '!seen[$$0]++' ${DISTINFO_FILE}.tmp > ${DISTINFO_FILE}
diff --git a/lang/intel-compute-runtime/Makefile b/lang/intel-compute-runtime/Makefile
index 68b03e964d6..e1524293eae 100644
--- a/lang/intel-compute-runtime/Makefile
+++ b/lang/intel-compute-runtime/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	compute-runtime
-DISTVERSION=	20.05.15524
+DISTVERSION=	20.06.15619
 CATEGORIES=	lang
 PKGNAMEPREFIX=	intel-
 
diff --git a/lang/intel-compute-runtime/distinfo b/lang/intel-compute-runtime/distinfo
index fd34649d683..cff9f2c6c13 100644
--- a/lang/intel-compute-runtime/distinfo
+++ b/lang/intel-compute-runtime/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580470533
-SHA256 (intel-compute-runtime-20.05.15524_GH0.tar.gz) = 3c1fe0f64b612dbb331f41284c242c2c047c6e4d037e296b2e045055f9d46053
-SIZE (intel-compute-runtime-20.05.15524_GH0.tar.gz) = 2718083
+TIMESTAMP = 1581073900
+SHA256 (intel-compute-runtime-20.06.15619_GH0.tar.gz) = 6fdd5171204796eca7bd626e7108cd7b80f7e00c99426876d93d1154b97d933b
+SIZE (intel-compute-runtime-20.06.15619_GH0.tar.gz) = 2726254
diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index 647c13a89f4..8741dcdd8e1 100644
--- a/lang/rust-nightly/Makefile
+++ b/lang/rust-nightly/Makefile
@@ -18,7 +18,7 @@ DISTINFO_FILE=	${.CURDIR}/distinfo
 
 # Get latest from top level 'date' key in
 # https://static.rust-lang.org/dist/channel-rust-nightly.toml
-NIGHTLY_DATE=	2020-02-05
+NIGHTLY_DATE=	2020-02-15
 
 # See WRKSRC/src/stage0.txt for this date
 BOOTSTRAPS_DATE=		2020-01-30
diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo
index 0504c1b98a0..e7de97058cc 100644
--- a/lang/rust-nightly/distinfo
+++ b/lang/rust-nightly/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1580876770
-SHA256 (rust/2020-02-05/rustc-nightly-src.tar.xz) = 7b41d4d2359c75a01a1851ae635b084d841bbbc2cea6bc722d17b6ea57537254
-SIZE (rust/2020-02-05/rustc-nightly-src.tar.xz) = 94238684
+TIMESTAMP = 1581774340
+SHA256 (rust/2020-02-15/rustc-nightly-src.tar.xz) = 3c70d19fd4aba6cefde4ca1684ea48b719bc841f5c9d7f8ae0f46d6d71c8b9e8
+SIZE (rust/2020-02-15/rustc-nightly-src.tar.xz) = 94355884
 SHA256 (rust/2020-01-30/rustc-beta-x86_64-unknown-freebsd.tar.xz) = de239e7838f913c1b4c03ec866b32966e83941a4797809f2baab2b07bb0b7225
 SIZE (rust/2020-01-30/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 34914832
 SHA256 (rust/2020-01-30/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = f8ff7d3298374817cbe40c20ae131f9ed95a4271f952596b6581da52d655618f
diff --git a/lang/slib/Makefile b/lang/slib/Makefile
index ebc3dfbe5da..9ead2b08ffb 100644
--- a/lang/slib/Makefile
+++ b/lang/slib/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	slib
-PORTVERSION=	3b5
-PORTREVISION=	1
+PORTVERSION=	3b6
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://groups.csail.mit.edu/mac/ftpdir/scm/ \
 		http://groups.csail.mit.edu/mac/ftpdir/scm/OLD/
diff --git a/lang/slib/distinfo b/lang/slib/distinfo
index d4160c23790..30ea6a97d46 100644
--- a/lang/slib/distinfo
+++ b/lang/slib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539733415
-SHA256 (slib-3b5.tar.gz) = ea26e5170c6db6d6c69e4aaf91e9b1c9619174fc92d5dc63c71fff2a935e51ba
-SIZE (slib-3b5.tar.gz) = 987735
+TIMESTAMP = 1581851946
+SHA256 (slib-3b6.tar.gz) = f87762730299758c3c53e0f8997565bac7b25814781ebae6e4bd4d80d110ad91
+SIZE (slib-3b6.tar.gz) = 984776
diff --git a/lang/slib/pkg-plist b/lang/slib/pkg-plist
index 7014b4884ab..a32ff77ccea 100644
--- a/lang/slib/pkg-plist
+++ b/lang/slib/pkg-plist
@@ -66,6 +66,7 @@
 %%DATADIR%%/html4each.scm
 %%DATADIR%%/htmlform.scm
 %%DATADIR%%/http-cgi.scm
+%%DATADIR%%/iso8601.scm
 %%DATADIR%%/jscheme.init
 %%DATADIR%%/kawa.init
 %%DATADIR%%/limit.scm
diff --git a/mail/Makefile b/mail/Makefile
index e1fb1c22edc..97075d7670e 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -605,6 +605,7 @@
     SUBDIR += rubygem-roadie
     SUBDIR += rubygem-roadie-rails
     SUBDIR += rubygem-roadie-rails52
+    SUBDIR += rubygem-roadie3
     SUBDIR += rubygem-ruby-qmail
     SUBDIR += rubygem-tmail
     SUBDIR += rubygem-vmail
diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile
index f23c542c677..f5e4287da23 100644
--- a/mail/fetchmailconf/Makefile
+++ b/mail/fetchmailconf/Makefile
@@ -6,9 +6,8 @@ DISTNAME=	fetchmail-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 MAINTAINER=	chalpin@cs.wisc.edu
 COMMENT=	Python-based GUI to configure fetchmail
 
-BROKEN=		unfetchable
-DEPRECATED=	Broken, uses EOLed python27
-EXPIRATION_DATE=	2020-02-19
+# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244130 has an update to get it
+# compatible to Python 3.
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
@@ -27,7 +26,7 @@ NO_ARCH=	yes
 
 GNU_CONFIGURE=	yes
 
-TARGET=		fetchmailconf
+ALL_TARGET=	fetchmailconf
 INSTALL_TARGET=	install-data-am install-nodist_binSCRIPTS install-man
 
 post-install:
diff --git a/mail/fetchmailconf/distinfo b/mail/fetchmailconf/distinfo
deleted file mode 100644
index b0080b347c8..00000000000
--- a/mail/fetchmailconf/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1546191531
-SHA256 (fetchmail-6.3.26.tar.xz) = 79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850
-SIZE (fetchmail-6.3.26.tar.xz) = 1283816
-SHA256 (9b8b634.patch) = b0a9f7e28e7e6a5a16669832ad7a7a7dca47b435ce446ef10bd0421deea4a848
-SIZE (9b8b634.patch) = 1023
-SHA256 (fetchmail-6.3.26-ssl-backport.patch) = a34b1a6becf731e2ef029a1c5ee3a82a7bbb1e2487b6f3be15bbb4e7dc8b500d
-SIZE (fetchmail-6.3.26-ssl-backport.patch) = 31596
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index d937a8b48c0..d13edfcd5a3 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mutt
-DISTVERSION=	1.13.3
+DISTVERSION=	1.13.4
 CATEGORIES+=	mail
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 4bc1ef5b2fe..c2e0ed86e65 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1578869944
-SHA256 (mutt/mutt-1.13.3.tar.gz) = 78423016b5f2fcb31bfd156999ff6638177be4459230d2ee61a81e5641d07378
-SIZE (mutt/mutt-1.13.3.tar.gz) = 4896808
+TIMESTAMP = 1581806451
+SHA256 (mutt/mutt-1.13.4.tar.gz) = b57d3f1040d8018114cf1033dab229f36e4becbcdf59c2edeb294fc044ffcd04
+SIZE (mutt/mutt-1.13.4.tar.gz) = 4901222
 SHA256 (mutt/mutt-1.13.2.vc.greeting) = b11fcfad1f53f16f89a8ecc334fba615698f5bcaa9373fd487a6c9d95c3872ad
 SIZE (mutt/mutt-1.13.2.vc.greeting) = 4573
 SHA256 (mutt/patch-1.12.1.vvv.nntp.xz) = 9c420584d549ac0bb49c52ddfd2ab5bee0f89e59cb938673444ec27ad7c782ad
diff --git a/mail/rubygem-roadie-rails/Makefile b/mail/rubygem-roadie-rails/Makefile
index d40665d596a..cc6da38bce1 100644
--- a/mail/rubygem-roadie-rails/Makefile
+++ b/mail/rubygem-roadie-rails/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	roadie-rails
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 
@@ -12,7 +13,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	rubygem-railties4>=3.0<5.3:www/rubygem-railties4 \
-		rubygem-roadie>=3.1<4:mail/rubygem-roadie
+		rubygem-roadie3>=3.1<4:mail/rubygem-roadie3
 
 USES=		gem shebangfix
 USE_RUBY=	yes
diff --git a/mail/rubygem-roadie-rails52/Makefile b/mail/rubygem-roadie-rails52/Makefile
index a1ce04496eb..d565a912377 100644
--- a/mail/rubygem-roadie-rails52/Makefile
+++ b/mail/rubygem-roadie-rails52/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	roadie-rails
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	52
@@ -13,7 +14,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	rubygem-railties52>=3.0:www/rubygem-railties52 \
-		rubygem-roadie>=3.1:mail/rubygem-roadie
+		rubygem-roadie3>=3.1:mail/rubygem-roadie3
 
 USES=		gem shebangfix
 USE_RUBY=	yes
diff --git a/mail/rubygem-roadie3/Makefile b/mail/rubygem-roadie3/Makefile
new file mode 100644
index 00000000000..abd2ef32cd8
--- /dev/null
+++ b/mail/rubygem-roadie3/Makefile
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+PORTNAME=	roadie
+PORTVERSION=	3.5.1
+CATEGORIES=	mail rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	3
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Helper for generating HTML mails
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	rubygem-css_parser>=1.4<2:textproc/rubygem-css_parser \
+		rubygem-nokogiri>=1.8<2:textproc/rubygem-nokogiri
+
+USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^3\.
+
+.include <bsd.port.mk>
diff --git a/mail/rubygem-roadie3/distinfo b/mail/rubygem-roadie3/distinfo
new file mode 100644
index 00000000000..285e9c2a9d3
--- /dev/null
+++ b/mail/rubygem-roadie3/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1577693961
+SHA256 (rubygem/roadie-3.5.1.gem) = 39cd109579408e7058e5476323216c8a017dde3d3ae8f26dcc76cd65c26830fe
+SIZE (rubygem/roadie-3.5.1.gem) = 54784
diff --git a/mail/rubygem-roadie3/pkg-descr b/mail/rubygem-roadie3/pkg-descr
new file mode 100644
index 00000000000..88daca0beed
--- /dev/null
+++ b/mail/rubygem-roadie3/pkg-descr
@@ -0,0 +1,4 @@
+Roadie tries to make sending HTML emails a little less painful by inlining
+stylesheets and rewriting relative URLs for you inside your emails.
+
+WWW: https://github.com/Mange/roadie
diff --git a/math/Makefile b/math/Makefile
index 623811913a9..b546812ada1 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -693,7 +693,6 @@
     SUBDIR += py-apgl
     SUBDIR += py-arviz
     SUBDIR += py-autograd
-    SUBDIR += py-basemap
     SUBDIR += py-basemap-data
     SUBDIR += py-bayesian-optimization
     SUBDIR += py-bitmath
diff --git a/math/R-cran-DRR/Makefile b/math/R-cran-DRR/Makefile
index 6d995dc6949..264f7ca446a 100644
--- a/math/R-cran-DRR/Makefile
+++ b/math/R-cran-DRR/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	DRR
-PORTVERSION=	0.0.3
-PORTREVISION=	2
+PORTVERSION=	0.0.4
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/math/R-cran-DRR/distinfo b/math/R-cran-DRR/distinfo
index 242532cb566..12df1758763 100644
--- a/math/R-cran-DRR/distinfo
+++ b/math/R-cran-DRR/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521620003
-SHA256 (DRR_0.0.3.tar.gz) = 7493389c1fb9ddc4d4261e15bf2d4198603227275688b1d3e3994d47e976a1f9
-SIZE (DRR_0.0.3.tar.gz) = 128442
+TIMESTAMP = 1581828332
+SHA256 (DRR_0.0.4.tar.gz) = 93e365a4907e301ae01f7d943e6bdcda71ef23c51a4759ba3c94bcf842d4e0f8
+SIZE (DRR_0.0.4.tar.gz) = 129784
diff --git a/math/R-cran-MCMCpack/Makefile b/math/R-cran-MCMCpack/Makefile
index 89481d372a3..d70c7484a95 100644
--- a/math/R-cran-MCMCpack/Makefile
+++ b/math/R-cran-MCMCpack/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	MCMCpack
-DISTVERSION=	1.4-5
+DISTVERSION=	1.4-6
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-MCMCpack/distinfo b/math/R-cran-MCMCpack/distinfo
index 0673bb8209f..3b876c24dc0 100644
--- a/math/R-cran-MCMCpack/distinfo
+++ b/math/R-cran-MCMCpack/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575386152
-SHA256 (MCMCpack_1.4-5.tar.gz) = da949cfa44f71bfff1c6ae06caf8fe4252dd6391aa4c8f0fb6e02c7d6b1cdfb5
-SIZE (MCMCpack_1.4-5.tar.gz) = 678959
+TIMESTAMP = 1581827813
+SHA256 (MCMCpack_1.4-6.tar.gz) = 6bcd018d6fa589a6854ee1bcea18b9d6c4095f3deae9058f69afbb09cba873c7
+SIZE (MCMCpack_1.4-6.tar.gz) = 679520
diff --git a/math/R-cran-memisc/Makefile b/math/R-cran-memisc/Makefile
index b9a81affdad..a85bb823b76 100644
--- a/math/R-cran-memisc/Makefile
+++ b/math/R-cran-memisc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	memisc
-DISTVERSION=	0.99.21
+DISTVERSION=	0.99.22
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/math/R-cran-memisc/distinfo b/math/R-cran-memisc/distinfo
index fb78e6f4301..db40d323a8a 100644
--- a/math/R-cran-memisc/distinfo
+++ b/math/R-cran-memisc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576914380
-SHA256 (memisc_0.99.21.tar.gz) = d8c3817a2b222fcec86bcbc2f897c67436a7b0ad5d5b32f194cebb687e947439
-SIZE (memisc_0.99.21.tar.gz) = 1294434
+TIMESTAMP = 1581827145
+SHA256 (memisc_0.99.22.tar.gz) = 1dcd1b32ed0b367b3ebf05e615e1064ee4e9a901b56440a248c6c5dcd83f3770
+SIZE (memisc_0.99.22.tar.gz) = 1295048
diff --git a/math/fcl/Makefile b/math/fcl/Makefile
index e2ddd03a1ca..2542dbde4a9 100644
--- a/math/fcl/Makefile
+++ b/math/fcl/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	fcl
-DISTVERSION=	0.5.0-304
-PORTREVISION=	3
-DISTVERSIONSUFFIX=	-g16c193a
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.6.0
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -19,7 +18,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	flexible-collision-library
 USE_LDCONFIG=	yes
 
-CMAKE_OFF=	FCL_BUILD_TESTS # also see https://github.com/flexible-collision-library/fcl/issues/354
+CMAKE_OFF=	FCL_BUILD_TESTS BUILD_TESTING # also see https://github.com/flexible-collision-library/fcl/issues/354
 
 OPTIONS_DEFINE_amd64=		SSE2 SSE3 SSSE3 SSE4 SSE41 SSE42 SSE4A
 OPTIONS_DEFAULT_amd64=		SSE2
@@ -31,4 +30,10 @@ ${sse}_DESC=		Support for ${sse}
 ${sse}_CMAKE_ON=	-DFCL_USE_X64_SSE:BOOL=ON -DOPT_SSE_${sse}=-m${sse:tl:S/41/4.1/:S/42/4.2/}
 .endfor
 
+do-test:
+	@cd ${BUILD_WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON -DFCL_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
+
 .include <bsd.port.mk>
diff --git a/math/fcl/distinfo b/math/fcl/distinfo
index 718b60b7919..f435e3c840e 100644
--- a/math/fcl/distinfo
+++ b/math/fcl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542689785
-SHA256 (flexible-collision-library-fcl-0.5.0-304-g16c193a_GH0.tar.gz) = bee789713d067314466960ee75bee1b59c09a9d95e5cc8de9531186d6164e75d
-SIZE (flexible-collision-library-fcl-0.5.0-304-g16c193a_GH0.tar.gz) = 6168928
+TIMESTAMP = 1581564819
+SHA256 (flexible-collision-library-fcl-v0.6.0_GH0.tar.gz) = 6891abac5cc26d64f5ef8894bc6c2a30174558c5c83a3ed63cf65a21cb619b2b
+SIZE (flexible-collision-library-fcl-v0.6.0_GH0.tar.gz) = 6205849
diff --git a/math/fcl/pkg-plist b/math/fcl/pkg-plist
index 72cbc150b14..04240892092 100644
--- a/math/fcl/pkg-plist
+++ b/math/fcl/pkg-plist
@@ -16,6 +16,7 @@ include/fcl/broadphase/broadphase_interval_tree-inl.h
 include/fcl/broadphase/broadphase_interval_tree.h
 include/fcl/broadphase/broadphase_spatialhash-inl.h
 include/fcl/broadphase/broadphase_spatialhash.h
+include/fcl/broadphase/default_broadphase_callbacks.h
 include/fcl/broadphase/detail/hierarchy_tree-inl.h
 include/fcl/broadphase/detail/hierarchy_tree.h
 include/fcl/broadphase/detail/hierarchy_tree_array-inl.h
@@ -205,6 +206,7 @@ include/fcl/narrowphase/detail/convexity_based_algorithm/simplex.h
 include/fcl/narrowphase/detail/convexity_based_algorithm/support.h
 include/fcl/narrowphase/detail/distance_func_matrix-inl.h
 include/fcl/narrowphase/detail/distance_func_matrix.h
+include/fcl/narrowphase/detail/failed_at_this_configuration.h
 include/fcl/narrowphase/detail/gjk_solver_indep-inl.h
 include/fcl/narrowphase/detail/gjk_solver_indep.h
 include/fcl/narrowphase/detail/gjk_solver_libccd-inl.h
@@ -316,3 +318,4 @@ lib/libfcl.so
 lib/libfcl.so.0.6
 lib/libfcl.so.0.6.0
 libdata/pkgconfig/fcl.pc
+%%DATADIR%%/package.xml
diff --git a/math/geogram/Makefile b/math/geogram/Makefile
index 86c4a3b14c8..1362e9762de 100644
--- a/math/geogram/Makefile
+++ b/math/geogram/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	geogram
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.7.3
+DISTVERSION=	1.7.4
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/math/geogram/distinfo b/math/geogram/distinfo
index e839644cadd..51a6d4c111f 100644
--- a/math/geogram/distinfo
+++ b/math/geogram/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578116635
-SHA256 (alicevision-geogram-v1.7.3_GH0.tar.gz) = 0c97a59b04417b6882d9daf1b8e279efcc68d2bd1b4fac0bae3a90baf3822a11
-SIZE (alicevision-geogram-v1.7.3_GH0.tar.gz) = 10702594
+TIMESTAMP = 1581663269
+SHA256 (alicevision-geogram-v1.7.4_GH0.tar.gz) = c0c4d20dd71d3b1f83b5e69a2860b087832fbac508c82a74bc78be60fa0762ff
+SIZE (alicevision-geogram-v1.7.4_GH0.tar.gz) = 8565175
diff --git a/math/geogram/pkg-plist b/math/geogram/pkg-plist
index f309ee2fc11..c098db6aa4b 100644
--- a/math/geogram/pkg-plist
+++ b/math/geogram/pkg-plist
@@ -127,6 +127,7 @@ include/geogram1/geogram/numerics/predicates/dot_compare_3d.h
 include/geogram1/geogram/numerics/predicates/orient2d.h
 include/geogram1/geogram/numerics/predicates/orient3d.h
 include/geogram1/geogram/numerics/predicates/orient4d.h
+include/geogram1/geogram/numerics/predicates/side_for_boolean.h
 include/geogram1/geogram/numerics/predicates/side1.h
 include/geogram1/geogram/numerics/predicates/side2.h
 include/geogram1/geogram/numerics/predicates/side3.h
@@ -275,17 +276,6 @@ include/geogram1/geogram_gfx/GLUP/shaders/fullscreen/blur_fragment_shader.h
 include/geogram1/geogram_gfx/GLUP/shaders/fullscreen/depth_dependent_blur_fragment_shader.h
 include/geogram1/geogram_gfx/GLUP/shaders/fullscreen/unsharp_masking_fragment_shader.h
 include/geogram1/geogram_gfx/GLUP/shaders/fullscreen/vertex_shader.h
-include/geogram1/geogram_gfx/third_party/ImGui/OLD/glup_compat.h
-include/geogram1/geogram_gfx/third_party/ImGui/OLD/imconfig.h
-include/geogram1/geogram_gfx/third_party/ImGui/OLD/imgui.h
-include/geogram1/geogram_gfx/third_party/ImGui/OLD/imgui_impl_android.h
-include/geogram1/geogram_gfx/third_party/ImGui/OLD/imgui_impl_glfw.h
-include/geogram1/geogram_gfx/third_party/ImGui/OLD/imgui_impl_opengl3.h
-include/geogram1/geogram_gfx/third_party/ImGui/OLD/imgui_impl_win32.h
-include/geogram1/geogram_gfx/third_party/ImGui/OLD/imgui_internal.h
-include/geogram1/geogram_gfx/third_party/ImGui/OLD/imstb_rectpack.h
-include/geogram1/geogram_gfx/third_party/ImGui/OLD/imstb_textedit.h
-include/geogram1/geogram_gfx/third_party/ImGui/OLD/imstb_truetype.h
 include/geogram1/geogram_gfx/ImGui_ext/icon_font.h
 include/geogram1/geogram_gfx/ImGui_ext/imgui_ext.h
 include/geogram1/geogram_gfx/api/defs.h
@@ -331,17 +321,16 @@ include/geogram1/geogram_gfx/third_party/imgui_fonts/fa_regular.h
 include/geogram1/geogram_gfx/third_party/imgui_fonts/fa_solid.h
 include/geogram1/geogram_gfx/third_party/imgui_fonts/roboto_medium.h
 include/geogram1/geogram_gfx/third_party/imgui_lua_bindings/imgui_iterator.h
-include/geogram1/geogram_gfx/third_party/quicktext/glQuickText.h
 lib/cmake/modules/FindGeogram.cmake
 lib/libgeogram.so
 lib/libgeogram.so.1
-lib/libgeogram.so.1.7.3
+lib/libgeogram.so.1.7.4
 lib/libgeogram_gfx.so
 lib/libgeogram_gfx.so.1
-lib/libgeogram_gfx.so.1.7.3
+lib/libgeogram_gfx.so.1.7.4
 lib/libgeogram_num_3rdparty.so
 lib/libgeogram_num_3rdparty.so.1
-lib/libgeogram_num_3rdparty.so.1.7.3
+lib/libgeogram_num_3rdparty.so.1.7.4
 libdata/pkgconfig/geogram1.pc
 libdata/pkgconfig/geogram_gfx1.pc
 @dir include/geogram1/geogram_gfx/gui/colormaps
diff --git a/math/libnormaliz/Makefile b/math/libnormaliz/Makefile
index 958a976ebde..10a460c9ea1 100644
--- a/math/libnormaliz/Makefile
+++ b/math/libnormaliz/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=		libnormaliz
 DISTVERSIONPREFIX=	v
-DISTVERSION=		3.8.3
-PORTREVISION=		1
+DISTVERSION=		3.8.4
 CATEGORIES=		math
 
 MAINTAINER=	salvadore@FreeBSD.org
@@ -12,8 +11,7 @@ COMMENT=	Computations in affin monoids, vector configurations etc
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/dynamic_bitset.hpp:devel/boost-libs \
-		${LOCALBASE}/include/gmpxx.h:math/gmp
+BUILD_DEPENDS=	${LOCALBASE}/include/gmpxx.h:math/gmp
 
 USES=		autoreconf compiler:c++11-lang gmake libtool
 USE_GITHUB=	yes
@@ -33,10 +31,10 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 OPTIONS_DEFINE=		COCOA DOCS FLINT OPENMP
 COCOA_DESC=		Link with libcocoa.a (might cause circular dependency)
 COCOA_BUILD_DEPENDS=	${LOCALBASE}/lib/libcocoa.a:math/cocoalib
-COCOA_CONFIGURE_ENABLE=	nmzintegrate
+COCOA_CONFIGURE_WITH=	cocoalib
 FLINT_DESC=		Link with libflint.so
 FLINT_BUILD_DEPENDS=	${LOCALBASE}/lib/libflint.so:math/flint2
-FLINT_CONFIGURE_ENABLE=	flint
+FLINT_CONFIGURE_WITH=	flint
 FLINT_LDFLAGS=		-lpthread
 OPENMP_BUILD_DEPENDS=	${LOCALBASE}/lib/libomp.so:devel/openmp
 OPENMP_CONFIGURE_ENABLE=	openmp
diff --git a/math/libnormaliz/distinfo b/math/libnormaliz/distinfo
index dbc925347b2..0b1a9737c5a 100644
--- a/math/libnormaliz/distinfo
+++ b/math/libnormaliz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574784276
-SHA256 (Normaliz-Normaliz-v3.8.3_GH0.tar.gz) = bc51a45e898eac2ae3500855f991c27cace55ae123ebd3916cf60e62bc499389
-SIZE (Normaliz-Normaliz-v3.8.3_GH0.tar.gz) = 7960512
+TIMESTAMP = 1581692950
+SHA256 (Normaliz-Normaliz-v3.8.4_GH0.tar.gz) = 4aa76a4b367dc37c808e4e376ed5e875f5ad2c211a948c101e8b02a485fb4915
+SIZE (Normaliz-Normaliz-v3.8.4_GH0.tar.gz) = 8005040
diff --git a/math/moab/Makefile b/math/moab/Makefile
index 416f0942353..8d4e109d022 100644
--- a/math/moab/Makefile
+++ b/math/moab/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	moab
-DISTVERSION=	5.0.0
-PORTREVISION=	7
+DISTVERSION=	5.1.0
 CATEGORIES=	math
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 
@@ -23,7 +22,7 @@ CMAKE_ARGS=	-DBLAS_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so -DLAPACK_LIB
 
 BB_ACCOUNT=	fathomteam
 BB_PROJECT=	${PORTNAME}
-BB_COMMIT=	c4eed56fd6d2
+BB_COMMIT=	7bde9dfb84a8
 
 WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
 
diff --git a/math/moab/distinfo b/math/moab/distinfo
index e7470b2d8c0..737a33e004d 100644
--- a/math/moab/distinfo
+++ b/math/moab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1543026884
-SHA256 (moab-5.0.0.tar.gz) = 80fd376e71bc40b1cdf1c5ebd9c14e8cfe185e7554ff352431cbcb82a44920e3
-SIZE (moab-5.0.0.tar.gz) = 12370425
+TIMESTAMP = 1581781766
+SHA256 (moab-5.1.0.tar.gz) = e5f5b3dfb49e5182c69cadd67caf33708a9d54f9e97f21b641325f56e90f9939
+SIZE (moab-5.1.0.tar.gz) = 14226554
diff --git a/math/moab/pkg-plist b/math/moab/pkg-plist
index 4e8d795b5a6..8c20faa3342 100644
--- a/math/moab/pkg-plist
+++ b/math/moab/pkg-plist
@@ -76,6 +76,7 @@ include/moab/NestedRefine.hpp
 include/moab/NestedRefineTemplates.hpp
 include/moab/OrientedBox.hpp
 include/moab/OrientedBoxTreeTool.hpp
+include/moab/ParCommGraph.hpp
 %%MPI%%include/moab/ParallelComm.hpp
 %%MPI%%include/moab/ParallelData.hpp
 %%MPI%%include/moab/ParallelMergeMesh.hpp
@@ -122,12 +123,13 @@ include/moab/verdict/VerdictWrapper.hpp
 lib/cmake/MOAB/MOABConfig.cmake
 lib/cmake/MOAB/MOABTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/MOAB/MOABTargets.cmake
+lib/cmake/MOAB/ResolveCompilerPaths.cmake
 lib/iMesh-Defs.inc
 lib/libMOAB.so
 lib/libMOAB.so.5
-lib/libMOAB.so.5.0.0
+lib/libMOAB.so.5.1.0
 lib/libiMesh.so
 lib/libiMesh.so.5
-lib/libiMesh.so.5.0.0
+lib/libiMesh.so.5.1.0
 %%MPI%%lib/libmbcoupler.so
 lib/moab.make
diff --git a/math/mppp/Makefile b/math/mppp/Makefile
index 865737c4f1e..bc7b009d4a2 100644
--- a/math/mppp/Makefile
+++ b/math/mppp/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mppp
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.17
+DISTVERSION=	0.18
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/math/mppp/distinfo b/math/mppp/distinfo
index 4eeea66990c..bec2b3a6760 100644
--- a/math/mppp/distinfo
+++ b/math/mppp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1570314983
-SHA256 (bluescarni-mppp-v0.17_GH0.tar.gz) = 828b1b719c915e021641c6837d537a5de0c9f6977ec5abd4046d1be1cd1de351
-SIZE (bluescarni-mppp-v0.17_GH0.tar.gz) = 1400253
+TIMESTAMP = 1581781831
+SHA256 (bluescarni-mppp-v0.18_GH0.tar.gz) = 05c8585ed76be1d230b2a5243dd911481e8be9bd204433fa8e6cfe93d6ac0b15
+SIZE (bluescarni-mppp-v0.18_GH0.tar.gz) = 1418389
diff --git a/math/mppp/pkg-plist b/math/mppp/pkg-plist
index db6b52d026c..75635d69a55 100644
--- a/math/mppp/pkg-plist
+++ b/math/mppp/pkg-plist
@@ -2,8 +2,8 @@ include/mp++/concepts.hpp
 include/mp++/config.hpp
 include/mp++/detail/fwd_decl.hpp
 include/mp++/detail/gmp.hpp
+include/mp++/detail/integer_literals.hpp
 include/mp++/detail/mpfr.hpp
-include/mp++/detail/quadmath.hpp
 include/mp++/detail/type_traits.hpp
 include/mp++/detail/utils.hpp
 include/mp++/detail/visibility.hpp
@@ -23,5 +23,5 @@ lib/cmake/mp++/mp++-config.cmake
 lib/cmake/mp++/mp++_export-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/mp++/mp++_export.cmake
 lib/libmp++.so
-lib/libmp++.so.3
-lib/libmp++.so.3.0
+lib/libmp++.so.4
+lib/libmp++.so.4.0
diff --git a/math/py-basemap/Makefile b/math/py-basemap/Makefile
deleted file mode 100644
index ae73067200e..00000000000
--- a/math/py-basemap/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# Created by: mainland@apeiron.net
-# $FreeBSD$
-
-PORTNAME=	basemap
-PORTVERSION=	1.0.7
-PORTREVISION=	4
-CATEGORIES=	math python
-MASTER_SITES=	SF/matplotlib/matplotlib-toolkits/${PORTNAME}-${PORTVERSION}
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	Plots data on map projections with boundaries
-
-LICENSE=	GPLv2 LGPL21 MIT
-LICENSE_COMB=	multi
-
-DEPRECATED=	Deprecated upstream
-EXPIRATION_DATE=	2020-02-14
-
-BUILD_DEPENDS=	${PYNUMPY}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
-LIB_DEPENDS=	libgeos.so:graphics/geos
-
-USES=		python:2.7
-USE_PYTHON=	autoplist distutils
-
-DATADIR=	${PREFIX}/share/py-${PORTNAME}-data
-EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
-
-MAKE_ENV=	BASEMAP_DATA_PATH=${DATADIR}
-
-OPTIONS_DEFINE=	EXAMPLES
-
-PORTEXAMPLES=	*
-
-post-patch:
-	@${GREP} -lR "share/basemap" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
-		-e "s,share/basemap,share/py-basemap-data,g"
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_geoslib.so
-	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mpl_toolkits/basemap/_proj.so
-
-.include <bsd.port.mk>
diff --git a/math/py-basemap/distinfo b/math/py-basemap/distinfo
deleted file mode 100644
index 57a0667a621..00000000000
--- a/math/py-basemap/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (basemap-1.0.7.tar.gz) = e07ec2e0d63b24c9aed25a09fe8aff2598f82a85da8db74190bac81cbf104531
-SIZE (basemap-1.0.7.tar.gz) = 129694711
diff --git a/math/py-basemap/pkg-descr b/math/py-basemap/pkg-descr
deleted file mode 100644
index 9b89f1476f8..00000000000
--- a/math/py-basemap/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Plots data on map projections (with continental and political boundaries).
-
-WWW: http://matplotlib.sourceforge.net/matplotlib.toolkits.basemap.basemap.html
diff --git a/misc/cheat/Makefile b/misc/cheat/Makefile
index cb77b8705b5..fd588f0a3be 100644
--- a/misc/cheat/Makefile
+++ b/misc/cheat/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cheat
-DISTVERSION=	3.5.1
+DISTVERSION=	3.6.0
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -21,9 +21,7 @@ GH_TUPLE=	\
 		go-yaml:yaml:9f9df34309c0:go_yaml_yaml/vendor/gopkg.in/yaml.v1 \
 		go-yaml:yaml:v2.2.8:go_yaml_yaml_1/vendor/gopkg.in/yaml.v2 \
 		golang:sys:b77594299b42:golang_sys/vendor/golang.org/x/sys \
-		mattn:go-colorable:v0.0.9:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
-		mgutz:ansi:9520e82c474b:mgutz_ansi/vendor/github.com/mgutz/ansi \
 		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir
 GO_TARGET=	./cmd/${PORTNAME}
 
diff --git a/misc/cheat/distinfo b/misc/cheat/distinfo
index 61787d2b514..77f60a60691 100644
--- a/misc/cheat/distinfo
+++ b/misc/cheat/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1580713243
-SHA256 (cheat-cheat-3.5.1_GH0.tar.gz) = 12621c762c8bc8edae27ba544dda5b721bffd0eafa4837f352593704ae7d23e2
-SIZE (cheat-cheat-3.5.1_GH0.tar.gz) = 2018800
+TIMESTAMP = 1581871988
+SHA256 (cheat-cheat-3.6.0_GH0.tar.gz) = 8441c94d12b6a6f088818c8cabd91f75bc583bee3c66dac7a53851ae1032862f
+SIZE (cheat-cheat-3.6.0_GH0.tar.gz) = 2010195
 SHA256 (alecthomas-chroma-v0.7.1_GH0.tar.gz) = 962d3f29a445b07ad86bb596f447d9dd572da5073ac99c10eef4066580aa1d26
 SIZE (alecthomas-chroma-v0.7.1_GH0.tar.gz) = 597331
 SHA256 (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 7ebff38d382142f9220d2cfcb4731d0ae90cdef71238c94a15c35f8aa746007f
@@ -17,11 +17,7 @@ SHA256 (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 9632d0760e9a07c414f2b2b6cd453d6225e42e
 SIZE (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 72732
 SHA256 (golang-sys-b77594299b42_GH0.tar.gz) = 484bf05a828f18a9ea48f32b64322d6cc8e716b5cbfd455be72f445db8495b82
 SIZE (golang-sys-b77594299b42_GH0.tar.gz) = 1534631
-SHA256 (mattn-go-colorable-v0.0.9_GH0.tar.gz) = 703db7bd13f84446bb06a7f075cf6b21d65b828cd6831dc9069e28b564bdfb87
-SIZE (mattn-go-colorable-v0.0.9_GH0.tar.gz) = 7593
 SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
 SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
-SHA256 (mgutz-ansi-9520e82c474b_GH0.tar.gz) = f9203c71aceb8b7ffa87181fd8f51dc69acce3d2161c4c017ea92c6840f85093
-SIZE (mgutz-ansi-9520e82c474b_GH0.tar.gz) = 4876
 SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
 SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362
diff --git a/misc/libiio/Makefile b/misc/libiio/Makefile
index 9cc347b2373..70073757bc5 100644
--- a/misc/libiio/Makefile
+++ b/misc/libiio/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libiio
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.18
+DISTVERSION=	0.19
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/misc/libiio/distinfo b/misc/libiio/distinfo
index e006d1da89f..67ee095fb10 100644
--- a/misc/libiio/distinfo
+++ b/misc/libiio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556957735
-SHA256 (analogdevicesinc-libiio-v0.18_GH0.tar.gz) = 4a0b0908a5326e28b7c767a85e3c0b5a8c1c6d6e85735714449bb66e5a5a04fa
-SIZE (analogdevicesinc-libiio-v0.18_GH0.tar.gz) = 199857
+TIMESTAMP = 1581739187
+SHA256 (analogdevicesinc-libiio-v0.19_GH0.tar.gz) = 81c414d5c47b715d9bc9275b9fabbfd9e9483e60c035f3001b5977932049595d
+SIZE (analogdevicesinc-libiio-v0.19_GH0.tar.gz) = 225962
diff --git a/misc/libiio/files/patch-CMakeLists.txt b/misc/libiio/files/patch-CMakeLists.txt
index b4b13494de0..979b1e9ac9c 100644
--- a/misc/libiio/files/patch-CMakeLists.txt
+++ b/misc/libiio/files/patch-CMakeLists.txt
@@ -1,9 +1,18 @@
---- CMakeLists.txt.orig	2019-02-09 19:52:30 UTC
+--- CMakeLists.txt.orig	2020-02-14 09:59:16 UTC
 +++ CMakeLists.txt
-@@ -310,7 +310,7 @@ endif()
- #set(SETUP_PY ${CMAKE_CURRENT_SOURCE_DIR}/bindings/python/setup.py)
- #configure_file(python/setup.py.in ${SETUP_PY} @ONLY)
- 
+@@ -260,7 +260,7 @@ if(WITH_NETWORK_BACKEND)
+ 		set(HAVE_AVAHI ON)
+ 		set(AVAHI_LIBRARIES ${AVAHI_CLIENT_LIBRARIES} ${AVAHI_COMMON_LIBRARIES})
+ 		set(LIBS_TO_LINK ${LIBS_TO_LINK} ${AVAHI_LIBRARIES})
+-		set(AVAHI_SERVICE_INSTALL_DIR /etc/avahi/services/ CACHE PATH "default install path for Avahi service files")
++		set(AVAHI_SERVICE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/etc/avahi/services/ CACHE PATH "default install path for Avahi service files")
+ 	else()
+ 		message(STATUS "Building without Avahi (zeroconf) support")
+ 	endif()
+@@ -338,7 +338,7 @@ endif()
+ option(CSHARP_BINDINGS "Install C# bindings" OFF)
+ option(PYTHON_BINDINGS "Install Python bindings" OFF)
+ option(MATLAB_BINDINGS "Build MATLAB bindings" OFF)
 -add_subdirectory(bindings)
 +#add_subdirectory(bindings)
  
diff --git a/misc/libiio/pkg-plist b/misc/libiio/pkg-plist
index f7057ef3827..6db94d280f8 100644
--- a/misc/libiio/pkg-plist
+++ b/misc/libiio/pkg-plist
@@ -5,8 +5,9 @@ bin/iio_info
 bin/iio_readdev
 bin/iio_reg
 bin/iio_writedev
+etc/avahi/services/iio.service
 include/iio.h
 lib/libiio.so
 lib/libiio.so.0
-lib/libiio.so.0.18
+lib/libiio.so.0.19
 libdata/pkgconfig/libiio.pc
diff --git a/misc/perkeep/Makefile b/misc/perkeep/Makefile
index c40930ca9df..fc4439881d7 100644
--- a/misc/perkeep/Makefile
+++ b/misc/perkeep/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	perkeep
 DISTVERSION=	0.10.20190926
+PORTREVISION=	1
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -13,69 +14,15 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		go:modules
 USE_GITHUB=	yes
 GH_TAGNAME=	d342b0e # master branch doesn't contain 0.10
-GH_TUPLE=	\
-		FiloSottile:b2:b197f7a2c317:filosottile_b2/vendor/github.com/FiloSottile/b2 \
-		aws:aws-sdk-go:v1.14.31:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
-		bradfitz:latlong:b74550508561:bradfitz_latlong/vendor/github.com/bradfitz/latlong \
-		census-instrumentation:opencensus-go:v0.21.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
-		cznic:fileutil:6a051e75936f:cznic_fileutil/vendor/github.com/cznic/fileutil \
-		cznic:internal:4747030f7cf2:cznic_internal/vendor/github.com/cznic/internal \
-		cznic:kv:892ccf731fb7:cznic_kv/vendor/github.com/cznic/kv \
-		cznic:lldb:v1.1.0:cznic_lldb/vendor/github.com/cznic/lldb \
-		cznic:mathutil:5455a562bccb:cznic_mathutil/vendor/github.com/cznic/mathutil \
-		cznic:sortutil:4c7342852e65:cznic_sortutil/vendor/github.com/cznic/sortutil \
-		cznic:zappy:2533cb5b45cc:cznic_zappy/vendor/github.com/cznic/zappy \
-		edsrzf:mmap-go:0bce6a688712:edsrzf_mmap_go/vendor/github.com/edsrzf/mmap-go \
-		garyburd:go-oauth:bca2e7f09a17:garyburd_go_oauth/vendor/github.com/garyburd/go-oauth \
-		go-ini:ini:v1.38.1:go_ini_ini/vendor/github.com/go-ini/ini \
-		go-mgo:mgo:3f83fa500528:go_mgo_mgo/vendor/gopkg.in/mgo.v2 \
-		go-sql-driver:mysql:99ff426eb706:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
-		go4org:go4:ce4c26f7be8e:go4org_go4/vendor/go4.org \
-		golang:appengine:v1.6.0:golang_appengine/vendor/google.golang.org/appengine \
-		golang:crypto:22d7a77e9e5f:golang_crypto/vendor/golang.org/x/crypto \
-		golang:image:f03afa92d3ff:golang_image/vendor/golang.org/x/image \
-		golang:net:f3200d17e092:golang_net/vendor/golang.org/x/net \
-		golang:oauth2:aaccbc9213b0:golang_oauth2/vendor/golang.org/x/oauth2 \
-		golang:protobuf:v1.3.1:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:snappy:553a64147049:golang_snappy/vendor/github.com/golang/snappy \
-		golang:sync:112230192c58:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:3626398d7749:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
-		golang:time:9d24e82272b4:golang_time/vendor/golang.org/x/time \
-		google:go-genproto:c2c4e71fbf69:google_go_genproto/vendor/google.golang.org/genproto \
-		googleapis:gax-go:v2.0.4:googleapis_gax_go/vendor/github.com/googleapis/gax-go/v2 \
-		googleapis:google-api-go-client:v0.5.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
-		googleapis:google-cloud-go:v0.39.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
-		gopherjs:gopherjs:0766667cb4d1:gopherjs_gopherjs/vendor/github.com/gopherjs/gopherjs \
-		gopherjs:jquery:3ba2b901425e:gopherjs_jquery/vendor/github.com/gopherjs/jquery \
-		gorilla:websocket:v1.4.0:gorilla_websocket/vendor/github.com/gorilla/websocket \
-		grpc:grpc-go:v1.21.0:grpc_grpc_go/vendor/google.golang.org/grpc \
-		hashicorp:golang-lru:v0.5.1:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
-		hjfreyer:taglib-go:0ef8bba9c41b:hjfreyer_taglib_go/vendor/github.com/hjfreyer/taglib-go \
-		jmespath:go-jmespath:0b12d6b521d8:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
-		kr:fs:v0.1.0:kr_fs/vendor/github.com/kr/fs \
-		lib:pq:v1.1.1:lib_pq/vendor/github.com/lib/pq \
-		mailgun:mailgun-go:17e8bd11e87c:mailgun_mailgun_go/vendor/github.com/mailgun/mailgun-go \
-		mattn:go-mastodon:8f6192e26b66:mattn_go_mastodon/vendor/github.com/mattn/go-mastodon \
-		mattn:go-sqlite3:v1.6.0:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
-		miekg:dns:3f1f7c8ec9ea:miekg_dns/vendor/github.com/miekg/dns \
-		nf:cr2:05d46fef4f2f:nf_cr2/vendor/github.com/nf/cr2 \
-		pkg:errors:v0.8.0:pkg_errors/vendor/github.com/pkg/errors \
-		pkg:sftp:5bf2a174b604:pkg_sftp/vendor/github.com/pkg/sftp \
-		plaid:plaid-go:02b6af68061b:plaid_plaid_go/vendor/github.com/plaid/plaid-go \
-		russross:blackfriday:v2.0.0:russross_blackfriday/vendor/github.com/russross/blackfriday \
-		rwcarlsen:goexif:8d986c03457a:rwcarlsen_goexif/vendor/github.com/rwcarlsen/goexif \
-		shurcooL:sanitized_anchor_name:11a20b799bf2:shurcool_sanitized_anchor_name/vendor/github.com/shurcooL/sanitized_anchor_name \
-		syndtr:goleveldb:db3ee9ee8931:syndtr_goleveldb/vendor/github.com/syndtr/goleveldb \
-		tgulacsi:picago:9e1ac2306c70:tgulacsi_picago/vendor/github.com/tgulacsi/picago \
-		tomnomnom:linkheader:02ca5825eb80:tomnomnom_linkheader/vendor/github.com/tomnomnom/linkheader
-		#	::1d34785eb915:group_name/vendor/rsc.io/pdf
-		#	::371fbbdaa898:group_name/vendor/bazil.org/fuse
-		#	::v0.1.0:group_name/vendor/rsc.io/qr
+
 GO_TARGET=	${EXES:S/^/.\/cmd\//}
 
 EXES=		pk pk-deploy pk-devimport pk-get pk-mount pk-put
 
 PLIST_FILES=	${EXES:S/^/bin\//}
 
+# https://github.com/perkeep/perkeep/issues/1302
+post-extract:
+	@${RM} ${WRKSRC}/vendor/modules.txt
+
 .include <bsd.port.mk>
diff --git a/misc/perkeep/distinfo b/misc/perkeep/distinfo
index 4ca84c8407a..273fcd57ee1 100644
--- a/misc/perkeep/distinfo
+++ b/misc/perkeep/distinfo
@@ -1,113 +1,3 @@
-TIMESTAMP = 1575087226
+TIMESTAMP = 1581689839
 SHA256 (perkeep-perkeep-0.10.20190926-d342b0e_GH0.tar.gz) = 925604d62da40337b070e890acf5011b74426d42ccd2f5fce8b32c84a5998e8d
 SIZE (perkeep-perkeep-0.10.20190926-d342b0e_GH0.tar.gz) = 14653448
-SHA256 (FiloSottile-b2-b197f7a2c317_GH0.tar.gz) = 393780eb0b7164a616b8b04072ae413803e94b24d1465bf31815f62de0d921ff
-SIZE (FiloSottile-b2-b197f7a2c317_GH0.tar.gz) = 96819
-SHA256 (aws-aws-sdk-go-v1.14.31_GH0.tar.gz) = 74656ee62a7049b32225027ba3820a39ea0c5f36784f378aff115d55ddeaae32
-SIZE (aws-aws-sdk-go-v1.14.31_GH0.tar.gz) = 8690105
-SHA256 (bradfitz-latlong-b74550508561_GH0.tar.gz) = 4e0fb9169c20eba9eda2d88b5dc1daac3d08e7eecf2860e122f1b3a4ee557691
-SIZE (bradfitz-latlong-b74550508561_GH0.tar.gz) = 222284
-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 (cznic-fileutil-6a051e75936f_GH0.tar.gz) = 601f843ebc630229ba560794d12ae541d901fba6a9c8e3fbe6298d09fd4c91a0
-SIZE (cznic-fileutil-6a051e75936f_GH0.tar.gz) = 31858
-SHA256 (cznic-internal-4747030f7cf2_GH0.tar.gz) = 83b8429a6c055770e225fb045ff01ab5b792c60833bd8a482a1bf7ff7dcca938
-SIZE (cznic-internal-4747030f7cf2_GH0.tar.gz) = 9868
-SHA256 (cznic-kv-892ccf731fb7_GH0.tar.gz) = f0099410d58351036724fce63cfaf354836e1c07f5924b40acda2dc8d713149d
-SIZE (cznic-kv-892ccf731fb7_GH0.tar.gz) = 21527
-SHA256 (cznic-lldb-v1.1.0_GH0.tar.gz) = 8c5821910111f9d9d02d8fbdbd01b29a799312ccd0d02c2cbeeedc934fb922cc
-SIZE (cznic-lldb-v1.1.0_GH0.tar.gz) = 201563
-SHA256 (cznic-mathutil-5455a562bccb_GH0.tar.gz) = 4ab5467a671728162071312727577a438bddb3ce3f21a71dfb5f7635f2309727
-SIZE (cznic-mathutil-5455a562bccb_GH0.tar.gz) = 112966
-SHA256 (cznic-sortutil-4c7342852e65_GH0.tar.gz) = 4386fce6934eb62d2cacbf8f2312b349113d543a5a2d5361b803170ddd210e37
-SIZE (cznic-sortutil-4c7342852e65_GH0.tar.gz) = 4343
-SHA256 (cznic-zappy-2533cb5b45cc_GH0.tar.gz) = b026ca5447f4a5eab10c4a82673820fb3bce387a83d00a44082ef1b9104b7e97
-SIZE (cznic-zappy-2533cb5b45cc_GH0.tar.gz) = 31399
-SHA256 (edsrzf-mmap-go-0bce6a688712_GH0.tar.gz) = 53c8ab3c8b206a8dd7569238b6bd60dd8be360ca986cb484492aad904ec8eaa6
-SIZE (edsrzf-mmap-go-0bce6a688712_GH0.tar.gz) = 5495
-SHA256 (garyburd-go-oauth-bca2e7f09a17_GH0.tar.gz) = 82b63ce1e960622c0683787cefef0626cf45696de2da91f5be080e56ec388f63
-SIZE (garyburd-go-oauth-bca2e7f09a17_GH0.tar.gz) = 20259
-SHA256 (go-ini-ini-v1.38.1_GH0.tar.gz) = aa416cdb424b58dd61c8abb25281c91d0ef03e4716fb695d2a9f6d7599099c9a
-SIZE (go-ini-ini-v1.38.1_GH0.tar.gz) = 34488
-SHA256 (go-mgo-mgo-3f83fa500528_GH0.tar.gz) = 8f6051f4e5634ae87d5dc7683e84f0345f3fb6a708fd6d15240a87f377807360
-SIZE (go-mgo-mgo-3f83fa500528_GH0.tar.gz) = 376760
-SHA256 (go-sql-driver-mysql-99ff426eb706_GH0.tar.gz) = d321362dce390995d368f22d1ad6d05eecb616df1212415ce68ae6ae0b40dfa9
-SIZE (go-sql-driver-mysql-99ff426eb706_GH0.tar.gz) = 82567
-SHA256 (go4org-go4-ce4c26f7be8e_GH0.tar.gz) = 5af4046806b3c65b1fb3d846acfa6f6a5faaa280e7792da0cba07b3864761e26
-SIZE (go4org-go4-ce4c26f7be8e_GH0.tar.gz) = 140397
-SHA256 (golang-appengine-v1.6.0_GH0.tar.gz) = b2273441e2f02213d10acc4c5410662a13407a80589f74ff49353ffcae3f517f
-SIZE (golang-appengine-v1.6.0_GH0.tar.gz) = 332522
-SHA256 (golang-crypto-22d7a77e9e5f_GH0.tar.gz) = 099bb5d6e66c6988dda36b64cb0de93d06468e5edacbf118d51828b9959a76de
-SIZE (golang-crypto-22d7a77e9e5f_GH0.tar.gz) = 1685190
-SHA256 (golang-image-f03afa92d3ff_GH0.tar.gz) = cbe5553c4603e9960c2a9df3d2982e9677860606e03bfde811030a046899c863
-SIZE (golang-image-f03afa92d3ff_GH0.tar.gz) = 4875165
-SHA256 (golang-net-f3200d17e092_GH0.tar.gz) = 5b7f3441206d18e92393ccfda8f9033d6c4500aeb31d45de1bbe2f0bccad0aed
-SIZE (golang-net-f3200d17e092_GH0.tar.gz) = 1096621
-SHA256 (golang-oauth2-aaccbc9213b0_GH0.tar.gz) = 00179a605141c26dbc6d4e17e85ee7aa4662d03707cee279704fe560b9737a48
-SIZE (golang-oauth2-aaccbc9213b0_GH0.tar.gz) = 45330
-SHA256 (golang-protobuf-v1.3.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf
-SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884
-SHA256 (golang-snappy-553a64147049_GH0.tar.gz) = 7e322fd3c30642ad1297c9163f86b4775e522e9320cdda09d49bc2fe56428213
-SIZE (golang-snappy-553a64147049_GH0.tar.gz) = 62046
-SHA256 (golang-sync-112230192c58_GH0.tar.gz) = 6d98880ea18369550cb12d7011df8e4b21c5b7588268a412b863b5c9d2fa0313
-SIZE (golang-sync-112230192c58_GH0.tar.gz) = 16832
-SHA256 (golang-sys-3626398d7749_GH0.tar.gz) = ab42207a254556f8addf7b1cd4352bba50b477bc72a3c7d456e17e8525ffa886
-SIZE (golang-sys-3626398d7749_GH0.tar.gz) = 1423715
-SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
-SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
-SHA256 (golang-time-9d24e82272b4_GH0.tar.gz) = 7452a7b879ee5984709b2165f6212ad9464977f06d440140b8690e61695aa404
-SIZE (golang-time-9d24e82272b4_GH0.tar.gz) = 9313
-SHA256 (google-go-genproto-c2c4e71fbf69_GH0.tar.gz) = 710e51dff1c47134759459f2068690c8d4c1ca37adfb5633762cff5081bbccc8
-SIZE (google-go-genproto-c2c4e71fbf69_GH0.tar.gz) = 4027130
-SHA256 (googleapis-gax-go-v2.0.4_GH0.tar.gz) = 9c02744a9260cb20efd22cad068c521029c2b0cc13adaaf768d1f75b53e2a20d
-SIZE (googleapis-gax-go-v2.0.4_GH0.tar.gz) = 14335
-SHA256 (googleapis-google-api-go-client-v0.5.0_GH0.tar.gz) = 518691b284fc806ae4fda9dc2d8eb2ce6f9d26bbb5e512b3e0e09604e5b4e0db
-SIZE (googleapis-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 (gopherjs-gopherjs-0766667cb4d1_GH0.tar.gz) = bc4d58aabc0e9958a9b8f9ebd835f1deabe5061750d070fc1e2e41fe6e6d643a
-SIZE (gopherjs-gopherjs-0766667cb4d1_GH0.tar.gz) = 217279
-SHA256 (gopherjs-jquery-3ba2b901425e_GH0.tar.gz) = 701bb5f0d785a5163c01ad8a3c26e04057a53298e58d4116d9a4fac67362ab38
-SIZE (gopherjs-jquery-3ba2b901425e_GH0.tar.gz) = 147864
-SHA256 (gorilla-websocket-v1.4.0_GH0.tar.gz) = 2b5743c72bd0930c5a80e49c0138b5b7d27fa7c085efd0c86805cccfa7220c9d
-SIZE (gorilla-websocket-v1.4.0_GH0.tar.gz) = 50228
-SHA256 (grpc-grpc-go-v1.21.0_GH0.tar.gz) = 2c695d1cd4690c80c006116934ba98f2b41dd1d34dbee35c4f094e38db6d5e82
-SIZE (grpc-grpc-go-v1.21.0_GH0.tar.gz) = 731305
-SHA256 (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 3bf57512af746dc0338651ba1c35c65fe907ff214ccb22d679539f7ea791511e
-SIZE (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 12982
-SHA256 (hjfreyer-taglib-go-0ef8bba9c41b_GH0.tar.gz) = 8b8629367afc439794f655de74deb001eedb8539b5750e5f575a34ab35e207f2
-SIZE (hjfreyer-taglib-go-0ef8bba9c41b_GH0.tar.gz) = 188218
-SHA256 (jmespath-go-jmespath-0b12d6b521d8_GH0.tar.gz) = caa142e366d0b10e430a743dbc0413a4bc0f1317e33f9b133f202aea5802fa78
-SIZE (jmespath-go-jmespath-0b12d6b521d8_GH0.tar.gz) = 48310
-SHA256 (kr-fs-v0.1.0_GH0.tar.gz) = 5743b4ec1e7c4a336c40c9936989174dc9bfc1fb19640d7308c04892453f6c8d
-SIZE (kr-fs-v0.1.0_GH0.tar.gz) = 4405
-SHA256 (lib-pq-v1.1.1_GH0.tar.gz) = bc19f104f21e71536f43d99c375355bfdee159f967050af690a51ef588ab0e37
-SIZE (lib-pq-v1.1.1_GH0.tar.gz) = 95305
-SHA256 (mailgun-mailgun-go-17e8bd11e87c_GH0.tar.gz) = 3fa3875d220efb4943d0ec19dc0e4a5704d6b41e7af8423d4da9ea79259dc117
-SIZE (mailgun-mailgun-go-17e8bd11e87c_GH0.tar.gz) = 44665
-SHA256 (mattn-go-mastodon-8f6192e26b66_GH0.tar.gz) = 0d2ac421ce8c2fffefd52a88e2ad738dec1ab14c3d00a493425f80937f61181d
-SIZE (mattn-go-mastodon-8f6192e26b66_GH0.tar.gz) = 35814
-SHA256 (mattn-go-sqlite3-v1.6.0_GH0.tar.gz) = 0173610c43ed3a188009a5cd83ccaa6da321965f6daa7b9e1b379a0ad0dd3dc4
-SIZE (mattn-go-sqlite3-v1.6.0_GH0.tar.gz) = 2071502
-SHA256 (miekg-dns-3f1f7c8ec9ea_GH0.tar.gz) = e92b9d2fd5d4855a970f1f20bc522353c9d4ceb0d96721e0c79171cc3a3af2e1
-SIZE (miekg-dns-3f1f7c8ec9ea_GH0.tar.gz) = 168412
-SHA256 (nf-cr2-05d46fef4f2f_GH0.tar.gz) = d5ee27aaf54da5b61b931c4ac5f7bbe88495e47062d3d731a1cc02ce4d087997
-SIZE (nf-cr2-05d46fef4f2f_GH0.tar.gz) = 7951
-SHA256 (pkg-errors-v0.8.0_GH0.tar.gz) = bacf6c58e490911398cee61742ddc6a90c560733e4c9dcb3d867b17a894c9dd5
-SIZE (pkg-errors-v0.8.0_GH0.tar.gz) = 11344
-SHA256 (pkg-sftp-5bf2a174b604_GH0.tar.gz) = 1a8d403c01977c1b2acc8fbb975c3ac25985dd1f838ded81829a346a5a581aaf
-SIZE (pkg-sftp-5bf2a174b604_GH0.tar.gz) = 66942
-SHA256 (plaid-plaid-go-02b6af68061b_GH0.tar.gz) = fbfa6b00839ab5dc259ee21641317bde3de5f917855e9e7781eaf425d701a336
-SIZE (plaid-plaid-go-02b6af68061b_GH0.tar.gz) = 8570
-SHA256 (russross-blackfriday-v2.0.0_GH0.tar.gz) = da9c7e713b2c97300cab6c1545726950d05ea2093afe13c94c1d3f2a7844e3f5
-SIZE (russross-blackfriday-v2.0.0_GH0.tar.gz) = 77677
-SHA256 (rwcarlsen-goexif-8d986c03457a_GH0.tar.gz) = 38bd77ade5eb92eab570e5b1cfdf9e81356c23b049e20c29a9e3aeb217f59616
-SIZE (rwcarlsen-goexif-8d986c03457a_GH0.tar.gz) = 938992
-SHA256 (shurcooL-sanitized_anchor_name-11a20b799bf2_GH0.tar.gz) = 8d67e0cf9d7aa0908b0ea5b14d7957299b0b960277f18a8dc89f18cd7cb97201
-SIZE (shurcooL-sanitized_anchor_name-11a20b799bf2_GH0.tar.gz) = 1263
-SHA256 (syndtr-goleveldb-db3ee9ee8931_GH0.tar.gz) = cb1d8483da4f6224ab2cccc159ee7fd15a720fd57484a7eafd46778e22e63e0d
-SIZE (syndtr-goleveldb-db3ee9ee8931_GH0.tar.gz) = 138873
-SHA256 (tgulacsi-picago-9e1ac2306c70_GH0.tar.gz) = 28debd1f422a30f38465bdf0d260cbc92848ab6a7afa8fe4ae63166f2192a22e
-SIZE (tgulacsi-picago-9e1ac2306c70_GH0.tar.gz) = 307985
-SHA256 (tomnomnom-linkheader-02ca5825eb80_GH0.tar.gz) = 0905f5752137e019e22d2f0c6493ae969ad2cc944ceef58c2085a948c9c99e9d
-SIZE (tomnomnom-linkheader-02ca5825eb80_GH0.tar.gz) = 4318
diff --git a/misc/py-cinder/Makefile b/misc/py-cinder/Makefile
index 25acec224f5..1d4500c1a98 100644
--- a/misc/py-cinder/Makefile
+++ b/misc/py-cinder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cinder
 PORTVERSION=	12.0.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	misc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -33,7 +33,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.31.0:devel/py-oslo.middleware@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.30.0:devel/py-oslo.policy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.23.0:devel/py-oslo.privsep@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.reports>=1.18.0:devel/py-oslo.reports@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.8.0:devel/py-oslo.rootwrap@${PY_FLAVOR} \
@@ -128,12 +127,14 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}castellan1>=0.16.0:devel/py-castellan1@${PY
 		${PYTHON_PKGNAMEPREFIX}os-win4>=3.0.0:devel/py-os-win4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.db6>=4.27.0:devel/py-oslo.db6@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.messaging10>=5.29.0:devel/py-oslo.messaging10@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.policy2>=1.30.0:devel/py-oslo.policy2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}taskflow3>=2.16.0:devel/py-taskflow3@${PY_FLAVOR}
 .else
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}castellan>=0.16.0:devel/py-castellan@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}os-win>=3.0.0:devel/py-os-win@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.db>=4.27.0:devel/py-oslo.db@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.29.0:devel/py-oslo.messaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.30.0:devel/py-oslo.policy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}taskflow>=2.16.0:devel/py-taskflow@${PY_FLAVOR}
 .endif
 
diff --git a/misc/py-gluoncv/Makefile b/misc/py-gluoncv/Makefile
index e1f95929cec..7c681f4e3c7 100644
--- a/misc/py-gluoncv/Makefile
+++ b/misc/py-gluoncv/Makefile
@@ -23,7 +23,7 @@ PY_DEPENDS=	${PYNUMPY} \
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
-USES=		python localbase
+USES=		compiler:c11 python localbase
 USE_GITHUB=	yes
 GH_ACCOUNT=	dmlc
 GH_PROJECT=	gluon-cv
diff --git a/misc/vxl/Makefile b/misc/vxl/Makefile
index 49dd74b33c2..1988d9001c6 100644
--- a/misc/vxl/Makefile
+++ b/misc/vxl/Makefile
@@ -9,9 +9,6 @@ CATEGORIES=	misc science
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ libraries for computer vision and image understanding
 
-LICENSE=	MPL20
-xLICENSE_FILE=	${WRKSRC}/../LICENSE
-
 LIB_DEPENDS=	libpng16.so:graphics/png \
 		libtiff.so:graphics/tiff
 
@@ -30,4 +27,12 @@ do-test:
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64" || ${ARCH} == "i386"
+PLIST_SUB+=	X86=""
+.else
+PLIST_SUB+=	X86="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/misc/vxl/pkg-plist b/misc/vxl/pkg-plist
index ab790ad1c34..a52527ee7ee 100644
--- a/misc/vxl/pkg-plist
+++ b/misc/vxl/pkg-plist
@@ -498,8 +498,8 @@ include/vxl/core/vil/vil_image_view.hxx
 include/vxl/core/vil/vil_image_view_base.h
 include/vxl/core/vil/vil_load.h
 include/vxl/core/vil/vil_math.h
-include/vxl/core/vil/vil_math_sse.h
-include/vxl/core/vil/vil_math_sse.hxx
+%%X86%%include/vxl/core/vil/vil_math_sse.h
+%%X86%%include/vxl/core/vil/vil_math_sse.hxx
 include/vxl/core/vil/vil_memory_chunk.h
 include/vxl/core/vil/vil_memory_image.h
 include/vxl/core/vil/vil_na.h
diff --git a/misc/ytree/Makefile b/misc/ytree/Makefile
index d7bfd07b55b..3fd81175d20 100644
--- a/misc/ytree/Makefile
+++ b/misc/ytree/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ytree
-DISTVERSION=	2.00
+DISTVERSION=	2.01
 CATEGORIES=	misc
 MASTER_SITES=	http://www.han.de/~werner/
 
diff --git a/misc/ytree/distinfo b/misc/ytree/distinfo
index 4297789d809..9c03062676a 100644
--- a/misc/ytree/distinfo
+++ b/misc/ytree/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576143711
-SHA256 (ytree-2.00.tar.gz) = da8ecaf8e15f8b0d3077ea88da8db9cd607f72ed2a51e91a24d6ef3ff017c6bf
-SIZE (ytree-2.00.tar.gz) = 124654
+TIMESTAMP = 1581680604
+SHA256 (ytree-2.01.tar.gz) = 272d0d1eb7b44a8f2ac2bb21596dfd800ade7e07cb2953ad9ab712df8b6ea281
+SIZE (ytree-2.01.tar.gz) = 124683
diff --git a/multimedia/Makefile b/multimedia/Makefile
index f70e7558e28..c80104f403d 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -359,7 +359,6 @@
     SUBDIR += recmpeg
     SUBDIR += recordmydesktop
     SUBDIR += replex
-    SUBDIR += rox-videothumbnail
     SUBDIR += rtmpdump
     SUBDIR += rubygem-av
     SUBDIR += rubygem-clutter-gstreamer
diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index 924ee2ef9a8..6c0e6417fec 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -3,8 +3,8 @@
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
 # XXX Switch to release after https://bugs.chromium.org/p/aomedia/issues/detail?id=2545
-DISTVERSION=	1.0.0-3078
-DISTVERSIONSUFFIX=	-g657cd9920
+DISTVERSION=	1.0.0-3087
+DISTVERSIONSUFFIX=	-ga964eea63
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo
index 7a8e401fff3..eccf1e15bc9 100644
--- a/multimedia/aom/distinfo
+++ b/multimedia/aom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581552947
-SHA256 (jbeich-aom-v1.0.0-3078-g657cd9920_GH0.tar.gz) = a252cd5b59690b1e7d0f260f8487b1068b25f9c30de6e9f614c4d9b4dfdfff4e
-SIZE (jbeich-aom-v1.0.0-3078-g657cd9920_GH0.tar.gz) = 3513027
+TIMESTAMP = 1581704115
+SHA256 (jbeich-aom-v1.0.0-3087-ga964eea63_GH0.tar.gz) = 0264e0c496a5b1988c081828b3c145a289f0d51b360fbdb81b855af27bebf592
+SIZE (jbeich-aom-v1.0.0-3087-ga964eea63_GH0.tar.gz) = 3514792
diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile
index 08da8793af5..6aaa10d508c 100644
--- a/multimedia/dvbcut/Makefile
+++ b/multimedia/dvbcut/Makefile
@@ -38,6 +38,8 @@ CXXFLAGS+=	-I${LOCALBASE}/include \
 QMAKE_SOURCE_PATH=${WRKSRC}/src
 QMAKE_ARGS=	LRELEASE="${LRELEASE}"
 
+PORTSCOUT=	limit:^[^-]*$$
+
 post-build:
 		@${SED} -e 's;@prefix@;${PREFIX};' \
 			< ${WRKSRC}/dvbcut.desktop.in \
diff --git a/multimedia/kodi-addon-inputstream.adaptive-devel/Makefile b/multimedia/kodi-addon-inputstream.adaptive-devel/Makefile
index 18abf7a68b7..c0f91ea05f7 100644
--- a/multimedia/kodi-addon-inputstream.adaptive-devel/Makefile
+++ b/multimedia/kodi-addon-inputstream.adaptive-devel/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	inputstream.adaptive
 DISTVERSION=	2.5.4
 DISTVERSIONSUFFIX=	-Matrix
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	kodi-addon-
 PKGNAMESUFFIX=	-devel
@@ -13,9 +14,9 @@ COMMENT=	Adaptive stream support for Kodi
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.GPL
 
-BUILD_DEPENDS=	kodi-devel>=19.0.a20200115:multimedia/kodi-devel
+BUILD_DEPENDS=	kodi-devel>=19.0.a20200215:multimedia/kodi-devel
 LIB_DEPENDS=	libexpat.so:textproc/expat2
-RUN_DEPENDS=	kodi-devel>=19.0.a20200115:multimedia/kodi-devel
+RUN_DEPENDS=	kodi-devel>=19.0.a20200215:multimedia/kodi-devel
 
 USES=		cmake
 USE_GITHUB=	yes
diff --git a/multimedia/kodi-addon-peripheral.joystick-devel/Makefile b/multimedia/kodi-addon-peripheral.joystick-devel/Makefile
index ff5a1d6754c..b4a63e2f12f 100644
--- a/multimedia/kodi-addon-peripheral.joystick-devel/Makefile
+++ b/multimedia/kodi-addon-peripheral.joystick-devel/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	peripheral.joystick
 PORTVERSION=	1.4.8
 DISTVERSIONSUFFIX=	-Leia
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	kodi-addon-
 PKGNAMESUFFIX=	-devel
@@ -15,10 +15,10 @@ COMMENT=	Joystick support for Kodi
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/joystick.h:devel/evdev-proto \
-		kodi-devel>=19.0.a20200115:multimedia/kodi-devel
+		kodi-devel>=19.0.a20200215:multimedia/kodi-devel
 LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml \
 		libudev.so:devel/libudev-devd
-RUN_DEPENDS=	kodi-devel>=19.0.a20200115:multimedia/kodi-devel
+RUN_DEPENDS=	kodi-devel>=19.0.a20200215:multimedia/kodi-devel
 
 USES=		cmake localbase
 USE_GITHUB=	yes
diff --git a/multimedia/kodi-addon-vfs.libarchive-devel/Makefile b/multimedia/kodi-addon-vfs.libarchive-devel/Makefile
index 6407068e818..7b226e74ab2 100644
--- a/multimedia/kodi-addon-vfs.libarchive-devel/Makefile
+++ b/multimedia/kodi-addon-vfs.libarchive-devel/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	vfs.libarchive
 DISTVERSION=	1.1.1
 DISTVERSIONSUFFIX=	-Matrix
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	kodi-addon-
 PKGNAMESUFFIX=	-devel
@@ -12,10 +13,10 @@ COMMENT=	VFS addon for Kodi to access archives directly
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	kodi-devel>=19.0.a20200115:multimedia/kodi-devel
+BUILD_DEPENDS=	kodi-devel>=19.0.a20200215:multimedia/kodi-devel
 LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
 		liblzo2.so:archivers/lzo2
-RUN_DEPENDS=	kodi-devel>=19.0.a20200115:multimedia/kodi-devel
+RUN_DEPENDS=	kodi-devel>=19.0.a20200215:multimedia/kodi-devel
 
 USES=		cmake libarchive ssl
 USE_GITHUB=	yes
diff --git a/multimedia/kodi-devel/Makefile b/multimedia/kodi-devel/Makefile
index 2aa48af5638..1a6d2e966ae 100644
--- a/multimedia/kodi-devel/Makefile
+++ b/multimedia/kodi-devel/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	kodi
-DISTVERSION=	19.0.a20200115
+DISTVERSION=	19.0.a20200215
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-devel
 
@@ -56,7 +56,7 @@ USES=		autoreconf:build cmake:noninja compiler:c++11-lang gettext gl \
 USE_GITHUB=	yes
 GH_ACCOUNT=	xbmc
 GH_PROJECT=	xbmc
-GH_TAGNAME=	f4f9d88a351310788ffb2cfda2a0b4610c25db49
+GH_TAGNAME=	e2b66f0db58cfa012c2cb64959565f3082439061
 USE_GL=		egl gl glu
 USE_GNOME=	libxml2 libxslt
 USE_JAVA=	yes
diff --git a/multimedia/kodi-devel/distinfo b/multimedia/kodi-devel/distinfo
index d455b3a3c07..724562e0ea2 100644
--- a/multimedia/kodi-devel/distinfo
+++ b/multimedia/kodi-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579168627
-SHA256 (xbmc-xbmc-19.0.a20200115-f4f9d88a351310788ffb2cfda2a0b4610c25db49_GH0.tar.gz) = ba9444b23b2c4ae75c629b97b3a203a82c74053502a4fe7192ec61fb325cdf5d
-SIZE (xbmc-xbmc-19.0.a20200115-f4f9d88a351310788ffb2cfda2a0b4610c25db49_GH0.tar.gz) = 50953993
+TIMESTAMP = 1581761857
+SHA256 (xbmc-xbmc-19.0.a20200215-e2b66f0db58cfa012c2cb64959565f3082439061_GH0.tar.gz) = df01786daa9bf7e7455b7783c5687cb459b1aec6a7a56b208827fc465f6f9e81
+SIZE (xbmc-xbmc-19.0.a20200215-e2b66f0db58cfa012c2cb64959565f3082439061_GH0.tar.gz) = 50684160
diff --git a/multimedia/rox-videothumbnail/Makefile b/multimedia/rox-videothumbnail/Makefile
deleted file mode 100644
index a9a2ad26960..00000000000
--- a/multimedia/rox-videothumbnail/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	rox-videothumbnail
-PORTVERSION=	0.1.14
-PORTREVISION=	4
-CATEGORIES=	multimedia
-MASTER_SITES=	http://www.kerofin.demon.co.uk/rox/
-DISTNAME=	VideoThumbnail-${PORTVERSION}
-
-MAINTAINER=	olgeni@FreeBSD.org
-COMMENT=	Video thumbnail provider for the ROX file manager
-
-DEPRECATED=	Old, uses EOLed python27
-EXPIRATION_DATE=	2020-02-16
-
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
-		${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib@${PY_FLAVOR}
-
-WRKSRC=		${WRKDIR}/VideoThumbnail
-
-USES=		python:2.7 shebangfix
-SHEBANG_FILES=	AppRun vidthumb.py
-NO_ARCH=	yes
-
-do-build:
-	@${PYTHON_CMD} -m compileall ${WRKSRC}
-	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/apps
-	${CP} -r ${WRKSRC} ${STAGEDIR}${PREFIX}/apps/
-
-.include <bsd.port.mk>
diff --git a/multimedia/rox-videothumbnail/distinfo b/multimedia/rox-videothumbnail/distinfo
deleted file mode 100644
index 92fce798eaa..00000000000
--- a/multimedia/rox-videothumbnail/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (VideoThumbnail-0.1.14.tar.gz) = c9faea643a12c38f6ad34dedd8c37abf988d599f6f60e26de60d37f414c7e87d
-SIZE (VideoThumbnail-0.1.14.tar.gz) = 24424
diff --git a/multimedia/rox-videothumbnail/pkg-descr b/multimedia/rox-videothumbnail/pkg-descr
deleted file mode 100644
index 8b1745c0fb3..00000000000
--- a/multimedia/rox-videothumbnail/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a helper program for ROX-Filer. It provides images for video files.
-
-WWW: http://www.kerofin.demon.co.uk/rox/VideoThumbnail.html
diff --git a/multimedia/rox-videothumbnail/pkg-plist b/multimedia/rox-videothumbnail/pkg-plist
deleted file mode 100644
index 9a94fd3f888..00000000000
--- a/multimedia/rox-videothumbnail/pkg-plist
+++ /dev/null
@@ -1,29 +0,0 @@
-apps/VideoThumbnail/.DirIcon
-apps/VideoThumbnail/AppInfo.xml
-apps/VideoThumbnail/AppRun
-apps/VideoThumbnail/Help/COPYING
-apps/VideoThumbnail/Help/Changes
-apps/VideoThumbnail/Help/README
-apps/VideoThumbnail/Messages/dist
-apps/VideoThumbnail/Messages/en.po
-apps/VideoThumbnail/Messages/update-po
-apps/VideoThumbnail/Options.xml
-apps/VideoThumbnail/VideoThumbnail.xml
-apps/VideoThumbnail/extopts.py
-apps/VideoThumbnail/extopts.pyc
-apps/VideoThumbnail/extopts.pyo
-apps/VideoThumbnail/findrox.py
-apps/VideoThumbnail/findrox.pyc
-apps/VideoThumbnail/findrox.pyo
-apps/VideoThumbnail/manage.py
-apps/VideoThumbnail/manage.pyc
-apps/VideoThumbnail/manage.pyo
-apps/VideoThumbnail/options.py
-apps/VideoThumbnail/options.pyc
-apps/VideoThumbnail/options.pyo
-apps/VideoThumbnail/thumb.py
-apps/VideoThumbnail/thumb.pyc
-apps/VideoThumbnail/thumb.pyo
-apps/VideoThumbnail/vidthumb.py
-apps/VideoThumbnail/vidthumb.pyc
-apps/VideoThumbnail/vidthumb.pyo
diff --git a/net-im/pidgin-icyque/Makefile b/net-im/pidgin-icyque/Makefile
index f5cd40b4fc7..e59d4a7edbf 100644
--- a/net-im/pidgin-icyque/Makefile
+++ b/net-im/pidgin-icyque/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pidgin-icyque
-DISTVERSION=	g20190523
+DISTVERSION=	g20200111
 CATEGORIES=	net-im
 
 MAINTAINER=	eugen@FreeBSD.org
@@ -23,7 +23,7 @@ PLIST_FILES=	lib/purple-2/libicyque.so
 USE_GITHUB=	yes
 GH_ACCOUNT=	EionRobb
 GH_PROJECT=	icyque
-GH_TAGNAME=	a10e28e
+GH_TAGNAME=	ebc5227
 
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
diff --git a/net-im/pidgin-icyque/distinfo b/net-im/pidgin-icyque/distinfo
index c1a72911ce1..df2b9655f9a 100644
--- a/net-im/pidgin-icyque/distinfo
+++ b/net-im/pidgin-icyque/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568725781
-SHA256 (EionRobb-icyque-g20190523-a10e28e_GH0.tar.gz) = 86d5ff7f221184e3745d848d314db650eb15973de67d44de4371d81cd6c951c4
-SIZE (EionRobb-icyque-g20190523-a10e28e_GH0.tar.gz) = 58025
+TIMESTAMP = 1581763050
+SHA256 (EionRobb-icyque-g20200111-ebc5227_GH0.tar.gz) = a1e83ee76f7fe94f98105949ac09c0559cf0fe802b26e7930160d08ed5d422ca
+SIZE (EionRobb-icyque-g20200111-ebc5227_GH0.tar.gz) = 59237
diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile
index fc87d9d1a3e..83259674eca 100644
--- a/net-im/py-matrix-synapse/Makefile
+++ b/net-im/py-matrix-synapse/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	matrix-synapse
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.7.2
-PORTREVISION=	1
+DISTVERSION=	1.10.0
 CATEGORIES=	net-im python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -19,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_F
 		${PYTHON_PKGNAMEPREFIX}frozendict>=1:devel/py-frozendict@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.1.0:devel/py-unpaddedbase64@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.1.3:devel/py-canonicaljson@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}signedjson>=1.0.0:security/py-signedjson@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}signedjson>=1.1.0:security/py-signedjson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pynacl>=1.2.1:security/py-pynacl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}service_identity>=18.1.0:security/py-service_identity@${PY_FLAVOR} \
diff --git a/net-im/py-matrix-synapse/distinfo b/net-im/py-matrix-synapse/distinfo
index 2f3a56c62e9..001d89f2683 100644
--- a/net-im/py-matrix-synapse/distinfo
+++ b/net-im/py-matrix-synapse/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576842989
-SHA256 (matrix-org-synapse-v1.7.2_GH0.tar.gz) = fac51aba338c443a3f4ff8c8e95abb23aee759f9df605207429e4a911a0b97be
-SIZE (matrix-org-synapse-v1.7.2_GH0.tar.gz) = 6301252
+TIMESTAMP = 1581869799
+SHA256 (matrix-org-synapse-v1.10.0_GH0.tar.gz) = 649bb8a0a070a31057c5c884a2baed4d25242aaee62306e3a1056658267e0644
+SIZE (matrix-org-synapse-v1.10.0_GH0.tar.gz) = 6353706
diff --git a/net-mgmt/cacti-spine/Makefile b/net-mgmt/cacti-spine/Makefile
index dbd5d37a70f..46bb8576619 100644
--- a/net-mgmt/cacti-spine/Makefile
+++ b/net-mgmt/cacti-spine/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	spine
-PORTVERSION=	1.2.7
+PORTVERSION=	1.2.9
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.cacti.net/downloads/${PORTNAME}/
 DISTNAME=	cacti-${PORTNAME}-${PORTVERSION}
diff --git a/net-mgmt/cacti-spine/distinfo b/net-mgmt/cacti-spine/distinfo
index dfdd075062e..13fc72050c8 100644
--- a/net-mgmt/cacti-spine/distinfo
+++ b/net-mgmt/cacti-spine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575079726
-SHA256 (cacti-spine-1.2.7.tar.gz) = d2b5e7fa97e7766354b04f537a147f644bcaa9dfdb4efbaf85ab6d47c0e2ffdd
-SIZE (cacti-spine-1.2.7.tar.gz) = 106764
+TIMESTAMP = 1581805854
+SHA256 (cacti-spine-1.2.9.tar.gz) = 8113fa52a93706ffa6e43e7ee2ac51f8f08d1716b8ef6bff4b909b090e9faf0a
+SIZE (cacti-spine-1.2.9.tar.gz) = 106593
diff --git a/net-mgmt/thanos/Makefile b/net-mgmt/thanos/Makefile
index 4274cce03a3..38e73ee3295 100644
--- a/net-mgmt/thanos/Makefile
+++ b/net-mgmt/thanos/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	thanos
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.1
-PORTREVISION=	1
+DISTVERSION=	0.10.1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	ler@FreeBSD.org
@@ -22,111 +21,124 @@ GO_TARGET=	./cmd/${PORTNAME}
 USE_GITHUB=	yes
 GH_ACCOUNT=	thanos-io
 GH_TUPLE=	\
-		Azure:azure-pipeline-go:v0.2.1:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \
-		Azure:azure-sdk-for-go:v23.2.0:azure_azure_sdk_for_go/vendor/github.com/Azure/azure-sdk-for-go \
-		Azure:azure-storage-blob-go:v0.7.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \
-		Azure:go-autorest:v11.2.8:azure_go_autorest/vendor/github.com/Azure/go-autorest \
+		Azure:azure-pipeline-go:v0.2.2:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \
+		Azure:azure-sdk-for-go:v36.1.0:azure_azure_sdk_for_go/vendor/github.com/Azure/azure-sdk-for-go \
+		Azure:azure-storage-blob-go:v0.8.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \
+		Azure:go-autorest:3492b2aff503:azure_go_autorest/vendor/github.com/Azure/go-autorest \
+		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
 		NYTimes:gziphandler:v1.1.1:nytimes_gziphandler/vendor/github.com/NYTimes/gziphandler \
 		alecthomas:kingpin:v2.2.6:alecthomas_kingpin/vendor/gopkg.in/alecthomas/kingpin.v2 \
 		alecthomas:template:fb15b899a751:alecthomas_template/vendor/github.com/alecthomas/template \
-		alecthomas:units:c3de453c63f4:alecthomas_units/vendor/github.com/alecthomas/units \
-		armon:go-metrics:ec5e00d3c878:armon_go_metrics/vendor/github.com/armon/go-metrics \
+		alecthomas:units:f65c72e2690d:alecthomas_units/vendor/github.com/alecthomas/units \
+		aliyun:aliyun-oss-go-sdk:v2.0.4:aliyun_aliyun_oss_go_sdk/vendor/github.com/aliyun/aliyun-oss-go-sdk \
+		armon:go-metrics:v0.3.0:armon_go_metrics/vendor/github.com/armon/go-metrics \
 		armon:go-radix:v1.0.0:armon_go_radix/vendor/github.com/armon/go-radix \
-		aws:aws-sdk-go:v1.23.12:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
+		aws:aws-sdk-go:v1.25.48:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
-		census-ecosystem:opencensus-go-exporter-ocagent:v0.6.0:census_ecosystem_opencensus_go_exporter_ocagent/vendor/contrib.go.opencensus.io/exporter/ocagent \
-		census-instrumentation:opencensus-go:v0.22.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
-		census-instrumentation:opencensus-proto:v0.2.1:census_instrumentation_opencensus_proto/vendor/github.com/census-instrumentation/opencensus-proto \
+		bradfitz:gomemcache:a41fca850d0b:bradfitz_gomemcache/vendor/github.com/bradfitz/gomemcache \
+		census-instrumentation:opencensus-go:v0.22.2:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
 		cespare:xxhash:v1.1.0:cespare_xxhash/vendor/github.com/cespare/xxhash \
+		cespare:xxhash:v2.1.1:cespare_xxhash_1/vendor/github.com/cespare/xxhash/v2 \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		dgrijalva:jwt-go:01aeca54ebda:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \
+		dgrijalva:jwt-go:v3.2.0:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \
+		dominikh:go-tools:v0.0.1-2019.2.3:dominikh_go_tools/vendor/honnef.co/go/tools \
 		edsrzf:mmap-go:v1.0.0:edsrzf_mmap_go/vendor/github.com/edsrzf/mmap-go \
-		elastic:apm-agent-go:v1.5.0:elastic_apm_agent/vendor/go.elastic.co/apm \
-		elastic:go-fastjson:v1.0.0:elastic_fastjson/vendor/go.elastic.co/fastjson \
-		elastic:go-sysinfo:v1.0.1:elastic_go_sysinfo/vendor/github.com/elastic/go-sysinfo \
-		elastic:go-windows:v1.0.0:elastic_go_windows/vendor/github.com/elastic/go-windows \
-		fatih:structtag:v1.0.0:fatih_structtag/vendor/github.com/fatih/structtag \
+		elastic:apm-agent-go:v1.5.0:elastic_apm_agent_go/vendor/go.elastic.co/apm \
+		elastic:go-fastjson:v1.0.0:elastic_go_fastjson/vendor/go.elastic.co/fastjson \
+		elastic:go-sysinfo:v1.1.1:elastic_go_sysinfo/vendor/github.com/elastic/go-sysinfo \
+		elastic:go-windows:v1.0.1:elastic_go_windows/vendor/github.com/elastic/go-windows \
+		facette:natsort:2cd4dd1e2dcb:facette_natsort/vendor/github.com/facette/natsort \
+		fatih:structtag:v1.1.0:fatih_structtag/vendor/github.com/fatih/structtag \
 		fortytw2:leaktest:v1.3.0:fortytw2_leaktest/vendor/github.com/fortytw2/leaktest \
 		fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		go-inf:inf:v0.9.1:go_inf_inf/vendor/gopkg.in/inf.v0 \
-		go-ini:ini:v1.42.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
+		go-ini:ini:v1.51.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
 		go-kit:kit:v0.9.0:go_kit_kit/vendor/github.com/go-kit/kit \
 		go-logfmt:logfmt:v0.4.0:go_logfmt_logfmt/vendor/github.com/go-logfmt/logfmt \
-		go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		gogo:protobuf:28a6bbf47e48:gogo_protobuf/vendor/github.com/gogo/protobuf \
-		golang:appengine:v1.6.1:golang_appengine/vendor/google.golang.org/appengine \
-		golang:crypto:34f69633bfdc:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:aa69164e4478:golang_net/vendor/golang.org/x/net \
+		go-yaml:yaml:v2.2.5:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		gogo:protobuf:v1.3.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
+		golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
+		golang:crypto:e1110fd1c708:golang_crypto/vendor/golang.org/x/crypto \
+		golang:exp:a1ab85dbe136:golang_exp/vendor/golang.org/x/exp \
+		golang:groupcache:611e8accdfc9:golang_groupcache/vendor/github.com/golang/groupcache \
+		golang:lint:16217165b5de:golang_lint/vendor/golang.org/x/lint \
+		golang:net:2180aed22343:golang_net/vendor/golang.org/x/net \
 		golang:oauth2:0f29369cfe45:golang_oauth2/vendor/golang.org/x/oauth2 \
 		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:snappy:v0.0.1:golang_snappy/vendor/github.com/golang/snappy \
-		golang:sync:112230192c58:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:97732733099d:golang_sys/vendor/golang.org/x/sys \
+		golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \
+		golang:sys:4c7a9d0fe056:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
-		golang:time:9d24e82272b4:golang_time/vendor/golang.org/x/time \
+		golang:time:555d28b269f0:golang_time/vendor/golang.org/x/time \
+		golang:tools:3a792d9c32b2:golang_tools/vendor/golang.org/x/tools \
 		google:go-cmp:v0.3.1:google_go_cmp/vendor/github.com/google/go-cmp \
-		google:go-genproto:24fa4b261c55:google_go_genproto/vendor/google.golang.org/genproto \
+		google:go-genproto:c23dd37a84c9:google_go_genproto/vendor/google.golang.org/genproto \
 		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:gax-go:v2.0.5:googleapis_gax_go/vendor/github.com/googleapis/gax-go \
-		googleapis:gax-go:v2.0.5:googleapis_gax_go_1/vendor/github.com/googleapis/gax-go/v2 \
-		googleapis:gnostic:v0.3.0:googleapis_gnostic/vendor/github.com/googleapis/gnostic \
-		googleapis:google-api-go-client:v0.11.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
-		googleapis:google-cloud-go:v0.44.1:googleapis_google_cloud_go/vendor/cloud.google.com/go \
-		gophercloud:gophercloud:v0.3.0:gophercloud_gophercloud/vendor/github.com/gophercloud/gophercloud \
+		googleapis:gax-go:v2.0.2:googleapis_gax_go/vendor/github.com/googleapis/gax-go \
+		googleapis:gnostic:v0.3.1:googleapis_gnostic/vendor/github.com/googleapis/gnostic \
+		googleapis:google-api-go-client:v0.14.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
+		googleapis:google-cloud-go:v0.49.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
+		gophercloud:gophercloud:v0.6.0:gophercloud_gophercloud/vendor/github.com/gophercloud/gophercloud \
 		grpc-ecosystem:go-grpc-middleware:v1.1.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
-		grpc-ecosystem:go-grpc-prometheus:6af20e3a5340:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \
-		grpc-ecosystem:grpc-gateway:v1.9.5:grpc_ecosystem_grpc_gateway/vendor/github.com/grpc-ecosystem/grpc-gateway \
-		grpc:grpc-go:v1.22.1:grpc_grpc_go/vendor/google.golang.org/grpc \
-		hashicorp:consul:v1.6.1:hashicorp_consul/vendor/github.com/hashicorp/consul \
+		grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \
+		grpc-ecosystem:grpc-gateway:v1.12.1:grpc_ecosystem_grpc_gateway/vendor/github.com/grpc-ecosystem/grpc-gateway \
+		grpc:grpc-go:v1.25.1:grpc_grpc_go/vendor/google.golang.org/grpc \
+		hashicorp:consul:v1.3.0:hashicorp_consul/vendor/github.com/hashicorp/consul \
 		hashicorp:go-cleanhttp:v0.5.1:hashicorp_go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \
 		hashicorp:go-immutable-radix:v1.1.0:hashicorp_go_immutable_radix/vendor/github.com/hashicorp/go-immutable-radix \
 		hashicorp:go-rootcerts:v1.0.1:hashicorp_go_rootcerts/vendor/github.com/hashicorp/go-rootcerts \
 		hashicorp:golang-lru:v0.5.3:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
-		hashicorp:serf:v0.8.3:hashicorp_serf/vendor/github.com/hashicorp/serf \
+		hashicorp:serf:v0.8.5:hashicorp_serf/vendor/github.com/hashicorp/serf \
 		jmespath:go-jmespath:c2b33e8439af:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
 		joeshaw:multierror:69b34d4ec901:joeshaw_multierror/vendor/github.com/joeshaw/multierror \
-		jpillora:backoff:3050d21c67d7:jpillora_backoff/vendor/github.com/jpillora/backoff \
-		json-iterator:go:v1.1.7:json_iterator_go/vendor/github.com/json-iterator/go \
-		julienschmidt:httprouter:v1.2.0:julienschmidt_httprouter/vendor/github.com/julienschmidt/httprouter \
+		jpillora:backoff:v1.0.0:jpillora_backoff/vendor/github.com/jpillora/backoff \
+		json-iterator:go:v1.1.8:json_iterator_go/vendor/github.com/json-iterator/go \
+		jstemmer:go-junit-report:v0.9.1:jstemmer_go_junit_report/vendor/github.com/jstemmer/go-junit-report \
+		julienschmidt:httprouter:v1.3.0:julienschmidt_httprouter/vendor/github.com/julienschmidt/httprouter \
 		kr:logfmt:b84e30acd515:kr_logfmt/vendor/github.com/kr/logfmt \
 		kubernetes-sigs:yaml:v1.1.0:kubernetes_sigs_yaml/vendor/sigs.k8s.io/yaml \
 		kubernetes:api:7cf5895f2711:kubernetes_api/vendor/k8s.io/api \
 		kubernetes:apimachinery:1799e75a0719:kubernetes_apimachinery/vendor/k8s.io/apimachinery \
 		kubernetes:client-go:78d2af792bab:kubernetes_client_go/vendor/k8s.io/client-go \
 		kubernetes:klog:v0.3.1:kubernetes_klog/vendor/k8s.io/klog \
-		kubernetes:utils:6c36bc71fc4a:kubernetes_utils/vendor/k8s.io/utils \
+		kubernetes:utils:6ca3b61696b6:kubernetes_utils/vendor/k8s.io/utils \
 		leanovate:gopter:v0.2.4:leanovate_gopter/vendor/github.com/leanovate/gopter \
+		lightstep:lightstep-tracer-common:bc2310a04743:lightstep_lightstep_tracer_common/vendor/github.com/lightstep/lightstep-tracer-common \
+		lightstep:lightstep-tracer-go:v0.18.0:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \
 		lovoo:gcloud-opentracing:v0.3.0:lovoo_gcloud_opentracing/vendor/github.com/lovoo/gcloud-opentracing \
-		mattn:go-ieproxy:f9202b1cfdeb:mattn_go_ieproxy/vendor/github.com/mattn/go-ieproxy \
-		mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
+		mattn:go-ieproxy:7c0f6868bffe:mattn_go_ieproxy/vendor/github.com/mattn/go-ieproxy \
+		mattn:go-runewidth:v0.0.6:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
 		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
-		miekg:dns:v1.1.19:miekg_dns/vendor/github.com/miekg/dns \
-		minio:minio-go:de69c0e465ed:minio_minio_go/vendor/github.com/minio/minio-go/v6 \
+		miekg:dns:v1.1.22:miekg_dns/vendor/github.com/miekg/dns \
+		minio:minio-go:v6.0.44:minio_minio_go/vendor/github.com/minio/minio-go/v6 \
+		minio:sha256-simd:v0.1.1:minio_sha256_simd/vendor/github.com/minio/sha256-simd \
 		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
 		mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
 		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
 		modern-go:reflect2:v1.0.1:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
-		mozillazg:go-cos:v0.12.0:mozillazg_go_cos/vendor/github.com/mozillazg/go-cos \
+		mozillazg:go-cos:v0.13.0:mozillazg_go_cos/vendor/github.com/mozillazg/go-cos \
 		mozillazg:go-httpheader:v0.2.1:mozillazg_go_httpheader/vendor/github.com/mozillazg/go-httpheader \
 		mwitkow:go-conntrack:2f068394615f:mwitkow_go_conntrack/vendor/github.com/mwitkow/go-conntrack \
 		oklog:run:v1.0.0:oklog_run/vendor/github.com/oklog/run \
 		oklog:ulid:v1.3.1:oklog_ulid/vendor/github.com/oklog/ulid \
-		olekukonko:tablewriter:v0.0.1:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
-		opentracing-contrib:go-stdlib:cf7a6c988dc9:opentracing_contrib_go_stdlib/vendor/github.com/opentracing-contrib/go-stdlib \
+		olekukonko:tablewriter:v0.0.2:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
 		opentracing:basictracer-go:v1.0.0:opentracing_basictracer_go/vendor/github.com/opentracing/basictracer-go \
 		opentracing:opentracing-go:v1.1.0:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \
 		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
-		prometheus:client_golang:v1.1.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_golang:v1.2.1:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
 		prometheus:client_model:14fe0d1b01d4:prometheus_client_model/vendor/github.com/prometheus/client_model \
-		prometheus:common:v0.6.0:prometheus_common/vendor/github.com/prometheus/common \
-		prometheus:procfs:v0.0.3:prometheus_procfs/vendor/github.com/prometheus/procfs \
-		prometheus:prometheus:8ab628b35467:prometheus_prometheus/vendor/github.com/prometheus/prometheus \
-		samuel:go-zookeeper:0ceca61e4d75:samuel_go_zookeeper/vendor/github.com/samuel/go-zookeeper \
+		prometheus:common:v0.7.0:prometheus_common/vendor/github.com/prometheus/common \
+		prometheus:procfs:v0.0.6:prometheus_procfs/vendor/github.com/prometheus/procfs \
+		prometheus:prometheus:4708915ac6ef:prometheus_prometheus/vendor/github.com/prometheus/prometheus \
+		samuel:go-zookeeper:2cc03de413da:samuel_go_zookeeper/vendor/github.com/samuel/go-zookeeper \
 		santhosh-tekuri:jsonschema:v1.2.4:santhosh_tekuri_jsonschema/vendor/github.com/santhosh-tekuri/jsonschema \
+		uber-go:atomic:v1.5.0:uber_go_atomic/vendor/go.uber.org/atomic \
 		uber-go:automaxprocs:v1.2.0:uber_go_automaxprocs/vendor/go.uber.org/automaxprocs \
-		uber:jaeger-client-go:v2.16.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \
-		uber:jaeger-lib:v2.2.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib
+		uber:jaeger-client-go:v2.20.1:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \
+		uber:jaeger-lib:v2.2.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib \
+
+GL_TUPLE=	https://gitlab.howett.net:go:plist:591f970eefbbeb04d7b37f334a0c4c3256e32876:go_plist/vendor/howett.net/plist
 
 USE_GITLAB=	nodefault
 GL_SITE=	https://gitlab.howett.net
diff --git a/net-mgmt/thanos/distinfo b/net-mgmt/thanos/distinfo
index dd5ba44ee0e..d8a89b4195e 100644
--- a/net-mgmt/thanos/distinfo
+++ b/net-mgmt/thanos/distinfo
@@ -1,116 +1,134 @@
-TIMESTAMP = 1571621642
-SHA256 (thanos-io-thanos-v0.8.1_GH0.tar.gz) = 3e229d5edd47890df764fae827519844b32d10a3a396ba9a0be41e063b68a0d0
-SIZE (thanos-io-thanos-v0.8.1_GH0.tar.gz) = 12121382
-SHA256 (Azure-azure-pipeline-go-v0.2.1_GH0.tar.gz) = 97738fe9fe1c5bab41b89fc97cef08537e53cd3f38f5686e3853d2aecb20133d
-SIZE (Azure-azure-pipeline-go-v0.2.1_GH0.tar.gz) = 16378
-SHA256 (Azure-azure-sdk-for-go-v23.2.0_GH0.tar.gz) = c418c3de5e8a7eb647e11ec924f6b6f67fcff163d424ceaba3836320234c234c
-SIZE (Azure-azure-sdk-for-go-v23.2.0_GH0.tar.gz) = 14331392
-SHA256 (Azure-azure-storage-blob-go-v0.7.0_GH0.tar.gz) = 9efe2f2a788d0d00318d7fa4138cd973ac4c72fece82656aa67cbb501288bd93
-SIZE (Azure-azure-storage-blob-go-v0.7.0_GH0.tar.gz) = 173570
-SHA256 (Azure-go-autorest-v11.2.8_GH0.tar.gz) = 8ac246c2b519d8ebd34ba1edeee8abba7e286be1b2daf2017f5396724d99d6f0
-SIZE (Azure-go-autorest-v11.2.8_GH0.tar.gz) = 131134
+TIMESTAMP = 1581721843
+SHA256 (thanos-io-thanos-v0.10.1_GH0.tar.gz) = 0e176d04a4f005cfc9a9e370276072060a7f92ad708b26844f284d496e0b182d
+SIZE (thanos-io-thanos-v0.10.1_GH0.tar.gz) = 7425772
+SHA256 (Azure-azure-pipeline-go-v0.2.2_GH0.tar.gz) = dc0d15949088e17e74da35c3ae2730f52240ad73e25cf795f532b7282de68e2f
+SIZE (Azure-azure-pipeline-go-v0.2.2_GH0.tar.gz) = 16443
+SHA256 (Azure-azure-sdk-for-go-v36.1.0_GH0.tar.gz) = 4ec3a0ebc9871753a4c740ced45d4aa9576211056399bd1a0b256ddafd99c11c
+SIZE (Azure-azure-sdk-for-go-v36.1.0_GH0.tar.gz) = 19341798
+SHA256 (Azure-azure-storage-blob-go-v0.8.0_GH0.tar.gz) = e50db03bc05b952159e0a1d393c841c217c3aecd6ce745f8b9c42fd498e476c7
+SIZE (Azure-azure-storage-blob-go-v0.8.0_GH0.tar.gz) = 174822
+SHA256 (Azure-go-autorest-3492b2aff503_GH0.tar.gz) = 922194d5309244744ec032dba5fad170bf4e9d342ab1f93ee0145209b8fcaefa
+SIZE (Azure-go-autorest-3492b2aff503_GH0.tar.gz) = 164087
+SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
+SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
 SHA256 (NYTimes-gziphandler-v1.1.1_GH0.tar.gz) = c236c216a16e4286338e66e0947938944992f918fe827c31f8745c0be98818d2
 SIZE (NYTimes-gziphandler-v1.1.1_GH0.tar.gz) = 52107
 SHA256 (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 4624eae43489de8a71ea60efaf6744c581b6bd62909f7514c484c1ea0efaba5a
 SIZE (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 44383
 SHA256 (alecthomas-template-fb15b899a751_GH0.tar.gz) = 2e2a44375eca48ce941182504b5d13aa98182b9a3f64ace33bfda52208bd0f5e
 SIZE (alecthomas-template-fb15b899a751_GH0.tar.gz) = 55339
-SHA256 (alecthomas-units-c3de453c63f4_GH0.tar.gz) = b2eb77de46e677edb150bb4bf81d213416a477525980e315264cbd70b22d0ece
-SIZE (alecthomas-units-c3de453c63f4_GH0.tar.gz) = 3485
-SHA256 (armon-go-metrics-ec5e00d3c878_GH0.tar.gz) = de6df8b15d119c393073fb1ddc53c4859d58d7163caddffe2a78b90034fb5876
-SIZE (armon-go-metrics-ec5e00d3c878_GH0.tar.gz) = 27431
+SHA256 (alecthomas-units-f65c72e2690d_GH0.tar.gz) = ece06024b01821e013bd7158dfe8ec8cc697f586ce8d3cfaa22edde8c2f022c3
+SIZE (alecthomas-units-f65c72e2690d_GH0.tar.gz) = 4925
+SHA256 (aliyun-aliyun-oss-go-sdk-v2.0.4_GH0.tar.gz) = eb713aff4681052ee92e7d15fb3ef1cad6de297387429c23af517f756c657ef4
+SIZE (aliyun-aliyun-oss-go-sdk-v2.0.4_GH0.tar.gz) = 698467
+SHA256 (armon-go-metrics-v0.3.0_GH0.tar.gz) = 448c93a6ef30ba432ee80e03e8188bc44575f90df5b2a74b2b03414efa80b483
+SIZE (armon-go-metrics-v0.3.0_GH0.tar.gz) = 28377
 SHA256 (armon-go-radix-v1.0.0_GH0.tar.gz) = 9e5238a553708bccf930d1f9d0ce62ce30d92602b64ea248585ce06ec7bfee17
 SIZE (armon-go-radix-v1.0.0_GH0.tar.gz) = 5975
-SHA256 (aws-aws-sdk-go-v1.23.12_GH0.tar.gz) = 4b1e6d1ca55793c726f75420056ebcb7df3d65a8149df1575b79e43d0d9ea3c6
-SIZE (aws-aws-sdk-go-v1.23.12_GH0.tar.gz) = 11842615
+SHA256 (aws-aws-sdk-go-v1.25.48_GH0.tar.gz) = b5c15ed4b4b0134a04e62df6a531a7004162562310fcb8d292b9a15ea999b7c8
+SIZE (aws-aws-sdk-go-v1.25.48_GH0.tar.gz) = 13512626
 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
-SHA256 (census-ecosystem-opencensus-go-exporter-ocagent-v0.6.0_GH0.tar.gz) = f46746d4e52301f33da9b8a4d5b9ba9d15a47bf35334abfe8fbd90965126e416
-SIZE (census-ecosystem-opencensus-go-exporter-ocagent-v0.6.0_GH0.tar.gz) = 34100
-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 (census-instrumentation-opencensus-proto-v0.2.1_GH0.tar.gz) = bfcefa6093fc2ecdf5c9effea86e6982d0d6f9a5178b17fcf73a62e0f3fb43d0
-SIZE (census-instrumentation-opencensus-proto-v0.2.1_GH0.tar.gz) = 151701
+SHA256 (bradfitz-gomemcache-a41fca850d0b_GH0.tar.gz) = e9b32edd5745cd009c4d23d0ff6e2fdd7ae92e6049a9155500c93bf93e744bc6
+SIZE (bradfitz-gomemcache-a41fca850d0b_GH0.tar.gz) = 13238
+SHA256 (census-instrumentation-opencensus-go-v0.22.2_GH0.tar.gz) = 0aa930142b669d7c47e2b8343f6adc9f03414a9c45763c5f746de95231d6ad6d
+SIZE (census-instrumentation-opencensus-go-v0.22.2_GH0.tar.gz) = 165321
 SHA256 (cespare-xxhash-v1.1.0_GH0.tar.gz) = 9418be390574092f0ca989b9ae2f5450270ead8125a635a100850b28c8c9c495
 SIZE (cespare-xxhash-v1.1.0_GH0.tar.gz) = 8200
+SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
+SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (dgrijalva-jwt-go-01aeca54ebda_GH0.tar.gz) = 77dec60898cc9058d76fe1ec9bbf3fbaa52c9e90eb315704469fe8967d3399bc
-SIZE (dgrijalva-jwt-go-01aeca54ebda_GH0.tar.gz) = 33516
+SHA256 (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 197465ef53219f3aeb1a6940b70e16d288fe4e4108d4831b91ea101118440e63
+SIZE (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 36960
+SHA256 (dominikh-go-tools-v0.0.1-2019.2.3_GH0.tar.gz) = 3b16c5bec68f71d13be0216b849ce910aa4a1844db6e08dafe90fb1a439974c7
+SIZE (dominikh-go-tools-v0.0.1-2019.2.3_GH0.tar.gz) = 367559
 SHA256 (edsrzf-mmap-go-v1.0.0_GH0.tar.gz) = 49c502c28de1e36f12005a70543ae62e15dcd85565572df4e973beb5812587bf
 SIZE (edsrzf-mmap-go-v1.0.0_GH0.tar.gz) = 5463
-SHA256 (elastic-go-sysinfo-v1.0.1_GH0.tar.gz) = e50ac330a4871edaec47e55f26cdb0e5222a74f919d4e1a340490b947265ba48
-SIZE (elastic-go-sysinfo-v1.0.1_GH0.tar.gz) = 45933
-SHA256 (elastic-go-windows-v1.0.0_GH0.tar.gz) = ab12ef1314a7aebc76954f5414c1ceb6036fafd7b74605915a3b9b8c54d83838
-SIZE (elastic-go-windows-v1.0.0_GH0.tar.gz) = 16263
-SHA256 (fatih-structtag-v1.0.0_GH0.tar.gz) = 3eeac31734e979c88bcc0e8f78d430593a8da6613205415e3bec86f380fefe9e
-SIZE (fatih-structtag-v1.0.0_GH0.tar.gz) = 5423
+SHA256 (elastic-apm-agent-go-v1.5.0_GH0.tar.gz) = 3a5c625d4112ca6dc3304917f4513f0602c687057d0b42176b1050d0e45d3f8b
+SIZE (elastic-apm-agent-go-v1.5.0_GH0.tar.gz) = 335475
+SHA256 (elastic-go-fastjson-v1.0.0_GH0.tar.gz) = 74fc857be20f3bc7aad6d0d407e0425c901d7e16be5ec69bd4fcd172b74bcbcb
+SIZE (elastic-go-fastjson-v1.0.0_GH0.tar.gz) = 9479
+SHA256 (elastic-go-sysinfo-v1.1.1_GH0.tar.gz) = 2ae2789202f43ee550c9c70393da5b89e8430ad7c47247cbf357e49a81d9353d
+SIZE (elastic-go-sysinfo-v1.1.1_GH0.tar.gz) = 52307
+SHA256 (elastic-go-windows-v1.0.1_GH0.tar.gz) = 52043392ca03e270c3f9c8632c78fa71885af756043f3258d20865185b8199ed
+SIZE (elastic-go-windows-v1.0.1_GH0.tar.gz) = 16844
+SHA256 (facette-natsort-2cd4dd1e2dcb_GH0.tar.gz) = aa65ea416cb4c72d672c7207afdda9c4dc5a535b5c72781636cc5dc82411eacb
+SIZE (facette-natsort-2cd4dd1e2dcb_GH0.tar.gz) = 2881
+SHA256 (fatih-structtag-v1.1.0_GH0.tar.gz) = d383e1082afed1be7111d32cf88aeaed4859609fc58c3607707a7e9d2540bc2b
+SIZE (fatih-structtag-v1.1.0_GH0.tar.gz) = 5645
 SHA256 (fortytw2-leaktest-v1.3.0_GH0.tar.gz) = 897726ed584a7c442eb660406e3438d4585b00c5f3769360eb19b18cace35292
 SIZE (fortytw2-leaktest-v1.3.0_GH0.tar.gz) = 5281
 SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd
 SIZE (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = 31139
 SHA256 (go-inf-inf-v0.9.1_GH0.tar.gz) = 756e00e87207cb063d305b6e38bf56dba4d76586fbe40b7d6b657d22516d0f71
 SIZE (go-inf-inf-v0.9.1_GH0.tar.gz) = 13072
-SHA256 (go-ini-ini-v1.42.0_GH0.tar.gz) = 49136717e5db9000e02f86807cfd9faa98f943553a3c40319020b7c32e7c142c
-SIZE (go-ini-ini-v1.42.0_GH0.tar.gz) = 35078
+SHA256 (go-ini-ini-v1.51.0_GH0.tar.gz) = 6c98311d375afbe36a246c5d29acb5cb428634a4186e591ce9b7fe2fa4f2a471
+SIZE (go-ini-ini-v1.51.0_GH0.tar.gz) = 43536
 SHA256 (go-kit-kit-v0.9.0_GH0.tar.gz) = 41e92e4f5a6111e6f88bec9b46ca41d6eb9167dc2231813616bdf365e641be44
 SIZE (go-kit-kit-v0.9.0_GH0.tar.gz) = 251842
 SHA256 (go-logfmt-logfmt-v0.4.0_GH0.tar.gz) = eddccc7c8d39a6381f7152e73ebf3c725de317c5b984d8a77282e63915aa834d
 SIZE (go-logfmt-logfmt-v0.4.0_GH0.tar.gz) = 12724
-SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff
-SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656
-SHA256 (gogo-protobuf-28a6bbf47e48_GH0.tar.gz) = eb650c4bc8d23c7822c158bb30045ef00b7894243d0957dac186870ae7240433
-SIZE (gogo-protobuf-28a6bbf47e48_GH0.tar.gz) = 2045482
-SHA256 (golang-appengine-v1.6.1_GH0.tar.gz) = 1755aaf4c6246579337bf1bc4f834ef00c56216da87b20456863ca91985b5afa
-SIZE (golang-appengine-v1.6.1_GH0.tar.gz) = 333353
-SHA256 (golang-crypto-34f69633bfdc_GH0.tar.gz) = c3fa0760971622af64c3b7a3319291d997f2f0d53a5c90c17d25eaeba7f0371a
-SIZE (golang-crypto-34f69633bfdc_GH0.tar.gz) = 1708053
-SHA256 (golang-net-aa69164e4478_GH0.tar.gz) = b538bbdda3b9f7c93b6bbac94874d8fa85d25e43577f3b356fd825f39410be0f
-SIZE (golang-net-aa69164e4478_GH0.tar.gz) = 1100688
+SHA256 (go-yaml-yaml-v2.2.5_GH0.tar.gz) = 7b3929eeaa6c9ba8be52a10d195955060ff0b8b8c13671d533d26ff27fb13de2
+SIZE (go-yaml-yaml-v2.2.5_GH0.tar.gz) = 72259
+SHA256 (gogo-protobuf-v1.3.1_GH0.tar.gz) = 5184f06decd681fcc82f6583976111faf87189c0c2f8063b34ac2ea9ed997236
+SIZE (gogo-protobuf-v1.3.1_GH0.tar.gz) = 2038188
+SHA256 (golang-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316
+SIZE (golang-appengine-v1.6.5_GH0.tar.gz) = 332903
+SHA256 (golang-crypto-e1110fd1c708_GH0.tar.gz) = 88aa023baf627a39b2ce36d508c8419c5bc8692cd1c77c4f172067c8bf97cd96
+SIZE (golang-crypto-e1110fd1c708_GH0.tar.gz) = 1711594
+SHA256 (golang-exp-a1ab85dbe136_GH0.tar.gz) = db0ee35aa8817da410e87df26c1f91fa94ce6924542c285181bbc303e2c52dce
+SIZE (golang-exp-a1ab85dbe136_GH0.tar.gz) = 1484243
+SHA256 (golang-groupcache-611e8accdfc9_GH0.tar.gz) = 2dcf44761a792ec5514e631901c121aef94bada0223e74d46ff2f51658509f0a
+SIZE (golang-groupcache-611e8accdfc9_GH0.tar.gz) = 26083
+SHA256 (golang-lint-16217165b5de_GH0.tar.gz) = e1b870caa2e428d183d6a467be064578582bacc19615e50867c24d53080ba496
+SIZE (golang-lint-16217165b5de_GH0.tar.gz) = 31428
+SHA256 (golang-net-2180aed22343_GH0.tar.gz) = 9c40aa2ee0ac181b28a2699ab2738cacc199ce3bd751a7cb360cb8a1c8c62505
+SIZE (golang-net-2180aed22343_GH0.tar.gz) = 1169236
 SHA256 (golang-oauth2-0f29369cfe45_GH0.tar.gz) = 468421ddfe905216454006b309ebda6e97aa6089265b995bce4259d6a9efd141
 SIZE (golang-oauth2-0f29369cfe45_GH0.tar.gz) = 45498
 SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
 SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
 SHA256 (golang-snappy-v0.0.1_GH0.tar.gz) = b1d97f47fcb61cb0cdd54bc424eda980c47838effb0ec9e322506514a50fee85
 SIZE (golang-snappy-v0.0.1_GH0.tar.gz) = 62605
-SHA256 (golang-sync-112230192c58_GH0.tar.gz) = 6d98880ea18369550cb12d7011df8e4b21c5b7588268a412b863b5c9d2fa0313
-SIZE (golang-sync-112230192c58_GH0.tar.gz) = 16832
-SHA256 (golang-sys-97732733099d_GH0.tar.gz) = 8d60fa6ab0c2b099f2c7d6f8c0a5df177c5c524183a2a38e0e8d2d18cde53532
-SIZE (golang-sys-97732733099d_GH0.tar.gz) = 1350239
+SHA256 (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 00a6dce4c1a9ca9edae6c3f1bedc0b15911c62681371ad9ed7738e182ba70393
+SIZE (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 16956
+SHA256 (golang-sys-4c7a9d0fe056_GH0.tar.gz) = bb3e69a4a9ea38e38796be479e968a8eec4c5d2b50f2f6955890b95daff2f425
+SIZE (golang-sys-4c7a9d0fe056_GH0.tar.gz) = 1514940
 SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
 SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
-SHA256 (golang-time-9d24e82272b4_GH0.tar.gz) = 7452a7b879ee5984709b2165f6212ad9464977f06d440140b8690e61695aa404
-SIZE (golang-time-9d24e82272b4_GH0.tar.gz) = 9313
+SHA256 (golang-time-555d28b269f0_GH0.tar.gz) = 8ce368da65025dad4e4ed302a5835e2b3579f3a111721f9b275803519a5d10b3
+SIZE (golang-time-555d28b269f0_GH0.tar.gz) = 9577
+SHA256 (golang-tools-3a792d9c32b2_GH0.tar.gz) = 7ffa34d037496a4c857cb30f1eee739c7ea7e45ca98338424be359429c5ddc0d
+SIZE (golang-tools-3a792d9c32b2_GH0.tar.gz) = 2303937
 SHA256 (google-go-cmp-v0.3.1_GH0.tar.gz) = a95fa266e5c2283b813102f265c1bdf5b78100f9889b984aef828eb094efe6e3
 SIZE (google-go-cmp-v0.3.1_GH0.tar.gz) = 76403
-SHA256 (google-go-genproto-24fa4b261c55_GH0.tar.gz) = 96481b64c5971de2dd22d7c6f764d2acbeb4cd85ab6166856284115c3f99238c
-SIZE (google-go-genproto-24fa4b261c55_GH0.tar.gz) = 5332241
+SHA256 (google-go-genproto-c23dd37a84c9_GH0.tar.gz) = a323dee9f833f2669ae83afbb3809c0edaafc6e3e3f821740d5def7404051864
+SIZE (google-go-genproto-c23dd37a84c9_GH0.tar.gz) = 5654785
 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-gax-go-v2.0.2_GH0.tar.gz) = 624786968d59eb032cfe049f139ddc14be1be5d508c34ebf520edc3946bae2ac
 SIZE (googleapis-gax-go-v2.0.2_GH0.tar.gz) = 8942
-SHA256 (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 3089affe6f5e27f7a6d494cb399aa6baf232384f763f548ad5ddfbea0e88e59c
-SIZE (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 15328
-SHA256 (googleapis-gnostic-v0.3.0_GH0.tar.gz) = 1768997905c6d847ad134f090ee6b0d9cd825c0f4d93d0fca44d99fbf545d690
-SIZE (googleapis-gnostic-v0.3.0_GH0.tar.gz) = 424461
-SHA256 (googleapis-google-api-go-client-v0.11.0_GH0.tar.gz) = cf37fa8cfdb99697b1ea77a76994f450c31c23f6128de78d300ae50561c934ed
-SIZE (googleapis-google-api-go-client-v0.11.0_GH0.tar.gz) = 12410910
-SHA256 (googleapis-google-cloud-go-v0.44.1_GH0.tar.gz) = 099889666786c7def044b63f6b7f192724d1f3942c1275fe9d26d3c0d4d25070
-SIZE (googleapis-google-cloud-go-v0.44.1_GH0.tar.gz) = 2213784
-SHA256 (gophercloud-gophercloud-v0.3.0_GH0.tar.gz) = 307b300f073b49b91ec6371e6e358910860fa94ba9d81d794f21ba3313961d65
-SIZE (gophercloud-gophercloud-v0.3.0_GH0.tar.gz) = 900135
+SHA256 (googleapis-gnostic-v0.3.1_GH0.tar.gz) = 86dd32c2c1cffb5193fe2e611848936a6d23e8ac9e9a5fc67b2436642ceb09d1
+SIZE (googleapis-gnostic-v0.3.1_GH0.tar.gz) = 435152
+SHA256 (googleapis-google-api-go-client-v0.14.0_GH0.tar.gz) = 5012ec53c0106f7ea9840ac4f11fb492d4367b8008788f0b7d1731930daa04c9
+SIZE (googleapis-google-api-go-client-v0.14.0_GH0.tar.gz) = 12847260
+SHA256 (googleapis-google-cloud-go-v0.49.0_GH0.tar.gz) = 86ea20f3e3266524d213f556e9456846a063f655cef01c8190aa584e22638aa8
+SIZE (googleapis-google-cloud-go-v0.49.0_GH0.tar.gz) = 2353423
+SHA256 (gophercloud-gophercloud-v0.6.0_GH0.tar.gz) = 023cbf6bfbc414073e797d0f8536bb2c7b3937cf63b53afc22a4b5e6179e1764
+SIZE (gophercloud-gophercloud-v0.6.0_GH0.tar.gz) = 913575
 SHA256 (grpc-ecosystem-go-grpc-middleware-v1.1.0_GH0.tar.gz) = 6f6ec573a25d5f788e7ec41d82b015e16f4c156b6c6c4dcd1c8ecef84ec28554
 SIZE (grpc-ecosystem-go-grpc-middleware-v1.1.0_GH0.tar.gz) = 85633
-SHA256 (grpc-ecosystem-go-grpc-prometheus-6af20e3a5340_GH0.tar.gz) = e37a815659a20ccb6baf26a48cc51efe39b9651ceb0857178f6f2eaa2c47ae75
-SIZE (grpc-ecosystem-go-grpc-prometheus-6af20e3a5340_GH0.tar.gz) = 30606
-SHA256 (grpc-ecosystem-grpc-gateway-v1.9.5_GH0.tar.gz) = 2e38be4cd2801c1ff8ed87b8310437d9d289460ea102ad75ea37e3793af62151
-SIZE (grpc-ecosystem-grpc-gateway-v1.9.5_GH0.tar.gz) = 303385
-SHA256 (grpc-grpc-go-v1.22.1_GH0.tar.gz) = 6370b4e1d19ea557e50e08648da581b6f0bf29c2eb8ae90a0748e7685a8f8a2f
-SIZE (grpc-grpc-go-v1.22.1_GH0.tar.gz) = 742592
-SHA256 (hashicorp-consul-v1.6.1_GH0.tar.gz) = c02a8a9a8b775066cdc33765bbf928f3dd20e3cc0f61cf41f35ed5f0e12a8749
-SIZE (hashicorp-consul-v1.6.1_GH0.tar.gz) = 22621651
+SHA256 (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = eba66530952a126ab869205bdb909af607bfd9eb09f00207b62eb29140258aa9
+SIZE (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = 24760
+SHA256 (grpc-ecosystem-grpc-gateway-v1.12.1_GH0.tar.gz) = 8a3ce7fa981dd21c0693fb2922457053a7c2e5a5687e22d9f19fe7c35520c35e
+SIZE (grpc-ecosystem-grpc-gateway-v1.12.1_GH0.tar.gz) = 438424
+SHA256 (grpc-grpc-go-v1.25.1_GH0.tar.gz) = d4c16d05bca2afb32001c2d2ed233c013374d09ecc2bd15894d098555a637316
+SIZE (grpc-grpc-go-v1.25.1_GH0.tar.gz) = 702242
+SHA256 (hashicorp-consul-v1.3.0_GH0.tar.gz) = 092fa948012e8f6003211a90af4ae14d1e6c3006535b2bc7eb0eaac34b7f77fb
+SIZE (hashicorp-consul-v1.3.0_GH0.tar.gz) = 19423317
 SHA256 (hashicorp-go-cleanhttp-v0.5.1_GH0.tar.gz) = 24dedefe5edc4698dfa7e15a472369078a3447e8096e6d856549341c873c4a0b
 SIZE (hashicorp-go-cleanhttp-v0.5.1_GH0.tar.gz) = 8069
 SHA256 (hashicorp-go-immutable-radix-v1.1.0_GH0.tar.gz) = 7c8eb6ecabcf4428e2f3b6bbb99c74d6c5e568ea1c42a029b284ae96dbccd57f
@@ -119,18 +137,20 @@ SHA256 (hashicorp-go-rootcerts-v1.0.1_GH0.tar.gz) = 62eb5aa833acd6befcce8037023d
 SIZE (hashicorp-go-rootcerts-v1.0.1_GH0.tar.gz) = 11786
 SHA256 (hashicorp-golang-lru-v0.5.3_GH0.tar.gz) = dd98197fc84fbf636b6811ff3c14ef1ea0fe732fe782b8034cf082b3ff274af3
 SIZE (hashicorp-golang-lru-v0.5.3_GH0.tar.gz) = 13348
-SHA256 (hashicorp-serf-v0.8.3_GH0.tar.gz) = 9437b8b1a7f7c2e43e5df5ccd1385134e3e7dd33ca34771e461490daf1beefce
-SIZE (hashicorp-serf-v0.8.3_GH0.tar.gz) = 1970313
+SHA256 (hashicorp-serf-v0.8.5_GH0.tar.gz) = bee75f213c661b84cc1ab6436b56ba0169ec7780976605f640ecb6ebb658766b
+SIZE (hashicorp-serf-v0.8.5_GH0.tar.gz) = 1972387
 SHA256 (jmespath-go-jmespath-c2b33e8439af_GH0.tar.gz) = 1ccd468fe91f58cd1b144f6317f06b53bf0a5da5e03e6a399a2d03f087db1fe9
 SIZE (jmespath-go-jmespath-c2b33e8439af_GH0.tar.gz) = 48265
 SHA256 (joeshaw-multierror-69b34d4ec901_GH0.tar.gz) = 8f53148758c58301d48b37ab9c27706c87e0bf94a84a919dc8dcc92f3e461449
 SIZE (joeshaw-multierror-69b34d4ec901_GH0.tar.gz) = 2163
-SHA256 (jpillora-backoff-3050d21c67d7_GH0.tar.gz) = 94505380f2fc60e5b307e79267f2089f347fa3c2417d08c1820efc43155a6fcc
-SIZE (jpillora-backoff-3050d21c67d7_GH0.tar.gz) = 3347
-SHA256 (json-iterator-go-v1.1.7_GH0.tar.gz) = fb0560a12eab7071f8518104703b6b2b1e6a5a0b564c8d61b0b68d29f6471233
-SIZE (json-iterator-go-v1.1.7_GH0.tar.gz) = 77936
-SHA256 (julienschmidt-httprouter-v1.2.0_GH0.tar.gz) = 54bdf6b53508bead0a9d4bae96beba3ac5171ce3a2e44c84431a7f23570b8ff5
-SIZE (julienschmidt-httprouter-v1.2.0_GH0.tar.gz) = 22914
+SHA256 (jpillora-backoff-v1.0.0_GH0.tar.gz) = 611b29ce95acfa2997e3449762a3df68fcaa773db045535f26eb5c686106351f
+SIZE (jpillora-backoff-v1.0.0_GH0.tar.gz) = 3507
+SHA256 (json-iterator-go-v1.1.8_GH0.tar.gz) = 0e16ec1a5175936864f3ee101951f58845ae0c86211e9a15b0c6bbf23752e62d
+SIZE (json-iterator-go-v1.1.8_GH0.tar.gz) = 79177
+SHA256 (jstemmer-go-junit-report-v0.9.1_GH0.tar.gz) = 4999e6d8feefe5b89eb9c2b3845a3c0ecdb6f0b0ba4e9785567a43f8952fff15
+SIZE (jstemmer-go-junit-report-v0.9.1_GH0.tar.gz) = 17764
+SHA256 (julienschmidt-httprouter-v1.3.0_GH0.tar.gz) = 2999dffc23f8ac3872ea37d108ddec0ba570d2780a42876300bdcdb0744908e2
+SIZE (julienschmidt-httprouter-v1.3.0_GH0.tar.gz) = 23889
 SHA256 (kr-logfmt-b84e30acd515_GH0.tar.gz) = bf056ba7960b6846f2aa2c6ec0a217ead3e7259bc6c537f9f3ba3af6eb82cb80
 SIZE (kr-logfmt-b84e30acd515_GH0.tar.gz) = 6411
 SHA256 (kubernetes-sigs-yaml-v1.1.0_GH0.tar.gz) = 0ee3cfa6e0c3178df07213443ebac0d6ecc1178147f43f848ea7114acf621953
@@ -143,22 +163,28 @@ SHA256 (kubernetes-client-go-78d2af792bab_GH0.tar.gz) = aac14ae70818105823618727
 SIZE (kubernetes-client-go-78d2af792bab_GH0.tar.gz) = 560699
 SHA256 (kubernetes-klog-v0.3.1_GH0.tar.gz) = fa64aad2df750ca2938188883109d83ef6183039f3a8b19bdf0993b10cd604e6
 SIZE (kubernetes-klog-v0.3.1_GH0.tar.gz) = 28851
-SHA256 (kubernetes-utils-6c36bc71fc4a_GH0.tar.gz) = 4ddbf7599e79e5db2d12bfc703499c7bb11f01ea7c6ed490ccce13d7903a086e
-SIZE (kubernetes-utils-6c36bc71fc4a_GH0.tar.gz) = 51151
+SHA256 (kubernetes-utils-6ca3b61696b6_GH0.tar.gz) = c5d05e0e6bc63bee17c7d7f0f638a38e889c1d8eee0bd60c688161ecf5e48280
+SIZE (kubernetes-utils-6ca3b61696b6_GH0.tar.gz) = 78515
 SHA256 (leanovate-gopter-v0.2.4_GH0.tar.gz) = 0cd50155a6ab92c08c3fcb783a1a7ef367e20ff1203f41f514cdaee1bdc56873
 SIZE (leanovate-gopter-v0.2.4_GH0.tar.gz) = 57065
+SHA256 (lightstep-lightstep-tracer-common-bc2310a04743_GH0.tar.gz) = 1c186829b697bfb47f011d6f3a8e092323e9e262a7cbdc152203ec58ac036f2b
+SIZE (lightstep-lightstep-tracer-common-bc2310a04743_GH0.tar.gz) = 44156
+SHA256 (lightstep-lightstep-tracer-go-v0.18.0_GH0.tar.gz) = 1f5b90da8187f9df6cb2c69434bb9c4d5578ee659c1dad71d816f740c034d740
+SIZE (lightstep-lightstep-tracer-go-v0.18.0_GH0.tar.gz) = 56719
 SHA256 (lovoo-gcloud-opentracing-v0.3.0_GH0.tar.gz) = a9f8567986e1d086a2afe285497ed3d17feaac9dfa20751e0fc85442a4cacc04
 SIZE (lovoo-gcloud-opentracing-v0.3.0_GH0.tar.gz) = 5323
-SHA256 (mattn-go-ieproxy-f9202b1cfdeb_GH0.tar.gz) = ead7f9d67a0f5da42acc79c53a60c8dfd5d1bb1be726db1348bc4b0ea01f8159
-SIZE (mattn-go-ieproxy-f9202b1cfdeb_GH0.tar.gz) = 7514
-SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe
-SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827
+SHA256 (mattn-go-ieproxy-7c0f6868bffe_GH0.tar.gz) = caf8b5faaa47c492900bd84e6b56e5d83d5996188b98c324d8c328344ea21bb4
+SIZE (mattn-go-ieproxy-7c0f6868bffe_GH0.tar.gz) = 8486
+SHA256 (mattn-go-runewidth-v0.0.6_GH0.tar.gz) = 5554017bd41a30901ff788c5ef77e8c29a4ed565ae67e1ccad43ae03b720baed
+SIZE (mattn-go-runewidth-v0.0.6_GH0.tar.gz) = 16030
 SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
 SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
-SHA256 (miekg-dns-v1.1.19_GH0.tar.gz) = bcdcbd882906312af4854969e2809fbb76cd6ffec54ecaf5e1f3412f41f26200
-SIZE (miekg-dns-v1.1.19_GH0.tar.gz) = 177278
-SHA256 (minio-minio-go-de69c0e465ed_GH0.tar.gz) = 8e192dd02b27a770ea710dab5eac3949195b074814b856a8823420537585c163
-SIZE (minio-minio-go-de69c0e465ed_GH0.tar.gz) = 195393
+SHA256 (miekg-dns-v1.1.22_GH0.tar.gz) = 32446249a35d682913bc0d56a1126c0aec8712d3714c5b5ad078f14b682ba0ef
+SIZE (miekg-dns-v1.1.22_GH0.tar.gz) = 178978
+SHA256 (minio-minio-go-v6.0.44_GH0.tar.gz) = 1979f14edbbd79f08725889638bca62312b5c9ef47871ad8f2dcd72883829e85
+SIZE (minio-minio-go-v6.0.44_GH0.tar.gz) = 201238
+SHA256 (minio-sha256-simd-v0.1.1_GH0.tar.gz) = bc1f1e80dc1291f6d26933658155488cc895f6b8a4944479d462cf5a79112109
+SIZE (minio-sha256-simd-v0.1.1_GH0.tar.gz) = 65024
 SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
 SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362
 SHA256 (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 53fbc06b125ff1c9c73a4eb1764346932671a29c67a45a92e2ebc6855635069b
@@ -167,8 +193,8 @@ SHA256 (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = d673e902118a6ece63198dc7
 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 (mozillazg-go-cos-v0.12.0_GH0.tar.gz) = 2050f1b297d17392c4336015ca2c8e2ed539a84ca3cdc6bb7b6899e26de498eb
-SIZE (mozillazg-go-cos-v0.12.0_GH0.tar.gz) = 48775
+SHA256 (mozillazg-go-cos-v0.13.0_GH0.tar.gz) = b812be5b2a86e4201727279922263c7bf095a929448accc94c787b44ac5b90f0
+SIZE (mozillazg-go-cos-v0.13.0_GH0.tar.gz) = 50774
 SHA256 (mozillazg-go-httpheader-v0.2.1_GH0.tar.gz) = a6990188f680dd038b8edeb7d1576015e61c65b6e0ca532273dc06c527934446
 SIZE (mozillazg-go-httpheader-v0.2.1_GH0.tar.gz) = 6446
 SHA256 (mwitkow-go-conntrack-2f068394615f_GH0.tar.gz) = 5bb72eaf9a4ffd7d0353fa6944951d244df89d879ac36d4b9860fd159162dd81
@@ -177,39 +203,35 @@ SHA256 (oklog-run-v1.0.0_GH0.tar.gz) = 079ee5a50fcb299eb7b957dd1acaba1f536f2abe5
 SIZE (oklog-run-v1.0.0_GH0.tar.gz) = 7126
 SHA256 (oklog-ulid-v1.3.1_GH0.tar.gz) = 499a6ee77ca473a44ad9f11425a8f87f6c02ff1221b11f24d13bee13ce632640
 SIZE (oklog-ulid-v1.3.1_GH0.tar.gz) = 55582
-SHA256 (olekukonko-tablewriter-v0.0.1_GH0.tar.gz) = d9d620f0bcd58953a44b514042caa378b8256a692bcc8c0842e8aeac5a87db89
-SIZE (olekukonko-tablewriter-v0.0.1_GH0.tar.gz) = 17505
-SHA256 (opentracing-contrib-go-stdlib-cf7a6c988dc9_GH0.tar.gz) = 904f8846fb3a74c70706f2a34ff431d1f2f029cbd62a7baaf1ca31c11ecf8c0a
-SIZE (opentracing-contrib-go-stdlib-cf7a6c988dc9_GH0.tar.gz) = 11931
+SHA256 (olekukonko-tablewriter-v0.0.2_GH0.tar.gz) = 07e3c6c6f36f6d6e5fc0aa5490f756a9d987e2f3ed20c74e1ec3805c027fd71d
+SIZE (olekukonko-tablewriter-v0.0.2_GH0.tar.gz) = 18831
 SHA256 (opentracing-basictracer-go-v1.0.0_GH0.tar.gz) = a1d4f028a38c32d996014dfb07577a881a3413adc081380f47b2e74bab37da88
 SIZE (opentracing-basictracer-go-v1.0.0_GH0.tar.gz) = 21335
 SHA256 (opentracing-opentracing-go-v1.1.0_GH0.tar.gz) = 8aaf0be594bf4c73d577190e3a85946708d76c9815638577cbe1d0134c09ab94
 SIZE (opentracing-opentracing-go-v1.1.0_GH0.tar.gz) = 33085
 SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
 SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
-SHA256 (prometheus-client_golang-v1.1.0_GH0.tar.gz) = 4fd80a210cc090db117d92d126d15cdb5108c84e3178ffc7bd26cb2fa4298343
-SIZE (prometheus-client_golang-v1.1.0_GH0.tar.gz) = 140006
+SHA256 (prometheus-client_golang-v1.2.1_GH0.tar.gz) = fe6a626322d22d8ce9780320fd04a64a90c9a7aa62ec88809651072b30a10e6a
+SIZE (prometheus-client_golang-v1.2.1_GH0.tar.gz) = 142465
 SHA256 (prometheus-client_model-14fe0d1b01d4_GH0.tar.gz) = e86922566dae5bd684e2b77baabfaee9df34ce11cd7c8bae688b512b3a496f03
 SIZE (prometheus-client_model-14fe0d1b01d4_GH0.tar.gz) = 57495
-SHA256 (prometheus-common-v0.6.0_GH0.tar.gz) = 3b58d10c44520d8fd3817b45599a6229123ccf8967db528063143266405b7c4f
-SIZE (prometheus-common-v0.6.0_GH0.tar.gz) = 99696
-SHA256 (prometheus-procfs-v0.0.3_GH0.tar.gz) = 3af9b805166932b771dfa19a4c94eb83ceefd2eb54d1a314c3bf15a5f3154d0d
-SIZE (prometheus-procfs-v0.0.3_GH0.tar.gz) = 91880
-SHA256 (prometheus-prometheus-8ab628b35467_GH0.tar.gz) = 0cf03727bd6a6f1642793d402b96cd203ff7bfad39455a585c6ac7d4d81ef50e
-SIZE (prometheus-prometheus-8ab628b35467_GH0.tar.gz) = 15240715
-SHA256 (samuel-go-zookeeper-0ceca61e4d75_GH0.tar.gz) = 4d7f7264a086371d9345f3c49674750514e8eb2713b17a4e392093fb5f0fc19e
-SIZE (samuel-go-zookeeper-0ceca61e4d75_GH0.tar.gz) = 40116
+SHA256 (prometheus-common-v0.7.0_GH0.tar.gz) = 71b1dce2afd959f9fcab3b5e097dfa9d398a61749851d290114746a3f8f119ae
+SIZE (prometheus-common-v0.7.0_GH0.tar.gz) = 100520
+SHA256 (prometheus-procfs-v0.0.6_GH0.tar.gz) = fe0a4dc8f045273afe24b4049bc30d95b0779af0a25120bdadfef6ff80019b52
+SIZE (prometheus-procfs-v0.0.6_GH0.tar.gz) = 123997
+SHA256 (prometheus-prometheus-4708915ac6ef_GH0.tar.gz) = 74291685932eb8ab83f5d0301f77b487913bcf16070c8b3f9a3a4413d39e4ce5
+SIZE (prometheus-prometheus-4708915ac6ef_GH0.tar.gz) = 12863144
+SHA256 (samuel-go-zookeeper-2cc03de413da_GH0.tar.gz) = dac23a1f2a63f6f79f8d2bc30d6a36e9b28b4e15013381b11b102f489505fc53
+SIZE (samuel-go-zookeeper-2cc03de413da_GH0.tar.gz) = 40257
 SHA256 (santhosh-tekuri-jsonschema-v1.2.4_GH0.tar.gz) = a5c4f3144052a308e2af5e9d0f49e4abd7ea96fa15b2c24c80882ce9c52300c3
 SIZE (santhosh-tekuri-jsonschema-v1.2.4_GH0.tar.gz) = 57750
+SHA256 (uber-go-atomic-v1.5.0_GH0.tar.gz) = 3b003515efb86c67aced0ce9e954cca50964ee0afe83e5a63dfe43aa58347290
+SIZE (uber-go-atomic-v1.5.0_GH0.tar.gz) = 9365
 SHA256 (uber-go-automaxprocs-v1.2.0_GH0.tar.gz) = 6e9e8e355a57b793397eda88b5f6e8e0da3fc5b3b51dcab95c865c0926d42067
 SIZE (uber-go-automaxprocs-v1.2.0_GH0.tar.gz) = 16007
-SHA256 (uber-jaeger-client-go-v2.16.0_GH0.tar.gz) = 9657eb6603d6aae55c5637957ab63400127bcc395981831366998428cc3f7edb
-SIZE (uber-jaeger-client-go-v2.16.0_GH0.tar.gz) = 167656
+SHA256 (uber-jaeger-client-go-v2.20.1_GH0.tar.gz) = 9b293e3376c0523e4d338fae3fccfa1e0fa208c3ef60dfa31d7b2149e1545e78
+SIZE (uber-jaeger-client-go-v2.20.1_GH0.tar.gz) = 189674
 SHA256 (uber-jaeger-lib-v2.2.0_GH0.tar.gz) = 5ea76c211b8b005c17dd32c8286005973b264e00d559c75f55acbc7001aa2fd9
 SIZE (uber-jaeger-lib-v2.2.0_GH0.tar.gz) = 36451
-SHA256 (elastic-go-fastjson-v1.0.0_GH0.tar.gz) = 74fc857be20f3bc7aad6d0d407e0425c901d7e16be5ec69bd4fcd172b74bcbcb
-SIZE (elastic-go-fastjson-v1.0.0_GH0.tar.gz) = 9479
-SHA256 (elastic-apm-agent-go-v1.5.0_GH0.tar.gz) = 3a5c625d4112ca6dc3304917f4513f0602c687057d0b42176b1050d0e45d3f8b
-SIZE (elastic-apm-agent-go-v1.5.0_GH0.tar.gz) = 335475
 SHA256 (go-plist-591f970eefbbeb04d7b37f334a0c4c3256e32876_GL0.tar.gz) = 63bd1d3aedbb0a2e6861f0e78c9defca6805478c00763506864524b6011cc3ac
 SIZE (go-plist-591f970eefbbeb04d7b37f334a0c4c3256e32876_GL0.tar.gz) = 49098
diff --git a/net-p2p/namecoin/Makefile b/net-p2p/namecoin/Makefile
index 7f4a53d4b42..e6d3a9d1486 100644
--- a/net-p2p/namecoin/Makefile
+++ b/net-p2p/namecoin/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	namecoin
-PORTVERSION=	0.17.0
+PORTVERSION=	0.19.0.1
 DISTVERSIONPREFIX=	nc
-PORTREVISION=	13
 PORTEPOCH=	1
 CATEGORIES=	net-p2p dns
 
diff --git a/net-p2p/namecoin/distinfo b/net-p2p/namecoin/distinfo
index 8952ce93c3a..1e2fffb472f 100644
--- a/net-p2p/namecoin/distinfo
+++ b/net-p2p/namecoin/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1540917313
-SHA256 (namecoin-namecoin-core-nc0.17.0_GH0.tar.gz) = b9e56cebd6756ad8ff7c8f6c9e633cb56cb139c7c4437189945b3f25acbe0082
-SIZE (namecoin-namecoin-core-nc0.17.0_GH0.tar.gz) = 5465627
+TIMESTAMP = 1581654464
+SHA256 (namecoin-namecoin-core-nc0.19.0.1_GH0.tar.gz) = a9d403822a7ff470f9bf1467e6833af53af7c80a8c696eb259f16b105cba7ad3
+SIZE (namecoin-namecoin-core-nc0.19.0.1_GH0.tar.gz) = 5873509
 SHA256 (indolering-namecoin-graphics-a13a73b_GH0.tar.gz) = 82f308a3527d96a202099feb96a754d036bbdaa875156ad002ba2747d75000c7
 SIZE (indolering-namecoin-graphics-a13a73b_GH0.tar.gz) = 7364908
diff --git a/net-p2p/namecoin/files/patch-src_fs.h b/net-p2p/namecoin/files/patch-src_fs.h
new file mode 100644
index 00000000000..1a2bce9bbbb
--- /dev/null
+++ b/net-p2p/namecoin/files/patch-src_fs.h
@@ -0,0 +1,10 @@
+--- src/fs.h.orig	2020-02-14 04:46:53.262100000 +0000
++++ src/fs.h	2020-02-14 04:47:08.369514000 +0000
+@@ -11,7 +11,6 @@
+ #include <ext/stdio_filebuf.h>
+ #endif
+ 
+-#define BOOST_FILESYSTEM_NO_DEPRECATED
+ #include <boost/filesystem.hpp>
+ #include <boost/filesystem/fstream.hpp>
+ 
diff --git a/net-p2p/xmrig/Makefile b/net-p2p/xmrig/Makefile
index 2cc8fd727db..f8efb0388c8 100644
--- a/net-p2p/xmrig/Makefile
+++ b/net-p2p/xmrig/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmrig
-PORTVERSION=	5.5.3
+PORTVERSION=	5.6.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-p2p
 
diff --git a/net-p2p/xmrig/distinfo b/net-p2p/xmrig/distinfo
index 290c0c80b96..953ff8d7a77 100644
--- a/net-p2p/xmrig/distinfo
+++ b/net-p2p/xmrig/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580721219
-SHA256 (xmrig-xmrig-v5.5.3_GH0.tar.gz) = 267a7b7eff22a7f7e5eb93ef1602c65dfe986e19e4f65e8e64fea6596e42835a
-SIZE (xmrig-xmrig-v5.5.3_GH0.tar.gz) = 1246258
+TIMESTAMP = 1581871749
+SHA256 (xmrig-xmrig-v5.6.0_GH0.tar.gz) = f81288f5183f9073f382b51e883309b89c32ea791f758a94fc4fe1600dde8001
+SIZE (xmrig-xmrig-v5.6.0_GH0.tar.gz) = 1307067
diff --git a/net/Makefile b/net/Makefile
index 05a1bbc610d..d708f749212 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1088,6 +1088,7 @@
     SUBDIR += py-python-bitcoinrpc
     SUBDIR += py-python-ceilometerclient
     SUBDIR += py-python-cinderclient
+    SUBDIR += py-python-cinderclient5
     SUBDIR += py-python-designateclient
     SUBDIR += py-python-glanceclient
     SUBDIR += py-python-heatclient
diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile
index 9cdcded97c8..e312a2cfec8 100644
--- a/net/guacamole-server/Makefile
+++ b/net/guacamole-server/Makefile
@@ -17,7 +17,8 @@ LIB_DEPENDS=	libossp-uuid.so:misc/ossp-uuid \
 
 CONFLICTS_BUILD=pulseaudio-*+jack_* ffmpeg-*+jack_*
 
-USES=		autoreconf gnome jpeg libtool localbase pkgconfig shebangfix
+USES=		autoreconf compiler:c11 gnome jpeg libtool localbase pkgconfig \
+		shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	apache
diff --git a/net/haproxy19/Makefile b/net/haproxy19/Makefile
index 186b95d12bd..555a1721833 100644
--- a/net/haproxy19/Makefile
+++ b/net/haproxy19/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	haproxy
-DISTVERSION=	1.9.13
+DISTVERSION=	1.9.14
 CATEGORIES=	net www
 PKGNAMESUFFIX=	19
 MASTER_SITES=	http://www.haproxy.org/download/1.9/src/
diff --git a/net/haproxy19/distinfo b/net/haproxy19/distinfo
index 461dcb9bb6b..04fc06f3217 100644
--- a/net/haproxy19/distinfo
+++ b/net/haproxy19/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574705497
-SHA256 (haproxy-1.9.13.tar.gz) = adae40f963b03df0917edc44681064627f77683dcf7db66ef030672ad6d00547
-SIZE (haproxy-1.9.13.tar.gz) = 2395999
+TIMESTAMP = 1581694288
+SHA256 (haproxy-1.9.14.tar.gz) = d4bd6c58547cfd282feaef195d816b26145be19e494bf3486bb7187f7982296f
+SIZE (haproxy-1.9.14.tar.gz) = 2476753
diff --git a/net/haproxy19/pkg-plist b/net/haproxy19/pkg-plist
index e60a375e530..d7b72bae229 100644
--- a/net/haproxy19/pkg-plist
+++ b/net/haproxy19/pkg-plist
@@ -46,6 +46,8 @@ sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/internals/http-docs.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/http-parsing.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/list.fig
+%%PORTDOCS%%%%DOCSDIR%%/internals/listener-states.fig
+%%PORTDOCS%%%%DOCSDIR%%/internals/listener-states.png
 %%PORTDOCS%%%%DOCSDIR%%/internals/lua_socket.fig
 %%PORTDOCS%%%%DOCSDIR%%/internals/lua_socket.pdf
 %%PORTDOCS%%%%DOCSDIR%%/internals/naming.txt
diff --git a/net/libfabric/Makefile b/net/libfabric/Makefile
index b86484e3f54..6687b00635c 100644
--- a/net/libfabric/Makefile
+++ b/net/libfabric/Makefile
@@ -41,9 +41,23 @@ ${p}_DESC=			'${p:tl}' provider
 ${p}_CONFIGURE_ENABLE=		${p:tl}
 .endfor
 
+SED_WRAP_CLOSE=	{ \
+		i\\\n \
+		\#ifdef SHIM_SYS_SHIM_HELPERS\\\n \
+		\#undef close\\\n \
+		\#endif\n \
+		a\\\n \
+		\#ifdef SHIM_SYS_SHIM_HELPERS\\\n \
+		\#define close epoll_shim_close\\\n \
+		\#endif\n \
+		}
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '<asm/types\.h>' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|<asm/types\.h>|<sys/types.h>|'
 	@${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '<malloc\.h>' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|<malloc\.h>|<stdlib.h>|'
 	@${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '<alloca\.h>' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|<alloca\.h>|<stdlib.h>|'
+	@${GREP} -Flr --include='*.c' '.close' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} $$'/\\.close/${SED_WRAP_CLOSE}'
+	@${REINPLACE_CMD} $$'/fi_ops.*close/${SED_WRAP_CLOSE}' ${WRKSRC}/src/fabric.c
+	@${REINPLACE_CMD} $$'/[*>]close/${SED_WRAP_CLOSE}' ${WRKSRC}/include/rdma/fabric.h
 
 .include <bsd.port.mk>
diff --git a/net/madonctl/Makefile b/net/madonctl/Makefile
index b9aa28b8d15..7f3d13a7745 100644
--- a/net/madonctl/Makefile
+++ b/net/madonctl/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	madonctl
 PORTVERSION=	2.3.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	net
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -19,32 +19,11 @@ PLIST_FILES=	bin/madonctl
 
 GH_ACCOUNT=	McKael
 GH_TAGNAME=	97f477f
-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.7:goyaml_yaml/vendor/gopkg.in/yaml.v2 \
-		golang:net:c0dbc17:golang_net/vendor/golang.org/x/net \
-		golang:oauth2:858c2ad:golang_oauth2/vendor/golang.org/x/oauth2 \
-		golang:sys:a1369af:golang_sys/vendor/golang.org/x/sys \
-		golang:text:929e72c:golang_text/vendor/golang.org/x/text \
-		gorilla:websocket:v1.4.1:gorilla_websocket/vendor/github.com/gorilla/websocket \
-		hashicorp:hcl:v2.3.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.11:mattn_goisatty/vendor/github.com/mattn/go-isatty \
-		mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
-		pelletier:go-toml:v1.6.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.1: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.5:spf13_pflag/vendor/github.com/spf13/pflag \
-		spf13:viper:v1.6.1:spf13_viper/vendor/github.com/spf13/viper \
-		stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify
 USE_GITHUB=	yes
 
+# Remove vendor/modules.txt due to inconsistent vendoring
+# See https://github.com/McKael/madonctl/issues/22
+post-extract:
+	@${RM} ${WRKSRC}/vendor/modules.txt
+
 .include <bsd.port.mk>
diff --git a/net/p5-ZeroMQ/Makefile b/net/p5-ZeroMQ/Makefile
index afe2d8facd1..ae9bb8505df 100644
--- a/net/p5-ZeroMQ/Makefile
+++ b/net/p5-ZeroMQ/Makefile
@@ -13,20 +13,24 @@ COMMENT=	ZeroMQ2 wrapper for Perl
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Task-Weaken>=0:devel/p5-Task-Weaken
-RUN_DEPENDS=	p5-Task-Weaken>=0:devel/p5-Task-Weaken
+DEPRECATED=	Deprecated by upstream
+EXPIRATION_DATE=2020-02-29
+
+BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	libzmq.so:net/libzmq2 \
 		libuuid.so:misc/e2fsprogs-libuuid
+RUN_DEPENDS=	p5-Task-Weaken>=0:devel/p5-Task-Weaken
 TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
 		p5-Test-Requires>=0.05:devel/p5-Test-Requires \
 		p5-Test-TCP>=1.08:devel/p5-Test-TCP \
 		p5-AnyEvent>=0:devel/p5-AnyEvent \
 		p5-JSON>=2.00:converters/p5-JSON
 
-USES=		pkgconfig perl5
-MAKE_JOBS_UNSAFE=	yes
+USES=		perl5 pkgconfig
 USE_PERL5=	configure
 
+MAKE_JOBS_UNSAFE=	yes
+
 post-patch:
 	@${REINPLACE_CMD} -i '' -e "s/lib => 'zmq',//" ${WRKSRC}/Makefile.PL
 
diff --git a/net/py-cloudscraper/Makefile b/net/py-cloudscraper/Makefile
index 6deeb2075c3..30fb50223c3 100644
--- a/net/py-cloudscraper/Makefile
+++ b/net/py-cloudscraper/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cloudscraper
-DISTVERSION=	1.2.20
+DISTVERSION=	1.2.23
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/net/py-cloudscraper/distinfo b/net/py-cloudscraper/distinfo
index 8ad7130ef6c..8dc8ee0dcc6 100644
--- a/net/py-cloudscraper/distinfo
+++ b/net/py-cloudscraper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579244912
-SHA256 (VeNoMouS-cloudscraper-1.2.20_GH0.tar.gz) = 259d1dd51109f4f67b474e7bda9623a56f25b99075f0531b9b0567cfccd10593
-SIZE (VeNoMouS-cloudscraper-1.2.20_GH0.tar.gz) = 111629
+TIMESTAMP = 1581790374
+SHA256 (VeNoMouS-cloudscraper-1.2.23_GH0.tar.gz) = 33c2efacc6e20535bc9e15eee6401cd9364624aba0a87a0e069878882e8a6cf6
+SIZE (VeNoMouS-cloudscraper-1.2.23_GH0.tar.gz) = 113830
diff --git a/net/py-pyroute2/Makefile b/net/py-pyroute2/Makefile
index 509beffc7a2..22a3be1a512 100644
--- a/net/py-pyroute2/Makefile
+++ b/net/py-pyroute2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pyroute2
-PORTVERSION=	0.5.7
+PORTVERSION=	0.5.9
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-pyroute2/distinfo b/net/py-pyroute2/distinfo
index 9bbd30d646a..daeeb7ca5fb 100644
--- a/net/py-pyroute2/distinfo
+++ b/net/py-pyroute2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578401118
-SHA256 (pyroute2-0.5.7.tar.gz) = 963fce07da2841456d39e3b932b071f6de28d23dadfae014022d67a752916f98
-SIZE (pyroute2-0.5.7.tar.gz) = 718123
+TIMESTAMP = 1581775757
+SHA256 (pyroute2-0.5.9.tar.gz) = 240ed116fabef02c284cc40d27986e629f02aa788311a8059905b8988752d5b7
+SIZE (pyroute2-0.5.9.tar.gz) = 734751
diff --git a/net/py-python-cinderclient/Makefile b/net/py-python-cinderclient/Makefile
index 47920387c14..7b980837ff4 100644
--- a/net/py-python-cinderclient/Makefile
+++ b/net/py-python-cinderclient/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	python-cinderclient
-PORTVERSION=	5.0.0
+PORTVERSION=	6.0.0
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -24,7 +24,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=3.5.1:devel/py-simplejson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
 
-USES=		python shebangfix
+USES=		python:3.6+ shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/net/py-python-cinderclient/distinfo b/net/py-python-cinderclient/distinfo
index 4aade97bacb..817af6b0d61 100644
--- a/net/py-python-cinderclient/distinfo
+++ b/net/py-python-cinderclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578401178
-SHA256 (python-cinderclient-5.0.0.tar.gz) = d61bc8d816c1fe18304843b70bbb33220ebb5ae554b4c3a1c83486ad0d7d1509
-SIZE (python-cinderclient-5.0.0.tar.gz) = 254510
+TIMESTAMP = 1581775759
+SHA256 (python-cinderclient-6.0.0.tar.gz) = 48f5a0df0983bd06c0c870b728f2952a3fe4b67a4dc0031afaef0536e829d097
+SIZE (python-cinderclient-6.0.0.tar.gz) = 258173
diff --git a/net/py-python-cinderclient5/Makefile b/net/py-python-cinderclient5/Makefile
new file mode 100644
index 00000000000..453614cd6c4
--- /dev/null
+++ b/net/py-python-cinderclient5/Makefile
@@ -0,0 +1,37 @@
+# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
+# $FreeBSD$
+
+PORTNAME=	python-cinderclient
+PORTVERSION=	5.0.0
+CATEGORIES=	net python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	5
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	OpenStack Block Storage API Client Library
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}prettytable>=0.7.1<0.8:devel/py-prettytable@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=3.5.1:devel/py-simplejson@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
+
+USES=		python shebangfix
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^5\.
+
+SHEBANG_GLOB=	*.sh
+
+.include <bsd.port.mk>
diff --git a/net/py-python-cinderclient5/distinfo b/net/py-python-cinderclient5/distinfo
new file mode 100644
index 00000000000..4aade97bacb
--- /dev/null
+++ b/net/py-python-cinderclient5/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1578401178
+SHA256 (python-cinderclient-5.0.0.tar.gz) = d61bc8d816c1fe18304843b70bbb33220ebb5ae554b4c3a1c83486ad0d7d1509
+SIZE (python-cinderclient-5.0.0.tar.gz) = 254510
diff --git a/net/py-python-cinderclient5/pkg-descr b/net/py-python-cinderclient5/pkg-descr
new file mode 100644
index 00000000000..89888d5f1d4
--- /dev/null
+++ b/net/py-python-cinderclient5/pkg-descr
@@ -0,0 +1,9 @@
+This is a client for the OpenStack Cinder API. There's a Python API (the
+cinderclient module), and a command-line script (cinder). Each implements 100%
+of the OpenStack Cinder API.
+
+See the OpenStack CLI Reference for information on how to use the cinder
+command-line tool. You may also want to look at the OpenStack API documentation.
+
+WWW: https://docs.openstack.org/python-cinderclient/latest/
+WWW: https://github.com/openstack/python-cinderclient
diff --git a/net/py-python-designateclient/Makefile b/net/py-python-designateclient/Makefile
index d4c83e68e16..d80851779ec 100644
--- a/net/py-python-designateclient/Makefile
+++ b/net/py-python-designateclient/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	python-designateclient
-PORTVERSION=	3.0.0
+PORTVERSION=	3.1.0
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-python-designateclient/distinfo b/net/py-python-designateclient/distinfo
index 5ad894677ac..16f78e02e5d 100644
--- a/net/py-python-designateclient/distinfo
+++ b/net/py-python-designateclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578501173
-SHA256 (python-designateclient-3.0.0.tar.gz) = 9f859e3b7c7e84f706d803823a63467f529cd79e7ca8504f75fe54cd4fb66aa7
-SIZE (python-designateclient-3.0.0.tar.gz) = 62684
+TIMESTAMP = 1581775761
+SHA256 (python-designateclient-3.1.0.tar.gz) = 714a68ac0b3f9a4e5933f69c01b0b6737f26fee138b9ee7654e04930bbd2cf16
+SIZE (python-designateclient-3.1.0.tar.gz) = 60222
diff --git a/net/py-python-openstackclient/Makefile b/net/py-python-openstackclient/Makefile
index 2e631aedfbe..04bd8151592 100644
--- a/net/py-python-openstackclient/Makefile
+++ b/net/py-python-openstackclient/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	python-openstackclient
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -22,7 +23,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-cinderclient>=3.3.0:net/py-python-cinderclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-glanceclient>=2.8.0:net/py-python-glanceclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.17.0:net/py-python-keystoneclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-novaclient>=15.0.0:net/py-python-novaclient@${PY_FLAVOR} \
@@ -35,4 +35,12 @@ NO_ARCH=	yes
 
 SHEBANG_GLOB=	*.sh
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3600
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}python-cinderclient5>=3.3.0:net/py-python-cinderclient5@${PY_FLAVOR}
+.else
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}python-cinderclient>=3.3.0:net/py-python-cinderclient@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/rtptools/Makefile b/net/rtptools/Makefile
index 2a2491fc737..7b52b1f0307 100644
--- a/net/rtptools/Makefile
+++ b/net/rtptools/Makefile
@@ -16,6 +16,8 @@ GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	irtlab
 
+PORTSCOUT=	limit:^\d.*
+
 .for f in multidump multiplay rtpdump rtpplay rtpsend rtptrans
 PLIST_FILES+=	bin/${f}
 PLIST_FILES+=	man/man1/${f}.1.gz
diff --git a/net/rubygem-t/Makefile b/net/rubygem-t/Makefile
index b0a12b49013..76b4ca6702b 100644
--- a/net/rubygem-t/Makefile
+++ b/net/rubygem-t/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	t
 PORTVERSION=	3.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
@@ -17,7 +17,7 @@ RUN_DEPENDS=	rubygem-geokit>=1.9<2:graphics/rubygem-geokit \
 		rubygem-htmlentities>=4.3<5:textproc/rubygem-htmlentities \
 		rubygem-launchy>=2.4<3:devel/rubygem-launchy \
 		rubygem-oauth>=0.5.1<0.6:net/rubygem-oauth \
-		rubygem-retryable>=2.0:devel/rubygem-retryable \
+		rubygem-retryable>=3.0<4:devel/rubygem-retryable \
 		rubygem-thor>=0.19.1<2:devel/rubygem-thor \
 		rubygem-twitter>=6.0:net/rubygem-twitter
 
diff --git a/net/rubygem-t/files/patch-gemspec b/net/rubygem-t/files/patch-gemspec
index 133f9bbe6ed..fd6e20a256e 100644
--- a/net/rubygem-t/files/patch-gemspec
+++ b/net/rubygem-t/files/patch-gemspec
@@ -5,7 +5,7 @@
        s.add_runtime_dependency(%q<htmlentities>.freeze, ["~> 4.3"])
        s.add_runtime_dependency(%q<oauth>.freeze, ["~> 0.5.1"])
 -      s.add_runtime_dependency(%q<retryable>.freeze, ["~> 2.0"])
-+      s.add_runtime_dependency(%q<retryable>.freeze, [">= 2.0"])
++      s.add_runtime_dependency(%q<retryable>.freeze, ["~> 3.0"])
        s.add_runtime_dependency(%q<thor>.freeze, [">= 0.19.1", "< 2"])
 -      s.add_runtime_dependency(%q<twitter>.freeze, ["~> 6.0"])
 +      s.add_runtime_dependency(%q<twitter>.freeze, [">= 6.0"])
diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index 45fca1e1787..a743632f73a 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -40,7 +40,7 @@ MANUF_RUN_DEPENDS=	${LOCALBASE}/share/wireshark/manuf:net/wireshark
 MATPLOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 P0F_BASE_RUN_DEPENDS=	${LOCALBASE}/etc/p0f.fp:net-mgmt/p0f
 PYCRYPTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR}
-PYX_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PyX>0:graphics/py-PyX@${PY_FLAVOR}
+PYX_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyx>0:graphics/py-pyx@${PY_FLAVOR}
 QUESO_BASE_RUN_DEPENDS=	${LOCALBASE}/etc/queso.conf.sample:net/queso
 SOX_RUN_DEPENDS=	${LOCALBASE}/bin/sox:audio/sox
 
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index 33fd1cd4a17..38e88c34b91 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
-DISTVERSION=	1.13.99.0
+DISTVERSION=	1.13.99.1
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 PKGNAMESUFFIX=	-devel
@@ -13,7 +13,7 @@ LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
-GH_TAGNAME=	ec7dd7e0
+GH_TAGNAME=	ca6cf0f6
 
 WITH_DEBUG=	yes
 CFLAGS+=	-O0 -g -Wno-error
diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo
index f604de67f5d..0908e107916 100644
--- a/ports-mgmt/pkg-devel/distinfo
+++ b/ports-mgmt/pkg-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581519100
-SHA256 (freebsd-pkg-1.13.99.0-ec7dd7e0_GH0.tar.gz) = 8cc835475644fb4d47bbec03159b5d31dbc6f75210c647ea88f3550d1ccca92e
-SIZE (freebsd-pkg-1.13.99.0-ec7dd7e0_GH0.tar.gz) = 3387030
+TIMESTAMP = 1581697686
+SHA256 (freebsd-pkg-1.13.99.1-ca6cf0f6_GH0.tar.gz) = 27e488d452cd3ad2c4a4024442b79c20e44fbec38c0b7f73f905431c138cdf2a
+SIZE (freebsd-pkg-1.13.99.1-ca6cf0f6_GH0.tar.gz) = 3388777
diff --git a/ports-mgmt/pkg-provides/Makefile b/ports-mgmt/pkg-provides/Makefile
index 2983341e8b3..809183bad64 100644
--- a/ports-mgmt/pkg-provides/Makefile
+++ b/ports-mgmt/pkg-provides/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	pkg-provides
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.2
-PORTREVISION=	1
+DISTVERSION=	0.7.0
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	rodrigo@FreeBSD.org
@@ -19,7 +18,7 @@ LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rosorio
-GH_TAGNAME=	71b876c
+GH_TAGNAME=	691abba
 USE_LDCONFIG=	yes
 
 SUB_FILES=	pkg-message
diff --git a/ports-mgmt/pkg-provides/distinfo b/ports-mgmt/pkg-provides/distinfo
index 3634cef6af2..3a151336ec8 100644
--- a/ports-mgmt/pkg-provides/distinfo
+++ b/ports-mgmt/pkg-provides/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575964382
-SHA256 (rosorio-pkg-provides-v0.6.2-71b876c_GH0.tar.gz) = ee581a4e7a16f8fbfea2931480af637dc656020e78d47cc173199c91646a97c0
-SIZE (rosorio-pkg-provides-v0.6.2-71b876c_GH0.tar.gz) = 10952
+TIMESTAMP = 1581885435
+SHA256 (rosorio-pkg-provides-v0.7.0-691abba_GH0.tar.gz) = 0f9d9708b437d6ea40bc1a9966b57a59f2e1d060053cca65604ef70b8391a74c
+SIZE (rosorio-pkg-provides-v0.7.0-691abba_GH0.tar.gz) = 11066
diff --git a/science/cgnslib/Makefile b/science/cgnslib/Makefile
index e6e297d652a..373c8690701 100644
--- a/science/cgnslib/Makefile
+++ b/science/cgnslib/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	cgnslib
+PORTVERSION=	3.4.1
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.4.0
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	science
 
@@ -44,13 +43,16 @@ HDF5_CMAKE_ON=		-DHDF5_INCLUDE_PATH:PATH="${LOCALBASE}/include"
 TESTS_CMAKE_BOOL=	CGNS_ENABLE_TESTS
 
 TOOLS_USES=		gl localbase tk xorg
-TOOLS_USE=		GL=gl,glu XORG=ice,xext,x11,xmu
+TOOLS_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig	\
+			libfreetype.so:print/freetype2
+TOOLS_USE=		GL=egl,gl,glu	\
+			XORG=ice,sm,x11,xau,xcomposite,xcursor,xdamage,xdmcp,xext,xfixes,xft,xi,xinerama,xkbfile,xmu,xpm,xrandr,xrender,xres,xscrnsaver,xt,xtst,xv,xxf86vm
 TOOLS_CMAKE_BOOL=	CGNS_BUILD_CGNSTOOLS
 TOOLS_CMAKE_ON=		-DTCL_INCLUDE_PATH:STRING="${TCL_INCLUDEDIR}" \
 			-DTK_INCLUDE_PATH:STRING="${TK_INCLUDEDIR}"
 
 post-install:
-	${RLN} ${STAGEDIR}${PREFIX}/lib/libcgns.so.${DISTVERSION:R} \
-		${STAGEDIR}${PREFIX}/lib/libcgns.so.${DISTVERSION:R:R}
+	${RLN} ${STAGEDIR}${PREFIX}/lib/libcgns.so.${PORTVERSION} \
+		${STAGEDIR}${PREFIX}/lib/libcgns.so.${PORTVERSION:R:R}
 
 .include <bsd.port.mk>
diff --git a/science/cgnslib/distinfo b/science/cgnslib/distinfo
index 9f4c59480c9..a645ab3682f 100644
--- a/science/cgnslib/distinfo
+++ b/science/cgnslib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551816418
-SHA256 (CGNS-CGNS-v3.4.0_GH0.tar.gz) = 6372196caf25b27d38cf6f056258cb0bdd45757f49d9c59372b6dbbddb1e05da
-SIZE (CGNS-CGNS-v3.4.0_GH0.tar.gz) = 3393312
+TIMESTAMP = 1581868095
+SHA256 (CGNS-CGNS-v3.4.1_GH0.tar.gz) = d32595e7737b9332243bd3de1eb8c018a272f620f09b289dea8292eba1365994
+SIZE (CGNS-CGNS-v3.4.1_GH0.tar.gz) = 3383039
diff --git a/science/cgnslib/pkg-plist b/science/cgnslib/pkg-plist
index d07697de0d6..240c1f6ba6b 100644
--- a/science/cgnslib/pkg-plist
+++ b/science/cgnslib/pkg-plist
@@ -23,7 +23,6 @@
 %%TOOLS%%bin/cgnstools/plotwish
 %%TOOLS%%bin/cgnstools/tecplot_to_cgns
 %%TOOLS%%bin/cgnstools/tetgen_to_cgns
-%%TOOLS%%bin/cgnstools/update_ngon
 %%TOOLS%%bin/cgnstools/vgrid_to_cgns
 %%TOOLS%%bin/cgnsview
 %%TOOLS%%bin/unitconv
@@ -46,7 +45,7 @@ include/cgnswin_f.h
 lib/libcgns.a
 lib/libcgns.so
 lib/libcgns.so.3
-lib/libcgns.so.3.4
+lib/libcgns.so.3.4.1
 %%TOOLS%%share/cgnstools/aflr3.tcl
 %%TOOLS%%share/cgnstools/balloon.tcl
 %%TOOLS%%share/cgnstools/cgns-icon.xbm
diff --git a/science/py-chainer/Makefile b/science/py-chainer/Makefile
index b01ff1846c2..780e96fbbbc 100644
--- a/science/py-chainer/Makefile
+++ b/science/py-chainer/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	chainer
-DISTVERSION=	7.1.0
-PORTREVISION=	1
+DISTVERSION=	7.2.0
 CATEGORIES=	science # machine-learning
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,6 +14,7 @@ LICENSE=	MIT
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}protobuf>=3.0.0:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
 		${PY_TYPING} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR}
diff --git a/science/py-chainer/distinfo b/science/py-chainer/distinfo
index e15a5a7b8a4..a9ab7e9ca66 100644
--- a/science/py-chainer/distinfo
+++ b/science/py-chainer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579241250
-SHA256 (chainer-7.1.0.tar.gz) = afe4531a5b1b95449a49f06c6d12c881a39a603067bc067e0af89849692f4674
-SIZE (chainer-7.1.0.tar.gz) = 1014168
+TIMESTAMP = 1581738856
+SHA256 (chainer-7.2.0.tar.gz) = d8b2eea53cd6698e9d1a7c25c4989477f4fd344601f12898996780524440ab0b
+SIZE (chainer-7.2.0.tar.gz) = 1046344
diff --git a/security/Makefile b/security/Makefile
index 0118b9a8bc8..3c5339c058a 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -213,8 +213,8 @@
     SUBDIR += hlfl
     SUBDIR += hmap
     SUBDIR += hockeypuck
-    SUBDIR += honggfuzz
     SUBDIR += honeytrap
+    SUBDIR += honggfuzz
     SUBDIR += horcrux
     SUBDIR += hotssh
     SUBDIR += hpenc
@@ -358,7 +358,6 @@
     SUBDIR += modsecurity3-apache
     SUBDIR += modsecurity3-nginx
     SUBDIR += monkeysphere
-    SUBDIR += morphis
     SUBDIR += munge
     SUBDIR += mussh
     SUBDIR += n2n
diff --git a/security/R-cran-digest/Makefile b/security/R-cran-digest/Makefile
index 33f9a198f57..c686f738a9f 100644
--- a/security/R-cran-digest/Makefile
+++ b/security/R-cran-digest/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	digest
-PORTVERSION=	0.6.23
+PORTVERSION=	0.6.24
 CATEGORIES=	security
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/security/R-cran-digest/distinfo b/security/R-cran-digest/distinfo
index c7942d76dd3..1213e9e8d42 100644
--- a/security/R-cran-digest/distinfo
+++ b/security/R-cran-digest/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574572288
-SHA256 (digest_0.6.23.tar.gz) = b73a754df122d3c17f4976ea01328c99aa0fc08be399ae2fdce2b33637d205a2
-SIZE (digest_0.6.23.tar.gz) = 143316
+TIMESTAMP = 1581828592
+SHA256 (digest_0.6.24.tar.gz) = 04985b4179b69b4d5e4ad3491a3d79af5ff52991f3c00f86fa2ba98d1fabba07
+SIZE (digest_0.6.24.tar.gz) = 145526
diff --git a/security/aws-vault/Makefile b/security/aws-vault/Makefile
index eb06422bf91..8b077159a47 100644
--- a/security/aws-vault/Makefile
+++ b/security/aws-vault/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	aws-vault
 DISTVERSIONPREFIX=	v
-DISTVERSION=	5.2.1
+DISTVERSION=	5.3.0
 CATEGORIES=	security
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/security/aws-vault/distinfo b/security/aws-vault/distinfo
index 970c6801a2c..cb1bb0e7d2d 100644
--- a/security/aws-vault/distinfo
+++ b/security/aws-vault/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1581426954
-SHA256 (99designs-aws-vault-v5.2.1_GH0.tar.gz) = 64807f1a6a7fe92a4383e6a99137be4f9970c6c71da6e0aa971256e482075fd4
-SIZE (99designs-aws-vault-v5.2.1_GH0.tar.gz) = 38546
+TIMESTAMP = 1581684043
+SHA256 (99designs-aws-vault-v5.3.0_GH0.tar.gz) = b573da516e1e2fe913f8d0f135e5aba1707ebea2f1aacf16f2c46f60dc0cc927
+SIZE (99designs-aws-vault-v5.3.0_GH0.tar.gz) = 38898
 SHA256 (99designs-go-keychain-8e49817e8af4_GH0.tar.gz) = 2ef17b0e33b0e57081c3ef6996d429a2439926546e6a0e8a727a3e9b8c76a587
 SIZE (99designs-go-keychain-8e49817e8af4_GH0.tar.gz) = 2337378
 SHA256 (99designs-keyring-v1.1.4_GH0.tar.gz) = 94248c2d78ed1c16596242e3b2ccd6042b67325782e3670ff1f3cc068698df24
diff --git a/security/cyberchef/Makefile b/security/cyberchef/Makefile
index 1af5e33df55..f0638ed323a 100644
--- a/security/cyberchef/Makefile
+++ b/security/cyberchef/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cyberchef
-PORTVERSION=	9.12.0
+PORTVERSION=	9.13.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${GH_TAGNAME}/
diff --git a/security/cyberchef/distinfo b/security/cyberchef/distinfo
index fedeb3aa310..94380e99393 100644
--- a/security/cyberchef/distinfo
+++ b/security/cyberchef/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576967837
-SHA256 (CyberChef_v9.12.0.zip) = d55a02fc1f0b2af9fff05ecdb2dda265acf12897859070c92604cc68d0d2b593
-SIZE (CyberChef_v9.12.0.zip) = 32180175
+TIMESTAMP = 1581694255
+SHA256 (CyberChef_v9.13.0.zip) = 382790a7d45e3e618b5a06788b728ad8b7720ce94496b14ee5eb53f3991093ce
+SIZE (CyberChef_v9.13.0.zip) = 32188619
diff --git a/security/morphis/Makefile b/security/morphis/Makefile
deleted file mode 100644
index 8536026245a..00000000000
--- a/security/morphis/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# Created by: Yuri Victorovich <yuri@rawbw.com>
-# $FreeBSD$
-
-PORTNAME=	morphis
-PORTVERSION=	0.8.18.6
-DISTVERSIONPREFIX=	v
-PORTREVISION=	1
-CATEGORIES=	security net-p2p
-
-MAINTAINER=	yuri@FreeBSD.org
-COMMENT=	Peer-to-peer high-performance distributed datastore and mail
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Fails to build with recent versions of python, upstream git repository is gone
-EXPIRATION_DATE=	2020-02-14
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy11>0:databases/py-sqlalchemy11@${PY_FLAVOR}
-
-USES=		python:3.4+ shebangfix
-USE_GITHUB=	yes
-GH_ACCOUNT=	yurivict
-NO_ARCH=	yes
-SHEBANG_FILES=	contrib/morphisd/opt/morphis/setargv
-
-SUB_FILES=	morphis-service morphis-cmd pkg-message
-SUB_LIST=	LOCALBASE=${LOCALBASE} USER=${USER} GROUP=${GROUP}
-PLIST_SUB=	USER=${USER} GROUP=${GROUP}
-
-USER=		nobody
-GROUP=		nobody
-
-do-build:
-	@(cd ${WRKSRC} && \
-	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-		-d ${WRKSRC} -f ${WRKSRC} && \
-	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
-		-d ${WRKSRC} -f ${WRKSRC})
-do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${DATADIR}/
-	@cd ${STAGEDIR}${DATADIR} && ${RM} Makefile LICENSE README RUNNING TODO-*
-	@${MKDIR} ${STAGEDIR}/var/db/morphis
-	@${LN} -s /var/db/morphis ${STAGEDIR}${DATADIR}/data
-	${INSTALL_SCRIPT} ${WRKDIR}/morphis-cmd ${STAGEDIR}${PREFIX}/bin/morphis
-	${INSTALL_SCRIPT} ${WRKDIR}/morphis-service ${STAGEDIR}${PREFIX}/etc/rc.d/morphis
-
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} >= 3700
-BROKEN=		fails to build
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/security/morphis/distinfo b/security/morphis/distinfo
deleted file mode 100644
index 8b04f2450fa..00000000000
--- a/security/morphis/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1483641216
-SHA256 (yurivict-morphis-v0.8.18.6_GH0.tar.gz) = 88fcf9d48a98e57e4ea5661ae2ad05c70998479918e8abade9c71eef281cf96e
-SIZE (yurivict-morphis-v0.8.18.6_GH0.tar.gz) = 184296
diff --git a/security/morphis/files/morphis-cmd.in b/security/morphis/files/morphis-cmd.in
deleted file mode 100644
index 054c2beff19..00000000000
--- a/security/morphis/files/morphis-cmd.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-cd %%LOCALBASE%%/share/morphis && su -m %%USER%% -c "./run.sh $@"
diff --git a/security/morphis/files/morphis-service.in b/security/morphis/files/morphis-service.in
deleted file mode 100644
index 7a151d15756..00000000000
--- a/security/morphis/files/morphis-service.in
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# Copyright (C) 2016 by Yuri Victorovich. All rights reserved.
-
-# PROVIDE: morphis
-# REQUIRE: NETWORKING SERVERS tor
-# KEYWORD: shutdown
-
-# morphis is disabled by default, if you have configuration file
-#
-# Add the following line to /etc/rc.conf to enable morphis:
-#
-#morphis_enable="YES"
-
-. /etc/rc.subr
-
-
-name="morphis"
-rcvar=morphis_enable
-start_cmd="morphis_start"
-stop_cmd="morphis_stop"
-status_cmd="morphis_status"
-
-load_rc_config ${name}
-
-: ${morphis_enable="NO"}
-: ${morphis_args=""}
-
-is_process_running() {
-  local pidfile=$1
-  [ -f $pidfile ] && procstat `cat $pidfile` >/dev/null 2>&1
-}
-
-stop_daemon() {
-  # assume PID is also PGID (daemon(8) PID is always PGID)
-  [ -f "$1" ] && kill -- -$(cat $1)
-}
-
-morphis_start() {
-  local logfile=/var/log/morphis.log
-  local pidfile=/var/run/morphis.pid
-  # already running?
-  if is_process_running $pidfile; then
-    echo "morphis is already running (pid=$(cat $pidfile))"
-    return 1
-  fi
-  # log file
-  touch $logfile
-  chmod 640 $logfile
-  # user depends on the port option, so better force it on directories to avoid user confusion
-  chown -R %%USER%%:%%GROUP%% /var/db/morphis
-  # run
-  cd %%LOCALBASE%%/share/morphis
-  /usr/sbin/daemon -P $pidfile -u %%USER%% %%LOCALBASE%%/share/morphis/run.sh ${morphis_args} >>$logfile 2>&1
-  # make sure it runs
-  if is_process_running $pidfile; then
-    echo "started morphis (pid=$(cat $pidfile))"
-  else
-    echo "failed to start morphis"
-  fi
-}
-
-morphis_stop() {
-  local pidfile=/var/run/morphis.pid
-  if is_process_running $pidfile; then
-    echo "stopping morphis (pid=$(cat $pidfile))"
-    stop_daemon $pidfile
-  else
-    echo "morphis isn't running"
-  fi
-}
-
-morphis_status() {
-  local pidfile=/var/run/morphis.pid
-  if is_process_running $pidfile; then
-    echo "morphis is running, pid=$(cat $pidfile)"
-  else
-    echo "morphis isn't running"
-  fi
-}
-
-command="/usr/bin/true"
-
-run_rc_command "$1"
diff --git a/security/morphis/files/pkg-message.in b/security/morphis/files/pkg-message.in
deleted file mode 100644
index 7673ea9de9f..00000000000
--- a/security/morphis/files/pkg-message.in
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-You installed MORPHiS: Secure decentralized data store and mail.
-
-It is recommended to run MORPHiS as a service:
-# sysrc morphis_enable="YES"
-# service morphis start
-
-To access MORPHiS please navigate to:
-http://localhost:4251
-
-You can also run MORPHiS manually (not recommended) with the command:
-# su -m %%USER%% -c morphis
-EOM
-}
-]
diff --git a/security/morphis/pkg-descr b/security/morphis/pkg-descr
deleted file mode 100644
index d36bb66b9c5..00000000000
--- a/security/morphis/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-MORPHiS is a global encrypted distributed datastore intended to replace the
-cloud for storage and far more. This first release also includes DMAIL
-(distributed mail), inherently spam resistant, inherently encrypted,
-uncensorable, free distributed messaging.
-
-WWW: https://morph.is
diff --git a/security/morphis/pkg-plist b/security/morphis/pkg-plist
deleted file mode 100644
index 820bb0adc0e..00000000000
--- a/security/morphis/pkg-plist
+++ /dev/null
@@ -1,223 +0,0 @@
-bin/morphis
-etc/rc.d/morphis
-%%DATADIR%%/data
-%%DATADIR%%/CONTRIBUTORS
-%%DATADIR%%/CREDITS
-%%DATADIR%%/VERSION
-%%DATADIR%%/__pycache__/asymkey.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/asymkey.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/base58.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/base58.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/bittrie.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/bittrie.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/brute.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/brute.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/chord.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/chord.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/chord_packet.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/chord_packet.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/chord_tasks.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/chord_tasks.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/chordexception.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/chordexception.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/client_engine.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/client_engine.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/consts.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/consts.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/db.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/db.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/dhgroup14.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/dhgroup14.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/dmail.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/dmail.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/dsskey.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/dsskey.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/enc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/enc.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/hashbench.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/hashbench.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/kex.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/kex.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/kexdhgroup14sha1.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/kexdhgroup14sha1.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/llog.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/llog.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/mbase32.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/mbase32.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/mcc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/mcc.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/mn1.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/mn1.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/multipart.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/multipart.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/mutil.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/mutil.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/node.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/node.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/packet.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/packet.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/peer.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/peer.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/putil.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/putil.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/rsakey.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/rsakey.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/setup_all.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/setup_all.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/shell.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/shell.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/sshexception.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/sshexception.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/sshtype.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/__pycache__/sshtype.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/asymkey.py
-%%DATADIR%%/base58.py
-%%DATADIR%%/bittrie.py
-%%DATADIR%%/brute.py
-%%DATADIR%%/build.sh
-%%DATADIR%%/chord.py
-%%DATADIR%%/chord_packet.py
-%%DATADIR%%/chord_tasks.py
-%%DATADIR%%/chordexception.py
-%%DATADIR%%/client.py
-%%DATADIR%%/client_engine.py
-%%DATADIR%%/consts.py
-%%DATADIR%%/contrib/morphisd/COPYING
-%%DATADIR%%/contrib/morphisd/README.md
-%%DATADIR%%/contrib/morphisd/etc/default/morphisd
-%%DATADIR%%/contrib/morphisd/opt/morphis/morphisd
-%%DATADIR%%/contrib/morphisd/opt/morphis/setargv
-%%DATADIR%%/contrib/morphisd/usr/lib/systemd/system/morphisd.service
-%%DATADIR%%/db.py
-%%DATADIR%%/dev_cluster.sh
-%%DATADIR%%/dev_node.sh
-%%DATADIR%%/dhgroup14.py
-%%DATADIR%%/dmail.py
-%%DATADIR%%/dsskey.py
-%%DATADIR%%/enc.py
-%%DATADIR%%/exceptions/20150716-01.txt
-%%DATADIR%%/favicon.ico
-%%DATADIR%%/hashbench.py
-%%DATADIR%%/kex.py
-%%DATADIR%%/kexdhgroup14sha1.py
-%%DATADIR%%/llog.py
-%%DATADIR%%/logging-debug.ini
-%%DATADIR%%/logging-info.ini
-%%DATADIR%%/logging-ms.ini
-%%DATADIR%%/logging-prod.ini
-%%DATADIR%%/logging-warn.ini
-%%DATADIR%%/logging.ini
-%%DATADIR%%/lots-bulk.sh
-%%DATADIR%%/lots.sh
-%%DATADIR%%/maalstroom/__init__.py
-%%DATADIR%%/maalstroom/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/maalstroom/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/maalstroom/__pycache__/dispatcher.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/maalstroom/__pycache__/dispatcher.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/maalstroom/__pycache__/dmail.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/maalstroom/__pycache__/dmail.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/maalstroom/__pycache__/templates.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/maalstroom/__pycache__/templates.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/maalstroom/dispatcher.py
-%%DATADIR%%/maalstroom/dmail.py
-%%DATADIR%%/maalstroom/resources/images/dmail/add_address.png
-%%DATADIR%%/maalstroom/resources/images/dmail/addressbook.png
-%%DATADIR%%/maalstroom/resources/images/dmail/addressbook_blue.png
-%%DATADIR%%/maalstroom/resources/images/dmail/addressbook_grey.png
-%%DATADIR%%/maalstroom/resources/images/dmail/bullet.png
-%%DATADIR%%/maalstroom/resources/images/dmail/bullet_white.png
-%%DATADIR%%/maalstroom/resources/images/dmail/compose_blue.png
-%%DATADIR%%/maalstroom/resources/images/dmail/compose_white.png
-%%DATADIR%%/maalstroom/resources/images/dmail/divider.gif
-%%DATADIR%%/maalstroom/resources/images/dmail/draft.png
-%%DATADIR%%/maalstroom/resources/images/dmail/draft_white.png
-%%DATADIR%%/maalstroom/resources/images/dmail/gradient.jpg
-%%DATADIR%%/maalstroom/resources/images/dmail/inbox.png
-%%DATADIR%%/maalstroom/resources/images/dmail/inbox_new.png
-%%DATADIR%%/maalstroom/resources/images/dmail/inbox_white.png
-%%DATADIR%%/maalstroom/resources/images/dmail/list_addresses.png
-%%DATADIR%%/maalstroom/resources/images/dmail/logo.png
-%%DATADIR%%/maalstroom/resources/images/dmail/mail_icon.png
-%%DATADIR%%/maalstroom/resources/images/dmail/mail_icon2.png
-%%DATADIR%%/maalstroom/resources/images/dmail/read.png
-%%DATADIR%%/maalstroom/resources/images/dmail/refresh.png
-%%DATADIR%%/maalstroom/resources/images/dmail/reply_blue.png
-%%DATADIR%%/maalstroom/resources/images/dmail/reply_dk.png
-%%DATADIR%%/maalstroom/resources/images/dmail/reply_icon.png
-%%DATADIR%%/maalstroom/resources/images/dmail/reply_icon_new.png
-%%DATADIR%%/maalstroom/resources/images/dmail/reply_purp.png
-%%DATADIR%%/maalstroom/resources/images/dmail/reply_white.png
-%%DATADIR%%/maalstroom/resources/images/dmail/save.png
-%%DATADIR%%/maalstroom/resources/images/dmail/save_blue.png
-%%DATADIR%%/maalstroom/resources/images/dmail/save_dk.png
-%%DATADIR%%/maalstroom/resources/images/dmail/save_purp.png
-%%DATADIR%%/maalstroom/resources/images/dmail/save_white.png
-%%DATADIR%%/maalstroom/resources/images/dmail/send.png
-%%DATADIR%%/maalstroom/resources/images/dmail/send_blue.png
-%%DATADIR%%/maalstroom/resources/images/dmail/send_dk.png
-%%DATADIR%%/maalstroom/resources/images/dmail/send_purp.png
-%%DATADIR%%/maalstroom/resources/images/dmail/send_white.png
-%%DATADIR%%/maalstroom/resources/images/dmail/sent.png
-%%DATADIR%%/maalstroom/resources/images/dmail/sent_white.png
-%%DATADIR%%/maalstroom/resources/images/dmail/settings.png
-%%DATADIR%%/maalstroom/resources/images/dmail/stripe.png
-%%DATADIR%%/maalstroom/resources/images/dmail/tags.png
-%%DATADIR%%/maalstroom/resources/images/dmail/tags_white.png
-%%DATADIR%%/maalstroom/resources/images/dmail/trash.png
-%%DATADIR%%/maalstroom/resources/images/dmail/trash_blue.png
-%%DATADIR%%/maalstroom/resources/images/dmail/trash_dk.png
-%%DATADIR%%/maalstroom/resources/images/dmail/trash_icon.png
-%%DATADIR%%/maalstroom/resources/images/dmail/trash_icon_new.png
-%%DATADIR%%/maalstroom/resources/images/dmail/trash_white.png
-%%DATADIR%%/maalstroom/resources/images/dmail/trash_white_in.png
-%%DATADIR%%/maalstroom/resources/images/dmail/unread.png
-%%DATADIR%%/maalstroom/resources/style.css
-%%DATADIR%%/maalstroom/templates.py
-%%DATADIR%%/maalstroom/templates/dmail/address_config.html
-%%DATADIR%%/maalstroom/templates/dmail/address_list.html
-%%DATADIR%%/maalstroom/templates/dmail/address_list_row.html
-%%DATADIR%%/maalstroom/templates/dmail/aside.html
-%%DATADIR%%/maalstroom/templates/dmail/compose.html
-%%DATADIR%%/maalstroom/templates/dmail/create_address.html
-%%DATADIR%%/maalstroom/templates/dmail/logo.html
-%%DATADIR%%/maalstroom/templates/dmail/msg_list.html
-%%DATADIR%%/maalstroom/templates/dmail/msg_list_list_end.html
-%%DATADIR%%/maalstroom/templates/dmail/msg_list_list_row.html
-%%DATADIR%%/maalstroom/templates/dmail/msg_list_list_start.html
-%%DATADIR%%/maalstroom/templates/dmail/nav.html
-%%DATADIR%%/maalstroom/templates/dmail/new_mail.html
-%%DATADIR%%/maalstroom/templates/dmail/page_wrapper.html
-%%DATADIR%%/maalstroom/templates/dmail/read.html
-%%DATADIR%%/maalstroom/templates/main/combined_upload.html
-%%DATADIR%%/mbase32.py
-%%DATADIR%%/mcc.py
-%%DATADIR%%/mn1.py
-%%DATADIR%%/multipart.py
-%%DATADIR%%/mutil.py
-%%DATADIR%%/node.py
-%%DATADIR%%/old/__pycache__/n1.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/old/__pycache__/n1.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/old/__pycache__/node.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/old/__pycache__/node.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/old/__pycache__/server_test.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%DATADIR%%/old/__pycache__/server_test.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/old/n1.py
-%%DATADIR%%/old/node.py
-%%DATADIR%%/old/server_test.py
-%%DATADIR%%/packet.py
-%%DATADIR%%/peer.py
-%%DATADIR%%/putil.py
-%%DATADIR%%/rsakey.py
-%%DATADIR%%/run.sh
-%%DATADIR%%/setup.py
-%%DATADIR%%/setup_all.py
-%%DATADIR%%/shell.py
-%%DATADIR%%/sshexception.py
-%%DATADIR%%/sshtype.py
-%%DATADIR%%/test_100n.sh
-%%DATADIR%%/upload_page.html
-@dir(%%USER%%,%%GROUP%%,0700) /var/db/morphis
diff --git a/security/py-ckcc-protocol/Makefile b/security/py-ckcc-protocol/Makefile
index 582a6efae09..2bb1afd86b0 100644
--- a/security/py-ckcc-protocol/Makefile
+++ b/security/py-ckcc-protocol/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ckcc-protocol
-PORTVERSION=	0.8.0
+PORTVERSION=	1.0.0
 CATEGORIES=	security
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ecdsa>=0.13:security/py-ecdsa@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hidapi>=0.7.99.post21:comms/py-hidapi@${PY_FLAVOR}
 
-USES=		python:3.5+
+USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/security/py-ckcc-protocol/distinfo b/security/py-ckcc-protocol/distinfo
index 56de6226c28..8e9964ce5b3 100644
--- a/security/py-ckcc-protocol/distinfo
+++ b/security/py-ckcc-protocol/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579884462
-SHA256 (ckcc-protocol-0.8.0.tar.gz) = f0851c98b91825d19567d0d3bac1b28044d40a3d5f194c8b04c5338f114d7ad5
-SIZE (ckcc-protocol-0.8.0.tar.gz) = 21781
+TIMESTAMP = 1581871823
+SHA256 (ckcc-protocol-1.0.0.tar.gz) = 2140732a64066af81d591f10c57ad1848ebdcd8286102203f538cd79fed19cbe
+SIZE (ckcc-protocol-1.0.0.tar.gz) = 26585
diff --git a/security/py-google-auth/Makefile b/security/py-google-auth/Makefile
index 2e906a4f585..3d136778fbd 100644
--- a/security/py-google-auth/Makefile
+++ b/security/py-google-auth/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	google-auth
-PORTVERSION=	1.11.0
+PORTVERSION=	1.11.2
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-google-auth/distinfo b/security/py-google-auth/distinfo
index 32800b20050..862d89bb722 100644
--- a/security/py-google-auth/distinfo
+++ b/security/py-google-auth/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580046509
-SHA256 (google-auth-1.11.0.tar.gz) = 44549e69ac39acf41fdf47f3f39a06e4e68378476806760d94a2c6a361b2bb06
-SIZE (google-auth-1.11.0.tar.gz) = 87392
+TIMESTAMP = 1581775763
+SHA256 (google-auth-1.11.2.tar.gz) = 1ee22e22f35d6e00f068d7b3999b2ce24ecb5d0dcbd485aa6896d2b83c8907d6
+SIZE (google-auth-1.11.2.tar.gz) = 88031
diff --git a/security/py-zkg/Makefile b/security/py-zkg/Makefile
index f3357c05ca4..f5a38965ad3 100644
--- a/security/py-zkg/Makefile
+++ b/security/py-zkg/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	zkg
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.2
+DISTVERSION=	2.0.7
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -13,7 +13,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}GitPython>=2.1.8:devel/py-gitpython@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}btest>=0:devel/py-btest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}btest>=0.61:devel/py-btest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}semantic_version>=0:devel/py-semantic_version@${PY_FLAVOR} \
 		git:devel/git
diff --git a/security/py-zkg/distinfo b/security/py-zkg/distinfo
index d9ce09581a0..e452aa2870f 100644
--- a/security/py-zkg/distinfo
+++ b/security/py-zkg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563965789
-SHA256 (zeek-package-manager-v2.0.2_GH0.tar.gz) = e5ec83d36a58ff611f40079479f478c4ef34e908bba7a16040689cb5d83464f5
-SIZE (zeek-package-manager-v2.0.2_GH0.tar.gz) = 95625
+TIMESTAMP = 1581861450
+SHA256 (zeek-package-manager-v2.0.7_GH0.tar.gz) = c7b633a6799e5a45d3ef2041b69ec03ba6fc298eb2f55c6caf07912959bc077b
+SIZE (zeek-package-manager-v2.0.7_GH0.tar.gz) = 97245
diff --git a/shells/antibody/Makefile b/shells/antibody/Makefile
index d3d07dc3711..812e950edc2 100644
--- a/shells/antibody/Makefile
+++ b/shells/antibody/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	antibody
-PORTVERSION=	4.3.0
+PORTVERSION=	4.3.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	shells
 
diff --git a/shells/antibody/distinfo b/shells/antibody/distinfo
index 9731da30b6e..7d2a4daf125 100644
--- a/shells/antibody/distinfo
+++ b/shells/antibody/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1581648081
-SHA256 (getantibody-antibody-v4.3.0_GH0.tar.gz) = ba5be9416a6ae1c88c8bad655306c5d1c8391176c4343c5d25b981b7999cb02c
-SIZE (getantibody-antibody-v4.3.0_GH0.tar.gz) = 53077
+TIMESTAMP = 1581714596
+SHA256 (getantibody-antibody-v4.3.1_GH0.tar.gz) = b69b2b90914e03f4a54453d740345cad222b379c366ec3788f4fdf4b1f01ac64
+SIZE (getantibody-antibody-v4.3.1_GH0.tar.gz) = 53076
 SHA256 (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 4624eae43489de8a71ea60efaf6744c581b6bd62909f7514c484c1ea0efaba5a
 SIZE (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 44383
 SHA256 (alecthomas-template-fb15b89_GH0.tar.gz) = edc515063323c61120740ef930ce60e659e9ae82e2b21062ec451ff675b8d6be
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 80d34010f45..dc9a546fce2 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zsh
-DISTVERSION=	5.7.1
-PORTREVISION=	1
+DISTVERSION=	5.8
 CATEGORIES=	shells
 MASTER_SITES=	https://www.zsh.org/pub/ \
 		SF \
@@ -36,6 +35,11 @@ CONFIGURE_ARGS=	--with-tcsetpgrp \
 		--enable-multibyte \
 		--enable-zsh-secure-free \
 		--sysconfdir=${PREFIX}/etc
+
+# fix PREFIX != LOCALBASE
+CONFIGURE_ARGS+=--disable-site-fndir \
+		--enable-additional-fpath=${DATADIR}/site-functions
+
 CONFIGURE_ENV+=	zsh_cv_sys_path_dev_fd=no \
 		ac_cv_header_sys_capability_h=no
 
@@ -106,6 +110,7 @@ post-build:
 		${WRKSRC}/Doc/zshall.1)
 
 post-install:
+	${MKDIR} ${STAGEDIR}${DATADIR}/site-functions
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/zsh ${STAGEDIR}${PREFIX}/bin/rzsh
 # Precompile completions and functions
 	(${STAGEDIR}${PREFIX}/bin/zsh -fc ' \
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index d867564967d..9e13dcfa811 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1549389259
-SHA256 (zsh-5.7.1.tar.xz) = 7260292c2c1d483b2d50febfa5055176bd512b32a8833b116177bf5f01e77ee8
-SIZE (zsh-5.7.1.tar.xz) = 3126308
-SHA256 (zsh-5.7.1-doc.tar.xz) = 3053670250e23905c940592c79428d7f67495fa05b0fff49dfaab9172c4239b4
-SIZE (zsh-5.7.1-doc.tar.xz) = 3062112
+TIMESTAMP = 1581837123
+SHA256 (zsh-5.8.tar.xz) = dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27
+SIZE (zsh-5.8.tar.xz) = 3193284
+SHA256 (zsh-5.8-doc.tar.xz) = 9b4e939593cb5a76564d2be2e2bfbb6242509c0c56fd9ba52f5dba6cf06fdcc4
+SIZE (zsh-5.8-doc.tar.xz) = 3088696
diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
index e29c792dcd0..e51f7e5c411 100644
--- a/shells/zsh/pkg-plist
+++ b/shells/zsh/pkg-plist
@@ -74,6 +74,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/AIX/_smit
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/AIX/_volume_groups
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD.zwc
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_bsd_disks
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_bsd_pkg
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_bsdconfig
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_bsdinstall
@@ -82,6 +83,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_cu
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_cvsup
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_fbsd_architectures
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_fbsd_device_types
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_fetch
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_file_flags
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_freebsd-update
@@ -99,6 +101,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_nbsd_architectures
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_obsd_architectures
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_pfctl
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_pkgin
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_portaudit
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_portlint
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_portmaster
@@ -215,6 +218,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Darwin/_softwareupdate
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Darwin/_sw_vers
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Darwin/_system_profiler
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Darwin/_trash
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Darwin/_xcode-select
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian.zwc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_a2utils
@@ -234,6 +238,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_dcut
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_deb_architectures
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_deb_codenames
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_deb_files
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_deb_packages
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_debbugs_bugnumber
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_debchange
@@ -265,6 +270,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_pbuilder
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_piuparts
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_reprepro
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_sbuild
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_schroot
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_svn-buildpackage
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_toolchain-source
@@ -277,16 +283,20 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux.zwc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_acpi
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_acpitool
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_alsa-utils
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_analyseplugin
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_brctl
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_btrfs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_chattr
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_chcon
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_chrt
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_cpupower
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_cryptsetup
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_dkms
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_e2label
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_ethtool
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_findmnt
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_free
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_fuse_arguments
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_fuse_values
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_fusermount
@@ -311,16 +321,21 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_opkg
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_pidof
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_pkgtool
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_pmap
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_qdbus
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_rpmbuild
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_schedtool
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_selinux_contexts
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_selinux_roles
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_selinux_types
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_selinux_users
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_setsid
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_slabtop
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_ss
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_sshfs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_strace
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_sysstat
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_tload
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_tpb
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_tpconfig
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_tracepath
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_tune2fs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_uml
@@ -366,6 +381,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix.zwc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_a2ps
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_aap
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_abcde
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_absolute_command_paths
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ack
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_adb
@@ -383,6 +399,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_at
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_attr
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_augeas
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_avahi
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_awk
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_base64
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_basename
@@ -469,7 +486,6 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ed
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_elfdump
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_elinks
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_elm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_email_addresses
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_enscript
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_entr
@@ -488,7 +504,6 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_find_net_interfaces
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_finger
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_flac
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_flasher
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_flex
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_fmt
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_fold
@@ -528,7 +543,6 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_have_glob_qual
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_head
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_hexdump
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_hg
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_host
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_hostname
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_hosts
@@ -602,6 +616,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_mutt
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_mv
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_my_accounts
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_myrepos
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_mysql_utils
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_mysqldiff
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ncftp
@@ -616,7 +631,6 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nl
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nmap
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_notmuch
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_npm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nslookup
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_numfmt
@@ -626,6 +640,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_openstack
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_other_accounts
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pack
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pandoc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_paste
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_patch
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_patchutils
@@ -653,8 +668,8 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pon
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ports
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_postfix
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_postgresql
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_postscript
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_prcs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_printenv
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_printers
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_process_names
@@ -663,16 +678,17 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pspdf
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_psutils
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pump
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pv
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pwgen
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pydoc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_python
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_python_modules
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_qemu
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_quilt
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_raggle
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_rake
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ranlib
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_rar
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_rclone
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_rcs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_readelf
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_readlink
@@ -688,12 +704,12 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_rubber
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ruby
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_runit
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_sablotron
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_samba
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_sccs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_scons
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_screen
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_script
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_seafile
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_sed
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_seq
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_service
@@ -720,6 +736,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_stat
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_stdbuf
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_stgit
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_stow
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_strings
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_strip
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_stty
@@ -761,6 +778,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_touch
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_tput
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_tr
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_transmission
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_tree
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_truss
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_tty
@@ -780,14 +798,12 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_user_at_host
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_users
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_users_on
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_uzbl
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_vcsh
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_vim
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_visudo
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_vmstat
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_vorbis
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_vpnc
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_vux
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_w
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_w3m
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_watch
@@ -880,7 +896,6 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xterm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xv
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xwit
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_zathura
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_zeal
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh.zwc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_add-zle-hook-widget
@@ -976,6 +991,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zle
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zmodload
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zmv
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zparseopts
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zpty
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zsh-mime-handler
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zsocket
diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile
index bc2288f3066..7e5d4aa9991 100644
--- a/sysutils/acpica-tools/Makefile
+++ b/sysutils/acpica-tools/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	acpica
-PORTVERSION=	20200110
+PORTVERSION=	20200214
 CATEGORIES=	sysutils devel
 MASTER_SITES=	https://acpica.org/sites/acpica/files/ \
 		LOCAL/jkim
diff --git a/sysutils/acpica-tools/distinfo b/sysutils/acpica-tools/distinfo
index 79ae0683745..9e5adfab962 100644
--- a/sysutils/acpica-tools/distinfo
+++ b/sysutils/acpica-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578680790
-SHA256 (acpica-unix-20200110.tar.gz) = 9d3f60fbe801cf1049f854de23da5c9a569a34267b27b97fab3d66a68c5266b1
-SIZE (acpica-unix-20200110.tar.gz) = 1863088
+TIMESTAMP = 1581706878
+SHA256 (acpica-unix-20200214.tar.gz) = e77ab9f8557ca104f6e8f49efaa8eead29f78ca11cadfc8989012469ecc0738e
+SIZE (acpica-unix-20200214.tar.gz) = 1846645
diff --git a/sysutils/burp-devel/Makefile b/sysutils/burp-devel/Makefile
index cf715b6991f..81692c7ddb7 100644
--- a/sysutils/burp-devel/Makefile
+++ b/sysutils/burp-devel/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTVERSION=	2.3.20
+PORTVERSION=	2.3.22
 PORTREVISION=	0	#this is a slave port that needs PORTREVISION to be tracked separately
 PKGNAMESUFFIX=	-devel
 
diff --git a/sysutils/burp-devel/distinfo b/sysutils/burp-devel/distinfo
index 595fef31744..1a46d7135ba 100644
--- a/sysutils/burp-devel/distinfo
+++ b/sysutils/burp-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577870569
-SHA256 (grke-burp-2.3.20_GH0.tar.gz) = 5a205fbacc4f9c815bc6cfcbc8e5f891b144795c23110b06e2ac6c16776d94d8
-SIZE (grke-burp-2.3.20_GH0.tar.gz) = 627910
+TIMESTAMP = 1580671041
+SHA256 (grke-burp-2.3.22_GH0.tar.gz) = e8f1c3c2432916bfec631e452c09ef48b13ec77fe715300638e474b6e49d455b
+SIZE (grke-burp-2.3.22_GH0.tar.gz) = 628380
diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile
index 2eb1eea1024..1e7f7fdb29a 100644
--- a/sysutils/fluent-bit/Makefile
+++ b/sysutils/fluent-bit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fluent-bit
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.3.4
+DISTVERSION=	1.3.7
 CATEGORIES=	sysutils
 
 MAINTAINER=	girgen@FreeBSD.org
diff --git a/sysutils/fluent-bit/distinfo b/sysutils/fluent-bit/distinfo
index 5c2eb633538..b2b2339c3c2 100644
--- a/sysutils/fluent-bit/distinfo
+++ b/sysutils/fluent-bit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576357127
-SHA256 (fluent-fluent-bit-v1.3.4_GH0.tar.gz) = 57d36332a28c14686c35798465a614df5bc0e934fadfcfdedb9e3013c2e14129
-SIZE (fluent-fluent-bit-v1.3.4_GH0.tar.gz) = 11961342
+TIMESTAMP = 1581778181
+SHA256 (fluent-fluent-bit-v1.3.7_GH0.tar.gz) = e897949356855e2a7d1a71085c7c21653b7792ef137d19d665e7b5dcd8e4d46a
+SIZE (fluent-fluent-bit-v1.3.7_GH0.tar.gz) = 12127010
diff --git a/sysutils/helm/Makefile b/sysutils/helm/Makefile
index f68f049cf3f..c247d550b77 100644
--- a/sysutils/helm/Makefile
+++ b/sysutils/helm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	helm
-PORTVERSION=	3.0.3
+PORTVERSION=	3.1.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -21,133 +21,133 @@ GH_TUPLE=	\
 		Azure:go-ansiterm:d6e3b3328b78:azure_go_ansiterm/vendor/github.com/Azure/go-ansiterm \
 		Azure:go-autorest:v13.3.1:azure_go_autorest/vendor/github.com/Azure/go-autorest \
 		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
-		MakeNowJust:heredoc:e9091a26100e:makenowjust_heredoc/vendor/github.com/MakeNowJust/heredoc \
+		MakeNowJust:heredoc:bb23615498cd:makenowjust_heredoc/vendor/github.com/MakeNowJust/heredoc \
 		Masterminds:goutils:v1.1.0:masterminds_goutils/vendor/github.com/Masterminds/goutils \
-		Masterminds:semver:v3.0.1:masterminds_semver/vendor/github.com/Masterminds/semver/v3 \
-		Masterminds:sprig:v3.0.0:masterminds_sprig/vendor/github.com/Masterminds/sprig/v3 \
-		Masterminds:vcs:v1.13.0:masterminds_vcs/vendor/github.com/Masterminds/vcs \
-		Microsoft:go-winio:v0.4.12:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
-		Microsoft:hcsshim:v0.8.6:microsoft_hcsshim/vendor/github.com/Microsoft/hcsshim \
+		Masterminds:semver:v3.0.3:masterminds_semver/vendor/github.com/Masterminds/semver/v3 \
+		Masterminds:sprig:v3.0.2:masterminds_sprig/vendor/github.com/Masterminds/sprig/v3 \
+		Masterminds:vcs:v1.13.1:masterminds_vcs/vendor/github.com/Masterminds/vcs \
+		Microsoft:go-winio:fc70bd9a86b5:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
+		Microsoft:hcsshim:v0.8.7:microsoft_hcsshim/vendor/github.com/Microsoft/hcsshim \
 		PuerkitoBio:purell:v1.1.1:puerkitobio_purell/vendor/github.com/PuerkitoBio/purell \
 		PuerkitoBio:urlesc:de5bf2ad4578:puerkitobio_urlesc/vendor/github.com/PuerkitoBio/urlesc \
 		Shopify:logrus-bugsnag:577dee27f20d:shopify_logrus_bugsnag/vendor/github.com/Shopify/logrus-bugsnag \
-		asaskevich:govalidator:f61b66f89f4a:asaskevich_govalidator/vendor/github.com/asaskevich/govalidator \
-		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
+		asaskevich:govalidator:475eaeb16496:asaskevich_govalidator/vendor/github.com/asaskevich/govalidator \
+		beorn7:perks:v1.0.0:beorn7_perks/vendor/github.com/beorn7/perks \
 		bshuster-repo:logrus-logstash-hook:v0.4.1:bshuster_repo_logrus_logstash_hook/vendor/github.com/bshuster-repo/logrus-logstash-hook \
-		bugsnag:bugsnag-go:v1.5.0:bugsnag_bugsnag_go/vendor/github.com/bugsnag/bugsnag-go \
-		bugsnag:panicwrap:v1.2.0:bugsnag_panicwrap/vendor/github.com/bugsnag/panicwrap \
-		cespare:xxhash:v2.1.0:cespare_xxhash/vendor/github.com/cespare/xxhash/v2 \
-		containerd:containerd:v1.3.0:containerd_containerd/vendor/github.com/containerd/containerd \
-		containerd:continuity:004b46473808:containerd_continuity/vendor/github.com/containerd/continuity \
+		bugsnag:bugsnag-go:b1d153021fcd:bugsnag_bugsnag_go/vendor/github.com/bugsnag/bugsnag-go \
+		bugsnag:osext:0dd3f918b21b:bugsnag_osext/vendor/github.com/bugsnag/osext \
+		bugsnag:panicwrap:e2c28503fcd0:bugsnag_panicwrap/vendor/github.com/bugsnag/panicwrap \
+		census-instrumentation:opencensus-go:v0.22.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
+		containerd:cgroups:bf292b21730f:containerd_cgroups/vendor/github.com/containerd/cgroups \
+		containerd:containerd:v1.3.2:containerd_containerd/vendor/github.com/containerd/containerd \
 		cpuguy83:go-md2man:v1.0.10:cpuguy83_go_md2man/vendor/github.com/cpuguy83/go-md2man \
 		cyphar:filepath-securejoin:v0.2.2:cyphar_filepath_securejoin/vendor/github.com/cyphar/filepath-securejoin \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		deislabs:oras:v0.7.0:deislabs_oras/vendor/github.com/deislabs/oras \
+		deislabs:oras:v0.8.1:deislabs_oras/vendor/github.com/deislabs/oras \
 		dgrijalva:jwt-go:v3.2.0:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \
-		dmcgowan:letsencrypt:1847a81d2087:dmcgowan_letsencrypt/vendor/rsc.io/letsencrypt \
-		docker:cli:d88565df0c2d:docker_cli/vendor/github.com/docker/cli \
-		docker:distribution:v2.7.1:docker_distribution/vendor/github.com/docker/distribution \
-		docker:docker-credential-helpers:v0.6.1:docker_docker_credential_helpers/vendor/github.com/docker/docker-credential-helpers \
+		docker:cli:5d0cf8839492:docker_cli/vendor/github.com/docker/cli \
+		docker:distribution:a8371794149d:docker_distribution/vendor/github.com/docker/distribution \
+		docker:docker-credential-helpers:v0.6.3:docker_docker_credential_helpers/vendor/github.com/docker/docker-credential-helpers \
+		moby:moby:46ec8731fbce:moby_moby/vendor/github.com/docker/docker \
 		docker:go-connections:v0.4.0:docker_go_connections/vendor/github.com/docker/go-connections \
-		docker:go-metrics:b84716841b82:docker_go_metrics/vendor/github.com/docker/go-metrics \
+		docker:go-metrics:399ea8c73916:docker_go_metrics/vendor/github.com/docker/go-metrics \
 		docker:go-units:v0.4.0:docker_go_units/vendor/github.com/docker/go-units \
-		docker:libtrust:aabc10ec26b7:docker_libtrust/vendor/github.com/docker/libtrust \
-		docker:spdystream:6480d4af844c:docker_spdystream/vendor/github.com/docker/spdystream \
-		emicklei:go-restful:v2.11.1:emicklei_go_restful/vendor/github.com/emicklei/go-restful \
+		docker:libtrust:fa567046d9b1:docker_libtrust/vendor/github.com/docker/libtrust \
+		docker:spdystream:449fdfce4d96:docker_spdystream/vendor/github.com/docker/spdystream \
+		emicklei:go-restful:v2.9.5:emicklei_go_restful/vendor/github.com/emicklei/go-restful \
 		evanphx:json-patch:v4.5.0:evanphx_json_patch/vendor/github.com/evanphx/json-patch \
 		exponent-io:jsonpath:d6023ce2651d:exponent_io_jsonpath/vendor/github.com/exponent-io/jsonpath \
-		garyburd:redigo:v1.6.0:garyburd_redigo/vendor/github.com/garyburd/redigo \
+		fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \
+		garyburd:redigo:535138d7bcd7:garyburd_redigo/vendor/github.com/garyburd/redigo \
 		ghodss:yaml:v1.0.0:ghodss_yaml/vendor/github.com/ghodss/yaml \
 		go-inf:inf:v0.9.1:go_inf_inf/vendor/gopkg.in/inf.v0 \
 		go-openapi:jsonpointer:v0.19.3:go_openapi_jsonpointer/vendor/github.com/go-openapi/jsonpointer \
 		go-openapi:jsonreference:v0.19.3:go_openapi_jsonreference/vendor/github.com/go-openapi/jsonreference \
-		go-openapi:spec:v0.19.4:go_openapi_spec/vendor/github.com/go-openapi/spec \
+		go-openapi:spec:v0.19.3:go_openapi_spec/vendor/github.com/go-openapi/spec \
 		go-openapi:swag:v0.19.5:go_openapi_swag/vendor/github.com/go-openapi/swag \
 		go-yaml:yaml:v2.2.4:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		gobwas:glob:v0.2.3:gobwas_glob/vendor/github.com/gobwas/glob \
 		gofrs:flock:v0.7.1:gofrs_flock/vendor/github.com/gofrs/flock \
-		gofrs:uuid:v3.2.0:gofrs_uuid/vendor/github.com/gofrs/uuid \
 		gogo:protobuf:v1.3.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
-		golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
-		golang:crypto:f83a4685e152:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:fe3aa8a45271:golang_net/vendor/golang.org/x/net \
+		golang:appengine:v1.5.0:golang_appengine/vendor/google.golang.org/appengine \
+		golang:crypto:69ecbb4d6d5d:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:13f9640d40b9:golang_net/vendor/golang.org/x/net \
 		golang:oauth2:0f29369cfe45:golang_oauth2/vendor/golang.org/x/oauth2 \
 		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sync:112230192c58:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:195ce5e7f934:golang_sys/vendor/golang.org/x/sys \
+		golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \
+		golang:sys:9fbb57f87de9:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
-		golang:time:555d28b269f0:golang_time/vendor/golang.org/x/time \
+		golang:time:9d24e82272b4:golang_time/vendor/golang.org/x/time \
 		google:btree:v1.0.0:google_btree/vendor/github.com/google/btree \
-		google:go-cmp:v0.3.1:google_go_cmp/vendor/github.com/google/go-cmp \
-		google:go-genproto:919d9bdd9fe6:google_go_genproto/vendor/google.golang.org/genproto \
+		google:go-cmp:v0.4.0:google_go_cmp/vendor/github.com/google/go-cmp \
+		google:go-genproto:24fa4b261c55:google_go_genproto/vendor/google.golang.org/genproto \
 		google:gofuzz:v1.0.0:google_gofuzz/vendor/github.com/google/gofuzz \
 		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
-		googleapis:gnostic:v0.3.1:googleapis_gnostic/vendor/github.com/googleapis/gnostic \
+		googleapis:gnostic:0c5108395e2d:googleapis_gnostic/vendor/github.com/googleapis/gnostic \
 		googleapis:google-cloud-go:v0.38.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
 		gophercloud:gophercloud:v0.1.0:gophercloud_gophercloud/vendor/github.com/gophercloud/gophercloud \
-		gorilla:handlers:v1.4.0:gorilla_handlers/vendor/github.com/gorilla/handlers \
-		gorilla:mux:v1.7.0:gorilla_mux/vendor/github.com/gorilla/mux \
-		gosuri:uitable:v0.0.1:gosuri_uitable/vendor/github.com/gosuri/uitable \
-		gregjones:httpcache:c63ab54fda8f:gregjones_httpcache/vendor/github.com/gregjones/httpcache \
-		grpc:grpc-go:v1.24.0:grpc_grpc_go/vendor/google.golang.org/grpc \
-		hashicorp:golang-lru:v0.5.3:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
+		gorilla:handlers:60c7bfde3e33:gorilla_handlers/vendor/github.com/gorilla/handlers \
+		gorilla:mux:v1.7.2:gorilla_mux/vendor/github.com/gorilla/mux \
+		gosuri:uitable:v0.0.4:gosuri_uitable/vendor/github.com/gosuri/uitable \
+		gregjones:httpcache:9cad4c3443a7:gregjones_httpcache/vendor/github.com/gregjones/httpcache \
+		grpc:grpc-go:v1.27.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+		hashicorp:golang-lru:v0.5.1:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
 		huandu:xstrings:v1.2.0:huandu_xstrings/vendor/github.com/huandu/xstrings \
-		imdario:mergo:v0.3.8:imdario_mergo/vendor/github.com/imdario/mergo \
+		imdario:mergo:v0.3.7:imdario_mergo/vendor/github.com/imdario/mergo \
 		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
-		json-iterator:go:v1.1.7:json_iterator_go/vendor/github.com/json-iterator/go \
-		kardianos:osext:ae77be60afb1:kardianos_osext/vendor/github.com/kardianos/osext \
+		json-iterator:go:v1.1.8:json_iterator_go/vendor/github.com/json-iterator/go \
 		konsorten:go-windows-terminal-sequences:v1.0.1:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
 		kubernetes-sigs:yaml:v1.1.0:kubernetes_sigs_yaml/vendor/sigs.k8s.io/yaml \
-		kubernetes:api:35e52d86657a:kubernetes_api/vendor/k8s.io/api \
-		kubernetes:apiextensions-apiserver:5357c4baaf65:kubernetes_apiextensions_apiserver/vendor/k8s.io/apiextensions-apiserver \
-		kubernetes:apimachinery:a2eda9f80ab8:kubernetes_apimachinery/vendor/k8s.io/apimachinery \
-		kubernetes:cli-runtime:74ad18325ed5:kubernetes_cli_runtime/vendor/k8s.io/cli-runtime \
-		kubernetes:client-go:bec269661e48:kubernetes_client_go/vendor/k8s.io/client-go \
+		kubernetes:api:v0.17.2:kubernetes_api/vendor/k8s.io/api \
+		kubernetes:apiextensions-apiserver:v0.17.2:kubernetes_apiextensions_apiserver/vendor/k8s.io/apiextensions-apiserver \
+		kubernetes:apimachinery:v0.17.2:kubernetes_apimachinery/vendor/k8s.io/apimachinery \
+		kubernetes:cli-runtime:v0.17.2:kubernetes_cli_runtime/vendor/k8s.io/cli-runtime \
+		kubernetes:client-go:v0.17.2:kubernetes_client_go/vendor/k8s.io/client-go \
+		kubernetes:component-base:v0.17.2:kubernetes_component_base/vendor/k8s.io/component-base \
 		kubernetes:klog:v1.0.0:kubernetes_klog/vendor/k8s.io/klog \
-		kubernetes:kube-openapi:0270cf2f1c1d:kubernetes_kube_openapi/vendor/k8s.io/kube-openapi \
-		kubernetes:kubectl:2ed914427d51:kubernetes_kubectl/vendor/k8s.io/kubectl \
-		kubernetes:utils:8d271d903fe4:kubernetes_utils/vendor/k8s.io/utils \
+		kubernetes:kube-openapi:30be4d16710a:kubernetes_kube_openapi/vendor/k8s.io/kube-openapi \
+		kubernetes:kubectl:v0.17.2:kubernetes_kubectl/vendor/k8s.io/kubectl \
+		kubernetes:utils:e782cd3c129f:kubernetes_utils/vendor/k8s.io/utils \
+		liggitt:tabwriter:89fcab3d43de:liggitt_tabwriter/vendor/github.com/liggitt/tabwriter \
 		mailru:easyjson:v0.7.0:mailru_easyjson/vendor/github.com/mailru/easyjson \
-		mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
-		mattn:go-shellwords:v1.0.5:mattn_go_shellwords/vendor/github.com/mattn/go-shellwords \
+		mattn:go-colorable:v0.0.9:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
+		mattn:go-isatty:v0.0.4:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		mattn:go-runewidth:v0.0.2:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
+		mattn:go-shellwords:v1.0.9:mattn_go_shellwords/vendor/github.com/mattn/go-shellwords \
 		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
-		miekg:dns:0d29b283ac0f:miekg_dns/vendor/github.com/miekg/dns \
 		mitchellh:copystructure:v1.0.0:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \
 		mitchellh:go-wordwrap:v1.0.0:mitchellh_go_wordwrap/vendor/github.com/mitchellh/go-wordwrap \
 		mitchellh:reflectwalk:v1.0.0:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \
-		moby:moby:38ab9da00309:moby_moby/vendor/github.com/docker/docker \
 		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
 		modern-go:reflect2:v1.0.1:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
-		morikuni:aec:39771216ff4c:morikuni_aec/vendor/github.com/morikuni/aec \
+		morikuni:aec:v1.0.0:morikuni_aec/vendor/github.com/morikuni/aec \
 		opencontainers:go-digest:v1.0.0-rc1:opencontainers_go_digest/vendor/github.com/opencontainers/go-digest \
 		opencontainers:image-spec:v1.0.1:opencontainers_image_spec/vendor/github.com/opencontainers/image-spec \
 		opencontainers:runc:v0.1.1:opencontainers_runc/vendor/github.com/opencontainers/runc \
 		peterbourgon:diskv:v2.0.1:peterbourgon_diskv/vendor/github.com/peterbourgon/diskv \
-		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
+		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		prometheus:client_golang:v1.2.1:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_golang:v1.0.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
 		prometheus:client_model:14fe0d1b01d4:prometheus_client_model/vendor/github.com/prometheus/client_model \
-		prometheus:common:v0.7.0:prometheus_common/vendor/github.com/prometheus/common \
+		prometheus:common:v0.4.1:prometheus_common/vendor/github.com/prometheus/common \
 		prometheus:procfs:v0.0.5:prometheus_procfs/vendor/github.com/prometheus/procfs \
 		russross:blackfriday:v1.5.2:russross_blackfriday/vendor/github.com/russross/blackfriday \
 		sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
 		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:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
-		square:go-jose:v1.1.2:square_go_jose/vendor/gopkg.in/square/go-jose.v1 \
 		stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify \
 		xeipuuv:gojsonpointer:4e3ac2762d5f:xeipuuv_gojsonpointer/vendor/github.com/xeipuuv/gojsonpointer \
 		xeipuuv:gojsonreference:bd5ef7bd5415:xeipuuv_gojsonreference/vendor/github.com/xeipuuv/gojsonreference \
 		xeipuuv:gojsonschema:v1.1.0:xeipuuv_gojsonschema/vendor/github.com/xeipuuv/gojsonschema \
-		xenolf:lego:a9d8cec0e656:xenolf_lego/vendor/github.com/xenolf/lego \
-		yvasiyarov:go-metrics:c25f46c4b940:yvasiyarov_go_metrics/vendor/github.com/yvasiyarov/go-metrics \
-		yvasiyarov:gorelic:v0.0.6:yvasiyarov_gorelic/vendor/github.com/yvasiyarov/gorelic \
+		yvasiyarov:go-metrics:57bccd1ccd43:yvasiyarov_go_metrics/vendor/github.com/yvasiyarov/go-metrics \
+		yvasiyarov:gorelic:a9bba5b9ab50:yvasiyarov_gorelic/vendor/github.com/yvasiyarov/gorelic \
 		yvasiyarov:newrelic_platform_go:b21fdbd4370f:yvasiyarov_newrelic_platform_go/vendor/github.com/yvasiyarov/newrelic_platform_go \
 		kubernetes-sigs:kustomize:v2.0.3:kubernetes_sigs_kustomize/vendor/sigs.k8s.io/kustomize
 
 GO_PKGNAME=	k8s.io/helm
 GO_BUILDFLAGS=	-ldflags="-X helm.sh/helm/v3/internal/version.version=v${PORTVERSION} \
-		-X helm.sh/helm/v3/internal/version.gitCommit=ac925eb7279f4a6955df663a0128044a8a6b7593"
+		-X helm.sh/helm/v3/internal/version.gitCommit=b29d20baf09943e134c2fa5e1e1cab3bf93315fa"
 GO_TARGET=	./cmd/${PORTNAME}
 
 PLIST_FILES=	${GO_TARGET:C/.\/cmd/bin/}
diff --git a/sysutils/helm/distinfo b/sysutils/helm/distinfo
index 8023fde7bd2..96c208a2f00 100644
--- a/sysutils/helm/distinfo
+++ b/sysutils/helm/distinfo
@@ -1,84 +1,88 @@
-TIMESTAMP = 1580553433
-SHA256 (helm-helm-v3.0.3_GH0.tar.gz) = 0687c7a19890411a9e8a50a467518d035d4601b8616bcc4972a9b4b43df922c4
-SIZE (helm-helm-v3.0.3_GH0.tar.gz) = 499874
+TIMESTAMP = 1581872902
+SHA256 (helm-helm-v3.1.0_GH0.tar.gz) = 46799de982807cd3e215c82f844f2a41c96c6c360d097797872517d03bceaeae
+SIZE (helm-helm-v3.1.0_GH0.tar.gz) = 529944
 SHA256 (Azure-go-ansiterm-d6e3b3328b78_GH0.tar.gz) = ee1ebe2efef498be1c558bf71e143289db2d21e2d42592503ad2d4a989006821
 SIZE (Azure-go-ansiterm-d6e3b3328b78_GH0.tar.gz) = 20946
 SHA256 (Azure-go-autorest-v13.3.1_GH0.tar.gz) = a06207e78072d15979e384d310a10b45a89c4351d0779dcb91d082c96e065a8e
 SIZE (Azure-go-autorest-v13.3.1_GH0.tar.gz) = 165007
 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
 SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
-SHA256 (MakeNowJust-heredoc-e9091a26100e_GH0.tar.gz) = 07a1f09df0897a94dc85a2740492ee32ca50c8ee3f1439cc8c8ed2ba75e4dd71
-SIZE (MakeNowJust-heredoc-e9091a26100e_GH0.tar.gz) = 3402
+SHA256 (MakeNowJust-heredoc-bb23615498cd_GH0.tar.gz) = be00f2aedeb443f9768f767b44e3ceab6d68ce6d45cb00468c61d5fcaff3823a
+SIZE (MakeNowJust-heredoc-bb23615498cd_GH0.tar.gz) = 3383
 SHA256 (Masterminds-goutils-v1.1.0_GH0.tar.gz) = 053a61c4b0d78e6978600c99562f04d053993c428d549a20b627151cf1aabbae
 SIZE (Masterminds-goutils-v1.1.0_GH0.tar.gz) = 14610
-SHA256 (Masterminds-semver-v3.0.1_GH0.tar.gz) = 039a09a397f10906343c6d5b65381311e9b574429c2ebdb7ae5b7a75eb6b98c9
-SIZE (Masterminds-semver-v3.0.1_GH0.tar.gz) = 23977
-SHA256 (Masterminds-sprig-v3.0.0_GH0.tar.gz) = 6cee82b51e743e3fd9c9dfbb20d1667aeb0a92652db6971fa9c1658b0296633a
-SIZE (Masterminds-sprig-v3.0.0_GH0.tar.gz) = 47424
-SHA256 (Masterminds-vcs-v1.13.0_GH0.tar.gz) = ade612352987f8144eeef8201ab9c6ea0ce795f0f61f3a122975e31c7fefa688
-SIZE (Masterminds-vcs-v1.13.0_GH0.tar.gz) = 27675
-SHA256 (Microsoft-go-winio-v0.4.12_GH0.tar.gz) = 0883cf6323376eca97e1b9e1a13ddd2a2f3bc85810aff7fdbd56621f71922d46
-SIZE (Microsoft-go-winio-v0.4.12_GH0.tar.gz) = 92439
-SHA256 (Microsoft-hcsshim-v0.8.6_GH0.tar.gz) = 8ed4dbe7a70172101c32b3365c3b43ba779e2fd5259cf00389b729c68a50cbd3
-SIZE (Microsoft-hcsshim-v0.8.6_GH0.tar.gz) = 1664509
+SHA256 (Masterminds-semver-v3.0.3_GH0.tar.gz) = da69b88d88751537a18634a497c0aefd3de4c4ef79f3fb3ca8ebca7f81ff1052
+SIZE (Masterminds-semver-v3.0.3_GH0.tar.gz) = 23824
+SHA256 (Masterminds-sprig-v3.0.2_GH0.tar.gz) = 861ec05ce38b0138e8ff6e8b91b2ee61795947dd151d5e9a89314cc27c38cd08
+SIZE (Masterminds-sprig-v3.0.2_GH0.tar.gz) = 47799
+SHA256 (Masterminds-vcs-v1.13.1_GH0.tar.gz) = e89e09a27118e180152ec2837471ad0badffaae6cf3588c1dcee20d935774644
+SIZE (Masterminds-vcs-v1.13.1_GH0.tar.gz) = 27781
+SHA256 (Microsoft-go-winio-fc70bd9a86b5_GH0.tar.gz) = 85937c915268ae71db887348363b44a531d9202f5180fbbf00b8d4f21ec4be2f
+SIZE (Microsoft-go-winio-fc70bd9a86b5_GH0.tar.gz) = 119568
+SHA256 (Microsoft-hcsshim-v0.8.7_GH0.tar.gz) = 21ba15424d314563a8e4f5593b1569510e0e576b7b2d726501fac0ccfb9d1440
+SIZE (Microsoft-hcsshim-v0.8.7_GH0.tar.gz) = 3402184
 SHA256 (PuerkitoBio-purell-v1.1.1_GH0.tar.gz) = 93e2ae2b12fc656ecc7ca28336009d24431247d2af59949c59fdef26ecc9a971
 SIZE (PuerkitoBio-purell-v1.1.1_GH0.tar.gz) = 11604
 SHA256 (PuerkitoBio-urlesc-de5bf2ad4578_GH0.tar.gz) = e1d470b13efcab6d4dea96a3cdb986b8a29a06c05d1b80399f0e58caef5ca932
 SIZE (PuerkitoBio-urlesc-de5bf2ad4578_GH0.tar.gz) = 6796
 SHA256 (Shopify-logrus-bugsnag-577dee27f20d_GH0.tar.gz) = 8b9835cfe1c87ddc292a8a636b0a6adae5ed62a9f819e708be0f5bcd383151d6
 SIZE (Shopify-logrus-bugsnag-577dee27f20d_GH0.tar.gz) = 3379
-SHA256 (asaskevich-govalidator-f61b66f89f4a_GH0.tar.gz) = 7e241314ac30b59d9dc6ead8e902de94e07135486694e4e7ef0dc97eaf42c40e
-SIZE (asaskevich-govalidator-f61b66f89f4a_GH0.tar.gz) = 51800
-SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
-SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
+SHA256 (asaskevich-govalidator-475eaeb16496_GH0.tar.gz) = 72b597629e12ec2089e3e39bba37e8ee8c90efb89dcaea5dff1c214f39236377
+SIZE (asaskevich-govalidator-475eaeb16496_GH0.tar.gz) = 57023
+SHA256 (beorn7-perks-v1.0.0_GH0.tar.gz) = b69d92e2e84b7d510dfa6110d3ac4ada0096a6c81190c5e174aa888bfe475cbc
+SIZE (beorn7-perks-v1.0.0_GH0.tar.gz) = 10866
 SHA256 (bshuster-repo-logrus-logstash-hook-v0.4.1_GH0.tar.gz) = 7e332cfd49f657a390066cf2ffd7b8141b949b7ca4b8095f14b21eb9b4504ddc
 SIZE (bshuster-repo-logrus-logstash-hook-v0.4.1_GH0.tar.gz) = 6616
-SHA256 (bugsnag-bugsnag-go-v1.5.0_GH0.tar.gz) = 30fa4cba2770ea71f02ab8e26c64c564cb0bc184e643b28aca352a0d861c39c6
-SIZE (bugsnag-bugsnag-go-v1.5.0_GH0.tar.gz) = 347088
-SHA256 (bugsnag-panicwrap-v1.2.0_GH0.tar.gz) = ba4d6fb584f998eb25cbebb47299696ba2790dae46e1713b6de3b26cde89a031
-SIZE (bugsnag-panicwrap-v1.2.0_GH0.tar.gz) = 8564
-SHA256 (cespare-xxhash-v2.1.0_GH0.tar.gz) = e290af0281cb450d295eafbecdbc3138f94c3ff728f14714af055a1d9a4ce15d
-SIZE (cespare-xxhash-v2.1.0_GH0.tar.gz) = 9198
-SHA256 (containerd-containerd-v1.3.0_GH0.tar.gz) = a5115a680cc02ca6ce5680b7c3f2852006b2f556b35f88872eb20311a47cb4d1
-SIZE (containerd-containerd-v1.3.0_GH0.tar.gz) = 5697153
-SHA256 (containerd-continuity-004b46473808_GH0.tar.gz) = fad63b604b84e5388d064cb9e82c343c93f5bab710ff6a68de7f2dd42d5f81a4
-SIZE (containerd-continuity-004b46473808_GH0.tar.gz) = 1075040
+SHA256 (bugsnag-bugsnag-go-b1d153021fcd_GH0.tar.gz) = 164d5189a3c4130b815965073ce88dca43f512cbff5b476f39acf9ba1796ba68
+SIZE (bugsnag-bugsnag-go-b1d153021fcd_GH0.tar.gz) = 24686
+SHA256 (bugsnag-osext-0dd3f918b21b_GH0.tar.gz) = 164c7c6d6e45fa84bfdf22c276ddb34ab475186df33da2f946df02167dd31983
+SIZE (bugsnag-osext-0dd3f918b21b_GH0.tar.gz) = 2791
+SHA256 (bugsnag-panicwrap-e2c28503fcd0_GH0.tar.gz) = 48b115946e1c5d026c95dfeeaf808967183b277a68bda594f95cefddcb9a22e7
+SIZE (bugsnag-panicwrap-e2c28503fcd0_GH0.tar.gz) = 8117
+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 (containerd-cgroups-bf292b21730f_GH0.tar.gz) = a6529bf5677e3dfe22f5b166653c856ed15128271dc9e56f486669b0a8531f74
+SIZE (containerd-cgroups-bf292b21730f_GH0.tar.gz) = 45393
+SHA256 (containerd-containerd-v1.3.2_GH0.tar.gz) = 1ac07660f693aac0df48638090e1c528a056dbe19c4136bbe0c74fa865399b96
+SIZE (containerd-containerd-v1.3.2_GH0.tar.gz) = 5704320
 SHA256 (cpuguy83-go-md2man-v1.0.10_GH0.tar.gz) = 76aa56849123b99b95fcea2b15502fd886dead9a5c35be7f78bdc2bad6be8d99
 SIZE (cpuguy83-go-md2man-v1.0.10_GH0.tar.gz) = 43936
 SHA256 (cyphar-filepath-securejoin-v0.2.2_GH0.tar.gz) = 85410db58d5a37db05ff1f681fc538bb53893c0a8c555db5482770396e5c15e9
 SIZE (cyphar-filepath-securejoin-v0.2.2_GH0.tar.gz) = 10822
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (deislabs-oras-v0.7.0_GH0.tar.gz) = 10a8fb08e3f603960b42dce8bad03c1bd0371f3e969b6308c74c138d550a7d97
-SIZE (deislabs-oras-v0.7.0_GH0.tar.gz) = 83133
+SHA256 (deislabs-oras-v0.8.1_GH0.tar.gz) = 4c2482aa2b804c8deaa0a355977960593a10c23b60438575fa239e99d44d4b96
+SIZE (deislabs-oras-v0.8.1_GH0.tar.gz) = 91097
 SHA256 (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 197465ef53219f3aeb1a6940b70e16d288fe4e4108d4831b91ea101118440e63
 SIZE (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 36960
-SHA256 (dmcgowan-letsencrypt-1847a81d2087_GH0.tar.gz) = 8a093bc278eded89251399cc141126c1624ed6325b48fc9a2dde512bbfb39014
-SIZE (dmcgowan-letsencrypt-1847a81d2087_GH0.tar.gz) = 9514
-SHA256 (docker-cli-d88565df0c2d_GH0.tar.gz) = 09612f1fc26a9703c7762c8bc270f4af0c79d044dc42d5e91c6b33812265d8a3
-SIZE (docker-cli-d88565df0c2d_GH0.tar.gz) = 7424704
-SHA256 (docker-distribution-v2.7.1_GH0.tar.gz) = 4c3609c102351f15c0386f619d48bb592f3100726b4bde86f3eba7739192ff55
-SIZE (docker-distribution-v2.7.1_GH0.tar.gz) = 1996699
-SHA256 (docker-docker-credential-helpers-v0.6.1_GH0.tar.gz) = 9b36ae15d5bceaaf3496b80413acafa6325c633af3ae211ce10724dfa7046883
-SIZE (docker-docker-credential-helpers-v0.6.1_GH0.tar.gz) = 27723
+SHA256 (docker-cli-5d0cf8839492_GH0.tar.gz) = 81af3d67e269a6c2b6065bb23a5aa0ea1ea2b605b96f884c169336d44d383c2c
+SIZE (docker-cli-5d0cf8839492_GH0.tar.gz) = 7713558
+SHA256 (docker-distribution-a8371794149d_GH0.tar.gz) = c9e946800f807110cd514bf3b818e6ef2983719f6094b816fc67574683072c0f
+SIZE (docker-distribution-a8371794149d_GH0.tar.gz) = 3523544
+SHA256 (docker-docker-credential-helpers-v0.6.3_GH0.tar.gz) = 441684cf1d2434aa1024aa2f8455e11502c44858e93ea171b19caa656dd2b2e2
+SIZE (docker-docker-credential-helpers-v0.6.3_GH0.tar.gz) = 28971
+SHA256 (moby-moby-46ec8731fbce_GH0.tar.gz) = c90901cccfa0a920904138c910731a235e8d4e3c5ad9f7db1f48e5d4e2563110
+SIZE (moby-moby-46ec8731fbce_GH0.tar.gz) = 9661067
 SHA256 (docker-go-connections-v0.4.0_GH0.tar.gz) = e31dfcf72dd9b07bf6dc320671a78a142a1b7c6287a7282c034c8cd463bc8663
 SIZE (docker-go-connections-v0.4.0_GH0.tar.gz) = 30770
-SHA256 (docker-go-metrics-b84716841b82_GH0.tar.gz) = 63abf1e2087de4e4a0dd6f727a382455b445418ebd4dc76da64cc5714b9d0ed0
-SIZE (docker-go-metrics-b84716841b82_GH0.tar.gz) = 16289
+SHA256 (docker-go-metrics-399ea8c73916_GH0.tar.gz) = 73a215f48ce02ae60c5174752b7a6fe954f3541c2bf46c4745860a6ebe20a7fb
+SIZE (docker-go-metrics-399ea8c73916_GH0.tar.gz) = 16289
 SHA256 (docker-go-units-v0.4.0_GH0.tar.gz) = b411f15ca9b419880006f3944b8ec87dc3fe15cbba3beb6e04f2c03f9ea8370b
 SIZE (docker-go-units-v0.4.0_GH0.tar.gz) = 11514
-SHA256 (docker-libtrust-aabc10ec26b7_GH0.tar.gz) = ddf9c43e429d6919942ed55769d257cf1bb93df9a394493357e0c96a42ef4eb9
-SIZE (docker-libtrust-aabc10ec26b7_GH0.tar.gz) = 39349
-SHA256 (docker-spdystream-6480d4af844c_GH0.tar.gz) = 5c8b46535fd9f3d441360f10395abd09815285860eec83ca8b7028f0cea359a9
-SIZE (docker-spdystream-6480d4af844c_GH0.tar.gz) = 35411
-SHA256 (emicklei-go-restful-v2.11.1_GH0.tar.gz) = 2982966d290a351875dee5a34bb3dbc30bbf031743e280d132259bed49c640ed
-SIZE (emicklei-go-restful-v2.11.1_GH0.tar.gz) = 66646
+SHA256 (docker-libtrust-fa567046d9b1_GH0.tar.gz) = e2d7ddb648fa2b0a1ce9713647cbb5a3bdbb43c1cc5a882c480758d325c76a30
+SIZE (docker-libtrust-fa567046d9b1_GH0.tar.gz) = 38950
+SHA256 (docker-spdystream-449fdfce4d96_GH0.tar.gz) = bf27356ac5790fb852f90da56d072145c89d23a0c3f9806bd85ca94305c9cf15
+SIZE (docker-spdystream-449fdfce4d96_GH0.tar.gz) = 35383
+SHA256 (emicklei-go-restful-v2.9.5_GH0.tar.gz) = 7781be0cfcc41280191ef87194d9005730fd1971625c5f205dc3f181ac988547
+SIZE (emicklei-go-restful-v2.9.5_GH0.tar.gz) = 64769
 SHA256 (evanphx-json-patch-v4.5.0_GH0.tar.gz) = a9b9f34bd68a3f493f72b12c9d7601ce665e9f21de9295f6e721bf969c7d5bf1
 SIZE (evanphx-json-patch-v4.5.0_GH0.tar.gz) = 15076
 SHA256 (exponent-io-jsonpath-d6023ce2651d_GH0.tar.gz) = f5ce66cbfc621fb2f97e9161619d9a81641c760b90e53a0024cf7bb1ee7ab679
 SIZE (exponent-io-jsonpath-d6023ce2651d_GH0.tar.gz) = 8221
-SHA256 (garyburd-redigo-v1.6.0_GH0.tar.gz) = 6a17aedbaea7737637ecc0ff90812c169cf1c2b51dfd0809df6998295abb8f19
-SIZE (garyburd-redigo-v1.6.0_GH0.tar.gz) = 42765
+SHA256 (fatih-color-v1.7.0_GH0.tar.gz) = 4650d7aa3feed266fc85d91dc34ca9cffdf7ee03ea29bf2cbf84bbecc75fb755
+SIZE (fatih-color-v1.7.0_GH0.tar.gz) = 816449
+SHA256 (garyburd-redigo-535138d7bcd7_GH0.tar.gz) = 8b2897fcd43ea92f50f274ad4130aad76d74b3bf4ea1de7dc2d8b71a1a485b79
+SIZE (garyburd-redigo-535138d7bcd7_GH0.tar.gz) = 26863
 SHA256 (ghodss-yaml-v1.0.0_GH0.tar.gz) = 8a76b47cd171944612aae1cfa08bbb971b63fec16794c839252808392097de44
 SIZE (ghodss-yaml-v1.0.0_GH0.tar.gz) = 11772
 SHA256 (go-inf-inf-v0.9.1_GH0.tar.gz) = 756e00e87207cb063d305b6e38bf56dba4d76586fbe40b7d6b657d22516d0f71
@@ -87,8 +91,8 @@ SHA256 (go-openapi-jsonpointer-v0.19.3_GH0.tar.gz) = 014bb71b56bbe062bf4cf0c8b79
 SIZE (go-openapi-jsonpointer-v0.19.3_GH0.tar.gz) = 15377
 SHA256 (go-openapi-jsonreference-v0.19.3_GH0.tar.gz) = b3113cd6f67e3aa5ccc54f1cc3a7dedd163e9450c67f605de7b32417c4c7289d
 SIZE (go-openapi-jsonreference-v0.19.3_GH0.tar.gz) = 13931
-SHA256 (go-openapi-spec-v0.19.4_GH0.tar.gz) = 01c59d9d31b31c91b4794d04d21731052341c9b1280df81ef784de4a3da3bd98
-SIZE (go-openapi-spec-v0.19.4_GH0.tar.gz) = 217801
+SHA256 (go-openapi-spec-v0.19.3_GH0.tar.gz) = d14a88b940d2982ca0abc8e11c078134953a5e8fd1503eb6510c41cb6323f273
+SIZE (go-openapi-spec-v0.19.3_GH0.tar.gz) = 217790
 SHA256 (go-openapi-swag-v0.19.5_GH0.tar.gz) = 943b187c67d847b899245ca969223586f457f92b77d0bcce9790877471838eea
 SIZE (go-openapi-swag-v0.19.5_GH0.tar.gz) = 33023
 SHA256 (go-yaml-yaml-v2.2.4_GH0.tar.gz) = 9004c9709200d52ef6e5c69af3f71f3adb1a2b7e884ea7597f306bf54b1f007c
@@ -97,112 +101,112 @@ SHA256 (gobwas-glob-v0.2.3_GH0.tar.gz) = 325026fc78bcebcf31151b6e060f4e1c3321b04
 SIZE (gobwas-glob-v0.2.3_GH0.tar.gz) = 25962
 SHA256 (gofrs-flock-v0.7.1_GH0.tar.gz) = d4e33c3923e671fe6288a6dcb6618b7c46834c1a387653f482f5247c5a132dea
 SIZE (gofrs-flock-v0.7.1_GH0.tar.gz) = 7294
-SHA256 (gofrs-uuid-v3.2.0_GH0.tar.gz) = 77d6e7d793bbc8835e082b590d0512ed177d6eba898bffb202d76ef97db57677
-SIZE (gofrs-uuid-v3.2.0_GH0.tar.gz) = 17064
 SHA256 (gogo-protobuf-v1.3.1_GH0.tar.gz) = 5184f06decd681fcc82f6583976111faf87189c0c2f8063b34ac2ea9ed997236
 SIZE (gogo-protobuf-v1.3.1_GH0.tar.gz) = 2038188
-SHA256 (golang-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316
-SIZE (golang-appengine-v1.6.5_GH0.tar.gz) = 332903
-SHA256 (golang-crypto-f83a4685e152_GH0.tar.gz) = e8a4eff0a3d3a8d75e77b084a3eb5f4852d148b49065f5982a5eedea6e7f7d2c
-SIZE (golang-crypto-f83a4685e152_GH0.tar.gz) = 1709134
-SHA256 (golang-net-fe3aa8a45271_GH0.tar.gz) = 0a2d88f2fdf3b6951db507318de3e2bf7cd07800be0260a57f829040dc86d3f4
-SIZE (golang-net-fe3aa8a45271_GH0.tar.gz) = 1103254
+SHA256 (golang-appengine-v1.5.0_GH0.tar.gz) = 0de9d0a9882054e319bf7608b6ede31a6d3005ccd3efecd85b936d4b82cbd6b1
+SIZE (golang-appengine-v1.5.0_GH0.tar.gz) = 325873
+SHA256 (golang-crypto-69ecbb4d6d5d_GH0.tar.gz) = 006815c146fa85ab4b28f862748df3d7866f51688d5803d015c8a397019de0f9
+SIZE (golang-crypto-69ecbb4d6d5d_GH0.tar.gz) = 1719992
+SHA256 (golang-net-13f9640d40b9_GH0.tar.gz) = 4057c48585661100b0b9420bc7b5c316c53de74158eacb291fbd4c276872bb24
+SIZE (golang-net-13f9640d40b9_GH0.tar.gz) = 1100040
 SHA256 (golang-oauth2-0f29369cfe45_GH0.tar.gz) = 468421ddfe905216454006b309ebda6e97aa6089265b995bce4259d6a9efd141
 SIZE (golang-oauth2-0f29369cfe45_GH0.tar.gz) = 45498
 SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
 SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
-SHA256 (golang-sync-112230192c58_GH0.tar.gz) = 6d98880ea18369550cb12d7011df8e4b21c5b7588268a412b863b5c9d2fa0313
-SIZE (golang-sync-112230192c58_GH0.tar.gz) = 16832
-SHA256 (golang-sys-195ce5e7f934_GH0.tar.gz) = a8e2aad89c6eb4f31d90cd4162c295b9587516ecf456eccd6c5a96298fcd16cf
-SIZE (golang-sys-195ce5e7f934_GH0.tar.gz) = 1513918
+SHA256 (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 00a6dce4c1a9ca9edae6c3f1bedc0b15911c62681371ad9ed7738e182ba70393
+SIZE (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 16956
+SHA256 (golang-sys-9fbb57f87de9_GH0.tar.gz) = 2f944b1fa3e7c040dc10ab2288ac7309d2ccab383337a4d9f77556e50589cb7c
+SIZE (golang-sys-9fbb57f87de9_GH0.tar.gz) = 1535108
 SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
 SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
-SHA256 (golang-time-555d28b269f0_GH0.tar.gz) = 8ce368da65025dad4e4ed302a5835e2b3579f3a111721f9b275803519a5d10b3
-SIZE (golang-time-555d28b269f0_GH0.tar.gz) = 9577
+SHA256 (golang-time-9d24e82272b4_GH0.tar.gz) = 7452a7b879ee5984709b2165f6212ad9464977f06d440140b8690e61695aa404
+SIZE (golang-time-9d24e82272b4_GH0.tar.gz) = 9313
 SHA256 (google-btree-v1.0.0_GH0.tar.gz) = 9f53e0e1330a4dbe92100d516606791f7196bf828ba93d693ef4d5c1cbd5fe30
 SIZE (google-btree-v1.0.0_GH0.tar.gz) = 15292
-SHA256 (google-go-cmp-v0.3.1_GH0.tar.gz) = a95fa266e5c2283b813102f265c1bdf5b78100f9889b984aef828eb094efe6e3
-SIZE (google-go-cmp-v0.3.1_GH0.tar.gz) = 76403
-SHA256 (google-go-genproto-919d9bdd9fe6_GH0.tar.gz) = 533257e6606c612f46fa999c59622b203bccf8666dd53eed79385dec98df48af
-SIZE (google-go-genproto-919d9bdd9fe6_GH0.tar.gz) = 5547345
+SHA256 (google-go-cmp-v0.4.0_GH0.tar.gz) = 97964b47aa6dc61007f9e1b1ad67812f0a8a2380072a59daebac7bc0cdcf740a
+SIZE (google-go-cmp-v0.4.0_GH0.tar.gz) = 81600
+SHA256 (google-go-genproto-24fa4b261c55_GH0.tar.gz) = 96481b64c5971de2dd22d7c6f764d2acbeb4cd85ab6166856284115c3f99238c
+SIZE (google-go-genproto-24fa4b261c55_GH0.tar.gz) = 5332241
 SHA256 (google-gofuzz-v1.0.0_GH0.tar.gz) = c614b23263110dcf0881f13e9cac482ca01b222cd4a2664827574867a5437c66
 SIZE (google-gofuzz-v1.0.0_GH0.tar.gz) = 13201
 SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
 SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543
-SHA256 (googleapis-gnostic-v0.3.1_GH0.tar.gz) = 86dd32c2c1cffb5193fe2e611848936a6d23e8ac9e9a5fc67b2436642ceb09d1
-SIZE (googleapis-gnostic-v0.3.1_GH0.tar.gz) = 435152
+SHA256 (googleapis-gnostic-0c5108395e2d_GH0.tar.gz) = e43de452b39ce224dae1547787297fc9a1ab2c977d92cde87939b99f0adb68d2
+SIZE (googleapis-gnostic-0c5108395e2d_GH0.tar.gz) = 300472
 SHA256 (googleapis-google-cloud-go-v0.38.0_GH0.tar.gz) = fec2263c5a5d12a32a2af6f4940e3d072a2ef3847b192545e8f56898dd80cbe5
 SIZE (googleapis-google-cloud-go-v0.38.0_GH0.tar.gz) = 1919592
 SHA256 (gophercloud-gophercloud-v0.1.0_GH0.tar.gz) = 7da425182399179423beb99dff52002571998e8c14bb95b2ccaf12c26b0aad78
 SIZE (gophercloud-gophercloud-v0.1.0_GH0.tar.gz) = 878471
-SHA256 (gorilla-handlers-v1.4.0_GH0.tar.gz) = 6bf76c80f59b927e29f87aeae37adca1a1dba07c6d51789b17619001f32dd688
-SIZE (gorilla-handlers-v1.4.0_GH0.tar.gz) = 18379
-SHA256 (gorilla-mux-v1.7.0_GH0.tar.gz) = 5aca5bfa16325506b23b66ce34e2b9336a3a341b8c51ba7b0faf7d0daade0116
-SIZE (gorilla-mux-v1.7.0_GH0.tar.gz) = 40777
-SHA256 (gosuri-uitable-v0.0.1_GH0.tar.gz) = fb255c043810edf049eebc1b93cbe715084335317e000fc72395bca65b737f68
-SIZE (gosuri-uitable-v0.0.1_GH0.tar.gz) = 6858
-SHA256 (gregjones-httpcache-c63ab54fda8f_GH0.tar.gz) = 3a4016cd2810f0ad820441e0bcc97719ab60f7959c0f9d873025ceb735f29656
-SIZE (gregjones-httpcache-c63ab54fda8f_GH0.tar.gz) = 13946
-SHA256 (grpc-grpc-go-v1.24.0_GH0.tar.gz) = b8ac419ef6eb434e54e3900f0489bdda2f18d604e3f8c074b8ae75e6c106872b
-SIZE (grpc-grpc-go-v1.24.0_GH0.tar.gz) = 755074
-SHA256 (hashicorp-golang-lru-v0.5.3_GH0.tar.gz) = dd98197fc84fbf636b6811ff3c14ef1ea0fe732fe782b8034cf082b3ff274af3
-SIZE (hashicorp-golang-lru-v0.5.3_GH0.tar.gz) = 13348
+SHA256 (gorilla-handlers-60c7bfde3e33_GH0.tar.gz) = bd3b5343a44eee7cdf3548d4759346d3ed4e0192cce841cada1ec319fe02841c
+SIZE (gorilla-handlers-60c7bfde3e33_GH0.tar.gz) = 11018
+SHA256 (gorilla-mux-v1.7.2_GH0.tar.gz) = 56920f5c8a9286478005a13940c27069242447812ac47f4e6221cfc9d13ea73f
+SIZE (gorilla-mux-v1.7.2_GH0.tar.gz) = 40933
+SHA256 (gosuri-uitable-v0.0.4_GH0.tar.gz) = 7b496d0c8df70ef7ab546081174ad9994917bf4be49f0420079ecc3c66355875
+SIZE (gosuri-uitable-v0.0.4_GH0.tar.gz) = 7250
+SHA256 (gregjones-httpcache-9cad4c3443a7_GH0.tar.gz) = 6a4e441dfb7d79ced30f2cfb17aedd84b03801231de119754b7133bda8374335
+SIZE (gregjones-httpcache-9cad4c3443a7_GH0.tar.gz) = 13950
+SHA256 (grpc-grpc-go-v1.27.0_GH0.tar.gz) = 53082da10cb09b2cb850ed3c0a41ed13e61fdcbff24fb43c473f8427d1c6dcbf
+SIZE (grpc-grpc-go-v1.27.0_GH0.tar.gz) = 825961
+SHA256 (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 3bf57512af746dc0338651ba1c35c65fe907ff214ccb22d679539f7ea791511e
+SIZE (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 12982
 SHA256 (huandu-xstrings-v1.2.0_GH0.tar.gz) = c43737734bb260e7d77329af8a33bf687f9430abc1b21d3b1f4a8fa6fb3dbde3
 SIZE (huandu-xstrings-v1.2.0_GH0.tar.gz) = 16628
-SHA256 (imdario-mergo-v0.3.8_GH0.tar.gz) = 8722e1280a333b1b17541dc05102200e1c9e8ee85f45fc66a4ba629b97a870e6
-SIZE (imdario-mergo-v0.3.8_GH0.tar.gz) = 18180
+SHA256 (imdario-mergo-v0.3.7_GH0.tar.gz) = ce29171c44a6b4084ed514bc9b4ed6c3c01462c210b7ec6fe5e56691a46eb939
+SIZE (imdario-mergo-v0.3.7_GH0.tar.gz) = 16668
 SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
 SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
-SHA256 (json-iterator-go-v1.1.7_GH0.tar.gz) = fb0560a12eab7071f8518104703b6b2b1e6a5a0b564c8d61b0b68d29f6471233
-SIZE (json-iterator-go-v1.1.7_GH0.tar.gz) = 77936
-SHA256 (kardianos-osext-ae77be60afb1_GH0.tar.gz) = 14cdf40dfc961addbc20de5de76d84468f585e7058badeaf742a8c300956ebca
-SIZE (kardianos-osext-ae77be60afb1_GH0.tar.gz) = 4850
+SHA256 (json-iterator-go-v1.1.8_GH0.tar.gz) = 0e16ec1a5175936864f3ee101951f58845ae0c86211e9a15b0c6bbf23752e62d
+SIZE (json-iterator-go-v1.1.8_GH0.tar.gz) = 79177
 SHA256 (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = e36c5a5de388bf72db3037b47f025b09e574be8d0bc74b3e44c960cba0880e87
 SIZE (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = 1909
 SHA256 (kubernetes-sigs-yaml-v1.1.0_GH0.tar.gz) = 0ee3cfa6e0c3178df07213443ebac0d6ecc1178147f43f848ea7114acf621953
 SIZE (kubernetes-sigs-yaml-v1.1.0_GH0.tar.gz) = 14890
-SHA256 (kubernetes-api-35e52d86657a_GH0.tar.gz) = 7b0d7545e8c1dc960d2afc45d6dd2023456eb066a5b591b51ad416086e5b41b4
-SIZE (kubernetes-api-35e52d86657a_GH0.tar.gz) = 2538636
-SHA256 (kubernetes-apiextensions-apiserver-5357c4baaf65_GH0.tar.gz) = d2baf567dda53d580918ae1546160b04e9c6e412483402c98aefa4f0f5414cba
-SIZE (kubernetes-apiextensions-apiserver-5357c4baaf65_GH0.tar.gz) = 376413
-SHA256 (kubernetes-apimachinery-a2eda9f80ab8_GH0.tar.gz) = db89a68fd723efd1f602eff467b2b65c86db584c9beadec1361cced3ee2ca843
-SIZE (kubernetes-apimachinery-a2eda9f80ab8_GH0.tar.gz) = 504018
-SHA256 (kubernetes-cli-runtime-74ad18325ed5_GH0.tar.gz) = f724fcc9bfbd6006b908f55ba0564d7e20866f15612c41328b6c292f94f61fc3
-SIZE (kubernetes-cli-runtime-74ad18325ed5_GH0.tar.gz) = 91268
-SHA256 (kubernetes-client-go-bec269661e48_GH0.tar.gz) = ab3f4cfe6e06e587a24984e4371718488439f30745045cb54277ba6808e6174f
-SIZE (kubernetes-client-go-bec269661e48_GH0.tar.gz) = 586268
+SHA256 (kubernetes-api-v0.17.2_GH0.tar.gz) = 5c25a9ae60e90978bfaaa2219030a9f36c5e0bd574c3e23d4673c0c1e3038eaf
+SIZE (kubernetes-api-v0.17.2_GH0.tar.gz) = 2406948
+SHA256 (kubernetes-apiextensions-apiserver-v0.17.2_GH0.tar.gz) = 70a2a8bfa4d7d81127b4a55e680e779bb75eabebcc3a4db36fa477422b9daf8c
+SIZE (kubernetes-apiextensions-apiserver-v0.17.2_GH0.tar.gz) = 388542
+SHA256 (kubernetes-apimachinery-v0.17.2_GH0.tar.gz) = 39904607220d027810f62ecc1ee9031f8b94f594ca90876504ffc9e448a1a9a9
+SIZE (kubernetes-apimachinery-v0.17.2_GH0.tar.gz) = 520581
+SHA256 (kubernetes-cli-runtime-v0.17.2_GH0.tar.gz) = 62cd599d0f085351b6c7a514de744f25ca4d3c84c364db02e3a697cf848a342a
+SIZE (kubernetes-cli-runtime-v0.17.2_GH0.tar.gz) = 102781
+SHA256 (kubernetes-client-go-v0.17.2_GH0.tar.gz) = a69ee78eaadab5f45c2afaabd533ef6a509e724ed0130138588a16dc898fc855
+SIZE (kubernetes-client-go-v0.17.2_GH0.tar.gz) = 599146
+SHA256 (kubernetes-component-base-v0.17.2_GH0.tar.gz) = e5e74c1a3eb5b6b076fcc8f4299075e7e894963e8c13832222a15092bcd89b77
+SIZE (kubernetes-component-base-v0.17.2_GH0.tar.gz) = 68960
 SHA256 (kubernetes-klog-v1.0.0_GH0.tar.gz) = eb84fc7a8051175f2da4a428360ce70703c8ccdd0e987fddc2f9d5c8fd97cd00
 SIZE (kubernetes-klog-v1.0.0_GH0.tar.gz) = 32366
-SHA256 (kubernetes-kube-openapi-0270cf2f1c1d_GH0.tar.gz) = 27673f765e7651c27be25978eb0893af6f974a770962c15000603f8679a3d3fc
-SIZE (kubernetes-kube-openapi-0270cf2f1c1d_GH0.tar.gz) = 739432
-SHA256 (kubernetes-kubectl-2ed914427d51_GH0.tar.gz) = ef4a6cf88c7441625cb6621ecd07dd28a766b07d14e278fa562fef269c028e18
-SIZE (kubernetes-kubectl-2ed914427d51_GH0.tar.gz) = 2760907
-SHA256 (kubernetes-utils-8d271d903fe4_GH0.tar.gz) = 6a12d48660f6530e808da9e1bed6fdc3db3b1d4dc5c88ce35f55209e87d30499
-SIZE (kubernetes-utils-8d271d903fe4_GH0.tar.gz) = 52036
+SHA256 (kubernetes-kube-openapi-30be4d16710a_GH0.tar.gz) = f006f56aac17223e5160703533073b522410f328ead651cefb1f545883a0e0e6
+SIZE (kubernetes-kube-openapi-30be4d16710a_GH0.tar.gz) = 739612
+SHA256 (kubernetes-kubectl-v0.17.2_GH0.tar.gz) = 10d188a46e845b36e0455fcbca0d713090534c65c13d1de43b2d94b8992656eb
+SIZE (kubernetes-kubectl-v0.17.2_GH0.tar.gz) = 2797070
+SHA256 (kubernetes-utils-e782cd3c129f_GH0.tar.gz) = 2e601eb7fe013498c4f91d368972cc7d3d37056a540e405a9735d3d90d15235e
+SIZE (kubernetes-utils-e782cd3c129f_GH0.tar.gz) = 78518
+SHA256 (liggitt-tabwriter-89fcab3d43de_GH0.tar.gz) = 598efa60759ed9bac4c65fbf396288cccd11f68e85a05aed1fef015bb6a23bcc
+SIZE (liggitt-tabwriter-89fcab3d43de_GH0.tar.gz) = 12279
 SHA256 (mailru-easyjson-v0.7.0_GH0.tar.gz) = 20e8ea95e5bd594b386c6edb5c57080929f6270018b9d29e4c86f6723ca50df7
 SIZE (mailru-easyjson-v0.7.0_GH0.tar.gz) = 72804
-SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe
-SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827
-SHA256 (mattn-go-shellwords-v1.0.5_GH0.tar.gz) = 58b3312528c83d57fca0b56f19a2af48de36403e450ac0339e961efdab17482f
-SIZE (mattn-go-shellwords-v1.0.5_GH0.tar.gz) = 4261
+SHA256 (mattn-go-colorable-v0.0.9_GH0.tar.gz) = 703db7bd13f84446bb06a7f075cf6b21d65b828cd6831dc9069e28b564bdfb87
+SIZE (mattn-go-colorable-v0.0.9_GH0.tar.gz) = 7593
+SHA256 (mattn-go-isatty-v0.0.4_GH0.tar.gz) = a6228abe42ccfcad4b17c176117ccf2822d06bde51dc437852854056d8737f12
+SIZE (mattn-go-isatty-v0.0.4_GH0.tar.gz) = 3377
+SHA256 (mattn-go-runewidth-v0.0.2_GH0.tar.gz) = 6c7734401fdf829af4f35a5af21a54548f7d3a68336940fb550178ddfe95b076
+SIZE (mattn-go-runewidth-v0.0.2_GH0.tar.gz) = 22367
+SHA256 (mattn-go-shellwords-v1.0.9_GH0.tar.gz) = 44e952c3d221b255705aa8da26a672b988dcfb813717c9056505cab2955f3729
+SIZE (mattn-go-shellwords-v1.0.9_GH0.tar.gz) = 5335
 SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
 SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
-SHA256 (miekg-dns-0d29b283ac0f_GH0.tar.gz) = 91732ed762d58f41f886110ef65e1b9eed55329fd5fd69a3e65614e71b5c8533
-SIZE (miekg-dns-0d29b283ac0f_GH0.tar.gz) = 1316487
 SHA256 (mitchellh-copystructure-v1.0.0_GH0.tar.gz) = 0e04d8fe1065459ab234507b9a4b7164b05eda970fee6ffdf0219423c357fda8
 SIZE (mitchellh-copystructure-v1.0.0_GH0.tar.gz) = 8903
 SHA256 (mitchellh-go-wordwrap-v1.0.0_GH0.tar.gz) = 9bcf5c1f8b66594c73f606502bb3d9713d862a71ea66d8641e2a0b7bb66cb252
 SIZE (mitchellh-go-wordwrap-v1.0.0_GH0.tar.gz) = 2777
 SHA256 (mitchellh-reflectwalk-v1.0.0_GH0.tar.gz) = bd22df35225e4bfcecafb35ac4869911fafc356f5dadcfb141cd0caededc87c3
 SIZE (mitchellh-reflectwalk-v1.0.0_GH0.tar.gz) = 6143
-SHA256 (moby-moby-38ab9da00309_GH0.tar.gz) = 72017f213a4246cf2c5d98f94978492cacef41f18a90f547b220c17228474f20
-SIZE (moby-moby-38ab9da00309_GH0.tar.gz) = 9476575
 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 (morikuni-aec-39771216ff4c_GH0.tar.gz) = 832234603a60c998c97956aa3e7c2b6aabec107775ddd1646ac1f6c8648c4ed6
-SIZE (morikuni-aec-39771216ff4c_GH0.tar.gz) = 55424
+SHA256 (morikuni-aec-v1.0.0_GH0.tar.gz) = 560235880d23e531fcbf59ab768bdb213ea54d0169452a61ec54187dca393d77
+SIZE (morikuni-aec-v1.0.0_GH0.tar.gz) = 55416
 SHA256 (opencontainers-go-digest-v1.0.0-rc1_GH0.tar.gz) = 3f511b32c46f60482644f0ad6a345f52e672c82164bfb08274f15f7c14cd3076
 SIZE (opencontainers-go-digest-v1.0.0-rc1_GH0.tar.gz) = 19206
 SHA256 (opencontainers-image-spec-v1.0.1_GH0.tar.gz) = c7ca467de2cca65e7ea74414a3f51e91450156213af485830dcdfff0571e10d2
@@ -211,16 +215,16 @@ SHA256 (opencontainers-runc-v0.1.1_GH0.tar.gz) = e59694701625218b26b40a8ab2401ef
 SIZE (opencontainers-runc-v0.1.1_GH0.tar.gz) = 496426
 SHA256 (peterbourgon-diskv-v2.0.1_GH0.tar.gz) = e3b15d57dfe5b4aacf506d256c595b95523c51756459aae04579d35c85bad184
 SIZE (peterbourgon-diskv-v2.0.1_GH0.tar.gz) = 16077
-SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
-SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
+SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
+SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
 SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (prometheus-client_golang-v1.2.1_GH0.tar.gz) = fe6a626322d22d8ce9780320fd04a64a90c9a7aa62ec88809651072b30a10e6a
-SIZE (prometheus-client_golang-v1.2.1_GH0.tar.gz) = 142465
+SHA256 (prometheus-client_golang-v1.0.0_GH0.tar.gz) = afee7b61a77342cc24ea55e284d08688267efca1843e529a51799fe52c5ee662
+SIZE (prometheus-client_golang-v1.0.0_GH0.tar.gz) = 138046
 SHA256 (prometheus-client_model-14fe0d1b01d4_GH0.tar.gz) = e86922566dae5bd684e2b77baabfaee9df34ce11cd7c8bae688b512b3a496f03
 SIZE (prometheus-client_model-14fe0d1b01d4_GH0.tar.gz) = 57495
-SHA256 (prometheus-common-v0.7.0_GH0.tar.gz) = 71b1dce2afd959f9fcab3b5e097dfa9d398a61749851d290114746a3f8f119ae
-SIZE (prometheus-common-v0.7.0_GH0.tar.gz) = 100520
+SHA256 (prometheus-common-v0.4.1_GH0.tar.gz) = 99229ef4b100e55d1e6496995f1a1af6813426b8820521bc041340eb077985b9
+SIZE (prometheus-common-v0.4.1_GH0.tar.gz) = 98631
 SHA256 (prometheus-procfs-v0.0.5_GH0.tar.gz) = 0a28cd42f6c727ccd48878f7506f0a9c87b72e7dba122f8c6884aba3aab7c800
 SIZE (prometheus-procfs-v0.0.5_GH0.tar.gz) = 112152
 SHA256 (russross-blackfriday-v1.5.2_GH0.tar.gz) = 626138a08abb8579474a555e9d45cb5260629a2c07e8834428620a650dc9f195
@@ -233,8 +237,6 @@ SHA256 (spf13-cobra-v0.0.5_GH0.tar.gz) = 79226ce00e2b91306277e679d024eea6d17d0c0
 SIZE (spf13-cobra-v0.0.5_GH0.tar.gz) = 111126
 SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
 SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
-SHA256 (square-go-jose-v1.1.2_GH0.tar.gz) = 1efa46e3763e038f9c2ad30dcbbbc8ce0abadfab30efe72abba49ac8d03a61fe
-SIZE (square-go-jose-v1.1.2_GH0.tar.gz) = 258878
 SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698
 SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085
 SHA256 (xeipuuv-gojsonpointer-4e3ac2762d5f_GH0.tar.gz) = ad625b72ad9cbc347ca9d07af1e9dbe49feeb5688a70a015f2153a67e27328a0
@@ -243,12 +245,10 @@ SHA256 (xeipuuv-gojsonreference-bd5ef7bd5415_GH0.tar.gz) = f99765bc8692e620f8abc
 SIZE (xeipuuv-gojsonreference-bd5ef7bd5415_GH0.tar.gz) = 6958
 SHA256 (xeipuuv-gojsonschema-v1.1.0_GH0.tar.gz) = 4fa629186e89d3ec76a8e6ee531b1a5c64a688e0c5b82e5da86dc05c94b42581
 SIZE (xeipuuv-gojsonschema-v1.1.0_GH0.tar.gz) = 70883
-SHA256 (xenolf-lego-a9d8cec0e656_GH0.tar.gz) = 48e491916d5299a0a5a98290e2b954f90a3b25db0a52dc62284c4eca1b7c993e
-SIZE (xenolf-lego-a9d8cec0e656_GH0.tar.gz) = 60152
-SHA256 (yvasiyarov-go-metrics-c25f46c4b940_GH0.tar.gz) = f452669bba66cede76763bb7dd720968743c9206b3fd171823c4db7c5fa708e0
-SIZE (yvasiyarov-go-metrics-c25f46c4b940_GH0.tar.gz) = 30706
-SHA256 (yvasiyarov-gorelic-v0.0.6_GH0.tar.gz) = afbf6b41a3d1722a2f2e2f11d35ea5bba23f88e6eb14860b9dc8a7b21cad70a8
-SIZE (yvasiyarov-gorelic-v0.0.6_GH0.tar.gz) = 8045
+SHA256 (yvasiyarov-go-metrics-57bccd1ccd43_GH0.tar.gz) = e3957d5684a51ae7b91462d8bbb279aaa5cb66f3fdd63eb524bea5bf67c244ad
+SIZE (yvasiyarov-go-metrics-57bccd1ccd43_GH0.tar.gz) = 30677
+SHA256 (yvasiyarov-gorelic-a9bba5b9ab50_GH0.tar.gz) = 6581f0bb89a64ffea0c348f39661c2e747be363687d7743ce46fd38192eaf47e
+SIZE (yvasiyarov-gorelic-a9bba5b9ab50_GH0.tar.gz) = 8243
 SHA256 (yvasiyarov-newrelic_platform_go-b21fdbd4370f_GH0.tar.gz) = e220f805098db72967f79acb660cde2ab594a233a0cfedd912e92917fdca7500
 SIZE (yvasiyarov-newrelic_platform_go-b21fdbd4370f_GH0.tar.gz) = 4633
 SHA256 (kubernetes-sigs-kustomize-v2.0.3_GH0.tar.gz) = 7619cf777a23cc9d10164f76249a628624cba798ef3461e3f31ae66a0e9b420f
diff --git a/sysutils/istio/Makefile b/sysutils/istio/Makefile
index 0ba56567598..286c268e21c 100644
--- a/sysutils/istio/Makefile
+++ b/sysutils/istio/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	istio
-PORTVERSION=	1.4.3
+PORTVERSION=	1.4.4
 CATEGORIES=	sysutils
 
 MAINTAINER=	danilo@FreeBSD.org
diff --git a/sysutils/istio/distinfo b/sysutils/istio/distinfo
index b62febe31a6..a994436fcf5 100644
--- a/sysutils/istio/distinfo
+++ b/sysutils/istio/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1580048409
-SHA256 (istio-istio-1.4.3_GH0.tar.gz) = 05e4b2637d36839a66678560c2ca26354512e1a56ae4588cb78fbba792841d96
-SIZE (istio-istio-1.4.3_GH0.tar.gz) = 10420194
+TIMESTAMP = 1581875243
+SHA256 (istio-istio-1.4.4_GH0.tar.gz) = 959f79801ea20460569197f0cf38889e27e75a7f9942cfcb5a6ae28c00072988
+SIZE (istio-istio-1.4.4_GH0.tar.gz) = 10419746
 SHA256 (Azure-go-autorest-v12.0.0_GH0.tar.gz) = d4284f272872790710150ccab2831c93156b76ef142a2c1a672777fc9b7f703e
 SIZE (Azure-go-autorest-v12.0.0_GH0.tar.gz) = 134572
 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
diff --git a/sysutils/kubectl/Makefile b/sysutils/kubectl/Makefile
index 7a6e409155e..2ec285e47c3 100644
--- a/sysutils/kubectl/Makefile
+++ b/sysutils/kubectl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	kubectl
-PORTVERSION=	1.17.2
+PORTVERSION=	1.17.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
diff --git a/sysutils/kubectl/distinfo b/sysutils/kubectl/distinfo
index 5cf5337b9c7..e8238cf1796 100644
--- a/sysutils/kubectl/distinfo
+++ b/sysutils/kubectl/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1580038990
-SHA256 (kubernetes-kubernetes-v1.17.2_GH0.tar.gz) = 90a9e05995e55bf1ca4febf3801a2db177e4f5eb57663a00459619fce3b71676
-SIZE (kubernetes-kubernetes-v1.17.2_GH0.tar.gz) = 31753827
+TIMESTAMP = 1581871427
+SHA256 (kubernetes-kubernetes-v1.17.3_GH0.tar.gz) = e28c1aaac0bc155ffb6ea7fba7ef1e156c56f81664d60f5eccb1148a714c91a9
+SIZE (kubernetes-kubernetes-v1.17.3_GH0.tar.gz) = 31762013
 SHA256 (golang-sys-9fbb57f87de9_GH0.tar.gz) = 2f944b1fa3e7c040dc10ab2288ac7309d2ccab383337a4d9f77556e50589cb7c
 SIZE (golang-sys-9fbb57f87de9_GH0.tar.gz) = 1535108
diff --git a/textproc/Makefile b/textproc/Makefile
index 5a4cb560f54..fbae2efe3fb 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1473,7 +1473,6 @@
     SUBDIR += rubygem-asciidoctor-diagram
     SUBDIR += rubygem-asciidoctor-include-ext
     SUBDIR += rubygem-asciidoctor-plantuml
-    SUBDIR += rubygem-asciidoctor-plantuml009
     SUBDIR += rubygem-autoprefixer-rails
     SUBDIR += rubygem-babel-source
     SUBDIR += rubygem-babel-transpiler
@@ -1503,21 +1502,16 @@
     SUBDIR += rubygem-docdiff
     SUBDIR += rubygem-elasticsearch
     SUBDIR += rubygem-elasticsearch-api
-    SUBDIR += rubygem-elasticsearch-api503
     SUBDIR += rubygem-elasticsearch-api6
     SUBDIR += rubygem-elasticsearch-dsl
     SUBDIR += rubygem-elasticsearch-model
-    SUBDIR += rubygem-elasticsearch-model019
     SUBDIR += rubygem-elasticsearch-model6
     SUBDIR += rubygem-elasticsearch-persistence
     SUBDIR += rubygem-elasticsearch-rails
-    SUBDIR += rubygem-elasticsearch-rails019
     SUBDIR += rubygem-elasticsearch-rails6
     SUBDIR += rubygem-elasticsearch-transport
-    SUBDIR += rubygem-elasticsearch-transport503
     SUBDIR += rubygem-elasticsearch-transport6
     SUBDIR += rubygem-elasticsearch-xpack
-    SUBDIR += rubygem-elasticsearch503
     SUBDIR += rubygem-elasticsearch6
     SUBDIR += rubygem-emot
     SUBDIR += rubygem-escape_utils
diff --git a/textproc/apertium/Makefile b/textproc/apertium/Makefile
index 7aadd1b75a6..da50f669891 100644
--- a/textproc/apertium/Makefile
+++ b/textproc/apertium/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	apertium
-PORTVERSION=	3.4.2
+PORTVERSION=	3.6.1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Toolbox to build shallow-transfer machine translation systems
@@ -19,13 +19,23 @@ LIB_DEPENDS=	liblttoolbox3.so:textproc/lttoolbox \
 		libpcre.so:devel/pcre
 RUN_DEPENDS=	bash:shells/bash
 
-USES=		autoreconf compiler:c++11-lang gnome libtool localbase:ldflags \
-		pathfix pkgconfig
+USES=		autoreconf gmake gnome libtool localbase:ldflags pathfix pkgconfig python shebangfix
+USE_GITHUB=	yes
 USE_GNOME=	libxml2 libxslt
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+
+GH_ACCOUNT=	unhammer:contrib
+GH_PROJECT=	apertium-get:contrib
+GH_TAGNAME=	2ed405e:contrib
+GH_SUBDIR=	apertium/apertium-get:contrib
+
+GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
+SHEBANG_FILES=	scripts/apertium-genvldix scripts/apertium-translate-to-default-equivalent.in \
+		scripts/apertium-metalrx scripts/apertium-genvdix apertium/apertium-get/apertium-get \
+		scripts/apertium-filter-dix.in scripts/apertium-filter-rules.in \
+		scripts/apertium-metalrx-to-lrx.in scripts/apertium-genvrdix
 
 PLIST_SUB=	APVER="${PORTVERSION:R}"
 
diff --git a/textproc/apertium/distinfo b/textproc/apertium/distinfo
index 1e7432c1e71..3dcc8be4a5e 100644
--- a/textproc/apertium/distinfo
+++ b/textproc/apertium/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1506010925
-SHA256 (apertium-3.4.2.tar.gz) = 67b787c342cbd44d4bcafffdb5da3db265d4ce07003be21e73821c44102d7dd5
-SIZE (apertium-3.4.2.tar.gz) = 1079545
+TIMESTAMP = 1581616844
+SHA256 (apertium-apertium-v3.6.1_GH0.tar.gz) = 45150740fda3d37808233776f13328279a76dd7874be69b8aeb396afd20581bf
+SIZE (apertium-apertium-v3.6.1_GH0.tar.gz) = 395894
+SHA256 (unhammer-apertium-get-2ed405e_GH0.tar.gz) = e7df732a23ea76a3ecad708d40840599ea77932cb3a1767535aab8f0563162a3
+SIZE (unhammer-apertium-get-2ed405e_GH0.tar.gz) = 18799
diff --git a/textproc/apertium/pkg-plist b/textproc/apertium/pkg-plist
index a2e6ba6292b..30eb48617c0 100644
--- a/textproc/apertium/pkg-plist
+++ b/textproc/apertium/pkg-plist
@@ -1,5 +1,7 @@
 bin/apertium
+bin/apertium-cleanstream
 bin/apertium-deshtml
+bin/apertium-deshtml-alt
 bin/apertium-deslatex
 bin/apertium-desmediawiki
 bin/apertium-desodt
@@ -10,11 +12,20 @@ bin/apertium-deswxml
 bin/apertium-desxlsx
 bin/apertium-desxpresstag
 bin/apertium-filter-ambiguity
+bin/apertium-filter-dix
+bin/apertium-filter-rules
 bin/apertium-gen-deformat
 bin/apertium-gen-modes
 bin/apertium-gen-reformat
+bin/apertium-genvdix
+bin/apertium-genvldix
+bin/apertium-genvrdix
+bin/apertium-get
 bin/apertium-interchunk
+bin/apertium-metalrx
+bin/apertium-metalrx-to-lrx
 bin/apertium-multiple-translations
+bin/apertium-perceptron-trace
 bin/apertium-prelatex
 bin/apertium-postchunk
 bin/apertium-postlatex
@@ -37,6 +48,7 @@ bin/apertium-tagger-apply-new-rules
 bin/apertium-tagger-readwords
 bin/apertium-tmxbuild
 bin/apertium-transfer
+bin/apertium-translate-to-default-equivalent
 bin/apertium-unformat
 bin/apertium-utils-fixlatex
 bin/apertium-validate-acx
@@ -50,7 +62,6 @@ include/apertium-%%APVER%%/apertium/a.h
 include/apertium-%%APVER%%/apertium/align.h
 include/apertium-%%APVER%%/apertium/analysis.h
 include/apertium-%%APVER%%/apertium/apertium_re.h
-include/apertium-%%APVER%%/apertium/apertium_tagger.h
 include/apertium-%%APVER%%/apertium/basic_5_3_1_tagger.h
 include/apertium-%%APVER%%/apertium/basic_5_3_2_tagger.h
 include/apertium-%%APVER%%/apertium/basic_5_3_3_tagger.h
@@ -73,14 +84,24 @@ include/apertium-%%APVER%%/apertium/optional.h
 include/apertium-%%APVER%%/apertium/collection.h
 include/apertium-%%APVER%%/apertium/constant_manager.h
 include/apertium-%%APVER%%/apertium/endian_double_util.h
+include/apertium-%%APVER%%/apertium/feature_vec.h
+include/apertium-%%APVER%%/apertium/feature_vec_averager.h
+include/apertium-%%APVER%%/apertium/file_morpho_stream.h
+include/apertium-%%APVER%%/apertium/getopt_long.h
 include/apertium-%%APVER%%/apertium/hmm.h
 include/apertium-%%APVER%%/apertium/interchunk.h
 include/apertium-%%APVER%%/apertium/interchunk_word.h
 include/apertium-%%APVER%%/apertium/latex_accentsmap.h
 include/apertium-%%APVER%%/apertium/lswpost.h
 include/apertium-%%APVER%%/apertium/morpho_stream.h
+include/apertium-%%APVER%%/apertium/mtx_reader.h
+include/apertium-%%APVER%%/apertium/perceptron_spec.h
+include/apertium-%%APVER%%/apertium/perceptron_tagger.h
 include/apertium-%%APVER%%/apertium/postchunk.h
+include/apertium-%%APVER%%/apertium/pretransfer.h
+include/apertium-%%APVER%%/apertium/sentence_stream.h
 include/apertium-%%APVER%%/apertium/serialiser.h
+include/apertium-%%APVER%%/apertium/shell_utils.h
 include/apertium-%%APVER%%/apertium/stream.h
 include/apertium-%%APVER%%/apertium/stream_5_3_1_tagger.h
 include/apertium-%%APVER%%/apertium/stream_5_3_1_tagger_trainer.h
@@ -88,12 +109,17 @@ include/apertium-%%APVER%%/apertium/stream_5_3_2_tagger.h
 include/apertium-%%APVER%%/apertium/stream_5_3_2_tagger_trainer.h
 include/apertium-%%APVER%%/apertium/stream_5_3_3_tagger.h
 include/apertium-%%APVER%%/apertium/stream_5_3_3_tagger_trainer.h
+include/apertium-%%APVER%%/apertium/stream_tagger.h
+include/apertium-%%APVER%%/apertium/stream_tagger_trainer.h
+include/apertium-%%APVER%%/apertium/string_to_wostream.h
 include/apertium-%%APVER%%/apertium/streamed_type.h
 include/apertium-%%APVER%%/apertium/string_utils.h
 include/apertium-%%APVER%%/apertium/tag.h
+include/apertium-%%APVER%%/apertium/tagger.h
 include/apertium-%%APVER%%/apertium/tagger_data.h
 include/apertium-%%APVER%%/apertium/tagger_data_hmm.h
 include/apertium-%%APVER%%/apertium/tagger_data_lsw.h
+include/apertium-%%APVER%%/apertium/tagger_data_percep_coarse_tags.h
 include/apertium-%%APVER%%/apertium/tagger_utils.h
 include/apertium-%%APVER%%/apertium/tagger_word.h
 include/apertium-%%APVER%%/apertium/tmx_align_parameters.h
@@ -122,14 +148,17 @@ include/apertium-%%APVER%%/apertium/tsx_reader.h
 include/apertium-%%APVER%%/apertium/ttag.h
 include/apertium-%%APVER%%/apertium/unlocked_cstdio.h
 include/apertium-%%APVER%%/apertium/utf_converter.h
+include/apertium-%%APVER%%/apertium/utils.h
 include/apertium-%%APVER%%/apertium/wchar_t_exception.h
 include/apertium-%%APVER%%/apertium/wchar_t_exception_type.h
-lib/libapertium3-%%APVER%%.so.0
-lib/libapertium3-%%APVER%%.so.0.0.0
+include/apertium-%%APVER%%/apertium/xml_reader.h
+lib/libapertium3-%%APVER%%.so.1
+lib/libapertium3-%%APVER%%.so.1.0.0
 lib/libapertium3.a
 lib/libapertium3.so
 libdata/pkgconfig/apertium.pc
 man/man1/apertium-deshtml.1.gz
+man/man1/apertium-deshtml-alt.1.gz
 man/man1/apertium-deslatex.1.gz
 man/man1/apertium-desmediawiki.1.gz
 man/man1/apertium-desodt.1.gz
@@ -175,12 +204,15 @@ man/man1/apertium.1.gz
 share/aclocal/apertium.m4
 %%DATADIR%%/apertium-createmodes.awk
 %%DATADIR%%/deformat.xsl
+%%DATADIR%%/filter-dix.xslt
+%%DATADIR%%/filter-rules.xslt
 %%DATADIR%%/format.dtd
 %%DATADIR%%/format.rnc
 %%DATADIR%%/interchunk.dtd
 %%DATADIR%%/interchunk.rnc
 %%DATADIR%%/lexchoice.xsl
 %%DATADIR%%/lexchoicebil.xsl
+%%DATADIR%%/metalrx-to-lrx.xslt
 %%DATADIR%%/modes.dtd
 %%DATADIR%%/modes.rnc
 %%DATADIR%%/modes/README
@@ -188,9 +220,10 @@ share/aclocal/apertium.m4
 %%DATADIR%%/modes2debugmodes.xsl
 %%DATADIR%%/new2old.xsl
 %%DATADIR%%/postchunk.dtd
+%%DATADIR%%/postchunk.rnc
 %%DATADIR%%/reformat.xsl
 %%DATADIR%%/tagger.dtd
 %%DATADIR%%/tagger.rnc
 %%DATADIR%%/transfer.dtd
 %%DATADIR%%/transfer.rnc
-%%DATADIR%%/postchunk.rnc
+%%DATADIR%%/translate-to-default-equivalent.xslt
diff --git a/textproc/ibus-table/Makefile b/textproc/ibus-table/Makefile
index 346d2e8d544..b3e5c5d9509 100644
--- a/textproc/ibus-table/Makefile
+++ b/textproc/ibus-table/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ibus-table
-DISTVERSION=	1.9.24
-PORTREVISION=	1
+DISTVERSION=	1.9.25
 CATEGORIES=	textproc
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/ibus-table/distinfo b/textproc/ibus-table/distinfo
index 12ad2e22edb..c81024bea0a 100644
--- a/textproc/ibus-table/distinfo
+++ b/textproc/ibus-table/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579851172
-SHA256 (kaio-ibus-table-1.9.24_GH0.tar.gz) = 19da5b7bc4dfef702f3480688645ac7fecb249fe96f8cff60c6b21c2fdceab76
-SIZE (kaio-ibus-table-1.9.24_GH0.tar.gz) = 498939
+TIMESTAMP = 1581740332
+SHA256 (kaio-ibus-table-1.9.25_GH0.tar.gz) = 0ffa37785e05773183519c977ea1f0c7ee6e8616d145a2f407dce1252a3c30e6
+SIZE (kaio-ibus-table-1.9.25_GH0.tar.gz) = 499042
diff --git a/textproc/py-duecredit/Makefile b/textproc/py-duecredit/Makefile
index e10def47328..a1748258f20 100644
--- a/textproc/py-duecredit/Makefile
+++ b/textproc/py-duecredit/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	duecredit
-DISTVERSION=	0.7.0
-PORTREVISION=	1
+DISTVERSION=	0.8.0
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-duecredit/distinfo b/textproc/py-duecredit/distinfo
index 5dfc9dac0e8..67324b94b4a 100644
--- a/textproc/py-duecredit/distinfo
+++ b/textproc/py-duecredit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551510918
-SHA256 (duecredit-0.7.0.tar.gz) = 8a13be317afcf56bdccba6a5d3d82c2f4e3509ffa1aff47d61c1a91e6d454010
-SIZE (duecredit-0.7.0.tar.gz) = 66131
+TIMESTAMP = 1581740736
+SHA256 (duecredit-0.8.0.tar.gz) = a0c773f38af623f08010ca8ee151d594767b868f405308307479aa9b4e41adfb
+SIZE (duecredit-0.8.0.tar.gz) = 68211
diff --git a/textproc/rubygem-asciidoctor-plantuml009/Makefile b/textproc/rubygem-asciidoctor-plantuml009/Makefile
deleted file mode 100644
index fa210cca370..00000000000
--- a/textproc/rubygem-asciidoctor-plantuml009/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	asciidoctor-plantuml
-PORTVERSION=	0.0.9
-CATEGORIES=	textproc rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	009
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Asciidoctor PlantUML extension
-
-LICENSE=	MIT
-
-RUN_DEPENDS=	rubygem-asciidoctor>=1.5.6<3.0.0:textproc/rubygem-asciidoctor
-
-USES=		gem
-USE_RUBY=	yes
-
-NO_ARCH=	yes
-
-PORTSCOUT=	ignore:1
-
-.include <bsd.port.mk>
diff --git a/textproc/rubygem-asciidoctor-plantuml009/distinfo b/textproc/rubygem-asciidoctor-plantuml009/distinfo
deleted file mode 100644
index 2d27581fda4..00000000000
--- a/textproc/rubygem-asciidoctor-plantuml009/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1560957726
-SHA256 (rubygem/asciidoctor-plantuml-0.0.9.gem) = cb5268a1cc47571d2ab67eeac0461fb377b1937614bd4b2d077ce8c34d90fd53
-SIZE (rubygem/asciidoctor-plantuml-0.0.9.gem) = 7680
diff --git a/textproc/rubygem-asciidoctor-plantuml009/pkg-descr b/textproc/rubygem-asciidoctor-plantuml009/pkg-descr
deleted file mode 100644
index 30f17b3edf9..00000000000
--- a/textproc/rubygem-asciidoctor-plantuml009/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Asciidoctor PlantUml is an extension that enables you to add PlantUML diagrams
-to your AsciiDoc documents.
-
-WWW: https://github.com/hsanson/asciidoctor-plantuml
diff --git a/textproc/rubygem-elasticsearch-api503/Makefile b/textproc/rubygem-elasticsearch-api503/Makefile
deleted file mode 100644
index af86922c23a..00000000000
--- a/textproc/rubygem-elasticsearch-api503/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Created by: Ryan Steinmetz <zi@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	elasticsearch-api
-PORTVERSION=	5.0.3
-CATEGORIES=	textproc rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	503
-
-MAINTAINER=	mfechner@FreeBSD.org
-COMMENT=	Ruby API for Elasticsearch
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
-
-RUN_DEPENDS=	rubygem-multi_json>=0:devel/rubygem-multi_json
-
-USES=		gem
-USE_RUBY=	yes
-
-NO_ARCH=	yes
-
-PORTSCOUT=	limit:^5\.0\.3
-
-.include <bsd.port.mk>
diff --git a/textproc/rubygem-elasticsearch-api503/distinfo b/textproc/rubygem-elasticsearch-api503/distinfo
deleted file mode 100644
index 1e987e303bf..00000000000
--- a/textproc/rubygem-elasticsearch-api503/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1486593202
-SHA256 (rubygem/elasticsearch-api-5.0.3.gem) = bc9ab073a2610159f1ec92aca67db93a3c2236134f09caf42c34150c91085429
-SIZE (rubygem/elasticsearch-api-5.0.3.gem) = 86528
diff --git a/textproc/rubygem-elasticsearch-api503/pkg-descr b/textproc/rubygem-elasticsearch-api503/pkg-descr
deleted file mode 100644
index c845e16a151..00000000000
--- a/textproc/rubygem-elasticsearch-api503/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Ruby API for Elasticsearch.  See textproc/rubygem-elasticsearch for more
-details.
-
-WWW: https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-api
diff --git a/textproc/rubygem-elasticsearch-model019/Makefile b/textproc/rubygem-elasticsearch-model019/Makefile
deleted file mode 100644
index 22d4648f5d1..00000000000
--- a/textproc/rubygem-elasticsearch-model019/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	elasticsearch-model
-PORTVERSION=	0.1.9
-CATEGORIES=	textproc rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	019
-
-MAINTAINER=	mfechner@FreeBSD.org
-COMMENT=	ActiveModel/Record integrations for Elasticsearch
-
-LICENSE=	APACHE20
-
-RUN_DEPENDS=	rubygem-activesupport52>=3:devel/rubygem-activesupport52 \
-		rubygem-elasticsearch503>=0.4:textproc/rubygem-elasticsearch503 \
-		rubygem-hashie>=0:devel/rubygem-hashie
-
-USES=		gem
-USE_RUBY=	yes
-
-NO_ARCH=	yes
-
-PORTSCOUT=	limit:^0\.1\.9
-
-.include <bsd.port.mk>
diff --git a/textproc/rubygem-elasticsearch-model019/distinfo b/textproc/rubygem-elasticsearch-model019/distinfo
deleted file mode 100644
index 8617ddf8571..00000000000
--- a/textproc/rubygem-elasticsearch-model019/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1569874678
-SHA256 (rubygem/elasticsearch-model-0.1.9.gem) = eefbaa5104b56d9e1167d48dd290798abf8b1fd15d41074c474fa4d07ad36b82
-SIZE (rubygem/elasticsearch-model-0.1.9.gem) = 54784
diff --git a/textproc/rubygem-elasticsearch-model019/pkg-descr b/textproc/rubygem-elasticsearch-model019/pkg-descr
deleted file mode 100644
index f2ae07277a5..00000000000
--- a/textproc/rubygem-elasticsearch-model019/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-The Elasticsearch::Model library builds on top of the elasticsearch library.
-
-It aims to simplify integration of Ruby classes ("models"), commonly found e.g.
-in Ruby on Rails applications, with the Elasticsearch search and analytics
-engine.
-
-WWW: https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-model
diff --git a/textproc/rubygem-elasticsearch-rails019/Makefile b/textproc/rubygem-elasticsearch-rails019/Makefile
deleted file mode 100644
index 50c2c44e005..00000000000
--- a/textproc/rubygem-elasticsearch-rails019/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	elasticsearch-rails
-PORTVERSION=	0.1.9
-CATEGORIES=	textproc rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	019
-
-MAINTAINER=	mfechner@FreeBSD.org
-COMMENT=	Ruby on Rails integrations for Elasticsearch
-
-LICENSE=	APACHE20
-
-USES=		gem
-USE_RUBY=	yes
-
-NO_ARCH=	yes
-
-PORTSCOUT=	limit:^0\.1\.9
-
-.include <bsd.port.mk>
diff --git a/textproc/rubygem-elasticsearch-rails019/distinfo b/textproc/rubygem-elasticsearch-rails019/distinfo
deleted file mode 100644
index 7db9e0ae617..00000000000
--- a/textproc/rubygem-elasticsearch-rails019/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1569875040
-SHA256 (rubygem/elasticsearch-rails-0.1.9.gem) = 5f70aaa825892ec85ab4ef650bc17b3e566a26d2a3f223809fd3d0c19aa83020
-SIZE (rubygem/elasticsearch-rails-0.1.9.gem) = 4258304
diff --git a/textproc/rubygem-elasticsearch-rails019/pkg-descr b/textproc/rubygem-elasticsearch-rails019/pkg-descr
deleted file mode 100644
index 34db6feb78d..00000000000
--- a/textproc/rubygem-elasticsearch-rails019/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-The Elasticsearch::Rails library is a companion for the the elasticsearch-model
-library, providing features suitable for Ruby on Rails applications.
-
-WWW: https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-rails
diff --git a/textproc/rubygem-elasticsearch-transport503/Makefile b/textproc/rubygem-elasticsearch-transport503/Makefile
deleted file mode 100644
index 9cf1fba2c2e..00000000000
--- a/textproc/rubygem-elasticsearch-transport503/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: Ryan Steinmetz <zi@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	elasticsearch-transport
-PORTVERSION=	5.0.3
-CATEGORIES=	textproc rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	503
-
-MAINTAINER=	mfechner@FreeBSD.org
-COMMENT=	Ruby client for Elasticsearch
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
-
-RUN_DEPENDS=	rubygem-faraday>=0:www/rubygem-faraday \
-		rubygem-multi_json>=0:devel/rubygem-multi_json
-
-USES=		gem
-USE_RUBY=	yes
-
-NO_ARCH=	yes
-
-.include <bsd.port.mk>
diff --git a/textproc/rubygem-elasticsearch-transport503/distinfo b/textproc/rubygem-elasticsearch-transport503/distinfo
deleted file mode 100644
index aa42b86ad40..00000000000
--- a/textproc/rubygem-elasticsearch-transport503/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1486593243
-SHA256 (rubygem/elasticsearch-transport-5.0.3.gem) = 4628cb791ed315d5e7540ab2919d94571435657cf5890655e0b84905ce54eea8
-SIZE (rubygem/elasticsearch-transport-5.0.3.gem) = 37376
diff --git a/textproc/rubygem-elasticsearch-transport503/pkg-descr b/textproc/rubygem-elasticsearch-transport503/pkg-descr
deleted file mode 100644
index dd950d49531..00000000000
--- a/textproc/rubygem-elasticsearch-transport503/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Ruby client for Elasticsearch.  See textproc/rubygem-elasticsearch for more
-details.
-
-WWW: https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-transport
diff --git a/textproc/rubygem-elasticsearch503/Makefile b/textproc/rubygem-elasticsearch503/Makefile
deleted file mode 100644
index 78063998816..00000000000
--- a/textproc/rubygem-elasticsearch503/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Created by: Ryan Steinmetz <zi@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	elasticsearch
-PORTVERSION=	5.0.3
-CATEGORIES=	textproc rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	503
-
-MAINTAINER=	ruby@FreeBSD.org
-COMMENT=	Ruby integrations for Elasticsearch
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
-
-RUN_DEPENDS=	rubygem-elasticsearch-api503=${PORTVERSION}:textproc/rubygem-elasticsearch-api503 \
-		rubygem-elasticsearch-transport503=${PORTVERSION}:textproc/rubygem-elasticsearch-transport503
-
-USES=		gem
-USE_RUBY=	yes
-
-NO_ARCH=	yes
-
-PORTSCOUT=	limit:^5\.0\.3
-
-.include <bsd.port.mk>
diff --git a/textproc/rubygem-elasticsearch503/distinfo b/textproc/rubygem-elasticsearch503/distinfo
deleted file mode 100644
index 49ae7e5106b..00000000000
--- a/textproc/rubygem-elasticsearch503/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1486593278
-SHA256 (rubygem/elasticsearch-5.0.3.gem) = 443d424d6b3a3b5cad5e3bb3a95fa83ab80becf39944de83ff4844dfb325333a
-SIZE (rubygem/elasticsearch-5.0.3.gem) = 8704
diff --git a/textproc/rubygem-elasticsearch503/pkg-descr b/textproc/rubygem-elasticsearch503/pkg-descr
deleted file mode 100644
index 1c2cf3ad605..00000000000
--- a/textproc/rubygem-elasticsearch503/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Ruby integrations for Elasticsearch that feature:
-
-* a client for connecting to an Elasticsearch cluster
-* a Ruby API for the Elasticsearch's REST API
-* various extensions and utilities
-
-WWW: https://github.com/elastic/elasticsearch-ruby
diff --git a/www/Makefile b/www/Makefile
index 49859107ec9..12db37fd201 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1466,6 +1466,7 @@
     SUBDIR += py-dj22-djangoql
     SUBDIR += py-dj22-djangorestframework
     SUBDIR += py-dj22-drf-yasg
+    SUBDIR += py-dj22-jsonfield
     SUBDIR += py-dj22-jsonfield2
     SUBDIR += py-dj22-swapper
     SUBDIR += py-django
diff --git a/www/R-cran-RgoogleMaps/Makefile b/www/R-cran-RgoogleMaps/Makefile
index 04769374876..a7c5bf1a89f 100644
--- a/www/R-cran-RgoogleMaps/Makefile
+++ b/www/R-cran-RgoogleMaps/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	RgoogleMaps
-PORTVERSION=	1.4.5.2
+PORTVERSION=	1.4.5.3
 CATEGORIES=	www
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
@@ -11,7 +11,8 @@ COMMENT=	Overlays on Google map tiles in R
 
 LICENSE=	GPLv2+
 
-CRAN_DEPENDS=	R-cran-png>0:graphics/R-cran-png
+CRAN_DEPENDS=	R-cran-png>0:graphics/R-cran-png \
+		R-cran-sp>0:math/R-cran-sp
 RUN_DEPENDS=	${CRAN_DEPENDS}
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 
diff --git a/www/R-cran-RgoogleMaps/distinfo b/www/R-cran-RgoogleMaps/distinfo
index f05c225d50a..b5cb4d890c1 100644
--- a/www/R-cran-RgoogleMaps/distinfo
+++ b/www/R-cran-RgoogleMaps/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580249147
-SHA256 (RgoogleMaps_1.4.5.2.tar.gz) = 476f7d6826ec6ed69c7a05055f8da9b26732893b58cc6bbd79d5f45fbb8d4df8
-SIZE (RgoogleMaps_1.4.5.2.tar.gz) = 345296
+TIMESTAMP = 1581828027
+SHA256 (RgoogleMaps_1.4.5.3.tar.gz) = d1d5ad8db841754af175d4104a05c5c31e5cc445be314a3ac70483c31798680b
+SIZE (RgoogleMaps_1.4.5.3.tar.gz) = 345120
diff --git a/www/py-dj22-jsonfield/Makefile b/www/py-dj22-jsonfield/Makefile
new file mode 100644
index 00000000000..9aaf2956863
--- /dev/null
+++ b/www/py-dj22-jsonfield/Makefile
@@ -0,0 +1,26 @@
+# Created by: René Ladan <rene@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	jsonfield
+PORTVERSION=	2.1.1
+CATEGORIES=	www python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj22-
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Reusable JSONField model for Django to store validated JSON
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
+
+USES=		python:3.5+
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}jsonfield
+
+.include <bsd.port.mk>
diff --git a/www/py-dj22-jsonfield/distinfo b/www/py-dj22-jsonfield/distinfo
new file mode 100644
index 00000000000..0d02c6ffa00
--- /dev/null
+++ b/www/py-dj22-jsonfield/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1581594058
+SHA256 (jsonfield-2.1.1.tar.gz) = ed7c5e1829e9453e24a8bebef1e702ffe402e6def6b326f0e0b88764c59a6dc7
+SIZE (jsonfield-2.1.1.tar.gz) = 9142
diff --git a/www/py-dj22-jsonfield/pkg-descr b/www/py-dj22-jsonfield/pkg-descr
new file mode 100644
index 00000000000..fd7554bca5b
--- /dev/null
+++ b/www/py-dj22-jsonfield/pkg-descr
@@ -0,0 +1,8 @@
+django-jsonfield is a reusable Django field that allows you to store validated
+JSON in your model. It silently takes care of serialization. To use, simply
+add the field to one of your models.
+
+This port is not a duplicate of www/py-django-jsonfield, both ports have
+distinct but upstreams.
+
+WWW: https://github.com/rpkilby/django-jsonfield
diff --git a/www/py-dj22-jsonfield2/Makefile b/www/py-dj22-jsonfield2/Makefile
index 0434ab8448d..1a30ff98671 100644
--- a/www/py-dj22-jsonfield2/Makefile
+++ b/www/py-dj22-jsonfield2/Makefile
@@ -2,8 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	jsonfield2
-PORTVERSION=	3.1.0
+PORTVERSION=	4.0.0
 CATEGORIES=	www python
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj22-
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -21,7 +22,4 @@ NO_ARCH=	yes
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}jsonfield2
 
-GH_ACCOUNT=	rpkilby
-USE_GITHUB=	yes
-
 .include <bsd.port.mk>
diff --git a/www/py-dj22-jsonfield2/distinfo b/www/py-dj22-jsonfield2/distinfo
index 22937db6787..fa6a3b91d5b 100644
--- a/www/py-dj22-jsonfield2/distinfo
+++ b/www/py-dj22-jsonfield2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575793987
-SHA256 (rpkilby-jsonfield2-3.1.0_GH0.tar.gz) = 96a7381583ac0c371516f8a457ba12d09dc70cd50b47cf630c21322e7b855a4b
-SIZE (rpkilby-jsonfield2-3.1.0_GH0.tar.gz) = 11198
+TIMESTAMP = 1581775765
+SHA256 (jsonfield2-4.0.0.tar.gz) = 7bd43edd85d203ad6edb0ecb39870a1c7a4fadaf7e807b0feeca3da64b086b5d
+SIZE (jsonfield2-4.0.0.tar.gz) = 12684
diff --git a/www/py-django_openstack_auth/Makefile b/www/py-django_openstack_auth/Makefile
index 0593788c729..06a8cd9d04f 100644
--- a/www/py-django_openstack_auth/Makefile
+++ b/www/py-django_openstack_auth/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django_openstack_auth
 PORTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +18,6 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.config>=4.0.0:devel/py-oslo.config@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.23.0:devel/py-oslo.policy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.1.0:devel/py-keystoneauth1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
@@ -27,4 +27,12 @@ USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3600
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}oslo.policy2>=1.23.0:devel/py-oslo.policy2@${PY_FLAVOR}
+.else
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.23.0:devel/py-oslo.policy@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/www/py-horizon/Makefile b/www/py-horizon/Makefile
index e764053db34..25a436ee081 100644
--- a/www/py-horizon/Makefile
+++ b/www/py-horizon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	horizon
 PORTVERSION=	13.0.1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	https://tarballs.openstack.org/horizon/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -28,13 +29,11 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.25.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.config>=5.1.0:devel/py-oslo.config@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.30.0:devel/py-oslo.policy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymongo>=3.0.2:databases/pymongo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyscss>=1.3.4:textproc/py-pyscss@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-cinderclient>=3.3.0:net/py-python-cinderclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-glanceclient>=2.8.0:net/py-python-glanceclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-neutronclient>=6.3.0:net/py-python-neutronclient@${PY_FLAVOR} \
@@ -88,4 +87,14 @@ CONFLICTS_INSTALL=	py??-horizon-*
 post-patch:
 	@${REINPLACE_CMD} -Ee 's|(pyScss)!=1.3.5,|\1|' ${WRKSRC}/requirements.txt
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3600
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}oslo.policy2>=1.30.0:devel/py-oslo.policy2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-cinderclient5>=3.3.0:net/py-python-cinderclient5@${PY_FLAVOR}
+.else
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.30.0:devel/py-oslo.policy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-cinderclient>=3.3.0:net/py-python-cinderclient@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/www/py-jsonfield/Makefile b/www/py-jsonfield/Makefile
index c98df498bdb..74b4bed5e61 100644
--- a/www/py-jsonfield/Makefile
+++ b/www/py-jsonfield/Makefile
@@ -21,4 +21,6 @@ USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj22-jsonfield
+
 .include <bsd.port.mk>
diff --git a/www/redmine/Makefile b/www/redmine/Makefile
index eb1e0eb2582..cf9bf4e7200 100644
--- a/www/redmine/Makefile
+++ b/www/redmine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	redmine
 PORTVERSION=	3.4.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	https://www.redmine.org/releases/
 
@@ -21,8 +21,8 @@ RUN_DEPENDS=	rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \
 		rubygem-mime-types>=3.0:misc/rubygem-mime-types \
 		rubygem-protected_attributes>=0:devel/rubygem-protected_attributes \
 		rubygem-actionpack-xml_parser1>=0:textproc/rubygem-actionpack-xml_parser1 \
+		rubygem-roadie3>=3.2.1<4:mail/rubygem-roadie3 \
 		rubygem-roadie-rails>=1.1.1:mail/rubygem-roadie-rails \
-		rubygem-roadie>=3.2.1:mail/rubygem-roadie \
 		rubygem-mimemagic>=0:misc/rubygem-mimemagic \
 		rubygem-mail>=2.6.4:mail/rubygem-mail \
 		rubygem-nokogiri18>=1.8.1:textproc/rubygem-nokogiri18 \
diff --git a/www/rubygem-rails52/Makefile b/www/rubygem-rails52/Makefile
index def7cb89f92..b86fa7fdca5 100644
--- a/www/rubygem-rails52/Makefile
+++ b/www/rubygem-rails52/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rails
 PORTVERSION=	5.2.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	52
@@ -24,6 +24,7 @@ RUN_DEPENDS=	rubygem-actioncable52>=${PORTVERSION}:www/rubygem-actioncable52 \
 		rubygem-activesupport52>=${PORTVERSION}:devel/rubygem-activesupport52 \
 		rubygem-bundler>=1.3.0:sysutils/rubygem-bundler \
 		rubygem-railties52>=${PORTVERSION}:www/rubygem-railties52 \
+		rubygem-sprockets-rails-rails52>=2.0.0:devel/rubygem-sprockets-rails-rails52 \
 		rubygem-bootsnap>=1.1.0:devel/rubygem-bootsnap \
 		rubygem-byebug>=0:devel/rubygem-byebug \
 		rubygem-capybara>=2.15:devel/rubygem-capybara \
diff --git a/www/rubygem-roda/Makefile b/www/rubygem-roda/Makefile
index 2b5b2320383..6d917aff67e 100644
--- a/www/rubygem-roda/Makefile
+++ b/www/rubygem-roda/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	roda
-PORTVERSION=	3.28.0
+PORTVERSION=	3.29.0
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
diff --git a/www/rubygem-roda/distinfo b/www/rubygem-roda/distinfo
index 6b07c456dcd..66287703409 100644
--- a/www/rubygem-roda/distinfo
+++ b/www/rubygem-roda/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579196915
-SHA256 (rubygem/roda-3.28.0.gem) = 24421226dcd2795265a1cc8b37a62085cfea4a63bfed5b9e571ca9feb67e5b46
-SIZE (rubygem/roda-3.28.0.gem) = 289280
+TIMESTAMP = 1581703961
+SHA256 (rubygem/roda-3.29.0.gem) = c089d34aa2bf494a48d873e66ef31e8d412cf37d542ccd99b4805a56e8fa919b
+SIZE (rubygem/roda-3.29.0.gem) = 186368
diff --git a/www/tinymce/Makefile b/www/tinymce/Makefile
index 26f2a404094..63f55331607 100644
--- a/www/tinymce/Makefile
+++ b/www/tinymce/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tinymce
-PORTVERSION=	5.1.6
+PORTVERSION=	5.2.0
 CATEGORIES=	www
 MASTER_SITES=	http://download.tiny.cloud/tinymce/community/ \
 		LOCAL/sunpoet
diff --git a/www/tinymce/distinfo b/www/tinymce/distinfo
index 0a73f3d724c..5dca4c1d516 100644
--- a/www/tinymce/distinfo
+++ b/www/tinymce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580562259
-SHA256 (tinymce_5.1.6.zip) = 20fa07347b553a9929e54b0a3fda411c980bdddbaf7bb322ba6ca8a1d59447cf
-SIZE (tinymce_5.1.6.zip) = 661176
+TIMESTAMP = 1581688144
+SHA256 (tinymce_5.2.0.zip) = 4ff39ee853e5fd5d38c80cb13f4eba5b48f9c877e5fdabfda71d9ab931622bc3
+SIZE (tinymce_5.2.0.zip) = 670517
diff --git a/www/you-get/Makefile b/www/you-get/Makefile
index 94f3563ebf5..92e653e057d 100644
--- a/www/you-get/Makefile
+++ b/www/you-get/Makefile
@@ -19,8 +19,10 @@ USE_PYTHON=	autoplist distutils noflavors
 
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=	RTMPDUMP
+OPTIONS_DEFINE=	RTMPDUMP SOCKS
+SOCKS_DESC=	SOCKS support
 
 RTMPDUMP_RUN_DEPENDS=	rtmpdump:multimedia/rtmpdump
+SOCKS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index a88b7c68169..87db41b98ac 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-sis
-PORTVERSION=	0.11.0
+PORTVERSION=	0.12.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sis/distinfo b/x11-drivers/xf86-video-sis/distinfo
index ed1f290c1cd..e597a67b343 100644
--- a/x11-drivers/xf86-video-sis/distinfo
+++ b/x11-drivers/xf86-video-sis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566064121
-SHA256 (xorg/driver/xf86-video-sis-0.11.0.tar.bz2) = 2177901a21a980552f8be429f063388e4c5d5f2e24e8b0ce72d65bd93ccc3b6b
-SIZE (xorg/driver/xf86-video-sis-0.11.0.tar.bz2) = 735940
+TIMESTAMP = 1581789879
+SHA256 (xorg/driver/xf86-video-sis-0.12.0.tar.bz2) = 119d3f17d53c862ec4bf891ed696a6f1d32cdf8bd11d944a9f0ad24625333a5b
+SIZE (xorg/driver/xf86-video-sis-0.12.0.tar.bz2) = 741069
diff --git a/x11-fm/Makefile b/x11-fm/Makefile
index 95cc0b9bf9c..8743392258b 100644
--- a/x11-fm/Makefile
+++ b/x11-fm/Makefile
@@ -25,8 +25,6 @@
     SUBDIR += qtfm
     SUBDIR += rodent
     SUBDIR += rox-filer
-    SUBDIR += rox-mime-editor
-    SUBDIR += rox-session
     SUBDIR += sunflower
     SUBDIR += sushi
     SUBDIR += tdfsb
diff --git a/x11-fm/rox-mime-editor/Makefile b/x11-fm/rox-mime-editor/Makefile
deleted file mode 100644
index e87a94ca49a..00000000000
--- a/x11-fm/rox-mime-editor/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	rox-mime-editor
-PORTVERSION=	0.6
-PORTREVISION=	2
-CATEGORIES=	x11-fm
-MASTER_SITES=	SF/rox/MIME-Editor/${PORTVERSION}
-DISTNAME=	mime-editor-${PORTVERSION}
-
-MAINTAINER=	olgeni@FreeBSD.org
-COMMENT=	MIME type editor for the ROX desktop
-
-DEPRECATED=	Old, uses EOLed python27
-EXPIRATION_DATE=	2020-02-16
-
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
-		${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib@${PY_FLAVOR}
-
-USES=		python:2.7 shebangfix tar:bzip2 
-SHEBANG_FILES=	MIME-Editor/AppRun
-
-do-build:
-	@${PYTHON_CMD} -m compileall ${WRKSRC}
-	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
-
-pre-install:
-	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
-				${WRKSRC}/MIME-Editor/findrox.py
-	@${FIND} ${WRKSRC} -name *.bak -delete
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/apps
-	@${CP} -r ${WRKSRC}/MIME-Editor ${STAGEDIR}${PREFIX}/apps/
-
-.include <bsd.port.mk>
diff --git a/x11-fm/rox-mime-editor/distinfo b/x11-fm/rox-mime-editor/distinfo
deleted file mode 100644
index dc8ff99f742..00000000000
--- a/x11-fm/rox-mime-editor/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mime-editor-0.6.tar.bz2) = de0708f824feea875c606d2c000749da542f117bf7922d8f1679f5aef9d9bb39
-SIZE (mime-editor-0.6.tar.bz2) = 34669
diff --git a/x11-fm/rox-mime-editor/pkg-descr b/x11-fm/rox-mime-editor/pkg-descr
deleted file mode 100644
index 8398f869b65..00000000000
--- a/x11-fm/rox-mime-editor/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A MIME type editor for the ROX desktop.
-
-WWW: http://rox.sourceforge.net/mime_editor.html
diff --git a/x11-fm/rox-mime-editor/pkg-plist b/x11-fm/rox-mime-editor/pkg-plist
deleted file mode 100644
index 3d16908f0a7..00000000000
--- a/x11-fm/rox-mime-editor/pkg-plist
+++ /dev/null
@@ -1,30 +0,0 @@
-apps/MIME-Editor/.DirIcon
-apps/MIME-Editor/AppInfo.xml
-apps/MIME-Editor/AppRun
-apps/MIME-Editor/Help/COPYING
-apps/MIME-Editor/Help/Changes
-apps/MIME-Editor/Help/README
-apps/MIME-Editor/MIME-Editor.xml
-apps/MIME-Editor/Messages/dist
-apps/MIME-Editor/Messages/es.gmo
-apps/MIME-Editor/Messages/es.po
-apps/MIME-Editor/Messages/fr.gmo
-apps/MIME-Editor/Messages/fr.po
-apps/MIME-Editor/Messages/it.gmo
-apps/MIME-Editor/Messages/it.po
-apps/MIME-Editor/Messages/update-po
-apps/MIME-Editor/editor.py
-apps/MIME-Editor/editor.pyc
-apps/MIME-Editor/editor.pyo
-apps/MIME-Editor/fields.py
-apps/MIME-Editor/fields.pyc
-apps/MIME-Editor/fields.pyo
-apps/MIME-Editor/findrox.py
-apps/MIME-Editor/findrox.pyc
-apps/MIME-Editor/findrox.pyo
-apps/MIME-Editor/override.py
-apps/MIME-Editor/override.pyc
-apps/MIME-Editor/override.pyo
-apps/MIME-Editor/type.py
-apps/MIME-Editor/type.pyc
-apps/MIME-Editor/type.pyo
diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
deleted file mode 100644
index d1b3cc93a25..00000000000
--- a/x11-fm/rox-session/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	rox-session
-PORTVERSION=	0.40.0
-PORTREVISION=	4
-CATEGORIES=	x11-fm
-MASTER_SITES=	SF/rox/ROX-Session/${PORTVERSION}/
-
-MAINTAINER=	olgeni@FreeBSD.org
-COMMENT=	Simple session manager for the ROX desktop
-
-DEPRECATED=	Old, uses EOLed python27
-EXPIRATION_DATE=	2020-02-16
-
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/Help/COPYING
-
-LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
-		${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR}
-
-WRKSRC=		${WRKDIR}/ROX-Session
-DATADIR=	${PREFIX}/apps/ROX-Session
-
-USES=		gettext-tools gnome pkgconfig python:2.7 shebangfix xorg
-SHEBANG_FILES=	AutoStart.py choose_wm.py interactive.py migrate.py
-USE_GNOME=	gtk20 libxml2
-USE_XORG=	x11 xext xtst xxf86vm
-
-PORTDOCS=	Changes DBUS-API README
-
-OPTIONS_DEFINE=	GDM DOCS
-OPTIONS_SUB=	yes
-GDM_DESC=	Install GDM login manager
-
-SUB_FILES=	${PORTNAME} rox.desktop
-
-GDM_RUN_DEPENDS=${LOCALBASE}/sbin/gdm:x11/gdm
-
-post-patch:
-	@${FIND} ${WRKSRC} -name "*.orig" -delete
-
-do-build:
-	@${PYTHON_CMD} -m compileall ${WRKSRC}
-	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
-	@cd ${WRKSRC} && ./AppRun --compile
-	@${MKDIR} ${WRKSRC}/Messages
-	@cd ${WRKSRC}/src/po && ./dist
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@cd ${WRKSRC} && ${CP} -r .DirIcon AppInfo.xml AppRun \
-		Environment Login Messages Options.xml ROX-Session \
-		ROX-Session.xml RunROX SetupPanel Styles browser images \
-		*.py *.pyc *.pyo ${STAGEDIR}${DATADIR}
-
-do-install-GDM-on:
-	${INSTALL_DATA} ${WRKDIR}/rox.desktop ${STAGEDIR}${PREFIX}/share/applications
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/Help/${f} ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/x11-fm/rox-session/distinfo b/x11-fm/rox-session/distinfo
deleted file mode 100644
index 44881cf277b..00000000000
--- a/x11-fm/rox-session/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rox-session-0.40.0.tar.gz) = 96810f80226d85ba120724528c07331f0e9b89f814825c08bb03d650a8254e96
-SIZE (rox-session-0.40.0.tar.gz) = 203282
diff --git a/x11-fm/rox-session/files/patch-setup.py b/x11-fm/rox-session/files/patch-setup.py
deleted file mode 100644
index 7b8d96b3f0e..00000000000
--- a/x11-fm/rox-session/files/patch-setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- setup.py.orig	2008-04-13 18:36:56.000000000 +0200
-+++ setup.py	2012-09-09 17:11:39.000000000 +0200
-@@ -137,7 +137,9 @@
- 	try:
- 		session_dirs = ['/etc/X11/sessions', '/etc/dm/Sessions',
- 				'/etc/X11/dm/Sessions', '/usr/share/xsessions',
--				'/opt/kde3/share/apps/kdm/sessions']
-+				'/opt/kde3/share/apps/kdm/sessions',
-+				'/usr/local/share/applications',
-+				'/usr/local/etc/dm/Sessions']
- 		# TODO: more guesses about where KDE is installed, /opt/kde3
- 		# works for SuSE 9.2
- 		for d in session_dirs:
diff --git a/x11-fm/rox-session/files/rox-session.in b/x11-fm/rox-session/files/rox-session.in
deleted file mode 100644
index 4f3105b56aa..00000000000
--- a/x11-fm/rox-session/files/rox-session.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-echo "ROX Session: Starting up..." 
-cd "%%DATADIR%%"
-./AppRun -w < /dev/null
diff --git a/x11-fm/rox-session/files/rox.desktop.in b/x11-fm/rox-session/files/rox.desktop.in
deleted file mode 100644
index 4ff3f6e5558..00000000000
--- a/x11-fm/rox-session/files/rox.desktop.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=ROX
-Comment=This session logs you into the ROX Desktop
-Exec=%%PREFIX%%/bin/rox-session
-Type=Application
diff --git a/x11-fm/rox-session/pkg-descr b/x11-fm/rox-session/pkg-descr
deleted file mode 100644
index c1006f835ea..00000000000
--- a/x11-fm/rox-session/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-ROX-Session is a simple session manager.
-It loads, runs any programs you asked it to, and then quits when you run it
-a second time (thus ending your session). It does not display any windows
-until you ask it to quit.
-
-WWW: http://rox.sourceforge.net/desktop/
diff --git a/x11-fm/rox-session/pkg-plist b/x11-fm/rox-session/pkg-plist
deleted file mode 100644
index c9a0fcbb83a..00000000000
--- a/x11-fm/rox-session/pkg-plist
+++ /dev/null
@@ -1,55 +0,0 @@
-apps/ROX-Session/.DirIcon
-apps/ROX-Session/AppInfo.xml
-apps/ROX-Session/AppRun
-apps/ROX-Session/AutoStart.py
-apps/ROX-Session/AutoStart.pyc
-apps/ROX-Session/AutoStart.pyo
-apps/ROX-Session/Environment
-apps/ROX-Session/Login
-apps/ROX-Session/Messages/da.gmo
-apps/ROX-Session/Messages/de.gmo
-apps/ROX-Session/Messages/es.gmo
-apps/ROX-Session/Messages/fr.gmo
-apps/ROX-Session/Messages/it.gmo
-apps/ROX-Session/Messages/ja.gmo
-apps/ROX-Session/Messages/lt.gmo
-apps/ROX-Session/Messages/nl.gmo
-apps/ROX-Session/Messages/pt_BR.gmo
-apps/ROX-Session/Messages/ru.gmo
-apps/ROX-Session/Messages/zh_CN.gmo
-apps/ROX-Session/Messages/zh_TW.gmo
-apps/ROX-Session/Options.xml
-apps/ROX-Session/ROX-Session
-apps/ROX-Session/ROX-Session.xml
-apps/ROX-Session/RunROX
-apps/ROX-Session/SetupPanel
-apps/ROX-Session/Styles
-apps/ROX-Session/browser
-apps/ROX-Session/choose_wm.py
-apps/ROX-Session/choose_wm.pyc
-apps/ROX-Session/choose_wm.pyo
-apps/ROX-Session/findrox.py
-apps/ROX-Session/findrox.pyc
-apps/ROX-Session/findrox.pyo
-apps/ROX-Session/gdm.py
-apps/ROX-Session/gdm.pyc
-apps/ROX-Session/gdm.pyo
-apps/ROX-Session/images/rox-halt.png
-apps/ROX-Session/images/rox-suspend.png
-apps/ROX-Session/interactive.py
-apps/ROX-Session/interactive.pyc
-apps/ROX-Session/interactive.pyo
-apps/ROX-Session/logout.py
-apps/ROX-Session/logout.pyc
-apps/ROX-Session/logout.pyo
-apps/ROX-Session/migrate.py
-apps/ROX-Session/migrate.pyc
-apps/ROX-Session/migrate.pyo
-apps/ROX-Session/sessionbus.py
-apps/ROX-Session/sessionbus.pyc
-apps/ROX-Session/sessionbus.pyo
-apps/ROX-Session/setup.py
-apps/ROX-Session/setup.pyc
-apps/ROX-Session/setup.pyo
-bin/rox-session
-%%GDM%%share/applications/rox.desktop
diff --git a/x11-fonts/font-awesome/Makefile b/x11-fonts/font-awesome/Makefile
index 2b7c5fe7b4d..0a3c10d3087 100644
--- a/x11-fonts/font-awesome/Makefile
+++ b/x11-fonts/font-awesome/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	font-awesome
-DISTVERSION=	5.11.2
+DISTVERSION=	5.12.1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://use.fontawesome.com/releases/v${DISTVERSION}/
 DISTNAME=	fontawesome-free-${DISTVERSION}-desktop
diff --git a/x11-fonts/font-awesome/distinfo b/x11-fonts/font-awesome/distinfo
index 7422b99f316..57aec4b7464 100644
--- a/x11-fonts/font-awesome/distinfo
+++ b/x11-fonts/font-awesome/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1572699297
-SHA256 (fontawesome-free-5.11.2-desktop.zip) = 5c5fe6c31ed5ccb0c7b959a4f160501b7c2377e2aef2d5370f645f924db097b8
-SIZE (fontawesome-free-5.11.2-desktop.zip) = 1976695
+TIMESTAMP = 1581882426
+SHA256 (fontawesome-free-5.12.1-desktop.zip) = 160a3e8f4c910cfe653b1d7804342233c2f5c97cbe8aff1d8fd35c1d5717a852
+SIZE (fontawesome-free-5.12.1-desktop.zip) = 2001027
diff --git a/x11-fonts/spleen/Makefile b/x11-fonts/spleen/Makefile
index 45e4024e0b3..b7e8b8ce89f 100644
--- a/x11-fonts/spleen/Makefile
+++ b/x11-fonts/spleen/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	spleen
-DISTVERSION=	1.5.0
+DISTVERSION=	1.7.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://github.com/fcambus/spleen/releases/download/${DISTVERSION}/
 PKGNAMESUFFIX=	-font
@@ -23,17 +23,17 @@ OPTIONS_EXCLUDE=	VT
 .endif
 OPTIONS_SUB=		yes
 
-TYPE_DESC=		Font type
-VT_DESC=		Install vt(4) fonts
-X11_DESC=		Install Xorg bitmap fonts
+TYPE_DESC=	Font type
+VT_DESC=	Install vt(4) fonts
+X11_DESC=	Install Xorg bitmap fonts
 
 # vtfontcvt is broken with large fonts, so use Dmitry Wagin's
 # improved version from https://bugs.freebsd.org/205707 that
 # doesn't have this problem.
 VT_BUILD_DEPENDS=	vtfontcvt-ng:x11-fonts/vtfontcvt-ng
 
-X11_USES_OFF=		fonts:none
-X11_USES=		fonts
+X11_USES_OFF=	fonts:none
+X11_USES=	fonts
 
 do-build:
 	@${DO_NADA}
@@ -59,6 +59,7 @@ do-install-VT-on:
 do-install-X11-on:
 	${INSTALL_DATA} ${WRKSRC}/fonts.alias-spleen \
 		${STAGEDIR}${FONTSDIR}/fonts.alias
-	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.otf ${WRKSRC}/*.pcf.gz \
+		${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/spleen/distinfo b/x11-fonts/spleen/distinfo
index f7efd9b6d3a..63990099e6b 100644
--- a/x11-fonts/spleen/distinfo
+++ b/x11-fonts/spleen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569926329
-SHA256 (spleen-1.5.0.tar.gz) = a346844625416ede531bcb720bc786924792a0538fe90c8f1215d619dcd0f6c2
-SIZE (spleen-1.5.0.tar.gz) = 244033
+TIMESTAMP = 1581617013
+SHA256 (spleen-1.7.0.tar.gz) = 2a8768d5cd2f4be327ee66bd80f343edd9e31af7836c4a177dd85caac9289cd8
+SIZE (spleen-1.7.0.tar.gz) = 290409
diff --git a/x11-fonts/spleen/pkg-plist b/x11-fonts/spleen/pkg-plist
index b10b291a147..6e3838782c7 100644
--- a/x11-fonts/spleen/pkg-plist
+++ b/x11-fonts/spleen/pkg-plist
@@ -1,12 +1,16 @@
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%X11%%%%FONTSDIR%%/fonts.alias
 %%VT%%%%FONTSDIR%%/spleen-12x24.fnt
+%%X11%%%%FONTSDIR%%/spleen-12x24.otf
 %%X11%%%%FONTSDIR%%/spleen-12x24.pcf.gz
 %%VT%%%%FONTSDIR%%/spleen-16x32.fnt
+%%X11%%%%FONTSDIR%%/spleen-16x32.otf
 %%X11%%%%FONTSDIR%%/spleen-16x32.pcf.gz
 %%VT%%%%FONTSDIR%%/spleen-32x64.fnt
+%%X11%%%%FONTSDIR%%/spleen-32x64.otf
 %%X11%%%%FONTSDIR%%/spleen-32x64.pcf.gz
 %%VT%%%%FONTSDIR%%/spleen-5x8.fnt
 %%X11%%%%FONTSDIR%%/spleen-5x8.pcf.gz
 %%VT%%%%FONTSDIR%%/spleen-8x16.fnt
+%%X11%%%%FONTSDIR%%/spleen-8x16.otf
 %%X11%%%%FONTSDIR%%/spleen-8x16.pcf.gz
diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index 1c1f5a22cde..95acb5cdade 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
-DISTVERSION=	1.20.0-603
+DISTVERSION=	1.20.0-604
 DISTVERSIONSUFFIX=	-g${GL_COMMIT:C/(.{12}).*/\1/}
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
@@ -36,7 +36,7 @@ USE_XORG=	pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
 GL_SITE=	https://gitlab.freedesktop.org
 GL_ACCOUNT=	xorg
 GL_PROJECT=	xserver
-GL_COMMIT=	ee9f6e20de1408d572dc1eba33f3d2a8501d7da5
+GL_COMMIT=	4709d24f8e3ef5ee79085b77401eaacd7e1690c7
 MESON_ARGS=	-Dxwayland=true \
 		-Dxorg=false \
 		-Dxnest=false \
diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo
index a8760315758..c1e0439c58c 100644
--- a/x11-servers/xwayland-devel/distinfo
+++ b/x11-servers/xwayland-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1581544573
-SHA256 (xorg-xserver-ee9f6e20de1408d572dc1eba33f3d2a8501d7da5_GL0.tar.gz) = 0adac3f0db13085f8a04d814cdf32614d81fac988209c276d4f6b82afdbee3d9
-SIZE (xorg-xserver-ee9f6e20de1408d572dc1eba33f3d2a8501d7da5_GL0.tar.gz) = 5108029
+TIMESTAMP = 1581696284
+SHA256 (xorg-xserver-4709d24f8e3ef5ee79085b77401eaacd7e1690c7_GL0.tar.gz) = fde4799e79f53d23d57632be454cbc8bbae01ab1bab72575d22a2a05222a2199
+SIZE (xorg-xserver-4709d24f8e3ef5ee79085b77401eaacd7e1690c7_GL0.tar.gz) = 5108351
 SHA256 (71749de24509.patch) = b541c7ca7098ed624e815f0dc17e94d1dc48e70af55459e51a8f04b10bcd0116
 SIZE (71749de24509.patch) = 1392
 SHA256 (1e897704c822.patch) = b5c9e98a8596d4aa854c817f2f44ed7636cbc32de6773ade20e03970deb70717
diff --git a/x11-servers/xwayland-devel/pkg-message b/x11-servers/xwayland-devel/pkg-message
new file mode 100644
index 00000000000..846b3cf4a71
--- /dev/null
+++ b/x11-servers/xwayland-devel/pkg-message
@@ -0,0 +1,13 @@
+[
+{ type: install
+  message: <<EOM
+For hardware acceleration DRI3 needs to be enabled e.g.,
+
+For sh/bash/ksh/zsh run and (optionally) add into ~/.profile:
+  export LIBGL_DRI3_ENABLE=1
+
+For csh/tcsh run and (optionally) add into ~/.login:
+  setenv LIBGL_DRI3_ENABLE 1
+EOM
+}
+]
diff --git a/x11-toolkits/mygui/Makefile b/x11-toolkits/mygui/Makefile
index f295d03b0b2..746c26747de 100644
--- a/x11-toolkits/mygui/Makefile
+++ b/x11-toolkits/mygui/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mygui
-PORTVERSION=	3.2.3.git20190127
-PORTREVISION=	1
+PORTVERSION=	3.4.0
+DISTVERSIONPREFIX=	MyGUI
 CATEGORIES=	x11-toolkits graphics devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -24,7 +24,6 @@ INSTALL_WRKSRC=	${WRKSRC}/${MYGUI_SUBDIR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MyGUI
-GH_TAGNAME=	c1c4a9a
 
 MYGUI_RENDERSYSTEM?=	0
 
diff --git a/x11-toolkits/mygui/distinfo b/x11-toolkits/mygui/distinfo
index 08f18995289..2d725d80ba6 100644
--- a/x11-toolkits/mygui/distinfo
+++ b/x11-toolkits/mygui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1554081768
-SHA256 (MyGUI-mygui-3.2.3.git20190127-c1c4a9a_GH0.tar.gz) = e7b16b1e212684c1e0d73ac9cfdb8a43c9cd16a973a0a2cae06d4af6d551de08
-SIZE (MyGUI-mygui-3.2.3.git20190127-c1c4a9a_GH0.tar.gz) = 22391079
+TIMESTAMP = 1581614289
+SHA256 (MyGUI-mygui-MyGUI3.4.0_GH0.tar.gz) = d1d5f294670ae71f7200ed4b30859018281d8cfd45d6a38d18b97a4aba604c42
+SIZE (MyGUI-mygui-MyGUI3.4.0_GH0.tar.gz) = 22391483
diff --git a/x11-wm/hikari/Makefile b/x11-wm/hikari/Makefile
index 99c6476000f..87583767468 100644
--- a/x11-wm/hikari/Makefile
+++ b/x11-wm/hikari/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 		libwlroots.so:x11-toolkits/wlroots \
 		libxkbcommon.so:x11/libxkbcommon
 
-USES=		gnome pkgconfig xorg
+USES=		compiler:c11 gnome pkgconfig xorg
 USE_GNOME=	cairo glib20 pango
 USE_XORG=	pixman
 ALL_TARGET=	${WITH_DEBUG:Ddebug}
diff --git a/x11/Makefile b/x11/Makefile
index 25d94525f13..5cf73c0e46f 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -278,7 +278,6 @@
     SUBDIR += rofi
     SUBDIR += rofi-calc
     SUBDIR += rofi-pass
-    SUBDIR += rox-wallpaper
     SUBDIR += roxbg
     SUBDIR += roxterm
     SUBDIR += rsibreak
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 5038857ffa3..cfe2faaa25c 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libXpm
-PORTVERSION=	3.5.12
-PORTREVISION=	2
+PORTVERSION=	3.5.13
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXpm/distinfo b/x11/libXpm/distinfo
index bc5694a761f..b59b86c30a9 100644
--- a/x11/libXpm/distinfo
+++ b/x11/libXpm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481989508
-SHA256 (xorg/lib/libXpm-3.5.12.tar.bz2) = fd6a6de3da48de8d1bb738ab6be4ad67f7cb0986c39bd3f7d51dd24f7854bdec
-SIZE (xorg/lib/libXpm-3.5.12.tar.bz2) = 430736
+TIMESTAMP = 1581678985
+SHA256 (xorg/lib/libXpm-3.5.13.tar.bz2) = 9cd1da57588b6cb71450eff2273ef6b657537a9ac4d02d0014228845b935ac25
+SIZE (xorg/lib/libXpm-3.5.13.tar.bz2) = 463251
diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index 144fc89afa4..3485acdc246 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	libxkbcommon
-PORTVERSION=	0.8.4
+PORTVERSION=	0.10.0
 CATEGORIES=	x11
 MASTER_SITES=	https://xkbcommon.org/download/
+DIST_SUBDIR=	xorg/lib
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Keymap handling library for toolkits and window systems
@@ -13,13 +14,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	xkeyboard-config>0:x11/xkeyboard-config
 
-USES=		gmake bison tar:xz xorg xorg-cat:lib
+USES=		bison meson pkgconfig tar:xz xorg
 USE_XORG=	xcb
-INSTALL_TARGET=	install-strip
-
-CONFIGURE_ARGS=	--without-doxygen \
-		--with-default-rules="xorg" \
-		--with-x-locale-root=${PREFIX}/lib/X11/locale \
-		--disable-wayland
+MESON_ARGS=	-Ddefault-rules=xorg \
+		-Denable-docs=false \
+		-Denable-wayland=false \
+		-Dx-locale-root="${PREFIX}/lib/X11/locale"
 
 .include <bsd.port.mk>
diff --git a/x11/libxkbcommon/distinfo b/x11/libxkbcommon/distinfo
index 6021f0f1215..5a44e5c0d0a 100644
--- a/x11/libxkbcommon/distinfo
+++ b/x11/libxkbcommon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1560365070
-SHA256 (xorg/lib/libxkbcommon-0.8.4.tar.xz) = 60ddcff932b7fd352752d51a5c4f04f3d0403230a584df9a2e0d5ed87c486c8b
-SIZE (xorg/lib/libxkbcommon-0.8.4.tar.xz) = 648592
+TIMESTAMP = 1579381980
+SHA256 (xorg/lib/libxkbcommon-0.10.0.tar.xz) = 57c3630cdc38fb4734cd57fa349e92244f5ae3862813e533cedbd86721a0b6f2
+SIZE (xorg/lib/libxkbcommon-0.10.0.tar.xz) = 383788
diff --git a/x11/libxkbcommon/pkg-plist b/x11/libxkbcommon/pkg-plist
index d1d3b5f186f..5c2fb72d103 100644
--- a/x11/libxkbcommon/pkg-plist
+++ b/x11/libxkbcommon/pkg-plist
@@ -4,11 +4,9 @@ include/xkbcommon/xkbcommon-compose.h
 include/xkbcommon/xkbcommon-keysyms.h
 include/xkbcommon/xkbcommon-names.h
 include/xkbcommon/xkbcommon-x11.h
-lib/libxkbcommon.a
 lib/libxkbcommon.so
 lib/libxkbcommon.so.0
 lib/libxkbcommon.so.0.0.0
-lib/libxkbcommon-x11.a
 lib/libxkbcommon-x11.so
 lib/libxkbcommon-x11.so.0
 lib/libxkbcommon-x11.so.0.0.0
diff --git a/x11/plasma5-plasma-desktop/Makefile b/x11/plasma5-plasma-desktop/Makefile
index 56a7068e98d..5468d80bffa 100644
--- a/x11/plasma5-plasma-desktop/Makefile
+++ b/x11/plasma5-plasma-desktop/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	plasma-desktop
 DISTVERSION=	${KDE_PLASMA_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -38,7 +38,8 @@ USE_KDE=	activities activities-stats archive attica auth baloo \
 		plasma-workspace runner service solid \
 		sonnet textwidgets unitconversion wallet \
 		widgetsaddons windowsystem xmlgui
-USE_KDE+=	drkonqi_run infocenter_run kde-cli-tools_run kmenuedit_run ksysguard_run \
+USE_KDE+=	drkonqi_run infocenter_run kde-cli-tools_run kmenuedit_run \
+		kquickcharts_run ksysguard_run \
 		polkit-kde-agent-1_run systemsettings_run
 USE_QT=		concurrent core dbus declarative gui network phonon4 printsupport \
 		sql svg widgets x11extras xml \
diff --git a/x11/rox-wallpaper/Makefile b/x11/rox-wallpaper/Makefile
deleted file mode 100644
index a5edfa48011..00000000000
--- a/x11/rox-wallpaper/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	rox-wallpaper
-PORTVERSION=	2.3
-PORTREVISION=	2
-CATEGORIES=	x11
-MASTER_SITES=	SF/rox/Wallpaper/${PORTVERSION}
-DISTNAME=	Wallpaper-${PORTVERSION}
-
-MAINTAINER=	olgeni@FreeBSD.org
-COMMENT=	Wallpaper management tool for the ROX desktop
-
-DEPRECATED=	Old, uses EOLed python27
-EXPIRATION_DATE=	2020-02-16
-
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
-		${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib@${PY_FLAVOR}
-
-USES=		python:2.7 shebangfix
-SHEBANG_FILES=	AppRun
-NO_ARCH=	yes
-
-WRKSRC=		${WRKDIR}/Wallpaper
-
-do-build:
-	@${PYTHON_CMD} -m compileall ${WRKSRC}
-	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/apps
-	${CP} -r ${WRKSRC} ${STAGEDIR}${PREFIX}/apps/Wallpaper
-
-.include <bsd.port.mk>
diff --git a/x11/rox-wallpaper/distinfo b/x11/rox-wallpaper/distinfo
deleted file mode 100644
index 0e842b5cc78..00000000000
--- a/x11/rox-wallpaper/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (Wallpaper-2.3.tar.gz) = 3f5c26f71aed59dcfcab58f4dfe2bbff7337c0dac13dcc5c1147733211fd5476
-SIZE (Wallpaper-2.3.tar.gz) = 23280
diff --git a/x11/rox-wallpaper/pkg-descr b/x11/rox-wallpaper/pkg-descr
deleted file mode 100644
index d814c663cd0..00000000000
--- a/x11/rox-wallpaper/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-A wallpaper management tool for the ROX desktop, supporting both
-random and command-generated wallpapers.
-
-WWW: http://rox.sourceforge.net/desktop/Wallpaper
diff --git a/x11/rox-wallpaper/pkg-plist b/x11/rox-wallpaper/pkg-plist
deleted file mode 100644
index 67c7f65365e..00000000000
--- a/x11/rox-wallpaper/pkg-plist
+++ /dev/null
@@ -1,34 +0,0 @@
-apps/Wallpaper/.DirIcon
-apps/Wallpaper/AppInfo.xml
-apps/Wallpaper/AppRun
-apps/Wallpaper/Help/COPYING
-apps/Wallpaper/Help/Changes
-apps/Wallpaper/Help/README
-apps/Wallpaper/Messages/dist
-apps/Wallpaper/Messages/hu.gmo
-apps/Wallpaper/Messages/hu.po
-apps/Wallpaper/Messages/it.gmo
-apps/Wallpaper/Messages/it.po
-apps/Wallpaper/Messages/messages.pot
-apps/Wallpaper/Messages/update-po
-apps/Wallpaper/Messages/zh_CN.gmo
-apps/Wallpaper/Messages/zh_CN.po
-apps/Wallpaper/Messages/zh_TW.gmo
-apps/Wallpaper/Messages/zh_TW.po
-apps/Wallpaper/Wallpaper.xml
-apps/Wallpaper/actions.py
-apps/Wallpaper/actions.pyc
-apps/Wallpaper/actions.pyo
-apps/Wallpaper/findrox.py
-apps/Wallpaper/findrox.pyc
-apps/Wallpaper/findrox.pyo
-apps/Wallpaper/fixed.py
-apps/Wallpaper/fixed.pyc
-apps/Wallpaper/fixed.pyo
-apps/Wallpaper/main.py
-apps/Wallpaper/main.pyc
-apps/Wallpaper/main.pyo
-apps/Wallpaper/makedist.sh
-apps/Wallpaper/options.py
-apps/Wallpaper/options.pyc
-apps/Wallpaper/options.pyo
diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile
index e0007dfa7a5..f30aafa49d3 100644
--- a/x11/xfce4-whiskermenu-plugin/Makefile
+++ b/x11/xfce4-whiskermenu-plugin/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-whiskermenu-plugin
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
diff --git a/x11/xfce4-whiskermenu-plugin/distinfo b/x11/xfce4-whiskermenu-plugin/distinfo
index 2fe216ca02d..678376ab4d7 100644
--- a/x11/xfce4-whiskermenu-plugin/distinfo
+++ b/x11/xfce4-whiskermenu-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581540328
-SHA256 (xfce4/xfce4-whiskermenu-plugin-2.4.1.tar.bz2) = 53fc81a936792aedfca00f3d66fec9e3eef6fbb77e16c366e425bf3f5fdfb67c
-SIZE (xfce4/xfce4-whiskermenu-plugin-2.4.1.tar.bz2) = 171946
+TIMESTAMP = 1581763378
+SHA256 (xfce4/xfce4-whiskermenu-plugin-2.4.2.tar.bz2) = fb2e1d44744d851c5339900e7af9068397028efa9ee5235a66ab273e95740dee
+SIZE (xfce4/xfce4-whiskermenu-plugin-2.4.2.tar.bz2) = 171280