Update cdrtools to 2.01.01a24.

The change logs with over 3000 lines are too long to mention here.
See AN-2.01.01* in the source directory.

For me it was support for writing DVD+RWs.

Note on the patches:
patch-ak: fix compilation with DVDPLUS_DEBUG defined.

patch-cg: revert "use" from off_t to int again as it is passed to function
expecting an int. The possible values aren't huge, anyway.

patch-ck, patch-cl, patch-cm: fix references to /etc/default/cdrecord.

Remove patches that have been incorporated upstream.

28 files changed, 283 insertions, 344 deletions

diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index 04efc1f038a..81e14113eb7 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:10 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/03/16 22:04:52 bad Exp $
 
-DISTNAME=	cdrtools-2.01
-PKGREVISION=	4
+DISTNAME=	cdrtools-2.01.01a24
+PKGNAME=	cdrtools-2.01.01.24
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/
+MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -17,6 +17,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
+WRKSRC=		${WRKDIR}/cdrtools-2.01.01
 USE_TOOLS+=	gmake tbl
 
 .if ${LOCALBASE} != "/opt/schily"
@@ -55,9 +56,6 @@ SUBST_FILES.fix=	cdrecord/defaults.c cdrecord/cdrecord.1 \
 SUBST_SED.fix=		-e "s,@CDRECORD_CONF@,${CDRECORD_CONF},g"
 SUBST_MESSAGE.fix=	Fixing paths.
 
-post-extract:
-	${CP} ${WRKSRC}/RULES/os-freebsd.id ${WRKSRC}/RULES/os-dragonfly.id
-
 do-configure:
 	cd ${WRKSRC}/RULES;						\
 	for suffix in netbsd-cc.rul netbsd-gcc.rul; do			\
diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index 0007da39f55..d5d8317418b 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1,27 +1,24 @@
-$NetBSD: distinfo,v 1.4 2006/08/28 13:56:22 dsainty Exp $
+$NetBSD: distinfo,v 1.5 2007/03/16 22:04:52 bad Exp $
 
-SHA1 (cdrtools-2.01.tar.bz2) = f94cfe51dd512d4e0b9106b986bde12d4f7967ce
-RMD160 (cdrtools-2.01.tar.bz2) = b34a8b81b21cc8ed1927f34e44130513d2ee0407
-Size (cdrtools-2.01.tar.bz2) = 1400389 bytes
-SHA1 (patch-aa) = e6ca173814be22af60626a973d61e36b2a06798d
-SHA1 (patch-ab) = a94454664efc8e7b36087ecbfc94557050d1cad5
-SHA1 (patch-ac) = 45c660e3d9f55e161614f29b0e94e177012213aa
-SHA1 (patch-ad) = 8ca45e2fc52cdd25e666a0fbf40e6679140cecd9
-SHA1 (patch-ae) = 013d57cb94dc9653b41ed8b21c7d8a819d5e10f3
-SHA1 (patch-af) = d91bb7f1ed63725639228e59437982d903223fbb
-SHA1 (patch-ag) = 398889dab85fb52600f1e1dac3fdaf2601d92f90
-SHA1 (patch-ah) = f3b163c78fcc77722d7f8f9338556685d50d2919
-SHA1 (patch-ai) = df338ebfc23b8016fd839a41f279e1e31835ee05
-SHA1 (patch-aj) = ef92e08cd85ee9ade5c99ea52481f5887365f726
-SHA1 (patch-ba) = 3eb8a53bba94e3226d32e39fe0a7f18086c5797b
-SHA1 (patch-bb) = d78453246a81d82c71e8d1d831acccff4b2b40fd
-SHA1 (patch-ca) = 12111a160a9e968d71c73f84685d998d4330ade6
-SHA1 (patch-cb) = 1819e8e0ee38549c276ef8eb46a3b0a62661a083
-SHA1 (patch-cc) = a14098dd14e0b58d3fed1167341a22167eea7c19
-SHA1 (patch-cd) = 5bedbdd8b7535948f0497680b0561abb98c80864
-SHA1 (patch-ce) = eb12b12d26f8451654124abcd0424ff29e89bcf8
-SHA1 (patch-cf) = 021b7979320dbc2fdd7a40e9cef0a3db6844d874
-SHA1 (patch-cg) = 945db00ff13460dce1f9ce38e8ff29ab7cbd1f85
-SHA1 (patch-ch) = 1060be9a0c7371ad52b23b22f3b5dcf09cb99f7f
-SHA1 (patch-ci) = 2b6aee7cd9acb06b7190f068e4510ace1d8715a3
-SHA1 (patch-cj) = 209b87149e6660637dc58b561a83f6db56c645d2
+SHA1 (cdrtools-2.01.01a24.tar.bz2) = cd375751bb1417049df05c342d00d95f6b04f296
+RMD160 (cdrtools-2.01.01a24.tar.bz2) = 95f9d6e82414b92f4d8ad434a66f926754c42101
+Size (cdrtools-2.01.01a24.tar.bz2) = 1588764 bytes
+SHA1 (patch-aa) = fca9bcc4d4a7480cea9c9f6011f72afdf691a9ef
+SHA1 (patch-ac) = cde9bd57eef040d27734f6c86c55ac6153025d4f
+SHA1 (patch-ah) = fb6abfd0a2e92370f1fc8c00426852fb5f83ae18
+SHA1 (patch-ai) = 0f535ca3dde4c28909697e43136ff60c352cb6b0
+SHA1 (patch-aj) = 8f5c57f7b5ebc4ae9188212c9599d0431f0ce785
+SHA1 (patch-ak) = 1ea3e7c76001d41e0a256d510b6e8c58dac7f966
+SHA1 (patch-ba) = 8a1d6b7703e0885fe080e4a71aeabd0bb4302381
+SHA1 (patch-bb) = d9a94fc48430988b86b6a4a08a01e6a7ed95669f
+SHA1 (patch-ca) = b7a2f9a511852cca018a090086e46d299e4e1ce0
+SHA1 (patch-cb) = 39e5ab3ef417d32fa5ef9f9dd1313193ce647162
+SHA1 (patch-cc) = 709590dbb45c37e3a6b07322167f38c95fcb2fdf
+SHA1 (patch-cd) = a97eaa7f3c69ead40c313dae5128a79cc46f50b1
+SHA1 (patch-ce) = a57b73b2edac23903439136c874a1e2d0f895e70
+SHA1 (patch-cf) = 73fc95f53b85f637d4eb81a8b79355863c539ba7
+SHA1 (patch-cg) = d59b660609a2928e872bcde8393ad6eec51798bd
+SHA1 (patch-cj) = d1ebb5950ef434ff9b0e42d03e41e1bd247874d9
+SHA1 (patch-ck) = 394c92976b7da8d55433ec4c59a6439563b28c56
+SHA1 (patch-cl) = 89aade26d8e2c01b11144c011fde90a2b7ae0a17
+SHA1 (patch-cm) = 405234b554c69733c1bfee19eca2847e97c6f9da
diff --git a/sysutils/cdrtools/patches/patch-aa b/sysutils/cdrtools/patches/patch-aa
index 539ce26375b..e3eff6e2378 100644
--- a/sysutils/cdrtools/patches/patch-aa
+++ b/sysutils/cdrtools/patches/patch-aa
@@ -1,19 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2006/01/25 16:03:00 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2007/03/16 22:04:53 bad Exp $
 
