[pkgsrc/trunk]: pkgsrc/devel/exempi Make this patch NetBSD only unbreaking ot...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/090875da3fe1
branches:  trunk
changeset: 550342:090875da3fe1
user:      hasso <hasso%pkgsrc.org@localhost>
date:      Wed Nov 19 09:30:26 2008 +0000

description:
Make this patch NetBSD only unbreaking other platforms. GNU iconv switched
to use char** by default as well some time ago.

diffstat:

 devel/exempi/distinfo         |   4 ++--
 devel/exempi/patches/patch-ab |  20 +++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diffs (51 lines):

diff -r dda52fdede1e -r 090875da3fe1 devel/exempi/distinfo
--- a/devel/exempi/distinfo     Wed Nov 19 08:06:36 2008 +0000
+++ b/devel/exempi/distinfo     Wed Nov 19 09:30:26 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/09/22 15:04:43 wiz Exp $
+$NetBSD: distinfo,v 1.4 2008/11/19 09:30:26 hasso Exp $
 
 SHA1 (exempi-2.0.0.tar.gz) = e1375fc0da629804399a8a5b4dc443636f5cf89f
 RMD160 (exempi-2.0.0.tar.gz) = 717c9a63cf4adca09d86297fcf372de317255a15
 Size (exempi-2.0.0.tar.gz) = 3064678 bytes
-SHA1 (patch-ab) = c0ff8dac7ace9d23ced44dd3e3aabb63eb22f4e1
+SHA1 (patch-ab) = 363e85076fe7af6bea36953e9ded575a93d340d2
diff -r dda52fdede1e -r 090875da3fe1 devel/exempi/patches/patch-ab
--- a/devel/exempi/patches/patch-ab     Wed Nov 19 08:06:36 2008 +0000
+++ b/devel/exempi/patches/patch-ab     Wed Nov 19 09:30:26 2008 +0000
@@ -1,22 +1,28 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/04/12 10:56:18 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2008/11/19 09:30:26 hasso Exp $
 
---- source/XMPFiles/FormatSupport/Reconcile_Impl.cpp.orig      2007-10-30 22:22:10.000000000 +0100
-+++ source/XMPFiles/FormatSupport/Reconcile_Impl.cpp
-@@ -254,7 +254,7 @@ void ReconcileUtils::UTF8ToLatin1 ( cons
+--- ./source/XMPFiles/FormatSupport/Reconcile_Impl.cpp.orig    2008-02-22 21:22:00 +0200
++++ ./source/XMPFiles/FormatSupport/Reconcile_Impl.cpp
+@@ -254,7 +254,11 @@ void ReconcileUtils::UTF8ToLatin1 ( cons
                size_t outLen = utf8Len * 4;
                char * buf = (char *)calloc( outLen, 1 );
                char * out = buf;
--              size_t converted = iconv( cd, &in, &inLen, &out, &outLen );
++              #ifdef __NetBSD__
 +              size_t converted = iconv( cd, (const char **)&in, &inLen, &out, &outLen );
++              #else
+               size_t converted = iconv( cd, &in, &inLen, &out, &outLen );
++              #endif
                iconv_close( cd );
  
                latin1->assign ( (const char *)buf, outLen );
-@@ -411,7 +411,7 @@ void ReconcileUtils::Latin1ToUTF8 ( cons
+@@ -411,7 +415,11 @@ void ReconcileUtils::Latin1ToUTF8 ( cons
                size_t outLen = latin1Len * 4;
                char * buf = (char *)calloc( outLen, 1 );
                char * out = buf;
--              size_t converted = iconv( cd, &in, &inLen, &out, &outLen );
++              #ifdef __NetBSD__
 +              size_t converted = iconv( cd, (const char **)&in, &inLen, &out, &outLen );
++              #else
+               size_t converted = iconv( cd, &in, &inLen, &out, &outLen );
++              #endif
                iconv_close( cd );
  
                utf8->assign ( (const char *)buf, outLen );