[pkgsrc/trunk]: pkgsrc/net/nmap Fixed building with SunPro on Solaris.

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cc814c77bc60
branches:  trunk
changeset: 523564:cc814c77bc60
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Jan 09 15:25:47 2007 +0000

description:
Fixed building with SunPro on Solaris.

diffstat:

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

diffs (33 lines):

diff -r d68c741b90ac -r cc814c77bc60 net/nmap/distinfo
--- a/net/nmap/distinfo Tue Jan 09 15:21:34 2007 +0000
+++ b/net/nmap/distinfo Tue Jan 09 15:25:47 2007 +0000
@@ -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-ab) = bef6a0bc8481702319d14d3427169562f13e1526
 SHA1 (patch-ac) = ac9f3ada1a3b431665225ce778b90723ddf523c8
 SHA1 (patch-ai) = f93dd35a9427f5619d3320955a1f7d132930ef66
+SHA1 (patch-aj) = 1500c5a1ea2af3f7ffd355740dace674875e0ea6
diff -r d68c741b90ac -r cc814c77bc60 net/nmap/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/nmap/patches/patch-aj Tue Jan 09 15:25:47 2007 +0000
@@ -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 */