Add DragonFly support. Also recognize DragonFly and NetBSD as OS name.

6 files changed, 70 insertions, 15 deletions

diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 1d983b5b736..ff56e3298ef 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.28 2006/01/31 22:21:23 salo Exp $
+$NetBSD: distinfo,v 1.29 2006/02/01 20:39:11 joerg Exp $
 
 SHA1 (nmap-4.00.tar.bz2) = f4de47d454c6c6e49e20086294701e4a09159638
 RMD160 (nmap-4.00.tar.bz2) = 42ba5d40dfe523a1265d741b2e42658a88f07b01
 Size (nmap-4.00.tar.bz2) = 1896480 bytes
 SHA1 (patch-aa) = 80598e757ea710d707d4b8f247f22a1460b2688a
-SHA1 (patch-ab) = 7ac228ff6016b1893b0bdd38134fe46f6ee71b67
-SHA1 (patch-ad) = 697142c3eed5c8771c9421e241a06b9c35588b9d
+SHA1 (patch-ab) = db30a6dacb49a1760ae79a21b2949db23049aef7
+SHA1 (patch-ad) = d10bc67832fdaa9318ab57c6c283c07a10dec9b1
 SHA1 (patch-ae) = 9ef870f3961c38c85c558304595df31f2b9d92fd
-SHA1 (patch-af) = 8c642b7c23f0df89c3a16f368e88070c3db94bdb
+SHA1 (patch-af) = 2ea6443bef6138af65d85f813f7caddf6988dd6a
+SHA1 (patch-ah) = 323de45bf4befa7a8502830f246dcfde95ca8f7f
+SHA1 (patch-ai) = f93dd35a9427f5619d3320955a1f7d132930ef66
diff --git a/net/nmap/patches/patch-ab b/net/nmap/patches/patch-ab
index c20a7e1b387..ba9077169c0 100644
--- a/net/nmap/patches/patch-ab
+++ b/net/nmap/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.9 2004/10/19 07:03:10 salo Exp $
+$NetBSD: patch-ab,v 1.10 2006/02/01 20:39:11 joerg Exp $
 
---- configure.orig	2004-10-17 05:49:33.000000000 +0200
-+++ configure	2004-10-19 08:43:53.000000000 +0200
-@@ -5715,10 +5715,6 @@
+--- configure.orig	2005-12-31 01:13:10.000000000 +0000
++++ configure
+@@ -3029,7 +3029,7 @@ _ACEOF
+   # libpcap doesn't even LOOK at
+                                      # the timeout you give it under Linux
+     ;;
+-  *-freebsd* | *-kfreebsd*-gnu)
++  *-freebsd* | *-kfreebsd*-gnu | *-dragonfly*)
+     cat >>confdefs.h <<\_ACEOF
+ #define FREEBSD 1
+ _ACEOF
+@@ -5765,10 +5765,6 @@ fi
  
  fi;
  
@@ -13,7 +22,7 @@ $NetBSD: patch-ab,v 1.9 2004/10/19 07:03:10 salo Exp $
  if test $needs_cpp_precomp = yes; then
    CXXFLAGS="-no-cpp-precomp $CXXFLAGS"
  fi
