*/*: sync with upstream

Taken from: HardenedBSD

archivers/kf5-karchive/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1559457447
-SHA256 (KDE/frameworks/5.59.0/karchive-5.59.0.tar.xz) = d95623a2cc024965d135a09e4bd1d860cef33e11db41b0ef3110548fa5d63523
-SIZE (KDE/frameworks/5.59.0/karchive-5.59.0.tar.xz) = 458364
+TIMESTAMP = 1562535565
+SHA256 (KDE/frameworks/5.60.0/karchive-5.60.0.tar.xz) = 4e3d2a6ba551c6ada44a6517150e031df92691919119bc3b5eb4efc741ff7564
+SIZE (KDE/frameworks/5.60.0/karchive-5.60.0.tar.xz) = 459208

archivers/kf5-karchive/pkg-plist

@@ -1,4 +1,3 @@
-etc/xdg/karchive.categories
 include/KF5/KArchive/K7Zip
 include/KF5/KArchive/KAr
 include/KF5/KArchive/KArchive
@@ -35,3 +34,4 @@ lib/libKF5Archive.so
 lib/libKF5Archive.so.5
 lib/libKF5Archive.so.%%KDE_FRAMEWORKS_VERSION%%
 %%QT_MKSPECDIR%%/modules/qt_KArchive.pri
+share/qlogging-categories5/karchive.categories

astro/py-astropy/Makefile

@@ -13,6 +13,7 @@ MAINTAINER=	[email protected]
 COMMENT=	Community-developed python astronomy tools
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/licenses/LICENSE.rst
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}

astro/py-astropy/pkg-descr

@@ -3,4 +3,4 @@ tools needed for performing astronomy and astrophysics research with Python. It
 also provides an index for other astronomy packages and tools for managing
 them.
 
-WWW: http://www.astropy.org
+WWW: https://www.astropy.org/

audio/Makefile

@@ -793,6 +793,7 @@
     SUBDIR += stk
     SUBDIR += streamripper
     SUBDIR += streamtranscoder
+    SUBDIR += string-machine-lv2
     SUBDIR += stymulator
     SUBDIR += suil
     SUBDIR += supercollider

audio/drumgizmo/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	drumgizmo
-PORTVERSION=	0.9.16
-PORTREVISION=	1
+PORTVERSION=	0.9.17
 CATEGORIES=	audio
 MASTER_SITES=	http://www.drumgizmo.org/releases/${PORTNAME}-${PORTVERSION}/
 
@@ -25,7 +24,7 @@ USES=		compiler:c++11-lang gettext-runtime gnome libtool pkgconfig
 USE_GNOME=	glib20
 USE_XORG=	x11 xext
 
-CPPFLAGS+=	-I../include -I../../include -I../src -I../../src
+CPPFLAGS+=	-I../include -I../../include -I../src -I../../src -I${LOCALBASE}/include
 
 CONFIGURE_ENV=	EXPAT_CFLAGS=-isystem${LOCALBASE}/include EXPAT_LDFLAGS=-L${LOCALBASE}/lib \
 		ZITA_CPPFLAGS=-isystem${LOCALBASE}/include ZITA_LDFLAGS=-L${LOCALBASE}/lib

audio/drumgizmo/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1534090125
-SHA256 (drumgizmo-0.9.16.tar.gz) = 8f76b58785186ac02337b9248003ec1a459a801d3003619fd32fde976c307947
-SIZE (drumgizmo-0.9.16.tar.gz) = 903112
+TIMESTAMP = 1563296892
+SHA256 (drumgizmo-0.9.17.tar.gz) = a1a31b2af5544e39e8e19c370fa6fee0a372a14fffa762d4d12debf4e711ec9c
+SIZE (drumgizmo-0.9.17.tar.gz) = 1008799

audio/drumgizmo/files/patch-drumgizmo_input_ossmidi.cc

@@ -1,4 +1,4 @@
---- drumgizmo/input/ossmidi.cc.orig	2018-10-06 16:29:02 UTC
+--- drumgizmo/input/ossmidi.cc.orig	2019-05-08 15:53:39 UTC
 +++ drumgizmo/input/ossmidi.cc
 @@ -30,6 +30,7 @@
  #include <stdlib.h>
@@ -7,4 +7,4 @@
 +#include <cstring>
 
 
- static int const NOTE_ON = 0x90;
+ OSSInputEngine::OSSInputEngine()

audio/drumgizmo/files/patch-drumgizmo_output_oss.cc

@@ -1,10 +1,10 @@
---- drumgizmo/output/oss.cc.orig	2018-10-06 16:27:27 UTC
+--- drumgizmo/output/oss.cc.orig	2019-06-16 08:27:26 UTC
 +++ drumgizmo/output/oss.cc
 @@ -30,6 +30,7 @@
  #include <stdlib.h>
  #include <unistd.h>
  #include <iostream>
 +#include <cstring>
 
+ #include <config.h>
 
- OSSOutputEngine::OSSOutputEngine()

audio/drumgizmo/pkg-plist

@@ -1,7 +1,9 @@
 bin/dgreftest
+bin/dgvalidator
 bin/drumgizmo
 lib/lv2/drumgizmo.lv2/drumgizmo.so
-lib/lv2/drumgizmo.lv2/drumgizmo.ttl
 lib/lv2/drumgizmo.lv2/manifest.ttl
+man/man1/dgvalidator.1.gz
+man/man1/dgvalidator.fr.1.gz
 man/man1/drumgizmo.1.gz
 man/man1/drumgizmo.fr.1.gz

audio/string-machine-lv2/Makefile

@@ -0,0 +1,42 @@
+# $FreeBSD$
+
+PORTNAME=	string-machine
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.1.0
+CATEGORIES=	audio
+PKGNAMESUFFIX=	-lv2
+
+MAINTAINER=	[email protected]
+COMMENT=	Digital model of electronic string ensemble instrument
+
+LICENSE=	BSL
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	lv2>0:audio/lv2 \
+		${LOCALBASE}/include/boost/intrusive/list.hpp:devel/boost-libs
+
+USES=		gmake gnome localbase pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	jpcima
+GH_TUPLE=	DISTRHO:DPF:7a056bb:d/dpf
+USE_GNOME=	cairo
+USE_XORG=	x11
+
+CFLAGS+=	-I${FILESDIR} -pthread
+
+PLIST_FILES=	lib/lv2/string-machine.lv2/manifest.ttl \
+		lib/lv2/string-machine.lv2/presets.ttl \
+		lib/lv2/string-machine.lv2/string-machine.so \
+		lib/lv2/string-machine.lv2/string-machine.ttl \
+		lib/vst/string-machine-vst.so
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/lv2/${PORTNAME}.lv2
+	${INSTALL_LIB} ${WRKSRC}/bin/${PORTNAME}.lv2/string-machine.so ${STAGEDIR}${PREFIX}/lib/lv2/${PORTNAME}.lv2
+.for f in manifest.ttl presets.ttl string-machine.ttl
+	${INSTALL_DATA} ${WRKSRC}/bin/${PORTNAME}.lv2/${f} ${STAGEDIR}${PREFIX}/lib/lv2/${PORTNAME}.lv2
+.endfor
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vst
+	${INSTALL_LIB} ${WRKSRC}/bin/string-machine-vst.so ${STAGEDIR}${PREFIX}/lib/vst
+
+.include <bsd.port.mk>

audio/string-machine-lv2/distinfo

@@ -0,0 +1,5 @@
+TIMESTAMP = 1563296073
+SHA256 (jpcima-string-machine-v0.1.0_GH0.tar.gz) = 014a5ebff097906582c3d7de6533065ead9fcef3dde4e4aff7b3d16525082510
+SIZE (jpcima-string-machine-v0.1.0_GH0.tar.gz) = 219821
+SHA256 (DISTRHO-DPF-7a056bb_GH0.tar.gz) = e9c1bcbd364cd31ddf19c51d6100dbd2996e93b72f0ec626fefddb4197429e4a
+SIZE (DISTRHO-DPF-7a056bb_GH0.tar.gz) = 1630863

audio/string-machine-lv2/files/mntent.h

@@ -0,0 +1,35 @@
+#ifdef HAVE_MNTENT_H
+#include <mntent.h>
+#else
+
+#ifndef mntent_h_
+#define mntent_h_
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/param.h>
+#include <sys/ucred.h>
+#include <sys/mount.h>
+
+#define MOUNTED "mounted"
+#define MNTTYPE_NFS "nfs"
+
+//#define MOPTSLEN (256 - (MNAMELEN * 2 + MFSNAMELEN + 2 * sizeof(int)))
+
+struct mntent {
+	char *mnt_fsname;   /* file system name */
+	char *mnt_dir; /* file system path prefix */
+	char *mnt_type;	   /* dbg, efs,	nfs */
+	char *mnt_opts;	   /* ro, hide,	etc. */
+	int  mnt_freq; /* dump frequency, in days */
+	int  mnt_passno;	   /* pass number on parallel fsck */
+};
+
+FILE * setmntent(char * filep, char * type);
+struct mntent *getmntent(FILE * filep);
+//char * hasmntopt(struct mntent * mnt, char * opt);
+int endmntent(FILE * filep);
+
+#endif /* mntent_h_ */
+#endif /* not HAVE_MNTENT_H */

