*/*: sync with upstream

Taken from: HardenedBSD

audio/clementine-player/Makefile

@@ -6,8 +6,6 @@ DISTVERSION=	1.3.1.g20190103
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-player
 
-MASTER_SITES=	GH
-
 MAINTAINER=	[email protected]
 COMMENT=	Cross-platform music player based on Amarok 1.4
 

audio/deadbeef/Makefile

@@ -27,6 +27,7 @@ CPPFLAGS+=	-I../dumb/dumb-kode54/include -I../../plugins/libmp4ff \
 		-I./sidplay-libs/libsidplay/include/sidplay \
 		-I${LOCALBASE}/include
 CFLAGS+=	-Wno-narrowing
+LDFLAGS_i386=	-Wl,-z,notext
 LIBS+=		-L${LOCALBASE}/lib -lexecinfo -lintl
 USE_GNOME=	intltool
 INSTALLS_ICONS=	yes

audio/guitarix-lv2/Makefile

@@ -41,7 +41,7 @@ LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
 RUN_DEPENDS=	roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf
 
 USES=		eigen:3 libarchive localbase:ldflags pkgconfig \
-		python:build readline waf tar:xz
+		python:2.7,build readline waf tar:xz
 USE_GNOME=	atkmm cairo gtk20 gtkmm24 pangomm
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes

audio/libopenmpt/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libopenmpt
-PORTVERSION=	0.4.0
+PORTVERSION=	0.4.1
 DISTVERSIONSUFFIX=	+release.autotools
 CATEGORIES=	audio
 MASTER_SITES=	https://lib.openmpt.org/files/libopenmpt/src/ \

audio/libopenmpt/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1545655956
-SHA256 (libopenmpt-0.4.0+release.autotools.tar.gz) = 5b70f8538fecdd41662008a4f50167df6c7685fdab38840c7a20eefb634cddab
-SIZE (libopenmpt-0.4.0+release.autotools.tar.gz) = 1460280
+TIMESTAMP = 1546885809
+SHA256 (libopenmpt-0.4.1+release.autotools.tar.gz) = e4fe7e476b91bc99a16c1a06fc739f6a1051a619c8cdd769c24213289b0a35cc
+SIZE (libopenmpt-0.4.1+release.autotools.tar.gz) = 1461371

audio/pacpl/Makefile

@@ -48,7 +48,6 @@ OPTIMFROG_RUN_DEPENDS=	ofr:audio/optimfrog
 OPUS_DESC=		Ogg Opus audio codec support
 OPUS_RUN_DEPENDS=	opusenc:audio/opus-tools
 SNDFILE_RUN_DEPENDS=	sndfile-convert:audio/libsndfile
-VORBIS_RUN_DEPENDS=	oggenc:audio/vorbis-tools
 SHORTEN_DESC=		Shorten audio support
 SHORTEN_RUN_DEPENDS=	shorten:audio/shorten
 SOX_DESC=		Audio conversion support via SoX

audio/pc-mixer/Makefile

@@ -10,7 +10,6 @@ COMMENT=	QT5 based audio mixer for FreeBSD
 
 LICENSE=	BSD2CLAUSE
 
-WRKSRC_SUBDIR=	src-qt5
 MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
 
 MAKE_JOBS_UNSAFE=yes

audio/pianobar/Makefile

@@ -2,14 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	pianobar
-PORTVERSION=	2017.08.30
-PORTREVISION=	3
+PORTVERSION=	2018.06.22
 CATEGORIES=	audio
 MASTER_SITES=	https://6xq.net/${PORTNAME}/
 
-PATCH_SITES=	https://github.com/PromyLOPh/${PORTNAME}/commit/
-PATCHFILES=	38b16f9957a7.patch:-p1
-
 MAINTAINER=	[email protected]
 COMMENT=	Command-line Pandora online radio player
 

audio/pianobar/distinfo

@@ -1,5 +1,3 @@
-TIMESTAMP = 1504104262
-SHA256 (pianobar-2017.08.30.tar.bz2) = ec14db6cf1a7dbc1d8190b5ca0d256021e970587bcdaeb23904d4bca71a04674
-SIZE (pianobar-2017.08.30.tar.bz2) = 46664
-SHA256 (38b16f9957a7.patch) = cc90b0f0cd7b02a1a5470af2cb60e5dc6f45bcbc2302faba6502f2f6c9e73bf0
-SIZE (38b16f9957a7.patch) = 1040
+TIMESTAMP = 1546727914
+SHA256 (pianobar-2018.06.22.tar.bz2) = 946357718a7b5fea661247ad10187e77f94724ef2bb29a2482afeb2d8c8bd4c2
+SIZE (pianobar-2018.06.22.tar.bz2) = 47455

audio/xmixer/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	xmixer
 PORTVERSION=	0.9.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	http://mpx.freeshell.net/
 
@@ -13,24 +13,13 @@ COMMENT=	Audio mixer (gtk and Xlib) for X11R6
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 GNU_CONFIGURE=	yes
-ALL_TARGET=	${PROGRAMS}
+ALL_TARGET=	xmixer
 
 PLIST_FILES=	bin/xmixer \
 		man/man1/xmixer.1.gz
 
-OPTIONS_DEFINE=	GTK1
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGTK1}
-USE_GNOME+=	gtk12
-PROGRAMS=	xmixer xgmixer
-PLIST_FILES+=	bin/xgmixer
-.else
-USE_XORG=	x11 xt ice xaw
-PROGRAMS=	xmixer
+USE_XORG=	x11 xt ice xaw xmu sm
 LDFLAGS+=	-L${LOCALBASE}/lib -lX11
-.endif
 
 post-patch:
 	@${GREP} -lR "rxvt -e" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
@@ -41,9 +30,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|<getopt\.h>|<unistd.h>|g' ${WRKSRC}/main.c
 
 do-install:
-.for file in ${PROGRAMS}
-	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/bin/${file}
-.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/xmixer ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/xmixer.man ${STAGEDIR}${MAN1PREFIX}/man/man1/xmixer.1
 
 .include <bsd.port.mk>

audio/ympd/Makefile

@@ -4,7 +4,6 @@ PORTNAME=	ympd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.0
 CATEGORIES=	audio www
-MASTER_SITES=	GH
 
 MAINTAINER=	[email protected]
 COMMENT=	Stand-alone lightweight web UI controller for audio/musicpd

biology/seqtools/Makefile

@@ -21,6 +21,7 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 USE_XORG=	x11
 CFLAGS+=	-I${LOCALBASE}/include
+LLD_UNSAFE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo -lcurl -lsqlite3 -lm
 MAKE_JOBS_UNSAFE=	yes
 

cad/openvsp/Makefile

@@ -3,7 +3,7 @@
 PORTNAME=	openvsp
 DISTVERSIONPREFIX=	${GH_PROJECT}_
 DISTVERSION=	3.16.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 
 MAINTAINER=	[email protected]

databases/Makefile

@@ -215,6 +215,7 @@
     SUBDIR += mysql-connector-c
     SUBDIR += mysql-connector-c++
     SUBDIR += mysql-connector-java
+    SUBDIR += mysql-connector-java51
     SUBDIR += mysql-connector-odbc
     SUBDIR += mysql-q4m
     SUBDIR += mysql-udf
@@ -796,6 +797,7 @@
     SUBDIR += py-leveldb
     SUBDIR += py-lmdb
     SUBDIR += py-marshmallow-sqlalchemy
+    SUBDIR += py-mongoengine
     SUBDIR += py-motor
     SUBDIR += py-mycli
     SUBDIR += py-mysql-connector-python

databases/mysql-connector-java/Makefile

@@ -2,72 +2,51 @@
 # $FreeBSD$
 
 PORTNAME=	mysql-connector-java
-PORTVERSION=	5.1.47
+PORTVERSION=	8.0.13
 CATEGORIES=	databases java
 MASTER_SITES=	MYSQL/Connector-J
 
 MAINTAINER=	[email protected]
 COMMENT=	MySQL Connector/J: JDBC interface for MySQL
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${JAVALIBDIR}/log4j.jar:devel/log4j
-
-# 6.0 is currently in beta.
-PORTSCOUT=	limit:^5\.1\..*
+RUN_DEPENDS=	${JAVALIBDIR}/slf4j-api.jar:devel/slf4j \
+		${JAVALIBDIR}/c3p0.jar:databases/c3p0
 
 USES=		cpe
+USE_JAVA=	yes
+
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	mysql_connector_j
 
 NO_ARCH=	yes
-USE_JAVA=	yes
-JAVA_VERSION=	1.6 1.7 1.8
-BUILDDIR=	${WRKDIR}/${DISTNAME}
-APIDOCSDIR=	${STAGEDIR}${DOCSDIR}/javadoc
-SRCDIR=		${WRKDIR}/${DISTNAME}/src
-JAVADOCDIR=	${WRKDIR}/${DISTNAME}/javadoc
-DESTJARFILE=	${PORTNAME}.jar
-EXTRADOCS=	CHANGES
-JARFILE=	${DISTNAME}-bin.jar
-JDCLASSPATH=	${SRCDIR}:${CLASSPATH}
+NO_BUILD=	yes
 
-PLIST_FILES=	${JAVAJARDIR}/${DESTJARFILE}
+CONFLICTS_INSTALL=	mysql-connector-java51-*
 
-OPTIONS_DEFINE=	DOCS
-
-PORTDOCS=	*
+JAVA_VERSION=	1.8+
+EXTRADOCS=	CHANGES
+EXTRAJARS=	protobuf-java-3.6.1.jar
 
-.include <bsd.port.pre.mk>
+PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar \
+		${EXTRAJARS:C,^.*$,${JAVAJARDIR}/&,g}
 
-do-build:
-	@${DO_NADA}
+OPTIONS_DEFINE= DOCS
 
-do-build-DOCS-on:
-.if ${JAVA_PORT_VERSION:M1.8.*}
-	@${ECHO_MSG} "NOTE>>> Generating javadoc is broken with JDK 1.8+"
-.else
-	@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR};               \
-	    ${JAVADOC} -quiet -breakiterator -encoding utf8     \
-	    -d ${JAVADOCDIR} -package -classpath ${JDCLASSPATH}	\
-	    com.mysql.jdbc org.gjt.mm.mysql)
-.endif
+PORTDOCS=	*
 
 do-install:
-	@${ECHO_MSG} -n ">> Installing .jar files..."
-	${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
-	@${ECHO_MSG} " [ DONE ]"
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/${DISTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
+	@for extrajar in ${EXTRAJARS} ; do \
+	  ${INSTALL_DATA} ${INSTALL_WRKSRC}/lib/$$extrajar ${STAGEDIR}${JAVAJARDIR}/$$extrajar ; \
+	done
 
 do-install-DOCS-on:
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@for extradoc in ${EXTRADOCS} ; do                          \
+	@for extradoc in ${EXTRADOCS} ; do \
 	  ${INSTALL_DATA} ${INSTALL_WRKSRC}/$$extradoc ${STAGEDIR}${DOCSDIR} ; \
 	done
-.if ${JAVA_PORT_VERSION:N1.8.*}
-	@${MKDIR} ${STAGEDIR}${APIDOCSDIR}
-	@cd ${JAVADOCDIR} && ${COPYTREE_SHARE} . ${APIDOCSDIR}
-.endif
-	@${ECHO_MSG} " [ DONE ]"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

databases/mysql-connector-java/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1535796903
-SHA256 (mysql-connector-java-5.1.47.tar.gz) = 4ae79214b2f1b5fc600fc867a4d27dcfcb467813c38bf3eee87789ba400349c6
-SIZE (mysql-connector-java-5.1.47.tar.gz) = 4452049
+TIMESTAMP = 1546682403
+SHA256 (mysql-connector-java-8.0.13.tar.gz) = 99501fbc74b4cb80cd75a4d06c38b662be01bfd39c409efa3c747ec83216329b
+SIZE (mysql-connector-java-8.0.13.tar.gz) = 5980103

databases/mysql-connector-java/pkg-descr

@@ -1,13 +1,7 @@
 
-MySQL Connector/J is a native Java driver that converts JDBC (Java
-Database Connectivity) calls into the network protocol used by the
-MySQL database. It lets developers working with the Java programming
-language easily build programs and applets that interact with MySQL
-and connect all corporate data, even in a heterogeneous
-environment. MySQL Connector/J is a Type IV JDBC driver and has a
-complete JDBC feature set that supports the capabilities of MySQL.
-
-This port is derived from the original databases/mysql-jdbc-mm port of
-the mm.mysql JDBC connector by [email protected].
+MySQL Connector/J is the official JDBC driver for MySQL. MySQL
+Connector/J 8.0 is compatible with all MySQL versions starting with
+MySQL 5.5. Additionally, MySQL Connector/J 8.0 supports the new X
+DevAPI for development with MySQL Server 8.0.
 
 WWW: https://dev.mysql.com/downloads/connector/j/

databases/mysql-connector-java51/Makefile

@@ -0,0 +1,76 @@
+# Created by: Matthew Seaman
+# $FreeBSD$
+
+PORTNAME=	mysql-connector-java
+PORTVERSION=	5.1.47
+CATEGORIES=	databases java
+MASTER_SITES=	MYSQL/Connector-J
+PKGNAMESUFFIX=	51
+
+MAINTAINER=	[email protected]
+COMMENT=	MySQL Connector/J: JDBC interface for MySQL
+
+LICENSE=	GPLv2
+
+RUN_DEPENDS=	${JAVALIBDIR}/log4j.jar:devel/log4j
+
+# 8.0.x is now the GA release, but drops support for java 1.6 and 1.7
+PORTSCOUT=	limit:^5\.1\..*
+
+USES=		cpe
+CPE_VENDOR=	oracle
+CPE_PRODUCT=	mysql_connector_j
+
+CONFLICTS_INSTALL=	mysql-connector-java-8*
+
+NO_ARCH=	yes
+USE_JAVA=	yes
+JAVA_VERSION=	1.6 1.7 1.8
+BUILDDIR=	${WRKDIR}/${DISTNAME}
+APIDOCSDIR=	${STAGEDIR}${DOCSDIR}/javadoc
+SRCDIR=		${WRKDIR}/${DISTNAME}/src
+JAVADOCDIR=	${WRKDIR}/${DISTNAME}/javadoc
+DESTJARFILE=	${PORTNAME}.jar
+EXTRADOCS=	CHANGES
+JARFILE=	${DISTNAME}-bin.jar
+JDCLASSPATH=	${SRCDIR}:${CLASSPATH}
+
+PLIST_FILES=	${JAVAJARDIR}/${DESTJARFILE}
+
+OPTIONS_DEFINE=	DOCS
+
+PORTDOCS=	*
+
+.include <bsd.port.pre.mk>
+
+do-build:
+	@${DO_NADA}
+
+do-build-DOCS-on:
+.if ${JAVA_PORT_VERSION:M1.8.*}
+	@${ECHO_MSG} "NOTE>>> Generating javadoc is broken with JDK 1.8+"
+.else
+	@${MKDIR} ${JAVADOCDIR} && (cd ${SRCDIR};               \
+	    ${JAVADOC} -quiet -breakiterator -encoding utf8     \
+	    -d ${JAVADOCDIR} -package -classpath ${JDCLASSPATH}	\
+	    com.mysql.jdbc org.gjt.mm.mysql)
+.endif
+
+do-install:
+	@${ECHO_MSG} -n ">> Installing .jar files..."
+	${INSTALL_DATA} ${BUILDDIR}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
+	@${ECHO_MSG} " [ DONE ]"
+
+do-install-DOCS-on:
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@for extradoc in ${EXTRADOCS} ; do                          \
+	  ${INSTALL_DATA} ${INSTALL_WRKSRC}/$$extradoc ${STAGEDIR}${DOCSDIR} ; \
+	done
+.if ${JAVA_PORT_VERSION:N1.8.*}
+	@${MKDIR} ${STAGEDIR}${APIDOCSDIR}
+	@cd ${JAVADOCDIR} && ${COPYTREE_SHARE} . ${APIDOCSDIR}
+.endif
+	@${ECHO_MSG} " [ DONE ]"
+
+.include <bsd.port.post.mk>

databases/mysql-connector-java51/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1535796903
+SHA256 (mysql-connector-java-5.1.47.tar.gz) = 4ae79214b2f1b5fc600fc867a4d27dcfcb467813c38bf3eee87789ba400349c6
+SIZE (mysql-connector-java-5.1.47.tar.gz) = 4452049

databases/mysql-connector-java51/pkg-descr

@@ -0,0 +1,13 @@
+
+MySQL Connector/J is a native Java driver that converts JDBC (Java
+Database Connectivity) calls into the network protocol used by the
+MySQL database. It lets developers working with the Java programming
+language easily build programs and applets that interact with MySQL
+and connect all corporate data, even in a heterogeneous
+environment. MySQL Connector/J is a Type IV JDBC driver and has a
+complete JDBC feature set that supports the capabilities of MySQL.
+
+This port is derived from the original databases/mysql-jdbc-mm port of
+the mm.mysql JDBC connector by [email protected].
+
+WWW: https://dev.mysql.com/downloads/connector/j/

databases/py-asyncpg/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	asyncpg
-PORTVERSION=	0.18.2
-PORTREVISION=	1
+PORTVERSION=	0.18.3
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}