[pkgsrc/trunk]: pkgsrc/devel/gettext-lib Make sure that locale_charset is def...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/59a0864925fc
branches:  trunk
changeset: 515523:59a0864925fc
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Mon Jul 03 19:06:13 2006 +0000

description:
Make sure that locale_charset is defined only once.  Otherwise, it may cause
a link error on Darwin.  The patch was adapted from the one submitted in
PR pkg/32723.  It also fixes PR pkg/32945.

Bump PKGREVISION.

diffstat:

 devel/gettext-lib/Makefile         |   3 ++-
 devel/gettext-lib/distinfo         |   3 ++-
 devel/gettext-lib/patches/patch-aa |  23 +++++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diffs (53 lines):

diff -r 44dcc1b17a3f -r 59a0864925fc devel/gettext-lib/Makefile
--- a/devel/gettext-lib/Makefile        Mon Jul 03 19:00:38 2006 +0000
+++ b/devel/gettext-lib/Makefile        Mon Jul 03 19:06:13 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2006/02/05 22:45:54 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2006/07/03 19:06:13 minskim Exp $
 
 DISTNAME=              gettext-0.14.5
 PKGNAME=               gettext-lib-0.14.5
+PKGREVISION=           1
 SVR4_PKGNAME=          gttli
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GNU:=gettext/}
diff -r 44dcc1b17a3f -r 59a0864925fc devel/gettext-lib/distinfo
--- a/devel/gettext-lib/distinfo        Mon Jul 03 19:00:38 2006 +0000
+++ b/devel/gettext-lib/distinfo        Mon Jul 03 19:06:13 2006 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2006/02/05 22:45:54 joerg Exp $
+$NetBSD: distinfo,v 1.11 2006/07/03 19:06:13 minskim Exp $
 
 SHA1 (gettext-0.14.5.tar.gz) = 68737eee1a6427044eef901dc88e4144d371fb6b
 RMD160 (gettext-0.14.5.tar.gz) = d31c8e49671f00623ce1e6f73716a5abcd1c7ec2
 Size (gettext-0.14.5.tar.gz) = 7105715 bytes
+SHA1 (patch-aa) = dc0a04586858ae38052893e85c9b8ac41b89a181
 SHA1 (patch-ab) = 2195304902fe17cd97c243a6bc395de1484a50c4
 SHA1 (patch-ac) = f7695a44cdb85a4f6d9b97872425acb4b74519c9
diff -r 44dcc1b17a3f -r 59a0864925fc devel/gettext-lib/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/gettext-lib/patches/patch-aa        Mon Jul 03 19:06:13 2006 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.3 2006/07/03 19:06:13 minskim Exp $
+
+--- intl/localcharset.c.orig   2005-05-20 13:07:51.000000000 -0700
++++ intl/localcharset.c
+@@ -23,6 +23,13 @@
+ # include <config.h>
+ #endif
+ 
++#if !HAVE_ICONV
++
++/* Provide our variant only if we don't use the systems iconv library. This is
++ * consistant with the usage in loadmsgcat.c and prevents us from relying on
++ * link-time symbol resolution.
++ */
++
+ /* Specification.  */
+ #include "localcharset.h"
+ 
+@@ -407,3 +414,4 @@ locale_charset ()
+ 
+   return codeset;
+ }
++#endif