*/*: sync with upstream

Taken from: HardenedBSD

accessibility/yasr/Makefile

@@ -30,9 +30,6 @@ PLIST_FILES=	bin/yasr \
 		%%NLS%%share/locale/es/LC_MESSAGES/yasr.mo \
 		%%NLS%%share/locale/fr/LC_MESSAGES/yasr.mo
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/csh|' ${WRKSRC}/yasr.conf
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}

accessibility/yasr/files/patch-yasr.conf

@@ -0,0 +1,11 @@
+--- yasr.conf.orig	2008-01-31 13:01:50 UTC
++++ yasr.conf
+@@ -63,7 +63,7 @@ synthesizer port=|/usr/local/bin/eflite
+ # Below line appropriate for Speech Dispatcher in its default configuration
+ #synthesizer port=127.0.0.1:6560
+ key echo=off
+-shell=/bin/bash
++shell=/bin/csh
+ special=off
+ up and down arrows=speak line
+ DisableKey=6925

astro/josm/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	josm
-PORTVERSION=	15553
+PORTVERSION=	15628
 CATEGORIES=	astro java
 MASTER_SITES=	http://josm.openstreetmap.de/download/ \
 		http://mirror.amdmi3.ru/distfiles/

astro/josm/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1575368145
-SHA256 (josm-snapshot-15553.jar) = 52a89550c846598bcb2fa53fbdd478fb4b70a5aad61a51a32c6bf6945360731e
-SIZE (josm-snapshot-15553.jar) = 13941067
+TIMESTAMP = 1578345944
+SHA256 (josm-snapshot-15628.jar) = 8601e44c112ef9f77e8a35c830275c70272bf6e50a4431101924f4044318d6a7
+SIZE (josm-snapshot-15628.jar) = 14047527

astro/py-metpy/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	metpy
-PORTVERSION=	0.11.1
+PORTVERSION=	0.12.0
 CATEGORIES=	astro python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,21 +18,15 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.22.0:math/py-pandas@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Pint>=0:devel/py-Pint@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Pint>=0.8:devel/py-Pint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pooch>=0.1:devel/py-pooch@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}scipy>=0.17.0:science/py-scipy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traitlets>=4.3.0:devel/py-traitlets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xarray011>=0.10.7:devel/py-xarray011@${PY_FLAVOR}
 
-USES=		python:3.5+
+USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3600
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}contextlib2>=0:devel/py-contextlib2@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

astro/py-metpy/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1571483841
-SHA256 (MetPy-0.11.1.tar.gz) = 807c49389905571736a6f61e6630dd5b1beead490c8e50e0bfaa1e76847bf7bf
-SIZE (MetPy-0.11.1.tar.gz) = 4149359
+TIMESTAMP = 1578401130
+SHA256 (MetPy-0.12.0.tar.gz) = 4125fbbc2620e3702961fe012cb52bdaba5f609ec5f5458818617676044b7921
+SIZE (MetPy-0.12.0.tar.gz) = 5188288

audio/emms/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	emms
 DISTVERSION=	5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio elisp
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}

audio/forked-daapd/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	forked-daapd
 PORTVERSION=	24.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio
 
 MAINTAINER=	[email protected]

audio/forked-daapd/files/patch-dmap_common.h

@@ -0,0 +1,11 @@
+--- src/dmap_common.h.orig	2016-05-06 17:50:14 UTC
++++ src/dmap_common.h
+@@ -46,7 +46,7 @@ dmap_get_fields_table(int *nfields);
+
+ /* From dmap_fields.gperf - keep in sync, don't alter */
+ const struct dmap_field *
+-dmap_find_field (register const char *str, register unsigned int len);
++dmap_find_field (register const char *str, register size_t len);
+
+
+ void

audio/noise-repellent-lv2/Makefile

@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	noise-repellent
-DISTVERSION=	0.1.4
+DISTVERSION=	0.1.5-3
+DISTVERSIONSUFFIX=	-g7f5a8fb
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 
@@ -15,7 +16,7 @@ BUILD_DEPENDS=	lv2>0:audio/lv2 \
 		${LOCALBASE}/include/fftw3.h:math/fftw3
 LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
 
-USES=		gmake pkgconfig
+USES=		meson pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	lucianodato
 

audio/noise-repellent-lv2/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1517623764
-SHA256 (lucianodato-noise-repellent-0.1.4_GH0.tar.gz) = 19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
-SIZE (lucianodato-noise-repellent-0.1.4_GH0.tar.gz) = 31263
+TIMESTAMP = 1578362766
+SHA256 (lucianodato-noise-repellent-0.1.5-3-g7f5a8fb_GH0.tar.gz) = 544cd29d1542ca94a6638cf7907dd1b0bcd264bcce1f7692eece74f98a38bf96
+SIZE (lucianodato-noise-repellent-0.1.5-3-g7f5a8fb_GH0.tar.gz) = 30284

