*/*: sync with upstream

Taken from: HardenedBSD
2018-05-08 16:43:10 +02:00 · 2018-05-08 16:43:10 +02:00 · 75158b8ed1
parent 2711f0b0df
commit 75158b8ed1
206 changed files with 2395 additions and 4458 deletions
--- a/astro/libkgeomap/Makefile
+++ b/astro/libkgeomap/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	libkgeomap
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	astro kde kde-applications

 MAINTAINER=	kde@FreeBSD.org
@ -11,7 +12,7 @@ LICENSE=	GPLv2+ LGPL20+
 LICENSE_COMB=	multi

 BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/buffer_concepts.hpp:devel/boost-libs
-LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv
+LIB_DEPENDS=	libopencv_video.so:graphics/opencv

 USES=		cmake:outsource gettext kde:5 pkgconfig tar:xz
 USE_KDE=	config coreaddons ecm i18n kio marble service textwidgets
--- a/audio/cava/Makefile
+++ b/audio/cava/Makefile
@ -1,11 +1,11 @@
 # $FreeBSD$

 PORTNAME=	cava
-DISTVERSION=	0.6.0
+DISTVERSION=	0.6.1
 CATEGORIES=	audio

 MAINTAINER=	tobik@FreeBSD.org
-COMMENT=	Console-based Audio Visualizer for ALSA, MPD, PulseAudio, and sndio
+COMMENT=	Console-based Audio Visualizer for MPD, PulseAudio, and sndio

 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
@ -22,8 +22,12 @@ CONFIGURE_ENV=	ac_cv_lib_asound_snd_pcm_open=no

 INSTALL_TARGET=	install-strip

-OPTIONS_DEFINE=	PULSEAUDIO SNDIO
-OPTIONS_DEFAULT=PULSEAUDIO
+PLIST_FILES=	bin/cava
+PORTDOCS=	README.md
+PORTEXAMPLES=	config
+
+OPTIONS_DEFINE=	DOCS EXAMPLES PULSEAUDIO SNDIO
+OPTIONS_DEFAULT=PULSEAUDIO SNDIO

 PULSEAUDIO_CONFIGURE_ENV_OFF=	ac_cv_lib_pulse_simple_pa_simple_new=no
 PULSEAUDIO_LIB_DEPENDS=		libpulse-simple.so:audio/pulseaudio \
@ -34,12 +38,15 @@ SNDIO_LIB_DEPENDS=		libsndio.so:audio/sndio

 post-patch:
 	@${REINPLACE_CMD} '/^cava_font/d' ${WRKSRC}/Makefile.am
-	@${REINPLACE_CMD} '/<alloca.h>/d' ${WRKSRC}/cava.c

 pre-configure:
 	@${ECHO_CMD} ${DISTVERSION} > ${WRKSRC}/version

-post-install:
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/example_files/config ${STAGEDIR}${EXAMPLESDIR}

--- a/audio/cava/distinfo
+++ b/audio/cava/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1509139935
-SHA256 (karlstav-cava-0.6.0_GH0.tar.gz) = 42d51c6c283cd2b0f5125954ea8c61a12385703d1953ef9c40103402c7a744dc
-SIZE (karlstav-cava-0.6.0_GH0.tar.gz) = 40990
+TIMESTAMP = 1525757005
+SHA256 (karlstav-cava-0.6.1_GH0.tar.gz) = 98b880e7e704ed457863f379f31b488e06076bb34a5de02825096969b916a78d
+SIZE (karlstav-cava-0.6.1_GH0.tar.gz) = 42285
--- a/audio/cava/files/patch-sndio
+++ b/audio/cava/files/patch-sndio
@ -1,176 +0,0 @@
-https://github.com/karlstav/cava/commit/76fa7c132da25f5499a0f1b5dc4b416a34dad737
-
-diff --git a/cava.c b/cava.c
-index 76197cd..64dff25 100644
--- cava.c
-+++ cava.c
-@@ -53,6 +53,10 @@
- #include "input/pulse.c"
- #endif
- 
-+#ifdef SNDIO
-+#include "input/sndio.c"
-+#endif
-+
- #include <iniparser.h>
- 
- #include "config.h"
-@@ -287,6 +291,9 @@ as of 0.4.0 all options are specified in config file, see in '/home/username/.co
-     #ifdef PULSE
-         strcat(supportedInput,", 'pulse'");
-     #endif
-+    #ifdef SNDIO
-+        strcat(supportedInput,", 'sndio'");
-+    #endif
- 
- 	//fft: planning to rock
- 	fftw_complex outl[M / 2 + 1][2];
-@@ -388,6 +395,13 @@ as of 0.4.0 all options are specified in config file, see in '/home/username/.co
- 	}
- 	#endif
- 
-+	#ifdef SNDIO
-+	if (p.im == 4) {
-+		thr_id = pthread_create(&p_thread, NULL, input_sndio, (void*)&audio);
-+		audio.rate = 44100;
-+	}
-+	#endif
-+
- 	if (p.highcf > audio.rate / 2) {
- 		cleanup();
- 		fprintf(stderr,
-diff --git a/config.c b/config.c
-index 1da11cd..9f8465e 100644
--- config.c
-+++ config.c
-@@ -87,6 +87,13 @@ if (strcmp(inputMethod, "pulse") == 0) {
-         #endif
- 
- }
-+if (strcmp(inputMethod, "sndio") == 0) {
-+	p->im = 4;
-+	#ifndef SNDIO
-+		fprintf(stderr, "cava was built without sndio support\n");
-+		exit(EXIT_FAILURE);
-+	#endif
-+}
- if (p->im == 0) {
- 	fprintf(stderr,
- 		"input method '%s' is not supported, supported methods are: %s\n",
-@@ -325,6 +332,10 @@ inputMethod = (char *)iniparser_getstring(ini, "input:method", "fifo");
- 	inputMethod = (char *)iniparser_getstring(ini, "input:method", "pulse");
- #endif
- 
-+//setting sndio to defaualt if supported
-+#ifdef SNDIO
-+	inputMethod = (char *)iniparser_getstring(ini, "input:method", "sndio");
-+#endif
- 
- #ifdef NCURSES
- 	outputMethod = (char *)iniparser_getstring(ini, "output:method", "ncurses");
-@@ -402,6 +413,12 @@ if (strcmp(inputMethod, "pulse") == 0) {
- 	p->im = 3;
- 	p->audio_source = (char *)iniparser_getstring(ini, "input:source", "auto");
- }
-+#ifdef SNDIO
-+if (strcmp(inputMethod, "sndio") == 0) {
-+	p->im = 4;
-+	p->audio_source = (char *)iniparser_getstring(ini, "input:source", SIO_DEVANY);
-+}
-+#endif
- 
- validate_config(supportedInput, params);
- //iniparser_freedict(ini);
-diff --git a/configure.ac b/configure.ac
-index 6e3c291..92fa281 100644
--- configure.ac
-+++ configure.ac
-@@ -64,6 +64,19 @@ AC_CHECK_LIB(pulse-simple, pa_simple_new, have_pulse=yes, have_pulse=no)
-       AC_MSG_NOTICE([WARNING: No pusleaudio dev files found building without pulseaudio support])
-     fi
- 
-+dnl ######################
-+dnl checking for sndio dev
-+dnl ######################
-+AC_CHECK_LIB(sndio, sio_open, have_sndio=yes, have_sndio=no)
-+    if [[ $have_sndio = "yes" ]] ; then
-+      LIBS="$LIBS -lsndio"
-+      CPPFLAGS="$CPPFLAGS -DSNDIO"
-+    fi
-+
-+    if [[ $have_sndio = "no" ]] ; then
-+      AC_MSG_NOTICE([WARNING: No sndio dev files found building without sndio support])
-+    fi
-+
- dnl ######################
- dnl checking for math lib
- dnl ######################
-diff --git a/input/sndio.c b/input/sndio.c
-new file mode 100644
-index 0000000..6142225
--- /dev/null
-+++ input/sndio.c
-@@ -0,0 +1,63 @@
-+#include <assert.h>
-+#include <errno.h>
-+#include <sndio.h>
-+#include <string.h>
-+
-+void* input_sndio(void* data)
-+{
-+	struct audio_data *audio = (struct audio_data *)data;
-+	struct sio_par par;
-+	struct sio_hdl *hdl;
-+	int16_t buf[256];
-+	unsigned int i, n, channels;
-+
-+	assert(audio->channels > 0);
-+	channels = audio->channels;
-+
-+	sio_initpar(&par);
-+	par.sig = 1;
-+	par.bits = 16;
-+	par.le = 1;
-+	par.rate = 44100;
-+	par.rchan = channels;
-+	par.appbufsz = sizeof(buf) / channels;
-+
-+	if ((hdl = sio_open(audio->source, SIO_REC, 0)) == NULL) {
-+		fprintf(stderr, __FILE__": Could not open sndio source: %s\n", audio->source);
-+		exit(EXIT_FAILURE);
-+	}
-+
-+	if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par) || par.sig != 1 || par.le != 1 || par.rate != 44100 || par.rchan != channels) {
-+		fprintf(stderr, __FILE__": Could not set required audio parameters\n");
-+		exit(EXIT_FAILURE);
-+	}
-+
-+	if (!sio_start(hdl)) {
-+		fprintf(stderr, __FILE__": sio_start() failed\n");
-+		exit(EXIT_FAILURE);
-+	}
-+
-+	n = 0;
-+	while (audio->terminate != 1) {
-+		if (sio_read(hdl, buf, sizeof(buf)) == 0) {
-+			fprintf(stderr, __FILE__": sio_read() failed: %s\n", strerror(errno));
-+			exit(EXIT_FAILURE);
-+		}
-+
-+		for (i = 0; i < sizeof(buf)/sizeof(buf[0]); i += 2) {
-+			if (par.rchan == 1) {
-+				// sndiod has already taken care of averaging the samples
-+				audio->audio_out_l[n] = buf[i];
-+			} else if (par.rchan == 2) {
-+				audio->audio_out_l[n] = buf[i];
-+				audio->audio_out_r[n] = buf[i + 1];
-+			}
-+			n = (n + 1) % 2048;
-+		}
-+	}
-+
-+	sio_stop(hdl);
-+	sio_close(hdl);
-+
-+	return 0;
-+}
--- a/audio/cava/pkg-descr
+++ b/audio/cava/pkg-descr
@ -1,5 +1,5 @@
 C.A.V.A. is a bar spectrum audio visualizer for the terminal using
-ALSA, PulseAudio, sndio or fifo buffer for input.
+PulseAudio, sndio or fifo buffer for input.

 This program is not intended for scientific use.  It's written to look
 responsive and aesthetic when used to visualize music.
--- a/audio/cava/pkg-plist
+++ b/audio/cava/pkg-plist
@ -1,2 +0,0 @@
-bin/cava
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config
--- a/audio/py-sounddevice/Makefile
+++ b/audio/py-sounddevice/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	sounddevice
-PORTVERSION=	0.3.10
-PORTREVISION=	1
+DISTVERSION=	0.3.11
 CATEGORIES=	audio python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/audio/py-sounddevice/distinfo
+++ b/audio/py-sounddevice/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1516010801
-SHA256 (sounddevice-0.3.10.tar.gz) = 6a972db105b11a570b454c0b92b5d37ead46829ce71a278b148ec6479209ad9f
-SIZE (sounddevice-0.3.10.tar.gz) = 46411
+TIMESTAMP = 1525795954
+SHA256 (sounddevice-0.3.11.tar.gz) = e1f9e4eb72cf85ee7c4aff62558c7d179e8aceca258ad5217bcf9e43d75bcc5d
+SIZE (sounddevice-0.3.11.tar.gz) = 46563
--- a/audio/wavpack/Makefile
+++ b/audio/wavpack/Makefile
@ -30,10 +30,10 @@ ASM_DESC=	Optimized assembler routines (requires MMX on x86)
 .include <bsd.port.options.mk>

 # ASM needs clang 3.8+
-# depend on llvm39 since it's more likely to be installed already than 3.8
+# depend on llvm60 since it's more likely to be installed already than 3.8
 .if ${OSVERSION} < 1100101 && ${PORT_OPTIONS:MASM}
-BUILD_DEPENDS+=	clang39:devel/llvm39
-CC=		clang39
+BUILD_DEPENDS+=	clang60:devel/llvm60
+CC=		clang60
 .endif

 .include <bsd.port.mk>
--- a/comms/lrzsz/pkg-descr
+++ b/comms/lrzsz/pkg-descr
@ -5,4 +5,4 @@ running under PC-DOS, CP/M, Unix, and other operating systems.
 lrzsz is derived from the last unrestricted version of Chuck Forsberg's
 rzsz package.  lrzsz is covered under the GNU copyleft.

-WWW: http://www.ohse.de/uwe/software/lrzsz.html
+WWW: https://ohse.de/uwe/software/lrzsz.html
--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	osm2pgsql
-PORTVERSION=	0.94.0
-PORTREVISION=	2
+PORTVERSION=	0.96.0
 CATEGORIES=	converters geography

 MAINTAINER=	amdmi3@FreeBSD.org
--- a/converters/osm2pgsql/distinfo
+++ b/converters/osm2pgsql/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1507552761
-SHA256 (openstreetmap-osm2pgsql-0.94.0_GH0.tar.gz) = 9e67e400deca48185313921431884171fb087dfe9e0d21e31857b8b06f20d317
-SIZE (openstreetmap-osm2pgsql-0.94.0_GH0.tar.gz) = 1203310
+TIMESTAMP = 1525370298
+SHA256 (openstreetmap-osm2pgsql-0.96.0_GH0.tar.gz) = b6020e77d88772989279a69ae4678e9782989b630613754e483b5192cd39c723
+SIZE (openstreetmap-osm2pgsql-0.96.0_GH0.tar.gz) = 1219163
--- a/converters/osm2pgsql/pkg-descr
+++ b/converters/osm2pgsql/pkg-descr
@ -5,4 +5,4 @@ The format of the database is optimised for ease of rendering
 by mapnik. It may be less suitable for other general purpose
 processing.

-WWW: http://wiki.openstreetmap.org/wiki/Osm2pgsql
+WWW: https://wiki.openstreetmap.org/wiki/Osm2pgsql
--- a/databases/mysql55-client/files/patch-client_mysql.cc
+++ b/databases/mysql55-client/files/patch-client_mysql.cc
@ -0,0 +1,11 @@
+--- client/mysql.cc.orig	2018-05-08 12:44:38.160868000 +0200
+++ client/mysql.cc	2018-05-08 12:45:01.377062000 +0200
+@@ -2671,7 +2671,7 @@
+         mysql_free_result(fields);
+         break;
+       }
+-      field_names[i][num_fields*2]= '\0';
+      field_names[i][num_fields*2]= NULL;
+       j=0;
+       while ((sql_field=mysql_fetch_field(fields)))
+       {
--- a/databases/pg_partman/Makefile
+++ b/databases/pg_partman/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	pg_partman
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.1.2
+DISTVERSION=	3.1.3
 CATEGORIES=	databases

 MAINTAINER=	lacey.leanne@gmail.com
--- a/databases/pg_partman/distinfo
+++ b/databases/pg_partman/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1519208856
-SHA256 (keithf4-pg_partman-v3.1.2_GH0.tar.gz) = f13ecac21a6b4acb320765a95dc3b282711790ea48c91f46159196a87c0625f9
-SIZE (keithf4-pg_partman-v3.1.2_GH0.tar.gz) = 857476
+TIMESTAMP = 1524082569
+SHA256 (keithf4-pg_partman-v3.1.3_GH0.tar.gz) = 64e236c9a4d45369a61b33ed4c976be0bb85c4ddd3d97a8778768ad7dad7c2ae
+SIZE (keithf4-pg_partman-v3.1.3_GH0.tar.gz) = 863628
--- a/databases/pg_partman/pkg-plist
+++ b/databases/pg_partman/pkg-plist
@ -7,7 +7,7 @@ bin/reapply_indexes.py
 bin/undo_partition.py
 bin/vacuum_maintenance.py
 lib/postgresql/pg_partman_bgw.so
-%%PORTDOCS%%%%DOCSDIR%%/migration.md
+%%PORTDOCS%%%%DOCSDIR%%/migration_to_partman.md
 %%PORTDOCS%%%%DOCSDIR%%/pg_partman.md
 %%PORTDOCS%%%%DOCSDIR%%/pg_partman_howto.md
 share/postgresql/extension/pg_partman--0.1.0--0.1.1.sql
@ -72,5 +72,6 @@ share/postgresql/extension/pg_partman--3.0.1--3.0.2.sql
 share/postgresql/extension/pg_partman--3.0.2--3.1.0.sql
 share/postgresql/extension/pg_partman--3.1.0--3.1.1.sql
 share/postgresql/extension/pg_partman--3.1.1--3.1.2.sql
-share/postgresql/extension/pg_partman--3.1.2.sql
+share/postgresql/extension/pg_partman--3.1.2--3.1.3.sql
+share/postgresql/extension/pg_partman--3.1.3.sql
 share/postgresql/extension/pg_partman.control
--- a/databases/postgresql93-contrib/pkg-descr
+++ b/databases/postgresql93-contrib/pkg-descr
@ -20,4 +20,4 @@ For more information, please see

 This software is part of the standard PostgreSQL distribution.

-WWW: http://www.postgresql.org/
+WWW: https://www.postgresql.org/
--- a/databases/postgresql93-server/pkg-descr
+++ b/databases/postgresql93-server/pkg-descr
@ -20,4 +20,4 @@ support mailing list (questions@PostgreSQL.ORG).

 PostgreSQL is free and the complete source is available.

-WWW: http://www.postgresql.org/
+WWW: https://www.postgresql.org/
--- a/databases/postgresql94-server/pkg-descr
+++ b/databases/postgresql94-server/pkg-descr
@ -20,4 +20,4 @@ support mailing list (questions@PostgreSQL.ORG).

 PostgreSQL is free and the complete source is available.

-WWW: http://www.postgresql.org/
+WWW: https://www.postgresql.org/
--- a/databases/postgresql95-contrib/pkg-descr
+++ b/databases/postgresql95-contrib/pkg-descr
@ -20,4 +20,4 @@ For more information, please see

 This software is part of the standard PostgreSQL distribution.

-WWW: http://www.postgresql.org/
+WWW: https://www.postgresql.org/
--- a/databases/postgresql95-plpython/pkg-descr
+++ b/databases/postgresql95-plpython/pkg-descr
@ -3,4 +3,4 @@ procedures in Python (http://www.python.org/).

 This software is part of the standard PostgreSQL distribution.

-WWW: http://www.postgresql.org/
+WWW: https://www.postgresql.org/
--- a/databases/py-python-arango/Makefile
+++ b/databases/py-python-arango/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	python-arango
-DISTVERSION=	3.12.1
+DISTVERSION=	4.0.0
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -10,7 +10,10 @@ MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python driver for ArangoDB

 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE

+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}

--- a/databases/py-python-arango/distinfo
+++ b/databases/py-python-arango/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1514862633
-SHA256 (python-arango-3.12.1.tar.gz) = 9a092133a0951e23b1164c4055349500e99a7c5713926e277b376bef8c3fa2d8
-SIZE (python-arango-3.12.1.tar.gz) = 76402
+TIMESTAMP = 1525793101
+SHA256 (python-arango-4.0.0.tar.gz) = f5f8f85bd1901eff7630e908be2088b8b446b019d19e97d2dc6cba9e9f423e07
+SIZE (python-arango-4.0.0.tar.gz) = 77574
--- a/devel/Makefile
+++ b/devel/Makefile
@ -1657,7 +1657,6 @@
    SUBDIR += llvm34
    SUBDIR += llvm35
    SUBDIR += llvm38
-    SUBDIR += llvm39
    SUBDIR += llvm40
    SUBDIR += llvm50
    SUBDIR += llvm60
@ -4358,6 +4357,7 @@
    SUBDIR += py-canonicaljson
    SUBDIR += py-capstone
    SUBDIR += py-castellan
+    SUBDIR += py-cbor
    SUBDIR += py-cclib
    SUBDIR += py-cdg
    SUBDIR += py-celery
@ -4787,6 +4787,7 @@
    SUBDIR += py-ptvsd
    SUBDIR += py-pudb
    SUBDIR += py-py
+    SUBDIR += py-py-ubjson
    SUBDIR += py-pyasn1
    SUBDIR += py-pyasn1-modules
    SUBDIR += py-pybind11
@ -5052,6 +5053,7 @@
    SUBDIR += py-typed-ast
    SUBDIR += py-typing
    SUBDIR += py-tzlocal
+    SUBDIR += py-u-msgpack-python
    SUBDIR += py-ua_parser
    SUBDIR += py-ujson
    SUBDIR += py-uncompyle2
--- a/devel/ccache/Makefile
+++ b/devel/ccache/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	ccache
 PORTVERSION=	3.3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://www.samba.org/ftp/ccache/ \
 		LOCAL/bdrewery
--- a/devel/ccache/files/ccache-howto-freebsd.txt.in
+++ b/devel/ccache/files/ccache-howto-freebsd.txt.in
@ -6,7 +6,12 @@ To use ccache for ports, just add WITH_CCACHE_BUILD=yes to
 /etc/make.conf. The rest of this guide is for building
 /usr/src and other checkouts.

-To use ccache for base add the following to /etc/make.conf.
+To use ccache for base (11.0+) just add WITH_CCACHE_BUILD=yes
+to /etc/src.conf.  Refer to src.conf(5) for more information.
+
+-------------------------------------------------------------------------------
+
+For older releases, before 11.0, add the following to /etc/make.conf.
 You can replace cc and c++ with the compilers of your choice.
 (remember that only GCC and Clang can build world and kernel)

@ -28,7 +33,7 @@ For csh/tcsh Add the following to /etc/csh.cshrc:
 For icc users:
 Add %%ICCPREFIX%% to CCACHE_PATH

--
+-------------------------------------------------------------------------------

 To use distcc:

@ -53,15 +58,6 @@ reset PATH=$CCACHE_PATH and try again.
 Make sure you run 'ccache-update-links' after you install/uninstall
 additional compilers in order to create/remove compiler links.

-Clang will return a lot of 'unused argument' warnings: they are harmless.
-Just add this to /etc/make.conf if you want to hide them:
-.if ${CC:T} == "clang"
-CFLAGS+=	-Qunused-arguments
-.endif
-
-Any time you change CC/CXX you need to reinstall devel/libtool or you
-will run in to problems.
-
 --

 Ccache's default cache size is 1GB and this is larger than the default size of
--- a/devel/cmake-doc/Makefile
+++ b/devel/cmake-doc/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	cmake
-DISTVERSION=	3.11.0
+DISTVERSION=	3.11.1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-doc
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	cmake
-DISTVERSION=	3.11.0
+DISTVERSION=	3.11.1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-gui
--- a/devel/fossology-nomos-standalone/Makefile
+++ b/devel/fossology-nomos-standalone/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	fossology
-PORTVERSION=	3.2.0
+PORTVERSION=	3.3.0
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-nomos-standalone

@ -17,6 +17,7 @@ LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPL
 BUILD_DEPENDS=	gawk:lang/gawk

 USE_GITHUB=	yes
+GH_TAGNAME=	660fc06

 USES=		gmake gettext pkgconfig
 USE_GNOME=	glib20
--- a/devel/fossology-nomos-standalone/distinfo
+++ b/devel/fossology-nomos-standalone/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1519217156
-SHA256 (fossology-fossology-3.2.0_GH0.tar.gz) = f22682511c3e5f5aae1944f64190def47f515ff0083c15d3ba731bf5a4f8dbc0
-SIZE (fossology-fossology-3.2.0_GH0.tar.gz) = 13339096
+TIMESTAMP = 1525789205
+SHA256 (fossology-fossology-3.3.0-660fc06_GH0.tar.gz) = f056c2fead153042e4bae54c0678da21ba50458156e3f0f15d82af09e281d55c
+SIZE (fossology-fossology-3.3.0-660fc06_GH0.tar.gz) = 14160449
--- a/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_STRINGS.in
+++ b/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_STRINGS.in
@ -0,0 +1,105 @@
+commit 9a138091eb231c1cf552e41f8d35d4f4e12eb985
+Author: Dmitry Marakasov <amdmi3@amdmi3.ru>
+Date:   Sat Apr 28 20:27:43 2018 +0300
+
+    fix(nomos): fix posix incomparible regular expressions
+
+diff --git src/nomos/agent/STRINGS.in src/nomos/agent/STRINGS.in
+index 706dcabca..c64f75b64 100644
+--- src/nomos/agent/STRINGS.in
+++ src/nomos/agent/STRINGS.in
+@@ -1299,7 +1299,7 @@
+ #####
+ %ENTRY%	_LT_COMMERCIAL_5
+ %KEY%	"license"
+-%STR%	"((may|can)|( be|)) used? (this file |)in accordance with the commercial license agreement"
+%STR%	"((may|can)|( be)?) used? (this file )?in accordance with the commercial license agreement"
+ #####
+ %ENTRY%	_LT_COMMERCIAL_6
+ %KEY%	"license"
+@@ -1652,7 +1652,7 @@
+ #
+ %ENTRY%	_LT_DUAL_LICENSE_28
+ %KEY%	"licen[cs]"
+-%STR%	"either under the terms of =SOME= license (version|) =SOME= or at your option under =SOME= license"
+%STR%	"either under the terms of =SOME= license (version)? =SOME= or at your option under =SOME= license"
+ #
+ %ENTRY%	_LT_DUAL_LICENSE_29
+ %KEY%	"licen[cs]"
+@@ -2321,7 +2321,7 @@
+ #
+ %ENTRY% _LT_FREE_94
+ %KEY% "permi[st]"
+-%STR% "permission is granted to r?e?-?distribute =FEW= in any (manner|way) provid(ed|ing) (that |)this (copyright |)notice (remains intact|(is (not modified|acknowledged|not removed)))"
+%STR% "permission is granted to r?e?-?distribute =FEW= in any (manner|way) provid(ed|ing) (that )?this (copyright )?notice (remains intact|(is (not modified|acknowledged|not removed)))"
+ #
+ %ENTRY% _LT_FREE_95
+ %KEY% "distribut"
+@@ -3891,7 +3891,7 @@
+ #
+ %ENTRY%	_LT_MIT_4
+ %KEY%	"permi[st]"
+-%STR%	"permission to use copy modify and/?o?r? distribute this (software|program) for any purpose (with or|and) without fee is hereby granted provided that (the above|this) copyright (notice|) and (this|) permission notice appear (in|on) all copies"
+%STR%	"permission to use copy modify and/?o?r? distribute this (software|program) for any purpose (with or|and) without fee is hereby granted provided that (the above|this) copyright (notice)? and (this)? permission notice appear (in|on) all copies"
+ #
+ %ENTRY%	_LT_MIT_5
+ %KEY%	"permi[st]"
+@@ -6229,7 +6229,7 @@ k
+ #
+ %ENTRY%	_LT_SEE_OTHER_11
+ %KEY%	"(Â©|\(c\)|copyright|\<c\>[^+:]|&copy)"
+-%STR%	"see =FEW= for (the |)copyright (information|notice)"
+%STR%	"see =FEW= for (the )?copyright (information|notice)"
+ #
+ %ENTRY%	_LT_SEE_OTHER_12
+ %KEY%	"copyright"
+@@ -6249,7 +6249,7 @@ k
+ #
+ %ENTRY% _LT_SEE_OTHER_16
+ %KEY% "copyright"
+-%STR% "for conditions? =FEW= and use see (the |)copyright notice"
+%STR% "for conditions? =FEW= and use see (the )?copyright notice"
+ #
+ %ENTRY% _LT_SEE_OTHER_17
+ %KEY% "copyright"
+@@ -8264,22 +8264,22 @@ k
+ %ENTRY%	_TITLE_MPL10
+ %KEY%	"\<([mn]pl|mozilla|netscape)\>"
+ #%STR%	"mozilla public licen[cs]e (1\.?0|(\<mpl\> |v|version )1\.?0)"
+-%STR%	"mozilla public licen[cs]e (1\.?0|(mpl |)((v\.? ?|version )1\.?0))"
+%STR%	"mozilla public licen[cs]e (1\.?0|(mpl )?((v\.? ?|version )1\.?0))"
+ #
+ %ENTRY%	_TITLE_MPL11
+ %KEY%	"\<([mn]pl|mozilla|netscape)\>"
+ #%STR%	"mozilla public licen[cs]e (1\.?1|(\<mpl\> |v|version )1\.?1)"
+-%STR%	"mozilla public licen[cs]e (1\.?1|(mpl |)((v\.? ?|version )1\.?1))"
+%STR%	"mozilla public licen[cs]e (1\.?1|(mpl )?((v\.? ?|version )1\.?1))"
+ #
+ %ENTRY%	_TITLE_MPL11_OR_LATER
+ %KEY%	"licen[cs]"
+ #%STR%	"mozilla public licen[cs]e (1\.?1|(\<mpl\> |v|version )1\.?1) =SOME= or =SOME= (newer|later|subsequent|more recent)"
+-%STR%	"mozilla public licen[cs]e (1\.?1|(mpl |)((v\.? ?|version )1\.?1)) =SOME= or =SOME= (newer|later|subsequent|more recent)"
+%STR%	"mozilla public licen[cs]e (1\.?1|(mpl )?((v\.? ?|version )1\.?1)) =SOME= or =SOME= (newer|later|subsequent|more recent)"
+ #
+ %ENTRY%	_TITLE_MPL20
+ %KEY%	"\<([mn]pl|mozilla|netscape)\>"
+ #%STR%	"mozilla public licen[cs]e (2\.?0|(\<mpl\> |v\.? ?|version )2\.?0)"
+-%STR%	"mozilla public licen[cs]e (2\.?0|(mpl |)((v\.? ?|version )2\.?0))"
+%STR%	"mozilla public licen[cs]e (2\.?0|(mpl )?((v\.? ?|version )2\.?0))"
+ #
+ %ENTRY%	_TITLE_MPL20_EXCEPTION
+ %KEY%	"licen[cs]"
+@@ -9083,11 +9083,11 @@ k
+ #
+ %ENTRY%	_PHR_COPYLEFT_NEXT_030
+ %KEY%	"licen[cs]"
+-%STR%	"(r?e?distributed|available|licensed) under copyleft-next( |-)0\.?3\.?0 (licen[cs]e|)"
+%STR%	"(r?e?distributed|available|licensed) under copyleft-next( |-)0\.?3\.?0 (licen[cs]e)?"
+ #
+ %ENTRY%	_PHR_COPYLEFT_NEXT_031
+ %KEY%	"licen[cs]"
+-%STR%	"(r?e?distributed|available|licensed) under copyleft-next( |-)0\.?3\.?1 (licen[cs]e|)"
+%STR%	"(r?e?distributed|available|licensed) under copyleft-next( |-)0\.?3\.?1 (licen[cs]e)?"
+ #
+ %ENTRY%	_PHR_EULA
+ %KEY%	"\<(end[ -]user|eula)\>"
--- a/devel/ksql/Makefile
+++ b/devel/ksql/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	ksql
-PORTVERSION=	0.2.5
+PORTVERSION=	0.3.1
 CATEGORIES=	devel databases
 MASTER_SITES=	http://kristaps.bsd.lv/ksql/snapshots/

--- a/devel/ksql/distinfo
+++ b/devel/ksql/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1520673947
-SHA256 (ksql-0.2.5.tar.gz) = 0a5536c53c556cf21b5d3db438c6e67972127a83490cb73c6e83cc72e51b6f0e
-SIZE (ksql-0.2.5.tar.gz) = 38367
+TIMESTAMP = 1525759327
+SHA256 (ksql-0.3.1.tar.gz) = 06c5734d2604b6ff604cf9fa1ee90957ad036e58f26752d5d0688e7f40e5b074
+SIZE (ksql-0.3.1.tar.gz) = 41310
--- a/devel/llvm39/Makefile
+++ b/devel/llvm39/Makefile
@ -1,502 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	llvm
-DISTVERSION=	3.9.1
-PORTREVISION=	8
-CATEGORIES=	devel lang
-MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
-PKGNAMESUFFIX=	${LLVM_SUFFIX}
-DISTNAME=	${PORTNAME}-${DISTVERSION}.src
-DISTFILES=	${PORTNAME}-${DISTVERSION}.src${EXTRACT_SUFX}
-
-MAINTAINER=	brooks@FreeBSD.org
-COMMENT=	LLVM and Clang
-
-LICENSE=	LLVM
-LICENSE_NAME=	LLVM Release License
-LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
-LLVM_MAJOR=	${LLVM_RELEASE:C/\.[0-9]$//}
-RCDIR=		${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|}
-PRE_=		${DISTVERSION:C/.*rc.*/pre-/:N*[0-9]*}
-LLVM_SUFFIX=	${DISTVERSION:R:S/.//}
-
-LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
-DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
-
-USES=		cmake:outsource compiler:c++11-lib libedit perl5 tar:xz \
-		shebangfix
-_USES_PYTHON?=	python:2.7,build
-USES+=		${_USES_PYTHON}
-USE_LDCONFIG=	${LLVM_PREFIX}/lib
-SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \
-		tools/clang/tools/scan-view/bin/scan-view \
-		tools/clang/tools/clang-format/git-clang-format \
-		tools/clang/tools/clang-format/clang-format-diff.py
-
-SUB_FILES=	llvm-wrapper.sh
-SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
-
-CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}
-CMAKE_ARGS=	-DLLVM_BUILD_LLVM_DYLIB=ON
-# Following commit https://github.com/kitware/cmake/commit/956054
-# we need to either change the whole man-shuffle below, or simply
-# redefine CMAKE_INSTALL_MANDIR
-CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
-
-OPTIONS_DEFINE=	CLANG DOCS EXTRAS LIT LLD LLDB
-OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
-OPTIONS_DEFINE_i386=	COMPILER_RT
-OPTIONS_DEFAULT=	CLANG EXTRAS LIT LLD LLDB
-OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
-OPTIONS_DEFAULT_i386=	COMPILER_RT
-OPTIONS_SUB=	yes
-
-CLANG_DESC=	Build clang
-CLANG_EXTRA_PATCHES= \
-	${PATCHDIR}/clang-patch-fformat_extensions.diff \
-	${PATCHDIR}/clang-patch-fopenmp.diff \
-	${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt \
-	${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format.py \
-	${PATCHDIR}/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer \
-	${PATCHDIR}/clang-patch-tools_clang_include_clang_Basic_DiagnosticSemaKinds.td \
-	${PATCHDIR}/clang-patch-tools_clang_lib_Sema_SemaOverload.cpp \
-	${PATCHDIR}/config-patch-tools_clang_include_clang_Sema_Overload.h
-CLANG_CONFLICTS_INSTALL=	clang-devel-3.[1234567]*
-CLANG_DISTFILES=	cfe-${DISTVERSION}.src${EXTRACT_SUFX}
-CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-CLANG_PORTDOCS=		clang
-CLANG_USE=		GNOME=libxml2
-COMPILER_RT_DESC=	Sanitizer libraries
-COMPILER_RT_DISTFILES=	compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX}
-COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|}
-DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
-DOCS_PORTDOCS=		llvm
-DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
-			-DLLVM_BUILD_DOCS=ON
-DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
-EXTRAS_DESC=		Extra clang tools
-EXTRAS_IMPLIES=		CLANG
-EXTRAS_DISTFILES=	clang-tools-extra-${DISTVERSION}.src${EXTRACT_SUFX}
-GOLD_DESC=		Build the LLVM Gold plugin for LTO
-GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
-GOLD_BUILD_DEPENDS=	${LOCALBASE}/bin/ld.gold:devel/binutils
-LIT_DESC=		Install lit and FileCheck test tools
-LIT_VARS=		_USES_PYTHON=python:2.7
-LLD_DESC=		Install lld, the LLVM linker
-LLD_DISTFILES=		lld-${DISTVERSION}.src${EXTRACT_SUFX}
-LLDB_BUILD_DEPENDS=	swig3.0:devel/swig30
-LLDB_DESC=		Install lldb, the LLVM debugger
-LLDB_DISTFILES=		lldb-${DISTVERSION}.src${EXTRACT_SUFX}
-LLDB_EXTRA_PATCHES=	${PATCHDIR}/lldb-patch-tools_lldb_source_Host_common_FileSpec.cpp
-LLDB_IMPLIES=		CLANG
-LLDB_VARS=		_USES_PYTHON=python:2.7
-OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
-OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
-OPENMP_EXTRA_PATCHES=	${PATCHDIR}/openmp-patch-bug32279
-
-.if defined(WITH_DEBUG)
-CMAKE_BUILD_TYPE=	RelWithDebInfo
-STRIP=
-.endif
-
-_CRTLIBDIR=	${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd
-
-# Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel
-.for option in CLANG COMPILER_RT EXTRAS LLD LLDB OPENMP
-WRKSRC_${option:tl}=		${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//}
-.endfor
-
-OPTIONS_SUB=	yes
-
-PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE} LLVM_MAJOR=${LLVM_MAJOR}
-
-COMMANDS=	bugpoint \
-		llc \
-		lli \
-		llvm-ar \
-		llvm-as \
-		llvm-bcanalyzer \
-		llvm-config \
-		llvm-cov \
-		llvm-diff \
-		llvm-dis \
-		llvm-dwarfdump \
-		llvm-extract \
-		llvm-link \
-		llvm-mc \
-		llvm-mcmarkup \
-		llvm-nm \
-		llvm-objdump \
-		llvm-profdata \
-		llvm-ranlib \
-		llvm-readobj \
-		llvm-rtdyld \
-		llvm-size \
-		llvm-split \
-		llvm-stress \
-		llvm-symbolizer \
-		llvm-tblgen \
-		macho-dump \
-		opt
-FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
-
-STRIP_LIBS=	BugpointPasses.so \
-		LLVMHello.so \
-		${LIBNAME}.0 \
-		libLTO.so
-
-EXTRAS_COMMANDS+= \
-		clang-apply-replacements \
-		clang-include-fixer \
-		clang-modernize \
-		clang-query \
-		clang-rename \
-		clang-tidy \
-		find-all-symbols \
-		modularize
-EXTRAS_LIBS=	libclangApplyReplacements \
-		libclangIncludeFixer \
-		libclangRename \
-		libclangQuery \
-		libclangRename \
-		libclangTidy \
-		libclangTidyGoogleModule \
-		libclangTidyLLVMModule \
-		libclangTidyMiscModule \
-		libclangTidyReadabilityModule \
-		libclangTidyUtils \
-		libfindAllSymbols \
-		libmodernizeCore
-EXTRAS_PATTERN=	${EXTRAS_COMMANDS:tW:C/  */|/g}|${EXTRAS_LIBS:tW:C/  */|/g}
-
-.include <bsd.port.options.mk>
-
-# keep in sync with /usr/src/lib/clang/clang.build.mk
-CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
-
-.if ${PORT_OPTIONS:MCLANG}
-COMMANDS+=	clang \
-		clang++ \
-		clang-check \
-		clang-cpp \
-		clang-format \
-		clang-tblgen \
-		scan-build \
-		scan-view
-MAN1SRCS+=	clang.1 \
-		scan-build.1
-CLANG_PATTERN=	(c-index-test|clang|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer)
-.endif
-
-.if ${PORT_OPTIONS:MCOMPILER_RT}
-COMPILER_RT_PATTERN=	(asan_blacklist.txt|sanitizer|xray)
-.endif
-
-.if ${PORT_OPTIONS:MLIT}
-MAN1SRCS+=	lit.1 FileCheck.1
-LIT_COMMANDS=	lit llvm-lit FileCheck
-.endif
-
-.if ${PORT_OPTIONS:MLLDB}
-COMMANDS+=	argdumper \
-		lldb \
-		lldb-mi \
-		lldb-server
-.endif
-
-.if ! ${OPTIONS_DEFINE:MCOMPILER_RT}
-# Hack to disable COMPILER_RT in plist of unsupported architectures
-PLIST_SUB+=	COMPILER_RT="@comment "
-.else
-.endif
-
-.if ! ${OPTIONS_DEFINE:MGOLD}
-# Hack to disable GOLD in plist of unsupported architectures
-PLIST_SUB+=	GOLD="@comment "
-.else
-.endif
-
-.if ! ${OPTIONS_DEFINE:MOPENMP}
-# Hack to disable OPENMP in plist of unsupported architectures
-PLIST_SUB+=	OPENMP="@comment "
-.else
-.endif
-
-MAN1SRCS+=	bugpoint.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
-		llvm-bcanalyzer.1 llvm-build.1 llvm-config.1 llvm-cov.1 \
-		llvm-diff.1 llvm-dis.1 llvm-dwarfdump.1 \
-		llvm-extract.1 llvm-lib.1 llvm-link.1 llvm-nm.1 \
-		llvm-profdata.1 llvm-readobj.1 llvm-stress.1 llvm-symbolizer.1 \
-		opt.1 tblgen.1
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-_COMPILER_RT_LIBS= \
-	libclang_rt.asan-preinit-x86_64.a \
-	libclang_rt.asan-x86_64.a \
-	libclang_rt.asan-x86_64.a.syms \
-	libclang_rt.asan-x86_64.so \
-	libclang_rt.asan_cxx-x86_64.a \
-	libclang_rt.asan_cxx-x86_64.a.syms \
-	libclang_rt.builtins-x86_64.a \
-	libclang_rt.dd-x86_64.a \
-	libclang_rt.dyndd-x86_64.so \
-	libclang_rt.lsan-x86_64.a \
-	libclang_rt.profile-x86_64.a \
-	libclang_rt.safestack-x86_64.a \
-	libclang_rt.stats-x86_64.a \
-	libclang_rt.stats_client-x86_64.a \
-	libclang_rt.tsan-x86_64.a \
-	libclang_rt.tsan-x86_64.a.syms \
-	libclang_rt.tsan_cxx-x86_64.a \
-	libclang_rt.tsan_cxx-x86_64.a.syms \
-	libclang_rt.ubsan_standalone-x86_64.a \
-	libclang_rt.ubsan_standalone-x86_64.a.syms \
-	libclang_rt.ubsan_standalone_cxx-x86_64.a \
-	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
-.endif
-.if ${ARCH} == "i386"
-_COMPILER_RT_LIBS+= \
-	libclang_rt.asan-i386.a \
-	libclang_rt.asan-i386.so \
-	libclang_rt.asan-preinit-i386.a \
-	libclang_rt.asan_cxx-i386.a \
-	libclang_rt.builtins-i386.a \
-	libclang_rt.profile-i386.a \
-	libclang_rt.safestack-i386.a \
-	libclang_rt.stats-i386.a \
-	libclang_rt.stats_client-i386.a \
-	libclang_rt.ubsan_standalone-i386.a \
-	libclang_rt.ubsan_standalone_cxx-i386.a
-.endif
-
-.if ${PORT_OPTIONS:MEXTRAS}
-COMMANDS+=	${EXTRAS_COMMANDS}
-MAN1SRCS+=	extraclangtools.1
-PORTDOCS+=	clang-tools
-SHEBANG_FILES+=	tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \
-		tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py \
-		tools/clang/tools/extra/include-fixer/find-all-symbols/tool/run-find-all-symbols.py
-.endif
-
-.if ${PORT_OPTIONS:MLLD}
-COMMANDS+=	lld \
-		lld-link
-PORTDOCS+=	lld
-.endif
-
-.if ${OPSYS} == "FreeBSD" && ${COMPILER_TYPE} != clang
-CXXFLAGS+=	-D_GLIBCXX_USE_C99
-.endif
-
-.if ${ARCH} == "armv6"
-BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
-CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
-MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
-.endif
-
-LLDB_BUILD_DEPENDS+= ${PY_ENUM34}
-
-post-extract-CLANG-on:
-	${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang
-
-post-extract-EXTRAS-on:
-	${MV} ${WRKSRC_extras} ${PATCH_WRKSRC}/tools/clang/tools/extra
-
-post-extract-LLD-on:
-	${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld
-
-post-extract-LLDB-on:
-	${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb
-
-post-extract-OPENMP-on:
-	${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/tools/openmp
-
-post-patch:
-	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
-	    -e 's|from lit|from lit${LLVM_SUFFIX}|' \
-	    -e 's|lit\.|lit${LLVM_SUFFIX}.|' \
-	    ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py \
-	    ${WRKSRC}/utils/lit/lit/formats/*.py
-	${REINPLACE_CMD} -e 's,/usr/local/,${LOCALBASE}/,' \
-	    ${WRKSRC}/CMakeLists.txt
-
-post-patch-CLANG-on:
-	${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \
-	    ${PATCH_WRKSRC}/tools/clang/lib/Driver/Tools.cpp
-
-post-patch-COMPILER_RT-on:
-	cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt/patch-svn-294806
-	cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt/patch-lib_sanitizer__common_sanitizer__linux.cc
-	cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt/patch-lib_sanitizer__common_sanitizer__platfrom__limit__posix.h
-
-post-build-COMPILER_RT-on:
-	${MKDIR} ${WRKDIR}/compiler-rt-build
-	cd ${WRKDIR}/compiler-rt-build && \
-	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
-	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
-	    ${WRKSRC_compiler_rt} && \
-	${MAKE_ENV} ${MAKE_CMD}
-
-post-install:
-	${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis
-	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
-	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
-.for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
-	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
-	    ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
-.endfor
-
-post-install-DOCS-on:
-	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR}
-.for _man in ${MAN1SRCS}
-	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
-	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
-.endfor
-.if ! ${PORT_OPTIONS:MLIT}
-	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
-	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
-.endif
-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
-
-.if ${PORT_OPTIONS:MCLANG}
-post-install-DOCS-off:
-	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/scan-build.1
-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
-.endif
-
-post-install-LLDB-on:
-	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib
-	${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/lldb/Host/windows/getopt
-
-post-install-CLANG-on:
-	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
-	   ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
-	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/clang-tblgen \
-	    ${STAGEDIR}${LLVM_PREFIX}/bin/
-
-post-install-COMPILER_RT-on:
-	cd ${WRKDIR}/compiler-rt-build && \
-	    ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET}
-.if ${ARCH} == "amd64"
-	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/libclang_rt*i386*
-.endif
-	${MKDIR} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}
-	${MV} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/* \
-	    ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}
-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd
-
-post-install-LIT-on:
-	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \
-	    ${STAGEDIR}${LLVM_PREFIX}/bin/lit
-	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
-	    ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit
-	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
-	    ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX}
-	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
-	    ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX}
-	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
-	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats
-	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \
-	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
-	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/formats/*.py \
-			${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats
-	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \
-	    ${STAGEDIR}${LLVM_PREFIX}/bin/
-	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
-	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
-
-TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
-do-test:
-	if [ `${ID} -u` = 0 ]; then \
-		${CHOWN} -R nobody ${WRKSRC}/test; \
-		su -m nobody -c ${TEST_CMD}; \
-	else \
-		${SH} -c ${TEST_CMD}; \
-	fi
-
-build-plist:
-	${RM} ${PLIST} ${PLIST}.tmp
-	${ECHO_CMD} "@comment >>>>> GENERATED FILE, DO NOT EDIT <<<<<" >> ${PLIST}.tmp
-	${ECHO_CMD} "@comment Alter build-plist target and regenerate as required" >> ${PLIST}.tmp
-.for command in ${COMMANDS}
-	${ECHO_CMD} bin/${command}${LLVM_SUFFIX} >> ${PLIST}.tmp
-.endfor
-.for command in ${LIT_COMMANDS}
-	${ECHO_CMD} %%LIT%%bin/${command}${LLVM_SUFFIX} >> ${PLIST}.tmp
-	${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||}/bin/${command} >> ${PLIST}.tmp
-.endfor
-
-	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
-	    ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \
-	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
-	    -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \
-	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \
-	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
-	    -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' \
-	    -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' | \
-	    ${SORT} >> ${PLIST}.tmp
-	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
-	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \
-	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
-	    -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' | \
-	    ${SORT} >> ${PLIST}.tmp
-	${AWK} '{ \
-	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(omp.h|${EXTRAS_PATTERN}|libclang_rt)/) {printf "%%%%CLANG%%%%"} \
-	    if ($$0 ~ /${COMPILER_RT_PATTERN}/) \
-		{printf "%%%%COMPILER_RT%%%%"} \
-	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
-	    if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
-	    if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
-	    if ($$0 ~ /lib.*omp/) {printf "%%%%OPENMP%%%%"} \
-	    if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \
-	    if ($$0 !~ /libclang_rt/) {print}}' ${PLIST}.tmp >> ${PLIST}
-	${RM} ${PLIST}.tmp
-
-check-commands:
-.for command in ${COMMANDS}
-	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
-.endfor
-
-.if make(svn-patch-clang)
-.if !defined(PATCH_REV)
-.error svn-patch-clang requires that PATCH_REV be set
-.endif
-_PATCH_FILE=${FILESDIR}/clang-patch-svn-${PATCH_REV}
-_LLVM_BASE=http://llvm.org/svn/llvm-project/cfe/trunk
-svn-patch-clang:
-	svn log -c ${PATCH_REV} ${_LLVM_BASE} >> ${_PATCH_FILE}
-	svn diff -c ${PATCH_REV} ${_LLVM_BASE} | \
-	    ${SED} -E -e 's;^(---|\+\+\+) ;\1 tools/clang/;' >> ${_PATCH_FILE}
-.endif
-.if make(svn-patch-compiler-rt)
-.if !defined(PATCH_REV)
-.error svn-patch-compiler-rt requires that PATCH_REV be set
-.endif
-_PATCH_FILE=${FILESDIR}/compiler-rt-patch-svn-${PATCH_REV}
-_LLVM_BASE=http://llvm.org/svn/llvm-project/compiler-rt/trunk
-svn-patch-compiler-rt:
-	svn log -c ${PATCH_REV} ${_LLVM_BASE} >> ${_PATCH_FILE}
-	svn diff -c ${PATCH_REV} ${_LLVM_BASE} | \
-	    ${SED} -E -e 's;^(---|\+\+\+) ;\1 tools/compiler-rt/;' >> ${_PATCH_FILE}
-.endif
-.if make(svn-patch-lldb)
-.if !defined(PATCH_REV)
-.error svn-patch-lldb requires that PATCH_REV be set
-.endif
-_PATCH_FILE=${FILESDIR}/lldb-patch-svn-${PATCH_REV}
-_LLVM_BASE=http://llvm.org/svn/llvm-project/lldb/trunk
-svn-patch-lldb:
-	svn log -c ${PATCH_REV} ${_LLVM_BASE} >> ${_PATCH_FILE}
-	svn diff -c ${PATCH_REV} ${_LLVM_BASE} | >> ${_PATCH_FILE}
-.endif
-
-.include <bsd.port.post.mk>
--- a/devel/llvm39/distinfo
+++ b/devel/llvm39/distinfo
@ -1,15 +0,0 @@
-TIMESTAMP = 1482267336
-SHA256 (llvm-3.9.1.src.tar.xz) = 1fd90354b9cf19232e8f168faf2220e79be555df3aa743242700879e8fd329ee
-SIZE (llvm-3.9.1.src.tar.xz) = 18130436
-SHA256 (cfe-3.9.1.src.tar.xz) = e6c4cebb96dee827fa0470af313dff265af391cb6da8d429842ef208c8f25e63
-SIZE (cfe-3.9.1.src.tar.xz) = 10363080
-SHA256 (compiler-rt-3.9.1.src.tar.xz) = d30967b1a5fa51a2503474aacc913e69fd05ae862d37bf310088955bdb13ec99
-SIZE (compiler-rt-3.9.1.src.tar.xz) = 1376372
-SHA256 (clang-tools-extra-3.9.1.src.tar.xz) = 29a5b65bdeff7767782d4427c7c64d54c3a8684bc6b217b74a70e575e4813635
-SIZE (clang-tools-extra-3.9.1.src.tar.xz) = 456464
-SHA256 (lld-3.9.1.src.tar.xz) = 48e128fabb2ddaee64ecb8935f7ac315b6e68106bc48aeaf655d179c65d87f34
-SIZE (lld-3.9.1.src.tar.xz) = 500120
-SHA256 (lldb-3.9.1.src.tar.xz) = 7e3311b2a1f80f4d3426e09f9459d079cab4d698258667e50a46dccbaaa460fc
-SIZE (lldb-3.9.1.src.tar.xz) = 13750816
-SHA256 (openmp-3.9.1.src.tar.xz) = d23b324e422c0d5f3d64bae5f550ff1132c37a070e43c7ca93991676c86c7766
-SIZE (openmp-3.9.1.src.tar.xz) = 2031588
--- a/devel/llvm39/files/clang-patch-fformat_extensions.diff
+++ b/devel/llvm39/files/clang-patch-fformat_extensions.diff
@ -1,45 +0,0 @@
-diff -ruN tools/clang/include/clang/Basic/LangOptions.def tools/clang/include/clang/Basic/LangOptions.def
--- tools/clang/include/clang/Basic/LangOptions.def	2015-07-30 22:47:41 UTC
-+++ tools/clang/include/clang/Basic/LangOptions.def
-@@ -114,6 +114,7 @@
- LANGOPT(RTTIData          , 1, 1, "emit run-time type information data")
- LANGOPT(MSBitfields       , 1, 0, "Microsoft-compatible structure layout")
- LANGOPT(Freestanding, 1, 0, "freestanding implementation")
-+LANGOPT(FormatExtensions  , 1, 0, "FreeBSD format extensions")
- LANGOPT(NoBuiltin         , 1, 0, "disable builtin functions")
- LANGOPT(NoMathBuiltin     , 1, 0, "disable math builtin functions")
- LANGOPT(GNUAsm            , 1, 1, "GNU-style inline assembly")
-diff -ruN tools/clang/include/clang/Driver/Options.td tools/clang/include/clang/Driver/Options.td
--- tools/clang/include/clang/Driver/Options.td	2015-07-30 22:47:41 UTC
-+++ tools/clang/include/clang/Driver/Options.td
-@@ -644,6 +644,8 @@
- 
- def ffreestanding : Flag<["-"], "ffreestanding">, Group<f_Group>, Flags<[CC1Option]>,
-   HelpText<"Assert that the compilation takes place in a freestanding environment">;
-+def fformat_extensions: Flag<["-"], "fformat-extensions">, Group<f_Group>, Flags<[CC1Option]>,
-+  HelpText<"Enable FreeBSD kernel specific format string extensions">;
- def fgnu_keywords : Flag<["-"], "fgnu-keywords">, Group<f_Group>, Flags<[CC1Option]>,
-   HelpText<"Allow GNU-extension keywords regardless of language standard">;
- def fgnu89_inline : Flag<["-"], "fgnu89-inline">, Group<f_Group>, Flags<[CC1Option]>,
-diff -ruN tools/clang/lib/Driver/Tools.cpp tools/clang/lib/Driver/Tools.cpp
--- tools/clang/lib/Driver/Tools.cpp	2015-07-30 22:47:41 UTC
-+++ tools/clang/lib/Driver/Tools.cpp
-@@ -4045,6 +4045,7 @@
- 
-   // Forward -f (flag) options which we can pass directly.
-   Args.AddLastArg(CmdArgs, options::OPT_femit_all_decls);
-+  Args.AddLastArg(CmdArgs, options::OPT_fformat_extensions);
-   Args.AddLastArg(CmdArgs, options::OPT_fheinous_gnu_extensions);
-   Args.AddLastArg(CmdArgs, options::OPT_fstandalone_debug);
-   Args.AddLastArg(CmdArgs, options::OPT_fno_standalone_debug);
-diff -ruN tools/clang/lib/Frontend/CompilerInvocation.cpp tools/clang/lib/Frontend/CompilerInvocation.cpp
--- tools/clang/lib/Frontend/CompilerInvocation.cpp	2015-07-30 22:47:41 UTC
-+++ tools/clang/lib/Frontend/CompilerInvocation.cpp
-@@ -1543,6 +1543,7 @@
-   Opts.ShortWChar = Args.hasFlag(OPT_fshort_wchar, OPT_fno_short_wchar, false);
-   Opts.ShortEnums = Args.hasArg(OPT_fshort_enums);
-   Opts.Freestanding = Args.hasArg(OPT_ffreestanding);
-+  Opts.FormatExtensions = Args.hasArg(OPT_fformat_extensions);
-   Opts.NoBuiltin = Args.hasArg(OPT_fno_builtin) || Opts.Freestanding;
-   Opts.NoMathBuiltin = Args.hasArg(OPT_fno_math_builtin);
-   Opts.AssumeSaneOperatorNew = !Args.hasArg(OPT_fno_assume_sane_operator_new);
--- a/devel/llvm39/files/clang-patch-fopenmp.diff
+++ b/devel/llvm39/files/clang-patch-fopenmp.diff
@ -1,28 +0,0 @@
--- tools/clang/lib/Driver/Tools.cpp.orig	2016-09-02 19:55:01.000873648 +0000
-+++ tools/clang/lib/Driver/Tools.cpp	2016-09-02 19:54:32.001875868 +0000
-@@ -2733,13 +2733,22 @@
- 
-   switch (getOpenMPRuntime(TC, Args)) {
-   case OMPRT_OMP:
-    CmdArgs.push_back("-lomp");
-+    if (TC.getTriple().getOS() != llvm::Triple::FreeBSD || TC.isCrossCompiling() || !llvm::sys::fs::exists("%%LLVM_PREFIX%%/lib/libomp.so"))
-+      CmdArgs.push_back("-lomp");
-+    else
-+      CmdArgs.push_back("%%LLVM_PREFIX%%/lib/libomp.so");
-     break;
-   case OMPRT_GOMP:
-    CmdArgs.push_back("-lgomp");
-+    if (TC.getTriple().getOS() != llvm::Triple::FreeBSD || TC.isCrossCompiling() || !llvm::sys::fs::exists("%%LLVM_PREFIX%%/lib/libomp.so"))
-+      CmdArgs.push_back("-lgomp");
-+    else
-+      CmdArgs.push_back("%%LLVM_PREFIX%%/lib/libgomp.so");
-     break;
-   case OMPRT_IOMP5:
-    CmdArgs.push_back("-liomp5");
-+    if (TC.getTriple().getOS() != llvm::Triple::FreeBSD || TC.isCrossCompiling() || !llvm::sys::fs::exists("%%LLVM_PREFIX%%/lib/libomp.so"))
-+      CmdArgs.push_back("-liomp5");
-+    else
-+      CmdArgs.push_back("%%LLVM_PREFIX%%/lib/libiomp5.so");
-     break;
-   case OMPRT_Unknown:
-     // Already diagnosed.
--- a/devel/llvm39/files/clang-patch-svn-r280672
+++ b/devel/llvm39/files/clang-patch-svn-r280672
@ -1,39 +0,0 @@
------------------------------------------------------------------------
-r280672 | ed | 2016-09-05 18:38:34 +0000 (Mon, 05 Sep 2016) | 6 lines
-
-Add support for targeting armv6-unknown-cloudabi-eabihf.
-
-I'm in the progress of adding ARMv6 support to CloudABI. On the compiler
-side, everything seems to work properly with this tiny change applied.
-
-
------------------------------------------------------------------------
-Index: test/Preprocessor/init.c
-===================================================================
--- tools/clang/test/Preprocessor/init.c	(revision 280671)
-+++ tools/clang/test/Preprocessor/init.c	(revision 280672)
-@@ -1975,6 +1975,11 @@
- // ARMEABIHARDFP:#define __arm 1
- // ARMEABIHARDFP:#define __arm__ 1
- 
-+// RUN: %clang_cc1 -E -dM -ffreestanding -triple=armv6-unknown-cloudabi-eabihf < /dev/null | FileCheck -match-full-lines -check-prefix ARMV6-CLOUDABI %s
-+//
-+// ARMV6-CLOUDABI:#define __CloudABI__ 1
-+// ARMV6-CLOUDABI:#define __arm__ 1
-+
- // RUN: %clang_cc1 -E -dM -ffreestanding -triple=arm-netbsd-eabi < /dev/null | FileCheck -match-full-lines -check-prefix ARM-NETBSD %s
- //
- // ARM-NETBSD-NOT:#define _LP64
-Index: lib/Basic/Targets.cpp
-===================================================================
--- tools/clang/lib/Basic/Targets.cpp	(revision 280671)
-+++ tools/clang/lib/Basic/Targets.cpp	(revision 280672)
-@@ -8261,6 +8261,8 @@
-       return new DarwinARMTargetInfo(Triple, Opts);
- 
-     switch (os) {
-+    case llvm::Triple::CloudABI:
-+      return new CloudABITargetInfo<ARMleTargetInfo>(Triple, Opts);
-     case llvm::Triple::Linux:
-       return new LinuxTargetInfo<ARMleTargetInfo>(Triple, Opts);
-     case llvm::Triple::FreeBSD:
--- a/devel/llvm39/files/clang-patch-tools_clang_include_clang_Basic_DiagnosticSemaKinds.td
+++ b/devel/llvm39/files/clang-patch-tools_clang_include_clang_Basic_DiagnosticSemaKinds.td
@ -1,12 +0,0 @@
--- tools/clang/include/clang/Basic/DiagnosticSemaKinds.td.orig
-+++ tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
-@@ -3180,6 +3180,9 @@
- 
- def note_ovl_candidate_inherited_constructor : Note<
-     "constructor from base class %0 inherited here">;
-+def note_ovl_candidate_inherited_constructor_slice : Note<
-+    "candidate %select{constructor|template}0 ignored: "
-+    "inherited constructor cannot be used to %select{copy|move}1 object">;
- def note_ovl_candidate_illegal_constructor : Note<
-     "candidate %select{constructor|template}0 ignored: "
-     "instantiation %select{takes|would take}0 its own class type by value">;
--- a/devel/llvm39/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
+++ b/devel/llvm39/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
@ -1,31 +0,0 @@
--- tools/clang/lib/Headers/CMakeLists.txt.orig	2015-07-30 22:47:41 UTC
-+++ tools/clang/lib/Headers/CMakeLists.txt
-@@ -30,7 +30,6 @@ set(files
-   Intrin.h
-   inttypes.h
-   iso646.h
-  limits.h
-   lzcntintrin.h
-   mm3dnow.h
-   mmintrin.h
-@@ -45,20 +44,12 @@ set(files
-   s390intrin.h
-   shaintrin.h
-   smmintrin.h
-  stdalign.h
-  stdarg.h
-  stdatomic.h
-  stdbool.h
-  stddef.h
-   __stddef_max_align_t.h
-  stdint.h
-  stdnoreturn.h
-   tbmintrin.h
-   tgmath.h
-   tmmintrin.h
-   unwind.h
-   vadefs.h
-  varargs.h
-   vecintrin.h
-   __wmmintrin_aes.h
-   wmmintrin.h
--- a/devel/llvm39/files/clang-patch-tools_clang_lib_Sema_SemaOverload.cpp
+++ b/devel/llvm39/files/clang-patch-tools_clang_lib_Sema_SemaOverload.cpp
@ -1,49 +0,0 @@
--- tools/clang/lib/Sema/SemaOverload.cpp.orig
-+++ tools/clang/lib/Sema/SemaOverload.cpp
-@@ -5783,6 +5783,28 @@
-       Candidate.FailureKind = ovl_fail_illegal_constructor;
-       return;
-     }
-+
-+    // C++ [over.match.funcs]p8: (proposed DR resolution)
-+    //   A constructor inherited from class type C that has a first parameter
-+    //   of type "reference to P" (including such a constructor instantiated
-+    //   from a template) is excluded from the set of candidate functions when
-+    //   constructing an object of type cv D if the argument list has exactly
-+    //   one argument and D is reference-related to P and P is reference-related
-+    //   to C.
-+    auto *Shadow = dyn_cast<ConstructorUsingShadowDecl>(FoundDecl.getDecl());
-+    if (Shadow && Args.size() == 1 && Constructor->getNumParams() >= 1 &&
-+        Constructor->getParamDecl(0)->getType()->isReferenceType()) {
-+      QualType P = Constructor->getParamDecl(0)->getType()->getPointeeType();
-+      QualType C = Context.getRecordType(Constructor->getParent());
-+      QualType D = Context.getRecordType(Shadow->getParent());
-+      SourceLocation Loc = Args.front()->getExprLoc();
-+      if ((Context.hasSameUnqualifiedType(P, C) || IsDerivedFrom(Loc, P, C)) &&
-+          (Context.hasSameUnqualifiedType(D, P) || IsDerivedFrom(Loc, D, P))) {
-+        Candidate.Viable = false;
-+        Candidate.FailureKind = ovl_fail_inhctor_slice;
-+        return;
-+      }
-+    }
-   }
- 
-   unsigned NumParams = Proto->getNumParams();
-@@ -9750,6 +9772,17 @@
-   case ovl_fail_enable_if:
-     return DiagnoseFailedEnableIfAttr(S, Cand);
- 
-+  case ovl_fail_inhctor_slice:
-+    // It's generally not interesting to note copy/move constructors here.
-+    if (cast<CXXConstructorDecl>(Fn)->isCopyOrMoveConstructor())
-+      return;
-+    S.Diag(Fn->getLocation(),
-+           diag::note_ovl_candidate_inherited_constructor_slice)
-+      << (Fn->getPrimaryTemplate() ? 1 : 0)
-+      << Fn->getParamDecl(0)->getType()->isRValueReferenceType();
-+    MaybeEmitInheritedConstructorNote(S, Cand->FoundDecl);
-+    return;
-+
-   case ovl_fail_addr_not_available: {
-     bool Available = checkAddressOfCandidateIsAvailable(S, Cand->Function);
-     (void)Available;
--- a/devel/llvm39/files/clang-patch-tools_clang_tools_clang-format_clang-format.py
+++ b/devel/llvm39/files/clang-patch-tools_clang_tools_clang-format_clang-format.py
@ -1,11 +0,0 @@
--- tools/clang/tools/clang-format/clang-format.py.orig	2015-09-08 20:44:00 UTC
-+++ tools/clang/tools/clang-format/clang-format.py
-@@ -34,7 +34,7 @@ import vim
- 
- # set g:clang_format_path to the path to clang-format if it is not on the path
- # Change this to the full path if clang-format is not on the path.
-binary = 'clang-format'
-+binary = 'clang-format39'
- if vim.eval('exists("g:clang_format_path")') == "1":
-   binary = vim.eval('g:clang_format_path')
- 
--- a/devel/llvm39/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer
+++ b/devel/llvm39/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer
@ -1,12 +0,0 @@
--- tools/clang/tools/scan-build/libexec/ccc-analyzer.orig
-+++ tools/clang/tools/scan-build/libexec/ccc-analyzer
-@@ -81,6 +81,9 @@
-   if (-x "/usr/bin/xcrun") {
-     $UseXCRUN = 1;
-   }
-+} elsif (`uname -s` eq "FreeBSD\n") {
-+  $DefaultCCompiler = 'cc';
-+  $DefaultCXXCompiler = 'c++';
- } else {
-   $DefaultCCompiler = 'gcc';
-   $DefaultCXXCompiler = 'g++';
--- a/devel/llvm39/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__linux.cc
+++ b/devel/llvm39/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__linux.cc
@ -1,41 +0,0 @@
--- lib/sanitizer_common/sanitizer_linux.cc.orig	2017-01-06 20:57:47.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_linux.cc	2018-04-19 17:03:38.293789000 +0100
-@@ -63,7 +63,6 @@
- #include <sys/exec.h>
- #include <sys/sysctl.h>
- #include <vm/vm_param.h>
-#include <vm/pmap.h>
- #include <machine/atomic.h>
- extern "C" {
- // <sys/umtx.h> must be included after <errno.h> and <sys/types.h> on
-@@ -223,7 +222,8 @@ static void kernel_stat_to_stat(struct k
- 
- uptr internal_stat(const char *path, void *buf) {
- #if SANITIZER_FREEBSD
-  return internal_syscall(SYSCALL(stat), path, buf);
-+  return internal_syscall(SYSCALL(fstatat), AT_FDCWD, (uptr)path,
-+                          (uptr)buf, 0);
- #elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
-   return internal_syscall(SYSCALL(newfstatat), AT_FDCWD, (uptr)path,
-                           (uptr)buf, 0);
-@@ -247,7 +247,8 @@ uptr internal_stat(const char *path, voi
- 
- uptr internal_lstat(const char *path, void *buf) {
- #if SANITIZER_FREEBSD
-  return internal_syscall(SYSCALL(lstat), path, buf);
-+  return internal_syscall(SYSCALL(fstatat), AT_FDCWD, (uptr)path,
-+                         (uptr)buf, AT_SYMLINK_NOFOLLOW);
- #elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
-   return internal_syscall(SYSCALL(newfstatat), AT_FDCWD, (uptr)path,
-                          (uptr)buf, AT_SYMLINK_NOFOLLOW);
-@@ -590,7 +591,9 @@ uptr internal_getppid() {
- }
- 
- uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count) {
-#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
-+#if SANITIZER_FREEBSD
-+  return internal_syscall(SYSCALL(getdirentries), fd, (uptr)dirp, count, NULL);
-+#elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
-   return internal_syscall(SYSCALL(getdents64), fd, (uptr)dirp, count);
- #else
-   return internal_syscall(SYSCALL(getdents), fd, (uptr)dirp, count);
--- a/devel/llvm39/files/compiler-rt/patch-lib_sanitizer__common_sanitizerplatfromlimit__posix.h
+++ b/devel/llvm39/files/compiler-rt/patch-lib_sanitizer__common_sanitizerplatfromlimit__posix.h
@ -1,15 +0,0 @@
--- lib/sanitizer_common/sanitizer_platform_limits_posix.h.orig	2017-05-24 19:09:24.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_platform_limits_posix.h	2017-05-24 20:12:47.183536000 +0000
-@@ -485,7 +485,12 @@
-   };
- #elif SANITIZER_FREEBSD
-   struct __sanitizer_dirent {
-+#if __FreeBSD_version < 1200031
-     unsigned int d_fileno;
-+#else
-+    unsigned long long d_fileno;
-+    unsigned long long d_off;
-+#endif
-     unsigned short d_reclen;
-     // more fields that we don't care about
-   };
--- a/devel/llvm39/files/compiler-rt/patch-svn-294806
+++ b/devel/llvm39/files/compiler-rt/patch-svn-294806
@ -1,30 +0,0 @@
--- lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig	2016-04-26 10:41:30 UTC
-+++ lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -23,11 +23,6 @@
- #ifdef _FILE_OFFSET_BITS
- #undef _FILE_OFFSET_BITS
- #endif
-#if SANITIZER_FREEBSD
-#define _WANT_RTENTRY
-#include <sys/param.h>
-#include <sys/socketvar.h>
-#endif
- #include <arpa/inet.h>
- #include <dirent.h>
- #include <errno.h>
-@@ -422,6 +417,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
-   unsigned struct_input_absinfo_sz = sizeof(struct input_absinfo);
-   unsigned struct_input_id_sz = sizeof(struct input_id);
-   unsigned struct_mtpos_sz = sizeof(struct mtpos);
-+  unsigned struct_rtentry_sz = sizeof(struct rtentry);
-   unsigned struct_termio_sz = sizeof(struct termio);
-   unsigned struct_vt_consize_sz = sizeof(struct vt_consize);
-   unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes);
-@@ -441,7 +437,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
-   unsigned struct_midi_info_sz = sizeof(struct midi_info);
-   unsigned struct_mtget_sz = sizeof(struct mtget);
-   unsigned struct_mtop_sz = sizeof(struct mtop);
-  unsigned struct_rtentry_sz = sizeof(struct rtentry);
-   unsigned struct_sbi_instrument_sz = sizeof(struct sbi_instrument);
-   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
-   unsigned struct_synth_info_sz = sizeof(struct synth_info);
--- a/devel/llvm39/files/config-patch-tools_clang_include_clang_Sema_Overload.h
+++ b/devel/llvm39/files/config-patch-tools_clang_include_clang_Sema_Overload.h
@ -1,15 +0,0 @@
--- tools/clang/include/clang/Sema/Overload.h.orig
-+++ tools/clang/include/clang/Sema/Overload.h
-@@ -586,7 +586,11 @@
-     ovl_fail_enable_if,
- 
-     /// This candidate was not viable because its address could not be taken.
-    ovl_fail_addr_not_available
-+    ovl_fail_addr_not_available,
-+
-+    /// This inherited constructor is not viable because it would slice the
-+    /// argument.
-+    ovl_fail_inhctor_slice,
-   };
- 
-   /// OverloadCandidate - A single candidate in an overload set (C++ 13.3).
--- a/devel/llvm39/files/lldb-patch-tools_lldb_source_Host_common_FileSpec.cpp
+++ b/devel/llvm39/files/lldb-patch-tools_lldb_source_Host_common_FileSpec.cpp
@ -1,10 +0,0 @@
--- tools/lldb/source/Host/common/FileSpec.cpp.orig	2016-12-03 16:10:10 UTC
-+++ tools/lldb/source/Host/common/FileSpec.cpp
-@@ -17,6 +17,7 @@
- #ifndef _MSC_VER
- #include <libgen.h>
- #endif
-+#include <climits>
- #include <set>
- #include <string.h>
- #include <fstream>
--- a/devel/llvm39/files/llvm-wrapper.sh.in
+++ b/devel/llvm39/files/llvm-wrapper.sh.in
@ -1,11 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-LLVM_PREFIX="%%LLVM_PREFIX%%"
-LLVM_SUFFIX="%%LLVM_SUFFIX%%"
-
-tool=$(/bin/realpath $0)
-tool=${tool##*/}
-tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
-    "${tool}" "${@}"
--- a/devel/llvm39/files/openmp-patch-bug32279
+++ b/devel/llvm39/files/openmp-patch-bug32279
@ -1,29 +0,0 @@
--- tools/openmp/runtime/cmake/LibompHandleFlags.cmake.orig	2017-03-16 15:50:48 UTC
-+++ tools/openmp/runtime/cmake/LibompHandleFlags.cmake
-@@ -156,6 +156,11 @@ function(libomp_get_libflags libflags)
-   if(${IA32})
-     libomp_append(libflags_local -lirc_pic LIBOMP_HAVE_IRC_PIC_LIBRARY)
-   endif()
-+  IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+    libomp_append(libflags_local "-Wl,--no-as-needed" LIBOMP_HAVE_AS_NEEDED_FLAG)
-+    libomp_append(libflags_local "-lm")
-+    libomp_append(libflags_local "-Wl,--as-needed" LIBOMP_HAVE_AS_NEEDED_FLAG)
-+  ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-   IF(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-     libomp_append(libflags_local -lm)
-   ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
- runtime/cmake/LibompHandleFlags.cmake | 5 +++++
- runtime/cmake/LibompMicroTests.cmake  | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
--- tools/openmp/runtime/cmake/LibompMicroTests.cmake.orig	2017-03-16 15:50:48 UTC
-+++ tools/openmp/runtime/cmake/LibompMicroTests.cmake
-@@ -171,7 +171,7 @@ add_custom_command(
- add_custom_target(libomp-test-deps DEPENDS test-deps/.success)
- set(libomp_expected_library_deps)
- if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-  set(libomp_expected_library_deps libc.so.7 libthr.so.3)
-+  set(libomp_expected_library_deps libc.so.7 libthr.so.3 libm.so.5)
-   libomp_append(libomp_expected_library_deps libhwloc.so.5 LIBOMP_USE_HWLOC)
- elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
-   set(libomp_expected_library_deps libc.so.12 libpthread.so.1 libm.so.0)
--- a/devel/llvm39/files/patch-svn-283188
+++ b/devel/llvm39/files/patch-svn-283188
@ -1,26 +0,0 @@
------------------------------------------------------------------------
-r283188 | mgorny | 2016-10-04 06:09:14 +0000 (Tue, 04 Oct 2016) | 9 lines
-
-[cmake] Use separate doctrees to prevent races between Sphinx instances
-
-Use separate doctrees between different Sphinx builders in order to
-prevent race condition issues due to multiple Sphinx instances accessing
-the same doctree cache in parallel.
-
-Bug: https://llvm.org/bugs/show_bug.cgi?id=23781
-
-Differential Revision: https://reviews.llvm.org/D23755
------------------------------------------------------------------------
-Index: cmake/modules/AddSphinxTarget.cmake
-===================================================================
--- cmake/modules/AddSphinxTarget.cmake	(revision 283187)
-+++ cmake/modules/AddSphinxTarget.cmake	(revision 283188)
-@@ -6,7 +6,7 @@
- # ``project`` should be the project name
- function (add_sphinx_target builder project)
-   set(SPHINX_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/${builder}")
-  set(SPHINX_DOC_TREE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")
-+  set(SPHINX_DOC_TREE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees-${builder}")
-   set(SPHINX_TARGET_NAME docs-${project}-${builder})
- 
-   if (SPHINX_WARNINGS_AS_ERRORS)
--- a/devel/llvm39/files/patch-tools_llvm-shlib_CMakeLists.txt
+++ b/devel/llvm39/files/patch-tools_llvm-shlib_CMakeLists.txt
@ -1,13 +0,0 @@
-Otherwise we end up with a 4k library without any symbols.
-
--- tools/llvm-shlib/CMakeLists.txt.orig	2016-05-26 06:35:35.000000000 +0200
-+++ tools/llvm-shlib/CMakeLists.txt	2016-11-15 17:07:29.937965000 +0100
-@@ -39,7 +39,7 @@
- add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})
- 
- list(REMOVE_DUPLICATES LIB_NAMES)
-if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") # FIXME: It should be "GNU ld for elf"
-+if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")) # FIXME: It should be "GNU ld for elf"
-   # GNU ld doesn't resolve symbols in the version script.
-   set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)
- elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
--- a/devel/llvm39/pkg-descr
+++ b/devel/llvm39/pkg-descr
@ -1,8 +0,0 @@
-The LLVM Project is a collection of modular and reusable compiler and
-toolchain technologies.
-
-This port includes Clang (a C/C++/Objective-C compiler), LLD (a linker),
-LLDB (a debugger), an OpenMP runtime library, and the LLVM infrastructure
-these are built on.
-
-WWW: http://llvm.org/
--- a/devel/llvm39/pkg-plist
+++ b/devel/llvm39/pkg-plist
--- a/devel/p5-Test-Manifest/Makefile
+++ b/devel/p5-Test-Manifest/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	Test-Manifest
-PORTVERSION=	2.02
-PORTREVISION=	1
+PORTVERSION=	2.021
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@ -10,9 +9,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to interact with a t/test_manifest file

-LICENSE=	ART10 GPLv1+
-LICENSE_COMB=	dual
+LICENSE=	ART20
+LICENSE_FILE=	${WRKSRC}/LICENSE

+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure

--- a/devel/p5-Test-Manifest/distinfo
+++ b/devel/p5-Test-Manifest/distinfo
@ -1,2 +1,3 @@
-SHA256 (Test-Manifest-2.02.tar.gz) = 064783ceaf7dd569a5724d40900a3f9d92168ee4c613f7a3cb99a99aa8283396
-SIZE (Test-Manifest-2.02.tar.gz) = 9180
+TIMESTAMP = 1525792922
+SHA256 (Test-Manifest-2.021.tar.gz) = a47aaad71c580e16e6e63d8c037cdddcd919876754beb2c95d9a88682dd332d9
+SIZE (Test-Manifest-2.021.tar.gz) = 14053
--- a/devel/p5-Test-Manifest/pkg-plist
+++ b/devel/p5-Test-Manifest/pkg-plist
@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/Test::Manifest.3.gz
 %%SITE_PERL%%/Test/Manifest.pm
+%%PERL5_MAN3%%/Test::Manifest.3.gz
--- a/devel/py-IBMQuantumExperience/Makefile
+++ b/devel/py-IBMQuantumExperience/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	IBMQuantumExperience
-DISTVERSION=	1.9.0
+DISTVERSION=	1.9.1
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-IBMQuantumExperience/distinfo
+++ b/devel/py-IBMQuantumExperience/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1522562408
-SHA256 (IBMQuantumExperience-1.9.0.tar.gz) = bd37582cbb2d17f33e55771c2adc32611479750f5e8d2a92d6f8756fed7cfecb
-SIZE (IBMQuantumExperience-1.9.0.tar.gz) = 12738
+TIMESTAMP = 1525756971
+SHA256 (IBMQuantumExperience-1.9.1.tar.gz) = 480cce2ca285368432b7d00b9cd702a4f8a1c9d69914ba6f65e08099e151e407
+SIZE (IBMQuantumExperience-1.9.1.tar.gz) = 12770
--- a/devel/py-asyncio/Makefile
+++ b/devel/py-asyncio/Makefile
@ -15,8 +15,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 USES=		python:3.3+
 USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes

-regression-test: build
+do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test

 .include <bsd.port.mk>
--- a/devel/py-cbor/Makefile
+++ b/devel/py-cbor/Makefile
@ -0,0 +1,21 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	cbor
+PORTVERSION=	1.0.0
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	RFC 7049 - Concise Binary Object Representation
+
+LICENSE=	APACHE20
+
+USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cbor/_cbor.so
+
+.include <bsd.port.mk>
--- a/devel/py-cbor/distinfo
+++ b/devel/py-cbor/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1523535472
+SHA256 (cbor-1.0.0.tar.gz) = 13225a262ddf5615cbd9fd55a76a0d53069d18b07d2e9f19c39e6acb8609bbb6
+SIZE (cbor-1.0.0.tar.gz) = 20096
--- a/devel/py-cbor/pkg-descr
+++ b/devel/py-cbor/pkg-descr
@ -0,0 +1,13 @@
+An implementation of RFC 7049 - Concise Binary Object Representation (CBOR).
+
+CBOR is comparable to JSON, has a superset of JSON's ability, but serializes to
+a binary format which is smaller and faster to generate and parse.
+
+The two primary functions are cbor.loads() and cbor.dumps().
+
+This library includes a C implementation which runs 3-5 times faster than the
+Python standard library's C-accelerated implementanion of JSON. This is also
+includes a 100% Python implementation.
+
+WWW: https://pypi.org/project/cbor/
+WWW: https://bitbucket.org/bodhisnarkva/cbor
--- a/devel/py-pipenv/Makefile
+++ b/devel/py-pipenv/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	pipenv
-PORTVERSION=	11.10.1
-PORTREVISION=	1
+PORTVERSION=	11.10.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -27,10 +26,7 @@ USES=		python
 .include <bsd.port.pre.mk>

 .if ${PYTHON_REL} < 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pathlib2>=2.1.0:devel/py-pathlib2@${FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${FLAVOR}
 .endif

-post-patch:
-	@${REINPLACE_CMD} -e 's|pathlib2==2.1.0|pathlib2>=2.1.0|' ${WRKSRC}/setup.py ${WRKSRC}/pipenv.egg-info/requires.txt
-
 .include <bsd.port.post.mk>
--- a/devel/py-pipenv/distinfo
+++ b/devel/py-pipenv/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1524918155
-SHA256 (pipenv-11.10.1.tar.gz) = 9acfd4d4b6a36e35ec3d255211224506c9983c30e4b57b3047e61d690c2d82cb
-SIZE (pipenv-11.10.1.tar.gz) = 5879529
+TIMESTAMP = 1525792855
+SHA256 (pipenv-11.10.2.tar.gz) = 05cbbf62cf2462ad4153fd7aa217debc84e29d45caeb02435949fdf7034f986b
+SIZE (pipenv-11.10.2.tar.gz) = 5950137
--- a/devel/py-py-ubjson/Makefile
+++ b/devel/py-py-ubjson/Makefile
@ -0,0 +1,22 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	py-ubjson
+PORTVERSION=	0.11.0
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Universal Binary JSON encoder/decoder
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_ubjson.so
+
+.include <bsd.port.mk>
--- a/devel/py-py-ubjson/distinfo
+++ b/devel/py-py-ubjson/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1523535606
+SHA256 (py-ubjson-0.11.0.tar.gz) = 81784e64936c12e218afc49ff4fb90702f298ac16848971d9570c87595860762
+SIZE (py-ubjson-0.11.0.tar.gz) = 45473
--- a/devel/py-py-ubjson/pkg-descr
+++ b/devel/py-py-ubjson/pkg-descr
@ -0,0 +1,5 @@
+This is a Python Universal Binary JSON encoder/decoder based on the draft-12
+specification.
+
+WWW: https://github.com/Iotic-Labs/py-ubjson
+WWW: https://pypi.org/project/py-ubjson/
--- a/devel/py-u-msgpack-python/Makefile
+++ b/devel/py-u-msgpack-python/Makefile
@ -0,0 +1,20 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	u-msgpack-python
+PORTVERSION=	2.5.0
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Portable, lightweight MessagePack (de)serializer
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+NO_ARCH=	yes
+USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+
+.include <bsd.port.mk>
--- a/devel/py-u-msgpack-python/distinfo
+++ b/devel/py-u-msgpack-python/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1523534361
+SHA256 (u-msgpack-python-2.5.0.tar.gz) = 7ff18ae3721fa75571f9329c08f7c0120416a6ae36194bd8674f65b3b78d0702
+SIZE (u-msgpack-python-2.5.0.tar.gz) = 16012
--- a/devel/py-u-msgpack-python/pkg-descr
+++ b/devel/py-u-msgpack-python/pkg-descr
@ -0,0 +1,8 @@
+u-msgpack-python is a lightweight MessagePack serializer and deserializer module
+written in pure Python, compatible with both Python 2 and Python 3, as well as
+CPython and PyPy implementations of Python. u-msgpack-python is fully compliant
+with the latest MessagePack specification. In particular, it supports the new
+binary, UTF-8 string, application-defined ext, and timestamp types.
+
+WWW: https://pypi.org/project/u-msgpack-python/
+WWW: https://github.com/vsergeev/u-msgpack-python
--- a/devel/rubygem-aws-sdk-core/Makefile
+++ b/devel/rubygem-aws-sdk-core/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	aws-sdk-core
-DISTVERSION=	2.11.43
+DISTVERSION=	2.11.44
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

--- a/devel/rubygem-aws-sdk-core/distinfo
+++ b/devel/rubygem-aws-sdk-core/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1525599909
-SHA256 (rubygem/aws-sdk-core-2.11.43.gem) = a3bb1d4a5cdf6898becb8955d1f035f2b815609c8593393b51f2121762a70575
-SIZE (rubygem/aws-sdk-core-2.11.43.gem) = 1236992
+TIMESTAMP = 1525792883
+SHA256 (rubygem/aws-sdk-core-2.11.44.gem) = fe9a53bb66dd0406b205fe1d88cec53174942951c94fb5b2393fca08c309f267
+SIZE (rubygem/aws-sdk-core-2.11.44.gem) = 1238016
--- a/devel/rubygem-aws-sdk-resources/Makefile
+++ b/devel/rubygem-aws-sdk-resources/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	aws-sdk-resources
-DISTVERSION=	2.11.43
+DISTVERSION=	2.11.44
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

--- a/devel/rubygem-aws-sdk-resources/distinfo
+++ b/devel/rubygem-aws-sdk-resources/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1525599919
-SHA256 (rubygem/aws-sdk-resources-2.11.43.gem) = 52f364c18288c16bf1d7f07d7be0eb7c96d1a296ebd532dccbdcde06b706229b
-SIZE (rubygem/aws-sdk-resources-2.11.43.gem) = 48640
+TIMESTAMP = 1525792896
+SHA256 (rubygem/aws-sdk-resources-2.11.44.gem) = 19ac0e95df9fc704f3c78a697b402b62738d37b2909399dd1d1d1eaac9be6e02
+SIZE (rubygem/aws-sdk-resources-2.11.44.gem) = 48640
--- a/devel/rubygem-aws-sdk/Makefile
+++ b/devel/rubygem-aws-sdk/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	aws-sdk
-DISTVERSION=	2.11.43
+DISTVERSION=	2.11.44
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

--- a/devel/rubygem-aws-sdk/distinfo
+++ b/devel/rubygem-aws-sdk/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1525599928
-SHA256 (rubygem/aws-sdk-2.11.43.gem) = a329560ed69571ad0d6056d7ca82cfbd0d9d891ab378cd7c482c7370cf8d6e6e
-SIZE (rubygem/aws-sdk-2.11.43.gem) = 4608
+TIMESTAMP = 1525792909
+SHA256 (rubygem/aws-sdk-2.11.44.gem) = f3b81949a7a35f7c4c905d044061d66cd61e9282a23dbec35f4eb2064773c933
+SIZE (rubygem/aws-sdk-2.11.44.gem) = 4608
--- a/devel/rubygem-diva/Makefile
+++ b/devel/rubygem-diva/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	diva
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

--- a/devel/rubygem-diva/distinfo
+++ b/devel/rubygem-diva/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1515988721
-SHA256 (rubygem/diva-0.3.1.gem) = a8b5151497db49a12778401e20fe3405596a7d3a6a888be98124ec016b20ef58
-SIZE (rubygem/diva-0.3.1.gem) = 13824
+TIMESTAMP = 1525691525
+SHA256 (rubygem/diva-0.3.2.gem) = 8d202ef311a94af28d7b2c3b63322f1dd678db154551d40fc6f260da5e11e166
+SIZE (rubygem/diva-0.3.2.gem) = 13824
--- a/games/xtris/pkg-descr
+++ b/games/xtris/pkg-descr
@ -4,5 +4,3 @@ players, for the X Window system.
 xtris is a true client/server game (as opposed to a centralized game
 managing multiple displays), which makes it particularily responsive and
 bandwith-effective.
-
-WWW: http://www.iagora.com/~espel/xtris/xtris.html
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	cimg
 DISTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	graphics devel

@ -64,7 +64,7 @@ LIB_DEPENDS+=	libcurl.so:ftp/curl			\
 		libIlmImf.so:graphics/OpenEXR		\
 		libgimp-2.0.so:graphics/gimp-app	\
 		libfftw3.so:math/fftw3			\
-		libopencv_legacy.so:graphics/opencv	\
+		libopencv_video.so:graphics/opencv	\
 		libopencv_core.so:graphics/opencv-core	\
 		libGraphicsMagick.so:graphics/GraphicsMagick
 USES+=		jpeg
--- a/graphics/cimg/files/patch-examples__Makefile
+++ b/graphics/cimg/files/patch-examples__Makefile
@ -85,7 +85,7 @@
 BOARD_LIBS = -lboard
 
 +# Flags to compile on FreeBSD
-+FREEBSD_LDFLAGS = $(LDFLAGS) -ansi -ffast-math  -I$(X11PATH)/include $(EXTRA_FLAGS) -lX11 -L$(X11PATH)/lib
+FREEBSD_LDFLAGS = $(LDFLAGS) -ffast-math  -I$(X11PATH)/include $(EXTRA_FLAGS) -lX11 -L$(X11PATH)/lib
 +
 # Flags to compile on Sun Solaris
 SOLARIS_LIBS = -R$(X11PATH)/lib -lrt -lnsl -lsocket
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	digikam
 PORTVERSION=	${DIGIKAM_VER}
-PORTREVISION=	14
+PORTREVISION=	15
 PORTEPOCH=	2
 CATEGORIES=	graphics kde
 PKGNAMESUFFIX=	-kde4
@ -19,7 +19,7 @@ LIB_DEPENDS=	libtiff.so:graphics/tiff \
 		libjasper.so:graphics/jasper \
 		liblensfun.so:graphics/lensfun \
 		liblqr-1.so:graphics/liblqr-1 \
-		libkface.so:graphics/libkface \
+		libopencv_video.so:graphics/opencv \
 		libpgf.so:graphics/libpgf \
 		libkgeomap.so:astro/libkgeomap-kde4 \
 		libboost_graph.so:devel/boost-libs
@ -28,7 +28,7 @@ USES+=		eigen:3 pkgconfig shebangfix
 USE_KDE+=	libkdcraw libkexiv2 libkipi runtime_run
 USE_QT4+=	sql-sqlite3_run
 USE_LDCONFIG=	yes
-CMAKE_ARGS+=	-DWITH_Sqlite2:BOOL=OFF
+CMAKE_ARGS+=	-DWITH_Sqlite2:BOOL=OFF -DENABLE_OPENCV3:BOOL=true

 WRKSRC=		${WRKDIR}/${DISTNAME}/core
 SHEBANG_FILES=	data/scripts/digitaglinktree/digitaglinktree
--- a/graphics/digikam-kde4/Makefile.common
+++ b/graphics/digikam-kde4/Makefile.common
@ -6,7 +6,6 @@
 #	graphics/digikam-kde4-l10n
 #	graphics/kipi-plugin-*
 #	graphics/kipi-plugins-kde4
-#	graphics/libkface
 #	graphics/libkipiplugins
 # These ports now lead independent lives:
 #	astro/libkgeomap-kde4 (part of KDE Applications)
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	digikam
 DISTVERSION=	5.9.0
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
 DIST_SUBDIR=	KDE/digikam/${PORTVERSION}
@ -23,7 +24,7 @@ LIB_DEPENDS=	libKF5KGeoMap.so:astro/libkgeomap \
 		liblcms2.so:graphics/lcms2 \
 		liblensfun.so:graphics/lensfun \
 		liblqr-1.so:graphics/liblqr-1 \
-		libopencv_contrib.so:graphics/opencv \
+		libopencv_video.so:graphics/opencv \
 		libopencv_core.so:graphics/opencv-core \
 		libpgf.so:graphics/libpgf \
 		libpng.so:graphics/png \
@ -49,9 +50,8 @@ SHEBANG_FILES=	core/data/scripts/digitaglinktree/digitaglinktree

 # Disable kipiplugins, as they are built in their own port: graphics/kipiplugins.
 # Remember to keep that port in sync with this one.
-CMAKE_ON=	DIGIKAMSC_COMPILE_DIGIKAM
-CMAKE_OFF=	DIGIKAMSC_COMPILE_KIPIPLUGINS \
-		ENABLE_OPENCV3
+CMAKE_ON=	DIGIKAMSC_COMPILE_DIGIKAM ENABLE_OPENCV3
+CMAKE_OFF=	DIGIKAMSC_COMPILE_KIPIPLUGINS

 OPTIONS_DEFINE=		DOCS MULTIMEDIA MYSQL NLS
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
--- a/graphics/facedetect/Makefile
+++ b/graphics/facedetect/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	facedetect
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics

@ -13,7 +13,7 @@ COMMENT=	Simple face detector for batch processing
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt

-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cv2.so:graphics/py-opencv

 USES=		python:2.7,run shebangfix
 USE_GITHUB=	yes
--- a/graphics/frei0r/Makefile
+++ b/graphics/frei0r/Makefile
@ -29,11 +29,11 @@ USES+=	localbase
 .endif

 .if defined(BUILDING_FREI0R_OPENCV)
-PORTREVISION=	0
+PORTREVISION=	1
 COMMENT=	Frei0r OpenCV plugins
 PKGNAMESUFFIX=	-plugins-opencv
 LIB_DEPENDS+=	libopencv_core.so:graphics/opencv-core \
-		libopencv_legacy.so:graphics/opencv
+		libopencv_video.so:graphics/opencv
 FREI0R_PLUGINS=	facebl0r facedetect

 CMAKE_ARGS+=	-DWITHOUT_OPENCV:BOOL=OFF \
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	gmic
 PORTVERSION=	1.6.9
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	graphics
 MASTER_SITES=	http://gmic.eu/files/source/
 PKGNAMEPREFIX=	gimp-
@ -14,7 +14,7 @@ COMMENT=	GREYC's Magic Image Converter

 LIB_DEPENDS=	libGraphicsMagick++.so:graphics/GraphicsMagick \
 		libIlmImf.so:graphics/OpenEXR \
-		libopencv_legacy.so:graphics/opencv \
+		libopencv_video.so:graphics/opencv \
 		libMagick++-6.so:graphics/ImageMagick \
 		libavcodec.so:multimedia/ffmpeg \
 		libfftw3.so:math/fftw3 \
--- a/graphics/kipi-plugin-removeredeyes/Makefile
+++ b/graphics/kipi-plugin-removeredeyes/Makefile
@ -2,17 +2,18 @@

 PORTNAME=	kipi-plugin-${KIPI_PLUGIN}
 PORTVERSION=	${DIGIKAM_VER}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics kde

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}

-LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv
+LIB_DEPENDS=	libopencv_video.so:graphics/opencv
 # Ensure -L${LOCALBASE}/lib is in the linker flags, as 
 # the cmake files do not properly handle opencv with tbb
 # enabled.
 USES+=		localbase:ldflags
+CMAKE_ON=	ENABLE_OPENCV3

 KIPI_PLUGIN=	removeredeyes
 .include "${.CURDIR}/../digikam-kde4/Makefile.common"
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	krita
-DISTVERSION=	4.0.1
+DISTVERSION=	4.0.2
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}
 DIST_SUBDIR=	KDE/${PORTNAME}
--- a/graphics/krita/distinfo
+++ b/graphics/krita/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1523646176
-SHA256 (KDE/krita/krita-4.0.1.tar.gz) = ec0ae3afd6670a6f2102614d36a6b24a4968d7e9d13e8f1de90d1065f7f2a54c
-SIZE (KDE/krita/krita-4.0.1.tar.gz) = 237493152
+TIMESTAMP = 1525801099
+SHA256 (KDE/krita/krita-4.0.2.tar.gz) = 8e013b09ec38dbf2d0401a74e868749b9d60e66d89094dc7fc2c51f48d8ad68c
+SIZE (KDE/krita/krita-4.0.2.tar.gz) = 237610294
--- a/graphics/libkface/Makefile
+++ b/graphics/libkface/Makefile
@ -10,6 +10,9 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE4 library for face recognition

+DEPRECATED=	No longer maintained upstream
+EXPIRATION_DATE=	2018-06-07
+
 LICENSE=	GPLv2+ LGPL20+
 LICENSE_COMB=	multi

--- a/graphics/opencv-core/Makefile
+++ b/graphics/opencv-core/Makefile
@ -1,7 +1,7 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$

-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-${OCV_SLAVE}

 COMMENT=	OpenCV core libraries
--- a/graphics/opencv-core/pkg-plist
+++ b/graphics/opencv-core/pkg-plist
@ -1,30 +1,119 @@
 include/opencv2/core.hpp
 include/opencv2/core/affine.hpp
-include/opencv2/core/core.hpp
+include/opencv2/core/base.hpp
+include/opencv2/core/bufferpool.hpp
 include/opencv2/core/core_c.h
-include/opencv2/core/cuda_devptrs.hpp
-include/opencv2/core/devmem2d.hpp
+include/opencv2/core/core.hpp
+include/opencv2/core/cuda_stream_accessor.hpp
+include/opencv2/core/cuda_types.hpp
+include/opencv2/core/cuda.hpp
+include/opencv2/core/cuda.inl.hpp
+include/opencv2/core/cuda/block.hpp
+include/opencv2/core/cuda/border_interpolate.hpp
+include/opencv2/core/cuda/color.hpp
+include/opencv2/core/cuda/common.hpp
+include/opencv2/core/cuda/datamov_utils.hpp
+include/opencv2/core/cuda/detail/color_detail.hpp
+include/opencv2/core/cuda/detail/reduce_key_val.hpp
+include/opencv2/core/cuda/detail/reduce.hpp
+include/opencv2/core/cuda/detail/transform_detail.hpp
+include/opencv2/core/cuda/detail/type_traits_detail.hpp
+include/opencv2/core/cuda/detail/vec_distance_detail.hpp
+include/opencv2/core/cuda/dynamic_smem.hpp
+include/opencv2/core/cuda/emulation.hpp
+include/opencv2/core/cuda/filters.hpp
+include/opencv2/core/cuda/funcattrib.hpp
+include/opencv2/core/cuda/functional.hpp
+include/opencv2/core/cuda/limits.hpp
+include/opencv2/core/cuda/reduce.hpp
+include/opencv2/core/cuda/saturate_cast.hpp
+include/opencv2/core/cuda/scan.hpp
+include/opencv2/core/cuda/simd_functions.hpp
+include/opencv2/core/cuda/transform.hpp
+include/opencv2/core/cuda/type_traits.hpp
+include/opencv2/core/cuda/utility.hpp
+include/opencv2/core/cuda/vec_distance.hpp
+include/opencv2/core/cuda/vec_math.hpp
+include/opencv2/core/cuda/vec_traits.hpp
+include/opencv2/core/cuda/warp_reduce.hpp
+include/opencv2/core/cuda/warp_shuffle.hpp
+include/opencv2/core/cuda/warp.hpp
+include/opencv2/core/cv_cpu_dispatch.h
+include/opencv2/core/cv_cpu_helper.h
+include/opencv2/core/cvdef.h
+include/opencv2/core/cvstd.hpp
+include/opencv2/core/cvstd.inl.hpp
+include/opencv2/core/directx.hpp
 include/opencv2/core/eigen.hpp
-include/opencv2/core/gpumat.hpp
-include/opencv2/core/internal.hpp
+include/opencv2/core/fast_math.hpp
+include/opencv2/core/hal/hal.hpp
+include/opencv2/core/hal/interface.h
+include/opencv2/core/hal/intrin_cpp.hpp
+include/opencv2/core/hal/intrin_neon.hpp
+include/opencv2/core/hal/intrin_sse.hpp
+include/opencv2/core/hal/intrin_vsx.hpp
+include/opencv2/core/hal/intrin.hpp
+include/opencv2/core/opencl/ocl_defs.hpp
+include/opencv2/core/opencl/opencl_info.hpp
+include/opencv2/core/opencl/opencl_svm.hpp
+include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdblas.hpp
+include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdfft.hpp
+include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
+include/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp
+include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
+include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
+include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp
+include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp
+include/opencv2/core/opencl/runtime/opencl_core.hpp
+include/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp
+include/opencv2/core/opencl/runtime/opencl_gl.hpp
+include/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp
+include/opencv2/core/opencl/runtime/opencl_svm_20.hpp
+include/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp
+include/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp
+include/opencv2/core/ippasync.hpp
 include/opencv2/core/mat.hpp
-include/opencv2/core/opengl_interop.hpp
-include/opencv2/core/opengl_interop_deprecated.hpp
+include/opencv2/core/mat.inl.hpp
+include/opencv2/core/matx.hpp
+include/opencv2/core/neon_utils.hpp
+include/opencv2/core/ocl_genbase.hpp
+include/opencv2/core/ocl.hpp
+include/opencv2/core/opengl.hpp
 include/opencv2/core/operations.hpp
+include/opencv2/core/optim.hpp
+include/opencv2/core/ovx.hpp
+include/opencv2/core/persistence.hpp
+include/opencv2/core/ptr.inl.hpp
+include/opencv2/core/saturate.hpp
+include/opencv2/core/softfloat.hpp
+include/opencv2/core/sse_utils.hpp
+include/opencv2/core/traits.hpp
 include/opencv2/core/types_c.h
+include/opencv2/core/types.hpp
+include/opencv2/core/utility.hpp
+include/opencv2/core/utils/filesystem.hpp
+include/opencv2/core/utils/logger.defines.hpp
+include/opencv2/core/utils/logger.hpp
+include/opencv2/core/utils/trace.hpp
+include/opencv2/core/va_intel.hpp
 include/opencv2/core/version.hpp
+include/opencv2/core/vsx_utils.hpp
 include/opencv2/core/wimage.hpp
+include/opencv2/cvconfig.h
 include/opencv2/imgproc.hpp
-include/opencv2/imgproc/imgproc.hpp
+include/opencv2/imgproc/detail/distortion_model.hpp
+include/opencv2/imgproc/hal/hal.hpp
+include/opencv2/imgproc/hal/interface.h
 include/opencv2/imgproc/imgproc_c.h
+include/opencv2/imgproc/imgproc.hpp
 include/opencv2/imgproc/types_c.h
@comment include/opencv2/opencv.hpp
@comment include/opencv2/opencv_modules.hpp
 lib/libopencv_core.so
-lib/libopencv_core.so.2
+lib/libopencv_core.so.%%SOVERSION%%
 lib/libopencv_core.so.%%VERSION%%
 lib/libopencv_imgproc.so
-lib/libopencv_imgproc.so.2
+lib/libopencv_imgproc.so.%%SOVERSION%%
 lib/libopencv_imgproc.so.%%VERSION%%
 libdata/pkgconfig/opencv-core.pc
 share/cmake/Modules/FindOpenCVCore.cmake
--- a/graphics/opencv-java/Makefile
+++ b/graphics/opencv-java/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics java
 PKGNAMESUFFIX=	-${OCV_SLAVE}

@ -11,6 +11,6 @@ OCV_JAVA=	yes
 MASTERDIR=	${.CURDIR:H}/opencv
 PLIST=		${.CURDIR}/pkg-plist

-PLIST_SUB+=	OCV_VER=${DISTVERSION:R:S|.||g}
+PLIST_SUB+=	OCV_VER=${DISTVERSION:S|.||g}

 .include "${MASTERDIR}/Makefile"
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@ -1,9 +1,8 @@
 # Created by: Marc Abramowitz (http://marc.abramowitz.info)
 # $FreeBSD$

-PORTNAME?=	opencv
-PORTVERSION=	2.4.13.1
-PORTREVISION?=	10
+PORTNAME=	opencv
+PORTVERSION=	3.4.1
 CATEGORIES=	graphics

 MAINTAINER=	ports@FreeBSD.org
@ -12,79 +11,185 @@ COMMENT=	Open Source Computer Vision library
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

-USE_GITHUB=	yes
-
-USES=		cmake pkgconfig
-USE_LDCONFIG=	yes
-
 NOT_FOR_ARCHS=	sparc64
 NOT_FOR_ARCHS_REASON_sparc64=	does not compile on sparc64

-DATADIR=	${PREFIX}/share/OpenCV
-PLIST_SUB+=	VERSION=${DISTVERSION:R}
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf \
+		libtesseract.so:graphics/tesseract

-CMAKE_ARGS+=	-DWITH_CUDA:BOOL=Off \
-		-DWITH_PVAPI:BOOL=Off \
-		-DWITH_UNICAP:BOOL=Off \
-		-DBUILD_TESTS:BOOL=Off \
-		-DBUILD_DOCS:BOOL=Off \
-		-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_CMD}
+USES=		cmake:outsource compiler:c++14-lang localbase:ldflags pkgconfig
+
+USE_GITHUB=	yes
+USE_LDCONFIG=	yes
+USE_CXXSTD=	c++11
+
+DATADIR=	${PREFIX}/share/OpenCV
+PLIST_SUB+=	SOVERSION=${DISTVERSION:R} VERSION=${DISTVERSION}
+
+# 3rd party libs
+CMAKE_ON=	ENABLE_CXX11
+CMAKE_OFF=	BUILD_ZLIB BUILD_TIFF BUILD_JASPER BUILD_JPEG BUILD_PNG BUILD_OPENEXR BUILD_TBB BUILD_IPP_IW BUILD_ITT BUILD_PROTOBUF
+# Optional 3rd party components
+CMAKE_ARGS+=	-DWITH_1394:BOOL=OFF \
+		-DWITH_CAROTENE:BOOL=OFF \
+		-DWITH_CPUFEATURES:BOOL=OFF \
+		-DWITH_VTK:BOOL=OFF \
+		-DWITH_CUDA:BOOL=OFF \
+		-DWITH_CUFFT:BOOL=OFF \
+		-DWITH_CUBLAS:BOOL=OFF \
+		-DWITH_NVCUVID:BOOL=OFF \
+		-DWITH_EIGEN:BOOL=OFF \
+		-DWITH_VFW:BOOL=OFF \
+		-DWITH_FFMPEG:BOOL=OFF \
+		-DWITH_GSTREAMER:BOOL=OFF \
+		-DWITH_GSTREAMER_0_10:BOOL=OFF \
+		-DWITH_GTK:BOOL=OFF \
+		-DWITH_GTK_2_X:BOOL=ON \
+		-DWITH_IPP:BOOL=OFF \
+		-DWITH_IPP_A:BOOL=OFF \
+		-DWITH_HALIDE:BOOL=OFF \
+		-DWITH_JASPER:BOOL=OFF \
+		-DWITH_JPEG:BOOL=OFF \
+		-DWITH_WEBP:BOOL=OFF \
+		-DWITH_OPENEXR:BOOL=OFF \
+		-DWITH_OPENGL:BOOL=OFF \
+		-DWITH_OPENVX:BOOL=OFF \
+		-DWITH_OPENNI:BOOL=OFF \
+		-DWITH_OPENNI2:BOOL=OFF \
+		-DWITH_PNG:BOOL=OFF \
+		-DWITH_GDCM:BOOL=OFF \
+		-DWITH_PVAPI:BOOL=OFF \
+		-DWITH_GIGEAPI:BOOL=OFF \
+		-DWITH_ARAVIS:BOOL=OFF \
+		-DWITH_QT:BOOL=OFF \
+		-DWITH_WIN32UI:BOOL=OFF \
+		-DWITH_TBB:BOOL=OFF \
+		-DWITH_OPENMP:BOOL=OFF \
+		-DWITH_CSTRIPES:BOOL=ON \
+		-DWITH_PTHREADS_PF:BOOL=OFF \
+		-DWITH_TIFF:BOOL=OFF \
+		-DWITH_UNICAP:BOOL=OFF \
+		-DWITH_V4L:BOOL=OFF \
+		-DWITH_LIBV4L:BOOL=OFF \
+		-DWITH_DSHOW:BOOL=OFF \
+		-DWITH_MSMF:BOOL=OFF \
+		-DWITH_XIMEA:BOOL=OFF \
+		-DWITH_XINE:BOOL=OFF \
+		-DWITH_CLP:BOOL=OFF \
+		-DWITH_OPENCL:BOOL=OFF \
+		-DWITH_OPENCL_SVM:BOOL=OFF \
+		-DWITH_OPENCLAMDFFT:BOOL=OFF \
+		-DWITH_OPENCLAMDBLAS:BOOL=OFF \
+		-DWITH_DIRECTX:BOOL=OFF \
+		-DWITH_INTELPERC:BOOL=OFF \
+		-DWITH_MATLAB:BOOL=OFF \
+		-DWITH_VA:BOOL=OFF \
+		-DWITH_VA_INTEL:BOOL=OFF \
+		-DWITH_MFX:BOOL=OFF \
+		-DWITH_GDAL:BOOL=OFF \
+		-DWITH_GPHOTO2:BOOL=OFF \
+		-DWITH_LAPACK:BOOL=OFF \
+		-DWITH_ITT:BOOL=OFF
+# OpenCV build components
+CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON \
+		-DBUILD_opencv_apps:BOOL=ON \
+		-DBUILD_opencv_js:BOOL=OFF \
+		-DBUILD_ANDROID_EXAMPLES:BOOL=OFF \
+		-DBUILD_DOCS:BOOL=OFF \
+		-DBUILD_EXAMPLES:BOOL=OFF \
+		-DBUILD_PACKAGE:BOOL=OFF \
+		-DBUILD_PERF_TESTS:BOOL=OFF \
+		-DBUILD_TESTS:BOOL=OFF \
+		-DBUILD_WITH_DEBUG_INFO:BOOL=OFF \
+		-DBUILD_WITH_DYNAMIC_IPP:BOOL=OFF \
+		-DBUILD_FAT_JAVA_LIB:BOOL=OFF \
+		-DBUILD_CUDA_STUBS:BOOL=OFF \
+		-DBUILD_ANDROID_SERVICE:BOOL=OFF \
+		-DBUILD_opencv_ts:BOOL=OFF \
+		-DBUILD_opencv_cnn_3dobj_INIT:BOOL=OFF \
+		-DBUILD_opencv_world:BOOL=OFF
+# OpenCV installation options
+CMAKE_ARGS+=	-DINSTALL_CREATE_DISTRIB:BOOL=OFF \
+		-DINSTALL_C_EXAMPLES:BOOL=OFF \
+		-DINSTALL_PYTHON_EXAMPLES:BOOL=OFF \
+		-DINSTALL_TO_MANGLED_PATHS:BOOL=OFF \
+		-DINSTALL_TESTS:BOOL=OFF
+# OpenCV build options
+CMAKE_ARGS+=	-DENABLE_CCACHE:BOOL=OFF \
+		-DENABLE_PRECOMPILED_HEADERS:BOOL=OFF \
+		-DENABLE_SOLUTION_FOLDERS:BOOL=OFF \
+		-DENABLE_PROFILING:BOOL=OFF \
+		-DENABLE_COVERAGE:BOOL=OFF \
+		-DENABLE_OMIT_FRAME_POINTER:BOOL=ON \
+		-DENABLE_POWERPC:BOOL=OFF \
+		-DENABLE_VSX:BOOL=OFF \
+		-DENABLE_FAST_MATH:BOOL=OFF \
+		-DENABLE_NEON:BOOL=OFF \
+		-DENABLE_VFPV3:BOOL=OFF \
+		-DENABLE_NOISY_WARNINGS:BOOL=OFF \
+		-DOPENCV_WARNINGS_ARE_ERRORS:BOOL=OFF \
+		-DENABLE_IMPL_COLLECTION:BOOL=OFF \
+		-DENABLE_INSTRUMENTATION:BOOL=OFF \
+		-DENABLE_GNU_STL_DEBUG:BOOL=OFF \
+		-DENABLE_BUILD_HARDENING:BOOL=OFF \
+		-DENABLE_LTO:BOOL=OFF \
+		-DGENERATE_ABI_DESCRIPTOR:BOOL=OFF \
+		-DCV_ENABLE_INTRINSICS:BOOL=ON \
+		-DCV_DISABLE_OPTIMIZATION:BOOL=OFF \
+		-DCV_TRACE:BOOL=OFF \
+		-DENABLE_PYLINT:BOOL=OFF

 SUB_FILES=	FindOpenCVCore.cmake
-SUB_LIST=	OCV_VERSION=${DISTVERSION:R}
+SUB_LIST=	OCV_VERSION=${DISTVERSION}

 OCV_CORE_MODS=		core imgproc
-OCV_MODS=		calib3d contrib features2d flann gpu \
-			highgui legacy ml ocl objdetect photo \
-			stitching superres ts video videostab
-OCV_NONFREE_MODS=	nonfree
+OCV_MODS=		apps calib3d contrib dnn features2d flann highgui \
+			imgcodecs ml objdetect photo shape stitching \
+			superres ts video videoio videostab
 OCV_JAVA_MODS=		java
-OCV_PYTHON_MODS=	python
+OCV_PYTHON_MODS=	python${PYTHON_MAJOR_VER}

-OPTIONS_DEFINE=		DC1394 EXAMPLES NONFREE OPENGL
-OPTIONS_GROUP=		IMAGE PERFORMANCE SIMD VIDEO
-OPTIONS_GROUP_IMAGE=	JASPER JPEG OPENEXR PNG TIFF
-OPTIONS_GROUP_PERFORMANCE=	EIGEN3 TBB
-OPTIONS_GROUP_SIMD=	${OPTIONS_GROUP_SIMD_${MACHINE_ARCH}}
-OPTIONS_GROUP_SIMD_amd64=	${OPTIONS_GROUP_SIMD_i386}
-OPTIONS_GROUP_SIMD_armv6=	NEON VFPV3
-#OPTIONS_GROUP_SIMD_armv7=	NEON VFPV3
-OPTIONS_GROUP_SIMD_i386=	SSE SSE2 SSE3 SSSE3 SSE41 SSE42 AVX AVX2
-OPTIONS_GROUP_VIDEO=	FFMPEG GSTREAMER GSTREAMER0 V4L XINE
+OPTIONS_DEFINE=		EXAMPLES EXTRA_MODULES OPENGL
+OPTIONS_GROUP=		PERFORMANCE IMAGE VIDEO
+OPTIONS_GROUP_PERFORMANCE=	EIGEN3 OPENCL TBB
+OPTIONS_GROUP_IMAGE=	GDAL GDCM JASPER JPEG OPENEXR PNG TIFF WEBP
+OPTIONS_GROUP_VIDEO=	ARAVIS DC1394 FFMPEG GPHOTO2 GSTREAMER V4L XINE
 OPTIONS_RADIO=		GUI
 OPTIONS_RADIO_GUI=	GTK2 QT4
-OPTIONS_DEFAULT=	EIGEN3 JASPER JPEG PNG TIFF V4L ${MACHINE_CPU:tu}
+# EXTRA_MODULES required for libopencv_dnn which is required by py-opencv
+OPTIONS_DEFAULT=	EIGEN3 EXTRA_MODULES FFMPEG JASPER JPEG PNG TIFF WEBP V4L \
+			${MACHINE_CPU:tu}
 OPTIONS_SUB=		yes
 .if defined(OCV_CORE)
-OPTIONS_EXCLUDE=	DC1394 EXAMPLES GTK2 QT4 JASPER JPEG NONFREE OPENEXR \
-			OPENGL PNG TIFF FFMPEG GSTREAMER GSTREAMER0 V4L XINE
+OPTIONS_EXCLUDE=	ARAVIS DC1394 EXAMPLES EXTRA_MODULES FFMPEG \
+			GDAL GDCM GPHOTO2 GSTREAMER GTK2 JASPER JPEG \
+			OPENEXR OPENGL PNG QT4 TIFF WEBP V4L XINE
+.elif defined(OCV_SLAVE)
+OPTIONS_EXCLUDE=	EXAMPLES
 .endif

 DC1394_DESC=		IEEE 1394 camera support
 DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
 DC1394_CMAKE_BOOL=	WITH_1394

+EXAMPLES_CMAKE_BOOL=	INSTALL_C_EXAMPLES
+
+PERFORMANCE_DESC=	Performance enhancing libraries
+
 EIGEN3_DESC=		Eigen 3 support
-EIGEN3_USES=		eigen:3
+EIGEN3_BUILD_DEPENDS=	${LOCALBASE}/include/eigen3/Eigen/Eigen:math/eigen3
 EIGEN3_CMAKE_BOOL=	WITH_EIGEN

-. if !defined(OCV_SLAVE)
-EXAMPLES_CMAKE_BOOL=	BUILD_EXAMPLES INSTALL_C_EXAMPLES
-. endif
-EXAMPLES_PORTEXAMPLES=	*
+OPENCL_DESC=		OpenCL support
+OPENCL_BUILD_DEPENDS=	opencl>=0:devel/opencl
+OPENCL_RUN_DEPENDS=	opencl>=0:devel/opencl
+OPENCL_CMAKE_BOOL=	WITH_OPENCL

-FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
-FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
+TBB_DESC=		TBB support
+TBB_LIB_DEPENDS=	libtbb.so:devel/tbb
+TBB_CMAKE_BOOL=		WITH_TBB

-GSTREAMER0_DESC=	${GSTREAMER_DESC} 0.10
-GSTREAMER0_USE=		GSTREAMER=yes
-GSTREAMER0_CMAKE_BOOL=	WITH_GSTREAMER_0_10
-
-GSTREAMER_USE=		GSTREAMER1=yes
-GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER
-
-GTK2_USE=		GNOME=gtk20
-GTK2_CMAKE_BOOL=	WITH_GTK
+IMAGE_DESC=		Image format support

 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 JASPER_CMAKE_BOOL=	WITH_JASPER
@ -92,88 +197,144 @@ JASPER_CMAKE_BOOL=	WITH_JASPER
 JPEG_USES=		jpeg
 JPEG_CMAKE_BOOL=	WITH_JPEG

-NONFREE_CMAKE_BOOL=	BUILD_opencv_nonfree
+GDAL_DESC=		Geospatial Data Abstraction Library
+GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
+GDAL_CMAKE_BOOL=	WITH_GDAL
+
+GDCM_DESC=		Open source DICOM library
+GDCM_LIB_DEPENDS=	libgdcmMSFF.so:devel/gdcm
+GDCM_CMAKE_BOOL=	WITH_GDCM

 OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR
 OPENEXR_CMAKE_BOOL=	WITH_OPENEXR

-OPENGL_LIB_DEPENDS=	${PORT_OPTIONS:MGTK2:C,.+,libgtkglext-x11-1.0.so:x11-toolkits/gtkglext,}
-OPENGL_USE=		${PORT_OPTIONS:MQT4:S,$,=opengl,}
-OPENGL_CMAKE_BOOL=	WITH_OPENGL
-
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CMAKE_BOOL=		WITH_PNG

-QT4_USE=		QT4=gui,moc_build,qmake_build,rcc_build,uic_build,qtestlib
-QT4_CMAKE_ON=		-DWITH_QT:STRING="4"
-QT4_CMAKE_OFF=		-DWITH_QT:BOOL=false
-
-.for _simd in ${OPTIONS_GROUP_SIMD}
-${_simd}_DESC=		${MMX_DESC:S/MMX/${_simd}/}
-${_simd}_CMAKE_BOOL=	ENABLE_${_simd}
-.endfor
-
-TBB_LIB_DEPENDS=	libtbb.so:devel/tbb
-TBB_CMAKE_BOOL=		WITH_TBB
-TBB_CMAKE_ON=		-DTBB_INCLUDE_DIR:STRING="${LOCALBASE}/include"
-
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CMAKE_BOOL=	WITH_TIFF

+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
+WEBP_CMAKE_BOOL=	WITH_WEBP
+
+VIDEO_DESC=		Video support
+
+ARAVIS_DESC=		Aravis SDK
+ARAVIS_LIB_DEPENDS=	libaravis-0.6.so:devel/libaravis
+ARAVIS_CMAKE_BOOL=	WITH_ARAVIS
+
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
+FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
+
+GPHOTO2_DESC=		Gphoto2 camera support
+GPHOTO2_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
+GPHOTO2_CMAKE_BOOL=	WITH_GPHOTO2
+
+GSTREAMER_USE=		GSTREAMER1=yes
+GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER
+
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
-V4L_CMAKE_BOOL=		WITH_V4L
-V4L_CMAKE_ON=		-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
+V4L_CMAKE_BOOL=		WITH_V4L WITH_LIBV4L
+V4L_CMAKE_ON=		CMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"

 XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
 XINE_CMAKE_BOOL=	WITH_XINE

-IMAGE_DESC=		Image format support
-NONFREE_DESC=		Build functionality that has possible limitations of use
-PERFORMANCE_DESC=	Performance enhancing libraries
-TBB_DESC=		TBB support
+EXTRA_MODULES_DESC=		Extra modules
+EXTRA_MODULES_GH_ACCOUNT=	opencv:DEFAULT \
+				tiny-dnn:extra_mod_3rdparty_tiny_dnn
+EXTRA_MODULES_GH_PROJECT=	opencv_contrib:extra_mod \
+				tiny-dnn:extra_mod_3rdparty_tiny_dnn \
+				opencv_3rdparty:extra_mod_3rdparty_face_landmark_model \
+				opencv_3rdparty:extra_mod_3rdparty_boost_descr \
+				opencv_3rdparty:extra_mod_3rdparty_vgg_descr
+EXTRA_MODULES_GH_TAGNAME=	${PORTVERSION}:extra_mod \
+				2a2b50caa437a5964a61e45ffc83e70558e2bc68:extra_mod_3rdparty_tiny_dnn \
+				8afa57abc8229d611c4937165d20e2a2d9fc5a12:extra_mod_3rdparty_face_landmark_model \
+				34e4206aef44d50e6bbcd0ab06354b52e7466d26:extra_mod_3rdparty_boost_descr \
+				fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:extra_mod_3rdparty_vgg_descr
+EXTRA_MODULES_LIB_DEPENDS=	libgflags.so:devel/gflags \
+				libglog.so:devel/glog \
+				libhdf5.so:science/hdf5
+EXTRA_MODULES_EXTRA_PATCHES+=	${FILESDIR}/extra-patch-modules_dnn__modern_CMakeLists.txt \
+				${FILESDIR}/extra-patch-modules_sfm_src__libmv__light_libmv_numeric_numeric.h
+
+OPENGL_DESC=		OpenGL (require QT or GTK2)
+OPENGL_CMAKE_BOOL=	WITH_OPENGL
+OPENGL_LIB_DEPENDS=	${PORT_OPTIONS:MGTK2:C,.+,libgtkglext-x11-1.0.so:x11-toolkits/gtkglext,}
+OPENGL_USE=		${PORT_OPTIONS:MQT4:S,$,=opengl,}
+
+# GUI
+
+GTK2_USE=		GNOME=gtk20
+GTK2_CMAKE_BOOL=	WITH_GTK
+
+QT4_USE=		QT4=gui,moc_build,qmake_build,rcc_build,uic_build,qtestlib
+QT4_CMAKE_ON=		-DWITH_QT:STRING="4"
+QT4_CMAKE_OFF=		-DWITH_QT:BOOL=OFF

 .if defined(OCV_CORE)
 . for module in ${OCV_MODS} ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS}
-CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
+CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=OFF
 . endfor
 .elif defined(OCV_PYTHON)
-LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv
+LIB_DEPENDS+=	libopencv_core.so:graphics/opencv-core \
+		libopencv_imgproc.so:graphics/opencv-core \
+		libopencv_ml.so:graphics/opencv
 BUILD_DEPENDS+=	${PYNUMPY}
 RUN_DEPENDS+=	${PYNUMPY}
-USES+=		fortran python:2.7
+USES+=		python:2.7
 USE_PYTHON=	flavors
-CMAKE_ARGS+=	-DBUILD_opencv_python:BOOL=On
+CMAKE_ARGS+=	-DBUILD_opencv_python${PYTHON_MAJOR_VER}:BOOL=ON
 . for module in apps java stitching superres videostab
-CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
+CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=OFF
 . endfor
-INSTALL_WRKSRC=	${WRKSRC}/modules/python
+INSTALL_WRKSRC=	${WRKDIR}/.build/modules/python${PYTHON_MAJOR_VER}
 .elif defined(OCV_JAVA)
 BUILD_DEPENDS+=	ant:devel/apache-ant
-LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv
-USES+=		python:2.7,build
+LIB_DEPENDS+=	libopencv_ml.so:graphics/opencv
+USES+=		python:build
 USE_JAVA=	yes
-CMAKE_ARGS+=	-DBUILD_opencv_java:BOOL=On
+CMAKE_ARGS+=	-DBUILD_opencv_java:BOOL=ON
 . for module in apps python stitching superres videostab
-CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
+CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=OFF
 . endfor
 CONFIGURE_ENV+=	JAVA_HOME="${JAVA_HOME}"
-INSTALL_WRKSRC=	${WRKSRC}/modules/java
+INSTALL_WRKSRC=	${WRKDIR}/.build/modules/java
 .else
 LIB_DEPENDS+=	libopencv_core.so:graphics/opencv-core
 . for module in ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS}
-CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
+CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=OFF
 . endfor
 .endif

+.if !defined(OCV_JAVA)
+CMAKE_ARGS+=	-DBUILD_JAVA:BOOL=OFF
+.endif
+
+post-extract-EXTRA_MODULES-on:
+	@${MV} ${WRKSRC_extra_mod}/doc/tutorials/* ${WRKSRC}/doc/tutorials/
+	@${MV} ${WRKSRC_extra_mod}/modules/* ${WRKSRC}/modules/
+	@${CP} -RpP ${WRKSRC_extra_mod}/samples/* ${WRKSRC}/samples/
+	@${MKDIR} ${CONFIGURE_WRKSRC}/3rdparty/tinydnn/tiny-dnn-1.0.0a3/
+	@${MV} ${WRKSRC_extra_mod_3rdparty_tiny_dnn}/* ${CONFIGURE_WRKSRC}/3rdparty/tinydnn/tiny-dnn-1.0.0a3/
+	@${MKDIR} ${CONFIGURE_WRKSRC}/share/OpenCV/testdata/cv/face/
+	@${MV} ${WRKSRC_extra_mod_3rdparty_face_landmark_model}/* ${CONFIGURE_WRKSRC}/share/OpenCV/testdata/cv/face/
+	@${MKDIR} ${CONFIGURE_WRKSRC}/downloads/xfeatures2d/
+	@${MV} ${WRKSRC_extra_mod_3rdparty_boost_descr}/* ${CONFIGURE_WRKSRC}/downloads/xfeatures2d/
+	@${MV} ${WRKSRC_extra_mod_3rdparty_vgg_descr}/* ${CONFIGURE_WRKSRC}/downloads/xfeatures2d/
+
 post-patch:
-	@${MKDIR} ${CONFIGURE_WRKSRC}
 	@${REINPLACE_CMD} -e '/pkgconfig/s|$${OPENCV_LIB_INSTALL_PATH}|libdata|' \
 		 ${WRKSRC}/cmake/OpenCVGenPkgconfig.cmake
+	@${REINPLACE_CMD} -e 's|$${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/1.2|${LOCALBASE}/include/CL|g' \
+		 ${WRKSRC}/cmake/OpenCVDetectOpenCL.cmake
 	@${REINPLACE_CMD} -e 's|share/OpenCV/doc|${DOCSDIR_REL}|g' \
 		-e 's|share/OpenCV/samples|${EXAMPLESDIR_REL}|g' \
 		${WRKSRC}/CMakeLists.txt
-	@${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} {} \;
+	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' \
+		${WRKSRC}/modules/dnn/src/torch/THGeneral.cpp
 .if defined(OCV_CORE)
 	@${REINPLACE_CMD} -e 's|opencv.pc|opencv-core.pc|g' \
 		${WRKSRC}/cmake/OpenCVGenPkgconfig.cmake
@ -184,12 +345,18 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|add_subdirectory(data)||g' \
 		${WRKSRC}/CMakeLists.txt
 .endif
+	@${FIND} ${WRKSRC} -name '*.bak' -exec ${RM} {} \;
+
+pre-build:
+	protoc --proto_path=${WRKSRC}/modules/dnn/src/caffe/ --cpp_out=${WRKSRC}/modules/dnn/misc/caffe/ ${WRKSRC}/modules/dnn/src/caffe/*.proto
+	protoc --proto_path=${WRKSRC}/modules/dnn/src/tensorflow/ --cpp_out=${WRKSRC}/modules/dnn/misc/tensorflow/ ${WRKSRC}/modules/dnn/src/tensorflow/*.proto

 post-install:
 .if !defined(OCV_SLAVE)
 	(cd ${STAGEDIR}${PREFIX} && \
-		${RM} -r include/opencv2/core include/opencv2/imgproc \
-			lib/libopencv_core* lib/libopencv_imgproc*)
+		${RM} -r include/opencv2/core include/opencv2/core.hpp include/opencv2/imgproc \
+			include/opencv2/imgproc.hpp \
+			include/opencv2/cvconfig.h lib/libopencv_core* lib/libopencv_imgproc*)
 .endif
 .if defined(OCV_CORE)
 	${RM} -r ${STAGEDIR}${PREFIX}/include/opencv
@ -204,8 +371,8 @@ post-install:
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S|${PREFIX}/||})
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC}/samples/python2 && \
-		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/python2
+	cd ${WRKSRC}/samples/python && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/python
 .endif
 .if defined(OCV_JAVA)
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
@ -213,4 +380,12 @@ post-install:
 		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/java
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if !defined(OCV_CORE)
+.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1200000)
+EXTRA_PATCHES+=			${FILESDIR}/extra-patch-modules_sfm_src_libmv__light_libmv_numeric_numeric.cc
+.endif
+.endif
+
+.include <bsd.port.post.mk>
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@ -1,3 +1,13 @@
-TIMESTAMP = 1475482010
-SHA256 (opencv-opencv-2.4.13.1_GH0.tar.gz) = 0d5ce5e0973e3a745f927d1ee097aaf909aae59f787be6d27a03d639e2d96bd7
-SIZE (opencv-opencv-2.4.13.1_GH0.tar.gz) = 91773677
+TIMESTAMP = 1524780757
+SHA256 (opencv-opencv-3.4.1_GH0.tar.gz) = f1b87684d75496a1054405ae3ee0b6573acaf3dad39eaf4f1d66fdd7e03dc852
+SIZE (opencv-opencv-3.4.1_GH0.tar.gz) = 87051748
+SHA256 (tiny-dnn-tiny-dnn-2a2b50caa437a5964a61e45ffc83e70558e2bc68_GH0.tar.gz) = 03ff06b154a1a6a0f53d6f24a128727e533355d68164c509303e2da14062e97f
+SIZE (tiny-dnn-tiny-dnn-2a2b50caa437a5964a61e45ffc83e70558e2bc68_GH0.tar.gz) = 12885594
+SHA256 (opencv-opencv_contrib-3.4.1_GH0.tar.gz) = 298c69ee006d7675e1ff9d371ba8b0d9e7e88374bb7ba0f9d0789851d352ec6e
+SIZE (opencv-opencv_contrib-3.4.1_GH0.tar.gz) = 57126844
+SHA256 (opencv-opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12_GH0.tar.gz) = 0ae1f2d2a619ab177d96024e253e142d15dea27236510aaf1a65c7b529ee6677
+SIZE (opencv-opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12_GH0.tar.gz) = 63301261
+SHA256 (opencv-opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26_GH0.tar.gz) = d93c783cdf799da7e4a9209d169390424c4c198c1c9b5eeb78ffc890afe5f332
+SIZE (opencv-opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26_GH0.tar.gz) = 397901
+SHA256 (opencv-opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d_GH0.tar.gz) = e9abccbabcace092e5424073168cc86d422585d15d25569f01fb6503b109e0e1
+SIZE (opencv-opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d_GH0.tar.gz) = 1470898
--- a/graphics/opencv/files/extra-patch-modules_dnn__modern_CMakeLists.txt
+++ b/graphics/opencv/files/extra-patch-modules_dnn__modern_CMakeLists.txt
@ -0,0 +1,37 @@
+--- modules/dnn_modern/CMakeLists.txt.orig	2017-12-22 19:15:17.000000000 +0300
+++ modules/dnn_modern/CMakeLists.txt	2018-01-17 02:29:23.382430000 +0300
+@@ -15,20 +15,20 @@
+ 
+ set(TINY_DNN_CPP_PATH "${OpenCV_BINARY_DIR}/3rdparty/tinydnn")
+ set(TINY_DNN_CPP_ROOT "${TINY_DNN_CPP_PATH}/tiny-dnn-1.0.0a3")
+-ocv_download(FILENAME "v1.0.0a3.tar.gz"
+-               HASH "adb1c512e09ca2c7a6faef36f9c53e59"
+-               URL
+-                 "${OPENCV_TINY_DNN_URL}"
+-                 "$ENV{OPENCV_TINY_DNN_URL}"
+-                 "https://github.com/tiny-dnn/tiny-dnn/archive/"
+-               DESTINATION_DIR "${TINY_DNN_CPP_PATH}"
+-               STATUS TINY_DNN_DOWNLOAD_SUCCESS
+-               ID "tiny-dnn"
+-               UNPACK RELATIVE_URL)
+-
+-if(NOT TINY_DNN_DOWNLOAD_SUCCESS)
+-  message(STATUS "Failed to download tiny-dnn sources")
+-endif()
+#ocv_download(FILENAME "v1.0.0a3.tar.gz"
+#               HASH "adb1c512e09ca2c7a6faef36f9c53e59"
+#               URL
+#                 "${OPENCV_TINY_DNN_URL}"
+#                 "$ENV{OPENCV_TINY_DNN_URL}"
+#                 "https://github.com/tiny-dnn/tiny-dnn/archive/"
+#               DESTINATION_DIR "${TINY_DNN_CPP_PATH}"
+#               STATUS TINY_DNN_DOWNLOAD_SUCCESS
+#               ID "tiny-dnn"
+#               UNPACK RELATIVE_URL)
+#
+#if(NOT TINY_DNN_DOWNLOAD_SUCCESS)
+#  message(STATUS "Failed to download tiny-dnn sources")
+#endif()
+ 
+ find_package(TinyDNN QUIET)
+ 
--- a/graphics/opencv/files/extra-patch-modules_sfm_CMakeLists.txt
+++ b/graphics/opencv/files/extra-patch-modules_sfm_CMakeLists.txt
@ -0,0 +1,40 @@
+--- modules/sfm/CMakeLists.txt.orig	2015-12-17 20:11:31.000000000 +0300
+++ modules/sfm/CMakeLists.txt	2016-10-10 18:28:05.556797000 +0300
+@@ -1,25 +1,30 @@
+ set(the_description "SFM algorithms")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+ 
+ 
+ ### LIBMV LIGHT EXTERNAL DEPENDENCIES ###
+ 
+ find_package(Gflags QUIET)
+-find_package(Ceres QUIET)
+-if(NOT Ceres_FOUND)  # Looks like Ceres find glog on the own, so separate search isn't necessary
+#find_package(Ceres QUIET)
+#if(NOT Ceres_FOUND)  # Looks like Ceres find glog on the own, so separate search isn't necessary
+   find_package(Glog QUIET)
+-endif()
+#endif()
+ 
+ if((gflags_FOUND OR GFLAGS_FOUND) AND (glog_FOUND OR GLOG_FOUND))
+   set(_fname "${CMAKE_CURRENT_BINARY_DIR}/test_sfm_deps.cpp")
+   file(WRITE "${_fname}" "#include <glog/logging.h>\n#include <gflags/gflags.h>\nint main() { (void)(0); return 0; }\n")
+-  try_compile(SFM_DEPS_OK "${CMAKE_BINARY_DIR}" "${_fname}"
+-      CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${GLOG_INCLUDE_DIRS};${GFLAGS_INCLUDE_DIRS}"
+-      LINK_LIBRARIES ${GLOG_LIBRARIES} ${GFLAGS_LIBRARIES}
+-      OUTPUT_VARIABLE OUTPUT
+  try_compile(SFM_DEPS_OK "${CMAKE_CURRENT_BINARY_DIR}" "${_fname}"
+      CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${GLOG_INCLUDE_DIRS};${GFLAGS_INCLUDE_DIRS} -DLINK_LIBRARIES:STRING=${GLOG_LIBRARIES};${GFLAGS_LIBRARIES}"
+   )
+   file(REMOVE "${_fname}")
+   message(STATUS "Checking SFM deps... ${SFM_DEPS_OK}")
+ else()
+  if(NOT gflags_FOUND AND NOT GFLAGS_FOUND)
+    message(STATUS "gflags not found")
+  endif()
+  if(NOT glog_FOUND AND NOT GLOG_FOUND)
+    message(STATUS "glog not found")
+  endif()
+   set(SFM_DEPS_OK FALSE)
+ endif()
+ 
--- a/Show More
+++ b/Show More