*/*: sync with upstream

Taken from: HardenedBSD

astro/marble/Makefile

@@ -37,7 +37,7 @@ OPTIONS_SUB=	yes
 
 GPS_DESC=		Support for GPS position provider
 GPS_LIB_DEPENDS=	libgps.so:astro/gpsd
-GPS_CMAKE_BOOL_ON=		WITH_libgps
+GPS_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_libgps
 
 WEBENGINE_DESC=		Add dependency on qt5-webengine
 WEBENGINE_USE=		QT=webengine

audio/abcde/Makefile

@@ -40,7 +40,7 @@ FLAC_RUN_DEPENDS=	flac:audio/flac
 MPP_RUN_DEPENDS=	mpcenc:audio/musepack
 MUSICBRAINZ_DESC=	Enable MusicBrainz DiscID support
 MUSICBRAINZ_USES=	perl5
-MUSICBRAINZ_USE_PERL5=	run
+MUSICBRAINZ_USE=	PERL5=run
 MUSICBRAINZ_RUN_DEPENDS=	\
 		p5-MusicBrainz-DiscID>=0:audio/p5-MusicBrainz-DiscID \
 		p5-WebService-MusicBrainz>=1:www/p5-WebService-MusicBrainz

audio/abcde/files/pkg-message.in

@@ -1,7 +1,8 @@
-******************************************************************
+[
+{ type: install
+  message: <<EOD
 Please copy %%PREFIX%%/etc/abcde.conf.sample to ~/.abcde.conf and
 edit as necessary. Sane defaults have been set.
-
-NOTE: If you have been using abcde-2.1.4 or older, you must start
-with a fresh ~/.abcde.conf.
-******************************************************************
+EOD
+}
+]

audio/bsequencer-lv2/Makefile

@@ -2,8 +2,8 @@
 
 PORTNAME=	bsequencer
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3-16
-DISTVERSIONSUFFIX=	-g49dc212
+DISTVERSION=	0.3-17
+DISTVERSIONSUFFIX=	-g265b06c
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 
@@ -19,7 +19,6 @@ USES=		gmake gnome pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	sjaehn
 GH_PROJECT=	BSEQuencer
-USE_GCC=	any # see https://github.com/sjaehn/BSEQuencer/issues/7
 USE_GNOME=	cairo
 USE_XORG=	x11
 

audio/bsequencer-lv2/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1562728215
-SHA256 (sjaehn-BSEQuencer-v0.3-16-g49dc212_GH0.tar.gz) = 19dc26dd3d9cdeedb95ecfe212827a53d03033092d2ede03cc955ef3fdc93ba2
-SIZE (sjaehn-BSEQuencer-v0.3-16-g49dc212_GH0.tar.gz) = 1140966
+TIMESTAMP = 1563133017
+SHA256 (sjaehn-BSEQuencer-v0.3-17-g265b06c_GH0.tar.gz) = 53a3882a2b7c0b28f2bbc24c662379121f764f598a2423bd731a87033581ac14
+SIZE (sjaehn-BSEQuencer-v0.3-17-g265b06c_GH0.tar.gz) = 1142523

audio/cadence/Makefile

@@ -39,8 +39,9 @@ post-patch:
 		cadence cadence-aloop-daemon cadence-jacksettings cadence-logs \
 		cadence-pulse2jack cadence-pulse2loopback cadence-render \
 		cadence-session-start catarina catia claudia claudia-launcher
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
-	${REINPLACE_CMD} -e 's|-mtune=generic -msse -mfpmath=sse||' ${WRKSRC}/c++/Makefile.mk
+	${REINPLACE_CMD} -e 's|-mtune=generic||' ${WRKSRC}/c++/Makefile.mk
+.if ! ${ARCH} == amd64 && ! ${ARCH} == i386
+	${REINPLACE_CMD} -e 's|-msse -mfpmath=sse||' ${WRKSRC}/c++/Makefile.mk
 .endif
 
 .include <bsd.port.post.mk>

audio/gsequencer/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gsequencer
-DISTVERSION=	2.2.17
+DISTVERSION=	2.2.19
 CATEGORIES=	audio
 MASTER_SITES=	SAVANNAH/gsequencer/${DISTVERSION:R}.x
 

audio/gsequencer/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1562746736
-SHA256 (gsequencer-2.2.17.tar.gz) = ae65942b9d08ead94b015ac8e61882081653f53e73ac1dc19e6599b67150412c
-SIZE (gsequencer-2.2.17.tar.gz) = 5219839
+TIMESTAMP = 1562998031
+SHA256 (gsequencer-2.2.19.tar.gz) = 6360b8bebbbd1867c50d1f89bab6f6a8aa0ac6001602e0e09e2d35607f8ffa92
+SIZE (gsequencer-2.2.19.tar.gz) = 5228984

audio/qjackctl/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	qjackctl
 DISTVERSIONPREFIX=	qjackctl_
-DISTVERSION=	0_5_8
+DISTVERSION=	0_5_9
 CATEGORIES=	audio
 
 MAINTAINER=	[email protected]
@@ -22,6 +22,8 @@ USE_QT=		core gui network widgets x11extras xml buildtools_build linguisttools_b
 USE_GL=		gl
 USE_CXXSTD=	c++11
 
+BINARY_ALIAS=	qmake=${QMAKE}
+
 OPTIONS_DEFINE=		DBUS SYSTRAY XUNIQUE
 OPTIONS_DEFAULT=	DBUS SYSTRAY XUNIQUE
 OPTIONS_GROUP=		AIFACE

audio/qjackctl/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1558802963
-SHA256 (rncbc-qjackctl-qjackctl_0_5_8_GH0.tar.gz) = 13eb3daebd3c20cedcec9cca990b462eb7966300d417e7cad3eab2f994cee609
-SIZE (rncbc-qjackctl-qjackctl_0_5_8_GH0.tar.gz) = 859341
+TIMESTAMP = 1563007422
+SHA256 (rncbc-qjackctl-qjackctl_0_5_9_GH0.tar.gz) = e8cdbb5dc12a8920d15b778fa8a685bee88eca07b5535ccd341f45562e94a321
+SIZE (rncbc-qjackctl-qjackctl_0_5_9_GH0.tar.gz) = 859064

audio/qjackctl/files/patch-src_qjackctl.cpp

@@ -1,17 +1,6 @@
---- src/qjackctl.cpp.orig	2016-04-05 15:57:30 UTC
+--- src/qjackctl.cpp.orig	2019-07-12 10:07:12 UTC
 +++ src/qjackctl.cpp
-@@ -30,6 +30,10 @@
-
- #include <QSessionManager>
-
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
- #if QT_VERSION < 0x040500
- namespace Qt {
- const WindowFlags WindowCloseButtonHint = WindowFlags(0x08000000);
-@@ -218,7 +222,7 @@ public:
+@@ -190,7 +190,7 @@ bool qjackctlApplication::setup ( const QString& sServ
  			sUnique += sServerName;
  		}
  		char szHostName[255];

audio/qmidictl/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmidictl
-DISTVERSION=	0.5.4
+DISTVERSION=	0.5.5
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -16,4 +16,6 @@ GNU_CONFIGURE=	yes
 USE_QT=		core gui widgets qmake_build buildtools_build
 USE_GL=		gl
 
+BINARY_ALIAS=	qmake=${QMAKE}
+
 .include <bsd.port.mk>

audio/qmidictl/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1555167452
-SHA256 (qmidictl-0.5.4.tar.gz) = 532babf7f3bc8b60579b53e61e710b6e9f442c87aa470ded56cd74be85a84963
-SIZE (qmidictl-0.5.4.tar.gz) = 195298
+TIMESTAMP = 1562998649
+SHA256 (qmidictl-0.5.5.tar.gz) = 8b296042b5faf7ca636850303fbd52b1622cd5380d757170aeda9f866e3dd2c5
+SIZE (qmidictl-0.5.5.tar.gz) = 197103

audio/qsynth/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qsynth
-PORTVERSION=	0.5.6
+PORTVERSION=	0.5.7
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -20,13 +20,13 @@ USE_QT=		core gui network widgets x11extras buildtools_build \
 		linguisttools_build qmake_build
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--localedir=${DATADIR} \
+		--with-fluidsynth=${LOCALBASE}
 CONFIGURE_ENV=	ac_cv_path_ac_cv_qmake=${QMAKE} \
 		ac_cv_path_ac_lrelease=${LRELEASE} \
 		ac_cv_path_ac_lupdate=${LUPDATE} \
 		ac_cv_path_ac_moc=${MOC} \
 		ac_cv_path_ac_uic=${UIC}
-CONFIGURE_ARGS=	--localedir=${DATADIR} \
-		--with-fluidsynth=${LOCALBASE}
 
 # cf. PR 224488
 LDFLAGS+=	-Wl,--as-needed
@@ -40,8 +40,8 @@ XUNIQUE_DESC=		X11 unique/single instance
 
 GRADIENT_CONFIGURE_ENABLE=	gradient
 SYSTEM_TRAY_CONFIGURE_ENABLE=	system-tray
-XUNIQUE_CONFIGURE_ENABLE=	xunique
 XUNIQUE_USE=			XORG=x11
+XUNIQUE_CONFIGURE_ENABLE=	xunique
 
 post-patch:
 	@${REINPLACE_CMD} -e ' \

audio/qsynth/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1554981036
-SHA256 (qsynth-0.5.6.tar.gz) = a6eb404778fad87bb37fa1fb4caf1d80f24a324f9c3a22b669df2f8c94849040
-SIZE (qsynth-0.5.6.tar.gz) = 269583
+TIMESTAMP = 1562945333
+SHA256 (qsynth-0.5.7.tar.gz) = 86eef57606423f4a369d130c3e222d7f847ba1c57d2e7eefb4c0c8a7102735a2
+SIZE (qsynth-0.5.7.tar.gz) = 315715

audio/supercollider/Makefile

@@ -49,7 +49,7 @@ SUPERNOVA_CMAKE_BOOL=	SUPERNOVA
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
+.if ! ${ARCH} == amd64 && ! ${ARCH} == i386
 CMAKE_ARGS+=	-DSSE:BOOL=FALSE -DSSE2:BOOL=FALSE
 .endif
 

biology/ncbi-blast+/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	ncbi-blast+
 DISTVERSION=	2.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology perl5 python
 MASTER_SITES=	https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/LATEST/ \
 		https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${PORTVERSION}/

biology/ncbi-blast+/files/patch-src_objtools_blast_seqdb__reader_test_seqdb__perf.cpp

@@ -1,14 +1,16 @@
---- src/objtools/blast/seqdb_reader/test/seqdb_perf.cpp.orig	2019-07-10 10:11:51.713901000 -0500
-+++ src/objtools/blast/seqdb_reader/test/seqdb_perf.cpp	2019-07-10 10:15:40.994964000 -0500
-@@ -137,8 +137,10 @@ CSeqDBPerfApp::x_ScanDatabase()
+--- src/objtools/blast/seqdb_reader/test/seqdb_perf.cpp.orig	2018-10-23 19:28:52 UTC
++++ src/objtools/blast/seqdb_reader/test/seqdb_perf.cpp
+@@ -137,8 +137,13 @@ CSeqDBPerfApp::x_ScanDatabase()
      }
      LOG_POST(Info << "Will go over " << oids2iterate.size() << " sequences");
 
-+    // kScanUncompressed is read only and initialized before threading
-+    // so shared should be fine here
++#if defined(NCBI_COMPILER_GCC) && (NCBI_COMPILER_VERSION >= 900)
      #pragma omp parallel default(none) num_threads(m_DbHandles.size()) \
--                         shared(oids2iterate) if(m_DbHandles.size() > 1)
 +                         shared(oids2iterate,kScanUncompressed) if(m_DbHandles.size() > 1)
++#else
++    #pragma omp parallel default(none) num_threads(m_DbHandles.size()) \
+                          shared(oids2iterate) if(m_DbHandles.size() > 1)
++#endif
      {
          int thread_id = 0;
  #ifdef _OPENMP

cad/ldraw/Makefile

@@ -16,6 +16,8 @@ COMMENT=	LDraw-format CAD files representing many of LEGO bricks produced
 
 LICENSE=	CC-BY-2.0
 
+BROKEN=		unfetchable
+
 USES=		zip
 
 NO_BUILD=	yes

cad/openvsp/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	openvsp
 DISTVERSIONPREFIX=	${GH_PROJECT}_
-DISTVERSION=	3.17.0
+DISTVERSION=	3.17.1
 CATEGORIES=	cad
 
 MAINTAINER=	[email protected]

cad/openvsp/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1553966825
-SHA256 (OpenVSP-OpenVSP-OpenVSP_3.17.0_GH0.tar.gz) = ba34eb172d767503cf7e6434225a831662ab48c6a4707ed3fdc4af7ee4343646
-SIZE (OpenVSP-OpenVSP-OpenVSP_3.17.0_GH0.tar.gz) = 35052877
+TIMESTAMP = 1562687475
+SHA256 (OpenVSP-OpenVSP-OpenVSP_3.17.1_GH0.tar.gz) = f0468b22a577c636943a4c17e07ffa4ceb0817f59374be404b581da15bd841c4
+SIZE (OpenVSP-OpenVSP-OpenVSP_3.17.1_GH0.tar.gz) = 35748749

comms/chu/Makefile

@@ -9,7 +9,8 @@ MASTER_SITES=	SUNSITE/system/admin/time
 MAINTAINER=	[email protected]
 COMMENT=	Synchronise computer clock to CHU radio station
 
-LICENSE=	GPLv1
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 NO_WRKSUBDIR=	yes
 
@@ -25,11 +26,13 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/chu ${STAGEDIR}${PREFIX}/sbin
-	${MKDIR} ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/testsignal ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/chu.8 ${STAGEDIR}${PREFIX}/man/man8
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for d in COPYING TESTING chu.html chuman.html ntp.html
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for d in TESTING chu.html chuman.html ntp.html
 	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
 .endfor
 

comms/chu/files/patch-chu.c

@@ -1,5 +1,5 @@
---- chu.c.orig	1999-03-17 11:42:18.000000000 -0500
-+++ chu.c	2011-07-01 08:42:06.000000000 -0400
+--- chu.c.orig	1999-03-17 16:42:18 UTC
++++ chu.c
 @@ -20,15 +20,21 @@
  #include <stdlib.h>
  #include <string.h>
@@ -24,7 +24,7 @@
  #define SAMPLE_RATE 8000
  #define SAMPLES 512
  #define OVERLAP 50
-@@ -389,6 +395,21 @@
+@@ -389,6 +395,21 @@ void saveAdjTime()
    }
  }
 
@@ -46,7 +46,7 @@
  #ifdef USE_TIMEX
  void timex_adjustment(int microsec)
  {
-@@ -462,7 +483,8 @@
+@@ -462,7 +483,8 @@ double gettimexoffset()
    adjtimex(&t);
    offset = t.offset;
  #endif
@@ -56,7 +56,7 @@
    return (double) offset; 
  }
 
-@@ -655,13 +677,18 @@
+@@ -655,13 +677,18 @@ void adj_time(double d)
      tv.tv_usec += 1000000;
    }
 
@@ -75,7 +75,7 @@
    {
      printf("standard adjustment ");
 
-@@ -1267,7 +1294,7 @@
+@@ -1267,7 +1294,7 @@ char *parseArgs(int argc, char **argv)
    return fname;
  }
 
@@ -84,7 +84,7 @@
  {
    FILE *fp;
    signed char buf[8192];
-@@ -1278,7 +1305,7 @@
+@@ -1278,7 +1305,7 @@ void main(int argc, char **argv)
 
    fname = parseArgs(argc, argv);
    if (fname == NULL)
@@ -93,7 +93,7 @@
 
    /* Set priority to maximum -- just long enough for us
       to open the audio device and timestamp it.  This should
-@@ -1293,7 +1320,7 @@
+@@ -1293,7 +1320,7 @@ void main(int argc, char **argv)
    if (fp == NULL)
    {
      printf("fopen(): Unable to open file: %s  %s\n", fname, strerror(errno));

comms/chu/pkg-descr

@@ -3,4 +3,4 @@ Research Council Canada (NRC). This software uses signals from radio
 station CHU to set and frequency discipline the system clock on a
 Linux (FreeBSD) based system.
 
-WWW: http://www.rossi.com/chu/
+WWW: https://www.rossi.com/chu/

comms/chu/pkg-plist

@@ -1,6 +1,5 @@
 sbin/chu
 %%DATADIR%%/testsignal
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/chu.html
 %%PORTDOCS%%%%DOCSDIR%%/chuman.html
 %%PORTDOCS%%%%DOCSDIR%%/ntp.html