Update to cdrecord-1.8a36.

Replace patch-ad and patch-af with new patches (old ones were not
needed and two new patches were needed -- reported to Joerg Schilling).
Add NetBSD Id to patch-ae.

6 files changed, 51 insertions, 46 deletions

diff --git a/sysutils/cdrecord-current/Makefile b/sysutils/cdrecord-current/Makefile
index d9ef300fe3b..b3b0dc80337 100644
--- a/sysutils/cdrecord-current/Makefile
+++ b/sysutils/cdrecord-current/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 1999/11/16 00:00:24 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1999/12/20 03:52:22 briggs Exp $
 
-DISTNAME=	cdrecord-1.8a31
+DISTNAME=	cdrecord-1.8a36
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.fokus.gmd.de/nthp/employees/schilling/cdrecord.html
+HOMEPAGE=	http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
 
 USE_GMAKE=	yes
 
diff --git a/sysutils/cdrecord-current/files/md5 b/sysutils/cdrecord-current/files/md5
index bc149d84118..d6847f91bd5 100644
--- a/sysutils/cdrecord-current/files/md5
+++ b/sysutils/cdrecord-current/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/11/16 00:00:26 hubertf Exp $
+$NetBSD: md5,v 1.3 1999/12/20 03:52:23 briggs Exp $
 
-MD5 (cdrecord-1.8a31.tar.gz) = 281c4edf8d9b9e4d2bc639f4df6ebcf5
+MD5 (cdrecord-1.8a36.tar.gz) = 1ef47fd2c31962893f6430a26ce86990
diff --git a/sysutils/cdrecord-current/files/patch-sum b/sysutils/cdrecord-current/files/patch-sum
index 6309931e68d..d014354a3bc 100644
--- a/sysutils/cdrecord-current/files/patch-sum
+++ b/sysutils/cdrecord-current/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.3 1999/11/20 00:56:16 ross Exp $
+$NetBSD: patch-sum,v 1.4 1999/12/20 03:52:24 briggs Exp $
 
 MD5 (patch-aa) = ce1e36780a6289a44496d355e35da71c
 MD5 (patch-ab) = 3a20ed15fd69037fc67d9d7172125c23
 MD5 (patch-ac) = ddbdfce08207bde25ecfbeee439ee1a8
-MD5 (patch-ad) = ec8aadadf88df2db7e4dfb5dd091498a
-MD5 (patch-ae) = 3b26826ccceee3a89aea7e49e46a86a1
-MD5 (patch-af) = 92ba5cd2a95ce3b392219af6ecaeb8d8
+MD5 (patch-ad) = 97443b7650c9715a3d3456e56900ec85
+MD5 (patch-ae) = 4c3938baa5a03adc55193361aa43c697
+MD5 (patch-af) = 830ef4e4b7bfaf4a367776ecff8d7579
diff --git a/sysutils/cdrecord-current/patches/patch-ad b/sysutils/cdrecord-current/patches/patch-ad
index 2472b268077..9014a5cd2d7 100644
--- a/sysutils/cdrecord-current/patches/patch-ad
+++ b/sysutils/cdrecord-current/patches/patch-ad
@@ -1,15 +1,21 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/09/17 08:18:34 tron Exp $
+$NetBSD: patch-ad,v 1.2 1999/12/20 03:52:24 briggs Exp $
 
---- include/mconfig.h.orig	Fri Oct  9 15:31:45 1998
-+++ include/mconfig.h	Mon Dec 28 10:33:08 1998
-@@ -35,9 +35,7 @@
- extern "C" {
- #endif
- 
--#if defined(unix) || defined(__unix) || defined(__unix__)
--#	define	IS_UNIX
--#endif
-+#define	IS_UNIX
- 
- #ifdef	__MSDOS__
- #	define	IS_MSDOS
+*** 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-ae b/sysutils/cdrecord-current/patches/patch-ae
index 36289a307bb..868a8d767ad 100644
--- a/sysutils/cdrecord-current/patches/patch-ae
+++ b/sysutils/cdrecord-current/patches/patch-ae
@@ -1,3 +1,5 @@
+$NetBSD: patch-ae,v 1.3 1999/12/20 03:52:24 briggs Exp $
+
 --- cdda2wav/Makefile.orig	Tue Nov 16 00:48:52 1999
 +++ cdda2wav/Makefile	Tue Nov 16 00:49:23 1999
 @@ -7,7 +7,8 @@
diff --git a/sysutils/cdrecord-current/patches/patch-af b/sysutils/cdrecord-current/patches/patch-af
index c7965cb3ebd..4bc9e006d9e 100644
--- a/sysutils/cdrecord-current/patches/patch-af
+++ b/sysutils/cdrecord-current/patches/patch-af
@@ -1,24 +1,21 @@
-$NetBSD: patch-af,v 1.1 1999/11/20 00:56:17 ross Exp $
+$NetBSD: patch-af,v 1.2 1999/12/20 03:52:24 briggs Exp $
 
---- mkisofs-1.12b5/mkisofs.c.orig	Wed Nov  3 14:56:49 1999
-+++ mkisofs-1.12b5/mkisofs.c	Fri Nov 19 16:48:02 1999
-@@ -879,19 +879,6 @@
- 
- parse_input_files:
- 
--#ifdef __NetBSD__
--    {
--	int resource;
--    struct rlimit rlp;
--	if (getrlimit(RLIMIT_DATA,&rlp) == -1) 
--		perror("Warning: getrlimit");
--	else {
--		rlp.rlim_cur=33554432;
--		if (setrlimit(RLIMIT_DATA,&rlp) == -1)
--			perror("Warning: setrlimit");
--		}
--	}
--#endif
- #ifdef HAVE_SBRK
-   mem_start = (unsigned long) sbrk(0);
- #endif
+*** 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 \