*/*: sync with upstream

Taken from: HardenedBSD
2018-01-23 23:00:43 +01:00 · 2018-01-23 23:00:43 +01:00 · a666fd8efe
commit a666fd8efe
parent 1582209c77
401 changed files with 4924 additions and 1588 deletions
--- a/archivers/py-lz4/Makefile
+++ b/archivers/py-lz4/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	lz4
-PORTVERSION=	0.18.1
+PORTVERSION=	0.19.1
 CATEGORIES=	archivers python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -28,4 +28,10 @@ post-install:
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/block/_block.so \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/frame/_frame.so

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3000
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
--- a/archivers/py-lz4/distinfo
+++ b/archivers/py-lz4/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1514987162
-SHA256 (lz4-0.18.1.tar.gz) = e6b90591c5a80573995e90686c5b03a8e612d1ac4b19eae0c7422958c45cdde6
-SIZE (lz4-0.18.1.tar.gz) = 100914
+TIMESTAMP = 1516630809
+SHA256 (lz4-0.19.1.tar.gz) = 48be1403a902fb6693aa9d5088c4b315f67ac21d507a238ecfeae4d22e8334be
+SIZE (lz4-0.19.1.tar.gz) = 107434
--- a/archivers/py-lz4/pkg-plist
+++ b/archivers/py-lz4/pkg-plist
@ -9,6 +9,9 @@
 %%PYTHON_SITELIBDIR%%/lz4/frame/__init__.py
 %%PYTHON_SITELIBDIR%%/lz4/frame/__init__.pyc
 %%PYTHON_SITELIBDIR%%/lz4/frame/__init__.pyo
+%%PYTHON_SITELIBDIR%%/lz4/frame/_compression.py
+%%PYTHON_SITELIBDIR%%/lz4/frame/_compression.pyc
+%%PYTHON_SITELIBDIR%%/lz4/frame/_compression.pyo
 %%PYTHON_SITELIBDIR%%/lz4/frame/_frame.so
 %%PYTHON_SITELIBDIR%%/lz4/version.py
 %%PYTHON_SITELIBDIR%%/lz4/version.pyc
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@ -21,7 +21,6 @@ USE_PERL5=	build
 MAKE_ENV=	UPX_UCLDIR=${LOCALBASE}\
 		UPX_LZMADIR=${WRKDIR}\
 		target=freebsd
-NOT_FOR_ARCHS=	sparc64

 PORTDOCS=	BUGS COPYING LICENSE NEWS PROJECTS README\
 		README.1ST README.SRC THANKS TODO
@ -31,9 +30,9 @@ PLIST_FILES=	bin/upx \
 OPTIONS_DEFINE=	DOCS

 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/upx.out ${STAGEDIR}${PREFIX}/bin/upx
-	@${INSTALL_MAN} ${WRKSRC}/doc/upx.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/src/upx.out ${STAGEDIR}${PREFIX}/bin/upx
+	${INSTALL_MAN} ${WRKSRC}/doc/upx.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}

 .include <bsd.port.mk>
--- a/archivers/upx/files/patch-src_miniacc.h
+++ b/archivers/upx/files/patch-src_miniacc.h
@ -9,7 +9,7 @@
 #    define ACC_OS_POSIX_FREEBSD    1
 #    define ACC_INFO_OS_POSIX       "freebsd"
 #  elif defined(__hpux__) || defined(__hpux)
-@@ -1968,7 +1968,7 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEO
+@@ -1968,11 +1968,11 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEOF_PTRDIFF_T ==
 #elif !(ACC_ABI_BIG_ENDIAN) && !(ACC_ABI_LITTLE_ENDIAN)
 #if (ACC_ARCH_ALPHA) && (ACC_ARCH_CRAY_MPP)
 #  define ACC_ABI_BIG_ENDIAN        1
@ -18,3 +18,8 @@
 #  define ACC_ABI_LITTLE_ENDIAN     1
 #elif (ACC_ARCH_ALPHA || ACC_ARCH_AMD64 || ACC_ARCH_BLACKFIN || ACC_ARCH_CRIS || ACC_ARCH_I086 || ACC_ARCH_I386 || ACC_ARCH_MSP430)
 #  define ACC_ABI_LITTLE_ENDIAN     1
+-#elif (ACC_ARCH_AVR32 || ACC_ARCH_M68K || ACC_ARCH_S390 || ACC_ARCH_SPU)
+#elif (ACC_ARCH_AVR32 || ACC_ARCH_M68K || ACC_ARCH_S390 || ACC_ARCH_SPU || ACC_ARCH_SPARC)
+ #  define ACC_ABI_BIG_ENDIAN        1
+ #elif 1 && defined(__IAR_SYSTEMS_ICC__) && defined(__LITTLE_ENDIAN__)
+ #  if (__LITTLE_ENDIAN__ == 1)
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gpsd
-PORTVERSION=	3.16
+PORTVERSION=	3.17
 CATEGORIES=	astro geography
 MASTER_SITES=	SAVANNAH

@ -12,14 +12,15 @@ COMMENT=	Daemon that monitors one or more GPSes attached to a host computer
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING

-USES=		cpe pathfix pkgconfig python:2 scons shebangfix
+USES=		cpe pathfix pkgconfig python:2.7 scons shebangfix
 CPE_VENDOR=	gpsd_project
+USE_PYTHON=	flavors
 USE_RC_SUBR=	gpsd
 SHEBANG_FILES=	*.py gps/*.py gegps xgps gpscat xgpsspeed gpsprof \
 		gpsfake

 MAKE_ARGS=	prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \
-		manbuild=no
+		manbuild=no target_python="${PYTHON_CMD}"
 MAKE_ENV=	DESTDIR="${STAGEDIR}"
 PLIST_SUB=	PYTHON_EGGINFO=gps-${PORTVERSION}.egg-info

@ -28,12 +29,12 @@ OPTIONS_DEFINE=	AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FURY FV18 GARMIN \
 		NETFEED NMEA0183 NTP NTPSHM NTRIP OCEANSERVER ONCORE \
 		PASSTHROUGH PPS PROFILING RECONFIGURE RTCM104V2 RTCM104V3 \
 		SHMEXPORT SIRF SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE \
-		TSIP QTBIND UBLOX USB
+		TSIP QTBIND UBLOX USB X11
 OPTIONS_DEFAULT= AIVDM ASHTECH CPPBIND EARTHMATE EVERMORE FURY FV18 GARMIN \
 		GARMINTXT GEOSTAR GPSCLOCK ITRAX NAVCOM NCURSES NETFEED \
 		NMEA0183 NTP NTPSHM NTRIP OCEANSERVER ONCORE PASSTHROUGH \
 		RECONFIGURE RTCM104V2 RTCM104V3 SHMEXPORT SIRF SOCKEXPORT \
-		SUPERSTARII TIMING TNT TRIPMATE TSIP UBLOX USB
+		SUPERSTARII TIMING TNT TRIPMATE TSIP UBLOX USB X11
 OPTIONS_SUB=	yes

 AIVDM_DESC=		Aivdm support
@ -137,6 +138,10 @@ QTBIND_PLIST_SUB=	QTBIND=""
 QTBIND_PLIST_SUB_OFF=	QTBIND="@comment "
 RECONFIGURE_MAKE_ARGS_OFF=	reconfigure=no
 CPPBIND_MAKE_ARGS_OFF=	libgpsmm=no
+X11_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${FLAVOR} \
+	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${FLAVOR}
+#X11_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${FLAVOR}
+X11_USE=	GNOME=gtk30

 # Build control
 PROFILING_MAKE_ARGS=	profiling=yes
--- a/astro/gpsd/distinfo
+++ b/astro/gpsd/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1493742351
-SHA256 (gpsd-3.16.tar.gz) = 03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029
-SIZE (gpsd-3.16.tar.gz) = 8587490
+TIMESTAMP = 1516146278
+SHA256 (gpsd-3.17.tar.gz) = 68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a
+SIZE (gpsd-3.17.tar.gz) = 8755304
--- a/astro/gpsd/files/patch-SConstruct
+++ b/astro/gpsd/files/patch-SConstruct
@ -1,101 +0,0 @@
-Remove LIBPATH='.' - see http://lists.nongnu.org/archive/html/gpsd-dev/2016-02/msg00042.html
-
--- SConstruct.orig	2016-01-08 19:25:48 UTC
-+++ SConstruct
-@@ -985,37 +985,37 @@ gpsmon_sources = [
- ## Production programs
- 
- gpsd = env.Program('gpsd', gpsd_sources,
-                   LIBS=['gpsd', 'gps_static'], LIBPATH='.',
-+                   LIBS=['gpsd', 'gps_static'],
-                    parse_flags=gpsdflags+gpsflags)
- gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'],
-                        LIBS=['gpsd', 'gps_static'], LIBPATH='.',
-+                        LIBS=['gpsd', 'gps_static'],
-                         parse_flags=gpsdflags+gpsflags)
- gpsctl = env.Program('gpsctl', ['gpsctl.c'],
-                     LIBS=['gpsd', 'gps_static'], LIBPATH='.',
-+                     LIBS=['gpsd', 'gps_static'],
-                      parse_flags=gpsdflags+gpsflags)
- gpsmon = env.Program('gpsmon', gpsmon_sources,
-                     LIBS=['gpsd', 'gps_static'], LIBPATH='.',
-+                     LIBS=['gpsd', 'gps_static'],
-                      parse_flags=gpsdflags + gpsflags + ncurseslibs)
- gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'],
-                      LIBS=['gps_static'], LIBPATH='.',
-+                      LIBS=['gps_static'],
-                       parse_flags=gpsflags)
- gpspipe = env.Program('gpspipe', ['gpspipe.c'],
-                      LIBS=['gps_static'], LIBPATH='.',
-+                      LIBS=['gps_static'],
-                       parse_flags=gpsflags)
- gps2udp = env.Program('gps2udp', ['gps2udp.c'],
-                      LIBS=['gps_static'], LIBPATH='.',
-+                      LIBS=['gps_static'],
-                       parse_flags=gpsflags)
- gpxlogger = env.Program('gpxlogger', ['gpxlogger.c'],
-                        LIBS=['gps_static'], LIBPATH='.',
-+                        LIBS=['gps_static'],
-                         parse_flags=gpsflags)
- lcdgps = env.Program('lcdgps', ['lcdgps.c'],
-                     LIBS=['gps_static'], LIBPATH='.',
-+                     LIBS=['gps_static'],
-                      parse_flags=gpsflags)
- cgps = env.Program('cgps', ['cgps.c'],
-                   LIBS=['gps_static'], LIBPATH='.',
-+                   LIBS=['gps_static'],
-                    parse_flags=gpsflags + ncurseslibs)
- ntpshmmon = env.Program('ntpshmmon', ['ntpshmmon.c'],
-                        LIBS=['gps_static'], LIBPATH='.',
-+                        LIBS=['gps_static'],
-                         parse_flags=gpsflags)
- 
- binaries = [gpsd, gpsdecode, gpsctl, gpsdctl, gpspipe, gps2udp, gpxlogger, lcdgps, ntpshmmon]
-@@ -1024,26 +1024,26 @@ if env["ncurses"]:
- 
- # Test programs - always link locally and statically
- test_bits = env.Program('test_bits', ['test_bits.c'],
-                        LIBS=['gps_static'], LIBPATH='.')
-+                        LIBS=['gps_static'])
- test_float = env.Program('test_float', ['test_float.c'])
- test_geoid = env.Program('test_geoid', ['test_geoid.c'],
-                          LIBS=['gpsd', 'gps_static'],
-                         LIBPATH='.', parse_flags=gpsdflags)
-+                         parse_flags=gpsdflags)
- test_matrix = env.Program('test_matrix', ['test_matrix.c'],
-                           LIBS=['gpsd', 'gps_static'],
-                          LIBPATH='.', parse_flags=gpsdflags)
-+                          parse_flags=gpsdflags)
- test_mktime = env.Program('test_mktime', ['test_mktime.c'],
-                          LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"])
-+                          LIBS=['gps_static'], parse_flags=["-lm"])
- test_packet = env.Program('test_packet', ['test_packet.c'],
-                           LIBS=['gpsd', 'gps_static'],
-                          LIBPATH='.', parse_flags=gpsdflags)
-+                          parse_flags=gpsdflags)
- test_timespec = env.Program('test_timespec', ['test_timespec.c'],
-                           LIBS=['gpsd', 'gps_static'],
-                          LIBPATH='.', parse_flags=gpsdflags)
-+                          parse_flags=gpsdflags)
- test_trig = env.Program('test_trig', ['test_trig.c'], parse_flags=["-lm"])
- # test_libgps for glibc older than 2.17
- test_libgps = env.Program('test_libgps', ['test_libgps.c'],
-                          LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"] + rtlibs + dbusflags)
-+                          LIBS=['gps_static'], parse_flags=["-lm"] + rtlibs + dbusflags)
- 
- if not env['socket_export']:
-     announce("test_json not building because socket_export is disabled")
-@@ -1051,11 +1051,11 @@ if not env['socket_export']:
- else:
-     test_json = env.Program(
-         'test_json', ['test_json.c'],
-	LIBS=['gps_static'], LIBPATH='.',
-+	LIBS=['gps_static'],
- 	parse_flags=["-lm"] + rtlibs + usbflags + dbusflags)
- 
- test_gpsmm = env.Program('test_gpsmm', ['test_gpsmm.cpp'],
-                         LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"])
-+                         LIBS=['gps_static'], parse_flags=["-lm"])
- testprogs = [test_bits, test_float, test_geoid, test_libgps, test_matrix, test_mktime, test_packet, test_timespec, test_trig]
- if env['socket_export']:
-     testprogs.append(test_json)
--- a/astro/gpsd/pkg-plist
+++ b/astro/gpsd/pkg-plist
@ -10,18 +10,18 @@ bin/gpspipe
 bin/gpsprof
 bin/gpxlogger
 bin/lcdgps
-bin/ntpshmmon
-bin/xgps
-bin/xgpsspeed
+%%PPS%%bin/ntpshmmon
+%%X11%%bin/xgps
+%%X11%%bin/xgpsspeed
 include/gps.h
 include/libgpsmm.h
 %%QTBIND%%lib/libQgpsmm.prl
 %%QTBIND%%lib/libQgpsmm.so
-%%QTBIND%%lib/libQgpsmm.so.22
-%%QTBIND%%lib/libQgpsmm.so.22.0.0
+%%QTBIND%%lib/libQgpsmm.so.23
+%%QTBIND%%lib/libQgpsmm.so.23.0.0
 lib/libgps.so
-lib/libgps.so.22
-lib/libgps.so.22.0.0
+lib/libgps.so.23
+lib/libgps.so.23.0.0
 man/man1/cgps.1.gz
 man/man1/gegps.1.gz
 man/man1/gps.1.gz
@ -33,10 +33,11 @@ man/man1/gpsfake.1.gz
 man/man1/gpsmon.1.gz
 man/man1/gpspipe.1.gz
 man/man1/gpsprof.1.gz
+man/man1/gpxlogger.1.gz
 man/man1/lcdgps.1.gz
 man/man1/ntpshmmon.1.gz
-man/man1/xgps.1.gz
-man/man1/xgpsspeed.1.gz
+%%X11%%man/man1/xgps.1.gz
+%%X11%%man/man1/xgpsspeed.1.gz
 man/man3/libQgpsmm.3.gz
 man/man3/libgps.3.gz
 man/man3/libgpsmm.3.gz
@ -65,6 +66,5 @@ man/man8/gpsinit.8.gz
 %%PYTHON_SITELIBDIR%%/gps/packet.so
 %%QTBIND%%libdata/pkgconfig/Qgpsmm.pc
 libdata/pkgconfig/libgps.pc
-libdata/pkgconfig/libgpsd.pc
 sbin/gpsd
 sbin/gpsdctl
--- a/astro/xplanet/Makefile
+++ b/astro/xplanet/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	xplanet
 PORTVERSION=	1.3.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	astro geography
 MASTER_SITES=	SF

--- a/astro/xplanet/files/patch-src_readConfig.cpp
+++ b/astro/xplanet/files/patch-src_readConfig.cpp
@ -1,4 +1,18 @@
--- src/readConfig.cpp.orig	2012-03-03 03:20:05 UTC
+The later chunks (using i2b) are compile fixes on aarch64 (presumably with
+clang6 as well). Typical error message reads
+
+    readConfig.cpp:407:54: error: non-constant-expression cannot be narrowed 
+    from type 'int' to 'unsigned char' in initializer list [-Wc++11-narrowing]
+        unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
+                                   ^~~~~~~~
+    readConfig.cpp:407:54: note: insert an explicit cast to silence this issue
+        unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
+                                   ^~~~~~~~
+                                   static_cast<unsigned char>( )
+
+Since it happens in a half-dozen places, introduce a trivial helper function.
+
+--- src/readConfig.cpp.orig	2018-01-21 16:58:09 UTC
 +++ src/readConfig.cpp
@@ -4,6 +4,7 @@
 #include <fstream>
@ -8,3 +22,66 @@
 using namespace std;
 
 #include "body.h"
+@@ -20,6 +21,8 @@ using namespace std;
+ static PlanetProperties *defaultProperties;
+ static PlanetProperties *currentProperties;
+ 
+static inline unsigned char i2b( int x ) { return static_cast<unsigned int>(x) & 0xffU; }
+
+ static void
+ readConfig(const char *line, PlanetProperties *planetProperties[])
+ {
+@@ -49,7 +52,7 @@ readConfig(const char *line, PlanetPrope
+             int r, g, b;
+             if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
+             {
+-                unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
+                unsigned char color[3] = { i2b(r), i2b(g), i2b(b) };
+                 currentProperties->ArcColor(color);
+             }
+             else
+@@ -179,7 +182,7 @@ readConfig(const char *line, PlanetPrope
+             int r, g, b;
+             if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
+             {
+-                unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
+                unsigned char color[3] = { i2b(r), i2b(g), i2b(b) };
+                 currentProperties->Color(color);
+             }
+             else
+@@ -244,7 +247,7 @@ readConfig(const char *line, PlanetPrope
+             int r, g, b;
+             if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
+             {
+-                unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
+                unsigned char color[3] = { i2b(r), i2b(g), i2b(b) };
+                 currentProperties->GridColor(color);
+             }
+             else
+@@ -296,7 +299,7 @@ readConfig(const char *line, PlanetPrope
+             int r, g, b;
+             if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
+             {
+-                unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
+                unsigned char color[3] = { i2b(r), i2b(g), i2b(b) };
+                 currentProperties->MarkerColor(color);
+             }
+             else
+@@ -403,7 +406,7 @@ readConfig(const char *line, PlanetPrope
+             int r, g, b;
+             if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
+             {
+-                unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
+                unsigned char color[3] = { i2b(r), i2b(g), i2b(b) };
+                 currentProperties->OrbitColor(color);
+             }
+             else
+@@ -473,7 +476,7 @@ readConfig(const char *line, PlanetPrope
+             int r, g, b;
+             if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
+             {
+-                unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
+                unsigned char color[3] = { i2b(r), i2b(g), i2b(b) };
+                 currentProperties->TextColor(color);
+             }
+             else
--- a/benchmarks/lzbench/files/patch-Makefile
+++ b/benchmarks/lzbench/files/patch-Makefile
@ -0,0 +1,13 @@
+--- Makefile.orig	2018-01-05 10:06:50 UTC
+++ Makefile
+@@ -26,8 +26,8 @@ ifeq (1,$(filter 1,$(shell [ "$(COMPILER)" = "gcc" ] &
+     DONT_BUILD_GLZA ?= 1
+ endif
+ 
+-# LZSSE requires gcc with support of __SSE4_1__
+-ifeq ($(shell echo|$(CC) -dM -E - -march=native|grep -c SSE4_1), 0)
+# LZSSE requires compiler with __SSE4_1__ support and 64-bit CPU
+ifneq ($(shell echo|$(CC) -dM -E - -march=native|egrep -c '__(SSE4_1|x86_64)__'),2)
+ 	DONT_BUILD_LZSSE ?= 1
+ endif
+ 
--- a/benchmarks/stress-ng/Makefile
+++ b/benchmarks/stress-ng/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	stress-ng
-PORTVERSION=	0.09.10
+PORTVERSION=	0.09.12
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://kernel.ubuntu.com/~cking/tarballs/stress-ng/

--- a/benchmarks/stress-ng/distinfo
+++ b/benchmarks/stress-ng/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1515964292
-SHA256 (stress-ng-0.09.10.tar.xz) = ac4c6edc785c6fc4211015c0e1d67861d839ad6a7b796ef9beefd26399c9e052
-SIZE (stress-ng-0.09.10.tar.xz) = 313888
+TIMESTAMP = 1516711966
+SHA256 (stress-ng-0.09.12.tar.xz) = e56f53a03a254e2f657ffc40cc24aea939b8666b7f04467f23d90bafbfb0a825
+SIZE (stress-ng-0.09.12.tar.xz) = 317052
--- a/chinese/Makefile
+++ b/chinese/Makefile
@ -52,6 +52,7 @@
    SUBDIR += gydict
    SUBDIR += hc
    SUBDIR += ibus-array
+    SUBDIR += ibus-cangjie
    SUBDIR += ibus-chewing
    SUBDIR += ibus-libpinyin
    SUBDIR += ibus-pinyin
--- a/chinese/ibus-cangjie/Makefile
+++ b/chinese/ibus-cangjie/Makefile
@ -0,0 +1,37 @@
+# Created by: blubee <hello@blubee.me>
+# $FreeBSD$
+
+PORTNAME=		ibus-cangjie
+PORTVERSION=		2.4
+DISTVERSIONPREFIX=	v
+CATEGORIES=		chinese
+
+MAINTAINER=	hello@blubee.me
+COMMENT=	IBus engine for users of the Cangjie and Quick
+
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libibus-1.0.so:textproc/ibus
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/cangjie/_core.so:chinese/pycangjie \
+		${PYTHON_SITELIBDIR}/pycanberra/pycanberra.py:devel/pycanberra@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cangjie/_core.so:chinese/pycangjie \
+		${PYTHON_SITELIBDIR}/pycanberra/pycanberra.py:devel/pycanberra@${PY_FLAVOR}
+
+USES=		autoreconf gmake libtool pkgconfig python:3.4+
+USE_GNOME=	introspection:run pygobject3 intltool
+GLIB_SCHEMAS=	org.cangjians.ibus.cangjie.gschema.xml \
+		org.cangjians.ibus.quick.gschema.xml
+
+OPTIONS_DEFINE=		NLS
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	gettext
+
+INSTALLS_ICONS=		yes
+GNU_CONFIGURE=		yes
+
+USE_GITHUB=		yes
+GH_ACCOUNT=		Cangjians
+GH_PROJECT=		ibus-cangjie
+
+.include <bsd.port.mk>
--- a/chinese/ibus-cangjie/distinfo
+++ b/chinese/ibus-cangjie/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1509798473
+SHA256 (Cangjians-ibus-cangjie-v2.4_GH0.tar.gz) = 632b38bf8fe979fbbe50fe0cee5322fe2f5c815c3ad0e800c0bdab7e3b814043
+SIZE (Cangjians-ibus-cangjie-v2.4_GH0.tar.gz) = 38549
--- a/chinese/ibus-cangjie/files/patch-autogen.sh
+++ b/chinese/ibus-cangjie/files/patch-autogen.sh
@ -0,0 +1,8 @@
+--- autogen.sh.orig	2015-03-29 15:19:21 UTC
+++ autogen.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
+#!/bin/sh
+ 
+ set -e
+ set -x
--- a/chinese/ibus-cangjie/files/patch-configure.ac
+++ b/chinese/ibus-cangjie/files/patch-configure.ac
@ -0,0 +1,13 @@
+--- configure.ac.orig	2015-03-29 15:19:21 UTC
+++ configure.ac
+@@ -15,8 +15,8 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+ IT_PROG_INTLTOOL([0.35.0])
+ 
+ # i18n
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION(0.17)
+#AM_GNU_GETTEXT([external])
+#AM_GNU_GETTEXT_VERSION(0.17)
+ 
+ # Note: If you change GETTEXT_PACKAGE below, you will also need to change it
+ #       in src/config.py, or find a way to de-hardcode it there.
--- a/chinese/ibus-cangjie/pkg-descr
+++ b/chinese/ibus-cangjie/pkg-descr
@ -0,0 +1,8 @@
+This is an IBus engine for users of the Cangjie and 
+Quick input methods.
+
+It is primarily intended to Hong Kong people 
+who want to input Traditional Chinese,
+as they are (by far) the majority of Cangjie and Quick users.
+
+WWW: http://cangjians.github.io/projects/ibus-cangjie/
--- a/chinese/ibus-cangjie/pkg-plist
+++ b/chinese/ibus-cangjie/pkg-plist
@ -0,0 +1,28 @@
+bin/ibus-setup-cangjie
+lib/ibus-cangjie/ibus-engine-cangjie
+%%PYTHON_SITELIBDIR%%/ibus_cangjie/__init__.py
+%%PYTHON_SITELIBDIR%%/ibus_cangjie/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ibus_cangjie/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ibus_cangjie/__pycache__/canberra.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ibus_cangjie/__pycache__/canberra.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ibus_cangjie/__pycache__/engine.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ibus_cangjie/__pycache__/engine.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ibus_cangjie/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ibus_cangjie/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ibus_cangjie/canberra.py
+%%PYTHON_SITELIBDIR%%/ibus_cangjie/engine.py
+%%PYTHON_SITELIBDIR%%/ibus_cangjie/setup.py
+share/appdata/cangjie.appdata.xml
+share/appdata/quick.appdata.xml
+share/applications/ibus-setup-cangjie.desktop
+share/applications/ibus-setup-quick.desktop
+%%DATADIR%%/setup.ui
+share/ibus/component/cangjie.xml
+share/ibus/component/quick.xml
+share/icons/hicolor/16x16/intl/cangjie.png
+share/icons/hicolor/16x16/intl/quick.png
+share/icons/hicolor/scalable/intl/cangjie.svg
+share/icons/hicolor/scalable/intl/quick.svg
+share/locale/pt_BR/LC_MESSAGES/ibus-cangjie.mo
+share/locale/zh_HK/LC_MESSAGES/ibus-cangjie.mo
+share/locale/zh_TW/LC_MESSAGES/ibus-cangjie.mo
--- a/comms/gnuradio/pkg-plist
+++ b/comms/gnuradio/pkg-plist
@ -1206,7 +1206,6 @@ lib/libvolk.so.1.%%MAJOR_VERSION%%
 %%PORTDOCS%%%%DOCSDIR%%/README.qtgui
 %%PORTDOCS%%%%DOCSDIR%%/README.uhd
 %%PORTDOCS%%%%DOCSDIR%%/README.vocoder
-%%PORTDOCS%%%%DOCSDIR%%/html/gr-trellis.html
 %%PORTDOCS%%%%DOCSDIR%%/xml/test_tcm.py.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/test_viterbi_equalization1.py.xml
 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py
--- a/comms/uhd/Makefile
+++ b/comms/uhd/Makefile
@ -2,8 +2,7 @@

 PORTNAME=	uhd
 PORTVERSION=	3.10.2.0
-PORTREVISION=	1
-#PORTREVISION=	4
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://files.ettus.com/binaries/images/
 DISTFILES=	${IMAGE_FILE}
@ -25,7 +24,6 @@ GH_TAGNAME=     bd6e21dc06cfca6f1165b1eba6ddbf5a46dc343c

 CONFLICTS=	usrp-[0-9]*

-BROKEN=		fails to build with boost 1.66, see bug 224087
 BROKEN_powerpc64=	fails to link: undefined reference to boost function

 USES=		compiler:c++0x cmake:outsource ncurses pkgconfig \
--- a/comms/uhd/files/patch-host_examples_network_relay.cpp
+++ b/comms/uhd/files/patch-host_examples_network_relay.cpp
@ -0,0 +1,16 @@
+--- host/examples/network_relay.cpp.orig	2017-12-17 19:37:02.232333000 +0000
+++ host/examples/network_relay.cpp	2017-12-17 19:37:35.331222000 +0000
+@@ -128,5 +128,5 @@
+         std::vector<char> buff(insane_mtu);
+         while (not boost::this_thread::interruption_requested()){
+-            if (wait_for_recv_ready(_server_socket->native())){
+            if (wait_for_recv_ready(_server_socket->native_handle())){
+                 boost::mutex::scoped_lock lock(_endpoint_mutex);
+                 const size_t len = _server_socket->receive_from(asio::buffer(&buff.front(), buff.size()), _endpoint);
+@@ -154,5 +154,5 @@
+         std::vector<char> buff(insane_mtu);
+         while (not boost::this_thread::interruption_requested()){
+-            if (wait_for_recv_ready(_client_socket->native())){
+            if (wait_for_recv_ready(_client_socket->native_handle())){
+                 const size_t len = _client_socket->receive(asio::buffer(&buff.front(), buff.size()));
+                 boost::mutex::scoped_lock lock(_endpoint_mutex);
--- a/comms/uhd/files/patch-host_lib_transport_tcp_zero_copy.cpp
+++ b/comms/uhd/files/patch-host_lib_transport_tcp_zero_copy.cpp
@ -0,0 +1,9 @@
+--- host/lib/transport/tcp_zero_copy.cpp.orig	2017-12-17 19:39:49.890757000 +0000
+++ host/lib/transport/tcp_zero_copy.cpp	2017-12-17 19:40:36.125127000 +0000
+@@ -155,5 +155,5 @@
+         _socket.reset(new asio::ip::tcp::socket(_io_service));
+         _socket->connect(receiver_endpoint);
+-        _sock_fd = _socket->native();
+        _sock_fd = _socket->native_handle();
+ 
+         //packets go out ASAP
--- a/comms/uhd/files/patch-host_lib_transport_udp_simple.cpp
+++ b/comms/uhd/files/patch-host_lib_transport_udp_simple.cpp
@ -0,0 +1,9 @@
+--- host/lib/transport/udp_simple.cpp.orig	2017-12-17 19:40:02.609104000 +0000
+++ host/lib/transport/udp_simple.cpp	2017-12-17 19:40:47.660730000 +0000
+@@ -57,5 +57,5 @@
+ 
+     size_t recv(const asio::mutable_buffer &buff, double timeout){
+-        if (not wait_for_recv_ready(_socket->native(), timeout)) return 0;
+        if (not wait_for_recv_ready(_socket->native_handle(), timeout)) return 0;
+         return _socket->receive_from(asio::buffer(buff), _recv_endpoint);
+     }
--- a/comms/uhd/files/patch-host_lib_transport_udp_zero_copy.cpp
+++ b/comms/uhd/files/patch-host_lib_transport_udp_zero_copy.cpp
@ -0,0 +1,9 @@
+--- host/lib/transport/udp_zero_copy.cpp.orig	2017-12-17 16:25:59.637675000 +0100
+++ host/lib/transport/udp_zero_copy.cpp	2017-12-17 16:26:12.713784000 +0100
+@@ -191,5 +191,5 @@
+         _socket->open(asio::ip::udp::v4());
+         _socket->connect(receiver_endpoint);
+-        _sock_fd = _socket->native();
+        _sock_fd = _socket->native_handle();
+ 
+         //allocate re-usable managed receive buffers
--- a/databases/mariadb-connector-c/Makefile
+++ b/databases/mariadb-connector-c/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	mariadb-connector-c
-PORTVERSION=	3.0.2
-PORTREVISION=	1
+PORTVERSION=	3.0.3
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \
--- a/databases/mariadb-connector-c/distinfo
+++ b/databases/mariadb-connector-c/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1501154860
-SHA256 (mariadb-connector-c-3.0.2-src.tar.gz) = 518d14b8d77838370767d73f9bf1674f46232e1a2a34d4195bd38f52a3033758
-SIZE (mariadb-connector-c-3.0.2-src.tar.gz) = 662569
+TIMESTAMP = 1516728668
+SHA256 (mariadb-connector-c-3.0.3-src.tar.gz) = 210f0ee3414b235d3db8e98e9e5a0a98381ecf771e67ca4a688036368984eeea
+SIZE (mariadb-connector-c-3.0.3-src.tar.gz) = 666928
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME?=	mysql
-PORTVERSION=	5.5.58
+PORTVERSION=	5.5.59
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.5
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1508414506
-SHA256 (mysql-5.5.58.tar.gz) = 9b6912faf261555c8975db24a987f63f36aaa28052a301e85538346ace0009b9
-SIZE (mysql-5.5.58.tar.gz) = 21045852
+TIMESTAMP = 1516705214
+SHA256 (mysql-5.5.59.tar.gz) = ee920177c9dec770c30b673a21143d5e92a67e8207f9b720d41d51cda05d8513
+SIZE (mysql-5.5.59.tar.gz) = 21050313
--- a/databases/mysqlwsrep57-server/Makefile
+++ b/databases/mysqlwsrep57-server/Makefile
@ -171,6 +171,14 @@ CMAKE_ARGS+=		-DWITH_SSL=system
 CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
 .endif

+# ${LOCALBASE}/include/lz4.h does not compile with Clang 6.
+# Also MySQL code itself needs -Wno-c++11-narrowing when Clang 6 is used.
+.if ${OSVERSION} >= 1200056
+CFLAGS+=	-DLZ4_DISABLE_DEPRECATE_WARNINGS
+CXXFLAGS+=	-DLZ4_DISABLE_DEPRECATE_WARNINGS -Wno-c++11-narrowing
+LDFLAGS+=	-L${LOCALBASE}/lib
+.endif
+
 post-extract:
 	${RM} -fv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h

--- a/databases/mysqlwsrep57-server/files/patch-sql-common_client__authentication.cc
+++ b/databases/mysqlwsrep57-server/files/patch-sql-common_client__authentication.cc
@ -0,0 +1,11 @@
+--- sql-common/client_authentication.cc.orig	2018-01-22 16:19:07.776289000 +0200
+++ sql-common/client_authentication.cc	2018-01-22 16:19:26.756981000 +0200
+@@ -84,7 +84,7 @@
+ 
+   if (mysql->options.extension != NULL &&
+       mysql->options.extension->server_public_key_path != NULL &&
+-      mysql->options.extension->server_public_key_path != '\0')
+      mysql->options.extension->server_public_key_path[0] != '\0')
+   {
+     pub_key_file= fopen(mysql->options.extension->server_public_key_path,
+                         "r");
--- a/databases/mysqlwsrep57-server/files/patch-storage_innobase_row_row0sel.cc
+++ b/databases/mysqlwsrep57-server/files/patch-storage_innobase_row_row0sel.cc
@ -0,0 +1,11 @@
+--- storage/innobase/row/row0sel.cc.orig	2018-01-22 18:12:31.679942000 +0200
+++ storage/innobase/row/row0sel.cc	2018-01-22 18:12:55.834909000 +0200
+@@ -5193,7 +5193,7 @@
+ 		reporting due to search views etc. */
+ 		if (prev_rec != NULL
+ 		    && prebuilt->m_mysql_handler->end_range != NULL
+-		    && prebuilt->idx_cond == false && end_loop >= 100) {
+		    && prebuilt->idx_cond == NULL && end_loop >= 100) {
+ 
+ 			dict_index_t*	key_index = prebuilt->index;
+ 			bool		clust_templ_for_sec = false;
--- a/databases/rubygem-activerecord-import/Makefile
+++ b/databases/rubygem-activerecord-import/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	activerecord-import
-PORTVERSION=	0.21.0
+PORTVERSION=	0.22.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG

--- a/databases/rubygem-activerecord-import/distinfo
+++ b/databases/rubygem-activerecord-import/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1511371595
-SHA256 (rubygem/activerecord-import-0.21.0.gem) = 94ef79261e28f73709f052106c3e9b9ed9aa29c7e7f00ebcf8e594732a6bc633
-SIZE (rubygem/activerecord-import-0.21.0.gem) = 52736
+TIMESTAMP = 1516713297
+SHA256 (rubygem/activerecord-import-0.22.0.gem) = d89e1f2f49c870de34c856ed798f28107b0b0b2f4f24ee2308ba6708c6aac61f
+SIZE (rubygem/activerecord-import-0.22.0.gem) = 52736
--- a/databases/rubygem-flipper-active_record/Makefile
+++ b/databases/rubygem-flipper-active_record/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	flipper-active_record
-PORTVERSION=	0.12.1
+PORTVERSION=	0.12.2
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG

--- a/databases/rubygem-flipper-active_record/distinfo
+++ b/databases/rubygem-flipper-active_record/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1516437770
-SHA256 (rubygem/flipper-active_record-0.12.1.gem) = c415df4e2ef295d9a1352f473ebd8a1d150e162efc713a63a258c28706272ac1
-SIZE (rubygem/flipper-active_record-0.12.1.gem) = 9216
+TIMESTAMP = 1516713208
+SHA256 (rubygem/flipper-active_record-0.12.2.gem) = 0b185b178c7135d602c2a1a1669a1c18e51b5c1ed7a27ed11052eb919bfdbfc8
+SIZE (rubygem/flipper-active_record-0.12.2.gem) = 9216
--- a/databases/tile38/Makefile
+++ b/databases/tile38/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	tile38
-PORTVERSION=	1.10.0
+PORTVERSION=	1.10.1
 CATEGORIES=	databases

 MAINTAINER=	olevole@olevole.ru
@ -11,9 +11,7 @@ COMMENT=	In-memory geolocation data store, spatial index, and realtime geofence
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE

-BUILD_DEPENDS=	go>=1.4:lang/go \
-		bash:shells/bash
-RUN_DEPENDS=	go>=1.4:lang/go \
+BUILD_DEPENDS=	go>=1.7:lang/go \
 		bash:shells/bash

 USES=		shebangfix
--- a/databases/tile38/distinfo
+++ b/databases/tile38/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1515485445
-SHA256 (tidwall-tile38-1.10.0_GH0.tar.gz) = 614b91cc1561ac3c491a3a5e1ce7664ae01f94d51567bc7549cf33b1d3da581f
-SIZE (tidwall-tile38-1.10.0_GH0.tar.gz) = 32802607
+TIMESTAMP = 1516407425
+SHA256 (tidwall-tile38-1.10.1_GH0.tar.gz) = b475e9e764eb2cba69d5bd9c9c083f7e17e86987c9f856a75ca746a1ab814bf6
+SIZE (tidwall-tile38-1.10.1_GH0.tar.gz) = 32804178
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@ -43,7 +43,9 @@
    SUBDIR += everygui
    SUBDIR += fbreader
    SUBDIR += fet
+    SUBDIR += flameshot
    SUBDIR += freemind
+    SUBDIR += freeplane
    SUBDIR += fusenshi
    SUBDIR += gaddr
    SUBDIR += ganttproject
--- a/deskutils/flameshot/Makefile
+++ b/deskutils/flameshot/Makefile
@ -0,0 +1,29 @@
+# Created by: Nicola Stanislao Vitale <nivit@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	flameshot
+PORTVERSION=	0.5.0
+DISTVERSIONPREFIX=	v
+CATEGORIES=	deskutils
+
+MAINTAINER=	nivit@FreeBSD.org
+COMMENT=	Powerful yet simple to use screenshot software
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+GH_ACCOUNT=	lupoDharkael
+
+INSTALL_ICONS=	yes
+
+USES=		qmake
+USE_GCC=	yes
+USE_GITHUB=	yes
+USE_GL=		gl
+USE_QT5=	core dbus gui linguist network widgets
+
+post-patch:
+		@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},1' \
+			${WRKSRC}/${PORTNAME}.pro
+
+.include <bsd.port.mk>
--- a/deskutils/flameshot/distinfo
+++ b/deskutils/flameshot/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1516551815
+SHA256 (lupoDharkael-flameshot-v0.5.0_GH0.tar.gz) = 32d593c14c37286d9f64873c4ef9a07eb084723c92b2280d5c22152547c1e3f0
+SIZE (lupoDharkael-flameshot-v0.5.0_GH0.tar.gz) = 464600
--- a/deskutils/flameshot/files/patch-flameshot.pro
+++ b/deskutils/flameshot/files/patch-flameshot.pro
@ -0,0 +1,35 @@
+--- flameshot.pro.orig	2017-12-20 13:41:48 UTC
+++ flameshot.pro
+@@ -177,27 +177,27 @@ unix: {
+     packaging {
+         USRPATH = /usr
+     } else {
+-        USRPATH = /usr/local
+        USRPATH = %%LOCALBASE%%
+     }
+ 
+     target.path = $${BASEDIR}$${USRPATH}/bin/
+ 
+-    qmfile.path = $${BASEDIR}/usr/share/flameshot/translations/
+    qmfile.path = $${BASEDIR}$${USRPATH}/share/flameshot/translations/
+     qmfile.files = $${TRANSLATIONS_FILES}
+ 
+-    dbus.path = $${BASEDIR}/usr/share/dbus-1/interfaces/
+    dbus.path = $${BASEDIR}$${USRPATH}/share/dbus-1/interfaces/
+     dbus.files = dbus/org.dharkael.Flameshot.xml
+     
+     icon.path = $${BASEDIR}$${USRPATH}/share/icons/
+     icon.files = img/flameshot.png
+ 
+-    completion.path = /usr/share/bash-completion/completions/
+    completion.path = $${BASEDIR}$${USRPATH}/share/bash-completion/completions/
+     completion.files = docs/bash-completion/flameshot
+ 
+     desktopentry.path = $${BASEDIR}$${USRPATH}/share/applications
+     desktopentryinit.path = $${BASEDIR}$${USRPATH}/share/applications
+     desktopentryconfig.path = $${BASEDIR}$${USRPATH}/share/applications
+-    servicedbus.path = $${BASEDIR}/usr/share/dbus-1/services/
+    servicedbus.path = $${BASEDIR}$${USRPATH}/share/dbus-1/services/
+ 
+     packaging {
+         desktopentry.files = docs/desktopEntry/package/flameshot.desktop
--- a/deskutils/flameshot/pkg-descr
+++ b/deskutils/flameshot/pkg-descr
@ -0,0 +1,11 @@
+Powerful yet simple to use screenshot software.
+
+Features:
+
+    * Customizable appearance.
+    * Easy to use.
+    * In-app screenshot edition.
+    * DBus interface.
+    * Upload to Imgur.
+
+WWW: https://github.com/lupoDharkael/flameshot
--- a/deskutils/flameshot/pkg-plist
+++ b/deskutils/flameshot/pkg-plist
@ -0,0 +1,10 @@
+bin/flameshot
+share/applications/flameshot-config.desktop
+share/applications/flameshot-init.desktop
+share/applications/flameshot.desktop
+share/bash-completion/completions/flameshot
+share/dbus-1/interfaces/org.dharkael.Flameshot.xml
+share/dbus-1/services/org.dharkael.Flameshot.service
+%%DATADIR%%/translations/Internationalization_ca.qm
+%%DATADIR%%/translations/Internationalization_es.qm
+share/icons/flameshot.png
--- a/deskutils/freeplane/Makefile
+++ b/deskutils/freeplane/Makefile
@ -0,0 +1,34 @@
+# Created by: Loïc Bartoletti <lbartoletti@tuxfamily.org>
+# $FreeBSD$
+
+PORTNAME=	freeplane
+PORTVERSION=	1.6.12
+PORTREVISION=	1
+CATEGORIES=	deskutils editors java
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20stable
+DISTNAME=	${PORTNAME}_bin-${PORTVERSION}
+
+MAINTAINER=	lbartoletti@tuxfamily.org
+COMMENT=	Free mind mapping and knowledge management software
+
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/license.txt
+
+USES=		cpe zip
+USE_JAVA=	yes
+JAVA_VERSION=	1.6+
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+do-install:
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \
+		"! ( -name freeplane\.sh* -or -name license\.txt -or -name *\.bat -or -name *\.exe )"
+# Install freeplane.sh with the right permission, link to it to bin/
+# and let it resolve the path to DATADIR automatically.
+	${INSTALL_SCRIPT} ${WRKSRC}/freeplane.sh ${STAGEDIR}${DATADIR}
+	${RLN} ${STAGEDIR}${DATADIR}/freeplane.sh ${STAGEDIR}${PREFIX}/bin/freeplane
+
+.include <bsd.port.mk>
--- a/deskutils/freeplane/distinfo
+++ b/deskutils/freeplane/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1516389249
+SHA256 (freeplane_bin-1.6.12.zip) = 34ebea17df37edd8bd1f52ea5e7e40d3e83e2b409a62dbd0d74a86967c9ea6f0
+SIZE (freeplane_bin-1.6.12.zip) = 36164443
--- a/deskutils/freeplane/files/patch-freeplane.sh
+++ b/deskutils/freeplane/files/patch-freeplane.sh
@ -0,0 +1,17 @@
+--- freeplane.sh.orig	2018-01-07 18:16:56 UTC
+++ freeplane.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
+#!/bin/sh
+ 
+ # we only want to test the script, not Freeplane itself
+ if ( echo "${DEBUG}" | grep -qe "script" ); then
+@@ -123,7 +123,7 @@ if [ -x $(which readlink) ] && [ "`echo $OSTYPE | cut 
+ 	# if we have 'readlink' we can use it to get an absolute path
+ 	# -m should be faster and link does always resolve, else this script
+ 	# wouldn't be called, would it?
+-	freefile=$(readlink -mn "$0")
+	freefile=$(readlink -fn "$0")
+ 	_debug "Link '$0' resolved to '${freefile}'."
+ else
+ 	freefile="$0"
--- a/deskutils/freeplane/pkg-descr
+++ b/deskutils/freeplane/pkg-descr
@ -0,0 +1,6 @@
+Freeplane is a free and open source software application that supports
+thinking, sharing information and getting things done at work, in
+school and at home.  The software can be used for mind mapping and
+analyzing the information contained in mind maps.
+
+WWW: https://www.freeplane.org/
--- a/deskutils/freeplane/pkg-plist
+++ b/deskutils/freeplane/pkg-plist
@ -0,0 +1,238 @@
+bin/freeplane
+%%DATADIR%%/core/org.freeplane.core/META-INF/MANIFEST.MF
+%%DATADIR%%/core/org.freeplane.core/lib/SimplyHTML-0.17.3.jar
+%%DATADIR%%/core/org.freeplane.core/lib/commons-codec-1.7.jar
+%%DATADIR%%/core/org.freeplane.core/lib/commons-io-2.4.jar
+%%DATADIR%%/core/org.freeplane.core/lib/commons-lang-2.6.jar
+%%DATADIR%%/core/org.freeplane.core/lib/freeplane_mac-1.5.jar
+%%DATADIR%%/core/org.freeplane.core/lib/freeplaneeditor-1.5.jar
+%%DATADIR%%/core/org.freeplane.core/lib/freeplaneosgi-1.5.jar
+%%DATADIR%%/core/org.freeplane.core/lib/freeplaneviewer.jar
+%%DATADIR%%/core/org.freeplane.core/lib/idw-gpl-1.6.1.jar
+%%DATADIR%%/core/org.freeplane.core/lib/jgoodies-common-1.8.1.jar
+%%DATADIR%%/core/org.freeplane.core/lib/jgoodies-forms-1.9.0.jar
+%%DATADIR%%/core/org.freeplane.core/lib/jortho-1.5.jar
+%%DATADIR%%/core/org.freeplane.core/lib/jortho.jar
+%%DATADIR%%/core/org.freeplane.core/lib/kitfox-svg-salamander-1.1.1-p1.jar
+%%DATADIR%%/doc/Freeplane_LaTeX.mm
+%%DATADIR%%/doc/Images/Preferences_Joining nodes.png
+%%DATADIR%%/doc/Images/doc/BackgroundContextMenu.png
+%%DATADIR%%/doc/Images/doc/BackgroundContextMenu_nl.png
+%%DATADIR%%/doc/Images/doc/HotKeysTable.png
+%%DATADIR%%/doc/Images/doc/HotKeysTable_nl.png
+%%DATADIR%%/doc/Images/doc/MenusPropertiesPanel.png
+%%DATADIR%%/doc/Images/doc/MenusPropertiesPanel_nl.png
+%%DATADIR%%/doc/Images/doc/freeplaneApplications.png
+%%DATADIR%%/doc/Images/doc/goto node with ID.png
+%%DATADIR%%/doc/Images/doc/key mapping dialog.png
+%%DATADIR%%/doc/Images/doc/mapView v outlineView.png
+%%DATADIR%%/doc/Images/doc/right-click menu - open maps.png
+%%DATADIR%%/doc/Images/doc/tabs in workspace.png
+%%DATADIR%%/doc/Images/examples.png
+%%DATADIR%%/doc/Images/eyes.png
+%%DATADIR%%/doc/Images/icons toolbar - collapsed.png
+%%DATADIR%%/doc/Images/mouse/mouse_RB.png
+%%DATADIR%%/doc/Images/other/workspace/Freeplane workspace (annotated).png
+%%DATADIR%%/doc/Images/other/workspace/Freeplane workspace.png
+%%DATADIR%%/doc/Images/other/workspace/details arrow_.png
+%%DATADIR%%/doc/Images/other/workspace/f bar - split.png
+%%DATADIR%%/doc/Images/other/workspace/f bar.png
+%%DATADIR%%/doc/Images/other/workspace/filter toolbar - split.png
+%%DATADIR%%/doc/Images/other/workspace/filter toolbar.png
+%%DATADIR%%/doc/Images/other/workspace/icons toolbar.png
+%%DATADIR%%/doc/Images/other/workspace/menubar.png
+%%DATADIR%%/doc/Images/other/workspace/notes panel.png
+%%DATADIR%%/doc/Images/other/workspace/properties panel.png
+%%DATADIR%%/doc/Images/other/workspace/resize arrows.png
+%%DATADIR%%/doc/Images/other/workspace/right-click menu.png
+%%DATADIR%%/doc/Images/other/workspace/scroll bars.png
+%%DATADIR%%/doc/Images/other/workspace/status line.png
+%%DATADIR%%/doc/Images/other/workspace/submenu flyouts (basic).png
+%%DATADIR%%/doc/Images/other/workspace/submenu flyouts.png
+%%DATADIR%%/doc/Images/other/workspace/toolbar - split.png
+%%DATADIR%%/doc/Images/other/workspace/toolbar.png
+%%DATADIR%%/doc/Images/other/workspace/view - toolbars.png
+%%DATADIR%%/doc/Images/other/workspace/view - view settings.png
+%%DATADIR%%/doc/Images/properties toolbar - collapsed.png
+%%DATADIR%%/doc/api/allclasses-frame.html
+%%DATADIR%%/doc/api/allclasses-noframe.html
+%%DATADIR%%/doc/api/constant-values.html
+%%DATADIR%%/doc/api/deprecated-list.html
+%%DATADIR%%/doc/api/help-doc.html
+%%DATADIR%%/doc/api/index-all.html
+%%DATADIR%%/doc/api/index.html
+%%DATADIR%%/doc/api/org/freeplane/core/ui/components/UITools.InsertEolAction.html
+%%DATADIR%%/doc/api/org/freeplane/core/ui/components/UITools.html
+%%DATADIR%%/doc/api/org/freeplane/core/ui/components/package-frame.html
+%%DATADIR%%/doc/api/org/freeplane/core/ui/components/package-summary.html
+%%DATADIR%%/doc/api/org/freeplane/core/ui/components/package-tree.html
+%%DATADIR%%/doc/api/org/freeplane/core/util/FreeplaneVersion.html
+%%DATADIR%%/doc/api/org/freeplane/core/util/HtmlUtils.IndexPair.html
+%%DATADIR%%/doc/api/org/freeplane/core/util/HtmlUtils.html
+%%DATADIR%%/doc/api/org/freeplane/core/util/LogUtils.html
+%%DATADIR%%/doc/api/org/freeplane/core/util/MenuUtils.MenuEntry.html
+%%DATADIR%%/doc/api/org/freeplane/core/util/MenuUtils.MenuEntryTreeBuilder.html
+%%DATADIR%%/doc/api/org/freeplane/core/util/MenuUtils.html
+%%DATADIR%%/doc/api/org/freeplane/core/util/TextUtils.html
+%%DATADIR%%/doc/api/org/freeplane/core/util/package-frame.html
+%%DATADIR%%/doc/api/org/freeplane/core/util/package-summary.html
+%%DATADIR%%/doc/api/org/freeplane/core/util/package-tree.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/FreeplaneScriptBaseClass.ConfigProperties.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/FreeplaneScriptBaseClass.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/package-frame.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/package-summary.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/package-tree.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Convertible.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.Attributes.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.AttributesRO.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.Cloud.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.Connector.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.ConnectorRO.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.Controller.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.ControllerRO.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.Edge.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.EdgeRO.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.ExternalObject.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.ExternalObjectRO.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.Font.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.FontRO.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.Icons.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.IconsRO.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.Link.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.LinkRO.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.Map.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.MapRO.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.Node.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.NodeRO.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.NodeStyle.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.NodeStyleRO.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.Properties.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.Reminder.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.ReminderRO.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/Proxy.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/ScriptUtils.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/package-frame.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/package-summary.html
+%%DATADIR%%/doc/api/org/freeplane/plugin/script/proxy/package-tree.html
+%%DATADIR%%/doc/api/overview-frame.html
+%%DATADIR%%/doc/api/overview-summary.html
+%%DATADIR%%/doc/api/overview-tree.html
+%%DATADIR%%/doc/api/package-list
+%%DATADIR%%/doc/api/script.js
+%%DATADIR%%/doc/api/serialized-form.html
+%%DATADIR%%/doc/api/stylesheet.css
+%%DATADIR%%/doc/examplepicture_nl.JPG
+%%DATADIR%%/doc/freeplane.jpg
+%%DATADIR%%/doc/freeplane.mm
+%%DATADIR%%/doc/freeplaneApplications.mm
+%%DATADIR%%/doc/freeplaneApplications_ja.mm
+%%DATADIR%%/doc/freeplaneApplications_nl.mm
+%%DATADIR%%/doc/freeplaneFunctions.mm
+%%DATADIR%%/doc/freeplaneFunctions_ja.mm
+%%DATADIR%%/doc/freeplaneFunctions_nl.mm
+%%DATADIR%%/doc/freeplaneTutorial.jpg
+%%DATADIR%%/doc/freeplaneTutorial.mm
+%%DATADIR%%/doc/freeplaneTutorial.mmfilter
+%%DATADIR%%/doc/freeplaneTutorial_ja.mm
+%%DATADIR%%/doc/freeplaneTutorial_ja.mmfilter
+%%DATADIR%%/doc/freeplaneTutorial_nl.jpg
+%%DATADIR%%/doc/freeplaneTutorial_nl.mm
+%%DATADIR%%/doc/freeplaneTutorial_nl.mmfilter
+%%DATADIR%%/doc/freeplane_de.mm
+%%DATADIR%%/doc/freeplane_es.mm
+%%DATADIR%%/doc/freeplane_et.mm
+%%DATADIR%%/doc/freeplane_fr.mm
+%%DATADIR%%/doc/freeplane_id.mm
+%%DATADIR%%/doc/freeplane_it.mm
+%%DATADIR%%/doc/freeplane_ja.mm
+%%DATADIR%%/doc/freeplane_menuposition_nl.jpg
+%%DATADIR%%/doc/freeplane_nl.jpg
+%%DATADIR%%/doc/freeplane_ru.mm
+%%DATADIR%%/doc/freeplane_vi.mm
+%%DATADIR%%/doc/history_en.txt
+%%DATADIR%%/doc/whatsNew-1.5.x.mm
+%%DATADIR%%/framework.jar
+%%DATADIR%%/freeplane.l4j.ini
+%%DATADIR%%/freeplane.png
+%%DATADIR%%/freeplane.policy
+%%DATADIR%%/freeplane.sh
+%%DATADIR%%/freeplane.svg
+%%DATADIR%%/freeplaneConsole.l4j.ini
+%%DATADIR%%/freeplaneIcons.dll
+%%DATADIR%%/freeplanelauncher.jar
+%%DATADIR%%/gitinfo.txt
+%%DATADIR%%/init.xargs
+%%DATADIR%%/plugins/org.freeplane.plugin.bugreport/META-INF/MANIFEST.MF
+%%DATADIR%%/plugins/org.freeplane.plugin.bugreport/lib/plugin-1.5.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.formula/META-INF/MANIFEST.MF
+%%DATADIR%%/plugins/org.freeplane.plugin.formula/lib/plugin-1.5.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.jsyntaxpane/META-INF/MANIFEST.MF
+%%DATADIR%%/plugins/org.freeplane.plugin.jsyntaxpane/lib/jsyntaxpane-0.9.6~r156-5.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.jsyntaxpane/lib/plugin-1.5.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.latex/META-INF/MANIFEST.MF
+%%DATADIR%%/plugins/org.freeplane.plugin.latex/lib/jlatexmath-1.0.6.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.latex/lib/jlatexmath-font-cyrillic-1.0.6.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.latex/lib/jlatexmath-font-greek-1.0.6.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.latex/lib/plugin-1.5.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.openmaps/META-INF/MANIFEST.MF
+%%DATADIR%%/plugins/org.freeplane.plugin.openmaps/lib/jmapviewer-1.14.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.openmaps/lib/plugin-1.5.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/META-INF/MANIFEST.MF
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/byte-buddy-1.6.9.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-all-2.3.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-patcher-0.0.2.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/plugin-1.5.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.svg/META-INF/MANIFEST.MF
+%%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/avalon-framework-api-4.3.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/avalon-framework-impl-4.3.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/batik-all-1.9.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/commons-logging-1.2.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/fop-2.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/plugin-1.5.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/xml-apis-1.4.01.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/xml-apis-ext-1.3.04.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/xmlgraphics-commons-2.2.jar
+%%DATADIR%%/props.xargs
+%%DATADIR%%/resources/gitinfo.properties
+%%DATADIR%%/resources/ortho/dictionary_de.ortho
+%%DATADIR%%/resources/ortho/dictionary_en.ortho
+%%DATADIR%%/resources/ortho/dictionary_fr.ortho
+%%DATADIR%%/resources/templates/BigMap.mm
+%%DATADIR%%/resources/templates/BuzanMap.mm
+%%DATADIR%%/resources/templates/conceptMap.mm
+%%DATADIR%%/resources/templates/essay.mm
+%%DATADIR%%/resources/templates/standard-1.6-noEdgeColor.mm
+%%DATADIR%%/resources/templates/standard-1.6.mm
+%%DATADIR%%/resources/xml/filemodemenu.xml
+%%DATADIR%%/resources/xml/mindmapmodemenu.xml
+%%DATADIR%%/resources/xml/preferences.xml
+%%DATADIR%%/resources/xml/stylemodemenu.xml
+%%DATADIR%%/resources/xslt/export2oowriter.manifest.xsl
+%%DATADIR%%/resources/xslt/export2oowriter.styles.xsl
+%%DATADIR%%/resources/xslt/export2oowriter.xsl
+%%DATADIR%%/resources/xslt/mm2adoc.xsl
+%%DATADIR%%/resources/xslt/mm2freeplane1_1-mm.xsl
+%%DATADIR%%/resources/xslt/mm2html.xsl
+%%DATADIR%%/resources/xslt/mm2latexartcl.xsl
+%%DATADIR%%/resources/xslt/mm2latexbeamer_richcontent_1.3.x.xsl
+%%DATADIR%%/resources/xslt/mm2latexbook.xsl
+%%DATADIR%%/resources/xslt/mm2latexinput.xsl
+%%DATADIR%%/resources/xslt/mm2markdown.xsl
+%%DATADIR%%/resources/xslt/mm2msp_utf8.xsl
+%%DATADIR%%/resources/xslt/mm2msp_utf8_TEMPLATE.mm
+%%DATADIR%%/resources/xslt/mm2mwiki.xsl
+%%DATADIR%%/resources/xslt/mm2opml.xsl
+%%DATADIR%%/resources/xslt/mm2raw.xsl
+%%DATADIR%%/resources/xslt/mm2text.xsl
+%%DATADIR%%/resources/xslt/mm2wordml_utf8.xsl
+%%DATADIR%%/resources/xslt/mm2wordml_utf8_TEMPLATE.mm
+%%DATADIR%%/resources/xslt/mm2xbel.xsl
+%%DATADIR%%/resources/xslt/mm2xls_utf8.xsl
+%%DATADIR%%/resources/xslt/mm2xml.xsl
+%%DATADIR%%/resources/xslt/tohtml.xsl
+%%DATADIR%%/resources/xslt/xbel2mm.xsl
+%%DATADIR%%/scripts/apiGenerator.groovy
+%%DATADIR%%/scripts/freeplane.dsld
+%%DATADIR%%/scripts/installScriptAddOn.groovy
+@dir %%DATADIR%%/fwdir/condperm
+@dir %%DATADIR%%/fwdir/perms
--- a/devel/Makefile
+++ b/devel/Makefile
@ -508,6 +508,7 @@
    SUBDIR += elixir-decimal
    SUBDIR += elixir-deppie
    SUBDIR += elixir-dialyze
+    SUBDIR += elixir-distillery
    SUBDIR += elixir-estree
    SUBDIR += elixir-eternal
    SUBDIR += elixir-exactor
@ -5382,6 +5383,7 @@
    SUBDIR += rubygem-devise-rails50
    SUBDIR += rubygem-directory_watcher
    SUBDIR += rubygem-ditz
+    SUBDIR += rubygem-diva
    SUBDIR += rubygem-docile
    SUBDIR += rubygem-drydock
    SUBDIR += rubygem-dynflow
--- a/devel/cgit/Makefile
+++ b/devel/cgit/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	cgit
 PORTVERSION=	1.1
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	devel www
 MASTER_SITES=	http://git.zx2c4.com/cgit/snapshot/:cgit \
 		https://www.kernel.org/pub/software/scm/git/:git
@ -15,10 +15,16 @@ COMMENT=	Fast, lightweight web frontend for Git repositories
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

-GIT_VERSION=	2.15.1
-USES=		cpe gmake iconv shebangfix ssl tar:xz
+TEST_DEPENDS=	msgfmt:devel/gettext-tools
+
+GIT_VERSION=	2.16.1
+USES=		cpe gmake iconv perl5 python:env shebangfix ssl tar:xz
 CPE_VENDOR=	lars_hjemli
-SHEBANG_FILES=	filters/html-converters/rst2html
+USE_PERL5=	test
+SHEBANG_FILES=	filters/email-gravatar.py \
+		filters/html-converters/md2html \
+		filters/html-converters/rst2html \
+		filters/syntax-highlighting.py

 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
--- a/devel/cgit/distinfo
+++ b/devel/cgit/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1512008253
+TIMESTAMP = 1516669198
 SHA256 (cgit-1.1.tar.xz) = 0889af29be15fc981481caa09579f982b9740fe9fd2860ab87dff286f4635890
 SIZE (cgit-1.1.tar.xz) = 86268
-SHA256 (git-2.15.1.tar.xz) = 999c90fd7d45066992cdb87dda35bdff6dfc1d01496118ea718dfb866da4045c
-SIZE (git-2.15.1.tar.xz) = 4894768
+SHA256 (git-2.16.1.tar.xz) = cfad4337f2fdbfc1e2c8abce5e17e1dd4e1718a34ac2cbe3238fbe2426f2ea19
+SIZE (git-2.16.1.tar.xz) = 4961656
--- a/devel/cgit/files/patch-git-2.16
+++ b/devel/cgit/files/patch-git-2.16
@ -0,0 +1,115 @@
+From 1dd53e3a2ffec730ec27ebe15b3d63e0b417a544 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Thu, 18 Jan 2018 09:19:31 +0100
+Subject: git: update to v2.16.0
+
+Update to git version v2.16.0:
+
+* refs: convert resolve_ref_unsafe to struct object_id
+  (49e61479be913f67e66bb3fdf8de9475c41b58bd)
+* diff: remove DIFF_OPT_SET macro
+  (23dcf77f48feb49c54bad09210f093a799816334)
+* log: add option to choose which refs to decorate
+  (65516f586b69307f977cd67cc45513a296cabc25)
+* diff: convert flags to be stored in bitfields
+  (02f2f56bc377c287c411947d0e1482aac888f8db)
+
+Signed-off-by: Christian Hesse <mail@eworm.de>
+---
+ Makefile    | 2 +-
+ cgit.c      | 2 +-
+ git         | 2 +-
+ shared.c    | 2 +-
+ ui-blame.c  | 2 +-
+ ui-commit.c | 2 +-
+ ui-diff.c   | 2 +-
+ ui-log.c    | 7 +++----
+ 8 files changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/cgit.c b/cgit.c
+index 972a67e..a3702c2 100644
+--- cgit.c
+++ cgit.c
+@@ -478,7 +478,7 @@ static char *guess_defbranch(void)
+ 	const char *ref, *refname;
+ 	struct object_id oid;
+ 
+-	ref = resolve_ref_unsafe("HEAD", 0, oid.hash, NULL);
+	ref = resolve_ref_unsafe("HEAD", 0, &oid, NULL);
+ 	if (!ref || !skip_prefix(ref, "refs/heads/", &refname))
+ 		return "master";
+ 	return xstrdup(refname);
+diff --git a/shared.c b/shared.c
+index df3f611..21ac8f4 100644
+--- shared.c
+++ shared.c
+@@ -346,7 +346,7 @@ void cgit_diff_tree(const struct object_id *old_oid,
+ 	opt.output_format = DIFF_FORMAT_CALLBACK;
+ 	opt.detect_rename = 1;
+ 	opt.rename_limit = ctx.cfg.renamelimit;
+-	DIFF_OPT_SET(&opt, RECURSIVE);
+	opt.flags.recursive = 1;
+ 	if (ignorews)
+ 		DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
+ 	opt.format_callback = cgit_diff_tree_cb;
+diff --git a/ui-commit.c b/ui-commit.c
+index 586fea0..abf58f6 100644
+--- ui-commit.c
+++ ui-commit.c
+@@ -41,7 +41,7 @@ void cgit_print_commit(char *hex, const char *prefix)
+ 
+ 	format_display_notes(&oid, &notes, PAGE_ENCODING, 0);
+ 
+-	load_ref_decorations(DECORATE_FULL_REFS);
+	load_ref_decorations(NULL, DECORATE_FULL_REFS);
+ 
+ 	cgit_print_layout_start();
+ 	cgit_print_diff_ctrls();
+diff --git a/ui-diff.c b/ui-diff.c
+index c7fb49b..a10ce8a 100644
+--- ui-diff.c
+++ ui-diff.c
+@@ -444,7 +444,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
+ 
+ 		diff_setup(&diffopt);
+ 		diffopt.output_format = DIFF_FORMAT_PATCH;
+-		DIFF_OPT_SET(&diffopt, RECURSIVE);
+		diffopt.flags.recursive = 1;
+ 		diff_setup_done(&diffopt);
+ 
+ 		ctx.page.mimetype = "text/plain";
+diff --git a/ui-log.c b/ui-log.c
+index 2d2bb31..8e36fba 100644
+--- ui-log.c
+++ ui-log.c
+@@ -119,8 +119,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
+ 	struct commit_list *parents = commit->parents;
+ 	struct commit *parent;
+ 	int found = 0, saved_fmt;
+-	unsigned saved_flags = revs->diffopt.flags;
+-
+	struct diff_flags saved_flags = revs->diffopt.flags;
+ 
+ 	/* Always show if we're not in "follow" mode with a single file. */
+ 	if (!ctx.qry.follow)
+@@ -149,7 +148,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
+ 	add_lines = 0;
+ 	rem_lines = 0;
+ 
+-	DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
+	revs->diffopt.flags.recursive = 1;
+ 	diff_tree_oid(&parent->tree->object.oid,
+ 		      &commit->tree->object.oid,
+ 		      "", &revs->diffopt);
+@@ -434,7 +433,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
+ 	rev.ignore_missing = 1;
+ 	rev.simplify_history = 1;
+ 	setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL);
+-	load_ref_decorations(DECORATE_FULL_REFS);
+	load_ref_decorations(NULL, DECORATE_FULL_REFS);
+ 	rev.show_decorations = 1;
+ 	rev.grep_filter.ignore_case = 1;
+ 
+-- 
+cgit v1.1-35-ge94e
+
--- a/devel/e2fsprogs-libss/Makefile
+++ b/devel/e2fsprogs-libss/Makefile
@ -14,11 +14,6 @@ LICENSE_FILE=	${INSTALL_WRKSRC}/ss.h
 CONFLICTS=	heimdal-[0-9]*
 CONFLICTS+=	krb4-[0-9]*

-BROKEN_mips=		Does not build: expected declaration specifiers before size_t
-BROKEN_mips64=		Does not build: expected declaration specifiers before size_t
-BROKEN_powerpc64=	Does not build: expected declaration specifiers before size_t
-BROKEN_sparc64=		Does not build: expected declaration specifiers before size_t
-
 OPTIONS_EXCLUDE=	DOCS EXAMPLES IPV6 NLS
 CONFIGURE_ARGS=	--enable-elf-shlibs
 MASTERDIR=	${.CURDIR}/../../sysutils/e2fsprogs
@ -31,7 +26,7 @@ FILESDIR=	${.CURDIR}/files
 PKGDIR=		${.CURDIR}

 pre-build:
-	@(cd ${WRKSRC}/lib/ss && compile_et ss_err.et && \
+	(cd ${WRKSRC}/lib/ss && compile_et ss_err.et && \
 	${REINPLACE_CMD} -f ${FILESDIR}/fix-ss_err.h.sed ss_err.h)

 .include "${MASTERDIR}/Makefile"
--- a/devel/e2fsprogs-libss/files/fix-ss_err.h.sed
+++ b/devel/e2fsprogs-libss/files/fix-ss_err.h.sed
@ -1,2 +1,3 @@
 /#define __ss_err_h__/a\
+#include <stdio.h>
 #include <com_err.h>
--- a/devel/elixir-distillery/Makefile
+++ b/devel/elixir-distillery/Makefile
@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME=	distillery
+DISTVERSION=	1.5.2
+CATEGORIES=	devel
+PKGNAMEPREFIX=	elixir-
+
+MAINTAINER=	olgeni@FreeBSD.org
+COMMENT=	Automatically generate releases for Elixir projects
+
+LICENSE=	MIT
+
+USES=		elixir
+USE_GITHUB=	yes
+GH_ACCOUNT=	bitwalker
+
+.include <bsd.port.mk>
--- a/devel/elixir-distillery/distinfo
+++ b/devel/elixir-distillery/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1516541468
+SHA256 (bitwalker-distillery-1.5.2_GH0.tar.gz) = 1d1ebc1c5a2a0a7fda127af622b8e5769d7287a4c710b6d818060acc3e9458c9
+SIZE (bitwalker-distillery-1.5.2_GH0.tar.gz) = 210510
--- a/devel/elixir-distillery/files/patch-mix.exs
+++ b/devel/elixir-distillery/files/patch-mix.exs
@ -0,0 +1,10 @@
+--- mix.exs.orig	2018-01-21 13:38:06 UTC
+++ mix.exs
+@@ -7,7 +7,6 @@ defmodule Distillery.Mixfile do
+      elixir: "~> 1.3",
+      build_embedded: Mix.env == :prod,
+      start_permanent: Mix.env == :prod,
+-     deps: deps(),
+      description: description(),
+      package: package(),
+      docs: docs(),
--- a/devel/elixir-distillery/pkg-descr
+++ b/devel/elixir-distillery/pkg-descr
@ -0,0 +1,4 @@
+Distillery is a pure-Elixir, dependency-free implementation of
+release generation for Elixir projects.
+
+WWW: https://github.com/bitwalker/distillery
--- a/devel/elixir-distillery/pkg-plist
+++ b/devel/elixir-distillery/pkg-plist
@ -0,0 +1,78 @@
+lib/elixir/lib/distillery/ebin/Elixir.Distillery.Cookies.beam
+lib/elixir/lib/distillery/ebin/Elixir.Distillery.IO.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Releases.App.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Releases.Appup.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Releases.Archiver.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Releases.Assembler.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Releases.Config.LoadError.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Releases.Config.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Releases.Environment.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Releases.Errors.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Releases.Logger.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Releases.Overlays.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Releases.Plugin.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Releases.Profile.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Releases.Release.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Releases.Utils.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Tasks.Release.Clean.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Tasks.Release.Init.beam
+lib/elixir/lib/distillery/ebin/Elixir.Mix.Tasks.Release.beam
+lib/elixir/lib/distillery/ebin/distillery.app
+lib/elixir/lib/distillery/lib/distillery/lib/cookies.ex
+lib/elixir/lib/distillery/lib/distillery/lib/io.ex
+lib/elixir/lib/distillery/lib/distillery/tasks/clean.ex
+lib/elixir/lib/distillery/lib/distillery/tasks/init.ex
+lib/elixir/lib/distillery/lib/distillery/tasks/release.ex
+lib/elixir/lib/distillery/lib/mix/lib/releases/appups.ex
+lib/elixir/lib/distillery/lib/mix/lib/releases/archiver.ex
+lib/elixir/lib/distillery/lib/mix/lib/releases/assembler.ex
+lib/elixir/lib/distillery/lib/mix/lib/releases/config/config.ex
+lib/elixir/lib/distillery/lib/mix/lib/releases/config/load_error.ex
+lib/elixir/lib/distillery/lib/mix/lib/releases/errors.ex
+lib/elixir/lib/distillery/lib/mix/lib/releases/logger.ex
+lib/elixir/lib/distillery/lib/mix/lib/releases/models/app.ex
+lib/elixir/lib/distillery/lib/mix/lib/releases/models/environment.ex
+lib/elixir/lib/distillery/lib/mix/lib/releases/models/profile.ex
+lib/elixir/lib/distillery/lib/mix/lib/releases/models/release.ex
+lib/elixir/lib/distillery/lib/mix/lib/releases/overlays.ex
+lib/elixir/lib/distillery/lib/mix/lib/releases/plugins/plugin.ex
+lib/elixir/lib/distillery/lib/mix/lib/releases/utils.ex
+lib/elixir/lib/distillery/priv/libexec/commands/attach.sh
+lib/elixir/lib/distillery/priv/libexec/commands/command.sh
+lib/elixir/lib/distillery/priv/libexec/commands/console.sh
+lib/elixir/lib/distillery/priv/libexec/commands/describe.sh
+lib/elixir/lib/distillery/priv/libexec/commands/escript.sh
+lib/elixir/lib/distillery/priv/libexec/commands/eval.sh
+lib/elixir/lib/distillery/priv/libexec/commands/foreground.sh
+lib/elixir/lib/distillery/priv/libexec/commands/help.sh
+lib/elixir/lib/distillery/priv/libexec/commands/install.sh
+lib/elixir/lib/distillery/priv/libexec/commands/pid.sh
+lib/elixir/lib/distillery/priv/libexec/commands/ping.sh
+lib/elixir/lib/distillery/priv/libexec/commands/pingpeer.sh
+lib/elixir/lib/distillery/priv/libexec/commands/reboot.sh
+lib/elixir/lib/distillery/priv/libexec/commands/reload_config.sh
+lib/elixir/lib/distillery/priv/libexec/commands/remote_console.sh
+lib/elixir/lib/distillery/priv/libexec/commands/restart.sh
+lib/elixir/lib/distillery/priv/libexec/commands/rpc.sh
+lib/elixir/lib/distillery/priv/libexec/commands/rpcterms.sh
+lib/elixir/lib/distillery/priv/libexec/commands/start.sh
+lib/elixir/lib/distillery/priv/libexec/commands/stop.sh
+lib/elixir/lib/distillery/priv/libexec/commands/unpack.sh
+lib/elixir/lib/distillery/priv/libexec/config.sh
+lib/elixir/lib/distillery/priv/libexec/env.sh
+lib/elixir/lib/distillery/priv/libexec/erts.sh
+lib/elixir/lib/distillery/priv/libexec/helpers.sh
+lib/elixir/lib/distillery/priv/libexec/logger.sh
+lib/elixir/lib/distillery/priv/templates/boot.eex
+lib/elixir/lib/distillery/priv/templates/boot_check.eex
+lib/elixir/lib/distillery/priv/templates/boot_loader.eex
+lib/elixir/lib/distillery/priv/templates/boot_loader_win.eex
+lib/elixir/lib/distillery/priv/templates/boot_win.eex
+lib/elixir/lib/distillery/priv/templates/erl_ini.eex
+lib/elixir/lib/distillery/priv/templates/erl_script.eex
+lib/elixir/lib/distillery/priv/templates/example_config.eex
+lib/elixir/lib/distillery/priv/templates/executable.eex
+lib/elixir/lib/distillery/priv/templates/nodetool.eex
+lib/elixir/lib/distillery/priv/templates/release_utils.eex
+lib/elixir/lib/distillery/priv/templates/vm.args.eex
+%%PORTDOCS%%%%DOCSDIR%%/README.md
--- a/devel/etcd32/Makefile
+++ b/devel/etcd32/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	etcd
-PORTVERSION=	3.2.14
+PORTVERSION=	3.2.15
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
--- a/devel/etcd32/distinfo
+++ b/devel/etcd32/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1515707204
-SHA256 (coreos-etcd-v3.2.14_GH0.tar.gz) = 96d5908b883a78b6caa3346867b620d04980a4545520ced0b6d1b3a0590f1546
-SIZE (coreos-etcd-v3.2.14_GH0.tar.gz) = 3047100
+TIMESTAMP = 1516700370
+SHA256 (coreos-etcd-v3.2.15_GH0.tar.gz) = 7ea084fae29b7efad8ec21d7fa85adef6b468bd0b128dc97a2a6b5094bb37938
+SIZE (coreos-etcd-v3.2.15_GH0.tar.gz) = 3047626
--- a/devel/git-cinnabar/Makefile
+++ b/devel/git-cinnabar/Makefile
@ -3,6 +3,7 @@
 PORTNAME=	git-cinnabar
 DISTVERSION=	0.5.0b2-12
 DISTVERSIONSUFFIX=	-g826f1d8 # custom release branch
+PORTREVISION=	1
 CATEGORIES=	devel

 MAINTAINER=	jbeich@FreeBSD.org
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@ -2,10 +2,10 @@
 # $FreeBSD$

 PORTNAME=	gitg
-PORTVERSION=	3.24.0
-PORTREVISION=	1
+PORTVERSION=	3.26.0
 CATEGORIES=	devel deskutils gnome
 MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome3

 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GTK-based git repository viewer
@ -13,8 +13,6 @@ COMMENT=	GTK-based git repository viewer
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

-BROKEN=		fails to configure
-
 BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
 		valac:lang/vala
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
--- a/devel/gitg/distinfo
+++ b/devel/gitg/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1495094129
-SHA256 (gitg-3.24.0.tar.xz) = 3e4ec4a8ae83bc7ced8c7610927ade70e37daa5e8beeb4f357a6ea30b4cc951e
-SIZE (gitg-3.24.0.tar.xz) = 1703132
+TIMESTAMP = 1513152551
+SHA256 (gnome3/gitg-3.26.0.tar.xz) = 26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5
+SIZE (gnome3/gitg-3.26.0.tar.xz) = 1551308
--- a/devel/gitg/pkg-plist
+++ b/devel/gitg/pkg-plist
@ -73,6 +73,7 @@ share/icons/hicolor/scalable/apps/gitg-symbolic.svg
 %%NLS%%share/locale/sv/LC_MESSAGES/gitg.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/gitg.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/gitg.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/gitg.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gitg.mo
 %%NLS%%share/locale/zh_HK/LC_MESSAGES/gitg.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gitg.mo
--- a/devel/grpc/Makefile
+++ b/devel/grpc/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	grpc
-PORTVERSION=	1.8.4
+PORTVERSION=	1.8.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel

--- a/devel/grpc/distinfo
+++ b/devel/grpc/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1515724853
-SHA256 (grpc-grpc-v1.8.4_GH0.tar.gz) = e35d9c107734f346eaa32c9a8b2bc19a06908e647cc6971cc73113b7aea8bdcd
-SIZE (grpc-grpc-v1.8.4_GH0.tar.gz) = 4632294
+TIMESTAMP = 1516545606
+SHA256 (grpc-grpc-v1.8.5_GH0.tar.gz) = df9168da760fd2ee970c74c9d1b63377e0024be248deaa844e784d0df47599de
+SIZE (grpc-grpc-v1.8.5_GH0.tar.gz) = 4632761
 SHA256 (google-benchmark-v1.3.0_GH0.tar.gz) = f19559475a592cbd5ac48b61f6b9cedf87f0b6775d1443de54cfe8f53940b28d
 SIZE (google-benchmark-v1.3.0_GH0.tar.gz) = 105485
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=		Ice
-PORTVERSION=		3.6.3
-PORTREVISION=		3
+PORTVERSION=		3.6.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=		devel

--- a/devel/ice/distinfo
+++ b/devel/ice/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1483464992
-SHA256 (zeroc-ice-ice-v3.6.3_GH0.tar.gz) = 82ff74e6d24d9fa396dbb4d9697dc183b17bc9c3f6f076fecdc05632be80a2dc
-SIZE (zeroc-ice-ice-v3.6.3_GH0.tar.gz) = 5512741
+TIMESTAMP = 1505206779
+SHA256 (zeroc-ice-ice-v3.6.4_GH0.tar.gz) = 4f5cc5e09586eab7de7745bbdc5fbf383c59f8fdc561264d4010bba19afdde2a
+SIZE (zeroc-ice-ice-v3.6.4_GH0.tar.gz) = 5523841
--- a/devel/ice/files/Make.rules.FreeBSD
+++ b/devel/ice/files/Make.rules.FreeBSD
@ -1,4 +1,6 @@
 mkshlib                 = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4)
+mkplugin		= $(CXX) -shared $(LDFLAGS) -o $(1) $(3) $(4)
+

 BASELIBS		= -lIceUtil -pthread -L$(LOCALBASE)/lib %%ICONV_LIB%%
 LIBS			= -lIce $(BASELIBS) 
--- a/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp
+++ b/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp
@ -1,35 +0,0 @@
--- cpp/src/IceGrid/ServerI.cpp.orig	2016-11-15 12:22:54.201742997 +0100
-+++ cpp/src/IceGrid/ServerI.cpp	2017-09-07 12:48:01.409625996 +0100
-@@ -341,7 +341,22 @@
-         {
-             assert(_p->first.find("config_") == 0);
-             const string service = _p->first.substr(7);
-            facet = "IceBox.Service." + service + ".Properties";
-+            bool useSharedCommunicator = false;
-+            for (PropertyDescriptorSeq::const_iterator d = _properties.at("config").begin(); d != _properties.at("config").end(); ++d)
-+            {
-+                if (d->name == "IceBox.UseSharedCommunicator." + service)
-+                {
-+                   useSharedCommunicator = (atoi(d->value.c_str()) > 0);
-+                }
-+            }
-+            if (useSharedCommunicator)
-+            {
-+                facet = "IceBox.SharedCommunicator.Properties";
-+            }
-+            else
-+            {
-+                facet = "IceBox.Service." + service + ".Properties";
-+            }
-             if(_traceLevels->server > 1)
-             {
-                 const string id = _server->getId();
-@@ -1232,7 +1232,7 @@ ServerI::load(const AMD_Node_loadServerPtr& amdCB, const InternalServerDescripto
-             updateRevision(desc->uuid, desc->revision);
-         }
- 
-        if(!_desc)
-+        if(!_desc || (_load && descriptorUpdated(_load->getInternalServerDescriptor(), _desc)))
-         {
-             _load->addCallback(amdCB);
-             return 0;
--- a/devel/ice/files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp
+++ b/devel/ice/files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp
@ -1,84 +0,0 @@
--- cpp/src/IceSSL/OpenSSLEngine.cpp.orig	2016-10-05 16:59:08.000000000 +0200
-+++ cpp/src/IceSSL/OpenSSLEngine.cpp	2016-10-12 01:59:40.150375902 +0200
-@@ -43,7 +43,7 @@
- int instanceCount = 0;
- bool initOpenSSL = false;
- 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- IceUtil::Mutex* locks = 0;
- #endif
- 
-@@ -62,7 +62,7 @@
-         // OpenSSL 1.1.0 introduces a new thread API and removes 
-         // the need to use a custom thread callback.
-         //
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-         CRYPTO_set_locking_callback(0);
-         CRYPTO_set_id_callback(0);
- 
-@@ -87,7 +87,7 @@
- // OpenSSL 1.1.0 introduces a new thread API and removes 
- // the need to use a custom thread callback.
- //
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- //
- // OpenSSL mutex callback.
- //
-@@ -158,7 +158,7 @@
- DH*
- IceSSL_opensslDHCallback(SSL* ssl, int /*isExport*/, int keyLength)
- {
-#  if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#  if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     SSL_CTX* ctx = SSL_get_SSL_CTX(ssl);
- #  else
-     SSL_CTX* ctx = ssl->ctx;
-@@ -219,7 +219,7 @@
-             //
-             // OpenSSL 1.1.0 remove the need for library initialization and cleanup.
-             //
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-             //
-             // Create the mutexes and set the callbacks.
-             //
-@@ -292,7 +292,9 @@
-             string entropyDaemon = properties->getProperty("IceSSL.EntropyDaemon");
-             if(!entropyDaemon.empty())
-             {
-+#    ifndef OPENSSL_NO_EGD
-                 if(RAND_egd(entropyDaemon.c_str()) <= 0)
-+#    endif
-                 {
-                     throw PluginInitializationException(__FILE__, __LINE__,
-                                                         "IceSSL: EGD failure using file " + entropyDaemon);
-@@ -326,7 +328,7 @@
- //
- // OpenSSL 1.1.0 remove the need for library initialization and cleanup.
- //
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     //
-     // Clean up OpenSSL resources.
-     //
-@@ -399,7 +401,7 @@
-                                                     "IceSSL: unable to create SSL context:\n" + sslErrors());
-             }
- 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-             int securityLevel = properties->getPropertyAsIntWithDefault(propPrefix + "SecurityLevel", -1);
-             if(securityLevel != -1)
-             {
-@@ -954,7 +956,7 @@
- SSL_METHOD*
- OpenSSLEngine::getMethod(int /*protocols*/)
- {
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     SSL_METHOD* meth = const_cast<SSL_METHOD*>(TLS_method());
- #else
-     //
--- a/devel/ice/files/patch-cpp-src-IceSSL-Util.cpp
+++ b/devel/ice/files/patch-cpp-src-IceSSL-Util.cpp
@ -1,29 +0,0 @@
--- cpp/src/IceSSL/Util.cpp~	2016-10-05 16:59:08.000000000 +0200
-+++ cpp/src/IceSSL/Util.cpp	2016-10-12 01:55:08.517427902 +0200
-@@ -110,7 +110,7 @@
- {
- 
- #  ifndef OPENSSL_NO_DH
-#    if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#    if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- // The following arrays are predefined Diffie Hellman group parameters.
- // These are known strong primes, distributed with the OpenSSL library
-@@ -338,7 +338,7 @@
- //
- // Convert a predefined parameter set into a DH value.
- //
-#    if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#    if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- static DH*
- convertDH(const unsigned char* buf, int len)
- {
-@@ -428,7 +428,7 @@
-     // No match found. Use one of the predefined parameter sets instead.
-     //
-     IceUtil::Mutex::Lock sync(*this);
-#    if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#    if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     if(keyLength >= 4096)
-     {
-         if(!_dh4096)
--- a/devel/ice/files/patch-cpp-src-IceUtil-Cond.cpp
+++ b/devel/ice/files/patch-cpp-src-IceUtil-Cond.cpp
@ -1,11 +0,0 @@
--- cpp/src/IceUtil/Cond.cpp.orig	2016-10-12 00:34:17.622732906 +0200
-+++ cpp/src/IceUtil/Cond.cpp	2016-10-12 00:34:40.133725906 +0200
-@@ -332,7 +332,7 @@
-         throw ThreadSyscallException(__FILE__, __LINE__, rc);
-     }
- 
-#if !defined(__hppa) && !defined(__APPLE__) && !defined(__FreeBSD__)
-+#if !defined(__hppa) && !defined(__APPLE__)
-     rc = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC); 
-     if(rc != 0)
-     {
--- a/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp
+++ b/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp
@ -9,6 +9,15 @@
 const string anonCiphers = "ADH:@SECLEVEL=0";
 #  else
 const string anonCiphers = "ADH";
+@@ -2048,7 +2048,7 @@
+     //
+     // No DSA support in Secure Transport / AIX 7.1 / SChannel
+     //
+-#if !defined(ICE_USE_SECURE_TRANSPORT) && !defined(_AIX) && !defined(ICE_USE_SCHANNEL)
+#if !defined(ICE_USE_SECURE_TRANSPORT) && !defined(_AIX) && !defined(ICE_USE_SCHANNEL)  && !defined(LIBRESSL_VERSION_NUMBER)
+     {
+         //
+         // DSA PEM keys are not supported with SChannel. Since Windows 10
@@ -3215,9 +3215,7 @@
 #endif
     }
--- a/devel/ice/files/patch-php-config-Make.rules.php
+++ b/devel/ice/files/patch-php-config-Make.rules.php
@ -1,22 +1,22 @@
--- php/config/Make.rules.php.orig	2015-06-23 15:30:20.000000000 +0000
-+++ php/config/Make.rules.php	2015-06-27 19:48:31.900063596 +0000
-@@ -108,13 +108,8 @@
+--- php/config/Make.rules.php.orig	2017-09-13 13:20:00.000000000 +0200
+++ php/config/Make.rules.php	2017-09-13 13:20:00.000000000 +0200
+@@ -81,13 +81,8 @@ ifeq ($(findstring /php/test/,$(abspath $(MAKEFILE_LIST))),)
+         $(error $(PHP_CONFIG) not found review your PHP installation and ensure $(PHP_CONFIG) is in your PATH)
+     endif
 
- libdir		= $(top_srcdir)/lib
- 
-ifndef usr_dir_install
-    install_phpdir	= $(prefix)/php
-    install_libdir  	= $(prefix)/php
-else
-    install_phpdir  	= $(prefix)/share/php
-    install_libdir  	= $(shell $(PHP_CONFIG) --extension-dir)
-endif
-+install_phpdir  	= $(prefix)/share/pear
-+install_libdir  	= $(prefix)/lib/php/$(PHP_EXT_DIR)
+-    ifndef usr_dir_install
+-        install_phpdir	= $(prefix)/php
+-        install_libdir  	= $(prefix)/php
+-    else
+-        install_phpdir  	= $(prefix)/share/php
+-        install_libdir  	= $(shell $(PHP_CONFIG) --extension-dir)
+-    endif
+    install_phpdir         = $(prefix)/share/pear
+    install_libdir         = $(prefix)/lib/php/$(PHP_EXT_DIR)
+ endif
 
 ifdef ice_src_dist
-     RPATH_DIR	= $(LOADER_PATH)/../../cpp/$(libsubdir)
-@@ -172,7 +167,8 @@
+@@ -145,7 +140,8 @@ else
 endif
 
 ifeq ($(installphplib),)
--- a/devel/ice/files/patch-python-modules-IcePy-Operation.cpp
+++ b/devel/ice/files/patch-python-modules-IcePy-Operation.cpp
@ -1,186 +0,0 @@
--- python/modules/IcePy/Operation.cpp.orig	2017-01-29 22:23:51.186130998 +0100
-+++ python/modules/IcePy/Operation.cpp	2017-01-29 22:24:55.929130998 +0100
-@@ -1682,11 +1682,11 @@
-             }
-             else
-             {
-                if(PyTuple_SET_ITEM(results.get(), info->pos, Unset) < 0)
-+                if(PyTuple_SetItem(results.get(), info->pos, Unset) < 0)
-                 {
-                     return 0;
-                 }
-                Py_INCREF(Unset); // PyTuple_SET_ITEM steals a reference.
-+                Py_INCREF(Unset); // PyTuple_SetItem steals a reference.
-             }
-         }
- 
-@@ -2546,7 +2546,7 @@
-             throwPythonException();
-         }
- 
-        if(PyTuple_SET_ITEM(result.get(), 0, ok ? incTrue() : incFalse()) < 0)
-+        if(PyTuple_SetItem(result.get(), 0, ok ? incTrue() : incFalse()) < 0)
-         {
-             throwPythonException();
-         }
-@@ -2586,11 +2586,11 @@
-         }
- #endif
- 
-        if(PyTuple_SET_ITEM(result.get(), 1, op.get()) < 0)
-+        if(PyTuple_SetItem(result.get(), 1, op.get()) < 0)
-         {
-             throwPythonException();
-         }
-        op.release(); // PyTuple_SET_ITEM steals a reference.
-+        op.release(); // PyTuple_SetItem steals a reference.
- 
-         return result.release();
-     }
-@@ -2827,7 +2827,7 @@
-             return 0;
-         }
- 
-        if(PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse()) < 0)
-+        if(PyTuple_SetItem(args.get(), 0, ok ? incTrue() : incFalse()) < 0)
-         {
-             return 0;
-         }
-@@ -2867,11 +2867,11 @@
-         memcpy(buf, results.first, sz);
- #endif
- 
-        if(PyTuple_SET_ITEM(args.get(), 1, op.get()) < 0)
-+        if(PyTuple_SetItem(args.get(), 1, op.get()) < 0)
-         {
-             return 0;
-         }
-        op.release(); // PyTuple_SET_ITEM steals a reference.
-+        op.release(); // PyTuple_SetItem steals a reference.
- 
-         return args.release();
-     }
-@@ -2910,7 +2910,7 @@
-             return;
-         }
- 
-        if(PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse()) < 0)
-+        if(PyTuple_SetItem(args.get(), 0, ok ? incTrue() : incFalse()) < 0)
-         {
-             assert(PyErr_Occurred());
-             PyErr_Print();
-@@ -2958,13 +2958,13 @@
-         memcpy(buf, results.first, sz);
- #endif
- 
-        if(PyTuple_SET_ITEM(args.get(), 1, op.get()) < 0)
-+        if(PyTuple_SetItem(args.get(), 1, op.get()) < 0)
-         {
-             assert(PyErr_Occurred());
-             PyErr_Print();
-             return;
-         }
-        op.release(); // PyTuple_SET_ITEM steals a reference.
-+        op.release(); // PyTuple_SetItem steals a reference.
- 
-         PyObjectHandle tmp = PyObject_Call(_response, args.get(), 0);
-         if(PyErr_Occurred())
-@@ -3126,7 +3126,7 @@
-             return;
-         }
- 
-        if(PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse()) < 0)
-+        if(PyTuple_SetItem(args.get(), 0, ok ? incTrue() : incFalse()) < 0)
-         {
-             assert(PyErr_Occurred());
-             PyErr_Print();
-@@ -3174,13 +3174,13 @@
-         memcpy(buf, results.first, sz);
- #endif
- 
-        if(PyTuple_SET_ITEM(args.get(), 1, op.get()) < 0)
-+        if(PyTuple_SetItem(args.get(), 1, op.get()) < 0)
-         {
-             assert(PyErr_Occurred());
-             PyErr_Print();
-             return;
-         }
-        op.release(); // PyTuple_SET_ITEM steals a reference.
-+        op.release(); // PyTuple_SetItem steals a reference.
- 
-         const string methodName = "ice_response";
-         if(!PyObject_HasAttrString(_callback, STRCAST(methodName.c_str())))
-@@ -3302,11 +3302,11 @@
-                 }
-                 else
-                 {
-                    if(PyTuple_SET_ITEM(args.get(), info->pos + offset, Unset) < 0)
-+                    if(PyTuple_SetItem(args.get(), info->pos + offset, Unset) < 0)
-                     {
-                         throwPythonException();
-                     }
-                    Py_INCREF(Unset); // PyTuple_SET_ITEM steals a reference.
-+                    Py_INCREF(Unset); // PyTuple_SetItem steals a reference.
-                 }
-             }
- 
-@@ -3329,11 +3329,11 @@
-     // Create an object to represent Ice::Current. We need to append this to the argument tuple.
-     //
-     PyObjectHandle curr = createCurrent(current);
-    if(PyTuple_SET_ITEM(args.get(), PyTuple_GET_SIZE(args.get()) - 1, curr.get()) < 0)
-+    if(PyTuple_SetItem(args.get(), PyTuple_GET_SIZE(args.get()) - 1, curr.get()) < 0)
-     {
-         throwPythonException();
-     }
-    curr.release(); // PyTuple_SET_ITEM steals a reference.
-+    curr.release(); // PyTuple_SetItem steals a reference.
- 
-     if(_op->amd)
-     {
-@@ -3347,7 +3347,7 @@
-         }
-         obj->upcall = new UpcallPtr(this);
-         obj->encoding = current.encoding;
-        if(PyTuple_SET_ITEM(args.get(), 0, (PyObject*)obj) < 0) // PyTuple_SET_ITEM steals a reference.
-+        if(PyTuple_SetItem(args.get(), 0, (PyObject*)obj) < 0) // PyTuple_SetItem steals a reference.
-         {
-             Py_DECREF(obj);
-             throwPythonException();
-@@ -3698,23 +3698,23 @@
-     }
- #endif
- 
-    if(PyTuple_SET_ITEM(args.get(), start, ip.get()) < 0)
-+    if(PyTuple_SetItem(args.get(), start, ip.get()) < 0)
-     {
-         throwPythonException();
-     }
-     ++start;
-    ip.release(); // PyTuple_SET_ITEM steals a reference.
-+    ip.release(); // PyTuple_SetItem steals a reference.
- 
-     //
-     // Create an object to represent Ice::Current. We need to append
-     // this to the argument tuple.
-     //
-     PyObjectHandle curr = createCurrent(current);
-    if(PyTuple_SET_ITEM(args.get(), start, curr.get()) < 0)
-+    if(PyTuple_SetItem(args.get(), start, curr.get()) < 0)
-     {
-         throwPythonException();
-     }
-    curr.release(); // PyTuple_SET_ITEM steals a reference.
-+    curr.release(); // PyTuple_SetItem steals a reference.
- 
-     string dispatchName = "ice_invoke";
-     if(_amd)
-@@ -3730,7 +3730,7 @@
-         }
-         obj->upcall = new UpcallPtr(this);
-         obj->encoding = current.encoding;
-        if(PyTuple_SET_ITEM(args.get(), 0, (PyObject*)obj) < 0) // PyTuple_SET_ITEM steals a reference.
-+        if(PyTuple_SetItem(args.get(), 0, (PyObject*)obj) < 0) // PyTuple_SetItem steals a reference.
-         {
-             Py_DECREF(obj);
-             throwPythonException();
--- a/devel/ice/files/patch-scripts-TestUtil.py
+++ b/devel/ice/files/patch-scripts-TestUtil.py
@ -35,6 +35,15 @@
         x64 = True
     elif line == "armv7l":
         armv7l = True
+@@ -879,7 +898,7 @@
+       os.remove(filePath)
+     passwords = open(filePath, "a")
+ 
+-    command = '"%s" "%s"' % (sys.executable,
+    command = '"%s" "%s" 2>/dev/null' % (sys.executable,
+                            os.path.abspath(os.path.join(os.path.dirname(__file__), "icehashpassword.py")))
+ 
+     #
@@ -2013,7 +2032,7 @@
         addLdPath(getCppLibDir(lang), env)
     elif isAIX():
--- a/devel/ice/pkg-plist
+++ b/devel/ice/pkg-plist
@ -241,49 +241,49 @@ include/Slice/PythonUtil.h
 include/Slice/RubyUtil.h
 include/Slice/Util.h
 lib/libFreeze.so
-lib/libFreeze.so.3.6.3
+lib/libFreeze.so.3.6.4
 lib/libFreeze.so.36
 lib/libGlacier2.so
-lib/libGlacier2.so.3.6.3
+lib/libGlacier2.so.3.6.4
 lib/libGlacier2.so.36
 lib/libGlacier2CryptPermissionsVerifier.so
-lib/libGlacier2CryptPermissionsVerifier.so.3.6.3
+lib/libGlacier2CryptPermissionsVerifier.so.3.6.4
 lib/libGlacier2CryptPermissionsVerifier.so.36
 lib/libIce.so
-lib/libIce.so.3.6.3
+lib/libIce.so.3.6.4
 lib/libIce.so.36
 lib/libIceBox.so
-lib/libIceBox.so.3.6.3
+lib/libIceBox.so.3.6.4
 lib/libIceBox.so.36
 lib/libIceDiscovery.so
-lib/libIceDiscovery.so.3.6.3
+lib/libIceDiscovery.so.3.6.4
 lib/libIceDiscovery.so.36
 lib/libIceGrid.so
-lib/libIceGrid.so.3.6.3
+lib/libIceGrid.so.3.6.4
 lib/libIceGrid.so.36
 lib/libIceLocatorDiscovery.so
-lib/libIceLocatorDiscovery.so.3.6.3
+lib/libIceLocatorDiscovery.so.3.6.4
 lib/libIceLocatorDiscovery.so.36
 lib/libIcePatch2.so
-lib/libIcePatch2.so.3.6.3
+lib/libIcePatch2.so.3.6.4
 lib/libIcePatch2.so.36
 lib/libIceSSL.so
-lib/libIceSSL.so.3.6.3
+lib/libIceSSL.so.3.6.4
 lib/libIceSSL.so.36
 lib/libIceStorm.so
-lib/libIceStorm.so.3.6.3
+lib/libIceStorm.so.3.6.4
 lib/libIceStorm.so.36
 lib/libIceStormService.so
-lib/libIceStormService.so.3.6.3
+lib/libIceStormService.so.3.6.4
 lib/libIceStormService.so.36
 lib/libIceUtil.so
-lib/libIceUtil.so.3.6.3
+lib/libIceUtil.so.3.6.4
 lib/libIceUtil.so.36
 lib/libIceXML.so
-lib/libIceXML.so.3.6.3
+lib/libIceXML.so.3.6.4
 lib/libIceXML.so.36
 lib/libSlice.so
-lib/libSlice.so.3.6.3
+lib/libSlice.so.3.6.4
 lib/libSlice.so.36
 man/man1/dumpdb.1.gz
 man/man1/glacier2router.1.gz
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	jenkins
-PORTVERSION=	2.102
+PORTVERSION=	2.103
 CATEGORIES=	devel java
 MASTER_SITES=	http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
 DISTNAME=	jenkins
--- a/devel/jenkins/distinfo
+++ b/devel/jenkins/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1516020701
-SHA256 (jenkins/2.102/jenkins.war) = df57d15616cc18fbf20a43d8dae8ccdec9a6881e514c56f8530a47a7187c1e35
-SIZE (jenkins/2.102/jenkins.war) = 74355911
+TIMESTAMP = 1516603754
+SHA256 (jenkins/2.103/jenkins.war) = 0ad2e6b785f853380994f88f0a60ffba8a0f8d1c5f76039b3f514ad9090ee7b4
+SIZE (jenkins/2.103/jenkins.war) = 74382260
--- a/devel/jfrog-cli/Makefile
+++ b/devel/jfrog-cli/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	jfrog-cli
-PORTVERSION=	1.6.0
+PORTVERSION=	1.13.1
 CATEGORIES=	devel

 MAINTAINER=	swills@FreeBSD.org
@ -18,13 +18,10 @@ PLIST_FILES=	bin/jfrog
 post-extract:
 	@${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src
 	@${MKDIR} ${WRKSRC}/src/github.com/jfrogdev/jfrog-cli-go
-.for src in .gitignore CONTRIBUTING.md Jenkinsfile LICENSE README.md \
-	artifactory bintray getCli.sh jfrog missioncontrol testsdata utils xray
-	@${MV} ${WRKSRC}/${src} ${WRKSRC}/src/github.com/jfrogdev/jfrog-cli-go
-.endfor
+	@${MV} ${WRKSRC}/jfrog-cli ${WRKSRC}/jfrog-client ${WRKSRC}/src/github.com/jfrogdev/jfrog-cli-go

 do-build:
-	@cd ${WRKSRC}/src/github.com/jfrogdev/jfrog-cli-go ; \
+	cd ${WRKSRC}/src/github.com/jfrogdev/jfrog-cli-go ; \
 		${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go install ./...

 do-install:
--- a/devel/jfrog-cli/distinfo
+++ b/devel/jfrog-cli/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1485889695
-SHA256 (JFrogDev-jfrog-cli-go-1.6.0_GH0.tar.gz) = 5da5e904ee1a46c367652a9df4f4787a63fa9ec5934f44698f3aae7e8bc25680
-SIZE (JFrogDev-jfrog-cli-go-1.6.0_GH0.tar.gz) = 162253
+TIMESTAMP = 1516640244
+SHA256 (JFrogDev-jfrog-cli-go-1.13.1_GH0.tar.gz) = 12ae8aef171c6924fc17098fc2e7e9553054b2203c2ba9a2569e6d98fbc0c83d
+SIZE (JFrogDev-jfrog-cli-go-1.13.1_GH0.tar.gz) = 7857770
--- a/devel/libosmo-netif/Makefile
+++ b/devel/libosmo-netif/Makefile
@ -16,11 +16,6 @@ LIB_DEPENDS=	libosmocore.so:devel/libosmocore \
 		libosmoabis.so:devel/libosmo-abis \
 		libtalloc.so:devel/talloc

-BROKEN_mips=	Does not build: undefined reference to __bswap_16
-BROKEN_mips64=	Does not build: undefined reference to __bswap_16
-BROKEN_powerpc64=	Does not build: undefined reference to __bswap_16
-BROKEN_sparc64=	Does not build: undefined reference to __bswap_16
-
 USES=		autoreconf libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@ -41,5 +36,7 @@ DAHDI_CPPFLAGS=		-I${LOCALBASE}/include

 post-patch:
 	${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
+	@${REINPLACE_CMD} -e 's,__bswap_,__bswap,' \
+		${WRKSRC}/examples/rs232-write.c

 .include <bsd.port.mk>
--- a/devel/libosmocore/Makefile
+++ b/devel/libosmocore/Makefile
@ -29,5 +29,7 @@ DOXYGEN_CONFIGURE_ENV_OFF=ac_cv_path_DOXYGEN=false

 post-patch:
 	${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
+	@${REINPLACE_CMD} -e '/#pragma GCC diagnostic/d' \
+		${WRKSRC}/src/application.c

 .include <bsd.port.mk>
--- a/devel/p5-File-Path-Tiny/Makefile
+++ b/devel/p5-File-Path-Tiny/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	File-Path-Tiny
-PORTVERSION=	0.8
+PORTVERSION=	0.9
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/devel/p5-File-Path-Tiny/distinfo
+++ b/devel/p5-File-Path-Tiny/distinfo
@ -1,2 +1,3 @@
-SHA256 (File-Path-Tiny-0.8.tar.gz) = 78f8eec74a11f423b4a9080d009d3c895c6b2c65833f0fd7fb11998cde50b6e8
-SIZE (File-Path-Tiny-0.8.tar.gz) = 7723
+TIMESTAMP = 1516629907
+SHA256 (File-Path-Tiny-0.9.tar.gz) = a752bf67dbec35b68a4277335e4459e37c6f73343491fa7a372c564651aee6b4
+SIZE (File-Path-Tiny-0.9.tar.gz) = 9883
--- a/devel/p5-Getopt-Long-Descriptive/Makefile
+++ b/devel/p5-Getopt-Long-Descriptive/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Getopt-Long-Descriptive
-PORTVERSION=	0.100
+PORTVERSION=	0.101
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RJBS
@ -20,6 +20,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
 		p5-Test-Warnings>=0.005:devel/p5-Test-Warnings

+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure

--- a/devel/p5-Getopt-Long-Descriptive/distinfo
+++ b/devel/p5-Getopt-Long-Descriptive/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1468513627
-SHA256 (Getopt-Long-Descriptive-0.100.tar.gz) = 1451e79310d1630de37690e3aba5c38ea5f01a486c5a43f0cd95bef2a02dffb6
-SIZE (Getopt-Long-Descriptive-0.100.tar.gz) = 31366
+TIMESTAMP = 1516630733
+SHA256 (Getopt-Long-Descriptive-0.101.tar.gz) = 752e898ea6eb8706ceb836668ca645704f5dcbc3124b6d1b21d04007dbc46948
+SIZE (Getopt-Long-Descriptive-0.101.tar.gz) = 31933
--- a/devel/p5-Test-Portability-Files/Makefile
+++ b/devel/p5-Test-Portability-Files/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Test-Portability-Files
-PORTVERSION=	0.07
+PORTVERSION=	0.09
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/devel/p5-Test-Portability-Files/distinfo
+++ b/devel/p5-Test-Portability-Files/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1502122306
-SHA256 (Test-Portability-Files-0.07.tar.gz) = 5563cb65346e294bfbd732e195ab55198a978de3d810235a3568d80b676cb985
-SIZE (Test-Portability-Files-0.07.tar.gz) = 17928
+TIMESTAMP = 1516630140
+SHA256 (Test-Portability-Files-0.09.tar.gz) = 16d31fa941af1a79faec0192e09880cb19225cde649c03d2e3ceda9b455a621c
+SIZE (Test-Portability-Files-0.09.tar.gz) = 19875
--- a/devel/p5-threads/Makefile
+++ b/devel/p5-threads/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	threads
-PORTVERSION=	2.16
+PORTVERSION=	2.21
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JDHEDDEN
--- a/devel/p5-threads/distinfo
+++ b/devel/p5-threads/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1496418368
-SHA256 (threads-2.16.tar.gz) = 5a4ff6f33886b1fd25c275ab02e518a1a01d1727ddc4c6a907d2f53f8f77ae72
-SIZE (threads-2.16.tar.gz) = 113038
+TIMESTAMP = 1516713265
+SHA256 (threads-2.21.tar.gz) = 28394c98a2bcae6f20ffb8a3d965a1c194b764c650169e2050ee38dbaa10f110
+SIZE (threads-2.21.tar.gz) = 113446
--- a/devel/papilio-loader/Makefile
+++ b/devel/papilio-loader/Makefile
@ -20,6 +20,7 @@ GH_TAGNAME=	dd111c4
 WRKSRC_SUBDIR=	papilio-prog

 USES=		autoreconf:autoconf pkgconfig gmake
+CXXFLAGS+=	-std=c++98
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	libftdi1_CFLAGS="-I ${LOCALBASE}/include/libftdi1"
 CONFIGURE_ENV+=	libftdi1_LIBS="-L ${LOCALBASE}/lib -lftdi1"
--- a/devel/phpunit/Makefile
+++ b/devel/phpunit/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	phpunit
-PORTVERSION=	5.7.20
+DISTVERSION=	5.7.26
 CATEGORIES=	devel www
 MASTER_SITES=	https://phar.phpunit.de/ \
 		http://ports.toco-domains.de/
--- a/devel/phpunit/distinfo
+++ b/devel/phpunit/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1497434046
-SHA256 (phpunit-5.7.20.phar) = 012f7fd85ca7b34198fedd4387df453a979bc6240b90da60ad7f3ba41a0d438c
-SIZE (phpunit-5.7.20.phar) = 2993984
+TIMESTAMP = 1516138475
+SHA256 (phpunit-5.7.26.phar) = 5483b06864e375ffaff506888a2ff6480561345f5a2b8d88b6d5896b89a249af
+SIZE (phpunit-5.7.26.phar) = 3035326
--- a/devel/py-aniso8601/Makefile
+++ b/devel/py-aniso8601/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	aniso8601
-PORTVERSION=	1.3.0
+PORTVERSION=	2.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/Show more
+++ b/Show more