Update to cdrecord 2.0.

Too many changes to list them all here; see following for full details:
	ftp://ftp.berlios.de/pub/cdrecord/AN-2.0

cdrecord:
	-overburn option
	Driveropts "burnproof" renamed to "burnfree"
	CD-Text support.

cdda2wav:
	Added -L to query freedb.freedb.org for CDDB information.

mkisofs:
	Fix -graft-points.
	Various fixes to HFS support.

libedc:
	Performance enhancements.

libscg:
	Various improvements to SCSI & ATAPI transports.

8 files changed, 64 insertions, 70 deletions

diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index a45da81a2c0..5a7b99353f9 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.43 2002/09/29 14:34:00 lukem Exp $
+# $NetBSD: Makefile,v 1.44 2003/01/03 16:27:09 lukem Exp $
 
-DISTNAME=	cdrtools-1.10
-PKGNAME=	cdrecord-1.10
-WRKSRC=		${WRKDIR}/${DISTNAME:C/a.*//}
+DISTNAME=	cdrtools-2.0
+PKGNAME=	cdrecord-2.0
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/
+MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/
 
-MAINTAINER=	hubertf@netbsd.org
+MAINTAINER=	lukem@netbsd.org
 HOMEPAGE=	http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
 COMMENT=	This program allows you to create CD's on a CD-Recorder
 
@@ -52,7 +51,12 @@ do-install:
 	cd ${WRKSRC}/mkisofs;						\
 		${INSTALL_PROGRAM} OBJ/*/mkisofs ${PREFIX}/bin;		\
 		${INSTALL_MAN} mkisofs.8 ${PREFIX}/man/man8
-	cd ${WRKSRC}/misc;						\
+	cd ${WRKSRC}/mkisofs/diag;					\
+		for f in devdump isodump isoinfo isovfy; do		\
+			${INSTALL_PROGRAM} OBJ/*/$$f ${PREFIX}/bin;	\
+			${INSTALL_MAN} isoinfo.8 ${PREFIX}/man/man8/$$f.8; \
+		done
+	cd ${WRKSRC}/readcd;						\
 		${INSTALL_PROGRAM} OBJ/*/readcd ${PREFIX}/bin;		\
 		${INSTALL_MAN} readcd.1 ${PREFIX}/man/man1
 
diff --git a/sysutils/cdrecord/PLIST b/sysutils/cdrecord/PLIST
index aec25381503..c4e99a854ab 100644
--- a/sysutils/cdrecord/PLIST
+++ b/sysutils/cdrecord/PLIST
@@ -1,9 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:58 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/03 16:27:09 lukem Exp $
 bin/cdda2wav
 bin/cdrecord
 bin/mkisofs
 bin/readcd
+bin/devdump
+bin/isodump
+bin/isoinfo
+bin/isovfy
 man/man1/cdda2wav.1
 man/man1/cdrecord.1
 man/man1/readcd.1
 man/man8/mkisofs.8
+man/man8/devdump.8
+man/man8/isodump.8
+man/man8/isoinfo.8
+man/man8/isovfy.8
diff --git a/sysutils/cdrecord/distinfo b/sysutils/cdrecord/distinfo
index 1ca31d1e7c5..d3019fab187 100644
--- a/sysutils/cdrecord/distinfo
+++ b/sysutils/cdrecord/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2002/09/26 11:32:02 jlam Exp $
+$NetBSD: distinfo,v 1.8 2003/01/03 16:27:09 lukem Exp $
 
-SHA1 (cdrtools-1.10.tar.gz) = 0d61bd1331d69a579e6582719a119d94166fcf10
-Size (cdrtools-1.10.tar.gz) = 1331424 bytes
-SHA1 (patch-ac) = 8faabd6be403f62f09da4016d2263b946d95c42e
-SHA1 (patch-ah) = 97796b651f305b8942f463f2438783cd5b686fd8
-SHA1 (patch-ai) = 3dd98fc56a3304b980797f9a898bec2bd3dd484c
-SHA1 (patch-aj) = 0030dee842d2ed96b58486039ec0cd0999a6db86
-SHA1 (patch-ba) = ae9850e4a37a034ff0d2bec7c752de70d603b131
+SHA1 (cdrtools-2.0.tar.gz) = a6645d541a40a0374d6ebffae699555273e41cb0
+Size (cdrtools-2.0.tar.gz) = 1583252 bytes
+SHA1 (patch-ac) = 52622d8fc4170a9c0310c810badc74bb3b9c9df8
+SHA1 (patch-ah) = 34ecab01125bcac2a28e295b198edce0de8b8777
+SHA1 (patch-ai) = 38f6bc8a9deee6861d5589dcf65dcd4968614457
+SHA1 (patch-aj) = 7e8328ad3478a43cc9311158c30b0acfe48fbb7b
+SHA1 (patch-ba) = 8d7038282ba5a6b133544cc8e440f6e12a475990
 SHA1 (patch-bb) = c5ee1e00e1f8723fe28d4d360bcede7680a7e4b9
diff --git a/sysutils/cdrecord/patches/patch-ac b/sysutils/cdrecord/patches/patch-ac
index c1fb66f0fc4..753ebb242e7 100644
--- a/sysutils/cdrecord/patches/patch-ac
+++ b/sysutils/cdrecord/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.12 2001/08/07 11:23:57 drochner Exp $
+$NetBSD: patch-ac,v 1.13 2003/01/03 16:27:10 lukem Exp $
 
---- include/btorder.h.orig	Sat Feb 17 23:24:23 2001
-+++ include/btorder.h	Mon Aug  6 10:27:20 2001
+--- include/btorder.h.orig	Mon Dec 10 10:54:27 2001
++++ include/btorder.h
 @@ -28,6 +28,7 @@
  #include <sys/types.h>			/* try to load isa_defs.h on Solaris */
  #define	_INCL_SYS_TYPES_H
@@ -9,8 +9,8 @@ $NetBSD: patch-ac,v 1.12 2001/08/07 11:23:57 drochner Exp $
 +#include <machine/endian.h>
  
  #ifndef _MCONFIG_H
- #include <mconfig.h>
-@@ -77,7 +78,7 @@
+ #include <mconfig.h>			/* load bit/byte-oder from xmconfig.h*/
+@@ -108,7 +109,7 @@ error  Only one of _BIT_FIELDS_LTOH or _
  #	if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
  	   defined(__PPC) || defined(powerpc) || defined(__powerpc__)
  
diff --git a/sysutils/cdrecord/patches/patch-ah b/sysutils/cdrecord/patches/patch-ah
index 8e94db3ec87..69a453b9ff1 100644
--- a/sysutils/cdrecord/patches/patch-ah
+++ b/sysutils/cdrecord/patches/patch-ah
@@ -1,26 +1,26 @@
-$NetBSD: patch-ah,v 1.2 2001/08/07 11:23:57 drochner Exp $
+$NetBSD: patch-ah,v 1.3 2003/01/03 16:27:10 lukem Exp $
 
---- cdda2wav/setuid.c.orig	Sat Apr 22 22:37:57 2000
-+++ cdda2wav/setuid.c	Mon Aug  6 10:36:07 2001
-@@ -93,7 +93,7 @@
-     }
+--- cdda2wav/setuid.c.orig	Thu Nov 21 16:12:35 2002
++++ cdda2wav/setuid.c	Sat Nov 30 18:17:51 2002
+@@ -92,7 +92,7 @@
+ 
      if (geteuid() == 0) return; /* nothing to do */
  
 -#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEUID)
 +#if defined (HAVE_SETEUID)
      if (seteuid(effective_uid)) {
  	perror("seteuid in needroot()");
- 	exit(1);
-@@ -127,7 +127,7 @@
-     }
+ 	exit(PERM_ERROR);
+@@ -126,7 +126,7 @@
+ 	return;
      if (geteuid() != 0) return; /* nothing to do */
  
 -#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEUID)
 +#if defined (HAVE_SETEUID)
      if (seteuid(real_uid)) {
  	perror("seteuid in dontneedroot()");
- 	exit(1);
-@@ -185,7 +185,7 @@
+ 	exit(PERM_ERROR);
+@@ -186,7 +186,7 @@
  
      if (getegid() == effective_gid) return; /* nothing to do */
  
@@ -28,13 +28,13 @@ $NetBSD: patch-ah,v 1.2 2001/08/07 11:23:57 drochner Exp $
 +#if defined (HAVE_SETEGID)
      if (setegid(effective_gid)) {
  	perror("setegid in needgroup()");
- 	exit(1);
-@@ -216,7 +216,7 @@
- 	exit(1);
+ 	exit(PERM_ERROR);
+@@ -217,7 +217,7 @@
+ 	exit(INTERNAL_ERROR);
      }
      if (getegid() != effective_gid) return; /* nothing to do */
 -#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEGID)
 +#if defined (HAVE_SETEGID)
      if (setegid(real_gid)) {
  	perror("setegid in dontneedgroup()");
- 	exit(1);
+ 	exit(PERM_ERROR);
diff --git a/sysutils/cdrecord/patches/patch-ai b/sysutils/cdrecord/patches/patch-ai
index 5f36da7bd35..55a6ab5dce1 100644
--- a/sysutils/cdrecord/patches/patch-ai
+++ b/sysutils/cdrecord/patches/patch-ai
@@ -1,19 +1,13 @@
-$NetBSD: patch-ai,v 1.2 2001/08/07 11:23:57 drochner Exp $
+$NetBSD: patch-ai,v 1.3 2003/01/03 16:27:10 lukem Exp $
 
-I know this patch is an ugly hack. But at least it makes "cdrecord -scanbus"
-more usefull, which in turn makes xcdroast work. Feel free to implement
-this cleanly however...
-
-Thorsten Frueauf <frueauf@netbsd.org>, 2001.02.10
-
---- libscg/scsi-bsd.c.orig	Sun Mar 18 15:10:21 2001
-+++ libscg/scsi-bsd.c	Mon Aug  6 14:55:09 2001
+--- libscg/scsi-bsd.c.orig	Mon Oct 21 15:57:07 2002
++++ libscg/scsi-bsd.c	Sat Nov 30 18:20:19 2002
 @@ -48,7 +48,7 @@
   *	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.40";	/* The version for this transport*/
-+LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.40nb1";	/* The version for this transport*/
+-LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.41";	/* The version for this transport*/
++LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.41nb1";	/* The version for this transport*/
  
  #define	MAX_SCG		16	/* Max # of SCSI controllers */
  #define	MAX_TGT		16
@@ -26,7 +20,7 @@ Thorsten Frueauf <frueauf@netbsd.org>, 2001.02.10
  		case SCG_SCCS_ID:
  			return (__sccsid);
  		}
-@@ -130,6 +130,15 @@
+@@ -140,6 +140,15 @@
  	register int	l;
  	register int	nopen = 0;
  	char		devname[64];
@@ -42,7 +36,7 @@ Thorsten Frueauf <frueauf@netbsd.org>, 2001.02.10
  
  	if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
  		errno = EINVAL;
-@@ -156,6 +165,60 @@
+@@ -166,6 +175,60 @@
  	if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2))
  		goto openbydev;
  
