*/*: sync with upstream

Taken from: HardenedBSD
opnsense2 · Dec 5, 2019 · 8e9f9e6 · 8e9f9e6
1 parent 69a18cb
commit 8e9f9e6
Show file tree

Hide file tree

Showing 225 changed files with 2,852 additions and 1,959 deletions.
diff --git a/astro/marble/Makefile b/astro/marble/Makefile
@@ -32,6 +32,8 @@ OPTIONS_DEFINE=	GPS DOCS WEBENGINE
 OPTIONS_DEFAULT=GPS
 OPTIONS_DEFAULT_amd64=	WEBENGINE
 OPTIONS_DEFAULT_i386=	WEBENGINE
+OPTIONS_DEFAULT_powerpc64=	${OPTIONS_DEFAULT_powerpc64_${OSREL:R}}
+OPTIONS_DEFAULT_powerpc64_13=	WEBENGINE
 OPTIONS_SUB=	yes
 
 GPS_DESC=		Support for GPS position provider

diff --git a/astro/mkgmap/Makefile b/astro/mkgmap/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mkgmap
-PORTVERSION=	r4382
+PORTVERSION=	r4384
 CATEGORIES=	astro converters java
 MASTER_SITES=	http://www.mkgmap.org.uk/download/ \
 		http://mirror.amdmi3.ru/distfiles/

diff --git a/astro/mkgmap/distinfo b/astro/mkgmap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575371129
-SHA256 (mkgmap-r4382.tar.gz) = d61c966da70f42100d4847acb8a0a1108680c15aab68230560ec8fa7320242d9
-SIZE (mkgmap-r4382.tar.gz) = 3393168
+TIMESTAMP = 1575471345
+SHA256 (mkgmap-r4384.tar.gz) = 212affa1010b27a54a68ba491bb5c4747a40c5349fac00ebe324de54179c1b7a
+SIZE (mkgmap-r4384.tar.gz) = 3391547
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
@@ -55,6 +55,8 @@ OPTIONS_DEFINE=		IPOD MP3TUNES MTP QTWEBENGINE
 OPTIONS_DEFAULT=	IPOD MP3TUNES MTP
 OPTIONS_DEFAULT_amd64=	QTWEBENGINE
 OPTIONS_DEFAULT_i386=	QTWEBENGINE
+OPTIONS_DEFAULT_powerpc64=	${OPTIONS_DEFAULT_powerpc64_${OSREL:R}}
+OPTIONS_DEFAULT_powerpc64_13=	QTWEBENGINE
 OPTIONS_SUB=		yes
 
 IPOD_DESC=		Apple iPod support

diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Legendary Open Cubic Player
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-ONLY_FOR_ARCHS=	amd64
+ONLY_FOR_ARCHS=	amd64 i386
 
 LIB_DEPENDS=	libid3tag.so:audio/libid3tag \
 		libmad.so:audio/libmad \

diff --git a/audio/ocp/files/patch-config.h.in b/audio/ocp/files/patch-config.h.in
@@ -0,0 +1,14 @@
+--- config.h.in.orig	2019-11-26 21:41:02 UTC
++++ config.h.in
+@@ -160,9 +160,11 @@
+
+ #undef HAVE_RESIZE_TERM
+
++/*
+ #if (defined(_X86) || defined(__i386__)) && !defined(__APPLE__)
+ #define I386_ASM 1
+ #endif
++*/
+
+ /* #define I386_ASM_EMU 1 */
+
diff --git a/audio/plasma5-plasma-pa/distinfo b/audio/plasma5-plasma-pa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573566492
-SHA256 (KDE/plasma/5.17.3/plasma-pa-5.17.3.tar.xz) = 338a91dcd8950b8b4c16cd5094855ac575327ee38bcc6eaea15fe44f1ddb50fb
-SIZE (KDE/plasma/5.17.3/plasma-pa-5.17.3.tar.xz) = 103716
+TIMESTAMP = 1575440787
+SHA256 (KDE/plasma/5.17.4/plasma-pa-5.17.4.tar.xz) = 43a366147323c583dd032c46fab68e4b1ff3a28e4ff1239eebed5b7536f41dde
+SIZE (KDE/plasma/5.17.4/plasma-pa-5.17.4.tar.xz) = 103976
diff --git a/audio/siren/Makefile b/audio/siren/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	siren
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.kariliq.nl/${PORTNAME}/dist/
 