audio/string-machine-lv2/files/patch-dpf_utils_generate-ttl.sh

@@ -0,0 +1,8 @@
+--- dpf/utils/generate-ttl.sh.orig	2019-07-16 23:38:05 UTC
++++ dpf/utils/generate-ttl.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ set -e
+

audio/string-machine-lv2/pkg-descr

@@ -0,0 +1,5 @@
+String-machine is a virtual-analog string ensemble synthesizer.
+
+This implementation is based on a digital model designed by Peter Whiting.
+
+WWW: https://github.com/jpcima/string-machine

benchmarks/super-smack/Makefile

@@ -25,6 +25,7 @@ OPTIONS_MULTI_DB=	MYSQL PGSQL
 OPTIONS_DEFAULT=	MYSQL
 
 MYSQL_USE=		MYSQL=yes
+MYSQL_USES=		compiler:c++11-lang
 MYSQL_CONFIGURE_ON=	--with-mysql \
 			--with-mysql-include=${LOCALBASE}/include/mysql \
 			--with-mysql-lib=${LOCALBASE}/lib/mysql

comms/xastir/Makefile

@@ -3,8 +3,7 @@
 
 PORTNAME=	xastir
 DISTVERSIONPREFIX=	Release-
-DISTVERSION=	2.1.0
-PORTREVISION=	4
+DISTVERSION=	2.1.4
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	[email protected]
@@ -13,8 +12,6 @@ COMMENT=	X Amateur Station Tracking and Information Reporting
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		magick/image-private.h: No such file or directory
-
 BUILD_DEPENDS=	xfontsel:x11-fonts/xfontsel
 RUN_DEPENDS=	wget:ftp/wget
 LIB_DEPENDS=	libtiff.so:graphics/tiff \
