Update to 2.01.01alpha66:

NEW features of cdrtools-2.01.01a65:

All:

-	*BSD comes with a broken sed(1), so we need to go back to tr(1) based
	code for GNU make in the Schily Makefilesystem.

-	Added support for amd64-netbsd-cc.rul to the Schily Makefilesystem

-	Added support for DragonFly BSD to config.guess and config.sub

Libscg:

-	Added a hack to liscg to allow cdrecord -scanbus to work on NetBSD

-	Added a hack to liscg to allow cdrecord -scanbus to work on OpenBSD

Mkisofs (Maintained/enhanced by J

-	Avoid signed chars ad parameter to toupper

NEW features of cdrtools-2.01.01a66:

-	Added support for 64 bit compilation on HP-HX using "cc".
	Use make CCOM=cc64 as usual to switch to 64 bit compilation.

Libschily:

-	libschily/fconv.c reworked to deal with non-C99 compliant systems and to deal
	with the constraints found in HP-UX-11.11.

Libsiconv:

-	Fixed a problem in libsiconv in case that the the locale is specified as
	"iconv:name".

Libscg:

-	Make libscg deal with the new error code from HP-UX that
	is returned for a non-existing ATAPI slave.

-	Some minor changes in libscg to make scgcheck report less problems
	with HP-UX

Cdrecord:

-	Better man page with repect to dev=

-	The cdrecord man page has been restructured.

-	Fixed a bug in the workaround code for a firmware bug for DVD+R
	media in HL-DT-ST drives.

Cdda2wav (Maintained/enhanced by J

-	Better man page with repect to dev=

-	The cdda2wav man page has been restructured.

Readcd:

-	readcd now only send the Plextor specific SCSI commands for the -cxscan
	option in case that the drive identifies as Plextor.

-	Better man page with repect to dev=

Scgcheck:

-	Better man page with repect to dev=

Btcflash:

-	Better man page with repect to dev=

Mkisofs (Maintained/enhanced by J

-	mkisofs man page reworked

-	isoinfo man page reworked

-	New file mkisofs/rock.h

-	isodump now prints more information about Rock Ridge attributes to
	help debugging non-compliant Rock Ridge ISO images.

-	isoinfo now correctly identifies ISO images made with the Mac OS X
	program "hdiutil" by e.g. calling:

	hdiutil makehybrid -iso -hfs -verbose -o xxx.iso some_dir

	As filesystems that violate the Rock Ridge standard.

	Check e.g. by "isoinfo -i xxx.iso -d"

	Interpreting Rock Ridge on such images can be enforced by calling:

	"isoinfo -i xxx.iso -lR -debug"

-	mkisofs now ignores the broken Rock Ridge attributes that have been
	created by the Mac OS X program "hdiutil".

6 files changed, 6 insertions, 179 deletions

diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index 8195100bddf..af4925cbf26 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.62 2009/09/24 08:07:36 hasso Exp $
+# $NetBSD: Makefile,v 1.63 2009/10/31 00:55:03 wiz Exp $
 
-DISTNAME=	cdrtools-2.01.01a64
+DISTNAME=	cdrtools-2.01.01a66
 PKGNAME=	${DISTNAME:S/a/alpha/:S/-pre/pre/}
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/ \
@@ -88,8 +88,6 @@ do-configure:
 			ln -sf i386-$$suffix ${MACHINE}-$$suffix;	\
 		fi;							\
 	done;								\
-	ln -sf i386-freebsd-cc.rul amd64-dragonfly-cc.rul;		\
-	ln -sf i386-freebsd-gcc.rul amd64-dragonfly-gcc.rul
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_PROGRAM} config
 
 post-build:
@@ -132,7 +130,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \
 		${DESTDIR}${PREFIX}/share/examples/cdrtools/cdrecord
 
-
 CONFIGURE_ENV+= librt=${NETBSDLIB.rt:U:Q}
 
 .if ${OPSYS} == "NetBSD"
diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index 58fc95ddcb0..35fc97a9acf 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.41 2009/09/13 16:40:22 tron Exp $
+$NetBSD: distinfo,v 1.42 2009/10/31 00:55:03 wiz Exp $
 
-SHA1 (cdrtools-2.01.01a64.tar.bz2) = 2e4af9079527bd5683dc778d1400ef68b595fd36
-RMD160 (cdrtools-2.01.01a64.tar.bz2) = d609abe707c41d1a66bec7bb1ff4ae7967e5b355
-Size (cdrtools-2.01.01a64.tar.bz2) = 1836328 bytes
+SHA1 (cdrtools-2.01.01a66.tar.bz2) = caef4828b7cea14e68a11388d011dc97b70219a7
+RMD160 (cdrtools-2.01.01a66.tar.bz2) = 150461c3bd140ac00afafc5bd2359c571e5deb4f
+Size (cdrtools-2.01.01a66.tar.bz2) = 1842467 bytes
 SHA1 (patch-aa) = 1f3461ae34071c20672025575bbb0abe7b128ef8
 SHA1 (patch-ab) = bc6e2ccd371dcd2ae9c8d7caee89b937c9e36893
-SHA1 (patch-ac) = eedad8bd2a3705c33dd6640ba0556f5dd3927739
 SHA1 (patch-ad) = 08230fc203325916d4604576401da048dc108637
 SHA1 (patch-ae) = 9b58bfb2e394cd5e710d1fa407a887dbdaacd756
-SHA1 (patch-ai) = a65625831d88a97547c4e0a03075711bee0dc373
-SHA1 (patch-ch) = f64e026c66451df814bf848cf73b513a25cc1311
-SHA1 (patch-ci) = 5c7912aed94253b3ba8208a91c04c34da6345083
diff --git a/sysutils/cdrtools/patches/patch-ac b/sysutils/cdrtools/patches/patch-ac
deleted file mode 100644
index 9d6755b5c8e..00000000000
--- a/sysutils/cdrtools/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2009/09/09 13:45:13 wiz Exp $
-
---- RULES/mk-gmake.id.orig	2009-08-29 12:17:45.000000000 +0000
-+++ RULES/mk-gmake.id
-@@ -55,9 +55,9 @@ endif
- _MACHCMD=	(mach || uname -p || true)	2> /dev/null
- _ARCHCMD=	(arch || /usr/ucb/arch || true)	2> /dev/null
- 
--XP_ARCH:=	$(shell $(_MACHCMD) | sed 'y%ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"%abcdefghijklmnopqrstuvwxyz,------%')
--XK_ARCH:=	$(shell uname -m    | sed 'y%ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"%abcdefghijklmnopqrstuvwxyz,------%')
--XM_ARCH:=	$(shell $(_ARCHCMD) | sed 'y%ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"%abcdefghijklmnopqrstuvwxyz,------%')
-+XP_ARCH:=	$(shell $(_MACHCMD) | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"' 'abcdefghijklmnopqrstuvwxyz,//////' | tr ',/' ',\-')
-+XK_ARCH:=	$(shell uname -m    | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"' 'abcdefghijklmnopqrstuvwxyz,//////' | tr ',/' ',\-')
-+XM_ARCH:=	$(shell $(_ARCHCMD) | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"' 'abcdefghijklmnopqrstuvwxyz,//////' | tr ',/' ',\-')
- 
- P_ARCH=		$(XP_ARCH)
- K_ARCH=		$(XK_ARCH)
-@@ -73,9 +73,9 @@ _M_ARCH=	$(_UNIQ)$(XM_ARCH)
- __M_ARCH=	$(_M_ARCH:$(_UNIQ)=$(K_ARCH))
- M_ARCH=		$(__M_ARCH:$(_UNIQ)%=%)
- 
--OSNAME:=	$(shell uname -s | sed 'y%ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"%abcdefghijklmnopqrstuvwxyz,------%')
--OSREL:=		$(shell uname -r | sed 'y%ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"%abcdefghijklmnopqrstuvwxyz,------%')
--OSVERSION:=	$(shell uname -v | sed 'y%ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"%abcdefghijklmnopqrstuvwxyz,------%')
-+OSNAME:=	$(shell uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"' 'abcdefghijklmnopqrstuvwxyz,//////' | tr ',/' ',\-')
-+OSREL:=		$(shell uname -r | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"' 'abcdefghijklmnopqrstuvwxyz,//////' | tr ',/' ',\-')
-+OSVERSION:=	$(shell uname -v | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"' 'abcdefghijklmnopqrstuvwxyz,//////' | tr ',/' ',\-')
- 
- ARCH_DONE=	TRUE
- 
diff --git a/sysutils/cdrtools/patches/patch-ai b/sysutils/cdrtools/patches/patch-ai
deleted file mode 100644
index d9a044e903d..00000000000
--- a/sysutils/cdrtools/patches/patch-ai
+++ /dev/null
@@ -1,110 +0,0 @@
-$NetBSD: patch-ai,v 1.8 2009/06/09 18:45:13 wiz Exp $
-
---- libscg/scsi-bsd.c.orig	2009-04-19 12:26:13.000000000 +0000
-+++ libscg/scsi-bsd.c
-@@ -44,6 +44,7 @@ static	char __sccsid[] =
- 
- #undef	sense
- #include <sys/scsiio.h>
-+#include <util.h>
- 
- /*
-  *	Warning: you may change this source, but if you do that
-@@ -52,7 +53,7 @@ static	char __sccsid[] =
-  *	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.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
-@@ -112,7 +113,7 @@ scgo_version(scgp, what)
- 		 * return "schily" for the SCG_AUTHOR request.
- 		 */
- 		case SCG_AUTHOR:
--			return (_scg_auth_schily);
-+			return ("frueauf");
- 		case SCG_SCCS_ID:
- 			return (__sccsid);
- 		}
-@@ -144,6 +145,10 @@ scgo_open(scgp, device)
- 	register int	l;
- 	register int	nopen = 0;
- 	char		devname[64];
-+#if defined(__NetBSD__)
-+	struct scsi_addr mysaddr;
-+	int		myslicename = getrawpartition();
-+#endif
- 
- 	if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
- 		errno = EINVAL;
-@@ -170,6 +175,60 @@ scgo_open(scgp, device)
- 	if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2))
- 		goto openbydev;
- 
-+
-+/*
-+ * I know of no method in NetBSD to probe the scsibus and get the mapping
-+ * busnumber,target,lun --> devicename.
-+ *
-+ * Because of this implement a true bruteforce hack to find
-+ * out what cdroms there are.
-+ *
-+ * Note that this method only finds cd0-cd7. Anything higher
-+ * than this needs additional tweaks.
-+ *
-+ * Feel free to implement this cleanly if you have better knowledge.
-+ * Until then this helps to get -scanbus und thus xcdroast working :-)
-+ *
-+ */
-+#if defined(__NetBSD__)
-+	if (busno >= 0 && tgt >= 0 && tlun >= 0) {
-+		for (l=0; l < MAX_LUN ; l++) {
-+			sprintf(devname, "/dev/rcd%d%c", l, 'a' + myslicename);
-+			f = open(devname, O_RDWR);
-+			if (f >= 0) {
-+				if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) {
-+					close(f);
-+					errno = EINVAL;
-+					return (0);
-+				}
-+				if (busno == SADDR_BUS(mysaddr) && tgt == SADDR_TARGET(mysaddr) && tlun == SADDR_LUN(mysaddr)) {
-+					scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
-+					return(1);
-+				}
-+			}
-+		}
-+	} else for (l=0; l < MAX_LUN ; l++) {
-+			sprintf(devname, "/dev/rcd%d%c", l, 'a' + myslicename);
-+			f = open(devname, O_RDWR);
-+			if (f >= 0) {
-+				if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) {
-+					close(f);
-+					errno = EINVAL;
-+					return (0);
-+				}
-+				scg_scsibus(scgp) = busno   = SADDR_BUS(mysaddr);
-+				scg_target(scgp)  = tgt     = SADDR_TARGET(mysaddr);
-+				if ((tlun >= 0) && (tlun != SADDR_LUN(mysaddr))) {
-+					close(f);
-+					errno = EINVAL;
-+					return (0);
-+				}
-+				scg_lun(scgp)     = tlun    = SADDR_LUN(mysaddr);
-+				if (scg_setup(scgp, f, busno, tgt, tlun))
-+					nopen++;
-+			}
-+		}
-+#else /* not __NetBSD__ */
- 	if (busno >= 0 && tgt >= 0 && tlun >= 0) {
- 
- 		js_snprintf(devname, sizeof (devname),
-@@ -206,6 +265,7 @@ scgo_open(scgp, device)
- 			}
- 		}
- 	}
-+#endif /* end of not __NetBSD__ */
- 	/*
- 	 * Could not open /dev/su-* or got dev=devname:b,l,l / dev=devname:@,l
- 	 * We do the apropriate tests and try our best.
diff --git a/sysutils/cdrtools/patches/patch-ch b/sysutils/cdrtools/patches/patch-ch
deleted file mode 100644
index 4cdc862ad5e..00000000000
--- a/sysutils/cdrtools/patches/patch-ch
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ch,v 1.4 2009/09/09 13:57:52 wiz Exp $
-
-for getrawpartition in patch-ai
-
---- RULES/i386-netbsd-cc.rul.orig	2007-05-09 12:25:30.000000000 +0000
-+++ RULES/i386-netbsd-cc.rul
-@@ -37,5 +37,6 @@ LIB_KVM=	
- 
- #LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%)
- LDOPTS=		$(LIBS_PATH) $(LDPATH)
-+LDLIBS=		$(LIBS) $(LIBX) -lutil
- 
- RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib
diff --git a/sysutils/cdrtools/patches/patch-ci b/sysutils/cdrtools/patches/patch-ci
deleted file mode 100644
index f62ac409edd..00000000000
--- a/sysutils/cdrtools/patches/patch-ci
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ci,v 1.4 2009/09/09 13:57:52 wiz Exp $
-
-for getrawpartition in patch-ai
-
---- RULES/i386-netbsd-gcc.rul.orig	2007-05-09 12:25:30.000000000 +0000
-+++ RULES/i386-netbsd-gcc.rul
-@@ -37,5 +37,6 @@ LIB_KVM=	
- 
- #LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%)
- LDOPTS=		$(LIBS_PATH) $(LDPATH)
-+LDLIBS=		$(LIBS) $(LIBX) -lutil
- 
- RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib