*/*: sync with upstream

Taken from: FreeBSD

audio/deadbeef/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	deadbeef
 PORTVERSION=	0.6.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/
 

audio/deadbeef/files/patch-junklib.c

@@ -0,0 +1,10 @@
+--- junklib.c.orig	2014-07-31 19:03:51 UTC
++++ junklib.c
+@@ -32,7 +32,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #if HAVE_ICONV
+-  #define LIBICONV_PLUG
+   #include <iconv.h>
+ #elif HAVE_ICU
+   #warning icu

audio/pd/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pd
-DISTVERSION=	0.46-6
+DISTVERSION=	0.46-7
 DISTVERSIONSUFFIX=	.src
 CATEGORIES=	audio
 MASTER_SITES=	http://msp.ucsd.edu/Software/

audio/pd/distinfo

@@ -1,2 +1,2 @@
-SHA256 (pd-0.46-6.src.tar.gz) = 721dd4048b7a225e5d7b4ff4a585781a56b7d32348ea4838f9db7805b07b8cec
-SIZE (pd-0.46-6.src.tar.gz) = 2252980
+SHA256 (pd-0.46-7.src.tar.gz) = 543802341bb0c7d03ed3a64cd56e2fafdbd35505d815ae3ced6555b43eaf58e5
+SIZE (pd-0.46-7.src.tar.gz) = 2254022

audio/pd/pkg-plist

@@ -375,7 +375,7 @@ man/man1/pdsend.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/5.reference/delay-help.pd
 %%PORTDOCS%%%%DOCSDIR%%/5.reference/delread~-help.pd
 %%PORTDOCS%%%%DOCSDIR%%/5.reference/delwrite~-help.pd
-%%PORTDOCS%%%%DOCSDIR%%/5.reference/drawnumber-help.pd
+%%PORTDOCS%%%%DOCSDIR%%/5.reference/drawtext-help.pd
 %%PORTDOCS%%%%DOCSDIR%%/5.reference/drawpolygon-help.pd
 %%PORTDOCS%%%%DOCSDIR%%/5.reference/element-help.pd
 %%PORTDOCS%%%%DOCSDIR%%/5.reference/env~-help.pd

audio/quimup/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	quimup
-PORTVERSION=	1.3.2
+PORTVERSION=	1.4.0
 CATEGORIES=	audio
 MASTER_SITES=	SF/musicpd/Quimup/${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src
@@ -15,29 +15,24 @@ LICENSE=	GPLv2 # (or later)
 LIB_DEPENDS=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient \
 		libtag.so:${PORTSDIR}/audio/taglib
 
-WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}\ ${PORTVERSION}
 
 USES=		pkgconfig qmake
-USE_QT4=	corelib gui network \
-		moc_build rcc_build uic_build
+USE_QT5=	core gui network widgets buildtools_build
 
-PLIST_FILES=	bin/${PORTNAME} \
-		share/pixmaps/${PORTNAME}.png
+PLIST_FILES=	bin/quimup \
+		share/pixmaps/quimup.png
 
-DESKTOP_ENTRIES="Quimup" "MPD client" \
-		"${PREFIX}/share/pixmaps/${PORTNAME}.png" "${PORTNAME}" \
+DESKTOP_ENTRIES="Quimup" "MPD client" "quiump" "quiump" \
 		"Audio;AudioVideo;Qt;" true
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		'/^CONFIG/s|-O2|| ; \
-		 s|^QMAKE_|#QMAKE_|' ${WRKSRC}/${PORTNAME}.pro
 	@${REINPLACE_CMD} -e \
 		'/^#define get_time/d' ${WRKSRC}/src/qm_playlistview.h
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/quimup ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/src/resources/mn_icon.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+		${STAGEDIR}${PREFIX}/share/pixmaps/quimup.png
 
 .include <bsd.port.mk>

audio/quimup/distinfo

@@ -1,2 +1,2 @@
-SHA256 (quimup_1.3.2_src.tar.gz) = a47f9e1e5debcca573acb08ef20e0f41ff74affb3c5857883de8365d741580be
-SIZE (quimup_1.3.2_src.tar.gz) = 228123
+SHA256 (quimup_1.4.0_src.tar.gz) = b46f8ff651b9154a43cf90b005c160cbbddcc2fb8c6b17dfdee9b6c4a2e131ea
+SIZE (quimup_1.4.0_src.tar.gz) = 225621

biology/ruby-bio/Makefile

@@ -28,7 +28,7 @@ USE_RUBY_SETUP=	yes
 SHEBANG_FILES=	sample/biofetch.rb
 ruby_OLD_CMD=	/usr/proj/bioruby/bin/ruby
 
-XML_PARSER_RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/xmlparser.so:${PORTSDIR}/textproc/ruby-xmlparser
+XMLPARSER_RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/xmlparser.so:${PORTSDIR}/textproc/ruby-xmlparser
 BDB4_RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
 MYSQL_RUN_DEPENDS=	rubygem-dbd-mysql>=0:${PORTSDIR}/databases/rubygem-dbd-mysql
 PGSQL_RUN_DEPENDS=	rubygem-dbd-pg>=0:${PORTSDIR}/databases/rubygem-dbd-pg

comms/hidapi/Makefile

@@ -15,10 +15,16 @@ LICENSE_COMB=	dual
 USE_GITHUB=	yes
 GH_ACCOUNT=	signal11
 
-USES=		autoreconf iconv:wchar_t libtool
+USES=		autoreconf gettext-tools iconv:wchar_t libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 PORTDOCS=	*
 
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+
+pre-configure:
+	@${CP} ${LOCALBASE}/share/gettext/config.rpath ${WRKSRC}
+
 .include <bsd.port.mk>

comms/hidapi/files/patch-configure.ac

@@ -1,11 +1,18 @@
---- configure.ac.orig
+--- configure.ac.orig	2013-10-06 22:43:37 UTC
 +++ configure.ac
-@@ -94,6 +94,8 @@
- 	LIBS="${LIBS}"
+@@ -89,11 +89,11 @@ case $host in
+ 	os="freebsd"
+ 	threads="pthreads"
+
+-	CFLAGS="$CFLAGS -I/usr/local/include"
+-	LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-	LIBS="${LIBS}"
  	AC_CHECK_LIB([usb], [libusb_init], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -lusb"], [hidapi_lib_error libusb])
- 	AC_CHECK_LIB([iconv], [iconv_open], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -liconv"], [hidapi_lib_error libiconv])
+-	AC_CHECK_LIB([iconv], [iconv_open], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -liconv"], [hidapi_lib_error libiconv])
 +	AC_CHECK_DECLS([libusb_get_string_descriptor], [], [], [[#include <libusb.h>]])
 +	AC_CHECK_DECLS([libusb_handle_events_completed], [], [], [[#include <libusb.h>]])
++	AM_ICONV
++	LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} ${LTLIBICONV}"
  	echo libs_priv: $LIBS_LIBUSB_PRIVATE
  	;;
  *-mingw*)

comms/hidapi/files/patch-libusb-hid.c

@@ -1,4 +1,4 @@
---- libusb/hid.c.orig
+--- libusb/hid.c.orig	2013-10-06 22:43:37 UTC
 +++ libusb/hid.c
 @@ -25,6 +25,8 @@
 
@@ -9,7 +9,7 @@
  /* C */
  #include <stdio.h>
  #include <string.h>
