Sat Aug 23 05:38:22 2014 UTC ()
Add a patch from Valeriy Ushakov:

The bug prevents mkisofs from creating old-style distrib/cdrom ISO
image for macppc.  Trying to create bootable macppc CD in distrib/cdrom
using cdrtools mkisofs fails with:

    mkisofs: No such file or directory. Invalid node - '--macbin'.

The bug is in option spec that causes mkisofs to misparse
-hide-hfs-list option.  The patch is actually a single whitespace
character.

Bump PKGREVISION.


(wiz)
diff -r1.107 -r1.108 pkgsrc/sysutils/cdrtools/Makefile
diff -r1.83 -r1.84 pkgsrc/sysutils/cdrtools/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/cdrtools/patches/patch-mkisofs_mkisofs.c
cvs diff -r1.107 -r1.108 pkgsrc/sysutils/cdrtools/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/cdrtools/Makefile 2014/05/14 08:41:01 1.107
+++ pkgsrc/sysutils/cdrtools/Makefile 2014/08/23 05:38:22 1.108
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.107 2014/05/14 08:41:01 wiz Exp $ 1# $NetBSD: Makefile,v 1.108 2014/08/23 05:38:22 wiz Exp $
2 2
3DISTNAME= cdrtools-3.01a24 3DISTNAME= cdrtools-3.01a24
4PKGNAME= ${DISTNAME:S/a/alpha/:S/-pre/pre/} 4PKGNAME= ${DISTNAME:S/a/alpha/:S/-pre/pre/}
 5PKGREVISION= 1
5CATEGORIES= sysutils 6CATEGORIES= sysutils
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrtools/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrtools/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= wiz@NetBSD.org 10MAINTAINER= wiz@NetBSD.org
10HOMEPAGE= http://cdrecord.berlios.de/old/private/cdrecord.html 11HOMEPAGE= http://cdrecord.berlios.de/old/private/cdrecord.html
11COMMENT= Software for creating ISO9660 images and writing CD/DVD/Blu-ray 12COMMENT= Software for creating ISO9660 images and writing CD/DVD/Blu-ray
12#LICENSE= CDDL.Schily.txt AND gnu-gpl-v2 AND gnu-lgpl-v2.1 13#LICENSE= CDDL.Schily.txt AND gnu-gpl-v2 AND gnu-lgpl-v2.1
13 14
14CONFLICTS= mkisofs-[0-9]* cdrtools-ossdvd-[0-9]* cdrecord-[0-9]* cdrkit-[0-9]* 15CONFLICTS= mkisofs-[0-9]* cdrtools-ossdvd-[0-9]* cdrecord-[0-9]* cdrkit-[0-9]*
15 16
16PKG_INSTALLATION_TYPES= overwrite pkgviews 17PKG_INSTALLATION_TYPES= overwrite pkgviews
17 18
cvs diff -r1.83 -r1.84 pkgsrc/sysutils/cdrtools/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/cdrtools/distinfo 2014/05/14 08:41:01 1.83
+++ pkgsrc/sysutils/cdrtools/distinfo 2014/08/23 05:38:22 1.84
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.83 2014/05/14 08:41:01 wiz Exp $ 1$NetBSD: distinfo,v 1.84 2014/08/23 05:38:22 wiz Exp $
2 2
3SHA1 (cdrtools-3.01a24.tar.bz2) = b49b01b6269280336ef3ca89aa41538db3a9b2dc 3SHA1 (cdrtools-3.01a24.tar.bz2) = b49b01b6269280336ef3ca89aa41538db3a9b2dc
4RMD160 (cdrtools-3.01a24.tar.bz2) = 6afd625f0b04f861592a82caf6bf78109dfee726 4RMD160 (cdrtools-3.01a24.tar.bz2) = 6afd625f0b04f861592a82caf6bf78109dfee726
5Size (cdrtools-3.01a24.tar.bz2) = 2075400 bytes 5Size (cdrtools-3.01a24.tar.bz2) = 2075400 bytes
 6SHA1 (patch-mkisofs_mkisofs.c) = 94fbc4abd559852f20c307e1dcf8070a02520f2d
File Added: pkgsrc/sysutils/cdrtools/patches/Attic/patch-mkisofs_mkisofs.c
$NetBSD: patch-mkisofs_mkisofs.c,v 1.1 2014/08/23 05:38:22 wiz Exp $

The bug prevents mkisofs from creating old-style distrib/cdrom ISO
image for macppc.  Trying to create bootable macppc CD in distrib/cdrom
using cdrtools mkisofs fails with:

    mkisofs: No such file or directory. Invalid node - '--macbin'.

The bug is in option spec that causes mkisofs to misparse
-hide-hfs-list option.  The patch is actually a single whitespace
character.

--- mkisofs/mkisofs.c.orig	2014-02-11 22:38:45.000000000 +0000
+++ mkisofs/mkisofs.c
@@ -1364,7 +1364,7 @@ LOCAL const struct mki_option mki_option
 	__("\1FILE\1Set HFS AutoStart file name")},
 	{{"no-desktop%0", &create_dt },
 	__("Do not create the HFS (empty) Desktop files")},
-	{{"hide-hfs&", NULL, (getpargfun)hfs_add_match },
+	{{"hide-hfs& ", NULL, (getpargfun)hfs_add_match },
 	__("\1GLOBFILE\1Hide HFS file")},
 	{{"hide-hfs-list&", NULL, (getpargfun)hfs_add_list },
 	__("\1FILE\1List of HFS files to hide")},