Re: PR/32945 CVS commit: pkgsrc/devel/gettext-lib

[Min Sik Kim <minskim%NetBSD.org@localhost>]

The following reply was made to PR pkg/32945; it has been noted by GNATS.

From: Min Sik Kim <minskim%NetBSD.org@localhost>
To: Gilles Dauphin <Gilles.Dauphin%enst.fr@localhost>
Cc: gnats-bugs%NetBSD.org@localhost
Subject: Re: PR/32945 CVS commit: pkgsrc/devel/gettext-lib
Date: Wed, 5 Jul 2006 11:16:43 -0700

 --Apple-Mail-2--129972184
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain;
        charset=US-ASCII;
        delsp=yes;
        format=flowed
 
 On Jul 5, 2006, at 2:00 AM, Gilles Dauphin wrote:
 >
 >>
 >> The following reply was made to PR pkg/32945; it has been noted by  
 >> GNATS.
 >>
 >> From: Min Sik Kim <minskim%netbsd.org@localhost>
 >> To: gnats-bugs%NetBSD.org@localhost
 >> Cc:
 >> Subject: PR/32945 CVS commit: pkgsrc/devel/gettext-lib
 >> Date: Mon,  3 Jul 2006 19:06:13 +0000 (UTC)
 >>
 >>  Module Name:       pkgsrc
 >>  Committed By:      minskim
 >>  Date:              Mon Jul  3 19:06:13 UTC 2006
 >>
 >>  Modified Files:
 >>     pkgsrc/devel/gettext-lib: Makefile distinfo
 >>  Added Files:
 >>     pkgsrc/devel/gettext-lib/patches: patch-aa
 >>
 >>  Log Message:
 >>  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.
 >
 >  This patch break gettext-lib on Solaris.
 >  locale_charset is *not* define in the native iconv library.
 >  Original patch in PR 32945 seems good (#ifndef __APPLE__ ...)
 >  here is the patch i want and maybe use CFLAGS.Darwin+= - 
 > D__LOCALE_CHARSET__
 >  in Makefile
 
 I want to avoid platform-dependent fixes if possible.  How about  
 defining locale_charset only when GNU iconv is used?  See the  
 attached patches.
 
 Regards,
 Min
 
 
 --Apple-Mail-2--129972184
 Content-Transfer-Encoding: 7bit
 Content-Type: application/octet-stream;
        x-unix-mode=0644;
        name=gettext-lib.diff
 Content-Disposition: attachment;
        filename=gettext-lib.diff
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/gettext-lib/Makefile,v
 retrieving revision 1.43
 diff -u -r1.43 Makefile
 --- Makefile   3 Jul 2006 19:06:13 -0000       1.43
 +++ Makefile   5 Jul 2006 18:07:57 -0000
 @@ -2,7 +2,7 @@
  
  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_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
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/gettext-lib/distinfo,v
 retrieving revision 1.11
 diff -u -r1.11 distinfo
 --- distinfo   3 Jul 2006 19:06:13 -0000       1.11
 +++ distinfo   5 Jul 2006 18:07:57 -0000
 @@ -3,6 +3,6 @@
  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
 Index: patches/patch-aa
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/gettext-lib/patches/patch-aa,v
 retrieving revision 1.3
 diff -u -r1.3 patch-aa
 --- patches/patch-aa   3 Jul 2006 19:06:13 -0000       1.3
 +++ patches/patch-aa   5 Jul 2006 18:07:57 -0000
 @@ -1,22 +1,19 @@
 -$NetBSD: patch-aa,v 1.3 2006/07/03 19:06:13 minskim Exp $
 +$NetBSD$
  
  --- 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;
   }
 
 --Apple-Mail-2--129972184
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain;
        charset=US-ASCII;
        format=flowed
 
 
 
 --Apple-Mail-2--129972184--