-@@ -250,7 +252,7 @@
+@@ -250,7 +252,7 @@ static int get_usage(uint8_t *report_des
  }
  #endif /* INVASIVE_GET_USAGE */
 
@@ -18,7 +18,20 @@
  /* The FreeBSD version of libusb doesn't have this funciton. In mainline
     libusb, it's inlined in libusb.h. This function will bear a striking
     resemblence to that one, because there's about one way to code it.
-@@ -757,7 +757,11 @@
+@@ -333,11 +335,7 @@ static wchar_t *get_usb_string(libusb_de
+ 	size_t inbytes;
+ 	size_t outbytes;
+ 	size_t res;
+-#ifdef __FreeBSD__
+-	const char *inptr;
+-#else
+-	char *inptr;
+-#endif
++	ICONV_CONST char *inptr;
+ 	char *outptr;
+ 
+ 	/* Determine which language to use. */
+@@ -757,7 +755,11 @@ static void *read_thread(void *param)
  	libusb_cancel_transfer(dev->transfer);
 
  	while (!dev->cancelled)

comms/unixcw/Makefile

@@ -4,7 +4,7 @@
 #       it still works as well.
 
 PORTNAME?=	unixcw
-PORTVERSION=	3.4.2
+PORTVERSION=	3.5.0
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/unixcw/unixcw-${PORTVERSION}
 DISTNAME=	unixcw_${PORTVERSION}.orig
