[pkgsrc/trunk]: pkgsrc/sysutils/cdrtools Fix broken caching of iconv handlers...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b6e6c177c43d
branches:  trunk
changeset: 557494:b6e6c177c43d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Apr 16 16:44:02 2009 +0000

description:
Fix broken caching of iconv handlers. Addresses PR 37643.

diffstat:

 sysutils/cdrtools/Makefile         |   3 ++-
 sysutils/cdrtools/distinfo         |   3 ++-
 sysutils/cdrtools/patches/patch-ac |  21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diffs (54 lines):

diff -r 154c7d950a98 -r b6e6c177c43d sysutils/cdrtools/Makefile
--- a/sysutils/cdrtools/Makefile        Thu Apr 16 14:05:38 2009 +0000
+++ b/sysutils/cdrtools/Makefile        Thu Apr 16 16:44:02 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2009/04/12 14:36:52 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2009/04/16 16:44:02 joerg Exp $
 
 DISTNAME=      cdrtools-2.01.01a59-pre2
 PKGNAME=       ${DISTNAME:S/a/alpha/:S/-pre/pre/}
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ftp://ftp.berlios.de/pub/cdrecord/alpha/ \
                http://ftp.berlios.de/pub/cdrecord/alpha/
diff -r 154c7d950a98 -r b6e6c177c43d sysutils/cdrtools/distinfo
--- a/sysutils/cdrtools/distinfo        Thu Apr 16 14:05:38 2009 +0000
+++ b/sysutils/cdrtools/distinfo        Thu Apr 16 16:44:02 2009 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.32 2009/04/12 14:36:52 wiz Exp $
+$NetBSD: distinfo,v 1.33 2009/04/16 16:44:02 joerg Exp $
 
 SHA1 (cdrtools-2.01.01a59-pre2.tar.bz2) = 733455b1dd7f9ca4b57d4474ad87dce926f2d638
 RMD160 (cdrtools-2.01.01a59-pre2.tar.bz2) = 180b8b677c92649be0b56447d496f6e0a3212fad
 Size (cdrtools-2.01.01a59-pre2.tar.bz2) = 1784649 bytes
 SHA1 (patch-aa) = 1f3461ae34071c20672025575bbb0abe7b128ef8
 SHA1 (patch-ab) = c5454596c0733601b21219c92d609e4157d897a6
+SHA1 (patch-ac) = 53e49cdcdb6dbc6430c0b6535e0e827f89c142e6
 SHA1 (patch-ad) = 08230fc203325916d4604576401da048dc108637
 SHA1 (patch-ai) = b3ef2697a55c715c385a44e0d11bb702fa67f5c3
 SHA1 (patch-ch) = 65397614fe196709b26a789bdd34ed6776b4ef46
diff -r 154c7d950a98 -r b6e6c177c43d sysutils/cdrtools/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/cdrtools/patches/patch-ac        Thu Apr 16 16:44:02 2009 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.4 2009/04/16 16:44:02 joerg Exp $
+
+Fix crashes in the NetBSD macppc CD-ROM build.
+
+--- libsiconv/sic_nls.c.orig   2009-04-16 18:07:14.000000000 +0200
++++ libsiconv/sic_nls.c
+@@ -456,10 +456,10 @@ dup_iconv_sic(sip)
+               return ((siconvt_t *)NULL);
+       }
+       sp->sic_name = nm;      /* Allow to compare name pointers */
+-      sip->sic_uni2cs = NULL;
+-      sip->sic_cs2uni = NULL;
+-      sip->sic_cd2uni = from;
+-      sip->sic_uni2cd = to;
++      sp->sic_uni2cs = NULL;
++      sp->sic_cs2uni = NULL;
++      sp->sic_cd2uni = from;
++      sp->sic_uni2cd = to;
+       sp->sic_alt    = NULL;
+       sp->sic_next   = NULL;
+       sip->sic_alt = sp;