*/*: sync with upstream

Taken from: HardenedBSD
2019-09-13 06:56:18 +02:00 · 2019-09-13 06:56:18 +02:00 · 014ccd4597
parent 5d46e1d71c
commit 014ccd4597
242 changed files with 4037 additions and 1507 deletions
--- a/astro/routino/Makefile
+++ b/astro/routino/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	routino
-PORTVERSION=	3.2
+PORTVERSION=	3.3.1
 CATEGORIES=	astro
 MASTER_SITES=	http://www.routino.org/download/

--- a/astro/routino/distinfo
+++ b/astro/routino/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1491683625
-SHA256 (routino-3.2.tgz) = e2a431eaffbafab630835966d342e4ae25d5edb94c8ed419200e1ffb50bc7552
-SIZE (routino-3.2.tgz) = 2463662
+TIMESTAMP = 1568197606
+SHA256 (routino-3.3.1.tgz) = a954565ab60a5abebc47e8c6e8b496f972e8dd781810fa5548b6d7a9e3e5e135
+SIZE (routino-3.3.1.tgz) = 2541830
--- a/astro/routino/files/patch-src_Makefile
+++ b/astro/routino/files/patch-src_Makefile
@ -1,17 +1,16 @@
--- src/Makefile.orig	2015-09-29 18:09:59 UTC
+--- src/Makefile.orig	2018-10-30 19:12:36 UTC
 +++ src/Makefile
-@@ -38,9 +38,7 @@ EXE=planetsplitter$(.EXE) planetsplitter
-     router+lib$(.EXE) router+lib-slim$(.EXE)
+@@ -39,8 +39,7 @@ EXE=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) r
 
 ifneq ($(HOST),MINGW)
-LIB =libroutino.so               libroutino-slim.so
-LIB+=libroutino.so.$(SOVERSION)  libroutino-slim.so.$(SOVERSION)
-LIB+=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
-+LIB=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
+   LIB =libroutino.so               libroutino-slim.so
+-  LIB+=libroutino.so.$(SOVERSION)  libroutino-slim.so.$(SOVERSION)
+-  LIB+=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
+  LIB=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
 else
- LIB =routino.dll routino-slim.dll
- LIB+=routino.def routino-slim.def
-@@ -284,22 +282,23 @@ install-local: all-local
+   LIB =routino.dll routino-slim.dll
+   LIB+=routino.def routino-slim.def
+@@ -284,22 +283,23 @@ install-local: all-local
 	@[ -d $(DESTDIR)$(bindir) ] || mkdir -p $(DESTDIR)$(bindir)
 	@for file in $(EXE); do \
 	    if [ -f $$file ]; then \
--- a/astro/routino/pkg-plist
+++ b/astro/routino/pkg-plist
@ -70,10 +70,13 @@ lib/libroutino.so.0.0.0
 %%WWWDIR%%/data/translations.xml
 %%WWWDIR%%/translations/router.html
 %%WWWDIR%%/translations/translate.pl
+%%WWWDIR%%/translations/translation.cs.txt
 %%WWWDIR%%/translations/translation.de.txt
 %%WWWDIR%%/translations/translation.en.txt
+%%WWWDIR%%/translations/translation.es.txt
 %%WWWDIR%%/translations/translation.fr.txt
 %%WWWDIR%%/translations/translation.hu.txt
+%%WWWDIR%%/translations/translation.it.txt
 %%WWWDIR%%/translations/translation.nl.txt
 %%WWWDIR%%/translations/translation.pl.txt
 %%WWWDIR%%/translations/translation.ru.txt
@ -83,7 +86,8 @@ lib/libroutino.so.0.0.0
 %%WWWDIR%%/translations/visualiser.html
 %%WWWDIR%%/www/leaflet/install.sh
 %%WWWDIR%%/www/openlayers/install.sh
-%%WWWDIR%%/www/openlayers/routino.cfg
+%%WWWDIR%%/www/openlayers2/install.sh
+%%WWWDIR%%/www/openlayers2/routino.cfg
 %%WWWDIR%%/%%WWWDIR%%/.htaccess
 %%WWWDIR%%/%%WWWDIR%%/documentation/algorithm.html
 %%WWWDIR%%/%%WWWDIR%%/documentation/configuration.html
@ -942,15 +946,19 @@ lib/libroutino.so.0.0.0
 %%WWWDIR%%/%%WWWDIR%%/router.cgi
 %%WWWDIR%%/%%WWWDIR%%/router.css
 %%WWWDIR%%/%%WWWDIR%%/router.html
+%%WWWDIR%%/%%WWWDIR%%/router.html.cs
 %%WWWDIR%%/%%WWWDIR%%/router.html.de
 %%WWWDIR%%/%%WWWDIR%%/router.html.en
+%%WWWDIR%%/%%WWWDIR%%/router.html.es
 %%WWWDIR%%/%%WWWDIR%%/router.html.fr
 %%WWWDIR%%/%%WWWDIR%%/router.html.hu
+%%WWWDIR%%/%%WWWDIR%%/router.html.it
 %%WWWDIR%%/%%WWWDIR%%/router.html.nl
 %%WWWDIR%%/%%WWWDIR%%/router.html.pl
 %%WWWDIR%%/%%WWWDIR%%/router.html.ru
 %%WWWDIR%%/%%WWWDIR%%/router.leaflet.js
 %%WWWDIR%%/%%WWWDIR%%/router.openlayers.js
+%%WWWDIR%%/%%WWWDIR%%/router.openlayers2.js
 %%WWWDIR%%/%%WWWDIR%%/router.pl
 %%WWWDIR%%/%%WWWDIR%%/search.cgi
 %%WWWDIR%%/%%WWWDIR%%/search.pl
@ -959,13 +967,17 @@ lib/libroutino.so.0.0.0
 %%WWWDIR%%/%%WWWDIR%%/visualiser.cgi
 %%WWWDIR%%/%%WWWDIR%%/visualiser.css
 %%WWWDIR%%/%%WWWDIR%%/visualiser.html
+%%WWWDIR%%/%%WWWDIR%%/visualiser.html.cs
 %%WWWDIR%%/%%WWWDIR%%/visualiser.html.de
 %%WWWDIR%%/%%WWWDIR%%/visualiser.html.en
+%%WWWDIR%%/%%WWWDIR%%/visualiser.html.es
 %%WWWDIR%%/%%WWWDIR%%/visualiser.html.fr
 %%WWWDIR%%/%%WWWDIR%%/visualiser.html.hu
+%%WWWDIR%%/%%WWWDIR%%/visualiser.html.it
 %%WWWDIR%%/%%WWWDIR%%/visualiser.html.nl
 %%WWWDIR%%/%%WWWDIR%%/visualiser.html.pl
 %%WWWDIR%%/%%WWWDIR%%/visualiser.html.ru
 %%WWWDIR%%/%%WWWDIR%%/visualiser.leaflet.js
 %%WWWDIR%%/%%WWWDIR%%/visualiser.openlayers.js
+%%WWWDIR%%/%%WWWDIR%%/visualiser.openlayers2.js
@dir %%WWWDIR%%/results
--- a/audio/linux-c7-alsa-plugins-oss/Makefile
+++ b/audio/linux-c7-alsa-plugins-oss/Makefile
@ -73,7 +73,7 @@ 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}}" \
+		CFLAGS="${CFLAGS:N-march=*} ${COMPAT32_CFLAGS_${ARCH}}" \
 		LDFLAGS="${LDFLAGS}" MAKE="${LOCALBASE}/bin/gmake" \
 		MKDIR_P="${MKDIR}" PKG_CONFIG="${LOCALBASE}/bin/pkgconf" \
 		PKG_CONFIG_PATH=${LINUXBASE}/usr/lib/pkgconfig \
@ -81,7 +81,7 @@ do-configure:
 .endif
 	@(cd ${WRKSRC} && ${AUTORECONF} -f -i && ${SETENV} \
 		PATH=${LINUXBASE}/usr/bin ./configure CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		CFLAGS="${CFLAGS:N-march=*}" LDFLAGS="${LDFLAGS}" \
 		MAKE="${LOCALBASE}/bin/gmake" MKDIR_P="${MKDIR}" \
 		PKG_CONFIG="${LOCALBASE}/bin/pkgconf" \
 		PKG_CONFIG_PATH=${LINUXBASE}${LIBDIR_${ARCH}}/pkgconfig \
--- a/chinese/pyzy/Makefile
+++ b/chinese/pyzy/Makefile
@ -11,10 +11,6 @@ COMMENT=	Chinese PinYin and Bopomofo conversion library

 LICENSE=	LGPL21

-BROKEN_aarch64=		fails to compile: constant expression evaluates to -1
-BROKEN_armv6=		fails to compile: constant expression evaluates to -1
-BROKEN_armv7=		fails to compile: constant expression evaluates to -1
-
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3

 USE_GITHUB=	yes
@ -36,13 +32,7 @@ OPENCC_DESC=	Use opencc for simplified and traditional Chinese conversion
 OPENCC_CONFIGURE_ENABLE=	opencc
 OPENCC_LIB_DEPENDS=		libopencc.so:chinese/opencc

-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-CXXFLAGS+=	-Wno-error=narrowing
-.endif
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-1.0.so

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/chinese/pyzy/files/patch-src_DoublePinyinContext.cc
+++ b/chinese/pyzy/files/patch-src_DoublePinyinContext.cc
@ -0,0 +1,22 @@
+--- src/DoublePinyinContext.cc.orig	2019-09-09 19:45:16 UTC
+++ src/DoublePinyinContext.cc
+@@ -352,7 +352,7 @@ DoublePinyinContext::isPinyin (int i)
+         return NULL;
+     }
+ 
+-    char sheng = ID_TO_SHENG (i);
+    signed char sheng = ID_TO_SHENG (i);
+ 
+     if (sheng == PINYIN_ID_VOID) {
+         return NULL;
+@@ -365,8 +365,8 @@ inline const Pinyin *
+ DoublePinyinContext::isPinyin (int i, int j)
+ {
+     const Pinyin *pinyin = NULL;
+-    char sheng = ID_TO_SHENG (i);
+-    const char *yun = ID_TO_YUNS (j);
+    signed char sheng = ID_TO_SHENG (i);
+    const signed char *yun = ID_TO_YUNS (j);
+ 
+     do {
+         if (sheng == PINYIN_ID_VOID || yun[0] == PINYIN_ID_VOID)
--- a/chinese/pyzy/files/patch-src_DoublePinyinTable.h
+++ b/chinese/pyzy/files/patch-src_DoublePinyinTable.h
@ -0,0 +1,121 @@
+--- src/DoublePinyinTable.h.orig	2019-09-09 19:30:30 UTC
+++ src/DoublePinyinTable.h
+@@ -26,7 +26,7 @@
+ 
+ #define PINYIN_ID_AEO PINYIN_ID_ZERO
+ 
+-static const char double_pinyin_mspy_sheng[] = {
+static const signed char double_pinyin_mspy_sheng[] = {
+     PINYIN_ID_AEO,  // A
+     PINYIN_ID_B,    // B
+     PINYIN_ID_C,    // C
+@@ -55,7 +55,7 @@ static const char double_pinyin_mspy_sheng[] = {
+     PINYIN_ID_Z,    // Z
+     PINYIN_ID_VOID, // ;
+ };
+-static const char double_pinyin_mspy_yun[][2] = {
+static const signed char double_pinyin_mspy_yun[][2] = {
+     { PINYIN_ID_A,    PINYIN_ID_VOID }, // A
+     { PINYIN_ID_OU,   PINYIN_ID_VOID }, // B
+     { PINYIN_ID_IAO,  PINYIN_ID_VOID }, // C
+@@ -84,7 +84,7 @@ static const char double_pinyin_mspy_yun[][2] = {
+     { PINYIN_ID_EI,   PINYIN_ID_VOID }, // Z
+     { PINYIN_ID_ING,  PINYIN_ID_VOID }, // ;
+ };
+-static const char double_pinyin_zrm_sheng[] = {
+static const signed char double_pinyin_zrm_sheng[] = {
+     PINYIN_ID_AEO,  // A
+     PINYIN_ID_B,    // B
+     PINYIN_ID_C,    // C
+@@ -113,7 +113,7 @@ static const char double_pinyin_zrm_sheng[] = {
+     PINYIN_ID_Z,    // Z
+     PINYIN_ID_VOID, // ;
+ };
+-static const char double_pinyin_zrm_yun[][2] = {
+static const signed char double_pinyin_zrm_yun[][2] = {
+     { PINYIN_ID_A,    PINYIN_ID_VOID }, // A
+     { PINYIN_ID_OU,   PINYIN_ID_VOID }, // B
+     { PINYIN_ID_IAO,  PINYIN_ID_VOID }, // C
+@@ -142,7 +142,7 @@ static const char double_pinyin_zrm_yun[][2] = {
+     { PINYIN_ID_EI,   PINYIN_ID_VOID }, // Z
+     { PINYIN_ID_VOID, PINYIN_ID_VOID }, // ;
+ };
+-static const char double_pinyin_abc_sheng[] = {
+static const signed char double_pinyin_abc_sheng[] = {
+     PINYIN_ID_ZH,   // A
+     PINYIN_ID_B,    // B
+     PINYIN_ID_C,    // C
+@@ -171,7 +171,7 @@ static const char double_pinyin_abc_sheng[] = {
+     PINYIN_ID_Z,    // Z
+     PINYIN_ID_VOID, // ;
+ };
+-static const char double_pinyin_abc_yun[][2] = {
+static const signed char double_pinyin_abc_yun[][2] = {
+     { PINYIN_ID_A,    PINYIN_ID_VOID }, // A
+     { PINYIN_ID_OU,   PINYIN_ID_VOID }, // B
+     { PINYIN_ID_IN,   PINYIN_ID_UAI  }, // C
+@@ -200,7 +200,7 @@ static const char double_pinyin_abc_yun[][2] = {
+     { PINYIN_ID_IAO,  PINYIN_ID_VOID }, // Z
+     { PINYIN_ID_VOID, PINYIN_ID_VOID }, // ;
+ };
+-static const char double_pinyin_zgpy_sheng[] = {
+static const signed char double_pinyin_zgpy_sheng[] = {
+     PINYIN_ID_CH,   // A
+     PINYIN_ID_B,    // B
+     PINYIN_ID_C,    // C
+@@ -229,7 +229,7 @@ static const char double_pinyin_zgpy_sheng[] = {
+     PINYIN_ID_Z,    // Z
+     PINYIN_ID_VOID, // ;
+ };
+-static const char double_pinyin_zgpy_yun[][2] = {
+static const signed char double_pinyin_zgpy_yun[][2] = {
+     { PINYIN_ID_A,    PINYIN_ID_VOID }, // A
+     { PINYIN_ID_IAO,  PINYIN_ID_VOID }, // B
+     { PINYIN_ID_VOID, PINYIN_ID_VOID }, // C
+@@ -258,7 +258,7 @@ static const char double_pinyin_zgpy_yun[][2] = {
+     { PINYIN_ID_OU,   PINYIN_ID_VOID }, // Z
+     { PINYIN_ID_ING,  PINYIN_ID_VOID }, // ;
+ };
+-static const char double_pinyin_pyjj_sheng[] = {
+static const signed char double_pinyin_pyjj_sheng[] = {
+     PINYIN_ID_ZERO, // A
+     PINYIN_ID_B,    // B
+     PINYIN_ID_C,    // C
+@@ -287,7 +287,7 @@ static const char double_pinyin_pyjj_sheng[] = {
+     PINYIN_ID_Z,    // Z
+     PINYIN_ID_VOID, // ;
+ };
+-static const char double_pinyin_pyjj_yun[][2] = {
+static const signed char double_pinyin_pyjj_yun[][2] = {
+     { PINYIN_ID_A,    PINYIN_ID_VOID }, // A
+     { PINYIN_ID_IA,   PINYIN_ID_UA   }, // B
+     { PINYIN_ID_UAN,  PINYIN_ID_VOID }, // C
+@@ -316,7 +316,7 @@ static const char double_pinyin_pyjj_yun[][2] = {
+     { PINYIN_ID_UN,   PINYIN_ID_VOID }, // Z
+     { PINYIN_ID_VOID, PINYIN_ID_VOID }, // ;
+ };
+-static const char double_pinyin_xhe_sheng[] = {
+static const signed char double_pinyin_xhe_sheng[] = {
+     PINYIN_ID_AEO,  // A
+     PINYIN_ID_B,    // B
+     PINYIN_ID_C,    // C
+@@ -345,7 +345,7 @@ static const char double_pinyin_xhe_sheng[] = {
+     PINYIN_ID_Z,    // Z
+     PINYIN_ID_VOID, // ;
+ };
+-static const char double_pinyin_xhe_yun[][2] = {
+static const signed char double_pinyin_xhe_yun[][2] = {
+     { PINYIN_ID_A,    PINYIN_ID_VOID }, // A
+     { PINYIN_ID_IN,   PINYIN_ID_VOID }, // B
+     { PINYIN_ID_AO,   PINYIN_ID_VOID }, // C
+@@ -376,8 +376,8 @@ static const char double_pinyin_xhe_yun[][2] = {
+ };
+ 
+ static const struct {
+-    const char  (&sheng)[27];
+-    const char  (&yun)[27][2];
+    const signed char  (&sheng)[27];
+    const signed char  (&yun)[27][2];
+ } double_pinyin_map [] = {
+     { double_pinyin_mspy_sheng, double_pinyin_mspy_yun },
+     { double_pinyin_zrm_sheng,  double_pinyin_zrm_yun  },
--- a/comms/openzwave-devel/Makefile
+++ b/comms/openzwave-devel/Makefile
@ -11,7 +11,7 @@ COMMENT=	Open-zwave - An open-source interface to Z-Wave networks

 LICENSE=	LGPL20

-USES=		gmake tar:bz2 iconv pkgconfig
+USES=		compiler:c++11-lang gmake iconv pkgconfig tar:bz2

 # Manually update this when makefile is updated
 # echo $(git describe --long --tags --dirty 2>/dev/null | sed s/^v//) | awk '{split($$0,a,"-"); print a[2]}'
--- a/databases/Makefile
+++ b/databases/Makefile
@ -91,6 +91,7 @@
    SUBDIR += frontbase-jdbc
    SUBDIR += gadfly
    SUBDIR += galera
+    SUBDIR += galera26
    SUBDIR += gdbm
    SUBDIR += geoserver-mysql-plugin
    SUBDIR += gigabase
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	freetds
-PORTVERSION=	1.1.51
+PORTVERSION=	1.1.56
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://www.freetds.org/files/current/ \
--- a/databases/freetds-devel/distinfo
+++ b/databases/freetds-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1565555125
-SHA256 (freetds-dev.1.1.51.tar.bz2) = 38501a906c8ab641a2e1c9acbe36892702b8d88669c5a39896f6894156a9574d
-SIZE (freetds-dev.1.1.51.tar.bz2) = 2262275
+TIMESTAMP = 1567764290
+SHA256 (freetds-dev.1.1.56.tar.bz2) = a8d99201eaa32224e75d4e70d519c8a1a2b5c62b37c80c73480ee104470707b9
+SIZE (freetds-dev.1.1.56.tar.bz2) = 2247109
--- a/databases/galera26/Makefile
+++ b/databases/galera26/Makefile
@ -0,0 +1,71 @@
+# Created by: Nicolas Embriz <nbari@tequila.io>
+# $FreeBSD$
+
+PORTNAME=	galera
+PORTVERSION=	26.4.2
+DISTVERSIONPREFIX=	release_
+CATEGORIES=	databases
+PKGNAMESUFFIX=	26
+
+MAINTAINER=	devel@galeracluster.com
+COMMENT=	Synchronous multi-master replication engine
+
+LICENSE=	GPLv2
+
+BROKEN_aarch64=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
+BROKEN_armv6=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
+BROKEN_armv7=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
+NOT_FOR_ARCHS=		i386
+# On i386 older versions of clang produce:
+#   cannot compile this atomic library call yet ... __atomic_add_fetch
+# whereas newer ones generate a call to __atomic_add_fetch which ends up with
+# undefined reference at link time:
+#   undefined reference to `__atomic_fetch_add_8'
+# https://bugs.llvm.org//show_bug.cgi?id=23262
+# https://bugs.llvm.org//show_bug.cgi?id=24908
+# https://tracker.crystax.net/issues/1263
+NOT_FOR_ARCHS_REASON_i386=Uses 64 bit atomics that clang cannot generate on i386
+
+BUILD_DEPENDS=	checkmk:devel/check \
+		${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
+
+USES=		compiler:c++11-lang python:build scons ssl
+
+USE_LDCONFIG=	yes
+
+USE_GITHUB=	yes
+GH_TUPLE?=	codership:galera:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \
+		codership:wsrep-API:75a5f452f2ba07b0f4a3a9a94825fccc71b27398:dummy/wsrep/src
+
+LDFLAGS+=	-lboost_program_options -lboost_system
+MAKE_ARGS+=	revno=${GH_TAGNAME} system_asio=0 tests=0
+
+USE_RC_SUBR=	garb.sh
+
+# Abuse TEST_TARGET to append tests=1 (which is not a target, strictly
+# speaking) at the end of the "scons ..." command so that it overrides
+# tests=0 from ${MAKE_ARGS}. To rerun the tests a second time, remove
+# all *.passed files: find ./work -name *.passed -print -delete
+TEST_TARGET=	deterministic_tests=1 tests=1
+
+PLIST_FILES=	bin/garbd \
+		lib/libgalera.so \
+		lib/libgalera_smm.so
+
+OPTIONS_DEFINE=	BOOSTPOOL BPOSTATIC DEBUG
+
+BOOSTPOOL_DESC=	Use boost pool allocator
+BPOSTATIC_DESC=	Use static boost_program_options
+
+BOOSTPOOL_MAKE_ARGS=	boost_pool=1
+BPOSTATIC_MAKE_ARGS=	bpostatic=${LOCALBASE}/lib/libboost_program_options.a
+DEBUG_MAKE_ARGS=	debug=0
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/garb/garbd ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_LIB} ${WRKSRC}/libgalera_smm.so ${STAGEDIR}${PREFIX}/lib/
+	@(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libgalera_smm.so \
+		libgalera.so)
+
+.include <bsd.port.mk>
--- a/databases/galera26/distinfo
+++ b/databases/galera26/distinfo
@ -0,0 +1,5 @@
+TIMESTAMP = 1568151779
+SHA256 (codership-galera-release_26.4.2_GH0.tar.gz) = 367ff81e52d2b3c95e8bf2092616f7d1dcfb9723a91fa13e7e5a7b4573f7dcd1
+SIZE (codership-galera-release_26.4.2_GH0.tar.gz) = 3397996
+SHA256 (codership-wsrep-API-75a5f452f2ba07b0f4a3a9a94825fccc71b27398_GH0.tar.gz) = ac782d33d84a874d89bbe4eeb818ab56ae729aee4c491f91892694a2e134c558
+SIZE (codership-wsrep-API-75a5f452f2ba07b0f4a3a9a94825fccc71b27398_GH0.tar.gz) = 50214
--- a/databases/galera26/files/garb.sh.in
+++ b/databases/galera26/files/garb.sh.in
@ -0,0 +1,95 @@
+#!/bin/sh
+#
+# garb.sh for rc.d usage (c) 2013 Codership Oy
+# $Id$
+
+# PROVIDE: garb
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable Galera Arbitrator Daemon (garbd):
+#  garb_enable (bool):         Set to "NO" by default.
+#                              Set it to "YES" to enable Galera Arbitrator Daemon.
+#  garb_galera_nodes (str):    A space-separated list of node addresses (address[:port]) in the cluster
+#                              (default empty).
+#  garb_galera_group (str):    Galera cluster name, should be the same as on the rest of the nodes.
+#                              (default empty).
+# Optional:
+#  garb_galera_options (str):  Optional Galera internal options string (e.g. SSL settings)
+#                              see http://www.codership.com/wiki/doku.php?id=galera_parameters
+#                              (default empty).
+#  garb_log_file (str):        Log file for garbd (default empty). Optional, by default logs to syslog
+#  garb_pid_file (str):        Custum PID file path and name.
+#                              Default to "/var/run/garb.pid".
+#
+
+. /etc/rc.subr
+
+name="garb"
+rcvar=garb_enable
+
+load_rc_config $name
+
+# set defaults
+: ${garb_enable="NO"}
+: ${garb_galera_nodes=""}
+: ${garb_galera_group=""}
+: ${garb_galera_options=""}
+: ${garb_log_file=""}
+: ${garb_pid_file="/var/run/garbd"}
+
+procname="/usr/local/bin/garbd"
+command="/usr/sbin/daemon"
+command_args="-c -f -u nobody -p $garb_pid_file $procname"
+start_precmd="${name}_prestart"
+#start_cmd="${name}_start"
+start_postcmd="${name}_poststart"
+stop_precmd="${name}_prestop"
+#stop_cmd="${name}_stop"
+#stop_postcmd="${name}_poststop"
+#extra_commands="reload"
+#reload_cmd="${name}_reload"
+#export LD_LIBRARY_PATH=/usr/local/lib/gcc44
+
+garb_prestart()
+{
+	[ "$(id -ur)" != "0" ] && err 4 "root rights are required to start $name"
+	[ -r "$garb_pid_file" ] && err 0 "$procname is already running with PID $(cat $garb_pid_file)"
+	[ -x "$procname" ] || err 5 "$procname is not found"
+
+	# check that node addresses are configured
+	[ -z "$garb_galera_nodes" ] && err 6 "List of garb_galera_nodes is not configured"
+	[ -z "$garb_galera_group" ] && err 6 "garb_galera_group name is not configured"
+
+	GALERA_PORT=${GALERA_PORT:-4567}
+
+	# Concatenate all nodes in the list (for backward compatibility)
+	ADDRESS=
+	for NODE in ${garb_galera_nodes}; do
+		[ -z "$ADDRESS" ] && ADDRESS="$NODE" || ADDRESS="$ADDRESS,$NODE"
+	done
+
+	command_args="$command_args -a gcomm://$ADDRESS"
+	[ -n "$garb_galera_group" ]   && command_args="$command_args -g $garb_galera_group"
+	[ -n "$garb_galera_options" ] && command_args="$command_args -o $garb_galera_options"
+	[ -n "$garb_log_file" ]       && command_args="$command_args -l $garb_log_file"
+	return 0
+}
+
+garb_poststart()
+{
+	local timeout=15
+	while [ ! -f "$garb_pid_file" -a $timeout -gt 0 ]; do
+		timeout=$(( timeout - 1 ))
+		sleep 1
+	done
+	return 0
+}
+
+garb_prestop() {
+	[ "$(id -ur)" != "0" ] && err 4 "root rights are required to stop $name"
+	[ -r $garb_pid_file ] || err 0 ""
+	return 0
+}
+
+run_rc_command "$1"
--- a/databases/galera26/pkg-descr
+++ b/databases/galera26/pkg-descr
@ -0,0 +1,5 @@
+Galera v26 wsrep provider library for Galera Cluster for MySQL, an
+easy-to-use high-availability solution with high system up-time,
+no data loss, and scalability for future growth.
+
+WWW: https://galeracluster.com/
--- a/databases/galera26/pkg-message
+++ b/databases/galera26/pkg-message
@ -0,0 +1,8 @@
+[
+{ type: install
+  message: <<EOM
+Find the Galera Cluster documentation at
+http://galeracluster.com/documentation-webpages/
+EOM
+}
+]
--- a/databases/mroonga/Makefile
+++ b/databases/mroonga/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	mroonga
-PORTVERSION=	9.05
+PORTVERSION=	9.07
 CATEGORIES=	databases textproc
 MASTER_SITES=	http://packages.groonga.org/source/mroonga/

--- a/databases/mroonga/distinfo
+++ b/databases/mroonga/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1564783847
-SHA256 (mroonga-9.05.tar.gz) = 3385072732ff89466dfbef1d53b4c4367d28a4636d446178e57dc5afcde1591d
-SIZE (mroonga-9.05.tar.gz) = 2671989
+TIMESTAMP = 1567681564
+SHA256 (mroonga-9.07.tar.gz) = 2e5ba33f042de13923cb307c0be44b14052c30103aa27b0a1f955adbf283bdd3
+SIZE (mroonga-9.07.tar.gz) = 2688119
--- a/databases/plpgsql_check/Makefile
+++ b/databases/plpgsql_check/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	plpgsql_check
-PORTVERSION=	1.7.3
+PORTVERSION=	1.7.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER_NODOT}-
--- a/databases/plpgsql_check/distinfo
+++ b/databases/plpgsql_check/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1564577734
-SHA256 (okbob-plpgsql_check-v1.7.3_GH0.tar.gz) = 1f2111963cf79d33f190b2be507dba632ea805ef7ccab363468736b957e05e0c
-SIZE (okbob-plpgsql_check-v1.7.3_GH0.tar.gz) = 219464
+TIMESTAMP = 1568290890
+SHA256 (okbob-plpgsql_check-v1.7.5_GH0.tar.gz) = a5fc3b8575b053f0ff0a30975aa85e86dfcc6d2ca594bf369dc959a0ceb2c7d9
+SIZE (okbob-plpgsql_check-v1.7.5_GH0.tar.gz) = 220412
--- a/databases/pspg/Makefile
+++ b/databases/pspg/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	pspg
-DISTVERSION=	1.7.2
+DISTVERSION=	2.0.2
 CATEGORIES=	databases

 MAINTAINER=	dg@syrec.org
--- a/databases/pspg/distinfo
+++ b/databases/pspg/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1567371014
-SHA256 (okbob-pspg-1.7.2_GH0.tar.gz) = 8865da5672cb160a5609e0e6f3de0377b3e25e287311a54c0290edbb56f367f1
-SIZE (okbob-pspg-1.7.2_GH0.tar.gz) = 1316356
+TIMESTAMP = 1568217796
+SHA256 (okbob-pspg-2.0.2_GH0.tar.gz) = 7d3b1b2467c004302128d794243824e75b84182790e3e3815dc1b9403ecc691e
+SIZE (okbob-pspg-2.0.2_GH0.tar.gz) = 1328279
--- a/databases/pspg/pkg-descr
+++ b/databases/pspg/pkg-descr
@ -1,5 +1,6 @@
-pspg is a small specialized pager designed to be used with psql. It know how
-to work with tabular data, has the ability to freeze first few rows/columns
-and configurable colors.
+pspg is a small specialized pager designed to work with tables. Its primary
+purpose is to work as PostgreSQL pager, but MySQL is supported too. Main
+features include the ability to freeze first few rows/columns, possibility to
+sort data by specified numeric column and configurable color themes.

 WWW: https://github.com/okbob/pspg
--- a/devel/android-tools-adb/Makefile
+++ b/devel/android-tools-adb/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	android-tools-adb
 DISTVERSIONPREFIX=	platform-tools-
-DISTVERSION?=	29.0.2
+DISTVERSION?=	29.0.3
 PORTREVISION?=	0
 CATEGORIES=	devel comms

@ -12,8 +12,7 @@ COMMENT=	Android debug bridge command line tool
 LICENSE=	APACHE20

 USE_GITHUB=	yes
-GH_ACCOUNT=	aosp-mirror
-GH_PROJECT=	platform_system_core
+GH_TUPLE=	aosp-mirror:platform_system_core:${DISTVERSIONFULL}

 CONFLICTS_INSTALL?=	${PORTNAME}-devel-*

@ -37,9 +36,7 @@ OPTIONS_SUB=	yes
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}"
 .endif

-BASH_GH_ACCOUNT=	mbrubeck:bashcomp
-BASH_GH_PROJECT=	android-completion:bashcomp
-BASH_GH_TAGNAME=	c1b0656:bashcomp
+BASH_GH_TUPLE=		mbrubeck:android-completion:c1b0656:bashcomp
 BASH_PLIST_FILES=	etc/bash_completion.d/adb
 BASH_VARS=		LICENSE+=MIT LICENSE_COMB=multi

@ -55,7 +52,7 @@ TEST_BUILD_DEPENDS+=	googlemock>=1.6.0:devel/googlemock \
 TEST_ALL_TARGET=	adb_test

 TEST_PYTHON_DESC=	${TEST_DESC:S/tests/python &/}
-TEST_PYTHON_GH_PROJECT=	platform_development:development
+TEST_PYTHON_GH_TUPLE=	aosp-mirror:platform_development:${DISTVERSIONFULL}:development
 TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
 TEST_PYTHON_USES=	python:2.7,build

--- a/devel/android-tools-adb/distinfo
+++ b/devel/android-tools-adb/distinfo
@ -1,7 +1,7 @@
-TIMESTAMP = 1563393249
-SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.2_GH0.tar.gz) = cd0f6fe386f07d7aef98cf46a41cef0aa1e8cebfe06f434bb5c88777de4c2643
-SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.2_GH0.tar.gz) = 59909027
+TIMESTAMP = 1565662258
+SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.3_GH0.tar.gz) = f2938ab5d206f5d4e075afba1a3e32fc26656bb439b6208200bef0ea5bae77eb
+SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.3_GH0.tar.gz) = 61252755
 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
 SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
-SHA256 (aosp-mirror-platform_development-platform-tools-29.0.2_GH0.tar.gz) = aa40c37fd1cbb1c4a93a0c4ba26468bb47a5837826cb94423f5ca161dd85f118
-SIZE (aosp-mirror-platform_development-platform-tools-29.0.2_GH0.tar.gz) = 56861217
+SHA256 (aosp-mirror-platform_development-platform-tools-29.0.3_GH0.tar.gz) = 58a291b441d7ab9a0ec1224ce3e383feff5ec67940de901d544af8fdfaf5687b
+SIZE (aosp-mirror-platform_development-platform-tools-29.0.3_GH0.tar.gz) = 56856358
--- a/devel/android-tools-adb/files/Makefile
+++ b/devel/android-tools-adb/files/Makefile
@ -63,13 +63,11 @@ SRCS+= chrono_utils.cpp
 SRCS+= file.cpp
 SRCS+= logging.cpp
 SRCS+= parsenetaddress.cpp
-SRCS+= quick_exit.cpp
 SRCS+= stringprintf.cpp
 SRCS+= strings.cpp
 TEST_SRCS+= file_test.cpp
 TEST_SRCS+= logging_test.cpp
 TEST_SRCS+= parsenetaddress_test.cpp
-TEST_SRCS+= quick_exit_test.cpp
 TEST_SRCS+= stringprintf_test.cpp
 TEST_SRCS+= strings_test.cpp
 TEST_SRCS+= test_main.cpp
@ -90,28 +88,14 @@ SRCS+= socket_local_client_unix.cpp
 SRCS+= socket_local_server_unix.cpp
 SRCS+= socket_network_client_unix.cpp
 SRCS+= ../libcutils/sockets.cpp
-SRCS+= load_file.cpp
 SRCS+= threads.cpp
 # DragonFly, NetBSD, OpenBSD
 CPPFLAGS.sockets.cpp+= -o ${.TARGET}

-# required by base/file.cpp
-.PATH: ${.CURDIR}/../liblog
-SRCS+= config_read.cpp
-SRCS+= config_write.cpp
-SRCS+= fake_log_device.cpp
-SRCS+= fake_writer.cpp
-SRCS+= logger_lock.cpp
-SRCS+= logger_name.cpp
-SRCS+= logger_write.cpp
-SRCS+= logprint.cpp
-SRCS+= stderr_write.cpp
-
 CPPFLAGS+= -DPLATFORM_TOOLS_VERSION="\"${VERSION:U0.0.0}\""
 CPPFLAGS+= -DADB_HOST=1
 CPPFLAGS+= -Doff64_t=off_t
 CPPFLAGS+= -Dlseek64=lseek
-CPPFLAGS+= -DFAKE_LOG_DEVICE=1
 CPPFLAGS+= -I${.CURDIR}
 CPPFLAGS+= -I${.CURDIR}/client
 CPPFLAGS+= -I${.CURDIR}/../include
--- a/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp
+++ b/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp
@ -1,6 +1,23 @@
--- adb/bugreport_test.cpp.orig	2016-09-28 18:07:09 UTC
+--- adb/bugreport_test.cpp.orig	2019-08-13 02:10:58 UTC
 +++ adb/bugreport_test.cpp
-@@ -40,6 +40,7 @@ using ::testing::internal::CaptureStdout
+@@ -14,8 +14,6 @@
+  * limitations under the License.
+  */
+ 
+-#include "bugreport.h"
+-
+ #include <gmock/gmock.h>
+ #include <gtest/gtest.h>
+ 
+@@ -24,6 +22,7 @@
+ 
+ #include "sysdeps.h"
+ #include "adb_utils.h"
+#include "bugreport.h"
+ 
+ using ::testing::_;
+ using ::testing::Action;
+@@ -40,6 +39,7 @@ using ::testing::internal::CaptureStdout;
 using ::testing::internal::GetCapturedStderr;
 using ::testing::internal::GetCapturedStdout;
 