@@ -13,24 +13,17 @@ COMMENT=	Text-based audio player
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-LIB_DEPENDS=	libFLAC.so:audio/flac \
-		libid3tag.so:audio/libid3tag \
-		libmad.so:audio/libmad \
-		libvorbis.so:audio/libvorbis \
-		libwavpack.so:audio/wavpack \
-		libopusfile.so:audio/opusfile
-
 BROKEN_mips=		fails to configure: cannot find program /nxb-bin/usr/bin/cc
 BROKEN_mips64=		fails to configure: cannot find program /nxb-bin/usr/bin/cc
 
-USES=		ncurses pkgconfig
+USES=		localbase:ldflags ncurses pkgconfig
 HAS_CONFIGURE=	yes
 USE_CSTD=	c99
 
-OPTIONS_DEFINE=		FFMPEG MPG123
+OPTIONS_DEFINE=		FAAD FFMPEG FLAC MAD MPG123 OPUS SNDFILE VORBIS WAVPACK
 OPTIONS_MULTI=		SOUND
 OPTIONS_MULTI_SOUND=	OSS PULSEAUDIO SNDIO
-OPTIONS_DEFAULT=	OSS
+OPTIONS_DEFAULT=	FFMPEG OSS
 OSS_CONFIGURE_ON=	oss=yes
 OSS_CONFIGURE_OFF=	oss=no
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
@@ -40,20 +33,41 @@ SNDIO_CONFIGURE_ON=	sndio=yes
 SNDIO_CONFIGURE_OFF=	sndio=no
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_USES=		localbase:ldflags
+FAAD_CONFIGURE_ON=	aac=yes
+FAAD_CONFIGURE_OFF=	aac=no
+FAAD_LIB_DEPENDS=	libfaad.so:audio/faad \
+			libmp4v2.so:multimedia/mp4v2
 FFMPEG_CONFIGURE_ON=	ffmpeg=yes
 FFMPEG_CONFIGURE_OFF=	ffmpeg=no
 FFMPEG_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg
+FLAC_CONFIGURE_ON=	flac=yes
+FLAC_CONFIGURE_OFF=	flac=no
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
+MAD_CONFIGURE_ON=	mad=yes
+MAD_CONFIGURE_OFF=	mad=no
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad \
+			libid3tag.so:audio/libid3tag
 MPG123_CONFIGURE_ON=	mpg123=yes
 MPG123_CONFIGURE_OFF=	mpg123=no
 MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
+OPUS_CONFIGURE_ON=	opus=yes
+OPUS_CONFIGURE_OFF=	opus=no
+OPUS_LIB_DEPENDS=	libopusfile.so:audio/opusfile
+SNDFILE_CONFIGURE_ON=	sndfile=yes
+SNDFILE_CONFIGURE_OFF=	sndfile=no
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
+VORBIS_CONFIGURE_ON=	vorbis=yes
+VORBIS_CONFIGURE_OFF=	vorbis=no
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
+WAVPACK_CONFIGURE_ON=	wavpack=yes
+WAVPACK_CONFIGURE_OFF=	wavpack=no
+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 OPTIONS_SUB=	yes
 
-CONFIGURE_ARGS=	sndfile=no \
-		alsa=no \
+CONFIGURE_ARGS=	alsa=no \
 		ao=no \
 		sun=no \
-		portaudio=no \
-		aac=no
+		portaudio=no
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lcurses|-lncurses|' ${WRKSRC}/configure

diff --git a/audio/siren/pkg-plist b/audio/siren/pkg-plist
@@ -1,12 +1,14 @@
 bin/siren