audio/noson-app/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	noson-app
-DISTVERSION=	4.1.0
+DISTVERSION=	4.2.2
 CATEGORIES=	audio net
 
 MAINTAINER=	[email protected]

audio/noson-app/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1576606111
-SHA256 (janbar-noson-app-4.1.0_GH0.tar.gz) = 17f5a1512e7b74f58abcbadd7a6c2a2498520fd9f7c08055cb85940efd912e61
-SIZE (janbar-noson-app-4.1.0_GH0.tar.gz) = 1948793
+TIMESTAMP = 1578338968
+SHA256 (janbar-noson-app-4.2.2_GH0.tar.gz) = 5989d82c44f6b9cbe4e900d0e4628397dc90ec4f5301882b17ee89ccaa441996
+SIZE (janbar-noson-app-4.2.2_GH0.tar.gz) = 2073805

audio/plasma5-plasma-pa/distinfo

@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1578414618
+SHA256 (KDE/plasma/5.17.5/plasma-pa-5.17.5.tar.xz) = 933c6ab1fda52b336a157a48b1ea64b81fd1d84ca08a40a52bfae276cca2bf23
+SIZE (KDE/plasma/5.17.5/plasma-pa-5.17.5.tar.xz) = 104280

benchmarks/phoronix-test-suite/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	phoronix-test-suite
 DISTVERSIONPREFIX=	v
-DISTVERSION=	9.2.0
+DISTVERSION=	9.2.1
 CATEGORIES=	benchmarks
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
@@ -25,7 +25,11 @@ PORTDATA=	*
 PORTDOCS=	*
 
 NO_ARCH=	yes
-SHEBANG_FILES=	ob-cache/test-profiles/pts/shadowofthetombraider-1.0.1/install.sh \
+SHEBANG_FILES=	ob-cache/test-profiles/pts/shadowofthetombraider-1.0.0/install.sh \
+				ob-cache/test-profiles/pts/shadowofthetombraider-1.0.0/interim.sh \
+				ob-cache/test-profiles/pts/shadowofthetombraider-1.0.0/pre.sh \
+				ob-cache/test-profiles/pts/shadowofthetombraider-1.0.0/post.sh \
+				ob-cache/test-profiles/pts/shadowofthetombraider-1.0.1/install.sh \
 				ob-cache/test-profiles/pts/shadowofthetombraider-1.0.1/interim.sh \
 				ob-cache/test-profiles/pts/shadowofthetombraider-1.0.1/pre.sh \
 				ob-cache/test-profiles/pts/shadowofthetombraider-1.0.1/post.sh

benchmarks/phoronix-test-suite/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1575985175
-SHA256 (phoronix-test-suite-phoronix-test-suite-v9.2.0_GH0.tar.gz) = a87a6d685bdb3e725df1ca9f1f205a7671cb982d7f5d714c15a2bbc92819a672
-SIZE (phoronix-test-suite-phoronix-test-suite-v9.2.0_GH0.tar.gz) = 1303491
+TIMESTAMP = 1578479316
+SHA256 (phoronix-test-suite-phoronix-test-suite-v9.2.1_GH0.tar.gz) = 28acbcb6c5b8eb27c20329cd1a5ea3f1a27abb69812c4b1eeade4b91c89fc7d8
+SIZE (phoronix-test-suite-phoronix-test-suite-v9.2.1_GH0.tar.gz) = 1307046

benchmarks/phoronix-test-suite/files/patch-install-sh

@@ -54,7 +54,7 @@
  rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/static/images/%phoronix-test-suite.png
 
 -
- sed 's:export PTS_DIR=$(readlink -f `dirname $0`):PTS_DIR='"$INSTALL_PREFIX"'\/share\/phoronix-test-suite:g' phoronix-test-suite > $DESTDIR$INSTALL_PREFIX/bin/phoronix-test-suite
+ sed 's:export PTS_DIR=$(readlink -f `dirname $0`):export PTS_DIR='"$INSTALL_PREFIX"'\/share\/phoronix-test-suite:g' phoronix-test-suite > $DESTDIR$INSTALL_PREFIX/bin/phoronix-test-suite
  chmod +x $DESTDIR$INSTALL_PREFIX/bin/phoronix-test-suite
 
  # sed 's:\$url = PTS_PATH . \"documentation\/index.html\";:\$url = \"'"$INSTALL_PREFIX"'\/share\/doc\/packages\/phoronix-test-suite\/index.html\";:g' pts-core/commands/gui_gtk.php > $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/commands/gui_gtk.php

cad/Makefile

