- update nmap to version 5.35DC1

 - remove MD2 code from nse_openssl.cc (already removed in nmap svn)
 - remove naming conflict if openssl-1.x is build with SCTP support

Approved by:	glarkin (mentor)

8 files changed, 349 insertions, 167 deletions

diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index 0327cf6067f9..e41c160032a2 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nmap
-PORTVERSION=	5.21
-PORTREVISION=	1
+DISTVERSION=	5.35DC1
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		http://nmap.ucsd.edu/dist/ \
@@ -34,17 +33,24 @@ CONFIGURE_ENV=	LUA_INCDIR="${LUA_INCDIR}" LUA_LIBDIR="${LUA_LIBDIR}"
 
 MANLANG=	"" de es fr hr hu it jp pl pt_BR pt_PT ro ru sk zh
 MAN1=		nmap.1
-MAN1_EN=	ncat.1
-PLIST_SUB=	NCATDATADIR=share/ncat
+MAN1_EN=	ncat.1 nping.1
+PLIST_SUB+=	NCATDATADIR=share/ncat \
+		NPINGDIR=share/nping
 
 .ifndef WITHOUT_SSL
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -I${OPENSSLINC}"
+PLIST_SUB+=		WITHSSL=""
 .else
 CONFIGURE_ARGS+=	--without-openssl
+PLIST_SUB+=		WITHSSL="@comment "
 .endif
 
