svn commit: r385655 - in head/archivers/dpkg: . files

[Pawel Pekala]

Author: pawel
Date: Thu May  7 19:04:36 2015
New Revision: 385655
URL: https://svnweb.freebsd.org/changeset/ports/385655

Log:
  - Update to version 1.7.25
  - Sort USES, use correct option helper, fix plist when NLS=off
  - Add build fix patch (when NLS=off and compiler == clang) which
    prevents mixing C and C++ code in C header file

Added:
  head/archivers/dpkg/files/patch-lib_compat_gettext.h   (contents, props changed)
Modified:
  head/archivers/dpkg/Makefile
  head/archivers/dpkg/distinfo
  head/archivers/dpkg/pkg-plist

Modified: head/archivers/dpkg/Makefile
==============================================================================
--- head/archivers/dpkg/Makefile	Thu May  7 18:52:19 2015	(r385654)
+++ head/archivers/dpkg/Makefile	Thu May  7 19:04:36 2015	(r385655)
@@ -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/
 		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}/$
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-NLS_CONFIGURE_OFF=	--disable-nls
+NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 post-patch:

Modified: head/archivers/dpkg/distinfo
==============================================================================
--- head/archivers/dpkg/distinfo	Thu May  7 18:52:19 2015	(r385654)
+++ head/archivers/dpkg/distinfo	Thu May  7 19:04:36 2015	(r385655)
@@ -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

Added: head/archivers/dpkg/files/patch-lib_compat_gettext.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/archivers/dpkg/files/patch-lib_compat_gettext.h	Thu May  7 19:04:36 2015	(r385655)
@@ -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

Modified: head/archivers/dpkg/pkg-plist
==============================================================================
--- head/archivers/dpkg/pkg-plist	Thu May  7 18:52:19 2015	(r385654)
+++ head/archivers/dpkg/pkg-plist	Thu May  7 19:04:36 2015	(r385655)
@@ -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
- at dir man/hu/man8
- at 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