@@ -25,14 +22,14 @@ LIB_DEPENDS=	libtiff.so:graphics/tiff \
 		liblcms2.so:graphics/lcms2 \
 		libfreetype.so:print/freetype2 \
 		libjasper.so:graphics/jasper \
-		libwmflite.so:graphics/libwmf
+		libwmflite.so:graphics/libwmf \
+		libshp.so:devel/shapelib
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake jpeg motif python:run shebangfix
-USE_GCC=	yes
 USE_XORG=	x11 xt xext sm ice
 USE_GNOME+=	libxml2
-SHEBANG_FILES=	scripts/gpx2shape scripts/values.pl.in
+SHEBANG_FILES=	scripts/gpx2shape
 SHEBANG_REGEX=	./scripts/.*\.(sh|pl|py)
 
 USE_GITHUB=	yes
@@ -41,31 +38,27 @@ GH_PROJECT=	Xastir
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	DAVIS SHAPELIB DBFAWK MAGICK CURL GEOTIFF GDAL GPSMAN FESTIVAL \
+OPTIONS_DEFINE=	DAVIS DBFAWK MAGICK CURL GEOTIFF GPSMAN FESTIVAL \
 		RTREE ERRORPOP BDB
 
 DAVIS_DESC=	Include Davis Weatherstation Support
-SHAPELIB_DESC=	Include Shapelib support
 DBFAWK_DESC=	Include DBFAWK Support
 MAGICK_DESC=	Include GraphicsMagick Support
 CURL_DESC=	Include CURL Internet Image support
 GEOTIFF_DESC=	Include GeoTIFF Support
-GDAL_DESC=	Include GDAL Support
 GPSMAN_DESC=	Include GPSMAN Support
 FESTIVAL_DESC=	Include Festival Voice Synthesis Support
 RTREE_DESC=	Enable spatial indexing of shapefiles
 ERRORPOP_DESC=	Send error popups to stderr
 BDB_DESC=	Tiger Map Caching using Berkeley DB
 
