From owner-svn-ports-head@FreeBSD.ORG Thu May 7 19:04:38 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AC65DA63; Thu, 7 May 2015 19:04:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9A2CA106F; Thu, 7 May 2015 19:04:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t47J4cK4003182; Thu, 7 May 2015 19:04:38 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t47J4bNF003177; Thu, 7 May 2015 19:04:37 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201505071904.t47J4bNF003177@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Thu, 7 May 2015 19:04:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385655 - in head/archivers/dpkg: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 May 2015 19:04:38 -0000 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 @@ + , which chokes if dcgettext is defined as a macro. So include + it now, to make later inclusions of a NOP. */ + #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3) +-# include + # if (__GLIBC__ >= 2 && !defined __UCLIBC__) || _GLIBCXX_HAVE_LIBINTL_H + # include + # 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 -@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