From the release announcement on http://nmap.org:

"The Nmap Project is pleased to announce the immediate, free availability
 of the Nmap Security Scanner version 6.00 from http://nmap.org/.
 It is the product of almost three years of work, 3,924 code commits,
 and more than a dozen point releases since the big Nmap 5 release in July
 2009. Nmap 6 includes a more powerful Nmap Scripting Engine, 289 new scripts,
 better web scanning, full IPv6 support, the Nping packet prober, faster scans,  and much more! We recommend that all current users upgrade."

Here is a condensed Changelog:

Nmap 6.01 [2012-06-13]

o [Zenmap] Fixed a hang that would occur on Mac OS X 10.7.

o [Zenmap] Fixed a crash that happened when activating the host filter.

o Fixed a bug that caused Nmap to fail to find any network interface when
  at least one of them is in the monitor mode.
  http://seclists.org/nmap-dev/2012/q2/449
  http://seclists.org/nmap-dev/2012/q2/478

o Fixed the greppable output of hosts that time-out.

Nmap 6.00 [2012-05-21]

o Most important release since Nmap 5.00 in July 2009! For a list of
  the most significant improvements and new features, see the
  announcement at: http://nmap.org/6

o Some XML output improvements...

o Lots of NSE scripts added and updated...

o Fixed the routing table loop on OS X so that on-link routes appear.

o Upgraded included libpcap to version 1.2.1.

o Fixed a compilation problem on Solaris 9 caused by a missing
  definition of IPV6_V6ONLY.

o Setting --min-parallelism by itself no longer forces the maximum
  parallelism to the same value.

o [Zenmap] Fixed a crash that would happen in the profile editor when
  the script.db file doesn't exist.

o [Zenmap] It is now possible to compare scans having the same name or
  command line parameters.

o Fixed an error that could occur with ICMPv6 probes and -d4 debugging:
  "Unexpected probespec2ascii type encountered"

o Applied a workaround to make pcap captures work better on Solaris 10.

o Fixed a bug that could cause Nsock timers to fire too early.

o Changed the way timeout calculations are made in the IPv6 OS engine.

Nmap 5.61TEST5 [2012-03-09]

o Integrated all of your IPv4 OS fingerprint submissions since June
  2011 (about 1,900 of them).  Added about 256 new fingerprints (and
  deleted some bogus ones), bringing the new total to 3,572.
  Additions include Apple iOS 5.01, OpenBSD 4.9 and 5.0, FreeBSD 7.0
  through 9.0-PRERELEASE, and a ton of new WAPs, routers, and other
  devices. Many existing fingerprints were improved. For more details,
  see http://seclists.org/nmap-dev/2012/q1/431

o Integrated all of your service/version detection fingerprints
  submitted since November 2010--more than 2,500 of them!  Our
  signature count increased more than 10% to 7,423 covering 862
  protocols. Some amusing and bizarre new services are described at
  http://seclists.org/nmap-dev/2012/q1/359

