From be5710a9313ea0f91caa4ec751308b095c1242a5 Mon Sep 17 00:00:00 2001
From: tv <tv@pkgsrc.org>
Date: Tue, 8 Nov 2005 03:27:32 +0000
Subject: Use strerror() on Interix.

---
 devel/electricfence/distinfo         |  4 ++--
 devel/electricfence/patches/patch-ab | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'devel')

diff --git a/devel/electricfence/distinfo b/devel/electricfence/distinfo
index 2e424d8903b..5fb00ac6143 100644
--- a/devel/electricfence/distinfo
+++ b/devel/electricfence/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 22:24:13 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/11/08 03:27:32 tv Exp $
 
 SHA1 (ElectricFence-2.1.tar.gz) = 1794db6d446f31045ebf845543cf6759cbab1e4f
 RMD160 (ElectricFence-2.1.tar.gz) = 4513b43b2c9b4212822c2b2d749b6485909d8f67
 Size (ElectricFence-2.1.tar.gz) = 47917 bytes
 SHA1 (patch-aa) = 53c7c23d6d0a5b4f9814125bce8d6280f474fd56
-SHA1 (patch-ab) = d69757ff0d7b85b755303be9ed25d4334bbbaab7
+SHA1 (patch-ab) = 54c2dca3c58f430fd2ffe3a59ddfd6d89fc4bbda
 SHA1 (patch-ac) = 4c56eeea0b8e53cdf260b61aa8fdef16f601b186
diff --git a/devel/electricfence/patches/patch-ab b/devel/electricfence/patches/patch-ab
index 456c6b76ee4..2da0b6ff191 100644
--- a/devel/electricfence/patches/patch-ab
+++ b/devel/electricfence/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2004/06/08 19:51:36 jschauma Exp $
+$NetBSD: patch-ab,v 1.5 2005/11/08 03:27:32 tv Exp $
 
---- page.c.orig	Sat Apr 27 00:57:38 1996
+--- page.c.orig	1996-04-26 18:57:38.000000000 -0400
 +++ page.c
 @@ -3,6 +3,7 @@
  #include <unistd.h>
@@ -15,11 +15,20 @@ $NetBSD: patch-ab,v 1.4 2004/06/08 19:51:36 jschauma Exp $
  static caddr_t	startAddr = (caddr_t) 0;
  
 -#if ( !defined(sgi) && !defined(_AIX) )
-+#if ( !defined(sgi) && !defined(_AIX) && !(defined(BSD) && BSD >= 199306)) && !defined(linux)
++#if ( !defined(sgi) && !defined(_AIX) && !(defined(BSD) && BSD >= 199306)) && !defined(linux) && !defined(__INTERIX)
  extern int	sys_nerr;
  extern char *	sys_errlist[];
  #endif
-@@ -70,7 +71,7 @@
+@@ -39,7 +40,7 @@ stringErrorReport(void)
+ {
+ #if ( defined(sgi) )
+ 	return strerror(oserror());
+-#elif ( defined(_AIX) )
++#elif ( defined(_AIX) || defined(__INTERIX) )
+ 	return strerror(errno);
+ #else
+ 	if ( errno > 0 && errno < sys_nerr )
+@@ -70,7 +71,7 @@ Page_Create(size_t size)
  	 */
  	allocation = (caddr_t) mmap(
  	 startAddr
@@ -28,7 +37,7 @@ $NetBSD: patch-ab,v 1.4 2004/06/08 19:51:36 jschauma Exp $
  	,PROT_READ|PROT_WRITE
  	,MAP_PRIVATE|MAP_ANONYMOUS
  	,-1
-@@ -122,7 +123,7 @@
+@@ -122,7 +123,7 @@ Page_Create(size_t size)
  	 */
  	allocation = (caddr_t) mmap(
  	 startAddr
-- 
cgit v1.2.3