[pkgsrc/pkgsrc-2009Q1]: pkgsrc/sysutils/cdrtools Pullup ticket #2742 - reques...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/32ef1ac037a8
branches:  pkgsrc-2009Q1
changeset: 556778:32ef1ac037a8
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri Apr 17 14:48:17 2009 +0000

description:
Pullup ticket #2742 - requested by joerg
cdrtools: bug fix

Revision pulled up:
- sysutils/cdrtools/Makefile                    1.54 (via patch)
- sysutils/cdrtools/distinfo                    1.33 (via patch)
- sysutils/cdrtools/patches/patch-ac            1.4
---
Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Apr 16 16:44:03 UTC 2009

Modified Files:
        pkgsrc/sysutils/cdrtools: Makefile distinfo
Added Files:
        pkgsrc/sysutils/cdrtools/patches: patch-ac

Log Message:
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 da12525fa6e2 -r 32ef1ac037a8 sysutils/cdrtools/Makefile
--- a/sysutils/cdrtools/Makefile        Fri Apr 17 12:23:42 2009 +0000
+++ b/sysutils/cdrtools/Makefile        Fri Apr 17 14:48:17 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2009/02/22 15:38:31 wiz Exp $
+# $NetBSD: Makefile,v 1.52.2.1 2009/04/17 14:48:17 tron Exp $
 
 DISTNAME=      cdrtools-2.01.01a58-pre2
 PKGNAME=       ${DISTNAME:S/a/alpha/:S/-pre2/.2/}
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ftp://ftp.berlios.de/pub/cdrecord/alpha/ \
                http://ftp.berlios.de/pub/cdrecord/alpha/
diff -r da12525fa6e2 -r 32ef1ac037a8 sysutils/cdrtools/distinfo
--- a/sysutils/cdrtools/distinfo        Fri Apr 17 12:23:42 2009 +0000
+++ b/sysutils/cdrtools/distinfo        Fri Apr 17 14:48:17 2009 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.31 2009/02/22 15:38:31 wiz Exp $
+$NetBSD: distinfo,v 1.31.2.1 2009/04/17 14:48:17 tron Exp $
 
 SHA1 (cdrtools-2.01.01a58-pre2.tar.bz2) = 21113779b5366fc981ba1adcf77be8d5b89e26b3
 RMD160 (cdrtools-2.01.01a58-pre2.tar.bz2) = 3c5706df7c6527d30e92acfb147c92f8a6d5ac92
 Size (cdrtools-2.01.01a58-pre2.tar.bz2) = 1783671 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 da12525fa6e2 -r 32ef1ac037a8 sysutils/cdrtools/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/cdrtools/patches/patch-ac        Fri Apr 17 14:48:17 2009 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.4.2.2 2009/04/17 14:48:45 tron 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;