From fdc72dd563936b0790c073a6338572a764b972fd Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Wed, 21 Jun 2006 21:27:29 +0000
Subject: Never include sys/errno.h or define errno.

---
 net/etherape/distinfo         |  4 ++--
 net/etherape/patches/patch-ab | 31 ++++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/net/etherape/distinfo b/net/etherape/distinfo
index b3708640be6..28e157407b4 100644
--- a/net/etherape/distinfo
+++ b/net/etherape/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:13:46 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/06/21 21:27:29 joerg Exp $
 
 SHA1 (etherape-0.9.1.tar.gz) = d9eb267e1ff5992bf120f8bbefc974660a203909
 RMD160 (etherape-0.9.1.tar.gz) = f9ca91b43ff9c324518cd3ef7aec3612f52dcd48
 Size (etherape-0.9.1.tar.gz) = 447092 bytes
 SHA1 (patch-aa) = e6b41ead7de0a0ce5f293f742e3e79cfe2d65021
-SHA1 (patch-ab) = 36ba395ccd63348e16ac4e6fff724af17fa12082
+SHA1 (patch-ab) = 8673a2e9fb9ae26ee0bab7bd76a2157f5c1623a6
diff --git a/net/etherape/patches/patch-ab b/net/etherape/patches/patch-ab
index 6e110287be5..3cbe89d67b2 100644
--- a/net/etherape/patches/patch-ab
+++ b/net/etherape/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2004/12/20 23:24:02 christos Exp $
+$NetBSD: patch-ab,v 1.2 2006/06/21 21:27:30 joerg Exp $
 
---- src/dns.c.orig	2003-04-06 09:45:41.000000000 -0400
-+++ src/dns.c	2004-12-20 18:15:45.000000000 -0500
-@@ -60,6 +60,17 @@
+--- src/dns.c.orig	2003-04-06 13:45:41.000000000 +0000
++++ src/dns.c
+@@ -38,7 +38,6 @@
+ #include <sys/time.h>
+ #include <sys/select.h>
+ #include <sys/stat.h>
+-#include <sys/errno.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+@@ -60,11 +59,19 @@ extern char *sys_errlist[];
  #define strerror(errno) (((errno) >= 0 && (errno) < sys_nerr) ? sys_errlist[errno] : "unlisted error")
  #endif
  
@@ -19,8 +27,13 @@ $NetBSD: patch-ab,v 1.1 2004/12/20 23:24:02 christos Exp $
 +#endif
  
  
- /*  Hmm, it seems Irix requires this  */
-@@ -432,15 +443,15 @@
+-/*  Hmm, it seems Irix requires this  */
+-extern int errno;
+-
+ /* Defined in main.c - non zero if you want to activate DNS resolving, zero to disable*/
+ extern int dns;
+ 
+@@ -432,15 +439,15 @@ void
  dns_open (void)
  {
    int option, i;
@@ -41,7 +54,7 @@ $NetBSD: patch-ab,v 1.1 2004/12/20 23:24:02 christos Exp $
    resfd = socket (AF_INET, SOCK_DGRAM, 0);
    if (resfd == -1)
      {
-@@ -755,7 +766,7 @@
+@@ -755,7 +762,7 @@ dorequest (char *s, int type, word id)
    int r, i;
    int buf[(MaxPacketsize / sizeof (int)) + 1];
  
@@ -50,7 +63,7 @@ $NetBSD: patch-ab,v 1.1 2004/12/20 23:24:02 christos Exp $
  		   MaxPacketsize);
    if (r == -1)
      {
-@@ -764,9 +775,9 @@
+@@ -764,9 +771,9 @@ dorequest (char *s, int type, word id)
      }
    hp = (packetheader *) buf;
    hp->id = id;			/* htons() deliberately left out (redundant) */
@@ -62,7 +75,7 @@ $NetBSD: patch-ab,v 1.1 2004/12/20 23:24:02 christos Exp $
  		   sizeof (struct sockaddr));
  }
  
-@@ -1279,15 +1290,15 @@
+@@ -1279,15 +1286,15 @@ dns_ack ()
        /* Check to see if this server is actually one we sent to */
        if (from.sin_addr.s_addr == localhost)
  	{
-- 
cgit v1.2.3