--- a/components/nmap/Makefile	Mon Apr 17 14:00:45 2017 -0700
+++ b/components/nmap/Makefile	Mon Apr 17 14:03:00 2017 -0700
@@ -29,15 +29,15 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=         nmap
-COMPONENT_VERSION=      7.11
+COMPONENT_VERSION=      7.40
 COMPONENT_PROJECT_URL=	http://nmap.org/
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH= \
-    sha256:dfc95db3a8ee4c56650dbaa5a1a1e989b2963de8faea2531c21e6fd6e0bccc2a
+    sha256:ac35f64e820071efa768c34c96ed741b7278bbfce9fed776cd3200ca2d904a65
 COMPONENT_ARCHIVE_URL=  $(COMPONENT_PROJECT_URL)dist/$(COMPONENT_ARCHIVE)
 COMPONENT_ANITYA_ID=	2096
 
-TPNO=			27577
+TPNO=			34280
 
 TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk
@@ -64,12 +64,6 @@
 CONFIGURE_OPTIONS  +=   --with-ncat 
 CONFIGURE_OPTIONS  +=   --with-ndiff
 
-# pkgdepend doesn't like the first line of a Python script to be:
-# '#!/usr/bin/env python' so turn it into '#!/usr/bin/python$(PYTHON_VERSION)'
-COMPONENT_POST_INSTALL_ACTION += \
-        $(GSED) -i -e "s?env python?python$(PYTHON_VERSION)?" \
-                $(PROTOUSRBINDIR)/uninstall_zenmap
-
 REQUIRED_PACKAGES += library/pcre
 REQUIRED_PACKAGES += library/python/pygobject-27
 REQUIRED_PACKAGES += library/python/pygtk2-27

--- a/components/nmap/nmap.p5m	Mon Apr 17 14:00:45 2017 -0700
+++ b/components/nmap/nmap.p5m	Mon Apr 17 14:03:00 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -46,7 +46,6 @@
 file path=usr/bin/nmap
 link path=usr/bin/nmapfe target=zenmap
 file path=usr/bin/nping
-file path=usr/bin/uninstall_zenmap
 link path=usr/bin/xnmap target=zenmap
 file path=usr/bin/zenmap
 file path=usr/lib/python$(PYVER)/vendor-packages/ndiff.py
@@ -72,6 +71,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/Dialogs.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/HostsViewer.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/Image.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/LegendWindow.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/NodeNotebook.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/NodeWindow.py
 file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/RadialNet.py
@@ -206,18 +206,21 @@
 file path=usr/share/nmap/nselib/asn1.lua
 file path=usr/share/nmap/nselib/base32.lua
 file path=usr/share/nmap/nselib/base64.lua
-file path=usr/share/nmap/nselib/bin.luadoc
-file path=usr/share/nmap/nselib/bit.luadoc
+file path=usr/share/nmap/nselib/bin.lua
+file path=usr/share/nmap/nselib/bit.lua
 file path=usr/share/nmap/nselib/bitcoin.lua
+file path=usr/share/nmap/nselib/bits.lua
 file path=usr/share/nmap/nselib/bittorrent.lua
 file path=usr/share/nmap/nselib/bjnp.lua
 file path=usr/share/nmap/nselib/brute.lua
 file path=usr/share/nmap/nselib/cassandra.lua
 file path=usr/share/nmap/nselib/citrixxml.lua
+file path=usr/share/nmap/nselib/coap.lua
 file path=usr/share/nmap/nselib/comm.lua
 file path=usr/share/nmap/nselib/creds.lua
 file path=usr/share/nmap/nselib/cvs.lua
 file path=usr/share/nmap/nselib/datafiles.lua
+file path=usr/share/nmap/nselib/datetime.lua
 file path=usr/share/nmap/nselib/dhcp.lua
 file path=usr/share/nmap/nselib/dhcp6.lua
 file path=usr/share/nmap/nselib/dns.lua
@@ -228,6 +231,7 @@
 file path=usr/share/nmap/nselib/eigrp.lua
 file path=usr/share/nmap/nselib/formulas.lua
 file path=usr/share/nmap/nselib/ftp.lua
