Merge branch 'devel' into patch-5

pfsense · Sep 22, 2017 · 9142166 · 9142166
2 parents 3cd7a93 + f7e09b3
commit 9142166
Show file tree

Hide file tree

Showing 423 changed files with 5,089 additions and 3,263 deletions.
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
@@ -253,6 +253,7 @@ MOZ_OPTIONS+=	\
 		--enable-chrome-format=${MOZ_CHROME} \
 		--enable-default-toolkit=${MOZ_TOOLKIT} \
 		--enable-update-channel=${MOZ_CHANNEL} \
+		--disable-updater \
 		--enable-pie \
 		--with-pthreads
 # Configure options for install

diff --git a/Mk/bsd.licenses.db.mk b/Mk/bsd.licenses.db.mk
@@ -40,7 +40,7 @@ Licenses_db_Include_MAINTAINER=         [email protected]
 #
 
 _LICENSE_LIST= 	BSL CDDL CPAL-1.0 ClArtistic EPL GFDL GMGPL \
-				ISCL MIT MPL NCSA OFL10 OFL11 OWL OpenSSL PD PSFL PostgreSQL \
+				ISCL MIT NCSA OFL10 OFL11 OWL OpenSSL PD PSFL PostgreSQL \
 				RUBY WTFPL1 WTFPL ZLIB ZPL21
 
 # GNU family
@@ -72,6 +72,9 @@ _LICENSE_LIST+=	CC0-1.0 \
 				CC-BY-NC-SA-1.0 CC-BY-NC-SA-2.0 CC-BY-NC-SA-2.5 CC-BY-NC-SA-3.0 CC-BY-NC-SA-4.0 \
 				CC-BY-SA-1.0 CC-BY-SA-2.0 CC-BY-SA-2.5 CC-BY-SA-3.0 CC-BY-SA-4.0
 
+# MPL family
+_LICENSE_LIST+= MPL MPL10 MPL11 MPL20
+
 # Others
 _LICENSE_LIST+= NONE
 
@@ -349,6 +352,15 @@ _LICENSE_GROUPS_MIT=	COPYFREE FSF GPL OSI
 _LICENSE_NAME_MPL=	Mozilla Public License
 _LICENSE_GROUPS_MPL=	FSF OSI
 
+_LICENSE_NAME_MPL10=	Mozilla Public License version 1.0
+_LICENSE_GROUPS_MPL10=	FSF OSI
+
+_LICENSE_NAME_MPL11=	Mozilla Public License version 1.1
+_LICENSE_GROUPS_MPL11=	FSF OSI
+
+_LICENSE_NAME_MPL20=	Mozilla Public License version 2.0
+_LICENSE_GROUPS_MPL20=	FSF OSI
+
 _LICENSE_NAME_NCSA=	University of Illinois/NCSA Open Source License
 _LICENSE_GROUPS_NCSA=	COPYFREE FSF GPL OSI
 

diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
@@ -112,6 +112,9 @@ DEV_ERROR+=	"USE_DOS2UNIX is no longer supported, please use USES=dos2unix"
 .if ${LICENSE:MBSD}
 DEV_WARNING+=	"LICENSE must not contain BSD, instead use BSD[234]CLAUSE"
 .endif
+.if ${LICENSE:MMPL}
+DEV_WARNING+=	"LICENSE must not contain MPL, instead use MPL[10|11|20]"
+.endif
 .else
 DEV_WARNING+=	"Please set LICENSE for this port"
 .endif

diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
@@ -937,9 +937,7 @@ _PERL_CPAN_ID=	${MASTER_SITE_SUBDIR:C/^CPAN:(.)(.)(.*)$/\1\/\1\2\/\1\2\3/}
 #
 .if !defined(IGNORE_MASTER_SITE_PGSQL)
 MASTER_SITE_PGSQL+= \
-	http://ftp.postgresql.org/pub/%SUBDIR%/ \
-	https://ftp.postgresql.org/pub/%SUBDIR%/ \
-	ftp://ftp.postgresql.org/pub/%SUBDIR%/
+	https://ftp.postgresql.org/pub/%SUBDIR%/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_PHP)

diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	musicpd
-PORTVERSION=	0.20.9
+PORTVERSION=	0.20.10
 CATEGORIES=	audio ipv6
 MASTER_SITES=	http://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}

diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497078447
-SHA256 (mpd-0.20.9.tar.xz) = cd77a2869e32354b004cc6b34fcb0bee56114caa2d9ed862aaa8071441e34eb7
-SIZE (mpd-0.20.9.tar.xz) = 773404
+TIMESTAMP = 1503840715
+SHA256 (mpd-0.20.10.tar.xz) = 52fbc1125cdba41ba999add2820d45f3ce7cf493006bb04d8f0b2937204d3121
+SIZE (mpd-0.20.10.tar.xz) = 778828
diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openal-soft
-PORTVERSION=	1.17.2
-PORTREVISION=	2
+PORTVERSION=	1.18.1
 CATEGORIES=	audio
 MASTER_SITES=	http://kcat.strangesoft.net/openal-releases/
 
@@ -17,17 +16,19 @@ CONFLICTS=	openal-200[0-9]*
 USES=		tar:bzip2 cmake compiler:c11
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DSHARE_INSTALL_DIR:STRING=${ETCDIR} \
+		-DALSOFT_REQUIRE_OSS:BOOL=OFF \
 		-DALSOFT_REQUIRE_JACK:BOOL=OFF \
-		-DALSOFT_REQUIRE_OSS:BOOL=ON \
 		-DALSOFT_REQUIRE_SOLARIS:BOOL=OFF \
 		-DALSOFT_REQUIRE_SNDIO:BOOL=OFF \
 		-DALSOFT_REQUIRE_QSA:BOOL=OFF \
 		-DALSOFT_BACKEND_ALSA:BOOL=OFF \
 		-DALSOFT_BACKEND_WAVE:BOOL=ON \
-		-DALSOFT_UTILS:BOOL=ON \
-		-DALSOFT_EXAMPLES:BOOL=OFF
+		-DALSOFT_EXAMPLES:BOOL=OFF \
+		-DALSOFT_UTILS:BOOL=ON
 
-OPTIONS_DEFINE=		FLUIDSYNTH CONFIG JACK PORTAUDIO PULSEAUDIO SNDIO
+OPTIONS_DEFINE=		EXAMPLES FLUIDSYNTH CONFIG OSS JACK PORTAUDIO \
+			PULSEAUDIO SNDIO
+OPTIONS_DEFAULT=	OSS
 OPTIONS_SUB=		yes
 CONFIG_DESC=		Install configuration utility (needs Qt 4.x)
 
@@ -40,6 +41,8 @@ CONFIG_USE=		QT4=corelib,gui,qmake_build,moc_build,rcc_build,uic_build
 FLUIDSYNTH_CMAKE_ON=	-DALSOFT_REQUIRE_FLUIDSYNTH:BOOL=ON
 FLUIDSYNTH_CMAKE_OFF=	-DALSOFT_MIDI_FLUIDSYNTH:BOOL=OFF
 FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
+OSS_CMAKE_ON=		-DALSOFT_REQUIRE_OSS:BOOL=ON
+OSS_CMAKE_OFF=		-DALSOFT_BACKEND_OSS:BOOL=OFF
 JACK_CMAKE_ON=		-DALSOFT_REQUIRE_JACK:BOOL=ON
 JACK_CMAKE_OFF=		-DALSOFT_BACKEND_JACK:BOOL=OFF
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
@@ -56,7 +59,11 @@ SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 post-patch:
 	@${REINPLACE_CMD} 's|/etc/openal|${ETCDIR}|' \
 		${WRKSRC}/Alc/alcConfig.c
-	@${REINPLACE_CMD} 's|$${SHARE_INSTALL_DIR}/openal|${ETCDIR}|' \
+	@${REINPLACE_CMD} 's|$${CMAKE_INSTALL_DATADIR}/openal|${ETCDIR}|' \
 		${WRKSRC}/CMakeLists.txt
 
