MFH: r365724

- update to 6.4.7
- add CPE entry
- sort pkg-plist

Changelog (entries related to the command line tools)

Nmap 6.47 [2014-08-20]

o Integrated all of your IPv4 OS fingerprint submissions since June 2013
  (2700+ of them). Added 366 fingerprints, bringing the new total to 4485.
  Additions include Linux 3.10 - 3.14, iOS 7, OpenBSD 5.4 - 5.5, FreeBSD 9.2,
  OS X 10.9, Android 4.3, and more. Many existing fingerprints were improved.
  Highlights: http://seclists.org/nmap-dev/2014/q3/325 [Daniel Miller]

o Removed the External Entity Declaration from the DOCTYPE in Nmap's XML. This
  was added in 6.45, and resulted in trouble for Nmap XML parsers without
  network access, as well as increased traffic to Nmap's servers. The doctype
  is now:
  <!DOCTYPE nmaprun>

o [Ncat] Fixed SOCKS5 username/password authentication. The password length was
  being written in the wrong place, so authentication could not succeed.
  Reported with patch by Pierluigi Vittori.

o Avoid formatting NULL as "%s" when running nmap --iflist. GNU libc converts
  this to the string "(null)", but it caused segfault on Solaris. [Daniel Miller]

o Handle ICMP admin-prohibited messages when doing service version detection.
  Crash reported by Nathan Stocks was: Unexpected error in NSE_TYPE_READ
  callback.  Error code: 101 (Network is unreachable) [David Fifield]

o [NSE] Fix a bug causing http.head to not honor redirects. [Patrik Karlsson]

Approved by:	portmgr (zi)

3 files changed, 36 insertions, 36 deletions

diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index 5c127427b5e9..04a7c2e70b85 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nmap
-DISTVERSION=	6.46
+DISTVERSION=	6.47
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		LOCAL/ohauer
@@ -10,7 +10,7 @@ MASTER_SITES=	http://nmap.org/dist/ \
 MAINTAINER=	ohauer@FreeBSD.org
 COMMENT=	Port scanning utility for large networks
 
-# nmap-6.46 => r32840
+# nmap-6.47 => svn.nmap.org/nmap-releases/nmap-6.47 (r33605)
 # http://nmap.org/book/man-legal.html
 # Install the nmap modified license because of
 # http://insecure.org/news/download-com-fiasco.html
@@ -19,7 +19,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
-USES=		gmake tar:bzip2
+USES=		tar:bzip2 gmake cpe
 GNU_CONFIGURE=	yes
 
 OPTIONS_SUB=	yes
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=--without-localdirs \
 .if ${CC} != "cc" && ${CC} !="clang"
 GCCLIBDIR_CMDS=	${CC} -print-file-name=libstdc++.so | ${SED} -e 's/libstdc++.so//'
 CONFIGURE_ARGS+=LDFLAGS="-L$$(${GCCLIBDIR_CMDS})"
-NDCC=	true
+NOT_BASE_CC=	true
 .endif
 
 # XXX limit results if we do a grep in the sources!
@@ -77,7 +77,7 @@ post-install:
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 # gcc from ports is in use
-.if defined(NDCC)
+.if defined(NOT_BASE_CC)
 	@${ECHO_MSG} do not forget to adjust libnmap.conf
 .endif
 
diff --git a/security/nmap/distinfo b/security/nmap/distinfo
index dfd70a29bd73..15891037c09c 100644
--- a/security/nmap/distinfo
+++ b/security/nmap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nmap-6.46.tar.bz2) = 3f89d9053c69507fe9533c40188a6561d49607a37b1db6380aed9039d4883137
-SIZE (nmap-6.46.tar.bz2) = 7911353
+SHA256 (nmap-6.47.tar.bz2) = 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591
+SIZE (nmap-6.47.tar.bz2) = 7878122
diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index b5f1258914b3..0354d366ba4e 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -651,36 +651,36 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/xdmcp-discover.nse
 %%DATADIR%%/scripts/xmpp-brute.nse
 %%DATADIR%%/scripts/xmpp-info.nse
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/nselib/data/psexec
+@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/pl/man1
+@dirrmtry man/pl
+@dirrmtry man/pt_BR/man1
+@dirrmtry man/pt_BR
+@dirrmtry man/pt_PT/man1
+@dirrmtry man/pt_PT
+@dirrmtry man/ro/man1
+@dirrmtry man/ro
+@dirrmtry man/ru/man1
+@dirrmtry man/ru
+@dirrmtry man/sk/man1
+@dirrmtry man/sk
+@dirrmtry man/zh/man1
+@dirrmtry man/zh
+%%SSL%%@dirrm share/ncat
 @dirrm %%DATADIR%%/nselib/data/jdwp-class
+@dirrm %%DATADIR%%/nselib/data/psexec
 @dirrm %%DATADIR%%/nselib/data
 @dirrm %%DATADIR%%/nselib
+@dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%
-%%SSL%%@dirrm share/ncat
-@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/pl/man1
-@dirrmtry man/pl
-@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