+file path=usr/share/nmap/nselib/geoip.lua
 file path=usr/share/nmap/nselib/giop.lua
 file path=usr/share/nmap/nselib/gps.lua
 file path=usr/share/nmap/nselib/http.lua
@@ -237,6 +241,7 @@
 file path=usr/share/nmap/nselib/imap.lua
 file path=usr/share/nmap/nselib/informix.lua
 file path=usr/share/nmap/nselib/ipOps.lua
+file path=usr/share/nmap/nselib/ipmi.lua
 file path=usr/share/nmap/nselib/ipp.lua
 file path=usr/share/nmap/nselib/iscsi.lua
 file path=usr/share/nmap/nselib/isns.lua
@@ -252,6 +257,7 @@
 file path=usr/share/nmap/nselib/membase.lua
 file path=usr/share/nmap/nselib/mobileme.lua
 file path=usr/share/nmap/nselib/mongodb.lua
+file path=usr/share/nmap/nselib/mqtt.lua
 file path=usr/share/nmap/nselib/msrpc.lua
 file path=usr/share/nmap/nselib/msrpcperformance.lua
 file path=usr/share/nmap/nselib/msrpctypes.lua
@@ -295,6 +301,7 @@
 file path=usr/share/nmap/nselib/ssh1.lua
 file path=usr/share/nmap/nselib/ssh2.lua
 file path=usr/share/nmap/nselib/sslcert.lua
+file path=usr/share/nmap/nselib/sslv2.lua
 file path=usr/share/nmap/nselib/stdnse.lua
 file path=usr/share/nmap/nselib/strbuf.lua
 file path=usr/share/nmap/nselib/strict.lua
@@ -303,6 +310,7 @@
 file path=usr/share/nmap/nselib/target.lua
 file path=usr/share/nmap/nselib/tftp.lua
 file path=usr/share/nmap/nselib/tls.lua
+file path=usr/share/nmap/nselib/tn3270.lua
 file path=usr/share/nmap/nselib/tns.lua
 file path=usr/share/nmap/nselib/unicode.lua
 file path=usr/share/nmap/nselib/unittest.lua
@@ -376,11 +384,16 @@
 file path=usr/share/nmap/scripts/cassandra-brute.nse
 file path=usr/share/nmap/scripts/cassandra-info.nse
 file path=usr/share/nmap/scripts/cccam-version.nse
+file path=usr/share/nmap/scripts/cics-enum.nse
+file path=usr/share/nmap/scripts/cics-user-enum.nse
 file path=usr/share/nmap/scripts/citrix-brute-xml.nse
 file path=usr/share/nmap/scripts/citrix-enum-apps-xml.nse
 file path=usr/share/nmap/scripts/citrix-enum-apps.nse
 file path=usr/share/nmap/scripts/citrix-enum-servers-xml.nse
 file path=usr/share/nmap/scripts/citrix-enum-servers.nse
+file path=usr/share/nmap/scripts/clamav-exec.nse
+file path=usr/share/nmap/scripts/clock-skew.nse
+file path=usr/share/nmap/scripts/coap-resources.nse
 file path=usr/share/nmap/scripts/couchdb-databases.nse
 file path=usr/share/nmap/scripts/couchdb-stats.nse
 file path=usr/share/nmap/scripts/creds-summary.nse
@@ -426,9 +439,11 @@
 file path=usr/share/nmap/scripts/eppc-enum-processes.nse
 file path=usr/share/nmap/scripts/fcrdns.nse
 file path=usr/share/nmap/scripts/finger.nse
+file path=usr/share/nmap/scripts/fingerprint-strings.nse
 file path=usr/share/nmap/scripts/firewalk.nse
 file path=usr/share/nmap/scripts/firewall-bypass.nse
 file path=usr/share/nmap/scripts/flume-master-info.nse
+file path=usr/share/nmap/scripts/fox-info.nse
 file path=usr/share/nmap/scripts/freelancer-info.nse
 file path=usr/share/nmap/scripts/ftp-anon.nse
 file path=usr/share/nmap/scripts/ftp-bounce.nse
