*/*: sync with upstream

Taken from: FreeBSD

archivers/dpkg/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dpkg
-PORTVERSION=	1.17.24
+PORTVERSION=	1.17.25
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	dpkg_${PORTVERSION}
@@ -18,7 +18,7 @@ RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar \
 		gmd5sum:${PORTSDIR}/sysutils/coreutils
 
 GNU_CONFIGURE=	yes
-USES=		gmake iconv libtool perl5 pkgconfig tar:xz shebangfix
+USES=		gmake iconv libtool perl5 pkgconfig shebangfix tar:xz
 WRKSRC=		${WRKDIR}/dpkg-${PORTVERSION}
 SHEBANG_FILES=	dselect/methods/ftp/update dselect/methods/ftp/install \
 		dselect/methods/ftp/setup
@@ -37,7 +37,7 @@ CONFIGURE_ENV+=	PERL_LIBDIR="${PREFIX}/${SITE_PERL_REL}"
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-NLS_CONFIGURE_OFF=	--disable-nls
+NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 post-patch:

archivers/dpkg/distinfo

@@ -1,2 +1,2 @@
-SHA256 (dpkg_1.17.24.tar.xz) = afd60233ef090aa5a4d9e181b8986d1f5deb23a3428a2309b6b4ec448d539eac
-SIZE (dpkg_1.17.24.tar.xz) = 4388276
+SHA256 (dpkg_1.17.25.tar.xz) = 07019d38ae98fb107c79dbb3690cfadff877f153b8c4970e3a30d2e59aa66baa
+SIZE (dpkg_1.17.25.tar.xz) = 4407792

archivers/dpkg/files/patch-lib_compat_gettext.h

@@ -0,0 +1,10 @@
+--- lib/compat/gettext.h.orig	2015-05-07 18:40:12 UTC
++++ lib/compat/gettext.h
+@@ -53,7 +53,6 @@
+    <libintl.h>, which chokes if dcgettext is defined as a macro.  So include
+    it now, to make later inclusions of <libintl.h> a NOP.  */
+ #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
+-# include <cstdlib>
+ # if (__GLIBC__ >= 2 && !defined __UCLIBC__) || _GLIBCXX_HAVE_LIBINTL_H
+ #  include <libintl.h>
+ # endif

archivers/dpkg/pkg-plist

@@ -582,8 +582,8 @@ sbin/start-stop-daemon
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/dselect.mo
-@dir man/hu/man8
-@dir man/hu/man1
+%%NLS%%@dir man/hu/man8
+%%NLS%%@dir man/hu/man1
 @dir etc/dpkg/dselect.cfg.d
 @dir etc/dpkg/dpkg.cfg.d
 @dir %%DPKGDIR%%/updates

archivers/kzip/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	kzip
-DISTVERSION=	20091108
+DISTVERSION=	20150319
 CATEGORIES=	archivers linux
 MASTER_SITES=	http://static.jonof.id.au/dl/kenutils/
 DISTNAME=	kzipmix-${DISTVERSION}-linux-static
@@ -14,10 +14,11 @@ NO_CDROM=	License does not allow redistribution
 NO_PACKAGE=	${NO_CDROM}
 RESTRICTED=	${NO_CDROM}
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	amd64 i386
 
 USE_LINUX=	yes
 NO_BUILD=	yes
+WRKSRC_SUBDIR=	i686
 
 FILES=		kzip-static
 .for file in ${FILES}

archivers/kzip/distinfo

@@ -1,2 +1,2 @@
-SHA256 (kzipmix-20091108-linux-static.tar.gz) = 086a5bd4225b7ccad97ae4c377fe6041eaf78c29a908db547df1f31b2a9bb462
-SIZE (kzipmix-20091108-linux-static.tar.gz) = 495296 
+SHA256 (kzipmix-20150319-linux-static.tar.gz) = 03da29180960f03515d962e90395543872b53bd22d1b0ea9763f8b4299c20fb7
+SIZE (kzipmix-20150319-linux-static.tar.gz) = 1205749

astro/libosmpbf/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	libosmpbf
 PORTVERSION=	1.3.0
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	astro geography devel
 
@@ -16,8 +17,6 @@ LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
 USE_GITHUB=	yes
 GH_ACCOUNT=	scrosby
 GH_PROJECT=	OSM-binary
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	d9be2d1
 
 USES=		gmake
 BUILD_WRKSRC=	${WRKSRC}/src

astro/libosmpbf/distinfo

@@ -1,2 +1,2 @@
-SHA256 (libosmpbf-1.3.0.tar.gz) = 25226cba789292fe2c78c29321afd81d1d083b6f990f6bc4d02b41ff8b1e638f
-SIZE (libosmpbf-1.3.0.tar.gz) = 23774
+SHA256 (scrosby-OSM-binary-v1.3.0_GH0.tar.gz) = c4bb6de92ae52481775ba2a6e8b751eb39dade17a1ee6669d79b694cd5266ff8
+SIZE (scrosby-OSM-binary-v1.3.0_GH0.tar.gz) = 23768

