13 files changed, 115 insertions, 116 deletions

diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index 34b6a211312b..dc75a671152a 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -5,20 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	nmap
-PORTVERSION=	${DISTVERSION:L:C/([a-z])[a-z]+/\1/g:C/[^a-z0-9+]+/./g}
-PORTREVISION=	1
+PORTNAME=	nmap
+PORTVERSION=	4.52
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://download.insecure.org/nmap/dist/ \
 		http://www.mirrors.wiretapped.net/security/network-mapping/nmap/ \
 		http://www.mirrorservice.org/sites/ftp.wiretapped.net/pub/security/network-mapping/nmap/ \
 		http://mirror.sg.depaul.edu/pub/security/nmap/
-DISTNAME=	nmap-${DISTVERSION}	# needed for security/nmapfe
 
 MAINTAINER=	daniel@roe.ch
-COMMENT?=	Port scanning utility for large networks
-
-DISTVERSION=	4.20
+COMMENT=	Port scanning utility for large networks
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -28,13 +24,18 @@ CONFIGURE_ARGS=	--without-localdirs
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-.ifndef BUILD_NMAPFE
-
 MAN1=		nmap.1
 
-LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
+		dnet.1:${PORTSDIR}/net/libdnet
+USE_LUA=	5.1
+LUA_COMPS=	lua
 
-CONFIGURE_ARGS+=	--with-libpcre=${LOCALBASE}
+CONFIGURE_ARGS+=	--without-zenmap \
+			--with-libpcre=${LOCALBASE} \
+			--with-libdnet=${LOCALBASE} \
+			--with-liblua=${LOCALBASE}
+CONFIGURE_ENV=	LUA_INCDIR="${LUA_INCDIR}" LUA_LIBDIR="${LUA_LIBDIR}"
 
 .ifndef WITHOUT_SSL
 USE_OPENSSL=	yes
@@ -43,11 +44,6 @@ CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 CONFIGURE_ARGS+=	--without-openssl
 .endif
 
-CONFIGURE_ARGS+=	--without-nmapfe
-
-ALL_TARGET=	nmap
-INSTALL_TARGET=	install-nmap
-
 post-configure:
 	@${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" ${WRKSRC}/Makefile
 
@@ -59,27 +55,4 @@ post-install:
 	done
 .endif
 
-.else
-
-RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
-
-DESCR=		${PKGDIR}/pkg-descr.fe
-PLIST=		${PKGDIR}/pkg-plist.fe
-PLIST_SUB=	REALPREFIX=${PREFIX}
-
-MAN1=		nmapfe.1
-MLINKS=		nmapfe.1 xnmap.1
-
-USE_GNOME=	gtk20
-USE_GCC=	3.2+
-
-CONFIGURE_ARGS+=--without-openssl
-
-CONFIGURE_ARGS+=--with-nmapfe
-
-ALL_TARGET=	nbase/libnbase.a nmapfe/nmapfe
-INSTALL_TARGET=	install-nmapfe
-
-.endif
-
 .include <bsd.port.mk>
diff --git a/security/nmap/distinfo b/security/nmap/distinfo
index d28f2fbe6751..7cfeb1697ca5 100644
--- a/security/nmap/distinfo
+++ b/security/nmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (nmap-4.20.tar.bz2) = ea50419f99472200c4184a304e3831ea
-SHA256 (nmap-4.20.tar.bz2) = c923a6cfa6d3683dc7ee27a721c19d15fd66f264f8ca6dbc9cfac710591f32a8
-SIZE (nmap-4.20.tar.bz2) = 2156077
+MD5 (nmap-4.52.tar.bz2) = 4f965a89e4e724d266dd9235c485633f
+SHA256 (nmap-4.52.tar.bz2) = ec44e89f12bb1c140e9e580f2ceee8950caa03537cf74f5718b25b19a476589a
+SIZE (nmap-4.52.tar.bz2) = 3147364
diff --git a/security/nmap/files/patch-Makefile.in b/security/nmap/files/patch-Makefile.in
index b862a58d19bf..98ebc43a82ea 100644
--- a/security/nmap/files/patch-Makefile.in
+++ b/security/nmap/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon Oct  6 12:57:49 2003
-+++ Makefile.in	Mon Oct  6 12:58:00 2003
-@@ -9,7 +9,7 @@
- mandir = @mandir@
+--- Makefile.in.orig	Sat Dec  1 01:21:28 2007
++++ Makefile.in	Fri Jan  4 17:05:28 2008
+@@ -11,7 +11,7 @@
  srcdir = @srcdir@
+ nmaplibexecdir = @libexecdir@/nmap
  nmapdatadir = @datadir@/nmap
 -deskdir = $(prefix)/share/applications
 +deskdir = $(X11BASE)/share/applications
+ NMAPDEVDIR=~/nmap-dev
  
- NBASEDIR=@NBASEDIR@
- NSOCKDIR=@NSOCKDIR@
+ export NBASEDIR=@NBASEDIR@
diff --git a/security/nmap/files/patch-configure b/security/nmap/files/patch-configure
index d12d998de06b..74215d921f00 100644
--- a/security/nmap/files/patch-configure
+++ b/security/nmap/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig
-+++ configure
-@@ -1395,7 +1395,7 @@
+--- configure.orig	Thu Nov 29 10:36:33 2007
++++ configure	Sat Jan 12 16:57:04 2008
+@@ -1488,7 +1488,7 @@
  if test -z "$ac_cv_prog_CC"; then
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
@@ -12,12 +9,16 @@ $FreeBSD$
  echo "$as_me:$LINENO: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-@@ -3552,7 +3552,7 @@
+@@ -6781,9 +6781,10 @@
+     no_lua="yes"
+   ;;
+   *)
+-    CXXFLAGS="-I$with_liblua/include $CXXFLAGS"
+-    LDFLAGS="-L$with_liblua/lib $LDFLAGS"
++    CXXFLAGS="-I${LUA_INCDIR} $CXXFLAGS"
++    LDFLAGS="-L${LUA_LIBDIR} $LDFLAGS"
+     have_lua=yes
++    LIBLUA_LIBS="-llua"
+   ;;
+   esac
  
- 
- 
--for ac_header in string.h getopt.h strings.h memory.h sys/param.h sys/sockio.h bstring.h sys/time.h sys/stat.h fcntl.h termios.h pwd.h unistd.h
-+for ac_header in string.h strings.h memory.h sys/param.h sys/sockio.h bstring.h sys/time.h sys/stat.h fcntl.h termios.h pwd.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/security/nmap/files/patch-nbase::configure b/security/nmap/files/patch-nbase::configure
deleted file mode 100644
index 20b0cafc69f5..000000000000
--- a/security/nmap/files/patch-nbase::configure
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- nbase/configure.orig
-+++ nbase/configure
-@@ -3088,7 +3088,7 @@
- 
- 
- 
--for ac_header in string.h getopt.h strings.h memory.h sys/param.h sys/time.h unistd.h bstring.h errno.h sys/types.h sys/socket.h netinet/in.h sys/sockio.h rpc/types.h netdb.h pwd.h arpa/inet.h sys/resource.h sys/stat.h sys/wait.h net/if.h libiberty.h fcntl.h
-+for ac_header in string.h strings.h memory.h sys/param.h sys/time.h unistd.h bstring.h errno.h sys/types.h sys/socket.h netinet/in.h sys/sockio.h rpc/types.h netdb.h pwd.h arpa/inet.h sys/resource.h sys/stat.h sys/wait.h net/if.h libiberty.h fcntl.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/security/nmap/files/patch-nbase__configure b/security/nmap/files/patch-nbase__configure
new file mode 100644
index 000000000000..d9b773308dbd
--- /dev/null
+++ b/security/nmap/files/patch-nbase__configure
@@ -0,0 +1,11 @@
+--- nbase/configure.orig	Tue Nov 27 20:32:49 2007
++++ nbase/configure	Fri Jan  4 17:10:41 2008
+@@ -3015,7 +3015,7 @@
+ 
+ 
+ 
+-for ac_header in string.h getopt.h strings.h sys/param.h sys/time.h unistd.h errno.h sys/types.h sys/socket.h netinet/in.h arpa/inet.h sys/stat.h net/if.h netdb.h sys/wait.h fcntl.h sys/resource.h
++for ac_header in string.h strings.h sys/param.h sys/time.h unistd.h errno.h sys/types.h sys/socket.h netinet/in.h arpa/inet.h sys/stat.h net/if.h netdb.h sys/wait.h fcntl.h sys/resource.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/security/nmap/files/patch-nmap.cc b/security/nmap/files/patch-nmap.cc
new file mode 100644
index 000000000000..56e9dfd8afd4
--- /dev/null
+++ b/security/nmap/files/patch-nmap.cc
@@ -0,0 +1,10 @@
+--- nmap.cc.orig	Sat Dec 22 07:32:03 2007
++++ nmap.cc	Thu Jan 10 20:41:30 2008
+@@ -99,6 +99,7 @@
+ 
+ /* $Id: nmap.cc 6633 2007-12-22 06:32:03Z fyodor $ */
+ 
++#include <getopt.h>
+ #include "nmap.h"
+ #include "osscan.h"
+ #include "osscan2.h"
diff --git a/security/nmap/files/patch-nmapfe::Makefile.in b/security/nmap/files/patch-nmapfe::Makefile.in
deleted file mode 100644
index e36ff1b21116..000000000000
--- a/security/nmap/files/patch-nmapfe::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- nmapfe/Makefile.in.orig	Mon Oct  6 13:00:32 2003
-+++ nmapfe/Makefile.in	Mon Oct  6 13:01:05 2003
-@@ -72,7 +72,7 @@
- CONFIG_CLEAN_FILES = 
- PROGRAMS =  $(bin_PROGRAMS)
- 
--DEFS = @DEFS@ -DVERSION=\"$(VERSION)\" -DHAVE_CONFIG_H=1 -I$(srcdir) 
-+DEFS = @DEFS@ -DVERSION=\"$(VERSION)\" -DHAVE_CONFIG_H=1 -DNMAP_PATH=\"$(bindir)/\" -I$(srcdir)
- CPPFLAGS = @CPPFLAGS@
- STATIC =
- LDFLAGS = @LDFLAGS@ $(STATIC)
diff --git a/security/nmap/files/patch-nmapfe::nmapfe_sig.c b/security/nmap/files/patch-nmapfe::nmapfe_sig.c
deleted file mode 100644
index eb75f3b9c157..000000000000
--- a/security/nmap/files/patch-nmapfe::nmapfe_sig.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- nmapfe/nmapfe_sig.c.orig	Mon Oct  6 12:59:49 2003
-+++ nmapfe/nmapfe_sig.c	Mon Oct  6 13:00:06 2003
-@@ -425,7 +425,7 @@
-   if (size > command_size)
-     command = realloc(command, size);
- 
--  strcpy(command, "nmap ");
-+  strcpy(command, NMAP_PATH "nmap ");
-  
-   /* select the scan type */
-   if (opt.scanValue == CONNECT_SCAN) {
diff --git a/security/nmap/pkg-descr b/security/nmap/pkg-descr
index 4642b831e38d..da815059b3a8 100644
--- a/security/nmap/pkg-descr
+++ b/security/nmap/pkg-descr
@@ -4,12 +4,9 @@ scanning techniques, version detection (determine service protocols
 and application versions listening behind ports), and TCP/IP
 fingerprinting (remote host OS or device identification). Nmap also
 offers flexible target and port specification, decoy/stealth scanning,
-sunRPC scanning, and more.
+sunRPC scanning, and much more.
 
 WWW: http://www.insecure.org/nmap/
 
-See the web page and the Phrack Magazine article (Volume 7, Issue 51 
+See the web page and the Phrack Magazine article (Volume 7, Issue 51
 September 01, 1997, article 11 of 17) http://www.insecure.org/nmap/p51-11.txt
-
--- David
-   obrien@cs.ucdavis.edu
diff --git a/security/nmap/pkg-descr.fe b/security/nmap/pkg-descr.fe
index 52dab8778aa5..e69de29bb2d1 100644
--- a/security/nmap/pkg-descr.fe
+++ b/security/nmap/pkg-descr.fe
@@ -1,6 +0,0 @@
-nmapfe is a GUI front end for the nmap port scanning tool.
-
-WWW: http://www.insecure.org/nmap/
-
--- David
-   obrien@cs.ucdavis.edu
diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index 80203a6dcf01..911ec017c417 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -1,7 +1,62 @@
 bin/nmap
+libexec/nmap/nselib-bin/bit.so
+@dirrm libexec/nmap/nselib-bin
+@dirrm libexec/nmap
+%%DATADIR%%/scripts/script.db
+%%DATADIR%%/scripts/xamppDefaultPass.nse
+%%DATADIR%%/scripts/strangeSMTPport.nse
+%%DATADIR%%/scripts/skype_v2-version.nse
+%%DATADIR%%/scripts/showSSHVersion.nse
+%%DATADIR%%/scripts/showSMTPVersion.nse
+%%DATADIR%%/scripts/showOwner.nse
+%%DATADIR%%/scripts/showHTTPVersion.nse
+%%DATADIR%%/scripts/showHTMLTitle.nse
+%%DATADIR%%/scripts/rpcinfo.nse
+%%DATADIR%%/scripts/robots.nse
+%%DATADIR%%/scripts/ripeQuery.nse
+%%DATADIR%%/scripts/promiscuous.nse
+%%DATADIR%%/scripts/netbios-smb-os-discovery.nse
+%%DATADIR%%/scripts/nbstat.nse
+%%DATADIR%%/scripts/mswindowsShell.nse
+%%DATADIR%%/scripts/kibuvDetection.nse
+%%DATADIR%%/scripts/ircZombieTest.nse
+%%DATADIR%%/scripts/ircServerInfo.nse
+%%DATADIR%%/scripts/iax2Detect.nse
+%%DATADIR%%/scripts/ftpbounce.nse
+%%DATADIR%%/scripts/finger.nse
+%%DATADIR%%/scripts/echoTest.nse
+%%DATADIR%%/scripts/dns-test-open-recursion.nse
+%%DATADIR%%/scripts/daytimeTest.nse
+%%DATADIR%%/scripts/chargenTest.nse
+%%DATADIR%%/scripts/bruteTelnet.nse
+%%DATADIR%%/scripts/anonFTP.nse
+%%DATADIR%%/scripts/SSLv2-support.nse
+%%DATADIR%%/scripts/SSHv1-support.nse
+%%DATADIR%%/scripts/SQLInject.nse
+%%DATADIR%%/scripts/SNMPsysdesr.nse
+%%DATADIR%%/scripts/SMTPcommands.nse
+%%DATADIR%%/scripts/SMTP_openrelay_test.nse
+%%DATADIR%%/scripts/RealVNC_auth_bypass.nse
+%%DATADIR%%/scripts/PPTPversion.nse
+%%DATADIR%%/scripts/MySQLinfo.nse
+%%DATADIR%%/scripts/MSSQLm.nse
+%%DATADIR%%/scripts/HTTPtrace.nse
+%%DATADIR%%/scripts/HTTPpasswd.nse
+%%DATADIR%%/scripts/HTTP_open_proxy.nse
+%%DATADIR%%/scripts/HTTPAuth.nse
+%%DATADIR%%/scripts/zoneTrans.nse
+@dirrm %%DATADIR%%/scripts
+%%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
+@dirrm %%DATADIR%%/nselib
 %%DATADIR%%/nmap-mac-prefixes
 %%DATADIR%%/nmap-os-db
-%%DATADIR%%/nmap-os-fingerprints
 %%DATADIR%%/nmap-protocols
 %%DATADIR%%/nmap-rpc
 %%DATADIR%%/nmap-service-probes
diff --git a/security/nmap/pkg-plist.fe b/security/nmap/pkg-plist.fe
index 9f6f1f4aea16..e69de29bb2d1 100644
--- a/security/nmap/pkg-plist.fe
+++ b/security/nmap/pkg-plist.fe
@@ -1,6 +0,0 @@
-bin/nmapfe
-bin/xnmap
-@cwd %%X11BASE%%
-share/applications/nmapfe.desktop
-@dirrmtry share/applications
-@cwd %%REALPREFIX%%