---- cdda2wav/interface.c.orig	2006-01-25 15:51:29.000000000 +0000
-+++ cdda2wav/interface.c
-@@ -439,12 +439,12 @@ static void Check_interface_for_device( 
- #endif
- #endif
-        break;
--#if defined (__linux__) || defined (__FreeBSD__)
-+#if defined (__linux__) || defined (__FreeBSD__) || defined(__DragonFly__)
- #if defined (__linux__)
-     case SCSI_CDROM_MAJOR:     /* scsi cd */
-     default:			/* for example ATAPI cds */
- #else
--#if defined (__FreeBSD__)
-+#if defined (__FreeBSD__) || defined(__DragonFly__)
-     case 117:
- 	if (!S_ISCHR(statstruct->st_mode)) {
- 	    fprintf(stderr, "%s is not a char device\n",pdev_name);
+--- cdda2wav/local.cnf.in.orig	2003-09-04 10:35:46.000000000 +0200
++++ cdda2wav/local.cnf.in
+@@ -43,7 +43,7 @@ HAVE_IOCTL=	$(__HAVE_IOCTL:$(_UNIQ)$(HAV
+ 
+ ############# Sound device support
+ #to disable sound support comment out the corresponding line with HAVE_SOUND
+-OSS_SOUND_DEV=	'"/dev/dsp"'
++OSS_SOUND_DEV=	'"${DEVOSSSOUND}"'
+ SUN_SOUND_DEV=	'"/dev/audio"'
+ 
+ HAVE_OSS=	@HAVE_OSS@
diff --git a/sysutils/cdrtools/patches/patch-ab b/sysutils/cdrtools/patches/patch-ab
deleted file mode 100644
index 385d9a1f1d6..00000000000
--- a/sysutils/cdrtools/patches/patch-ab
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/01/25 16:03:00 joerg Exp $
-
---- cdda2wav/ioctl.c.orig	2006-01-25 15:52:17.000000000 +0000
-+++ cdda2wav/ioctl.c
-@@ -156,7 +156,7 @@ static unsigned ReadToc_cooked ( x )
- 	    fprintf( stderr, "can't get TocEntry #%d lba (error %d).\n", i+1, err );
- 	    exit( MEDIA_ERROR );
- 	}
--#ifdef	__FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- 	entry[i].cdte_addr.lba = be32_to_cpu(entry[i].cdte_addr.lba);
- #endif
-     }
-@@ -168,7 +168,7 @@ static unsigned ReadToc_cooked ( x )
- 	fprintf( stderr, "can't get TocEntry LEADOUT lba (error %d).\n", err );
- 	exit( MEDIA_ERROR );
-     }
--#ifdef	__FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-     entry[i].cdte_addr.lba = be32_to_cpu(entry[i].cdte_addr.lba);
- #endif
- 
-@@ -196,7 +196,7 @@ static void trash_cache_cooked(p, lSecto
- {
-       /* trash the cache */
- 
--#if	defined __FreeBSD__
-+#if	defined(__FreeBSD__) || defined(__DragonFly__)
-       static struct cdrom_read_audio arg2;
- 
-       arg2.address.lba = find_an_off_sector(lSector, SectorBurstVal);
-@@ -266,7 +266,7 @@ static int ReadCdRom_cooked (x, p, lSect
-   static int nothing_read = 1;
- 
- /* read 2352 bytes audio data */
--#if	defined __FreeBSD__
-+#if	defined(__FreeBSD__) || defined(__DragonFly__)
-   arg.address.lba = lSector;
-   arg.addr_format = CDROM_LBA;
-   arg.nframes = SectorBurstVal;
-@@ -395,7 +395,7 @@ static subq_chnl *ReadSubQ_cooked ( x, s
- {
-     struct cdrom_subchnl sub_ch;
- 
--#if	defined __FreeBSD__
-+#if	defined(__FreeBSD__) || defined(__DragonFly__)
-     struct cd_sub_channel_info sub_ch_info;
- 
-     if (x && x->verbose) {
-@@ -433,7 +433,7 @@ static subq_chnl *ReadSubQ_cooked ( x, s
-           return NULL;
-       }
-       case GET_POSITIONDATA:
--#if	defined __FreeBSD__
-+#if	defined(_FreeBSD__) || defined(__DragonFly__)
-       sub_ch.data_format = CD_CURRENT_POSITION;
- #endif
- #if defined (__linux__)
diff --git a/sysutils/cdrtools/patches/patch-ac b/sysutils/cdrtools/patches/patch-ac
index bccb725a438..3cedb37ceda 100644
--- a/sysutils/cdrtools/patches/patch-ac
+++ b/sysutils/cdrtools/patches/patch-ac
@@ -1,18 +1,18 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2007/03/16 22:04:53 bad Exp $
 
---- include/btorder.h.orig	2003-06-15 23:41:22.000000000 +0200
-+++ include/btorder.h
-@@ -28,6 +28,9 @@
- #include <sys/types.h>			/* try to load isa_defs.h on Solaris */
- #define	_INCL_SYS_TYPES_H
+--- include/schily/btorder.h.orig	2007-01-16 15:19:12.000000000 +0100
++++ include/schily/btorder.h
+@@ -27,6 +27,9 @@
+ #ifndef	_SCHILY_TYPES_H
+ #include <schily/types.h>		/* try to load isa_defs.h on Solaris */
  #endif
 +#ifdef __NetBSD__
 +#include <machine/endian.h>
 +#endif
  
- #ifndef _MCONFIG_H
- #include <mconfig.h>			/* load bit/byte-oder from xmconfig.h*/
-@@ -108,7 +111,7 @@ error  Only one of _BIT_FIELDS_LTOH or _
+ /*
+  * Convert bit-order definitions from xconfig.h into our values
+@@ -103,7 +106,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/cdrtools/patches/patch-ad b/sysutils/cdrtools/patches/patch-ad
deleted file mode 100644
index 568b056c178..00000000000
--- a/sysutils/cdrtools/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/01/25 16:03:00 joerg Exp $
-
---- cdda2wav/mycdrom.h.orig	2006-01-25 15:53:18.000000000 +0000
-+++ cdda2wav/mycdrom.h
-@@ -52,7 +52,7 @@ All subcode only
- 
- #   endif /* if 0 */
- #  else /* not Sun SVR4 */
--#   if defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
-+#   if defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined __DragonFly__
- #    if !defined CDIOCREADAUDIO
- #     undef HAVE_IOCTL_INTERFACE
- #    else
diff --git a/sysutils/cdrtools/patches/patch-ae b/sysutils/cdrtools/patches/patch-ae
deleted file mode 100644
index 3c43b773215..00000000000
--- a/sysutils/cdrtools/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/01/25 16:03:00 joerg Exp $
-
---- include/xmconfig.h.orig	2006-01-25 15:54:29.000000000 +0000
-+++ include/xmconfig.h
-@@ -765,7 +765,7 @@ extern "C" {
- /*
-  * Prototype for FreeBSD / NetBSD / OpenBSD / BSD/OS
-  */
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__)
- #	define	PROTOTYPES
- #	define	HAVE_AOUT
- #	define	HAVE_STDARG_H
diff --git a/sysutils/cdrtools/patches/patch-af b/sysutils/cdrtools/patches/patch-af
deleted file mode 100644
index d1577645844..00000000000
--- a/sysutils/cdrtools/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/01/25 16:03:00 joerg Exp $
-
---- libscg/scsihack.c.orig	2006-01-25 15:54:47.000000000 +0000
-+++ libscg/scsihack.c
-@@ -129,7 +129,7 @@ EXPORT scg_ops_t scg_std_ops = {
- 
- #endif	/* linux */
- 
--#if	defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if	defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #define	SCSI_IMPL		/* We have a SCSI implementation for *BSD */
- 
- #include "scsi-bsd.c"
diff --git a/sysutils/cdrtools/patches/patch-ag b/sysutils/cdrtools/patches/patch-ag
deleted file mode 100644
index 80395c5bc11..00000000000
--- a/sysutils/cdrtools/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/01/25 16:03:00 joerg Exp $
-
---- mkisofs/defaults.h.orig	2006-01-25 15:55:08.000000000 +0000
-+++ mkisofs/defaults.h
-@@ -67,6 +67,10 @@
- #define	SYSTEM_ID_DEFAULT	"FreeBSD"
- #endif
- 
-+#ifdef __DragonFly__
-+#define	SYSTEM_ID_DEFAULT	"DragonFly"
-+#endif
-+
- #ifdef __NetBSD__
- #define	SYSTEM_ID_DEFAULT	"NetBSD"
- #endif
diff --git a/sysutils/cdrtools/patches/patch-ah b/sysutils/cdrtools/patches/patch-ah
index 1c1b3541905..c9cce18336f 100644
--- a/sysutils/cdrtools/patches/patch-ah
+++ b/sysutils/cdrtools/patches/patch-ah
@@ -1,58 +1,40 @@
-$NetBSD: patch-ah,v 1.2 2006/01/25 16:03:00 joerg Exp $
+$NetBSD: patch-ah,v 1.3 2007/03/16 22:04:54 bad Exp $
 
---- cdda2wav/setuid.c.orig	2004-08-19 10:54:34.000000000 +0000
+--- cdda2wav/setuid.c.orig	2006-11-11 22:40:01.000000000 +0100
 +++ cdda2wav/setuid.c
-@@ -94,7 +94,7 @@ void needroot(necessary)
+@@ -116,7 +116,7 @@ needroot(necessary)
+ 	if (geteuid() == 0)
+ 		return; /* nothing to do */
  
-     if (geteuid() == 0) return; /* nothing to do */
+-#if defined _POSIX_SAVED_IDS && defined(HAVE_SETEUID)
++#if defined(HAVE_SETEUID)
+ 	if (seteuid(effective_uid)) {
+ 		errmsg("Error with seteuid in needroot().\n");
+ 		exit(PERM_ERROR);
+@@ -162,7 +162,7 @@ dontneedroot()
+ 	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(PERM_ERROR);
-@@ -133,7 +133,7 @@ void dontneedroot()
- 	return;
-     if (geteuid() != 0) return; /* nothing to do */
+-#if defined _POSIX_SAVED_IDS && defined(HAVE_SETEUID)
++#if defined(HAVE_SETEUID)
+ 	if (seteuid(real_uid)) {
+ 		errmsg("Error with seteuid in dontneedroot().\n");
+ 		exit(PERM_ERROR);
+@@ -264,7 +264,7 @@ needgroup(necessary)
+ 	if (getegid() == effective_gid)
+ 		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(PERM_ERROR);
-@@ -176,7 +176,7 @@ void neverneedroot()
-       }
- #endif
-     }
--#if	defined(__FreeBSD__)	/* XXX this is a big hack and and not a permanent solution */
-+#if	defined(__FreeBSD__) || defined(__DragonFly__)	/* XXX this is a big hack and and not a permanent solution */
-     else {
- #if defined (HAVE_SETUID)
- 	if (setuid(real_uid)) {
-@@ -217,7 +217,7 @@ void needgroup(necessary)
- 
-     if (getegid() == effective_gid) return; /* nothing to do */
- 
--#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEGID)
-+#if defined (HAVE_SETEGID)
-     if (setegid(effective_gid)) {
- 	perror("setegid in needgroup()");
- 	exit(PERM_ERROR);
-@@ -249,7 +249,7 @@ void dontneedgroup()
- 	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(PERM_ERROR);
-@@ -292,7 +292,7 @@ void neverneedgroup()
-       }
- #endif
-     }
--#if	defined(__FreeBSD__)	/* XXX this is a big hack and and not a permanent solution */
-+#if	defined(__FreeBSD__) || defined(__DragonFly__)	/* XXX this is a big hack and and not a permanent solution */
-     else {
- #if defined (HAVE_SETGID)
- 	if (setgid(real_gid)) {
+-#if defined _POSIX_SAVED_IDS && defined(HAVE_SETEGID)
++#if defined(HAVE_SETEGID)
+ 	if (setegid(effective_gid)) {
+ 		errmsg("Error with setegid in needgroup().\n");
+ 		exit(PERM_ERROR);
+@@ -302,7 +302,7 @@ dontneedgroup()
+ 	}
+ 	if (getegid() != effective_gid)
+ 		return; /* nothing to do */
+-#if defined _POSIX_SAVED_IDS && defined(HAVE_SETEGID)
++#if defined(HAVE_SETEGID)
+ 	if (setegid(real_gid)) {
+ 		errmsg("Error with setegid in dontneedgroup().\n");
+ 		exit(PERM_ERROR);
diff --git a/sysutils/cdrtools/patches/patch-ai b/sysutils/cdrtools/patches/patch-ai
index 203e79b86bd..13c37a647a3 100644
--- a/sysutils/cdrtools/patches/patch-ai
+++ b/sysutils/cdrtools/patches/patch-ai
@@ -1,17 +1,17 @@
-$NetBSD: patch-ai,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2007/03/16 22:04:54 bad Exp $
 
---- libscg/scsi-bsd.c.orig	2004-01-15 00:13:05.000000000 +0100
+--- libscg/scsi-bsd.c.orig	2006-11-26 18:12:57.000000000 +0100
 +++ libscg/scsi-bsd.c
-@@ -48,7 +48,7 @@ static	char __sccsid[] =
+@@ -52,7 +52,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.42";	/* The version for this transport*/
-+LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.42nb1";	/* The version for this transport*/
+-LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.43";	/* The version for this transport*/
++LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.43nb1";	/* The version for this transport*/
  
  #define	MAX_SCG		16	/* Max # of SCSI controllers */
  #define	MAX_TGT		16
-@@ -108,7 +108,7 @@ scgo_version(scgp, what)
+@@ -112,7 +112,7 @@ scgo_version(scgp, what)
  		 * return "schily" for the SCG_AUTHOR request.
  		 */
  		case SCG_AUTHOR:
@@ -20,7 +20,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
  		case SCG_SCCS_ID:
  			return (__sccsid);
  		}
-@@ -140,6 +140,15 @@ scgo_open(scgp, device)
+@@ -144,6 +144,15 @@ scgo_open(scgp, device)
  	register int	l;
  	register int	nopen = 0;
  	char		devname[64];
@@ -36,7 +36,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
  
  	if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
  		errno = EINVAL;
-@@ -166,6 +175,60 @@ scgo_open(scgp, device)
+@@ -170,6 +179,60 @@ scgo_open(scgp, device)
  	if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2))
  		goto openbydev;
  
@@ -97,7 +97,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
  	if (busno >= 0 && tgt >= 0 && tlun >= 0) {
  
  		js_snprintf(devname, sizeof (devname),
-@@ -202,6 +265,7 @@ scgo_open(scgp, device)
+@@ -206,6 +269,7 @@ scgo_open(scgp, device)
  			}
  		}
  	}
diff --git a/sysutils/cdrtools/patches/patch-aj b/sysutils/cdrtools/patches/patch-aj
index 2f9f576e8e8..27662919a73 100644
--- a/sysutils/cdrtools/patches/patch-aj
+++ b/sysutils/cdrtools/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
+$NetBSD: patch-aj,v 1.2 2007/03/16 22:04:54 bad Exp $
 
---- cdrecord/scsi_cdr.c.orig	2004-05-25 00:36:01.000000000 +0200
+--- cdrecord/scsi_cdr.c.orig	2006-09-26 14:24:55.000000000 +0200
 +++ cdrecord/scsi_cdr.c
-@@ -319,7 +319,11 @@ request_sense(scgp)
+@@ -312,7 +312,11 @@ request_sense(scgp)
  		char	sensebuf[CCS_SENSE_LEN];
  	register struct	scg_cmd	*scmd = scgp->scmd;
  
@@ -10,12 +10,12 @@ $NetBSD: patch-aj,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
 +#ifdef __NetBSD__
 +	/* request sense already done by kernel */
 +	scg_prsense((Uchar *)scgp->scmd->u_sense.cmd_sense,
-+	    scgp->scmd->sense_count);
-+#else	
++	   scgp->scmd->sense_count);
++#else
  	fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
  	scmd->addr = sensebuf;
  	scmd->size = sizeof (sensebuf);
-@@ -335,6 +339,7 @@ request_sense(scgp)
+@@ -328,6 +332,7 @@ request_sense(scgp)
  	if (scg_cmd(scgp) < 0)
  		return (-1);
  	scg_prsense((Uchar *)sensebuf, CCS_SENSE_LEN - scg_getresid(scgp));
@@ -23,3 +23,24 @@ $NetBSD: patch-aj,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
  	return (0);
  }
  
+@@ -339,7 +344,11 @@ request_sense_b(scgp, bp, cnt)
+ {
+ 	register struct	scg_cmd	*scmd = scgp->scmd;
+ 
+-
++#ifdef __NetBSD__
++	/* request sense already done by kernel */
++	memcpy(bp, scgp->scmd->u_sense.cmd_sense,
++	   (scgp->scmd->sense_count < cnt ? scgp->scmd->sense_count : cnt));
++#else
+ 	fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
+ 	scmd->addr = bp;
+ 	scmd->size = cnt;
+@@ -354,6 +363,7 @@ request_sense_b(scgp, bp, cnt)
+ 
+ 	if (scg_cmd(scgp) < 0)
+ 		return (-1);
++#endif
+ 	return (0);
+ }
+ 
diff --git a/sysutils/cdrtools/patches/patch-ak b/sysutils/cdrtools/patches/patch-ak
new file mode 100644
index 00000000000..327fd0751cc
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1 2007/03/16 22:04:54 bad Exp $
+
+--- cdrecord/drv_dvdplus.c.orig	2007-02-22 21:17:25.000000000 +0100
++++ cdrecord/drv_dvdplus.c	2007-03-13 15:26:00.000000000 +0100
+@@ -647,8 +647,8 @@
+ 	di_to_dstat(dip, dsp);
+ 
+ #ifdef	DVDPLUS_DEBUG
+-error("res2 %d era %d sess stat %d disk stat %d\n",
+-dip->res2,
++error("dtype %d era %d sess stat %d disk stat %d\n",
++dip->dtype,
+ dip->erasable,
+ dip->sess_status,
+ dip->disk_status);
diff --git a/sysutils/cdrtools/patches/patch-ba b/sysutils/cdrtools/patches/patch-ba
index 5d5f38c1f6c..6cb7bef0ad6 100644
--- a/sysutils/cdrtools/patches/patch-ba
+++ b/sysutils/cdrtools/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
+$NetBSD: patch-ba,v 1.2 2007/03/16 22:04:54 bad Exp $
 
---- readcd/readcd.c.orig	2004-09-08 19:24:14.000000000 +0200
+--- readcd/readcd.c.orig	2007-02-26 16:46:48.000000000 +0100
 +++ readcd/readcd.c
-@@ -398,12 +398,12 @@ main(ac, av)
+@@ -431,12 +431,12 @@ main(ac, av)
  	/*
  	 * We don't need root privilleges anymore.
  	 */
diff --git a/sysutils/cdrtools/patches/patch-bb b/sysutils/cdrtools/patches/patch-bb
index 4fd68513a3e..8511e5f9aba 100644
--- a/sysutils/cdrtools/patches/patch-bb
+++ b/sysutils/cdrtools/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
+$NetBSD: patch-bb,v 1.2 2007/03/16 22:04:54 bad Exp $
 
---- mkisofs/mkisofs.c.orig	2004-09-08 19:27:36.000000000 +0200
+--- mkisofs/mkisofs.c.orig	2007-02-26 16:01:09.000000000 +0100
 +++ mkisofs/mkisofs.c
-@@ -2407,12 +2407,12 @@ parse_input_files:
+@@ -2126,12 +2126,12 @@ args_ok:
  		}
  	}
  	/* We don't need root privilleges anymore. */
diff --git a/sysutils/cdrtools/patches/patch-ca b/sysutils/cdrtools/patches/patch-ca
index 0e580db804e..1a4e08aa82a 100644
--- a/sysutils/cdrtools/patches/patch-ca
+++ b/sysutils/cdrtools/patches/patch-ca
@@ -1,8 +1,8 @@
-$NetBSD: patch-ca,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
+$NetBSD: patch-ca,v 1.2 2007/03/16 22:04:54 bad Exp $
 
---- cdrecord/defaults.c.orig	2004-03-02 02:10:32.000000000 +0100
+--- cdrecord/defaults.c.orig	2006-09-13 17:35:12.000000000 +0200
 +++ cdrecord/defaults.c
-@@ -54,7 +54,7 @@ open_cdrdefaults()
+@@ -50,7 +50,7 @@ open_cdrdefaults()
  	 * don't contribute work and don't give support, they are causing extra
  	 * work for me and this way slow down the cdrecord development.
  	 */
diff --git a/sysutils/cdrtools/patches/patch-cb b/sysutils/cdrtools/patches/patch-cb
index 851a7a841c7..6ff4499025f 100644
--- a/sysutils/cdrtools/patches/patch-cb
+++ b/sysutils/cdrtools/patches/patch-cb
@@ -1,8 +1,51 @@
-$NetBSD: patch-cb,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
+$NetBSD: patch-cb,v 1.2 2007/03/16 22:04:54 bad Exp $
 
---- cdrecord/cdrecord.1.orig	2004-07-11 01:28:23.000000000 +0200
+--- cdrecord/cdrecord.1.orig	2006-12-13 23:42:23.000000000 +0100
 +++ cdrecord/cdrecord.1
-@@ -2016,8 +2016,8 @@ login shell.
+@@ -160,7 +160,7 @@ option of 
+ described below.
+ 
+ .PP
+-If a file /etc/default/cdrecord exists, the parameter to the
++If a file @CDRECORD_CONF@ exists, the parameter to the
+ .B dev=
+ option may also be a drive name label in said file (see FILES section).
+ 
+@@ -576,13 +576,13 @@ If no 
+ option is present,
+ .B cdrecord
+ will try to get a drive specific speed value from the file
+-.B /etc/default/cdrecord
++.B @CDRECORD_CONF@
+ and if it cannot find one, it will try to get the speed value from the
+ .B CDR_SPEED
+ environment and later from the 
+ .B CDR_SPEED=
+ entry in
+-.BR /etc/default/cdrecord .
++.BR @CDRECORD_CONF@ .
+ If no speed value could be found, cdrecord uses a drive specific default speed.
+ The default for all new (MMC compliant) drives is to use the maximum supported by the drive.
+ If you use 
+@@ -786,7 +786,7 @@ If the argument to the
+ .B dev=
+ option does not contain the characters ',', '/', '@' or ':',
+ it is interpreted as an label name that may be found in the file
+-/etc/default/cdrecord (see FILES section).
++@CDRECORD_CONF@ (see FILES section).
+ .sp
+ If no 
+ .B dev=
+@@ -2009,7 +2009,7 @@ Then write the CD using:
+ .TP
+ .B CDR_DEVICE
+ This may either hold a device identifier that is suitable to the open
+-call of the SCSI transport library or a label in the file /etc/default/cdrecord.
++call of the SCSI transport library or a label in the file @CDRECORD_CONF@.
+ .TP
+ .B CDR_SPEED
+ Sets the default speed value for writing (see also 
+@@ -2072,8 +2072,8 @@ login shell.
  
  .SH FILES
  .TP
@@ -13,12 +56,12 @@ $NetBSD: patch-cb,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
  For example:
  .SM CDR_FIFOSIZE=8m
  or
-@@ -2026,7 +2026,7 @@ or
+@@ -2082,7 +2082,7 @@ or
  .TP
  CDR_DEVICE
  This may either hold a device identifier that is suitable to the open
 -call of the SCSI transport library or a label in the file /etc/default/cdrecord 
-+call of the SCSI transport library or a label in the file @CDRECORD_CONF@
++call of the SCSI transport library or a label in the file @CDRECORD_CONF@ 
  that allows to identify a specific drive on the system.
  .TP
  CDR_SPEED
diff --git a/sysutils/cdrtools/patches/patch-cc b/sysutils/cdrtools/patches/patch-cc
index 5129efbb81b..30f8cd90195 100644
--- a/sysutils/cdrtools/patches/patch-cc
+++ b/sysutils/cdrtools/patches/patch-cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-cc,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
+$NetBSD: patch-cc,v 1.2 2007/03/16 22:04:54 bad Exp $
 
---- readcd/readcd.1.orig	Wed Dec 25 02:28:41 2002
+--- readcd/readcd.1.orig	2006-11-06 02:02:02.000000000 +0100
 +++ readcd/readcd.1
-@@ -186,7 +186,7 @@ If the argument to the
+@@ -177,7 +177,7 @@ If the argument to the
  .B dev=
  option does not contain the characters ',', '/', '@' or ':',
  it is interpreted as an label name that may be found in the file
 -/etc/default/cdrecord (see FILES section).
 +@CDRECORD_CONF@ (see FILES section).
- .TP
- .BI timeout= #
- Set the default SCSI command timeout value to 
+ .sp
+ If no 
+ .B dev=
diff --git a/sysutils/cdrtools/patches/patch-cd b/sysutils/cdrtools/patches/patch-cd
index 8002adc295d..fd776ace5e9 100644
--- a/sysutils/cdrtools/patches/patch-cd
+++ b/sysutils/cdrtools/patches/patch-cd
@@ -1,8 +1,8 @@
-$NetBSD: patch-cd,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
+$NetBSD: patch-cd,v 1.2 2007/03/16 22:04:54 bad Exp $
 
---- include/schily.h.orig	2004-03-05 01:30:40.000000000 +0100
-+++ include/schily.h
-@@ -116,7 +116,7 @@ extern	int	fspawnl __PR((FILE *, FILE *,
+--- include/schily/schily.h.orig	2007-02-26 16:17:56.000000000 +0100
++++ include/schily/schily.h
+@@ -115,7 +115,7 @@ extern	int	fspawnl __PR((FILE *, FILE *,
  extern	int	fspawnv_nowait __PR((FILE *, FILE *, FILE *,
  					const char *, int, char *const*));
  extern	int	fgetline __PR((FILE *, char *, int));
diff --git a/sysutils/cdrtools/patches/patch-ce b/sysutils/cdrtools/patches/patch-ce
index a85d748a570..743228b93d2 100644
--- a/sysutils/cdrtools/patches/patch-ce
+++ b/sysutils/cdrtools/patches/patch-ce
@@ -1,8 +1,8 @@
-$NetBSD: patch-ce,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
+$NetBSD: patch-ce,v 1.2 2007/03/16 22:04:54 bad Exp $
 
---- libschily/stdio/fgetstr.c	2004/04/26 07:42:03	1.1
-+++ libschily/stdio/fgetstr.c	2004/04/26 07:42:22
-@@ -26,7 +26,7 @@
+--- libschily/stdio/fgetstr.c.orig	2004-09-25 14:26:06.000000000 +0200
++++ libschily/stdio/fgetstr.c
+@@ -22,7 +22,7 @@
   */
  
  EXPORT int
@@ -11,10 +11,3 @@ $NetBSD: patch-ce,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
  	register	FILE	*f;
  			char	*buf;
  	register	int	len;
-@@ -60,5 +60,5 @@
- 	char	*buf;
- 	int	len;
- {
--	return (fgetstr(stdin, buf, len));
-+	return (schily_fgetstr(stdin, buf, len));
- }
diff --git a/sysutils/cdrtools/patches/patch-cf b/sysutils/cdrtools/patches/patch-cf
index 008d494a167..1654768ee0d 100644
--- a/sysutils/cdrtools/patches/patch-cf
+++ b/sysutils/cdrtools/patches/patch-cf
@@ -1,8 +1,8 @@
-$NetBSD: patch-cf,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
+$NetBSD: patch-cf,v 1.2 2007/03/16 22:04:54 bad Exp $
 
---- mkisofs/tree.c.orig	2004-06-12 15:16:37.000000000 +0200
+--- mkisofs/tree.c.orig	2006-11-25 16:49:32.000000000 +0100
 +++ mkisofs/tree.c
-@@ -1577,7 +1577,7 @@ insert_file_entry(this_dir, whole_path, 
+@@ -1562,7 +1562,7 @@ insert_file_entry(this_dir, whole_path, 
  	/*
  	 * >= is required by the large file summit standard.
  	 */
diff --git a/sysutils/cdrtools/patches/patch-cg b/sysutils/cdrtools/patches/patch-cg
index 707046ce8d2..8c51585e720 100644
--- a/sysutils/cdrtools/patches/patch-cg
+++ b/sysutils/cdrtools/patches/patch-cg
@@ -1,17 +1,8 @@
-$NetBSD: patch-cg,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
+$NetBSD: patch-cg,v 1.2 2007/03/16 22:04:54 bad Exp $
 
---- mkisofs/write.c.orig	2004-08-24 18:21:55.000000000 +0200
+--- mkisofs/write.c.orig	2007-02-17 16:48:16.000000000 +0100
 +++ mkisofs/write.c
-@@ -463,7 +463,7 @@ write_one_file(filename, size, outfile)
- static	char		buffer[SECTOR_SIZE * NSECT];
- 	FILE		*infile;
- 	off_t		remain;
--	int	use;
-+	off_t	use;
- 
- 
- 	if ((infile = fopen(filename, "rb")) == NULL) {
-@@ -529,7 +529,10 @@ static	char		buffer[SECTOR_SIZE * NSECT]
+@@ -428,7 +428,10 @@ static	char		buffer[SECTOR_SIZE * NSECT]
  			fflush(stderr);
  		}
  #endif
@@ -22,4 +13,4 @@ $NetBSD: patch-cg,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
 +			remain -= use;
  	}
  	fclose(infile);
- }/* write_one_file(... */
+ } /* write_one_file(... */
diff --git a/sysutils/cdrtools/patches/patch-ch b/sysutils/cdrtools/patches/patch-ch
deleted file mode 100644
index addad165bfc..00000000000
--- a/sysutils/cdrtools/patches/patch-ch
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ch,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
-
---- cdda2wav/cdda2wav.c.orig	2004-08-24 17:06:14.000000000 +0200
-+++ cdda2wav/cdda2wav.c
-@@ -970,7 +970,7 @@ prio_done:
- 	dontneedroot();
- }
- #else
--#if      defined _POSIX_PRIORITY_SCHEDULING
-+#if      defined _POSIX_PRIORITY_SCHEDULING && (_POSIX_PRIORITY_SCHEDULING != -1)
- #include <sched.h>
- 
- static void
-@@ -2616,7 +2616,7 @@ Rate   Divider      Rate   Divider      
-   if ( global.verbose != 0 ) {
-     fputs( "#Cdda2wav version ", stderr );
-     fputs( VERSION, stderr );
--#if defined _POSIX_PRIORITY_SCHEDULING || defined HAVE_SYS_PRIOCNTL_H
-+#if (defined _POSIX_PRIORITY_SCHEDULING && (_POSIX_PRIORITY_SCHEDULING != -1)) || defined HAVE_SYS_PRIOCNTL_H
-     fputs( ", real time sched.", stderr );
- #endif
- #if defined ECHO_TO_SOUNDCARD
diff --git a/sysutils/cdrtools/patches/patch-ci b/sysutils/cdrtools/patches/patch-ci
deleted file mode 100644
index 47845bf0892..00000000000
--- a/sysutils/cdrtools/patches/patch-ci
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ci,v 1.1 2006/05/27 10:55:52 drochner Exp $
-
---- ./cdda2wav/local.cnf.in.orig	2006-05-24 14:18:40.000000000 +0200
-+++ ./cdda2wav/local.cnf.in
-@@ -43,7 +43,7 @@ HAVE_IOCTL=	$(__HAVE_IOCTL:$(_UNIQ)$(HAV
- 
- ############# Sound device support
- #to disable sound support comment out the corresponding line with HAVE_SOUND
--OSS_SOUND_DEV=	'"/dev/dsp"'
-+OSS_SOUND_DEV=	'"${DEVOSSSOUND}"'
- SUN_SOUND_DEV=	'"/dev/audio"'
- 
- HAVE_OSS=	@HAVE_OSS@
diff --git a/sysutils/cdrtools/patches/patch-cj b/sysutils/cdrtools/patches/patch-cj
index 514a19ab94f..7e1d5237b9d 100644
--- a/sysutils/cdrtools/patches/patch-cj
+++ b/sysutils/cdrtools/patches/patch-cj
@@ -1,14 +1,11 @@
-$NetBSD: patch-cj,v 1.1 2006/08/28 13:56:22 dsainty Exp $
+$NetBSD: patch-cj,v 1.2 2007/03/16 22:04:55 bad Exp $
 
 isoinfo extracts files at the painful rate of 1 sector at a time.  This patch
 speeds up file extraction significantly by using a much larger buffer.
 
-Also avoid crashing under NetBSD by not making the assumption that
-fclose(NULL) is legal.
-   
---- mkisofs/diag/isoinfo.c.orig	2005-05-16 02:21:05.000000000 +1200
-+++ mkisofs/diag/isoinfo.c	2006-07-15 18:33:06.000000000 +1200
-@@ -644,7 +644,7 @@
+--- mkisofs/diag/isoinfo.c.orig	2006-10-19 12:31:36.000000000 +0200
++++ mkisofs/diag/isoinfo.c
+@@ -649,7 +649,7 @@ extract_file(idr)
  	struct iso_directory_record *idr;
  {
  	int		extent, len, tlen;
@@ -17,7 +14,7 @@ fclose(NULL) is legal.
  
  #if	defined(__CYGWIN32__) || defined(__CYGWIN__) || defined(__EMX__) || defined(__DJGPP__)
  	setmode(fileno(stdout), O_BINARY);
-@@ -654,16 +654,15 @@
+@@ -659,16 +659,15 @@ extract_file(idr)
  	len = isonum_733((unsigned char *)idr->size);
  
  	while (len > 0) {
@@ -37,13 +34,3 @@ fclose(NULL) is legal.
  		write(STDOUT_FILENO, buff, tlen);
  	}
  }
-@@ -1252,7 +1252,8 @@
- 		td = td->next;
- 	}
- 
--	fclose(infile);
-+	if (infile != NULL)
-+		fclose(infile);
- 	return (0);
- }
- 
diff --git a/sysutils/cdrtools/patches/patch-ck b/sysutils/cdrtools/patches/patch-ck
new file mode 100644
index 00000000000..edf6cb7083b
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-ck
@@ -0,0 +1,13 @@
+$NetBSD: patch-ck,v 1.1 2007/03/16 22:04:55 bad Exp $
+
+--- btcflash/btcflash.1.orig	2006-02-08 23:13:24.000000000 +0100
++++ btcflash/btcflash.1
+@@ -169,7 +169,7 @@ If the argument to the
+ .B dev=
+ option does not contain the characters ',', '/', '@' or ':',
+ it is interpreted as an label name that may be found in the file
+-/etc/default/cdrecord (see FILES section).
++@CDRECORD_CONF@ (see FILES section).
+ .TP
+ .BI timeout= #
+ Set the default SCSI command timeout value to 
diff --git a/sysutils/cdrtools/patches/patch-cl b/sysutils/cdrtools/patches/patch-cl
new file mode 100644
index 00000000000..2a646fa89e5
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-cl
@@ -0,0 +1,39 @@
+$NetBSD: patch-cl,v 1.1 2007/03/16 22:04:55 bad Exp $
+
+--- mkisofs/diag/isoinfo.8.orig	2004-06-01 12:50:59.000000000 +0200
++++ mkisofs/diag/isoinfo.8
+@@ -177,7 +177,7 @@ If the argument to the
+ .B dev=
+ option does not contain the characters ',', '/', '@' or ':',
+ it is interpreted as an label name that may be found in the file
+-/etc/default/cdrecord (see FILES section).
++@CDRECORD_CONF@ (see FILES section).
+ .sp
+ The options
+ .B \-i
+@@ -250,7 +250,7 @@ sites. Despite the name, the software is
+ .TP
+ .B CDR_DEVICE
+ This may either hold a device identifier that is suitable to the open
+-call of the SCSI transport library or a label in the file /etc/default/cdrecord.
++call of the SCSI transport library or a label in the file @CDRECORD_CONF@.
+ .TP
+ .B RSH
+ If the 
+@@ -288,13 +288,13 @@ login shell.
+ 
+ .SH FILES
+ .TP
+-/etc/default/cdrecord
+-Default values can be set for the following options in /etc/default/cdrecord.
++@CDRECORD_CONF@
++Default values can be set for the following options in @CDRECORD_CONF@.
+ .RS
+ .TP
+ CDR_DEVICE
+ This may either hold a device identifier that is suitable to the open
+-call of the SCSI transport library or a label in the file /etc/default/cdrecord 
++call of the SCSI transport library or a label in the file @CDRECORD_CONF@ 
+ that allows to identify a specific drive on the system.
+ .TP
+ Any other label
diff --git a/sysutils/cdrtools/patches/patch-cm b/sysutils/cdrtools/patches/patch-cm
new file mode 100644
index 00000000000..9e8512157a5
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-cm
@@ -0,0 +1,13 @@
+$NetBSD: patch-cm,v 1.1 2007/03/16 22:04:55 bad Exp $
+
+--- scgcheck/scgcheck.1.orig	2006-05-14 15:32:56.000000000 +0200
++++ scgcheck/scgcheck.1
+@@ -160,7 +160,7 @@ If the argument to the
+ .B dev=
+ option does not contain the characters ',', '/', '@' or ':',
+ it is interpreted as an label name that may be found in the file
+-/etc/default/cdrecord (see FILES section).
++@CDRECORD_CONF@ (see FILES section).
+ .TP
+ .BI timeout= #
+ Set the default SCSI command timeout value to