-lib/siren/ip/flac.so
-lib/siren/ip/mad.so
-lib/siren/ip/opus.so
-lib/siren/ip/vorbis.so
-lib/siren/ip/wavpack.so
+%%FAAD%%lib/siren/ip/aac.so
 %%FFMPEG%%lib/siren/ip/ffmpeg.so
+%%FLAC%%lib/siren/ip/flac.so
+%%MAD%%lib/siren/ip/mad.so
 %%MPG123%%lib/siren/ip/mpg123.so
+%%OPUS%%lib/siren/ip/opus.so
 %%OSS%%lib/siren/op/oss.so
 %%PULSEAUDIO%%lib/siren/op/pulse.so
+%%SNDFILE%%lib/siren/ip/sndfile.so
 %%SNDIO%%lib/siren/op/sndio.so
+%%VORBIS%%lib/siren/ip/vorbis.so
+%%WAVPACK%%lib/siren/ip/wavpack.so
 man/man1/siren.1.gz
diff --git a/audio/suil/Makefile b/audio/suil/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	suil
-PORTVERSION=	0.10.2
-PORTREVISION=	3
+PORTVERSION=	0.10.6
 CATEGORIES=	audio
 MASTER_SITES=	http://download.drobilla.net/
 

diff --git a/audio/suil/distinfo b/audio/suil/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546112163
-SHA256 (suil-0.10.2.tar.bz2) = 9f445910627fb30f4c182b9ee00d1030324910d8a9ce7c9654c34465411da401
-SIZE (suil-0.10.2.tar.bz2) = 334948
+TIMESTAMP = 1575153911
+SHA256 (suil-0.10.6.tar.bz2) = 06fc70abaa33bd7089dd1051af46f89d378e8465d170347a3190132e6f009b7c
+SIZE (suil-0.10.6.tar.bz2) = 347615
diff --git a/audio/suil/pkg-plist b/audio/suil/pkg-plist
@@ -4,6 +4,7 @@ lib/libsuil-0.so.0
 lib/libsuil-0.so.%%SUILVERSION%%
 lib/suil-0/libsuil_gtk2_in_qt5.so
 lib/suil-0/libsuil_qt5_in_gtk2.so
+lib/suil-0/libsuil_qt5_in_gtk3.so
 lib/suil-0/libsuil_x11_in_gtk2.so
 lib/suil-0/libsuil_x11_in_gtk3.so
 lib/suil-0/libsuil_x11_in_qt5.so

diff --git a/chinese/auto-cn-l10n/Makefile b/chinese/auto-cn-l10n/Makefile
@@ -14,7 +14,6 @@ COMMENT=	The automatic localization for Simplified Chinese zh_CN.eucCN locale
 
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
-REINPLACE_ARGS=	-i ""
 
 OPTIONS_DEFINE=		WQY FIREFLYTTF FCITX SCIM MINICHINPUT RELAXCONF
 OPTIONS_DEFAULT=	WQY SCIM RELAXCONF
@@ -34,8 +33,9 @@ MINICHINPUT_RUN_DEPENDS=chinput:chinese/miniChinput
 RELAXCONF_RUN_DEPENDS=	relaxconf:sysutils/relaxconf
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; \
+	@${REINPLACE_CMD} -e "s|%%X11BASE%%|${LOCALBASE}|g; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/dot.xselector ${WRKSRC}/dot.xinitrc
+	@${RM} ${WRKSRC}/dot.xselector.bak ${WRKSRC}/dot.xinitrc.bak
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/skel/zh_CN.eucCN

diff --git a/comms/libmodbus/Makefile b/comms/libmodbus/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libmodbus
-PORTVERSION=	3.1.4
-PORTREVISION=	1
+PORTVERSION=	3.1.6
 CATEGORIES=	comms
 MASTER_SITES=	http://libmodbus.org/site_media/build/
 

