Remove cdrecord-devel as cdrecord is now a newer version.

11 files changed, 1 insertions, 341 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index e883d0a3200..28e5852835f 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.178 2002/12/22 13:13:39 seb Exp $
+# $NetBSD: Makefile,v 1.179 2003/01/03 16:30:32 lukem Exp $
 
 COMMENT=	System utilities
 
@@ -24,7 +24,6 @@ SUBDIR+=	c++rt0
 SUBDIR+=	cdbkup
 SUBDIR+=	cdrdao
 SUBDIR+=	cdrecord
-SUBDIR+=	cdrecord-devel
 SUBDIR+=	cdrecord-xcdroast
 SUBDIR+=	cfengine
 SUBDIR+=	cfengine2
diff --git a/sysutils/cdrecord-devel/DESCR b/sysutils/cdrecord-devel/DESCR
deleted file mode 100644
index 48cbdc9893a..00000000000
--- a/sysutils/cdrecord-devel/DESCR
+++ /dev/null
@@ -1,9 +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.
-
-This is a development release of the software.
diff --git a/sysutils/cdrecord-devel/Makefile b/sysutils/cdrecord-devel/Makefile
deleted file mode 100644
index 4263f5bcb15..00000000000
--- a/sysutils/cdrecord-devel/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2002/10/03 05:04:29 lukem Exp $
-
-DISTNAME=	cdrtools-1.11a34
-PKGNAME=	cdrecord-1.10.34
-PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${DISTNAME:C/a.*//}
-CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/
-
-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
-
-CONFLICTS=	mkisofs-[0-9]*
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_BUILDLINK2=		# defined
-USE_GMAKE=		# defined
-TBL?=			tbl
-
-.if ${LOCALBASE} != "/opt/schily"
-BUILDLINK_TRANSFORM=	r:-I/opt/schily
-BUILDLINK_TRANSFORM+=	r:-L/opt/schily
-.endif
-
-# avoid picking up a bad ${ARCH} during the build
-MAKE_ENV+=      ARCH=""
-MAKE_ENV+=      MAKEPROG="gmake"
-
-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 f in cdda2wav/cdda2wav.1 mkisofs/mkisofs.8; do		\
-		${TBL} $${f} > $${f}.tmp;				\
-		${MV} -f $${f}.tmp $${f};				\
-	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
-
-.include "../../mk/ossaudio.buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrecord-devel/PLIST b/sysutils/cdrecord-devel/PLIST
deleted file mode 100644
index 820fab58f8d..00000000000
--- a/sysutils/cdrecord-devel/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/10/03 05:04:30 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-devel/distinfo b/sysutils/cdrecord-devel/distinfo
deleted file mode 100644
index aa096c229c9..00000000000
--- a/sysutils/cdrecord-devel/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/29 08:04:10 lukem Exp $
-
-SHA1 (cdrtools-1.11a34.tar.gz) = 13fba1355b834785f847ec697d6912f648a4a02c
-Size (cdrtools-1.11a34.tar.gz) = 1512523 bytes
-SHA1 (patch-ac) = 52622d8fc4170a9c0310c810badc74bb3b9c9df8
-SHA1 (patch-ah) = cb1ee6bc32602735b81e339345194b49f225e94c
-SHA1 (patch-ai) = 3dd98fc56a3304b980797f9a898bec2bd3dd484c
-SHA1 (patch-aj) = 7e8328ad3478a43cc9311158c30b0acfe48fbb7b
-SHA1 (patch-ba) = 8d7038282ba5a6b133544cc8e440f6e12a475990
-SHA1 (patch-bb) = c5ee1e00e1f8723fe28d4d360bcede7680a7e4b9
diff --git a/sysutils/cdrecord-devel/patches/patch-ac b/sysutils/cdrecord-devel/patches/patch-ac
deleted file mode 100644
index 755e816e29a..00000000000
--- a/sysutils/cdrecord-devel/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/09/29 07:59:09 lukem Exp $
-
---- 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
- #endif
-+#include <machine/endian.h>
- 
- #ifndef _MCONFIG_H
- #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__)
- 
--#		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-devel/patches/patch-ah b/sysutils/cdrecord-devel/patches/patch-ah
deleted file mode 100644
index 11949e0b27a..00000000000
--- a/sysutils/cdrecord-devel/patches/patch-ah
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/09/29 08:01:02 lukem Exp $
-
---- cdda2wav/setuid.c.orig	Thu Mar 21 08:29:21 2002
-+++ cdda2wav/setuid.c
-@@ -91,7 +91,7 @@ void needroot(necessary)
- 
-     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);
-@@ -125,7 +125,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)) {
- 	perror("seteuid in dontneedroot()");
- 	exit(1);
-@@ -185,7 +185,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(1);
-@@ -216,7 +216,7 @@ void dontneedgroup()
- 	exit(1);
-     }
-     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);
diff --git a/sysutils/cdrecord-devel/patches/patch-ai b/sysutils/cdrecord-devel/patches/patch-ai
deleted file mode 100644
index 8a0a735e026..00000000000
--- a/sysutils/cdrecord-devel/patches/patch-ai
+++ /dev/null
@@ -1,113 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/08/09 08:16:43 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
-@@ -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*/
- 
- #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);
- 		}
-@@ -130,6 +130,15 @@
- 	register int	l;
- 	register int	nopen = 0;
- 	char		devname[64];
-+#if defined(__NetBSD__)
-+	struct scsi_addr mysaddr;
-+#if defined(__i386__)
-+	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;
-@@ -156,6 +165,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),
-@@ -192,6 +255,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-devel/patches/patch-aj b/sysutils/cdrecord-devel/patches/patch-aj
deleted file mode 100644
index 4e225469310..00000000000
--- a/sysutils/cdrecord-devel/patches/patch-aj
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/09/29 08:02:17 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-devel/patches/patch-ba b/sysutils/cdrecord-devel/patches/patch-ba
deleted file mode 100644
index 5e5336e2bb6..00000000000
--- a/sysutils/cdrecord-devel/patches/patch-ba
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ba,v 1.1.1.1 2002/09/29 08:04:00 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-devel/patches/patch-bb b/sysutils/cdrecord-devel/patches/patch-bb
deleted file mode 100644
index 3949d9e450e..00000000000
--- a/sysutils/cdrecord-devel/patches/patch-bb
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bb,v 1.1.1.1 2001/08/07 11:23:57 lukem 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