Remove cdrecord, replaced by cdrtools.

21 files changed, 2 insertions, 537 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 7a9d8f20f62..211538961b1 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.325 2005/12/30 23:03:57 agc Exp $
+# $NetBSD: Makefile,v 1.326 2006/01/05 23:30:03 wiz Exp $
 #
 
 COMMENT=	System utilities
@@ -30,8 +30,8 @@ SUBDIR+=	ccd2iso
 SUBDIR+=	ccze
 SUBDIR+=	cdbkup
 SUBDIR+=	cdrdao
-SUBDIR+=	cdrecord
 SUBDIR+=	cdrecord-xcdroast
+SUBDIR+=	cdrtools
 SUBDIR+=	cdrtools-ossdvd
 SUBDIR+=	cfengine2
 SUBDIR+=	cfengine2-doc
diff --git a/sysutils/cdrecord/DESCR b/sysutils/cdrecord/DESCR
deleted file mode 100644
index 8cd5fe6525c..00000000000
--- a/sysutils/cdrecord/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Cdrecord allows you to burn CDs with a CD-R/CD-RW recorder. It
-works as a burn engine for several applications. Cdrecord supports
-CD recorders from many different vendors; all SCSI-3/mmc and
-ATAPI/mmc compliant drives should also work.  Supported features
-include: IDE/ATAPI, parallel-port, and SCSI drives; audio CDs, data
-CDs, and mixed CDs; full multi-session support, CD-RWs (rewritable),
-TAO, DAO and human-readable error messages.
diff --git a/sysutils/cdrecord/MESSAGE.SunOS b/sysutils/cdrecord/MESSAGE.SunOS
deleted file mode 100644
index 217fe9cd1d4..00000000000
--- a/sysutils/cdrecord/MESSAGE.SunOS
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.SunOS,v 1.2 2003/05/06 18:38:32 grant Exp $
-
-You will need to stop Solaris volume management before using
-${PKGNAME_NOREV}:
-
-	/etc/init.d/volmgt stop
-
-===========================================================================
diff --git a/sysutils/cdrecord/MESSAGE.cdrecord.conf b/sysutils/cdrecord/MESSAGE.cdrecord.conf
deleted file mode 100644
index e710d5e0ccf..00000000000
--- a/sysutils/cdrecord/MESSAGE.cdrecord.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.cdrecord.conf,v 1.1 2003/03/08 08:16:58 grant Exp $
-
-Note: The location of the ${PKGNAME_NOREV} `defaults' file has been set to
-
-	${CDRECORD_CONF}
-
-This is the pkgsrc standard config file location, NOT the ${PKGNAME_NOREV}
-standard location, which is /etc/default/cdrecord.
-
-The reason for this is that pkgsrc packages should not use configuration
-files outside ${LOCALBASE} unless they are explicitly set by the user.
-
-===========================================================================
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
deleted file mode 100644
index b0c40435cc4..00000000000
--- a/sysutils/cdrecord/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# $NetBSD: Makefile,v 1.68 2005/12/05 20:50:59 rillig Exp $
-
-DISTNAME=	cdrtools-2.00.3
-PKGNAME=	cdrecord-2.00.3
-PKGREVISION=	2
-CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
-COMMENT=	Software for creating ISO9660 images and writing CDs/CD-RWs
-
-CONFLICTS=	mkisofs-[0-9]* cdrtools-ossdvd-[0-9]*
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_TOOLS+=		gmake tbl
-
-# avoid picking up a bad ${ARCH} during the build
-MAKE_ENV+=      ARCH=""
-MAKE_ENV+=      MAKEPROG="gmake"
-MAKE_ENV+=	COPTX=${CFLAGS:M*:Q}
-MAKE_ENV+=	LDOPTX=${LDFLAGS:M*:Q}
-
-# if we're using a gcc which is named gcc, we need to set CCOM=gcc
-# in MAKE_ENV so the make infrastructure picks the right options.
-.if !empty(CC:M*gcc*)
-MAKE_ENV+=	CCOM="gcc"
-.endif
-
-# allow us to override the default /etc/default/cdrecord by patching
-# the documentation appropriately. Additionally, we also provide a
-# MESSAGE stating the reasons we do this, as required by the license.
-CDRECORD_CONF?=	${PKG_SYSCONFDIR}/cdrecord.conf
-
-.if ${CDRECORD_CONF} != "/etc/default/cdrecord"
-MESSAGE_SRC+=	MESSAGE.cdrecord.conf
-MESSAGE_SUBST+=	PKGNAME_NOREV=${PKGNAME_NOREV}
-MESSAGE_SUBST+=	CDRECORD_CONF=${CDRECORD_CONF}
-.endif
-
-INSTALLATION_DIRS=	bin man/man1 man/man8
-
-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			\
-		if [ ! -f ${MACHINE}-$$suffix ]; then			\
-			${LN} -sf i386-$$suffix ${MACHINE}-$$suffix;	\
-		fi;							\
-	done
-
-post-build:
-	cd ${WRKSRC};							\
-	for file in cdda2wav/cdda2wav.1 mkisofs/mkisofs.8; do		\
-		${TBL} $${file} > $${file}.tmp;				\
-		${MV} -f $${file}.tmp $${file};				\
-	done
-
-do-install:
-	cd ${WRKSRC}/cdda2wav;						\
-		${INSTALL_PROGRAM} OBJ/*/cdda2wav ${PREFIX}/bin;	\
-		${INSTALL_MAN} cdda2wav.1 ${PREFIX}/man/man1
-	cd ${WRKSRC}/cdrecord;						\
-		${INSTALL_PROGRAM} OBJ/*/cdrecord ${PREFIX}/bin;	\
-		${INSTALL_MAN} cdrecord.1 ${PREFIX}/man/man1
-	cd ${WRKSRC}/mkisofs;						\
-		${INSTALL_PROGRAM} OBJ/*/mkisofs ${PREFIX}/bin;		\
-		${INSTALL_MAN} mkisofs.8 ${PREFIX}/man/man8
-	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
-
-SUBST_CLASSES+=		fix
-SUBST_STAGE.fix=	post-patch
-SUBST_FILES.fix=	cdrecord/defaults.c cdrecord/cdrecord.1 \
-			readcd/readcd.1
-SUBST_SED.fix=		-e "s,@CDRECORD_CONF@,${CDRECORD_CONF},g"
-SUBST_MESSAGE.fix=	"Fixing paths."
-
-.include "../../mk/ossaudio.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrecord/PLIST b/sysutils/cdrecord/PLIST
deleted file mode 100644
index 1659133493d..00000000000
--- a/sysutils/cdrecord/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/29 16:44:32 wiz Exp $
-bin/cdda2wav
-bin/cdrecord
-bin/devdump
-bin/isodump
-bin/isoinfo
-bin/isovfy
-bin/mkisofs
-bin/readcd
-man/man1/cdda2wav.1
-man/man1/cdrecord.1
-man/man1/readcd.1
-man/man8/devdump.8
-man/man8/isodump.8
-man/man8/isoinfo.8
-man/man8/isovfy.8
-man/man8/mkisofs.8
diff --git a/sysutils/cdrecord/distinfo b/sysutils/cdrecord/distinfo
deleted file mode 100644
index 3404df2232a..00000000000
--- a/sysutils/cdrecord/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.16 2005/11/04 22:16:30 dbj Exp $
-
-SHA1 (cdrtools-2.00.3.tar.gz) = 744795871f516dd8dc3918d3cf59f880abc73e4c
-RMD160 (cdrtools-2.00.3.tar.gz) = dbb558bddab429e9b8e3ed42fe99d0c4805b2c1a
-Size (cdrtools-2.00.3.tar.gz) = 1638876 bytes
-SHA1 (patch-ac) = 9e091493ccce1a78d3bf764fae89cf040f22045a
-SHA1 (patch-ah) = 34ecab01125bcac2a28e295b198edce0de8b8777
-SHA1 (patch-ai) = b98f716286cedf0d920bcc6959562176cb706af6
-SHA1 (patch-aj) = 7e8328ad3478a43cc9311158c30b0acfe48fbb7b
-SHA1 (patch-ba) = 8d7038282ba5a6b133544cc8e440f6e12a475990
-SHA1 (patch-bb) = c5ee1e00e1f8723fe28d4d360bcede7680a7e4b9
-SHA1 (patch-ca) = 5dbc3d3f248781627b6d6100808c70db60e83bd4
-SHA1 (patch-cb) = 8119e171e7308c0bb095b6a1d760473d8cc89120
-SHA1 (patch-cc) = a14098dd14e0b58d3fed1167341a22167eea7c19
-SHA1 (patch-cd) = a3368559694a181574889f8d4da124be6a0e8e85
-SHA1 (patch-ce) = eb12b12d26f8451654124abcd0424ff29e89bcf8
-SHA1 (patch-cf) = 60b44f905585af2b61232725386258abdb3118f9
-SHA1 (patch-cg) = 99a48786f0f0e1e4d1d04761a9d23ccb1ab63f8d
-SHA1 (patch-ch) = 363dbb9004814436419a3932c70ec85049bdf0ca
diff --git a/sysutils/cdrecord/patches/patch-ac b/sysutils/cdrecord/patches/patch-ac
deleted file mode 100644
index 00a0cae35fe..00000000000
--- a/sysutils/cdrecord/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.14 2003/05/06 19:52:44 grant Exp $
-
---- include/btorder.h.orig	Mon Dec 10 10:54:27 2001
-+++ include/btorder.h
-@@ -28,6 +28,9 @@
- #include <sys/types.h>			/* try to load isa_defs.h on Solaris */
- #define	_INCL_SYS_TYPES_H
- #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 _
- #	if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
- 	   defined(__PPC) || defined(powerpc) || defined(__powerpc__)
- 
--#		if	defined(__BIG_ENDIAN__)
-+#		if	defined(__BIG_ENDIAN__) || BYTE_ORDER == BIG_ENDIAN
- #			define _BIT_FIELDS_HTOL
- #		else
- #			define _BIT_FIELDS_LTOH
diff --git a/sysutils/cdrecord/patches/patch-ah b/sysutils/cdrecord/patches/patch-ah
deleted file mode 100644
index 69a453b9ff1..00000000000
--- a/sysutils/cdrecord/patches/patch-ah
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2003/01/03 16:27:10 lukem Exp $
-
---- 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(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(PERM_ERROR);
-@@ -186,7 +186,7 @@
- 
-     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);
-@@ -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(PERM_ERROR);
diff --git a/sysutils/cdrecord/patches/patch-ai b/sysutils/cdrecord/patches/patch-ai
deleted file mode 100644
index 556182e8989..00000000000
--- a/sysutils/cdrecord/patches/patch-ai
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2005/01/10 15:48:07 hamajima Exp $
-
---- 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.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
-@@ -108,7 +108,7 @@
- 		 * return "schily" for the SCG_AUTHOR request.
- 		 */
- 		case SCG_AUTHOR:
--			return (_scg_auth_schily);
-+			return ("frueauf");
- 		case SCG_SCCS_ID:
- 			return (__sccsid);
- 		}
-@@ -140,6 +140,15 @@
- 	register int	l;
- 	register int	nopen = 0;
- 	char		devname[64];
-+#if defined(__NetBSD__)
-+	struct scsi_addr mysaddr;
-+#if defined(__i386__) || defined(__amd64__)
-+	char	slicename[] = "d";	/* i386 is special */
-+#else
-+	char	slicename[] = "c";	/* this is what the rest uses */
-+#endif
-+	char	*myslicename = slicename;
-+#endif
- 
- 	if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
- 		errno = EINVAL;
-@@ -166,6 +175,60 @@
- 	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%s", l, 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 goto openbydev;
-+		}
-+	} else for (l=0; l < MAX_LUN ; l++) {
-+			sprintf(devname, "/dev/rcd%d%s", l, 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),
-@@ -202,6 +265,7 @@
- 			}
- 		}
- 	}
-+#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/cdrecord/patches/patch-aj b/sysutils/cdrecord/patches/patch-aj
deleted file mode 100644
index fe127071cd2..00000000000
--- a/sysutils/cdrecord/patches/patch-aj
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aj,v 1.5 2003/01/03 16:27:10 lukem Exp $
-
---- 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;
- {
-+
-+#ifdef __NetBSD__
-+	/* request sense already done by kernel */
-+	scg_prsense((Uchar *)scgp->scmd->u_sense.cmd_sense,
-+	    scgp->scmd->sense_count);
-+#else	
- 		 char	sensebuf[CCS_SENSE_LEN];
- 	register struct	scg_cmd	*scmd = scgp->scmd;
- 
-@@ -301,6 +307,7 @@ request_sense(scgp)
- 	if (scg_cmd(scgp) < 0)
- 		return (-1);
- 	scg_prsense((Uchar *)sensebuf, CCS_SENSE_LEN - scg_getresid(scgp));
-+#endif
- 	return (0);
- }
- 
diff --git a/sysutils/cdrecord/patches/patch-ba b/sysutils/cdrecord/patches/patch-ba
deleted file mode 100644
index 09b0fb82337..00000000000
--- a/sysutils/cdrecord/patches/patch-ba
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ba,v 1.2 2003/01/03 16:27:10 lukem Exp $
-
---- 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.
- 	 */
--#ifdef	HAVE_SETREUID
--	if (setreuid(-1, getuid()) < 0)
--#else
- #ifdef	HAVE_SETEUID
- 	if (seteuid(getuid()) < 0)
-+#else
-+#ifdef	HAVE_SETREUID
-+	if (setreuid(-1, getuid()) < 0)
- #else
- 	if (setuid(getuid()) < 0)
- #endif
diff --git a/sysutils/cdrecord/patches/patch-bb b/sysutils/cdrecord/patches/patch-bb
deleted file mode 100644
index a788057c205..00000000000
--- a/sysutils/cdrecord/patches/patch-bb
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2001/08/07 11:23:57 drochner Exp $
-
---- mkisofs/mkisofs.c.orig	Fri Apr 20 17:45:50 2001
-+++ mkisofs/mkisofs.c	Mon Aug  6 10:46:21 2001
-@@ -2072,11 +2072,11 @@
- 		}
- 	}
- 	/* We don't need root privilleges anymore. */
--#ifdef	HAVE_SETREUID
--	if (setreuid(-1, getuid()) < 0)
--#else
- #ifdef	HAVE_SETEUID
- 	if (seteuid(getuid()) < 0)
-+#else
-+#ifdef	HAVE_SETREUID
-+	if (setreuid(-1, getuid()) < 0)
- #else
- 	if (setuid(getuid()) < 0)
- #endif
diff --git a/sysutils/cdrecord/patches/patch-ca b/sysutils/cdrecord/patches/patch-ca
deleted file mode 100644
index 0df50707d4a..00000000000
--- a/sysutils/cdrecord/patches/patch-ca
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2003/03/08 08:16:59 grant Exp $
-
---- cdrecord/defaults.c.orig	Thu Aug 15 03:52:00 2002
-+++ cdrecord/defaults.c
-@@ -53,7 +53,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.
- 	 */
--	return (defltopen("/etc/default/cdrecord"));
-+	return (defltopen("@CDRECORD_CONF@"));
- }
- 
- EXPORT void
diff --git a/sysutils/cdrecord/patches/patch-cb b/sysutils/cdrecord/patches/patch-cb
deleted file mode 100644
index 88a2ea95c19..00000000000
--- a/sysutils/cdrecord/patches/patch-cb
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2003/03/08 08:16:59 grant Exp $
-
---- cdrecord/cdrecord.1.orig	Sat Mar  8 18:45:54 2003
-+++ cdrecord/cdrecord.1
-@@ -1418,8 +1418,8 @@ 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@.
- For example:
- .SM CDR_FIFOSIZE=8m
- or
-@@ -1428,7 +1428,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@
- that allows to identify a specific drive on the system.
- .TP
- CDR_SPEED
diff --git a/sysutils/cdrecord/patches/patch-cc b/sysutils/cdrecord/patches/patch-cc
deleted file mode 100644
index 795fe862e6e..00000000000
--- a/sysutils/cdrecord/patches/patch-cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2003/03/08 08:16:59 grant Exp $
-
---- readcd/readcd.1.orig	Wed Dec 25 02:28:41 2002
-+++ readcd/readcd.1
-@@ -186,7 +186,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/cdrecord/patches/patch-cd b/sysutils/cdrecord/patches/patch-cd
deleted file mode 100644
index f3f3e47d769..00000000000
--- a/sysutils/cdrecord/patches/patch-cd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cd,v 1.1 2004/04/26 07:46:11 agc Exp $
-
---- include/schily.h	2004/04/26 07:40:33	1.1
-+++ include/schily.h	2004/04/26 07:40:49
-@@ -115,7 +115,7 @@
- extern	int	fspawnv_nowait __PR((FILE *, FILE *, FILE *,
- 					const char *, int, char *const*));
- extern	int	fgetline __PR((FILE *, char *, int));
--extern	int	fgetstr __PR((FILE *, char *, int));
-+extern	int	schily_fgetstr __PR((FILE *, char *, int));
- extern	void	file_raise __PR((FILE *, int));
- extern	int	fileclose __PR((FILE *));
- extern	FILE	*fileluopen __PR((int, const char *));
diff --git a/sysutils/cdrecord/patches/patch-ce b/sysutils/cdrecord/patches/patch-ce
deleted file mode 100644
index 854715ceecb..00000000000
--- a/sysutils/cdrecord/patches/patch-ce
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ce,v 1.1 2004/04/26 07:46:11 agc 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 @@
-  */
- 
- EXPORT int
--fgetstr(f, buf, len)
-+schily_fgetstr(f, buf, len)
- 	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/cdrecord/patches/patch-cf b/sysutils/cdrecord/patches/patch-cf
deleted file mode 100644
index 699f866f29c..00000000000
--- a/sysutils/cdrecord/patches/patch-cf
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cf,v 1.1 2004/06/20 21:37:14 martin Exp $
-
---- mkisofs/tree.c.orig	2002-12-07 21:40:47.000000000 +0100
-+++ mkisofs/tree.c	2004-06-20 12:48:19.000000000 +0200
-@@ -1517,7 +1517,7 @@
- 	/*
- 	 * >= is required by the large file summit standard.
- 	 */
--	if (S_ISREG(lstatbuf.st_mode) && (lstatbuf.st_size >= (off_t)0x7FFFFFFF)) {
-+	if (S_ISREG(lstatbuf.st_mode) && (lstatbuf.st_size >= (off_t)0x0FFFFFFFF)) {
- #ifdef	EOVERFLOW
- 		errno = EOVERFLOW;
- #else
diff --git a/sysutils/cdrecord/patches/patch-cg b/sysutils/cdrecord/patches/patch-cg
deleted file mode 100644
index 8c39707dfa5..00000000000
--- a/sysutils/cdrecord/patches/patch-cg
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-cg,v 1.1 2004/06/20 21:37:14 martin Exp $
-
---- mkisofs/write.c.orig	2002-12-23 15:16:45.000000000 +0100
-+++ mkisofs/write.c	2004-06-20 23:16:24.000000000 +0200
-@@ -383,8 +383,8 @@
- 	 */
- static	char		buffer[SECTOR_SIZE * NSECT];
- 	FILE		*infile;
--	int		remain;
--	int	use;
-+	unsigned int	remain;
-+	unsigned int	use;
- 
- 
- 	if ((infile = fopen(filename, "rb")) == NULL) {
-@@ -449,7 +449,10 @@
- 			fflush(stderr);
- 		}
- #endif
--		remain -= use;
-+		if (use > remain)
-+			remain = 0;
-+		else
-+			remain -= use;
- 	}
- 	fclose(infile);
- }/* write_one_file(... */
diff --git a/sysutils/cdrecord/patches/patch-ch b/sysutils/cdrecord/patches/patch-ch
deleted file mode 100644
index 870fffe02a5..00000000000
--- a/sysutils/cdrecord/patches/patch-ch
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ch,v 1.1 2005/11/04 22:16:30 dbj Exp $
-
---- cdda2wav/cdda2wav.c.orig	2002-11-21 11:34:33.000000000 -0500
-+++ cdda2wav/cdda2wav.c
-@@ -960,7 +960,7 @@ prio_done:
- 	dontneedroot();
- }
- #else
--#if      defined _POSIX_PRIORITY_SCHEDULING
-+#if      defined _POSIX_PRIORITY_SCHEDULING && (_POSIX_PRIORITY_SCHEDULING != -1)
- #include <sched.h>
- 
- static void
-@@ -2434,7 +2434,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