diff options
| author | minskim <minskim@pkgsrc.org> | 2006-07-06 14:49:55 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2006-07-06 14:49:55 +0000 |
| commit | 3450d2e644911e3c95e122a7f49abfbd27df9dc4 (patch) | |
| tree | f7e91ddd6d619e4a0d626bd51eeea1e83b837b87 /devel/gettext-lib | |
| parent | f2c224eb0cb51b6b627590ecb0d3ea3dd686afdb (diff) | |
| download | pkgsrc-3450d2e644911e3c95e122a7f49abfbd27df9dc4.tar.gz | |
Define locale_charset only when GNU iconv is used. This fixes the package
on Solaris where native iconv doesn't have locale_charset. Noted by
Gilles Dauphin in PR pkg/32945.
Bump PKGREVISION.
Diffstat (limited to 'devel/gettext-lib')
| -rw-r--r-- | devel/gettext-lib/Makefile | 7 | ||||
| -rw-r--r-- | devel/gettext-lib/distinfo | 4 | ||||
| -rw-r--r-- | devel/gettext-lib/patches/patch-aa | 13 |
3 files changed, 12 insertions, 12 deletions
diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile index 0f53e5ebc67..67a0186760a 100644 --- a/devel/gettext-lib/Makefile +++ b/devel/gettext-lib/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.43 2006/07/03 19:06:13 minskim Exp $ +# $NetBSD: Makefile,v 1.44 2006/07/06 14:49:55 minskim Exp $ DISTNAME= gettext-0.14.5 PKGNAME= gettext-lib-0.14.5 -PKGREVISION= 1 +PKGREVISION= 2 SVR4_PKGNAME= gttli CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=gettext/} @@ -26,6 +26,9 @@ CONFIGURE_ARGS+= --with-included-gettext CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} +CFLAGS+= ${CFLAGS.${ICONV_TYPE}-iconv} +CFLAGS.gnu-iconv+= -DHAVE_GNU_ICONV + INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} localedir=${EGDIR} BUILD_DIRS= intl diff --git a/devel/gettext-lib/distinfo b/devel/gettext-lib/distinfo index 55fb8142b23..b702c1601c0 100644 --- a/devel/gettext-lib/distinfo +++ b/devel/gettext-lib/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.11 2006/07/03 19:06:13 minskim Exp $ +$NetBSD: distinfo,v 1.12 2006/07/06 14:49:55 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-aa) = 88013bfa911b8b70fce14f27142210f0da791390 SHA1 (patch-ab) = 2195304902fe17cd97c243a6bc395de1484a50c4 SHA1 (patch-ac) = f7695a44cdb85a4f6d9b97872425acb4b74519c9 diff --git a/devel/gettext-lib/patches/patch-aa b/devel/gettext-lib/patches/patch-aa index 04096bef599..dc726031592 100644 --- a/devel/gettext-lib/patches/patch-aa +++ b/devel/gettext-lib/patches/patch-aa @@ -1,22 +1,19 @@ -$NetBSD: patch-aa,v 1.3 2006/07/03 19:06:13 minskim Exp $ +$NetBSD: patch-aa,v 1.4 2006/07/06 14:49:55 minskim Exp $ --- intl/localcharset.c.orig 2005-05-20 13:07:51.000000000 -0700 +++ intl/localcharset.c -@@ -23,6 +23,13 @@ +@@ -23,6 +23,10 @@ # include <config.h> #endif -+#if !HAVE_ICONV ++#if !HAVE_GNU_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. -+ */ ++/* Provide our variant only if we don't use the GNU iconv library. */ + /* Specification. */ #include "localcharset.h" -@@ -407,3 +414,4 @@ locale_charset () +@@ -407,3 +411,4 @@ locale_charset () return codeset; } |