@@ -103,7 +97,7 @@ Thorsten Frueauf <frueauf@netbsd.org>, 2001.02.10
  	if (busno >= 0 && tgt >= 0 && tlun >= 0) {
  
  		js_snprintf(devname, sizeof(devname),
-@@ -192,6 +255,7 @@
+@@ -202,6 +265,7 @@
  			}
  		}
  	}
diff --git a/sysutils/cdrecord/patches/patch-aj b/sysutils/cdrecord/patches/patch-aj
index 83c977120d2..fe127071cd2 100644
--- a/sysutils/cdrecord/patches/patch-aj
+++ b/sysutils/cdrecord/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.4 2002/08/25 21:50:56 jlam Exp $
+$NetBSD: patch-aj,v 1.5 2003/01/03 16:27:10 lukem Exp $
 
---- cdrecord/scsi_cdr.c.orig	Wed Apr 11 00:22:21 2001
-+++ cdrecord/scsi_cdr.c	Wed May 15 19:55:52 2002
-@@ -271,6 +271,12 @@
+--- cdrecord/scsi_cdr.c.orig	Thu Sep 12 22:39:35 2002
++++ cdrecord/scsi_cdr.c
+@@ -282,6 +282,12 @@ EXPORT int
  request_sense(scgp)
  	SCSI	*scgp;
  {
@@ -15,7 +15,7 @@ $NetBSD: patch-aj,v 1.4 2002/08/25 21:50:56 jlam Exp $
  		 char	sensebuf[CCS_SENSE_LEN];
  	register struct	scg_cmd	*scmd = scgp->scmd;
  
-@@ -290,6 +296,7 @@
+@@ -301,6 +307,7 @@ request_sense(scgp)
  	if (scg_cmd(scgp) < 0)
  		return (-1);
  	scg_prsense((Uchar *)sensebuf, CCS_SENSE_LEN - scg_getresid(scgp));
@@ -23,15 +23,3 @@ $NetBSD: patch-aj,v 1.4 2002/08/25 21:50:56 jlam Exp $
  	return (0);
  }
  