audio/cplay/Makefile

@@ -5,14 +5,14 @@ PORTNAME=	cplay
 PORTVERSION=	1.49
 PORTREVISION=	5
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/
+MASTER_SITES=	DEBIAN
+DISTFILES=	${DISTNAME:S/-/_/}.orig${EXTRACT_SUFX}
 
 MAINTAINER=	[email protected]
 COMMENT=	Curses-based front-end for various audio players
 
 LICENSE=	GPLv2
 
-BROKEN=		Fails to fetch
 USES=		gettext gmake python:2
 
 MAKE_ARGS=	PREFIX="${STAGEDIR}${PREFIX}"

audio/cplay/distinfo

@@ -1,2 +1,2 @@
-SHA256 (cplay-1.49.tar.gz) = 4c624a7e5839b1523418b0b898dc300c571099a7e7252265ee79f7adbed0a80d
-SIZE (cplay-1.49.tar.gz) = 36400
+SHA256 (cplay_1.49.orig.tar.gz) = 4c624a7e5839b1523418b0b898dc300c571099a7e7252265ee79f7adbed0a80d
+SIZE (cplay_1.49.orig.tar.gz) = 36400

audio/mpg123/pkg-plist

@@ -11,4 +11,3 @@ lib/mpg123/output_oss.so
 libdata/pkgconfig/libmpg123.pc
 man/man1/out123.1.gz
 man/man1/mpg123.1.gz
-@dirrm lib/mpg123

audio/oss/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	oss
-DISTVERSION=	4.2-build2009
-PORTREVISION=	1
+DISTVERSION=	4.2-build2011
 CATEGORIES=	audio
 MASTER_SITES=	http://www.opensound.com/developer/sources/stable/bsd/
 DISTNAME=	${PORTNAME}-v${DISTVERSION}-src-bsd

audio/oss/distinfo

@@ -1,2 +1,2 @@
-SHA256 (oss-v4.2-build2009-src-bsd.tar.bz2) = 10cfe6b5130cf5adb0f17d211e3a09f37977587e22ccf9ec169abb2a89535a8b
-SIZE (oss-v4.2-build2009-src-bsd.tar.bz2) = 1665927
+SHA256 (oss-v4.2-build2011-src-bsd.tar.bz2) = 65ba999222d7250242c23d6d13e98dc39d3157c14acc32691d8aa9678ccedbbc
+SIZE (oss-v4.2-build2011-src-bsd.tar.bz2) = 1628950

chinese/eric6/distinfo

@@ -1,2 +1,2 @@
-SHA256 (eric6-i18n-zh_CN.GB2312-6.0.4.tar.gz) = d027a5a82f6f9e3fa70d3bed632942fdad08c75bf8ac0f7fb5e4ba8d9e03de42
-SIZE (eric6-i18n-zh_CN.GB2312-6.0.4.tar.gz) = 447173
+SHA256 (eric6-i18n-zh_CN.GB2312-6.0.5.tar.gz) = 6275f3bc827717babb15ee6f442a21fc5d779865bf8eeb38e9fd0e741bd70abf
+SIZE (eric6-i18n-zh_CN.GB2312-6.0.5.tar.gz) = 447183

comms/seyon/Makefile

@@ -2,24 +2,22 @@
 # $FreeBSD$
 
 PORTNAME=	seyon
-PORTVERSION=	2.14b
-PORTREVISION=	2
+PORTVERSION=	2.20c
 CATEGORIES=	comms
-MASTER_SITES=	ftp://sipb.mit.edu/pub/seyon/
-DISTNAME=	Seyon-${PORTVERSION}
-EXTRACT_SUFX=	-tar.Z
+MASTER_SITES=	DEBIAN
+DISTFILES=	${DISTNAME:S/-/_/}.orig${EXTRACT_SUFX}
 
 MAINTAINER=	[email protected]
 COMMENT=	Communications package for the X Window system
 
-BROKEN=		Unfetchable
-WRKSRC=		${WRKDIR}/seyon
 USES=		imake
 USE_XORG=	x11 xext xpm xmu xaw xt sm ice
-MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/seyon lib/X11/app-defaults/Seyon \
 		lib/X11/app-defaults/Seyon-color lib/X11/seyon.help \
 		man/man1/${PORTNAME}.1.gz
 
+post-extract:
+	${CHMOD} +x ${WRKSRC}/makever.sh
+
 .include <bsd.port.mk>

comms/seyon/distinfo

