Update to version 4.11

- bite the bullet and use GNU make, it's increasingly annoying to try
  avoiding it

Changes:

- Added a dozens of more detailed SSH version detection signatures,
  thanks to a SSH huge survey and integration effort by Doug Hoyte.
  The results of his large-scale SSH scan are posted at
   http://seclists.org/nmap-dev/2006/Apr-Jun/0393.html .

- Fixed the Nmap Makefile (actually Makefile.in) to correctly handle
  include file dependencies.  So if a .h file is changed, all of the
  .cc files which depend on it will be recompiled.  Thanks to Diman
  Todorov (diman(a)xover.mud.at) for the patch.

- Fixed a compilation problem on solaris and possibly other platforms.
  The error message looked like "No rule to make target `inet_aton.o',
  needed by `libnbase.a'".  Thanks to Matt Selsky
  (selsky(a)columbia.edu) for the patch.

  Fixes PR pkg/33806 from Gilles Dauphin.

- Applied a patch which helps with HP-UX compilation by linking in the
  nm library (-lnm).  Thanks to Zakharov Mikhail (zmey20000(a)yahoo.com)
  for the patch.

- Added version detection probes for detecting the Nessus daemon.
  Thanks to Adam Vartanian (flooey(a)gmail.com) for sending the patch.

6 files changed, 15 insertions, 112 deletions

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 14a66fdea38..5bcf9fdd0c5 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2006/06/15 15:24:23 salo Exp $
+# $NetBSD: Makefile,v 1.52 2006/06/25 14:29:14 salo Exp $
 #
 
-DISTNAME=	nmap-4.10
+DISTNAME=	nmap-4.11
 CATEGORIES=	net security
 MASTER_SITES=	http://www.insecure.org/nmap/dist/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,9 +12,10 @@ COMMENT=	Network/port scanner with OS detection
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
+USE_TOOLS+=		gmake
 
 LIBTOOL_OVERRIDE+=	libdnet-stripped/libtool
 
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index cc5f20de2be..021dc90bf3e 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.32 2006/06/15 15:24:23 salo Exp $
+$NetBSD: distinfo,v 1.33 2006/06/25 14:29:14 salo Exp $
 
-SHA1 (nmap-4.10.tar.bz2) = ee63328b3ff02dd75bf3e98a8506ccfdaeeb623b
-RMD160 (nmap-4.10.tar.bz2) = 1d64699b0e42cf38a6b666bf4585223ca87440c6
-Size (nmap-4.10.tar.bz2) = 2130202 bytes
-SHA1 (patch-aa) = 94785ba16d30b607df680d4a272a7bec67b32802
+SHA1 (nmap-4.11.tar.bz2) = 53c6ef07fd6b923a403a7af84bcca141df6c079a
+RMD160 (nmap-4.11.tar.bz2) = efd9d6f8f34c30fcc985a0705d17a04c709a280a
+Size (nmap-4.11.tar.bz2) = 2130457 bytes
+SHA1 (patch-aa) = f3834d896b11a93c46b44c272106adf25aa296df
 SHA1 (patch-ab) = ea3fc8ec22a6331a1c2dc512f1d166970beca6c3
-SHA1 (patch-ad) = d54793006dcd446cc973950c9d8a974cb37655d1
-SHA1 (patch-ae) = 9ef870f3961c38c85c558304595df31f2b9d92fd
-SHA1 (patch-af) = d8eeac10d6c8fc3351eca6dc3638168d8a458a16
 SHA1 (patch-ai) = f93dd35a9427f5619d3320955a1f7d132930ef66
diff --git a/net/nmap/patches/patch-aa b/net/nmap/patches/patch-aa
index 06349112a1f..284517e9176 100644
--- a/net/nmap/patches/patch-aa
+++ b/net/nmap/patches/patch-aa
@@ -1,57 +1,19 @@
-$NetBSD: patch-aa,v 1.18 2006/06/15 15:24:24 salo Exp $
+$NetBSD: patch-aa,v 1.19 2006/06/25 14:29:14 salo Exp $
 
---- Makefile.in.orig	2006-04-22 23:52:13.000000000 +0200
-+++ Makefile.in	2006-04-25 14:56:00.000000000 +0200
-@@ -1,4 +1,4 @@
--export NMAP_VERSION = 4.10
-+NMAP_VERSION = 4.10
- NMAP_NAME= Nmap
- NMAP_URL= http://www.insecure.org/nmap/
- NMAP_PLATFORM=@host@
-@@ -11,14 +11,14 @@
- nmapdatadir = @datadir@/nmap
- deskdir = $(prefix)/share/applications
- 
--export NBASEDIR=@NBASEDIR@
--export NSOCKDIR=@NSOCKDIR@
-+NBASEDIR=@NBASEDIR@
-+NSOCKDIR=@NSOCKDIR@
+--- Makefile.in.orig	2006-06-24 06:25:58.000000000 +0200
++++ Makefile.in	2006-06-25 16:05:21.000000000 +0200
+@@ -16,8 +16,8 @@
  CC = @CC@
  CXX = @CXX@
  CCOPT = 
 -LIBPCAPDIR = @libpcapdir@
 -LIBPCREDIR = @LIBPCREDIR@
--export LIBDNETDIR = @LIBDNETDIR@
 +#LIBPCAPDIR = @libpcapdir@
 +#LIBPCREDIR = @LIBPCREDIR@
-+LIBDNETDIR = @LIBDNETDIR@
+ export LIBDNETDIR = @LIBDNETDIR@
  DEFS = @DEFS@ -DNMAP_VERSION=\"$(NMAP_VERSION)\" -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
  # For mtrace debugging -- see MTRACE define in main.cc for instructions
- # Should only be enabled during debugging and not in any real release.
-@@ -35,7 +35,7 @@
- SHTOOL = ./shtool
- INSTALL = $(SHTOOL) install 
- MAKEDEPEND = @MAKEDEPEND@
--export RPMTDIR=$(HOME)/rpm
-+RPMTDIR=$(HOME)/rpm
- 
- # DESTDIR is used by some package maintainers to install Nmap under
- # its usual directory structure into a different tree.  See the 
-@@ -46,11 +46,11 @@
- TARGETNMAPFE=@TARGETNMAPFE@
- INSTALLNMAPFE=@INSTALLNMAPFE@
- 
--export SRCS = main.cc nmap.cc targets.cc tcpip.cc nmap_error.cc utils.cc idle_scan.cc osscan.cc output.cc scan_engine.cc timing.cc charpool.cc services.cc protocols.cc nmap_rpc.cc portlist.cc NmapOps.cc TargetGroup.cc Target.cc FingerPrintResults.cc service_scan.cc NmapOutputTable.cc MACLookup.cc nmap_tty.cc nmap_dns.cc @COMPAT_SRCS@
-+SRCS = main.cc nmap.cc targets.cc tcpip.cc nmap_error.cc utils.cc idle_scan.cc osscan.cc output.cc scan_engine.cc timing.cc charpool.cc services.cc protocols.cc nmap_rpc.cc portlist.cc NmapOps.cc TargetGroup.cc Target.cc FingerPrintResults.cc service_scan.cc NmapOutputTable.cc MACLookup.cc nmap_tty.cc nmap_dns.cc @COMPAT_SRCS@
- 
- OBJS = main.o nmap.o targets.o tcpip.o nmap_error.o utils.o idle_scan.o osscan.o output.o scan_engine.o timing.o charpool.o services.o protocols.o nmap_rpc.o portlist.o NmapOps.o TargetGroup.o Target.o FingerPrintResults.o service_scan.o NmapOutputTable.o MACLookup.o nmap_tty.o nmap_dns.o @COMPAT_OBJS@
- 
--export DEPS = nmap.h nmap_amigaos.h nmap_error.h targets.h idle_scan.h osscan.h output.h scan_engine.h timing.h tcpip.h utils.h global_structures.h charpool.h services.h protocols.h nmap_rpc.h portlist.h NmapOps.h TargetGroup.h Target.h FingerPrintResults.h service_scan.h NmapOutputTable.h MACLookup.h nmap_tty.h nmap_dns.h
-+DEPS = nmap.h nmap_amigaos.h nmap_error.h targets.h idle_scan.h osscan.h output.h scan_engine.h timing.h tcpip.h utils.h global_structures.h charpool.h services.h protocols.h nmap_rpc.h portlist.h NmapOps.h TargetGroup.h Target.h FingerPrintResults.h service_scan.h NmapOutputTable.h MACLookup.h nmap_tty.h nmap_dns.h
- 
- 
- # %.o : %.cc -- nope this is a GNU extension
-@@ -68,14 +68,14 @@
+@@ -67,14 +67,14 @@
  # all of the prerequisites (e.g. recursive makes and such)
  FORCE:
  
diff --git a/net/nmap/patches/patch-ad b/net/nmap/patches/patch-ad
deleted file mode 100644
index cf9d2058b18..00000000000
--- a/net/nmap/patches/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ad,v 1.11 2006/02/12 17:24:23 salo Exp $
-
---- 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.  ##
- ## --------------------- ##
- 
-+LIBS=
-+
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-@@ -7081,7 +7083,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lssl  $LIBS"
-+LIBS="-lssl -lcrypto $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -7144,7 +7146,7 @@
- #define HAVE_LIBSSL 1
- _ACEOF
- 
--  LIBS="-lssl $LIBS"
-+  LIBS="-lssl -lcrypto $LIBS"
- 
- else
-    use_openssl="no"
diff --git a/net/nmap/patches/patch-ae b/net/nmap/patches/patch-ae
deleted file mode 100644
index 5ea859a461a..00000000000
--- a/net/nmap/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2004/11/26 09:24:21 adam Exp $
-
---- nsock/src/configure.orig	2004-01-12 03:23:15.000000000 +0000
-+++ nsock/src/configure
-@@ -9,6 +9,8 @@
- ## M4sh Initialization.  ##
- ## --------------------- ##
- 
-+LIBS=
-+
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
diff --git a/net/nmap/patches/patch-af b/net/nmap/patches/patch-af
deleted file mode 100644
index e3052491f56..00000000000
--- a/net/nmap/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.6 2006/02/12 17:24:23 salo Exp $
-
---- 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.  ##
- ## --------------------- ##
- 
-+LIBS=
-+
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh