*/*: sync with upstream

Taken from: HardenedBSD

archivers/peazip/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	peazip
 PORTVERSION=	6.8.1
+PORTREVISION=	1
 CATEGORIES=	archivers
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 MASTER_SITES=	https://github.com/giorgiotani/PeaZip/releases/download/${PORTVERSION}/

archivers/peazip/pkg-plist

@@ -44,6 +44,7 @@ share/icons/hicolor/256x256/apps/peazip.png
 %%DATADIR%%/res/lang/ru.txt
 %%DATADIR%%/res/lang/si.txt
 %%DATADIR%%/res/lang/sk.txt
+%%DATADIR%%/res/lang/sl.txt
 %%DATADIR%%/res/lang/sv.txt
 %%DATADIR%%/res/lang/tj.txt
 %%DATADIR%%/res/lang/tr.txt

archivers/rubygem-archive-tar-minitar/Makefile

@@ -11,8 +11,8 @@ COMMENT=	Library and command-line utility for tar archives
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-minitar>=${PORTVERSION}:archivers/rubygem-minitar \
-		rubygem-minitar-cli>=${PORTVERSION}:archivers/rubygem-minitar-cli
+RUN_DEPENDS=	rubygem-minitar>=${PORTVERSION}<1:archivers/rubygem-minitar \
+		rubygem-minitar-cli>=${PORTVERSION}<1:archivers/rubygem-minitar-cli
 
 USES=		gem
 USE_RUBY=	yes

archivers/rubygem-archive-zip/Makefile

@@ -12,7 +12,7 @@ COMMENT=	Provides interface to working with ZIP archives
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-io-like>=0.3.0:devel/rubygem-io-like
+RUN_DEPENDS=	rubygem-io-like>=0.3.0<0.4:devel/rubygem-io-like
 
 USES=		gem
 USE_RUBY=	yes

archivers/rubygem-minitar-cli/Makefile

@@ -14,8 +14,8 @@ LICENSE_COMB=	dual
 LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/docs/bsdl.txt
 LICENSE_FILE_RUBY=	${WRKSRC}/docs/ruby.txt
 
-RUN_DEPENDS=	rubygem-minitar>=0.8.0:archivers/rubygem-minitar \
-		rubygem-powerbar>=1.0:devel/rubygem-powerbar
+RUN_DEPENDS=	rubygem-minitar>=0.8.0<0.9:archivers/rubygem-minitar \
+		rubygem-powerbar>=1.0<2:devel/rubygem-powerbar
 
 USES=		gem
 USE_RUBY=	yes

audio/libshout/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	libshout
 PORTVERSION=	2.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio net
 MASTER_SITES=	https://downloads.xiph.org/releases/libshout/ \
 		https://svn.xiph.org/releases/libshout/ \

audio/libshout/files/patch-include-shout-shout.h.in

@@ -0,0 +1,26 @@
+Obtained from:	https://gitlab.xiph.org/xiph/icecast-libshout/commit/0ac7ed9e84c3871d4427acc1ce59dca5e4af21ef
+
+--- include/shout/shout.h.in.orig	2019-05-22 09:05:32 UTC
++++ include/shout/shout.h.in
+@@ -85,6 +85,11 @@ extern "C" {
+ #define SHOUT_TLS_RFC2818           ( 11) /* Use TLS for transport layer like HTTPS [RFC2818] does. */
+ #define SHOUT_TLS_RFC2817           ( 12) /* Use TLS via HTTP Upgrade:-header [RFC2817]. */
+
++/* Possible values for blocking */
++#define SHOUT_BLOCKING_DEFAULT      (255) /* Use the default blocking setting. */
++#define SHOUT_BLOCKING_FULL         (  0) /* Block in all I/O related functions */
++#define SHOUT_BLOCKING_NONE         (  1) /* Do not block in I/O related functions */
++
+ #define SHOUT_AI_BITRATE            "bitrate"
+ #define SHOUT_AI_SAMPLERATE         "samplerate"
+ #define SHOUT_AI_CHANNELS           "channels"
+@@ -244,7 +249,8 @@ int shout_set_protocol(shout_t *self, un
+ unsigned int shout_get_protocol(shout_t *self);
+
+ /* Instructs libshout to use nonblocking I/O. Must be called before
+- * shout_open (no switching back and forth midstream at the moment). */
++ * shout_open (no switching back and forth midstream at the moment).
++ * nonblocking is one of SHOUT_BLOCKING_xxx. */
+ int shout_set_nonblocking(shout_t* self, unsigned int nonblocking);
+ unsigned int shout_get_nonblocking(shout_t *self);
+

audio/libshout/files/patch-src-connection.c

@@ -0,0 +1,59 @@
+Obtained from:	https://gitlab.xiph.org/xiph/icecast-libshout/commit/0ac7ed9e84c3871d4427acc1ce59dca5e4af21ef
+		https://gitlab.xiph.org/xiph/icecast-libshout/commit/b807c1e2550718bdc73d65ac1b05255d18f45c54
+
+--- src/connection.c.orig	2019-05-20 19:32:59 UTC
++++ src/connection.c
+@@ -118,7 +118,7 @@ static struct timeval shout_connection_i
+             .tv_usec = (timeout % 1000) * 1000
+         };
+         return tv;
+-    } else if (con->nonblocking) {
++    } else if (con->nonblocking == SHOUT_BLOCKING_NONE) {
+         return tv_nonblocking;
+     } else {
+         return tv_blocking;
+@@ -167,7 +167,7 @@ static shout_connection_return_state_t s
+             }
+         break;
+         case SHOUT_SOCKSTATE_CONNECTING:
+-            if (con->nonblocking) {
++            if (con->nonblocking == SHOUT_BLOCKING_NONE) {
+                 ret = shout_connection_iter__wait_for_io(con, shout, 1, 1, 0);
+                 if (ret != SHOUT_RS_DONE) {
+                     return ret;
+@@ -460,7 +460,7 @@ int                 shout_connection_ite
+             break; \
+             case SHOUT_RS_TIMEOUT: \
+             case SHOUT_RS_NOTNOW: \
+-                if (con->nonblocking) \
++                if (con->nonblocking == SHOUT_BLOCKING_NONE) \
+                     return SHOUTERR_RETRY; \
+                 retry = 1; \
+             break; \
+@@ -518,7 +518,7 @@ int                 shout_connection_sel
+ }
+ int                 shout_connection_set_nonblocking(shout_connection_t *con, unsigned int nonblocking)
+ {
+-    if (!con)
++    if (!con || (nonblocking != SHOUT_BLOCKING_DEFAULT && nonblocking != SHOUT_BLOCKING_FULL && nonblocking != SHOUT_BLOCKING_NONE))
+         return SHOUTERR_INSANE;
+
+     if (con->socket != SOCK_ERROR)
+@@ -563,13 +563,14 @@ int                 shout_connection_con
+     if (con->socket != SOCK_ERROR || con->current_socket_state != SHOUT_SOCKSTATE_UNCONNECTED)
+         return SHOUTERR_BUSY;
+
+-    shout_connection_set_nonblocking(con, shout_get_nonblocking(shout));
++    if (con->nonblocking == SHOUT_BLOCKING_DEFAULT)
++        shout_connection_set_nonblocking(con, shout_get_nonblocking(shout));
+
+     port = shout->port;
+-    if (shout_get_protocol(shout) == SHOUT_PROTOCOL_ICY)
++    if (con->impl == shout_icy_impl)
+         port++;
+
+-    if (con->nonblocking) {
++    if (con->nonblocking == SHOUT_BLOCKING_NONE) {
+         con->socket = sock_connect_non_blocking(shout->host, port);
+     } else {
+         con->socket = sock_connect(shout->host, port);

audio/libshout/files/patch-src-shout.c

@@ -0,0 +1,25 @@
+Obtained from:	https://gitlab.xiph.org/xiph/icecast-libshout/commit/0ac7ed9e84c3871d4427acc1ce59dca5e4af21ef
+
+--- src/shout.c.orig	2019-05-22 09:05:32 UTC
++++ src/shout.c
+@@ -417,7 +417,7 @@ int shout_set_metadata(shout_t *self, sh
+ #ifdef HAVE_OPENSSL
+     shout_connection_select_tlsmode(connection, self->tls_mode);
+ #endif
+-    shout_connection_set_nonblocking(connection, 0);
++    shout_connection_set_nonblocking(connection, SHOUT_BLOCKING_FULL);
+
+     connection->target_message_state = SHOUT_MSGSTATE_PARSED_FINAL;
+
+@@ -989,7 +989,10 @@ unsigned int shout_get_protocol(shout_t 
+
+ int shout_set_nonblocking(shout_t *self, unsigned int nonblocking)
+ {
+-    if (!self || (nonblocking != 0 && nonblocking != 1))
++    if (nonblocking == SHOUT_BLOCKING_DEFAULT)
++        nonblocking = SHOUT_BLOCKING_FULL;
++
++    if (!self || (nonblocking != SHOUT_BLOCKING_FULL && nonblocking != SHOUT_BLOCKING_NONE))
+         return SHOUTERR_INSANE;
+
+     if (self->connection)

audio/linux-c7-openal-soft/Makefile

@@ -4,15 +4,14 @@
 PORTNAME=	openal-soft
 PORTVERSION=	1.16.0
 DISTVERSIONSUFFIX=	-3.el7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio linux
-MASTER_SITES=	EPEL7/o
+MASTER_SITES=	EPEL7/o \
+		https://harbottle.gitlab.io/wine32/7/i386/:i386
 
 MAINTAINER=	[email protected]
 COMMENT=	3D positional spatialized sound library (Linux CentOS ${LINUX_DIST_VER})
 
-ONLY_FOR_ARCHS=	amd64
-
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	alsalib

audio/linux-c7-openal-soft/distinfo

@@ -1,4 +1,6 @@
-TIMESTAMP = 1482094313
+TIMESTAMP = 1567501651
+SHA256 (centos/openal-soft-1.16.0-3.el7.i686.rpm) = 114e20b9feeb46dcdee2f52f7a4ba746085502dab51624506abc428bc2153408
+SIZE (centos/openal-soft-1.16.0-3.el7.i686.rpm) = 286432
 SHA256 (centos/openal-soft-1.16.0-3.el7.x86_64.rpm) = 775242cb1d603b85a53eb325c9d85a6aed9639968430c5d45893c90252b07429
 SIZE (centos/openal-soft-1.16.0-3.el7.x86_64.rpm) = 288688
 SHA256 (centos/openal-soft-1.16.0-3.el7.src.rpm) = 906734a0d59518d4ccd106ae5a96e01196f1214dab7a96e2c8cabd8f9f930d64

audio/linux-c7-openal-soft/pkg-plist.amd64

@@ -1,5 +1,7 @@
 etc/openal/alsoft.conf
 usr/bin/openal-info
+usr/lib/libopenal.so.1
+usr/lib/libopenal.so.1.16.0
 usr/lib64/libopenal.so.1
 usr/lib64/libopenal.so.1.16.0
 %%PORTDOCS%%%%DOCSDIR%%/COPYING

audio/linux-c7-openal-soft/pkg-plist.i386

@@ -0,0 +1,8 @@
+etc/openal/alsoft.conf
+usr/bin/openal-info
+usr/lib/libopenal.so.1
+usr/lib/libopenal.so.1.16.0
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+usr/share/openal/alsoftrc.sample
+usr/share/openal/hrtf/default-44100.mhr
+usr/share/openal/hrtf/default-48000.mhr

audio/mixxx/Makefile

@@ -4,7 +4,7 @@
 PORTNAME=	mixxx
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	[email protected]
@@ -47,22 +47,25 @@ USE_QT=		buildtools concurrent core dbus gui network opengl script scripttools \
 CONFLICTS=	mixxx20* mixxx21*
 
 MAKE_ARGS=	qtdir="${PREFIX}" install_root="${PREFIX}" \
-		build=release optimize=off ${GUI} battery=0 vamp=1 modplug=1
+		build=release optimize=off ${GUI} battery=0 vamp=1 modplug=1 mad=1
 LATE_INSTALL_ARGS=	--install-sandbox=${STAGEDIR}
 
 GUI=		qt5=1
 
 PORTDATA=	*
 PORTDOCS=	*
 
-OPTIONS_DEFINE=		DOCS FAAD GPERFTOOLS HID LAME OPUS SHOUTCAST WAVPACK
-OPTIONS_DEFAULT=	FAAD HID SHOUTCAST OPUS WAVPACK
+OPTIONS_DEFINE=		DOCS FAAD FFMPEG GPERFTOOLS HID LAME OPUS SHOUTCAST WAVPACK
+OPTIONS_DEFAULT=	FAAD FFMPEG HID SHOUTCAST OPUS WAVPACK
 OPTIONS_SUB=		yes
 
 FAAD_LIB_DEPENDS=	libfaad.so:audio/faad \
 			libmp4v2.so:multimedia/mp4v2
 FAAD_MAKE_ARGS=		faad=1
 FAAD_MAKE_ARGS_OFF=	faad=0
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
+FFMPEG_MAKE_ARGS=	ffmpeg=1
+FFMPEG_MAKE_ARGS_OFF=	ffmpeg=0
 GPERFTOOLS_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
 GPERFTOOLS_MAKE_ARGS=	perftools=1
 GPERFTOOLS_MAKE_ARGS_OFF=	perftools=0

audio/plasma5-plasma-pa/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1564587441
-SHA256 (KDE/plasma/5.16.4/plasma-pa-5.16.4.tar.xz) = 9b166e11f7115576181c17f0ced51b9a7ec689334d4b15ebb55d4e6e7ff6cbd4
-SIZE (KDE/plasma/5.16.4/plasma-pa-5.16.4.tar.xz) = 100748
+TIMESTAMP = 1567529834
+SHA256 (KDE/plasma/5.16.5/plasma-pa-5.16.5.tar.xz) = e029563d50cc6266a4a3e22574c33fef4670e1aaab18630eb30769e2167acc96
+SIZE (KDE/plasma/5.16.5/plasma-pa-5.16.5.tar.xz) = 101100

audio/plasma5-plasma-pa/pkg-plist

@@ -87,6 +87,8 @@ share/locale/ko/LC_MESSAGES/plasma_applet_org.kde.plasma.volume.mo
 share/locale/lt/LC_MESSAGES/kcm_pulseaudio.mo
 share/locale/lt/LC_MESSAGES/plasma_applet_org.kde.plasma.volume.mo
 share/locale/lv/LC_MESSAGES/plasma_applet_org.kde.plasma.volume.mo
+share/locale/ml/LC_MESSAGES/kcm_pulseaudio.mo
+share/locale/ml/LC_MESSAGES/plasma_applet_org.kde.plasma.volume.mo
 share/locale/nb/LC_MESSAGES/kcm_pulseaudio.mo
 share/locale/nl/LC_MESSAGES/kcm_pulseaudio.mo
 share/locale/nl/LC_MESSAGES/plasma_applet_org.kde.plasma.volume.mo

benchmarks/rubygem-benchmark-ips/Makefile

@@ -11,8 +11,9 @@ COMMENT=	Iterations per second enhancement to Benchmark
 
 LICENSE=	MIT
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>

cad/zcad/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	zcad
 PORTVERSION=	0.9.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 

comms/cqrlog/Makefile

@@ -4,7 +4,7 @@
 PORTNAME=	cqrlog
 PORTVERSION=	2.3.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	comms hamradio
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
@@ -15,7 +15,11 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libhamlib.so:comms/hamlib
 
-USES=		fpc lazarus:flavors shebangfix ssl:run dos2unix mysql
+USES=		fpc gnome lazarus:flavors shebangfix ssl:run dos2unix \
+		mysql:server xorg
+
+USE_GNOME+=	cairo
+USE_XORG=	x11
 USE_GITHUB=	yes
 GH_ACCOUNT=	ok2cqr
 
@@ -32,7 +36,6 @@ MAKE_ENV+=	LAZBUILD_CMD="${LAZBUILD_CMD}" \
 		LCL_PLATFORM="${LCL_PLATFORM}" \
 		LAZARUS_DIR="${LAZARUS_DIR}"
 
-USE_XORG+=	x11
 NO_LAZBUILD=	yes
 LAZBUILD_ARGS=	-d --pcp=.
 LAZARUS_NO_FLAVORS=qt5

converters/py-text-unidecode/Makefile

@@ -1,20 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	text-unidecode
-DISTVERSION=	1.2
+DISTVERSION=	1.3
 CATEGORIES=	converters python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	[email protected]
 COMMENT=	Most basic port of Perl's Text::Unidecode module
 
-LICENSE=	ART10
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+LICENSE_FILE_ART10=	${WRKSRC}/LICENSE
+LICENSE_FILE_GPLv1=	${WRKSRC}/LICENSE
+
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v
+
 .include <bsd.port.mk>

converters/py-text-unidecode/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1530183792
-SHA256 (text-unidecode-1.2.tar.gz) = 5a1375bb2ba7968740508ae38d92e1f889a0832913cb1c447d5e2046061a396d
-SIZE (text-unidecode-1.2.tar.gz) = 76872
+TIMESTAMP = 1567451164
+SHA256 (text-unidecode-1.3.tar.gz) = bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93
+SIZE (text-unidecode-1.3.tar.gz) = 76885

converters/rubygem-json-ld-preloaded/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	json-ld-preloaded
-PORTVERSION=	3.0.3
+PORTVERSION=	3.0.4
 CATEGORIES=	converters rubygems
 MASTER_SITES=	RG
 

converters/rubygem-json-ld-preloaded/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1564157951
-SHA256 (rubygem/json-ld-preloaded-3.0.3.gem) = d3af9499870fbbeb4e17c2f69531bed12cfaa04ea1caf646bdb6795c1cadb853
-SIZE (rubygem/json-ld-preloaded-3.0.3.gem) = 107008
+TIMESTAMP = 1567510044
+SHA256 (rubygem/json-ld-preloaded-3.0.4.gem) = 316980ac5faf4c863946012b3d40ed96680a5da8c8204c72ed7169e4bdfb6442
+SIZE (rubygem/json-ld-preloaded-3.0.4.gem) = 116224

converters/rubygem-po_to_json/Makefile

@@ -14,8 +14,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-json>=1.6.0:devel/rubygem-json
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>

databases/fpc-fpindexer/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-fpindexer
 

databases/fpc-gdbm/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-gdbm