@@ -1,2 +1,2 @@
-SHA256 (Seyon-2.14b-tar.Z) = 17aa8f3520def76339bd2baa69c8ea11009693081151ec1c20a4f5f4f5b49bca
-SIZE (Seyon-2.14b-tar.Z) = 224819
+SHA256 (seyon_2.20c.orig.tar.gz) = f221699ac420e55f0d769d4c50699a7e1552132cafe2a65192c3f3f090ca9048
+SIZE (seyon_2.20c.orig.tar.gz) = 167487

comms/seyon/files/patch-Imakefile

@@ -1,7 +1,7 @@
---- Imakefile.orig	Mon Mar 29 13:40:32 1999
-+++ Imakefile	Mon Mar 29 13:40:41 1999
-@@ -46,13 +46,6 @@
- InstallAppDefaultsLong(Seyon-co,Seyon-color)
+--- Imakefile.orig	1999-05-09 20:51:54 UTC
++++ Imakefile
+@@ -47,13 +47,6 @@ InstallAppDefaultsLong(Seyon-co,Seyon-co
+ InstallAppDefaultsLong(Seyon,Seyon)
  InstallNonExecFile(seyon.help,$(LIBDIR))
 
 -install::
@@ -13,3 +13,12 @@
 -
  clean::
  	rm -f version.h y.tab.* SeParse.c
+
+@@ -73,5 +66,5 @@ SeScan.o: y.tab.h
+ y.tab.h y.tab.c: SeParse.y
+ 	$(YACC) -d SeParse.y
+
+-SeParse.c: SeParse.y
+-	$(MV) y.tab.c SeParse.c
++SeParse.c: y.tab.c
++	$(CP) y.tab.c SeParse.c

comms/seyon/files/patch-SePort.c

@@ -1,18 +1,18 @@
---- SePort.c.orig	Thu Apr  4 11:44:26 1996
-+++ SePort.c	Thu Apr  4 11:51:54 1996
-@@ -1011,6 +1011,7 @@
+--- SePort.c.orig	2015-05-08 01:08:39 UTC
++++ SePort.c
+@@ -1022,6 +1022,7 @@ lock_tty()
    pid_t           pid,
                    lckpid;
    char           *modemname;
 +  int		  killret;
  #if LF_USE_ASCII_PID
    char            pidstr[20],
                    lckpidstr[20];
-@@ -1077,11 +1078,13 @@
+@@ -1088,11 +1089,13 @@ relink:
  #endif
 
        lockPid = (pid_t) lckpid;
--      if (kill(lckpid, 0) == 0) {
+-      if (kill(lckpid, 0) == 0 || errno != ESRCH) {
 -		SeErrorF("Device %s is locked by process %d", modem_port, lckpid, "");
 -		unlink(ltmp);
 -		return -1;

comms/svxlink/Makefile

@@ -23,6 +23,7 @@ BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconf \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sm0svx
+GH_PROJECT=	svxlink
 
 USES=		cmake tcl
 CMAKE_SOURCE_PATH=	${WRKSRC}/src

databases/beansdb/Makefile

@@ -4,12 +4,14 @@
 PORTNAME=	beansdb
 PORTVERSION=	0.5.3
 CATEGORIES=	databases
-MASTER_SITES=	GOOGLE_CODE
+MASTER_SITES=	GOOGLE_CODE \
+		http://mirror.amdmi3.ru/googlecode/
 
 MAINTAINER=	[email protected]
 COMMENT=	Yet another distributed key-value storage system from Douban Inc
 
-BROKEN=		Unfetchable
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 GNU_CONFIGURE=	yes
 USE_CSTD=	gnu89

databases/dalmp/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dalmp
-PORTVERSION=	3.0.2
+PORTVERSION=	3.0.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
@@ -12,13 +12,11 @@ COMMENT=	Database Abstraction Layer for MySQL using PHP
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BROKEN=		Unfetchable
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	nbari
 GH_PROJECT=	${PORTNAME:tu}
 
-USES=	tar:bzip2
+USES=		tar:bzip2
 
 NO_BUILD=	yes
 USE_PHP=	pcre mysql mysqli session memcache sqlite3 curl

databases/dalmp/distinfo

@@ -1,2 +1,2 @@
-SHA256 (nbari-DALMP-v3.0.2_GH0.tar.bz2) = 86ad8a3bf1dbb5ec6e7481b43366a59a7b69b4ac6b9453ec1622a333fe24c3b3
-SIZE (nbari-DALMP-v3.0.2_GH0.tar.bz2) = 166856
+SHA256 (nbari-DALMP-v3.0.3_GH0.tar.bz2) = 253c68e498e74f8aa073f149360f9422965cc07d30d7b24397f0844191a9da38
+SIZE (nbari-DALMP-v3.0.3_GH0.tar.bz2) = 166937