*/*: sync with upstream

Taken from: HardenedBSD

accessibility/redshift/Makefile

@@ -12,20 +12,17 @@ COMMENT=	Adjusts the color temperature of your screen
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gettext gmake libtool localbase pkgconfig shebangfix tar:bzip2
+USES=		autoreconf:build gettext gmake libtool localbase pkgconfig \
+		shebangfix tar:bzip2
 USE_GITHUB=	yes
 GH_ACCOUNT=	jonls
+USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 SHEBANG_FILES=	src/redshift-gtk/redshift-gtk.in
 
 CONFIGURE_ARGS+=	--disable-wingdi
 
-BUILD_DEPENDS=	autoconf-2.69:devel/autoconf \
-		automake-1.15:devel/automake \
-		libtoolize:devel/libtool \
-		intltool>=0:textproc/intltool
-
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libgeoclue-2.so:net/geoclue
 

archivers/libzip/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libzip
-PORTVERSION=	1.3.2
+PORTVERSION=	1.5.1
 CATEGORIES=	archivers devel
 MASTER_SITES=	https://libzip.org/download/
 
@@ -14,11 +14,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CPE_VENDOR=	nih
 
-GNU_CONFIGURE=	yes
-USES=		cpe libtool pathfix perl5 tar:xz
-USE_PERL5=	build
+USES=		cmake:outsource cpe perl5 ssl tar:xz
 USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
-TEST_TARGET=	check
+USE_PERL5=	test
+TEST_TARGET=	test
+
+CMAKE_OFF=	ENABLE_COMMONCRYPTO ENABLE_GNUTLS
 
 .include <bsd.port.mk>

archivers/libzip/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1511266116
-SHA256 (libzip-1.3.2.tar.xz) = 6277845010dbc20e281a77e637c97765c1323d67df4d456fd942f525ea86e185
-SIZE (libzip-1.3.2.tar.xz) = 942756
+TIMESTAMP = 1523434126
+SHA256 (libzip-1.5.1.tar.xz) = 04ea35b6956c7b3453f1ed3f3fe40e3ddae1f43931089124579e8384e79ed372
+SIZE (libzip-1.5.1.tar.xz) = 717908

archivers/libzip/files/patch-CMakeLists.txt

@@ -0,0 +1,12 @@
+Do not set RPATH on FreeBSD either.
+--- CMakeLists.txt.orig	2018-06-14 20:07:27 UTC
++++ CMakeLists.txt
+@@ -224,7 +224,7 @@ endif(WIN32)
+ ADD_DEFINITIONS("-DHAVE_CONFIG_H")
+ 
+ # rpath handling: use rpath in installed binaries
+-IF(NOT CMAKE_SYSTEM_NAME MATCHES Linux)
++IF(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD|Linux")
+ 	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+ 	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ ENDIF()

archivers/libzip/pkg-plist

@@ -3,10 +3,9 @@ bin/zipmerge
 bin/ziptool
 include/zip.h
 include/zipconf.h
-lib/libzip.a
 lib/libzip.so
 lib/libzip.so.5
-lib/libzip.so.5.0.0
+lib/libzip.so.5.0
 libdata/pkgconfig/libzip.pc
 man/man1/zipcmp.1.gz
 man/man1/zipmerge.1.gz
@@ -84,12 +83,18 @@ man/man3/zip_set_file_comment.3.gz
 man/man3/zip_set_file_compression.3.gz
 man/man3/zip_source.3.gz
 man/man3/zip_source_begin_write.3.gz
+man/man3/zip_source_begin_write_cloning.3.gz
 man/man3/zip_source_buffer.3.gz
+man/man3/zip_source_buffer_create.3.gz
+man/man3/zip_source_buffer_fragment.3.gz
+man/man3/zip_source_buffer_fragment_create.3.gz
 man/man3/zip_source_close.3.gz
 man/man3/zip_source_commit_write.3.gz
 man/man3/zip_source_error.3.gz
 man/man3/zip_source_file.3.gz
+man/man3/zip_source_file_create.3.gz
 man/man3/zip_source_filep.3.gz
+man/man3/zip_source_filep_create.3.gz
 man/man3/zip_source_free.3.gz
 man/man3/zip_source_function.3.gz
 man/man3/zip_source_function_create.3.gz

astro/p5-ZConf-Weather/Makefile

@@ -15,6 +15,9 @@ COMMENT=	ZConf module to assist with fetching/printing weather information
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
+DEPRECATED=	Unmaintained
+EXPIRATION_DATE=	2018-07-15
+
 BUILD_DEPENDS=	p5-ZConf>=6.1.0:net/p5-ZConf \
 		p5-Text-NeatTemplate>=0.10.01:textproc/p5-Text-NeatTemplate \
 		p5-Weather-Underground>=3.03:astro/p5-Weather-Underground

audio/ifp-line/Makefile

@@ -13,21 +13,16 @@ COMMENT=	Command line interface to iRiver music players
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf iconv
+USES=		iconv
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	LIBUSB_LIBS=-lusb
 MAKE_JOBS_UNSAFE=	yes
 
-LDFLAGS+=	-lusb
-
 PLIST_FILES=	bin/ifp man/man1/ifp.1.gz
 PORTDOCS=	NEWS README TIPS nonroot.sh
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		'/LIBUSB/s|ERROR|WARN|' ${WRKSRC}/configure.ac
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ifp ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/ifp.1 ${STAGEDIR}${MANPREFIX}/man/man1

audio/ifp-line/files/patch-Makefile.am

@@ -1,11 +0,0 @@
---- Makefile.am.orig	2005-12-10 07:35:04 UTC
-+++ Makefile.am
-@@ -2,6 +2,8 @@
- 
- EXTRA_DIST = $(man1_MANS) $(pkgdata_DATA)
- 
-+ACLOCAL_AMFLAGS = -I m4 
-+
- bin_PROGRAMS = ifp
- ifp_SOURCES = ifp.c ifp_routines.c ifp_routines.h
- ifp_CFLAGS = @LIBUSB_CFLAGS@

audio/ifp-line/files/patch-configure

@@ -0,0 +1,284 @@
+--- configure.orig	2005-12-10 07:27:54 UTC
++++ configure
+@@ -3860,281 +3860,6 @@ _ACEOF
+ 
+ 
+ 
+-# Check whether --with-libusb-prefix or --without-libusb-prefix was given.
+-if test "${with_libusb_prefix+set}" = set; then
+-  withval="$with_libusb_prefix"
+-  libusb_prefix="$withval"
+-else
+-  libusb_prefix=""
+-fi;
+-
+-# Check whether --with-libusb-exec-prefix or --without-libusb-exec-prefix was given.
+-if test "${with_libusb_exec_prefix+set}" = set; then
+-  withval="$with_libusb_exec_prefix"
+-  libusb_exec_prefix="$withval"
+-else
+-  libusb_exec_prefix=""
+-fi;
+-
+-    if test x$libusb_exec_prefix != x ; then
+-	libusb_config_args="$libusb_config_args --exec-prefix=$libusb_exec_prefix"
+-	if test x${LIBUSB_CONFIG+set} != xset ; then
+-	    LIBUSB_CONFIG=$libusb_exec_prefix/bin/libusb-config
+-	fi
+-    fi
+-    if test x$libusb_prefix != x ; then
+-	libusb_config_args="$libusb_config_args --prefix=$libusb_prefix"
+-	if test x${LIBUSB_CONFIG+set} != xset ; then
+-	    LIBUSB_CONFIG=$libusb_prefix/bin/libusb-config
+-	fi
+-    fi
+-
+-    # Extract the first word of "libusb-config", so it can be a program name with args.
+-set dummy libusb-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_LIBUSB_CONFIG+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  case $LIBUSB_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_LIBUSB_CONFIG="$LIBUSB_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_LIBUSB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-  test -z "$ac_cv_path_LIBUSB_CONFIG" && ac_cv_path_LIBUSB_CONFIG="no"
+-  ;;
+-esac
+-fi
+-LIBUSB_CONFIG=$ac_cv_path_LIBUSB_CONFIG
+-
+-if test -n "$LIBUSB_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $LIBUSB_CONFIG" >&5
+-echo "${ECHO_T}$LIBUSB_CONFIG" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-    min_libusb_version=0.1.7
+-    echo "$as_me:$LINENO: checking for libusb - version >= $min_libusb_version" >&5
+-echo $ECHO_N "checking for libusb - version >= $min_libusb_version... $ECHO_C" >&6
+-    no_libusb=""
+-    if test "$LIBUSB_CONFIG" = "no" ; then
+-	no_libusb="yes"
+-    else
+-	LIBUSB_CFLAGS=`$LIBUSB_CONFIG $libusb_config_args --cflags`
+-	LIBUSB_LIBS=`$LIBUSB_CONFIG $libusb_config_args --libs`
+-
+-	libusb_major_version=`$LIBUSB_CONFIG $libusb_args --version | \
+-		sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+-	libusb_minor_version=`$LIBUSB_CONFIG $libusb_args --version | \
+-		sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+-	libusb_micro_version=`$LIBUSB_CONFIG $libusb_args --version | \
+-		sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+-	if test "x$enable_libusbtext" = "xyes" ; then
+-	    ac_save_CFLAGS="$CFLAGS"
+-	    ac_save_LIBS="$LIBS"
+-	    CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
+-	    LIBS="$LIBS $LIBUSB_LIBS"
+-      rm -f conf.libusbtest
+-      if test "$cross_compiling" = yes; then
+-  echo $ac_n "cross compiling; assumed OK... $ac_c"
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <usb.h>
+-
+-char*
+-my_strdup (char *str)
+-{
+-  char *new_str;
+-
+-  if (str)
+-    {
+-      new_str = malloc ((strlen (str) + 1) * sizeof(char));
+-      strcpy (new_str, str);
+-    }
+-  else
+-    new_str = NULL;
+-
+-  return new_str;
+-}
+-
+-int main ()
+-{
+-  int major, minor, micro;
+-  char *tmp_version;
+-
+-  system ("touch conf.libusbtest");
+-
+-  /* HP/UX 9 (%@#!) writes to sscanf strings */
+-  tmp_version = my_strdup("$min_libusb_version");
+-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+-     printf("%s, bad version string\n", "$min_libusb_version");
+-     exit(1);
+-   }
+-
+-    if (($libusb_major_version > major) ||
+-        (($libusb_major_version == major) && ($libusb_minor_version > minor)) ||
+-	(($libusb_major_version == major) && ($libusb_minor_version == minor) &&
+-	($libusb_micro_version >= micro)))
+-    {
+-      return 0;
+-    }
+-  else
+-    {
+-      printf("\n*** 'libusb-config --version' returned %d.%d, but the minimum version\n", $libusb_major_version, $libusb_minor_version);
+-      printf("*** of libusb required is %d.%d. If libusb-config is correct, then it is\n", major, minor);
+-      printf("*** best to upgrade to the required version.\n");
+-      printf("*** If libusb-config was wrong, set the environment variable LIBUSB_CONFIG\n");
+-      printf("*** to point to the correct copy of libusb-config, and remove the file\n");
+-      printf("*** config.cache before re-running configure\n");
+-      return 1;
+-    }
+-}
+-
+-
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  :
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-no_libusb=yes
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-       CFLAGS="$ac_save_CFLAGS"
+-       LIBS="$ac_save_LIBS"
+-     fi
+-  fi
+-  if test "x$no_libusb" = x ; then
+-     echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-     :
+-  else
+-     echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-     if test "$LIBUSB_CONFIG" = "no" ; then
+-       echo "*** The libusb-config script installed by libusb could not be found"
+-       echo "*** If libusb was installed in PREFIX, make sure PREFIX/bin is in"
+-       echo "*** your path, or set the LIBUSB_CONFIG environment variable to the"
+-       echo "*** full path to libusb-config."
+-     else
+-       if test -f conf.libusbtest ; then
+-        :
+-       else
+-          echo "*** Could not run libusb test program, checking why..."
+-          CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
+-          LIBS="$LIBS $LIBUSB_LIBS"
+-          cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include <stdio.h>
+-#include <usb.h>
+-
+-int
+-main ()
+-{
+- return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-   echo "*** The test program compiled, but did not run. This usually means"
+-          echo "*** that the run-time linker is not finding libusb or finding the wrong"
+-          echo "*** version of libusb. If it is not finding libusb, you'll need to set your"
+-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+-          echo "*** is required on your system"
+-	  echo "***"
+-          echo "*** If you have an old version installed, it is best to remove it, although"
+-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- echo "*** The test program failed to compile or link. See the file config.log for the"
+-          echo "*** exact error that occured. This usually means libusb was incorrectly installed"
+-          echo "*** or that you have moved libusb since it was installed. In the latter case, you"
+-          echo "*** may want to edit the libusb-config script: $LIBUSB_CONFIG"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-          CFLAGS="$ac_save_CFLAGS"
+-          LIBS="$ac_save_LIBS"
+-       fi
+-     fi
+-     LIBUSB_CFLAGS=""
+-     LIBUSB_LIBS=""
+-     { { echo "$as_me:$LINENO: error: libusb is required." >&5
+-echo "$as_me: error: libusb is required." >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
+-
+-
+-  rm -f conf.libusbtest
+ 
+ 
+ # Checks for header files.

benchmarks/perftest/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	perftest
-DISTVERSION=	4.2-0.7
+DISTVERSION=	4.2-0.8
 CATEGORIES=	benchmarks
 
 MAINTAINER=	slavash@FreeBSD.org
@@ -19,7 +19,7 @@ USES=		autoreconf libtool
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	linux-rdma
-GH_TAGNAME=	V4.2-0.7
+GH_TAGNAME=	V4.2-0.8
 
 GNU_CONFIGURE=yes
 

benchmarks/perftest/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1526476189
-SHA256 (linux-rdma-perftest-4.2-0.7-V4.2-0.7_GH0.tar.gz) = c376e7232508fad50f34845a364a23400bd542140388702ba28748cc4496bce5
-SIZE (linux-rdma-perftest-4.2-0.7-V4.2-0.7_GH0.tar.gz) = 139384
+TIMESTAMP = 1528904606
+SHA256 (linux-rdma-perftest-4.2-0.8-V4.2-0.8_GH0.tar.gz) = 25e433e6ef13a634dfcf9c4b21e74cdc3bdcc5205b6fd88ee004d0671bcc82f4
+SIZE (linux-rdma-perftest-4.2-0.8-V4.2-0.8_GH0.tar.gz) = 139323

cad/repsnapper/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	repsnapper
 DISTVERSION=	2.5a4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 
 MAINTAINER=	martin.dieringer@gmx.de
@@ -13,19 +13,19 @@ LICENSE=	GPLv2 BSD3CLAUSE MIT
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libgtkglextmm-x11-1.2.so:x11-toolkits/gtkglextmm \
+		libpolyclipping.so:graphics/polyclipping \
 		libzip.so:archivers/libzip
-BUILD_DEPENDS+=	clang40:devel/llvm40
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	timschmidt
 
-USES=		compiler:c++11-lib autoreconf gmake libtool perl5 pkgconfig gettext
+USES=		compiler:c++11-lib autoreconf gettext gmake libtool localbase \
+		perl5 pkgconfig
 USE_GNOME=	gtkmm24 intltool libxml++26
 USE_GL=		gl
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 INSTALL_TARGET=	install-strip
 

cad/repsnapper/files/patch-configure.ac

@@ -0,0 +1,25 @@
+--- configure.ac.orig	2017-06-02 13:20:16 UTC
++++ configure.ac
+@@ -30,9 +30,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE"
+ case "$host_os" in
+ freebsd*)
+ # Using clang:
+-  CC=clang40
+-  CPP=clang-cpp40
+-  CXX=clang++40
+ # or gcc5:
+ #  CC=gcc5
+ #  CPP=cpp5
+@@ -52,9 +49,12 @@ AC_TYPE_SSIZE_T
+ dnl check for installed clipperlib newer than 5.1.0 (has PolyNode)
+ AC_DEFINE([HAVE_CLIPPERLIB],[0],[Have external clipper])
+ CLIPPER_LIBS="libclipper.la"
++saved_LIBS=$LIBS
++LIBS="-lpolyclipping $LIBS"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <polyclipping/clipper.hpp>], [ClipperLib::PolyNode cnode])],
+     [AC_DEFINE([HAVE_CLIPPERLIB],[1]) CLIPPER_LIBS="-lpolyclipping"],
+     [AC_MSG_WARN([libclipper is not installed. Using internal copy.])])
++LIBS=$saved_LIBS
+ AC_SUBST(CLIPPER_LIBS)
+ 
+ 

