Update to most recent -current version.

Note that the deleted patch files have been incorporated into the source.

6 files changed, 5 insertions, 63 deletions

diff --git a/sysutils/cdrecord-current/Makefile b/sysutils/cdrecord-current/Makefile
index b3b0dc80337..2143c528b85 100644
--- a/sysutils/cdrecord-current/Makefile
+++ b/sysutils/cdrecord-current/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 1999/12/20 03:52:22 briggs Exp $
+# $NetBSD: Makefile,v 1.6 2000/03/03 14:16:06 scw Exp $
 
-DISTNAME=	cdrecord-1.8a36
+DISTNAME=	cdrecord-1.8.1a01
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/
 
diff --git a/sysutils/cdrecord-current/files/md5 b/sysutils/cdrecord-current/files/md5
index d6847f91bd5..1de1ce1cf85 100644
--- a/sysutils/cdrecord-current/files/md5
+++ b/sysutils/cdrecord-current/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/12/20 03:52:23 briggs Exp $
+$NetBSD: md5,v 1.4 2000/03/03 14:16:06 scw Exp $
 
-MD5 (cdrecord-1.8a36.tar.gz) = 1ef47fd2c31962893f6430a26ce86990
+MD5 (cdrecord-1.8.1a01.tar.gz) = 35d0d86fa8c96c752b72f2e2293b3771
diff --git a/sysutils/cdrecord-current/files/patch-sum b/sysutils/cdrecord-current/files/patch-sum
index d014354a3bc..c12b09684a3 100644
--- a/sysutils/cdrecord-current/files/patch-sum
+++ b/sysutils/cdrecord-current/files/patch-sum
@@ -1,8 +1,5 @@
-$NetBSD: patch-sum,v 1.4 1999/12/20 03:52:24 briggs Exp $
+$NetBSD: patch-sum,v 1.5 2000/03/03 14:16:07 scw Exp $
 
 MD5 (patch-aa) = ce1e36780a6289a44496d355e35da71c
 MD5 (patch-ab) = 3a20ed15fd69037fc67d9d7172125c23
-MD5 (patch-ac) = ddbdfce08207bde25ecfbeee439ee1a8
-MD5 (patch-ad) = 97443b7650c9715a3d3456e56900ec85
 MD5 (patch-ae) = 4c3938baa5a03adc55193361aa43c697
-MD5 (patch-af) = 830ef4e4b7bfaf4a367776ecff8d7579
diff --git a/sysutils/cdrecord-current/patches/patch-ac b/sysutils/cdrecord-current/patches/patch-ac
deleted file mode 100644
index 5ff76c67643..00000000000
--- a/sysutils/cdrecord-current/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/09/17 08:18:34 tron Exp $
-
---- include/btorder.h.orig	Thu Apr 29 11:02:27 1999
-+++ include/btorder.h	Thu Sep 16 23:40:36 1999
-@@ -59,7 +59,7 @@
- 
- #	if defined(__i386) || defined(i386) || \
- 	   defined(__alpha) || defined(alpha) || \
--	   defined(__arm) || defined(arm)
-+	   defined(__arm) || defined(arm) || defined(__arm__)
- #		define _BIT_FIELDS_LTOH
- #	endif
- 
diff --git a/sysutils/cdrecord-current/patches/patch-ad b/sysutils/cdrecord-current/patches/patch-ad
deleted file mode 100644
index 9014a5cd2d7..00000000000
--- a/sysutils/cdrecord-current/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1999/12/20 03:52:24 briggs Exp $
-
-*** RULES/i386-netbsd-cc.rul.orig	Sat Dec 18 17:50:05 1999
---- RULES/i386-netbsd-cc.rul	Sat Dec 18 17:50:36 1999
-***************
-*** 26,32 ****
-  CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
-  CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
-  
-! OSDEFS=		-DIS_UNIX
-  CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
-  COPTS=
-  CWOPTS=		-Wall -Wtraditional \
---- 26,32 ----
-  CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
-  CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
-  
-! OSDEFS=
-  CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
-  COPTS=
-  CWOPTS=		-Wall -Wtraditional \
diff --git a/sysutils/cdrecord-current/patches/patch-af b/sysutils/cdrecord-current/patches/patch-af
deleted file mode 100644
index 4bc9e006d9e..00000000000
--- a/sysutils/cdrecord-current/patches/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-af,v 1.2 1999/12/20 03:52:24 briggs Exp $
-
-*** RULES/i386-netbsd-gcc.rul.orig	Sat Dec 18 17:50:19 1999
---- RULES/i386-netbsd-gcc.rul	Sat Dec 18 17:50:41 1999
-***************
-*** 26,32 ****
-  CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
-  CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
-  
-! OSDEFS=		-DIS_UNIX
-  CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
-  COPTS=
-  CWOPTS=		-Wall -Wtraditional \
---- 26,32 ----
-  CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
-  CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
-  
-! OSDEFS=
-  CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
-  COPTS=
-  CWOPTS=		-Wall -Wtraditional \