+post-install-EXAMPLES-on:
+	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${EXAMPLESDIR})
+
 .include <bsd.port.mk>
diff --git a/audio/openal-soft/distinfo b/audio/openal-soft/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474007361
-SHA256 (openal-soft-1.17.2.tar.bz2) = a341f8542f1f0b8c65241a17da13d073f18ec06658e1a1606a8ecc8bbc2b3314
-SIZE (openal-soft-1.17.2.tar.bz2) = 486934
+TIMESTAMP = 1501391361
+SHA256 (openal-soft-1.18.1.tar.bz2) = 2d51a6529526ef22484f51567e31a5c346a599767991a3dc9d4dcd9d9cec71dd
+SIZE (openal-soft-1.18.1.tar.bz2) = 638913
diff --git a/audio/openal-soft/files/patch-Alc_backends_jack.c b/audio/openal-soft/files/patch-Alc_backends_jack.c
@@ -0,0 +1,34 @@
+--- Alc/backends/jack.c.orig	2017-07-30 05:09:21 UTC
++++ Alc/backends/jack.c
+@@ -35,11 +35,13 @@
+ #include <jack/ringbuffer.h>
+
+
++extern void default_jack_error_callback(const char *msg) JACK_OPTIONAL_WEAK_EXPORT;
++
+ static const ALCchar jackDevice[] = "JACK Default";
+
+-
+ #ifdef HAVE_DYNLOAD
+ #define JACK_FUNCS(MAGIC)          \
++    MAGIC(default_jack_error_callback); \
+     MAGIC(jack_client_open);       \
+     MAGIC(jack_client_close);      \
+     MAGIC(jack_client_name_size);  \
+@@ -65,6 +67,7 @@ static void *jack_handle;
+ JACK_FUNCS(MAKE_FUNC);
+ #undef MAKE_FUNC
+
++#define default_jack_error_callback (*pdefault_jack_error_callback)
+ #define jack_client_open pjack_client_open
+ #define jack_client_close pjack_client_close
+ #define jack_client_name_size pjack_client_name_size
+@@ -567,7 +570,7 @@ static ALCboolean ALCjackBackendFactory_init(ALCjackBa
+
+     jack_set_error_function(jack_msg_handler);
+     client = jack_client_open("alsoft", ClientOptions, &status, NULL);
+-    jack_set_error_function(NULL);
++    jack_set_error_function(default_jack_error_callback);
+     if(client == NULL)
+     {
+         WARN("jack_client_open() failed, 0x%02x\n", status);
diff --git a/audio/openal-soft/files/patch-CMakeLists.txt b/audio/openal-soft/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2016-01-25 03:12:39 UTC
+--- CMakeLists.txt.orig	2017-07-30 05:09:21 UTC
 +++ CMakeLists.txt
-@@ -582,10 +582,6 @@ int main()
+@@ -646,10 +646,6 @@ int main()
 
      CHECK_SYMBOL_EXISTS(pthread_mutex_timedlock pthread.h HAVE_PTHREAD_MUTEX_TIMEDLOCK)
 
@@ -11,12 +11,12 @@
  ENDIF()
 
  # Check for a 64-bit type
-@@ -1184,7 +1180,7 @@ IF(ALSOFT_INSTALL)
-             DESTINATION include/AL
+@@ -1322,7 +1318,7 @@ IF(ALSOFT_INSTALL)
+             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/AL
      )
      INSTALL(FILES "${OpenAL_BINARY_DIR}/openal.pc"
--            DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
+-            DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 +            DESTINATION "libdata/pkgconfig")
- ENDIF()
-
-
+     IF(TARGET soft_oal)
+         INSTALL(TARGETS soft_oal
+                 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
diff --git a/audio/openal-soft/files/patch-OpenAL32_alBuffer.c b/audio/openal-soft/files/patch-OpenAL32_alBuffer.c
@@ -1,8 +1,8 @@
---- OpenAL32/alBuffer.c.orig	2016-01-25 03:12:39 UTC
+--- OpenAL32/alBuffer.c.orig	2017-07-30 05:09:21 UTC
 +++ OpenAL32/alBuffer.c
-@@ -1209,7 +1209,7 @@ static ALboolean DecomposeFormat(ALenum 
-         { AL_FORMAT_BFORMAT3D_16,      FmtBFormat3D, FmtShort },
-         { AL_FORMAT_BFORMAT3D_FLOAT32, FmtBFormat3D, FmtFloat },
+@@ -1171,7 +1171,7 @@ static ALboolean DecomposeUserFormat(ALenum format, en
+         { AL_FORMAT_BFORMAT3D_FLOAT32, UserFmtBFormat3D, UserFmtFloat },
+         { AL_FORMAT_BFORMAT3D_MULAW,   UserFmtBFormat3D, UserFmtMulaw },
      };
 -    ALuint i;
 +    volatile ALuint i;

diff --git a/audio/openal-soft/pkg-plist b/audio/openal-soft/pkg-plist
@@ -6,13 +6,31 @@ bin/openal-info
 %%ETCDIR%%/alsoftrc.sample
 %%ETCDIR%%/hrtf/default-44100.mhr
 %%ETCDIR%%/hrtf/default-48000.mhr
+%%ETCDIR%%/presets/3D7.1.ambdec
+%%ETCDIR%%/presets/hexagon.ambdec
+%%ETCDIR%%/presets/itu5.1.ambdec
+%%ETCDIR%%/presets/presets.txt
+%%ETCDIR%%/presets/rectangle.ambdec
+%%ETCDIR%%/presets/square.ambdec
 include/AL/al.h
 include/AL/alc.h
 include/AL/alext.h
 include/AL/efx.h
 include/AL/efx-creative.h
 include/AL/efx-presets.h
-lib/libopenal.so.1.17.2
+lib/cmake/OpenAL/OpenALConfig-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/OpenAL/OpenALConfig.cmake
+lib/libopenal.so.1.18.1
 lib/libopenal.so.1
 lib/libopenal.so
 libdata/pkgconfig/openal.pc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alffplay.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alhrtf.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/allatency.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alloopback.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alrecord.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alreverb.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alstream.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/altonegen.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/common/alhelpers.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/common/alhelpers.h
diff --git a/benchmarks/iperf/Makefile b/benchmarks/iperf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	iperf
 PORTVERSION=	2.0.10
+PORTREVISION=	1
 CATEGORIES=	benchmarks
 MASTER_SITES=	SF/${PORTNAME}2
 

diff --git a/benchmarks/iperf/files/patch-src-Client.cpp b/benchmarks/iperf/files/patch-src-Client.cpp
@@ -0,0 +1,11 @@
+--- src/Client.cpp.orig	2017-08-09 03:54:14 UTC
++++ src/Client.cpp
+@@ -680,7 +680,7 @@ void Client::Run( void ) {
+
+         // store datagram ID into buffer
+ 	if (isSeqNo64b(mSettings)) {
+-	    mBuf_UDP->id      = htonl((reportstruct->packetID & 0xFFFFFFFFFL));
++	    mBuf_UDP->id      = htonl((reportstruct->packetID & 0xFFFFFFFFL));
+ 	    mBuf_UDP->id2     = htonl((((reportstruct->packetID & 0xFFFFFFFF00000000LL) >> 32) | 0x80000000L));
+ 	} else {
+ 	    mBuf_UDP->id      = htonl(((reportstruct->packetID & 0xFFFFFFFFL) | 0x80000000L));
diff --git a/cad/stepcode/Makefile b/cad/stepcode/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	stepcode
 PORTVERSION=	0.8
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	2
 CATEGORIES=	cad
 
 MAINTAINER=	[email protected]
@@ -15,14 +15,14 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_powerpc64=	fails to configure: Schema scan for 15926-0002-lifecycle_integration.exp exited with error code 1
 
+USES=		cmake:outsource compiler:c++11-lang
 USE_GITHUB=	yes
-
 USE_LDCONFIG=	yes
-
-USES=		cmake:outsource compiler:c++11-lang
 CMAKE_ARGS+=	-DSC_INSTALL_PREFIX=${PREFIX} \
 		-DSC_BUILD_TYPE=Release
 
+MANDIRS=	${PREFIX}/man
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/schema_scanner
 	@(cd ${STAGEDIR}${PREFIX} ; \

diff --git a/cad/stepcode/files/patch-doc_CMakeLists.txt b/cad/stepcode/files/patch-doc_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- doc/CMakeLists.txt.orig	2017-08-29 15:56:46 UTC
++++ doc/CMakeLists.txt
+@@ -4,7 +4,7 @@ set(sc_MANS
+   )
+
+ if(NOT DEFINED MAN_DIR)
+-  set(MAN_DIR share/man)
++  set(MAN_DIR man)
+ endif(NOT DEFINED MAN_DIR)
+
+ if(NOT WIN32)
diff --git a/cad/stepcode/pkg-plist b/cad/stepcode/pkg-plist
@@ -114,5 +114,5 @@ lib/libsteplazyfile.so.2.0.0
 lib/libsteputils.so
 lib/libsteputils.so.2
 lib/libsteputils.so.2.0.0
-share/man/man1/exp2cxx.1
-share/man/man1/fedex.1
+man/man1/exp2cxx.1.gz
+man/man1/fedex.1.gz
diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdf2djvu
 PORTVERSION=	0.7.21
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	converters
 MASTER_SITES=	https://bitbucket.org/jwilk/pdf2djvu/downloads/
 

diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kbibtex
 DISTVERSION=	0.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases kde
 MASTER_SITES=	http://download.gna.org/${PORTNAME}/${PORTVERSION:R}/
 

diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mysql
-PORTVERSION=	5.6.36
+PORTVERSION=	5.6.37
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.6
 PKGNAMESUFFIX?=	56-server

diff --git a/databases/mysql56-server/distinfo b/databases/mysql56-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492102457
-SHA256 (mysql-5.6.36.tar.gz) = 0af81a5538fc7fe2b747295dfa96589ace8831d2a7d4a26660fca456babeb147
-SIZE (mysql-5.6.36.tar.gz) = 32192348
+TIMESTAMP = 1500392788
+SHA256 (mysql-5.6.37.tar.gz) = 59c4ed39047279ddccd1bed9e247830d2bfad27d56dc2eb48d0b5695c94a1fbd
+SIZE (mysql-5.6.37.tar.gz) = 32200158
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	postgresql
-DISTVERSION?=	9.2.21
+DISTVERSION?=	9.2.22
 PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
@@ -61,7 +61,7 @@ INSTALL_TARGET?=install-strip
 SERVER_ONLY=	yes
 COMPONENT=	-server
 USE_RC_SUBR=	postgresql
-USES+=		pgsql:${DISTVERSION:C/([0-9][0-9]*\.[0-9][0-9]*).*/\1/g}
+USES+=		pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
 USERS=		${PG_USER}
 GROUPS=	${PG_GROUP}
 SUB_FILES+=	502.pgsql
@@ -83,9 +83,11 @@ DTRACE_DESC=	Build with DTrace probes
 TZDATA_DESC=	Use internal timezone database
 XML_DESC=	Build with XML data type
 
+.if ${DISTVERSION:C/([0-9]*).*/\1/} != 10
 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
 OPTIONS_DEFINE+=	ICU
 ICU_DESC=	Use ICU for unicode collation
+.endif
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
@@ -96,8 +98,10 @@ OPTIONS_DEFAULT+=	XML TZDATA INTDATE
 
 .if !defined(SLAVE_ONLY)
 OPTIONS_DEFINE+=	NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG
-OPTIONS_RADIO= KRB5
-OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5
+. if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3
+  OPTIONS_RADIO= KRB5
+  OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5
+. endif
 
 KRB5_DESC=       Build with kerberos provider support
 NLS_DESC=	Use internationalized messages