Update to 5.00

Fix for PR#41506
Fix missing @dirrm entries from PLIST*

Before we go into the detailed changes, here are the top 5 improvements in Nmap 5:
1. The new Ncat tool aims to be your Swiss Army Knife for data transfer, redirection, and debugging. We released a whole users' guide detailing security testing and network administration tasks made easy with Ncat.
2. The addition of the Ndiff scan comparison tool completes Nmap's growth into a whole suite of applications which work together to serve network administrators and security practitioners. Ndiff makes it easy to automatically scan your network daily and report on any changes (systems coming up or going down or changes to the software services they are running). The other two tools now packaged with Nmap itself are Ncat and the much improved Zenmap GUI and results viewer.
3. Nmap performance has improved dramatically. We spent last summer scanning much of the Internet and merging that data with internal enterprise scan logs to determine the most commonly open ports. This allows Nmap to scan fewer ports by default while finding more open ports. We also added a fixed-rate scan engine so you can bypass Nmap's congestion control algorithms and scan at exactly the rate (packets per second) you specify.
4. We released Nmap Network Scanning, the official Nmap guide to network discovery and security scanning. From explaining port scanning basics for novices to detailing low-level packet crafting methods used by advanced hackers, this book suits all levels of security and networking professionals. A 42-page reference guide documents every Nmap feature and option, while the rest of the book demonstrates how to apply those features to quickly solve real-world tasks. More than half the book is available in the free online edition.
5. The Nmap Scripting Engine (NSE) is one of Nmap's most powerful and flexible features. It allows users to write (and share) simple scripts to automate a wide variety of networking tasks. Those scripts are then executed in parallel with the speed and efficiency you expect from Nmap. All existing scripts have been improved, and 32 new ones added. New scripts include a whole bunch of MSRPC/NetBIOS attacks, queries, and vulnerability probes; open proxy detection; whois and AS number lookup queries; brute force attack scripts against the SNMP and POP3 protocols; and many more. All NSE scripts and modules are described in the new NSE documentation portal.

Details are here: http://nmap.org/changelog.html

8 files changed, 158 insertions, 134 deletions

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 57be71e3d7c..b01d40745bb 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.65 2009/04/01 08:00:44 apb Exp $
+# $NetBSD: Makefile,v 1.66 2009/07/20 19:40:08 adrianp Exp $
 #
 
-DISTNAME=	nmap-4.76
-PKGREVISION=	3
+DISTNAME=	nmap-5.00
 CATEGORIES=	net security
