From b22d56bd676315421abb93b0e5eac79908d77558 Mon Sep 17 00:00:00 2001
From: kristerw <kristerw@pkgsrc.org>
Date: Fri, 8 Jul 2005 19:25:34 +0000
Subject: Eliminate conflicting function declarations on Darwin.

---
 shells/es/distinfo         | 6 +++---
 shells/es/patches/patch-ac | 4 ++--
 shells/es/patches/patch-ad | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'shells')

diff --git a/shells/es/distinfo b/shells/es/distinfo
index 50d3de08087..92bf72bf0b6 100644
--- a/shells/es/distinfo
+++ b/shells/es/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.8 2005/03/10 16:58:39 tv Exp $
+$NetBSD: distinfo,v 1.9 2005/07/08 19:25:34 kristerw Exp $
 
 SHA1 (es-0.9-alpha1.tar.gz) = 5027c9dade742c437b8e471a356d15883ebc4732
 RMD160 (es-0.9-alpha1.tar.gz) = ca2307202ab6e65c49188e3228d1af6426a23952
 Size (es-0.9-alpha1.tar.gz) = 125913 bytes
 SHA1 (patch-aa) = 0ecb437885e77c07ef9c6d677cefe9d0ae6b86d8
 SHA1 (patch-ab) = bd58fbbf71d5c9dc76bdc380cb7b93ad3f5f1c72
-SHA1 (patch-ac) = 52091c57f8f5bdcbf62069ae19200a7fc4bb88c0
-SHA1 (patch-ad) = ef0552148d9d0fdabb1dec72b3084eaaa33513c8
+SHA1 (patch-ac) = a5b166c8196f51e59f317a95ba2f1ae2cb42f6e4
+SHA1 (patch-ad) = 7af899985d5e3f2f4fb4ed4ce02696583f308f87
 SHA1 (patch-ae) = 3625310b30bbf64f24d6efbcd1864b7e8a92ff59
 SHA1 (patch-af) = e637be09b74092fb2fc5c34a7c09b824da4eea26
diff --git a/shells/es/patches/patch-ac b/shells/es/patches/patch-ac
index 3a1e6f45f41..60e9dce9e6d 100644
--- a/shells/es/patches/patch-ac
+++ b/shells/es/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2005/01/25 04:46:29 tv Exp $
+$NetBSD: patch-ac,v 1.3 2005/07/08 19:25:34 kristerw Exp $
 
 --- main.c~	Tue May 30 06:13:50 1995
 +++ main.c	Thu Apr 10 09:20:49 1997
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.2 2005/01/25 04:46:29 tv Exp $
  #endif
  
 -#if !HPUX && !defined(linux)
-+#if !HPUX && !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX)
++#if !HPUX && !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX) && !defined(__APPLE__)
  extern int getopt (int argc, char **argv, const char *optstring);
  #endif
  extern int optind;
diff --git a/shells/es/patches/patch-ad b/shells/es/patches/patch-ad
index 4eae8733083..0a5c24d78fa 100644
--- a/shells/es/patches/patch-ad
+++ b/shells/es/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2005/03/10 15:18:31 tv Exp $
+$NetBSD: patch-ad,v 1.5 2005/07/08 19:25:34 kristerw Exp $
 
 --- stdenv.h.orig	1995-05-30 07:13:53.000000000 -0400
 +++ stdenv.h
@@ -25,7 +25,7 @@ $NetBSD: patch-ad,v 1.4 2005/03/10 15:18:31 tv Exp $
  
  /* stdlib */
  
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX) && !defined(__APPLE__)
  extern noreturn exit(int);
  extern noreturn abort(void);
  extern long strtol(const char *num, char **end, int base);
-- 
cgit v1.2.3