diff options
-rw-r--r-- | sysutils/cdrtools/Makefile | 5 | ||||
-rw-r--r-- | sysutils/cdrtools/distinfo | 11 | ||||
-rw-r--r-- | sysutils/cdrtools/patches/patch-ac | 21 | ||||
-rw-r--r-- | sysutils/cdrtools/patches/patch-ai | 8 |
4 files changed, 11 insertions, 34 deletions
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile index d168bd0b1cf..cd810b43b36 100644 --- a/sysutils/cdrtools/Makefile +++ b/sysutils/cdrtools/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.54 2009/04/16 16:44:02 joerg Exp $ +# $NetBSD: Makefile,v 1.55 2009/06/09 18:45:12 wiz Exp $ -DISTNAME= cdrtools-2.01.01a59-pre2 +DISTNAME= cdrtools-2.01.01a60 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 --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo index ec00ff32060..876de4608bb 100644 --- a/sysutils/cdrtools/distinfo +++ b/sysutils/cdrtools/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.33 2009/04/16 16:44:02 joerg Exp $ +$NetBSD: distinfo,v 1.34 2009/06/09 18:45:12 wiz 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 (cdrtools-2.01.01a60.tar.bz2) = 2e613f726218d2bdc707ce2240721cd2c9dddcf0 +RMD160 (cdrtools-2.01.01a60.tar.bz2) = b71d57f799286d5c9f88d1dee24aeecc1fcb07a9 +Size (cdrtools-2.01.01a60.tar.bz2) = 1787126 bytes SHA1 (patch-aa) = 1f3461ae34071c20672025575bbb0abe7b128ef8 SHA1 (patch-ab) = c5454596c0733601b21219c92d609e4157d897a6 -SHA1 (patch-ac) = 53e49cdcdb6dbc6430c0b6535e0e827f89c142e6 SHA1 (patch-ad) = 08230fc203325916d4604576401da048dc108637 -SHA1 (patch-ai) = b3ef2697a55c715c385a44e0d11bb702fa67f5c3 +SHA1 (patch-ai) = a65625831d88a97547c4e0a03075711bee0dc373 SHA1 (patch-ch) = 65397614fe196709b26a789bdd34ed6776b4ef46 SHA1 (patch-ci) = ff0d14544b0958f581a37c1b007fae581f871021 diff --git a/sysutils/cdrtools/patches/patch-ac b/sysutils/cdrtools/patches/patch-ac deleted file mode 100644 index 05308ec2c15..00000000000 --- a/sysutils/cdrtools/patches/patch-ac +++ /dev/null @@ -1,21 +0,0 @@ -$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; diff --git a/sysutils/cdrtools/patches/patch-ai b/sysutils/cdrtools/patches/patch-ai index 9edc48ebbd8..d9a044e903d 100644 --- a/sysutils/cdrtools/patches/patch-ai +++ b/sysutils/cdrtools/patches/patch-ai @@ -1,6 +1,6 @@ -$NetBSD: patch-ai,v 1.7 2009/02/16 14:13:07 wiz Exp $ +$NetBSD: patch-ai,v 1.8 2009/06/09 18:45:13 wiz Exp $ ---- libscg/scsi-bsd.c.orig 2009-01-20 23:29:26.000000000 +0000 +--- libscg/scsi-bsd.c.orig 2009-04-19 12:26:13.000000000 +0000 +++ libscg/scsi-bsd.c @@ -44,6 +44,7 @@ static char __sccsid[] = @@ -14,8 +14,8 @@ $NetBSD: patch-ai,v 1.7 2009/02/16 14:13:07 wiz Exp $ * Choose your name instead of "schily" and make clear that the version * string is related to a modified source. */ --LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.46"; /* The version for this transport*/ -+LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.46nb1"; /* The version for this transport*/ +-LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.47"; /* The version for this transport*/ ++LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.47nb1"; /* The version for this transport*/ #define MAX_SCG 16 /* Max # of SCSI controllers */ #define MAX_TGT 16 |