*/*: sync with upstream

Taken from: FreeBSD

archivers/Makefile

@@ -190,6 +190,7 @@
     SUBDIR += rubygem-archive-tar-minitar
     SUBDIR += rubygem-archive-zip
     SUBDIR += rubygem-bzip2-ruby
+    SUBDIR += rubygem-fpm
     SUBDIR += rubygem-libarchive
     SUBDIR += rubygem-minitar
     SUBDIR += rubygem-ruby-xz

archivers/p5-Compress-LZF/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Compress-LZF
-PORTVERSION=	3.70
-PORTREVISION=	2
+PORTVERSION=	3.80
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-

archivers/p5-Compress-LZF/distinfo

@@ -1,2 +1,3 @@
-SHA256 (Compress-LZF-3.7.tar.gz) = 571389c9ab62d9d0dbae479460d8c2b5132de7467990198532b9f4845b9ecfe4
-SIZE (Compress-LZF-3.7.tar.gz) = 26546
+TIMESTAMP = 1486254639
+SHA256 (Compress-LZF-3.8.tar.gz) = 5d1f5df48ce13b4dee1cc9f278ecdbf8177877b0b98815a4eb3c91c3466716f2
+SIZE (Compress-LZF-3.8.tar.gz) = 31727

archivers/p5-POE-Filter-Bzip2/Makefile

@@ -2,16 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	POE-Filter-Bzip2
-PORTVERSION=	1.5.8
-PORTREVISION=	1
+PORTVERSION=	1.58
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	[email protected]
 COMMENT=	POE filter wrapped around Compress::Bzip2
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 BUILD_DEPENDS=	p5-Compress-Bzip2>=2.08:archivers/p5-Compress-Bzip2 \
 		p5-POE>=0.38:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}

archivers/p5-POE-Filter-LZF/Makefile

@@ -2,16 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	POE-Filter-LZF
-PORTVERSION=	1.7.0
-PORTREVISION=	1
+PORTVERSION=	1.70
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	[email protected]
 COMMENT=	POE filter wrapped around Compress::LZF
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 BUILD_DEPENDS=	p5-Compress-LZF>=1.51:archivers/p5-Compress-LZF \
 		p5-POE>=0.38:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}

archivers/p5-POE-Filter-LZO/Makefile

@@ -2,16 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	POE-Filter-LZO
-PORTVERSION=	1.7.0
-PORTREVISION=	1
+PORTVERSION=	1.70
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	[email protected]
 COMMENT=	POE filter wrapped around Compress::LZO
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 BUILD_DEPENDS=	p5-Compress-LZO>=1.08:archivers/p5-Compress-LZO \
 		p5-POE>=0.38:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}

archivers/p5-POE-Filter-LZW/Makefile

@@ -2,16 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	POE-Filter-LZW
-PORTVERSION=	1.7.2
-PORTREVISION=	1
+PORTVERSION=	1.72
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	[email protected]
 COMMENT=	POE filter wrapped around Compress::LZW
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 BUILD_DEPENDS=	p5-Compress-LZW>=0:archivers/p5-Compress-LZW \
 		p5-POE>=0.38:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}

archivers/p5-POE-Filter-Zlib/Makefile

@@ -2,16 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	POE-Filter-Zlib
-PORTVERSION=	2.0.2
-PORTREVISION=	2
+PORTVERSION=	2.02
 CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	[email protected]
 COMMENT=	POE filter wrapped around Compress::Zlib
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 BUILD_DEPENDS=	p5-POE>=0.38:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 

archivers/rubygem-fpm/Makefile

@@ -0,0 +1,31 @@
+# $FreeBSD$
+
+PORTNAME=	fpm
+PORTVERSION=	1.8.0
+CATEGORIES=	archivers rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	[email protected]
+COMMENT=	Build packages for multiple platforms with great ease and sanity
+
+RUN_DEPENDS=	rubygem-archive-tar-minitar>=0:archivers/rubygem-archive-tar-minitar \
+		rubygem-arr-pm>=0.0.10:devel/rubygem-arr-pm \
+		rubygem-backports>0:devel/rubygem-backports \
+		rubygem-cabin>=0.6.0:devel/rubygem-cabin \
+		rubygem-childprocess>=0:devel/rubygem-childprocess \
+		rubygem-clamp>=1.0.0:devel/rubygem-clamp \
+		rubygem-ffi>=0:devel/rubygem-ffi \
+		rubygem-mustache>=0:devel/rubygem-mustache \
+		rubygem-json1>=1.7:devel/rubygem-json1 \
+		rubygem-pleaserun>=0.0.24:devel/rubygem-pleaserun \
+		rubygem-ruby-xz>=0:archivers/rubygem-ruby-xz
+
+USE_RUBY=	yes
+USES=		gem
+
+PLIST_FILES=	bin/fpm
+
+post-patch:
+	@${REINPLACE_CMD} -e 's/1\.0\.0/1.0/' ${WRKSRC}/fpm.gemspec
+
+.include <bsd.port.mk>

archivers/rubygem-fpm/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1486132992
+SHA256 (rubygem/fpm-1.8.0.gem) = 91a1a0ffac2e1b4c1fbbca1409f35b77a242fa3fa1e1e330c1d9c9f5aa44efc6
+SIZE (rubygem/fpm-1.8.0.gem) = 135168

archivers/rubygem-fpm/pkg-descr

@@ -0,0 +1,5 @@
+Convert directories, rpms, python eggs, rubygems, and more to rpms, debs,
+solaris packages and more. Win at package management without wasting pointless
+hours debugging bad rpm specs!
+
+WWW: https://github.com/jordansissel/fpm

archivers/rubygem-ruby-xz/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	ruby-xz
 PORTVERSION=	0.2.3
+PORTREVISION=	1
 CATEGORIES=	archivers rubygems
 MASTER_SITES=	RG
 
@@ -11,6 +12,10 @@ COMMENT=	Ruby bindings for the liblzma library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+RUN_DEPENDS=	rubygem-ffi>=1.9:devel/rubygem-ffi \
+		rubygem-io-like>=0.3:devel/rubygem-io-like \
+		rubygem-archive-tar-minitar>=0.5:archivers/rubygem-archive-tar-minitar
+
 NO_ARCH=	yes
 USE_RUBY=	yes
 USES=		gem

archivers/star/Makefile

@@ -11,7 +11,7 @@ COMMENT=	Unique standard tape archiver with many enhancements
 
 LICENSE=	CDDL GPLv2
 LICENSE_COMB=	multi
-LICENSE_FILES=	${WRKSRC}/CDDL.Schily.txt
+LICENSE_FILE=	${WRKSRC}/CDDL.Schily.txt
 
 BUILD_DEPENDS=	smake:devel/smake
 

astro/p5-Astro-Catalog/Makefile

@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	Astro-Catalog
-PORTVERSION=	4.3.1
-PORTREVISION=	1
+PORTVERSION=	4.31
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	[email protected]
 COMMENT=	Generic stellar catalogue object
@@ -27,9 +25,8 @@ BUILD_DEPENDS=	p5-Astro-Coords>=0.12:astro/p5-Astro-Coords \
 		p5-libwww>=5.53:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-USES=		perl5
+NO_ARCH=	yes
+USES=		localbase perl5
 USE_PERL5=	modbuild
 
 post-patch:

audio/beast/Makefile

@@ -75,4 +75,4 @@ post-patch:
 		's|-DG_DISABLE_DEPRECATED||' ${WRKSRC}/bse/Makefile.am \
 		${WRKSRC}/bse/Makefile.in
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

audio/csound/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	csound
 PORTVERSION=	5.19.01
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R} \
 		SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R}/manual:manual
@@ -27,7 +27,8 @@ CONFLICTS_INSTALL=	outguess-* csound6
 
 WRKSRC=		${WRKDIR}/${PORTNAME:S/c/C/}${PORTVERSION}
 
-USES=		bison cpe gettext scons compiler:openmp python
+USES=		bison cpe gettext scons compiler:gcc-c++11-lib python
+USE_CSTD=	gnu89
 # math/gmm++ requires c++11
 USE_CXXSTD=	c++11
 CPE_VENDOR=	csounds

audio/forked-daapd/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	forked-daapd
 PORTVERSION=	24.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	[email protected]

audio/logitechmediaserver/Makefile

@@ -84,15 +84,17 @@ SLIMGROUP?=	${SLIMUSER}
 
 .include <bsd.port.pre.mk>
 
-ARCHNAME!=	${PERL} -V:archname | ${AWK} -F"'" '{print $$2}'
+ONLY_FOR_ARCHS=	i386 amd64
 
 .if ${ARCH} == "i386"
+ARCHNAME=	i386-freebsd-thread-multi-64int
 PLIST_SUB+=	I386_ONLY=""
 .else
 PLIST_SUB+=	I386_ONLY="@comment "
 .endif
 
 .if ${ARCH} == "amd64"
+ARCHNAME=	amd64-freebsd-thread-multi
 PLIST_SUB+=	AMD64_ONLY=""
 .else
 PLIST_SUB+=	AMD64_ONLY="@comment "

audio/rhythmbox/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	rhythmbox
 PORTVERSION=	3.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 LIB_DEPENDS=	libmusicbrainz5.so:audio/libmusicbrainz5 \
 		libtotem-plparser.so:multimedia/totem-pl-parser \
 		libdbus-glib-1.so:devel/dbus-glib \
-		libcheck.so:devel/libcheck \
+		libcheck.so:devel/check \
 		libpeas-1.0.so:devel/libpeas \
 		libjson-glib-1.0.so:devel/json-glib \
 		libsoup-gnome-2.4.so:devel/libsoup-gnome \

biology/Makefile

@@ -88,6 +88,7 @@
     SUBDIR += python-nexus
     SUBDIR += recombine
     SUBDIR += ruby-bio
+    SUBDIR += rubygem-bio
     SUBDIR += samtools
     SUBDIR += seaview
     SUBDIR += seqan

devel/rubygem-bio/Makefile → biology/rubygem-bio/Makefile

@@ -4,7 +4,7 @@
 PORTNAME=	bio
 PORTVERSION=	1.4.3.0001
 PORTREVISION=	1
-CATEGORIES=	devel rubygems
+CATEGORIES=	biology rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	[email protected]

chinese/libchewing/Makefile

@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	libchewing
-PORTVERSION=	0.5.0
+PORTVERSION=	0.5.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	chinese textproc
 
 MAINTAINER=	[email protected]

chinese/libchewing/distinfo

@@ -1,2 +1,3 @@
-SHA256 (chewing-libchewing-v0.5.0_GH0.tar.gz) = ef56c62ca1a84fd307aebc1eb271a1fb5d9becf05300c6fc1c97d1320c4f201b
-SIZE (chewing-libchewing-v0.5.0_GH0.tar.gz) = 3380799
+TIMESTAMP = 1486218448
+SHA256 (chewing-libchewing-v0.5.1_GH0.tar.gz) = b30a809123b6ba36283765b9337a98d695a292d361bd6f6bc74f03ac4f5772f8
+SIZE (chewing-libchewing-v0.5.1_GH0.tar.gz) = 3380799

chinese/libchewing/files/patch-CMakeLists.txt

@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2016-05-09 16:30:03 UTC
+--- CMakeLists.txt.orig	2017-02-04 14:42:12 UTC
 +++ CMakeLists.txt
 @@ -140,6 +140,7 @@ set(libdir "\${exec_prefix}/lib")
  set(includedir "\${prefix}/include")
@@ -21,12 +21,3 @@
  endif()
 
 
-@@ -362,7 +359,7 @@ add_library(chewing OBJECT
-     ${SRC_DIR}/bopomofo.c
- )
- set_target_properties(chewing PROPERTIES
--    COMPILE_DEFINITIONS "CHEWING_DATADIR=\"${CMAKE_INSTALL_DATADIR}/libchewing\""
-+    COMPILE_DEFINITIONS "CHEWING_DATADIR=\"${CMAKE_INSTALL_FULL_DATADIR}/libchewing\""
- )
-
- if (WITH_SQLITE3)

chinese/libchewing/pkg-plist

@@ -6,7 +6,7 @@ include/chewing/mod_aux.h
 lib/libchewing.a
 lib/libchewing.so
 lib/libchewing.so.3
-lib/libchewing.so.3.3.0
+lib/libchewing.so.3.3.1
 libdata/pkgconfig/chewing.pc
 %%DATADIR%%/dictionary.dat
 %%DATADIR%%/index_tree.dat

comms/gnuradio/Makefile

@@ -15,7 +15,6 @@ BUILD_DEPENDS=	sdl-config:devel/sdl12 \
 		swig2.0:devel/swig20 \
 		cheetah:devel/py-cheetah \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}qt4>0:devel/py-qt4 \
 		xdg-open:devel/xdg-utils \
 		guile:lang/guile \
 		aconnect:audio/alsa-utils \
@@ -41,7 +40,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 # volk/lib/volk_cpu.c: In function 'i_can_has_3dnow':
 # volk/lib/volk_cpu.c:62: error: can't find a register in class 'BREG' while reloading 'asm'
 # volk/lib/volk_cpu.c:62: error: 'asm' operand has impossible constraints
-USES=		cmake:outsource compiler:c11 iconv perl5 pkgconfig python:2.7 shebangfix
+USES=		cmake:outsource compiler:c11 iconv perl5 pkgconfig pyqt:4 python:2.7 shebangfix
 SHEBANG_FILES=	grc/scripts/freedesktop/grc_setup_freedesktop.in
 CMAKE_ARGS+=	-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"\
 		-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
@@ -54,6 +53,7 @@ CMAKE_ARGS+=	-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"\
 MAJOR_SUB_VER=	${PORTVERSION}
 DOCSDIR=	share/doc/${PORTNAME}-${PORTVERSION}
 USE_GNOME=	pygtk2
+USE_PYQT=	core gui opengl
 USE_WX=		3.0+
 USE_QT4=	corelib gui xml qmake moc rcc uic
 WX_COMPS=	wx wx:build wx:run python:build python:run