diff --git a/comms/libmodbus/distinfo b/comms/libmodbus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464558272
-SHA256 (libmodbus-3.1.4.tar.gz) = c8c862b0e9a7ba699a49bc98f62bdffdfafd53a5716c0e162696b4bf108d3637
-SIZE (libmodbus-3.1.4.tar.gz) = 471576
+TIMESTAMP = 1575451445
+SHA256 (libmodbus-3.1.6.tar.gz) = d7d9fa94a16edb094e5fdf5d87ae17a0dc3f3e3d687fead81835d9572cf87c16
+SIZE (libmodbus-3.1.6.tar.gz) = 479565
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
@@ -30,6 +30,8 @@ USE_LDCONFIG=	yes
 OPTIONS_DEFINE=	WEBENGINE
 OPTIONS_DEFAULT_amd64=	WEBENGINE
 OPTIONS_DEFAULT_i386=	WEBENGINE
+OPTIONS_DEFAULT_powerpc64=	${OPTIONS_DEFAULT_powerpc64_${OSREL:R}}
+OPTIONS_DEFAULT_powerpc64_13=	WEBENGINE
 
 WEBENGINE_DESC=		Add dependency on qt5-webengine
 WEBENGINE_USE=		QT=webengine

diff --git a/databases/p5-SQL-Translator/Makefile b/databases/p5-SQL-Translator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SQL-Translator
 PORTVERSION=	1.60
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -13,8 +14,8 @@ COMMENT=	Manipulate structured data definitions (SQL and more)
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-ShareDir-Install>=0:devel/p5-File-ShareDir-Install \
-		${RUN_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS} \
+		p5-File-ShareDir-Install>=0:devel/p5-File-ShareDir-Install
 RUN_DEPENDS=	p5-Carp-Clan>=0:devel/p5-Carp-Clan \
 		p5-DBI>=1.54:databases/p5-DBI \
 		p5-File-ShareDir>=1:devel/p5-File-ShareDir \
@@ -32,23 +33,17 @@ RUN_DEPENDS=	p5-Carp-Clan>=0:devel/p5-Carp-Clan \
 		p5-YAML>=0.66:textproc/p5-YAML
 TEST_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
 		p5-Test-Differences>=0:devel/p5-Test-Differences \
-		p5-Test-Exception>=0.31:devel/p5-Test-Exception \
-
-OPTIONS_DEFINE=	DIAGRAM
-DIAGRAM_DESC=	Diagram generation support
+		p5-Test-Exception>=0.31:devel/p5-Test-Exception
 
 USES=		perl5
-USE_PERL5=	configure
-
-NO_ARCH=	yes
-REINPLACE_ARGS=	-i ''
 
+OPTIONS_DEFINE=		DIAGRAM
+DIAGRAM_DESC=		Diagram generation support
+USE_PERL5=		configure
+NO_ARCH=		yes
 DIAGRAM_BUILD_DEPENDS=	${DIAGRAM_RUN_DEPENDS}
 DIAGRAM_RUN_DEPENDS=	p5-GD>=0:graphics/p5-GD \
 			p5-Graph>=0:math/p5-Graph \
 			p5-GraphViz>=0:graphics/p5-GraphViz
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|@EXPORT|&_OK|' ${WRKSRC}/lib/SQL/Translator/Parser/xSV.pm
-
 .include <bsd.port.mk>
diff --git a/databases/p5-Store-CouchDB/Makefile b/databases/p5-Store-CouchDB/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	Store-CouchDB
-PORTVERSION=	3.8
+PORTVERSION=	4.3
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:NORBU
+MASTER_SITE_SUBDIR=	CPAN:LEV
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	[email protected]