@@ -458,6 +473,7 @@
 file path=usr/share/nmap/scripts/http-affiliate-id.nse
 file path=usr/share/nmap/scripts/http-apache-negotiation.nse
 file path=usr/share/nmap/scripts/http-apache-server-status.nse
+file path=usr/share/nmap/scripts/http-aspnet-debug.nse
 file path=usr/share/nmap/scripts/http-auth-finder.nse
 file path=usr/share/nmap/scripts/http-auth.nse
 file path=usr/share/nmap/scripts/http-avaya-ipoffice-users.nse
@@ -504,11 +520,13 @@
 file path=usr/share/nmap/scripts/http-icloud-sendmsg.nse
 file path=usr/share/nmap/scripts/http-iis-short-name-brute.nse
 file path=usr/share/nmap/scripts/http-iis-webdav-vuln.nse
+file path=usr/share/nmap/scripts/http-internal-ip-disclosure.nse
 file path=usr/share/nmap/scripts/http-joomla-brute.nse
 file path=usr/share/nmap/scripts/http-litespeed-sourcecode-download.nse
 file path=usr/share/nmap/scripts/http-ls.nse
 file path=usr/share/nmap/scripts/http-majordomo2-dir-traversal.nse
 file path=usr/share/nmap/scripts/http-malware-host.nse
+file path=usr/share/nmap/scripts/http-mcmp.nse
 file path=usr/share/nmap/scripts/http-method-tamper.nse
 file path=usr/share/nmap/scripts/http-methods.nse
 file path=usr/share/nmap/scripts/http-mobileversion-checker.nse
@@ -585,12 +603,17 @@
 file path=usr/share/nmap/scripts/informix-query.nse
 file path=usr/share/nmap/scripts/informix-tables.nse
 file path=usr/share/nmap/scripts/ip-forwarding.nse
-file path=usr/share/nmap/scripts/ip-geolocation-geobytes.nse
 file path=usr/share/nmap/scripts/ip-geolocation-geoplugin.nse
 file path=usr/share/nmap/scripts/ip-geolocation-ipinfodb.nse
+file path=usr/share/nmap/scripts/ip-geolocation-map-bing.nse
+file path=usr/share/nmap/scripts/ip-geolocation-map-google.nse
+file path=usr/share/nmap/scripts/ip-geolocation-map-kml.nse
 file path=usr/share/nmap/scripts/ip-geolocation-maxmind.nse
 file path=usr/share/nmap/scripts/ip-https-discover.nse
 file path=usr/share/nmap/scripts/ipidseq.nse
+file path=usr/share/nmap/scripts/ipmi-brute.nse
+file path=usr/share/nmap/scripts/ipmi-cipher-zero.nse
+file path=usr/share/nmap/scripts/ipmi-version.nse
 file path=usr/share/nmap/scripts/ipv6-multicast-mld-list.nse
 file path=usr/share/nmap/scripts/ipv6-node-info.nse
 file path=usr/share/nmap/scripts/ipv6-ra-flood.nse
@@ -631,6 +654,7 @@
 file path=usr/share/nmap/scripts/mongodb-brute.nse
 file path=usr/share/nmap/scripts/mongodb-databases.nse
 file path=usr/share/nmap/scripts/mongodb-info.nse
+file path=usr/share/nmap/scripts/mqtt-subscribe.nse
 file path=usr/share/nmap/scripts/mrinfo.nse
 file path=usr/share/nmap/scripts/ms-sql-brute.nse
 file path=usr/share/nmap/scripts/ms-sql-config.nse
@@ -675,6 +699,7 @@
 file path=usr/share/nmap/scripts/nfs-showmount.nse
 file path=usr/share/nmap/scripts/nfs-statfs.nse
 file path=usr/share/nmap/scripts/nje-node-brute.nse
+file path=usr/share/nmap/scripts/nje-pass-brute.nse
 file path=usr/share/nmap/scripts/nntp-ntlm-info.nse
 file path=usr/share/nmap/scripts/nping-brute.nse
 file path=usr/share/nmap/scripts/nrpe-enum.nse
