diff options
| author | minskim <minskim> | 2006-07-03 19:06:13 +0000 |
|---|---|---|
| committer | minskim <minskim> | 2006-07-03 19:06:13 +0000 |
| commit | 09261f5109c792fdbffa3ae7358cab8f4074bdcd (patch) | |
| tree | 5091ff15f7f20707304872197ab5f1e9455068a4 /devel | |
| parent | 0e4ce848eff0ece9618b717405a74fd67b5eece0 (diff) | |
| download | pkgsrc-09261f5109c792fdbffa3ae7358cab8f4074bdcd.tar.gz | |
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 (limited to 'devel')
| -rw-r--r-- | devel/gettext-lib/Makefile | 3 | ||||
| -rw-r--r-- | devel/gettext-lib/distinfo | 3 | ||||
| -rw-r--r-- | devel/gettext-lib/patches/patch-aa | 23 |
3 files changed, 27 insertions, 2 deletions
diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile index a13ff48c535..0f53e5ebc67 100644 --- a/devel/gettext-lib/Makefile +++ b/devel/gettext-lib/Makefile @@ -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 --git a/devel/gettext-lib/distinfo b/devel/gettext-lib/distinfo index 721115807a2..55fb8142b23 100644 --- a/devel/gettext-lib/distinfo +++ b/devel/gettext-lib/distinfo @@ -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 --git a/devel/gettext-lib/patches/patch-aa b/devel/gettext-lib/patches/patch-aa new file mode 100644 index 00000000000..04096bef599 --- /dev/null +++ b/devel/gettext-lib/patches/patch-aa @@ -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 |