*/*: sync with upstream

Taken from: FreeBSD
snape7997 · Mar 16, 2017 · 30a8deb · 30a8deb
1 parent ae9f2a1
commit 30a8deb
Show file tree

Hide file tree

Showing 401 changed files with 854 additions and 1,211 deletions.
diff --git a/archivers/py-attic/Makefile b/archivers/py-attic/Makefile
@@ -17,9 +17,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:devel/py-msgpack-python
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:devel/py-msgpack-python
 
-USES=		python:3.3+
+USES=		python:3.3+ ssl
 USE_PYTHON=	autoplist distutils
-USE_OPENSSL=	yes
 
 STRIP_FILES=	hashindex.so platform_freebsd.so chunker.so crypto.so
 PYDISTUTILS_BUILDPATH=${BUILD_WRKSRC}/build/lib.${OPSYS:tl}-${UNAMER}-${ARCH}-${PYTHON_VER}

diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile
@@ -16,8 +16,7 @@ BUILD_DEPENDS=	re>=0.4.14:audio/re \
 		rem>=0.4.7:audio/rem
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		gmake pkgconfig
-USE_OPENSSL=	yes
+USES=		gmake pkgconfig ssl
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ilbc
 MAKE_ARGS=	MOD_AUTODETECT=""
 PLIST_FILES=	bin/baresip

diff --git a/audio/libshairport/Makefile b/audio/libshairport/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Airport Extreme Emulator
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		autoreconf gmake libtool
+USES=		autoreconf gmake libtool ssl
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes
 
 CPPFLAGS+=	-isystem${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

diff --git a/audio/rem/Makefile b/audio/rem/Makefile
@@ -14,9 +14,8 @@ LICENSE_FILE=	${WRKSRC}/docs/COPYING
 BUILD_DEPENDS=	${LOCALBASE}/share/re/re.mk:audio/re
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		gmake
+USES=		gmake ssl
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}

diff --git a/audio/shairport/Makefile b/audio/shairport/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS=	p5-MIME-Base64>=0:converters/p5-MIME-Base64 \
 		p5-HTTP-Message>=0:www/p5-HTTP-Message \
 		avahi-publish-service:net/avahi-app
 
-USES=		gmake perl5 pkgconfig
+USES=		gmake perl5 pkgconfig ssl
 USE_PERL5=	run
-USE_OPENSSL=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	miks
 GH_TAGNAME=	b1cb9ea

diff --git a/audio/umurmur/Makefile b/audio/umurmur/Makefile
@@ -16,9 +16,8 @@ LIB_DEPENDS=	libconfig.so:devel/libconfig \
 
 USE_GITHUB=	yes
 
-USES=		autoreconf gmake libtool
+USES=		autoreconf gmake libtool ssl
 GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--with-ssl=openssl
 
 USE_RC_SUBR=	umurmur

diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
@@ -56,7 +56,7 @@ XML_DESC=	Support XML based playlists (XSPF, RSS)
 
 OPTIONS_SUB=	yes
 
-AIRPLAY_USE=		OPENSSL=yes
+AIRPLAY_USES=		ssl
 AIRPLAY_CONFIGURE_OFF=	--without-plugins="airplay"
 
 AO_LIB_DEPENDS=		libao.so:audio/libao

diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile
@@ -10,9 +10,8 @@ COMMENT=	Tool for measuring webserver performance
 
 LICENSE=	GPLv2
 
-USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-USES=		autoreconf gmake libtool
+USES=		autoreconf gmake libtool ssl
 USE_GITHUB=	yes
 GH_TAGNAME=	dcfb746
 MAKE_ARGS=	LIBUTIL_OBJS=ssl_writev.o \

diff --git a/benchmarks/postal/Makefile b/benchmarks/postal/Makefile
@@ -33,7 +33,7 @@ GNUTLS_USES=		pkgconfig
 GNUTLS_CONFIGURE_OFF=	--disable-gnutls
 GNUTLS_CPPFLAGS=	$$(pkg-config --cflags gnutls)
 GNUTLS_LDFLAGS=		$$(pkg-config --libs gnutls)
-OPENSSL_USE=		OPENSSL=yes
+OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_OFF=	--disable-openssl
 OPENSSL_CPPFLAGS=	-I${OPENSSLINC}
 OPENSSL_LDFLAGS=	-L${OPENSSLLIB}

diff --git a/benchmarks/siege/Makefile b/benchmarks/siege/Makefile
@@ -12,8 +12,7 @@ COMMENT=	HTTP regression testing and benchmarking utility
 
 LICENSE=	GPLv2
 
-USES=		autoreconf libtool perl5
-USE_OPENSSL=	yes
+USES=		autoreconf libtool perl5 ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PERL="${PERL}"
 CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE} --disable-shared \

diff --git a/chinese/qterm/Makefile b/chinese/qterm/Makefile
@@ -27,7 +27,7 @@ PHONON_DESC=	Multimedia support via Phonon
 QTSCRIPT_DESC=	Scripting support via QtScript Bindings
 KDE_DESC=	Password management via KWallet
 
-OPENSSL_USE=	OPENSSL=yes
+OPENSSL_USES=		ssl
 OPENSSL_CMAKE_ON=	-DQTERM_ENABLE_SSH:BOOL=TRUE
 OPENSSL_CMAKE_OFF=	-DQTERM_ENABLE_SSH:BOOL=FALSE
 

diff --git a/comms/Makefile b/comms/Makefile
@@ -101,6 +101,7 @@
     SUBDIR += minicom
     SUBDIR += mlan3
     SUBDIR += morse
+    SUBDIR += multimon-ng
     SUBDIR += nasawash
     SUBDIR += ncid
     SUBDIR += nec2c

diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-master=${DEFAULTHOST} --with-port=${DEFAULTPORT} \
 		--with-pam --with-libwrap --with-openssl
 
-USE_OPENSSL=	yes
+USES=		ssl
 USE_RC_SUBR=	conserver
 
 OPTIONS_DEFINE=	FREEIPMI GSSAPI GSSAPIONLY STRIPREALM UDS

diff --git a/comms/multimon-ng/Makefile b/comms/multimon-ng/Makefile
@@ -0,0 +1,31 @@
+# $FreeBSD$
+
+PORTNAME=	multimon-ng
+PORTVERSION=	1.1.0
+CATEGORIES=	comms hamradio
+
+MAINTAINER=	[email protected]
+COMMENT=	Digital transmission decoder
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	EliasOenal
+
+USES=		cmake
+
+OPTIONS_DEFINE=	PULSEAUDIO X11
+
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
+PULSEAUDIO_CMAKE_BOOL=	PULSE_AUDIO_SUPPORT
+
+X11_USE=	XORG=ice,sm,x11,xext
+X11_CMAKE_BOOL=	X11_SUPPORT
+
+PLIST_FILES=	bin/multimon-ng
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/multimon-ng ${STAGEDIR}${PREFIX}/bin
+
+.include <bsd.port.mk>
diff --git a/comms/multimon-ng/distinfo b/comms/multimon-ng/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1489583557
+SHA256 (EliasOenal-multimon-ng-1.1.0_GH0.tar.gz) = 378209bce0111ec496a8bf1878d43b8d42d67921958c8fbef4aedde2ea416c43
+SIZE (EliasOenal-multimon-ng-1.1.0_GH0.tar.gz) = 2420682
diff --git a/comms/multimon-ng/files/patch-CMakeLists.txt b/comms/multimon-ng/files/patch-CMakeLists.txt
@@ -0,0 +1,12 @@
+--- CMakeLists.txt.orig	2015-11-09 12:57:23 UTC
++++ CMakeLists.txt
+@@ -48,7 +48,8 @@ endif( X11_SUPPORT ) 
+
+ if( PULSE_AUDIO_SUPPORT )
+ 	include_directories( ${PULSEAUDIO_INCLUDE_DIR} )
+-	link_libraries( ${PULSEAUDIO_LIBRARY} "-lpulse-simple" )
++	find_library( PULSE_SIMPLE NAMES pulse-simple REQUIRED )
++	link_libraries( ${PULSEAUDIO_LIBRARY} ${PULSE_SIMPLE} )
+ 	add_definitions( "-DPULSE_AUDIO" )
+ else( PULSE_AUDIO_SUPPORT )
+ 	add_definitions( "-DDUMMY_AUDIO" )
diff --git a/comms/multimon-ng/pkg-descr b/comms/multimon-ng/pkg-descr
@@ -0,0 +1,18 @@
+multimon-ng a fork of multimon.
+It decodes the following digital transmission modes:
+
+  - POCSAG512 POCSAG1200 POCSAG2400
+  - FLEX
+  - EAS
+  - UFSK1200 CLIPFSK AFSK1200 AFSK2400 AFSK2400_2 AFSK2400_3
+  - HAPN4800
+  - FSK9600
+  - DTMF
+  - ZVEI1 ZVEI2 ZVEI3 DZVEI PZVEI
+  - EEA EIA CCIR
+  - MORSE CW
+
+As an example it can be used with rtl_sdr to decode radio amateurs packets:
+rtl_fm -f 144.390M -s 22050 | multimon-ng -v 10 -t raw -A -
+
+WWW: https://github.com/EliasOenal/multimon-ng/
diff --git a/databases/galera/Makefile b/databases/galera/Makefile
@@ -18,12 +18,11 @@ BUILD_DEPENDS=	checkmk:devel/check \
 		${PYTHON_PKGNAMEPREFIX}cloud_sptheme>=0:textproc/py-cloud_sptheme
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 
-USES=		execinfo python:build scons shebangfix
+USES=		execinfo python:build scons shebangfix ssl
 
 USE_CXXSTD=	c++11
 USE_GCC=	yes
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes
 
 LDFLAGS+=	-lboost_program_options -lboost_system
 MAKE_ARGS+=	--config=force

diff --git a/databases/libdrizzle-redux/Makefile b/databases/libdrizzle-redux/Makefile
@@ -16,9 +16,8 @@ COMMENT=	Client and protocol library for the Drizzle database
 LICENSE=	BSD2CLAUSE
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool
+USES=		gmake libtool ssl
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes
 
 CONFLICTS=	libdrizzle-[0-9]*
 

diff --git a/databases/mongodb/Makefile b/databases/mongodb/Makefile
@@ -45,7 +45,7 @@ PORTSCOUT=	limitw:1,even
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
-USE_OPENSSL=	yes
+USES+=		ssl
 MAKE_ARGS+=	--ssl
 .endif
 

diff --git a/databases/mongodb32-tools/Makefile b/databases/mongodb32-tools/Makefile
@@ -23,7 +23,8 @@ OPTIONS_DEFAULT=	SSL
 SASL_USE=	my_tags=sasl
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
-SSL_USE=	openssl=yes my_tags=ssl
+SSL_USES=	ssl
+SSL_USE=	my_tags=ssl
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	"not yet ported to anything other than i386 and amd64"

diff --git a/databases/mysqlbackup/Makefile b/databases/mysqlbackup/Makefile
@@ -14,6 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		mysql
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 PERIODICS=	200.mysqlbackup.daily \
 		200.mysqlbackup.weekly \
@@ -24,12 +25,12 @@ PLIST_FILES=	bin/mysqlbackup \
 		man/man1/mysqlbackup.1.gz
 
 pre-install:
-	${REINPLACE_CMD} ${SUB_LIST:S,$,!g,:S,^, -e s!%%,:S,=,%%!,} \
+	@${REINPLACE_CMD} ${SUB_LIST:S,$,!g,:S,^, -e s!%%,:S,=,%%!,} \
 		${PERIODICS:S,^,${WRKSRC}/,}
 
 do-install:
 .for periodic in ${PERIODICS}
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/${periodic:E}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/${periodic:E}
 	${INSTALL_SCRIPT} ${WRKSRC}/${periodic} \
 		${STAGEDIR}${PREFIX}/etc/periodic/${periodic:E}/${periodic:R}
 .endfor

diff --git a/databases/mysqlbackup/pkg-descr b/databases/mysqlbackup/pkg-descr
@@ -18,4 +18,4 @@ Why mysqlbackup?
 
 6. It is written in sh - code interpreter available in a base system.
 
-WWW: https://mysqlbackup.googlecode.com
+WWW: https://code.google.com/archive/p/mysqlbackup/
diff --git a/databases/pg_rman/Makefile b/databases/pg_rman/Makefile
@@ -1,20 +1,20 @@
 # $FreeBSD$
 
 PORTNAME=	pg_rman
-PORTVERSION=	1.2.3
-PORTREVISION=	2
+PORTVERSION=	1.3.3
 CATEGORIES=	databases
-MASTER_SITES=	http://pg-rman.googlecode.com/files/
 
 MAINTAINER=	[email protected]
 COMMENT=	Online backup and restore tool for PostgreSQL
 
-BROKEN=		Unfetchable (google code has gone away)
-DEPRECATED=	Unfetchable for more than six months (google code has gone away)
-EXPIRATION_DATE=	2017-04-30
+LICENSE=	BSD3CLAUSE
 
-USES=		gmake pgsql:9.2
+USES=		gettext-runtime gmake pgsql
+USE_GITHUB=	yes
+PG_TAG_VERSION=	${PGSQL_DEFAULT:S/./_/}
+GH_TUPLE=	ossc-db:pg_rman:REL${PG_TAG_VERSION}_STABLE
 WANT_PGSQL=	client server
+WANT_PGSQL_VER=	91+
 MAKE_ARGS=	USE_PGXS=1
 PLIST_FILES=	bin/pg_rman
 

diff --git a/databases/pg_rman/distinfo b/databases/pg_rman/distinfo
@@ -1,2 +1,11 @@
-SHA256 (pg_rman-1.2.3.tar.gz) = ea1a4cd44bef716bc3c3f5a7d592f730730b666873a84f5bdee814b586b809bb
-SIZE (pg_rman-1.2.3.tar.gz) = 97390
+TIMESTAMP = 1489635538
+SHA256 (ossc-db-pg_rman-1.3.3-REL9_2_STABLE_GH0.tar.gz) = 5f93549370fd6857ebf137019ff04ac9c689d81b47dc5454ffc4c7d1b0d6d5e6
+SIZE (ossc-db-pg_rman-1.3.3-REL9_2_STABLE_GH0.tar.gz) = 111789
+SHA256 (ossc-db-pg_rman-1.3.3-REL9_3_STABLE_GH0.tar.gz) = d4a0801141091b92c06a1511ccdc694846bb67fede5a8dde43ce303374c0bbd2
+SIZE (ossc-db-pg_rman-1.3.3-REL9_3_STABLE_GH0.tar.gz) = 112483
+SHA256 (ossc-db-pg_rman-1.3.3-REL9_4_STABLE_GH0.tar.gz) = c5882f4ed8991e3f725aaa38193db8f5713b79561786cb103e0a6536e04d3f57
+SIZE (ossc-db-pg_rman-1.3.3-REL9_4_STABLE_GH0.tar.gz) = 112320
+SHA256 (ossc-db-pg_rman-1.3.3-REL9_5_STABLE_GH0.tar.gz) = e3c4fa00f5404693e6caa5eedff4d6e61fb62b84c5c403e40b3053df0759d54a
+SIZE (ossc-db-pg_rman-1.3.3-REL9_5_STABLE_GH0.tar.gz) = 112373
+SHA256 (ossc-db-pg_rman-1.3.3-REL9_6_STABLE_GH0.tar.gz) = b44bac870ce21f1e928fe8a4c53592ce6cb4cf038216033d0f884ebe8c0b525c
+SIZE (ossc-db-pg_rman-1.3.3-REL9_6_STABLE_GH0.tar.gz) = 112113
diff --git a/databases/pg_rman/pkg-descr b/databases/pg_rman/pkg-descr
@@ -5,4 +5,4 @@ backup and PITR as easy as pg_dump. Also, it maintains a backup
 catalog per database cluster. Users can maintain old backups including
 archive logs with one command.
 
-WWW: http://code.google.com/p/pg-rman/
+WWW: https://github.com/ossc-db/pg_rman
diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile
@@ -24,8 +24,7 @@ GROUPS=		pgbouncer
 USE_RC_SUBR=	pgbouncer
 
 GNU_CONFIGURE=	yes
-USES=		gmake
-USE_OPENSSL=	yes
+USES=		gmake ssl
 
 CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} --enable-evdns
 CONFIGURE_ENV+=	PTHREAD_LIBS="-lpthread"

diff --git a/databases/pgpool-II-33/Makefile b/databases/pgpool-II-33/Makefile
@@ -40,7 +40,7 @@ LIBMEMCACHED_BUILD_DEPENDS=	libmemcached>=1.0:databases/libmemcached
 LIBMEMCACHED_CONFIGURE_ON=	--with-memcached=${LOCALBASE}/lib/libmemcached
 
 SSL_CONFIGURE_WITH=	openssl
-SSL_USE=		OPENSSL=yes
+SSL_USES=		ssl
 
 PAM_DESC=		Build with PAM support
 PAM_CONFIGURE_ON=	--with-pam

diff --git a/databases/pgpool-II/Makefile b/databases/pgpool-II/Makefile
@@ -15,9 +15,8 @@ LICENSE=	MIT
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gmake pgsql:9.2 libtool
+USES=		gmake pgsql:9.2 libtool ssl
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--with-openssl
 
 CONFLICTS=	pgpool-3.* pgpool-II-22-* pgpool-II-23-* pgpool-II-23-*
@@ -28,15 +27,10 @@ PORTDOCS+=	TODO
 PORTDOCShtml=	pgpool-en.html pgpool-ja.html pgpool.css
 PORTDOCShtml+=	tutorial-en.html tutorial-ja.html
 
-OPTIONS_DEFINE+=	DOCS SSL
+OPTIONS_DEFINE+=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSSL}
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=--with-openssl
-.endif
-
 .if exists(${LOCALBASE}/include/postgresql/server/replication/walreceiver.h)
 FUNCTIONS=	pgpool-recovery pgpool-regclass pgpool-walrecrunning
 PLIST_SUB=	PGSQL9=""

diff --git a/databases/pgpool/Makefile b/databases/pgpool/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pgpool
 PORTVERSION=	3.4.9
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
 DISTNAME=	${PORTNAME}-II-${PORTVERSION}
@@ -24,7 +25,11 @@ CONFLICTS=	pgpool-II-*
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS SSL
+OPTIONS_DEFAULT= SSL
+
+SSL_CONFIGURE_WITH=     openssl
+SSL_USES=		ssl
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/pgpool

diff --git a/databases/pure-sql3/pkg-descr b/databases/pure-sql3/pkg-descr
@@ -3,4 +3,4 @@ minimal wrapper around Sqlite3's C interface which is designed to give the
 developer access to all of Sqlite3's features in a way that is convenient
 for Pure programmers.
 
-WWW: http://docs.pure-lang.googlecode.com/hg/pure-sql3.html
+WWW: https://puredocs.bitbucket.io/pure-sql3.html
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,4 +18,4 @@ Why mysqlbackup?

		6. It is written in sh - code interpreter available in a base system.

		WWW: https://mysqlbackup.googlecode.com
		WWW: https://code.google.com/archive/p/mysqlbackup/