@@ -689,10 +714,12 @@
 file path=usr/share/nmap/scripts/oracle-brute.nse
 file path=usr/share/nmap/scripts/oracle-enum-users.nse
 file path=usr/share/nmap/scripts/oracle-sid-brute.nse
+file path=usr/share/nmap/scripts/oracle-tns-version.nse
 file path=usr/share/nmap/scripts/ovs-agent-version.nse
 file path=usr/share/nmap/scripts/p2p-conficker.nse
 file path=usr/share/nmap/scripts/path-mtu.nse
 file path=usr/share/nmap/scripts/pcanywhere-brute.nse
+file path=usr/share/nmap/scripts/pcworx-info.nse
 file path=usr/share/nmap/scripts/pgsql-brute.nse
 file path=usr/share/nmap/scripts/pjl-ready-message.nse
 file path=usr/share/nmap/scripts/pop3-brute.nse
@@ -790,14 +817,15 @@
 file path=usr/share/nmap/scripts/ssh2-enum-algos.nse
 file path=usr/share/nmap/scripts/sshv1.nse
 file path=usr/share/nmap/scripts/ssl-ccs-injection.nse
+file path=usr/share/nmap/scripts/ssl-cert-intaddr.nse
 file path=usr/share/nmap/scripts/ssl-cert.nse
 file path=usr/share/nmap/scripts/ssl-date.nse
 file path=usr/share/nmap/scripts/ssl-dh-params.nse
 file path=usr/share/nmap/scripts/ssl-enum-ciphers.nse
-file path=usr/share/nmap/scripts/ssl-google-cert-catalog.nse
 file path=usr/share/nmap/scripts/ssl-heartbleed.nse
 file path=usr/share/nmap/scripts/ssl-known-key.nse
 file path=usr/share/nmap/scripts/ssl-poodle.nse
+file path=usr/share/nmap/scripts/sslv2-drown.nse
 file path=usr/share/nmap/scripts/sslv2.nse
 file path=usr/share/nmap/scripts/sstp-discover.nse
 file path=usr/share/nmap/scripts/stun-info.nse
@@ -821,8 +849,11 @@
 file path=usr/share/nmap/scripts/telnet-ntlm-info.nse
 file path=usr/share/nmap/scripts/tftp-enum.nse
 file path=usr/share/nmap/scripts/tls-nextprotoneg.nse
+file path=usr/share/nmap/scripts/tn3270-screen.nse
 file path=usr/share/nmap/scripts/tor-consensus-checker.nse
 file path=usr/share/nmap/scripts/traceroute-geolocation.nse
+file path=usr/share/nmap/scripts/tso-brute.nse
+file path=usr/share/nmap/scripts/tso-enum.nse
 file path=usr/share/nmap/scripts/unittest.nse
 file path=usr/share/nmap/scripts/unusual-port.nse
 file path=usr/share/nmap/scripts/upnp-info.nse
@@ -832,7 +863,9 @@
 file path=usr/share/nmap/scripts/vmauthd-brute.nse
 file path=usr/share/nmap/scripts/vnc-brute.nse
 file path=usr/share/nmap/scripts/vnc-info.nse
+file path=usr/share/nmap/scripts/vnc-title.nse
 file path=usr/share/nmap/scripts/voldemort-info.nse
+file path=usr/share/nmap/scripts/vtam-enum.nse
 file path=usr/share/nmap/scripts/vuze-dht-info.nse
 file path=usr/share/nmap/scripts/wdb-version.nse
 file path=usr/share/nmap/scripts/weblogic-t3-info.nse
@@ -849,6 +882,7 @@
 file path=usr/share/zenmap/config/zenmap_version
 file path=usr/share/zenmap/docs/help.html
 file path=usr/share/zenmap/locale/de/LC_MESSAGES/zenmap.mo
+file path=usr/share/zenmap/locale/es/LC_MESSAGES/zenmap.mo
 file path=usr/share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo
 file path=usr/share/zenmap/locale/hi/LC_MESSAGES/zenmap.mo
 file path=usr/share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo