Import of pkgsrc-2015Q2

sysutils/cdrtools/Makefile

@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.110 2015/03/13 17:51:15 tnn Exp $
+# $NetBSD: Makefile,v 1.111 2015/04/27 09:05:11 wiz Exp $
 
-DISTNAME=	cdrtools-3.01a24
+DISTNAME=	cdrtools-3.01a28
 PKGNAME=	${DISTNAME:S/a/alpha/:S/-pre/pre/}
-PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cdrtools/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	wiz@NetBSD.org
-HOMEPAGE=	http://cdrecord.berlios.de/old/private/cdrecord.html
+HOMEPAGE=	http://cdrtools.sourceforge.net/private/cdrecord.html
 COMMENT=	Software for creating ISO9660 images and writing CD/DVD/Blu-ray
 #LICENSE=	CDDL.Schily.txt AND gnu-gpl-v2 AND gnu-lgpl-v2.1
 
@@ -16,6 +15,8 @@ CONFLICTS=	mkisofs-[0-9]* cdrtools-ossdvd-[0-9]* cdrecord-[0-9]* cdrkit-[0-9]*
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C/a[0-9]*//}
 
+MAKE_JOBS_SAFE=	no # makefiles.5
+
 .include "../../mk/bsd.prefs.mk"
 
 USE_TOOLS+=	gm4 gmake tbl

sysutils/cdrtools/distinfo

@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.84 2014/08/23 05:38:22 wiz Exp $
+$NetBSD: distinfo,v 1.85 2015/04/27 09:05:11 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
+SHA1 (cdrtools-3.01a28.tar.bz2) = 081b1daa9c86f33483213a8d8d0fd75caec51ead
+RMD160 (cdrtools-3.01a28.tar.bz2) = 84ad3ddbaea67a59a057d5338f3a683bffb49c1f
+Size (cdrtools-3.01a28.tar.bz2) = 2081108 bytes

sysutils/cdrtools/patches/patch-mkisofs_mkisofs.c

@@ -1,23 +0,0 @@
-$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")},