databases/tcl-sqlite3/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sqlite3
-PORTVERSION=	3.23.1
+PORTVERSION=	3.24.0
 CATEGORIES=	databases tcl
 MASTER_SITES=	https://www.sqlite.org/2018/ http://www2.sqlite.org/2018/ http://www3.sqlite.org/2018/
 PKGNAMEPREFIX=	tcl-

databases/tcl-sqlite3/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1525362612
-SHA256 (sqlite-autoconf-3230100.tar.gz) = 92842b283e5e744eff5da29ed3c69391de7368fccc4d0ee6bf62490ce555ef25
-SIZE (sqlite-autoconf-3230100.tar.gz) = 2675362
+TIMESTAMP = 1528715215
+SHA256 (sqlite-autoconf-3240000.tar.gz) = d9d14e88c6fb6d68de9ca0d1f9797477d82fc3aed613558f87ffbdbbc5ceb74a
+SIZE (sqlite-autoconf-3240000.tar.gz) = 2699252

deskutils/multisync/Makefile

@@ -16,7 +16,6 @@ USE_GNOME=	gnomeprefix libgnomeui
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
-MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
 
 post-patch:

deskutils/multisync/files/patch-src-libversit-Makefile.am

@@ -0,0 +1,11 @@
+--- src/libversit/Makefile.am.orig	2004-04-12 04:23:21 UTC
++++ src/libversit/Makefile.am
+@@ -20,7 +20,7 @@ libversit_la_SOURCES = $(VERSIT_SRC)
+ AM_CFLAGS = -D_VCTEST_CONSOLE
+ noinst_PROGRAMS = vctest
+ vctest_SOURCES = vctest.c
+-vctest_LDADD = -L. -lversit
++vctest_LDADD = libversit.la
+ 
+ EXTRA_DIST = README.TXT vcaltest.c vctest.c
+ 

deskutils/p5-ZConf-BGSet/Makefile

@@ -12,6 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Background management utility and Perl module that uses ZConf
 
+DEPRECATED=	Unmaintained
+EXPIRATION_DATE=	2018-07-15
+
 BUILD_DEPENDS=	p5-Image-Size-FillFullSelect>=0.1.0:graphics/p5-Image-Size-FillFullSelect \
 		p5-ZConf>=:net/p5-ZConf \
 		hsetroot:x11/hsetroot \

deskutils/p5-ZConf-Runner-GUI-GTK/Makefile

@@ -12,6 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	The GTK GUI backend for ZConf::Runner
 
+DEPRECATED=	Unmaintained
+EXPIRATION_DATE=	2018-07-15
+
 BUILD_DEPENDS=	p5-ZConf>=0:net/p5-ZConf \
 		p5-Gtk2>=1.060:x11-toolkits/p5-Gtk2 \
 		p5-ZConf-Runner>=0:deskutils/p5-ZConf-Runner \

deskutils/p5-ZConf-Runner/Makefile

@@ -12,6 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Run a file using a chosen method, desktop entry, or mimetype
 
+DEPRECATED=	Unmaintained
+EXPIRATION_DATE=	2018-07-15
+
 BUILD_DEPENDS=	p5-ZConf>=6.1.0:net/p5-ZConf \
 		p5-File-MimeInfo>=0.16:devel/p5-File-MimeInfo \
 		p5-Curses-UI>=0.9609:devel/p5-Curses-UI \

deskutils/pinot/files/patch-Core_Makefile.am

@@ -0,0 +1,36 @@
+--- Core/Makefile.am.orig	2016-06-20 18:07:02 UTC
++++ Core/Makefile.am
+@@ -64,7 +64,7 @@ pinot_index_LDADD = \
+ 
+ pinot_index_SOURCES = pinot-index.cpp
+ 
+-pinot_index_DEPENDENCIES = libCore.la
++pinot_index_DEPENDENCIES = libCore.la libThread.la
+ 
+ pinot_search_LDFLAGS = \
+ 	-export-dynamic
+@@ -82,7 +82,7 @@ pinot_search_LDADD = \
+ pinot_search_SOURCES = \
+ 	pinot-search.cpp
+ 
+-pinot_search_DEPENDENCIES = libCore.la
++pinot_search_DEPENDENCIES = libCore.la libThread.la
+ 
+ pinot_dbus_daemon_LDFLAGS = \
+ 	-export-dynamic
+@@ -105,7 +105,7 @@ pinot_dbus_daemon_SOURCES = \
+ 	ServerThreads.cpp \
+ 	pinot-dbus-daemon.cpp
+ 
+-pinot_dbus_daemon_DEPENDENCIES = libCore.la
++pinot_dbus_daemon_DEPENDENCIES = libCore.la libThread.la
+ 
+ pinot_daemon_LDFLAGS = \
+ 	-export-dynamic
+@@ -128,5 +128,5 @@ pinot_daemon_SOURCES = \
+ 	ServerThreads.cpp \
+ 	pinot-dbus-daemon.cpp
+ 
+-pinot_daemon_DEPENDENCIES = libCore.la
++pinot_daemon_DEPENDENCIES = libCore.la libThread.la
+ 

deskutils/spice-gtk/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	spice-gtk
-PORTVERSION=	0.34
+PORTVERSION=	0.35
 CATEGORIES?=	deskutils gnome
 MASTER_SITES=	http://www.spice-space.org/download/gtk/
 
@@ -13,9 +13,9 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
 		libopus.so:audio/opus
-BUILD_DEPENDS=	spice-protocol>=0.12.10:devel/spice-protocol \
+BUILD_DEPENDS=	spice-protocol>=0.12.14:devel/spice-protocol \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing@${PY_FLAVOR}
-RUN_DEPENDS=	spice-protocol>=0.12.10:devel/spice-protocol
+RUN_DEPENDS=	spice-protocol>=0.12.14:devel/spice-protocol
 
 USES=		autoreconf cpe gettext-tools gmake jpeg libtool pkgconfig tar:bzip2 \
 		python ssl localbase:ldflags

deskutils/spice-gtk/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1515485373
-SHA256 (spice-gtk-0.34.tar.bz2) = e9720e01165f8451c9f3f58ad50e3afb990993b81cc2db86b3661b7ac5b976ee
-SIZE (spice-gtk-0.34.tar.bz2) = 1480566
+TIMESTAMP = 1529012630
+SHA256 (spice-gtk-0.35.tar.bz2) = b4e6073de5125e2bdecdf1fbe7c9e8c4cabe9c85518889b42f72bf63c8ab9e86
+SIZE (spice-gtk-0.35.tar.bz2) = 1437231

deskutils/spice-gtk/files/patch-configure.ac

