Make this work with 1.4K, and split out patch-aa into patch-ac as well

so that each patch works on a single source file.

4 files changed, 48 insertions, 28 deletions

diff --git a/misc/buffer/files/patch-sum b/misc/buffer/files/patch-sum
index 3e8a298f3d0..7545d2efee1 100644
--- a/misc/buffer/files/patch-sum
+++ b/misc/buffer/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:12 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/09/12 16:50:41 kim Exp $
 
-MD5 (patch-aa) = cd3d115b291f266d6bbcc433fda1f80a
-MD5 (patch-ab) = e8aa5031b45d75d8f858fda01fe26ba4
+MD5 (patch-aa) = bcd737f7020a03dbbcd68d0c3f44c090
+MD5 (patch-ab) = a4e376ec073297d92978bce4469a0d30
+MD5 (patch-ac) = f7f9fc1a6466837c223e48a525fd66c6
diff --git a/misc/buffer/patches/patch-aa b/misc/buffer/patches/patch-aa
index 81d169c8170..2f0e1798a54 100644
--- a/misc/buffer/patches/patch-aa
+++ b/misc/buffer/patches/patch-aa
@@ -1,25 +1,7 @@
-$NetBSD: patch-aa,v 1.5 1998/08/07 11:10:09 agc Exp $
+$NetBSD: patch-aa,v 1.6 1999/09/12 16:50:41 kim Exp $
 
---- buffer.c.orig	Wed Jul 14 17:59:17 1993
-+++ buffer.c	Wed Mar  4 16:32:52 1998
-@@ -384,6 +384,7 @@
- }
- 
- /* The interrupt handler */
-+void
- shutdown()
- {
- 	static int shutting;
-@@ -400,6 +401,7 @@
- }
- 
- /* Shutdown because the child has ended */
-+void
- child_shutdown()
- {
- 	/* Find out which child has died.  (They may not be my
---- Makefile.orig	Wed Jul 14 17:59:17 1993
-+++ Makefile	Fri Apr 10 23:31:14 1998
+--- Makefile.orig	Wed Jul 14 11:59:17 1993
++++ Makefile	Sun Sep 12 12:35:57 1999
 @@ -4,13 +4,13 @@
  #   You should also add -DSYS5 for Ultrix, AIX, and Solarix.
  # Add -DDEF_SHMEM=n if you can only have n bytes of shared memory
diff --git a/misc/buffer/patches/patch-ab b/misc/buffer/patches/patch-ab
index c10f674a4a8..6759f97d6c2 100644
--- a/misc/buffer/patches/patch-ab
+++ b/misc/buffer/patches/patch-ab
@@ -1,12 +1,29 @@
-$NetBSD: patch-ab,v 1.1 1999/04/05 02:00:49 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 1999/09/12 16:50:41 kim Exp $
 
---- sem.c.BAK	Mon Apr  5 03:56:15 1999
-+++ sem.c	Mon Apr  5 03:57:04 1999
-@@ -148,10 +148,12 @@
+--- sem.c.orig	Wed Jul 14 11:59:18 1993
++++ sem.c	Sun Sep 12 12:45:24 1999
+@@ -32,8 +32,10 @@
+ #include <sys/ipc.h>
+ #include <sys/sem.h>
+ #include <errno.h>
++#include <sys/param.h>
+ 
+-#if defined(SYS5) || defined(ultrix) || defined(_AIX)
++#if defined(SYS5) || defined(ultrix) || defined(_AIX) \
++    || (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 104110000))
+ union semun {
+ 	int val;
+ 	struct semid_ds *buf;
+@@ -148,10 +150,17 @@
  remove_sems( sem_id )
  	int sem_id;
  {
++#if defined(__NetBSD__) && defined(__NetBSD_Version__) \
++    && (__NetBSD_Version__ < 104110000)
 +	union semun dummy;
++#else
++#define dummy NULL
++#endif
 +
  	if( sem_id == -1 )
  		return;
diff --git a/misc/buffer/patches/patch-ac b/misc/buffer/patches/patch-ac
new file mode 100644
index 00000000000..15f4713b08c
--- /dev/null
+++ b/misc/buffer/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.1 1999/09/12 16:50:41 kim Exp $
+
+--- buffer.c.orig	Wed Jul 14 11:59:17 1993
++++ buffer.c	Sun Sep 12 12:35:57 1999
+@@ -384,6 +384,7 @@
+ }
+ 
+ /* The interrupt handler */
++void
+ shutdown()
+ {
+ 	static int shutting;
+@@ -400,6 +401,7 @@
+ }
+ 
+ /* Shutdown because the child has ended */
++void
+ child_shutdown()
+ {
+ 	/* Find out which child has died.  (They may not be my