- get endianness from machine/endian.h. Fixes compile on those arch's which

  weren't hard coded into the program

- setup up standard NetBSD build rules for the scsi library as is done with
  the cdrecord pkg.

- use /dev/rcd0d for i386 but /dev/rcd0c for other archs (instead of /dev/rcd0d
  for everything).  This is only a default and can be overridden at run time.

4 files changed, 43 insertions, 9 deletions

diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index dbd4c6852dd..4332201e54c 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/02/18 15:13:50 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2000/07/07 16:25:02 dmcmahill Exp $
 #
 
 DISTNAME=	cdrdao-1.1.3.src
@@ -22,6 +22,16 @@ CONFIGURE_ARGS+=	--without-posix-threads
 
 WRKSRC=		${WRKDIR}/cdrdao-1.1.3
 
+#override ARCH to avoid picking up a bad ${ARCH} during the build
+MAKE_ENV+=      ARCH=""
+
+post-configure:
+	cd ${WRKSRC}/scsilib/RULES ; \
+	${TEST} -f netbsd-cc.rul || ${MV} i386-netbsd-cc.rul netbsd-cc.rul; \
+	${TEST} -f netbsd-gcc.rul || ${MV} i386-netbsd-gcc.rul netbsd-gcc.rul; \
+	${LN} -sf netbsd-gcc.rul ${MACHINE}-netbsd-gcc.rul; \
+	${LN} -sf netbsd-cc.rul ${MACHINE}-netbsd-cc.rul;
+
 post-install:
 		${INSTALL_MAN_DIR} ${PREFIX}/share/doc/cdrdao
 		${INSTALL_MAN} ${WRKSRC}/COPYING \
diff --git a/sysutils/cdrdao/files/patch-sum b/sysutils/cdrdao/files/patch-sum
index 3743d4e370a..fa37372767c 100644
--- a/sysutils/cdrdao/files/patch-sum
+++ b/sysutils/cdrdao/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/02/18 15:13:50 wiz Exp $
+$NetBSD: patch-sum,v 1.2 2000/07/07 16:25:03 dmcmahill Exp $
 
 MD5 (patch-aa) = 2fd76fa846b2da4320105331c8493c35
-MD5 (patch-ab) = f943931b6b910bc39827fd15d8e3e774
+MD5 (patch-ab) = 0013df10bc2225521dd71cd7653001b8
+MD5 (patch-ac) = b183f1b51bd0cb776f06526d59826fa9
diff --git a/sysutils/cdrdao/patches/patch-ab b/sysutils/cdrdao/patches/patch-ab
index e4ffd0acc35..603997182bd 100644
--- a/sysutils/cdrdao/patches/patch-ab
+++ b/sysutils/cdrdao/patches/patch-ab
@@ -1,13 +1,18 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/02/18 15:13:50 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2000/07/07 16:25:04 dmcmahill Exp $
 
---- ./dao/main.cc.orig	Tue Oct 26 18:13:46 1999
-+++ ./dao/main.cc	Fri Feb 18 14:39:57 2000
-@@ -156,7 +156,7 @@
- 
+have a default scsi device which is likely to be correct (at least
+on single CD systems).
+
+--- dao/main.cc.orig	Tue Oct 26 12:13:46 1999
++++ dao/main.cc	Fri Jul  7 12:20:08 2000
+@@ -157,5 +157,9 @@
  #else
  
 -static const char *SCSI_DEVICE = "0,0,0";
++#if	defined (__i386__)
 +static const char *SCSI_DEVICE = "/dev/rcd0d";
++#else
++static const char *SCSI_DEVICE = "/dev/rcd0c";
++#endif /* __i386__ */
  static int FIFO_BUFFERS = 32;
  
- #endif
diff --git a/sysutils/cdrdao/patches/patch-ac b/sysutils/cdrdao/patches/patch-ac
new file mode 100644
index 00000000000..a5e48202e34
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.1 2000/07/07 16:25:04 dmcmahill Exp $
+
+--- scsilib/include/btorder.h.orig	Thu Apr 29 05:02:27 1999
++++ scsilib/include/btorder.h	Fri Jul  7 09:11:17 2000
+@@ -44,4 +44,13 @@
+  * Bitorder is known.
+  */
++
++#elif	defined(__NetBSD__)
++#include <machine/endian.h>
++#if	BYTE_ORDER == LITTLE_ENDIAN
++#define _BIT_FIELDS_LTOH
++#else
++#define _BIT_FIELDS_HTOL
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
++
+ #else
+ /*