12 files changed, 92 insertions, 86 deletions
diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index acf97501b840..d919506dc95f 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
 # Ports collection makefile for:  nmap
 # Date created:			  Tue Aug 04, 1998
 # Whom:				  David O'Brien (obrien@NUXI.com)
@@ -7,36 +6,73 @@
 #
 
 PORTNAME?=	nmap
-PORTVERSION=	3.30
+PORTVERSION=	3.46
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://download.insecure.org/nmap/dist/
-DISTNAME=	nmap-${PORTVERSION:S/.b/BETA/}
+DISTNAME=	nmap-${PORTVERSION}
 
 MAINTAINER=	eikemeier@fillmore-labs.com
 COMMENT?=	Port scanning utility for large networks
 
+USE_BZIP2=	yes
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-localdirs
-USE_BZIP2=	yes
 
-MAN1?=		nmap.1
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+.ifndef BUILD_NMAPFE
+
+MAN1=		nmap.1
 
-.include <bsd.port.pre.mk>
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
-.if ${OSVERSION} < 300004
-CFLAGS+=	-DDLT_RAW=12 # for obsoleted <net/bpf.h>
+CONFIGURE_ARGS+=	--with-libpcre=${LOCALBASE}
+
+.ifndef WITHOUT_SSL
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
+.else
+CONFIGURE_ARGS+=	--without-openssl
 .endif
 
-CONFIGURE_TARGET=	-build=${ARCH}-portbld-freebsd${OSREL}
-.if ${PORTNAME} == "nmap"
 CONFIGURE_ARGS+=	--without-nmapfe
-.endif
-ALL_TARGET?=		nmap
-INSTALL_TARGET?=	install-nmap
 
-.if !target(post-install) && (${PORTNAME} == "nmap")
+ALL_TARGET=	nmap
+INSTALL_TARGET=	install-nmap
+
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/nmap
+.ifndef NOPORTDOCS
+	@${MKDIR} ${DOCSDIR}
+	@for doc in CHANGELOG HACKING docs/nmap.dtd; do \
+		${INSTALL_DATA} ${WRKSRC}/$${doc} ${DOCSDIR}; \
+	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=	gtk12
+
+CONFIGURE_ARGS+=--without-openssl
+
+CONFIGURE_ARGS+=--with-nmapfe
+
+ALL_TARGET=	nbase/libnbase.a nmapfe/nmapfe
+INSTALL_TARGET=	install-nmapfe
+
+post-install:
+	@${STRIP_CMD} ${PREFIX}/bin/nmapfe
+
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/nmap/distinfo b/security/nmap/distinfo
index 962e2afc04d4..e67d76b30bb8 100644
--- a/security/nmap/distinfo
+++ b/security/nmap/distinfo
@@ -1 +1 @@
-MD5 (nmap-3.30.tar.bz2) = 639fc1c91f48319eca97401e74f9c90e
+MD5 (nmap-3.46.tar.bz2) = 58974b2d4059752a9f66adc4659f7878
diff --git a/security/nmap/files/patch-Makefile.in b/security/nmap/files/patch-Makefile.in
index 65f57295798d..252c0d8fcdad 100644
--- a/security/nmap/files/patch-Makefile.in
+++ b/security/nmap/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Fri Mar  9 22:25:19 2001
-+++ Makefile.in	Sun May 27 17:49:17 2001
-@@ -9,14 +9,14 @@
+--- Makefile.in.orig	Sat Sep 20 11:00:04 2003
++++ Makefile.in	Wed Sep 24 23:59:42 2003
+@@ -9,7 +9,7 @@
  mandir = @mandir@
  srcdir = @srcdir@
  nmapdatadir = @datadir@/nmap
@@ -8,21 +8,12 @@
 +deskdir = $(X11BASE)/share/gnome/apps/Utilities
  
  NBASEDIR=@NBASEDIR@
- CC = @CC@
- CXX = @CXX@
- CCOPT = 
- LIBPCAPDIR = @libpcapdir@
--INCLS = -I$(LIBPCAPDIR) 
-+#INCLS = -I$(LIBPCAPDIR) 
- DEFS = @DEFS@ -DNMAP_VERSION=\"$(NMAP_VERSION)\" -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
+ NSOCKDIR=@NSOCKDIR@
+@@ -23,6 +23,7 @@
  # For mtrace debugging -- see MTRACE define in main.cc for instructions
  # Should only be enabled during debugging and not in any real release.
