*/*: sync with upstream

Taken from: FreeBSD
snape7997 · Jan 15, 2017 · 745b48b · 745b48b
1 parent bd7b7e4
commit 745b48b
Show file tree

Hide file tree

Showing 504 changed files with 3,586 additions and 3,951 deletions.
diff --git a/astro/libosmium/files/patch-include_osmium_util_endian.hpp b/astro/libosmium/files/patch-include_osmium_util_endian.hpp
@@ -5,7 +5,7 @@
  // Windows is only available for little endian architectures
  // http://stackoverflow.com/questions/6449468/can-i-safely-assume-that-windows-installations-will-always-be-little-endian
 -#if !defined(_WIN32) && !defined(__APPLE__)
-+#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
 +# include <sys/endian.h>
 +#elif !defined(_WIN32) && !defined(__APPLE__)
  # include <endian.h>

diff --git a/astro/xearth/files/freebsd.committers.markers b/astro/xearth/files/freebsd.committers.markers
@@ -217,6 +217,7 @@
  52.188649,	-2.2341,	"crees"				# Worcester, West Midlands, United Kingdom
  42.8474,	-2.66976,	"carvay"			# Araba, Vitoria-Gasteiz, Spain
  51.49,		-3.16,		"ceri"				# Cardiff, UK
+ 37.1876,	-3.6149,	"cpm"				# Granada, Spain
  53.20,		-6.15,		"dwmalone"	align=left	# Dublin, Ireland
  53.286499,	-6.196429,	"flz"				# Stillorgan, Co. Dublin, Ireland
  53.65,		-6.67,		"peadar"	align=above	# Navan, Co. Meath, Ireland

diff --git a/audio/ardour5/Makefile b/audio/ardour5/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	ardour5
 PORTVERSION=	5.5.0
 CATEGORIES=	audio
-MASTER_SITES=	https://github.com/beerml/ardour_releases/raw/master/ \
-		http://github.com/beerml/ardour_releases/raw/master/
+MASTER_SITES=	https://github.com/beerml/ardour_releases/raw/master/
 # The original master side points to the latest release only:
 # MASTER_SITES=	https://community.ardour.org/srctar/
 DISTNAME=	Ardour-${PORTVERSION}

diff --git a/audio/flac/Makefile b/audio/flac/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flac
-PORTVERSION=	1.3.1
-PORTREVISION=	2
+PORTVERSION=	1.3.2
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/flac/
 
@@ -22,7 +21,7 @@ USES=		iconv libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static \
-		--enable-sse \
+		--disable-sse \
 		--with-ogg="${LOCALBASE}" \
 		--disable-doxygen-docs \
 		--disable-thorough-tests \

diff --git a/audio/flac/distinfo b/audio/flac/distinfo
@@ -1,2 +1,3 @@
-SHA256 (flac-1.3.1.tar.xz) = 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c
-SIZE (flac-1.3.1.tar.xz) = 941848
+TIMESTAMP = 1484327981
+SHA256 (flac-1.3.2.tar.xz) = 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f
+SIZE (flac-1.3.2.tar.xz) = 776192
diff --git a/audio/flac/files/patch-configure b/audio/flac/files/patch-configure
@@ -1,31 +1,13 @@
---- configure.orig	2014-11-27 02:46:58 UTC
+--- configure.orig	2017-01-01 03:46:48 UTC
 +++ configure
-@@ -17885,7 +17885,7 @@ _ACEOF
-
- asm_optimisation=no
- case "$host_cpu" in
--	x86_64)
-+	amd64|x86_64)
- 		if test $ac_cv_sizeof_voidp = 4 ; then
- 			# This must be a 32 bit user space running on 64 bit kernel so treat
- 			# this as ia32.
-@@ -19874,8 +19874,8 @@ if test "x$debug" = xtrue; then
+@@ -20547,8 +20547,8 @@ if test "x$debug" = xtrue; then
  	CFLAGS="-g $CFLAGS"
  else
  	CPPFLAGS="-DNDEBUG $CPPFLAGS"
--	CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
+-	CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//')
 -	CFLAGS="-O3 -funroll-loops $CFLAGS"
-+	#CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
++	#CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//')
 +	#CFLAGS="-O3 -funroll-loops $CFLAGS"
  fi
 
 
-@@ -20051,7 +20051,7 @@ rm -f core conftest.err conftest.$ac_obj
-
- 		fi
-
--	if test "x$asm_optimisation$sse_os" = "xyesyes" ; then
-+	if false test "x$asm_optimisation$sse_os" = "xyesyes" ; then
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -msse2" >&5
- $as_echo_n "checking if $CC accepts -msse2... " >&6; }
- 	ac_add_cflags__old_cflags="$CFLAGS"
diff --git a/audio/flac/files/patch-doc_html_Makefile.in b/audio/flac/files/patch-doc_html_Makefile.in
diff --git a/audio/flac/pkg-plist b/audio/flac/pkg-plist
diff --git a/audio/opencore-amr/Makefile b/audio/opencore-amr/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opencore-amr
-PORTVERSION=	0.1.3
-PORTREVISION=	1
+PORTVERSION=	0.1.4
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 

diff --git a/audio/opencore-amr/distinfo b/audio/opencore-amr/distinfo
@@ -1,2 +1,3 @@
-SHA256 (opencore-amr-0.1.3.tar.gz) = 106bf811c1f36444d7671d8fd2589f8b2e0cca58a2c764da62ffc4a070595385
-SIZE (opencore-amr-0.1.3.tar.gz) = 881105
+TIMESTAMP = 1484314752
+SHA256 (opencore-amr-0.1.4.tar.gz) = 029918505e6a357b2b09432c7892a192d740d8b82f8a44c2e0805ba45643a95b
+SIZE (opencore-amr-0.1.4.tar.gz) = 929807
diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile
@@ -17,8 +17,6 @@ LICENSE_NAME=	TeamSpeak 3.x End User License Agreement
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
 
-BROKEN_FreeBSD_11=Will not start on 11, Bug 212493
-
 USES=		tar:bz2
 NO_BUILD=	yes
 USE_LDCONFIG=	${LIBDIR}
@@ -46,6 +44,10 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100000 && ${OSVERSION} < 1100507
+BROKEN=	Will not start on FreeBSD 11, Bug 212493
+.endif
+
 .if ${ARCH} ==	"i386"
 TEAMSPEAK_ARCH=	x86
 WRKSRC=	${WRKDIR}/${PORTNAME}_freebsd_${TEAMSPEAK_ARCH}

diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmms-flac
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/flac/
 DISTNAME=	flac-${PORTVERSION}
@@ -16,8 +16,11 @@ LIB_DEPENDS=	libxmms.so:multimedia/xmms \
 		libFLAC.so:audio/flac \
 		libogg.so:audio/libogg
 
-USES=		iconv libtool tar:xz
+USES=		gettext-runtime iconv libtool tar:xz
+USE_GNOME=	gtk12
+USE_XORG=	xi xext x11
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 
 MAKEFILE=	${FILESDIR}/Makefile
 

diff --git a/audio/xmms-flac/distinfo b/audio/xmms-flac/distinfo
@@ -1,2 +1,3 @@
-SHA256 (flac-1.3.1.tar.xz) = 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c
-SIZE (flac-1.3.1.tar.xz) = 941848
+TIMESTAMP = 1484341501
+SHA256 (flac-1.3.2.tar.xz) = 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f
+SIZE (flac-1.3.2.tar.xz) = 776192
diff --git a/audio/xmms-flac/files/Makefile b/audio/xmms-flac/files/Makefile
@@ -2,7 +2,7 @@
 
 SUBDIRS= src/share src/plugin_common src/plugin_xmms
 
-all install:
+all install install-strip:
 	@for d in ${SUBDIRS}; do \
 		(cd $$d; ${MAKE} $@); \
 	done
diff --git a/audio/xmms-flac/files/patch-configure b/audio/xmms-flac/files/patch-configure
@@ -1,31 +1,13 @@
---- configure.orig	2014-11-27 02:46:58 UTC
+--- configure.orig	2017-01-01 03:46:48 UTC
 +++ configure
-@@ -17885,7 +17885,7 @@ _ACEOF
-
- asm_optimisation=no
- case "$host_cpu" in
--	x86_64)
-+	amd64|x86_64)
- 		if test $ac_cv_sizeof_voidp = 4 ; then
- 			# This must be a 32 bit user space running on 64 bit kernel so treat
- 			# this as ia32.
-@@ -19874,8 +19874,8 @@ if test "x$debug" = xtrue; then
+@@ -20547,8 +20547,8 @@ if test "x$debug" = xtrue; then
  	CFLAGS="-g $CFLAGS"
  else
  	CPPFLAGS="-DNDEBUG $CPPFLAGS"
--	CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
+-	CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//')
 -	CFLAGS="-O3 -funroll-loops $CFLAGS"
-+	#CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
++	#CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//')
 +	#CFLAGS="-O3 -funroll-loops $CFLAGS"
  fi
 
 
-@@ -20051,7 +20051,7 @@ rm -f core conftest.err conftest.$ac_obj
-
- 		fi
-
--	if test "x$asm_optimisation$sse_os" = "xyesyes" ; then
-+	if false test "x$asm_optimisation$sse_os" = "xyesyes" ; then
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -msse2" >&5
- $as_echo_n "checking if $CC accepts -msse2... " >&6; }
- 	ac_add_cflags__old_cflags="$CFLAGS"
diff --git a/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in b/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in
@@ -1,6 +1,6 @@
---- src/plugin_xmms/Makefile.in.orig	2014-11-27 02:47:01 UTC
+--- src/plugin_xmms/Makefile.in.orig	2017-01-01 03:46:49 UTC
 +++ src/plugin_xmms/Makefile.in
-@@ -156,8 +156,7 @@ libxmms_flac_la_DEPENDENCIES =  \
+@@ -166,8 +166,7 @@ libxmms_flac_la_DEPENDENCIES =  \
  	$(top_builddir)/src/share/grabbag/libgrabbag.la \
  	$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
  	$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
@@ -10,7 +10,7 @@
  am__objects_1 = charset.lo configure.lo fileinfo.lo http.lo plugin.lo \
  	tag.lo
  am_libxmms_flac_la_OBJECTS = $(am__objects_1)
-@@ -413,8 +412,7 @@ libxmms_flac_la_LIBADD = \
+@@ -429,8 +428,7 @@ libxmms_flac_la_LIBADD = \
  	$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
  	$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
  	$(top_builddir)/src/share/utf8/libutf8.la \

diff --git a/benchmarks/sipp/Makefile b/benchmarks/sipp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	sipp
 PORTVERSION=	3.5.1
+PORTREVISION=	1
 CATEGORIES=	benchmarks net
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/
 
@@ -29,7 +30,7 @@ SCTP_CONFIGURE_WITH=	sctp
 RTPSTREAM_CONFIGURE_WITH=	rtpstream
 OPENSSL_CONFIGURE_WITH=	openssl
 
-OPENSSL_USE=	openssl=yes
+OPENSSL_USES=		ssl
 GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 
 PCAP_FILES=	dtmf_2833_0.pcap dtmf_2833_1.pcap dtmf_2833_2.pcap \
@@ -41,7 +42,7 @@ PCAP_FILES=	dtmf_2833_0.pcap dtmf_2833_1.pcap dtmf_2833_2.pcap \
 PCAP_PLIST_FILES=	${PCAP_FILES:S|^|${DATADIR}/pcap/|}
 
 post-patch:
-	${REINPLACE_CMD} -e 's|-lcurses|-lncurses|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|[[:<:]]curses|ncurses|' ${WRKSRC}/configure.ac
 
 post-patch-PCAP-on:
 	@${REINPLACE_CMD} \
@@ -50,7 +51,7 @@ post-patch-PCAP-on:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/sipp.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/include/sipp.1 ${STAGEDIR}${PREFIX}/man/man1
 
 do-install-PCAP-on:
 	${MKDIR} ${STAGEDIR}${DATADIR}/pcap

diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kicad
 DISTVERSION=	20140622%2Bbzr4027
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	cad
 MASTER_SITES=	https://launchpadlibrarian.net/179199115/
@@ -19,14 +19,8 @@ RUN_DEPENDS=	xpdf:graphics/xpdf
 
 CONFLICTS=	kicad-devel*
 
-USES=		cmake desktop-file-utils dos2unix shared-mime-info tar:xz
-
-# Does not compile with Gcc48
-USE_GCC=	4.7
-#USES+=		compiler:gcc-c++11-lib
-LDFLAGS+=	-L${LOCALBASE}/lib/c++
-CXXFLAGS+=	-nostdinc++ -isystem ${LOCALBASE}/include/c++/v1
-BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
+USES=		cmake compiler:gcc-c++11-lib desktop-file-utils dos2unix \
+		shared-mime-info tar:xz
 
 DOS2UNIX_GLOB=	*.cmake sch_bus_entry.h sch_line.h sch_no_connect.h
 USE_XORG=	ice x11 xext

diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
@@ -1,34 +1,40 @@
 # $FreeBSD$
 
 PORTNAME=	librecad
-DISTVERSION=	2.0.8
-PORTREVISION=	2
+PORTVERSION=	2.1.3
 CATEGORIES=	cad
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	2D CAD system
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/gpl-2.0.txt
+
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/version.hpp:devel/boost-libs
-LIB_DEPENDS=	libmuparser.so:math/muparser
+LIB_DEPENDS=	libmuparser.so:math/muparser \
+		libfreetype.so:print/freetype2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LibreCAD
 GH_PROJECT=	LibreCAD
 
-USE_QT4=	gui help network sql svg help-tools_build \
-		linguisttools_build moc_build rcc_build uic_build
 USES=		compiler:c++11-lib desktop-file-utils pkgconfig qmake
+USE_GL=		gl
+USE_QT5=	core gui printsupport sql svg widgets \
+		buildtools_build linguisttools_build
+QMAKE_ARGS+=	BOOST_DIR="${LOCALBASE}"
 
 # Unhide std::to_string() to fix build with GCC (ports/193528)
 CFLAGS+=	-D_GLIBCXX_USE_C99
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \
+	@${REINPLACE_CMD} -e 's|QMAKE_CXXFLAGS += -g||' \
+		${WRKSRC}/common.pri
+	@${REINPLACE_CMD} -e 's|lrelease|${LRELEASE}|' \
+		${WRKSRC}/scripts/postprocess-unix.sh
+	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
 		${WRKSRC}/librecad/src/lib/engine/rs_settings.cpp \
 		${WRKSRC}/librecad/src/lib/engine/rs_system.cpp
-	@${REINPLACE_CMD} -e \
-		'/^Icon/s,librecad,${PREFIX}/share/pixmaps/librecad.png,' \
-		${WRKSRC}/desktop/librecad.desktop
 
 pre-install:
 	@${CHMOD} +w ${WRKSRC}/unix/resources/plugins/*.so

diff --git a/cad/librecad/distinfo b/cad/librecad/distinfo
@@ -1,2 +1,3 @@
-SHA256 (LibreCAD-LibreCAD-2.0.8_GH0.tar.gz) = ddf654a29369d0b6e275584eb769c5d682957cb34babd004d1c71206cd080f34
-SIZE (LibreCAD-LibreCAD-2.0.8_GH0.tar.gz) = 19965985
+TIMESTAMP = 1484384119
+SHA256 (LibreCAD-LibreCAD-2.1.3_GH0.tar.gz) = 74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06
+SIZE (LibreCAD-LibreCAD-2.1.3_GH0.tar.gz) = 22415288
diff --git a/cad/librecad/pkg-plist b/cad/librecad/pkg-plist
@@ -2,11 +2,11 @@ bin/librecad
 bin/ttf2lff
 share/appdata/librecad.appdata.xml
 share/applications/librecad.desktop
-%%DATADIR%%/doc/LibreCADdoc.qch
-%%DATADIR%%/doc/LibreCADdoc.qhc
 %%DATADIR%%/fonts/OpenGostTypeA-Regular.lff
 %%DATADIR%%/fonts/OpenGostTypeB-Regular.lff
 %%DATADIR%%/fonts/amiri-regular.lff
+%%DATADIR%%/fonts/azomix.lff
+%%DATADIR%%/fonts/azomix_i.lff
 %%DATADIR%%/fonts/cursive.lff
 %%DATADIR%%/fonts/cyrillic_ii.lff
 %%DATADIR%%/fonts/gothgbt.lff
@@ -18,6 +18,8 @@ share/applications/librecad.desktop
 %%DATADIR%%/fonts/greekp.lff
 %%DATADIR%%/fonts/greeks.lff
 %%DATADIR%%/fonts/iso.lff
+%%DATADIR%%/fonts/iso3098.lff
+%%DATADIR%%/fonts/iso3098_i.lff
 %%DATADIR%%/fonts/italicc.lff
 %%DATADIR%%/fonts/italiccs.lff
 %%DATADIR%%/fonts/italict.lff
@@ -1418,6 +1420,7 @@ share/applications/librecad.desktop
 %%DATADIR%%/qm/librecad_es_uy.qm
 %%DATADIR%%/qm/librecad_es_ve.qm
 %%DATADIR%%/qm/librecad_et.qm
+%%DATADIR%%/qm/librecad_eu.qm
 %%DATADIR%%/qm/librecad_fi.qm
 %%DATADIR%%/qm/librecad_fr.qm
 %%DATADIR%%/qm/librecad_gl.qm
@@ -1474,6 +1477,7 @@ share/applications/librecad.desktop
 %%DATADIR%%/qm/plugins_es_uy.qm
 %%DATADIR%%/qm/plugins_es_ve.qm
 %%DATADIR%%/qm/plugins_et.qm
+%%DATADIR%%/qm/plugins_eu.qm
 %%DATADIR%%/qm/plugins_fi.qm
 %%DATADIR%%/qm/plugins_fr.qm
 %%DATADIR%%/qm/plugins_gl.qm

diff --git a/chinese/pyzy/pkg-descr b/chinese/pyzy/pkg-descr
@@ -3,4 +3,4 @@ The Chinese PinYin and Bopomofo conversion library
 This is the Chinese PinYin / Bopomofo conversion library.
 You can easily write an application which handles the Chinese with it.
 
-WWW: http://github.com/pyzy/pyzy
+WWW: https://github.com/pyzy/pyzy