[pkgsrc/trunk]: pkgsrc/editors/abiword This fix was lost in last update.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/33a42e57cd69
branches:  trunk
changeset: 471690:33a42e57cd69
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue Mar 30 00:53:31 2004 +0000

description:
This fix was lost in last update.
This was my PR pkg/23368. And fredb fixed for me on 04/Nov/2003.
Old patch was put in place accidently on 26/Dec/2003.
This fixes the problem with ut_iconv.cpp and invalid conversion
under gcc 3.3.x.

diffstat:

 editors/abiword/distinfo         |   4 ++--
 editors/abiword/patches/patch-ab |  26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diffs (44 lines):

diff -r dece4bf9021e -r 33a42e57cd69 editors/abiword/distinfo
--- a/editors/abiword/distinfo  Tue Mar 30 00:32:29 2004 +0000
+++ b/editors/abiword/distinfo  Tue Mar 30 00:53:31 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2004/03/06 07:12:55 xtraeme Exp $
+$NetBSD: distinfo,v 1.25 2004/03/30 00:53:31 reed Exp $
 
 SHA1 (abiword-2.0.4.tar.bz2) = 9e2d9b00cf3d1991e474b1ac78a9f86c9b673734
 Size (abiword-2.0.4.tar.bz2) = 22057414 bytes
 SHA1 (patch-aa) = 730e205f54516535394659c74e052bbe706e1bc2
-SHA1 (patch-ab) = a678cee31946b0102e6e62145b1d87eb3b323989
+SHA1 (patch-ab) = 27c48de3374288c7f6d6749ff18ebeedf91cb3ab
diff -r dece4bf9021e -r 33a42e57cd69 editors/abiword/patches/patch-ab
--- a/editors/abiword/patches/patch-ab  Tue Mar 30 00:32:29 2004 +0000
+++ b/editors/abiword/patches/patch-ab  Tue Mar 30 00:53:31 2004 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.8 2003/12/26 18:26:59 wiz Exp $
+$NetBSD: patch-ab,v 1.9 2004/03/30 00:53:31 reed Exp $
 
---- src/af/util/xp/ut_iconv.cpp.orig   Thu Jul 17 15:12:55 2003
-+++ src/af/util/xp/ut_iconv.cpp        Thu Jul 17 15:16:40 2003
-@@ -295,8 +295,8 @@
-     return (size_t)-1;
- 
+--- src/af/util/xp/ut_types.h.orig     2003-10-21 09:25:23.000000000 -0700
++++ src/af/util/xp/ut_types.h
+@@ -259,7 +259,9 @@ ABI_EXPORT void * UT_calloc ( UT_uint32 
+ (defined (__MACH__) && defined (__APPLE__)) || \
+ (defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \
+ defined(__BEOS__) || defined (__AIX__) || \
+-(defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1))
++(defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)) || \
++defined(__NetBSD__) || \
++(defined(_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x0109)
  
--  ICONV_CONST char ** buf = const_cast<ICONV_CONST char**>(inbuf);
--  return iconv( cd, buf, inbytesleft, outbuf, outbytesleft );
-+  //ICONV_CONST char ** buf = const_cast<ICONV_CONST char**>(inbuf);
-+  return iconv( cd, inbuf, inbytesleft, outbuf, outbytesleft );
- }
- 
- int  UT_iconv_close( UT_iconv_t cd )
+ #define ICONV_CONST const
+ #else