From 4ac0fa085f2aa51f68a8e59b6e8eff940fa6e6f4 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Tue, 9 Jan 2007 15:25:47 +0000
Subject: Fixed building with SunPro on Solaris.

---
 net/nmap/distinfo         |  3 ++-
 net/nmap/patches/patch-aj | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 net/nmap/patches/patch-aj

(limited to 'net/nmap')

diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index c0ed98b308a..20be3f1039b 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2006/12/17 17:55:49 salo Exp $
+$NetBSD: distinfo,v 1.36 2007/01/09 15:25:47 rillig Exp $
 
 SHA1 (nmap-4.20.tar.bz2) = 641bf8ec28313f3fd110d7fa84c3a233cf79c36b
 RMD160 (nmap-4.20.tar.bz2) = d4794618c72f46e3c9446ce9e0c705ccf32c7115
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 439c500b9d853df5bf007d76b5e4012c959e135a
 SHA1 (patch-ab) = bef6a0bc8481702319d14d3427169562f13e1526
 SHA1 (patch-ac) = ac9f3ada1a3b431665225ce778b90723ddf523c8
 SHA1 (patch-ai) = f93dd35a9427f5619d3320955a1f7d132930ef66
+SHA1 (patch-aj) = 1500c5a1ea2af3f7ffd355740dace674875e0ea6
diff --git a/net/nmap/patches/patch-aj b/net/nmap/patches/patch-aj
new file mode 100644
index 00000000000..56e5cd7a66c
--- /dev/null
+++ b/net/nmap/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1 2007/01/09 15:25:48 rillig Exp $
+
+SunPro cannot handle struct { ...; union { ...; variable length array }}.
+
+--- libdnet-stripped/include/dnet/os.h.orig	2005-08-24 02:06:27.000000000 +0200
++++ libdnet-stripped/include/dnet/os.h	2007-01-09 16:18:57.602654556 +0100
+@@ -120,7 +120,7 @@ typedef unsigned int                ssiz
+ # ifdef __GNUC__
+ #  define __flexarr	[0]
+ # else
+-#  if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
++#  if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && !defined(__SUNPRO_C)
+ #   define __flexarr	[]
+ #  elif defined(_WIN32)
+ /* MS VC++ -- using just [] may work, but gives a non-standard extension warning */
-- 
cgit v1.2.3