+# XXX limit results if we do a grep in the sources!
+post-patch:
+	@${RM} -rf ${WRKSRC}/mswin32
+
 post-configure:
 	@${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" ${WRKSRC}/Makefile
 
diff --git a/security/nmap/distinfo b/security/nmap/distinfo
index 11a649783437..ef565cf4d865 100644
--- a/security/nmap/distinfo
+++ b/security/nmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (nmap-5.21.tar.bz2) = f77fa51d89ab27d35e5cd87bb086b858
-SHA256 (nmap-5.21.tar.bz2) = 9fcb24f86157541c2f17cc8a0cc1e5d15d909b51720d163fcad5faaa6201b0ba
-SIZE (nmap-5.21.tar.bz2) = 10015121
+MD5 (nmap-5.35DC1.tar.bz2) = 5bc2f8629f26716aa78d4bfe474a5d3a
+SHA256 (nmap-5.35DC1.tar.bz2) = 51a6cde0a6afee50799d59b1968f1a4011753bb535f070114fd60be62f59ad44
+SIZE (nmap-5.35DC1.tar.bz2) = 11302092
diff --git a/security/nmap/files/patch-Makefile.in b/security/nmap/files/patch-Makefile.in
index 04b1646d2fcb..ce17a6a2581f 100644
--- a/security/nmap/files/patch-Makefile.in
+++ b/security/nmap/files/patch-Makefile.in
@@ -1,7 +1,7 @@
 --- Makefile.in.orig	2009-06-24 23:35:54.000000000 +0200
 +++ Makefile.in	2009-07-03 19:32:31.000000000 +0200
-@@ -10,7 +10,7 @@
- mandir = @mandir@
+@@ -11,7 +11,7 @@
+ top_srcdir = @top_srcdir@
  srcdir = @srcdir@
  nmapdatadir = @datadir@/nmap
 -deskdir = $(prefix)/share/applications
diff --git a/security/nmap/files/patch-libdnet-stripped__include__dnet__sctp.h b/security/nmap/files/patch-libdnet-stripped__include__dnet__sctp.h
new file mode 100644
index 000000000000..79ba3de78bc9
--- /dev/null
+++ b/security/nmap/files/patch-libdnet-stripped__include__dnet__sctp.h
@@ -0,0 +1,65 @@
+--- ./libdnet-stripped/include/dnet/sctp.h.orig	2009-07-05 23:02:43.000000000 +0200
++++ ./libdnet-stripped/include/dnet/sctp.h	2010-09-03 21:04:28.000000000 +0200
+@@ -36,7 +36,7 @@
+ 	sctp_pack_p->sh_vtag = htonl(vtag);				\
+ } while (0)
+ 
+-struct sctp_chunkhdr {
++struct dnet_sctp_chunkhdr {
+ 	uint8_t		sch_type;	/* chunk type */
+ 	uint8_t		sch_flags;	/* chunk flags */
+ 	uint16_t	sch_length;	/* chunk length */
+@@ -70,7 +70,7 @@
+ #define SCTP_TYPEFLAG_SKIP	2
+ 
+ #define sctp_pack_chunkhdr(hdr, type, flags, length) do {		\
+-	struct sctp_chunkhdr *sctp_pack_chp = (struct sctp_chunkhdr *)(hdr);\
++	struct dnet_sctp_chunkhdr *sctp_pack_chp = (struct dnet_sctp_chunkhdr *)(hdr);\
+ 	sctp_pack_chp->sch_type = type;					\
+ 	sctp_pack_chp->sch_flags = flags;				\
+ 	sctp_pack_chp->sch_length = htons(length);			\
+@@ -80,7 +80,7 @@
+  * INIT chunk
+  */
+ struct sctp_chunkhdr_init {
+-	struct sctp_chunkhdr chunkhdr;
++	struct dnet_sctp_chunkhdr chunkhdr;
+ 
+ 	uint32_t	schi_itag;	/* Initiate Tag */
+ 	uint32_t	schi_arwnd;	/* Advertised Receiver Window Credit */
+@@ -105,7 +105,7 @@
+  * INIT ACK chunk
+  */
+ struct sctp_chunkhdr_init_ack {
+-	struct sctp_chunkhdr chunkhdr;
++	struct dnet_sctp_chunkhdr chunkhdr;
+ 
+ 	uint32_t	schia_itag;	/* Initiate Tag */
+ 	uint32_t	schia_arwnd;	/* Advertised Receiver Window Credit */
+@@ -130,7 +130,7 @@
+  * ABORT chunk
+  */
+ struct sctp_chunkhdr_abort {
+-	struct sctp_chunkhdr chunkhdr;
++	struct dnet_sctp_chunkhdr chunkhdr;
+ 
+ 	/* empty */
+ } __attribute__((__packed__));
+@@ -145,7 +145,7 @@
+  * SHUTDOWN ACK chunk
+  */
+ struct sctp_chunkhdr_shutdown_ack {
+-	struct sctp_chunkhdr chunkhdr;
++	struct dnet_sctp_chunkhdr chunkhdr;
+ 
+ 	/* empty */
+ } __attribute__((__packed__));
+@@ -160,7 +160,7 @@
+  * COOKIE ECHO chunk
+  */
+ struct sctp_chunkhdr_cookie_echo {
+-	struct sctp_chunkhdr chunkhdr;
++	struct dnet_sctp_chunkhdr chunkhdr;
+ 
+ 	/* empty */
+ } __attribute__((__packed__));
diff --git a/security/nmap/files/patch-libdnet-stripped__src__eth-bsd.c b/security/nmap/files/patch-libdnet-stripped__src__eth-bsd.c
index 15bea72d3cec..4f615c58e0f0 100644
--- a/security/nmap/files/patch-libdnet-stripped__src__eth-bsd.c
+++ b/security/nmap/files/patch-libdnet-stripped__src__eth-bsd.c
@@ -1,11 +1,5 @@
-#
-# $FreeBSD$
-#
-# - nmap fails to attach to bpf when more than 128 bpfs are busy.
-# PR: 98080
-#
---- libdnet-stripped/src/eth-bsd.c.orig
-+++ libdnet-stripped/src/eth-bsd.c
+--- ./libdnet-stripped/src/eth-bsd.c.orig	2009-11-09 05:49:32.000000000 +0100
++++ ./libdnet-stripped/src/eth-bsd.c	2010-09-03 21:04:29.000000000 +0200
 @@ -45,7 +45,7 @@
  	int i;
  
@@ -13,5 +7,5 @@
 -		for (i = 0; i < 128; i++) {
 +		for (i = 0; i < 1024; i++) {
  			snprintf(file, sizeof(file), "/dev/bpf%d", i);
- 			e->fd = open(file, O_WRONLY);
- 			if (e->fd != -1 || errno != EBUSY)
+ 			/* This would be O_WRONLY, but Mac OS X 10.6 has a bug
+ 			   where that prevents other users of the interface
diff --git a/security/nmap/files/patch-nse_openssl.cc b/security/nmap/files/patch-nse_openssl.cc
new file mode 100644
index 000000000000..2a02a830b7ef
--- /dev/null
+++ b/security/nmap/files/patch-nse_openssl.cc
@@ -0,0 +1,35 @@
+--- ./nse_openssl.cc.orig	2010-03-28 23:18:02.000000000 +0200
++++ ./nse_openssl.cc	2010-08-29 21:25:18.000000000 +0200
+@@ -8,7 +8,6 @@
+ #include <openssl/crypto.h>
+ #include <openssl/bn.h>
+ #include <openssl/rand.h>
+-#include <openssl/md2.h>
+ #include <openssl/md4.h>
+ #include <openssl/md5.h>
+ #include <openssl/sha.h>
+@@ -219,16 +218,6 @@
+   return 1;
+ }
+ 
+-static int l_md2(lua_State *L)     /** md2(string s) */
+-{
+-  size_t len;
+-  const unsigned char *s = (unsigned char *) luaL_checklstring( L, 1, &len );
+-  unsigned char digest[16];
+- 
+-  lua_pushlstring( L, (char *) MD2( s, len, digest ), 16 );
+-  return 1;
+-}
+-
+ static int l_md4(lua_State *L)     /** md4(string s) */
+ {
+   size_t len;
+@@ -515,7 +504,6 @@
+   { "bignum_mod_exp", l_bignum_mod_exp },
+   { "rand_bytes", l_rand_bytes },
+   { "rand_pseudo_bytes", l_rand_pseudo_bytes },
+-  { "md2", l_md2 },
+   { "md4", l_md4 },
+   { "md5", l_md5 },
+   { "sha1", l_sha1 },
diff --git a/security/nmap/files/patch-scan_engine.cc b/security/nmap/files/patch-scan_engine.cc
new file mode 100644
index 000000000000..60941269dc3f
--- /dev/null
+++ b/security/nmap/files/patch-scan_engine.cc
@@ -0,0 +1,20 @@
+--- ./scan_engine.cc.orig	2010-06-22 19:24:34.000000000 +0200
++++ ./scan_engine.cc	2010-09-03 21:04:29.000000000 +0200
+@@ -4124,7 +4124,7 @@
+       }
+     } else if (ip->ip_p == IPPROTO_SCTP && !USI->prot_scan) {
+       struct sctp_hdr *sctp = (struct sctp_hdr *) ((u8 *) ip + ip->ip_hl * 4);
+-      struct sctp_chunkhdr *chunk = (struct sctp_chunkhdr *) ((u8 *) sctp + 12);
++      struct dnet_sctp_chunkhdr *chunk = (struct dnet_sctp_chunkhdr *) ((u8 *) sctp + 12);
+       /* Now ensure this host is even in the incomplete list */
+       memset(&sin, 0, sizeof(sin));
+       sin.sin_addr.s_addr = ip->ip_src.s_addr;
+@@ -4737,7 +4737,7 @@
+       }
+     } else if (ip->ip_p == IPPROTO_SCTP && USI->ptech.rawsctpscan) {
+       struct sctp_hdr *sctp = (struct sctp_hdr *) (((char *) ip) + 4 * ip->ip_hl);
+-      struct sctp_chunkhdr *chunk = (struct sctp_chunkhdr *) ((u8 *) sctp + 12);
++      struct dnet_sctp_chunkhdr *chunk = (struct dnet_sctp_chunkhdr *) ((u8 *) sctp + 12);
+       /* Search for this host on the incomplete list */
+       memset(&sin, 0, sizeof(sin));
+       sin.sin_addr.s_addr = ip->ip_src.s_addr;
diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index 844d48bcb44e..d943fec8bf4e 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -1,182 +1,244 @@
-bin/nmap
 bin/ncat
-%%DATADIR%%/scripts/script.db
-%%DATADIR%%/scripts/whois.nse
-%%DATADIR%%/scripts/upnp-info.nse
-%%DATADIR%%/scripts/telnet-brute.nse
-%%DATADIR%%/scripts/sslv2.nse
-%%DATADIR%%/scripts/sshv1.nse
-%%DATADIR%%/scripts/ssh-hostkey.nse
-%%DATADIR%%/scripts/sql-injection.nse
-%%DATADIR%%/scripts/socks-open-proxy.nse
-%%DATADIR%%/scripts/snmp-sysdescr.nse
-%%DATADIR%%/scripts/snmp-brute.nse
-%%DATADIR%%/scripts/sniffer-detect.nse
-%%DATADIR%%/scripts/smtp-strangeport.nse
-%%DATADIR%%/scripts/smtp-open-relay.nse
-%%DATADIR%%/scripts/smtp-commands.nse
-%%DATADIR%%/scripts/smb-system-info.nse
-%%DATADIR%%/scripts/smb-server-stats.nse
-%%DATADIR%%/scripts/smb-security-mode.nse
-%%DATADIR%%/scripts/smb-os-discovery.nse
-%%DATADIR%%/scripts/smb-enum-users.nse
-%%DATADIR%%/scripts/smb-enum-shares.nse
-%%DATADIR%%/scripts/smb-enum-sessions.nse
-%%DATADIR%%/scripts/smb-enum-processes.nse
-%%DATADIR%%/scripts/smb-enum-domains.nse
-%%DATADIR%%/scripts/smb-check-vulns.nse
-%%DATADIR%%/scripts/smb-brute.nse
-%%DATADIR%%/scripts/skypev2-version.nse
-%%DATADIR%%/scripts/robots.txt.nse
-%%DATADIR%%/scripts/rpcinfo.nse
-%%DATADIR%%/scripts/realvnc-auth-bypass.nse
-%%DATADIR%%/scripts/pptp-version.nse
-%%DATADIR%%/scripts/pop3-capabilities.nse
-%%DATADIR%%/scripts/pop3-brute.nse
-%%DATADIR%%/scripts/p2p-conficker.nse
-%%DATADIR%%/scripts/nbstat.nse
-%%DATADIR%%/scripts/mysql-info.nse
-%%DATADIR%%/scripts/ms-sql-info.nse
-%%DATADIR%%/scripts/irc-info.nse
-%%DATADIR%%/scripts/imap-capabilities.nse
-%%DATADIR%%/scripts/iax2-version.nse
-%%DATADIR%%/scripts/http-trace.nse
-%%DATADIR%%/scripts/http-passwd.nse
-%%DATADIR%%/scripts/http-open-proxy.nse
-%%DATADIR%%/scripts/http-auth.nse
-%%DATADIR%%/scripts/http-iis-webdav-vuln.nse
-%%DATADIR%%/scripts/html-title.nse
-%%DATADIR%%/scripts/ftp-brute.nse
-%%DATADIR%%/scripts/ftp-bounce.nse
-%%DATADIR%%/scripts/ftp-anon.nse
-%%DATADIR%%/scripts/finger.nse
-%%DATADIR%%/scripts/dns-zone-transfer.nse
-%%DATADIR%%/scripts/dns-recursion.nse
-%%DATADIR%%/scripts/dns-random-txid.nse
-%%DATADIR%%/scripts/dns-random-srcport.nse
-%%DATADIR%%/scripts/daytime.nse
-%%DATADIR%%/scripts/banner.nse
-%%DATADIR%%/scripts/auth-spoof.nse
-%%DATADIR%%/scripts/auth-owners.nse
+bin/nmap
+bin/nping
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/nmap.dtd
+%%WITHSSL%%%%NCATDATADIR%%/ca-bundle.crt
+%%DATADIR%%/nmap-mac-prefixes
+%%DATADIR%%/nmap-os-db
+%%DATADIR%%/nmap-payloads
+%%DATADIR%%/nmap-protocols
+%%DATADIR%%/nmap-rpc
+%%DATADIR%%/nmap-service-probes
+%%DATADIR%%/nmap-services
+%%DATADIR%%/nmap.dtd
+%%DATADIR%%/nmap.xsl
+%%DATADIR%%/nse_main.lua
+%%DATADIR%%/nselib/afp.lua
+%%DATADIR%%/nselib/asn1.lua
+%%DATADIR%%/nselib/base64.lua
+%%DATADIR%%/nselib/citrixxml.lua
+%%DATADIR%%/nselib/comm.lua
+%%DATADIR%%/nselib/data/favicon-db
+%%DATADIR%%/nselib/data/folders.lst
+%%DATADIR%%/nselib/data/http-fingerprints
+%%DATADIR%%/nselib/data/oracle-sids
+%%DATADIR%%/nselib/data/passwords.lst
+%%DATADIR%%/nselib/data/psexec/README
+%%DATADIR%%/nselib/data/psexec/backdoor.lua
+%%DATADIR%%/nselib/data/psexec/default.lua
+%%DATADIR%%/nselib/data/psexec/drives.lua
+%%DATADIR%%/nselib/data/psexec/examples.lua
+%%DATADIR%%/nselib/data/psexec/experimental.lua
+%%DATADIR%%/nselib/data/psexec/network.lua
+%%DATADIR%%/nselib/data/psexec/nmap_service.c
+%%DATADIR%%/nselib/data/psexec/nmap_service.vcproj
+%%DATADIR%%/nselib/data/psexec/pwdump.lua
+%%DATADIR%%/nselib/data/usernames.lst
+%%DATADIR%%/nselib/data/yokoso-fingerprints
+%%DATADIR%%/nselib/datafiles.lua
+%%DATADIR%%/nselib/db2.lua
+%%DATADIR%%/nselib/dns.lua
+%%DATADIR%%/nselib/http.lua
+%%DATADIR%%/nselib/imap.lua
+%%DATADIR%%/nselib/ipOps.lua
+%%DATADIR%%/nselib/json.lua
+%%DATADIR%%/nselib/ldap.lua
+%%DATADIR%%/nselib/listop.lua
+%%DATADIR%%/nselib/match.lua
+%%DATADIR%%/nselib/mongodb.lua
+%%DATADIR%%/nselib/msrpc.lua
+%%DATADIR%%/nselib/msrpcperformance.lua
+%%DATADIR%%/nselib/msrpctypes.lua
+%%DATADIR%%/nselib/mssql.lua
+%%DATADIR%%/nselib/mysql.lua
+%%DATADIR%%/nselib/netbios.lua
+%%DATADIR%%/nselib/nsedebug.lua
+%%DATADIR%%/nselib/packet.lua
+%%DATADIR%%/nselib/pgsql.lua
+%%DATADIR%%/nselib/pop3.lua
+%%DATADIR%%/nselib/proxy.lua
+%%DATADIR%%/nselib/rpc.lua
+%%DATADIR%%/nselib/shortport.lua
+%%DATADIR%%/nselib/smb.lua
+%%DATADIR%%/nselib/smbauth.lua
+%%DATADIR%%/nselib/snmp.lua
+%%DATADIR%%/nselib/ssh1.lua
+%%DATADIR%%/nselib/ssh2.lua
+%%DATADIR%%/nselib/stdnse.lua
+%%DATADIR%%/nselib/strbuf.lua
+%%DATADIR%%/nselib/strict.lua
+%%DATADIR%%/nselib/tab.lua
+%%DATADIR%%/nselib/unpwdb.lua
+%%DATADIR%%/nselib/url.lua
+%%DATADIR%%/scripts/afp-brute.nse
+%%DATADIR%%/scripts/afp-path-vuln.nse
+%%DATADIR%%/scripts/afp-serverinfo.nse
+%%DATADIR%%/scripts/afp-showmount.nse
 %%DATADIR%%/scripts/asn-query.nse
+%%DATADIR%%/scripts/auth-owners.nse
+%%DATADIR%%/scripts/auth-spoof.nse
+%%DATADIR%%/scripts/banner.nse
 %%DATADIR%%/scripts/citrix-brute-xml.nse
 %%DATADIR%%/scripts/citrix-enum-apps-xml.nse
 %%DATADIR%%/scripts/citrix-enum-apps.nse
 %%DATADIR%%/scripts/citrix-enum-servers-xml.nse
 %%DATADIR%%/scripts/citrix-enum-servers.nse
+%%DATADIR%%/scripts/couchdb-databases.nse
+%%DATADIR%%/scripts/couchdb-stats.nse
+%%DATADIR%%/scripts/daap-get-library.nse
+%%DATADIR%%/scripts/daytime.nse
+%%DATADIR%%/scripts/db2-brute.nse
+%%DATADIR%%/scripts/db2-das-info.nse
 %%DATADIR%%/scripts/db2-info.nse
 %%DATADIR%%/scripts/dhcp-discover.nse
+%%DATADIR%%/scripts/dns-cache-snoop.nse
+%%DATADIR%%/scripts/dns-fuzz.nse
+%%DATADIR%%/scripts/dns-random-srcport.nse
+%%DATADIR%%/scripts/dns-random-txid.nse
+%%DATADIR%%/scripts/dns-recursion.nse
+%%DATADIR%%/scripts/dns-service-discovery.nse
+%%DATADIR%%/scripts/dns-zone-transfer.nse
+%%DATADIR%%/scripts/finger.nse
+%%DATADIR%%/scripts/ftp-anon.nse
+%%DATADIR%%/scripts/ftp-bounce.nse
+%%DATADIR%%/scripts/ftp-brute.nse
+%%DATADIR%%/scripts/ftp-libopie.nse
+%%DATADIR%%/scripts/html-title.nse
+%%DATADIR%%/scripts/http-auth.nse
 %%DATADIR%%/scripts/http-date.nse
 %%DATADIR%%/scripts/http-enum.nse
 %%DATADIR%%/scripts/http-favicon.nse
 %%DATADIR%%/scripts/http-headers.nse
+%%DATADIR%%/scripts/http-iis-webdav-vuln.nse
 %%DATADIR%%/scripts/http-malware-host.nse
+%%DATADIR%%/scripts/http-methods.nse
+%%DATADIR%%/scripts/http-open-proxy.nse
+%%DATADIR%%/scripts/http-passwd.nse
+%%DATADIR%%/scripts/http-php-version.nse
+%%DATADIR%%/scripts/http-trace.nse
 %%DATADIR%%/scripts/http-userdir-enum.nse
+%%DATADIR%%/scripts/http-vmware-path-vuln.nse
+%%DATADIR%%/scripts/iax2-version.nse
+%%DATADIR%%/scripts/imap-capabilities.nse
+%%DATADIR%%/scripts/ipidseq.nse
+%%DATADIR%%/scripts/irc-info.nse
+%%DATADIR%%/scripts/irc-unrealircd-backdoor.nse
+%%DATADIR%%/scripts/jdwp-version.nse
+%%DATADIR%%/scripts/ldap-brute.nse
+%%DATADIR%%/scripts/ldap-rootdse.nse
+%%DATADIR%%/scripts/ldap-search.nse
+%%DATADIR%%/scripts/lexmark-config.nse
+%%DATADIR%%/scripts/mongodb-databases.nse
+%%DATADIR%%/scripts/mongodb-info.nse
+%%DATADIR%%/scripts/ms-sql-brute.nse
+%%DATADIR%%/scripts/ms-sql-config.nse
+%%DATADIR%%/scripts/ms-sql-empty-password.nse
+%%DATADIR%%/scripts/ms-sql-hasdbaccess.nse
+%%DATADIR%%/scripts/ms-sql-info.nse
+%%DATADIR%%/scripts/ms-sql-query.nse
+%%DATADIR%%/scripts/ms-sql-tables.nse
+%%DATADIR%%/scripts/ms-sql-xp-cmdshell.nse
+%%DATADIR%%/scripts/mysql-brute.nse
+%%DATADIR%%/scripts/mysql-databases.nse
+%%DATADIR%%/scripts/mysql-empty-password.nse
+%%DATADIR%%/scripts/mysql-info.nse
+%%DATADIR%%/scripts/mysql-users.nse
+%%DATADIR%%/scripts/mysql-variables.nse
+%%DATADIR%%/scripts/nbstat.nse
+%%DATADIR%%/scripts/nfs-ls.nse
 %%DATADIR%%/scripts/nfs-showmount.nse
+%%DATADIR%%/scripts/nfs-statfs.nse
 %%DATADIR%%/scripts/ntp-info.nse
+%%DATADIR%%/scripts/ntp-monlist.nse
 %%DATADIR%%/scripts/oracle-sid-brute.nse
+%%DATADIR%%/scripts/p2p-conficker.nse
+%%DATADIR%%/scripts/pgsql-brute.nse
 %%DATADIR%%/scripts/pjl-ready-message.nse
+%%DATADIR%%/scripts/pop3-brute.nse
+%%DATADIR%%/scripts/pop3-capabilities.nse
+%%DATADIR%%/scripts/pptp-version.nse
+%%DATADIR%%/scripts/qscan.nse
+%%DATADIR%%/scripts/realvnc-auth-bypass.nse
+%%DATADIR%%/scripts/robots.txt.nse
+%%DATADIR%%/scripts/rpcinfo.nse
+%%DATADIR%%/scripts/script.db
+%%DATADIR%%/scripts/skypev2-version.nse
+%%DATADIR%%/scripts/smb-brute.nse
+%%DATADIR%%/scripts/smb-check-vulns.nse
+%%DATADIR%%/scripts/smb-enum-domains.nse
 %%DATADIR%%/scripts/smb-enum-groups.nse
+%%DATADIR%%/scripts/smb-enum-processes.nse
+%%DATADIR%%/scripts/smb-enum-sessions.nse
+%%DATADIR%%/scripts/smb-enum-shares.nse
+%%DATADIR%%/scripts/smb-enum-users.nse
+%%DATADIR%%/scripts/smb-os-discovery.nse
 %%DATADIR%%/scripts/smb-psexec.nse
+%%DATADIR%%/scripts/smb-security-mode.nse
+%%DATADIR%%/scripts/smb-server-stats.nse
+%%DATADIR%%/scripts/smb-system-info.nse
 %%DATADIR%%/scripts/smbv2-enabled.nse
+%%DATADIR%%/scripts/smtp-commands.nse
+%%DATADIR%%/scripts/smtp-enum-users.nse
+%%DATADIR%%/scripts/smtp-open-relay.nse
+%%DATADIR%%/scripts/smtp-strangeport.nse
+%%DATADIR%%/scripts/sniffer-detect.nse
+%%DATADIR%%/scripts/snmp-brute.nse
+%%DATADIR%%/scripts/snmp-interfaces.nse
+%%DATADIR%%/scripts/snmp-netstat.nse
+%%DATADIR%%/scripts/snmp-processes.nse
+%%DATADIR%%/scripts/snmp-sysdescr.nse
+%%DATADIR%%/scripts/snmp-win32-services.nse
+%%DATADIR%%/scripts/snmp-win32-shares.nse
+%%DATADIR%%/scripts/snmp-win32-software.nse
+%%DATADIR%%/scripts/snmp-win32-users.nse
+%%DATADIR%%/scripts/socks-open-proxy.nse
+%%DATADIR%%/scripts/sql-injection.nse
+%%DATADIR%%/scripts/ssh-hostkey.nse
+%%DATADIR%%/scripts/sshv1.nse
 %%DATADIR%%/scripts/ssl-cert.nse
+%%DATADIR%%/scripts/ssl-enum-ciphers.nse
+%%DATADIR%%/scripts/sslv2.nse
+%%DATADIR%%/scripts/telnet-brute.nse
+%%DATADIR%%/scripts/upnp-info.nse
+%%DATADIR%%/scripts/whois.nse
 %%DATADIR%%/scripts/x11-access.nse
 @dirrm %%DATADIR%%/scripts
-%%DATADIR%%/nselib/data/psexec/backdoor.lua
-%%DATADIR%%/nselib/data/psexec/drives.lua
-%%DATADIR%%/nselib/data/psexec/nmap_service.exe
-%%DATADIR%%/nselib/data/psexec/network.lua
-%%DATADIR%%/nselib/data/psexec/nmap_service.c
-%%DATADIR%%/nselib/data/psexec/experimental.lua
-%%DATADIR%%/nselib/data/psexec/pwdump.lua
-%%DATADIR%%/nselib/data/psexec/default.lua
-%%DATADIR%%/nselib/data/psexec/nmap_service.vcproj
-%%DATADIR%%/nselib/data/psexec/encoder.c
-%%DATADIR%%/nselib/data/psexec/examples.lua
-%%DATADIR%%/nselib/data/psexec/README
 @dirrm %%DATADIR%%/nselib/data/psexec
-%%DATADIR%%/nselib/data/usernames.lst
-%%DATADIR%%/nselib/data/favicon-db
-%%DATADIR%%/nselib/data/http-fingerprints
-%%DATADIR%%/nselib/data/folders.lst
-%%DATADIR%%/nselib/data/oracle-sids
-%%DATADIR%%/nselib/data/passwords.lst
-%%DATADIR%%/nselib/data/yokoso-fingerprints
 @dirrm %%DATADIR%%/nselib/data
-%%DATADIR%%/nselib/citrixxml.lua
-%%DATADIR%%/nselib/proxy.lua
-%%DATADIR%%/nselib/strict.lua
-%%DATADIR%%/nselib/http.lua
-%%DATADIR%%/nselib/ipOps.lua
-%%DATADIR%%/nselib/strbuf.lua
-%%DATADIR%%/nselib/stdnse.lua
-%%DATADIR%%/nselib/shortport.lua
-%%DATADIR%%/nselib/packet.lua
-%%DATADIR%%/nselib/match.lua
-%%DATADIR%%/nselib/listop.lua
-%%DATADIR%%/nselib/url.lua
-%%DATADIR%%/nselib/tab.lua
-%%DATADIR%%/nselib/datafiles.lua
-%%DATADIR%%/nselib/comm.lua
-%%DATADIR%%/nselib/base64.lua
-%%DATADIR%%/nselib/unpwdb.lua
-%%DATADIR%%/nselib/snmp.lua
-%%DATADIR%%/nselib/pop3.lua
-%%DATADIR%%/nselib/dns.lua
-%%DATADIR%%/nselib/ssh2.lua
-%%DATADIR%%/nselib/ssh1.lua
-%%DATADIR%%/nselib/smbauth.lua
-%%DATADIR%%/nselib/smb.lua
-%%DATADIR%%/nselib/nsedebug.lua
-%%DATADIR%%/nselib/netbios.lua
-%%DATADIR%%/nselib/msrpctypes.lua
-%%DATADIR%%/nselib/msrpcperformance.lua
-%%DATADIR%%/nselib/msrpc.lua
-%%DATADIR%%/nselib/imap.lua
 @dirrm %%DATADIR%%/nselib
-%%DATADIR%%/nse_main.lua
-%%DATADIR%%/nmap-mac-prefixes
-%%DATADIR%%/nmap-os-db
-%%DATADIR%%/nmap-protocols
-%%DATADIR%%/nmap-rpc
-%%DATADIR%%/nmap-service-probes
-%%DATADIR%%/nmap-services
-%%DATADIR%%/nmap.dtd
-%%DATADIR%%/nmap.xsl
 @dirrm %%DATADIR%%
-%%NCATDATADIR%%/ca-bundle.crt
+@dirrm %%NPINGDIR%%
 @dirrm %%NCATDATADIR%%
-@dirrmtry man/de/man1
-@dirrmtry man/de
-@dirrmtry man/es/man1
-@dirrmtry man/es
-@dirrmtry man/fr/man1
-@dirrmtry man/fr
-@dirrmtry man/hr/man1
-@dirrmtry man/hr
-@dirrmtry man/hu/man1
-@dirrmtry man/hu
-@dirrmtry man/it/man1
-@dirrmtry man/it
-@dirrmtry man/jp/man1
-@dirrmtry man/jp
-@dirrmtry man/pl/man1
-@dirrmtry man/pl
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry man/zh/man1
+@dirrmtry man/zh
+@dirrmtry man/sk/man1
+@dirrmtry man/sk
+@dirrmtry man/ru/man1
+@dirrmtry man/ru
+@dirrmtry man/ro/man1
+@dirrmtry man/ro
 @dirrmtry man/pt_PT/man1
 @dirrmtry man/pt_PT
 @dirrmtry man/pt_BR/man1
 @dirrmtry man/pt_BR
-@dirrmtry man/pt/man1
-@dirrmtry man/pt
-@dirrmtry man/ro/man1
-@dirrmtry man/ro
-@dirrmtry man/ro/man1
-@dirrmtry man/ro
-@dirrmtry man/sk/man1
-@dirrmtry man/sk
-@dirrmtry man/zh/man1
-@dirrmtry man/zh
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/HACKING
-%%PORTDOCS%%%%DOCSDIR%%/nmap.dtd
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry man/pl/man1
+@dirrmtry man/pl
+@dirrmtry man/jp/man1
+@dirrmtry man/jp
+@dirrmtry man/it/man1
+@dirrmtry man/it
+@dirrmtry man/hu/man1
+@dirrmtry man/hu
+@dirrmtry man/hr/man1
+@dirrmtry man/hr
+@dirrmtry man/fr/man1
+@dirrmtry man/fr
+@dirrmtry man/es/man1
+@dirrmtry man/es
+@dirrmtry man/de/man1
+@dirrmtry man/de
+@exec mkdir -p %D/%%NCATDATADIR%%
+@exec mkdir -p %D/%%NPINGDIR%%