Import of pkgsrc-2015Q1

sysutils/cdrtools/Makefile

@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.106 2014/03/12 09:20:06 wiz Exp $
+# $NetBSD: Makefile,v 1.110 2015/03/13 17:51:15 tnn Exp $
 
-DISTNAME=	cdrtools-3.01a23
+DISTNAME=	cdrtools-3.01a24
 PKGNAME=	${DISTNAME:S/a/alpha/:S/-pre/pre/}
+PKGREVISION=	1
 CATEGORIES=	sysutils
-#MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/ \
-#		http://ftp.berlios.de/pub/cdrecord/
-MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/ \
-		http://ftp.berlios.de/pub/cdrecord/alpha/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cdrtools/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	wiz@NetBSD.org
@@ -16,8 +14,6 @@ COMMENT=	Software for creating ISO9660 images and writing CD/DVD/Blu-ray
 
 CONFLICTS=	mkisofs-[0-9]* cdrtools-ossdvd-[0-9]* cdrecord-[0-9]* cdrkit-[0-9]*
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 WRKSRC=		${WRKDIR}/${DISTNAME:C/a[0-9]*//}
 
 .include "../../mk/bsd.prefs.mk"
@@ -27,6 +23,8 @@ USE_TOOLS+=	gm4 gmake tbl
 CFLAGS.NetBSD+=	-DUSE_GETRAWPARTITION
 LDFLAGS.NetBSD+=	-lutil
 
+LDFLAGS+=	${BUILDLINK_LDADD.iconv}
+
 # NetBSD 6.0 (and update releases) have incomplete implemenations of the
 # "*at" system calls. Pretend that they aren't present at all to
 # avoid build failures.
@@ -151,6 +149,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \
 		${DESTDIR}${PREFIX}/share/examples/cdrtools/cdrecord
 
-.include "../../mk/oss.buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

sysutils/cdrtools/distinfo

@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.82 2014/03/12 09:20:06 wiz Exp $
+$NetBSD: distinfo,v 1.84 2014/08/23 05:38:22 wiz Exp $
 
-SHA1 (cdrtools-3.01a23.tar.bz2) = 0539be5cb1ca27754608a1ddf5b36c8587cc5ae4
-RMD160 (cdrtools-3.01a23.tar.bz2) = f6b6cd4c339a92aa78743176f53d3bb9164b527c
-Size (cdrtools-3.01a23.tar.bz2) = 2068254 bytes
-SHA1 (patch-include_schily_sha2.h) = dab2dd40b20a37f1f2ff8cbd64f8361e800e1753
+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

sysutils/cdrtools/patches/patch-include_schily_sha2.h

@@ -1,29 +0,0 @@
-$NetBSD: patch-include_schily_sha2.h,v 1.2 2012/03/29 14:51:59 wiz Exp $
-
-Fix clang-3.1 build:
-sha2.c:1001:2: error: call to 'SHA384Pad' is ambiguous
-        SHA384Pad(context);
-        ^~~~~~~~~
-../include/schily/sha2.h:110:13: note: candidate function
-extern void SHA384Pad           __PR((SHA2_CTX *));
-            ^
-sha2.c:969:14: note: candidate function
-#pragma weak SHA384Pad = SHA512Pad
-             ^
-1 error generated.
-
---- include/schily/sha2.h.orig	2010-08-27 10:41:30.000000000 +0000
-+++ include/schily/sha2.h
-@@ -104,10 +104,12 @@ extern char *SHA256Data		__PR((const UIn
- 
- #ifdef	HAVE_LONGLONG
- extern void SHA384Init		__PR((SHA2_CTX *));
-+#ifndef  HAVE_PRAGMA_WEAK
- extern void SHA384Transform	__PR((UInt64_t state[8],
- 					const UInt8_t [SHA384_BLOCK_LENGTH]));
- extern void SHA384Update	__PR((SHA2_CTX *, const UInt8_t *, size_t));
- extern void SHA384Pad		__PR((SHA2_CTX *));
-+#endif
- extern void SHA384Final		__PR((UInt8_t [SHA384_DIGEST_LENGTH],
- 					SHA2_CTX *));
- extern char *SHA384End		__PR((SHA2_CTX *, char *));

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")},