@@ -13,21 +13,28 @@ MAINTAINER=	[email protected]
 COMMENT?=	Libs for cw on unix
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
-.ifndef CONFIGURE_ARGS
+.ifndef	CONFIGURE_ARGS
 CONFIGURE_ARGS=	--disable-xcwcp
 .endif
 CONFIGURE_ARGS+=	--includedir="${LOCALBASE}/include" \
 			--libdir="${LOCALBASE}/lib" \
 			--disable-alsa --disable-pulseaudio
 
 USE_LDCONFIG=	yes
-USES=		gmake libtool pkgconfig
+USES+=		gmake libtool pkgconfig
 USE_CSTD=	gnu99
 WRKSRC=		${WRKDIR}/unixcw-${PORTVERSION}
+MAJOR_LIB_VER=	6
+MINOR_LIB_VER=	5.1
+PLIST_SUB=	MAJOR_LIB_VER=${MAJOR_LIB_VER}
+PLIST_SUB+=	MINOR_LIB_VER=${MINOR_LIB_VER}
 
 post-install:
-	  ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcw.so.6.4.1
+.ifndef XCWCP
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcw.so.${MAJOR_LIB_VER}.${MINOR_LIB_VER}
+.endif
 
 .include <bsd.port.mk>

comms/unixcw/distinfo

@@ -1,2 +1,2 @@
-SHA256 (unixcw_3.4.2.orig.tar.gz) = 8c26f80861cb88de7554f1d693fb6288cf49ab5c7a6af31ee727860f56d76075
-SIZE (unixcw_3.4.2.orig.tar.gz) = 710813
+SHA256 (unixcw_3.5.0.orig.tar.gz) = ca94e54ce7e6da458aba13ecdea05e4ec7db50c482abf78201403c718680ac0c
+SIZE (unixcw_3.5.0.orig.tar.gz) = 719974

comms/unixcw/files/patch-src_libcw_Makefile.in

@@ -1,7 +1,7 @@
---- src/libcw/Makefile.in.orig	2015-06-10 20:55:54 UTC
+--- src/libcw/Makefile.in.orig	2015-10-06 17:17:18 UTC
 +++ src/libcw/Makefile.in
-@@ -690,7 +690,7 @@ libcw_test_simple_gen_LDADD = -lm -lpthr
- libcw_test_simple_gen_CFLAGS = -rdynamic
+@@ -676,7 +676,7 @@ libcw_test_internal_LDADD = -lm -lpthrea
+ libcw_test_internal_CFLAGS = -rdynamic
 
  # target: libcw.pc
 -pkgconfigdir = $(libdir)/pkgconfig

comms/unixcw/pkg-plist

@@ -5,8 +5,8 @@ include/libcw.h
 include/libcw_debug.h
 lib/libcw.a
 lib/libcw.so
-lib/libcw.so.6
-lib/libcw.so.6.4.1
+lib/libcw.so.%%MAJOR_LIB_VER%%
+lib/libcw.so.%%MAJOR_LIB_VER%%.%%MINOR_LIB_VER%%
 libdata/pkgconfig/libcw.pc
 man/man1/cw.1.gz
 man/man1/cwgen.1.gz

comms/xastir/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	xastir
 PORTVERSION=	2.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
 

comms/xcwcp/Makefile

@@ -1,25 +1,28 @@
 # $FreeBSD$
 
 PORTNAME=	xcwcp
+
 COMMENT=	X11 CW Tutor using unixcw
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libcw.so:${PORTSDIR}/comms/unixcw
 
 MASTERDIR=	${.CURDIR}/../unixcw
 
 PLIST=		${.CURDIR}/pkg-plist
-USE_QT4=	gui moc_build qmake_build rcc_build uic_build designer
-USE_AUTOTOOLS=	autoconf
+USE_QT5=	buildtools gui widgets qmake_build
+USES=		gettext
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-xcwcp
+XCWCP=		yes
 PLIST_FILES=	bin/xcwcp \
 		man/man1/xcwcp.1.gz
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
-post-stage:
-	# Remove files from the unixcw plist
-	for plistfile in `cat ${MASTERDIR}/pkg-plist`; \
-	do \
-		cleanfile=`echo $${plistfile} | ${SED} -E 's|man/man(.*).gz|man/man\1|'`; \
-		${RM} ${STAGEDIR}${PREFIX}/$${cleanfile}; \
-	done
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/xcwcp/xcwcp ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/src/xcwcp/xcwcp.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include "${MASTERDIR}/Makefile"