-@@ -1741,9 +1748,9 @@
- 
- 	fillbytes(mode, sizeof(mode), '\0');
- 	scgp->silent++;
--	if (mode_sense(scgp, mode, 0xFF, 0x3F, current?0:2) < 0) {	/* All Pages */
-+	if (mode_sense(scgp, mode, 0xFE, 0x3F, current?0:2) < 0) {	/* All Pages */
- 		fillbytes(mode, sizeof(mode), '\0');
--		if (mode_sense(scgp, mode, 0xFF, 0, current?0:2) < 0)	{/* VU (block desc) */
-+		if (mode_sense(scgp, mode, 0xFE, 0, current?0:2) < 0)	{/* VU (block desc) */
- 			scgp->silent--;
- 			return (-1);
- 		}
diff --git a/sysutils/cdrecord/patches/patch-ba b/sysutils/cdrecord/patches/patch-ba
index 2f8b498fc9f..09b0fb82337 100644
--- a/sysutils/cdrecord/patches/patch-ba
+++ b/sysutils/cdrecord/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.1 2001/08/07 11:23:57 drochner Exp $
+$NetBSD: patch-ba,v 1.2 2003/01/03 16:27:10 lukem Exp $
 
---- misc/readcd.c.orig	Fri Apr 13 19:41:39 2001
-+++ misc/readcd.c	Mon Aug  6 10:42:49 2001
-@@ -301,11 +301,11 @@
+--- readcd/readcd.c.orig	Fri Sep 20 09:00:12 2002
++++ readcd/readcd.c
+@@ -341,11 +341,11 @@ main(ac, av)
  	/*
  	 * We don't need root privilleges anymore.
  	 */