-@@ -200,7 +200,7 @@
- 	$(MAKEDEPEND) $(INCLS) -s "# DO NOT DELETE" -- $(DEFS) -- $(SRCS)
- 
- install-nmap: $(TARGET)
--	$(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir) $(deskdir)
-+	$(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir)
- 	$(INSTALL) -c -m 755 nmap $(bindir)/nmap
- 	$(INSTALL) -c -m 644 docs/$(TARGET).1 $(mandir)/man1/$(TARGET).1
- 	$(INSTALL) -c -m 644 nmap-os-fingerprints  $(nmapdatadir)/nmap-os-fingerprints
+ # DEFS += -DMTRACE=1
++CPPFLAGS = @CPPFLAGS@
+ CXXFLAGS = @CXXFLAGS@ $(CCOPT) $(DEFS) $(INCLS)
+ # CFLAGS = $(CXXFLAGS)
+ # CFLAGS = $(DEFS) $(INCLS)
diff --git a/security/nmap/pkg-descr b/security/nmap/pkg-descr
index f5b38d0ddbef..4642b831e38d 100644
--- a/security/nmap/pkg-descr
+++ b/security/nmap/pkg-descr
@@ -1,14 +1,14 @@
-nmap is a utility for port scanning large networks, although it works fine
-for single hosts.  The guiding philosophy for the creation of nmap was TMTOWTDI
-(There's More Than One Way To Do It).  Sometimes you need speed, other times
-you may need stealth.  In some cases, bypassing firewalls may be required. Not
-to mention the fact that you may want to scan different protocols (UDP, TCP,
-ICMP, etc.).  You just can't do all this with one scanning mode.  Thus nmap
-incorporates virtually every scanning technique known of.
+Nmap is a utility for network exploration or security auditing. It
+supports ping scanning (determine which hosts are up), many port
+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.
 
-WWW: http://www.insecure.org/nmap/index.html
+WWW: http://www.insecure.org/nmap/
 
-See the webpage 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
diff --git a/security/nmapfe/pkg-descr b/security/nmap/pkg-descr.fe
index ef1316ec24bc..52dab8778aa5 100644
--- a/security/nmapfe/pkg-descr
+++ b/security/nmap/pkg-descr.fe
@@ -1,6 +1,6 @@
 nmapfe is a GUI front end for the nmap port scanning tool.
 
-WWW: http://www.insecure.org/nmap/index.html
+WWW: http://www.insecure.org/nmap/
 
 -- David
    obrien@cs.ucdavis.edu
diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index e4bc645405b4..ea5a433bf7a0 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -1,6 +1,11 @@
 bin/nmap
-share/nmap/nmap-os-fingerprints
-share/nmap/nmap-protocols
-share/nmap/nmap-services
-share/nmap/nmap-rpc
-@dirrm share/nmap
+%%DATADIR%%/nmap-os-fingerprints
+%%DATADIR%%/nmap-protocols
+%%DATADIR%%/nmap-rpc
+%%DATADIR%%/nmap-service-probes
+%%DATADIR%%/nmap-services
+@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/nmap.dtd
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/security/nmap/pkg-plist.fe b/security/nmap/pkg-plist.fe
new file mode 100644
index 000000000000..61839ed0e911
--- /dev/null
+++ b/security/nmap/pkg-plist.fe
@@ -0,0 +1,8 @@
+bin/nmapfe
+bin/xnmap
+@cwd %%X11BASE%%
+share/gnome/apps/Utilities/nmapfe.desktop
+@unexec rmdir %D/share/gnome/apps/Utilities 2>/dev/null || true
+@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
+@unexec rmdir %D/share/gnome 2>/dev/null || true
+@cwd %%REALPREFIX%%
diff --git a/security/nmapfe/Makefile b/security/nmapfe/Makefile
index 7a56ea41168c..a40ac0b21021 100644
--- a/security/nmapfe/Makefile
+++ b/security/nmapfe/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
 # Ports collection makefile for:  nmap
 # Date created:			  Tue Aug 04, 1998
 # Whom:				  David O'Brien (obrien@NUXI.com)
@@ -10,16 +9,8 @@ PORTNAME=	nmapfe
 
 COMMENT=	GUI frontend for the nmap scanning utility
 
-RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
-
 MASTERDIR=	${.CURDIR}/../nmap
-PLIST=		${.CURDIR}/pkg-plist
-
-USE_GNOME=	gtk12
-
-MAN1=		nmapfe.1 xnmap.1
 
-ALL_TARGET=	nbase/libnbase.a nmapfe/nmapfe
-INSTALL_TARGET=	install-nmapfe
+BUILD_NMAPFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/security/nmapfe/pkg-plist b/security/nmapfe/pkg-plist
deleted file mode 100644
index ed083403e4f5..000000000000
--- a/security/nmapfe/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/nmapfe
-bin/xnmap
-@cwd %%X11BASE%%
-share/gnome/apps/Utilities/nmapfe.desktop
-@cwd %%LOCALBASE%%
diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
index 7a56ea41168c..a40ac0b21021 100644
--- a/security/zenmap/Makefile
+++ b/security/zenmap/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
 # Ports collection makefile for:  nmap
 # Date created:			  Tue Aug 04, 1998
 # Whom:				  David O'Brien (obrien@NUXI.com)
@@ -10,16 +9,8 @@ PORTNAME=	nmapfe
 
 COMMENT=	GUI frontend for the nmap scanning utility
 
-RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
-
 MASTERDIR=	${.CURDIR}/../nmap
-PLIST=		${.CURDIR}/pkg-plist
-
-USE_GNOME=	gtk12
-
-MAN1=		nmapfe.1 xnmap.1
 
-ALL_TARGET=	nbase/libnbase.a nmapfe/nmapfe
-INSTALL_TARGET=	install-nmapfe
+BUILD_NMAPFE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/security/zenmap/pkg-descr b/security/zenmap/pkg-descr
deleted file mode 100644
index ef1316ec24bc..000000000000
--- a/security/zenmap/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-nmapfe is a GUI front end for the nmap port scanning tool.
-
-WWW: http://www.insecure.org/nmap/index.html
-
--- David
-   obrien@cs.ucdavis.edu
diff --git a/security/zenmap/pkg-plist b/security/zenmap/pkg-plist
deleted file mode 100644
index ed083403e4f5..000000000000
--- a/security/zenmap/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/nmapfe
-bin/xnmap
-@cwd %%X11BASE%%
-share/gnome/apps/Utilities/nmapfe.desktop
-@cwd %%LOCALBASE%%