@ -8,7 +25,7 @@
 // Empty function so tests don't need to be linked against file_sync_service.cpp, which requires
 // SELinux and its transitive dependencies...
 bool do_sync_pull(const std::vector<const char*>& srcs, const char* dst, bool copy_attrs,
-@@ -47,6 +48,7 @@ bool do_sync_pull(const std::vector<cons
+@@ -47,6 +47,7 @@ bool do_sync_pull(const std::vector<const char*>& srcs
     ADD_FAILURE() << "do_sync_pull() should have been mocked";
     return false;
 }
--- a/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp
+++ b/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp
@ -0,0 +1,11 @@
+--- adb/client/adb_install.cpp.orig	2019-08-13 02:10:58 UTC
+++ adb/client/adb_install.cpp
+@@ -214,7 +214,7 @@ static int install_app_streamed(int argc, const char**
+             return 1;
+         }
+ 
+-#ifdef __linux__
+#if !defined(__APPLE__) && !defined(_WIN32)
+         posix_fadvise(local_fd.get(), 0, 0, POSIX_FADV_SEQUENTIAL | POSIX_FADV_NOREUSE);
+ #endif
+ 
--- a/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h
+++ b/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h
@ -1,10 +0,0 @@
--- adb/fdevent/fdevent.h.orig	2019-07-17 19:54:09 UTC
-+++ adb/fdevent/fdevent.h
-@@ -20,6 +20,7 @@
- #include <stddef.h>
- #include <stdint.h>
- 
-+#include <atomic> // std::atomic<bool> for GCC
- #include <chrono>
- #include <deque>
- #include <functional>
--- a/devel/android-tools-adb/files/patch-adb_types.h
+++ b/devel/android-tools-adb/files/patch-adb_types.h
@ -1,10 +0,0 @@
--- adb/types.h.orig	2019-07-17 19:54:09 UTC
-+++ adb/types.h
-@@ -16,6 +16,7 @@
- 
- #pragma once
- 
-+#include <cstring> // memcpy for GCC
- #include <algorithm>
- #include <deque>
- #include <memory>
--- a/devel/android-tools-fastboot/Makefile
+++ b/devel/android-tools-fastboot/Makefile
@ -1,9 +1,9 @@
 # $FreeBSD$

 PORTNAME=	android-tools-fastboot
-DISTVERSIONPREFIX=	android-
-DISTVERSION?=	9.0.0_r3
-PORTREVISION?=	3
+DISTVERSIONPREFIX=	platform-tools-
+DISTVERSION?=	29.0.3
+PORTREVISION?=	0
 CATEGORIES=	devel sysutils
 MASTER_SITES=	https://salsa.debian.org/android-tools-team/android-tools/raw/706e754/debian/:manpage
 DISTFILES=	fastboot.1:manpage
@ -16,29 +16,25 @@ LICENSE=	APACHE20 BSD2CLAUSE
 LICENSE_COMB=	multi

 USE_GITHUB=	yes
-GH_ACCOUNT=	aosp-mirror jbeich:extras
-GH_PROJECT=	platform_system_core platform_system_extras:extras
+GH_TUPLE=	aosp-mirror:platform_system_core:${DISTVERSIONFULL} \
+		jbeich:platform_system_extras:${DISTVERSIONFULL}:extras/extras \
+		jbeich:platform_system_tools_mkbootimg:${DISTVERSIONFULL}:mkbootimg/mkbootimg

 CONFLICTS_INSTALL?=	${PORTNAME}-devel-*

-USES=		compiler:c++11-lib pkgconfig uidfix
+USES=		compiler:c++17-lang pkgconfig ssl uidfix
 BUILD_WRKSRC=	${WRKSRC}/fastboot
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
-CPPFLAGS+=	-D_GLIBCXX_USE_C99 # XXX ports/193528
 MAKEFILE?=	${.CURDIR}/files/Makefile
 MAKE_ENV=	BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \
 		FILESDIR="${DOCSDIR}" \
-		VERSION="${SDK_REVISION}-0 ${GH_REVISION}-android" \
+		VERSION="${DISTVERSION}${DISTVERSIONSUFFIX}" \
 		MANDIR="${PREFIX}/man/man"
 PLIST_FILES=	bin/fastboot \
 		man/man1/fastboot.1.gz
 PORTDOCS=	*
 SUB_FILES=	pkg-message

-# Generated by "make update-revision" for "fastboot --version"
-SDK_REVISION?=	28.0.0
-GH_REVISION=	${DISTVERSIONSUFFIX:U0fac9018f238:S/-g//}
-
 OPTIONS_DEFINE=	BASH DOCS
 OPTIONS_SUB=	yes

@ -46,9 +42,7 @@ OPTIONS_SUB=	yes
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}"
 .endif

-BASH_GH_ACCOUNT=	mbrubeck:bashcomp
-BASH_GH_PROJECT=	android-completion:bashcomp
-BASH_GH_TAGNAME=	c1b0656:bashcomp
+BASH_GH_TUPLE=		mbrubeck:android-completion:c1b0656:bashcomp
 BASH_PLIST_FILES=	etc/bash_completion.d/fastboot
 BASH_VARS=		LICENSE+=MIT

@ -57,33 +51,10 @@ DOCS_MAKE_ARGS_OFF=	FILES="" FILESDIR=""
 post-extract:
 	@${CP} ${_DISTDIR}/${DISTFILES:M*\:manpage:C/:.*//} \
 		${BUILD_WRKSRC}
-# Adjust paths relative to core
-	@(cd ${WRKSRC_extras} && ${COPYTREE_SHARE} . ${WRKSRC})

 post-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES:H}
 	${INSTALL_DATA} ${WRKSRC_bashcomp}/android \
 		${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES}

-update-revision:
-	@${REINPLACE_CMD} -i '' -e "/^SDK_REVISION?=/s/=.*/=	$$(\
-		${FETCH_CMD} -qo- \
-			https://github.com/${GH_ACCOUNT}/platform_build/raw/${GH_TAGNAME}/core/version_defaults.mk | \
-			${SED} -n 's/^[[:space:]]*PLATFORM_SDK_VERSION := //p' \
-		).0.0/" \
-		${.CURDIR}/Makefile
-# https://developer.github.com/v3/repos/commits/#get-a-single-commit
-# Pretend to be curl(1) for pretty-printed JSON to help parse with sed(1)
-	@${REINPLACE_CMD} -i '' -e "/^GH_REVISION=/s/:U[^}:]*/:U$$(\
-		${SETENV} HTTP_USER_AGENT=curl ${FETCH_CMD} -qo- \
-			https://api.github.com/repos/${GH_ACCOUNT}/${GH_PROJECT}/commits/${GH_TAGNAME} | \
-			${SED} -n '/sha/ { s/.*\"\([0-9a-f]\{12\}\).*/\1/p; q; }' \
-		)/" \
-		${.CURDIR}/Makefile
-
 .include <bsd.port.mk>
-
-# XXX Work around !target(makesum)
-.ifndef DISTVERSIONSUFFIX
-makesum:	update-revision
-.endif
--- a/devel/android-tools-fastboot/distinfo
+++ b/devel/android-tools-fastboot/distinfo
@ -1,9 +1,11 @@
-TIMESTAMP = 1529542722
+TIMESTAMP = 1565662258
 SHA256 (fastboot.1) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
 SIZE (fastboot.1) = 5906
-SHA256 (aosp-mirror-platform_system_core-android-9.0.0_r3_GH0.tar.gz) = b9de23465b304432aa2b585aa66c6bf4841b177f2139b75ca5adc5d917e0ecd6
-SIZE (aosp-mirror-platform_system_core-android-9.0.0_r3_GH0.tar.gz) = 27484684
-SHA256 (jbeich-platform_system_extras-android-9.0.0_r3_GH0.tar.gz) = d82c4576bed24bfe701bb8c781714fa70365c03aed93cf4777407215de4d672d
-SIZE (jbeich-platform_system_extras-android-9.0.0_r3_GH0.tar.gz) = 211722695
+SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.3_GH0.tar.gz) = f2938ab5d206f5d4e075afba1a3e32fc26656bb439b6208200bef0ea5bae77eb
+SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.3_GH0.tar.gz) = 61252755
+SHA256 (jbeich-platform_system_extras-platform-tools-29.0.3_GH0.tar.gz) = 342433c834f260b5d55c5dc0b98ef27aea18feb50e1fff5e09fdb846c0f75a51
+SIZE (jbeich-platform_system_extras-platform-tools-29.0.3_GH0.tar.gz) = 210790583
+SHA256 (jbeich-platform_system_tools_mkbootimg-platform-tools-29.0.3_GH0.tar.gz) = 9c2f9ab0006969613a48b5a529674c0d79784b830479c28f802aa2a1916cdf53
+SIZE (jbeich-platform_system_tools_mkbootimg-platform-tools-29.0.3_GH0.tar.gz) = 6620
 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
 SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