@@ -106,7 +106,6 @@
     SUBDIR += tkgate
     SUBDIR += tochnog
     SUBDIR += transcalc
-    SUBDIR += ujprog
     SUBDIR += varkon
     SUBDIR += verilator
     SUBDIR += verilog-mode.el

cad/dinotrace/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	dinotrace
 PORTVERSION=	9.4c
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	cad
 MASTER_SITES=	http://www.veripool.org/ftp/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}

cad/verilog-mode.el/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	verilog-mode.el
 PORTVERSION=	801
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	cad elisp
 MASTER_SITES=	http://www.veripool.org/ftp/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}

comms/Makefile

@@ -199,6 +199,7 @@
     SUBDIR += uartlirc
     SUBDIR += uhd
     SUBDIR += uird
+    SUBDIR += ujprog
     SUBDIR += unixcw
     SUBDIR += usbmuxd
     SUBDIR += viewfax

cad/ujprog/Makefile → comms/ujprog/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	ujprog
 DISTVERSION=	g20191117
-CATEGORIES=	cad
+CATEGORIES=	comms
 
 MAINTAINER=	[email protected]
 COMMENT=	ULX2S/ULX3S FPGA JTAG programmer
@@ -16,6 +16,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	f32c
 GH_PROJECT=	tools
 GH_TAGNAME=	0698352b0e912caa9b8371b8f692e19aac547a69
+USE_CSTD=	c99
 
 ALL_TARGET=	ujprog flash
 

databases/Makefile

@@ -99,6 +99,7 @@
     SUBDIR += gnats4
     SUBDIR += gnatsweb4
     SUBDIR += go-carbon
+    SUBDIR += go-pgweb
     SUBDIR += gom
     SUBDIR += gqlplus
     SUBDIR += grass7

databases/bbdb/Makefile

@@ -4,7 +4,7 @@
 PORTNAME=	bbdb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 

databases/go-pgweb/Makefile

@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+PORTNAME=	pgweb
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.11.5
+CATEGORIES=	databases www
+PKGNAMEPREFIX=	go-
+
+MAINTAINER=	[email protected]
+COMMENT=	Pgweb is a web-based database browser for PostgreSQL
+
+LICENSE=	MIT
+
+USES=		go
+USE_GITHUB=	yes
+GH_ACCOUNT=	sosedoff
+GO_PKGNAME=	github.com/sosedoff/pgweb
+PLIST_FILES=	bin/pgweb
+
+.include <bsd.port.mk>

databases/go-pgweb/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1578291312
+SHA256 (sosedoff-pgweb-v0.11.5_GH0.tar.gz) = d51450053e481e897b6bdf84b665ecb8a453843bc35e1057c3e51d89be19edba
+SIZE (sosedoff-pgweb-v0.11.5_GH0.tar.gz) = 3943042

databases/go-pgweb/pkg-descr

@@ -0,0 +1,8 @@
+Pgweb is a web-based database browser for PostgreSQL, written in Go and works on
+OSX, Linux and Windows machines. Main idea behind using Go for backend
+development is to utilize ability of the compiler to produce zero-dependency
+binaries for multiple platforms. Pgweb was created as an attempt to build very
+simple and portable application to work with local or remote PostgreSQL
+databases.
+
+WWW: https://github.com/sosedoff/pgweb

databases/mysql80-client/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	80-client
 
 COMMENT=	Multithreaded SQL database (client)
@@ -12,7 +12,7 @@ LICENSE+=	LGPL21
 MASTERDIR=	${.CURDIR}/../mysql80-server
 
 PKGMESSAGE=	${.CURDIR}/pkg-message
-PATCHDIR=	${.CURDIR}/files
+PATCHDIR=	${MASTERDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
 CONFLICTS_INSTALL=	mysql8[1-9]-client-* \
@@ -24,12 +24,22 @@ CMAKE_ARGS+=	-DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql
 
-MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
-		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
-		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
+MMAN1=		comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 mysql_config_editor.1 \
+		mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlman.1 \
+		mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1
 
 CLIENT_ONLY=	yes
 
+OPTIONS_GROUP+=	PLUGINS
+PLUGINS_DESC=	Default Client Plugins
+OPTIONS_GROUP_PLUGINS=	SASLCLIENT
+SASLCLIENT_DESC=	SASL client plugin module
+SASLCLIENT_CMAKE_BOOL=	WITH_AUTHENTICATION_LDAP
+SASLCLIENT_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
+SASLCLIENT_USE=		OPENLDAP=yes
+OPTIONS_DEFAULT+=	SASLCLIENT
+OPTIONS_SUB=	yes
+
 # issue 166367: adding symlinks for back-compatibility with ${lib}_r
 post-install:
 	@${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a