-MASTER_SITES=	http://download.insecure.org/nmap/dist/
+MASTER_SITES=	http://nmap.org/dist/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adrianp@NetBSD.org
@@ -52,6 +51,12 @@ pre-build:
 	${ECHO} "# ignored" > ${WRKSRC}/makefile.dep
 .endif
 
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	post-patch
+SUBST_FILES.paths=	ndiff/setup.py
+SUBST_SED.paths=        -e "s|@@PKGMANDIR@@|${PKGMANDIR}|g"
+SUBST_MESSAGE.paths=	Fixing paths.
+
 post-build:
 	${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
 
diff --git a/net/nmap/PLIST b/net/nmap/PLIST
index 35e407ca4f7..c985b17a670 100644
--- a/net/nmap/PLIST
+++ b/net/nmap/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:09:36 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/07/20 19:40:08 adrianp Exp $
+bin/ncat
 bin/nmap
+man/man1/ncat.1
 man/man1/nmap.1
+share/ncat/ca-bundle.crt
 share/nmap/nmap-mac-prefixes
 share/nmap/nmap-os-db
 share/nmap/nmap-protocols
@@ -9,104 +12,95 @@ share/nmap/nmap-service-probes
 share/nmap/nmap-services
 share/nmap/nmap.dtd
 share/nmap/nmap.xsl
+share/nmap/nse_main.lua
+share/nmap/nselib/base64.lua
+share/nmap/nselib/comm.lua
 share/nmap/nselib/datafiles.lua
+share/nmap/nselib/dns.lua
 share/nmap/nselib/http.lua
+share/nmap/nselib/imap.lua
 share/nmap/nselib/ipOps.lua
 share/nmap/nselib/listop.lua
 share/nmap/nselib/match.lua
+share/nmap/nselib/msrpc.lua
+share/nmap/nselib/msrpcperformance.lua
+share/nmap/nselib/msrpctypes.lua
+share/nmap/nselib/netbios.lua
+share/nmap/nselib/nsedebug.lua
 share/nmap/nselib/packet.lua
+share/nmap/nselib/pop3.lua
 share/nmap/nselib/shortport.lua
+share/nmap/nselib/smb.lua
+share/nmap/nselib/smbauth.lua
+share/nmap/nselib/snmp.lua
+share/nmap/nselib/ssh1.lua
+share/nmap/nselib/ssh2.lua
 share/nmap/nselib/stdnse.lua
 share/nmap/nselib/strbuf.lua
 share/nmap/nselib/tab.lua
-share/nmap/nselib/url.lua
-share/nmap/scripts/HTTPAuth.nse
-share/nmap/scripts/HTTP_open_proxy.nse
-share/nmap/scripts/HTTPpasswd.nse
-share/nmap/scripts/HTTPtrace.nse
-share/nmap/scripts/MSSQLm.nse
-share/nmap/scripts/MySQLinfo.nse
-share/nmap/scripts/PPTPversion.nse
-share/nmap/scripts/RealVNC_auth_bypass.nse
-share/nmap/nselib/stdnse.lua
-share/nmap/nselib/strbuf.lua
-share/nmap/nselib/tab.lua
-share/nmap/nselib/url.lua
-share/nmap/nselib/base64.lua
-share/nmap/nselib/comm.lua
-share/nmap/nselib/dns.lua
-share/nmap/nselib/pop3.lua
-share/nmap/nselib/snmp.lua
 share/nmap/nselib/unpwdb.lua
-share/nmap/scripts/ASN.nse
-share/nmap/scripts/SNMPcommunitybrute.nse
-share/nmap/scripts/brutePOP3.nse
-share/nmap/scripts/dns-safe-recursion-port.nse
-share/nmap/scripts/dns-safe-recursion-txid.nse
-share/nmap/scripts/popcapa.nse
-share/nmap/scripts/whois.nse
-share/nmap/scripts/HTTPAuth.nse
-share/nmap/scripts/HTTP_open_proxy.nse
-share/nmap/scripts/HTTPpasswd.nse
-share/nmap/scripts/HTTPtrace.nse
-share/nmap/scripts/MSSQLm.nse
-share/nmap/scripts/MySQLinfo.nse
-share/nmap/scripts/PPTPversion.nse
-share/nmap/scripts/RealVNC_auth_bypass.nse
-share/nmap/scripts/SMTP_openrelay_test.nse
-share/nmap/scripts/SMTPcommands.nse
-share/nmap/scripts/SQLInject.nse
-share/nmap/scripts/SSHv1-support.nse
-share/nmap/scripts/SSLv2-support.nse
-share/nmap/scripts/UPnP-info.nse
-share/nmap/scripts/anonFTP.nse
-share/nmap/scripts/bruteTelnet.nse
-share/nmap/scripts/chargenTest.nse
-share/nmap/scripts/daytimeTest.nse
-share/nmap/scripts/dns-test-open-recursion.nse
-share/nmap/scripts/SMTP_openrelay_test.nse
-share/nmap/scripts/SMTPcommands.nse
-share/nmap/scripts/SNMPsysdescr.nse
-share/nmap/scripts/SQLInject.nse
-share/nmap/scripts/SSHv1-support.nse
-share/nmap/scripts/SSLv2-support.nse
-share/nmap/scripts/UPnP-info.nse
-share/nmap/scripts/anonFTP.nse
-share/nmap/scripts/bruteTelnet.nse
-share/nmap/scripts/chargenTest.nse
-share/nmap/scripts/daytimeTest.nse
-share/nmap/scripts/dns-test-open-recursion.nse
-share/nmap/scripts/echoTest.nse
-share/nmap/scripts/finger.nse
-share/nmap/scripts/ftpbounce.nse
-share/nmap/scripts/iax2Detect.nse
-share/nmap/scripts/ircServerInfo.nse
-share/nmap/scripts/ircZombieTest.nse
-share/nmap/scripts/nbstat.nse
-share/nmap/scripts/netbios-smb-os-discovery.nse
-share/nmap/scripts/promiscuous.nse
-share/nmap/scripts/ripeQuery.nse
-share/nmap/scripts/robots.nse
-share/nmap/scripts/rpcinfo.nse
-share/nmap/scripts/echoTest.nse
+share/nmap/nselib/url.lua
+share/nmap/scripts/asn-query.nse
+share/nmap/scripts/auth-owners.nse
+share/nmap/scripts/auth-spoof.nse
+share/nmap/scripts/banner.nse
+share/nmap/scripts/daytime.nse
+share/nmap/scripts/dns-random-srcport.nse
+share/nmap/scripts/dns-random-txid.nse
+share/nmap/scripts/dns-recursion.nse
+share/nmap/scripts/dns-zone-transfer.nse
 share/nmap/scripts/finger.nse
-share/nmap/scripts/ftpbounce.nse
-share/nmap/scripts/iax2Detect.nse
-share/nmap/scripts/ircServerInfo.nse
-share/nmap/scripts/ircZombieTest.nse
+share/nmap/scripts/ftp-anon.nse
+share/nmap/scripts/ftp-bounce.nse
+share/nmap/scripts/ftp-brute.nse
+share/nmap/scripts/html-title.nse
+share/nmap/scripts/http-auth.nse
+share/nmap/scripts/http-iis-webdav-vuln.nse
+share/nmap/scripts/http-open-proxy.nse
+share/nmap/scripts/http-passwd.nse
+share/nmap/scripts/http-trace.nse
+share/nmap/scripts/iax2-version.nse
+share/nmap/scripts/imap-capabilities.nse
+share/nmap/scripts/irc-info.nse
+share/nmap/scripts/ms-sql-info.nse
+share/nmap/scripts/mysql-info.nse
 share/nmap/scripts/nbstat.nse
-share/nmap/scripts/netbios-smb-os-discovery.nse
-share/nmap/scripts/promiscuous.nse
-share/nmap/scripts/ripeQuery.nse
-share/nmap/scripts/robots.nse
+share/nmap/scripts/p2p-conficker.nse
+share/nmap/scripts/pop3-brute.nse
+share/nmap/scripts/pop3-capabilities.nse
+share/nmap/scripts/pptp-version.nse
+share/nmap/scripts/realvnc-auth-bypass.nse
+share/nmap/scripts/robots.txt.nse
 share/nmap/scripts/rpcinfo.nse
 share/nmap/scripts/script.db
-share/nmap/scripts/showHTMLTitle.nse
-share/nmap/scripts/showHTTPVersion.nse
-share/nmap/scripts/showOwner.nse
-share/nmap/scripts/showSMTPVersion.nse
-share/nmap/scripts/showSSHVersion.nse
-share/nmap/scripts/skype_v2-version.nse
-share/nmap/scripts/strangeSMTPport.nse
-share/nmap/scripts/xamppDefaultPass.nse
-share/nmap/scripts/zoneTrans.nse
+share/nmap/scripts/skypev2-version.nse
+share/nmap/scripts/smb-brute.nse
+share/nmap/scripts/smb-check-vulns.nse
+share/nmap/scripts/smb-enum-domains.nse
+share/nmap/scripts/smb-enum-processes.nse
+share/nmap/scripts/smb-enum-sessions.nse
+share/nmap/scripts/smb-enum-shares.nse
+share/nmap/scripts/smb-enum-users.nse
+share/nmap/scripts/smb-os-discovery.nse
+share/nmap/scripts/smb-pwdump.nse
+share/nmap/scripts/smb-security-mode.nse
+share/nmap/scripts/smb-server-stats.nse
+share/nmap/scripts/smb-system-info.nse
+share/nmap/scripts/smtp-commands.nse
+share/nmap/scripts/smtp-open-relay.nse
+share/nmap/scripts/smtp-strangeport.nse
+share/nmap/scripts/sniffer-detect.nse
+share/nmap/scripts/snmp-brute.nse
+share/nmap/scripts/snmp-sysdescr.nse
+share/nmap/scripts/socks-open-proxy.nse
+share/nmap/scripts/sql-injection.nse
+share/nmap/scripts/ssh-hostkey.nse
+share/nmap/scripts/sshv1.nse
+share/nmap/scripts/sslv2.nse
+share/nmap/scripts/telnet-brute.nse
+share/nmap/scripts/upnp-info.nse
+share/nmap/scripts/whois.nse
+@dirrm share/nmap/nselib
+@dirrm share/nmap/scripts
+@dirrm share/nmap
+@dirrm share/ncat
diff --git a/net/nmap/PLIST.zenmap b/net/nmap/PLIST.zenmap
index 65a88199076..fe8fbd2c795 100644
--- a/net/nmap/PLIST.zenmap
+++ b/net/nmap/PLIST.zenmap
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST.zenmap,v 1.4 2009/07/20 19:40:08 adrianp Exp $
 bin/nmapfe
 bin/uninstall_zenmap
 bin/xnmap
@@ -52,6 +53,8 @@ ${PYSITELIB}/radialnet/gui/NodeWindow.py
 ${PYSITELIB}/radialnet/gui/NodeWindow.pyc
 ${PYSITELIB}/radialnet/gui/RadialNet.py
 ${PYSITELIB}/radialnet/gui/RadialNet.pyc
+${PYSITELIB}/radialnet/gui/SaveDialog.py
+${PYSITELIB}/radialnet/gui/SaveDialog.pyc
 ${PYSITELIB}/radialnet/gui/Toolbar.py
 ${PYSITELIB}/radialnet/gui/Toolbar.pyc
 ${PYSITELIB}/radialnet/gui/__init__.py
@@ -72,8 +75,6 @@ ${PYSITELIB}/zenmapCore/BugRegister.py
 ${PYSITELIB}/zenmapCore/BugRegister.pyc
 ${PYSITELIB}/zenmapCore/Diff.py
 ${PYSITELIB}/zenmapCore/Diff.pyc
-${PYSITELIB}/zenmapCore/DiffHtml.py
-${PYSITELIB}/zenmapCore/DiffHtml.pyc
 ${PYSITELIB}/zenmapCore/I18N.py
 ${PYSITELIB}/zenmapCore/I18N.pyc
 ${PYSITELIB}/zenmapCore/Name.py
@@ -164,8 +165,6 @@ ${PYSITELIB}/zenmapGUI/TargetCombo.py
 ${PYSITELIB}/zenmapGUI/TargetCombo.pyc
 ${PYSITELIB}/zenmapGUI/TopologyPage.py
 ${PYSITELIB}/zenmapGUI/TopologyPage.pyc
-${PYSITELIB}/zenmapGUI/Wizard.py
-${PYSITELIB}/zenmapGUI/Wizard.pyc
 ${PYSITELIB}/zenmapGUI/__init__.py
 ${PYSITELIB}/zenmapGUI/__init__.pyc
 ${PYSITELIB}/zenmapGUI/higwidgets/__init__.py
@@ -211,70 +210,75 @@ share/zenmap/config/scan_profile.usp
 share/zenmap/config/zenmap.conf
 share/zenmap/config/zenmap_version
 share/zenmap/docs/help.html
-share/zenmap/locale/pt_BR/LC_MESSAGES/umit.mo
-share/zenmap/misc/options.xml
+share/zenmap/locale/de/LC_MESSAGES/zenmap.mo
+share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo
+share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo
+share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo
 share/zenmap/misc/profile_editor.xml
-share/zenmap/misc/wizard.xml
-share/zenmap/pixmaps/default.svg
 share/zenmap/pixmaps/default_32.png
 share/zenmap/pixmaps/default_75.png
-share/zenmap/pixmaps/freebsd.svg
 share/zenmap/pixmaps/freebsd_32.png
 share/zenmap/pixmaps/freebsd_75.png
-share/zenmap/pixmaps/irix.svg
 share/zenmap/pixmaps/irix_32.png
 share/zenmap/pixmaps/irix_75.png
-share/zenmap/pixmaps/linux.svg
 share/zenmap/pixmaps/linux_32.png
 share/zenmap/pixmaps/linux_75.png
-share/zenmap/pixmaps/macosx.svg
 share/zenmap/pixmaps/macosx_32.png
 share/zenmap/pixmaps/macosx_75.png
-share/zenmap/pixmaps/openbsd.svg
 share/zenmap/pixmaps/openbsd_32.png
 share/zenmap/pixmaps/openbsd_75.png
 share/zenmap/pixmaps/radialnet/border.png
-share/zenmap/pixmaps/radialnet/close.png
-share/zenmap/pixmaps/radialnet/collapse.png
-share/zenmap/pixmaps/radialnet/expand.png
 share/zenmap/pixmaps/radialnet/firewall.png
 share/zenmap/pixmaps/radialnet/logo.png
-share/zenmap/pixmaps/radialnet/logo.svg
 share/zenmap/pixmaps/radialnet/padlock.png
 share/zenmap/pixmaps/radialnet/router.png
 share/zenmap/pixmaps/radialnet/switch.png
 share/zenmap/pixmaps/radialnet/wireless.png
-share/zenmap/pixmaps/redhat.svg
 share/zenmap/pixmaps/redhat_32.png
 share/zenmap/pixmaps/redhat_75.png
-share/zenmap/pixmaps/solaris.svg
 share/zenmap/pixmaps/solaris_32.png
 share/zenmap/pixmaps/solaris_75.png
 share/zenmap/pixmaps/splash.png
-share/zenmap/pixmaps/ubuntu.svg
+share/zenmap/pixmaps/throbber.gif
+share/zenmap/pixmaps/throbber.png
 share/zenmap/pixmaps/ubuntu_32.png
 share/zenmap/pixmaps/ubuntu_75.png
-share/zenmap/pixmaps/unknown.svg
 share/zenmap/pixmaps/unknown_32.png
 share/zenmap/pixmaps/unknown_75.png
-share/zenmap/pixmaps/vl_1.svg
 share/zenmap/pixmaps/vl_1_32.png
 share/zenmap/pixmaps/vl_1_75.png
-share/zenmap/pixmaps/vl_2.svg
 share/zenmap/pixmaps/vl_2_32.png
 share/zenmap/pixmaps/vl_2_75.png
-share/zenmap/pixmaps/vl_3.svg
 share/zenmap/pixmaps/vl_3_32.png
 share/zenmap/pixmaps/vl_3_75.png
-share/zenmap/pixmaps/vl_4.svg
 share/zenmap/pixmaps/vl_4_32.png
 share/zenmap/pixmaps/vl_4_75.png
-share/zenmap/pixmaps/vl_5.svg
 share/zenmap/pixmaps/vl_5_32.png
 share/zenmap/pixmaps/vl_5_75.png
-share/zenmap/pixmaps/win.svg
 share/zenmap/pixmaps/win_32.png
 share/zenmap/pixmaps/win_75.png
-share/zenmap/pixmaps/wizard_logo.png
 share/zenmap/pixmaps/zenmap.png
 share/zenmap/su-to-zenmap.sh
+@dirrm ${PYSITELIB}/radialnet/bestwidgets
+@dirrm ${PYSITELIB}/radialnet/core
+@dirrm ${PYSITELIB}/radialnet/gui
+@dirrm ${PYSITELIB}/radialnet/util
+@dirrm ${PYSITELIB}/radialnet
+@dirrm ${PYSITELIB}/zenmapCore
+@dirrm ${PYSITELIB}/zenmapGUI/higwidgets
+@dirrm ${PYSITELIB}/zenmapGUI
+@dirrm share/zenmap/config
+@dirrm share/zenmap/locale/de/LC_MESSAGES
+@dirrm share/zenmap/locale/fr/LC_MESSAGES
+@dirrm share/zenmap/locale/hr/LC_MESSAGES
+@dirrm share/zenmap/locale/pt_BR/LC_MESSAGES
+@dirrm share/zenmap/locale/de
+@dirrm share/zenmap/locale/fr
+@dirrm share/zenmap/locale/hr
+@dirrm share/zenmap/locale/pt_BR
+@dirrm share/zenmap/locale
+@dirrm share/zenmap/docs
+@dirrm share/zenmap/misc
+@dirrm share/zenmap/pixmaps/radialnet
+@dirrm share/zenmap/pixmaps
+@dirrm share/zenmap
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 351c79c8caa..97083e79785 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.39 2009/04/01 07:56:18 apb Exp $
+$NetBSD: distinfo,v 1.40 2009/07/20 19:40:08 adrianp Exp $
 
-SHA1 (nmap-4.76.tar.bz2) = a71141738b4512b6d5b35ef94258e525df30a586
-RMD160 (nmap-4.76.tar.bz2) = ec93522e05e7233e8950b28ab12b45355e63c0c7
-Size (nmap-4.76.tar.bz2) = 6061317 bytes
-SHA1 (patch-aa) = b47bb158aa9504e7bc0f3092e3370d49a82ec608
+SHA1 (nmap-5.00.tar.bz2) = 3e7557f7fd52ccf8f052042fe1412ba0c964dee8
+RMD160 (nmap-5.00.tar.bz2) = 429fff5e436826978426bd800698de8e0d78b662
+Size (nmap-5.00.tar.bz2) = 9068342 bytes
+SHA1 (patch-aa) = 61593e0479a79bcb4cce2e88b2e5753fa14bc429
 SHA1 (patch-ab) = bef6a0bc8481702319d14d3427169562f13e1526
+SHA1 (patch-ac) = c22e8f6411b1152a6e7582c90e5ec5bd4c6acaad
 SHA1 (patch-ad) = 767ace3bb0c94db80ce3352692358b63463f4e30
-SHA1 (patch-aj) = 5e306f51f5e0a07eb05d498547f95b526ffbdfc7
+SHA1 (patch-aj) = 868440ce24a70c1a747af6d65eed24f20c4bb892
diff --git a/net/nmap/options.mk b/net/nmap/options.mk
index 102a397eac0..91b48a288f9 100644
--- a/net/nmap/options.mk
+++ b/net/nmap/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2009/01/15 20:28:31 shattered Exp $
+# $NetBSD: options.mk,v 1.3 2009/07/20 19:40:08 adrianp Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nmap
 
-PKG_SUPPORTED_OPTIONS=	zenmap inet6
+PKG_SUPPORTED_OPTIONS=	zenmap inet6 ndiff
 
 .include "../../mk/bsd.options.mk"
 
@@ -26,6 +26,15 @@ PY_PATCHPLIST=			yes
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../databases/py-sqlite2/buildlink3.mk"
 .include "../../textproc/py-xml/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .else
 CONFIGURE_ARGS+=	--without-zenmap
 .endif
+
+.if !empty(PKG_OPTIONS:Mndiff)
+CONFIGURE_ARGS+=		--with-ndiff
+PLIST_SRC+=			${PKGDIR}/PLIST.ndiff
+PYTHON_VERSIONS_ACCEPTED=	25 24
+.else
+CONFIGURE_ARGS+=		--without-ndiff
+.endif
diff --git a/net/nmap/patches/patch-aa b/net/nmap/patches/patch-aa
index 62362808175..d272498b43b 100644
--- a/net/nmap/patches/patch-aa
+++ b/net/nmap/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.22 2009/01/04 15:16:11 adrianp Exp $
+$NetBSD: patch-aa,v 1.23 2009/07/20 19:40:08 adrianp Exp $
 
---- Makefile.in.orig	2008-09-05 06:32:06.000000000 +0100
+--- Makefile.in.orig	2009-06-24 22:35:54.000000000 +0100
 +++ Makefile.in
 @@ -24,8 +24,8 @@ CXX = @CXX@
  CCOPT = 
@@ -12,8 +12,8 @@ $NetBSD: patch-aa,v 1.22 2009/01/04 15:16:11 adrianp Exp $
 +#LIBPCREDIR = @LIBPCREDIR@
  export LIBDNETDIR = @LIBDNETDIR@
  ZENMAPDIR = zenmap
- PYTHON = @PYTHON@
-@@ -82,14 +82,14 @@ $(TARGET): @LUA_DEPENDS@ @PCAP_DEPENDS@ 
+ NDIFFDIR = ndiff
+@@ -95,14 +95,14 @@ $(TARGET): @LUA_DEPENDS@ @PCAP_DEPENDS@ 
  	rm -f $@
  	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
  
diff --git a/net/nmap/patches/patch-ac b/net/nmap/patches/patch-ac
new file mode 100644
index 00000000000..094b7adaa79
--- /dev/null
+++ b/net/nmap/patches/patch-ac
@@ -0,0 +1,11 @@
+$NetBSD: patch-ac,v 1.7 2009/07/20 19:40:08 adrianp Exp $
+
+--- ndiff/setup.py.orig	2009-06-24 22:35:54.000000000 +0100
++++ ndiff/setup.py
+@@ -29,5 +29,5 @@ class checked_install(distutils.command.
+                 + "Installing your distribution's python-dev package may solve this problem.")
+ 
+ distutils.core.setup(name = u"ndiff", scripts = [u"ndiff"],
+-    data_files = [(u"share/man/man1", [u"docs/ndiff.1"])],
++    data_files = [(u"@@PKGMANDIR@@/man1", [u"docs/ndiff.1"])],
+     cmdclass = {"install_egg_info": null_command, "install": checked_install})
diff --git a/net/nmap/patches/patch-aj b/net/nmap/patches/patch-aj
index cceb6380c4d..3a6c889aed9 100644
--- a/net/nmap/patches/patch-aj
+++ b/net/nmap/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.2 2009/01/04 15:16:11 adrianp Exp $
+$NetBSD: patch-aj,v 1.3 2009/07/20 19:40:08 adrianp Exp $
 
---- libdnet-stripped/include/dnet/os.h.orig	2008-08-29 21:23:56.000000000 +0100
+--- libdnet-stripped/include/dnet/os.h.orig	2009-06-24 22:35:54.000000000 +0100
 +++ libdnet-stripped/include/dnet/os.h
 @@ -115,7 +115,7 @@
  # ifdef __GNUC__
@@ -10,4 +10,4 @@ $NetBSD: patch-aj,v 1.2 2009/01/04 15:16:11 adrianp Exp $
 +#  if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && !defined(__SUNPRO_C)
  #   define __flexarr	[]
  #  elif defined(_WIN32)
- /* MS VC++ */
+ /* MS VC++ -- using [] works but gives a "nonstandard extension" warning */