From cc2acd7cdbc2800f0ba81d9c3845f0022d2e951b Mon Sep 17 00:00:00 2001
From: dholland <dholland>
Date: Sun, 14 Apr 2013 01:26:03 +0000
Subject: Don't provide own getopt on Solaris. May fix the Solaris build.

---
 databases/sdbm/distinfo         | 4 ++--
 databases/sdbm/patches/patch-af | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'databases/sdbm')

diff --git a/databases/sdbm/distinfo b/databases/sdbm/distinfo
index 0c754ab63e6..811a6e91168 100644
--- a/databases/sdbm/distinfo
+++ b/databases/sdbm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2012/06/23 18:49:27 dholland Exp $
+$NetBSD: distinfo,v 1.16 2013/04/14 01:26:03 dholland Exp $
 
 SHA1 (sdbm.tar.Z) = ebeb769b308a00853b0119f32dda781829e1d712
 RMD160 (sdbm.tar.Z) = 33a48f642ad81bb15a7ce4440dca605e97774afa
@@ -8,6 +8,6 @@ SHA1 (patch-ab) = 0d432aa2f4a8b33077aa045386da499b494bcd24
 SHA1 (patch-ac) = dccfcb2b7a2f68188bb55bb514021cc091274678
 SHA1 (patch-ad) = 7857dbfc168d12985a9fa0b5cefc39ac90bc4fba
 SHA1 (patch-ae) = 69e4e40277ecae8e6023d72dbbd4a738583f46dd
-SHA1 (patch-af) = fa89bf6c82ed379f83285390641a51bd9bb69c7e
+SHA1 (patch-af) = fa25d68eacd6e0b555a29618960659573013ca76
 SHA1 (patch-ah) = 90dba8033eba363f246fd785e8897724ab7eb718
 SHA1 (patch-ai) = 30be3d05db35d02190e8749840921d23c55c24db
diff --git a/databases/sdbm/patches/patch-af b/databases/sdbm/patches/patch-af
index 93c8f98c395..865e42a9e00 100644
--- a/databases/sdbm/patches/patch-af
+++ b/databases/sdbm/patches/patch-af
@@ -1,12 +1,12 @@
-$NetBSD: patch-af,v 1.4 2012/06/23 18:49:28 dholland Exp $
+$NetBSD: patch-af,v 1.5 2013/04/14 01:26:03 dholland Exp $
 
 - Use standard headers.
-- Don't provide own getopt on BSD platforms.
+- Don't provide own getopt on BSD platforms, or on Solaris.
 - Use <ctype.h> functions correctly.
 - Avoid signed bitwise operations.
 - Use the modern regexp library interface.
 
---- dbe.c.orig	2012-06-23 18:47:09.000000000 +0000
+--- dbe.c.orig	2013-04-14 01:29:53.000000000 +0000
 +++ dbe.c
 @@ -1,6 +1,12 @@
 +#include <sys/types.h>
@@ -26,7 +26,7 @@ $NetBSD: patch-af,v 1.4 2012/06/23 18:49:28 dholland Exp $
  #define index  strchr
  #endif
  
-+#if !(defined(BSD) && BSD >= 199506)
++#if !(defined(BSD) && BSD >= 199506) && !defined(__sun)
  char
  getopt(argc, argv, optstring)
  int argc;
-- 
cgit v1.2.3