--- a/devel/android-tools-fastboot/files/Makefile
+++ b/devel/android-tools-fastboot/files/Makefile
@ -3,15 +3,14 @@
 PROG_CXX=fastboot
 BINDIR?=/usr/bin
 FILESDIR?=${DOCDIR}/${PROG}
-VERSION?=0.0.0-0

 FILES=	README.md

 SRCS+=	bootimg_utils.cpp
-SRCS+=	engine.cpp
 SRCS+=	fastboot.cpp
+SRCS+=	fastboot_driver.cpp
 SRCS+=	../fastboot/fs.cpp
-SRCS+=	protocol.cpp
+SRCS+=	main.cpp
 SRCS+=	socket.cpp
 SRCS+=	tcp.cpp
 SRCS+=	udp.cpp
@ -20,18 +19,33 @@ SRCS+=	util.cpp
 .PATH: ${EXTRADIR}
 SRCS+=	usb_freebsd.cpp

-# required by fastboot
-.PATH: ${.CURDIR}/../adb
-SRCS+=	diagnose_usb.cpp
-
 # required by fastboot, diagnose_usb and libziparchive
 .PATH: ${.CURDIR}/../base
 SRCS+=	errors_unix.cpp
 SRCS+=	file.cpp
 SRCS+=	logging.cpp