@@ -1,26 +0,0 @@
---- configure.ac.orig	2016-08-30 15:45:02.000000000 +0300
-+++ configure.ac	2016-10-25 19:39:44.610155000 +0300
-@@ -106,7 +106,10 @@
- 
- PKG_CHECK_MODULES(SSL, openssl)
- 
--SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} openssl"
-+case $host_os in
-+	freebsd*)	;;
-+	*)		SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} openssl" ;;
-+esac
- 
- SPICE_CHECK_SASL
- 
-@@ -155,6 +158,11 @@
- PKG_CHECK_EXISTS([gtk+-x11-$with_gtk], [PKG_CHECK_MODULES(X11, x11)])
- AC_CHECK_HEADERS([X11/XKBlib.h])
- 
-+AS_IF([test "x$have_quartz" != "xyes" && test "x$have_win32" != "xyes"],
-+      [PKG_CHECK_MODULES(X11,x11)])
-+AC_SUBST(X11_CFLAGS)
-+AC_SUBST(X11_LIBS)
-+
- AC_ARG_WITH([pnp-ids-path],
-   AC_HELP_STRING([--with-pnp-ids-path],
-                  [Specify the path to pnp.ids @<:@default=(internal)@:>@]),

deskutils/spice-gtk/files/patch-libressl

@@ -1,33 +0,0 @@
---- src/bio-gio.c.orig	2017-01-13 14:00:07 UTC
-+++ src/bio-gio.c
-@@ -23,7 +23,7 @@
- #include "spice-util.h"
- #include "bio-gio.h"
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
- static BIO_METHOD one_static_bio;
- 
- static int BIO_meth_set_read(BIO_METHOD *biom,
---- src/spice-channel.c.orig	2018-01-21 15:48:25 UTC
-+++ src/spice-channel.c
-@@ -55,7 +55,7 @@ static void spice_channel_reset_capabilities(SpiceChan
- static void spice_channel_send_migration_handshake(SpiceChannel *channel);
- static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
- static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
- {
-     if (pkey->type != EVP_PKEY_RSA) {
---- spice-common/common/ssl_verify.c.orig	2018-01-21 15:52:12 UTC
-+++ spice-common/common/ssl_verify.c
-@@ -33,7 +33,7 @@
- #include <string.h>
- #include <gio/gio.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
- static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
- {
-     return M_ASN1_STRING_data(asn1);

deskutils/spice-gtk/pkg-plist

@@ -13,7 +13,6 @@ include/spice-client-glib-2.0/channel-usbredir.h
 include/spice-client-glib-2.0/channel-webdav.h
 include/spice-client-glib-2.0/smartcard-manager.h
 include/spice-client-glib-2.0/spice-audio.h
-include/spice-client-glib-2.0/spice-channel-enums.h
 include/spice-client-glib-2.0/spice-channel.h
 include/spice-client-glib-2.0/spice-client.h
 include/spice-client-glib-2.0/spice-file-transfer-task.h
@@ -31,7 +30,6 @@ include/spice-client-gtk-3.0/spice-gtk-session.h
 include/spice-client-gtk-3.0/spice-widget-enums.h
 include/spice-client-gtk-3.0/spice-widget.h
 include/spice-client-gtk-3.0/usb-device-widget.h
-include/spice-controller/spice-controller.h
 lib/girepository-1.0/SpiceClientGLib-2.0.typelib
 lib/girepository-1.0/SpiceClientGtk-3.0.typelib
 lib/libspice-client-glib-2.0.so
@@ -40,31 +38,9 @@ lib/libspice-client-glib-2.0.so.8.6.0
 lib/libspice-client-gtk-3.0.so
 lib/libspice-client-gtk-3.0.so.5
 lib/libspice-client-gtk-3.0.so.5.0.0
-lib/libspice-controller.so
-lib/libspice-controller.so.0
-lib/libspice-controller.so.0.0.0
 libdata/pkgconfig/spice-client-glib-2.0.pc
 libdata/pkgconfig/spice-client-gtk-3.0.pc
-libdata/pkgconfig/spice-controller.pc
 man/man1/spice-client.1.gz
-share/doc/spice-gtk/annotation-glossary.html
-share/doc/spice-gtk/api-index-full.html
-share/doc/spice-gtk/api-reference.html
-share/doc/spice-gtk/application-support.html
-share/doc/spice-gtk/ch01.html
-share/doc/spice-gtk/ch02.html
-share/doc/spice-gtk/ch03.html
-share/doc/spice-gtk/home.png
-share/doc/spice-gtk/index.html
-share/doc/spice-gtk/left-insensitive.png
-share/doc/spice-gtk/left.png
-share/doc/spice-gtk/object-tree.html
-share/doc/spice-gtk/right-insensitive.png
-share/doc/spice-gtk/right.png
-share/doc/spice-gtk/spice-gtk-SpiceURI.html
-share/doc/spice-gtk/spice-gtk-Utilities.html
-share/doc/spice-gtk/spice-gtk-Version-Information.html
-share/doc/spice-gtk/spice-gtk.devhelp2
 share/doc/spice-gtk/SpiceAudio.html
 share/doc/spice-gtk/SpiceChannel.html
 share/doc/spice-gtk/SpiceCursorChannel.html
@@ -84,6 +60,24 @@ share/doc/spice-gtk/SpiceUsbDeviceManager.html
 share/doc/spice-gtk/SpiceUsbDeviceWidget.html
 share/doc/spice-gtk/SpiceUsbredirChannel.html
 share/doc/spice-gtk/SpiceWebdavChannel.html
+share/doc/spice-gtk/annotation-glossary.html
+share/doc/spice-gtk/api-index-full.html
+share/doc/spice-gtk/api-reference.html
+share/doc/spice-gtk/application-support.html
+share/doc/spice-gtk/ch01.html
+share/doc/spice-gtk/ch02.html
+share/doc/spice-gtk/ch03.html
+share/doc/spice-gtk/home.png
+share/doc/spice-gtk/index.html
+share/doc/spice-gtk/left-insensitive.png
+share/doc/spice-gtk/left.png
+share/doc/spice-gtk/object-tree.html
+share/doc/spice-gtk/right-insensitive.png
+share/doc/spice-gtk/right.png
+share/doc/spice-gtk/spice-gtk-SpiceURI.html
+share/doc/spice-gtk/spice-gtk-Utilities.html
+share/doc/spice-gtk/spice-gtk-Version-Information.html
+share/doc/spice-gtk/spice-gtk.devhelp2
 share/doc/spice-gtk/style.css
 share/doc/spice-gtk/up-insensitive.png
 share/doc/spice-gtk/up.png
@@ -91,4 +85,3 @@ share/gir-1.0/SpiceClientGLib-2.0.gir
 share/gir-1.0/SpiceClientGtk-3.0.gir
 %%NLS%%share/locale/fr/LC_MESSAGES/spice-gtk.mo
 %%NLS%%share/locale/it/LC_MESSAGES/spice-gtk.mo
-share/vala/vapi/spice-protocol.vapi

devel/Makefile

@@ -166,7 +166,6 @@
     SUBDIR += autodist
     SUBDIR += autogen
     SUBDIR += automake
-    SUBDIR += automake-wrapper
     SUBDIR += automoc4
     SUBDIR += autotools
     SUBDIR += avalon-framework

devel/automake-wrapper/Makefile

@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	automake-wrapper
-
-COMMENT=	Wrapper script for GNU automake
-
-MASTERDIR=	${.CURDIR}/../../devel/autoconf-wrapper
-PKGDIR=		${.CURDIR}
-
-TOOL=		AUTOMAKE
-WRAPPED_TOOLS=	aclocal automake
-
-.include "${MASTERDIR}/Makefile"

devel/automake-wrapper/pkg-descr

@@ -1,3 +0,0 @@
-This port installs a wrapper script for automake, with symlinks to the
-unversioned name of each tool included with automake.  This allows the
-correct version to be selected depending on the user's requirements.

devel/autotools/Makefile

@@ -15,8 +15,8 @@ COMMENT=	Autotools meta-port
 
 RUN_DEPENDS=	libtoolize:devel/libtool \
 		autoconf-2.13:devel/autoconf213 \
-		autoconf-2.69:devel/autoconf \
-		automake-1.15:devel/automake
+		autoconf>=2.69:devel/autoconf \
+		automake>=1.15:devel/automake
 
 PLIST_FILES=	share/${PORTNAME}
 NO_BUILD=	yes

devel/codesearch-py/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	codesearch-py
-DISTVERSION=	g20180607
+DISTVERSION=	g20180614
 PORTEPOCH=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,17 +18,18 @@ USE_PYTHON=	autoplist concurrent distutils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	chromium
-GH_TAGNAME=	6ce84c4
+GH_TAGNAME=	fbd64d8
 
 NO_ARCH=	yes
 
-PORTDOCS=	changes_since_kythe_migration.md
+DOCS=		CONTRIBUTING.md doc/changes_since_kythe_migration.md README.md
+PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m unittest discover -v

devel/codesearch-py/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1528477048
-SHA256 (chromium-codesearch-py-g20180607-6ce84c4_GH0.tar.gz) = 4842dc0ebcf6c8139b48e6f171b523aedf6d54b3f064d70e9dc989c699b246fc
-SIZE (chromium-codesearch-py-g20180607-6ce84c4_GH0.tar.gz) = 946361
+TIMESTAMP = 1528992870
+SHA256 (chromium-codesearch-py-g20180614-fbd64d8_GH0.tar.gz) = 2403c3fb53ff8d7a0602e28f4614cdca28df911b55b1453f3602f353b784baf3
+SIZE (chromium-codesearch-py-g20180614-fbd64d8_GH0.tar.gz) = 903318

devel/erlang-gpb/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gpb
-PORTVERSION=	4.1.8
+PORTVERSION=	4.1.9
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 

devel/erlang-gpb/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1527230283
-SHA256 (tomas-abrahamsson-gpb-4.1.8_GH0.tar.gz) = 12b41845568a01e4d10248a213c38dfc846c2abb964a8b52946f7a873466addd
-SIZE (tomas-abrahamsson-gpb-4.1.8_GH0.tar.gz) = 400231
+TIMESTAMP = 1529001171
+SHA256 (tomas-abrahamsson-gpb-4.1.9_GH0.tar.gz) = a486f271589174eb964b219c859ef17bf04a5d0054cb12fb26e631779a6f63cc
+SIZE (tomas-abrahamsson-gpb-4.1.9_GH0.tar.gz) = 400408

devel/git-lfs/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	git-lfs
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4.1
+DISTVERSION=	2.4.2
 CATEGORIES=	devel
 
 MAINTAINER=	kenji@k2r.org

devel/git-lfs/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1527043438
-SHA256 (git-lfs-git-lfs-v2.4.1_GH0.tar.gz) = 3f57aa7bc82b21f5ac9c8df33fed853bb8fbefce0a5eecff80a504e56426a48e
-SIZE (git-lfs-git-lfs-v2.4.1_GH0.tar.gz) = 790742
+TIMESTAMP = 1528623531
+SHA256 (git-lfs-git-lfs-v2.4.2_GH0.tar.gz) = 130a552a27c8f324ac0548baf9db0519c4ae96c26a85f926c07ebe0f15a69fc2
+SIZE (git-lfs-git-lfs-v2.4.2_GH0.tar.gz) = 791443

devel/git-merge-changelog/Makefile

@@ -13,8 +13,8 @@ MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Git "merge" driver for GNU style ChangeLog files
 
 EXTRACT_DEPENDS=	${GNULIB_DIR}/lib/${PORTNAME}.c:${GNULIB_PORTDIR}	\
-			automake-1.15:devel/automake		\
-			autoconf-2.69:devel/autoconf
+			automake>=1.15:devel/automake		\
+			autoconf>=2.69:devel/autoconf
 
 GNU_CONFIGURE=	yes
 

devel/kBuild/Makefile

@@ -28,7 +28,8 @@ KBUILD_VERSION=	0.1.9998
 KBUILD_ARCH=	${MACHINE_ARCH:S/i386/x86/:S/x86_64/amd64/:S/powerpc/ppc32/:C/armv.*/arm/}
 KBUILD_ENV=	AUTORECONF=${AUTORECONF} \
 		AUTOPOINT=true \
-		CFLAGS="-D_WITH_GETLINE -D_WITH_DPRINTF"
+		CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" MAKE="${MAKE_CMD}"
 KBUILD_TARGET=	${OPSYS:tl}
 
 KBUILD_BINS=	kDepIDB kDepObj kDepPre kObjCache kmk kmk_append kmk_ash \
@@ -48,9 +49,7 @@ GCC_DESC=	Build with GCC (should almost always be enabled)
 GCC_USE=	GCC=any
 
 post-patch:
-	for f in ${WRKSRC}/kBuild/tools/*.kmk; do \
-		${REINPLACE_CMD} -e 's|gcc|${CC}|g' $$f ; \
-	done
+	@${REINPLACE_CMD} 's|gcc|${CC}|g' ${WRKSRC}/kBuild/tools/*.kmk
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${KBUILD_ENV} ./kBuild/env.sh --full ${MAKE_CMD} -f bootstrap.gmk

devel/libconfuse/Makefile

@@ -2,24 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	libconfuse
+DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.1
 PORTREVISION=	1
 CATEGORIES=	devel
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	martinh
-GH_PROJECT=	libconfuse
-GH_TAGNAME=	v3.2.1
-
 MAINTAINER=	otis@freebsd.sk
 COMMENT=	Configuration file parsing library
 
 LICENSE=	ISCL
 
+USES=		autoreconf gettext-tools iconv pathfix pkgconfig libtool
+USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	martinh
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls --enable-shared
 INSTALL_TARGET=	install-strip
-USES=		autoreconf gettext-tools iconv pathfix pkgconfig libtool
-USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>

devel/libconfuse/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1527704620
-SHA256 (martinh-libconfuse-3.2.1-v3.2.1_GH0.tar.gz) = 2eff8e3c300c4ed1d67fdb13f9d31a72a68e31874b4640db15334305bc40cebd
-SIZE (martinh-libconfuse-3.2.1-v3.2.1_GH0.tar.gz) = 116801
+TIMESTAMP = 1528983610
+SHA256 (martinh-libconfuse-v3.2.1_GH0.tar.gz) = 2eff8e3c300c4ed1d67fdb13f9d31a72a68e31874b4640db15334305bc40cebd
+SIZE (martinh-libconfuse-v3.2.1_GH0.tar.gz) = 116801

devel/liblouis/files/patch-tools_Makefile.am

@@ -0,0 +1,11 @@
+--- tools/Makefile.am.orig	2018-06-04 16:18:47 UTC
++++ tools/Makefile.am
+@@ -14,7 +14,7 @@ lou_compare_CPPFLAGS = $(AM_CPPFLAGS) -w
+ LDADD =							\
+ 	$(top_builddir)/liblouis/liblouis.la		\
+ 	$(top_builddir)/tools/gnulib/libgnutools.la	\
+-	$(top_builddir)/tools/libbrlcheck.la		\
++	libbrlcheck.la					\
+ 	$(LTLIBINTL)
+ 
+ # libbrlcheck is a convenience library that contains functionality to

devel/libsmpp34/Makefile

@@ -19,19 +19,14 @@ USES=		autoreconf libtool pathfix
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
-MAKE_JOBS_UNSAFE=yes
-
 post-patch:
-	${REINPLACE_CMD} -e 's|AC_CONFIG_AUX_DIR.*|AC_CONFIG_AUX_DIR([.])|g' \
-		${WRKSRC}/configure.ac
-	${REINPLACE_CMD} -e 's|AM_CONFIG_HEADER.*|AM_CONFIG_HEADER([./config.h])|g' \
-		${WRKSRC}/configure.ac
-	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/smpp34_dumpBuf.c
-	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/smpp34_dumpPdu.c
-	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/smpp34_pack.c
-	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/smpp34_params.c
-	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/smpp34_structs.c
-	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/smpp34_unpack.c
-	${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
+	@${REINPLACE_CMD} 's|malloc.h|stdlib.h|' \
+		${WRKSRC}/src/smpp34_dumpBuf.c \
+		${WRKSRC}/src/smpp34_dumpPdu.c \
+		${WRKSRC}/src/smpp34_pack.c \
+		${WRKSRC}/src/smpp34_params.c \
+		${WRKSRC}/src/smpp34_structs.c \
+		${WRKSRC}/src/smpp34_unpack.c
+	@${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
 
 .include <bsd.port.mk>

devel/libsmpp34/files/patch-binary-Makefile.am

@@ -0,0 +1,11 @@
+--- binary/Makefile.am.orig	2012-11-07 07:32:31 UTC
++++ binary/Makefile.am
+@@ -5,7 +5,7 @@ include $(top_srcdir)/test_pdu/Makefile.am
+ include $(top_srcdir)/test_apps/Makefile.am
+ include $(top_srcdir)/src/Makefile.am
+ 
+-LDADD = $(top_srcdir)/binary/libsmpp34.la
++LDADD = libsmpp34.la
+ AM_CPPFLAGS = -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS
+ AM_CFLAGS = @CFLAGS@ -Wall -fPIC # -static
+ INCLUDES = -I../src -I..

devel/libsmpp34/files/patch-binary-Makefile.in

@@ -1,11 +0,0 @@
---- binary/Makefile.in.orig	2014-07-14 15:29:16.000000000 +0300
-+++ binary/Makefile.in	2014-07-14 15:28:49.000000000 +0300
-@@ -676,6 +676,8 @@ clean-libLTLIBRARIES:
- 	done
- libsmpp34.la: $(libsmpp34_la_OBJECTS) $(libsmpp34_la_DEPENDENCIES) 
- 	$(libsmpp34_la_LINK) -rpath $(libdir) $(libsmpp34_la_OBJECTS) $(libsmpp34_la_LIBADD) $(LIBS)
-+../binary/libsmpp34.la: $(libsmpp34_la_OBJECTS) $(libsmpp34_la_DEPENDENCIES) 
-+	$(libsmpp34_la_LINK) -rpath $(libdir) $(libsmpp34_la_OBJECTS) $(libsmpp34_la_LIBADD) $(LIBS)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"

devel/p5-ZConf-GUI/Makefile

@@ -15,6 +15,9 @@ COMMENT=	GUI backend chooser
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
+DEPRECATED=	Unmaintained
+EXPIRATION_DATE=	2018-07-15
+
 BUILD_DEPENDS=	p5-ZConf>=6.1.0:net/p5-ZConf \
 		p5-Error-Helper>=1.0.0:devel/p5-Error-Helper \
 		p5-Module-List>=0.003:devel/p5-Module-List \

devel/pijul/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	pijul
 PORTVERSION=	0.10.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://pijul.org/releases/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -14,9 +15,7 @@ LICENSE=	GPLv2
 
 BROKEN_aarch64=		fails to compile: aesv8-armx-linux64.S:53:2: instruction requires: crypto aese v6.16b,v0.16b
 
-LIB_DEPENDS+=	libsodium.so:security/libsodium
-
-USES=		cargo gmake ssl
+USES=		cargo
 CARGO_CRATES=	adler32-1.0.2 \
 		advapi32-sys-0.2.0 \
 		aho-corasick-0.6.4 \
@@ -85,7 +84,7 @@ CARGO_CRATES=	adler32-1.0.2 \
 		libc-0.2.40 \
 		libflate-0.1.14 \
 		libpijul-0.10.1 \
-		line-0.1.1 \
+		line-0.1.7 \
 		log-0.3.9 \
 		log-0.4.1 \
 		matches-0.1.6 \

devel/pijul/distinfo

@@ -1,4 +1,4 @@
-TIMESTAMP = 1525384515
+TIMESTAMP = 1528463073
 SHA256 (pijul-0.10.0.tar.gz) = da3fcba4ab39a4371cda7273691364c2355c9b216bb7867d92dae5812ebb71d2
 SIZE (pijul-0.10.0.tar.gz) = 183007
 SHA256 (rust/crates/adler32-1.0.2.tar.gz) = 6cbd0b9af8587c72beadc9f72d35b9fbb070982c9e6203e46e93f10df25f8f45
@@ -137,8 +137,8 @@ SHA256 (rust/crates/libflate-0.1.14.tar.gz) = 1a429b86418868c7ea91ee50e9170683f4
 SIZE (rust/crates/libflate-0.1.14.tar.gz) = 32377
 SHA256 (rust/crates/libpijul-0.10.1.tar.gz) = ea2364fb645319433ce508d5c2791b15f168ed7e42d622f0203884f03669d860
 SIZE (rust/crates/libpijul-0.10.1.tar.gz) = 80514
-SHA256 (rust/crates/line-0.1.1.tar.gz) = ecdd22a3856203276b7854e16213139428e82922530438f36356e5b361ea4a42
-SIZE (rust/crates/line-0.1.1.tar.gz) = 3204
+SHA256 (rust/crates/line-0.1.7.tar.gz) = 28db36c6282c021990fd7523aa6c5505c35f613220ef1e6c85f80ba25d8b8961
+SIZE (rust/crates/line-0.1.7.tar.gz) = 3748
 SHA256 (rust/crates/log-0.3.9.tar.gz) = e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b
 SIZE (rust/crates/log-0.3.9.tar.gz) = 16686
 SHA256 (rust/crates/log-0.4.1.tar.gz) = 89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2

devel/tablist/Makefile

@@ -4,8 +4,8 @@ PORTNAME=	tablist
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.70-4
 DISTVERSIONSUFFIX=	-gc834a84
-PORTREVISION=   1
-CATEGORIES=	devel
+PORTREVISION=	2
+CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	jrm@FreeBSD.org

devel/tclreadline/Makefile

@@ -25,4 +25,7 @@ USE_LDCONFIG=	yes
 TCL_PKG=	${PORTNAME}${PORTVERSION}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} TCL_PKG=${TCL_PKG}
 
+post-patch:
+	@${RM} ${WRKSRC}/INSTALL
+
 .include <bsd.port.mk>

devel/xfce4-dev-tools/Makefile

@@ -14,8 +14,8 @@ COMMENT=	Xfce development tools
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	autoconf-2.69:devel/autoconf \
-		automake-1.15:devel/automake \
+RUN_DEPENDS=	autoconf>=2.69:devel/autoconf \
+		automake>=1.15:devel/automake \
 		libtoolize:devel/libtool \
 		bash:shells/bash
 

devel/youcompleteme/Makefile

@@ -3,7 +3,9 @@
 
 PORTNAME=	YouCompleteMe
 DISTVERSION=	g20180417
+PORTREVISION=	1
 CATEGORIES=	devel
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ultima@FreeBSD.org
 COMMENT=	Code-completion engine for Vim
@@ -14,17 +16,18 @@ LICENSE_FILE=	${WRKSRC}/COPYING.txt
 RUN_DEPENDS=	vim:editors/vim \
 		${LOCALBASE}/lib/libboost_thread.so:devel/boost-libs \
 		${LOCALBASE}/lib/${PY_BOOST} \
-		${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}bottle>0:www/py-bottle@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}frozendict>0:devel/py-frozendict@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}parso>0:textproc/py-parso@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests-futures>0:www/py-requests-futures@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}bottle>0:www/py-bottle@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}frozendict>0:devel/py-frozendict@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}parso>0:textproc/py-parso@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests-futures>0:www/py-requests-futures@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${FLAVOR}
 
-USES=		cmake python:2.7
+USES=		cmake python
+USE_PYTHON=	flavors
 USE_GITHUB=	yes
 GH_ACCOUNT=	Valloric
 GH_TAGNAME=	6975efd
@@ -61,6 +64,11 @@ RUST_RUN_DEPENDS=	racerd:devel/racerd
 
 VIMFILESDIR=		${PREFIX}/share/vim/vimfiles
 
+.include <bsd.port.pre.mk>
+.if ${PYTHON_MAJOR_VER} == 3
+CMAKE_ARGS+=		-DUSE_PYTHON2:BOOL=OFF
+.endif
+
 do-install:
 		${MKDIR} ${STAGEDIR}${VIMFILESDIR}/third_party/ycmd/third_party
 		(cd ${WRKSRC} && ${COPYTREE_SHARE} "autoload doc plugin python" \
@@ -82,4 +90,4 @@ do-install-MONO-on:
 		${RLN} ${PREFIX}/share/omnisharp-server/bin/Release \
 			${STAGEDIR}${MONOFILESDIR}/OmniSharp/bin/Release
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

dns/bind9-devel/Makefile

@@ -9,7 +9,7 @@ PORTREVISION=	0
 .else
 # XXX: correct version
 # dns/bind9xx here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net ipv6
 # XXX: put the ISC master_site

dns/bind9-devel/files/patch-CVE-2018-5738

@@ -0,0 +1,115 @@
+commit 03ecba2cdc8d9a6cb6bdf863ffa1e230cb4ff223
+Author: Evan Hunt <each@isc.org>
+Date:   2018-06-04 15:57:58 -0700
+
+    allow-recursion could incorrectly inherit from the default allow-query
+
+--- CHANGES.orig	2018-06-08 18:48:01 UTC
++++ CHANGES
+@@ -22,7 +22,12 @@
+ 4961.	[protocol]	Remove support for ECC-GOST (GOST R 34.11-94).
+ 			[GL #295]
+ 
+-4960.	[placeholder]
++4960.	[security]	When recursion is enabled, but the "allow-recursion"
++			and "allow-query-cache" ACLs are not specified,
++			they should be limited to local networks,
++			but were inadvertently set to match the default
++			"allow-query", thus allowing remote queries.
++			(CVE-2018-5738) [GL #309]
+ 
+ 4959.	[func]		NSID logging (enabled by the "request-nsid" option)
+ 			now has its own "nsid" category, instead of using the
+--- bin/named/server.c.orig	2018-06-08 18:48:01 UTC
++++ bin/named/server.c
+@@ -3725,10 +3725,6 @@ configure_view(dns_view_t *view, dns_vie
+ 	CHECKM(named_config_getport(config, &port), "port");
+ 	dns_view_setdstport(view, port);
+ 
+-	CHECK(configure_view_acl(vconfig, config, named_g_config,
+-				 "allow-query", NULL, actx,
+-				 named_g_mctx, &view->queryacl));
+-
+ 	/*
+ 	 * Make the list of response policy zone names for a view that
+ 	 * is used for real lookups and so cares about hints.
+@@ -4697,21 +4693,35 @@ configure_view(dns_view_t *view, dns_vie
+ 				 "allow-query-cache-on", NULL, actx,
+ 				 named_g_mctx, &view->cacheonacl));
+ 	/*
+-	 * Set "allow-query-cache", "allow-recursion", and
+-	 * "allow-recursion-on" acls if configured in named.conf.
+-	 * (Ignore the global defaults for now, because these ACLs
+-	 * can inherit from each other when only some of them set at
+-	 * the options/view level.)
++	 * Set the "allow-query", "allow-query-cache", "allow-recursion",
++	 * and "allow-recursion-on" ACLs if configured in named.conf, but
++	 * NOT from the global defaults. This is done by leaving the third
++	 * argument to configure_view_acl() NULL.
++	 *
++	 * We ignore the global defaults here because these ACLs
++	 * can inherit from each other.  If any are still unset after
++	 * applying the inheritance rules, we'll look up the defaults at
++	 * that time.
+ 	 */
+-	CHECK(configure_view_acl(vconfig, config, NULL, "allow-query-cache",
+-				 NULL, actx, named_g_mctx, &view->cacheacl));
++
++	/* named.conf only */
++	CHECK(configure_view_acl(vconfig, config, NULL,
++				 "allow-query", NULL, actx,
++				 named_g_mctx, &view->queryacl));
++
++	/* named.conf only */
++	CHECK(configure_view_acl(vconfig, config, NULL,
++				 "allow-query-cache", NULL, actx,
++				 named_g_mctx, &view->cacheacl));
+ 
+ 	if (strcmp(view->name, "_bind") != 0 &&
+ 	    view->rdclass != dns_rdataclass_chaos)
+ 	{
++		/* named.conf only */
+ 		CHECK(configure_view_acl(vconfig, config, NULL,
+ 					 "allow-recursion", NULL, actx,
+ 					 named_g_mctx, &view->recursionacl));
++		/* named.conf only */
+ 		CHECK(configure_view_acl(vconfig, config, NULL,
+ 					 "allow-recursion-on", NULL, actx,
+ 					 named_g_mctx, &view->recursiononacl));
+@@ -4749,18 +4759,21 @@ configure_view(dns_view_t *view, dns_vie
+ 		 * the global config.
+ 		 */
+ 		if (view->recursionacl == NULL) {
++			/* global default only */
+ 			CHECK(configure_view_acl(NULL, NULL, named_g_config,
+ 						 "allow-recursion", NULL,
+ 						 actx, named_g_mctx,
+ 						 &view->recursionacl));
+ 		}
+ 		if (view->recursiononacl == NULL) {
++			/* global default only */
+ 			CHECK(configure_view_acl(NULL, NULL, named_g_config,
+ 						 "allow-recursion-on", NULL,
+ 						 actx, named_g_mctx,
+ 						 &view->recursiononacl));
+ 		}
+ 		if (view->cacheacl == NULL) {
++			/* global default only */
+ 			CHECK(configure_view_acl(NULL, NULL, named_g_config,
+ 						 "allow-query-cache", NULL,
+ 						 actx, named_g_mctx,
+@@ -4774,6 +4787,14 @@ configure_view(dns_view_t *view, dns_vie
+ 		CHECK(dns_acl_none(mctx, &view->cacheacl));
+ 	}
+ 
++	if (view->queryacl == NULL) {
++		/* global default only */
++		CHECK(configure_view_acl(NULL, NULL, named_g_config,
++					 "allow-query", NULL,
++					 actx, named_g_mctx,
++					 &view->queryacl));
++	}
++
+ 	/*
+ 	 * Ignore case when compressing responses to the specified
+ 	 * clients. This causes case not always to be preserved,

dns/bind910/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX=	910

dns/bind910/files/patch-CVE-2018-5738

@@ -0,0 +1,127 @@
+commit 97600626c711585e7bb26cbc67711d072e87a62a
+Author: Evan Hunt <each@isc.org>
+Date:   2018-06-04 21:57:49 -0700
+
+    allow-recursion could incorrectly inherit from the default allow-query
+
+--- CHANGES.orig	2018-03-08 20:55:52 UTC
++++ CHANGES
+@@ -1,3 +1,10 @@
++4960.	[security]	When recursion is enabled, but the "allow-recursion"
++			and "allow-query-cache" ACLs are not specified,
++			they should be limited to local networks,
++			but were inadvertently set to match the default
++			"allow-query", thus allowing remote queries.
++			(CVE-2018-5738) [GL #309]
++
+ 	--- 9.10.7 released ---
+ 	--- 9.10.7rc2 released ---
+ 
+--- bin/named/server.c.orig	2018-03-08 20:55:52 UTC
++++ bin/named/server.c
+@@ -2565,10 +2565,6 @@ configure_view(dns_view_t *view, dns_vie
+ 		dns_acache_setcachesize(view->acache, max_acache_size);
+ 	}
+ 
+-	CHECK(configure_view_acl(vconfig, config, ns_g_config,
+-				 "allow-query", NULL, actx,
+-				 ns_g_mctx, &view->queryacl));
+-
+ 	/*
+ 	 * Make the list of response policy zone names for a view that
+ 	 * is used for real lookups and so cares about hints.
+@@ -3399,9 +3395,6 @@ configure_view(dns_view_t *view, dns_vie
+ 	INSIST(result == ISC_R_SUCCESS);
+ 	view->trust_anchor_telemetry = cfg_obj_asboolean(obj);
+ 
+-	CHECK(configure_view_acl(vconfig, config, ns_g_config,
+-				 "allow-query-cache-on", NULL, actx,
+-				 ns_g_mctx, &view->cacheonacl));
+ 	/*
+ 	 * Set sources where additional data and CNAME/DNAME
+ 	 * targets for authoritative answers may be found.
+@@ -3428,22 +3421,40 @@ configure_view(dns_view_t *view, dns_vie
+ 		view->additionalfromcache = ISC_TRUE;
+ 	}
+ 
++	CHECK(configure_view_acl(vconfig, config, ns_g_config,
++				 "allow-query-cache-on", NULL, actx,
++				 ns_g_mctx, &view->cacheonacl));
++
+ 	/*
+-	 * Set "allow-query-cache", "allow-recursion", and
+-	 * "allow-recursion-on" acls if configured in named.conf.
+-	 * (Ignore the global defaults for now, because these ACLs
+-	 * can inherit from each other when only some of them set at
+-	 * the options/view level.)
++	 * Set the "allow-query", "allow-query-cache", "allow-recursion",
++	 * and "allow-recursion-on" ACLs if configured in named.conf, but
++	 * NOT from the global defaults. This is done by leaving the third
++	 * argument to configure_view_acl() NULL.
++	 *
++	 * We ignore the global defaults here because these ACLs
++	 * can inherit from each other.  If any are still unset after
++	 * applying the inheritance rules, we'll look up the defaults at
++	 * that time.
+ 	 */
+-	CHECK(configure_view_acl(vconfig, config, NULL, "allow-query-cache",
+-				 NULL, actx, ns_g_mctx, &view->cacheacl));
++
++	/* named.conf only */
++	CHECK(configure_view_acl(vconfig, config, NULL,
++				 "allow-query", NULL, actx,
++				 ns_g_mctx, &view->queryacl));
++
++	/* named.conf only */
++	CHECK(configure_view_acl(vconfig, config, NULL,
++				 "allow-query-cache", NULL, actx,
++				 ns_g_mctx, &view->cacheacl));
+ 
+ 	if (strcmp(view->name, "_bind") != 0 &&
+ 	    view->rdclass != dns_rdataclass_chaos)
+ 	{
++		/* named.conf only */
+ 		CHECK(configure_view_acl(vconfig, config, NULL,
+ 					 "allow-recursion", NULL, actx,
+ 					 ns_g_mctx, &view->recursionacl));
++		/* named.conf only */
+ 		CHECK(configure_view_acl(vconfig, config, NULL,
+ 					 "allow-recursion-on", NULL, actx,
+ 					 ns_g_mctx, &view->recursiononacl));
+@@ -3481,18 +3492,21 @@ configure_view(dns_view_t *view, dns_vie
+ 		 * the global config.
+ 		 */
+ 		if (view->recursionacl == NULL) {
++			/* global default only */
+ 			CHECK(configure_view_acl(NULL, NULL, ns_g_config,
+ 						 "allow-recursion", NULL,
+ 						 actx, ns_g_mctx,
+ 						 &view->recursionacl));
+ 		}
+ 		if (view->recursiononacl == NULL) {
++			/* global default only */
+ 			CHECK(configure_view_acl(NULL, NULL, ns_g_config,
+ 						 "allow-recursion-on", NULL,
+ 						 actx, ns_g_mctx,
+ 						 &view->recursiononacl));
+ 		}
+ 		if (view->cacheacl == NULL) {
++			/* global default only */
+ 			CHECK(configure_view_acl(NULL, NULL, ns_g_config,
+ 						 "allow-query-cache", NULL,
+ 						 actx, ns_g_mctx,
+@@ -3506,6 +3520,14 @@ configure_view(dns_view_t *view, dns_vie
+ 		CHECK(dns_acl_none(mctx, &view->cacheacl));
+ 	}
+ 
++	if (view->queryacl == NULL) {
++		/* global default only */
++		CHECK(configure_view_acl(NULL, NULL, ns_g_config,
++					 "allow-query", NULL,
++					 actx, ns_g_mctx,
++					 &view->queryacl));
++	}
++
+ 	/*
+ 	 * Ignore case when compressing responses to the specified
+ 	 * clients. This causes case not always to be preserved,

dns/bind911/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX=	911

dns/bind911/files/patch-CVE-2018-5738

@@ -0,0 +1,127 @@
+commit 3d71785ef143b670409affee203145eb39266d87
+Author: Evan Hunt <each@isc.org>
+Date:   2018-06-04 21:55:41 -0700
+
+    allow-recursion could incorrectly inherit from the default allow-query
+
+--- CHANGES.orig	2018-03-08 20:55:28 UTC
++++ CHANGES
+@@ -1,3 +1,10 @@
++4960.	[security]	When recursion is enabled, but the "allow-recursion"
++			and "allow-query-cache" ACLs are not specified,
++			they should be limited to local networks,
++			but were inadvertently set to match the default
++			"allow-query", thus allowing remote queries.
++			(CVE-2018-5738) [GL #309]
++
+ 	--- 9.11.3 released ---
+ 	--- 9.11.3rc2 released ---
+ 
+--- bin/named/server.c.orig	2018-03-08 20:55:28 UTC
++++ bin/named/server.c
+@@ -3376,10 +3376,6 @@ configure_view(dns_view_t *view, dns_vie
+ 		dns_acache_setcachesize(view->acache, max_acache_size);
+ 	}
+ 
+-	CHECK(configure_view_acl(vconfig, config, ns_g_config,
+-				 "allow-query", NULL, actx,
+-				 ns_g_mctx, &view->queryacl));
+-
+ 	/*
+ 	 * Make the list of response policy zone names for a view that
+ 	 * is used for real lookups and so cares about hints.
+@@ -4258,9 +4254,6 @@ configure_view(dns_view_t *view, dns_vie
+ 	INSIST(result == ISC_R_SUCCESS);
+ 	view->trust_anchor_telemetry = cfg_obj_asboolean(obj);
+ 
+-	CHECK(configure_view_acl(vconfig, config, ns_g_config,
+-				 "allow-query-cache-on", NULL, actx,
+-				 ns_g_mctx, &view->cacheonacl));
+ 	/*
+ 	 * Set sources where additional data and CNAME/DNAME
+ 	 * targets for authoritative answers may be found.
+@@ -4287,22 +4280,40 @@ configure_view(dns_view_t *view, dns_vie
+ 		view->additionalfromcache = ISC_TRUE;
+ 	}
+ 
++	CHECK(configure_view_acl(vconfig, config, ns_g_config,
++				 "allow-query-cache-on", NULL, actx,
++				 ns_g_mctx, &view->cacheonacl));
++
+ 	/*
+-	 * Set "allow-query-cache", "allow-recursion", and
+-	 * "allow-recursion-on" acls if configured in named.conf.
+-	 * (Ignore the global defaults for now, because these ACLs
+-	 * can inherit from each other when only some of them set at
+-	 * the options/view level.)
++	 * Set the "allow-query", "allow-query-cache", "allow-recursion",
++	 * and "allow-recursion-on" ACLs if configured in named.conf, but
++	 * NOT from the global defaults. This is done by leaving the third
++	 * argument to configure_view_acl() NULL.
++	 *
++	 * We ignore the global defaults here because these ACLs
++	 * can inherit from each other.  If any are still unset after
++	 * applying the inheritance rules, we'll look up the defaults at
++	 * that time.
+ 	 */
+-	CHECK(configure_view_acl(vconfig, config, NULL, "allow-query-cache",
+-				 NULL, actx, ns_g_mctx, &view->cacheacl));
++
++	/* named.conf only */
++	CHECK(configure_view_acl(vconfig, config, NULL,
++				 "allow-query", NULL, actx,
++				 ns_g_mctx, &view->queryacl));
++
++	/* named.conf only */
++	CHECK(configure_view_acl(vconfig, config, NULL,
++				 "allow-query-cache", NULL, actx,
++				 ns_g_mctx, &view->cacheacl));
+ 
+ 	if (strcmp(view->name, "_bind") != 0 &&
+ 	    view->rdclass != dns_rdataclass_chaos)
+ 	{
++		/* named.conf only */
+ 		CHECK(configure_view_acl(vconfig, config, NULL,
+ 					 "allow-recursion", NULL, actx,
+ 					 ns_g_mctx, &view->recursionacl));
++		/* named.conf only */
+ 		CHECK(configure_view_acl(vconfig, config, NULL,
+ 					 "allow-recursion-on", NULL, actx,
+ 					 ns_g_mctx, &view->recursiononacl));
+@@ -4340,18 +4351,21 @@ configure_view(dns_view_t *view, dns_vie
+ 		 * the global config.
+ 		 */
+ 		if (view->recursionacl == NULL) {
++			/* global default only */
+ 			CHECK(configure_view_acl(NULL, NULL, ns_g_config,
+ 						 "allow-recursion", NULL,
+ 						 actx, ns_g_mctx,
+ 						 &view->recursionacl));
+ 		}
+ 		if (view->recursiononacl == NULL) {
++			/* global default only */
+ 			CHECK(configure_view_acl(NULL, NULL, ns_g_config,
+ 						 "allow-recursion-on", NULL,
+ 						 actx, ns_g_mctx,
+ 						 &view->recursiononacl));
+ 		}
+ 		if (view->cacheacl == NULL) {
++			/* global default only */
+ 			CHECK(configure_view_acl(NULL, NULL, ns_g_config,
+ 						 "allow-query-cache", NULL,
+ 						 actx, ns_g_mctx,
+@@ -4365,6 +4379,14 @@ configure_view(dns_view_t *view, dns_vie
+ 		CHECK(dns_acl_none(mctx, &view->cacheacl));
+ 	}
+ 
++	if (view->queryacl == NULL) {
++		/* global default only */
++		CHECK(configure_view_acl(NULL, NULL, ns_g_config,
++					 "allow-query", NULL,
++					 actx, ns_g_mctx,
++					 &view->queryacl));
++	}
++
+ 	/*
+ 	 * Ignore case when compressing responses to the specified
+ 	 * clients. This causes case not always to be preserved,

dns/bind912/Makefile

@@ -8,7 +8,7 @@ PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 PORTREVISION=	0
 .else
 # dns/bind912 here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}

dns/bind912/files/patch-CVE-2018-5738

@@ -0,0 +1,112 @@
+commit be02bf65712ee54148496aac3edb3ca7d061327f
+Author: Evan Hunt <each@isc.org>
+Date:   2018-06-04 21:46:23 -0700
+
+    allow-recursion could incorrectly inherit from the default allow-query
+
+--- CHANGES.orig	2018-05-16 18:06:47 UTC
++++ CHANGES
+@@ -1,3 +1,10 @@
++4960.	[security]	When recursion is enabled, but the "allow-recursion"
++			and "allow-query-cache" ACLs are not specified,
++			they should be limited to local networks,
++			but were inadvertently set to match the default
++			"allow-query", thus allowing remote queries.
++			(CVE-2018-5738) [GL #309]
++
+ 	--- 9.12.1-P2 released ---
+ 
+ 	--- 9.12.1-P1 (withdrawn) ---
+--- bin/named/server.c.orig	2018-05-16 18:06:47 UTC
++++ bin/named/server.c
+@@ -3725,10 +3725,6 @@ configure_view(dns_view_t *view, dns_vie
+ 	CHECKM(named_config_getport(config, &port), "port");
+ 	dns_view_setdstport(view, port);
+ 
+-	CHECK(configure_view_acl(vconfig, config, named_g_config,
+-				 "allow-query", NULL, actx,
+-				 named_g_mctx, &view->queryacl));
+-
+ 	/*
+ 	 * Make the list of response policy zone names for a view that
+ 	 * is used for real lookups and so cares about hints.
+@@ -4692,21 +4688,35 @@ configure_view(dns_view_t *view, dns_vie
+ 				 "allow-query-cache-on", NULL, actx,
+ 				 named_g_mctx, &view->cacheonacl));
+ 	/*
+-	 * Set "allow-query-cache", "allow-recursion", and
+-	 * "allow-recursion-on" acls if configured in named.conf.
+-	 * (Ignore the global defaults for now, because these ACLs
+-	 * can inherit from each other when only some of them set at
+-	 * the options/view level.)
++	 * Set the "allow-query", "allow-query-cache", "allow-recursion",
++	 * and "allow-recursion-on" ACLs if configured in named.conf, but
++	 * NOT from the global defaults. This is done by leaving the third
++	 * argument to configure_view_acl() NULL.
++	 *
++	 * We ignore the global defaults here because these ACLs
++	 * can inherit from each other.  If any are still unset after
++	 * applying the inheritance rules, we'll look up the defaults at
++	 * that time.
+ 	 */
+-	CHECK(configure_view_acl(vconfig, config, NULL, "allow-query-cache",
+-				 NULL, actx, named_g_mctx, &view->cacheacl));
++
++	/* named.conf only */
++	CHECK(configure_view_acl(vconfig, config, NULL,
++				 "allow-query", NULL, actx,
++				 named_g_mctx, &view->queryacl));
++
++	/* named.conf only */
++	CHECK(configure_view_acl(vconfig, config, NULL,
++				 "allow-query-cache", NULL, actx,
++				 named_g_mctx, &view->cacheacl));
+ 
+ 	if (strcmp(view->name, "_bind") != 0 &&
+ 	    view->rdclass != dns_rdataclass_chaos)
+ 	{
++		/* named.conf only */
+ 		CHECK(configure_view_acl(vconfig, config, NULL,
+ 					 "allow-recursion", NULL, actx,
+ 					 named_g_mctx, &view->recursionacl));
++		/* named.conf only */
+ 		CHECK(configure_view_acl(vconfig, config, NULL,
+ 					 "allow-recursion-on", NULL, actx,
+ 					 named_g_mctx, &view->recursiononacl));
+@@ -4744,18 +4754,21 @@ configure_view(dns_view_t *view, dns_vie
+ 		 * the global config.
+ 		 */
+ 		if (view->recursionacl == NULL) {
++			/* global default only */
+ 			CHECK(configure_view_acl(NULL, NULL, named_g_config,
+ 						 "allow-recursion", NULL,
+ 						 actx, named_g_mctx,
+ 						 &view->recursionacl));
+ 		}
+ 		if (view->recursiononacl == NULL) {
++			/* global default only */
+ 			CHECK(configure_view_acl(NULL, NULL, named_g_config,
+ 						 "allow-recursion-on", NULL,
+ 						 actx, named_g_mctx,
+ 						 &view->recursiononacl));
+ 		}
+ 		if (view->cacheacl == NULL) {
++			/* global default only */
+ 			CHECK(configure_view_acl(NULL, NULL, named_g_config,
+ 						 "allow-query-cache", NULL,
+ 						 actx, named_g_mctx,
+@@ -4769,6 +4782,14 @@ configure_view(dns_view_t *view, dns_vie
+ 		CHECK(dns_acl_none(mctx, &view->cacheacl));
+ 	}
+ 
++	if (view->queryacl == NULL) {
++		/* global default only */
++		CHECK(configure_view_acl(NULL, NULL, named_g_config,
++					 "allow-query", NULL,
++					 actx, named_g_mctx,
++					 &view->queryacl));
++	}
++
+ 	/*
+ 	 * Ignore case when compressing responses to the specified
+ 	 * clients. This causes case not always to be preserved,

dns/bind99/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX=	99

dns/bind99/files/patch-CVE-2018-5738

@@ -0,0 +1,112 @@
+commit fae03da5cb6370fd823d03818871ef70e4049543
+Author: Evan Hunt <each@isc.org>
+Date:   2018-06-04 21:59:33 -0700
+
+    allow-recursion could incorrectly inherit from the default allow-query
+
+--- CHANGES.orig	2018-03-08 20:56:13 UTC
++++ CHANGES
+@@ -1,3 +1,10 @@
++4960.	[security]	When recursion is enabled, but the "allow-recursion"
++			and "allow-query-cache" ACLs are not specified,
++			they should be limited to local networks,
++			but were inadvertently set to match the default
++			"allow-query", thus allowing remote queries.
++			(CVE-2018-5738) [GL #309]
++
+ 	--- 9.9.12 released ---
+ 	--- 9.9.12rc2 released ---
+ 
+--- bin/named/server.c.orig	2018-03-08 20:56:13 UTC
++++ bin/named/server.c
+@@ -2306,10 +2306,6 @@ configure_view(dns_view_t *view, cfg_obj
+ 		dns_acache_setcachesize(view->acache, max_acache_size);
+ 	}
+ 
+-	CHECK(configure_view_acl(vconfig, config, ns_g_config,
+-				 "allow-query", NULL, actx,
+-				 ns_g_mctx, &view->queryacl));
+-
+ 	/*
+ 	 * Make the list of response policy zone names for a view that
+ 	 * is used for real lookups and so cares about hints.
+@@ -3140,21 +3136,35 @@ configure_view(dns_view_t *view, cfg_obj
+ 	}
+ 
+ 	/*
+-	 * Set "allow-query-cache", "allow-recursion", and
+-	 * "allow-recursion-on" acls if configured in named.conf.
+-	 * (Ignore the global defaults for now, because these ACLs
+-	 * can inherit from each other when only some of them set at
+-	 * the options/view level.)
++	 * Set the "allow-query", "allow-query-cache", "allow-recursion",
++	 * and "allow-recursion-on" ACLs if configured in named.conf, but
++	 * NOT from the global defaults. This is done by leaving the third
++	 * argument to configure_view_acl() NULL.
++	 *
++	 * We ignore the global defaults here because these ACLs
++	 * can inherit from each other.  If any are still unset after
++	 * applying the inheritance rules, we'll look up the defaults at
++	 * that time.
+ 	 */
+-	CHECK(configure_view_acl(vconfig, config, NULL, "allow-query-cache",
+-				 NULL, actx, ns_g_mctx, &view->cacheacl));
++
++	/* named.conf only */
++	CHECK(configure_view_acl(vconfig, config, NULL,
++				 "allow-query", NULL, actx,
++				 ns_g_mctx, &view->queryacl));
++
++	/* named.conf only */
++	CHECK(configure_view_acl(vconfig, config, NULL,
++				 "allow-query-cache", NULL, actx,
++				 ns_g_mctx, &view->cacheacl));
+ 
+ 	if (strcmp(view->name, "_bind") != 0 &&
+ 	    view->rdclass != dns_rdataclass_chaos)
+ 	{
++		/* named.conf only */
+ 		CHECK(configure_view_acl(vconfig, config, NULL,
+ 					 "allow-recursion", NULL, actx,
+ 					 ns_g_mctx, &view->recursionacl));
++		/* named.conf only */
+ 		CHECK(configure_view_acl(vconfig, config, NULL,
+ 					 "allow-recursion-on", NULL, actx,
+ 					 ns_g_mctx, &view->recursiononacl));
+@@ -3192,18 +3202,21 @@ configure_view(dns_view_t *view, cfg_obj
+ 		 * the global config.
+ 		 */
+ 		if (view->recursionacl == NULL) {
++			/* global default only */
+ 			CHECK(configure_view_acl(NULL, NULL, ns_g_config,
+ 						 "allow-recursion", NULL,
+ 						 actx, ns_g_mctx,
+ 						 &view->recursionacl));
+ 		}
+ 		if (view->recursiononacl == NULL) {
++			/* global default only */
+ 			CHECK(configure_view_acl(NULL, NULL, ns_g_config,
+ 						 "allow-recursion-on", NULL,
+ 						 actx, ns_g_mctx,
+ 						 &view->recursiononacl));
+ 		}
+ 		if (view->cacheacl == NULL) {
++			/* global default only */
+ 			CHECK(configure_view_acl(NULL, NULL, ns_g_config,
+ 						 "allow-query-cache", NULL,
+ 						 actx, ns_g_mctx,
+@@ -3217,6 +3230,14 @@ configure_view(dns_view_t *view, cfg_obj
+ 		CHECK(dns_acl_none(mctx, &view->cacheacl));
+ 	}
+ 
++	if (view->queryacl == NULL) {
++		/* global default only */
++		CHECK(configure_view_acl(NULL, NULL, ns_g_config,
++					 "allow-query", NULL,
++					 actx, ns_g_mctx,
++					 &view->queryacl));
++	}
++
+ 	/*
+ 	 * Ignore case when compressing responses to the specified
+ 	 * clients. This causes case not always to be preserved,

dns/nsd/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nsd
-PORTVERSION=	4.1.21
+PORTVERSION=	4.1.22
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/	\
 		ftp://ftp.rhnet.is/pub/nsd/

dns/nsd/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1526378215
-SHA256 (nsd-4.1.21.tar.gz) = 7858b934a07e1582079d7e724b05855380416b7fd68cdaeeca16305bd66bd2bd
-SIZE (nsd-4.1.21.tar.gz) = 1099021
+TIMESTAMP = 1528707556
+SHA256 (nsd-4.1.22.tar.gz) = f186e86705768a35ecb6ac18d1ee4eeec2745fcd1feab38e64f89c5eb5aa049c
+SIZE (nsd-4.1.22.tar.gz) = 1099463

editors/jucipp/Makefile

@@ -3,8 +3,7 @@
 
 PORTNAME=	jucipp
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.1
-PORTREVISION=	1
+DISTVERSION=	1.4.4
 CATEGORIES=	editors
 
 MAINTAINER=	info@babaei.net
@@ -16,16 +15,19 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libaspell.so:textproc/aspell \
 		libboost_filesystem.so:devel/boost-libs \
 		libgit2.so:devel/libgit2 \
-		libclang.so:devel/llvm50
+		libclang.so.5:devel/llvm50
 
 USES=		cmake:outsource desktop-file-utils pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	cppit
-GH_TUPLE=	cppit:libclangmm:997d02a:libclangmm/libclangmm \
+GH_TUPLE=	cppit:libclangmm:5a0195e:libclangmm/libclangmm \
 		eidheim:tiny-process-library:a034812:tiny_process_library/tiny-process-library
 USE_GNOME=	gdkpixbuf2 gtkmm30 gtksourceviewmm3
 INSTALLS_ICONS=	yes
 
+CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH=${LOCALBASE}/llvm50/include \
+		-DCMAKE_LIBRARY_PATH=${LOCALBASE}/llvm50/lib
+
 PLIST_FILES=	bin/juci \
 		share/applications/juci.desktop \
 		share/icons/hicolor/scalable/apps/juci.svg

editors/jucipp/distinfo

@@ -1,7 +1,7 @@
-TIMESTAMP = 1520712458
-SHA256 (cppit-jucipp-v1.4.1_GH0.tar.gz) = 3c587e81f63db44a0ac9278208cd9643213884df414bbc844bdcb66fb00a27df
-SIZE (cppit-jucipp-v1.4.1_GH0.tar.gz) = 564365
-SHA256 (cppit-libclangmm-997d02a_GH0.tar.gz) = b01e20ba48f17eb7e1fccd370fa5dfb8759e0c050f91dfc9a1c392374a1b38d2
-SIZE (cppit-libclangmm-997d02a_GH0.tar.gz) = 18569
+TIMESTAMP = 1528741313
+SHA256 (cppit-jucipp-v1.4.4_GH0.tar.gz) = 1af88ddc869b63dc15bbdc0da6d43f3b0ce45a0083fb2c1f6e74dd2104688ea7
+SIZE (cppit-jucipp-v1.4.4_GH0.tar.gz) = 570650
+SHA256 (cppit-libclangmm-5a0195e_GH0.tar.gz) = d8b366f86b37ebba53bf14d9dc52a8e9e95946f8217d80d10bfaca5c4cd61294
+SIZE (cppit-libclangmm-5a0195e_GH0.tar.gz) = 18683
 SHA256 (eidheim-tiny-process-library-a034812_GH0.tar.gz) = a9410c6afa664c8548673aa088bcd47b2f57c6830d84bebced1ccfebcc871987
 SIZE (eidheim-tiny-process-library-a034812_GH0.tar.gz) = 8700

emulators/tme/Makefile

@@ -20,6 +20,7 @@ USE_GNOME=	gdkpixbuf2 gtk20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static --disable-warnings
+CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
 MAKE_JOBS_UNSAFE=yes
 INSTALL_TARGET=	install-strip
 

emulators/tme/files/patch-configure.in

@@ -1,6 +1,14 @@
---- configure.in.orig
+--- configure.in.orig	2010-06-05 19:56:37 UTC
 +++ configure.in
-@@ -599,18 +599,16 @@
+@@ -33,6 +33,7 @@ dnl POSSIBILITY OF SUCH DAMAGE.
+ 
+ dnl Checks that we are given a good source directory.
+ AC_INIT(ic/m68k/m68k-impl.h)
++AC_CONFIG_MACRO_DIR([m4])
+ AC_CANONICAL_SYSTEM
+ AM_INIT_AUTOMAKE(tme, 0.8)
+ 
+@@ -599,18 +600,14 @@ i[3456789]86-* | x86_64-*) misc_hosts="x86" ;;
  esac
  changequote([, ])dnl
  AC_MSG_RESULT([${misc_hosts}])
@@ -11,19 +19,19 @@
  
  dnl Configure for libtool.
 -AC_LIBLTDL_INSTALLABLE
-+LT_CONFIG_LTDL_DIR([libltdl])
-+LT_INIT([dlopen])
-+LTDL_INIT([installable])
- AC_SUBST(INCLTDL)
- AC_SUBST(LIBLTDL)
+-AC_SUBST(INCLTDL)
+-AC_SUBST(LIBLTDL)
 -AC_LIBTOOL_DLOPEN
 -AM_PROG_LIBTOOL
 -AC_SUBST(LTLIBOBJS)
 -AC_CONFIG_SUBDIRS(libltdl)
++LT_CONFIG_LTDL_DIR([libltdl])
++LT_INIT([dlopen])
++LTDL_INIT
  TME_PREOPEN=
  if test $enable_shared = no; then
    TME_PREOPEN='`sort -u $(top_builddir)/tme-preopen.txt`'
-@@ -683,11 +681,8 @@
+@@ -683,11 +680,8 @@ if test "x$gen_tmeconfig_h" = xyes; then
  #define _TMECONFIG_H
  
  TMEEOF

graphics/agg/Makefile

@@ -21,11 +21,10 @@ GNU_CONFIGURE=	yes
 USES=		autoreconf gmake libtool pathfix pkgconfig
 USE_XORG=	x11
 USE_SDL=	sdl
-MAKE_ENV=	C="${CC}" AGGCXXFLAGS="${CXXFLAGS}"
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
-MAKE_JOBS_UNSAFE=	yes
 
-CXXFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -I../include -L./
+post-patch:
+	@${REINPLACE_CMD} 's/_LDFLAGS/_LDADD/' ${WRKSRC}/examples/Makefile.am
 
 .include <bsd.port.mk>

graphics/maim/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	maim
-PORTVERSION=	5.5.1
+PORTVERSION=	5.5.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics
 

graphics/maim/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1527211487
-SHA256 (naelstrof-maim-v5.5.1_GH0.tar.gz) = 5a954fa2feb80809874517804f7fdea703ac36a709b3f6cd9310a66cbb027cb7
-SIZE (naelstrof-maim-v5.5.1_GH0.tar.gz) = 39601
+TIMESTAMP = 1528907941
+SHA256 (naelstrof-maim-v5.5.2_GH0.tar.gz) = 254563b89c52dcf1fab713c0221db7f3f1a37ec539ecc5512daf5916ba86ed93
+SIZE (naelstrof-maim-v5.5.2_GH0.tar.gz) = 39619

graphics/p5-Image-Size-FillFullSelect/Makefile

@@ -12,6 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Pick whether an image fill setting for a image should be fill or full
 
+DEPRECATED=	Unmaintained
+EXPIRATION_DATE=	2018-07-15
+
 BUILD_DEPENDS=	p5-Image-Size>=3.230:graphics/p5-Image-Size
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 

graphics/p5-Imager-AverageGray/Makefile

@@ -11,6 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Finds the average gray for a Imager object or image
 
+DEPRECATED=	Unmaintained
+EXPIRATION_DATE=	2018-07-15
+
 RUN_DEPENDS=	p5-Imager>=0:graphics/p5-Imager
 
 USES=		perl5

graphics/php-facedetect/Makefile

@@ -19,10 +19,9 @@ GH_ACCOUNT=	infusion
 GH_PROJECT=	PHP-Facedetect
 GH_TAGNAME=	4b1dfe1
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib -lopencv_core
+LIBS+=		-lopencv_core
 
-USES=		php:ext
+USES=		localbase php:ext
 
 CONFIGURE_ARGS+=	--with-facedetect
 

graphics/php-facedetect/pkg-descr

@@ -3,4 +3,4 @@ The extension offers two new functions. In principle, they differ only by
 their return value. The first returns only the number of faces found on the
 given image and the other an associative array of their coordinates.
 
-WWW: http://www.xarg.org/project/php-facedetect/
+WWW: https://www.xarg.org/project/php-facedetect/

lang/erlang-runtime20/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	erlang
-PORTVERSION=	20.3.7
+PORTVERSION=	20.3.8
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg			\
 		http://erlang.stacken.kth.se/download/:erlangorg		\
@@ -20,7 +20,7 @@ PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
 PATCHFILES=	patch-otp-20.3.1 patch-otp-20.3.2 patch-otp-20.3.3 \
 		patch-otp-20.3.4 patch-otp-20.3.5 patch-otp-20.3.6 \
-		patch-otp-20.3.7
+		patch-otp-20.3.7 patch-otp-20.3.8
 
 MAINTAINER=	erlang@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson

lang/erlang-runtime20/distinfo

@@ -1,8 +1,8 @@
-TIMESTAMP = 1528207615
+TIMESTAMP = 1528975866
 SHA256 (erlang/otp_src_20.3.tar.gz) = 4e19e6c403d5255531c0b870f19511c8b8e3b080618e4f9efcb44d905935b2a1
 SIZE (erlang/otp_src_20.3.tar.gz) = 88170904
-SHA256 (erlang/preloaded-20.3.7.tar.gz) = ba3fc7c3fe73e42882f2b55b248152ca7f3598d67cb7462ee4ba987f506d046d
-SIZE (erlang/preloaded-20.3.7.tar.gz) = 334978
+SHA256 (erlang/preloaded-20.3.8.tar.gz) = 0ecdeca0dde7d204d66ad47000f7b981080c22979878ffe15524aafe2dbfde3f
+SIZE (erlang/preloaded-20.3.8.tar.gz) = 334978
 SHA256 (erlang/patch-otp-20.3.1) = 3d43c6ecb867c64318466eb7adeb8953669cb092bb4b43bbe1b51cfb8d640ee8
 SIZE (erlang/patch-otp-20.3.1) = 5316
 SHA256 (erlang/patch-otp-20.3.2) = b4fa80bab29f1382510ad5b3fc66fd5d1aba35bb48ce390763eb05c88a3e44b1
@@ -17,3 +17,5 @@ SHA256 (erlang/patch-otp-20.3.6) = edcfba7dd5efee0f0739c919aea542bad33b788b7b2fe
 SIZE (erlang/patch-otp-20.3.6) = 10837
 SHA256 (erlang/patch-otp-20.3.7) = 3b55f718ef9d863b7616f22f9a90c01766f9d42a69cbfb5fe949d37aec6ac341
 SIZE (erlang/patch-otp-20.3.7) = 19324
+SHA256 (erlang/patch-otp-20.3.8) = ea17d780d1e14ac7419ab57b7393d493124cd2b32da248bbc273e71e87496a92
+SIZE (erlang/patch-otp-20.3.8) = 13102

lang/julia/Makefile

@@ -4,6 +4,7 @@
 PORTNAME=	julia
 PORTVERSION=	0.6.3
 DISTVERSIONSUFFIX=	-full
+PORTREVISION=	1
 CATEGORIES=	lang math
 MASTER_SITES=	https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/
 

lang/julia/files/patch-Make.inc

@@ -1,6 +1,6 @@
---- Make.inc.orig	2017-06-19 17:48:45 UTC
+--- Make.inc.orig	2018-05-27 21:19:34 UTC
 +++ Make.inc
-@@ -133,12 +133,7 @@ endif
+@@ -134,12 +134,7 @@ endif
  # disable automatic Makefile rules
  .SUFFIXES:
  
@@ -13,7 +13,7 @@
  
  # Julia's Semantic Versioning system labels the three decimal places in a version number as
  # the major, minor and patch versions.  Typically the major version would be incremented
-@@ -183,7 +178,7 @@ libdir := $(prefix)/lib
+@@ -184,7 +179,7 @@ libdir := $(prefix)/lib
  libexecdir := $(prefix)/libexec
  datarootdir := $(prefix)/share
  docdir := $(datarootdir)/doc/julia
@@ -22,7 +22,7 @@
  man1dir := $(mandir)/man1
  includedir := $(prefix)/include
  sysconfdir := $(prefix)/etc
-@@ -197,7 +192,7 @@ build_libdir := $(build_prefix)/lib
+@@ -198,7 +193,7 @@ build_libdir := $(build_prefix)/lib
  build_libexecdir := $(build_prefix)/libexec
  build_datarootdir := $(build_prefix)/share
  build_docdir := $(build_datarootdir)/doc/julia
@@ -31,7 +31,7 @@
  build_man1dir := $(build_mandir)/man1
  build_includedir := $(build_prefix)/include
  build_sysconfdir := $(build_prefix)/etc
-@@ -350,7 +345,7 @@ endif
+@@ -351,7 +346,7 @@ endif
  ifeq ($(USEIFC), 1)
  FC := ifort
  else
@@ -40,7 +40,7 @@
  endif
  
  STDLIBCPP_FLAG :=
-@@ -403,14 +398,14 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions
+@@ -404,14 +399,14 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions
  endif
  
  ifeq ($(USECLANG),1)

lang/julia/files/patch-Makefile

@@ -1,6 +1,6 @@
---- Makefile.orig	2017-06-19 17:48:45 UTC
+--- Makefile.orig	2018-05-27 21:19:34 UTC
 +++ Makefile
-@@ -71,7 +71,6 @@ $(build_prefix)/.examples: $(wildcard $(
+@@ -71,7 +71,6 @@ $(build_prefix)/.examples: $(wildcard $(JULIAHOME)/exa
  	@mkdir -p $(build_docdir)/examples
  	@cp -R $(JULIAHOME)/examples/*.jl $(build_docdir)/examples/
  	@cp -R $(JULIAHOME)/examples/clustermanager $(build_docdir)/examples/
@@ -8,7 +8,7 @@
  	@echo 1 > $@
  
  julia-symlink: julia-ui-$(JULIA_BUILD_MODE)
-@@ -96,7 +95,7 @@ julia-src-release julia-src-debug : juli
+@@ -96,7 +95,7 @@ julia-src-release julia-src-debug : julia-src-% : juli
  julia-ui-release julia-ui-debug : julia-ui-% : julia-src-%
  	@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/ui julia-$*
  
@@ -17,7 +17,7 @@
  	@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE)
  
  ifneq ($(CPUID_SPECIFIC_BINARIES), 0)
-@@ -332,7 +331,7 @@ define stringreplace
+@@ -333,7 +332,7 @@ define stringreplace
  	$(build_depsbindir)/stringreplace $$(strings -t x - $1 | grep '$2' | awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"
  endef
  
@@ -26,7 +26,7 @@
  	@$(MAKE) $(QUIET_MAKE) all
  	@for subdir in $(bindir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \
  		mkdir -p $(DESTDIR)$$subdir; \
-@@ -377,9 +376,6 @@ endif
+@@ -378,9 +377,6 @@ endif
  	$(INSTALL_M) $(JULIAHOME)/contrib/build_sysimg.jl $(DESTDIR)$(datarootdir)/julia/
  	# Copy in all .jl sources as well
  	cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/
@@ -36,7 +36,7 @@
  	# Remove perf suite
  	-rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/
  	# Remove various files which should not be installed
-@@ -387,38 +383,44 @@ endif
+@@ -388,37 +384,43 @@ endif
  	-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
  	# Copy in beautiful new man page
  	$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/
@@ -63,7 +63,8 @@
 -else ifneq (,$(findstring $(OS),Linux FreeBSD))
 +else
  	for julia in $(DESTDIR)$(bindir)/julia* ; do \
- 		patchelf --set-rpath '$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $$julia; \
+-		patchelf --set-rpath '$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $$julia; \
++		patchelf --set-rpath '$(GCCPATH):$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $$julia; \
  	done
  endif
 -
@@ -74,7 +75,7 @@
  
  	mkdir -p $(DESTDIR)$(sysconfdir)
  	cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/
- 
++
 +install-docs:
 +	# Copy documentation
 +	cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/
@@ -94,7 +95,6 @@
 +	# Install appdata file
 +	mkdir -p $(DESTDIR)$(datarootdir)/appdata/
 +	$(INSTALL_F) $(JULIAHOME)/contrib/julia.appdata.xml $(DESTDIR)$(datarootdir)/appdata/
-+
+ 
  distclean dist-clean:
  	-rm -fr $(BUILDROOT)/julia-*.tar.gz $(BUILDROOT)/julia*.exe $(BUILDROOT)/julia-*.7z $(BUILDROOT)/julia-$(JULIA_COMMIT)
- 

lang/julia/files/patch-src_Makefile

@@ -1,4 +1,4 @@
---- src/Makefile.orig	2017-06-19 17:48:45 UTC
+--- src/Makefile.orig	2018-05-07 22:05:07 UTC
 +++ src/Makefile
 @@ -263,7 +263,7 @@ else
  endif
@@ -9,7 +9,7 @@
  	$(INSTALL_NAME_CMD)libjulia-debug.$(SHLIB_EXT) $@
  ifneq ($(OS), WINNT)
  	@ln -sf libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT) $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_SHLIB_EXT)
-@@ -278,7 +278,7 @@ $(BUILDDIR)/libjulia-debug.a: $(SRCDIR)/
+@@ -278,7 +278,7 @@ $(BUILDDIR)/libjulia-debug.a: $(SRCDIR)/julia.expmap $
  libjulia-debug: $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT) $(PUBLIC_HEADER_TARGETS)
  
  $(build_shlibdir)/libjulia.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(OBJS) $(BUILDDIR)/flisp/libflisp.a $(BUILDDIR)/support/libsupport.a $(LIBUV)

lang/ponyc/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ponyc
-DISTVERSION=	0.22.2
+DISTVERSION=	0.23.0
 CATEGORIES=	lang
 
 MAINTAINER=	greg@unrelenting.technology

lang/ponyc/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1527444982
-SHA256 (ponylang-ponyc-0.22.2_GH0.tar.gz) = 7bf1290a4a3f6f74a12482ed1698b45d7766495958f1181e92564991ff7a09b6
-SIZE (ponylang-ponyc-0.22.2_GH0.tar.gz) = 1490218
+TIMESTAMP = 1528747607
+SHA256 (ponylang-ponyc-0.23.0_GH0.tar.gz) = 13bace89b4d069c7fa01e514d38fdcf02a8d2bf011367081186c4b00decf83bd
+SIZE (ponylang-ponyc-0.23.0_GH0.tar.gz) = 1520685

lang/ponyc/pkg-plist

@@ -209,13 +209,12 @@ lib/pony/%%VERSION%%/packages/term/readline.pony
 lib/pony/%%VERSION%%/packages/term/readline_notify.pony
 lib/pony/%%VERSION%%/packages/time/_test.pony
 lib/pony/%%VERSION%%/packages/time/_timing_wheel.pony
-lib/pony/%%VERSION%%/packages/time/date.pony
 lib/pony/%%VERSION%%/packages/time/nanos.pony
+lib/pony/%%VERSION%%/packages/time/posix_date.pony
 lib/pony/%%VERSION%%/packages/time/time.pony
 lib/pony/%%VERSION%%/packages/time/timer.pony
 lib/pony/%%VERSION%%/packages/time/timer_notify.pony
 lib/pony/%%VERSION%%/packages/time/timers.pony
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.md
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/circle/main.pony
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/commandline/main.pony
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/main.pony
@@ -243,7 +242,6 @@ lib/pony/%%VERSION%%/packages/time/timers.pony
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifdef/ifdef.pony
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lambda/lambda.pony
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mailbox/main.pony
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/main.pony
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mandelbrot/mandelbrot.pony
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/message-ubench/main.pony
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixed/main.pony

mail/anubis/files/patch-src_Makefile.am

@@ -0,0 +1,23 @@
+--- src/Makefile.am.orig	2014-05-16 04:19:46 UTC
++++ src/Makefile.am
+@@ -25,7 +25,7 @@ bin_PROGRAMS = @ANUBIS_BIN_ADM@
+ EXTRA_PROGRAMS = $(adm_bin_programs) $(adm_sbin_programs)
+ 
+ noinst_LIBRARIES = libanubisdb.a
+-anubis_LDADD = ./libanubisdb.a $(top_builddir)/lib/libanubis.a\
++anubis_LDADD = libanubisdb.a $(top_builddir)/lib/libanubis.a\
+  @LIBINTL@ $(GUILE_LIBS) @LIBGNUTLS_LIBS@ @GSASL_LIBS@ 
+ 
+ anubis_SOURCES = \
+@@ -65,9 +65,9 @@ anubis_SOURCES = \
+  xdatabase.c 
+ 
+ anubisadm_SOURCES = anubisadm.c anubisadm.h adm.c
+-anubisadm_LDADD = ./libanubisdb.a $(top_builddir)/lib/libanubis.a @LIBINTL@
++anubisadm_LDADD = libanubisdb.a $(top_builddir)/lib/libanubis.a @LIBINTL@
+ anubisusr_SOURCES = anubisusr.c anubisusr.h usr.c
+-anubisusr_LDADD = ./libanubisdb.a $(top_builddir)/lib/libanubis.a @LIBINTL@ @LIBGNUTLS_LIBS@ @GSASL_LIBS@ 
++anubisusr_LDADD = libanubisdb.a $(top_builddir)/lib/libanubis.a @LIBINTL@ @LIBGNUTLS_LIBS@ @GSASL_LIBS@ 
+ 
+ if TLS_COND
+  TLS_C=tls.c

mail/p5-Mail-Cache/Makefile

@@ -12,6 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Caches mail information
 
+DEPRECATED=	Unmaintained
+EXPIRATION_DATE=	2018-07-15
+
 BUILD_DEPENDS=	p5-File-BaseDir>=0:devel/p5-File-BaseDir \
 		p5-Email-Simple>=0:mail/p5-Email-Simple
 

mail/p5-Mail-IMAPTalk-MailCache/Makefile

@@ -12,6 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Caches mail information for Mail::IMAPTalk using Mail::Cache
 
+DEPRECATED=	Unmaintained
+EXPIRATION_DATE=	2018-07-15
+
 BUILD_DEPENDS=	p5-Mail-Cache>=0:mail/p5-Mail-Cache \
 		p5-Mail-IMAPTalk>=0:mail/p5-Mail-IMAPTalk
 

mail/p5-ZConf-Mail/Makefile

@@ -12,6 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Misc mail client functions backed by ZConf
 
+DEPRECATED=	Unmaintained
+EXPIRATION_DATE=	2018-07-15
+
 BUILD_DEPENDS=	p5-Config-Tiny>=0:devel/p5-Config-Tiny \
 		p5-Email-Date>=0:mail/p5-Email-Date \
 		p5-Email-Simple>=0:mail/p5-Email-Simple \

math/givaro/Makefile

@@ -15,7 +15,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
-USES=		autoreconf compiler:c++11-lang libtool pathfix pkgconfig
+USES=		autoreconf compiler:c++11-lang gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gmp="${LOCALBASE}"
 USE_LDCONFIG=	yes

math/mosesdecoder/Makefile

@@ -26,7 +26,6 @@ SHEBANG_FILES=	scripts/analysis/extract-target-trees.py \
 		scripts/training/flexibility_score.py \
 		scripts/training/filter-rule-table.py \
 		scripts/training/create_count_tables.py
-python_OLD_CMD=	"/usr/bin/env python"
 
 MAKE_ENV+=	BOOST_BUILD_PATH=${WRKSRC}/jam-files/boost-build
 

math/py-pandas-datareader/Makefile

@@ -1,10 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	pandas-datareader
-DISTVERSION=	0.6.0
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.6.0-30 # dev version because of this fix: https://github.com/pydata/pandas-datareader/pull/520
+DISTVERSIONSUFFIX=	-g3c17058
 CATEGORIES=	math finance python
-MASTER_SITES=	CHEESESHOP
+#MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	FreeBSD@Shaneware.biz
@@ -22,6 +23,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python
+USE_GITHUB=	yes # github only for the dev version
+GH_ACCOUNT=	pydata
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 

math/py-pandas-datareader/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1519808941
-SHA256 (pandas-datareader-0.6.0.tar.gz) = 47681336a3f6e6953b024bd73f8bb005f36e8df831ccce336e9fc601c587e3db
-SIZE (pandas-datareader-0.6.0.tar.gz) = 175013
+TIMESTAMP = 1529029463
+SHA256 (pydata-pandas-datareader-v0.6.0-30-g3c17058_GH0.tar.gz) = 0f1609e1c537d5a36ccad93ece61bee62b3fffefce3f41d90374e0779fbed787
+SIZE (pydata-pandas-datareader-v0.6.0-30-g3c17058_GH0.tar.gz) = 344102

misc/Makefile

@@ -410,6 +410,7 @@
     SUBDIR += py-glance
     SUBDIR += py-orange3-datafusion
     SUBDIR += py-orange3-educational
+    SUBDIR += py-orange3-network
     SUBDIR += py-orange3-timeseries
     SUBDIR += py-osd
     SUBDIR += py-palettable

misc/py-orange3-network/Makefile

@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+PORTNAME=	orange3-network
+DISTVERSION=	1.3.2
+CATEGORIES=	misc python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Network analysis add-on for Orange data mining suite
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	${PYNUMPY}
+RUN_DEPENDS=	orange3>0:misc/orange3 \
+		${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyqtgraph>0:graphics/py-pyqtgraph@${FLAVOR}
+
+USES=		python:3.4+
+USE_GITHUB=	yes
+GH_ACCOUNT=	biolab
+USE_PYTHON=	distutils autoplist
+
+.include <bsd.port.mk>

misc/py-orange3-network/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1529030727
+SHA256 (biolab-orange3-network-1.3.2_GH0.tar.gz) = 5900335c7e3f3e87412f6e86d290ad0badda01b84fca5f8a6d77713249f8df13
+SIZE (biolab-orange3-network-1.3.2_GH0.tar.gz) = 2135574

misc/py-orange3-network/pkg-descr

@@ -0,0 +1,4 @@
+Orange3-Network is an add-on for Orange data mining software package.
+It provides network visualization and network analysis tools.
+
+WWW: https://github.com/biolab/orange3-network

multimedia/kvazaar/Makefile

@@ -6,13 +6,14 @@ DISTVERSION?=	1.2.0
 PORTREVISION?=	0
 CATEGORIES=	multimedia
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	4b5d95155526.patch:-p1
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	H.265/HEVC encoder implemented in C
 
 LICENSE=	LGPL21+
 
-BROKEN_powerpc64=	fails to compile: strategyselector.c:377:26: linux/auxvec.h: No such file or directory
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	ultravideo
 GH_TUPLE=	silentbicycle:greatest:v1.0.0:greatest/greatest

multimedia/kvazaar/distinfo

@@ -3,3 +3,5 @@ SHA256 (ultravideo-kvazaar-v1.2.0_GH0.tar.gz) = 480ecfd9b4d2b7d21b355e4a35fcf47b
 SIZE (ultravideo-kvazaar-v1.2.0_GH0.tar.gz) = 486455
 SHA256 (silentbicycle-greatest-v1.0.0_GH0.tar.gz) = 18ee57a34869c6f6ce511cd71a5cc8661801cf69d64c4c66ff76773835df659b
 SIZE (silentbicycle-greatest-v1.0.0_GH0.tar.gz) = 11959
+SHA256 (4b5d95155526.patch) = d8c6c3c49798fe316b6d74ba6c6229acb6cab8aa9ea874ab593fdde2f7b53cc1
+SIZE (4b5d95155526.patch) = 1392

net-im/matterircd/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	matterircd
-PORTVERSION=	0.17.3
+PORTVERSION=	0.18.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-im irc
 

net-im/matterircd/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1525640698
-SHA256 (42wim-matterircd-v0.17.3_GH0.tar.gz) = 71ea4dab3e64c4779fb5910323a16ab9fbe8b85a32c60873f3bc5eda42f0adba
-SIZE (42wim-matterircd-v0.17.3_GH0.tar.gz) = 1600527
+TIMESTAMP = 1528792331
+SHA256 (42wim-matterircd-v0.18.0_GH0.tar.gz) = b71a27f24dfdca68a442477d4fdaaf95e1d22eff8e26748c1712b220fb364264
+SIZE (42wim-matterircd-v0.18.0_GH0.tar.gz) = 1605286

net-mgmt/riemann-c-client/Makefile

@@ -28,8 +28,6 @@ TEST_TARGET=	check
 USE_GITHUB=	yes
 GH_ACCOUNT=	algernon
 
-MAKE_JOBS_UNSAFE=	yes
-
 post-patch:
 	@${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/Makefile.am