*/*: sync with upstream

Taken from: HardenedBSD
2019-09-10 15:20:11 +02:00 · 2019-09-10 15:20:11 +02:00 · 9d16fa723c
parent deffa1b113
commit 9d16fa723c
285 changed files with 3939 additions and 1277 deletions
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	kstars
-DISTVERSION=	3.3.4
+DISTVERSION=	3.3.5
 PORTEPOCH=	1
 CATEGORIES=	astro kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
--- a/astro/kstars/distinfo
+++ b/astro/kstars/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1567023349
-SHA256 (kstars-3.3.4.tar.xz) = 0579dabaf8a024bcea1e7c97cc3284a013da8d2bc14a95dcdb74f088e18e86d9
-SIZE (kstars-3.3.4.tar.xz) = 70764724
+TIMESTAMP = 1568038651
+SHA256 (kstars-3.3.5.tar.xz) = d17a72bdcc579c3de7dd8ad386b15bb1c4932bf6bbd220407bef43cf6a6fd667
+SIZE (kstars-3.3.5.tar.xz) = 70750064
--- a/astro/kstars/files/patch-kstars_auxiliary_ksutils.cpp
+++ b/astro/kstars/files/patch-kstars_auxiliary_ksutils.cpp
@ -0,0 +1,11 @@
+--- kstars/auxiliary/ksutils.cpp.orig	2019-09-09 16:36:17 UTC
+++ kstars/auxiliary/ksutils.cpp
+@@ -1325,7 +1325,7 @@ bool copyRecursively(QString sourceFolder, QString des
+ //One is createLocalAstrometryConf and the other is configureAstrometry
+ bool configureLocalAstrometryConfIfNecessary()
+ {
+-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+     QString confPath = KSPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Literal("astrometry") + QLatin1Literal("/astrometry.cfg");
+     if (QFileInfo(confPath).exists() == false)
+     {
--- a/astro/kstars/pkg-plist
+++ b/astro/kstars/pkg-plist
@ -1695,7 +1695,6 @@ share/knotifications5/kstars.notifyrc
 %%DATADIR%%/venus.R4.vsop
 %%DATADIR%%/venus.R5.vsop
 %%DATADIR%%/venus.orbit
-%%DATADIR%%/windi.png
 %%DATADIR%%/wzdownload.png
 %%DATADIR%%/wzekos.png
 %%DATADIR%%/wzgeo.png
--- a/audio/linux-c7-alsa-plugins-oss/Makefile
+++ b/audio/linux-c7-alsa-plugins-oss/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	alsa-plugins
 PORTVERSION=	1.1.6
 DISTVERSIONSUFFIX=	-1.el7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio linux
 MASTER_SITES=	CENTOS_LINUX
 MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/Source/SPackages/ \
@ -19,10 +19,9 @@ COMMENT=	OSS plugin for ALSA (Linux CentOS ${LINUX_DIST_VER})

 LICENSE=	LGPL21+

-USES=		autoreconf:build linux:c7
+USES=		autoreconf:build gmake libtool:build linux:c7 pkgconfig
 USE_LDCONFIG=	yes
-USE_LINUX=	alsalib:build,run alsa-lib-devel:build devtools:build \
-		make:build
+USE_LINUX=	alsalib:build,run alsa-lib-devel:build base:build devtools:build
 USE_LINUX_PREFIX=yes

 RPM_PATCHES=	alsa-plugins-1.1.6-post.patch \
@ -31,13 +30,8 @@ CONFIG_ARGS=	--disable-static --disable-mix --disable-usbstream \
 		--disable-arcamav --disable-jack --disable-pulseaudio \
 		--disable-samplerate --disable-libav --disable-a52 \
 		--disable-lavrate --disable-speexdsp --with-speex=no
-CFLAGS+=	-DFREEBSD_OSS -DFREEBSD_OSS_USE_IO_PTR -DFREEBSD_OSS_BUFSZ_P2
-CFLAGS_amd64=	-nostdinc -isystem \
-		${LINUXBASE}/usr/lib/gcc/x86_64-redhat-linux/4.8.5/include \
-		-isystem /usr/include
-CFLAGS_i386=	-nostdinc -isystem \
-		${LINUXBASE}/usr/lib/gcc/i686-redhat-linux/4.8.5/include \
-		-isystem /usr/include
+CPPFLAGS+=	-DFREEBSD_OSS -DFREEBSD_OSS_USE_IO_PTR
+CFLAGS+=	--sysroot=${LINUXBASE}
 COMPAT32_CFLAGS_amd64=	-m32
 LIBDIR_amd64=	/usr/lib64
 LIBDIR_i386=	/usr/lib
@ -48,6 +42,8 @@ CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 PLIST=		${PKGDIR}/pkg-plist.${ARCH}

+.include <bsd.port.options.mk>
+
 post-extract:
 .if !empty(COMPAT32_CFLAGS_${ARCH})
 	@${MKDIR} ${WRKDIR}/32
@ -58,6 +54,8 @@ post-extract:
 		${PORTNAME}-${PORTVERSION}.tar.bz2 ${EXTRACT_AFTER_ARGS})

 do-patch:
+	@${REINPLACE_CMD} 's/mkdir -p/$$(MKDIR_P)/' \
+		${WRKDIR}/alsa-plugins-1.1.6-post.patch
 .for p in ${RPM_PATCHES}
 .if !empty(COMPAT32_CFLAGS_${ARCH})
 	@${PATCH} -d ${WRKSRC32} --forward --quiet -E -p1 < ${WRKDIR}/${p}
@ -74,28 +72,38 @@ do-patch:
 do-configure:
 .if !empty(COMPAT32_CFLAGS_${ARCH})
 	@(cd ${WRKSRC32} && ${AUTORECONF} -f -i && ${SETENV} \
+		PATH=${LINUXBASE}/usr/bin ./configure CPPFLAGS="${CPPFLAGS}" \
+		CFLAGS="${CFLAGS} ${COMPAT32_CFLAGS_${ARCH}}" \
+		LDFLAGS="${LDFLAGS}" MAKE="${LOCALBASE}/bin/gmake" \
+		MKDIR_P="${MKDIR}" PKG_CONFIG="${LOCALBASE}/bin/pkgconf" \
 		PKG_CONFIG_PATH=${LINUXBASE}/usr/lib/pkgconfig \
-		${LINUXBASE}/bin/sh ./configure \
-		CFLAGS="${CFLAGS} ${COMPAT32_CFLAGS_${ARCH}}" ${CONFIG_ARGS})
+		${CONFIG_ARGS})
 .endif
 	@(cd ${WRKSRC} && ${AUTORECONF} -f -i && ${SETENV} \
+		PATH=${LINUXBASE}/usr/bin ./configure CPPFLAGS="${CPPFLAGS}" \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		MAKE="${LOCALBASE}/bin/gmake" MKDIR_P="${MKDIR}" \
+		PKG_CONFIG="${LOCALBASE}/bin/pkgconf" \
 		PKG_CONFIG_PATH=${LINUXBASE}${LIBDIR_${ARCH}}/pkgconfig \
-		${LINUXBASE}/bin/sh ./configure --libdir ${LIBDIR_${ARCH}} \
-		CFLAGS="${CFLAGS}" ${CONFIG_ARGS})
+		--libdir ${LIBDIR_${ARCH}} ${CONFIG_ARGS})

 do-build:
 .if !empty(COMPAT32_CFLAGS_${ARCH})
-	@(cd ${WRKSRC32} && ${LINUXBASE}/usr/bin/make)
+	@(cd ${WRKSRC32} && ${SETENV} PATH=${LINUXBASE}/usr/bin \
+		${LOCALBASE}/bin/gmake)
 .endif
-	@(cd ${WRKSRC} && ${LINUXBASE}/usr/bin/make)
+	@(cd ${WRKSRC} && ${SETENV} PATH=${LINUXBASE}/usr/bin \
+		${LOCALBASE}/bin/gmake)

 do-install:
 .if !empty(COMPAT32_CFLAGS_${ARCH})
-	@(cd ${WRKSRC32} && ${LINUXBASE}/usr/bin/make install-strip \
+	@(cd ${WRKSRC32} && ${SETENV} PATH=${LINUXBASE}/usr/bin \
+		${LOCALBASE}/bin/gmake install-strip \
 		DESTDIR=${STAGEDIR}${LINUXBASE})
 	${RM} -r ${STAGEDIR}${LINUXBASE}/usr/lib/alsa-lib/*.la
 .endif
-	@(cd ${WRKSRC} && ${LINUXBASE}/usr/bin/make install-strip \
+	@(cd ${WRKSRC} && ${SETENV} PATH=${LINUXBASE}/usr/bin \
+		${LOCALBASE}/bin/gmake install-strip \
 		DESTDIR=${STAGEDIR}${LINUXBASE})
 	${RM} -r ${STAGEDIR}${LINUXBASE}${LIBDIR_${ARCH}}/alsa-lib/*.la
 	${RM} -r ${STAGEDIR}${LINUXBASE}/etc ${STAGEDIR}${LINUXBASE}/usr/share
--- a/audio/yoshimi/Makefile
+++ b/audio/yoshimi/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	yoshimi
-DISTVERSION=	1.6.0
+DISTVERSION=	1.6.0.1
 CATEGORIES=	audio

 MAINTAINER=	tobik@FreeBSD.org
--- a/audio/yoshimi/distinfo
+++ b/audio/yoshimi/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1567341715
-SHA256 (Yoshimi-yoshimi-1.6.0_GH0.tar.gz) = 006c5101b2a3abd9f3b060f520d573b52834b551ad7efad7530c5d0469d0dd0c
-SIZE (Yoshimi-yoshimi-1.6.0_GH0.tar.gz) = 9981151
+TIMESTAMP = 1567962161
+SHA256 (Yoshimi-yoshimi-1.6.0.1_GH0.tar.gz) = 92c4570391721f8faff1059063cf36f6e9018e52be6b18bce9d3d263087afcfb
+SIZE (Yoshimi-yoshimi-1.6.0.1_GH0.tar.gz) = 9974770
--- a/cad/k40-whisperer/Makefile
+++ b/cad/k40-whisperer/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	k40-whisperer
-DISTVERSION=	0.35
+DISTVERSION=	0.36
 CATEGORIES=	cad python
 MASTER_SITES=	http://www.scorchworks.com/K40whisperer/
 DISTNAME=	K40_Whisperer-${DISTVERSION}_src
@ -42,15 +42,6 @@ NON_DATA_FILES=	${DOCS} \
 		requirements.txt
 WHISPERER_COMMAND=	${PORTNAME}

-post-patch:
-	# Replace every leading tab with 8 spaces. It is a workaround for
-	# misindented Python scripts.
-	@${REINPLACE_CMD} -e 's|^	|        |g' \
-		-e ':again' \
-		-e 's|^\(        \)*	|\1        |g' \
-		-e 't again' \
-		${WRKSRC}/*.py
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${WHISPERER_COMMAND} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
--- a/cad/k40-whisperer/distinfo
+++ b/cad/k40-whisperer/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1567611773
-SHA256 (K40_Whisperer-0.35_src.zip) = e555dc8de00d88596463d3af61d523b3df3d0beb3385aa38dab2dfbd1cfc1015
-SIZE (K40_Whisperer-0.35_src.zip) = 170723
+TIMESTAMP = 1568044883
+SHA256 (K40_Whisperer-0.36_src.zip) = 29d93d6520b76d70ee1468ed9d85308d7e668fc73a885fbdaa03e5a0da3f9b78
+SIZE (K40_Whisperer-0.36_src.zip) = 170784
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	xcircuit
-PORTVERSION=	3.10.12
+PORTVERSION=	3.10.13
 PORTEPOCH=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://opencircuitdesign.com/xcircuit/archive/ \
@ -16,7 +16,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2

-USES=		ghostscript:x11,run gmake gnome pkgconfig tar:tgz tk:tea
+USES=		ghostscript:x11,run gmake gnome pkgconfig tar:tgz tk:tea xorg

 OPTIONS_DEFINE=	EXAMPLES

--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1540589489
-SHA256 (xcircuit-3.10.12.tgz) = 92ea6366fdb58b669b62abc0c5f5662658bbaf80de01b4344b24d1eeeea0a610
-SIZE (xcircuit-3.10.12.tgz) = 1615276
+TIMESTAMP = 1567944966
+SHA256 (xcircuit-3.10.13.tgz) = 769c886531fd5f7da0142115aa67d4eb465a3da127f0ad8b8705c5b53702a2f0
+SIZE (xcircuit-3.10.13.tgz) = 1615156
--- a/cad/xcircuit/files/patch-svg.c
+++ b/cad/xcircuit/files/patch-svg.c
@ -1,11 +1,12 @@
--- svg.c.orig	2009-09-23 21:50:37.000000000 +0900
-+++ svg.c	2009-11-09 22:27:21.000000000 +0900
-@@ -8,6 +8,7 @@
+--- svg.c.orig	2019-09-08 12:19:55 UTC
+++ svg.c
+@@ -7,9 +7,7 @@
+ #include <stdlib.h>
+ #include <stdint.h>
 #include <string.h>
+-#ifndef XC_WIN32
+ #include <unistd.h>
+-#endif
 #include <math.h>
 #include <limits.h>
-+#include <unistd.h>
 #include <sys/stat.h>
- #include <sys/wait.h>
- 
-
--- a/cad/xcircuit/files/patch-tclxcircuit.c
+++ b/cad/xcircuit/files/patch-tclxcircuit.c
@ -1,11 +0,0 @@
--- tclxcircuit.c.orig	2017-04-25 12:36:04 UTC
-+++ tclxcircuit.c
-@@ -8947,7 +8947,7 @@ int defaultscript()
-          sprintf(_STR2, "%s/tcl/%s", SCRIPTS_DIR, STARTUP_FILE);
-          if ((fd = fopen(_STR2, "r")) == NULL) {
-             Wprintf("Failed to open startup script \"%s\"\n", STARTUP_FILE);
-            return;
-+            return TCL_ERROR;
- 	 }
-       }
-    }
--- a/comms/svxlink/Makefile
+++ b/comms/svxlink/Makefile
@ -3,6 +3,7 @@

 PORTNAME?=	svxlink
 PORTVERSION=	19.09.1
+PORTREVISION=	1
 CATEGORIES=	comms hamradio

 MAINTAINER=	hamradio@FreeBSD.org
--- a/comms/yfklog/Makefile
+++ b/comms/yfklog/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	yfklog
-PORTVERSION=	0.3.5
+PORTVERSION=	0.6.0
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://fkurz.net/ham/yfklog/ \
 		LOCAL/db
@ -22,9 +22,8 @@ RUN_DEPENDS=	p5-Curses>=0:devel/p5-Curses \
 		p5-Net-FTP-File>=0:net/p5-Net-FTP-File

 USES=		perl5
-NO_BUILD=	yes

-OPTIONS_DEFINE=	DOCS EXAMPLES
+NO_BUILD=	yes

 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' \
@ -34,20 +33,21 @@ post-patch:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/yfk ${STAGEDIR}${PREFIX}/bin/yfklog
 	${INSTALL_DATA} ${FILESDIR}/yfklog.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_SCRIPT} ${WRKSRC}/yfksubs.pl ${STAGEDIR}${PREFIX}/libexec/yfksubs.pl
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/yfklog
+	${INSTALL_SCRIPT} ${WRKSRC}/yfksubs.pl ${STAGEDIR}${PREFIX}/share/yfklog/yfksubs.pl
 	${INSTALL_DATA} ${_DISTDIR}/yfk.png ${STAGEDIR}${PREFIX}/share/pixmaps/yfklog.png
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for	f in cty.dat db_calls.sql db_clubs.sql \
 	db_config.sql db_log.sql db_log.sqlite \
 	zweckform3421.lab zweckform3475.lab zweckform3657.lab config
-	@${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/onlinelog
 .for	f in README  search.php test.txt
 	${INSTALL_DATA} ${WRKSRC}/onlinelog/$f ${STAGEDIR}${EXAMPLESDIR}/onlinelog
 .endfor
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/clubs
-.for	f in README hsc2sql.awk hscmember.txt
+.for	f in README
 	${INSTALL_DATA} ${WRKSRC}/clubs/$f ${STAGEDIR}${EXAMPLESDIR}/clubs
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
--- a/comms/yfklog/distinfo
+++ b/comms/yfklog/distinfo
@ -1,4 +1,5 @@
-SHA256 (yfklog/yfklog-0.3.5.tar.gz) = af46983aa8900a8b1379b0302cf7891e29e3c2af662dd96ccd7342dc2a159bbf
-SIZE (yfklog/yfklog-0.3.5.tar.gz) = 128790
+TIMESTAMP = 1568047136
+SHA256 (yfklog/yfklog-0.6.0.tar.gz) = acca744084aebed9591b2b29f899a1193fdfcb453d6e4bad574e648953e87338
+SIZE (yfklog/yfklog-0.6.0.tar.gz) = 520368
 SHA256 (yfklog/yfk.png) = e54bf52aa79ac2a90b8a901d9eea37c04b4a5895daee4736dde65110abb7d49d
 SIZE (yfklog/yfk.png) = 1495
--- a/comms/yfklog/files/patch-yfk
+++ b/comms/yfklog/files/patch-yfk
@ -1,11 +0,0 @@
--- yfk.orig	2008-06-17 17:34:44.000000000 -0400
-+++ yfk	2008-06-17 17:36:27.000000000 -0400
-@@ -28,7 +28,7 @@
- 
- my $prefix="/usr";		
- 
-require "$prefix/share/yfklog/yfksubs.pl";	
-+require "$prefix/libexec/yfksubs.pl";	
- import yfksubs;
- 
- our $yfkver = '0.3.5';	# Program Version
--- a/comms/yfklog/pkg-plist
+++ b/comms/yfklog/pkg-plist
@ -1,6 +1,6 @@
 bin/yfklog
-libexec/yfksubs.pl
 man/man1/yfklog.1.gz
+share/yfklog/yfksubs.pl
 share/pixmaps/yfklog.png
 %%DATADIR%%/config
 %%DATADIR%%/cty.dat
@ -12,16 +12,14 @@ share/pixmaps/yfklog.png
 %%DATADIR%%/zweckform3421.lab
 %%DATADIR%%/zweckform3475.lab
 %%DATADIR%%/zweckform3657.lab
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clubs/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clubs/hsc2sql.awk
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clubs/hscmember.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/onlinelog/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/onlinelog/search.php
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/onlinelog/test.txt
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/MANUAL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASENOTES
+%%EXAMPLESDIR%%/clubs/README
+%%EXAMPLESDIR%%/onlinelog/README
+%%EXAMPLESDIR%%/onlinelog/search.php
+%%EXAMPLESDIR%%/onlinelog/test.txt
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/CHANGELOG
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/MANUAL
+%%DOCSDIR%%/README
+%%DOCSDIR%%/RELEASENOTES
--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	osm2pgsql
-PORTVERSION=	0.96.0
-PORTREVISION=	7
+PORTVERSION=	1.0.0
 CATEGORIES=	converters geography

 MAINTAINER=	amdmi3@FreeBSD.org
@ -19,7 +18,7 @@ LIB_DEPENDS=	libproj.so:graphics/proj \
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap

-USES=		cmake compiler:c++11-lang lua:53 pgsql
+USES=		cmake compiler:c++11-lang pgsql

 CXXFLAGS+=	"-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"

@ -29,7 +28,12 @@ PLIST_FILES=	bin/osm2pgsql \
 PORTDOCS=	AUTHORS ChangeLog README.md
 PORTDATA=	*

-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS LUAJIT
+
+LUAJIT_DESC=		Build with LuaJIT support
+LUAJIT_CMAKE_BOOL=	WITH_LUAJIT
+LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
+LUAJIT_USES_OFF=	lua:53

 post-patch:
 	@${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' ${WRKSRC}/CMakeLists.txt
--- a/converters/osm2pgsql/distinfo
+++ b/converters/osm2pgsql/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1525370298
-SHA256 (openstreetmap-osm2pgsql-0.96.0_GH0.tar.gz) = b6020e77d88772989279a69ae4678e9782989b630613754e483b5192cd39c723
-SIZE (openstreetmap-osm2pgsql-0.96.0_GH0.tar.gz) = 1219163
+TIMESTAMP = 1567801524
+SHA256 (openstreetmap-osm2pgsql-1.0.0_GH0.tar.gz) = e938f7b82a94ab6746da4f0dffdc0f60a55e6a596890e57eb169823e090b7cb9
+SIZE (openstreetmap-osm2pgsql-1.0.0_GH0.tar.gz) = 1222604
--- a/databases/grass7/Makefile
+++ b/databases/grass7/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	grass
 PORTVERSION=	7.6.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases geography
 MASTER_SITES=	https://grass.osgeo.org/%SUBDIR%/ \
 		http://grass.cict.fr/%SUBDIR%/ \
@ -79,12 +79,12 @@ PLIST_SUB=	GRASS_INST_DIR="${GRASS_INST_DIR}" \
 		VERSION="${PORTVERSION}" VERS="${PORTVERSION:C/([0-9]+).([0-9]+)(.*)/\1.\2/}" \
 		VER="${VER}" MAJVER="${PKGNAMESUFFIX}"

-OPTIONS_DEFINE=		LAS MOTIF NETCDF PDAL
+OPTIONS_DEFINE=		LAS NETCDF PDAL
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	MYSQL ODBC PGSQL SQLITE
 #OPTIONS_SINGLE=		BLAS
 #OPTIONS_SINGLE_BLAS=	ATLAS NETLIB GOTOBLAS OPENBLAS
-OPTIONS_DEFAULT=	LAS PDAL PGSQL SQLITE NETLIB MOTIF NETCDF MYSQL ODBC
+OPTIONS_DEFAULT=	LAS PDAL PGSQL SQLITE NETLIB NETCDF MYSQL ODBC
 OPTIONS_SUB=		yes

 #BLAS_DESC=		BLAS/LAPACK support
@ -101,9 +101,6 @@ LAS_LIB_DEPENDS=	liblas.so:devel/liblas \
 			libboost_program_options.so:devel/boost-libs \
 			libboost_thread.so:devel/boost-libs \
 			libgeotiff.so:graphics/libgeotiff
-MOTIF_USES=		motif
-MOTIF_USE=		GL=glw
-MOTIF_CONFIGURE_ON=	--with-motif --with-glw
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-mysql \
 			--with-mysql-includes=${LOCALBASE}/include/mysql \
--- a/databases/iplike/Makefile
+++ b/databases/iplike/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	iplike
-PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTVERSION=	2.1.3
 CATEGORIES=	databases
 MASTER_SITES=	SF/opennms/IPLIKE/stable-2.1/

--- a/databases/iplike/distinfo
+++ b/databases/iplike/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1550939644
-SHA256 (iplike-2.1.1.tar.gz) = 7c68a44e4696c185ee974f7eaa9d4d2f9e68d7827ba417973556fe11a8f8f62d
-SIZE (iplike-2.1.1.tar.gz) = 357850
+TIMESTAMP = 1568026022
+SHA256 (iplike-2.1.3.tar.gz) = 516e6522d03ef8c8345f0d84100a18fac1c4c0959a2ab23c4158e8b36b48a622
+SIZE (iplike-2.1.3.tar.gz) = 357938
--- a/deskutils/calcurse/Makefile
+++ b/deskutils/calcurse/Makefile
@ -2,9 +2,9 @@
 # $FreeBSD$

 PORTNAME=	calcurse
-PORTVERSION=	4.3.0
+PORTVERSION=	4.5.0
 CATEGORIES=	deskutils
-MASTER_SITES=	http://calcurse.org/files/
+MASTER_SITES=	https://calcurse.org/files/

 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Text-based calendar and scheduling application
@ -18,7 +18,9 @@ OPTIONS_SUB=	yes

 USES=		gmake ncurses shebangfix
 SHEBANG_FILES=	contrib/caldav/calcurse-caldav \
-		contrib/caldav/calcurse-caldav.py
+		contrib/caldav/calcurse-caldav.py \
+		contrib/vdir/calcurse-vdir \
+		contrib/vdir/calcurse-vdir.py
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-asciidoc

--- a/deskutils/calcurse/distinfo
+++ b/deskutils/calcurse/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1517490109
-SHA256 (calcurse-4.3.0.tar.gz) = 31ecc3dc09e1e561502b4c94f965ed6b167c03e9418438c4a7ad5bad2c785f9a
-SIZE (calcurse-4.3.0.tar.gz) = 597490
+TIMESTAMP = 1568036850
+SHA256 (calcurse-4.5.0.tar.gz) = c372ef16abcacb33a1aca99d0d4eba7c5cc8121fa96360f9d6edc0506e655cee
+SIZE (calcurse-4.5.0.tar.gz) = 657976
--- a/deskutils/calcurse/pkg-descr
+++ b/deskutils/calcurse/pkg-descr
@ -4,4 +4,4 @@ A configurable notification system reminds user of upcoming deadlines,
 and the curses based interface can be customized to suit user needs.
 All of the commands are documented within an online help system.

-WWW: http://calcurse.org/
+WWW: https://calcurse.org/
--- a/deskutils/calcurse/pkg-plist
+++ b/deskutils/calcurse/pkg-plist
@ -1,6 +1,7 @@
 bin/calcurse
 bin/calcurse-caldav
 bin/calcurse-upgrade
+bin/calcurse-vdir
 man/man1/calcurse.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/add.txt
 %%PORTDOCS%%%%DOCSDIR%%/config.txt
--- a/devel/aws-c-commons/Makefile
+++ b/devel/aws-c-commons/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	aws-c-common
-PORTVERSION=	0.3.9
-PORTREVISION=	1
+PORTVERSION=	0.4.6
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	devel
--- a/devel/aws-c-commons/distinfo
+++ b/devel/aws-c-commons/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1559160349
-SHA256 (awslabs-aws-c-common-v0.3.9_GH0.tar.gz) = c7cca1dc0adf5f565bb6478b04dbee76bea51d7127609c9d07f2971cd68ab327
-SIZE (awslabs-aws-c-common-v0.3.9_GH0.tar.gz) = 218283
+TIMESTAMP = 1568026655
+SHA256 (awslabs-aws-c-common-v0.4.6_GH0.tar.gz) = 82e866d48f4bce41bcf915583d2c3fe73c32d6f8af3a8fb3177dec37c0ac0188
+SIZE (awslabs-aws-c-common-v0.4.6_GH0.tar.gz) = 304308
--- a/devel/aws-c-commons/pkg-plist
+++ b/devel/aws-c-commons/pkg-plist
@ -1,14 +1,18 @@
+include/aws/common/allocator.h
 include/aws/common/array_list.h
 include/aws/common/array_list.inl
-include/aws/common/assert.inl
+include/aws/common/assert.h
 include/aws/common/atomics.h
+include/aws/common/atomics.inl
 include/aws/common/atomics_fallback.inl
 include/aws/common/atomics_gnu.inl
 include/aws/common/atomics_gnu_old.inl
 include/aws/common/atomics_msvc.inl
 include/aws/common/byte_buf.h
 include/aws/common/byte_order.h
+include/aws/common/byte_order.inl
 include/aws/common/clock.h
+include/aws/common/clock.inl
 include/aws/common/command_line_parser.h
 include/aws/common/common.h
 include/aws/common/condition_variable.h
@ -16,27 +20,46 @@ include/aws/common/config.h
 include/aws/common/date_time.h
 include/aws/common/device_random.h
 include/aws/common/encoding.h
+include/aws/common/encoding.inl
 include/aws/common/environment.h
 include/aws/common/error.h
+include/aws/common/error.inl
 include/aws/common/exports.h
 include/aws/common/hash_table.h
 include/aws/common/linked_list.h
+include/aws/common/linked_list.inl
+include/aws/common/log_channel.h
+include/aws/common/log_formatter.h
+include/aws/common/log_writer.h
+include/aws/common/logging.h
 include/aws/common/lru_cache.h
+include/aws/common/macros.h
+include/aws/common/math.cbmc.inl
 include/aws/common/math.fallback.inl
 include/aws/common/math.gcc_overflow.inl
 include/aws/common/math.gcc_x64_asm.inl
 include/aws/common/math.h
+include/aws/common/math.inl
 include/aws/common/math.msvc.inl
 include/aws/common/mutex.h
 include/aws/common/posix/common.inl
+include/aws/common/predicates.h
 include/aws/common/priority_queue.h
+include/aws/common/ring_buffer.h
+include/aws/common/ring_buffer.inl
 include/aws/common/rw_lock.h
+include/aws/common/stdbool.h
+include/aws/common/stdint.h
 include/aws/common/string.h
+include/aws/common/string.inl
 include/aws/common/system_info.h
 include/aws/common/task_scheduler.h
 include/aws/common/thread.h
 include/aws/common/time.h
 include/aws/common/uuid.h
+include/aws/common/zero.h
+include/aws/common/zero.inl
+include/aws/testing/aws_test_allocators.h
 include/aws/testing/aws_test_harness.h
 lib/aws-c-common/cmake/aws-c-common-config.cmake
 lib/aws-c-common/cmake/aws-c-common-targets-release.cmake
--- a/devel/aws-c-event-stream/Makefile
+++ b/devel/aws-c-event-stream/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	aws-c-event-stream
-PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTVERSION=	0.1.2
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	devel
@ -21,7 +20,7 @@ USES=		cmake compiler:c11
 USE_GITHUB=	yes
 GH_ACCOUNT=	awslabs

-CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=ON
+CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_LIBDIR=${LOCALBASE}/lib
 LDFLAGS+=	-lexecinfo -lpthread

 USE_LDCONFIG=	yes
--- a/devel/aws-c-event-stream/distinfo
+++ b/devel/aws-c-event-stream/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1547063997
-SHA256 (awslabs-aws-c-event-stream-v0.1.1_GH0.tar.gz) = e5ff7baa4bf90da1413ebed21edbc5b6c17bc13462036d128019886edac70ba5
-SIZE (awslabs-aws-c-event-stream-v0.1.1_GH0.tar.gz) = 27614
+TIMESTAMP = 1568026244
+SHA256 (awslabs-aws-c-event-stream-v0.1.2_GH0.tar.gz) = 9fadc2bad97eedcbdbd971dfc78815fb6f0cc09b82bd0de6632f267115023b07
+SIZE (awslabs-aws-c-event-stream-v0.1.2_GH0.tar.gz) = 27872
--- a/devel/aws-checksums/Makefile
+++ b/devel/aws-checksums/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	aws-checksums
-PORTVERSION=	0.1.2
+PORTVERSION=	0.1.3
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	devel
--- a/devel/aws-checksums/distinfo
+++ b/devel/aws-checksums/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1547063623
-SHA256 (awslabs-aws-checksums-v0.1.2_GH0.tar.gz) = 5b2111c1f86324aca276eabd0f4d2802bc48a3ae6a4f2e87d999028fe7e82a17
-SIZE (awslabs-aws-checksums-v0.1.2_GH0.tar.gz) = 78026
+TIMESTAMP = 1568027075
+SHA256 (awslabs-aws-checksums-v0.1.3_GH0.tar.gz) = c0236128f43303bf1085d0424e578cc2b1bb7cb874016840e2bcb7e0eed30078
+SIZE (awslabs-aws-checksums-v0.1.3_GH0.tar.gz) = 78242
--- a/devel/aws-sdk-cpp/Makefile
+++ b/devel/aws-sdk-cpp/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	aws-sdk-cpp
-PORTVERSION=	1.7.113
-PORTREVISION=	1
+PORTVERSION=	1.7.178
 CATEGORIES=	devel

 MAINTAINER=	danilo@FreeBSD.org
--- a/devel/aws-sdk-cpp/distinfo
+++ b/devel/aws-sdk-cpp/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1559160293
-SHA256 (aws-aws-sdk-cpp-1.7.113_GH0.tar.gz) = fb3c9af166725df8e25ac9afcf0df433cb5d19b7a384497c49a4e4363a3c21f7
-SIZE (aws-aws-sdk-cpp-1.7.113_GH0.tar.gz) = 21248186
+TIMESTAMP = 1568027338
+SHA256 (aws-aws-sdk-cpp-1.7.178_GH0.tar.gz) = 28c8eca4c349ae5a8a915ab30263f1147e2fb57d84a2fcd9c79d12dce7c5071a
+SIZE (aws-aws-sdk-cpp-1.7.178_GH0.tar.gz) = 22589166
--- a/devel/aws-sdk-cpp/pkg-plist
+++ b/devel/aws-sdk-cpp/pkg-plist
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@ -2,8 +2,8 @@
 # $FreeBSD$

 PORTNAME=	cppcheck
-PORTVERSION=	1.88
-PORTREVISION?=	1	# devel/cppcheck-gui
+PORTVERSION=	1.89
+PORTREVISION?=	0	# devel/cppcheck-gui
 CATEGORIES=	devel

 MAINTAINER=	amdmi3@FreeBSD.org
@ -35,6 +35,8 @@ PKGNAMESUFFIX=		-gui
 USES+=			shebangfix
 SHEBANG_FILES=		htmlreport/cppcheck-htmlreport

+PORTDATA=		*
+
 OPTIONS_DEFINE=		RULES HTMLREPORT MANPAGES MATCHCOMPILER TEST
 OPTIONS_DEFAULT=	RULES HTMLREPORT MANPAGES MATCHCOMPILER
 OPTIONS_SUB=		yes
--- a/devel/cppcheck/distinfo
+++ b/devel/cppcheck/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1562000248
-SHA256 (danmar-cppcheck-1.88_GH0.tar.gz) = 4aace0420d6aaa900b84b3329c5173c2294e251d2e24d8cba6e38254333dde3f
-SIZE (danmar-cppcheck-1.88_GH0.tar.gz) = 2364053
+TIMESTAMP = 1567801420
+SHA256 (danmar-cppcheck-1.89_GH0.tar.gz) = 37452d378825c7bd78116b4d7073df795fa732207d371ad5348287f811755783
+SIZE (danmar-cppcheck-1.89_GH0.tar.gz) = 2455141
--- a/devel/cppcheck/pkg-plist
+++ b/devel/cppcheck/pkg-plist
@ -1,29 +1,2 @@
 bin/cppcheck
-%%DATADIR%%/avr.cfg
-%%DATADIR%%/boost.cfg
-%%DATADIR%%/bsd.cfg
-%%DATADIR%%/cppcheck-lib.cfg
-%%DATADIR%%/cppunit.cfg
-%%DATADIR%%/daca.cfg
-%%DATADIR%%/embedded_sql.cfg
-%%DATADIR%%/gnu.cfg
-%%DATADIR%%/googletest.cfg
-%%DATADIR%%/gtk.cfg
-%%DATADIR%%/libcerror.cfg
-%%DATADIR%%/microsoft_sal.cfg
-%%DATADIR%%/motif.cfg
-%%DATADIR%%/nspr.cfg
-%%DATADIR%%/opengl.cfg
-%%DATADIR%%/posix.cfg
-%%DATADIR%%/python.cfg
-%%DATADIR%%/qt.cfg
-%%DATADIR%%/ruby.cfg
-%%DATADIR%%/sdl.cfg
-%%DATADIR%%/sfml.cfg
-%%DATADIR%%/sqlite3.cfg
-%%DATADIR%%/std.cfg
-%%DATADIR%%/tinyxml2.cfg
-%%DATADIR%%/windows.cfg
-%%DATADIR%%/wxwidgets.cfg
-%%DATADIR%%/zlib.cfg
 %%MANPAGES%%man/man1/cppcheck.1.gz
--- a/devel/cvs2cl/pkg-descr
+++ b/devel/cvs2cl/pkg-descr
@ -4,4 +4,4 @@ This Perl script does what you think it does: It produces a GNU-style
 ChangeLog for CVS-controlled sources, by running "cvs log" and parsing
 the output. Duplicate log messages get unified in the Right Way.

-WWW: http://www.red-bean.com/cvs2cl/
+WWW: https://www.red-bean.com/cvs2cl/
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	gitaly
-DISTVERSION=	1.53.3
+DISTVERSION=	1.59.2
 PORTREVISION=	0
 CATEGORIES=	devel

@ -14,21 +14,20 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # define dependencies that are required for build and run under MY_DEPENDS
 MY_DEPENDS=	git>=2.21:devel/git \
 		rubygem-bundler>=1.17.3:sysutils/rubygem-bundler \
-		rubygem-rugged>=0.28.0:devel/rubygem-rugged \
-		rubygem-github-linguist>=6.1:textproc/rubygem-github-linguist \
-		rubygem-gitlab-markup>=1.7.0:textproc/rubygem-gitlab-markup \
-		rubygem-activesupport52>=5.2.3:devel/rubygem-activesupport52 \
-		rubygem-gitaly-proto>=1.32.0:net/rubygem-gitaly-proto \
+		rubygem-rugged>=0.28<1.0:devel/rubygem-rugged \
+		rubygem-github-linguist>=6.1<7.0:textproc/rubygem-github-linguist \
+		rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \
+		rubygem-activesupport52>=5.2.3<5.3.0:devel/rubygem-activesupport52 \
 		rubygem-rdoc>=6.0:devel/rubygem-rdoc \
-		rubygem-gitlab-gollum-lib>=4.2.7.7:www/rubygem-gitlab-gollum-lib \
-		rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2:www/rubygem-gitlab-gollum-rugged_adapter \
-		rubygem-grpc>=1.19.0:net/rubygem-grpc \
-		rubygem-sentry-raven>=2.9.0:devel/rubygem-sentry-raven \
-		rubygem-faraday>=0.12:www/rubygem-faraday \
+		rubygem-gitlab-gollum-lib>=4.2.7.7<4.2.8.0:www/rubygem-gitlab-gollum-lib \
+		rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
+		rubygem-grpc>=1.19.0<1.20.0:net/rubygem-grpc \
+		rubygem-sentry-raven>=2.9.0<2.10.0:devel/rubygem-sentry-raven \
+		rubygem-faraday>=0.12<1.0:www/rubygem-faraday \
 		rubygem-rbtrace>0:devel/rubygem-rbtrace \
-		rubygem-gitlab-labkit>=0.3.0:devel/rubygem-gitlab-labkit \
-		rubygem-licensee8>=8.9.0:devel/rubygem-licensee8 \
-		rubygem-google-protobuf371>=3.7.1:devel/rubygem-google-protobuf371
+		rubygem-gitlab-labkit>=0.4.0<0.5.0:devel/rubygem-gitlab-labkit \
+		rubygem-licensee8>=8.9.0<8.10.0:devel/rubygem-licensee8 \
+		rubygem-google-protobuf371>=3.7.1<3.8.0:devel/rubygem-google-protobuf371
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 		${MY_DEPENDS}
 RUN_DEPENDS=	${MY_DEPENDS} \
@ -42,7 +41,7 @@ MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/tags
-GL_COMMIT=	37b71fbdfe4375bb8eaf64f855f1182caf066ec7
+GL_COMMIT=	1e7005f12bda1dfd0b724ebc039cca75f1cd38d1

 # for go dependencies
 USE_GITHUB=	nodefault
@ -56,11 +55,11 @@ GH_TUPLE=	\
 		codahale:hdrhistogram:3a0bb77429bd:codahale_hdrhistogram/vendor/github.com/codahale/hdrhistogram \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		getsentry:raven-go:v0.1.2:getsentry_raven_go/vendor/github.com/getsentry/raven-go \
-		golang:crypto:c2843e01d9a2:golang_crypto/vendor/golang.org/x/crypto \
+		golang:crypto:20be4c3c3ed5:golang_crypto/vendor/golang.org/x/crypto \
 		golang:net:d28f0bde5980:golang_net/vendor/golang.org/x/net \
 		golang:protobuf:v1.3.1:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:sync:37e7f081c4d4:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:d0b11bdaac8a:golang_sys/vendor/golang.org/x/sys \
+		golang:sys:953cdadca894:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
 		google:go-genproto:bd91e49a0898:google_go_genproto/vendor/google.golang.org/genproto \
 		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
@ -86,10 +85,8 @@ GH_TUPLE=	\
 		uber:jaeger-client-go:v2.15.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \
 		uber:jaeger-lib:v1.5.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib
 GL_TUPLE=	\
-		gitlab-org:gitaly-proto:f5d7f3cf76555acb5a14ae80eb7db4ad9ff2c553:gitlab_org_gitaly_proto/vendor/gitlab.com/gitlab-org/gitaly-proto \
 		gitlab-org:labkit:0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit

-
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example
 	${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@ -1,4 +1,4 @@
-TIMESTAMP = 1566042205
+TIMESTAMP = 1567416269
 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
 SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
@ -15,16 +15,16 @@ SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
 SHA256 (getsentry-raven-go-v0.1.2_GH0.tar.gz) = fe603da75a8284273f253a8524d456cd6293fb47508d907f830153ed9af98cb5
 SIZE (getsentry-raven-go-v0.1.2_GH0.tar.gz) = 19314
-SHA256 (golang-crypto-c2843e01d9a2_GH0.tar.gz) = a4d91350f176b2ef99084cd71f990ecee5f549efed72ef59a5b9e425a00d454a
-SIZE (golang-crypto-c2843e01d9a2_GH0.tar.gz) = 1650817
+SHA256 (golang-crypto-20be4c3c3ed5_GH0.tar.gz) = bc78136186ecd1683395d9094a7b973cb01675529131ac59f484e2716609de6f
+SIZE (golang-crypto-20be4c3c3ed5_GH0.tar.gz) = 1690016
 SHA256 (golang-net-d28f0bde5980_GH0.tar.gz) = 40f4d37b315f4a6867ab5beadf4d73f93b9c1d777b48ec66d59f953a4a19acb4
 SIZE (golang-net-d28f0bde5980_GH0.tar.gz) = 1097062
 SHA256 (golang-protobuf-v1.3.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf
 SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884
 SHA256 (golang-sync-37e7f081c4d4_GH0.tar.gz) = d0f0ce92264903fa32032fc365c0c0d36d129fa282d74364c406179a94714f10
 SIZE (golang-sync-37e7f081c4d4_GH0.tar.gz) = 16238
-SHA256 (golang-sys-d0b11bdaac8a_GH0.tar.gz) = e7e3f36dd307e908e59dbda3864ff74f9a5d7f0fdd4d88af630e092beb7d270c
-SIZE (golang-sys-d0b11bdaac8a_GH0.tar.gz) = 1243049
+SHA256 (golang-sys-953cdadca894_GH0.tar.gz) = fb56f244784dac7e7f66fc0ff9f5ff6adbd49ccb8f3625285e6e39254b64c12f
+SIZE (golang-sys-953cdadca894_GH0.tar.gz) = 1353286
 SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
 SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
 SHA256 (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 659ae77d08446b4bcb7d6b8a9c050d903e6e13fbd903541da7bf9966142e9377
@ -73,9 +73,7 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137
 SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460
 SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3
 SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655
-SHA256 (gitlab-org-gitaly-37b71fbdfe4375bb8eaf64f855f1182caf066ec7_GL0.tar.gz) = c069342eb5d1b87fb5bdc5876ede1157c04ec5de0501628813a95c02f2dd34ac
-SIZE (gitlab-org-gitaly-37b71fbdfe4375bb8eaf64f855f1182caf066ec7_GL0.tar.gz) = 2097542
-SHA256 (gitlab-org-gitaly-proto-f5d7f3cf76555acb5a14ae80eb7db4ad9ff2c553_GL0.tar.gz) = 20befa9ab47936d6a83fd362f5609d293dd4f6a3cb49d5b0049f6c8d6434810a
-SIZE (gitlab-org-gitaly-proto-f5d7f3cf76555acb5a14ae80eb7db4ad9ff2c553_GL0.tar.gz) = 178864
+SHA256 (gitlab-org-gitaly-1e7005f12bda1dfd0b724ebc039cca75f1cd38d1_GL0.tar.gz) = 803b300bfb0a7491158ae768b65d6dcd402954a6a24fb663f7f80f8e880485ad
+SIZE (gitlab-org-gitaly-1e7005f12bda1dfd0b724ebc039cca75f1cd38d1_GL0.tar.gz) = 2727106
 SHA256 (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 449f2e2d1cedea1ea276a1d8132d0244a4c5ffc465d2a24b824ab9790641f78e
 SIZE (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 2280466
--- a/devel/gitaly/files/patch-__support_makegen.go
+++ b/devel/gitaly/files/patch-__support_makegen.go
@ -1,6 +1,6 @@
--- _support/makegen.go.orig	2019-06-18 09:53:31 UTC
+--- _support/makegen.go.orig	2019-08-22 16:24:24 UTC
 +++ _support/makegen.go
-@@ -282,7 +282,7 @@ var templateText = `
+@@ -320,7 +320,7 @@ var templateText = `
 # These variables may be overridden at runtime by top-level make
 PREFIX ?= /usr/local
 INSTALL_DEST_DIR := $(DESTDIR)$(PREFIX)/bin/
@ -9,13 +9,13 @@
 ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly
 BUILD_TAGS := tracer_static tracer_static_jaeger
 
-@@ -330,8 +330,8 @@ build: ../.ruby-bundle
+@@ -368,8 +368,8 @@ build: ../.ruby-bundle
 # step. Both Omnibus and CNG assume it is in the Gitaly root, not in
 # _build. Hence the '../' in front.
 ../.ruby-bundle:  {{ .GitalyRubyDir }}/Gemfile.lock  {{ .GitalyRubyDir }}/Gemfile
 +	cd  {{ .GitalyRubyDir }} && rm Gemfile.lock && bundle install $(BUNDLE_FLAGS)
 	cd  {{ .GitalyRubyDir }} && bundle config # for debugging
 -	cd  {{ .GitalyRubyDir }} && bundle install $(BUNDLE_FLAGS)
- 	cd  {{ .GitalyRubyDir }} && bundle show gitaly-proto # sanity check
 	touch $@
 
+ .PHONY: install
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@ -1,19 +1,15 @@
--- ruby/Gemfile.orig	2019-07-11 10:11:31 UTC
+--- ruby/Gemfile.orig	2019-08-22 16:24:24 UTC
 +++ ruby/Gemfile
-@@ -6,9 +6,9 @@ gem 'bundler', '>= 1.17.3'
- gem 'rugged', '~> 0.28'
+@@ -7,7 +7,7 @@ gem 'rugged', '~> 0.28'
 gem 'github-linguist', '~> 6.1', require: 'linguist'
 gem 'gitlab-markup', '~> 1.7.0'
-gem 'activesupport', '~> 5.1.7'
-gem 'gitaly-proto', '~> 1.36.0'
+ gem 'activesupport', '~> 5.2.3'
 -gem 'rdoc', '~> 4.2'
-+gem 'activesupport', '~> 5.2.3'
-+gem 'gitaly-proto', '~> 1.37.0'
 +gem 'rdoc', '~> 6.0'
 gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
 gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
 gem 'grpc', '~> 1.19.0'
-@@ -25,17 +25,3 @@ gem 'licensee', '~> 8.9.0'
+@@ -24,17 +24,3 @@ gem 'licensee', '~> 8.9.0'
 
 gem 'google-protobuf', '~> 3.7.1'
 
--- a/devel/gitaly/pkg-plist
+++ b/devel/gitaly/pkg-plist
@ -142,6 +142,42 @@
 %%DATADIR%%/ruby/lib/gitlab/rails_logger.rb
 %%DATADIR%%/ruby/lib/gitlab/ref_matcher.rb
 %%DATADIR%%/ruby/lib/gitlab/utils/strong_memoize.rb
+%%DATADIR%%/ruby/proto/README.md
+%%DATADIR%%/ruby/proto/gitaly.rb
+%%DATADIR%%/ruby/proto/gitaly/blob_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/blob_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/cleanup_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/cleanup_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/commit_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/commit_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/conflicts_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/conflicts_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/diff_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/diff_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/namespace_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/namespace_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/objectpool_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/objectpool_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/operations_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/operations_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/ref_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/ref_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/remote_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/remote_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/repository-service_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/repository-service_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/server_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/server_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/shared_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/smarthttp_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/smarthttp_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/ssh_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/ssh_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/storage_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/storage_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/version.rb
+%%DATADIR%%/ruby/proto/gitaly/wiki_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/wiki_services_pb.rb
 %%DATADIR%%/ruby/spec/factories/gitaly/commit.rb
 %%DATADIR%%/ruby/spec/factories/gitaly/commit_author.rb
 %%DATADIR%%/ruby/spec/factories/sequences.rb
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	jenkins
-PORTVERSION=	2.193
+PORTVERSION=	2.194
 CATEGORIES=	devel java
 MASTER_SITES=	http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
 DISTNAME=	jenkins
--- a/devel/jenkins/distinfo
+++ b/devel/jenkins/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1567589365
-SHA256 (jenkins/2.193/jenkins.war) = 516d8fd3ef9a6c622079a0b200419f5c7039b3cc9de5d473410111b0f45c8985
-SIZE (jenkins/2.193/jenkins.war) = 78246752
+TIMESTAMP = 1568047225
+SHA256 (jenkins/2.194/jenkins.war) = 25e01768f8f7e2d677fdb09591e5c78f1c9b191ec8e5526f0adbed4d1dbc668a
+SIZE (jenkins/2.194/jenkins.war) = 78327249
--- a/devel/libregf/Makefile
+++ b/devel/libregf/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	libregf
-DISTVERSION=	alpha-20190714
+DISTVERSION=	alpha-20190808
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libregf/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
--- a/devel/libregf/distinfo
+++ b/devel/libregf/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1563169712
-SHA256 (libregf-alpha-20190714.tar.gz) = 41f9b83cb9a2d97f5eadde8f7e7800742a831e56bd0c88443cfe0b5bc80cb768
-SIZE (libregf-alpha-20190714.tar.gz) = 1589443
+TIMESTAMP = 1565295729
+SHA256 (libregf-alpha-20190808.tar.gz) = 740469a611ce8073e85b3777409515e9fa8f75680a239f5463dff17c7a5dfa2a
+SIZE (libregf-alpha-20190808.tar.gz) = 1596245
--- a/devel/p5-Test-Compile/Makefile
+++ b/devel/p5-Test-Compile/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Test-Compile
-PORTVERSION=	1.3.0
+PORTVERSION=	2.2.2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EGILES
--- a/devel/p5-Test-Compile/distinfo
+++ b/devel/p5-Test-Compile/distinfo
@ -1,2 +1,3 @@
-SHA256 (Test-Compile-v1.3.0.tar.gz) = 77527e9477ac5260443c756367a7f7bc3d8f6c6ebbc561b0b2fb3f79303bad33
-SIZE (Test-Compile-v1.3.0.tar.gz) = 15198
+TIMESTAMP = 1568033474
+SHA256 (Test-Compile-v2.2.2.tar.gz) = 7853b44a9819eb3e6003260eedf904a1ad80035ea5254296ce014f96084b65d4
+SIZE (Test-Compile-v2.2.2.tar.gz) = 17532
--- a/devel/p5-Test2-Harness/Makefile
+++ b/devel/p5-Test2-Harness/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Test2-Harness
-PORTVERSION=	0.001095
+PORTVERSION=	0.001096
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EXODIST
--- a/devel/p5-Test2-Harness/distinfo
+++ b/devel/p5-Test2-Harness/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1567688295
-SHA256 (Test2-Harness-0.001095.tar.gz) = ab52ddcc98b0e5ea7791516e249423a10714e8ea6b0b7a01187840122dd833ce
-SIZE (Test2-Harness-0.001095.tar.gz) = 535787
+TIMESTAMP = 1568051694
+SHA256 (Test2-Harness-0.001096.tar.gz) = 6dc70d5a0531eb7be868d2495de52b99b5f3f98bdab48c9e6bef44b9f8e5b268
+SIZE (Test2-Harness-0.001096.tar.gz) = 210861
--- a/devel/pmd/Makefile
+++ b/devel/pmd/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	pmd
-PORTVERSION=	6.12.0
+PORTVERSION=	6.17.0
 CATEGORIES=	devel java
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-bin-${PORTVERSION}
--- a/devel/pmd/distinfo
+++ b/devel/pmd/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1551542863
-SHA256 (pmd-bin-6.12.0.zip) = c9a523d5d59f646e7ec1c9282ef93ef6e4339ca43d1e6f5ac0415c1385595eb9
-SIZE (pmd-bin-6.12.0.zip) = 46084063
+TIMESTAMP = 1568030688
+SHA256 (pmd-bin-6.17.0.zip) = 1c794cd4791a636691f0b5ccaaba073e83b01d68a7c3ce8e7ee897d790e00000
+SIZE (pmd-bin-6.17.0.zip) = 48249469
--- a/devel/pmd/pkg-plist
+++ b/devel/pmd/pkg-plist
@ -6,22 +6,15 @@ bin/pmd
 %%DATADIR%%/antlr-runtime-3.5.2.jar
 %%DATADIR%%/antlr4-runtime-4.7.jar
 %%DATADIR%%/aopalliance-1.0.jar
-%%DATADIR%%/asm-7.0.jar
+%%DATADIR%%/asm-7.1.jar
 %%DATADIR%%/cglib-3.2.0.jar
 %%DATADIR%%/checker-qual-2.5.2.jar
-%%DATADIR%%/commons-beanutils-core-1.8.3.jar
 %%DATADIR%%/commons-io-2.6.jar
 %%DATADIR%%/commons-lang3-3.8.1.jar
-%%DATADIR%%/commons-logging-1.1.1.jar
-%%DATADIR%%/controlsfx-8.40.13.jar
 %%DATADIR%%/error_prone_annotations-2.1.3.jar
-%%DATADIR%%/flowless-0.6.jar
 %%DATADIR%%/groovy-2.4.7.jar
 %%DATADIR%%/gson-2.8.5.jar
 %%DATADIR%%/guava-26.0-jre.jar
-%%DATADIR%%/ikonli-core-2.3.0.jar
-%%DATADIR%%/ikonli-fontawesome5-pack-2.3.0.jar
-%%DATADIR%%/ikonli-javafx-2.3.0.jar
 %%DATADIR%%/j2objc-annotations-1.1.jar
 %%DATADIR%%/javacc-5.0.jar
 %%DATADIR%%/javax.inject-1.jar
@ -36,6 +29,7 @@ bin/pmd
 %%DATADIR%%/pmd-core-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-cpp-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-cs-%%PORTVERSION%%.jar
+%%DATADIR%%/pmd-dart-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-fortran-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-go-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-groovy-%%PORTVERSION%%.jar
@ -43,6 +37,7 @@ bin/pmd
 %%DATADIR%%/pmd-javascript-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-jsp-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-kotlin-%%PORTVERSION%%.jar
+%%DATADIR%%/pmd-lua-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-matlab-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-objectivec-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-perl-%%PORTVERSION%%.jar
@ -56,9 +51,7 @@ bin/pmd
 %%DATADIR%%/pmd-visualforce-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-vm-%%PORTVERSION%%.jar
 %%DATADIR%%/pmd-xml-%%PORTVERSION%%.jar
-%%DATADIR%%/reactfx-2.0-M5.jar
 %%DATADIR%%/rhino-1.7.7.2.jar
-%%DATADIR%%/richtextfx-0.9.2.jar
 %%DATADIR%%/saxon-9.1.0.8-dom.jar
 %%DATADIR%%/saxon-9.1.0.8.jar
 %%DATADIR%%/scala-compiler-2.12.4.jar
@ -68,5 +61,3 @@ bin/pmd
 %%DATADIR%%/slf4j-api-1.7.25.jar
 %%DATADIR%%/snakeyaml-1.17.jar
 %%DATADIR%%/stringtemplate-3.2.1.jar
-%%DATADIR%%/undofx-2.1.0.jar
-%%DATADIR%%/wellbehavedfx-0.3.3.jar
--- a/devel/py-arrow/Makefile
+++ b/devel/py-arrow/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	arrow
-PORTVERSION=	0.14.7
+PORTVERSION=	0.15.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-arrow/distinfo
+++ b/devel/py-arrow/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1567688299
-SHA256 (arrow-0.14.7.tar.gz) = 67f8be7c0cf420424bc62d8d7dc40b44e4bb2f7b515f9cc2954fb36e35797656
-SIZE (arrow-0.14.7.tar.gz) = 67657
+TIMESTAMP = 1568051699
+SHA256 (arrow-0.15.0.tar.gz) = 9b92a8e151e168b742a36b622deadf860d1686af8c5bbe46eca8da04b10fe92f
+SIZE (arrow-0.15.0.tar.gz) = 70963
--- a/devel/py-tblib/Makefile
+++ b/devel/py-tblib/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	tblib
-PORTVERSION=	1.3.2
+PORTVERSION=	1.4.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-tblib/distinfo
+++ b/devel/py-tblib/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1492205405
-SHA256 (tblib-1.3.2.tar.gz) = 436e4200e63d92316551179dc540906652878df4ff39b43db30fcf6400444fe7
-SIZE (tblib-1.3.2.tar.gz) = 26958
+TIMESTAMP = 1567982004
+SHA256 (tblib-1.4.0.tar.gz) = bd1ad564564a158ff62c290687f3db446038f9ac11a0bf6892712e3601af3bcd
+SIZE (tblib-1.4.0.tar.gz) = 27050
--- a/devel/rubygem-delayer/Makefile
+++ b/devel/rubygem-delayer/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	delayer
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

--- a/devel/rubygem-delayer/distinfo
+++ b/devel/rubygem-delayer/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1560004548
-SHA256 (rubygem/delayer-1.0.0.gem) = a8f0196fa06688f9ae6c36c764aba80f7bcbe46f48da49a6c8775c2883f77f57
-SIZE (rubygem/delayer-1.0.0.gem) = 10240
+TIMESTAMP = 1568045119
+SHA256 (rubygem/delayer-1.0.1.gem) = 6359b1ed71aace43914e069c3709b918f7fd4d23358883610db5dd36e0cce426
+SIZE (rubygem/delayer-1.0.1.gem) = 10240
--- a/devel/rubygem-gitlab-labkit/Makefile
+++ b/devel/rubygem-gitlab-labkit/Makefile
@ -2,8 +2,8 @@
 # $FreeBSD$

 PORTNAME=	gitlab-labkit
-PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTVERSION=	0.4.2
+PORTREVISION=	0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

@ -13,11 +13,11 @@ COMMENT=	Instrumentation for GitLab
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE

-RUN_DEPENDS=	rubygem-actionpack52>=5:www/rubygem-actionpack52 \
-		rubygem-activesupport52>=5:devel/rubygem-activesupport52 \
-		rubygem-grpc>=1.19.0:net/rubygem-grpc \
-		rubygem-jaeger-client>=0.10:devel/rubygem-jaeger-client \
-		rubygem-opentracing>=0.4:devel/rubygem-opentracing
+RUN_DEPENDS=	rubygem-actionpack52>=5<6:www/rubygem-actionpack52 \
+		rubygem-activesupport52>=5<6:devel/rubygem-activesupport52 \
+		rubygem-grpc>=1.19<2.0:net/rubygem-grpc \
+		rubygem-jaeger-client>=0.10<1.0:devel/rubygem-jaeger-client \
+		rubygem-opentracing>=0.4<1.0:devel/rubygem-opentracing

 USES=		gem
 USE_RUBY=	yes
--- a/devel/rubygem-gitlab-labkit/distinfo
+++ b/devel/rubygem-gitlab-labkit/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1561191887
-SHA256 (rubygem/gitlab-labkit-0.3.0.gem) = 418d59e2ba3174b6715ededfa5749e1985b170c609bd27704bb5abc45abd6a37
-SIZE (rubygem/gitlab-labkit-0.3.0.gem) = 14848
+TIMESTAMP = 1567415906
+SHA256 (rubygem/gitlab-labkit-0.4.2.gem) = 4fc9e87a7e1c0e5e3d248b0ded3bd6f8a8b2b4fb3d888058d2ebef37f44f9e0a
+SIZE (rubygem/gitlab-labkit-0.4.2.gem) = 15360
--- a/devel/rubygem-gitlab-sidekiq-fetcher/Makefile
+++ b/devel/rubygem-gitlab-sidekiq-fetcher/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gitlab-sidekiq-fetcher
-PORTVERSION=	0.4.0
+PORTVERSION=	0.5.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

--- a/devel/rubygem-gitlab-sidekiq-fetcher/distinfo
+++ b/devel/rubygem-gitlab-sidekiq-fetcher/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1545471705
-SHA256 (rubygem/gitlab-sidekiq-fetcher-0.4.0.gem) = 5962746a3faf60493dc15d016ae2139aeb86348fb39dee9057b152164f7a4af5
-SIZE (rubygem/gitlab-sidekiq-fetcher-0.4.0.gem) = 16384
+TIMESTAMP = 1567423431
+SHA256 (rubygem/gitlab-sidekiq-fetcher-0.5.1.gem) = abf86592fe2af8b7a1770b84bf153677da4764840381e23c17513fef64b932d3
+SIZE (rubygem/gitlab-sidekiq-fetcher-0.5.1.gem) = 17920
--- a/devel/rubygem-tty-box/pkg-descr
+++ b/devel/rubygem-tty-box/pkg-descr
@ -1,5 +1,5 @@
 TTY::Box provides box drawing component for TTY toolkit. It draws various frames
 and boxes in your terminal interface.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-box
--- a/devel/rubygem-tty-color/pkg-descr
+++ b/devel/rubygem-tty-color/pkg-descr
@ -1,5 +1,5 @@
 TTY::Color provides independent color support detection component for TTY
 toolkit.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-color
--- a/devel/rubygem-tty-command/pkg-descr
+++ b/devel/rubygem-tty-command/pkg-descr
@ -3,5 +3,5 @@ It runs external commands with pretty output logging and capture stdout, stderr
 and exit status. Redirect stdin, stdout and stderr of each command to a file or
 a string.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-command
--- a/devel/rubygem-tty-config/pkg-descr
+++ b/devel/rubygem-tty-config/pkg-descr
@ -2,5 +2,5 @@ TTY::Config provides app configuration component for TTY toolkit. It defines,
 reads and writes any Ruby app configurations with a penchant for terminal
 clients.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-config
--- a/devel/rubygem-tty-cursor/pkg-descr
+++ b/devel/rubygem-tty-cursor/pkg-descr
@ -3,5 +3,5 @@ supports terminal cursor positioning, visibility and text manipulation. The
 purpose of this library is to help move the terminal cursor around and
 manipulate text by using intuitive method calls.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-cursor
--- a/devel/rubygem-tty-editor/pkg-descr
+++ b/devel/rubygem-tty-editor/pkg-descr
@ -1,5 +1,5 @@
 TTY::Editor provides independent component for TTY toolkit. It opens a file or
 text in the user's preferred editor.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-editor
--- a/devel/rubygem-tty-file/pkg-descr
+++ b/devel/rubygem-tty-file/pkg-descr
@ -4,5 +4,5 @@ Though Ruby's File and FileUtils libraries provide very robust apis for dealing
 with files, this library aims to provide a level of abstraction that is much
 more convenient, with useful logging capabilities.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-file
--- a/devel/rubygem-tty-font/pkg-descr
+++ b/devel/rubygem-tty-font/pkg-descr
@ -2,5 +2,5 @@ TTY::Font provides independent terminal font rendering component for TTY
 toolkit. It writes text in large stylized characters using a variety of terminal
 friendly fonts.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-font
--- a/devel/rubygem-tty-markdown/pkg-descr
+++ b/devel/rubygem-tty-markdown/pkg-descr
@ -2,5 +2,5 @@ TTY::Markdown provides independent markdown processing component for TTY
 toolkit. It converts a markdown document or text into a terminal friendly
 output.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-markdown
--- a/devel/rubygem-tty-pager/pkg-descr
+++ b/devel/rubygem-tty-pager/pkg-descr
@ -2,5 +2,5 @@ TTY::Pager provides independent terminal output paging component for TTY
 toolkit. It supports terminal output paging in a cross-platform way supporting
 all major ruby interpreters.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-pager
--- a/devel/rubygem-tty-pie/pkg-descr
+++ b/devel/rubygem-tty-pie/pkg-descr
@ -1,5 +1,5 @@
 TTY::Pie provides pie chart drawing component for TTY toolkit. It draws pie
 charts in your terminal window.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-pie
--- a/devel/rubygem-tty-platform/pkg-descr
+++ b/devel/rubygem-tty-platform/pkg-descr
@ -2,5 +2,5 @@ TTY::Platform provides independent operating system detection component for TTY
 toolkit. It supports terminal platform query methods for detecting different
 operating systems.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-platform
--- a/devel/rubygem-tty-progressbar/pkg-descr
+++ b/devel/rubygem-tty-progressbar/pkg-descr
@ -1,5 +1,5 @@
 TTY::ProgressBar provides independent progress bars component for TTY toolkit.
 It supports a flexible progress bars drawing in terminal emulators.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-progressbar
--- a/devel/rubygem-tty-prompt/pkg-descr
+++ b/devel/rubygem-tty-prompt/pkg-descr
@ -2,5 +2,5 @@ TTY::Prompt provides independent prompt component for TTY toolkit. It supports a
 beautiful and powerful interactive command line prompt with a robust API for
 getting and validating complex inputs.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-prompt
--- a/devel/rubygem-tty-reader/pkg-descr
+++ b/devel/rubygem-tty-reader/pkg-descr
@ -4,5 +4,5 @@ character, line and multiline modes. In addition it maintains history of entered
 input with an ability to recall and re-edit those inputs and register to listen
 for keystroke events.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-reader
--- a/devel/rubygem-tty-screen/pkg-descr
+++ b/devel/rubygem-tty-screen/pkg-descr
@ -2,5 +2,5 @@ TTY::Screen provides independent terminal screen size detection component for
 TTY toolkit. It supports terminal screen size detection which works on various
 OS platforms and supports MRI, JRuby and Rubinius interpreters.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-screen
--- a/devel/rubygem-tty-spinner/pkg-descr
+++ b/devel/rubygem-tty-spinner/pkg-descr
@ -1,5 +1,5 @@
 TTY::Spinner provides independent spinner component for TTY toolkit. It supports
 a terminal spinner for tasks that have non-deterministic time frame.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-spinner
--- a/devel/rubygem-tty-table/pkg-descr
+++ b/devel/rubygem-tty-table/pkg-descr
@ -1,5 +1,5 @@
 TTY::Table provides independent table formatting component for TTY toolkit. It
 supports a flexible and intuitive table formatting.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-table
--- a/devel/rubygem-tty-tree/pkg-descr
+++ b/devel/rubygem-tty-tree/pkg-descr
@ -1,5 +1,5 @@
 TTY::Prompt provides independent directory or hash data rendering component for
 TTY toolkit. It prints directory or structured data in a tree like format.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-tree
--- a/devel/rubygem-tty-which/pkg-descr
+++ b/devel/rubygem-tty-which/pkg-descr
@ -2,5 +2,5 @@ TTY::Which provides cross-platform executables search component for TTY toolkit.
 It supports platform independent implementation of Unix which utility that
 searches for executable file in the path variable.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty-which
--- a/devel/rubygem-tty/pkg-descr
+++ b/devel/rubygem-tty/pkg-descr
@ -2,5 +2,5 @@ TTY is a toolbox for developing beautiful command line clients in Ruby with a
 fluid interface for gathering input, querying terminal properties and displaying
 information.

-WWW: https://piotrmurach.github.io/tty/
+WWW: https://ttytoolkit.org/
 WWW: https://github.com/piotrmurach/tty
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	emacs
-DISTVERSION=	${EMACS_VER}.${EMACS_REV}
+DISTVERSION=	27.0.50.20190908
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 PKGNAMESUFFIX=	-devel
@ -26,13 +26,14 @@ nox_PKGNAMESUFFIX=	-devel-nox

 USES=		autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig
 .if ${FLAVOR:U} != nox
-USES+=		desktop-file-utils xorg
+USES+=		desktop-file-utils gnome xorg
+INSTALLS_ICONS=	yes
 USE_XORG=	ice sm x11 xcb xext xfixes xinerama xmu xrandr xrender xt
 .endif
 CPE_VENDOR=	gnu
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
-GH_TAGNAME=	5f089ac
+GH_TAGNAME=	4042dad

 USE_HARDENING=	pie:off relro:off

@ -63,18 +64,16 @@ INFO=		auth autotype bovine calc ccmode cl dbus dired-x \
 		sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode \
 		tramp url vhdl-mode vip viper widget wisent woman
 INFO_PATH=	${DATADIR_REL}/info
-.if ${FLAVOR:U} != nox
-INSTALLS_ICONS=	yes
-.endif
-PLIST_SUB=	EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
+PLIST_SUB=	EMACS_VER=${DISTVERSION:R} GNU_HOST=${CONFIGURE_TARGET}
 SUB_FILES=	sources.el
-SUB_LIST=	EMACS_VER=${EMACS_VER} # sources.el
+SUB_LIST=	EMACS_VER=${DISTVERSION:R} # sources.el

 OPTIONS_DEFINE=	ACL DBUS GCONF GNUTLS GSETTINGS HARFBUZZ JSON LCMS2 M17N \
-		 MAILUTILS MODULES OTF SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS
-OPTIONS_DEFAULT=	ACL DBUS GIF GNUTLS GSETTINGS GTK3 HARFBUZZ JPEG JSON KQUEUE \
-		LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG SCROLLBARS \
-		SOURCES SVG THREADS TIFF XFT XIM XML XPM
+		 MAILUTILS MODULES OTF SCROLLBARS SOURCES THREADS XFT XIM XML \
+		XWIDGETS
+OPTIONS_DEFAULT=	ACL DBUS GIF GNUTLS GSETTINGS GTK3 HARFBUZZ JPEG JSON \
+		KQUEUE LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG \
+		SCROLLBARS SOURCES SVG THREADS TIFF XFT XIM XML XPM
 OPTIONS_GROUP=	GRAPHICS
 OPTIONS_GROUP_GRAPHICS=	CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
 OPTIONS_RADIO=	FILENOTIFY SOUND X11TOOLKIT
@ -83,14 +82,14 @@ OPTIONS_RADIO_SOUND=	ALSA OSS
 OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 MOTIF XAW XAW3D

 .if ${FLAVOR:U} == nox
-OPTIONS_EXCLUDE=	ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 GTK3 HARFBUZZ \
-			JPEG LCMS2 M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG \
-			TIFF XAW XAW3D XFT XIM XPM XWIDGETS
+OPTIONS_EXCLUDE=	ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 GTK3 \
+			HARFBUZZ JPEG LCMS2 M17N MAGICK MOTIF OSS OTF PNG \
+			SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM XWIDGETS
 .endif
 OPTIONS_SUB=	YES

 ACL_DESC=	Access control list support
-CAIRO_DESC=	Experimental Cairo library support     (implies PNG, XFT)
+CAIRO_DESC=	Cairo graphics library support    [implies PNG, XFT]
 FILENOTIFY_DESC=	File notification support
 GFILE_DESC=	File notification via gfile
 GRAPHICS_DESC=	Graphics support
@ -98,49 +97,42 @@ GSETTINGS_DESC=	GSettings API for application settings
 HARFBUZZ_DESC=	HarfBuzz for text shaping
 KQUEUE_DESC=	File notification via kqueue
 #LTO_DESC=	Enable link-time optimization
-M17N_DESC=	M17N support for text-shaping (implies XFT)
-MAGICK_DESC=	ImageMagick image processing support
+M17N_DESC=	M17N support for text-shaping     [implies XFT]
 MAILUTILS_DESC=	Mail framework via GNU Mailutils
 MODULES_DESC=	Dynamic modules support
-OTF_DESC=	Opentype fonts                         (implies XFT)
+OTF_DESC=	Opentype fonts                    [implies XFT]
 SCROLLBARS_DESC=	Toolkit scroll-bars
 SOURCES_DESC=	Install sources
-SVG_DESC=	Scalable vector graphics support       (implies PNG)
+SVG_DESC=	Scalable vector graphics support  [implies PNG]
 X11TOOLKIT_DESC=	X11 toolkit
 XAW3D_DESC=	Athena3D widgets
 XAW_DESC=	Athena widgets
 XIM_DESC=	X Input Method
-XWIDGETS_DESC=	Experimental GTK widgets               (requires GTK3)
+XWIDGETS_DESC=	Experimental GTK widgets          [implies GTK3]

 ACL_CONFIGURE_ENABLE=	acl
 ALSA_CONFIGURE_ON=	--with-sound=alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-CAIRO_USES=		gnome
 CAIRO_USE=		GNOME=cairo
 CAIRO_CONFIGURE_WITH=	cairo
 CAIRO_IMPLIES=		PNG XFT
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=	dbus
-GCONF_USES=		gnome
 GCONF_USE=		GNOME=gconf2
 GCONF_CONFIGURE_WITH=	gconf
 GFILE_CONFIGURE_ON=	--with-file-notification=gfile
-GFILE_USES=		gnome
 GFILE_USE=		GNOME=glib20
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CONFIGURE_WITH=	gif
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
-GSETTINGS_USES=		gnome
 GSETTINGS_USE=		GNOME=glib20
 GSETTINGS_CONFIGURE_WITH=	gsettings
 GSETTINGS_IMPLIES=	DBUS
-GTK2_USES=		gnome
 GTK2_USE=		GNOME=cairo,gtk20
 GTK2_CONFIGURE_ON=	--with-x-toolkit=gtk2
 GTK2_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 			libfontconfig.so:x11-fonts/fontconfig
-GTK3_USES=		gnome
 GTK3_USE=		GNOME=cairo,gtk30
 GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
 HARFBUZZ_CONFIGURE_WITH=	harfbuzz
@ -172,7 +164,6 @@ OTF_IMPLIES=		XFT
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_WITH=	png
 SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
-SVG_USES=		gnome
 SVG_USE=		GNOME=cairo,librsvg2
 SVG_CONFIGURE_WITH=	rsvg
 SVG_IMPLIES=		PNG
@ -188,7 +179,7 @@ XFT_CONFIGURE_WITH=	xft
 XFT_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 XIM_CONFIGURE_WITH=	xim
-XML_USES=		gnome
+XML_USES=		gnome # portlint complains, but necessary for nox flavor
 XML_USE=		GNOME=libxml2
 XML_CONFIGURE_WITH=	xml2
 XPM_USE=		XORG=xpm
@ -199,9 +190,6 @@ XWIDGETS_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 			libsoup-2.4.so:devel/libsoup
 XWIDGETS_IMPLIES=	GTK3

-EMACS_VER=	27.0.50
-EMACS_REV=	20190903
-
 .include <bsd.port.options.mk>

 # has graphics/ImageMagick been compiled with OPENMP?
@ -231,12 +219,12 @@ post-patch:

 post-install-MAILUTILS-on:
 	${LN} -sf ${PREFIX}/bin/movemail \
-		${STAGEDIR}${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
+		${STAGEDIR}${PREFIX}/libexec/emacs/${DISTVERSION:R}/${CONFIGURE_TARGET}

 post-install-SOURCES-on:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
-	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
-	${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
+	@${MKDIR} ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/src
+	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/src
+	${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/site-lisp/site-start.el

 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1567546776
-SHA256 (emacs-mirror-emacs-27.0.50.20190903-5f089ac_GH0.tar.gz) = 4d1dc3165e672897c0b41c2635a83e7008a62f0b1b7a6f20e787a9a94493e71a
-SIZE (emacs-mirror-emacs-27.0.50.20190903-5f089ac_GH0.tar.gz) = 40740194
+TIMESTAMP = 1568041373
+SHA256 (emacs-mirror-emacs-27.0.50.20190908-4042dad_GH0.tar.gz) = 284effffeb8aed2d02fdc2257a089c3cd6e49e7f4307442789eb12bca539a104
+SIZE (emacs-mirror-emacs-27.0.50.20190908-4042dad_GH0.tar.gz) = 40740122
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	tea
-PORTVERSION=	47.0.1
-PORTREVISION=	3
+PORTVERSION=	47.1.0
 CATEGORIES=	editors

 MAINTAINER=	danilo@FreeBSD.org
@ -11,7 +10,7 @@ COMMENT=	Simple and powerful Qt-based text editor

 LICENSE=	GPLv3

-USES=		compiler:c++11-lang gl gmake pkgconfig:build qmake qt:5
+USES=		compiler:c++11-lang gl gmake pkgconfig:build qmake qt:5 xorg

 OPTIONS_DEFINE=		DOCS
 OPTIONS_GROUP=		SPELL
--- a/editors/tea/distinfo
+++ b/editors/tea/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1544875227
-SHA256 (psemiletov-tea-qt-47.0.1_GH0.tar.gz) = 637e27bb0accff813b17968896d71f071dd51cee9b294370490c64db4c2a3c63
-SIZE (psemiletov-tea-qt-47.0.1_GH0.tar.gz) = 504723
+TIMESTAMP = 1568031478
+SHA256 (psemiletov-tea-qt-47.1.0_GH0.tar.gz) = 0b1371777a5aa5d8a9c62db40bf6c652a3398d8f9c0b015be0d38e8fac16b1f7
+SIZE (psemiletov-tea-qt-47.1.0_GH0.tar.gz) = 503335
--- a/emulators/linux_base-c7/Makefile
+++ b/emulators/linux_base-c7/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	c7
 PORTVERSION=	${LINUX_DIST_VER}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	emulators linux
 PKGNAMEPREFIX=	linux_base-
 EXTRACT_ONLY=	${DISTFILES:N*${SRC_SUFX}*:Nfilesystem-*:C/:[^:]+$//}
@ -17,6 +17,7 @@ USE_LINUX_RPM=	yes
 BIN_DISTNAMES=	bash-4.2.46-31.el7 \
 		bzip2-1.0.6-13.el7 \
 		coreutils-8.22-23.el7 \
+		diffutils-3.3-4.el7 \
 		e2fsprogs-1.42.9-13.el7 \
 		filesystem-3.2-25.el7 \
 		findutils-4.5.11-6.el7 \
@ -87,6 +88,7 @@ SRC_DISTFILES=	acl-2.2.51-14.el7${SRC_SUFX}:SOURCE \
 		compat-db-4.7.25-28.el7${SRC_SUFX}:SOURCE \
 		compat-gcc-32-3.2.3-72.el7${SRC_SUFX}:SOURCE \
 		coreutils-8.22-23.el7${SRC_SUFX}:SOURCE \
+		diffutils-3.3-4.el7${SRC_SUFX}:SOURCE \
 		e2fsprogs-1.42.9-13.el7${SRC_SUFX}:SOURCE \
 		filesystem-3.2-25.el7${SRC_SUFX}:SOURCE \
 		findutils-4.5.11-6.el7${SRC_SUFX}:SOURCE \
--- a/emulators/linux_base-c7/distinfo
+++ b/emulators/linux_base-c7/distinfo
@ -1,4 +1,4 @@
-TIMESTAMP = 1567944717
+TIMESTAMP = 1568037911
 SHA256 (centos/basesystem-10.0-7.el7.centos.noarch.rpm) = 0280ee16df09be0cebf62695706598caed8ff5cba47de1fed625068a90a9ef68
 SIZE (centos/basesystem-10.0-7.el7.centos.noarch.rpm) = 5124
 SHA256 (centos/bash-4.2.46-31.el7.i686.rpm) = 2988de97c4231cd72677ac64f3f1e20191355e0e34a56d59ed26cabc700ee29d
@ -29,6 +29,10 @@ SHA256 (centos/coreutils-8.22-23.el7.i686.rpm) = 524ab0a2f0739544363201524381a7e
 SIZE (centos/coreutils-8.22-23.el7.i686.rpm) = 3479156
 SHA256 (centos/coreutils-8.22-23.el7.x86_64.rpm) = 4d3f33ad5e764765d47a7132be0ec2868cbc1a9d3861ab8854c56bd0138b42cc
 SIZE (centos/coreutils-8.22-23.el7.x86_64.rpm) = 3415152
+SHA256 (centos/diffutils-3.3-4.el7.i686.rpm) = 324ea0854b7678806771514824490bf262ae570447d9f660be40ca5b741848bb
+SIZE (centos/diffutils-3.3-4.el7.i686.rpm) = 327736
+SHA256 (centos/diffutils-3.3-4.el7.x86_64.rpm) = 5668ccb29661f7c957bdc50d05a72bb11f0a15ee6fb119e42b992a45756a1292
+SIZE (centos/diffutils-3.3-4.el7.x86_64.rpm) = 329656
 SHA256 (centos/e2fsprogs-1.42.9-13.el7.i686.rpm) = 379a6a5a42aa7406f5eebf95ce82bd668d6d9869a282a1f8185fb665ac76fc66
 SIZE (centos/e2fsprogs-1.42.9-13.el7.i686.rpm) = 721724
 SHA256 (centos/e2fsprogs-1.42.9-13.el7.x86_64.rpm) = 617e9e1c9769016ea264e6a846d63aa9d22c35e820ffe03ae66aea6db860dc62
@ -235,6 +239,8 @@ SHA256 (centos/compat-gcc-32-3.2.3-72.el7.src.rpm) = bf748c424917bf99237baeadc82
 SIZE (centos/compat-gcc-32-3.2.3-72.el7.src.rpm) = 21623860
 SHA256 (centos/coreutils-8.22-23.el7.src.rpm) = aba61b6aa7d4293675e6c9238e3c977a8bbe86426ce3d3f92d2b4402938d605e
 SIZE (centos/coreutils-8.22-23.el7.src.rpm) = 5518732
+SHA256 (centos/diffutils-3.3-4.el7.src.rpm) = ea0b8b8f6a0f0c6ae4bebfdfff8437d09864de9011ad3f51a9372c209086fc4f
+SIZE (centos/diffutils-3.3-4.el7.src.rpm) = 1217500
 SHA256 (centos/e2fsprogs-1.42.9-13.el7.src.rpm) = d7fe09bd3ad9bb027458149fc5eb743e2dc6ccb1b678608d9ba5b84305b230b6
 SIZE (centos/e2fsprogs-1.42.9-13.el7.src.rpm) = 4729088
 SHA256 (centos/filesystem-3.2-25.el7.src.rpm) = d9a82c51739df0f5c5258dc339a949f660af0d776e4a35e7b33649287b70d9ab
--- a/emulators/linux_base-c7/pkg-plist.amd64
+++ b/emulators/linux_base-c7/pkg-plist.amd64
@ -110,6 +110,7 @@ usr/bin/chown
 usr/bin/chrt
 usr/bin/cksum
 usr/bin/clear
+usr/bin/cmp
 usr/bin/col
 usr/bin/colcrt
 usr/bin/colrm
@ -136,6 +137,8 @@ usr/bin/db47_verify
 usr/bin/dd
 usr/bin/df
 usr/bin/dgawk
+usr/bin/diff
+usr/bin/diff3
 usr/bin/dir
 usr/bin/dircolors
 usr/bin/dirname
@ -257,6 +260,7 @@ usr/bin/rmdir
 usr/bin/rpcgen
 usr/bin/runcon
 usr/bin/scriptreplay
+usr/bin/sdiff
 usr/bin/sed
 usr/bin/seq
 usr/bin/setarch
@ -1484,6 +1488,9 @@ usr/share/centos-release/EULA
 %%PORTDOCS%%usr/share/doc/coreutils-8.22/sh-utils/NEWS
 %%PORTDOCS%%usr/share/doc/coreutils-8.22/textutils/ChangeLog.bz2
 %%PORTDOCS%%usr/share/doc/coreutils-8.22/textutils/NEWS
+%%PORTDOCS%%usr/share/doc/diffutils-3.3/COPYING
+%%PORTDOCS%%usr/share/doc/diffutils-3.3/NEWS
+%%PORTDOCS%%usr/share/doc/diffutils-3.3/README
 %%PORTDOCS%%usr/share/doc/e2fsprogs-1.42.9/COPYING
 %%PORTDOCS%%usr/share/doc/e2fsprogs-1.42.9/README
 %%PORTDOCS%%usr/share/doc/e2fsprogs-1.42.9/RELEASE-NOTES
@ -2229,6 +2236,7 @@ usr/share/i18n/locales/zu_ZA
 usr/share/icons
 usr/share/info/bash.info.gz
 usr/share/info/coreutils.info.gz
+usr/share/info/diffutils.info.gz
 usr/share/info/dir
 usr/share/info/find-maint.info.gz
 usr/share/info/find.info.gz
@ -2283,6 +2291,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/bs/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ca/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/glib20.mo
@ -2294,6 +2303,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ca@valencia/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/cs/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/glib20.mo
@ -2306,6 +2316,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/cs/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/cy/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/da/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/glib20.mo
@ -2318,6 +2329,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/da/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/gawk.mo
@ -2333,6 +2345,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/de/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/dz/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/el/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/el/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/el/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/el/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/el/LC_MESSAGES/grep.mo
@ -2350,6 +2363,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/en_US/LC_MESSAGES/mit-krb5.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/eo/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/grep.mo
@ -2359,6 +2373,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/eo/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/es/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/gawk.mo
@ -2386,6 +2401,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/fa/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/fi/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/gdbm.mo
@ -2398,6 +2414,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/fi/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/gawk.mo
@ -2412,6 +2429,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/fur/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ga/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/grep.mo
@ -2420,6 +2438,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ga/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/gd/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/gl/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/grep.mo
@ -2429,11 +2448,13 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/util-linux.mo
 %%NLS%%usr/share/locale/gl/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/gu/LC_MESSAGES/glib20.mo
+%%NLS%%usr/share/locale/he/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/he/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/he/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/he/LC_MESSAGES/sed.mo
 %%NLS%%usr/share/locale/hi/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/hr/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/hr/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/hr/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/hr/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/hr/LC_MESSAGES/grep.mo
@ -2444,6 +2465,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/hr/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/hu/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/grep.mo
@ -2457,6 +2479,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ia/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/id/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/glib20.mo
@ -2469,6 +2492,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/is/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/is/LC_MESSAGES/popt.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/gawk.mo
@ -2482,6 +2506,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/it/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/gdbm.mo
@ -2519,6 +2544,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/lt/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/lt/LC_MESSAGES/libc.mo
 %%NLS%%usr/share/locale/lt/LC_TIME/coreutils.mo
+%%NLS%%usr/share/locale/lv/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/lv/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/mai/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/mg/LC_MESSAGES/glib20.mo
@ -2527,6 +2553,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/mn/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/mr/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ms/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ms/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ms/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ms/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ms/LC_TIME/coreutils.mo
@ -2541,6 +2568,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ne/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/gawk.mo
@ -2559,6 +2587,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/pa/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/gawk.mo
@ -2581,6 +2610,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/pt/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/grep.mo
@ -2590,6 +2620,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/pt_BR/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ro/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/grep.mo
@ -2599,6 +2630,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ro/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ru/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/grep.mo
@ -2629,6 +2661,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/sl/LC_MESSAGES/util-linux.mo
 %%NLS%%usr/share/locale/sl/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/sq/LC_MESSAGES/glib20.mo
+%%NLS%%usr/share/locale/sr/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/sr/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/sr/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/sr/LC_MESSAGES/grep.mo
@ -2638,6 +2671,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/sr@latin/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/gawk.mo
@ -2656,6 +2690,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/tl/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/tr/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/glib20.mo
@ -2669,6 +2704,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ug/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/uk/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/gdbm.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/glib20.mo
@ -2680,6 +2716,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/uk/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/gawk.mo
@ -2697,6 +2734,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/yi/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/glib20.mo
@ -2710,6 +2748,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/zh_HK/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/grep.mo
@ -2768,6 +2807,7 @@ usr/share/man/man1/chrt.1.gz
 usr/share/man/man1/chsh.1.gz
 usr/share/man/man1/cksum.1.gz
 usr/share/man/man1/clear.1.gz
+usr/share/man/man1/cmp.1.gz
 usr/share/man/man1/col.1.gz
 usr/share/man/man1/colcrt.1.gz
 usr/share/man/man1/colrm.1.gz
@ -2786,6 +2826,8 @@ usr/share/man/man1/dd.1.gz
 usr/share/man/man1/declare.1.gz
 usr/share/man/man1/df.1.gz
 usr/share/man/man1/dgawk.1.gz
+usr/share/man/man1/diff.1.gz
+usr/share/man/man1/diff3.1.gz
 usr/share/man/man1/dir.1.gz
 usr/share/man/man1/dircolors.1.gz
 usr/share/man/man1/dirname.1.gz
@ -2913,6 +2955,7 @@ usr/share/man/man1/runcon.1.gz
 usr/share/man/man1/runuser.1.gz
 usr/share/man/man1/script.1.gz
 usr/share/man/man1/scriptreplay.1.gz
+usr/share/man/man1/sdiff.1.gz
 usr/share/man/man1/sed.1.gz
 usr/share/man/man1/seq.1.gz
 usr/share/man/man1/set.1.gz
--- a/emulators/linux_base-c7/pkg-plist.i386
+++ b/emulators/linux_base-c7/pkg-plist.i386
@ -108,6 +108,7 @@ usr/bin/chown
 usr/bin/chrt
 usr/bin/cksum
 usr/bin/clear
+usr/bin/cmp
 usr/bin/col
 usr/bin/colcrt
 usr/bin/colrm
@ -134,6 +135,8 @@ usr/bin/db47_verify
 usr/bin/dd
 usr/bin/df
 usr/bin/dgawk
+usr/bin/diff
+usr/bin/diff3
 usr/bin/dir
 usr/bin/dircolors
 usr/bin/dirname
@ -255,6 +258,7 @@ usr/bin/rmdir
 usr/bin/rpcgen
 usr/bin/runcon
 usr/bin/scriptreplay
+usr/bin/sdiff
 usr/bin/sed
 usr/bin/seq
 usr/bin/setarch
@ -1022,6 +1026,9 @@ usr/share/centos-release/EULA
 %%PORTDOCS%%usr/share/doc/coreutils-8.22/sh-utils/NEWS
 %%PORTDOCS%%usr/share/doc/coreutils-8.22/textutils/ChangeLog.bz2
 %%PORTDOCS%%usr/share/doc/coreutils-8.22/textutils/NEWS
+%%PORTDOCS%%usr/share/doc/diffutils-3.3/COPYING
+%%PORTDOCS%%usr/share/doc/diffutils-3.3/NEWS
+%%PORTDOCS%%usr/share/doc/diffutils-3.3/README
 %%PORTDOCS%%usr/share/doc/e2fsprogs-1.42.9/COPYING
 %%PORTDOCS%%usr/share/doc/e2fsprogs-1.42.9/README
 %%PORTDOCS%%usr/share/doc/e2fsprogs-1.42.9/RELEASE-NOTES
@ -1764,6 +1771,7 @@ usr/share/i18n/locales/zu_ZA
 usr/share/icons
 usr/share/info/bash.info.gz
 usr/share/info/coreutils.info.gz
+usr/share/info/diffutils.info.gz
 usr/share/info/dir
 usr/share/info/find-maint.info.gz
 usr/share/info/find.info.gz
@ -1818,6 +1826,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/bs/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ca/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ca/LC_MESSAGES/glib20.mo
@ -1829,6 +1838,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ca@valencia/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/cs/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/cs/LC_MESSAGES/glib20.mo
@ -1841,6 +1851,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/cs/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/cy/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/da/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/da/LC_MESSAGES/glib20.mo
@ -1853,6 +1864,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/da/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/de/LC_MESSAGES/gawk.mo
@ -1868,6 +1880,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/de/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/dz/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/el/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/el/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/el/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/el/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/el/LC_MESSAGES/grep.mo
@ -1885,6 +1898,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/en_US/LC_MESSAGES/mit-krb5.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/eo/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/eo/LC_MESSAGES/grep.mo
@ -1894,6 +1908,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/eo/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/es/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/es/LC_MESSAGES/gawk.mo
@ -1921,6 +1936,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/fa/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/fi/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/fi/LC_MESSAGES/gdbm.mo
@ -1933,6 +1949,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/fi/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/fr/LC_MESSAGES/gawk.mo
@ -1947,6 +1964,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/fur/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ga/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ga/LC_MESSAGES/grep.mo
@ -1955,6 +1973,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ga/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/gd/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/gl/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/grep.mo
@ -1964,11 +1983,13 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/gl/LC_MESSAGES/util-linux.mo
 %%NLS%%usr/share/locale/gl/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/gu/LC_MESSAGES/glib20.mo
+%%NLS%%usr/share/locale/he/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/he/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/he/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/he/LC_MESSAGES/sed.mo
 %%NLS%%usr/share/locale/hi/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/hr/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/hr/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/hr/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/hr/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/hr/LC_MESSAGES/grep.mo
@ -1979,6 +2000,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/hr/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/hu/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/hu/LC_MESSAGES/grep.mo
@ -1992,6 +2014,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ia/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/id/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/id/LC_MESSAGES/glib20.mo
@ -2004,6 +2027,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/is/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/is/LC_MESSAGES/popt.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/it/LC_MESSAGES/gawk.mo
@ -2017,6 +2041,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/it/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/gawk.mo
 %%NLS%%usr/share/locale/ja/LC_MESSAGES/gdbm.mo
@ -2054,6 +2079,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/lt/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/lt/LC_MESSAGES/libc.mo
 %%NLS%%usr/share/locale/lt/LC_TIME/coreutils.mo
+%%NLS%%usr/share/locale/lv/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/lv/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/mai/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/mg/LC_MESSAGES/glib20.mo
@ -2062,6 +2088,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/mn/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/mr/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ms/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ms/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ms/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ms/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ms/LC_TIME/coreutils.mo
@ -2076,6 +2103,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ne/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/nl/LC_MESSAGES/gawk.mo
@ -2094,6 +2122,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/pa/LC_MESSAGES/grep.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/pl/LC_MESSAGES/gawk.mo
@ -2116,6 +2145,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/pt/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/grep.mo
@ -2125,6 +2155,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/pt_BR/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ro/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ro/LC_MESSAGES/grep.mo
@ -2134,6 +2165,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ro/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/ru/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/ru/LC_MESSAGES/grep.mo
@ -2164,6 +2196,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/sl/LC_MESSAGES/util-linux.mo
 %%NLS%%usr/share/locale/sl/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/sq/LC_MESSAGES/glib20.mo
+%%NLS%%usr/share/locale/sr/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/sr/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/sr/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/sr/LC_MESSAGES/grep.mo
@ -2173,6 +2206,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/sr@latin/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/sv/LC_MESSAGES/gawk.mo
@ -2191,6 +2225,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/tl/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/tr/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/tr/LC_MESSAGES/glib20.mo
@ -2204,6 +2239,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/ug/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/uk/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/gdbm.mo
 %%NLS%%usr/share/locale/uk/LC_MESSAGES/glib20.mo
@ -2215,6 +2251,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/uk/LC_TIME/coreutils.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/vi/LC_MESSAGES/gawk.mo
@ -2232,6 +2269,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/yi/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/glib20.mo
@ -2245,6 +2283,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE
 %%NLS%%usr/share/locale/zh_HK/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/bash.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/coreutils.mo
+%%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/diffutils.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/findutils.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo
 %%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/grep.mo
@ -2300,6 +2339,7 @@ usr/share/man/man1/chrt.1.gz
 usr/share/man/man1/chsh.1.gz
 usr/share/man/man1/cksum.1.gz
 usr/share/man/man1/clear.1.gz
+usr/share/man/man1/cmp.1.gz
 usr/share/man/man1/col.1.gz
 usr/share/man/man1/colcrt.1.gz
 usr/share/man/man1/colrm.1.gz
@ -2318,6 +2358,8 @@ usr/share/man/man1/dd.1.gz
 usr/share/man/man1/declare.1.gz
 usr/share/man/man1/df.1.gz
 usr/share/man/man1/dgawk.1.gz
+usr/share/man/man1/diff.1.gz
+usr/share/man/man1/diff3.1.gz
 usr/share/man/man1/dir.1.gz
 usr/share/man/man1/dircolors.1.gz
 usr/share/man/man1/dirname.1.gz
@ -2445,6 +2487,7 @@ usr/share/man/man1/runcon.1.gz
 usr/share/man/man1/runuser.1.gz
 usr/share/man/man1/script.1.gz
 usr/share/man/man1/scriptreplay.1.gz
+usr/share/man/man1/sdiff.1.gz
 usr/share/man/man1/sed.1.gz
 usr/share/man/man1/seq.1.gz
 usr/share/man/man1/set.1.gz
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@ -2,8 +2,9 @@

 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.7-8656 # git rev-list --count HEAD
-DISTVERSIONSUFFIX=	-g5ed700db5
+DISTVERSION=	0.0.7-8674 # git rev-list --count HEAD
+DISTVERSIONSUFFIX=	-gcb66d0569
+PORTREVISION=	1
 CATEGORIES=	emulators

 MAINTAINER=	jbeich@FreeBSD.org
@ -38,11 +39,15 @@ USES=		cmake compiler:c++17-lang iconv:wchar_t localbase:ldflags \
 USE_GL=		gl glew
 USE_QT=		qmake_build buildtools_build core dbus declarative gui network widgets
 USE_XORG=	x11
-LLD_UNSAFE=	yes # XXX ports/219089
 CMAKE_ON=	CMAKE_SKIP_RPATH USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG
 CMAKE_OFF=	USE_NATIVE_INSTRUCTIONS
 LDFLAGS+=	-Wl,--as-needed # GLU

+# XXX Drop after FreeBSD 12.0 EOL
+.if exists(/usr/lib/clang/6.0.1)
+LLD_UNSAFE=	yes # XXX ports/219089
+.endif
+
 # XXX Remove after FreeBSD 11.2/12.0 reach EOL i.e., around 2020-02-01
 .if !exists(/usr/include/c++/v1/charconv) && exists(/usr/lib/libc++.so)
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-revert-f9ad6358563b
@ -50,7 +55,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-revert-5bd17a44c972
 .endif

 OPTIONS_DEFINE=	ALSA EVDEV GDB LLVM PULSEAUDIO VULKAN
-OPTIONS_DEFAULT=ALSA LLVM VULKAN
+OPTIONS_DEFAULT=LLVM VULKAN

 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1567886472
-SHA256 (RPCS3-rpcs3-v0.0.7-8656-g5ed700db5_GH0.tar.gz) = 8d02c6467d9726589044ac8f918a2fcd7d1487f7eaafa8405eba059ec42d7717
-SIZE (RPCS3-rpcs3-v0.0.7-8656-g5ed700db5_GH0.tar.gz) = 5557046
+TIMESTAMP = 1568045762
+SHA256 (RPCS3-rpcs3-v0.0.7-8674-gcb66d0569_GH0.tar.gz) = d5d370cabced09dfcf3a65e420e2782661a98bce30d9458fe9077880a4030fef
+SIZE (RPCS3-rpcs3-v0.0.7-8674-gcb66d0569_GH0.tar.gz) = 5578023
 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5
 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 105400
 SHA256 (RPCS3-llvm-b860b5e8f4ee_GH0.tar.gz) = c151972a0c8ceac568c24b61e63d2ecbdac0f125185e23fc2238e0a14048256e
--- a/emulators/rpcs3/files/patch-rpcs3_Emu_Audio_ALSA_ALSABackend.cpp
+++ b/emulators/rpcs3/files/patch-rpcs3_Emu_Audio_ALSA_ALSABackend.cpp
@ -1,14 +0,0 @@
-Revert https://github.com/RPCS3/rpcs3/commit/d4591b15083b as ALSA on
-FreeBSD can only use plugins i.e., no kernel support.
-
--- rpcs3/Emu/Audio/ALSA/ALSABackend.cpp.orig	2019-01-22 20:10:17 UTC
-+++ rpcs3/Emu/Audio/ALSA/ALSABackend.cpp
-@@ -139,7 +139,7 @@ bool ALSABackend::AddData(const void* src, u32 num_sam
- 		return false;
- 	}
- 
-	if (false)
-+	if (res < 0)
- 	{
- 		res = snd_pcm_recover(tls_handle, res, 0);
- 
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@ -80,12 +80,12 @@ SYMBOLSUFFIX=	debug
 PLIST_SUB+=	SYMBOLSUFFIX=${SYMBOLSUFFIX}

 post-patch:
-	@${ECHO} 'VBOX_WITH_VBOXDRV = 1' > ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_NETFLT = 1' >> ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_NETADP = 1' >> ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_VBOXDRV = 1' > ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_NETFLT = 1' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_NETADP = 1' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
 .if ${PORT_OPTIONS:MVIMAGE}
-	@${ECHO} 'VBOX_WITH_NETFLT_VIMAGE = 1' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO_CMD} 'VBOX_WITH_NETFLT_VIMAGE = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 	    ${WRKSRC}/Config.kmk ${WRKSRC}/configure
--- a/Show More
+++ b/Show More