-@@ -5752,6 +5748,7 @@
+@@ -5802,6 +5798,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  extern char pcap_version[];
  int main() {
    int major, minor;
diff --git a/net/nmap/patches/patch-ad b/net/nmap/patches/patch-ad
index 40de4fbe34f..2e26d63242f 100644
--- a/net/nmap/patches/patch-ad
+++ b/net/nmap/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.9 2004/11/26 09:24:21 adam Exp $
+$NetBSD: patch-ad,v 1.10 2006/02/01 20:39:11 joerg Exp $
 
---- nbase/configure.orig	2004-10-16 05:03:55.000000000 +0000
+--- nbase/configure.orig	2006-01-25 07:50:35.000000000 +0000
 +++ nbase/configure
 @@ -9,6 +9,8 @@
  ## M4sh Initialization.  ##
@@ -11,7 +11,16 @@ $NetBSD: patch-ad,v 1.9 2004/11/26 09:24:21 adam Exp $
  # Be Bourne compatible
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
-@@ -7074,7 +7076,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" =
+@@ -2561,7 +2563,7 @@ _ACEOF
+   # libpcap doesn't even LOOK at
+                                      # the timeout you give it under Linux
+     ;;
+-  *-freebsd* | *-kfreebsd*-gnu)
++  *-freebsd* | *-kfreebsd*-gnu | *-dragonfly*)
+     cat >>confdefs.h <<\_ACEOF
+ #define FREEBSD 1
+ _ACEOF
+@@ -7081,7 +7083,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" =
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -20,7 +29,7 @@ $NetBSD: patch-ad,v 1.9 2004/11/26 09:24:21 adam Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7137,7 +7139,7 @@ if test $ac_cv_lib_ssl_SSL_new = yes; th
+@@ -7144,7 +7146,7 @@ if test $ac_cv_lib_ssl_SSL_new = yes; th
  #define HAVE_LIBSSL 1
  _ACEOF
  
diff --git a/net/nmap/patches/patch-af b/net/nmap/patches/patch-af
index 0ed80b86588..d2d2af5089d 100644
--- a/net/nmap/patches/patch-af
+++ b/net/nmap/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.4 2004/11/26 09:24:21 adam Exp $
+$NetBSD: patch-af,v 1.5 2006/02/01 20:39:11 joerg Exp $
 
---- nmapfe/configure.orig	2004-10-07 21:59:48.000000000 +0000
+--- nmapfe/configure.orig	2005-12-30 04:18:16.000000000 +0000
 +++ nmapfe/configure
 @@ -9,6 +9,8 @@
  ## M4sh Initialization.  ##
@@ -11,3 +11,12 @@ $NetBSD: patch-af,v 1.4 2004/11/26 09:24:21 adam Exp $
  # Be Bourne compatible
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
+@@ -2715,7 +2717,7 @@ _ACEOF
+   # libpcap doesn't even LOOK at
+                                      # the timeout you give it under Linux
+     ;;
+-  *-freebsd* | *-kfreebsd*-gnu)
++  *-freebsd* | *-kfreebsd*-gnu | *-dragonfly*)
+     cat >>confdefs.h <<\_ACEOF
+ #define FREEBSD 1
+ _ACEOF
diff --git a/net/nmap/patches/patch-ah b/net/nmap/patches/patch-ah
new file mode 100644
index 00000000000..bedd38bf127
--- /dev/null
+++ b/net/nmap/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2006/02/01 20:39:11 joerg Exp $
+
+--- libdnet-stripped/configure.orig	2006-02-01 19:38:08.000000000 +0000
++++ libdnet-stripped/configure
+@@ -22707,7 +22707,7 @@ esac
+ elif test "$ac_cv_header_net_if_tun_h" = yes ; then
+ 	if test "$ac_cv_header_stropts_h" = yes ; then
+            case "$host_os" in
+-           *kfreebsd*)
++           *kfreebsd* | *dragonfly*)
+                case $LIBOBJS in
+     "tun-bsd.$ac_objext"   | \
+   *" tun-bsd.$ac_objext"   | \
diff --git a/net/nmap/patches/patch-ai b/net/nmap/patches/patch-ai
new file mode 100644
index 00000000000..1fbfd0ce2d2
--- /dev/null
+++ b/net/nmap/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2006/02/01 20:39:11 joerg Exp $
+
+--- nmapfe/nmapfe_sig.c.orig	2006-01-21 00:41:22.000000000 +0000
++++ nmapfe/nmapfe_sig.c
+@@ -1094,6 +1094,8 @@ print_line (GtkTextBuffer *buffer, 
+               /* Color the Operating systems */
+           } else if (strstr(str, "Linux") ||
+                   strstr(str, "FreeBSD") ||
++                  strstr(str, "DragonFly") ||
++                  strstr(str, "NetBSD") ||
+                   strstr(str, "Win") ||
+                   strstr(str, "MacOS") ||
+                   strstr(str, "OpenBSD") ||