databases/mysql-workbench51/Makefile

@@ -11,6 +11,9 @@ PKGNAMESUFFIX=	51
 MAINTAINER=	[email protected]
 COMMENT=	The MySQL Workbench
 
+DEPRECATED=	EOL upstream, use databases/mysql-workbench52 instead
+EXPIRATION_DATE=	2015-11-10
+
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
 		libzip.so:${PORTSDIR}/archivers/libzip \

databases/mysql51-server/Makefile

@@ -11,6 +11,9 @@ PKGNAMESUFFIX?=	51-server
 MAINTAINER=	[email protected]
 COMMENT?=	Multithreaded SQL database (server)
 
+DEPRECATED=	EOL upstream, use mysql55 or mysql56 instead
+EXPIRATION_DATE=	2015-11-10
+
 SLAVEDIRS=	databases/mysql51-client databases/mysql51-scripts
 GNU_CONFIGURE=	yes
 

databases/p5-DBD-mysql51/Makefile

@@ -5,6 +5,9 @@ PKGNAMESUFFIX=	51
 
 COMMENT=	MySQL 5.1 driver for the Perl5 Database Interface (DBI)
 
+DEPRECATED=	EOL upstream, use databases/p5-DBD-mysql instead
+EXPIRATION_DATE=	2015-11-10
+
 CONFLICTS_INSTALL=	p5-DBD-mysql-[0-9]* p5-DBD-mysql5[02-9]-[0-9]*
 
 WANT_MYSQL_VER=	51

databases/p5-Tangram/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Tangram
-PORTVERSION=	2.11
+PORTVERSION=	2.12
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-

databases/p5-Tangram/distinfo

@@ -1,2 +1,2 @@
-SHA256 (Tangram-2.11.tar.gz) = d18c3c997213d576ab7d036749750806a0ec4fc024731d10547a57e11397e65d
-SIZE (Tangram-2.11.tar.gz) = 174989
+SHA256 (Tangram-2.12.tar.gz) = 06da4d0e5f4bd0dd001d1a67736197ff378d5de0519c5af0d60624e98bc5ea19
+SIZE (Tangram-2.12.tar.gz) = 175039

databases/percona56-client/Makefile

@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PORTNAME=	percona
-PORTREVISION=	2
 PKGNAMESUFFIX=	56-client
 
 COMMENT=	Multithreaded SQL database (client)

databases/percona56-client/files/patch-CMakeLists.txt

@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2014-10-06 18:06:02.000000000 +0200
-+++ CMakeLists.txt	2014-10-18 16:20:43.311977761 +0200
-@@ -468,40 +468,17 @@
+--- CMakeLists.txt	2015-09-14 17:49:16.000000000 +0200
++++ CMakeLists.txt.new	2015-09-16 09:04:18.149047561 +0200
+@@ -471,41 +471,17 @@
 
  ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(client)
@@ -37,12 +37,13 @@
 -  ADD_SUBDIRECTORY(packaging/rpm-oel)
 -  ADD_SUBDIRECTORY(packaging/rpm-fedora)
 -  ADD_SUBDIRECTORY(packaging/rpm-sles)
+-  ADD_SUBDIRECTORY(packaging/rpm-docker)
 -ENDIF()
 -
  INCLUDE(cmake/abi_check.cmake)
  INCLUDE(cmake/tags.cmake)
 
-@@ -568,18 +546,17 @@
+@@ -542,18 +518,17 @@
    SET(CPACK_GENERATOR "TGZ")
  ENDIF() 
  ADD_SUBDIRECTORY(packaging/WiX)
@@ -62,7 +63,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -605,5 +582,6 @@
+@@ -579,6 +554,7 @@
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()

databases/percona56-client/files/patch-vio_viosocket.c

@@ -0,0 +1,13 @@
+--- vio/viosocket.c.orig	2015-07-08 07:38:39 UTC
++++ vio/viosocket.c
+@@ -33,6 +33,10 @@
+ static void (*before_io_wait)(void)= 0;
+ static void (*after_io_wait)(void)= 0;
+
++#ifdef __FreeBSD__
++#define s6_addr32 __u6_addr.__u6_addr32
++#endif
++
+ /* Wait callback macros (both performance schema and threadpool */
+ #define START_SOCKET_WAIT(locker, state_ptr, sock, which, timeout) \
+ do                                                                 \