From 517f2279649191ba980ea3801d0e09f956bd951a Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sat, 23 Aug 2008 10:50:54 +0000
Subject: Remove patch-aj. Joerg Schilling says (translated): The comment is
 wrong. With this patch, formatting and writing in RAW mode (perhaps the
 latter only with Pioneer drives) does not work.

Bump PKGREVISION.
---
 sysutils/cdrtools/Makefile         |  4 ++--
 sysutils/cdrtools/distinfo         |  3 +--
 sysutils/cdrtools/patches/patch-aj | 25 -------------------------
 3 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 sysutils/cdrtools/patches/patch-aj

diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index bc1f36bbaa1..a17eadb3a63 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2008/08/22 22:01:00 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2008/08/23 10:50:54 wiz Exp $
 
 DISTNAME=	cdrtools-2.01.01a45
 PKGNAME=	cdrtools-2.01.01.45
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index 04acf4378bc..2216d6853b8 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2008/08/22 22:01:00 wiz Exp $
+$NetBSD: distinfo,v 1.21 2008/08/23 10:50:54 wiz Exp $
 
 SHA1 (cdrtools-2.01.01a45.tar.bz2) = c79ea5c87b48b2cb697e20c0efd9e11f752cfcb3
 RMD160 (cdrtools-2.01.01a45.tar.bz2) = e6e12fdae5ab98ba66f42eae27fb6e452f52eff1
@@ -9,7 +9,6 @@ SHA1 (patch-ac) = cde9bd57eef040d27734f6c86c55ac6153025d4f
 SHA1 (patch-ad) = 06f33c8b995e7f6edb53d78164cb8fbcd0cdefa8
 SHA1 (patch-ah) = fb6abfd0a2e92370f1fc8c00426852fb5f83ae18
 SHA1 (patch-ai) = 5d46fd425fdac880ea8037f8a2f18094d6765336
-SHA1 (patch-aj) = 28bc6a616647a895b6f42566080faf5c1173d698
 SHA1 (patch-ba) = 58b32b4b211fe620c57f510e1804f91d1b52fd28
 SHA1 (patch-bb) = 5d5f21b5d026df11245409c708534fe57886d3ff
 SHA1 (patch-cf) = a2b4f0dfe4a524451774ba2d29210f9cf7125d12
diff --git a/sysutils/cdrtools/patches/patch-aj b/sysutils/cdrtools/patches/patch-aj
deleted file mode 100644
index 7e3fe3cd80b..00000000000
--- a/sysutils/cdrtools/patches/patch-aj
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2007/09/18 23:07:26 wiz Exp $
-
---- cdrecord/scsi_cdr.c.orig	2007-09-01 12:09:48.000000000 +0000
-+++ cdrecord/scsi_cdr.c
-@@ -340,7 +340,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;
-@@ -355,6 +359,7 @@ request_sense_b(scgp, bp, cnt)
- 
- 	if (scg_cmd(scgp) < 0)
- 		return (-1);
-+#endif
- 	return (0);
- }
- 
-- 
cgit v1.2.3