5 files changed, 18 insertions, 58 deletions
diff --git a/net/nmap/patches/patch-aa b/net/nmap/patches/patch-aa
index 88df3374c23..9e5f0c930de 100644
--- a/net/nmap/patches/patch-aa
+++ b/net/nmap/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.15 2006/01/31 22:21:24 salo Exp $
+$NetBSD: patch-aa,v 1.16 2006/02/12 17:24:23 salo Exp $
 
---- Makefile.in.orig	2006-01-30 08:10:31.000000000 +0100
-+++ Makefile.in	2006-01-31 21:08:31.000000000 +0100
+--- Makefile.in.orig	2006-02-10 03:22:27.000000000 +0100
++++ Makefile.in	2006-02-12 18:06:50.000000000 +0100
 @@ -1,4 +1,4 @@
--export NMAP_VERSION = 4.00
-+NMAP_VERSION = 4.00
+-export NMAP_VERSION = 4.01
++NMAP_VERSION = 4.01
  NMAP_NAME= Nmap
  NMAP_URL= http://www.insecure.org/nmap/
  NMAP_PLATFORM=@host@
diff --git a/net/nmap/patches/patch-ab b/net/nmap/patches/patch-ab
index ba9077169c0..72f245271e4 100644
--- a/net/nmap/patches/patch-ab
+++ b/net/nmap/patches/patch-ab
@@ -1,17 +1,8 @@
-$NetBSD: patch-ab,v 1.10 2006/02/01 20:39:11 joerg Exp $
+$NetBSD: patch-ab,v 1.11 2006/02/12 17:24:23 salo Exp $
 
---- 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
+--- configure.orig	2006-02-02 03:18:42.000000000 +0100
++++ configure	2006-02-12 18:07:39.000000000 +0100
+@@ -5765,10 +5765,6 @@
  
  fi;
  
@@ -22,7 +13,7 @@ $NetBSD: patch-ab,v 1.10 2006/02/01 20:39:11 joerg Exp $
  if test $needs_cpp_precomp = yes; then
    CXXFLAGS="-no-cpp-precomp $CXXFLAGS"
  fi
-@@ -5802,6 +5798,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5802,6 +5798,7 @@
  extern char pcap_version[];
  int main() {
    int major, minor;
diff --git a/net/nmap/patches/patch-ad b/net/nmap/patches/patch-ad
index 2e26d63242f..cf9d2058b18 100644
--- a/net/nmap/patches/patch-ad
+++ b/net/nmap/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.10 2006/02/01 20:39:11 joerg Exp $
+$NetBSD: patch-ad,v 1.11 2006/02/12 17:24:23 salo Exp $
 
---- nbase/configure.orig	2006-01-25 07:50:35.000000000 +0000
-+++ nbase/configure
+--- nbase/configure.orig	2006-02-02 03:18:49.000000000 +0100
++++ nbase/configure	2006-02-12 18:08:45.000000000 +0100
 @@ -9,6 +9,8 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
@@ -11,16 +11,7 @@ $NetBSD: patch-ad,v 1.10 2006/02/01 20:39:11 joerg Exp $
  # Be Bourne compatible
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
-@@ -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}" =
+@@ -7081,7 +7083,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -29,7 +20,7 @@ $NetBSD: patch-ad,v 1.10 2006/02/01 20:39:11 joerg Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7144,7 +7146,7 @@ if test $ac_cv_lib_ssl_SSL_new = yes; th
+@@ -7144,7 +7146,7 @@
  #define HAVE_LIBSSL 1
  _ACEOF
  
diff --git a/net/nmap/patches/patch-af b/net/nmap/patches/patch-af
index d2d2af5089d..e3052491f56 100644
--- a/net/nmap/patches/patch-af
+++ b/net/nmap/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.5 2006/02/01 20:39:11 joerg Exp $
+$NetBSD: patch-af,v 1.6 2006/02/12 17:24:23 salo Exp $
 
---- nmapfe/configure.orig	2005-12-30 04:18:16.000000000 +0000
-+++ nmapfe/configure
+--- nmapfe/configure.orig	2006-02-03 03:05:13.000000000 +0100
++++ nmapfe/configure	2006-02-12 18:09:56.000000000 +0100
 @@ -9,6 +9,8 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
@@ -11,12 +11,3 @@ $NetBSD: patch-af,v 1.5 2006/02/01 20:39:11 joerg 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
deleted file mode 100644
index bedd38bf127..00000000000
--- a/net/nmap/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$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"   | \