+SRCS+=	mapped_file.cpp
 SRCS+=	parsenetaddress.cpp
 SRCS+=	stringprintf.cpp
 SRCS+=	strings.cpp
+SRCS+=	threads.cpp
+
+# required by fastboot
+.PATH: ${.CURDIR}/../diagnose_usb
+SRCS+=	diagnose_usb.cpp
+
+# required by fs_mgr/liblp
+.PATH: ${.CURDIR}/../extras/ext4_utils
+SRCS+=	ext4_sb.cpp
+SRCS+=	ext4_utils.cpp
+
+# required by fastboot
+.PATH: ${.CURDIR}/../fs_mgr/liblp
+SRCS+=	images.cpp
+SRCS+=	partition_opener.cpp
+SRCS+=	reader.cpp
+SRCS+=	utility.cpp
+SRCS+=	writer.cpp

 # required by fastboot
 .PATH: ${.CURDIR}/../libcutils
@ -45,36 +59,30 @@ CPPFLAGS.sockets.cpp+=	-o ${.TARGET}

 # required by base and libutils
 .PATH:	${.CURDIR}/../liblog
-SRCS+=	config_read.c
-SRCS+=	config_write.c
-SRCS+=	fake_log_device.c
-SRCS+=	fake_writer.c
-SRCS+=	local_logger.c
-SRCS+=	logger_lock.c
-SRCS+=	logger_name.c
-SRCS+=	logger_write.c
-SRCS+=	logprint.c
-SRCS+=	stderr_write.c
-SRCS+=	test_utils.cpp
+SRCS+=	config_read.cpp
+SRCS+=	config_write.cpp
+SRCS+=	fake_log_device.cpp
+SRCS+=	fake_writer.cpp
+SRCS+=	logger_lock.cpp
+SRCS+=	logger_name.cpp
+SRCS+=	logger_write.cpp
+SRCS+=	logprint.cpp
+SRCS+=	stderr_write.cpp

 # required by fastboot
 .PATH:	${.CURDIR}/../libsparse
-SRCS+=	backed_block.c
-SRCS+=	output_file.c
-SRCS+=	sparse.c
-SRCS+=	sparse_crc32.c
-SRCS+=	sparse_err.c
+SRCS+=	backed_block.cpp
+SRCS+=	output_file.cpp
+SRCS+=	sparse.cpp
+SRCS+=	sparse_crc32.cpp
+SRCS+=	sparse_err.cpp
 SRCS+=	sparse_read.cpp

-# required by libziparchive
-.PATH: ${.CURDIR}/../libutils
-SRCS+=	FileMap.cpp
-
 # required by fastboot
 .PATH:	${.CURDIR}/../libziparchive
 SRCS+=	zip_archive.cc

-CPPFLAGS+=	-DFASTBOOT_VERSION="\"${VERSION}\""
+CPPFLAGS+=	-DPLATFORM_TOOLS_VERSION="\"${VERSION:U0.0.0}\""
 CPPFLAGS+=	-Doff64_t=off_t
 CPPFLAGS+=	-Dftruncate64=ftruncate
 CPPFLAGS+=	-Dlseek64=lseek
@ -83,21 +91,25 @@ CPPFLAGS+=	-Dpread64=pread
 CPPFLAGS+=	-DFAKE_LOG_DEVICE=1
 CPPFLAGS+=	-I${.CURDIR}
 CPPFLAGS+=	-I${.CURDIR}/../include
-CPPFLAGS+=	-I${.CURDIR}/../adb
 CPPFLAGS+=	-I${.CURDIR}/../mkbootimg/include/bootimg
 CPPFLAGS+=	-I${.CURDIR}/../base/include
+CPPFLAGS+=	-I${.CURDIR}/../diagnose_usb/include
+CPPFLAGS+=	-I${.CURDIR}/../extras/ext4_utils/include
+CPPFLAGS+=	-I${.CURDIR}/../fs_mgr/liblp/include
 CPPFLAGS+=	-I${.CURDIR}/../libsparse/include
 CPPFLAGS+=	-I${.CURDIR}/../libziparchive/include
 CPPFLAGS+=	${CPPFLAGS.${.IMPSRC:T}}
+CPPFLAGS+=	$$(${PKG_CONFIG} libcrypto --cflags 2>/dev/null)
 CPPFLAGS+=	$$(${PKG_CONFIG} libusb-1.0 --cflags 2>/dev/null)
 CXXFLAGS+=	-D__STDC_LIMIT_MACROS # DragonFly
-CXXFLAGS+=	-std=gnu++11
+CXXFLAGS+=	-std=gnu++17

 .ifndef COMPILE.c
 CFLAGS+=	${CPPFLAGS}
 CXXFLAGS+=	${CPPFLAGS}
 .endif

+LDADD+=	$$(${PKG_CONFIG} libcrypto --libs 2>/dev/null || echo -lcrypto)
 LDADD+=	$$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb)
 LDADD+=	-lz \-lpthread
 DPADD+=	${LIBPTHREAD} ${LIBUSB} ${LIBZ}