diff --git a/databases/p5-Store-CouchDB/distinfo b/databases/p5-Store-CouchDB/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488836984
-SHA256 (Store-CouchDB-3.8.tar.gz) = 0c4e2d3e2889f42fd36217152e32806b233d83a4373939812ee583f3c3828b39
-SIZE (Store-CouchDB-3.8.tar.gz) = 22748
+TIMESTAMP = 1575448134
+SHA256 (Store-CouchDB-4.3.tar.gz) = 687953cf8b333ab36c87ced77a794894d6e341ec1b39eb5368b502aeba5a9edd
+SIZE (Store-CouchDB-4.3.tar.gz) = 20641
diff --git a/databases/pecl-redis/Makefile b/databases/pecl-redis/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	redis
-PORTVERSION=	5.0.2
+PORTVERSION=	5.1.1
 CATEGORIES=	databases
 
 MAINTAINER=	[email protected]

diff --git a/databases/pecl-redis/distinfo b/databases/pecl-redis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564568603
-SHA256 (PECL/redis-5.0.2.tgz) = 4e18d7ebe032a562c358d79f94efa5f187ea90db7a56ef648476e24f4fe0b72c
-SIZE (PECL/redis-5.0.2.tgz) = 243270
+TIMESTAMP = 1574622001
+SHA256 (PECL/redis-5.1.1.tgz) = 621c9d2b4054c797b0e5d5bc5e0f1eeb49bedb37f20e46f838aa4d17d2fe8180
+SIZE (PECL/redis-5.1.1.tgz) = 245205
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redis
-PORTVERSION=	6.0.0.20191129
+PORTVERSION=	6.0.0.20191203
 CATEGORIES=	databases
 PKGNAMESUFFIX=	-devel
 
@@ -13,7 +13,7 @@ LICENSE=	BSD3CLAUSE
 
 USES+=		compiler gmake
 USE_GITHUB=	yes
-GH_TUPLE= 	antirez:${PORTNAME}:f5d4853
+GH_TUPLE= 	antirez:${PORTNAME}:7b5f4b1
 
 OPTIONS_DEFINE=	JEMALLOC TESTS TRIB
 OPTIONS_RADIO=	EXTLUA

diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575048154
-SHA256 (antirez-redis-6.0.0.20191129-f5d4853_GH0.tar.gz) = ad80a318994bd763362825d73b5b2c674dbbee66a7caa25bbe33608025bcf0dd
-SIZE (antirez-redis-6.0.0.20191129-f5d4853_GH0.tar.gz) = 2164641
+TIMESTAMP = 1575507634
+SHA256 (antirez-redis-6.0.0.20191203-7b5f4b1_GH0.tar.gz) = d9d76066f0664453db3a4d2b4e349808d0ba5777ed5e58406ca2537d64c7bdf3
+SIZE (antirez-redis-6.0.0.20191203-7b5f4b1_GH0.tar.gz) = 2162083
diff --git a/databases/tiledb/Makefile b/databases/tiledb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tiledb
 PORTVERSION=	1.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 
 MAINTAINER=	[email protected]
@@ -15,16 +15,19 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
 		libtbb.so:devel/tbb \
+		libfmt.so:devel/libfmt \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	catch>=0:devel/catch \
 		clipp>=0:devel/clipp \
-		spdlog>=0:devel/spdlog
+		spdlog>=1.4:devel/spdlog
 
 USES=		cmake compiler:c++11-lang ssl
 
 CMAKE_ARGS=	-DCATCH_INCLUDE_DIR=${LOCALBASE}/include/catch2
 CMAKE_OFF=	TILEDB_CMAKE_IDE TILEDB_FORCE_ALL_DEPS TILEDB_HDFS TILEDB_S3 TILEDB_SUPERBUILD TILEDB_TESTS_AWS_S3_CONFIG TILEDB_VERBOSE TILEDB_WERROR
 CMAKE_ON=	TILEDB_CPP_API TILEDB_STATIC TILEDB_STATS TILEDB_TBB TILEDB_TBB_SHARED TILEDB_TESTS TILEDB_TOOLS
+CFLAGS+=	-DSPDLOG_FMT_EXTERNAL=1
+LDFLAGS+=	-L${LOCALBASE}/lib -lfmt
 
 GH_ACCOUNT=	TileDB-Inc
 GH_PROJECT=	TileDB