From 99b96f73447baf9fe565d4c215581bbafab0b9e1 Mon Sep 17 00:00:00 2001
From: minskim <minskim@pkgsrc.org>
Date: Sat, 27 Aug 2005 20:43:40 +0000
Subject: Remove conflicting declaration of shmat.  This fixes PR pkg/31008.

---
 misc/buffer/distinfo         |  4 ++--
 misc/buffer/patches/patch-ac | 21 ++++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'misc/buffer')

diff --git a/misc/buffer/distinfo b/misc/buffer/distinfo
index a531dad866e..abbe8a34756 100644
--- a/misc/buffer/distinfo
+++ b/misc/buffer/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:02:50 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/08/27 20:43:40 minskim Exp $
 
 SHA1 (buffer-1.17.tar.gz) = 88201f677485880cd508430015b7ce7d9663b6e7
 RMD160 (buffer-1.17.tar.gz) = c7f87873f8f74b900609ef495ebabc8596729fb8
 Size (buffer-1.17.tar.gz) = 17131 bytes
 SHA1 (patch-aa) = 8b1a563728b6a67e49123e2c48d9d39d55a91476
 SHA1 (patch-ab) = 8d440541eb7a52db06ad2819924631591ae0b06f
-SHA1 (patch-ac) = 4e3ea4cb963d4dbd62995ada3a71c03750110cad
+SHA1 (patch-ac) = 53a3f7730e62a244109243b1262e26dd5687c223
diff --git a/misc/buffer/patches/patch-ac b/misc/buffer/patches/patch-ac
index 15f4713b08c..91abd3fdd5f 100644
--- a/misc/buffer/patches/patch-ac
+++ b/misc/buffer/patches/patch-ac
@@ -1,20 +1,23 @@
-$NetBSD: patch-ac,v 1.1 1999/09/12 16:50:41 kim Exp $
+$NetBSD: patch-ac,v 1.2 2005/08/27 20:43:40 minskim Exp $
 
---- buffer.c.orig	Wed Jul 14 11:59:17 1993
-+++ buffer.c	Sun Sep 12 12:35:57 1999
-@@ -384,6 +384,7 @@
- }
+--- buffer.c.orig	1994-10-04 09:44:53.000000000 -0700
++++ buffer.c
+@@ -118,6 +118,4 @@ static char *rcsid = "$Header: /a/swan/h
+ #endif
+ 
+-extern char *shmat();
+-
+ /* General macros */
+ #define TRUE 1
+@@ -385,4 +383,5 @@ parse_args( argc, argv )
  
  /* The interrupt handler */
 +void
  shutdown()
  {
- 	static int shutting;
-@@ -400,6 +401,7 @@
- }
+@@ -401,4 +400,5 @@ shutdown()
  
  /* Shutdown because the child has ended */
 +void
  child_shutdown()
  {
- 	/* Find out which child has died.  (They may not be my
-- 
cgit v1.2.3