--- a/devel/android-tools-fastboot/files/patch-adb_sysdeps.h
+++ b/devel/android-tools-fastboot/files/patch-adb_sysdeps.h
@ -1,43 +0,0 @@
--- adb/sysdeps.h.orig	2015-09-05 00:01:27 UTC
-+++ adb/sysdeps.h
-@@ -61,11 +61,13 @@
- #endif
- #endif
- 
-#ifdef _WIN32
-
-+#if !defined(__clang__) || __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 7)
- // Clang-only nullability specifiers
- #define _Nonnull
- #define _Nullable
-+#endif
-+
-+#ifdef _WIN32
- 
- #include <ctype.h>
- #include <direct.h>
-@@ -401,6 +401,11 @@ typedef std::unique_ptr<HANDLE, handle_d
- 
- #include <string>
- 
-+#if defined(__Bitrig__) || defined(__DragonFly__) || \
-+    defined(__FreeBSD__) || defined(__OpenBSD__)
-+#include <pthread_np.h>
-+#endif
-+
- #define OS_PATH_SEPARATORS "/"
- #define OS_PATH_SEPARATOR '/'
- #define OS_PATH_SEPARATOR_STR "/"
-@@ -627,6 +632,12 @@ static __inline__ bool adb_thread_create
- static __inline__ int adb_thread_setname(const std::string& name) {
- #ifdef __APPLE__
-     return pthread_setname_np(name.c_str());
-+#elif defined(__Bitrig__) || defined(__DragonFly__) || \
-+      defined(__FreeBSD__) || defined(__OpenBSD__)
-+    pthread_set_name_np(pthread_self(), name.c_str());
-+    return 0;
-+#elif defined(__NetBSD__)
-+    return pthread_setname_np(pthread_self(), "%s", (void*)name.c_str());
- #else
-     const char *s = name.c_str();
- 
--- a/devel/android-tools-fastboot/files/patch-base_errors__unix.cpp
+++ b/devel/android-tools-fastboot/files/patch-base_errors__unix.cpp
@ -1,11 +0,0 @@
--- base/errors_unix.cpp.orig	2016-02-20 02:39:51 UTC
-+++ base/errors_unix.cpp
-@@ -16,7 +16,7 @@
- 
- #include "android-base/errors.h"
- 
-#include <errno.h>
-+#include <string.h>
- 
- namespace android {
- namespace base {
--- a/devel/android-tools-fastboot/files/patch-base_file.cpp
+++ b/devel/android-tools-fastboot/files/patch-base_file.cpp
@ -1,17 +1,14 @@
--- base/file.cpp.orig	2017-06-20 10:50:27 UTC
+--- base/file.cpp.orig	2019-07-17 19:54:09 UTC
 +++ base/file.cpp
-@@ -19,6 +19,10 @@
- #include <errno.h>
+@@ -20,6 +20,7 @@
 #include <fcntl.h>
+ #include <ftw.h>
 #include <libgen.h>
-+#include <limits.h> // PATH_MAX
-+#include <stdio.h> // BUFSIZ
-+#include <stdlib.h> // realpath
-+#include <string.h> // strerror
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -36,6 +39,9 @@
+#include <limits.h> // PATH_MAX for GCC
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -35,6 +36,9 @@
 #if defined(__APPLE__)
 #include <mach-o/dyld.h>
 #endif
@ -19,9 +16,9 @@
 +#include <sys/sysctl.h>
 +#endif
 #if defined(_WIN32)
+ #include <direct.h>
 #include <windows.h>
- #define O_CLOEXEC O_NOINHERIT
-@@ -251,6 +258,23 @@ std::string GetExecutablePath() {
+@@ -421,6 +425,23 @@ std::string GetExecutablePath() {
   if (result == 0 || result == sizeof(path) - 1) return "";
   path[PATH_MAX - 1] = 0;
   return path;
--- a/devel/android-tools-fastboot/files/patch-base_include_android-base_logging.h
+++ b/devel/android-tools-fastboot/files/patch-base_include_android-base_logging.h
@ -1,11 +1,22 @@
--- base/include/android-base/logging.h.orig	2015-09-29 18:07:07 UTC
+--- base/include/android-base/logging.h.orig	2019-07-17 19:54:09 UTC
 +++ base/include/android-base/logging.h
-@@ -25,6 +25,8 @@
- #endif
- #endif
- 
-+#include <errno.h>
-+
- #include <functional>
- #include <memory>
- #include <ostream>
+@@ -350,7 +350,7 @@ struct LogAbortAfterFullExpr {
+ // DCHECKs are debug variants of CHECKs only enabled in debug builds. Generally
+ // CHECK should be used unless profiling identifies a CHECK as being in
+ // performance critical code.
+-#if defined(NDEBUG) && !defined(__clang_analyzer__)
+#if defined(NDEBUG) && !defined(__clang_analyzer__) || !defined(__ANDROID__)
+ static constexpr bool kEnableDChecks = false;
+ #else
+ static constexpr bool kEnableDChecks = true;
+@@ -486,8 +486,9 @@ namespace std {  // NOLINT(cert-dcl58-cpp)
+ #pragma clang diagnostic ignored "-Wgcc-compat"
+ #define OSTREAM_STRING_POINTER_USAGE_WARNING \
+     __attribute__((diagnose_if(true, "Unexpected logging of string pointer", "warning")))
+OSTREAM_STRING_POINTER_USAGE_WARNING // GCC
+ inline std::ostream& operator<<(std::ostream& stream, const std::string* string_pointer)
+-    OSTREAM_STRING_POINTER_USAGE_WARNING {
+{
+   return stream << static_cast<const void*>(string_pointer);
+ }
+ #pragma clang diagnostic pop
--- a/devel/android-tools-fastboot/files/patch-base_parsenetaddress.cpp
+++ b/devel/android-tools-fastboot/files/patch-base_parsenetaddress.cpp
@ -1,10 +0,0 @@
--- base/parsenetaddress.cpp.orig	2016-02-20 02:39:51 UTC
-+++ base/parsenetaddress.cpp
-@@ -16,6 +16,7 @@
- 
- #include "android-base/parsenetaddress.h"
- 
-+#include <stdio.h> // sscanf
- #include <algorithm>
- 
- #include "android-base/stringprintf.h"
--- a/devel/android-tools-fastboot/files/patch-base_threads.cpp
+++ b/devel/android-tools-fastboot/files/patch-base_threads.cpp
@ -1,25 +1,7 @@
--- base/logging.cpp.orig	2016-08-08 21:10:17 UTC
-+++ base/logging.cpp
-@@ -25,7 +25,7 @@
- #include <time.h>
- 
- // For getprogname(3) or program_invocation_short_name.
-#if defined(__ANDROID__) || defined(__APPLE__)
-+#if !defined(_WIN32) && !defined(__GLIBC__)
- #include <stdlib.h>
- #elif defined(__GLIBC__)
- #include <errno.h>
-@@ -35,6 +35,8 @@
- #include <sys/uio.h>
- #endif
- 
-+#include <cstring> // strrchr
-+#include <cstdio>  // fprintf
- #include <iostream>
- #include <limits>
- #include <sstream>
-@@ -71,6 +72,16 @@
- #include <unistd.h>
+--- base/threads.cpp.orig	2019-07-17 19:54:09 UTC
+++ base/threads.cpp
+@@ -25,6 +25,16 @@
+ #include <syscall.h>
 #elif defined(_WIN32)
 #include <windows.h>
 +#elif defined(__DragonFly__) || defined(__FreeBSD__)
@ -34,8 +16,8 @@
 +#include <stdint.h>
 #endif
 
- #if defined(_WIN32)
-@@ -88,6 +97,16 @@ static thread_id GetThreadId() {
+ namespace android {
+@@ -41,6 +51,16 @@ uint64_t GetThreadId() {
   return syscall(__NR_gettid);
 #elif defined(_WIN32)
   return GetCurrentThreadId();
--- a/devel/android-tools-fastboot/files/patch-extras_ext4__utils_ext4__utils.cpp
+++ b/devel/android-tools-fastboot/files/patch-extras_ext4__utils_ext4__utils.cpp
@ -0,0 +1,47 @@
+--- extras/ext4_utils/ext4_utils.cpp.orig	2019-08-13 02:10:50 UTC
+++ extras/ext4_utils/ext4_utils.cpp
+@@ -32,8 +32,16 @@
+ 
+ #if defined(__linux__)
+ #include <linux/fs.h>
+-#elif defined(__APPLE__) && defined(__MACH__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
+  || (defined(__APPLE__) && defined(__MACH__))
+ #include <sys/disk.h>
+#elif defined(__sun)
+#include <sys/dkio.h>
+#elif defined(__Bitrig__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#include <sys/disklabel.h>
+#include <sys/dkio.h>
+#elif defined(__DragonFly__)
+#include <sys/diskslice.h>
+ #endif
+ 
+ int force = 0;
+@@ -206,10 +214,24 @@ u64 get_block_device_size(int fd)
+ 	u64 size = 0;
+ 	int ret;
+ 
+-#if defined(__linux__)
+#if defined(BLKGETSIZE64)
+ 	ret = ioctl(fd, BLKGETSIZE64, &size);
+-#elif defined(__APPLE__) && defined(__MACH__)
+#elif defined(DKIOCGETBLOCKCOUNT)
+ 	ret = ioctl(fd, DKIOCGETBLOCKCOUNT, &size);
+#elif defined(DIOCGMEDIASIZE)
+	ret = ioctl(fd, DIOCGMEDIASIZE, &size);
+#elif defined(DKIOCGMEDIAINFO)
+	struct dk_minfo minfo;
+	ret = ioctl(fd, DKIOCGMEDIAINFO, &minfo);
+	size = minfo.dki_lbsize * minfo.dki_capacity;
+#elif defined(DIOCGDINFO)
+	struct disklabel dl;
+	ret = ioctl(fd, DIOCGDINFO, &dl);
+	size = dl.d_secsize * dl.d_nsectors * dl.d_ntracks * dl.d_ncylinders;
+#elif defined(DIOCGPART)
+	struct partinfo pi;
+	ret = ioctl(fd, DIOCGPART, &pi);
+	size = pi.media_size;
+ #else
+ 	close(fd);
+ 	return 0;
--- a/devel/android-tools-fastboot/files/patch-fastboot_fastboot.cpp
+++ b/devel/android-tools-fastboot/files/patch-fastboot_fastboot.cpp
@ -0,0 +1,24 @@
+--- fastboot/fastboot.cpp.orig	2019-08-13 02:10:58 UTC
+++ fastboot/fastboot.cpp
+@@ -58,9 +58,20 @@
+ #include <android-base/stringprintf.h>
+ #include <android-base/strings.h>
+ #include <android-base/unique_fd.h>
+#ifdef PLATFORM_TOOLS_VERSION
+#include <sys/utsname.h>
+namespace android { namespace build {
+std::string GetBuildNumber() {
+  struct utsname uts;
+  if (uname(&uts) == -1)
+    return "unknown";
+  return uts.sysname;
+}}}
+#else
+ #include <build/version.h>
+-#include <liblp/liblp.h>
+ #include <platform_tools_version.h>
+#endif
+#include <liblp/liblp.h>
+ #include <sparse/sparse.h>
+ #include <ziparchive/zip_archive.h>
+ 
--- a/devel/android-tools-fastboot/files/patch-liblog_fake__writer.cpp
+++ b/devel/android-tools-fastboot/files/patch-liblog_fake__writer.cpp
--- a/devel/android-tools-fastboot/files/patch-liblog_logger.h
+++ b/devel/android-tools-fastboot/files/patch-liblog_logger.h
@ -1,6 +1,6 @@
--- liblog/logger.h.orig	2019-07-17 19:54:09 UTC
+--- liblog/logger.h.orig	2019-08-13 02:10:58 UTC
 +++ liblog/logger.h
-@@ -16,8 +16,14 @@
+@@ -16,7 +16,13 @@
 
 #pragma once
 
@ -10,7 +10,6 @@
 +using std::atomic_uintptr_t;
 +#else
 #include <stdatomic.h>
- #include <stdbool.h>
 +#endif
 
 #include <cutils/list.h>
--- a/devel/android-tools-fastboot/files/patch-liblog_logger__write.c
+++ b/devel/android-tools-fastboot/files/patch-liblog_logger__write.c
@ -1,16 +0,0 @@
--- liblog/logger_write.c.orig	2016-04-16 00:01:39 UTC
-+++ liblog/logger_write.c
-@@ -15,12 +15,12 @@
-  */
- 
- #include <errno.h>
-#include <stdatomic.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/time.h>
- 
- #ifdef __BIONIC__
-+#include <stdatomic.h>
- #include <android/set_abort_message.h>
- #endif
- 
--- a/devel/android-tools-fastboot/files/patch-liblog_logger__write.cpp
+++ b/devel/android-tools-fastboot/files/patch-liblog_logger__write.cpp
--- a/devel/android-tools-fastboot/files/patch-liblog_stderr__write.cpp
+++ b/devel/android-tools-fastboot/files/patch-liblog_stderr__write.cpp
@ -1,6 +1,6 @@
--- liblog/stderr_write.cpp.orig	2019-07-17 19:54:09 UTC
+--- liblog/stderr_write.cpp.orig	2019-08-13 02:10:58 UTC
 +++ liblog/stderr_write.cpp
-@@ -56,8 +56,8 @@ struct stderrContext {
+@@ -55,8 +55,8 @@ struct stderrContext {
 
 struct android_log_transport_write stderrLoggerWrite = {
     .node = {&stderrLoggerWrite.node, &stderrLoggerWrite.node},
--- a/devel/android-tools-fastboot/files/patch-libsparse_sparse__read.cpp
+++ b/devel/android-tools-fastboot/files/patch-libsparse_sparse__read.cpp
@ -1,10 +0,0 @@
--- libsparse/sparse_read.cpp.orig	2017-06-20 10:50:27 UTC
-+++ libsparse/sparse_read.cpp
-@@ -26,6 +26,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string>
-+#include <string.h> // memset
- #include <unistd.h>
- 
- #include <sparse/sparse.h>
--- a/devel/android-tools-fastboot/files/patch-libziparchive_zip__archive.cc
+++ b/devel/android-tools-fastboot/files/patch-libziparchive_zip__archive.cc
@ -1,29 +0,0 @@
--- libziparchive/zip_archive.cc.orig	2018-06-21 00:58:42 UTC
-+++ libziparchive/zip_archive.cc
-@@ -47,6 +47,17 @@
- #include "zip_archive_common.h"
- #include "zip_archive_private.h"
- 
-+#if !defined(_WIN32)
-+#if __cplusplus >= 201703 || (defined(_LIBCPP_VERSION) && __has_include(<string_view>))
-+#include <string_view>
-+#elif __cplusplus >= 201402
-+#include <experimental/string_view>
-+namespace std {
-+using std::experimental::string_view;
-+}
-+#endif // __cplusplus >= 201703
-+#endif // !defined(_WIN32)
-+
- using android::base::get_unaligned;
- 
- // Used to turn on crc checks - verify that the content CRC matches the values
-@@ -100,7 +111,7 @@ static uint32_t RoundUpPower2(uint32_t val) {
- }
- 
- static uint32_t ComputeHash(const ZipString& name) {
-#if !defined(_WIN32)
-+#if __cplusplus >= 201402 && !defined(_WIN32)
-   return std::hash<std::string_view>{}(
-       std::string_view(reinterpret_cast<const char*>(name.name), name.name_length));
- #else
--- a/devel/android-tools-fastboot/files/usb_freebsd.cpp
+++ b/devel/android-tools-fastboot/files/usb_freebsd.cpp
@ -42,18 +42,20 @@ struct usb_handle {
 	unsigned char iface;
 };

-class LibusbUsbTransport : public Transport {
+class LibusbUsbTransport : public UsbTransport {
 public:
-	explicit LibusbUsbTransport(std::unique_ptr<usb_handle> handle):
-		h(std::move(handle)) {}
-	~LibusbUsbTransport() override = default;
+	explicit LibusbUsbTransport(std::unique_ptr<usb_handle> handle, uint32_t ms_timeout):
+		h(std::move(handle)), ms_timeout_(ms_timeout) {}
+	~LibusbUsbTransport() override;

 	ssize_t Read(void *_data, size_t len) override;
 	ssize_t Write(const void *_data, size_t len) override;
 	int Close() override;
+	int Reset() override;

 private:
 	std::unique_ptr<usb_handle> h;
+	const uint32_t ms_timeout_;

 	DISALLOW_COPY_AND_ASSIGN(LibusbUsbTransport);
 };
@ -174,7 +176,7 @@ LibusbUsbTransport::Write(const void *_data, size_t len)
 	int actlen;

 	if (libusb_bulk_transfer(h->handle, h->ep_out,
-				 (unsigned char *)_data, len, &actlen, 0) < 0)
+				 (unsigned char *)_data, len, &actlen, ms_timeout_) < 0)
 		return (-1);
 	return (actlen);
 }
@ -185,11 +187,16 @@ LibusbUsbTransport::Read(void *_data, size_t len)
 	int actlen;

 	if (libusb_bulk_transfer(h->handle, h->ep_in,
-				 (unsigned char *)_data, len, &actlen, 0) < 0)
+				 (unsigned char *)_data, len, &actlen, ms_timeout_) < 0)
 		return (-1);
 	return (actlen);
 }

+LibusbUsbTransport::~LibusbUsbTransport()
+{
+	Close();
+}
+
 int
 LibusbUsbTransport::Close()
 {
@ -200,9 +207,17 @@ LibusbUsbTransport::Close()
 	return (0);
 }

-Transport *
-usb_open(ifc_match_func callback)
+int
+LibusbUsbTransport::Reset()
+{
+	if (libusb_reset_device(h->handle))
+		return (-1);
+	return (0);
+}
+
+UsbTransport *
+usb_open(ifc_match_func callback, uint32_t timeout_ms)
 {
 	std::unique_ptr<usb_handle> h = enumerate(callback);
-	return (h ? new LibusbUsbTransport(std::move(h)) : nullptr);
+	return (h ? new LibusbUsbTransport(std::move(h), timeout_ms) : nullptr);
 }
--- a/devel/android-tools-simpleperf/Makefile
+++ b/devel/android-tools-simpleperf/Makefile
@ -14,10 +14,9 @@ LICENSE=	APACHE20
 BUILD_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}

 USE_GITHUB=	yes
-GH_ACCOUNT=	android:bionic,core jbeich
-GH_PROJECT=	platform_bionic:bionic platform_system_core:core \
-		platform_system_extras
-GH_SUBDIR=	bionic:bionic
+GH_TUPLE=	jbeich:platform_system_extras:${DISTVERSIONFULL} \
+		aosp-mirror:platform_system_core:${DISTVERSIONFULL}:core \
+		aosp-mirror:platform_bionic:${DISTVERSIONFULL}:bionic/bionic

 USES=		compiler:c++11-lib ncurses uidfix
 BUILD_WRKSRC=	${WRKSRC}/simpleperf
--- a/devel/android-tools-simpleperf/distinfo
+++ b/devel/android-tools-simpleperf/distinfo
@ -1,7 +1,7 @@
 TIMESTAMP = 1495068953
 SHA256 (jbeich-platform_system_extras-android-7.1.2_r17_GH0.tar.gz) = ee97ae3df4eecc0d7fc16d3cb6f016ae1b1f81d7e450e678473c9b4618676b42
 SIZE (jbeich-platform_system_extras-android-7.1.2_r17_GH0.tar.gz) = 79621709
-SHA256 (android-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 33677ce1ca7a534c1d9060081890939d3ae7b6980cf573b650c4ec306874613a
-SIZE (android-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 3518577
-SHA256 (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = fb8d053d846f439951c651f205c9c914531d8dace86da60474f6675a92576449
-SIZE (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = 1596372
+SHA256 (aosp-mirror-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = fb8d053d846f439951c651f205c9c914531d8dace86da60474f6675a92576449
+SIZE (aosp-mirror-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = 1596372
+SHA256 (aosp-mirror-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 33677ce1ca7a534c1d9060081890939d3ae7b6980cf573b650c4ec306874613a
+SIZE (aosp-mirror-platform_bionic-android-7.1.2_r17_GH0.tar.gz) = 3518577
--- a/devel/clojure-cider/Makefile
+++ b/devel/clojure-cider/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	clojure-cider
-PORTVERSION=	0.21.0
+PORTVERSION=	0.22.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
--- a/devel/clojure-cider/distinfo
+++ b/devel/clojure-cider/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1550684908
-SHA256 (clojure-emacs-cider-v0.21.0_GH0.tar.gz) = 9337d141972e494d5057e848caa899906b9fa09f302fab0dc5f9e13f731272c3
-SIZE (clojure-emacs-cider-v0.21.0_GH0.tar.gz) = 4307928
+TIMESTAMP = 1568259607
+SHA256 (clojure-emacs-cider-v0.22.0_GH0.tar.gz) = 284ca73e44dd69494ac9ceee8e3db0d602791b03739169aa201d5986bc79ea28
+SIZE (clojure-emacs-cider-v0.22.0_GH0.tar.gz) = 8097772
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gsoap
-PORTVERSION=	2.8.89
+PORTVERSION=	2.8.91
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}2/gsoap-2.8
 DISTNAME=	${PORTNAME}_${PORTVERSION}
--- a/devel/gsoap/distinfo
+++ b/devel/gsoap/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1565173034
-SHA256 (gsoap_2.8.89.zip) = d9b10ca2611b00932fab98cbf67b514ddad24f22cbbda91d9d68ea45821c54f2
-SIZE (gsoap_2.8.89.zip) = 32553046
+TIMESTAMP = 1567767619
+SHA256 (gsoap_2.8.91.zip) = 2ca21b5ab2b40d899566c559f71a1d51ed7eac3f00160ab78060027a3ee6488f
+SIZE (gsoap_2.8.91.zip) = 32553307
--- a/devel/libversion/Makefile
+++ b/devel/libversion/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	libversion
-PORTVERSION=	2.9.1
+PORTVERSION=	3.0.0
 CATEGORIES=	devel

 MAINTAINER=	amdmi3@FreeBSD.org
@ -23,7 +23,7 @@ OPTIONS_DEFINE=	DOCS

 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in CHANGES.md README.md TODO.md doc/ALGORITHM.md
+.for f in CHANGES.md README.md doc/ALGORITHM.md
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor

--- a/devel/libversion/distinfo
+++ b/devel/libversion/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1567789118
-SHA256 (repology-libversion-2.9.1_GH0.tar.gz) = 2fb3b81069acbb58253c6db115e1c93349a2e7012e8ad9d46f3f0f97de1178f8
-SIZE (repology-libversion-2.9.1_GH0.tar.gz) = 22109
+TIMESTAMP = 1568230019
+SHA256 (repology-libversion-3.0.0_GH0.tar.gz) = e7e576de4044dd186f642132ee3fec5392d909f69fc8e26590f4c372f92adee0
+SIZE (repology-libversion-3.0.0_GH0.tar.gz) = 23127
--- a/devel/libversion/pkg-plist
+++ b/devel/libversion/pkg-plist
@ -1,4 +1,5 @@
 bin/version_compare
+bin/version_sort
 include/libversion/config.h
 include/libversion/export.h
 include/libversion/version.h
@ -6,6 +7,6 @@ lib/cmake/libversion/libversionConfig-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/libversion/libversionConfig.cmake
 lib/libversion.a
 lib/libversion.so
-lib/libversion.so.0
-lib/libversion.so.0.1.0
+lib/libversion.so.1
+lib/libversion.so.1.0.0
 libdata/pkgconfig/libversion.pc
--- a/devel/llvm90/Makefile
+++ b/devel/llvm90/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	llvm
 DISTVERSION=	9.0.0rc4
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel lang
 .if ${DISTVERSION:M*rc*}
 MASTER_SITES=  http://prereleases.llvm.org/${LLVM_RELEASE}/${RCDIR}
@ -66,12 +66,14 @@ CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
 CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG

-OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLDB PYCLANG
+OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLD_LINK LLDB PYCLANG
 OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
+OPTIONS_DEFINE_powerpc64=	OPENMP
 OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLDB PYCLANG
-OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
+OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD LLD_LINK OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
+OPTIONS_DEFAULT_powerpc64=	OPENMP
 OPTIONS_SINGLE=		BACKENDS
 OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD
 OPTIONS_SUB=	yes
@ -115,6 +117,8 @@ LIT_DESC=		Install lit and FileCheck test tools
 LIT_VARS=		_USES_PYTHON=python:3.6+
 LLD_DESC=		Install lld, the LLVM linker
 LLD_DISTFILES=		lld-${DISTVERSION}.src${EXTRACT_SUFX}
+LLD_LINK_DESC=		Link ld.lld as ld to clang uses it
+LLD_LINK_IMPLIES=	LLD
 LLDB_BUILD_DEPENDS=	swig3.0:devel/swig30 \
 			${PY_ENUM34}
 LLDB_DESC=		Install lldb, the LLVM debugger
@ -124,6 +128,7 @@ LLDB_IMPLIES=		CLANG
 LLDB_PORTDOCS=		lldb
 LLDB_VARS=		_USES_PYTHON=python:3.6+
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
+OPENMP_EXTRA_PATCHES=	${PATCHDIR}/openmp
 OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
 PYCLANG_DESC=	Install python bindings to libclang
 PYCLANG_IMPLIES=	CLANG
@ -533,6 +538,9 @@ post-install-LIT-on:
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
 	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}

+post-install-LLD_LINK-on:
+	${LN} -s ld.lld ${STAGEDIR}${LOCALBASE}/llvm${LLVM_SUFFIX}/bin/ld
+
 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
 do-test:
 	if [ `${ID} -u` = 0 ]; then \
@ -579,6 +587,7 @@ build-plist:
 		{printf "%%%%COMPILER_RT%%%%"} \
 	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
 	    if ($$0 ~ /(lld|wasm-ld)/ && $$0 !~ /(lldb)/) {printf "%%%%LLD%%%%"} \
+	    if ($$0 ~ /(bin\/ld$$)/) {printf "%%%%LLD_LINK%%%%"} \
 	    if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
 	    if ($$0 ~ /(lib.*omp|omp.h|ompt.h)/) {printf "%%%%OPENMP%%%%"} \
 	    if ($$0 ~ /(LLVMgold)/) {printf "%%%%GOLD%%%%"} \
--- a/devel/llvm90/files/openmp/patch-projects_openmp_runtime_src_kmp__platform.h
+++ b/devel/llvm90/files/openmp/patch-projects_openmp_runtime_src_kmp__platform.h
@ -0,0 +1,33 @@
+--- projects/openmp/runtime/src/kmp_platform.h.orig	2019-01-19 10:56:40 UTC
+++ projects/openmp/runtime/src/kmp_platform.h
+@@ -93,9 +93,9 @@
+ #define KMP_ARCH_X86 0
+ #define KMP_ARCH_X86_64 0
+ #define KMP_ARCH_AARCH64 0
+-#define KMP_ARCH_PPC64_BE 0
+-#define KMP_ARCH_PPC64_LE 0
+-#define KMP_ARCH_PPC64 (KMP_ARCH_PPC64_LE || KMP_ARCH_PPC64_BE)
+#define KMP_ARCH_PPC64_ELFv1 0
+#define KMP_ARCH_PPC64_ELFv2 0
+#define KMP_ARCH_PPC64 (KMP_ARCH_PPC64_ELFv2 || KMP_ARCH_PPC64_ELFv1)
+ #define KMP_ARCH_MIPS 0
+ #define KMP_ARCH_MIPS64 0
+ 
+@@ -117,12 +117,12 @@
+ #undef KMP_ARCH_X86
+ #define KMP_ARCH_X86 1
+ #elif defined __powerpc64__
+-#if defined __LITTLE_ENDIAN__
+-#undef KMP_ARCH_PPC64_LE
+-#define KMP_ARCH_PPC64_LE 1
+#if defined(_CALL_ELF) && _CALL_ELF == 2
+#undef KMP_ARCH_PPC64_ELFv2
+#define KMP_ARCH_PPC64_ELFv2 1
+ #else
+-#undef KMP_ARCH_PPC64_BE
+-#define KMP_ARCH_PPC64_BE 1
+#undef KMP_ARCH_PPC64_ELFv1
+#define KMP_ARCH_PPC64_ELFv1 1
+ #endif
+ #elif defined __aarch64__
+ #undef KMP_ARCH_AARCH64
--- a/devel/llvm90/files/openmp/patch-projects_openmp_runtime_src_zLinuxasm.S
+++ b/devel/llvm90/files/openmp/patch-projects_openmp_runtime_src_zLinuxasm.S
@ -0,0 +1,62 @@
+--- projects/openmp/runtime/src/z_Linux_asm.S.orig	2019-07-02 13:45:40 UTC
+++ projects/openmp/runtime/src/z_Linux_asm.S
+@@ -1328,12 +1328,12 @@ KMP_LABEL(kmp_1):
+ // return:	r3	(always 1/TRUE)
+ //
+ 	.text
+-# if KMP_ARCH_PPC64_LE
+# if KMP_ARCH_PPC64_ELFv2
+ 	.abiversion 2
+ # endif
+ 	.globl	__kmp_invoke_microtask
+ 
+-# if KMP_ARCH_PPC64_LE
+# if KMP_ARCH_PPC64_ELFv2
+ 	.p2align	4
+ # else
+ 	.p2align	2
+@@ -1341,7 +1341,7 @@ KMP_LABEL(kmp_1):
+ 
+ 	.type	__kmp_invoke_microtask,@function
+ 
+-# if KMP_ARCH_PPC64_LE
+# if KMP_ARCH_PPC64_ELFv2
+ __kmp_invoke_microtask:
+ .Lfunc_begin0:
+ .Lfunc_gep0:
+@@ -1385,7 +1385,7 @@ __kmp_invoke_microtask:
+ 	.cfi_offset lr, 16
+ 
+ // Compute the size necessary for the local stack frame.
+-# if KMP_ARCH_PPC64_LE
+# if KMP_ARCH_PPC64_ELFv2
+ 	li 12, 72
+ # else
+ 	li 12, 88
+@@ -1463,7 +1463,7 @@ __kmp_invoke_microtask:
+ // for the microtask begins 48 + 8*8 == 112 bytes above r1 for ELFv1 and
+ // 32 + 8*8 == 96 bytes above r1 for ELFv2.
+ 	addi 4, 4, 40
+-# if KMP_ARCH_PPC64_LE
+# if KMP_ARCH_PPC64_ELFv2
+ 	addi 12, 1, 88
+ # else
+ 	addi 12, 1, 104
+@@ -1475,7 +1475,7 @@ __kmp_invoke_microtask:
+ 	bdnz .Lnext
+ 
+ .Lcall:
+-# if KMP_ARCH_PPC64_LE
+# if KMP_ARCH_PPC64_ELFv2
+ 	std 2, 24(1)
+ 	mr 12, 3
+ #else
+@@ -1491,7 +1491,7 @@ __kmp_invoke_microtask:
+ 
+ 	mtctr 12
+ 	bctrl
+-# if KMP_ARCH_PPC64_LE
+# if KMP_ARCH_PPC64_ELFv2
+ 	ld 2, 24(1)
+ # else
+ 	ld 2, 40(1)
--- a/devel/llvm90/pkg-plist
+++ b/devel/llvm90/pkg-plist
@ -141,6 +141,7 @@ llvm%%LLVM_SUFFIX%%/bin/dsymutil
 %%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/find-all-symbols
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/git-clang-format
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/hmaptool
+%%LLD_LINK%%llvm%%LLVM_SUFFIX%%/bin/ld
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld.lld
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld
 llvm%%LLVM_SUFFIX%%/bin/llc
--- a/devel/netsurf-buildsystem/Makefile
+++ b/devel/netsurf-buildsystem/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	buildsystem
-PORTVERSION=	1.7
+PORTVERSION=	1.8
 CATEGORIES=	devel
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 PKGNAMEPREFIX=	netsurf-
--- a/devel/netsurf-buildsystem/distinfo
+++ b/devel/netsurf-buildsystem/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1536019754
-SHA256 (buildsystem-1.7.tar.gz) = 1cd6453301cd88c4dcc36ae67c67d2023b8a56ec2fd0704851b58ccdbc5243e0
-SIZE (buildsystem-1.7.tar.gz) = 38597
+TIMESTAMP = 1567620887
+SHA256 (buildsystem-1.8.tar.gz) = e6a324e7c5965ca032d3196adddd6fd986b5f47c0e6340a646d0d23e3597cd39
+SIZE (buildsystem-1.8.tar.gz) = 38617
--- a/devel/py-libversion/Makefile
+++ b/devel/py-libversion/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	libversion
-PORTVERSION=	1.1.4
+PORTVERSION=	1.2.0
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-libversion/distinfo
+++ b/devel/py-libversion/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1561496915
-SHA256 (libversion-1.1.4.tar.gz) = 982019a547a922b96cde904f17dad1e0dc00dd1c30068523d06794a0c9e6e076
-SIZE (libversion-1.1.4.tar.gz) = 7909
+TIMESTAMP = 1568230023
+SHA256 (libversion-1.2.0.tar.gz) = b352cc98ca4e23095b362e3dee57a75f193b5380060988d4823b84a7a9b47adc
+SIZE (libversion-1.2.0.tar.gz) = 8197
--- a/devel/py-pymisp/Makefile
+++ b/devel/py-pymisp/Makefile
@ -7,7 +7,7 @@ MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

 MAINTAINER=	gmm@tutanota.com
-COMMENT=	PyMISP is a Python library to access MISP platforms via their REST API
+COMMENT=	Python library to access MISP platforms via their REST API

 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
--- a/devel/py-uhid-freebsd/Makefile
+++ b/devel/py-uhid-freebsd/Makefile
@ -1,9 +1,9 @@
 # $FreeBSD$

 PORTNAME=		uhid-freebsd
-PORTVERSION=		1.0
-DISTVERSIONPREFIX=	v
+PORTVERSION=		1.2.1
 CATEGORIES=		devel python
+MASTER_SITES=		CHEESESHOP
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}

 MAINTAINER=		grembo@FreeBSD.org
@ -15,7 +15,4 @@ LICENSE_FILE=		${WRKSRC}/LICENSE
 USES=			python
 USE_PYTHON=		autoplist distutils

-USE_GITHUB=		yes
-GH_ACCOUNT=		grembo
-
 .include <bsd.port.mk>
--- a/devel/py-uhid-freebsd/distinfo
+++ b/devel/py-uhid-freebsd/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1568129281
-SHA256 (grembo-uhid-freebsd-v1.0_GH0.tar.gz) = 319501e3b2e24e892d5ab5c58cba69cd9eb7327056e8aa261efbe35fb96f8fc3
-SIZE (grembo-uhid-freebsd-v1.0_GH0.tar.gz) = 4017
+TIMESTAMP = 1568241061
+SHA256 (uhid-freebsd-1.2.1.tar.gz) = 13436ea492271b27cd4847fe3168fd467c0f31aa295abd4aeab61e92920fdd58
+SIZE (uhid-freebsd-1.2.1.tar.gz) = 4467
--- a/devel/xtoolchain-llvm-devel/Makefile
+++ b/devel/xtoolchain-llvm-devel/Makefile
@ -1,7 +1,11 @@
 # $FreeBSD$

 PORTNAME=	xtoolchain
+.ifndef NO_LLD_LINK
 PORTVERSION=	0.1
+.else
+PORTVERSION=	0.2
+.endif
 CATEGORIES=	devel
 MASTER_SITES=	# none
 DISTFILES=	# none
@ -37,11 +41,13 @@ do-install:
 	@${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
 		${STAGEDIR}${PREFIX}/share/toolchains/llvm${LLVM_SUFFIX}.mk

+.ifndef NO_LLD_LINK
 # XXX: would be better to add -fuse-ld=lld to LDFLAGS, but there isn't
 # yet a mechansim for that.  Link added here, not in devel/llvm* to avoid
 # forcing lld on all users.
 post-install:
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/llvm${LLVM_SUFFIX}/bin
 	@${LN} -s ld.lld ${STAGEDIR}${LOCALBASE}/llvm${LLVM_SUFFIX}/bin/ld
+.endif

 .include <bsd.port.mk>
--- a/devel/xtoolchain-llvm90/Makefile
+++ b/devel/xtoolchain-llvm90/Makefile
@ -1,6 +1,7 @@
 # $FreeBSD$

 LLVM_SUFFIX=90
+NO_LLD_LINK=yes

 MASTERDIR=	${.CURDIR}/../xtoolchain-llvm-devel

--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@ -6,7 +6,8 @@ PORTVERSION?=	${DJBDNS_VER}
 PORTREVISION?=	22
 PORTEPOCH?=	1
 CATEGORIES?=	dns
-MASTER_SITES=	http://cr.yp.to/djbdns/ \
+MASTER_SITES=	https://cr.yp.to/djbdns/ \
+		http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/
 DISTNAME=	djbdns-${DJBDNS_VER}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@ -2,9 +2,8 @@

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

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

--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@ -1,6 +1,6 @@
-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
+TIMESTAMP = 1568233855
+SHA256 (RPCS3-rpcs3-v0.0.7-8690-g27af75fe7_GH0.tar.gz) = b61ee696f3f555efaee90fef8fe49a1280d146a8029d53b76f848383c39dac50
+SIZE (RPCS3-rpcs3-v0.0.7-8690-g27af75fe7_GH0.tar.gz) = 5573156
 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5
 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 105400
 SHA256 (RPCS3-llvm-b860b5e8f4ee_GH0.tar.gz) = c151972a0c8ceac568c24b61e63d2ecbdac0f125185e23fc2238e0a14048256e
--- a/emulators/rpcs3/files/extra-patch-revert-4504ac2d1248
+++ b/emulators/rpcs3/files/extra-patch-revert-4504ac2d1248
@ -0,0 +1,218 @@
+rpcs3/util/atomic.cpp:95:3: error: use of undeclared identifier 'fallback_wait'
+                fallback_wait(data, size, old_value, timeout);
+                ^
+rpcs3/util/atomic.cpp:219:4: error: use of undeclared identifier 'fallback_notify_one'
+                        fallback_notify_one(data);
+                        ^
+rpcs3/util/atomic.cpp:307:5: error: use of undeclared identifier 'fallback_notify_all'
+                                fallback_notify_all(data);
+                                ^
+
+--- rpcs3/util/atomic.cpp.orig	2019-09-10 16:25:39 UTC
+++ rpcs3/util/atomic.cpp
+@@ -15,14 +15,11 @@
+ // Pointer mask without bits used as hash, assuming signed 48-bit pointers
+ static constexpr u64 s_pointer_mask = 0xffff'ffff'ffff & ~(s_hashtable_size - 1);
+ 
+-// Max number of waiters is 32767
+-static constexpr u64 s_waiter_mask = 0x7fff'0000'0000'0000;
+-
+-//
+-static constexpr u64 s_collision_bit = 0x8000'0000'0000'0000;
+// Max number of waiters is 65535
+static constexpr u64 s_waiter_mask = 0xffff'0000'0000'0000;
+ 
+ // Implementation detail (remaining bits out of 32 available for futex)
+-static constexpr u64 s_signal_mask = 0xffffffff & ~(s_waiter_mask | s_pointer_mask | s_collision_bit);
+static constexpr u64 s_signal_mask = 0xffffffff & ~(s_waiter_mask | s_pointer_mask);
+ 
+ // Callback for wait() function, returns false if wait should return
+ static thread_local bool(*s_tls_wait_cb)(const void* data) = [](const void*)
+@@ -182,8 +179,6 @@
+ 
+ 	u32 new_value = 0;
+ 
+-	bool fallback = false;
+-
+ 	const auto [_, ok] = entry.fetch_op([&](u64& value)
+ 	{
+ 		if ((value & s_waiter_mask) == s_waiter_mask || (value & s_signal_mask) == s_signal_mask)
+@@ -196,17 +191,11 @@
+ 		{
+ 			// Store pointer bits
+ 			value |= (iptr & s_pointer_mask);
+-			fallback = false;
+-
+-#ifdef _WIN32
+-			value += s_signal_mask & -s_signal_mask;
+-#endif
+ 		}
+ 		else
+ 		{
+-			// Set collision bit
+-			value |= s_collision_bit;
+-			fallback = true;
+			// Set pointer bits to all ones (collision, TODO)
+			value |= s_pointer_mask;
+ 		}
+ 
+ 		// Add waiter
+@@ -220,11 +209,7 @@
+ 		return;
+ 	}
+ 
+-	if (fallback)
+-	{
+-		fallback_wait(data, size, old_value, timeout);
+-	}
+-	else if (ptr_cmp(data, size, old_value) && s_tls_wait_cb(data))
+	if (ptr_cmp(data, size, old_value) && s_tls_wait_cb(data))
+ 	{
+ #ifdef _WIN32
+ 		LARGE_INTEGER qw;
+@@ -260,13 +245,6 @@
+ 			{
+ 				value -= s_waiter_mask & -s_waiter_mask;
+ 
+-#ifdef _WIN32
+-				if (!fallback)
+-				{
+-					value -= s_signal_mask & -s_signal_mask;
+-				}
+-#endif
+-
+ 				if ((value & s_waiter_mask) == 0)
+ 				{
+ 					// Reset on last waiter
+@@ -279,7 +257,7 @@
+ 			return false;
+ 		});
+ 
+-		if (ok || fallback)
+		if (ok)
+ 		{
+ 			break;
+ 		}
+@@ -306,20 +284,15 @@
+ 
+ 	atomic_t<u64>& entry = s_hashtable[iptr % s_hashtable_size];
+ 
+	bool fallback = false;
+
+ 	const auto [prev, ok] = entry.fetch_op([&](u64& value)
+ 	{
+ 		if (value & s_waiter_mask && (value & s_pointer_mask) == (iptr & s_pointer_mask))
+ 		{
+ #ifdef _WIN32
+-			if ((value & s_signal_mask) == 0)
+-			{
+-				// No relevant waiters, do nothing
+-				return false;
+-			}
+-
+-			// Try to decrement if possible
+			// Try to decrement if no collision
+ 			value -= s_waiter_mask & -s_waiter_mask;
+-			value -= s_signal_mask & -s_signal_mask;
+ 
+ 			if ((value & s_waiter_mask) == 0)
+ 			{
+@@ -337,22 +310,30 @@
+ 
+ 			if ((value & s_signal_mask) == s_signal_mask)
+ 			{
+-				// Signal will overflow, fallback to notify_all
+-				notify_all(data);
+				// Signal will overflow, fallback
+				fallback = true;
+ 				return false;
+ 			}
+ #endif
+
+ 			return true;
+ 		}
+-		else if (value & s_waiter_mask && value & s_collision_bit)
+
+		if (value & s_waiter_mask && (value & s_pointer_mask) == s_pointer_mask)
+ 		{
+-			fallback_notify_one(data);
+-			return false;
+			// Collision, notify everything
+			fallback = true;
+ 		}
+ 
+ 		return false;
+ 	});
+ 
+	if (fallback)
+	{
+		notify_all(data);
+		return;
+	}
+
+ 	if (ok)
+ 	{
+ #ifdef _WIN32
+@@ -375,32 +356,11 @@
+ 	{
+ 		if (value & s_waiter_mask)
+ 		{
+-			if ((value & s_pointer_mask) == (iptr & s_pointer_mask))
+			if ((value & s_pointer_mask) == s_pointer_mask || (value & s_pointer_mask) == (iptr & s_pointer_mask))
+ 			{
+-				if ((value & s_signal_mask) == 0)
+-				{
+-					// No relevant waiters, do nothing
+-					return false;
+-				}
+-
+-				const u64 count = (value & s_signal_mask) / (s_signal_mask & -s_signal_mask);
+-				value -= (s_waiter_mask & -s_waiter_mask) * count;
+-				value -= (s_signal_mask & -s_signal_mask) * count;
+-
+-				if ((value & s_waiter_mask) == 0)
+-				{
+-					// Reset on last waiter
+-					value = 0;
+-				}
+-
+				value = 0;
+ 				return true;
+ 			}
+-
+-			if (value & s_collision_bit)
+-			{
+-				fallback_notify_all(data);
+-				return false;
+-			}
+ 		}
+ 
+ 		return false;
+@@ -411,7 +371,7 @@
+ 		return;
+ 	}
+ 
+-	for (u64 count = old & s_signal_mask; count; count -= s_signal_mask & -s_signal_mask)
+	for (u64 count = old & s_waiter_mask; count; count -= s_waiter_mask & -s_waiter_mask)
+ 	{
+ 		NtReleaseKeyedEvent(nullptr, &entry, false, nullptr);
+ 	}
+@@ -426,17 +386,11 @@
+ 				return false;
+ 			}
+ 
+-			if ((value & s_pointer_mask) == (iptr & s_pointer_mask))
+			if ((value & s_pointer_mask) == s_pointer_mask || (value & s_pointer_mask) == (iptr & s_pointer_mask))
+ 			{
+ 				value += s_signal_mask & -s_signal_mask;
+ 				return true;
+ 			}
+-
+-			if (value & s_collision_bit)
+-			{
+-				fallback_notify_all(data);
+-				return false;
+-			}
+ 		}
+ 
+ 		return false;
--- a/emulators/rpcs3/files/extra-patch-revert-5bd17a44c972
+++ b/emulators/rpcs3/files/extra-patch-revert-5bd17a44c972
@ -25,7 +25,7 @@ rpcs3/util/atomic.cpp:94:7: error: member reference base type 'unsigned long' is
                ptls->mapped().cond.notify_one();
                ~~~~^ ~~~~~~

--- rpcs3/util/atomic.cpp.orig	2019-08-04 18:16:19 UTC
+--- rpcs3/util/atomic.cpp.orig	2019-09-10 16:25:39 UTC
 +++ rpcs3/util/atomic.cpp
@@ -2,10 +2,6 @@
 
@ -38,7 +38,7 @@ rpcs3/util/atomic.cpp:94:7: error: member reference base type 'unsigned long' is
 // Should be at least 65536, currently 2097152.
 static constexpr std::uintptr_t s_hashtable_size = 1u << 21;
 
-@@ -31,113 +27,6 @@ static inline bool ptr_cmp(const void* data, std::size_t size, u64 old_value)
+@@ -40,134 +36,8 @@ static inline bool ptr_cmp(const void* data, std::size
 	return false;
 }
 
@ -77,22 +77,41 @@ rpcs3/util/atomic.cpp:94:7: error: member reference base type 'unsigned long' is
 -		return s_waiter_maps[std::hash<const void*>()(ptr) % std::size(s_waiter_maps)];
 -	}
 -
-	void fallback_wait(const void* data, std::size_t size, u64 old_value)
+-	void fallback_wait(const void* data, std::size_t size, u64 old_value, u64 timeout)
 -	{
 -		auto& wmap = get_fallback_map(data);
 -
+-		if (!timeout)
+-		{
+-			return;
+-		}
+-
 -		// Update node key
 -		s_tls_waiter.key() = data;
 -
-		if (std::unique_lock lock(wmap.mutex); ptr_cmp(data, size, old_value))
+-		if (std::unique_lock lock(wmap.mutex); ptr_cmp(data, size, old_value) && s_tls_wait_cb(data))
 -		{
 -			// Add node to the waiter list
-			std::condition_variable& cond = wmap.list.insert(std::move(s_tls_waiter))->second.cond;
+-			const auto iter = wmap.list.insert(std::move(s_tls_waiter));
 -
 -			// Wait until the node is returned to its TLS location
+-			if (timeout + 1)
+-			{
+-				if (!iter->second.cond.wait_for(lock, std::chrono::nanoseconds(timeout), [&]
+-				{
+-					return 1 && s_tls_waiter;
+-				}))
+-				{
+-					// Put it back
+-					s_tls_waiter = wmap.list.extract(iter);
+-				}
+-
+-				return;
+-			}
+-
 -			while (!s_tls_waiter)
 -			{
-				cond.wait(lock);
+-				iter->second.cond.wait(lock);
 -			}
 -		}
 -	}
@ -132,9 +151,9 @@ rpcs3/util/atomic.cpp:94:7: error: member reference base type 'unsigned long' is
 -
 -#if !defined(_WIN32) && !defined(__linux__)
 -
-void atomic_storage_futex::wait(const void* data, std::size_t size, u64 old_value)
-{
-	fallback_wait(data, size, old_value);
+ void atomic_storage_futex::wait(const void* data, std::size_t size, u64 old_value, u64 timeout)
+ {
+-	fallback_wait(data, size, old_value, timeout);
 -}
 -
 -void atomic_storage_futex::notify_one(const void* data)
@ -149,12 +168,17 @@ rpcs3/util/atomic.cpp:94:7: error: member reference base type 'unsigned long' is
 -
 -#else
 -
- void atomic_storage_futex::wait(const void* data, std::size_t size, u64 old_value)
- {
- #ifdef _WIN32
-@@ -337,5 +226,3 @@ void atomic_storage_futex::notify_all(const void* data)
+-void atomic_storage_futex::wait(const void* data, std::size_t size, u64 old_value, u64 timeout)
+-{
+ 	if (!timeout)
+ 	{
+ 		return;
+@@ -402,8 +272,6 @@ void atomic_storage_futex::notify_all(const void* data
 	}
 #endif
 }
 -
 -#endif
+ 
+ void atomic_storage_futex::set_wait_callback(bool(*cb)(const void* data))
+ {
--- a/emulators/rpcs3/files/patch-rpcs3_Emu_IdManager.h
+++ b/emulators/rpcs3/files/patch-rpcs3_Emu_IdManager.h
@ -0,0 +1,13 @@
+https://github.com/RPCS3/rpcs3/issues/6529
+
+--- rpcs3/Emu/IdManager.h.orig	2019-09-09 16:16:02 UTC
+++ rpcs3/Emu/IdManager.h
+@@ -30,7 +30,7 @@ namespace id_manager
+ 		static const u32 base    = T::id_base;
+ 		static const u32 step    = T::id_step;
+ 		static const u32 count   = T::id_count;
+-		static const u32 invalid = base > 0 ? 0 : -1;
+		static constexpr u32 invalid = base > 0 ? 0 : -1;
+ 
+ 		// Note: full 32 bits range cannot be used at current implementation
+ 		static_assert(count > 0 && step > 0 && u64{step} * count + base < u64{UINT32_MAX} + (base != 0 ? 1 : 0), "ID traits: invalid object range");
--- a/emulators/wine/files/patch-dlls_iphlpapi_ipstats.c
+++ b/emulators/wine/files/patch-dlls_iphlpapi_ipstats.c
@ -1,3 +1,6 @@
+This has been merged upstream in Wine 4.15 (in a slightly tweaked manner),
+so we should be able to drop it latest with the next major release.
+
 --- UTC
 --- dlls/iphlpapi/ipstats.c.orig	2017-03-21 00:03:25.304042000 -0700
 +++ dlls/iphlpapi/ipstats.c	2017-03-21 00:09:42.312023000 -0700
--- a/ftp/netdumpd/Makefile
+++ b/ftp/netdumpd/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	netdumpd
-PORTVERSION=	20190518
+PORTVERSION=	20190910
 PORTREVISION=	0
 CATEGORIES=	ftp
 MASTER_SITES=	LOCAL/markj
--- a/ftp/netdumpd/distinfo
+++ b/ftp/netdumpd/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1558204420
-SHA256 (netdumpd-20190518.tar.gz) = cac88663b8424f12013508deadcd5ac44d12fa61acd8c6380bb71cd313d61cee
-SIZE (netdumpd-20190518.tar.gz) = 17620
+TIMESTAMP = 1568157384
+SHA256 (netdumpd-20190910.tar.gz) = 22fa99e9ca475d37150160aa405ff4dea81b1efbfd20e538be60bf1e5e91b9cc
+SIZE (netdumpd-20190910.tar.gz) = 17624
--- a/games/barrage/Makefile
+++ b/games/barrage/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	barrage
-PORTVERSION=	1.0.4
-PORTREVISION=	4
+PORTVERSION=	1.0.5
 CATEGORIES=	games
 MASTER_SITES=	SF/lgames/${PORTNAME}/

@ -13,8 +12,9 @@ COMMENT=	Destroy as many targets as possible
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING

-USES=		gmake
+USES=		gmake gnome sdl
 USE_SDL=	sdl mixer
+
 GNU_CONFIGURE=	yes

 INSTALLS_ICONS=	yes
@ -26,8 +26,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/games/|/|g' ${WRKSRC}/configure

 post-install:
-	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/
+	${LN} -sf ${PREFIX}/share/icons/${PORTNAME}48.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png

 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
--- a/games/barrage/distinfo
+++ b/games/barrage/distinfo
@ -1,2 +1,3 @@
-SHA256 (barrage-1.0.4.tar.gz) = ad74e049dfded3bca28b8dc1c5870408cfad9e024b35cc5b501ba90486d9af25
-SIZE (barrage-1.0.4.tar.gz) = 484641
+TIMESTAMP = 1568050232
+SHA256 (barrage-1.0.5.tar.gz) = a78897ab6a8cf6d53d4093bb8abae204ddfa3a22c5cab9e76220e4987de76904
+SIZE (barrage-1.0.5.tar.gz) = 510221
--- a/games/barrage/pkg-plist
+++ b/games/barrage/pkg-plist
@ -23,7 +23,6 @@ share/applications/barrage.desktop
 %%DATADIR%%/sounds/expl3.wav
 %%DATADIR%%/sounds/gunfire.wav
 %%DATADIR%%/sounds/highlight.wav
-share/icons/hicolor/16x16/apps/barrage.png
-share/icons/hicolor/32x32/apps/barrage.png
-share/icons/hicolor/48x48/apps/barrage.png
+share/icons/barrage48.png
 share/pixmaps/barrage.png
+/var/barrage.hscr
--- a/games/cutemaze/pkg-descr
+++ b/games/cutemaze/pkg-descr
@ -3,4 +3,4 @@ one of a choice of several different algorithms. You move the character through
 the maze while hunting for targets (cheese, by default) the game is won once
 all of these targets have been picked up.

-WWW: http://gottcode.org/cutemaze/
+WWW: https://gottcode.org/cutemaze/
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	krita
-DISTVERSION=	4.2.3
-PORTREVISION=	4
+DISTVERSION=	4.2.6
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}
 DIST_SUBDIR=	KDE/${PORTNAME}
@ -35,7 +34,7 @@ LIB_DEPENDS=	libImath.so:graphics/ilmbase \
 # Disable ninja generator for now (with gmake), until the duplicate test targets are resolved upstream.
 USES=		cmake:noninja gmake compiler:c++11-lib desktop-file-utils \
 		eigen:3 gettext jpeg kde:5 pkgconfig python:3.4+ qt:5 \
-		shared-mime-info
+		shared-mime-info xorg
 USE_KDE=	archive completion config coreaddons crash guiaddons i18n \
 		itemmodels itemviews kio service widgetsaddons windowsystem
 USE_QT=		concurrent core dbus declarative gui multimedia network printsupport \
--- a/graphics/krita/distinfo
+++ b/graphics/krita/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1563002816
-SHA256 (KDE/krita/krita-4.2.3.tar.gz) = 7b302dc204fba84737013528720c1704bea98f805a1215369f53c6421c088467
-SIZE (KDE/krita/krita-4.2.3.tar.gz) = 246136588
+TIMESTAMP = 1568188576
+SHA256 (KDE/krita/krita-4.2.6.tar.gz) = a7ea86f7943a29c7e0a764efc3f992a834b08c1ad4cdb4c7073a3912df3cdde3
+SIZE (KDE/krita/krita-4.2.6.tar.gz) = 246320346
--- a/graphics/krita/pkg-plist
+++ b/graphics/krita/pkg-plist
@ -96,8 +96,6 @@ lib/kritaplugins/kritapixelizefilter.so
 lib/kritaplugins/kritapngexport.so
 lib/kritaplugins/kritapngimport.so
 lib/kritaplugins/kritaposterize.so
-lib/kritaplugins/kritappmexport.so
-lib/kritaplugins/kritappmimport.so
 lib/kritaplugins/kritapresetdocker.so
 lib/kritaplugins/kritapresethistory.so
 lib/kritaplugins/kritapsdexport.so
@ -262,7 +260,6 @@ share/applications/krita_kra.desktop
 share/applications/krita_ora.desktop
 share/applications/krita_pdf.desktop
 share/applications/krita_png.desktop
-share/applications/krita_ppm.desktop
 share/applications/krita_psd.desktop
 share/applications/krita_qimageio.desktop
 share/applications/krita_raw.desktop
@ -302,25 +299,25 @@ share/color/icc/krita/krita25_lcms-builtin-sRGB_g100-truegamma.icc
 share/color/icc/krita/sRGB-elle-V2-g10.icc
 share/color/icc/krita/sRGB-elle-V2-srgbtrc.icc
 share/color/icc/krita/scRGB.icm
-share/icons/hicolor/1024x1024/apps/calligrakrita.png
+share/icons/hicolor/1024x1024/apps/krita.png
 share/icons/hicolor/1024x1024/mimetypes/application-x-krita.png
-share/icons/hicolor/128x128/apps/calligrakrita.png
+share/icons/hicolor/128x128/apps/krita.png
 share/icons/hicolor/128x128/mimetypes/application-x-krita.png
-share/icons/hicolor/16x16/apps/calligrakrita.png
+share/icons/hicolor/16x16/apps/krita.png
 share/icons/hicolor/16x16/mimetypes/application-x-krita.png
-share/icons/hicolor/22x22/apps/calligrakrita.png
+share/icons/hicolor/22x22/apps/krita.png
 share/icons/hicolor/22x22/mimetypes/application-x-krita.png
-share/icons/hicolor/256x256/apps/calligrakrita.png
+share/icons/hicolor/256x256/apps/krita.png
 share/icons/hicolor/256x256/mimetypes/application-x-krita.png
-share/icons/hicolor/32x32/apps/calligrakrita.png
+share/icons/hicolor/32x32/apps/krita.png
 share/icons/hicolor/32x32/mimetypes/application-x-krita.png
-share/icons/hicolor/48x48/apps/calligrakrita.png
+share/icons/hicolor/48x48/apps/krita.png
 share/icons/hicolor/48x48/mimetypes/application-x-krita.png
-share/icons/hicolor/512x512/apps/calligrakrita.png
+share/icons/hicolor/512x512/apps/krita.png
 share/icons/hicolor/512x512/mimetypes/application-x-krita.png
-share/icons/hicolor/64x64/apps/calligrakrita.png
+share/icons/hicolor/64x64/apps/krita.png
 share/icons/hicolor/64x64/mimetypes/application-x-krita.png
-share/icons/hicolor/scalable/apps/calligrakrita.svgz
+share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/actions/ConnectionTool.action
 %%DATADIR%%/actions/InteractionTool.action
 %%DATADIR%%/actions/KarbonCalligraphyTool.action
--- a/graphics/py-pillow/Makefile
+++ b/graphics/py-pillow/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	pillow
-PORTVERSION=	6.0.0
-PORTREVISION=	2
+PORTVERSION=	6.1.0
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

--- a/graphics/py-pillow/distinfo
+++ b/graphics/py-pillow/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1555711743
-SHA256 (python-pillow-Pillow-6.0.0_GH0.tar.gz) = f0babf5d7072ea9923a3950cd7ea41b0008429b16584de7d95cc5550a2806cda
-SIZE (python-pillow-Pillow-6.0.0_GH0.tar.gz) = 29205509
+TIMESTAMP = 1565961342
+SHA256 (python-pillow-Pillow-6.1.0_GH0.tar.gz) = 9a3a613e7780362605b10765274389b3e9a6fe3201dd2bceeb422d45c5c9ba18
+SIZE (python-pillow-Pillow-6.1.0_GH0.tar.gz) = 33523149
--- a/graphics/py-pillow/pkg-descr
+++ b/graphics/py-pillow/pkg-descr
@ -2,4 +2,4 @@ Pillow is the "friendly" PIL fork. PIL is the Python Imaging Library. Pillow
 was started for and is currently maintained by the Plone community. But it is
 used by many other folks in the Python web community.

-WWW: https://python-pillow.github.io/
+WWW: https://python-pillow.org/
--- a/lang/gcc9-devel/Makefile
+++ b/lang/gcc9-devel/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gcc
-PORTVERSION=	9.2.1.s20190831
+PORTVERSION=	9.2.1.s20190907
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
--- a/lang/gcc9-devel/distinfo
+++ b/lang/gcc9-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1567297358
-SHA256 (gcc-9-20190831.tar.xz) = 9b39511c0f9f8030a84203cf9f323e83c7c6d55c814ac6f2fd238509b3832874
-SIZE (gcc-9-20190831.tar.xz) = 68875072
+TIMESTAMP = 1567914226
+SHA256 (gcc-9-20190907.tar.xz) = 9f4aa7fd704df77e9b649f99959572477e9b99868f48a0fcc8b866b4fd1e76a5
+SIZE (gcc-9-20190907.tar.xz) = 68883596
--- a/lang/rust-nightly/Makefile
+++ b/lang/rust-nightly/Makefile
@ -16,7 +16,7 @@ CONFLICTS_INSTALL=	rust
 # Which source to pull:
 #   https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz
 #   https://static.rust-lang.org/dist/channel-rust-nightly.toml
-NIGHTLY_DATE=			2019-09-10
+NIGHTLY_DATE=			2019-09-12
 NIGHTLY_SUBDIR=			${NIGHTLY_DATE}/

 # See WRKSRC/src/stage0.txt for this date
--- a/lang/rust-nightly/distinfo
+++ b/lang/rust-nightly/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1568053426
-SHA256 (rust/2019-09-10/rustc-nightly-src.tar.xz) = 964ed04a02b19d58200f4b23ba79c6fb20549128f78f4d839b1cdff6971c6a9a
-SIZE (rust/2019-09-10/rustc-nightly-src.tar.xz) = 96266364
+TIMESTAMP = 1568234913
+SHA256 (rust/2019-09-12/rustc-nightly-src.tar.xz) = add0d51e0136e55bbbf347cdd8013ca65a0a0bd31a75041e5c5e214fc2a6874d
+SIZE (rust/2019-09-12/rustc-nightly-src.tar.xz) = 96409540
 SHA256 (rust/2019-08-13/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 62117526710b92d1cc00632a6bcf8c1941f5a7d9c1f7a964d7bca55f09786537
 SIZE (rust/2019-08-13/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 49723228
 SHA256 (rust/2019-08-13/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = c65ef74bebebcf18c9f89c67c16de146c7071e2dffe90effcaf544ff74829d6d
--- a/mail/Makefile
+++ b/mail/Makefile
@ -98,6 +98,7 @@
    SUBDIR += dma
    SUBDIR += dot-forward
    SUBDIR += dovecot
+    SUBDIR += dovecot-fts-xapian
    SUBDIR += dovecot-pigeonhole
    SUBDIR += dspam
    SUBDIR += ecartis
--- a/mail/dovecot-fts-xapian/Makefile
+++ b/mail/dovecot-fts-xapian/Makefile
@ -0,0 +1,34 @@
+# $FreeBSD$
+
+PORTNAME=	fts-xapian
+PORTVERSION=	1.2.1
+CATEGORIES=	mail
+PKGNAMEPREFIX=	dovecot-
+
+MAINTAINER=	bapt@FreeBSD.org
+COMMENT=	Dovecot FTS plugin based on Xapian
+
+LICENSE=	LGPL21
+
+LIB_DEPENDS=	libxapian.so:databases/xapian-core \
+		libicuuc.so:devel/icu
+BUILD_DEPENDS=	dovecot>=2.3.7:mail/dovecot
+RUN_DEPENDS=	dovecot>=2.3.7:mail/dovecot
+
+USES=		autoreconf libtool pkgconfig
+
+USE_LDCONFIG=	yes
+
+USE_GITHUB=yes
+GH_ACCOUNT=	grosjo
+GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
+
+GNU_CONFIGURE=	yes
+
+PLIST_FILES=	lib/dovecot/lib21_fts_xapian_plugin.a \
+		lib/dovecot/lib21_fts_xapian_plugin.so
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/lib21_fts_xapian_plugin.so
+
+.include <bsd.port.mk>
--- a/mail/dovecot-fts-xapian/distinfo
+++ b/mail/dovecot-fts-xapian/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1568284001
+SHA256 (grosjo-fts-xapian-1.2.1-fts-xapian-1.2.1_GH0.tar.gz) = 9c8dbaa3ddf5f489356a3ec40af012c02aaa6af7ae513ade5b208d3d19771277
+SIZE (grosjo-fts-xapian-1.2.1-fts-xapian-1.2.1_GH0.tar.gz) = 27267
--- a/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp
+++ b/mail/dovecot-fts-xapian/files/patch-src_fts-backend-xapian.cpp
@ -0,0 +1,13 @@
+--- src/fts-backend-xapian.cpp.orig	2019-08-18 16:36:45 UTC
+++ src/fts-backend-xapian.cpp
+@@ -115,9 +115,7 @@ static int fts_backend_xapian_init(struct fts_backend 
+     	}
+ 
+ 	const char * path = mailbox_list_get_root_forced(_backend->ns->list, MAILBOX_LIST_PATH_TYPE_INDEX);
+-	long l=strlen(path)+strlen(XAPIAN_FILE_PREFIX)+2;
+-	backend->path = (char *)i_malloc(l*sizeof(char));
+-	snprintf(backend->path,l,"%s/%s",path,XAPIAN_FILE_PREFIX);
+	backend->path = i_strconcat(path, "/" XAPIAN_FILE_PREFIX, NULL);
+ 
+ 	struct stat sb;
+ 	if(!( (stat(backend->path, &sb)==0) && S_ISDIR(sb.st_mode)))
--- a/mail/dovecot-fts-xapian/pkg-descr
+++ b/mail/dovecot-fts-xapian/pkg-descr
@ -0,0 +1,8 @@
+This project intends to provide a straightforward and simple way to configure
+FTS plugin for Dovecot, leveraging the efforts by the Xapian.org team.
+
+This effort came after Dovecot team decided to deprecate "fts_squat" included in
+the dovecot core, and due to the complexity of the Solr plugin capabilitles,
+un-needed for most users.
+
+WWW: https://github.com/grosjo/fts-xapian
--- a/Show More
+++ b/Show More