Nmap 6.25:

o [NSE] Added CPE to smb-os-discovery output.
o [Ncat] Fixed the printing of warning messages for large arguments to
  the -i and -w options.
o [Ncat] Shut down the write part of connected sockets in listen mode
  when stdin hits EOF, just as was already done in connect mode.
o [Zenmap] Removed a crashing error that could happen when canceling a
  "Print to File" on Windows:
  Traceback (most recent call last):
    File "zenmapGUI\MainWindow.pyo", line 831, in _print_cb
    File "zenmapGUI\Print.pyo", line 156, in run_print_operation
  GError: Error from StartDoc
o [NSE] Added new fingerprints for http-enum: Sitecore, Moodle, typo3,
  SquirrelMail, RoundCube.
o Added some new checks for failed library calls.

8 files changed, 425 insertions, 363 deletions

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 49372d17e5c..745d8462ebb 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.105 2013/05/09 07:40:25 adam Exp $
+# $NetBSD: Makefile,v 1.106 2013/05/20 06:21:22 adam Exp $
 
-DISTNAME=	nmap-6.01
-PKGREVISION=	10
+DISTNAME=	nmap-6.25
 CATEGORIES=	net security
 MASTER_SITES=	http://nmap.org/dist/
 EXTRACT_SUFX=	.tar.bz2
@@ -17,18 +16,20 @@ BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=1.0.0
 BUILDLINK_API_DEPENDS.libpcre+=	libpcre>=7.6
 BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.8
 
-GNU_CONFIGURE=		yes
-
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
-PLIST_SRC=		${WRKDIR}/.PLIST_SRC
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-libpcap=${BUILDLINK_PREFIX.libpcap}
+CONFIGURE_ARGS+=	--with-libpcre=${BUILDLINK_PREFIX.pcre}
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=	--without-subversion
 
 BUILD_DEFS+=		IPV6_READY
 
 .include "options.mk"
 
-CHECK_INTERPRETER_SKIP=	bin/uninstall_zenmap
+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
@@ -36,11 +37,6 @@ 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}
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
-CONFIGURE_ARGS+=	--without-subversion
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
@@ -62,12 +58,8 @@ pre-build:
 	${ECHO} "# ignored" > ${WRKSRC}/makefile.dep
 .endif
 
-post-build:
-	${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
-
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 #.include "../../devel/subversion-base/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/nmap/PLIST b/net/nmap/PLIST
index 762c7e5183f..a4b06d1e11d 100644
--- a/net/nmap/PLIST
+++ b/net/nmap/PLIST
@@ -1,7 +1,222 @@
-@comment $NetBSD: PLIST,v 1.16 2012/09/16 20:29:06 pettai Exp $
+@comment $NetBSD: PLIST,v 1.17 2013/05/20 06:21:22 adam Exp $
 bin/ncat
+${PLIST.ndiff}bin/ndiff
 bin/nmap
+${PLIST.zenmap}bin/nmapfe
 bin/nping
+${PLIST.zenmap}bin/uninstall_zenmap
+${PLIST.zenmap}bin/xnmap
+${PLIST.zenmap}bin/zenmap
+${PLIST.zenmap}${PYSITELIB}/radialnet/__init__.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/__init__.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/__init__.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/__init__.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/boxes.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/boxes.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/buttons.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/buttons.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/comboboxes.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/comboboxes.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/expanders.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/expanders.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/frames.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/frames.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/labels.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/labels.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/textview.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/textview.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/windows.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/windows.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/core/ArgvHandle.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/core/ArgvHandle.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/core/Coordinate.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/core/Coordinate.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/core/Graph.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/core/Graph.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/core/Info.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/core/Info.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/core/Interpolation.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/core/Interpolation.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/core/XMLHandler.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/core/XMLHandler.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/core/__init__.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/core/__init__.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/Application.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/Application.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/ControlWidget.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/ControlWidget.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/Dialogs.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/Dialogs.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/HostsViewer.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/HostsViewer.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/Image.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/Image.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/NodeNotebook.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/NodeNotebook.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/NodeWindow.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/NodeWindow.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/RadialNet.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/RadialNet.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/SaveDialog.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/SaveDialog.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/Toolbar.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/Toolbar.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/__init__.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/gui/__init__.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/util/__init__.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/util/__init__.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/util/drawing.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/util/drawing.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/util/geometry.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/util/geometry.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/util/integration.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/util/integration.pyc
+${PLIST.zenmap}${PYSITELIB}/radialnet/util/misc.py
+${PLIST.zenmap}${PYSITELIB}/radialnet/util/misc.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/BasePaths.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/BasePaths.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/Diff.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/Diff.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/I18N.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/I18N.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/NSEDocParser.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/NSEDocParser.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/Name.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/Name.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/NetworkInventory.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/NetworkInventory.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/NmapCommand.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/NmapCommand.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/NmapOptions.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/NmapOptions.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/NmapParser.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/NmapParser.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/Paths.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/Paths.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/RecentScans.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/RecentScans.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/ScriptArgsParser.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/ScriptArgsParser.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/ScriptMetadata.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/ScriptMetadata.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/SearchResult.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/SearchResult.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/StringPool.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/StringPool.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/TargetList.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/TargetList.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitConf.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitConf.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitConfigParser.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitConfigParser.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitDB.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitDB.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitLogging.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitLogging.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitOptionParser.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitOptionParser.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/Version.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/Version.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/__init__.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/__init__.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/About.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/About.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/App.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/App.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/BugReport.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/BugReport.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/CrashReport.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/CrashReport.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/DiffCompare.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/DiffCompare.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/FileChoosers.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/FileChoosers.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/FilterBar.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/FilterBar.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/Icons.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/Icons.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/MainWindow.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/MainWindow.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/NmapOutputProperties.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/NmapOutputProperties.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/NmapOutputViewer.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/NmapOutputViewer.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/OptionBuilder.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/OptionBuilder.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/Print.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/Print.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ProfileCombo.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ProfileCombo.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ProfileEditor.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ProfileEditor.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ProfileHelp.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ProfileHelp.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanHostDetailsPage.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanHostDetailsPage.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanHostsView.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanHostsView.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanInterface.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanInterface.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanNmapOutputPage.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanNmapOutputPage.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanOpenPortsPage.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanOpenPortsPage.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanRunDetailsPage.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanRunDetailsPage.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanScanListPage.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanScanListPage.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanToolbar.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanToolbar.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScansListStore.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScansListStore.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScriptInterface.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScriptInterface.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/SearchGUI.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/SearchGUI.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/SearchWindow.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/SearchWindow.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/TargetCombo.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/TargetCombo.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/TopologyPage.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/TopologyPage.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/__init__.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/__init__.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/__init__.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/__init__.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/gtkutils.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/gtkutils.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higboxes.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higboxes.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higbuttons.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higbuttons.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higdialogs.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higdialogs.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higentries.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higentries.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higexpanders.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higexpanders.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higframe.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higframe.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higlabels.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higlabels.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higlogindialogs.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higlogindialogs.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/hignotebooks.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/hignotebooks.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higprogressbars.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higprogressbars.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higscrollers.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higscrollers.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higspinner.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higspinner.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higtables.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higtables.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higtextviewers.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higtextviewers.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higwindows.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higwindows.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/utils.py
+${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/utils.pyc
 man/de/man1/nmap.1
 man/es/man1/nmap.1
 man/fr/man1/nmap.1
@@ -10,8 +225,10 @@ man/hu/man1/nmap.1
 man/it/man1/nmap.1
 man/jp/man1/nmap.1
 man/man1/ncat.1
+${PLIST.ndiff}man/man1/ndiff.1
 man/man1/nmap.1
 man/man1/nping.1
+${PLIST.zenmap}man/man1/zenmap.1
 man/pl/man1/nmap.1
 man/pt_BR/man1/nmap.1
 man/pt_PT/man1/nmap.1
@@ -19,6 +236,8 @@ man/ro/man1/nmap.1
 man/ru/man1/nmap.1
 man/sk/man1/nmap.1
 man/zh/man1/nmap.1
+${PLIST.zenmap}share/applications/zenmap-root.desktop
+${PLIST.zenmap}share/applications/zenmap.desktop
 share/ncat/ca-bundle.crt
 share/nmap/nmap-mac-prefixes
 share/nmap/nmap-os-db
@@ -31,20 +250,32 @@ share/nmap/nmap.dtd
 share/nmap/nmap.xsl
 share/nmap/nse_main.lua
 share/nmap/nselib/afp.lua
+share/nmap/nselib/ajp.lua
 share/nmap/nselib/amqp.lua
 share/nmap/nselib/asn1.lua
+share/nmap/nselib/base32.lua
 share/nmap/nselib/base64.lua
 share/nmap/nselib/bitcoin.lua
 share/nmap/nselib/bittorrent.lua
+share/nmap/nselib/bjnp.lua
 share/nmap/nselib/brute.lua
+share/nmap/nselib/cassandra.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/drupal-modules.lst
 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/http-sql-errors.lst
+share/nmap/nselib/data/http-web-files-extensions.lst
+share/nmap/nselib/data/jdwp-class/JDWPExecCmd.class
+share/nmap/nselib/data/jdwp-class/JDWPExecCmd.java
+share/nmap/nselib/data/jdwp-class/JDWPSystemInfo.class
+share/nmap/nselib/data/jdwp-class/JDWPSystemInfo.java
+share/nmap/nselib/data/jdwp-class/README.txt
 share/nmap/nselib/data/mysql-cis.audit
 share/nmap/nselib/data/oracle-default-accounts.lst
 share/nmap/nselib/data/oracle-sids
@@ -66,6 +297,8 @@ 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/vhosts-default.lst
+share/nmap/nselib/data/vhosts-full.lst
 share/nmap/nselib/data/wp-plugins.lst
 share/nmap/nselib/datafiles.lua
 share/nmap/nselib/dhcp.lua
@@ -75,20 +308,26 @@ share/nmap/nselib/dnsbl.lua
 share/nmap/nselib/dnssd.lua
 share/nmap/nselib/drda.lua
 share/nmap/nselib/eap.lua
+share/nmap/nselib/eigrp.lua
 share/nmap/nselib/ftp.lua
 share/nmap/nselib/giop.lua
+share/nmap/nselib/gps.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
+share/nmap/nselib/ipp.lua
 share/nmap/nselib/iscsi.lua
+share/nmap/nselib/isns.lua
+share/nmap/nselib/jdwp.lua
 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/mobileme.lua
 share/nmap/nselib/mongodb.lua
 share/nmap/nselib/msrpc.lua
 share/nmap/nselib/msrpcperformance.lua
@@ -102,11 +341,13 @@ share/nmap/nselib/netbios.lua
 share/nmap/nselib/nrpc.lua
 share/nmap/nselib/nsedebug.lua
 share/nmap/nselib/omp2.lua
+share/nmap/nselib/ospf.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/rdp.lua
 share/nmap/nselib/redis.lua
 share/nmap/nselib/rmi.lua
 share/nmap/nselib/rpc.lua
@@ -150,6 +391,11 @@ 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/ajp-auth.nse
+share/nmap/scripts/ajp-brute.nse
+share/nmap/scripts/ajp-headers.nse
+share/nmap/scripts/ajp-methods.nse
+share/nmap/scripts/ajp-request.nse
 share/nmap/scripts/amqp-info.nse
 share/nmap/scripts/asn-query.nse
 share/nmap/scripts/auth-owners.nse
@@ -161,12 +407,17 @@ 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/bjnp-discover.nse
+share/nmap/scripts/broadcast-ataoe-discover.nse
 share/nmap/scripts/broadcast-avahi-dos.nse
+share/nmap/scripts/broadcast-bjnp-discover.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-eigrp-discovery.nse
+share/nmap/scripts/broadcast-igmp-discovery.nse
 share/nmap/scripts/broadcast-listener.nse
 share/nmap/scripts/broadcast-ms-sql-discover.nse
 share/nmap/scripts/broadcast-netbios-master-browser.nse
@@ -174,17 +425,21 @@ 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-pim-discovery.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-tellstick-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/cassandra-brute.nse
+share/nmap/scripts/cassandra-info.nse
 share/nmap/scripts/cccam-version.nse
 share/nmap/scripts/citrix-brute-xml.nse
 share/nmap/scripts/citrix-enum-apps-xml.nse
@@ -194,6 +449,8 @@ 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/cups-info.nse
+share/nmap/scripts/cups-queue-info.nse
 share/nmap/scripts/cvs-brute-repository.nse
 share/nmap/scripts/cvs-brute.nse
 share/nmap/scripts/daap-get-library.nse
@@ -201,12 +458,17 @@ 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/dict-info.nse
+share/nmap/scripts/distcc-cve2004-2687.nse
 share/nmap/scripts/dns-blacklist.nse
 share/nmap/scripts/dns-brute.nse
 share/nmap/scripts/dns-cache-snoop.nse
+share/nmap/scripts/dns-check-zone.nse
 share/nmap/scripts/dns-client-subnet-scan.nse
 share/nmap/scripts/dns-fuzz.nse
+share/nmap/scripts/dns-ip6-arpa-scan.nse
 share/nmap/scripts/dns-nsec-enum.nse
+share/nmap/scripts/dns-nsec3-enum.nse
 share/nmap/scripts/dns-nsid.nse
 share/nmap/scripts/dns-random-srcport.nse
 share/nmap/scripts/dns-random-txid.nse
@@ -225,8 +487,11 @@ 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/eppc-enum-processes.nse
 share/nmap/scripts/finger.nse
 share/nmap/scripts/firewalk.nse
+share/nmap/scripts/firewall-bypass.nse
+share/nmap/scripts/flume-master-info.nse
 share/nmap/scripts/ftp-anon.nse
 share/nmap/scripts/ftp-bounce.nse
 share/nmap/scripts/ftp-brute.nse
@@ -236,7 +501,9 @@ 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/gkrellm-info.nse
 share/nmap/scripts/gopher-ls.nse
+share/nmap/scripts/gpsd-info.nse
 share/nmap/scripts/hadoop-datanode-info.nse
 share/nmap/scripts/hadoop-jobtracker-info.nse
 share/nmap/scripts/hadoop-namenode-info.nse
@@ -246,6 +513,7 @@ share/nmap/scripts/hbase-master-info.nse
 share/nmap/scripts/hbase-region-info.nse
 share/nmap/scripts/hddtemp-info.nse
 share/nmap/scripts/hostmap-bfk.nse
+share/nmap/scripts/hostmap-robtex.nse
 share/nmap/scripts/http-affiliate-id.nse
 share/nmap/scripts/http-apache-negotiation.nse
 share/nmap/scripts/http-auth-finder.nse
@@ -262,14 +530,24 @@ 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-drupal-enum-users.nse
+share/nmap/scripts/http-drupal-modules.nse
 share/nmap/scripts/http-email-harvest.nse
 share/nmap/scripts/http-enum.nse
+share/nmap/scripts/http-exif-spider.nse
 share/nmap/scripts/http-favicon.nse
 share/nmap/scripts/http-form-brute.nse
+share/nmap/scripts/http-form-fuzzer.nse
+share/nmap/scripts/http-frontpage-login.nse
 share/nmap/scripts/http-generator.nse
+share/nmap/scripts/http-git.nse
+share/nmap/scripts/http-gitweb-projects-enum.nse
 share/nmap/scripts/http-google-malware.nse
 share/nmap/scripts/http-grep.nse
 share/nmap/scripts/http-headers.nse
+share/nmap/scripts/http-huawei-hg5xx-vuln.nse
+share/nmap/scripts/http-icloud-findmyiphone.nse
+share/nmap/scripts/http-icloud-sendmsg.nse
 share/nmap/scripts/http-iis-webdav-vuln.nse
 share/nmap/scripts/http-joomla-brute.nse
 share/nmap/scripts/http-litespeed-sourcecode-download.nse
@@ -281,45 +559,66 @@ 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-phpself-xss.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-rfi-spider.nse
 share/nmap/scripts/http-robots.txt.nse
 share/nmap/scripts/http-robtex-reverse-ip.nse
+share/nmap/scripts/http-robtex-shared-ns.nse
+share/nmap/scripts/http-sitemap-generator.nse
+share/nmap/scripts/http-slowloris-check.nse
+share/nmap/scripts/http-slowloris.nse
+share/nmap/scripts/http-sql-injection.nse
 share/nmap/scripts/http-title.nse
+share/nmap/scripts/http-tplink-dir-traversal.nse
 share/nmap/scripts/http-trace.nse
+share/nmap/scripts/http-traceroute.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-virustotal.nse
+share/nmap/scripts/http-vlcstreamer-ls.nse
 share/nmap/scripts/http-vmware-path-vuln.nse
 share/nmap/scripts/http-vuln-cve2009-3960.nse
+share/nmap/scripts/http-vuln-cve2010-0738.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-waf-fingerprint.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/icap-info.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-forwarding.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/ipv6-ra-flood.nse
 share/nmap/scripts/irc-botnet-channels.nse
 share/nmap/scripts/irc-brute.nse
 share/nmap/scripts/irc-info.nse
+share/nmap/scripts/irc-sasl-brute.nse
 share/nmap/scripts/irc-unrealircd-backdoor.nse
 share/nmap/scripts/iscsi-brute.nse
 share/nmap/scripts/iscsi-info.nse
+share/nmap/scripts/isns-info.nse
+share/nmap/scripts/jdwp-exec.nse
+share/nmap/scripts/jdwp-info.nse
+share/nmap/scripts/jdwp-inject.nse
 share/nmap/scripts/jdwp-version.nse
 share/nmap/scripts/krb5-enum-users.nse
 share/nmap/scripts/ldap-brute.nse
@@ -327,18 +626,26 @@ 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/llmnr-resolve.nse
 share/nmap/scripts/lltd-discovery.nse
 share/nmap/scripts/maxdb-info.nse
+share/nmap/scripts/mcafee-epo-agent.nse
 share/nmap/scripts/membase-brute.nse
 share/nmap/scripts/membase-http-info.nse
 share/nmap/scripts/memcached-info.nse
+share/nmap/scripts/metasploit-info.nse
+share/nmap/scripts/metasploit-msgrpc-brute.nse
 share/nmap/scripts/metasploit-xmlrpc-brute.nse
+share/nmap/scripts/mmouse-brute.nse
+share/nmap/scripts/mmouse-exec.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/mrinfo.nse
 share/nmap/scripts/ms-sql-brute.nse
 share/nmap/scripts/ms-sql-config.nse
+share/nmap/scripts/ms-sql-dac.nse
 share/nmap/scripts/ms-sql-dump-hashes.nse
 share/nmap/scripts/ms-sql-empty-password.nse
 share/nmap/scripts/ms-sql-hasdbaccess.nse
@@ -346,13 +653,18 @@ 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/msrpc-enum.nse
+share/nmap/scripts/mtrace.nse
 share/nmap/scripts/mysql-audit.nse
 share/nmap/scripts/mysql-brute.nse
 share/nmap/scripts/mysql-databases.nse
+share/nmap/scripts/mysql-dump-hashes.nse
 share/nmap/scripts/mysql-empty-password.nse
 share/nmap/scripts/mysql-info.nse
+share/nmap/scripts/mysql-query.nse
 share/nmap/scripts/mysql-users.nse
 share/nmap/scripts/mysql-variables.nse
+share/nmap/scripts/mysql-vuln-cve2012-2122.nse
 share/nmap/scripts/nat-pmp-info.nse
 share/nmap/scripts/nat-pmp-mapport.nse
 share/nmap/scripts/nbstat.nse
@@ -378,12 +690,14 @@ 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-stealth.nse
 share/nmap/scripts/oracle-brute.nse
 share/nmap/scripts/oracle-enum-users.nse
 share/nmap/scripts/oracle-sid-brute.nse
 share/nmap/scripts/ovs-agent-version.nse
 share/nmap/scripts/p2p-conficker.nse
 share/nmap/scripts/path-mtu.nse
+share/nmap/scripts/pcanywhere-brute.nse
 share/nmap/scripts/pgsql-brute.nse
 share/nmap/scripts/pjl-ready-message.nse
 share/nmap/scripts/pop3-brute.nse
@@ -392,6 +706,7 @@ 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-enum-encryption.nse
 share/nmap/scripts/rdp-vuln-ms12-020.nse
 share/nmap/scripts/realvnc-auth-bypass.nse
 share/nmap/scripts/redis-brute.nse
@@ -402,6 +717,8 @@ 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/rmi-vuln-classloader.nse
+share/nmap/scripts/rpc-grind.nse
 share/nmap/scripts/rpcap-brute.nse
 share/nmap/scripts/rpcap-info.nse
 share/nmap/scripts/rpcinfo.nse
@@ -413,7 +730,9 @@ 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-call-spoof.nse
 share/nmap/scripts/sip-enum-users.nse
+share/nmap/scripts/sip-methods.nse
 share/nmap/scripts/skypev2-version.nse
 share/nmap/scripts/smb-brute.nse
 share/nmap/scripts/smb-check-vulns.nse
@@ -424,12 +743,16 @@ 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-ls.nse
 share/nmap/scripts/smb-mbenum.nse
 share/nmap/scripts/smb-os-discovery.nse
+share/nmap/scripts/smb-print-text.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/smb-vuln-ms10-054.nse
+share/nmap/scripts/smb-vuln-ms10-061.nse
 share/nmap/scripts/smbv2-enabled.nse
 share/nmap/scripts/smtp-brute.nse
 share/nmap/scripts/smtp-commands.nse
@@ -441,6 +764,7 @@ 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-hh3c-logins.nse
 share/nmap/scripts/snmp-interfaces.nse
 share/nmap/scripts/snmp-ios-config.nse
 share/nmap/scripts/snmp-netstat.nse
@@ -453,11 +777,11 @@ 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
 share/nmap/scripts/ssh2-enum-algos.nse
 share/nmap/scripts/sshv1.nse
 share/nmap/scripts/ssl-cert.nse
+share/nmap/scripts/ssl-date.nse
 share/nmap/scripts/ssl-enum-ciphers.nse
 share/nmap/scripts/ssl-google-cert-catalog.nse
 share/nmap/scripts/ssl-known-key.nse
@@ -476,6 +800,8 @@ 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/tls-nextprotoneg.nse
+share/nmap/scripts/traceroute-geolocation.nse
 share/nmap/scripts/unusual-port.nse
 share/nmap/scripts/upnp-info.nse
 share/nmap/scripts/url-snarf.nse
@@ -492,3 +818,58 @@ share/nmap/scripts/x11-access.nse
 share/nmap/scripts/xdmcp-discover.nse
 share/nmap/scripts/xmpp-brute.nse
 share/nmap/scripts/xmpp-info.nse
+${PLIST.zenmap}share/zenmap/config/scan_profile.usp
+${PLIST.zenmap}share/zenmap/config/zenmap.conf
+${PLIST.zenmap}share/zenmap/config/zenmap_version
+${PLIST.zenmap}share/zenmap/docs/help.html
+${PLIST.zenmap}share/zenmap/locale/de/LC_MESSAGES/zenmap.mo
+${PLIST.zenmap}share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo
+${PLIST.zenmap}share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo
+${PLIST.zenmap}share/zenmap/locale/it/LC_MESSAGES/zenmap.mo
+${PLIST.zenmap}share/zenmap/locale/ja/LC_MESSAGES/zenmap.mo
+${PLIST.zenmap}share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo
+${PLIST.zenmap}share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo
+${PLIST.zenmap}share/zenmap/misc/profile_editor.xml
+${PLIST.zenmap}share/zenmap/pixmaps/default_32.png
+${PLIST.zenmap}share/zenmap/pixmaps/default_75.png
+${PLIST.zenmap}share/zenmap/pixmaps/freebsd_32.png
+${PLIST.zenmap}share/zenmap/pixmaps/freebsd_75.png
+${PLIST.zenmap}share/zenmap/pixmaps/irix_32.png
+${PLIST.zenmap}share/zenmap/pixmaps/irix_75.png
+${PLIST.zenmap}share/zenmap/pixmaps/linux_32.png
+${PLIST.zenmap}share/zenmap/pixmaps/linux_75.png
+${PLIST.zenmap}share/zenmap/pixmaps/macosx_32.png
+${PLIST.zenmap}share/zenmap/pixmaps/macosx_75.png
+${PLIST.zenmap}share/zenmap/pixmaps/openbsd_32.png
+${PLIST.zenmap}share/zenmap/pixmaps/openbsd_75.png
+${PLIST.zenmap}share/zenmap/pixmaps/radialnet/border.png
+${PLIST.zenmap}share/zenmap/pixmaps/radialnet/firewall.png
+${PLIST.zenmap}share/zenmap/pixmaps/radialnet/logo.png
+${PLIST.zenmap}share/zenmap/pixmaps/radialnet/padlock.png
+${PLIST.zenmap}share/zenmap/pixmaps/radialnet/router.png
+${PLIST.zenmap}share/zenmap/pixmaps/radialnet/switch.png
+${PLIST.zenmap}share/zenmap/pixmaps/radialnet/wireless.png
+${PLIST.zenmap}share/zenmap/pixmaps/redhat_32.png
+${PLIST.zenmap}share/zenmap/pixmaps/redhat_75.png
+${PLIST.zenmap}share/zenmap/pixmaps/solaris_32.png
+${PLIST.zenmap}share/zenmap/pixmaps/solaris_75.png
+${PLIST.zenmap}share/zenmap/pixmaps/throbber.gif
+${PLIST.zenmap}share/zenmap/pixmaps/throbber.png
+${PLIST.zenmap}share/zenmap/pixmaps/ubuntu_32.png
+${PLIST.zenmap}share/zenmap/pixmaps/ubuntu_75.png
+${PLIST.zenmap}share/zenmap/pixmaps/unknown_32.png
+${PLIST.zenmap}share/zenmap/pixmaps/unknown_75.png
+${PLIST.zenmap}share/zenmap/pixmaps/vl_1_32.png
+${PLIST.zenmap}share/zenmap/pixmaps/vl_1_75.png
+${PLIST.zenmap}share/zenmap/pixmaps/vl_2_32.png
+${PLIST.zenmap}share/zenmap/pixmaps/vl_2_75.png
+${PLIST.zenmap}share/zenmap/pixmaps/vl_3_32.png
+${PLIST.zenmap}share/zenmap/pixmaps/vl_3_75.png
+${PLIST.zenmap}share/zenmap/pixmaps/vl_4_32.png
+${PLIST.zenmap}share/zenmap/pixmaps/vl_4_75.png
+${PLIST.zenmap}share/zenmap/pixmaps/vl_5_32.png
+${PLIST.zenmap}share/zenmap/pixmaps/vl_5_75.png
+${PLIST.zenmap}share/zenmap/pixmaps/win_32.png
+${PLIST.zenmap}share/zenmap/pixmaps/win_75.png
+${PLIST.zenmap}share/zenmap/pixmaps/zenmap.png
+${PLIST.zenmap}share/zenmap/su-to-zenmap.sh
diff --git a/net/nmap/PLIST.ndiff b/net/nmap/PLIST.ndiff
deleted file mode 100644
index 77ae84bc01b..00000000000
--- a/net/nmap/PLIST.ndiff
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.ndiff,v 1.1 2009/07/20 19:40:52 adrianp Exp $
-bin/ndiff
-man/man1/ndiff.1
diff --git a/net/nmap/PLIST.zenmap b/net/nmap/PLIST.zenmap
deleted file mode 100644
index ed9b06e52eb..00000000000
--- a/net/nmap/PLIST.zenmap
+++ /dev/null
@@ -1,271 +0,0 @@
-@comment $NetBSD: PLIST.zenmap,v 1.9 2012/09/16 20:29:06 pettai Exp $
-bin/nmapfe
-bin/uninstall_zenmap
-bin/xnmap
-bin/zenmap
-${PYSITELIB}/radialnet/__init__.py
-${PYSITELIB}/radialnet/__init__.pyc
-${PYSITELIB}/radialnet/bestwidgets/__init__.py
-${PYSITELIB}/radialnet/bestwidgets/__init__.pyc
-${PYSITELIB}/radialnet/bestwidgets/boxes.py
-${PYSITELIB}/radialnet/bestwidgets/boxes.pyc
-${PYSITELIB}/radialnet/bestwidgets/buttons.py
-${PYSITELIB}/radialnet/bestwidgets/buttons.pyc
-${PYSITELIB}/radialnet/bestwidgets/comboboxes.py
-${PYSITELIB}/radialnet/bestwidgets/comboboxes.pyc
-${PYSITELIB}/radialnet/bestwidgets/expanders.py
-${PYSITELIB}/radialnet/bestwidgets/expanders.pyc
-${PYSITELIB}/radialnet/bestwidgets/frames.py
-${PYSITELIB}/radialnet/bestwidgets/frames.pyc
-${PYSITELIB}/radialnet/bestwidgets/labels.py
-${PYSITELIB}/radialnet/bestwidgets/labels.pyc
-${PYSITELIB}/radialnet/bestwidgets/textview.py
-${PYSITELIB}/radialnet/bestwidgets/textview.pyc
-${PYSITELIB}/radialnet/bestwidgets/windows.py
-${PYSITELIB}/radialnet/bestwidgets/windows.pyc
-${PYSITELIB}/radialnet/core/ArgvHandle.py
-${PYSITELIB}/radialnet/core/ArgvHandle.pyc
-${PYSITELIB}/radialnet/core/Coordinate.py
-${PYSITELIB}/radialnet/core/Coordinate.pyc
-${PYSITELIB}/radialnet/core/Graph.py
-${PYSITELIB}/radialnet/core/Graph.pyc
-${PYSITELIB}/radialnet/core/Info.py
-${PYSITELIB}/radialnet/core/Info.pyc
-${PYSITELIB}/radialnet/core/Interpolation.py
-${PYSITELIB}/radialnet/core/Interpolation.pyc
-${PYSITELIB}/radialnet/core/XMLHandler.py
-${PYSITELIB}/radialnet/core/XMLHandler.pyc
-${PYSITELIB}/radialnet/core/__init__.py
-${PYSITELIB}/radialnet/core/__init__.pyc
-${PYSITELIB}/radialnet/gui/Application.py
-${PYSITELIB}/radialnet/gui/Application.pyc
-${PYSITELIB}/radialnet/gui/ControlWidget.py
-${PYSITELIB}/radialnet/gui/ControlWidget.pyc
-${PYSITELIB}/radialnet/gui/Dialogs.py
-${PYSITELIB}/radialnet/gui/Dialogs.pyc
-${PYSITELIB}/radialnet/gui/HostsViewer.py
-${PYSITELIB}/radialnet/gui/HostsViewer.pyc
-${PYSITELIB}/radialnet/gui/Image.py
-${PYSITELIB}/radialnet/gui/Image.pyc
-${PYSITELIB}/radialnet/gui/NodeNotebook.py
-${PYSITELIB}/radialnet/gui/NodeNotebook.pyc
-${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
-${PYSITELIB}/radialnet/gui/__init__.pyc
-${PYSITELIB}/radialnet/util/__init__.py
-${PYSITELIB}/radialnet/util/__init__.pyc
-${PYSITELIB}/radialnet/util/drawing.py
-${PYSITELIB}/radialnet/util/drawing.pyc
-${PYSITELIB}/radialnet/util/geometry.py
-${PYSITELIB}/radialnet/util/geometry.pyc
-${PYSITELIB}/radialnet/util/integration.py
-${PYSITELIB}/radialnet/util/integration.pyc
-${PYSITELIB}/radialnet/util/misc.py
-${PYSITELIB}/radialnet/util/misc.pyc
-${PYSITELIB}/zenmapCore/BasePaths.py
-${PYSITELIB}/zenmapCore/BasePaths.pyc
-${PYSITELIB}/zenmapCore/Diff.py
-${PYSITELIB}/zenmapCore/Diff.pyc
-${PYSITELIB}/zenmapCore/I18N.py
-${PYSITELIB}/zenmapCore/I18N.pyc
-${PYSITELIB}/zenmapCore/NSEDocParser.py
-${PYSITELIB}/zenmapCore/NSEDocParser.pyc
-${PYSITELIB}/zenmapCore/Name.py
-${PYSITELIB}/zenmapCore/Name.pyc
-${PYSITELIB}/zenmapCore/NetworkInventory.py
-${PYSITELIB}/zenmapCore/NetworkInventory.pyc
-${PYSITELIB}/zenmapCore/NmapCommand.py
-${PYSITELIB}/zenmapCore/NmapCommand.pyc
-${PYSITELIB}/zenmapCore/NmapOptions.py
-${PYSITELIB}/zenmapCore/NmapOptions.pyc
-${PYSITELIB}/zenmapCore/NmapParser.py
-${PYSITELIB}/zenmapCore/NmapParser.pyc
-${PYSITELIB}/zenmapCore/Paths.py
-${PYSITELIB}/zenmapCore/Paths.pyc
-${PYSITELIB}/zenmapCore/RecentScans.py
-${PYSITELIB}/zenmapCore/RecentScans.pyc
-${PYSITELIB}/zenmapCore/ScriptArgsParser.py
-${PYSITELIB}/zenmapCore/ScriptArgsParser.pyc
-${PYSITELIB}/zenmapCore/ScriptMetadata.py
-${PYSITELIB}/zenmapCore/ScriptMetadata.pyc
-${PYSITELIB}/zenmapCore/SearchResult.py
-${PYSITELIB}/zenmapCore/SearchResult.pyc
-${PYSITELIB}/zenmapCore/StringPool.py
-${PYSITELIB}/zenmapCore/StringPool.pyc
-${PYSITELIB}/zenmapCore/TargetList.py
-${PYSITELIB}/zenmapCore/TargetList.pyc
-${PYSITELIB}/zenmapCore/UmitConf.py
-${PYSITELIB}/zenmapCore/UmitConf.pyc
-${PYSITELIB}/zenmapCore/UmitConfigParser.py
-${PYSITELIB}/zenmapCore/UmitConfigParser.pyc
-${PYSITELIB}/zenmapCore/UmitDB.py
-${PYSITELIB}/zenmapCore/UmitDB.pyc
-${PYSITELIB}/zenmapCore/UmitLogging.py
-${PYSITELIB}/zenmapCore/UmitLogging.pyc
-${PYSITELIB}/zenmapCore/UmitOptionParser.py
-${PYSITELIB}/zenmapCore/UmitOptionParser.pyc
-${PYSITELIB}/zenmapCore/Version.py
-${PYSITELIB}/zenmapCore/Version.pyc
-${PYSITELIB}/zenmapCore/__init__.py
-${PYSITELIB}/zenmapCore/__init__.pyc
-${PYSITELIB}/zenmapGUI/About.py
-${PYSITELIB}/zenmapGUI/About.pyc
-${PYSITELIB}/zenmapGUI/App.py
-${PYSITELIB}/zenmapGUI/App.pyc
-${PYSITELIB}/zenmapGUI/BugReport.py
-${PYSITELIB}/zenmapGUI/BugReport.pyc
-${PYSITELIB}/zenmapGUI/CrashReport.py
-${PYSITELIB}/zenmapGUI/CrashReport.pyc
-${PYSITELIB}/zenmapGUI/DiffCompare.py
-${PYSITELIB}/zenmapGUI/DiffCompare.pyc
-${PYSITELIB}/zenmapGUI/FileChoosers.py
-${PYSITELIB}/zenmapGUI/FileChoosers.pyc
-${PYSITELIB}/zenmapGUI/FilterBar.py
-${PYSITELIB}/zenmapGUI/FilterBar.pyc
-${PYSITELIB}/zenmapGUI/Icons.py
-${PYSITELIB}/zenmapGUI/Icons.pyc
-${PYSITELIB}/zenmapGUI/MainWindow.py
-${PYSITELIB}/zenmapGUI/MainWindow.pyc
-${PYSITELIB}/zenmapGUI/NmapOutputProperties.py
-${PYSITELIB}/zenmapGUI/NmapOutputProperties.pyc
-${PYSITELIB}/zenmapGUI/NmapOutputViewer.py
-${PYSITELIB}/zenmapGUI/NmapOutputViewer.pyc
-${PYSITELIB}/zenmapGUI/OptionBuilder.py
-${PYSITELIB}/zenmapGUI/OptionBuilder.pyc
-${PYSITELIB}/zenmapGUI/Print.py
-${PYSITELIB}/zenmapGUI/Print.pyc
-${PYSITELIB}/zenmapGUI/ProfileCombo.py
-${PYSITELIB}/zenmapGUI/ProfileCombo.pyc
-${PYSITELIB}/zenmapGUI/ProfileEditor.py
-${PYSITELIB}/zenmapGUI/ProfileEditor.pyc
-${PYSITELIB}/zenmapGUI/ProfileHelp.py
-${PYSITELIB}/zenmapGUI/ProfileHelp.pyc
-${PYSITELIB}/zenmapGUI/ScanHostDetailsPage.py
-${PYSITELIB}/zenmapGUI/ScanHostDetailsPage.pyc
-${PYSITELIB}/zenmapGUI/ScanHostsView.py
-${PYSITELIB}/zenmapGUI/ScanHostsView.pyc
-${PYSITELIB}/zenmapGUI/ScanInterface.py
-${PYSITELIB}/zenmapGUI/ScanInterface.pyc
-${PYSITELIB}/zenmapGUI/ScanNmapOutputPage.py
-${PYSITELIB}/zenmapGUI/ScanNmapOutputPage.pyc
-${PYSITELIB}/zenmapGUI/ScanOpenPortsPage.py
-${PYSITELIB}/zenmapGUI/ScanOpenPortsPage.pyc
-${PYSITELIB}/zenmapGUI/ScanRunDetailsPage.py
-${PYSITELIB}/zenmapGUI/ScanRunDetailsPage.pyc
-${PYSITELIB}/zenmapGUI/ScanScanListPage.py
-${PYSITELIB}/zenmapGUI/ScanScanListPage.pyc
-${PYSITELIB}/zenmapGUI/ScanToolbar.py
-${PYSITELIB}/zenmapGUI/ScanToolbar.pyc
-${PYSITELIB}/zenmapGUI/ScansListStore.py
-${PYSITELIB}/zenmapGUI/ScansListStore.pyc
-${PYSITELIB}/zenmapGUI/ScriptInterface.py
-${PYSITELIB}/zenmapGUI/ScriptInterface.pyc
-${PYSITELIB}/zenmapGUI/SearchGUI.py
-${PYSITELIB}/zenmapGUI/SearchGUI.pyc
-${PYSITELIB}/zenmapGUI/SearchWindow.py
-${PYSITELIB}/zenmapGUI/SearchWindow.pyc
-${PYSITELIB}/zenmapGUI/TargetCombo.py
-${PYSITELIB}/zenmapGUI/TargetCombo.pyc
-${PYSITELIB}/zenmapGUI/TopologyPage.py
-${PYSITELIB}/zenmapGUI/TopologyPage.pyc
-${PYSITELIB}/zenmapGUI/__init__.py
-${PYSITELIB}/zenmapGUI/__init__.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/__init__.py
-${PYSITELIB}/zenmapGUI/higwidgets/__init__.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/gtkutils.py
-${PYSITELIB}/zenmapGUI/higwidgets/gtkutils.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/higboxes.py
-${PYSITELIB}/zenmapGUI/higwidgets/higboxes.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/higbuttons.py
-${PYSITELIB}/zenmapGUI/higwidgets/higbuttons.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/higdialogs.py
-${PYSITELIB}/zenmapGUI/higwidgets/higdialogs.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/higentries.py
-${PYSITELIB}/zenmapGUI/higwidgets/higentries.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/higexpanders.py
-${PYSITELIB}/zenmapGUI/higwidgets/higexpanders.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/higframe.py
-${PYSITELIB}/zenmapGUI/higwidgets/higframe.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/higlabels.py
-${PYSITELIB}/zenmapGUI/higwidgets/higlabels.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/higlogindialogs.py
-${PYSITELIB}/zenmapGUI/higwidgets/higlogindialogs.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/hignotebooks.py
-${PYSITELIB}/zenmapGUI/higwidgets/hignotebooks.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/higprogressbars.py
-${PYSITELIB}/zenmapGUI/higwidgets/higprogressbars.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/higscrollers.py
-${PYSITELIB}/zenmapGUI/higwidgets/higscrollers.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/higspinner.py
-${PYSITELIB}/zenmapGUI/higwidgets/higspinner.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/higtables.py
-${PYSITELIB}/zenmapGUI/higwidgets/higtables.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/higtextviewers.py
-${PYSITELIB}/zenmapGUI/higwidgets/higtextviewers.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/higwindows.py
-${PYSITELIB}/zenmapGUI/higwidgets/higwindows.pyc
-${PYSITELIB}/zenmapGUI/higwidgets/utils.py
-${PYSITELIB}/zenmapGUI/higwidgets/utils.pyc
-man/man1/zenmap.1
-share/applications/zenmap-root.desktop
-share/applications/zenmap.desktop
-share/zenmap/config/scan_profile.usp
-share/zenmap/config/zenmap.conf
-share/zenmap/config/zenmap_version
-share/zenmap/docs/help.html
-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/locale/ru/LC_MESSAGES/zenmap.mo
-share/zenmap/misc/profile_editor.xml
-share/zenmap/pixmaps/default_32.png
-share/zenmap/pixmaps/default_75.png
-share/zenmap/pixmaps/freebsd_32.png
-share/zenmap/pixmaps/freebsd_75.png
-share/zenmap/pixmaps/irix_32.png
-share/zenmap/pixmaps/irix_75.png
-share/zenmap/pixmaps/linux_32.png
-share/zenmap/pixmaps/linux_75.png
-share/zenmap/pixmaps/macosx_32.png
-share/zenmap/pixmaps/macosx_75.png
-share/zenmap/pixmaps/openbsd_32.png
-share/zenmap/pixmaps/openbsd_75.png
-share/zenmap/pixmaps/radialnet/border.png
-share/zenmap/pixmaps/radialnet/firewall.png
-share/zenmap/pixmaps/radialnet/logo.png
-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_32.png
-share/zenmap/pixmaps/redhat_75.png
-share/zenmap/pixmaps/solaris_32.png
-share/zenmap/pixmaps/solaris_75.png
-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_32.png
-share/zenmap/pixmaps/unknown_75.png
-share/zenmap/pixmaps/vl_1_32.png
-share/zenmap/pixmaps/vl_1_75.png
-share/zenmap/pixmaps/vl_2_32.png
-share/zenmap/pixmaps/vl_2_75.png
-share/zenmap/pixmaps/vl_3_32.png
-share/zenmap/pixmaps/vl_3_75.png
-share/zenmap/pixmaps/vl_4_32.png
-share/zenmap/pixmaps/vl_4_75.png
-share/zenmap/pixmaps/vl_5_32.png
-share/zenmap/pixmaps/vl_5_75.png
-share/zenmap/pixmaps/win_32.png
-share/zenmap/pixmaps/win_75.png
-share/zenmap/pixmaps/zenmap.png
-share/zenmap/su-to-zenmap.sh
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 0163376c66a..975a50e653e 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.58 2012/10/20 22:59:30 pettai Exp $
+$NetBSD: distinfo,v 1.59 2013/05/20 06:21:22 adam Exp $
 
-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 (nmap-6.25.tar.bz2) = 769943a1a5c10f67bf9738e26da42b3312db752f
+RMD160 (nmap-6.25.tar.bz2) = 8267788be9e98f3219eff9fee8b5efcfa5e5e932
+Size (nmap-6.25.tar.bz2) = 7668639 bytes
+SHA1 (patch-ab) = ab3df07bc7a57fa6736f743c480e0c9497b43053
 SHA1 (patch-ac) = c22e8f6411b1152a6e7582c90e5ec5bd4c6acaad
-SHA1 (patch-an) = ddafce5f617c1c547912895f345c80a52c9e7656
diff --git a/net/nmap/options.mk b/net/nmap/options.mk
index ee866f8776f..e3e99e5da3f 100644
--- a/net/nmap/options.mk
+++ b/net/nmap/options.mk
@@ -1,29 +1,42 @@
-# $NetBSD: options.mk,v 1.8 2013/04/07 10:11:54 abs Exp $
+# $NetBSD: options.mk,v 1.9 2013/05/20 06:21:22 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nmap
 
-PKG_SUPPORTED_OPTIONS=	inet6 zenmap ndiff
+PKG_SUPPORTED_OPTIONS=	inet6 ndiff zenmap
 PKG_SUGGESTED_OPTIONS=	inet6
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=	ndiff zenmap
+
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-###
-### Enable dynamically loadable preprocessors, detection engine
-### and rules libraries.
-###
+.if !empty(PKG_OPTIONS:Mndiff)
+CONFIGURE_ARGS+=	--with-ndiff
+PLIST.ndiff=		yes
+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.
+.include "../../lang/python/application.mk"
+.else
+CONFIGURE_ARGS+=		--without-ndiff
+.endif
+
+# Enable dynamically loadable preprocessors, detection engine
+# and rules libraries.
 .if !empty(PKG_OPTIONS:Mzenmap)
-CONFIGURE_ARGS+=		--with-zenmap
-PLIST_SRC+=			${PKGDIR}/PLIST.zenmap
-PY_PATCHPLIST=			yes
-REPLACE_PYTHON+=		zenmap/zenmapCore/*.py
-REPLACE_PYTHON+=		zenmap/zenmapGUI/*.py
-REPLACE_PYTHON+=		zenmap/zenmapGUI/higwidgets/*.py
+CONFIGURE_ARGS+=	--with-zenmap
+PLIST.zenmap=		yes
+PY_PATCHPLIST=		yes
+REPLACE_PYTHON+=	zenmap/zenmapCore/*.py
+REPLACE_PYTHON+=	zenmap/zenmapGUI/*.py
+REPLACE_PYTHON+=	zenmap/zenmapGUI/higwidgets/*.py
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
@@ -33,16 +46,3 @@ REPLACE_PYTHON+=		zenmap/zenmapGUI/higwidgets/*.py
 .else
 CONFIGURE_ARGS+=	--without-zenmap
 .endif
-
-.if !empty(PKG_OPTIONS:Mndiff)
-CONFIGURE_ARGS+=		--with-ndiff
-PLIST_SRC+=			${PKGDIR}/PLIST.ndiff
-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.
-.include "../../lang/python/application.mk"
-.else
-CONFIGURE_ARGS+=		--without-ndiff
-.endif
diff --git a/net/nmap/patches/patch-ab b/net/nmap/patches/patch-ab
index 366ad2b4d56..d953098040a 100644
--- a/net/nmap/patches/patch-ab
+++ b/net/nmap/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.18 2012/09/16 20:29:06 pettai Exp $
+$NetBSD: patch-ab,v 1.19 2013/05/20 06:21:22 adam Exp $
 
---- configure.orig	2011-01-21 21:00:04.000000000 +0000
+--- configure.orig	2012-11-16 00:54:16.000000000 +0000
 +++ configure
-@@ -6115,6 +6115,7 @@ else
+@@ -6311,6 +6311,7 @@ else
  extern char pcap_version[];
  int main() {
    int major, minor1, minor2;
 +  exit(0);	/* fool it */
    sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
    if (major > 0)
-     exit(0);
+     return 0;
diff --git a/net/nmap/patches/patch-an b/net/nmap/patches/patch-an
deleted file mode 100644
index 91fe62723dd..00000000000
--- a/net/nmap/patches/patch-an
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-an,v 1.2 2012/10/20 22:59:30 pettai Exp $
-
-Fix for sa_len size problem on NetBSD
-(See commit r29739 in nmap's svn for details)
-
-Fix (build) for Solaris 10
-(See commit r29672 in nmap's svn or PR pkg/47033)
-
---- 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
-@@ -954,9 +955,11 @@ intf_loop(intf_t *intf, intf_handler cal
- 			;
- 		else
- 			return (-1);
-+#ifdef IFF_IPMP
- 		if (lifr->lifr_flags & IFF_IPMP) {
- 			continue;
- 		}
-+#endif
- 		
- 		if (_intf_get_noalias(intf, entry) < 0)
- 			return (-1);