*/*: sync with upstream

Taken from: HardenedBSD
2019-05-05 10:09:04 +02:00 · 2019-05-05 10:09:04 +02:00 · 64b826778b
parent b94cda9ff0
commit 64b826778b
178 changed files with 2996 additions and 1060 deletions
--- a/audio/Makefile
+++ b/audio/Makefile
@ -135,6 +135,7 @@
    SUBDIR += eq10q-lv2
    SUBDIR += esound
    SUBDIR += espeak
+    SUBDIR += espressivo-lv2
    SUBDIR += etcd
    SUBDIR += eteroj-lv2
    SUBDIR += etktab
@ -487,6 +488,7 @@
    SUBDIR += luppp
    SUBDIR += lv2
    SUBDIR += lv2file
+    SUBDIR += lv2lint
    SUBDIR += lvtk
    SUBDIR += lxmusic
    SUBDIR += mac
@ -810,6 +812,7 @@
    SUBDIR += teamspeak3-server
    SUBDIR += tempest_for_eliza
    SUBDIR += thunar-media-tags-plugin
+    SUBDIR += timely-lv2
    SUBDIR += timemachine
    SUBDIR += timidity
    SUBDIR += timidity++
--- a/audio/espressivo-lv2/Makefile
+++ b/audio/espressivo-lv2/Makefile
@ -0,0 +1,28 @@
+# $FreeBSD$
+
+PORTNAME=	espressivo
+DISTVERSION=	g20190421
+CATEGORIES=	audio
+PKGNAMESUFFIX=	-lv2
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	LV2 plugin bundle to handle expressive events
+
+LICENSE=	ART20
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	lv2>0:audio/lv2 \
+		lv2lint:audio/lv2lint \
+		sord_validate:devel/sord
+
+USES=		compiler:c11 meson pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	OpenMusicKontrollers
+GH_PROJECT=	${PORTNAME}.lv2
+GH_TAGNAME=	de1d07c
+
+PLIST_FILES=	lib/lv2/espressivo.lv2/espressivo.so \
+		lib/lv2/espressivo.lv2/espressivo.ttl \
+		lib/lv2/espressivo.lv2/manifest.ttl
+
+.include <bsd.port.mk>
--- a/audio/espressivo-lv2/distinfo
+++ b/audio/espressivo-lv2/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1557001275
+SHA256 (OpenMusicKontrollers-espressivo.lv2-g20190421-de1d07c_GH0.tar.gz) = 2c814ec032bc22baed211a0dd24ef36d77fd80f356be7c490b4840335af22ff3
+SIZE (OpenMusicKontrollers-espressivo.lv2-g20190421-de1d07c_GH0.tar.gz) = 94124
--- a/audio/espressivo-lv2/pkg-descr
+++ b/audio/espressivo-lv2/pkg-descr
@ -0,0 +1,3 @@
+LV2 plugin bundle to handle expressive events.
+
+WWW: https://github.com/OpenMusicKontrollers/espressivo.lv2
--- a/audio/giada/Makefile
+++ b/audio/giada/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	giada
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.15.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio

 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
--- a/audio/lv2lint/Makefile
+++ b/audio/lv2lint/Makefile
@ -0,0 +1,28 @@
+# $FreeBSD$
+
+PORTNAME=	lv2lint
+DISTVERSION=	g20190403
+CATEGORIES=	audio
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Check whether a given LV2 plugin is up to the specification
+
+LICENSE=	ART20
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	lv2>0:audio/lv2 \
+		curl>0:ftp/curl \
+		libelf>0:devel/libelf
+LIB_DEPENDS=	liblilv-0.so:audio/lilv
+RUN_DEPENDS=	curl>0:ftp/curl \
+		libelf>0:devel/libelf
+
+USES=		meson pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	OpenMusicKontrollers
+GH_TAGNAME=	3c24394
+
+PLIST_FILES=	bin/lv2lint \
+		man/man1/lv2lint.1.gz
+
+.include <bsd.port.mk>
--- a/audio/lv2lint/distinfo
+++ b/audio/lv2lint/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1556999377
+SHA256 (OpenMusicKontrollers-lv2lint-g20190403-3c24394_GH0.tar.gz) = 8f4b6b766a0d171205f7482288b6ec57ede420792330facdc61e3d2defc5d756
+SIZE (OpenMusicKontrollers-lv2lint-g20190403-3c24394_GH0.tar.gz) = 33858
--- a/audio/lv2lint/files/patch-lv2lint.h
+++ b/audio/lv2lint/files/patch-lv2lint.h
@ -0,0 +1,11 @@
+--- lv2lint.h.orig	2019-05-04 19:51:19 UTC
+++ lv2lint.h
+@@ -38,7 +38,7 @@
+ #	include <curl/curl.h>
+ #endif
+ 
+-#define __unused __attribute__((unused))
+//#define __unused __attribute__((unused))
+ 
+ typedef enum _ansi_color_t {
+ 	ANSI_COLOR_BOLD,
--- a/audio/lv2lint/pkg-descr
+++ b/audio/lv2lint/pkg-descr
@ -0,0 +1,8 @@
+lv2lint can optionally test your plugin URIs for existence. If you want that,
+you need to enable it at compile time (-Donline-tests=true) and link to libcurl.
+
+lv2lint can optionally test your plugin symbol visibility and link dependencies.
+If you want that, you need to enable it at compile time (-Delf-tests=true) and
+link to libelf.
+
+WWW: https://github.com/OpenMusicKontrollers/lv2lint
--- a/audio/midi-matrix-lv2/Makefile
+++ b/audio/midi-matrix-lv2/Makefile
@ -2,10 +2,9 @@
 # $FreeBSD$

 PORTNAME=	midi-matrix
-PORTVERSION=	0.20.0
-PORTREVISION=	1
+DISTVERSION=	0.22.0
 CATEGORIES=	audio
-MASTER_SITES=	https://gitlab.com/OpenMusicKontrollers/midi_matrix.lv2/repository/archive.tar.gz?ref=${PORTVERSION}&dummy=/
+MASTER_SITES=	https://gitlab.com/OpenMusicKontrollers/midi_matrix.lv2/repository/archive.tar.gz?ref=${DISTVERSION}&dummy=/
 PKGNAMESUFFIX=	-lv2

 MAINTAINER=	yuri@FreeBSD.org
@ -14,9 +13,11 @@ COMMENT=	LV2 'Midi Matrix' plugin bundle: 'Channel Filter'
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/COPYING

-BUILD_DEPENDS=	lv2>0:audio/lv2
+BUILD_DEPENDS=	lv2>0:audio/lv2 \
+		lv2lint:audio/lv2lint \
+		sord_validate:devel/sord

-USES=		cmake compiler:c11 pkgconfig
+USES=		compiler:c11 gl meson pkgconfig
 USE_XORG=	x11 xext
 USE_GL=		gl glu

--- a/audio/midi-matrix-lv2/distinfo
+++ b/audio/midi-matrix-lv2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1502216898
-SHA256 (midi-matrix-0.20.0.tar.gz) = 1ff8478d2610c4b216a02052bde24929a54d89af31eb0c1a3e7e1ff5d07b7980
-SIZE (midi-matrix-0.20.0.tar.gz) = 1719808
+TIMESTAMP = 1557001679
+SHA256 (midi-matrix-0.22.0.tar.gz) = ce26aec78df22a9ccf74c06af8d1fb19ddaf782f538dec0498692caaaf7349f4
+SIZE (midi-matrix-0.22.0.tar.gz) = 1903280
--- a/audio/midi-matrix-lv2/files/patch-pugl_pugl_pugl__x11.c
+++ b/audio/midi-matrix-lv2/files/patch-pugl_pugl_pugl__x11.c
@ -1,11 +0,0 @@
--- pugl/pugl/pugl_x11.c.orig	2017-05-16 21:46:21 UTC
-+++ pugl/pugl/pugl_x11.c
-@@ -648,7 +648,7 @@ puglPasteFromClipboard(PuglView* view, s
- 		if(  (xevent.xselection.selection == impl->clipboard)
- 			&& (xevent.xselection.target == impl->utf8_string)
- 			&& (xevent.xselection.property == XA_PRIMARY) ) {
-			ulong nitems, rem;
-+			uint32_t nitems, rem;
- 			int format;
- 			uint8_t* data;
- 			Atom type;
--- a/audio/midi-matrix-lv2/pkg-descr
+++ b/audio/midi-matrix-lv2/pkg-descr
@ -6,4 +6,4 @@ enabling you to easily accomplish:
 * MIDI channel rerouting (e.g send events from channel X to channel Y)
 * And any possible combination thereof

-WWW: http://open-music-kontrollers.ch/lv2/midi_matrix
+WWW: https://open-music-kontrollers.ch/lv2/midi_matrix/
--- a/audio/polyphone/Makefile
+++ b/audio/polyphone/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	polyphone
 DISTVERSION=	1.9
 DISTVERSIONSUFFIX=	-src
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://polyphone-soundfonts.com/en/download/file/76-polyphone-1-8-src-zip/latest/download?ae95d968569b61bc77f7b8559a14db4d=1/

--- a/audio/rtaudio/Makefile
+++ b/audio/rtaudio/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	rtaudio
-DISTVERSIONPREFIX=	v
-DISTVERSION=	5.0.0
+DISTVERSION=	5.1.0
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
@ -14,6 +13,7 @@ USES=		autoreconf libtool pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	thestk
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-static
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip

--- a/audio/rtaudio/distinfo
+++ b/audio/rtaudio/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1509775215
-SHA256 (thestk-rtaudio-v5.0.0_GH0.tar.gz) = 14d1936c88585cacf081a896438f04f158c115c0fc9eec9364214040c4328376
-SIZE (thestk-rtaudio-v5.0.0_GH0.tar.gz) = 211279
+TIMESTAMP = 1556954589
+SHA256 (thestk-rtaudio-5.1.0_GH0.tar.gz) = 42242eb0db5902166a38530c242567294510f57be22754cfafe31ed1f35b76bf
+SIZE (thestk-rtaudio-5.1.0_GH0.tar.gz) = 226721
--- a/audio/rtaudio/files/patch-configure.ac
+++ b/audio/rtaudio/files/patch-configure.ac
@ -1,11 +0,0 @@
--- configure.ac.orig	2017-11-04 06:06:02 UTC
-+++ configure.ac
-@@ -142,7 +142,7 @@ case $host in
-   AS_IF([test "$api" == ""], [
-     AC_MSG_RESULT(using OSS)
-     api="$api -D__LINUX_OSS__"
-    LIBS="$LIBS -lossaudio"
-+    LIBS="$LIBS"
-     AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!))])
-   ;;
- 
--- a/audio/rtaudio/pkg-plist
+++ b/audio/rtaudio/pkg-plist
@ -1,6 +1,6 @@
 include/rtaudio/RtAudio.h
-lib/librtaudio.a
+include/rtaudio/rtaudio_c.h
 lib/librtaudio.so
 lib/librtaudio.so.6
-lib/librtaudio.so.6.0.0
+lib/librtaudio.so.6.0.1
 libdata/pkgconfig/rtaudio.pc
--- a/audio/rtmidi/Makefile
+++ b/audio/rtmidi/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	rtmidi
-DISTVERSIONPREFIX=	v
-DISTVERSION=	3.0.0
+DISTVERSION=	4.0.0
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/rtmidi/distinfo
+++ b/audio/rtmidi/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1515648219
-SHA256 (thestk-rtmidi-v3.0.0_GH0.tar.gz) = 55cd0fba60321aadcd847481d207bf2b70e783b5bfa1a01037bf916554a7d5c4
-SIZE (thestk-rtmidi-v3.0.0_GH0.tar.gz) = 82839
+TIMESTAMP = 1556954880
+SHA256 (thestk-rtmidi-4.0.0_GH0.tar.gz) = d32de9ceebf6d969537e9a9720925a1ac7f6a8bc4ac4ce7c58c01434f4e54f44
+SIZE (thestk-rtmidi-4.0.0_GH0.tar.gz) = 92928
--- a/audio/rtmidi/files/patch-configure.ac
+++ b/audio/rtmidi/files/patch-configure.ac
@ -1,32 +0,0 @@
--- configure.ac.orig	2017-09-01 00:10:07 UTC
-+++ configure.ac
-@@ -72,7 +72,7 @@ AC_MSG_CHECKING(whether to compile debug
- AC_ARG_ENABLE(debug,
-   [  --enable-debug = enable various debug output],
-   [AC_SUBST( cppflag, [-D__RTMIDI_DEBUG__] ) AC_SUBST( cxxflag, [-g] ) AC_SUBST( object_path, [Debug] ) AC_MSG_RESULT(yes)],
-  [AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [-O3] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
-+  [AC_SUBST( cppflag, [] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
- 
- # Set paths if prefix is defined
- if test "x$prefix" != "x" && test "x$prefix" != "xNONE"; then
-@@ -85,7 +85,7 @@ CPPFLAGS="$CPPFLAGS $cppflag"
- 
- # For debugging and optimization ... overwrite default because it has both -g and -O2
- #CXXFLAGS="$CXXFLAGS $cxxflag"
-CXXFLAGS="$cxxflag"
-+CXXFLAGS+="$cxxflag"
- 
- # Check compiler and use -Wall if gnu.
- if [test $GXX = "yes" ;] then
-@@ -139,6 +139,11 @@ case $host in
-   AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtMidi requires the pthread library!))
-   ;;
- 
-+  *-*-freebsd*)
-+  # Checks for pthread library.
-+  AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtMidi requires the pthread library!))
-+  ;;
-+
-   *-apple*)
-   # Look for Core flag
-   AC_ARG_WITH(core, [  --with-core = choose CoreMidi API support (mac only)])
--- a/audio/rtmidi/pkg-plist
+++ b/audio/rtmidi/pkg-plist
@ -1,6 +1,6 @@
 include/rtmidi/RtMidi.h
 include/rtmidi/rtmidi_c.h
 lib/librtmidi.so
-lib/librtmidi.so.4
-lib/librtmidi.so.4.0.0
+lib/librtmidi.so.5
+lib/librtmidi.so.5.0.0
 libdata/pkgconfig/rtmidi.pc
--- a/audio/samplv1-lv2/Makefile
+++ b/audio/samplv1-lv2/Makefile
@ -17,7 +17,8 @@ LIB_DEPENDS=	libjack.so:audio/jack \
 		liblo.so:audio/liblo \
 		libsndfile.so:audio/libsndfile

-USES=		autoreconf gl gmake pkgconfig qt:5 shared-mime-info
+USES=		autoreconf compiler:c++11-lang gl gmake pkgconfig qt:5 \
+		shared-mime-info
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	rncbc
--- a/audio/timely-lv2/Makefile
+++ b/audio/timely-lv2/Makefile
@ -0,0 +1,28 @@
+# $FreeBSD$
+
+PORTNAME=	timely
+DISTVERSION=	g20190412
+CATEGORIES=	audio
+PKGNAMESUFFIX=	-lv2
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Utility header for time-based LV2 plugins
+
+LICENSE=	ART20
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	lv2>0:audio/lv2 \
+		lv2lint:audio/lv2lint \
+		sord_validate:devel/sord
+
+USES=		compiler:c11 meson pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	OpenMusicKontrollers
+GH_PROJECT=	timely.lv2
+GH_TAGNAME=	3846b5a
+
+PLIST_FILES=	lib/lv2/timely.lv2/manifest.ttl \
+		lib/lv2/timely.lv2/timely.so \
+		lib/lv2/timely.lv2/timely.ttl
+
+.include <bsd.port.mk>
--- a/audio/timely-lv2/distinfo
+++ b/audio/timely-lv2/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1557000735
+SHA256 (OpenMusicKontrollers-timely.lv2-g20190412-3846b5a_GH0.tar.gz) = e981d5fceebf3135196eebe82b9175461884a4068a430e0204a84b87e4c3e00c
+SIZE (OpenMusicKontrollers-timely.lv2-g20190412-3846b5a_GH0.tar.gz) = 9746
--- a/audio/timely-lv2/pkg-descr
+++ b/audio/timely-lv2/pkg-descr
@ -0,0 +1,3 @@
+A utility LV2 plugin to be used with other, time-based plugins.
+
+WWW: https://github.com/OpenMusicKontrollers/timely.lv2
--- a/audio/vgmplay/Makefile
+++ b/audio/vgmplay/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	vgmplay
 PORTVERSION=	0.40.9
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/vgmrips/${PORTNAME}/releases/download/${PORTVERSION}/
 DISTNAME=	${PORTNAME:S/vgmp/VGMP/}_${PORTVERSION:S/.//:S/./-/}_src
@ -26,10 +27,12 @@ LIBAO_DESC=	Use libao
 OSS_MAKE_ENV+=	USE_LIBAO=0
 LIBAO_MAKE_ENV+=	USE_LIBAO=1
 LIBAO_LIB_DEPENDS=	libao.so:audio/libao
-LIBAO_CFLAGS+=	-I${LOCALBASE}/include
-LIBAO_LDFLAGS+=	-L${LOCALBASE}/lib
+LIBAO_USES=	localbase:ldflags

-MAKE_ENV+=	PREFIX=${LOCALBASE}
+MAKE_ENV+=	PREFIX=${LOCALBASE} ${MAKE_ENV_${ARCH}}
+MAKE_ENV_powerpc64=	BYTE_ORDER=2
+MAKE_ENV_powerpc=	BYTE_ORDER=2
+MAKE_ENV_powerpcspe=	BYTE_ORDER=2

 PLIST_FILES=	bin/vgmplay bin/vgm2pcm bin/vgm2wav man/man1/vgmplay.1.gz ${EXAMPLESDIR}/vgmplay.ini

--- a/audio/vm-lv2/Makefile
+++ b/audio/vm-lv2/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	vm
-PORTVERSION=	0.4.0
-PORTREVISION=	3
+DISTVERSION=	0.6.0
 CATEGORIES=	audio
 MASTER_SITES=	https://gitlab.com/OpenMusicKontrollers/vm.lv2/repository/archive.tar.gz?ref=${PORTVERSION}&dummy=/
 PKGNAMESUFFIX=	-lv2
@ -14,13 +13,14 @@ COMMENT=	Virtual machine LV2 plugin bundle
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/COPYING

-BUILD_DEPENDS=	lv2>0:audio/lv2
+BUILD_DEPENDS=	lv2>0:audio/lv2 \
+		lv2lint:audio/lv2lint
 LIB_DEPENDS=	liblilv-0.so:audio/lilv \
 		libserd-0.so:devel/serd \
 		libsord-0.so:devel/sord \
 		libsratom-0.so:audio/sratom

-USES=		cmake compiler:c++11-lib pkgconfig localbase
+USES=		compiler:c++11-lib gl meson pkgconfig localbase
 USE_XORG=	x11 xext
 USE_GL=		gl glu

--- a/audio/vm-lv2/distinfo
+++ b/audio/vm-lv2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1502075538
-SHA256 (vm-0.4.0.tar.gz) = 6b816a271caf68efa3649252613a50c5799628590ae761491e0e2652b1a0fbe9
-SIZE (vm-0.4.0.tar.gz) = 1745498
+TIMESTAMP = 1556999099
+SHA256 (vm-0.6.0.tar.gz) = 72ca3850760a344e0b8cdaf5a0820b4c24e2fb117cee9545bb6244a3583abe53
+SIZE (vm-0.6.0.tar.gz) = 2051802
--- a/audio/vm-lv2/files/patch-pugl_pugl_pugl__x11.c
+++ b/audio/vm-lv2/files/patch-pugl_pugl_pugl__x11.c
@ -1,11 +0,0 @@
--- pugl/pugl/pugl_x11.c.orig	2017-08-07 03:15:15 UTC
-+++ pugl/pugl/pugl_x11.c
-@@ -648,7 +648,7 @@ puglPasteFromClipboard(PuglView* view, s
- 		if(  (xevent.xselection.selection == impl->clipboard)
- 			&& (xevent.xselection.target == impl->utf8_string)
- 			&& (xevent.xselection.property == XA_PRIMARY) ) {
-			ulong nitems, rem;
-+			uint32_t nitems, rem;
- 			int format;
- 			uint8_t* data;
- 			Atom type;
--- a/audio/vm-lv2/pkg-plist
+++ b/audio/vm-lv2/pkg-plist
@ -1,5 +1,8 @@
 lib/lv2/vm.lv2/Cousine-Regular.ttf
+lib/lv2/vm.lv2/cancel.png
 lib/lv2/vm.lv2/manifest.ttl
+lib/lv2/vm.lv2/plus.png
+lib/lv2/vm.lv2/up_arrow.png
 lib/lv2/vm.lv2/vm.so
 lib/lv2/vm.lv2/vm.ttl
 lib/lv2/vm.lv2/vm_ui.so
--- a/biology/ddocent/Makefile
+++ b/biology/ddocent/Makefile
@ -1,10 +1,9 @@
 # $FreeBSD$

-PORTNAME=	dDocent
+PORTNAME=		dDocent
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.2.25
-PORTREVISION=	1
-CATEGORIES=	biology java
+DISTVERSION=		2.7.8
+CATEGORIES=		biology java perl5 python

 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Bash pipeline for RAD sequencing
@ -32,29 +31,21 @@ RUN_DEPENDS=	unzip>=0:archivers/unzip \
 		bedtools>=2.26.0:biology/bedtools \
 		pear-merger>=0:biology/pear-merger \
 		vcflib>=0:biology/vcflib \
-		freebayes:biology/freebayes
+		freebayes:biology/freebayes \
+		fastp:biology/fastp

 USES=		perl5 python shebangfix
-SHEBANG_FILES=	dDocent scripts/*.sh scripts/*.pl scripts/dDocent_filters
 USE_JAVA=	yes
 USE_GITHUB=	yes
+
+SHEBANG_FILES=	dDocent scripts/*.sh scripts/*.pl scripts/dDocent_filters
 GH_ACCOUNT=	jpuritz

 NO_BUILD=	yes
 NO_ARCH=	yes

-# These are on top of patch-dDocent, so don't apply them within the source
-# tree, or they'll get picked up by patch generators, and hard-code PREFIX.
-post-install:
-	${REINPLACE_CMD} -i '' \
-		-e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g' \
-		-e 's|%%BASH%%|${LOCALBASE}/bin/bash|g' \
-		-e 's|python|${PYTHON_CMD}|g' \
-		${STAGEDIR}${PREFIX}/bin/dDocent
-
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} \
 		${WRKSRC}/dDocent \
 		${WRKSRC}/*.sh \
@ -65,4 +56,12 @@ do-install:
 		${WRKSRC}/scripts/dDocent_filters \
 		${STAGEDIR}${PREFIX}/bin

+# These are on top of patch-dDocent, so don't apply them within the source
+# tree, or they'll get picked up by patch generators, and hard-code PREFIX.
+post-install:
+	@${REINPLACE_CMD} -i '' \
+		-e 's|SHELL=bash|SHELL=${LOCALBASE}/bin/bash|g' \
+		-e 's|python|${PYTHON_CMD}|g' \
+		${STAGEDIR}${PREFIX}/bin/dDocent
+
 .include <bsd.port.mk>
--- a/biology/ddocent/distinfo
+++ b/biology/ddocent/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1520345850
-SHA256 (jpuritz-dDocent-v2.2.25_GH0.tar.gz) = 903c3010b29b2ca95f7fe6099925948e4d3f21655668caff653df97dfa7ecf44
-SIZE (jpuritz-dDocent-v2.2.25_GH0.tar.gz) = 336804
+TIMESTAMP = 1556888100
+SHA256 (jpuritz-dDocent-v2.7.8_GH0.tar.gz) = 02aa297f602b55587782c959379cada8d8b0570973da75eb9f5786089a3ed485
+SIZE (jpuritz-dDocent-v2.7.8_GH0.tar.gz) = 345571
--- a/biology/ddocent/files/ddocent-assembly-test
+++ b/biology/ddocent/files/ddocent-assembly-test
@ -135,15 +135,11 @@ rm *rem*
 { set +x; } 2>/dev/null
 pause

-rm -f Rename_for_dDocent.sh     # Always get the latest
-set -x
-curl --insecure -L -O https://github.com/jpuritz/dDocent/raw/master/Rename_for_dDocent.sh
-more Rename_for_dDocent.sh
 { set +x; } 2>/dev/null
 pause

 set -x
-bash Rename_for_dDocent.sh SimRAD.barcodes
+Rename_for_dDocent.sh SimRAD.barcodes
 { set +x; } 2>/dev/null

 set -x
@ -312,20 +308,11 @@ cd-hit-est -i rainbow.fasta -o referenceRC.fasta -M 0 -T 0 -c 0.9
 { set +x; } 2>/dev/null
 pause

-rm -f remake_reference.sh
-set -x
-curl --insecure -L -O https://github.com/jpuritz/dDocent/raw/master/scripts/remake_reference.sh
-more remake_reference.sh
-#fix_bash_path remake_reference.sh
-
-bash remake_reference.sh 4 4 0.90 PE 2
+remake_reference.sh 4 4 0.90 PE 2
 { set +x; } 2>/dev/null
 pause

-rm -f ReferenceOpt.sh
-set -x
-curl --insecure -L -O https://github.com/jpuritz/dDocent/raw/master/scripts/ReferenceOpt.sh
-more ReferenceOpt.sh
+ReferenceOpt.sh

 bash ReferenceOpt.sh 4 8 4 8 PE 16
 { set +x; } 2>/dev/null
@ -357,7 +344,6 @@ printf "Bonus Section: Optimize reference assemblies? (takes a long time) y/[n]
 read bonus
 if [ 0$bonus = 0y ]; then
    set -x
-    curl -L -O https://raw.githubusercontent.com/jpuritz/dDocent/master/scripts/RefMapOpt.sh
    { set +x; } 2>/dev/null
    printf "Running dDocent to trim reads.\n"
    pause
@ -372,7 +358,7 @@ no
 no
 bacon@uwm.edu
 EOM
-    bash RefMapOpt.sh 4 8 4 8 0.9 64 PE
+    RefMapOpt.sh 4 8 4 8 0.9 64 PE
    { set +x; } 2>/dev/null
    pause
    more mapping.results
--- a/biology/ddocent/files/patch-dDocent
+++ b/biology/ddocent/files/patch-dDocent
@ -1,44 +1,13 @@
--- dDocent.orig	2018-04-20 00:10:34 UTC
+--- dDocent.orig	2019-05-03 12:59:20 UTC
 +++ dDocent
-@@ -1,6 +1,9 @@
+@@ -1,5 +1,6 @@
 #!/usr/local/bin/bash
 export LC_ALL=en_US.UTF-8
- 
 +# GNU Parallel uses $SHELL and has issues with [t]csh
-+export SHELL=%%BASH%%
-+
+ export SHELL=bash
+ 
 ##########dDocent##########
- VERSION='2.2.25'
- #This script serves as an interactive bash wrapper to QC, assemble, map, and call SNPs from double digest RAD (SE or PE), ezRAD (SE or PE) data, or SE RAD data.
-@@ -27,15 +30,15 @@ do
- 	fi
- done
- 
-if find ${PATH//:/ } -maxdepth 1 -name trimmomatic*jar 2> /dev/null| grep -q 'trim' ; then
-	TRIMMOMATIC=$(find ${PATH//:/ } -maxdepth 1 -name trimmomatic*jar 2> /dev/null | head -1)
-+if [ -e %%JAVAJARDIR%%/trimmomatic.jar ]; then
-+       TRIMMOMATIC=%%JAVAJARDIR%%/trimmomatic.jar
- 	else
-     echo "The dependency trimmomatic is not installed or is not in your" '$PATH'"."
-     NUMDEP=$((NUMDEP + 1))
- 	fi
- 
-if find ${PATH//:/ } -maxdepth 1 -name TruSeq2-PE.fa 2> /dev/null | grep -q 'Tru' ; then
-	ADAPTERS=$(find ${PATH//:/ } -maxdepth 1 -name TruSeq2-PE.fa 2> /dev/null | head -1)
-+if [ -e %%PREFIX%%/share/trimmomatic/adapters/TruSeq2-PE.fa ]; then
-+       ADAPTERS=%%PREFIX%%/share/trimmomatic/adapters/TruSeq2-PE.fa
- 	else
-     echo "The file listing adapters (included with trimmomatic) is not installed or is not in your" '$PATH'"."
-     NUMDEP=$((NUMDEP + 1))
-@@ -80,6 +83,7 @@ FREEB=(`freebayes | grep -oh 'v[0-9].*' 
-         	exit 1
-         fi         	
- VCFTV=$(vcftools | grep VCF | grep -oh '[0-9]*[a-z]*)$' | sed 's/[a-z)]//')
-+	echo $VCFTV
- 	if [ "$VCFTV" -lt "10" ]; then
-         	echo "The version of VCFtools installed in your" '$PATH' "is not optimized for dDocent."
-         	echo "Please install at least version 0.1.11"
-@@ -89,7 +93,7 @@ VCFTV=$(vcftools | grep VCF | grep -oh '
+@@ -83,7 +84,7 @@ VCFTV=$(vcftools | grep VCF | grep -oh '[0-9]*[a-z]*)$
         elif [ "$VCFTV" -ge "12" ]; then
                 VCFGTFLAG="--max-missing"
 	fi
@ -47,88 +16,58 @@
 	if [ "$BWAV" -lt "13" ]; then
         	echo "The version of bwa installed in your" '$PATH' "is not optimized for dDocent."
         	echo "Please install at least version 0.7.13"
-@@ -107,13 +111,12 @@ BTC=$( bedtools --version | mawk '{print
- 		exit 1	
+@@ -481,7 +482,7 @@ if [ "$SNP" != "no" ]; then
+         		if ( cov < cutoff) {x="mapped."i".bed";print $1"\t"$2"\t"$3 > x}
+         		else {i=i+1; x="mapped."i".bed"; print $1"\t"$2"\t"$3 > x; cov=0}
+         	}'
+-                ls mapped.*.bed | sed 's/mapped.//g' | sed 's/.bed//g' | shuf | parallel --bar --halt now,fail=1 --env call_genos2 --memfree $MAXMemory -j 4 --no-notice "call_genos2 {} 2> /dev/null"
+                ls mapped.*.bed | sed 's/mapped.//g' | sed 's/.bed//g' | gshuf | parallel --bar --halt now,fail=1 --env call_genos2 --memfree $MAXMemory -j 4 --no-notice "call_genos2 {} 2> /dev/null"
+                 if [ -f "freebayes.error" ]; then
+                         echo -e "\n\n\nFreeBayes has failed when trying to finish a previously failed instance.  Memory and processor settings need to be drastically reconfigured"
+                         ERROR3=1
+@@ -505,7 +506,7 @@ if [ "$SNP" != "no" ]; then
+ 	
+ 	rm freebayes.error freebayes.log &> /dev/null
+ 	
+-	ls mapped.*.bed | sed 's/mapped.//g' | sed 's/.bed//g' | shuf | parallel --bar --halt now,fail=5 --env call_genos --memfree $MAXMemory -j $NUMProc --no-notice "call_genos {} 2> /dev/null"
+	ls mapped.*.bed | sed 's/mapped.//g' | sed 's/.bed//g' | gshuf | parallel --bar --halt now,fail=5 --env call_genos --memfree $MAXMemory -j $NUMProc --no-notice "call_genos {} 2> /dev/null"
+ 
+ 
+ 	if [ -f "freebayes.error" ]; then
+@@ -541,7 +542,7 @@ if [ "$SNP" != "no" ]; then
+ 			echo "Using FreeBayes to call SNPs again"
+ 			NumP=$(( $NUMProc / 4 ))
+ 			NumP=$(( $NumP * 3 ))
+-			ls mapped.*.bed | sed 's/mapped.//g' | sed 's/.bed//g' | shuf | parallel --bar --halt now,fail=5 --env call_genos --memfree $MAXMemory -j $NumP --no-notice "call_genos {} 2> /dev/null" 
+			ls mapped.*.bed | sed 's/mapped.//g' | sed 's/.bed//g' | gshuf | parallel --bar --halt now,fail=5 --env call_genos --memfree $MAXMemory -j $NumP --no-notice "call_genos {} 2> /dev/null" 
+         fi
+     fi
+ 
+@@ -575,7 +576,7 @@ if [ "$SNP" != "no" ]; then
+             	NumP=$(( $NumP / 4 ))
+                 NumP=$(( $NumP * 3 ))
+ 			echo "Using FreeBayes to call SNPs again"
+-            ls mapped.*.bed | sed 's/mapped.//g' | sed 's/.bed//g' | shuf | parallel --bar --halt now,fail=1 --env call_genos --memfree $MAXMemory -j $NumP --no-notice "call_genos {} 2> /dev/null"
+            ls mapped.*.bed | sed 's/mapped.//g' | sed 's/.bed//g' | gshuf | parallel --bar --halt now,fail=1 --env call_genos --memfree $MAXMemory -j $NumP --no-notice "call_genos {} 2> /dev/null"
+         fi
 	fi
- 		
-if ! awk --version | fgrep -v GNU &>/dev/null; then
-+if ! awk --version | fgrep GNU &>/dev/null; then
-          awk=gawk
-     else
-          awk=awk
+ 
+@@ -1132,6 +1133,8 @@ fi
+ 
+ if [[ "$OSTYPE" == "darwin"* ]]; then
+ 	NUMProc=( `sysctl hw.ncpu | cut -f2 -d " " `)
+elif [[ "$OSTYPE" == "FreeBSD" ]]; then
+	NUMProc=( `sysctl -n hw.ncpu` )
+ else
+ 	NUMProc=( `grep -c ^processor /proc/cpuinfo 2> /dev/null` ) 
 fi
- 
-
- if [ $NUMDEP -gt 0 ]; then
- 	echo -e "\nPlease install all required software before running dDocent again."
- 	exit 1
-@@ -291,9 +294,9 @@ echo "Using BWA to map reads."
-         	for i in "${NAMES[@]}"
-         	do
-         	if [ -f "$i.R2.fq.gz" ]; then
-        		bwa mem reference.fasta $i.R1.fq.gz $i.R2.fq.gz -L 20,5 -I $INSERT,$SD,$INSERTH,$INSERTL -t $NUMProc -a -M -T 10 -A $optA -B $optB -O $optO -R "@RG\tID:$i\tSM:$i\tPL:Illumina" 2> bwa.$i.log | mawk '$6 !~/[2-9].[SH]/ && $6 !~ /[1-9][0-9].[SH]/' | samtools view -@$NUMProc -q 1 -SbT reference.fasta - > $i.bam 2>$i.bam.log
-+        		bwa mem -L 20,5 -I $INSERT,$SD,$INSERTH,$INSERTL -t $NUMProc -a -M -T 10 -A $optA -B $optB -O $optO -R "@RG\tID:$i\tSM:$i\tPL:Illumina" reference.fasta $i.R1.fq.gz $i.R2.fq.gz 2> bwa.$i.log | mawk '$6 !~/[2-9].[SH]/ && $6 !~ /[1-9][0-9].[SH]/' | samtools view -@$NUMProc -q 1 -SbT reference.fasta - > $i.bam 2>$i.bam.log
-         	else
-        		bwa mem reference.fasta $i.R1.fq.gz -L 20,5 -t $NUMProc -a -M -T 10 -A $optA -B $optB -O $optO -R "@RG\tID:$i\tSM:$i\tPL:Illumina" 2> bwa.$i.log | mawk '$6 !~/[2-9].[SH]/ && $6 !~ /[1-9][0-9].[SH]/' | samtools view -@$NUMProc -q 1 -SbT reference.fasta - > $i.bam 2>$i.bam.log
-+        		bwa mem -L 20,5 -t $NUMProc -a -M -T 10 -A $optA -B $optB -O $optO -R "@RG\tID:$i\tSM:$i\tPL:Illumina" reference.fasta $i.R1.fq.gz 2> bwa.$i.log | mawk '$6 !~/[2-9].[SH]/ && $6 !~ /[1-9][0-9].[SH]/' | samtools view -@$NUMProc -q 1 -SbT reference.fasta - > $i.bam 2>$i.bam.log
-         	fi
-         	samtools sort -@$NUMProc $i.bam -o $i.bam 
- 		mv $i.bam $i-RG.bam
-@@ -388,10 +391,10 @@ if [ "$SNP" != "no" ]; then
- 	}
- 	export -f call_genos
- 
-	ls mapped.*.bed | sed 's/mapped.//g' | sed 's/.bed//g' | shuf | parallel --env call_genos --memfree $MAXMemory -j $NUMProc --no-notice call_genos {}
-+	ls mapped.*.bed | sed 's/mapped.//g' | sed 's/.bed//g' | gshuf | parallel --env call_genos --memfree $MAXMemory -j $NUMProc --no-notice call_genos {}
- ####	
-	#ls mapped.*.bed | sed 's/mapped.//g' | sed 's/.bed//g' | shuf | parallel --memfree $MAXMemory -j $FB1 --no-notice --delay 1 freebayes -L bamlist.list -t mapped.{}.bed -v raw.{}.vcf -f reference.fasta -m 5 -q 5 -E 3 --min-repeat-entropy 1 -V --populations popmap -n 10
-	#ls mapped.*.bed | sed 's/mapped.//g' | sed 's/.bed//g' | shuf | parallel --memfree $MAXMemory -j $FB1 --no-notice "samtools view -b -L mapped.{}.bed | freebayes -c -t mapped.{}.bed -v raw.{}.vcf -f reference.fasta -m 5 -q 5 -E 3 --min-repeat-entropy 1 -V --populations popmap -n 10"
-+	#ls mapped.*.bed | sed 's/mapped.//g' | sed 's/.bed//g' | gshuf | parallel --memfree $MAXMemory -j $FB1 --no-notice --delay 1 freebayes -L bamlist.list -t mapped.{}.bed -v raw.{}.vcf -f reference.fasta -m 5 -q 5 -E 3 --min-repeat-entropy 1 -V --populations popmap -n 10
-+	#ls mapped.*.bed | sed 's/mapped.//g' | sed 's/.bed//g' | gshuf | parallel --memfree $MAXMemory -j $FB1 --no-notice "samtools view -b -L mapped.{}.bed | freebayes -c -t mapped.{}.bed -v raw.{}.vcf -f reference.fasta -m 5 -q 5 -E 3 --min-repeat-entropy 1 -V --populations popmap -n 10"
- 
- 
- 	rm mapped.*.bed 
-@@ -447,8 +450,8 @@ fi
- 
- #Function for trimming reads using trimmomatic
- trim_reads(){
-	TRIMMOMATIC=$(find ${PATH//:/ } -maxdepth 1 -name trimmomatic*jar 2> /dev/null | head -1)
-    ADAPTERS=$(find ${PATH//:/ } -maxdepth 1 -name TruSeq2-PE.fa 2> /dev/null | head -1)
-+       TRIMMOMATIC=%%JAVAJARDIR%%/trimmomatic.jar
-+       ADAPTERS=%%PREFIX%%/share/trimmomatic/adapters/TruSeq2-PE.fa
- 
- 	if [ -f $1.R.fq.gz ]; then	
- 		java -Xmx2g -jar $TRIMMOMATIC PE -threads 2 -phred33 $1.F.fq.gz $1.R.fq.gz $1.R1.fq.gz $1.unpairedF.fq.gz $1.R2.fq.gz $1.unpairedR.fq.gz ILLUMINACLIP:$ADAPTERS:2:30:10 LEADING:20 TRAILING:20 SLIDINGWINDOW:5:10 $TW &> $1.trim.log
-@@ -747,7 +750,14 @@ else
- fi
- 
- #Tries to get number of processors, if not asks user
-NUMProc=( `grep -c ^processor /proc/cpuinfo 2> /dev/null` ) 
-+if [ `uname` = Linux ]; then
-+    NUMProc=( `grep -c ^processor /proc/cpuinfo 2> /dev/null` ) 
-+elif [ `uname` = FreeBSD ]; then
-+    NUMProc=( `sysctl -n hw.ncpu` ) 
-+else
-+    printf "Unsupported platform: `uname`\n"
-+    exit 1
-+fi
- NUMProc=$(($NUMProc + 0)) 
- 
- echo "dDocent detects $NUMProc processors available on this system."
-@@ -764,7 +774,15 @@ if [ $NUMProc -lt 1 ]; then
- fi
- 
+@@ -1154,6 +1157,9 @@ fi
 #Tries to get maximum system memory, if not asks user
-MAXMemory=$(($(grep -Po '(?<=^MemTotal:)\s*[0-9]+' /proc/meminfo | tr -d " ") / 1048576))G
-+if [ `uname` = Linux ]; then
-+    MAXMemory=$(($(grep -Po '(?<=^MemTotal:)\s*[0-9]+' /proc/meminfo | tr -d " ") / 1048576))G
-+elif [ `uname` = FreeBSD ]; then
-+    MAXMemory=`sysctl -n hw.realmem`
-+    MAXMemory=$((MAXMemory / 1073741824))G
-+else
-+    printf "Unsupported platform: `uname`\n"
-+    exit 1
-+fi
+ if [[ "$OSTYPE" == "darwin"* ]]; then
+ 	MAXMemory=0
+elif [[ "$OSTYPE" == "FreeBSD" ]]; then
+	MAXMemory=`sysctl -n hw.realmem`
+	MAXMemory=$((MAXMemory / 1073741824))G
+ else
+ 	MAXMemory=$(($(grep -Po '(?<=^MemTotal:)\s*[0-9]+' /proc/meminfo | tr -d " ") / 1048576))
 
- echo "dDocent detects $MAXMemory maximum memory available on this system."
- echo "Please enter the maximum memory to use for this analysis. The size can be postfixed with 
--- a/biology/ddocent/files/patch-scripts_ReferenceOpt.sh
+++ b/biology/ddocent/files/patch-scripts_ReferenceOpt.sh
@ -0,0 +1,11 @@
+--- scripts/ReferenceOpt.sh.orig	2019-05-03 12:58:47 UTC
+++ scripts/ReferenceOpt.sh
+@@ -400,7 +400,7 @@ done
+ 
+ cut -f4 -d " " kopt.data > plot.kopt.data
+ gnuplot << \EOF
+-set terminal dumb size 120, 30
+set terminal dumb size 80, 30
+ set autoscale
+ unset label
+ set title "Histogram of number of reference contigs"
--- a/biology/ddocent/pkg-plist
+++ b/biology/ddocent/pkg-plist
@ -1,6 +1,5 @@
 bin/ErrorCount.sh
 bin/RefMapOpt.sh
-bin/ReferenceOpt.hyb.sh
 bin/ReferenceOpt.sh
 bin/Rename_SequenceFiles.sh
 bin/Rename_for_dDocent.sh
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	hylafax
-PORTVERSION=	6.0.6
-PORTREVISION=	8
+PORTVERSION=	6.0.7
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.hylafax.org/source/

@ -17,10 +16,13 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/afm/Courier:print/afm
 LIB_DEPENDS=	libtiff.so:graphics/tiff \
 		libjbig.so:graphics/jbigkit

-MAKE_JOBS_UNSAFE=	yes
-HAS_CONFIGURE=	yes
 USES=		fakeroot ghostscript jpeg

+USE_RC_SUBR=	hylafax
+
+MAKE_JOBS_UNSAFE=	yes
+HAS_CONFIGURE=		yes
+
 CONFIGURE_ARGS=	--with-INSTALL="" \
 		--with-LIBTIFF="-L${LOCALBASE}/lib -ltiff -ljpeg" \
 		--with-ZLIB=no --with-LIBZ=-lz \
@ -36,20 +38,24 @@ MAKE_ARGS+=	OPTIMIZER="" -DOPTIMIZER

 PORTDOCS=	RELEASENOTES-4.3.txt RELEASENOTES-4.4.txt RELEASENOTES-6.0.txt
 SUB_FILES=	pkg-message
-USE_RC_SUBR=	hylafax

 OPTIONS_DEFINE=	PAM NLS GAWK DOCS
 OPTIONS_DEFAULT=PAM
-NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
+
+NO_OPTIONS_SORT=yes
+
 GAWK_DESC=	Use gawk for scripts

 PAM_CONFIGURE_OFF=	--disable-pam
+
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
+
 GAWK_BUILD_DEPENDS=	gawk:lang/gawk
 GAWK_RUN_DEPENDS=	gawk:lang/gawk
 GAWK_CONFIGURE_ON=	--with-AWK="${LOCALBASE}/bin/gawk"
+
 DOCS_CONFIGURE_ON=	--with-HTML=yes

 .include <bsd.port.options.mk>
--- a/comms/hylafax/distinfo
+++ b/comms/hylafax/distinfo
@ -1,2 +1,3 @@
-SHA256 (hylafax-6.0.6.tar.gz) = 28926915b23ce7f5b4896de8ac5f58389c2c6e6bb73b4eee5bbd5129603bf7c0
-SIZE (hylafax-6.0.6.tar.gz) = 1297412
+TIMESTAMP = 1556939625
+SHA256 (hylafax-6.0.7.tar.gz) = a3dcb1a7fd8794bd33cea9a9414c32da100119dd2131bd08ab3ab3749fc30315
+SIZE (hylafax-6.0.7.tar.gz) = 1309111
--- a/comms/hylafax/files/patch-libhylafax_FaxRecvInfo.c++
+++ b/comms/hylafax/files/patch-libhylafax_FaxRecvInfo.c++
@ -1,16 +0,0 @@
-PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225372
-Upstream: http://bugs.hylafax.org/show_bug.cgi?id=971
-Obtained from: https://sourceforge.net/p/hylafax/HylaFAX+/2417/
-See Also: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853448
-
--- libhylafax/FaxRecvInfo.c++.orig	2018-10-07 07:40:23 UTC
-+++ libhylafax/FaxRecvInfo.c++
-@@ -112,7 +112,7 @@ FaxRecvInfo::decode(const char* cp)
-     if (cp == NULL || cp[1] != ',' || cp[2] != '"')
- 	return (false);
-     u_int i = 0;
-    while (cp+2 != '\0') {
-+    while (*(cp+2) != '\0') {
- 	callid[i] = cp+3;		// +1 for "/+1 for ,/+1 for "
- 	if (*cp == '\"') break;
- 	callid[i].resize(callid[i].next(0,'"'));
--- a/comms/hylafax/pkg-plist
+++ b/comms/hylafax/pkg-plist
@ -130,8 +130,8 @@ sbin/hylafax
 %%NLS%%share/locale/vi/LC_MESSAGES/hylafax-server.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/libhylafax.mo
 %%HYLAFAX_SPOOL%%/COPYRIGHT
-@exec mkfifo -m 0600 %%HYLAFAX_SPOOL%%/FIFO
-@exec chown uucp:dialer %%HYLAFAX_SPOOL%%/FIFO
+@postexec mkfifo -m 0600 %%HYLAFAX_SPOOL%%/FIFO
+@postexec chown uucp:dialer %%HYLAFAX_SPOOL%%/FIFO
@rmtry %%HYLAFAX_SPOOL%%/FIFO
 %%HYLAFAX_SPOOL%%/bin/ps2fax.gs
 %%HYLAFAX_SPOOL%%/bin/ps2fax.dps
--- a/comms/unixcw/files/patch-src_xcwcp_receiver.h
+++ b/comms/unixcw/files/patch-src_xcwcp_receiver.h
@ -0,0 +1,12 @@
+--- src/xcwcp/receiver.h.orig	2018-12-20 16:18:13 UTC
+++ src/xcwcp/receiver.h
+@@ -21,6 +21,9 @@
+ 
+ #include <QMouseEvent>
+ #include <QKeyEvent>
+#ifdef __FreeBSD__
+#include <sys/time.h>
+#endif
+ 
+ 
+ 
--- a/databases/cego/Makefile
+++ b/databases/cego/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	cego
-PORTVERSION=	2.44.9
+PORTVERSION=	2.44.10
 CATEGORIES=	databases
 MASTER_SITES=	http://www.lemke-it.com/

--- a/databases/cego/distinfo
+++ b/databases/cego/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1556796886
-SHA256 (cego-2.44.9.tar.gz) = b49dcf6d4e4773a34c8c0fb7fb9913b03d9779b9da98b24f37efd96eed06894a
-SIZE (cego-2.44.9.tar.gz) = 2924353
+TIMESTAMP = 1556981309
+SHA256 (cego-2.44.10.tar.gz) = 40d91d7181e0d71fc22941e8da7133d522ef108b75a7aadb1a93dabdc8ea4123
+SIZE (cego-2.44.10.tar.gz) = 3602818
--- a/databases/pg_citus/Makefile
+++ b/databases/pg_citus/Makefile
@ -13,8 +13,6 @@ COMMENT=	Horizontally scale Postgresql using sharding and replication

 LICENSE=	AGPLv3

-BROKEN_armv6=		fails to compile: transaction/backend_data.c:53:2: error: unknown type name 'pg_atomic_uint64'; did you mean 'pg_atomic_uint32'?
-BROKEN_armv7=		fails to compile: transaction/backend_data.c:53:2: error: unknown type name 'pg_atomic_uint64'; did you mean 'pg_atomic_uint32'?
 BROKEN_i386=		fails to compile: transaction/backend_data.c:727:2: error: unknown type name 'pg_atomic_uint64'; did you mean 'pg_atomic_uint32'?

 USES=		gmake pgsql:10+ autoreconf readline
--- a/databases/puppetdb-terminus6/Makefile
+++ b/databases/puppetdb-terminus6/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	puppetdb-terminus
-PORTVERSION=	6.3.1
+PORTVERSION=	6.3.2
 CATEGORIES=	databases ruby
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	6
--- a/databases/puppetdb-terminus6/distinfo
+++ b/databases/puppetdb-terminus6/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1555531514
-SHA256 (puppetdb-6.3.1.tar.gz) = 7bac6a9254731f869b37382b97454064ad6e997bded793b94a120ceceb3f039b
-SIZE (puppetdb-6.3.1.tar.gz) = 41706703
+TIMESTAMP = 1556833376
+SHA256 (puppetdb-6.3.2.tar.gz) = 6ec2b6aafda3fc5cf07f4f4db97f45160ac3516536831d7bdc2216e81438fe26
+SIZE (puppetdb-6.3.2.tar.gz) = 41707817
--- a/databases/puppetdb5/Makefile
+++ b/databases/puppetdb5/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	puppetdb
 PORTVERSION=	5.2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	5
@ -12,8 +12,7 @@ COMMENT=	PuppetDB storeconfigs backend

 LICENSE=	APACHE20

-RUN_DEPENDS=	bash:shells/bash \
-		puppet:sysutils/puppet5
+RUN_DEPENDS=	bash:shells/bash

 USE_RC_SUBR=	puppetdb

--- a/databases/puppetdb6/Makefile
+++ b/databases/puppetdb6/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	puppetdb
-PORTVERSION=	6.3.1
-PORTREVISION=	1
+PORTVERSION=	6.3.2
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	6
@ -12,8 +11,7 @@ COMMENT=	PuppetDB storeconfigs backend

 LICENSE=	APACHE20

-RUN_DEPENDS=	bash:shells/bash \
-		puppet:sysutils/puppet6
+RUN_DEPENDS=	bash:shells/bash

 USE_RC_SUBR=	puppetdb

--- a/databases/puppetdb6/distinfo
+++ b/databases/puppetdb6/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1555531506
-SHA256 (puppetdb-6.3.1.tar.gz) = 7bac6a9254731f869b37382b97454064ad6e997bded793b94a120ceceb3f039b
-SIZE (puppetdb-6.3.1.tar.gz) = 41706703
+TIMESTAMP = 1556833332
+SHA256 (puppetdb-6.3.2.tar.gz) = 6ec2b6aafda3fc5cf07f4f4db97f45160ac3516536831d7bdc2216e81438fe26
+SIZE (puppetdb-6.3.2.tar.gz) = 41707817
--- a/databases/tokyocabinet/Makefile
+++ b/databases/tokyocabinet/Makefile
@ -13,9 +13,6 @@ COMMENT=	Modern implementation of DBM
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING

-BROKEN_armv6=		dumps core: Assertion failed: (!NodePtr->isKnownSentinel()), function operator*, file ilist_iterator.h
-BROKEN_armv7=		fails to build: cc: error: unable to execute command: Abort trap (core dumped)
-
 GNU_CONFIGURE=	yes
 USES=		pathfix gmake
 USE_LDCONFIG=	yes
--- a/databases/xrootd/Makefile
+++ b/databases/xrootd/Makefile
@ -1,15 +1,10 @@
 # $FreeBSD$

 PORTNAME=	xrootd
-DISTVERSION=	4.8.5
-PORTREVISION=	2
+DISTVERSION=	4.9.1
 CATEGORIES=	databases
 MASTER_SITES=	http://xrootd.org/download/v${DISTVERSION}/

-PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
-PATCHFILES=	767d9770b01a89125b45fbea417364eb9efee528.patch:-p1 \
-		0a2240ed70edc769891cb5155aeb99405ceeb7f4.patch:-p1
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Framework for fast, low latency, scalable data access

@ -19,7 +14,8 @@ LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPL

 BUILD_DEPENDS=	bash:shells/bash
-LIB_DEPENDS=	librados.so:net/ceph12
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		librados.so:net/ceph12

 USES=		cmake gnome localbase:ldflags pkgconfig readline shebangfix ssl
 SHEBANG_GLOB=	*.sh
--- a/databases/xrootd/distinfo
+++ b/databases/xrootd/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1544295472
-SHA256 (xrootd-4.8.5.tar.gz) = 42e4d2cc6f8b442135f09bcc12c7be38b1a0c623a005cb5e69ff3d27997bdf73
-SIZE (xrootd-4.8.5.tar.gz) = 2396436
+TIMESTAMP = 1556989162
+SHA256 (xrootd-4.9.1.tar.gz) = de47160348d52a655f8d601520ad9146b9ee76eb5d2352cdf232a6fafce27adb
+SIZE (xrootd-4.9.1.tar.gz) = 2523674
 SHA256 (767d9770b01a89125b45fbea417364eb9efee528.patch) = e42f3bd0efdfad9aed34bfd7445ded01fb48d3796798af1f77c0801f06f5b033
 SIZE (767d9770b01a89125b45fbea417364eb9efee528.patch) = 3456
 SHA256 (0a2240ed70edc769891cb5155aeb99405ceeb7f4.patch) = 531d6338bf0419c224d94be76dd618fbc6df099d550045e0f803f74beaaf2ae2
--- a/databases/xrootd/pkg-plist
+++ b/databases/xrootd/pkg-plist
@ -12,6 +12,7 @@ bin/xprep
 bin/xrd
 bin/xrdacctest
 bin/xrdadler32
+bin/xrdcopy
 bin/xrdcp
 bin/xrdcp-old
 bin/xrdfs
@ -23,6 +24,7 @@ bin/xrdpwdadmin
 bin/xrdsssadmin
 bin/xrdstagetool
 bin/xrootd
+bin/xrootd-config
 include/xrootd/XProtocol/XProtocol.hh
 include/xrootd/XProtocol/XPtypes.hh
 include/xrootd/Xrd/XrdBuffer.hh
@ -70,6 +72,7 @@ include/xrootd/XrdClient/XrdClientUrlInfo.hh
 include/xrootd/XrdClient/XrdClientUrlSet.hh
 include/xrootd/XrdClient/XrdClientVector.hh
 include/xrootd/XrdCms/XrdCmsClient.hh
+include/xrootd/XrdCms/XrdCmsVnId.hh
 include/xrootd/XrdFileCache/XrdFileCacheDecision.hh
 include/xrootd/XrdHttp/XrdHttpSecXtractor.hh
 include/xrootd/XrdNet/XrdNet.hh
@ -87,6 +90,7 @@ include/xrootd/XrdOss/XrdOssStatInfo.hh
 include/xrootd/XrdOuc/XrdOucBuffer.hh
 include/xrootd/XrdOuc/XrdOucCRC.hh
 include/xrootd/XrdOuc/XrdOucCache.hh
+include/xrootd/XrdOuc/XrdOucCacheStats.hh
 include/xrootd/XrdOuc/XrdOucCallBack.hh
 include/xrootd/XrdOuc/XrdOucChain.hh
 include/xrootd/XrdOuc/XrdOucCompiler.hh
@ -113,6 +117,7 @@ include/xrootd/XrdOuc/XrdOucTrace.hh
 include/xrootd/XrdOuc/XrdOucUtils.hh
 include/xrootd/XrdOuc/XrdOuca2x.hh
 include/xrootd/XrdPosix/XrdPosix.hh
+include/xrootd/XrdPosix/XrdPosixCache.hh
 include/xrootd/XrdPosix/XrdPosixCallBack.hh
 include/xrootd/XrdPosix/XrdPosixExtern.hh
 include/xrootd/XrdPosix/XrdPosixOsDep.hh
@ -145,6 +150,13 @@ include/xrootd/XrdXml/XrdXmlReader.hh
 include/xrootd/XrdXrootd/XrdXrootdBridge.hh
 include/xrootd/XrdXrootd/XrdXrootdMonData.hh
 include/xrootd/private/Xrd/XrdPoll.hh
+include/xrootd/private/XrdClArg.hh
+include/xrootd/private/XrdClFileOperations.hh
+include/xrootd/private/XrdClFileSystemOperations.hh
+include/xrootd/private/XrdClFwd.hh
+include/xrootd/private/XrdClOperationHandlers.hh
+include/xrootd/private/XrdClOperations.hh
+include/xrootd/private/XrdClParallelOperation.hh
 include/xrootd/private/XrdClient/XrdClientConn.hh
 include/xrootd/private/XrdClient/XrdClientConnMgr.hh
 include/xrootd/private/XrdClient/XrdClientDebug.hh
@ -169,6 +181,7 @@ include/xrootd/private/XrdOss/XrdOssError.hh
 include/xrootd/private/XrdOuc/XrdOucExport.hh
 include/xrootd/private/XrdOuc/XrdOucN2NLoader.hh
 include/xrootd/private/XrdOuc/XrdOucPList.hh
+include/xrootd/private/XrdSecsss/XrdSecsssID.hh
 include/xrootd/private/XrdSsi/XrdSsiAtomics.hh
 include/xrootd/private/XrdSsi/XrdSsiCluster.hh
 include/xrootd/private/XrdSsi/XrdSsiEntity.hh
@ -212,6 +225,10 @@ lib/libXrdFfs.so.2
 lib/libXrdFfs.so.2.0.0
 lib/libXrdFileCache-4.so
 lib/libXrdHttp-4.so
+lib/libXrdHttpTPC-4.so
+lib/libXrdHttpUtils.so
+lib/libXrdHttpUtils.so.1
+lib/libXrdHttpUtils.so.1.0.0
 lib/libXrdN2No2p-4.so
 lib/libXrdOssSIgpfsT-4.so
 lib/libXrdPosix.so
@ -252,6 +269,7 @@ lib/libXrdXrootd-4.so
 man/man1/xprep.1.gz
 man/man1/xrd.1.gz
 man/man1/xrdadler32.1.gz
+man/man1/xrdcopy.1.gz
 man/man1/xrdcp-old.1.gz
 man/man1/xrdcp.1.gz
 man/man1/xrdfs.1.gz
@ -270,6 +288,6 @@ man/man8/xrdpfc_print.8.gz
 man/man8/xrdpwdadmin.8.gz
 man/man8/xrdsssadmin.8.gz
 man/man8/xrootd.8.gz
-%%DATADIR%%/xrootd/utils/XrdCmsNotify.pm
-%%DATADIR%%/xrootd/utils/XrdOlbMonPerf
-%%DATADIR%%/xrootd/utils/netchk
+%%DATADIR%%/utils/XrdCmsNotify.pm
+%%DATADIR%%/utils/XrdOlbMonPerf
+%%DATADIR%%/utils/netchk
--- a/devel/Makefile
+++ b/devel/Makefile
@ -6335,6 +6335,7 @@
    SUBDIR += thrift
    SUBDIR += thrift-c_glib
    SUBDIR += thrift-cpp
+    SUBDIR += thrust
    SUBDIR += thunar-vcs-plugin
    SUBDIR += ticcutils
    SUBDIR += tig
@ -6383,6 +6384,7 @@
    SUBDIR += valgrind-devel
    SUBDIR += varconf
    SUBDIR += vasm
+    SUBDIR += vc
    SUBDIR += vcglib
    SUBDIR += vera++
    SUBDIR += vexcl
--- a/devel/ace/Makefile
+++ b/devel/ace/Makefile
@ -17,7 +17,6 @@ LICENSE_NAME=	ACE
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

-BROKEN_aarch64=		Fails to link: missing sbrk
 BROKEN_powerpc=		Does not compile on ${ARCH}
 BROKEN_sparc64=		Does not compile on ${ARCH}

--- a/devel/elixir-excoveralls/Makefile
+++ b/devel/elixir-excoveralls/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	excoveralls
-PORTVERSION=	0.10.6
+PORTVERSION=	0.11.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	elixir-
--- a/devel/elixir-excoveralls/distinfo
+++ b/devel/elixir-excoveralls/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1551775407
-SHA256 (parroty-excoveralls-v0.10.6_GH0.tar.gz) = b59d87999f872aab9078f63187007dc6fdd6cb615362cc4fcdfd95daebde8dca
-SIZE (parroty-excoveralls-v0.10.6_GH0.tar.gz) = 200078
+TIMESTAMP = 1556937902
+SHA256 (parroty-excoveralls-v0.11.0_GH0.tar.gz) = 52ff95a04907aa6d6e2e0c4d2ed461771e4fd34f4e4afed133cd362904bf1c83
+SIZE (parroty-excoveralls-v0.11.0_GH0.tar.gz) = 200788
--- a/devel/git-cinnabar/Makefile
+++ b/devel/git-cinnabar/Makefile
@ -1,8 +1,8 @@
 # $FreeBSD$

 PORTNAME=	git-cinnabar
-DISTVERSION=	0.5.0-168
-DISTVERSIONSUFFIX=	-g89b9a17
+DISTVERSION=	0.5.0-171
+DISTVERSIONSUFFIX=	-g57d16ea
 CATEGORIES=	devel

 MAINTAINER=	jbeich@FreeBSD.org
--- a/devel/git-cinnabar/distinfo
+++ b/devel/git-cinnabar/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1556774927
-SHA256 (glandium-git-cinnabar-0.5.0-168-g89b9a17_GH0.tar.gz) = 497ae88eacf8bcc75561bd0de8371291553c140261c23888861309bde68f20e0
-SIZE (glandium-git-cinnabar-0.5.0-168-g89b9a17_GH0.tar.gz) = 159221
+TIMESTAMP = 1556925575
+SHA256 (glandium-git-cinnabar-0.5.0-171-g57d16ea_GH0.tar.gz) = 5f14664f406148d0e2776c2f4b0b48194935c9d058e29a40b43a60e91d8f06b0
+SIZE (glandium-git-cinnabar-0.5.0-171-g57d16ea_GH0.tar.gz) = 159287
--- a/devel/godot/Makefile
+++ b/devel/godot/Makefile
@ -14,7 +14,6 @@ LICENSE_COMB=		multi
 LICENSE_FILE_CC-BY-3.0=	${WRKSRC}/LOGO_LICENSE.md
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.txt

-BROKEN_aarch64=		fails to build: KeyError: 'android_arch'
 BROKEN_armv6=		fails to build: KeyError: 'android_arch'
 BROKEN_armv7=		fails to build: KeyError: 'android_arch'
 BROKEN_powerpc64=	fails to compile: inv_txfm_sse2.h:14:32: emmintrin.h: No such file or directory
--- a/devel/ppl/Makefile
+++ b/devel/ppl/Makefile
@ -13,9 +13,6 @@ COMMENT=	C++ library for the manipulation of convex polyhedra
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING

-BROKEN_armv6=		fails to compile: ./OR_Matrix_inlines.hh:100:8: error: missing 'typename' prior to dependent type template name 'OR_Matrix<T>::Pseudo_Row'
-BROKEN_armv7=		fails to compile: ./OR_Matrix_inlines.hh:100:8: error: missing 'typename' prior to dependent type template name 'OR_Matrix<T>::Pseudo_Row'
-
 BUILD_DEPENDS=	gm4:devel/m4
 LIB_DEPENDS=	libglpk.so:math/glpk \
 		libgmp.so:math/gmp
--- a/devel/py-python-gist/Makefile
+++ b/devel/py-python-gist/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	python-gist
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.2
+DISTVERSION=	0.7.0
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

@ -16,14 +16,16 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-gnupg>=0.4.1:security/py-python-gnupg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${PY_FLAVOR}

 USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	jdowner
 GH_PROJECT=	gist
 USE_PYTHON=	autoplist distutils
+
 NO_ARCH=	yes

 do-test:
--- a/devel/py-python-gist/distinfo
+++ b/devel/py-python-gist/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1554184405
-SHA256 (jdowner-gist-v0.6.2_GH0.tar.gz) = c68fabf7df91a6a3b74bd8ca8364b328e773707cdbb7b1db100f1ebbe8d0c03c
-SIZE (jdowner-gist-v0.6.2_GH0.tar.gz) = 18635
+TIMESTAMP = 1556959374
+SHA256 (jdowner-gist-v0.7.0_GH0.tar.gz) = 34ae609c74f6ff56724cffc1b5ce6a08b01c62ac7bf801e913b646965ffa6c61
+SIZE (jdowner-gist-v0.7.0_GH0.tar.gz) = 18912
--- a/devel/py-qtconsole/Makefile
+++ b/devel/py-qtconsole/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	qtconsole
-PORTVERSION=	4.4.3
-PORTREVISION=	1
+PORTVERSION=	4.4.4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -13,15 +12,15 @@ COMMENT=	Qt-based console for Jupyter with support for rich media output
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipykernel5>=5.1:devel/py-ipykernel5@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jupyter_client>=4.1:devel/py-jupyter_client@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ipykernel5>=5.1:devel/py-ipykernel5@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${PY_FLAVOR}

 USES=		pyqt:5 python:3.4+

-USE_PYQT=	core gui printsupport sip svg widgets
-USE_PYTHON=	distutils autoplist
+USE_PYQT=	core gui svg sip printsupport widgets
+USE_PYTHON=	autoplist distutils

 .include <bsd.port.mk>
--- a/devel/py-qtconsole/distinfo
+++ b/devel/py-qtconsole/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1543980367
-SHA256 (qtconsole-4.4.3.tar.gz) = bc1ba15f50c29ed50f1268ad823bb6543be263c18dd093b80495e9df63b003ac
-SIZE (qtconsole-4.4.3.tar.gz) = 419927
+TIMESTAMP = 1556964298
+SHA256 (qtconsole-4.4.4.tar.gz) = a667558c7b1e1442a2e5bcef1686c55e096efd0b58d8b2a0a8415f4579991ee3
+SIZE (qtconsole-4.4.4.tar.gz) = 420061
--- a/devel/py-rchitect/Makefile
+++ b/devel/py-rchitect/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	rchitect
-DISTVERSION=	0.2.4
+DISTVERSION=	0.3.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -11,8 +11,10 @@ COMMENT=	Interoperate R with Python

 LICENSE=	MIT

-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.10.0:devel/py-cffi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.10.0:devel/py-cffi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}

 USES=		python
 USE_PYTHON=	distutils autoplist
--- a/devel/py-rchitect/distinfo
+++ b/devel/py-rchitect/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1551234738
-SHA256 (rchitect-0.2.4.tar.gz) = 10a30ba3aa1f3389225ab1ec41d85a44d18d0a6415cc4c9cd7d8aa3db9cab716
-SIZE (rchitect-0.2.4.tar.gz) = 23630
+TIMESTAMP = 1556959271
+SHA256 (rchitect-0.3.2.tar.gz) = 8da91d1437af9f83394d04701590d16490b0ce15b7355c2d148906d263dba89e
+SIZE (rchitect-0.3.2.tar.gz) = 26559
--- a/devel/py-validators/Makefile
+++ b/devel/py-validators/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	validators
-DISTVERSION=	0.12.4
+DISTVERSION=	0.12.5
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-validators/distinfo
+++ b/devel/py-validators/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1546552089
-SHA256 (validators-0.12.4.tar.gz) = 68e4b74889aac1270d83636cb1dbcce3d2271e291ab14023cf95e7dbfbbce09d
-SIZE (validators-0.12.4.tar.gz) = 22878
+TIMESTAMP = 1556486033
+SHA256 (validators-0.12.5.tar.gz) = df3dda070965519283bae72249a36927ee3ea9c206f9ee6f234a71cf19b36136
+SIZE (validators-0.12.5.tar.gz) = 22928
--- a/devel/thrust/Makefile
+++ b/devel/thrust/Makefile
@ -0,0 +1,24 @@
+# $FreeBSD$
+
+PORTNAME=	thrust
+DISTVERSION=	1.9.4
+CATEGORIES=	devel
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	C++ parallel programming library which resembles the C++ STL
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		cmake
+USE_GITHUB=	yes
+
+NO_ARCH=	yes
+
+do-test: # tests freeze: https://github.com/thrust/thrust/issues/981
+	@cd ${BUILD_WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DENABLE_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
+
+.include <bsd.port.mk>
--- a/devel/thrust/distinfo
+++ b/devel/thrust/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1557015932
+SHA256 (thrust-thrust-1.9.4_GH0.tar.gz) = 41931a7d73331fc39c6bea56d1eb8d4d8bbf7c73688979bbdab0e55772f538d1
+SIZE (thrust-thrust-1.9.4_GH0.tar.gz) = 1119467
--- a/devel/thrust/files/patch-CMakeLists.txt
+++ b/devel/thrust/files/patch-CMakeLists.txt
@ -0,0 +1,21 @@
+--- CMakeLists.txt.orig	2019-01-29 23:00:07 UTC
+++ CMakeLists.txt
+@@ -350,9 +350,15 @@ add_custom_target(install-thrust
+ )
+ 
+ # add examples, testing and performance testing targets
+-add_subdirectory(examples)
+-add_subdirectory(testing)
+-add_subdirectory(performance)
+if (ENABLE_EXAMPLES)
+  add_subdirectory(examples)
+endif()
+if (ENABLE_TESTING)
+  add_subdirectory(testing)
+endif()
+if (ENABLE_PERFORMANCE)
+  add_subdirectory(performance)
+endif()
+ 
+ ### make zip acrhive
+ 
--- a/devel/thrust/pkg-descr
+++ b/devel/thrust/pkg-descr
@ -0,0 +1,7 @@
+Thrust is a parallel algorithms library which resembles the C++ Standard
+Template Library (STL). Thrust's high-level interface greatly enhances
+programmer productivity while enabling performance portability between GPUs and
+multicore CPUs. Interoperability with established technologies (such as CUDA,
+TBB, and OpenMP) facilitates integration with existing software.
+
+WWW: https://thrust.github.io/
--- a/devel/thrust/pkg-plist
+++ b/devel/thrust/pkg-plist
@ -0,0 +1,890 @@
+thrust/CHANGELOG
+thrust/addressof.h
+thrust/adjacent_difference.h
+thrust/advance.h
+thrust/allocate_unique.h
+thrust/async/copy.h
+thrust/async/for_each.h
+thrust/async/reduce.h
+thrust/async/sort.h
+thrust/async/transform.h
+thrust/binary_search.h
+thrust/complex.h
+thrust/copy.h
+thrust/count.h
+thrust/detail/adjacent_difference.inl
+thrust/detail/advance.inl
+thrust/detail/alignment.h
+thrust/detail/allocator/allocator_traits.h
+thrust/detail/allocator/allocator_traits.inl
+thrust/detail/allocator/copy_construct_range.h
+thrust/detail/allocator/copy_construct_range.inl
+thrust/detail/allocator/default_construct_range.h
+thrust/detail/allocator/default_construct_range.inl
+thrust/detail/allocator/destroy_range.h
+thrust/detail/allocator/destroy_range.inl
+thrust/detail/allocator/fill_construct_range.h
+thrust/detail/allocator/fill_construct_range.inl
+thrust/detail/allocator/malloc_allocator.h
+thrust/detail/allocator/malloc_allocator.inl
+thrust/detail/allocator/no_throw_allocator.h
+thrust/detail/allocator/tagged_allocator.h
+thrust/detail/allocator/tagged_allocator.inl
+thrust/detail/allocator/temporary_allocator.h
+thrust/detail/allocator/temporary_allocator.inl
+thrust/detail/allocator_aware_execution_policy.h
+thrust/detail/binary_search.inl
+thrust/detail/complex/arithmetic.h
+thrust/detail/complex/c99math.h
+thrust/detail/complex/catrig.h
+thrust/detail/complex/catrigf.h
+thrust/detail/complex/ccosh.h
+thrust/detail/complex/ccoshf.h
+thrust/detail/complex/cexp.h
+thrust/detail/complex/cexpf.h
+thrust/detail/complex/clog.h
+thrust/detail/complex/clogf.h
+thrust/detail/complex/complex.inl
+thrust/detail/complex/cpow.h
+thrust/detail/complex/cproj.h
+thrust/detail/complex/csinh.h
+thrust/detail/complex/csinhf.h
+thrust/detail/complex/csqrt.h
+thrust/detail/complex/csqrtf.h
+thrust/detail/complex/ctanh.h
+thrust/detail/complex/ctanhf.h
+thrust/detail/complex/math_private.h
+thrust/detail/complex/stream.h
+thrust/detail/config.h
+thrust/detail/config/compiler.h
+thrust/detail/config/compiler_fence.h
+thrust/detail/config/config.h
+thrust/detail/config/cpp_compatibility.h
+thrust/detail/config/cpp_dialect.h
+thrust/detail/config/debug.h
+thrust/detail/config/device_system.h
+thrust/detail/config/exec_check_disable.h
+thrust/detail/config/forceinline.h
+thrust/detail/config/global_workarounds.h
+thrust/detail/config/host_device.h
+thrust/detail/config/host_system.h
+thrust/detail/config/simple_defines.h
+thrust/detail/contiguous_storage.h
+thrust/detail/contiguous_storage.inl
+thrust/detail/copy.h
+thrust/detail/copy.inl
+thrust/detail/copy_if.h
+thrust/detail/copy_if.inl
+thrust/detail/count.inl
+thrust/detail/cpp11_required.h
+thrust/detail/cstdint.h
+thrust/detail/dependencies_aware_execution_policy.h
+thrust/detail/device_delete.inl
+thrust/detail/device_free.inl
+thrust/detail/device_malloc.inl
+thrust/detail/device_new.inl
+thrust/detail/device_ptr.inl
+thrust/detail/device_reference.inl
+thrust/detail/device_vector.inl
+thrust/detail/distance.inl
+thrust/detail/equal.inl
+thrust/detail/event_error.h
+thrust/detail/execute_with_allocator.h
+thrust/detail/execute_with_allocator_fwd.h
+thrust/detail/execute_with_dependencies.h
+thrust/detail/execution_policy.h
+thrust/detail/extrema.inl
+thrust/detail/fill.inl
+thrust/detail/find.inl
+thrust/detail/for_each.inl
+thrust/detail/function.h
+thrust/detail/functional.inl
+thrust/detail/functional/actor.h
+thrust/detail/functional/actor.inl
+thrust/detail/functional/argument.h
+thrust/detail/functional/composite.h
+thrust/detail/functional/operators.h
+thrust/detail/functional/operators/arithmetic_operators.h
+thrust/detail/functional/operators/assignment_operator.h
+thrust/detail/functional/operators/bitwise_operators.h
+thrust/detail/functional/operators/compound_assignment_operators.h
+thrust/detail/functional/operators/logical_operators.h
+thrust/detail/functional/operators/operator_adaptors.h
+thrust/detail/functional/operators/relational_operators.h
+thrust/detail/functional/placeholder.h
+thrust/detail/functional/value.h
+thrust/detail/gather.inl
+thrust/detail/generate.inl
+thrust/detail/get_iterator_value.h
+thrust/detail/host_vector.inl
+thrust/detail/inner_product.inl
+thrust/detail/integer_math.h
+thrust/detail/integer_traits.h
+thrust/detail/internal_functional.h
+thrust/detail/logical.inl
+thrust/detail/malloc_and_free.h
+thrust/detail/memory_algorithms.h
+thrust/detail/merge.inl
+thrust/detail/minmax.h
+thrust/detail/mismatch.inl
+thrust/detail/modern_gcc_required.h
+thrust/detail/mpl/math.h
+thrust/detail/numeric_traits.h
+thrust/detail/overlapped_copy.h
+thrust/detail/pair.inl
+thrust/detail/partition.inl
+thrust/detail/pointer.h
+thrust/detail/pointer.inl
+thrust/detail/preprocessor.h
+thrust/detail/range/head_flags.h
+thrust/detail/range/tail_flags.h
+thrust/detail/raw_pointer_cast.h
+thrust/detail/raw_reference_cast.h
+thrust/detail/reduce.inl
+thrust/detail/reference.h
+thrust/detail/reference.inl
+thrust/detail/reference_forward_declaration.h
+thrust/detail/remove.inl
+thrust/detail/replace.inl
+thrust/detail/reverse.inl
+thrust/detail/scan.inl
+thrust/detail/scatter.inl
+thrust/detail/select_system.h
+thrust/detail/seq.h
+thrust/detail/sequence.inl
+thrust/detail/set_operations.inl
+thrust/detail/sort.inl
+thrust/detail/static_assert.h
+thrust/detail/static_map.h
+thrust/detail/swap.h
+thrust/detail/swap.inl
+thrust/detail/swap_ranges.inl
+thrust/detail/tabulate.inl
+thrust/detail/temporary_array.h
+thrust/detail/temporary_array.inl
+thrust/detail/temporary_buffer.h
+thrust/detail/transform.inl
+thrust/detail/transform_reduce.inl
+thrust/detail/transform_scan.inl
+thrust/detail/trivial_sequence.h
+thrust/detail/tuple.inl
+thrust/detail/tuple_algorithms.h
+thrust/detail/tuple_meta_transform.h
+thrust/detail/tuple_transform.h
+thrust/detail/type_deduction.h
+thrust/detail/type_traits.h
+thrust/detail/type_traits/algorithm/intermediate_type_from_function_and_iterators.h
+thrust/detail/type_traits/function_traits.h
+thrust/detail/type_traits/has_member_function.h
+thrust/detail/type_traits/has_nested_type.h
+thrust/detail/type_traits/has_trivial_assign.h
+thrust/detail/type_traits/is_call_possible.h
+thrust/detail/type_traits/is_metafunction_defined.h
+thrust/detail/type_traits/iterator/is_discard_iterator.h
+thrust/detail/type_traits/iterator/is_output_iterator.h
+thrust/detail/type_traits/minimum_type.h
+thrust/detail/type_traits/pointer_traits.h
+thrust/detail/type_traits/result_of_adaptable_function.h
+thrust/detail/uninitialized_copy.inl
+thrust/detail/uninitialized_fill.inl
+thrust/detail/unique.inl
+thrust/detail/use_default.h
+thrust/detail/util/align.h
+thrust/detail/util/blocking.h
+thrust/detail/vector_base.h
+thrust/detail/vector_base.inl
+thrust/device_allocator.h
+thrust/device_delete.h
+thrust/device_free.h
+thrust/device_make_unique.h
+thrust/device_malloc.h
+thrust/device_malloc_allocator.h
+thrust/device_new.h
+thrust/device_new_allocator.h
+thrust/device_ptr.h
+thrust/device_reference.h
+thrust/device_vector.h
+thrust/distance.h
+thrust/equal.h
+thrust/event.h
+thrust/execution_policy.h
+thrust/extrema.h
+thrust/fill.h
+thrust/find.h
+thrust/for_each.h
+thrust/functional.h
+thrust/future.h
+thrust/gather.h
+thrust/generate.h
+thrust/host_vector.h
+thrust/inner_product.h
+thrust/iterator/constant_iterator.h
+thrust/iterator/counting_iterator.h
+thrust/iterator/detail/any_assign.h
+thrust/iterator/detail/any_system_tag.h
+thrust/iterator/detail/constant_iterator_base.h
+thrust/iterator/detail/counting_iterator.inl
+thrust/iterator/detail/device_system_tag.h
+thrust/iterator/detail/discard_iterator_base.h
+thrust/iterator/detail/distance_from_result.h
+thrust/iterator/detail/host_system_tag.h
+thrust/iterator/detail/is_iterator_category.h
+thrust/iterator/detail/iterator_adaptor_base.h
+thrust/iterator/detail/iterator_category_to_system.h
+thrust/iterator/detail/iterator_category_to_traversal.h
+thrust/iterator/detail/iterator_category_with_system_and_traversal.h
+thrust/iterator/detail/iterator_facade_category.h
+thrust/iterator/detail/iterator_traits.inl
+thrust/iterator/detail/iterator_traversal_tags.h
+thrust/iterator/detail/join_iterator.h
+thrust/iterator/detail/minimum_category.h
+thrust/iterator/detail/minimum_system.h
+thrust/iterator/detail/normal_iterator.h
+thrust/iterator/detail/permutation_iterator_base.h
+thrust/iterator/detail/retag.h
+thrust/iterator/detail/reverse_iterator.inl
+thrust/iterator/detail/reverse_iterator_base.h
+thrust/iterator/detail/tagged_iterator.h
+thrust/iterator/detail/transform_iterator.inl
+thrust/iterator/detail/transform_output_iterator.inl
+thrust/iterator/detail/tuple_of_iterator_references.h
+thrust/iterator/detail/universal_categories.h
+thrust/iterator/detail/zip_iterator.inl
+thrust/iterator/detail/zip_iterator_base.h
+thrust/iterator/discard_iterator.h
+thrust/iterator/iterator_adaptor.h
+thrust/iterator/iterator_categories.h
+thrust/iterator/iterator_facade.h
+thrust/iterator/iterator_traits.h
+thrust/iterator/permutation_iterator.h
+thrust/iterator/retag.h
+thrust/iterator/reverse_iterator.h
+thrust/iterator/transform_iterator.h
+thrust/iterator/transform_output_iterator.h
+thrust/iterator/zip_iterator.h
+thrust/limits.h
+thrust/logical.h
+thrust/memory.h
+thrust/memory/detail/device_system_resource.h
+thrust/memory/detail/host_system_resource.h
+thrust/merge.h
+thrust/mismatch.h
+thrust/mr/allocator.h
+thrust/mr/detail/config.h
+thrust/mr/disjoint_pool.h
+thrust/mr/disjoint_sync_pool.h
+thrust/mr/disjoint_tls_pool.h
+thrust/mr/fancy_pointer_resource.h
+thrust/mr/memory_resource.h
+thrust/mr/new.h
+thrust/mr/polymorphic_adaptor.h
+thrust/mr/pool.h
+thrust/mr/pool_options.h
+thrust/mr/sync_pool.h
+thrust/mr/tls_pool.h
+thrust/mr/validator.h
+thrust/optional.h
+thrust/pair.h
+thrust/partition.h
+thrust/per_device_resource.h
+thrust/random.h
+thrust/random/detail/discard_block_engine.inl
+thrust/random/detail/linear_congruential_engine.inl
+thrust/random/detail/linear_congruential_engine_discard.h
+thrust/random/detail/linear_feedback_shift_engine.inl
+thrust/random/detail/linear_feedback_shift_engine_wordmask.h
+thrust/random/detail/mod.h
+thrust/random/detail/normal_distribution.inl
+thrust/random/detail/normal_distribution_base.h
+thrust/random/detail/random_core_access.h
+thrust/random/detail/subtract_with_carry_engine.inl
+thrust/random/detail/uniform_int_distribution.inl
+thrust/random/detail/uniform_real_distribution.inl
+thrust/random/detail/xor_combine_engine.inl
+thrust/random/detail/xor_combine_engine_max.h
+thrust/random/discard_block_engine.h
+thrust/random/linear_congruential_engine.h
+thrust/random/linear_feedback_shift_engine.h
+thrust/random/normal_distribution.h
+thrust/random/subtract_with_carry_engine.h
+thrust/random/uniform_int_distribution.h
+thrust/random/uniform_real_distribution.h
+thrust/random/xor_combine_engine.h
+thrust/reduce.h
+thrust/remove.h
+thrust/replace.h
+thrust/reverse.h
+thrust/scan.h
+thrust/scatter.h
+thrust/sequence.h
+thrust/set_operations.h
+thrust/sort.h
+thrust/swap.h
+thrust/system/cpp/detail/adjacent_difference.h
+thrust/system/cpp/detail/assign_value.h
+thrust/system/cpp/detail/binary_search.h
+thrust/system/cpp/detail/copy.h
+thrust/system/cpp/detail/copy_if.h
+thrust/system/cpp/detail/count.h
+thrust/system/cpp/detail/equal.h
+thrust/system/cpp/detail/execution_policy.h
+thrust/system/cpp/detail/extrema.h
+thrust/system/cpp/detail/fill.h
+thrust/system/cpp/detail/find.h
+thrust/system/cpp/detail/for_each.h
+thrust/system/cpp/detail/gather.h
+thrust/system/cpp/detail/generate.h
+thrust/system/cpp/detail/get_value.h
+thrust/system/cpp/detail/inner_product.h
+thrust/system/cpp/detail/iter_swap.h
+thrust/system/cpp/detail/logical.h
+thrust/system/cpp/detail/malloc_and_free.h
+thrust/system/cpp/detail/memory.inl
+thrust/system/cpp/detail/merge.h
+thrust/system/cpp/detail/mismatch.h
+thrust/system/cpp/detail/par.h
+thrust/system/cpp/detail/partition.h
+thrust/system/cpp/detail/per_device_resource.h
+thrust/system/cpp/detail/pointer.inl
+thrust/system/cpp/detail/reduce.h
+thrust/system/cpp/detail/reduce_by_key.h
+thrust/system/cpp/detail/remove.h
+thrust/system/cpp/detail/replace.h
+thrust/system/cpp/detail/reverse.h
+thrust/system/cpp/detail/scan.h
+thrust/system/cpp/detail/scan_by_key.h
+thrust/system/cpp/detail/scatter.h
+thrust/system/cpp/detail/sequence.h
+thrust/system/cpp/detail/set_operations.h
+thrust/system/cpp/detail/sort.h
+thrust/system/cpp/detail/swap_ranges.h
+thrust/system/cpp/detail/tabulate.h
+thrust/system/cpp/detail/temporary_buffer.h
+thrust/system/cpp/detail/transform.h
+thrust/system/cpp/detail/transform_reduce.h
+thrust/system/cpp/detail/transform_scan.h
+thrust/system/cpp/detail/uninitialized_copy.h
+thrust/system/cpp/detail/uninitialized_fill.h
+thrust/system/cpp/detail/unique.h
+thrust/system/cpp/detail/unique_by_key.h
+thrust/system/cpp/detail/vector.inl
+thrust/system/cpp/execution_policy.h
+thrust/system/cpp/memory.h
+thrust/system/cpp/memory_resource.h
+thrust/system/cpp/pointer.h
+thrust/system/cpp/vector.h
+thrust/system/cuda/config.h
+thrust/system/cuda/detail/adjacent_difference.h
+thrust/system/cuda/detail/assign_value.h
+thrust/system/cuda/detail/async/copy.h
+thrust/system/cuda/detail/async/customization.h
+thrust/system/cuda/detail/async/for_each.h
+thrust/system/cuda/detail/async/reduce.h
+thrust/system/cuda/detail/async/sort.h
+thrust/system/cuda/detail/async/transform.h
+thrust/system/cuda/detail/binary_search.h
+thrust/system/cuda/detail/copy.h
+thrust/system/cuda/detail/copy_if.h
+thrust/system/cuda/detail/core/agent_launcher.h
+thrust/system/cuda/detail/core/alignment.h
+thrust/system/cuda/detail/core/triple_chevron_launch.h
+thrust/system/cuda/detail/core/util.h
+thrust/system/cuda/detail/count.h
+thrust/system/cuda/detail/cross_system.h
+thrust/system/cuda/detail/cub/agent/agent_histogram.cuh
+thrust/system/cuda/detail/cub/agent/agent_radix_sort_downsweep.cuh
+thrust/system/cuda/detail/cub/agent/agent_radix_sort_upsweep.cuh
+thrust/system/cuda/detail/cub/agent/agent_reduce.cuh
+thrust/system/cuda/detail/cub/agent/agent_reduce_by_key.cuh
+thrust/system/cuda/detail/cub/agent/agent_rle.cuh
+thrust/system/cuda/detail/cub/agent/agent_scan.cuh
+thrust/system/cuda/detail/cub/agent/agent_segment_fixup.cuh
+thrust/system/cuda/detail/cub/agent/agent_select_if.cuh
+thrust/system/cuda/detail/cub/agent/agent_spmv_orig.cuh
+thrust/system/cuda/detail/cub/agent/single_pass_scan_operators.cuh
+thrust/system/cuda/detail/cub/block/block_adjacent_difference.cuh
+thrust/system/cuda/detail/cub/block/block_discontinuity.cuh
+thrust/system/cuda/detail/cub/block/block_exchange.cuh
+thrust/system/cuda/detail/cub/block/block_histogram.cuh
+thrust/system/cuda/detail/cub/block/block_load.cuh
+thrust/system/cuda/detail/cub/block/block_radix_rank.cuh
+thrust/system/cuda/detail/cub/block/block_radix_sort.cuh
+thrust/system/cuda/detail/cub/block/block_raking_layout.cuh
+thrust/system/cuda/detail/cub/block/block_reduce.cuh
+thrust/system/cuda/detail/cub/block/block_scan.cuh
+thrust/system/cuda/detail/cub/block/block_shuffle.cuh
+thrust/system/cuda/detail/cub/block/block_store.cuh
+thrust/system/cuda/detail/cub/block/specializations/block_histogram_atomic.cuh
+thrust/system/cuda/detail/cub/block/specializations/block_histogram_sort.cuh
+thrust/system/cuda/detail/cub/block/specializations/block_reduce_raking.cuh
+thrust/system/cuda/detail/cub/block/specializations/block_reduce_raking_commutative_only.cuh
+thrust/system/cuda/detail/cub/block/specializations/block_reduce_warp_reductions.cuh
+thrust/system/cuda/detail/cub/block/specializations/block_scan_raking.cuh
+thrust/system/cuda/detail/cub/block/specializations/block_scan_warp_scans.cuh
+thrust/system/cuda/detail/cub/block/specializations/block_scan_warp_scans2.cuh
+thrust/system/cuda/detail/cub/block/specializations/block_scan_warp_scans3.cuh
+thrust/system/cuda/detail/cub/cub.cuh
+thrust/system/cuda/detail/cub/device/device_histogram.cuh
+thrust/system/cuda/detail/cub/device/device_partition.cuh
+thrust/system/cuda/detail/cub/device/device_radix_sort.cuh
+thrust/system/cuda/detail/cub/device/device_reduce.cuh
+thrust/system/cuda/detail/cub/device/device_run_length_encode.cuh
+thrust/system/cuda/detail/cub/device/device_scan.cuh
+thrust/system/cuda/detail/cub/device/device_segmented_radix_sort.cuh
+thrust/system/cuda/detail/cub/device/device_segmented_reduce.cuh
+thrust/system/cuda/detail/cub/device/device_select.cuh
+thrust/system/cuda/detail/cub/device/device_spmv.cuh
+thrust/system/cuda/detail/cub/device/dispatch/dispatch_histogram.cuh
+thrust/system/cuda/detail/cub/device/dispatch/dispatch_radix_sort.cuh
+thrust/system/cuda/detail/cub/device/dispatch/dispatch_reduce.cuh
+thrust/system/cuda/detail/cub/device/dispatch/dispatch_reduce_by_key.cuh
+thrust/system/cuda/detail/cub/device/dispatch/dispatch_rle.cuh
+thrust/system/cuda/detail/cub/device/dispatch/dispatch_scan.cuh
+thrust/system/cuda/detail/cub/device/dispatch/dispatch_select_if.cuh
+thrust/system/cuda/detail/cub/device/dispatch/dispatch_spmv_orig.cuh
+thrust/system/cuda/detail/cub/grid/grid_barrier.cuh
+thrust/system/cuda/detail/cub/grid/grid_even_share.cuh
+thrust/system/cuda/detail/cub/grid/grid_mapping.cuh
+thrust/system/cuda/detail/cub/grid/grid_queue.cuh
+thrust/system/cuda/detail/cub/host/mutex.cuh
+thrust/system/cuda/detail/cub/iterator/arg_index_input_iterator.cuh
+thrust/system/cuda/detail/cub/iterator/cache_modified_input_iterator.cuh
+thrust/system/cuda/detail/cub/iterator/cache_modified_output_iterator.cuh
+thrust/system/cuda/detail/cub/iterator/constant_input_iterator.cuh
+thrust/system/cuda/detail/cub/iterator/counting_input_iterator.cuh
+thrust/system/cuda/detail/cub/iterator/discard_output_iterator.cuh
+thrust/system/cuda/detail/cub/iterator/tex_obj_input_iterator.cuh
+thrust/system/cuda/detail/cub/iterator/tex_ref_input_iterator.cuh
+thrust/system/cuda/detail/cub/iterator/transform_input_iterator.cuh
+thrust/system/cuda/detail/cub/thread/thread_load.cuh
+thrust/system/cuda/detail/cub/thread/thread_operators.cuh
+thrust/system/cuda/detail/cub/thread/thread_reduce.cuh
+thrust/system/cuda/detail/cub/thread/thread_scan.cuh
+thrust/system/cuda/detail/cub/thread/thread_search.cuh
+thrust/system/cuda/detail/cub/thread/thread_store.cuh
+thrust/system/cuda/detail/cub/util_allocator.cuh
+thrust/system/cuda/detail/cub/util_arch.cuh
+thrust/system/cuda/detail/cub/util_debug.cuh
+thrust/system/cuda/detail/cub/util_device.cuh
+thrust/system/cuda/detail/cub/util_macro.cuh
+thrust/system/cuda/detail/cub/util_namespace.cuh
+thrust/system/cuda/detail/cub/util_ptx.cuh
+thrust/system/cuda/detail/cub/util_type.cuh
+thrust/system/cuda/detail/cub/warp/specializations/warp_reduce_shfl.cuh
+thrust/system/cuda/detail/cub/warp/specializations/warp_reduce_smem.cuh
+thrust/system/cuda/detail/cub/warp/specializations/warp_scan_shfl.cuh
+thrust/system/cuda/detail/cub/warp/specializations/warp_scan_smem.cuh
+thrust/system/cuda/detail/cub/warp/warp_reduce.cuh
+thrust/system/cuda/detail/cub/warp/warp_scan.cuh
+thrust/system/cuda/detail/equal.h
+thrust/system/cuda/detail/error.inl
+thrust/system/cuda/detail/execution_policy.h
+thrust/system/cuda/detail/extrema.h
+thrust/system/cuda/detail/fill.h
+thrust/system/cuda/detail/find.h
+thrust/system/cuda/detail/for_each.h
+thrust/system/cuda/detail/future.inl
+thrust/system/cuda/detail/gather.h
+thrust/system/cuda/detail/generate.h
+thrust/system/cuda/detail/get_value.h
+thrust/system/cuda/detail/guarded_cuda_runtime_api.h
+thrust/system/cuda/detail/guarded_driver_types.h
+thrust/system/cuda/detail/inner_product.h
+thrust/system/cuda/detail/internal/copy_cross_system.h
+thrust/system/cuda/detail/internal/copy_device_to_device.h
+thrust/system/cuda/detail/iter_swap.h
+thrust/system/cuda/detail/logical.h
+thrust/system/cuda/detail/malloc_and_free.h
+thrust/system/cuda/detail/memory.inl
+thrust/system/cuda/detail/merge.h
+thrust/system/cuda/detail/mismatch.h
+thrust/system/cuda/detail/par.h
+thrust/system/cuda/detail/par_to_seq.h
+thrust/system/cuda/detail/parallel_for.h
+thrust/system/cuda/detail/partition.h
+thrust/system/cuda/detail/per_device_resource.h
+thrust/system/cuda/detail/pointer.inl
+thrust/system/cuda/detail/reduce.h
+thrust/system/cuda/detail/reduce_by_key.h
+thrust/system/cuda/detail/remove.h
+thrust/system/cuda/detail/replace.h
+thrust/system/cuda/detail/reverse.h
+thrust/system/cuda/detail/scan.h
+thrust/system/cuda/detail/scan_by_key.h
+thrust/system/cuda/detail/scatter.h
+thrust/system/cuda/detail/sequence.h
+thrust/system/cuda/detail/set_operations.h
+thrust/system/cuda/detail/sort.h
+thrust/system/cuda/detail/swap_ranges.h
+thrust/system/cuda/detail/tabulate.h
+thrust/system/cuda/detail/temporary_buffer.h
+thrust/system/cuda/detail/terminate.h
+thrust/system/cuda/detail/transform.h
+thrust/system/cuda/detail/transform_reduce.h
+thrust/system/cuda/detail/transform_scan.h
+thrust/system/cuda/detail/uninitialized_copy.h
+thrust/system/cuda/detail/uninitialized_fill.h
+thrust/system/cuda/detail/unique.h
+thrust/system/cuda/detail/unique_by_key.h
+thrust/system/cuda/detail/util.h
+thrust/system/cuda/detail/vector.inl
+thrust/system/cuda/error.h
+thrust/system/cuda/execution_policy.h
+thrust/system/cuda/experimental/pinned_allocator.h
+thrust/system/cuda/future.h
+thrust/system/cuda/memory.h
+thrust/system/cuda/memory_resource.h
+thrust/system/cuda/pointer.h
+thrust/system/cuda/vector.h
+thrust/system/detail/adl/adjacent_difference.h
+thrust/system/detail/adl/assign_value.h
+thrust/system/detail/adl/async/copy.h
+thrust/system/detail/adl/async/for_each.h
+thrust/system/detail/adl/async/reduce.h
+thrust/system/detail/adl/async/sort.h
+thrust/system/detail/adl/async/transform.h
+thrust/system/detail/adl/binary_search.h
+thrust/system/detail/adl/copy.h
+thrust/system/detail/adl/copy_if.h
+thrust/system/detail/adl/count.h
+thrust/system/detail/adl/equal.h
+thrust/system/detail/adl/extrema.h
+thrust/system/detail/adl/fill.h
+thrust/system/detail/adl/find.h
+thrust/system/detail/adl/for_each.h
+thrust/system/detail/adl/gather.h
+thrust/system/detail/adl/generate.h
+thrust/system/detail/adl/get_value.h
+thrust/system/detail/adl/inner_product.h
+thrust/system/detail/adl/iter_swap.h
+thrust/system/detail/adl/logical.h
+thrust/system/detail/adl/malloc_and_free.h
+thrust/system/detail/adl/merge.h
+thrust/system/detail/adl/mismatch.h
+thrust/system/detail/adl/partition.h
+thrust/system/detail/adl/per_device_resource.h
+thrust/system/detail/adl/reduce.h
+thrust/system/detail/adl/reduce_by_key.h
+thrust/system/detail/adl/remove.h
+thrust/system/detail/adl/replace.h
+thrust/system/detail/adl/reverse.h
+thrust/system/detail/adl/scan.h
+thrust/system/detail/adl/scan_by_key.h
+thrust/system/detail/adl/scatter.h
+thrust/system/detail/adl/sequence.h
+thrust/system/detail/adl/set_operations.h
+thrust/system/detail/adl/sort.h
+thrust/system/detail/adl/swap_ranges.h
+thrust/system/detail/adl/tabulate.h
+thrust/system/detail/adl/temporary_buffer.h
+thrust/system/detail/adl/transform.h
+thrust/system/detail/adl/transform_reduce.h
+thrust/system/detail/adl/transform_scan.h
+thrust/system/detail/adl/uninitialized_copy.h
+thrust/system/detail/adl/uninitialized_fill.h
+thrust/system/detail/adl/unique.h
+thrust/system/detail/adl/unique_by_key.h
+thrust/system/detail/bad_alloc.h
+thrust/system/detail/errno.h
+thrust/system/detail/error_category.inl
+thrust/system/detail/error_code.inl
+thrust/system/detail/error_condition.inl
+thrust/system/detail/generic/adjacent_difference.h
+thrust/system/detail/generic/adjacent_difference.inl
+thrust/system/detail/generic/advance.h
+thrust/system/detail/generic/advance.inl
+thrust/system/detail/generic/binary_search.h
+thrust/system/detail/generic/binary_search.inl
+thrust/system/detail/generic/copy.h
+thrust/system/detail/generic/copy.inl
+thrust/system/detail/generic/copy_if.h
+thrust/system/detail/generic/copy_if.inl
+thrust/system/detail/generic/count.h
+thrust/system/detail/generic/count.inl
+thrust/system/detail/generic/distance.h
+thrust/system/detail/generic/distance.inl
+thrust/system/detail/generic/equal.h
+thrust/system/detail/generic/equal.inl
+thrust/system/detail/generic/extrema.h
+thrust/system/detail/generic/extrema.inl
+thrust/system/detail/generic/fill.h
+thrust/system/detail/generic/find.h
+thrust/system/detail/generic/find.inl
+thrust/system/detail/generic/for_each.h
+thrust/system/detail/generic/gather.h
+thrust/system/detail/generic/gather.inl
+thrust/system/detail/generic/generate.h
+thrust/system/detail/generic/generate.inl
+thrust/system/detail/generic/inner_product.h
+thrust/system/detail/generic/inner_product.inl
+thrust/system/detail/generic/logical.h
+thrust/system/detail/generic/memory.h
+thrust/system/detail/generic/memory.inl
+thrust/system/detail/generic/merge.h
+thrust/system/detail/generic/merge.inl
+thrust/system/detail/generic/mismatch.h
+thrust/system/detail/generic/mismatch.inl
+thrust/system/detail/generic/partition.h
+thrust/system/detail/generic/partition.inl
+thrust/system/detail/generic/per_device_resource.h
+thrust/system/detail/generic/reduce.h
+thrust/system/detail/generic/reduce.inl
+thrust/system/detail/generic/reduce_by_key.h
+thrust/system/detail/generic/reduce_by_key.inl
+thrust/system/detail/generic/remove.h
+thrust/system/detail/generic/remove.inl
+thrust/system/detail/generic/replace.h
+thrust/system/detail/generic/replace.inl
+thrust/system/detail/generic/reverse.h
+thrust/system/detail/generic/reverse.inl
+thrust/system/detail/generic/scalar/binary_search.h
+thrust/system/detail/generic/scalar/binary_search.inl
+thrust/system/detail/generic/scan.h
+thrust/system/detail/generic/scan.inl
+thrust/system/detail/generic/scan_by_key.h
+thrust/system/detail/generic/scan_by_key.inl
+thrust/system/detail/generic/scatter.h
+thrust/system/detail/generic/scatter.inl
+thrust/system/detail/generic/select_system.h
+thrust/system/detail/generic/select_system.inl
+thrust/system/detail/generic/select_system_exists.h
+thrust/system/detail/generic/sequence.h
+thrust/system/detail/generic/sequence.inl
+thrust/system/detail/generic/set_operations.h
+thrust/system/detail/generic/set_operations.inl
+thrust/system/detail/generic/sort.h
+thrust/system/detail/generic/sort.inl
+thrust/system/detail/generic/swap_ranges.h
+thrust/system/detail/generic/swap_ranges.inl
+thrust/system/detail/generic/tabulate.h
+thrust/system/detail/generic/tabulate.inl
+thrust/system/detail/generic/tag.h
+thrust/system/detail/generic/temporary_buffer.h
+thrust/system/detail/generic/temporary_buffer.inl
+thrust/system/detail/generic/transform.h
+thrust/system/detail/generic/transform.inl
+thrust/system/detail/generic/transform_reduce.h
+thrust/system/detail/generic/transform_reduce.inl
+thrust/system/detail/generic/transform_scan.h
+thrust/system/detail/generic/transform_scan.inl
+thrust/system/detail/generic/uninitialized_copy.h
+thrust/system/detail/generic/uninitialized_copy.inl
+thrust/system/detail/generic/uninitialized_fill.h
+thrust/system/detail/generic/uninitialized_fill.inl
+thrust/system/detail/generic/unique.h
+thrust/system/detail/generic/unique.inl
+thrust/system/detail/generic/unique_by_key.h
+thrust/system/detail/generic/unique_by_key.inl
+thrust/system/detail/internal/decompose.h
+thrust/system/detail/sequential/adjacent_difference.h
+thrust/system/detail/sequential/assign_value.h
+thrust/system/detail/sequential/binary_search.h
+thrust/system/detail/sequential/copy.h
+thrust/system/detail/sequential/copy.inl
+thrust/system/detail/sequential/copy_backward.h
+thrust/system/detail/sequential/copy_if.h
+thrust/system/detail/sequential/count.h
+thrust/system/detail/sequential/equal.h
+thrust/system/detail/sequential/execution_policy.h
+thrust/system/detail/sequential/extrema.h
+thrust/system/detail/sequential/fill.h
+thrust/system/detail/sequential/find.h
+thrust/system/detail/sequential/for_each.h
+thrust/system/detail/sequential/gather.h
+thrust/system/detail/sequential/general_copy.h
+thrust/system/detail/sequential/generate.h
+thrust/system/detail/sequential/get_value.h
+thrust/system/detail/sequential/inner_product.h
+thrust/system/detail/sequential/insertion_sort.h
+thrust/system/detail/sequential/iter_swap.h
+thrust/system/detail/sequential/logical.h
+thrust/system/detail/sequential/malloc_and_free.h
+thrust/system/detail/sequential/merge.h
+thrust/system/detail/sequential/merge.inl
+thrust/system/detail/sequential/mismatch.h
+thrust/system/detail/sequential/partition.h
+thrust/system/detail/sequential/per_device_resource.h
+thrust/system/detail/sequential/reduce.h
+thrust/system/detail/sequential/reduce_by_key.h
+thrust/system/detail/sequential/remove.h
+thrust/system/detail/sequential/replace.h
+thrust/system/detail/sequential/reverse.h
+thrust/system/detail/sequential/scan.h
+thrust/system/detail/sequential/scan_by_key.h
+thrust/system/detail/sequential/scatter.h
+thrust/system/detail/sequential/sequence.h
+thrust/system/detail/sequential/set_operations.h
+thrust/system/detail/sequential/sort.h
+thrust/system/detail/sequential/sort.inl
+thrust/system/detail/sequential/stable_merge_sort.h
+thrust/system/detail/sequential/stable_merge_sort.inl
+thrust/system/detail/sequential/stable_primitive_sort.h
+thrust/system/detail/sequential/stable_primitive_sort.inl
+thrust/system/detail/sequential/stable_radix_sort.h
+thrust/system/detail/sequential/stable_radix_sort.inl
+thrust/system/detail/sequential/swap_ranges.h
+thrust/system/detail/sequential/tabulate.h
+thrust/system/detail/sequential/temporary_buffer.h
+thrust/system/detail/sequential/transform.h
+thrust/system/detail/sequential/transform_reduce.h
+thrust/system/detail/sequential/transform_scan.h
+thrust/system/detail/sequential/trivial_copy.h
+thrust/system/detail/sequential/uninitialized_copy.h
+thrust/system/detail/sequential/uninitialized_fill.h
+thrust/system/detail/sequential/unique.h
+thrust/system/detail/sequential/unique_by_key.h
+thrust/system/detail/system_error.inl
+thrust/system/error_code.h
+thrust/system/omp/detail/adjacent_difference.h
+thrust/system/omp/detail/assign_value.h
+thrust/system/omp/detail/binary_search.h
+thrust/system/omp/detail/copy.h
+thrust/system/omp/detail/copy.inl
+thrust/system/omp/detail/copy_if.h
+thrust/system/omp/detail/copy_if.inl
+thrust/system/omp/detail/count.h
+thrust/system/omp/detail/default_decomposition.h
+thrust/system/omp/detail/default_decomposition.inl
+thrust/system/omp/detail/equal.h
+thrust/system/omp/detail/execution_policy.h
+thrust/system/omp/detail/extrema.h
+thrust/system/omp/detail/fill.h
+thrust/system/omp/detail/find.h
+thrust/system/omp/detail/for_each.h
+thrust/system/omp/detail/for_each.inl
+thrust/system/omp/detail/gather.h
+thrust/system/omp/detail/generate.h
+thrust/system/omp/detail/get_value.h
+thrust/system/omp/detail/inner_product.h
+thrust/system/omp/detail/iter_swap.h
+thrust/system/omp/detail/logical.h
+thrust/system/omp/detail/malloc_and_free.h
+thrust/system/omp/detail/memory.inl
+thrust/system/omp/detail/merge.h
+thrust/system/omp/detail/mismatch.h
+thrust/system/omp/detail/par.h
+thrust/system/omp/detail/partition.h
+thrust/system/omp/detail/partition.inl
+thrust/system/omp/detail/per_device_resource.h
+thrust/system/omp/detail/pointer.inl
+thrust/system/omp/detail/reduce.h
+thrust/system/omp/detail/reduce.inl
+thrust/system/omp/detail/reduce_by_key.h
+thrust/system/omp/detail/reduce_by_key.inl
+thrust/system/omp/detail/reduce_intervals.h
+thrust/system/omp/detail/reduce_intervals.inl
+thrust/system/omp/detail/remove.h
+thrust/system/omp/detail/remove.inl
+thrust/system/omp/detail/replace.h
+thrust/system/omp/detail/reverse.h
+thrust/system/omp/detail/scan.h
+thrust/system/omp/detail/scan_by_key.h
+thrust/system/omp/detail/scatter.h
+thrust/system/omp/detail/sequence.h
+thrust/system/omp/detail/set_operations.h
+thrust/system/omp/detail/sort.h
+thrust/system/omp/detail/sort.inl
+thrust/system/omp/detail/swap_ranges.h
+thrust/system/omp/detail/tabulate.h
+thrust/system/omp/detail/temporary_buffer.h
+thrust/system/omp/detail/transform.h
+thrust/system/omp/detail/transform_reduce.h
+thrust/system/omp/detail/transform_scan.h
+thrust/system/omp/detail/uninitialized_copy.h
+thrust/system/omp/detail/uninitialized_fill.h
+thrust/system/omp/detail/unique.h
+thrust/system/omp/detail/unique.inl
+thrust/system/omp/detail/unique_by_key.h
+thrust/system/omp/detail/unique_by_key.inl
+thrust/system/omp/detail/vector.inl
+thrust/system/omp/execution_policy.h
+thrust/system/omp/memory.h
+thrust/system/omp/memory_resource.h
+thrust/system/omp/pointer.h
+thrust/system/omp/vector.h
+thrust/system/system_error.h
+thrust/system/tbb/detail/adjacent_difference.h
+thrust/system/tbb/detail/assign_value.h
+thrust/system/tbb/detail/binary_search.h
+thrust/system/tbb/detail/copy.h
+thrust/system/tbb/detail/copy.inl
+thrust/system/tbb/detail/copy_if.h
+thrust/system/tbb/detail/copy_if.inl
+thrust/system/tbb/detail/count.h
+thrust/system/tbb/detail/equal.h
+thrust/system/tbb/detail/execution_policy.h
+thrust/system/tbb/detail/extrema.h
+thrust/system/tbb/detail/fill.h
+thrust/system/tbb/detail/find.h
+thrust/system/tbb/detail/for_each.h
+thrust/system/tbb/detail/for_each.inl
+thrust/system/tbb/detail/gather.h
+thrust/system/tbb/detail/generate.h
+thrust/system/tbb/detail/get_value.h
+thrust/system/tbb/detail/inner_product.h
+thrust/system/tbb/detail/iter_swap.h
+thrust/system/tbb/detail/logical.h
+thrust/system/tbb/detail/malloc_and_free.h
+thrust/system/tbb/detail/memory.inl
+thrust/system/tbb/detail/merge.h
+thrust/system/tbb/detail/merge.inl
+thrust/system/tbb/detail/mismatch.h
+thrust/system/tbb/detail/par.h
+thrust/system/tbb/detail/partition.h
+thrust/system/tbb/detail/partition.inl
+thrust/system/tbb/detail/per_device_resource.h
+thrust/system/tbb/detail/pointer.inl
+thrust/system/tbb/detail/reduce.h
+thrust/system/tbb/detail/reduce.inl
+thrust/system/tbb/detail/reduce_by_key.h
+thrust/system/tbb/detail/reduce_by_key.inl
+thrust/system/tbb/detail/reduce_intervals.h
+thrust/system/tbb/detail/remove.h
+thrust/system/tbb/detail/remove.inl
+thrust/system/tbb/detail/replace.h
+thrust/system/tbb/detail/reverse.h
+thrust/system/tbb/detail/scan.h
+thrust/system/tbb/detail/scan.inl
+thrust/system/tbb/detail/scan_by_key.h
+thrust/system/tbb/detail/scatter.h
+thrust/system/tbb/detail/sequence.h
+thrust/system/tbb/detail/set_operations.h
+thrust/system/tbb/detail/sort.h
+thrust/system/tbb/detail/sort.inl
+thrust/system/tbb/detail/swap_ranges.h
+thrust/system/tbb/detail/tabulate.h
+thrust/system/tbb/detail/temporary_buffer.h
+thrust/system/tbb/detail/transform.h
+thrust/system/tbb/detail/transform_reduce.h
+thrust/system/tbb/detail/transform_scan.h
+thrust/system/tbb/detail/uninitialized_copy.h
+thrust/system/tbb/detail/uninitialized_fill.h
+thrust/system/tbb/detail/unique.h
+thrust/system/tbb/detail/unique.inl
+thrust/system/tbb/detail/unique_by_key.h
+thrust/system/tbb/detail/unique_by_key.inl
+thrust/system/tbb/detail/vector.inl
+thrust/system/tbb/execution_policy.h
+thrust/system/tbb/memory.h
+thrust/system/tbb/memory_resource.h
+thrust/system/tbb/pointer.h
+thrust/system/tbb/vector.h
+thrust/system_error.h
+thrust/tabulate.h
+thrust/transform.h
+thrust/transform_reduce.h
+thrust/transform_scan.h
+thrust/tuple.h
+thrust/type_traits/integer_sequence.h
+thrust/type_traits/is_contiguous_iterator.h
+thrust/type_traits/is_execution_policy.h
+thrust/type_traits/is_operator_less_or_greater_function_object.h
+thrust/type_traits/is_operator_plus_function_object.h
+thrust/type_traits/is_trivially_relocatable.h
+thrust/type_traits/logical_metafunctions.h
+thrust/type_traits/remove_cvref.h
+thrust/type_traits/void_t.h
+thrust/uninitialized_copy.h
+thrust/uninitialized_fill.h
+thrust/unique.h
+thrust/version.h
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@ -14,7 +14,6 @@ COMMENT=	Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${BUILD_WRKSRC}/Core/Copying

-BROKEN_aarch64=		Does not compile on ${ARCH}: error Unknown CPU architecture
 BROKEN_powerpc=		Does not compile on ${ARCH}: error Unknown CPU architecture
 BROKEN_powerpc64=	Does not compile on ${ARCH}: error Unknown CPU architecture
 BROKEN_sparc64=		Does not compile on ${ARCH}
--- a/devel/vc/Makefile
+++ b/devel/vc/Makefile
@ -0,0 +1,29 @@
+# $FreeBSD$
+
+PORTNAME=	vc
+DISTVERSION=	1.4.1-10
+DISTVERSIONSUFFIX=	-g383ef32b
+CATEGORIES=	devel
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	SIMD Vector Classes for C++
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		cmake compiler:c++14-lang
+USE_GITHUB=	yes
+GH_ACCOUNT=	VcDevel
+GH_PROJECT=	Vc
+GH_TUPLE=	VcDevel:vc-testdata:9ada1f3:testdata/tests/testdata \
+		mattkretz:virtest:f7d03ef:virtest/tests/virtest
+
+CMAKE_OFF=	BUILD_TESTING
+
+do-test:
+	@cd ${BUILD_WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
+
+.include <bsd.port.mk>
--- a/devel/vc/distinfo
+++ b/devel/vc/distinfo
@ -0,0 +1,7 @@
+TIMESTAMP = 1556950593
+SHA256 (VcDevel-Vc-1.4.1-10-g383ef32b_GH0.tar.gz) = 9b46f53006fde3c1b3614e9bbcc8087f8bad643e81ed320f08f2126d4e72e592
+SIZE (VcDevel-Vc-1.4.1-10-g383ef32b_GH0.tar.gz) = 639289
+SHA256 (mattkretz-virtest-f7d03ef_GH0.tar.gz) = 1b03e27be46bc860deae5cc7c82f28df98dd2011af7a798b8aa16a99f90714a7
+SIZE (mattkretz-virtest-f7d03ef_GH0.tar.gz) = 26021
+SHA256 (VcDevel-vc-testdata-9ada1f3_GH0.tar.gz) = d03f4b02351e5207ec6c1c6d56d95f0d49557d01eed5433b64b159fc5594f005
+SIZE (VcDevel-vc-testdata-9ada1f3_GH0.tar.gz) = 53402148
--- a/devel/vc/pkg-descr
+++ b/devel/vc/pkg-descr
@ -0,0 +1,12 @@
+Vc is a free software library to ease explicit vectorization of C++ code. It has
+an intuitive API and provides portability between different compilers and
+compiler versions as well as portability between different vector instruction
+sets. Thus an application written with Vc can be compiled for:
+* AVX and AVX2
+* SSE2 up to SSE4.2 or SSE4a
+* Scalar
+* AVX-512 (Vc 2 development)
+* NEON (in development)
+* NVIDIA GPUs / CUDA (research)
+
+WWW: https://github.com/VcDevel/Vc
--- a/devel/vc/pkg-plist
+++ b/devel/vc/pkg-plist
@ -0,0 +1,164 @@
+include/Vc/Allocator
+include/Vc/IO
+include/Vc/Memory
+include/Vc/SimdArray
+include/Vc/Utils
+include/Vc/Vc
+include/Vc/algorithm
+include/Vc/array
+include/Vc/avx/casts.h
+include/Vc/avx/const.h
+include/Vc/avx/const_data.h
+include/Vc/avx/debug.h
+include/Vc/avx/deinterleave.tcc
+include/Vc/avx/detail.h
+include/Vc/avx/helperimpl.h
+include/Vc/avx/intrinsics.h
+include/Vc/avx/limits.h
+include/Vc/avx/macros.h
+include/Vc/avx/mask.h
+include/Vc/avx/mask.tcc
+include/Vc/avx/math.h
+include/Vc/avx/shuffle.h
+include/Vc/avx/simd_cast.h
+include/Vc/avx/simd_cast_caller.tcc
+include/Vc/avx/types.h
+include/Vc/avx/vector.h
+include/Vc/avx/vector.tcc
+include/Vc/avx/vectorhelper.h
+include/Vc/common/algorithms.h
+include/Vc/common/aliasingentryhelper.h
+include/Vc/common/alignedbase.h
+include/Vc/common/bitscanintrinsics.h
+include/Vc/common/const.h
+include/Vc/common/data.h
+include/Vc/common/deinterleave.h
+include/Vc/common/detail.h
+include/Vc/common/elementreference.h
+include/Vc/common/exponential.h
+include/Vc/common/fix_clang_emmintrin.h
+include/Vc/common/gatherimplementation.h
+include/Vc/common/gatherinterface.h
+include/Vc/common/gatherinterface_deprecated.h
+include/Vc/common/generalinterface.h
+include/Vc/common/iif.h
+include/Vc/common/indexsequence.h
+include/Vc/common/interleave.h
+include/Vc/common/interleavedmemory.h
+include/Vc/common/iterators.h
+include/Vc/common/loadinterface.h
+include/Vc/common/loadstoreflags.h
+include/Vc/common/logarithm.h
+include/Vc/common/macros.h
+include/Vc/common/makeContainer.h
+include/Vc/common/make_unique.h
+include/Vc/common/malloc.h
+include/Vc/common/mask.h
+include/Vc/common/maskbool.h
+include/Vc/common/math.h
+include/Vc/common/memory.h
+include/Vc/common/memorybase.h
+include/Vc/common/memoryfwd.h
+include/Vc/common/operators.h
+include/Vc/common/permutation.h
+include/Vc/common/scatterimplementation.h
+include/Vc/common/scatterinterface.h
+include/Vc/common/scatterinterface_deprecated.h
+include/Vc/common/set.h
+include/Vc/common/simd_cast.h
+include/Vc/common/simd_cast_caller.tcc
+include/Vc/common/simdarray.h
+include/Vc/common/simdarrayfwd.h
+include/Vc/common/simdarrayhelper.h
+include/Vc/common/simdize.h
+include/Vc/common/simdmaskarray.h
+include/Vc/common/span.h
+include/Vc/common/storage.h
+include/Vc/common/storeinterface.h
+include/Vc/common/subscript.h
+include/Vc/common/support.h
+include/Vc/common/transpose.h
+include/Vc/common/trigonometric.h
+include/Vc/common/types.h
+include/Vc/common/utility.h
+include/Vc/common/vector.h
+include/Vc/common/vector/casts.h
+include/Vc/common/vectorabi.h
+include/Vc/common/vectortraits.h
+include/Vc/common/vectortuple.h
+include/Vc/common/where.h
+include/Vc/common/writemaskedvector.h
+include/Vc/common/x86_prefetches.h
+include/Vc/cpuid.h
+include/Vc/fwddecl.h
+include/Vc/global.h
+include/Vc/iterators
+include/Vc/limits
+include/Vc/scalar/detail.h
+include/Vc/scalar/helperimpl.h
+include/Vc/scalar/limits.h
+include/Vc/scalar/macros.h
+include/Vc/scalar/mask.h
+include/Vc/scalar/math.h
+include/Vc/scalar/operators.h
+include/Vc/scalar/simd_cast.h
+include/Vc/scalar/simd_cast_caller.tcc
+include/Vc/scalar/type_traits.h
+include/Vc/scalar/types.h
+include/Vc/scalar/vector.h
+include/Vc/scalar/vector.tcc
+include/Vc/simdize
+include/Vc/span
+include/Vc/sse/casts.h
+include/Vc/sse/const.h
+include/Vc/sse/const_data.h
+include/Vc/sse/debug.h
+include/Vc/sse/deinterleave.tcc
+include/Vc/sse/detail.h
+include/Vc/sse/helperimpl.h
+include/Vc/sse/intrinsics.h
+include/Vc/sse/limits.h
+include/Vc/sse/macros.h
+include/Vc/sse/mask.h
+include/Vc/sse/mask.tcc
+include/Vc/sse/math.h
+include/Vc/sse/prefetches.tcc
+include/Vc/sse/shuffle.h
+include/Vc/sse/simd_cast.h
+include/Vc/sse/simd_cast_caller.tcc
+include/Vc/sse/type_traits.h
+include/Vc/sse/types.h
+include/Vc/sse/vector.h
+include/Vc/sse/vector.tcc
+include/Vc/sse/vectorhelper.h
+include/Vc/sse/vectorhelper.tcc
+include/Vc/support.h
+include/Vc/traits/decay.h
+include/Vc/traits/entry_type_of.h
+include/Vc/traits/has_addition_operator.h
+include/Vc/traits/has_contiguous_storage.h
+include/Vc/traits/has_equality_operator.h
+include/Vc/traits/has_multiply_operator.h
+include/Vc/traits/has_no_allocated_data.h
+include/Vc/traits/has_subscript_operator.h
+include/Vc/traits/is_functor_argument_immutable.h
+include/Vc/traits/is_implicit_cast_allowed.h
+include/Vc/traits/is_index_sequence.h
+include/Vc/traits/is_output_iterator.h
+include/Vc/traits/type_traits.h
+include/Vc/type_traits
+include/Vc/vector
+include/Vc/vector.h
+include/Vc/version.h
+lib/cmake/Vc/AddCompilerFlag.cmake
+lib/cmake/Vc/CheckCCompilerFlag.cmake
+lib/cmake/Vc/CheckCXXCompilerFlag.cmake
+lib/cmake/Vc/FindVc.cmake
+lib/cmake/Vc/OptimizeForArchitecture.cmake
+lib/cmake/Vc/UserWarning.cmake
+lib/cmake/Vc/VcConfig.cmake
+lib/cmake/Vc/VcConfigVersion.cmake
+lib/cmake/Vc/VcMacros.cmake
+lib/cmake/Vc/VcTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Vc/VcTargets.cmake
+lib/libVc.a
--- a/emulators/qemu-sbruno/Makefile
+++ b/emulators/qemu-sbruno/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	qemu
 PORTVERSION=	2.11.50.g20190318
+PORTREVISION=	1
 CATEGORIES=	emulators
 PKGNAMESUFFIX?=	-sbruno
 DIST_SUBDIR=	qemu/${PORTVERSION}
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@ -2,8 +2,8 @@

 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.6-8056 # git rev-list --count HEAD
-DISTVERSIONSUFFIX=	-g2b4da1870
+DISTVERSION=	0.0.6-8064 # git rev-list --count HEAD
+DISTVERSIONSUFFIX=	-gf246a8666
 CATEGORIES=	emulators

 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1556793583
-SHA256 (RPCS3-rpcs3-v0.0.6-8056-g2b4da1870_GH0.tar.gz) = a9a37748306711cf0434891bf98f4b452b40dbbe08050c392f24c9657d53043a
-SIZE (RPCS3-rpcs3-v0.0.6-8056-g2b4da1870_GH0.tar.gz) = 5301299
+TIMESTAMP = 1557003415
+SHA256 (RPCS3-rpcs3-v0.0.6-8064-gf246a8666_GH0.tar.gz) = a3dd4cca9e24ffa783cea1b386d6c5b1d4735db2f07ecad01bfcf06af46d6ad9
+SIZE (RPCS3-rpcs3-v0.0.6-8064-gf246a8666_GH0.tar.gz) = 5300482
 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/stella/Makefile
+++ b/emulators/stella/Makefile
@ -11,7 +11,6 @@ COMMENT=	Multi-platform Atari 2600 VCS emulator
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/License.txt

-BROKEN_aarch64=		fails to compile: Checking for compiler version... 5.0.0, bad; Please ensure you are using GCC 4.7 / Clang 3.4 or above
 BROKEN_armv6=		fails to compile: Checking for compiler version... 5.0.0, bad; Please ensure you are using GCC 4.7 / Clang 3.4 or above
 BROKEN_armv7=		fails to compile: Checking for compiler version... 5.0.0, bad; Please ensure you are using GCC 4.7 / Clang 3.4 or above

--- a/games/lordsawar/Makefile
+++ b/games/lordsawar/Makefile
@ -21,6 +21,4 @@ GNU_CONFIGURE=	yes
 SHEBANG_FILES=	create-lw-file
 bash_CMD=	/bin/sh

-BROKEN_aarch64=	Fails to build: runaway process
-
 .include <bsd.port.mk>
--- a/graphics/drawpile/Makefile
+++ b/graphics/drawpile/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	Drawpile
-DISTVERSION=	2.1.7
+DISTVERSION=	2.1.8
 CATEGORIES=	graphics python

 MAINTAINER=	yuri@FreeBSD.org
--- a/graphics/drawpile/distinfo
+++ b/graphics/drawpile/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1555267947
-SHA256 (drawpile-Drawpile-2.1.7_GH0.tar.gz) = 46efa8ea5b1da4b6e1151a65aafc88511c41ca0d359e54bd2d8d361af2550749
-SIZE (drawpile-Drawpile-2.1.7_GH0.tar.gz) = 2451038
+TIMESTAMP = 1557011002
+SHA256 (drawpile-Drawpile-2.1.8_GH0.tar.gz) = 0ed532caf4d470ff9062e6b8c34f53f6576b4609a3bad8335d2d215f5f4f8bcf
+SIZE (drawpile-Drawpile-2.1.8_GH0.tar.gz) = 2456030
--- a/graphics/exact-image/Makefile
+++ b/graphics/exact-image/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	exact-image
-PORTVERSION=	0.9.2
+PORTVERSION=	1.0.2
 CATEGORIES=	graphics perl5 python
 MASTER_SITES=	https://dl.exactcode.de/oss/exact-image/

@ -20,6 +20,7 @@ LIB_DEPENDS=	libagg.so:graphics/agg \
 		libpng.so:graphics/png \
 		libgif.so:graphics/giflib \
 		libjasper.so:graphics/jasper \
+		libImath-2_3.so:graphics/ilmbase \
 		libIlmImf.so:graphics/openexr \
 		liblcms.so:graphics/lcms \
 		libfreetype.so:print/freetype2 \
--- a/graphics/exact-image/distinfo
+++ b/graphics/exact-image/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1480938306
-SHA256 (exact-image-0.9.2.tar.bz2) = 665b205740b17b4162fae73aa36eb7046f28bb216d612461ca0499ff47a566ba
-SIZE (exact-image-0.9.2.tar.bz2) = 312995
+TIMESTAMP = 1556965227
+SHA256 (exact-image-1.0.2.tar.bz2) = 0694c66be5dec41377acead475de69b3d7ffb42c702402f8b713f8b44cdc2791
+SIZE (exact-image-1.0.2.tar.bz2) = 322174
--- a/graphics/exact-image/files/patch-api-api.cc
+++ b/graphics/exact-image/files/patch-api-api.cc
@ -1,6 +1,6 @@
--- api/api.cc.orig	2009-06-15 14:39:45.000000000 +0400
-+++ api/api.cc	2014-01-13 07:25:57.460488862 +0400
-@@ -909,7 +909,7 @@
+--- api/api.cc.orig	2009-06-15 10:39:45 UTC
+++ api/api.cc
+@@ -909,7 +909,7 @@ char** imageDecodeBarcodes (Image* image, const char* 
   }
   
   std::vector<std::string> ret;
--- a/graphics/exact-image/files/patch-api_api-swig.hh
+++ b/graphics/exact-image/files/patch-api_api-swig.hh
@ -1,11 +0,0 @@
--- api/api-swig.hh.orig	2009-03-19 13:00:11 UTC
-+++ api/api-swig.hh
-@@ -22,7 +22,7 @@
- %include "cstring.i"
- %include "std_string.i"
- 
-# manually include it, otherwise SWIG will not source it
-+/* manually include it, otherwise SWIG will not source it */
- %include "config.h"
- 
- %{
--- a/graphics/exact-image/files/patch-build__bottom.make
+++ b/graphics/exact-image/files/patch-build__bottom.make
@ -1,6 +1,6 @@
--- build/bottom.make.orig	2010-07-22 18:35:17.000000000 +0400
-+++ build/bottom.make	2014-12-12 00:07:13.000000000 +0300
-@@ -43,23 +43,23 @@
+--- build/bottom.make.orig	2018-05-03 16:50:06 UTC
+++ build/bottom.make
+@@ -43,23 +43,23 @@ $(X_MODULE): $($(X_MODULE)_BINARY)
 
 $($(X_MODULE)_OUTPUT)/%.o: $(X_MODULE)/%.c
 	@echo '  C         $@'
--- a/graphics/exact-image/files/patch-codecs__jpeg.cc
+++ b/graphics/exact-image/files/patch-codecs__jpeg.cc
@ -1,8 +1,8 @@
--- codecs/jpeg.cc.orig	2009-06-14 08:19:28.000000000 -0400
-+++ codecs/jpeg.cc	2010-01-16 21:51:34.000000000 -0500
-@@ -683,7 +683,7 @@
-      * We need to clean up the JPEG object, close the input file, and return.
-      */
+--- codecs/jpeg.cc.orig	2017-08-08 14:31:16 UTC
+++ codecs/jpeg.cc
+@@ -901,7 +901,7 @@ bool JPEGCodec::readMeta (std::istream* stream, Image&
+     // If we get here, the JPEG code has signaled an error.
+     // We need to clean up the JPEG object, close the input file, and return.
     jpeg_destroy_decompress (cinfo);
 -    free (cinfo);
 +    delete cinfo;
--- a/graphics/exact-image/files/patch-codecs_dcraw.h
+++ b/graphics/exact-image/files/patch-codecs_dcraw.h
@ -1,8 +1,8 @@
--- codecs/dcraw.h.orig	2015-07-16 15:20:12 UTC
+--- codecs/dcraw.h.orig	2018-06-06 15:17:56 UTC
 +++ codecs/dcraw.h
-@@ -843,8 +843,9 @@ int CLASS ljpeg_start (struct jhead *jh, int info_only
+@@ -825,8 +825,9 @@ int CLASS ljpeg_start (struct jhead *jh, int info_only
   do {
-     fread (data, 2, 2, ifp);
+     if (!fread (data, 2, 2, ifp)) return 0;
     tag =  data[0] << 8 | data[1];
 -    len = (data[2] << 8 | data[3]) - 2;
 -    if (tag <= 0xff00) return 0;
@ -12,7 +12,7 @@
     fread (data, 1, len, ifp);
     switch (tag) {
       case 0xffc3:
-@@ -4393,22 +4394,22 @@ void CLASS vng_interpolate()
+@@ -4438,22 +4439,22 @@ void CLASS vng_interpolate()
     -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,
     -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06,
     -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04,
@ -40,16 +40,16 @@
     +1,+0,+2,+1,0,0x10
   }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };
   ushort (*brow[5])[4], *pix;
-@@ -7771,7 +7772,7 @@ void CLASS adobe_coeff (const char *make, const char *
- 	{ 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } },
-     { "Phase One P65", 0, 0,
+@@ -8096,7 +8097,7 @@ void CLASS adobe_coeff (const char *make, const char *
 	{ 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } },
+     { "Photron BC2-HD", 0, 0,		/* DJC */
+ 	{ 14603,-4122,-528,-1810,9794,2017,-297,2763,5936 } },
 -    { "Red One", 704, 0xffff,		/* DJC */
 +    { "Red One", 704, -1,		/* DJC */
 	{ 21014,-7891,-2613,-3056,12201,856,-2203,5125,8042 } },
-     { "Samsung EX1", 0, 0x3e00,
- 	{ 8898,-2498,-994,-3144,11328,2066,-760,1381,4576 } },
-@@ -9547,7 +9548,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full)
+     { "Ricoh GR II", 0, 0,
+ 	{ 4630,-834,-423,-4977,12805,2417,-638,1467,6115 } },
+@@ -9956,7 +9957,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full)
   strncpy (th->desc, desc, 512);
   strncpy (th->make, make, 64);
   strncpy (th->model, model, 64);
--- a/graphics/exact-image/files/patch-codecs_raw.cc
+++ b/graphics/exact-image/files/patch-codecs_raw.cc
@ -1,14 +0,0 @@
--- codecs/raw.cc.orig	2011-01-14 16:30:13 UTC
-+++ codecs/raw.cc
-@@ -71,9 +71,8 @@ bool RAWCodec::writeImage (std::ostream* stream, Image
-   if (!image.getRawData())
-     return false;
- 
-  return stream->write ((char*)image.getRawData(), image.stride()*image.h)
-    /* ==
-       (size_t) image.stride()*image.h*/;
-+  stream->write ((char*)image.getRawData(), image.stride()*image.h);
-+  return stream->good();
- }
- 
- RAWCodec raw_loader;
--- a/graphics/hdr_tools/Makefile
+++ b/graphics/hdr_tools/Makefile
@ -19,7 +19,7 @@ LIB_DEPENDS=	libpopt.so:devel/popt \
 		libIlmImf.so:graphics/openexr \
 		libMagick++-6.so:graphics/ImageMagick6

-USES=		compiler:features gmake pkgconfig tar:tgz
+USES=		compiler:c++11-lang gmake pkgconfig tar:tgz
 NO_WRKSUBDIR=	yes

 PROGRAMS=	hdr_adjust hdr_convert hdr_create hdr_denoise hdr_fix_ca \
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@ -2,10 +2,10 @@
 # $FreeBSD$

 PORTNAME=	netpbm
-DISTVERSION=	10.86.02
+DISTVERSION=	10.86.03
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/t6/netpbm/releases/download/v${DISTVERSION}/ \
-		https://gitlab.com/tobiask/netpbm/uploads/1e1e21d485ff76f00e91c598881963a6/ \
+		https://gitlab.com/tobiask/netpbm/uploads/4289d10d566221cabdbb0ba39f37e593/ \
 		LOCAL/tobik

 MAINTAINER=	tobik@FreeBSD.org
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1555020938
-SHA256 (netpbm-10.86.02.tar.gz) = 179e76c2ce1b78a5590de79c15d3b6fa474bc2b473eec8309196b32f57fa1480
-SIZE (netpbm-10.86.02.tar.gz) = 3329362
+TIMESTAMP = 1557010007
+SHA256 (netpbm-10.86.03.tar.gz) = 9467d378dab6ec2c360379305b8d5ded903507ed2e54ac569a8c4ffaa32fd7b6
+SIZE (netpbm-10.86.03.tar.gz) = 3329606
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@ -3,8 +3,7 @@

 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
-DISTVERSION=	3_4_5
-PORTREVISION=	4
+DISTVERSION=	3_4_7
 CATEGORIES=	graphics geography
 PKGNAMESUFFIX=	-ltr

@ -18,46 +17,46 @@ BUILD_DEPENDS=	gpsbabel>=1.5.4:astro/gpsbabel \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.0:graphics/py-OWSLib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.1:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pygments>=2.3.0:textproc/py-pygments@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.6:graphics/py-pyproj@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.6.8:databases/py-sqlite3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
 RUN_DEPENDS=	astyle:devel/astyle \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=2.2.4:graphics/py-gdal@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.0:graphics/py-OWSLib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.1:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.6.1:databases/py-psycopg2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pygments>=2.3.0:textproc/py-pygments@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.6:graphics/py-pyproj@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.6.8:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libgdal.so:graphics/gdal \
@ -73,19 +72,22 @@ LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libqwt6.so:x11-toolkits/qwt6 \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
+		libsz.so:science/szip \
 		libxerces-c.so:textproc/xerces-c3 \
 		libzip.so:archivers/libzip

 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features cpe desktop-file-utils \
-		fortran gmake pgsql pyqt:5 python:3.6+ qt:5 shebangfix \
-		sqlite:3
+		fortran gmake gnome pgsql pyqt:5 python:3.6+ qt:5 \
+		shebangfix sqlite:3
+USE_GNOME=	libxml2
 USE_QT=		3d buildtools_build core concurrent dbus declarative \
-		designer doc gui linguist_build location network \
-		printsupport qmake_build script serialport \
+		designer doc gamepad gui linguist_build location \
+		network printsupport qmake_build script serialport \
 		sql sql-pgsql sql-sqlite3 svg testlib uitools \
 		webengine widgets webkit xml
-USE_PYQT=	core gui network qml qscintilla2 sip sql svg xml webkit_run
+USE_PYQT=	core gui network qml qscintilla2 sip sql svg xml \
+		webkit_run webkitwidgets_run
 USE_LDCONFIG=	yes

 CONFLICTS_INSTALL=	qgis
@ -111,7 +113,7 @@ CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py

 OPTIONS_DEFINE=		GRASS SERVER
-OPTIONS_DEFAULT=	GRASS
+OPTIONS_DEFAULT=	GRASS SERVER
 NO_OPTIONS_SORT=	yes

 OPTIONS_SUB=		yes
--- a/graphics/qgis-ltr/distinfo
+++ b/graphics/qgis-ltr/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1552305246
-SHA256 (qgis-QGIS-final-3_4_5_GH0.tar.gz) = 3183ebd2465ec44555e20dbb790ccff639a9da6eb4bce1e123ae030b1b42c57c
-SIZE (qgis-QGIS-final-3_4_5_GH0.tar.gz) = 89924291
+TIMESTAMP = 1556614839
+SHA256 (qgis-QGIS-final-3_4_7_GH0.tar.gz) = d070da42e842e59ce9a338b40784b9bc4582f3d48a19255fa8aef967cca653ba
+SIZE (qgis-QGIS-final-3_4_7_GH0.tar.gz) = 91022939
--- a/Show More
+++ b/Show More