o Integrated your latest IPv6 OS submissions and corrections. We're
  still low on IPv6 fingerprints, so please scan any IPv6 systems you
  own or administer and submit them to http://nmap.org/submit/.  Both
  new fingerprints (if Nmap doesn't find a good match) and corrections
  (if Nmap guesses wrong) are useful.

o IPv6 OS detection now includes a novelty detection system which
  avoids printing a match when an observed fingerprint is too
  different from fingerprints seen before. As the OS database is still
  small, this helps to avoid making (essentially) wild guesses when
  seeing a new operating system.

o Refactored the nsock library to add the nsock-engines system.

o [NSE] Added 43(!) NSE scripts, bringing the total up to 340.

o CPE (Common Platform Enumeration) OS classification is now supported
  for IPv6 OS detection.

[...]

Nmap 5.61TEST4 [2012-01-02] -> Nmap 5.61TEST1

[...]

Lots of Bugfixes!

Thanks to jschauma@ for analysing a NetBSD related problem,
and to David Fifield for providing the (upstream) patch.

8 files changed, 250 insertions, 81 deletions

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 52b8a290461..efd34c8cc5d 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.92 2012/09/15 10:06:06 obache Exp $
+# $NetBSD: Makefile,v 1.93 2012/09/16 20:29:06 pettai Exp $
 
-DISTNAME=	nmap-5.51.6
-PKGREVISION=	6
+DISTNAME=	nmap-6.01
 CATEGORIES=	net security
 MASTER_SITES=	http://nmap.org/dist/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +10,7 @@ HOMEPAGE=	http://insecure.org/nmap/
 COMMENT=	Network/port scanner with OS detection
 LICENSE=	gnu-gpl-v2
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
+#PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=1.0.0
@@ -31,8 +30,11 @@ BUILD_DEFS+=		IPV6_READY
 
 CHECK_INTERPRETER_SKIP=	bin/uninstall_zenmap
 CHECK_INTERPRETER_SKIP+=	share/zenmap/su-to-zenmap.sh
+CHECK_INTERPRETER_SKIP+=	share/nmap/nselib/data/oracle-default-accounts.lst
 CHECK_INTERPRETER_SKIP+=	share/nmap/nselib/data/oracle-sids
 CHECK_INTERPRETER_SKIP+=	share/nmap/nselib/data/passwords.lst
+CHECK_INTERPRETER_SKIP+=	share/nmap/nselib/data/rtsp-urls.txt
+CHECK_INTERPRETER_SKIP+=	share/nmap/nselib/data/snmpcommunities.lst
 
 CONFIGURE_ARGS+=	--with-libpcap=${BUILDLINK_PREFIX.libpcap}
 CONFIGURE_ARGS+=	--with-libpcre=${BUILDLINK_PREFIX.pcre}
diff --git a/net/nmap/PLIST b/net/nmap/PLIST
index fb7dae04165..762c7e5183f 100644
--- a/net/nmap/PLIST
+++ b/net/nmap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2011/11/22 12:18:07 pettai Exp $
+@comment $NetBSD: PLIST,v 1.16 2012/09/16 20:29:06 pettai Exp $
 bin/ncat
 bin/nmap
 bin/nping
@@ -31,15 +31,24 @@ share/nmap/nmap.dtd
 share/nmap/nmap.xsl
 share/nmap/nse_main.lua
 share/nmap/nselib/afp.lua
+share/nmap/nselib/amqp.lua
 share/nmap/nselib/asn1.lua
 share/nmap/nselib/base64.lua
+share/nmap/nselib/bitcoin.lua
+share/nmap/nselib/bittorrent.lua
 share/nmap/nselib/brute.lua
 share/nmap/nselib/citrixxml.lua
 share/nmap/nselib/comm.lua
+share/nmap/nselib/creds.lua
+share/nmap/nselib/cvs.lua
 share/nmap/nselib/data/favicon-db
+share/nmap/nselib/data/http-default-accounts-fingerprints.lua
 share/nmap/nselib/data/http-fingerprints.lua
 share/nmap/nselib/data/http-folders.txt
+share/nmap/nselib/data/mysql-cis.audit
+share/nmap/nselib/data/oracle-default-accounts.lst
 share/nmap/nselib/data/oracle-sids
+share/nmap/nselib/data/packetdecoders.lua
 share/nmap/nselib/data/passwords.lst
 share/nmap/nselib/data/psexec/README
 share/nmap/nselib/data/psexec/backdoor.lua
@@ -51,15 +60,26 @@ share/nmap/nselib/data/psexec/network.lua
 share/nmap/nselib/data/psexec/nmap_service.c
 share/nmap/nselib/data/psexec/nmap_service.vcproj
 share/nmap/nselib/data/psexec/pwdump.lua
+share/nmap/nselib/data/rtsp-urls.txt
+share/nmap/nselib/data/snmpcommunities.lst
+share/nmap/nselib/data/ssl-ciphers
+share/nmap/nselib/data/ssl-fingerprints
+share/nmap/nselib/data/tftplist.txt
 share/nmap/nselib/data/usernames.lst
+share/nmap/nselib/data/wp-plugins.lst
 share/nmap/nselib/datafiles.lua
 share/nmap/nselib/dhcp.lua
+share/nmap/nselib/dhcp6.lua
 share/nmap/nselib/dns.lua
+share/nmap/nselib/dnsbl.lua
 share/nmap/nselib/dnssd.lua
 share/nmap/nselib/drda.lua
+share/nmap/nselib/eap.lua
 share/nmap/nselib/ftp.lua
 share/nmap/nselib/giop.lua
 share/nmap/nselib/http.lua
+share/nmap/nselib/httpspider.lua
+share/nmap/nselib/iax2.lua
 share/nmap/nselib/imap.lua
 share/nmap/nselib/informix.lua
 share/nmap/nselib/ipOps.lua
@@ -68,51 +88,104 @@ share/nmap/nselib/json.lua
 share/nmap/nselib/ldap.lua
 share/nmap/nselib/listop.lua
 share/nmap/nselib/match.lua
+share/nmap/nselib/membase.lua
 share/nmap/nselib/mongodb.lua
 share/nmap/nselib/msrpc.lua
 share/nmap/nselib/msrpcperformance.lua
 share/nmap/nselib/msrpctypes.lua
 share/nmap/nselib/mssql.lua
 share/nmap/nselib/mysql.lua
+share/nmap/nselib/natpmp.lua
+share/nmap/nselib/ncp.lua
+share/nmap/nselib/ndmp.lua
 share/nmap/nselib/netbios.lua
 share/nmap/nselib/nrpc.lua
 share/nmap/nselib/nsedebug.lua
+share/nmap/nselib/omp2.lua
 share/nmap/nselib/packet.lua
 share/nmap/nselib/pgsql.lua
 share/nmap/nselib/pop3.lua
+share/nmap/nselib/pppoe.lua
 share/nmap/nselib/proxy.lua
+share/nmap/nselib/redis.lua
 share/nmap/nselib/rmi.lua
 share/nmap/nselib/rpc.lua
+share/nmap/nselib/rpcap.lua
+share/nmap/nselib/rsync.lua
+share/nmap/nselib/rtsp.lua
+share/nmap/nselib/sasl.lua
 share/nmap/nselib/shortport.lua
+share/nmap/nselib/sip.lua
 share/nmap/nselib/smb.lua
 share/nmap/nselib/smbauth.lua
+share/nmap/nselib/smtp.lua
 share/nmap/nselib/snmp.lua
+share/nmap/nselib/socks.lua
+share/nmap/nselib/srvloc.lua
 share/nmap/nselib/ssh1.lua
 share/nmap/nselib/ssh2.lua
+share/nmap/nselib/sslcert.lua
 share/nmap/nselib/stdnse.lua
 share/nmap/nselib/strbuf.lua
 share/nmap/nselib/strict.lua
+share/nmap/nselib/stun.lua
 share/nmap/nselib/tab.lua
 share/nmap/nselib/target.lua
+share/nmap/nselib/tftp.lua
 share/nmap/nselib/tns.lua
 share/nmap/nselib/unpwdb.lua
 share/nmap/nselib/upnp.lua
 share/nmap/nselib/url.lua
+share/nmap/nselib/versant.lua
 share/nmap/nselib/vnc.lua
+share/nmap/nselib/vulns.lua
+share/nmap/nselib/vuzedht.lua
 share/nmap/nselib/wsdd.lua
+share/nmap/nselib/xdmcp.lua
+share/nmap/nselib/xmpp.lua
+share/nmap/scripts/acarsd-info.nse
+share/nmap/scripts/address-info.nse
 share/nmap/scripts/afp-brute.nse
+share/nmap/scripts/afp-ls.nse
 share/nmap/scripts/afp-path-vuln.nse
 share/nmap/scripts/afp-serverinfo.nse
 share/nmap/scripts/afp-showmount.nse
+share/nmap/scripts/amqp-info.nse
 share/nmap/scripts/asn-query.nse
 share/nmap/scripts/auth-owners.nse
 share/nmap/scripts/auth-spoof.nse
+share/nmap/scripts/backorifice-brute.nse
+share/nmap/scripts/backorifice-info.nse
 share/nmap/scripts/banner.nse
+share/nmap/scripts/bitcoin-getaddr.nse
+share/nmap/scripts/bitcoin-info.nse
+share/nmap/scripts/bitcoinrpc-info.nse
+share/nmap/scripts/bittorrent-discovery.nse
+share/nmap/scripts/broadcast-avahi-dos.nse
+share/nmap/scripts/broadcast-db2-discover.nse
+share/nmap/scripts/broadcast-dhcp-discover.nse
+share/nmap/scripts/broadcast-dhcp6-discover.nse
 share/nmap/scripts/broadcast-dns-service-discovery.nse
 share/nmap/scripts/broadcast-dropbox-listener.nse
+share/nmap/scripts/broadcast-listener.nse
 share/nmap/scripts/broadcast-ms-sql-discover.nse
+share/nmap/scripts/broadcast-netbios-master-browser.nse
+share/nmap/scripts/broadcast-networker-discover.nse
+share/nmap/scripts/broadcast-novell-locate.nse
+share/nmap/scripts/broadcast-pc-anywhere.nse
+share/nmap/scripts/broadcast-pc-duo.nse
+share/nmap/scripts/broadcast-ping.nse
+share/nmap/scripts/broadcast-pppoe-discover.nse
+share/nmap/scripts/broadcast-rip-discover.nse
+share/nmap/scripts/broadcast-ripng-discover.nse
+share/nmap/scripts/broadcast-sybase-asa-discover.nse
 share/nmap/scripts/broadcast-upnp-info.nse
+share/nmap/scripts/broadcast-versant-locate.nse
+share/nmap/scripts/broadcast-wake-on-lan.nse
+share/nmap/scripts/broadcast-wpad-discover.nse
 share/nmap/scripts/broadcast-wsdd-discover.nse
+share/nmap/scripts/broadcast-xdmcp-discover.nse
+share/nmap/scripts/cccam-version.nse
 share/nmap/scripts/citrix-brute-xml.nse
 share/nmap/scripts/citrix-enum-apps-xml.nse
 share/nmap/scripts/citrix-enum-apps.nse
@@ -120,24 +193,38 @@ share/nmap/scripts/citrix-enum-servers-xml.nse
 share/nmap/scripts/citrix-enum-servers.nse
 share/nmap/scripts/couchdb-databases.nse
 share/nmap/scripts/couchdb-stats.nse
+share/nmap/scripts/creds-summary.nse
+share/nmap/scripts/cvs-brute-repository.nse
+share/nmap/scripts/cvs-brute.nse
 share/nmap/scripts/daap-get-library.nse
 share/nmap/scripts/daytime.nse
 share/nmap/scripts/db2-das-info.nse
 share/nmap/scripts/db2-discover.nse
 share/nmap/scripts/dhcp-discover.nse
+share/nmap/scripts/dns-blacklist.nse
+share/nmap/scripts/dns-brute.nse
 share/nmap/scripts/dns-cache-snoop.nse
+share/nmap/scripts/dns-client-subnet-scan.nse
 share/nmap/scripts/dns-fuzz.nse
+share/nmap/scripts/dns-nsec-enum.nse
+share/nmap/scripts/dns-nsid.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-service-discovery.nse
+share/nmap/scripts/dns-srv-enum.nse
 share/nmap/scripts/dns-update.nse
+share/nmap/scripts/dns-zeustracker.nse
 share/nmap/scripts/dns-zone-transfer.nse
 share/nmap/scripts/domcon-brute.nse
 share/nmap/scripts/domcon-cmd.nse
 share/nmap/scripts/domino-enum-users.nse
+share/nmap/scripts/dpap-brute.nse
 share/nmap/scripts/drda-brute.nse
 share/nmap/scripts/drda-info.nse
+share/nmap/scripts/duplicates.nse
+share/nmap/scripts/eap-info.nse
+share/nmap/scripts/epmd-info.nse
 share/nmap/scripts/finger.nse
 share/nmap/scripts/firewalk.nse
 share/nmap/scripts/ftp-anon.nse
@@ -145,56 +232,121 @@ share/nmap/scripts/ftp-bounce.nse
 share/nmap/scripts/ftp-brute.nse
 share/nmap/scripts/ftp-libopie.nse
 share/nmap/scripts/ftp-proftpd-backdoor.nse
+share/nmap/scripts/ftp-vsftpd-backdoor.nse
+share/nmap/scripts/ftp-vuln-cve2010-4221.nse
+share/nmap/scripts/ganglia-info.nse
 share/nmap/scripts/giop-info.nse
 share/nmap/scripts/gopher-ls.nse
+share/nmap/scripts/hadoop-datanode-info.nse
+share/nmap/scripts/hadoop-jobtracker-info.nse
+share/nmap/scripts/hadoop-namenode-info.nse
+share/nmap/scripts/hadoop-secondary-namenode-info.nse
+share/nmap/scripts/hadoop-tasktracker-info.nse
+share/nmap/scripts/hbase-master-info.nse
+share/nmap/scripts/hbase-region-info.nse
 share/nmap/scripts/hddtemp-info.nse
-share/nmap/scripts/hostmap.nse
+share/nmap/scripts/hostmap-bfk.nse
+share/nmap/scripts/http-affiliate-id.nse
+share/nmap/scripts/http-apache-negotiation.nse
+share/nmap/scripts/http-auth-finder.nse
 share/nmap/scripts/http-auth.nse
+share/nmap/scripts/http-awstatstotals-exec.nse
+share/nmap/scripts/http-axis2-dir-traversal.nse
+share/nmap/scripts/http-backup-finder.nse
+share/nmap/scripts/http-barracuda-dir-traversal.nse
 share/nmap/scripts/http-brute.nse
+share/nmap/scripts/http-cakephp-version.nse
+share/nmap/scripts/http-chrono.nse
+share/nmap/scripts/http-config-backup.nse
+share/nmap/scripts/http-cors.nse
 share/nmap/scripts/http-date.nse
+share/nmap/scripts/http-default-accounts.nse
 share/nmap/scripts/http-domino-enum-passwords.nse
+share/nmap/scripts/http-email-harvest.nse
 share/nmap/scripts/http-enum.nse
 share/nmap/scripts/http-favicon.nse
 share/nmap/scripts/http-form-brute.nse
+share/nmap/scripts/http-generator.nse
+share/nmap/scripts/http-google-malware.nse
+share/nmap/scripts/http-grep.nse
 share/nmap/scripts/http-headers.nse
 share/nmap/scripts/http-iis-webdav-vuln.nse
+share/nmap/scripts/http-joomla-brute.nse
+share/nmap/scripts/http-litespeed-sourcecode-download.nse
+share/nmap/scripts/http-majordomo2-dir-traversal.nse
 share/nmap/scripts/http-malware-host.nse
+share/nmap/scripts/http-method-tamper.nse
 share/nmap/scripts/http-methods.nse
 share/nmap/scripts/http-open-proxy.nse
+share/nmap/scripts/http-open-redirect.nse
 share/nmap/scripts/http-passwd.nse
 share/nmap/scripts/http-php-version.nse
+share/nmap/scripts/http-proxy-brute.nse
+share/nmap/scripts/http-put.nse
+share/nmap/scripts/http-qnap-nas-info.nse
 share/nmap/scripts/http-robots.txt.nse
+share/nmap/scripts/http-robtex-reverse-ip.nse
 share/nmap/scripts/http-title.nse
 share/nmap/scripts/http-trace.nse
+share/nmap/scripts/http-unsafe-output-escaping.nse
 share/nmap/scripts/http-userdir-enum.nse
 share/nmap/scripts/http-vhosts.nse
 share/nmap/scripts/http-vmware-path-vuln.nse
+share/nmap/scripts/http-vuln-cve2009-3960.nse
+share/nmap/scripts/http-vuln-cve2010-2861.nse
+share/nmap/scripts/http-vuln-cve2011-3192.nse
+share/nmap/scripts/http-vuln-cve2011-3368.nse
+share/nmap/scripts/http-vuln-cve2012-1823.nse
+share/nmap/scripts/http-waf-detect.nse
+share/nmap/scripts/http-wordpress-brute.nse
+share/nmap/scripts/http-wordpress-enum.nse
+share/nmap/scripts/http-wordpress-plugins.nse
+share/nmap/scripts/iax2-brute.nse
 share/nmap/scripts/iax2-version.nse
+share/nmap/scripts/imap-brute.nse
 share/nmap/scripts/imap-capabilities.nse
 share/nmap/scripts/informix-brute.nse
 share/nmap/scripts/informix-query.nse
 share/nmap/scripts/informix-tables.nse
+share/nmap/scripts/ip-geolocation-geobytes.nse
+share/nmap/scripts/ip-geolocation-geoplugin.nse
+share/nmap/scripts/ip-geolocation-ipinfodb.nse
+share/nmap/scripts/ip-geolocation-maxmind.nse
 share/nmap/scripts/ipidseq.nse
+share/nmap/scripts/ipv6-node-info.nse
+share/nmap/scripts/irc-botnet-channels.nse
+share/nmap/scripts/irc-brute.nse
 share/nmap/scripts/irc-info.nse
 share/nmap/scripts/irc-unrealircd-backdoor.nse
 share/nmap/scripts/iscsi-brute.nse
 share/nmap/scripts/iscsi-info.nse
 share/nmap/scripts/jdwp-version.nse
+share/nmap/scripts/krb5-enum-users.nse
 share/nmap/scripts/ldap-brute.nse
+share/nmap/scripts/ldap-novell-getpass.nse
 share/nmap/scripts/ldap-rootdse.nse
 share/nmap/scripts/ldap-search.nse
 share/nmap/scripts/lexmark-config.nse
+share/nmap/scripts/lltd-discovery.nse
+share/nmap/scripts/maxdb-info.nse
+share/nmap/scripts/membase-brute.nse
+share/nmap/scripts/membase-http-info.nse
+share/nmap/scripts/memcached-info.nse
+share/nmap/scripts/metasploit-xmlrpc-brute.nse
 share/nmap/scripts/modbus-discover.nse
+share/nmap/scripts/mongodb-brute.nse
 share/nmap/scripts/mongodb-databases.nse
 share/nmap/scripts/mongodb-info.nse
 share/nmap/scripts/ms-sql-brute.nse
 share/nmap/scripts/ms-sql-config.nse
+share/nmap/scripts/ms-sql-dump-hashes.nse
 share/nmap/scripts/ms-sql-empty-password.nse
 share/nmap/scripts/ms-sql-hasdbaccess.nse
 share/nmap/scripts/ms-sql-info.nse
 share/nmap/scripts/ms-sql-query.nse
 share/nmap/scripts/ms-sql-tables.nse
 share/nmap/scripts/ms-sql-xp-cmdshell.nse
+share/nmap/scripts/mysql-audit.nse
 share/nmap/scripts/mysql-brute.nse
 share/nmap/scripts/mysql-databases.nse
 share/nmap/scripts/mysql-empty-password.nse
@@ -202,17 +354,30 @@ share/nmap/scripts/mysql-info.nse
 share/nmap/scripts/mysql-users.nse
 share/nmap/scripts/mysql-variables.nse
 share/nmap/scripts/nat-pmp-info.nse
+share/nmap/scripts/nat-pmp-mapport.nse
 share/nmap/scripts/nbstat.nse
+share/nmap/scripts/ncp-enum-users.nse
+share/nmap/scripts/ncp-serverinfo.nse
+share/nmap/scripts/ndmp-fs-info.nse
+share/nmap/scripts/ndmp-version.nse
+share/nmap/scripts/nessus-brute.nse
+share/nmap/scripts/nessus-xmlrpc-brute.nse
 share/nmap/scripts/netbus-auth-bypass.nse
 share/nmap/scripts/netbus-brute.nse
 share/nmap/scripts/netbus-info.nse
 share/nmap/scripts/netbus-version.nse
+share/nmap/scripts/nexpose-brute.nse
 share/nmap/scripts/nfs-ls.nse
 share/nmap/scripts/nfs-showmount.nse
 share/nmap/scripts/nfs-statfs.nse
+share/nmap/scripts/nping-brute.nse
 share/nmap/scripts/nrpe-enum.nse
 share/nmap/scripts/ntp-info.nse
 share/nmap/scripts/ntp-monlist.nse
+share/nmap/scripts/omp2-brute.nse
+share/nmap/scripts/omp2-enum-targets.nse
+share/nmap/scripts/openlookup-info.nse
+share/nmap/scripts/openvas-otp-brute.nse
 share/nmap/scripts/oracle-brute.nse
 share/nmap/scripts/oracle-enum-users.nse
 share/nmap/scripts/oracle-sid-brute.nse
@@ -225,11 +390,30 @@ share/nmap/scripts/pop3-brute.nse
 share/nmap/scripts/pop3-capabilities.nse
 share/nmap/scripts/pptp-version.nse
 share/nmap/scripts/qscan.nse
+share/nmap/scripts/quake3-info.nse
+share/nmap/scripts/quake3-master-getservers.nse
+share/nmap/scripts/rdp-vuln-ms12-020.nse
 share/nmap/scripts/realvnc-auth-bypass.nse
+share/nmap/scripts/redis-brute.nse
+share/nmap/scripts/redis-info.nse
 share/nmap/scripts/resolveall.nse
+share/nmap/scripts/reverse-index.nse
+share/nmap/scripts/rexec-brute.nse
+share/nmap/scripts/riak-http-info.nse
+share/nmap/scripts/rlogin-brute.nse
 share/nmap/scripts/rmi-dumpregistry.nse
+share/nmap/scripts/rpcap-brute.nse
+share/nmap/scripts/rpcap-info.nse
 share/nmap/scripts/rpcinfo.nse
+share/nmap/scripts/rsync-brute.nse
+share/nmap/scripts/rsync-list-modules.nse
+share/nmap/scripts/rtsp-methods.nse
+share/nmap/scripts/rtsp-url-brute.nse
+share/nmap/scripts/samba-vuln-cve-2012-1182.nse
 share/nmap/scripts/script.db
+share/nmap/scripts/servicetags.nse
+share/nmap/scripts/sip-brute.nse
+share/nmap/scripts/sip-enum-users.nse
 share/nmap/scripts/skypev2-version.nse
 share/nmap/scripts/smb-brute.nse
 share/nmap/scripts/smb-check-vulns.nse
@@ -240,19 +424,25 @@ 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-flood.nse
+share/nmap/scripts/smb-mbenum.nse
 share/nmap/scripts/smb-os-discovery.nse
 share/nmap/scripts/smb-psexec.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/smbv2-enabled.nse
+share/nmap/scripts/smtp-brute.nse
 share/nmap/scripts/smtp-commands.nse
 share/nmap/scripts/smtp-enum-users.nse
 share/nmap/scripts/smtp-open-relay.nse
 share/nmap/scripts/smtp-strangeport.nse
+share/nmap/scripts/smtp-vuln-cve2010-4344.nse
+share/nmap/scripts/smtp-vuln-cve2011-1720.nse
+share/nmap/scripts/smtp-vuln-cve2011-1764.nse
 share/nmap/scripts/sniffer-detect.nse
 share/nmap/scripts/snmp-brute.nse
 share/nmap/scripts/snmp-interfaces.nse
+share/nmap/scripts/snmp-ios-config.nse
 share/nmap/scripts/snmp-netstat.nse
 share/nmap/scripts/snmp-processes.nse
 share/nmap/scripts/snmp-sysdescr.nse
@@ -260,6 +450,8 @@ share/nmap/scripts/snmp-win32-services.nse
 share/nmap/scripts/snmp-win32-shares.nse
 share/nmap/scripts/snmp-win32-software.nse
 share/nmap/scripts/snmp-win32-users.nse
+share/nmap/scripts/socks-auth-info.nse
+share/nmap/scripts/socks-brute.nse
 share/nmap/scripts/socks-open-proxy.nse
 share/nmap/scripts/sql-injection.nse
 share/nmap/scripts/ssh-hostkey.nse
@@ -267,15 +459,36 @@ share/nmap/scripts/ssh2-enum-algos.nse
 share/nmap/scripts/sshv1.nse
 share/nmap/scripts/ssl-cert.nse
 share/nmap/scripts/ssl-enum-ciphers.nse
+share/nmap/scripts/ssl-google-cert-catalog.nse
+share/nmap/scripts/ssl-known-key.nse
 share/nmap/scripts/sslv2.nse
+share/nmap/scripts/stun-info.nse
+share/nmap/scripts/stun-version.nse
 share/nmap/scripts/stuxnet-detect.nse
 share/nmap/scripts/svn-brute.nse
+share/nmap/scripts/targets-asn.nse
+share/nmap/scripts/targets-ipv6-multicast-echo.nse
+share/nmap/scripts/targets-ipv6-multicast-invalid-dst.nse
+share/nmap/scripts/targets-ipv6-multicast-mld.nse
+share/nmap/scripts/targets-ipv6-multicast-slaac.nse
+share/nmap/scripts/targets-sniffer.nse
 share/nmap/scripts/targets-traceroute.nse
 share/nmap/scripts/telnet-brute.nse
+share/nmap/scripts/telnet-encryption.nse
+share/nmap/scripts/tftp-enum.nse
+share/nmap/scripts/unusual-port.nse
 share/nmap/scripts/upnp-info.nse
+share/nmap/scripts/url-snarf.nse
+share/nmap/scripts/versant-info.nse
+share/nmap/scripts/vmauthd-brute.nse
 share/nmap/scripts/vnc-brute.nse
 share/nmap/scripts/vnc-info.nse
+share/nmap/scripts/voldemort-info.nse
+share/nmap/scripts/vuze-dht-info.nse
 share/nmap/scripts/wdb-version.nse
 share/nmap/scripts/whois.nse
 share/nmap/scripts/wsdd-discover.nse
 share/nmap/scripts/x11-access.nse
+share/nmap/scripts/xdmcp-discover.nse
+share/nmap/scripts/xmpp-brute.nse
+share/nmap/scripts/xmpp-info.nse
diff --git a/net/nmap/PLIST.zenmap b/net/nmap/PLIST.zenmap
index 5724c852ab2..ed9b06e52eb 100644
--- a/net/nmap/PLIST.zenmap
+++ b/net/nmap/PLIST.zenmap
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.zenmap,v 1.8 2011/01/31 23:22:47 pettai Exp $
+@comment $NetBSD: PLIST.zenmap,v 1.9 2012/09/16 20:29:06 pettai Exp $
 bin/nmapfe
 bin/uninstall_zenmap
 bin/xnmap
@@ -71,8 +71,6 @@ ${PYSITELIB}/radialnet/util/misc.py
 ${PYSITELIB}/radialnet/util/misc.pyc
 ${PYSITELIB}/zenmapCore/BasePaths.py
 ${PYSITELIB}/zenmapCore/BasePaths.pyc
-${PYSITELIB}/zenmapCore/BugRegister.py
-${PYSITELIB}/zenmapCore/BugRegister.pyc
 ${PYSITELIB}/zenmapCore/Diff.py
 ${PYSITELIB}/zenmapCore/Diff.pyc
 ${PYSITELIB}/zenmapCore/I18N.py
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 69b9946fed5..9fdd7de79db 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.55 2012/03/08 11:43:47 wiz Exp $
+$NetBSD: distinfo,v 1.56 2012/09/16 20:29:06 pettai Exp $
 
-SHA1 (nmap-5.51.6.tar.bz2) = 572a08f043ee1ba7cfcb83f3c886daa7c7231fb4
-RMD160 (nmap-5.51.6.tar.bz2) = 3ececb8dd4fd4e747c4ca98198d2562143749570
-Size (nmap-5.51.6.tar.bz2) = 16876602 bytes
-SHA1 (patch-ab) = 5360e2aac721262e494dc98f3bd64572a74fb62c
+SHA1 (nmap-6.01.tar.bz2) = e397e453893930d14e9bb33a847d15b94b7ee83a
+RMD160 (nmap-6.01.tar.bz2) = 1b6f2b0e4f019d9cd069db14990364c45d463c7d
+Size (nmap-6.01.tar.bz2) = 21640157 bytes
+SHA1 (patch-ab) = 89a1794a1bf954ddf42d94d88de444efa52e5cfb
 SHA1 (patch-ac) = c22e8f6411b1152a6e7582c90e5ec5bd4c6acaad
-SHA1 (patch-al) = c56396c28d96314c8d7e8b19a92bd5db7959e289
-SHA1 (patch-nbase_configure) = 3db822d392defd92d531b71f466b61be82e525a1
+SHA1 (patch-an) = 33fb3aa23cf4beedcc9cb908b08d928cabab17c8
diff --git a/net/nmap/patches/patch-ab b/net/nmap/patches/patch-ab
index d66f20185b0..366ad2b4d56 100644
--- a/net/nmap/patches/patch-ab
+++ b/net/nmap/patches/patch-ab
@@ -1,25 +1,7 @@
-$NetBSD: patch-ab,v 1.17 2012/03/08 11:43:47 wiz Exp $
+$NetBSD: patch-ab,v 1.18 2012/09/16 20:29:06 pettai Exp $
 
 --- configure.orig	2011-01-21 21:00:04.000000000 +0000
 +++ configure
-@@ -5308,7 +5308,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
-   $as_echo_n "(cached) " >&6
- else
- 
--	for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
-+	for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
- 	  test "$am_cv_pathless_PYTHON" = none && break
- 	  prog="import sys
- # split strings by '.' and convert to numeric.  Append some zeros
-@@ -5558,7 +5558,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
-   $as_echo_n "(cached) " >&6
- else
- 
--	for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
-+	for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
- 	  test "$am_cv_pathless_PYTHON" = none && break
- 	  prog="import sys
- # split strings by '.' and convert to numeric.  Append some zeros
 @@ -6115,6 +6115,7 @@ else
  extern char pcap_version[];
  int main() {
@@ -28,12 +10,3 @@ $NetBSD: patch-ab,v 1.17 2012/03/08 11:43:47 wiz Exp $
    sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
    if (major > 0)
      exit(0);
-@@ -6137,6 +6138,8 @@ else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-+#define BSD_SOURCE
-+#include <sys/types.h>
- #include <stdio.h>
- #ifdef HAVE_SYS_IOCCOM_H
- #include <sys/ioccom.h>
diff --git a/net/nmap/patches/patch-al b/net/nmap/patches/patch-al
deleted file mode 100644
index 807d90aebef..00000000000
--- a/net/nmap/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.2 2011/01/30 09:24:40 markd Exp $
-
---- nping/configure.orig	2011-01-26 10:07:02.311910853 +0000
-+++ nping/configure
-@@ -5068,6 +5068,8 @@ else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-+#define  _BSD_SOURCE
-+#include <sys/types.h>
- #include <stdio.h>
- #ifdef HAVE_SYS_IOCCOM_H
- #include <sys/ioccom.h>
diff --git a/net/nmap/patches/patch-an b/net/nmap/patches/patch-an
new file mode 100644
index 00000000000..868a22fe6de
--- /dev/null
+++ b/net/nmap/patches/patch-an
@@ -0,0 +1,21 @@
+$NetBSD: patch-an,v 1.1 2012/09/16 20:29:06 pettai Exp $
+
+Fix for sa_len size problem on NetBSD
+(See commit r29739 in nmap's svn for details)
+
+--- libdnet-stripped/src/intf.c.orig	2012-05-24 03:59:25.000000000 +0000
++++ libdnet-stripped/src/intf.c
+@@ -64,9 +64,10 @@
+ #endif
+ 
+ #ifdef HAVE_SOCKADDR_SA_LEN
+-# define NEXTIFR(i)	((struct ifreq *)((u_char *)&i->ifr_addr + \
+-				(i->ifr_addr.sa_len ? i->ifr_addr.sa_len : \
+-				 sizeof(i->ifr_addr))))
++# define max(a, b) ((a) > (b) ? (a) : (b))
++# define NEXTIFR(i)	((struct ifreq *) \
++				max((u_char *)i + sizeof(struct ifreq), \
++				(u_char *)&i->ifr_addr + i->ifr_addr.sa_len))
+ #else
+ # define NEXTIFR(i)	(i + 1)
+ #endif
diff --git a/net/nmap/patches/patch-nbase_configure b/net/nmap/patches/patch-nbase_configure
deleted file mode 100644
index 97695d0e4ff..00000000000
--- a/net/nmap/patches/patch-nbase_configure
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-nbase_configure,v 1.1 2011/07/08 09:24:48 adam Exp $
-
-Fix configuring with Clang.
-
---- nbase/configure.orig	2011-01-21 21:00:04.000000000 +0000
-+++ nbase/configure
-@@ -4509,7 +4509,7 @@ else
- #include <sys/socket.h>
- #endif
- 
--void main(void) {
-+int main(void) {
-     struct addrinfo hints, *ai;
-     int error;
- 
-@@ -4641,7 +4641,7 @@ else
- #include <netinet/in.h>
- #endif
- 
--void main(void) {
-+int main(void) {
-     struct sockaddr_in sa;
-     char hbuf[256];
-     int error;