-OPTIONS_DEFAULT=	SHAPELIB DBFAWK MAGICK CURL RTREE BDB
+OPTIONS_DEFAULT=	DBFAWK MAGICK CURL RTREE BDB
 
 DAVIS_CONFIGURE_ON=	--enable-davis
 
-SHAPELIB_LIB_DEPENDS=	libshp.so:devel/shapelib
-SHAPELIB_CONFIGURE_WITH=	shapelib
-
 MAGICK_LIB_DEPENDS=	libGraphicsMagickWand.so:graphics/GraphicsMagick
-MAGICK_CONFIGURE_WITH=	imagemagick graphicsmagick
+MAGICK_CONFIGURE_WITH=	graphicsmagick
+MAGICK_USES=		compiler:gcc-c++11-lib
 
 DBFAWK_LIB_DEPENDS=	libpcre.so:devel/pcre
 DBFAWK_CONFIGURE_WITH=	dbfawk
@@ -74,9 +67,6 @@ CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GEOTIFF_LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff
 
-GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
-GDAL_CONFIGURE_WITH=	gdal
-
 GPSMAN_BUILD_DEPENDS=	${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:graphics/gpsmanshp
 GPSMAN_IMPLIES=		SHAPELIB
 GPSMAN_CONFIGURE_WITH=	gpsman

comms/xastir/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1519518726
-SHA256 (Xastir-Xastir-Release-2.1.0_GH0.tar.gz) = a481e6a6c035954041904352ec58f52240c06874a30dfb810001da489d40f43a
-SIZE (Xastir-Xastir-Release-2.1.0_GH0.tar.gz) = 2996246
+TIMESTAMP = 1563174412
+SHA256 (Xastir-Xastir-Release-2.1.4_GH0.tar.gz) = 0bd3768440422a666e1c4c532df0184374244b77ae6650e6690715a0ca1fe7bc
+SIZE (Xastir-Xastir-Release-2.1.4_GH0.tar.gz) = 2694124

comms/xastir/pkg-plist

@@ -64,6 +64,7 @@ man/man1/xastir_udp_client.1.gz
 %%DATADIR%%/config/nwsc_ddmmyy_13.dbfawk
 %%DATADIR%%/config/nwsc_ddmmyy_15.dbfawk
 %%DATADIR%%/config/nwshzddmmyy.dbfawk
+%%DATADIR%%/config/nwshzddmmyy_old14.dbfawk
 %%DATADIR%%/config/nwsmzddmmyy.dbfawk
 %%DATADIR%%/config/nwsmzddmmyy_09.dbfawk
 %%DATADIR%%/config/nwsmzddmmyy_11.dbfawk
@@ -74,6 +75,7 @@ man/man1/xastir_udp_client.1.gz
 %%DATADIR%%/config/nwsozddmmyy.dbfawk
 %%DATADIR%%/config/nwsozddmmyy_09.dbfawk
 %%DATADIR%%/config/nwsozddmmyy_14.dbfawk
+%%DATADIR%%/config/nwsozddmmyy_14b.dbfawk
 %%DATADIR%%/config/nwsw_ddjn12.dbfawk
 %%DATADIR%%/config/nwsw_ddmmyy.dbfawk
 %%DATADIR%%/config/nwsw_ddmmyy_09.dbfawk
@@ -151,17 +153,17 @@ man/man1/xastir_udp_client.1.gz
 %%DATADIR%%/maps/Online/OSM_tiled_cycle.geo
 %%DATADIR%%/maps/Online/OSM_tiled_fosm.geo
 %%DATADIR%%/maps/Online/OSM_tiled_mapnik.geo
+%%DATADIR%%/maps/Online/USTigermap.geo
+%%DATADIR%%/maps/Online/USTigermapBorders.geo
 %%DATADIR%%/maps/Online/geogratis.gc.ca/National.geo
 %%DATADIR%%/maps/Online/geogratis.gc.ca/Regional.geo
 %%DATADIR%%/maps/Online/geogratis.gc.ca/Sub_national.geo
 %%DATADIR%%/maps/Online/geogratis.gc.ca/Sub_regional.geo
-%%DATADIR%%/maps/Online/nationalmap.gov/Aerial.geo
-%%DATADIR%%/maps/Online/nationalmap.gov/Contours.geo
-%%DATADIR%%/maps/Online/nationalmap.gov/Hydrography.geo
-%%DATADIR%%/maps/Online/nationalmap.gov/ShadedRelief.geo
-%%DATADIR%%/maps/Online/nationalmap.gov/Topo1-10.geo
-%%DATADIR%%/maps/Online/nationalmap.gov/TopoRelief1-7.geo
-%%DATADIR%%/maps/Online/nationalmap.gov/Transportation.geo
+%%DATADIR%%/maps/Online/nationalmap.gov/WMS_USGS_Hydrography.geo
+%%DATADIR%%/maps/Online/nationalmap.gov/WMS_USGS_ImageryOnly.geo
+%%DATADIR%%/maps/Online/nationalmap.gov/WMS_USGS_ImageryTopo.geo
+%%DATADIR%%/maps/Online/nationalmap.gov/WMS_USGS_ShadedReliefOnly.geo
+%%DATADIR%%/maps/Online/nationalmap.gov/WMS_USGS_Topo.geo
 %%DATADIR%%/maps/worldhi.map
 %%DATADIR%%/scripts/Coordinate.pm
 %%DATADIR%%/scripts/Xastir_tigerpoly.py
@@ -200,13 +202,9 @@ man/man1/xastir_udp_client.1.gz
 %%DATADIR%%/scripts/toporama50k.pl
 %%DATADIR%%/scripts/track-get.pl
 %%DATADIR%%/scripts/update_langfile.pl
-%%DATADIR%%/scripts/values
-%%DATADIR%%/scripts/values.pl
 %%DATADIR%%/scripts/waypoint-get.pl
 %%DATADIR%%/scripts/wms.pl
 %%DATADIR%%/scripts/wxnowsrv.pl
-%%DATADIR%%/scripts/xastir-fixcfg.sh
-%%DATADIR%%/scripts/xastir-migrate.sh
 %%DATADIR%%/sounds/placeholder
 %%DATADIR%%/symbols/13pct.xbm
 %%DATADIR%%/symbols/25pct.xbm

databases/hbase/Makefile

@@ -55,7 +55,7 @@ PLIST_SUB=	HBASE_USER=${HBASE_USER} \
 
 .include <bsd.port.pre.mk>
 
-.if ${JAVA_PORT_VERSION:M1.8.*}
+.if ${JAVA_PORT_VERSION:M*8*}
 JDK18_PROFILE=	,build-with-jdk8
 JDK18_SOURCE=	-DcompileSource=1.8
 .endif

databases/mysql-connector-java51/Makefile

@@ -47,7 +47,7 @@ do-build:
 	@${DO_NADA}
 
 do-build-DOCS-on:
-.if ${JAVA_PORT_VERSION:M1.8.*}
+.if ${JAVA_PORT_VERSION:M*8*}
 	@${ECHO_MSG} "NOTE>>> Generating javadoc is broken with JDK 1.8+"
 .else
 	@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR};               \
@@ -67,7 +67,7 @@ do-install-DOCS-on:
 	@for extradoc in ${EXTRADOCS} ; do                          \
 	  ${INSTALL_DATA} ${INSTALL_WRKSRC}/$$extradoc ${STAGEDIR}${DOCSDIR} ; \
 	done
-.if ${JAVA_PORT_VERSION:N1.8.*}
+.if ${JAVA_PORT_VERSION:N*8*}
 	@${MKDIR} ${STAGEDIR}${APIDOCSDIR}
 	@cd ${JAVADOCDIR} && ${COPYTREE_SHARE} . ${APIDOCSDIR}
 .endif

databases/mysql-connector-odbc/Makefile

@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
-USES=		cmake mysql
+USES=		cmake compiler:c++11-lang mysql
 
 CMAKE_ARGS=	-DWITH_UNIXODBC=1 -DDISABLE_GUI=1
 USE_LDCONFIG=	yes

deskutils/Makefile

@@ -27,6 +27,7 @@
     SUBDIR += calcurse
     SUBDIR += calibre
     SUBDIR += cartotheque
+    SUBDIR += cfiles
     SUBDIR += charmtimetracker
     SUBDIR += chart
     SUBDIR += cherrytree