summaryrefslogtreecommitdiff
path: root/sysutils/cdrtools
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-08-23 05:38:22 +0000
committerwiz <wiz@pkgsrc.org>2014-08-23 05:38:22 +0000
commit9af5389c82d39e302b27b420511d13e55b420da2 (patch)
treec1ed028bd02794a6c36bc02c8ec23b217dbd39b4 /sysutils/cdrtools
parent1231d68fe898fc5fb3d925c6404c98775f389827 (diff)
downloadpkgsrc-9af5389c82d39e302b27b420511d13e55b420da2.tar.gz
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.
Diffstat (limited to 'sysutils/cdrtools')
-rw-r--r--sysutils/cdrtools/Makefile3
-rw-r--r--sysutils/cdrtools/distinfo3
-rw-r--r--sysutils/cdrtools/patches/patch-mkisofs_mkisofs.c23
3 files changed, 27 insertions, 2 deletions
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index c325f9bd3c6..3823074063c 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.107 2014/05/14 08:41:01 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2014/08/23 05:38:22 wiz Exp $
DISTNAME= cdrtools-3.01a24
PKGNAME= ${DISTNAME:S/a/alpha/:S/-pre/pre/}
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrtools/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index de725879501..5baeba77e5e 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.83 2014/05/14 08:41:01 wiz Exp $
+$NetBSD: distinfo,v 1.84 2014/08/23 05:38:22 wiz Exp $
SHA1 (cdrtools-3.01a24.tar.bz2) = b49b01b6269280336ef3ca89aa41538db3a9b2dc
RMD160 (cdrtools-3.01a24.tar.bz2) = 6afd625f0b04f861592a82caf6bf78109dfee726
Size (cdrtools-3.01a24.tar.bz2) = 2075400 bytes
+SHA1 (patch-mkisofs_mkisofs.c) = 94fbc4abd559852f20c307e1dcf8070a02520f2d
diff --git a/sysutils/cdrtools/patches/patch-mkisofs_mkisofs.c b/sysutils/cdrtools/patches/patch-mkisofs_mkisofs.c
new file mode 100644
index 00000000000..e32e94ada22
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-mkisofs_mkisofs.c
@@ -0,0 +1,23 @@
+$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")},