From 6798b45582ec7d010eb3341b8fad83957fac3392 Mon Sep 17 00:00:00 2001
From: fgsch <fgsch@openbsd.org>
Date: Mon, 5 Mar 2001 08:12:04 +0000
Subject: [PATCH] Use update-patches output, rearrange plist, bump version.

---
 misc/cdrdao/Makefile                                       | 4 ++--
 .../patches/{patch-aa => patch-scsilib_include_btorder_h}  | 5 +++--
 .../patches/{patch-ac => patch-scsilib_libscg_scsi-bsd_c}  | 7 ++++---
 misc/cdrdao/pkg/PLIST                                      | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)
 rename misc/cdrdao/patches/{patch-aa => patch-scsilib_include_btorder_h} (58%)
 rename misc/cdrdao/patches/{patch-ac => patch-scsilib_libscg_scsi-bsd_c} (63%)

diff --git a/misc/cdrdao/Makefile b/misc/cdrdao/Makefile
index 379a41c866e..795b1185831 100644
--- a/misc/cdrdao/Makefile
+++ b/misc/cdrdao/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2001/03/05 07:46:52 fgsch Exp $
+# $OpenBSD: Makefile,v 1.9 2001/03/05 08:12:04 fgsch Exp $
 
 DISTNAME= 	cdrdao-1.1.4
 CATEGORIES=	audio misc
-NEED_VERSION=	1.305
+NEED_VERSION=	1.358
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cdrdao
 DISTFILES=	${DISTNAME}.src${EXTRACT_SUFX}
diff --git a/misc/cdrdao/patches/patch-aa b/misc/cdrdao/patches/patch-scsilib_include_btorder_h
similarity index 58%
rename from misc/cdrdao/patches/patch-aa
rename to misc/cdrdao/patches/patch-scsilib_include_btorder_h
index b24d7c1aa55..9de6733de6c 100644
--- a/misc/cdrdao/patches/patch-aa
+++ b/misc/cdrdao/patches/patch-scsilib_include_btorder_h
@@ -1,5 +1,6 @@
---- scsilib/include/btorder.h.orig	Thu Apr 29 06:02:27 1999
-+++ scsilib/include/btorder.h	Mon Jun 12 17:52:46 2000
+$OpenBSD: patch-scsilib_include_btorder_h,v 1.1 2001/03/05 08:12:04 fgsch Exp $
+--- scsilib/include/btorder.h.orig	Sat Apr 15 03:54:31 2000
++++ scsilib/include/btorder.h	Mon Mar  5 04:46:35 2001
 @@ -57,7 +57,7 @@
  #		define _BIT_FIELDS_HTOL
  #	endif
diff --git a/misc/cdrdao/patches/patch-ac b/misc/cdrdao/patches/patch-scsilib_libscg_scsi-bsd_c
similarity index 63%
rename from misc/cdrdao/patches/patch-ac
rename to misc/cdrdao/patches/patch-scsilib_libscg_scsi-bsd_c
index f9c5d420f96..486679eab2a 100644
--- a/misc/cdrdao/patches/patch-ac
+++ b/misc/cdrdao/patches/patch-scsilib_libscg_scsi-bsd_c
@@ -1,6 +1,7 @@
---- scsilib/libscg/scsi-bsd.c.orig	Mon Sep 13 16:41:38 1999
-+++ scsilib/libscg/scsi-bsd.c	Mon Jun 12 18:19:26 2000
-@@ -59,7 +59,12 @@
+$OpenBSD: patch-scsilib_libscg_scsi-bsd_c,v 1.1 2001/03/05 08:12:04 fgsch Exp $
+--- scsilib/libscg/scsi-bsd.c.orig	Sat Apr 15 03:54:42 2000
++++ scsilib/libscg/scsi-bsd.c	Mon Mar  5 04:46:35 2001
+@@ -59,7 +59,12 @@ struct scg_local {
  #define	SADDR_TARGET(a)	(SADDR_ISSCSI(a)?(a).addr.scsi.target:(a).addr.atapi.atbus*2+(a).addr.atapi.drive)
  #define	SADDR_LUN(a)	(SADDR_ISSCSI(a)?(a).addr.scsi.lun:0)
  #else
diff --git a/misc/cdrdao/pkg/PLIST b/misc/cdrdao/pkg/PLIST
index c92a0d54eb2..46d99c8cae5 100644
--- a/misc/cdrdao/pkg/PLIST
+++ b/misc/cdrdao/pkg/PLIST
@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.2 2001/03/05 07:46:53 fgsch Exp $
+@comment $OpenBSD: PLIST,v 1.3 2001/03/05 08:12:04 fgsch Exp $
 bin/cdrdao
 man/man1/cdrdao.1
+share/cdrdao/drivers
 share/doc/cdrdao/README
 share/doc/cdrdao/README.PlexDAE
 @dirrm share/doc/cdrdao
-share/cdrdao/drivers
 @dirrm share/cdrdao