Make this work on alpha - pull in appropriate headers, mostly.

6 files changed, 93 insertions, 8 deletions

diff --git a/databases/sdbm/files/patch-sum b/databases/sdbm/files/patch-sum
index b50f19a6bd1..730f38bff59 100644
--- a/databases/sdbm/files/patch-sum
+++ b/databases/sdbm/files/patch-sum
@@ -1,4 +1,8 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:31 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/09/26 03:47:09 hubertf Exp $
 
-MD5 (patch-aa) = 9481785d9961cb1af4448c98de225fd2
+MD5 (patch-aa) = 72d8d3700fb9d72c3ea10528ab121d62
 MD5 (patch-ab) = 33096133cd9d2e69f0aed907320df658
+MD5 (patch-ac) = b9b8c073f1085f72c766db0ec5c4422b
+MD5 (patch-ad) = 5a01f20e2b73620d07584cd1b82e525c
+MD5 (patch-ae) = 0bd5ab2d1f56e0a6a8d8b8f5ea6f1c26
+MD5 (patch-af) = fd040bcdc0b0aa184861745e31a1965f
diff --git a/databases/sdbm/patches/patch-aa b/databases/sdbm/patches/patch-aa
index d80042dbaeb..8a4c0153bc9 100644
--- a/databases/sdbm/patches/patch-aa
+++ b/databases/sdbm/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.2 1999/06/30 09:45:26 agc Exp $
+$NetBSD: patch-aa,v 1.3 2000/09/26 03:47:10 hubertf Exp $
 
---- sdbm.c.orig	Wed Jun 30 10:10:12 1999
-+++ sdbm.c	Wed Jun 30 10:21:59 1999
-@@ -35,17 +35,6 @@
+--- sdbm.c.orig	Mon Sep 25 23:17:30 2000
++++ sdbm.c
+@@ -25,6 +25,7 @@
+ #endif
+ #include <errno.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #ifdef __STDC__
+ #include <stddef.h>
+@@ -35,17 +36,6 @@
  #endif
  
  /*
@@ -20,12 +28,12 @@ $NetBSD: patch-aa,v 1.2 1999/06/30 09:45:26 agc Exp $
   * forward
   */
  static int getdbit proto((DBM *, long));
-@@ -95,7 +84,7 @@
+@@ -95,7 +85,7 @@
   */
  	n = strlen(file) * 2 + strlen(DIRFEXT) + strlen(PAGFEXT) + 2;
  
 -	if ((dirname = malloc((unsigned) n)) == NULL)
-+	if ((dirname = (char *) malloc((unsigned) n)) == NULL)
++	if ((dirname = (char *) malloc(n)) == NULL)
  		return errno = ENOMEM, (DBM *) NULL;
  /*
   * build the file names
diff --git a/databases/sdbm/patches/patch-ac b/databases/sdbm/patches/patch-ac
new file mode 100644
index 00000000000..ec164d8e561
--- /dev/null
+++ b/databases/sdbm/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2000/09/26 03:47:10 hubertf Exp $
+
+--- tune.h.orig	Mon Sep 25 23:22:26 2000
++++ tune.h
+@@ -10,7 +10,7 @@
+ #include <unistd.h>
+ #endif
+ 
+-#ifdef BSD42
++#if defined(BSD42) && !defined(__NetBSD__)
+ #define SEEK_SET	L_SET
+ #define	memset(s,c,n)	bzero(s, n)		/* only when c is zero */
+ #define	memcpy(s1,s2,n)	bcopy(s2, s1, n)
diff --git a/databases/sdbm/patches/patch-ad b/databases/sdbm/patches/patch-ad
new file mode 100644
index 00000000000..e1834f1bfe6
--- /dev/null
+++ b/databases/sdbm/patches/patch-ad
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.1 2000/09/26 03:47:10 hubertf Exp $
+
+--- util.c.orig	Mon Sep 25 23:25:31 2000
++++ util.c
+@@ -1,4 +1,7 @@
+ #include <stdio.h>
++#ifdef __NetBSD__
++#include <errno.h>
++#endif
+ #ifdef SDBM
+ #include "sdbm.h"
+ #else
+@@ -10,8 +13,10 @@
+ register char *s1;
+ register char *s2;
+ {
++#ifndef __NetBSD__
+ 	extern int errno, sys_nerr;
+ 	extern char *sys_errlist[];
++#endif
+ 	extern char *progname;
+ 
+ 	if (progname)
diff --git a/databases/sdbm/patches/patch-ae b/databases/sdbm/patches/patch-ae
new file mode 100644
index 00000000000..8c0c001377f
--- /dev/null
+++ b/databases/sdbm/patches/patch-ae
@@ -0,0 +1,10 @@
+$NetBSD: patch-ae,v 1.1 2000/09/26 03:47:11 hubertf Exp $
+
+--- dbu.c.orig	Mon Sep 25 23:27:21 2000
++++ dbu.c
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/file.h>
+ #ifdef SDBM
+ #include "sdbm.h"
diff --git a/databases/sdbm/patches/patch-af b/databases/sdbm/patches/patch-af
new file mode 100644
index 00000000000..b533be6dcf3
--- /dev/null
+++ b/databases/sdbm/patches/patch-af
@@ -0,0 +1,27 @@
+$NetBSD: patch-af,v 1.1 2000/09/26 03:47:11 hubertf Exp $
+
+--- dbe.c.orig	Mon Sep 25 23:28:28 2000
++++ dbe.c
+@@ -1,4 +1,6 @@
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #ifndef VMS
+ #include <sys/file.h>
+ #include <ndbm.h>
+@@ -51,6 +53,7 @@
+ #define index  strchr
+ #endif
+ 
++#ifndef __NetBSD__
+ char
+ getopt(argc, argv, optstring)
+ int argc;
+@@ -128,6 +131,7 @@
+ 	}
+ 	return c;
+ }
++#endif
+ 
+ 
+ void