From a808adc0c116648213cc7275922a84a53d0476dd Mon Sep 17 00:00:00 2001
From: ghen <ghen>
Date: Fri, 7 Jul 2006 18:47:52 +0000
Subject: Revert patch-aa to the previous revision and just add __NetBSD__ to
 the list. Suggested by joerg.

---
 net/netcat6/distinfo         |  4 ++--
 net/netcat6/patches/patch-aa | 27 +++++++++------------------
 2 files changed, 11 insertions(+), 20 deletions(-)

(limited to 'net/netcat6')

diff --git a/net/netcat6/distinfo b/net/netcat6/distinfo
index 3a798e15d9b..716889009ca 100644
--- a/net/netcat6/distinfo
+++ b/net/netcat6/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/07/07 17:51:19 ghen Exp $
+$NetBSD: distinfo,v 1.5 2006/07/07 18:47:52 ghen Exp $
 
 SHA1 (nc6-1.0.tar.bz2) = 1c361a8060be427fe1b2209d7155e26670e0c1b9
 RMD160 (nc6-1.0.tar.bz2) = c5444976925ffece7f27fc1ff3c16ebe19998b78
 Size (nc6-1.0.tar.bz2) = 264257 bytes
-SHA1 (patch-aa) = 77cd0084c0be48bcbcbfd2a96f08f430eea68650
+SHA1 (patch-aa) = 291ace89bef4e89a24bfc61c8b53104d00811657
diff --git a/net/netcat6/patches/patch-aa b/net/netcat6/patches/patch-aa
index 83078858cb1..d387688a8c4 100644
--- a/net/netcat6/patches/patch-aa
+++ b/net/netcat6/patches/patch-aa
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2006/07/07 17:51:19 ghen Exp $
+$NetBSD: patch-aa,v 1.5 2006/07/07 18:47:52 ghen Exp $
 
---- src/netsupport.c.orig	2006-01-19 23:46:23.000000000 +0100
-+++ src/netsupport.c	2006-07-06 20:48:20.000000000 +0200
-@@ -32,6 +32,9 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- 
-+#ifdef __GNUC__
-+#define alloca __builtin_alloca
-+#else
- #if HAVE_ALLOCA_H
- #include <alloca.h>
+--- src/netsupport.c.orig	2006-03-14 01:33:01.000000000 +0000
++++ src/netsupport.c
+@@ -38,7 +38,7 @@
+ #ifdef _AIX
+ #pragma alloca
  #else
-@@ -43,6 +46,7 @@ char *alloca();
+-#ifndef alloca /* predefined by HP cc +Olibcalls */
++#if !defined(alloca) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+ char *alloca();
  #endif
  #endif
- #endif
-+#endif
- 
- RCSID("@(#) $Header: /cvsroot/pkgsrc/net/netcat6/patches/patch-aa,v 1.4 2006/07/07 17:51:19 ghen Exp $");
- 
-- 
cgit v1.2.3