Due to popular demand, break the `nmapfe' GUI frontend for nmap off from

the main nmap port.  The nmap port now does not depend on GUI libs and is
thus installable on console-based machines.

8 files changed, 14 insertions, 42 deletions

diff --git a/security/nmapfe/Makefile b/security/nmapfe/Makefile
index 6070375..e362a3e 100644
--- a/security/nmapfe/Makefile
+++ b/security/nmapfe/Makefile
@@ -8,7 +8,7 @@
 #
 
 DISTNAME=	nmap-2.3BETA5
-PKGNAME=	nmap-2.3b5
+PKGNAME=	nmapfe-19990907
 CATEGORIES=	security net
 MASTER_SITES=	http://www.insecure.org/nmap/dist/  \
 		ftp://relay.nuxi.com/pub/misc/
@@ -17,6 +17,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=     obrien@FreeBSD.org
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
 
 .include <bsd.port.pre.mk>
 
@@ -24,15 +25,12 @@ USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --libdir=${PREFIX}/share/misc
 MAKE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
-.if ${OSVERSION} < 300004
-CFLAGS+=	-DDLT_RAW=12 # for obsoleted <net/bpf.h>
-.endif
-MAN1=		nmap.1
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/libpcap*
 
-post-install:
-	@strip ${PREFIX}/bin/nmap
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/nmapfe/nmapfe ${PREFIX}/bin
+	cd ${PREFIX}/bin && ${LN} -f nmapfe xnmap
 
 .include <bsd.port.post.mk>
diff --git a/security/nmapfe/pkg-comment b/security/nmapfe/pkg-comment
index 3de83ad..5678ecd2 100644
--- a/security/nmapfe/pkg-comment
+++ b/security/nmapfe/pkg-comment
@@ -1 +1 @@
-Port scanning utility for large networks
+GUI frontend for the nmap scanning utility
diff --git a/security/nmapfe/pkg-descr b/security/nmapfe/pkg-descr
index c591362..ef1316e 100644
--- a/security/nmapfe/pkg-descr
+++ b/security/nmapfe/pkg-descr
@@ -1,15 +1,6 @@
-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
-incorporats virtually every scanning technique known of.
+nmapfe is a GUI front end for the nmap port scanning tool.
 
 WWW: http://www.insecure.org/nmap/index.html
 
-See the webpage 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/nmapfe/pkg-plist b/security/nmapfe/pkg-plist
index 3de481e..201a964 100644
--- a/security/nmapfe/pkg-plist
+++ b/security/nmapfe/pkg-plist
@@ -1,6 +1,3 @@
 @comment $FreeBSD$
-bin/nmap
 bin/nmapfe
 bin/xnmap
-share/misc/nmap-os-fingerprints
-share/misc/nmap-services
diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
index 6070375..e362a3e 100644
--- a/security/zenmap/Makefile
+++ b/security/zenmap/Makefile
@@ -8,7 +8,7 @@
 #
 
 DISTNAME=	nmap-2.3BETA5
-PKGNAME=	nmap-2.3b5
+PKGNAME=	nmapfe-19990907
 CATEGORIES=	security net
 MASTER_SITES=	http://www.insecure.org/nmap/dist/  \
 		ftp://relay.nuxi.com/pub/misc/
@@ -17,6 +17,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=     obrien@FreeBSD.org
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
 
 .include <bsd.port.pre.mk>
 
@@ -24,15 +25,12 @@ USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --libdir=${PREFIX}/share/misc
 MAKE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
-.if ${OSVERSION} < 300004
-CFLAGS+=	-DDLT_RAW=12 # for obsoleted <net/bpf.h>
-.endif
-MAN1=		nmap.1
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/libpcap*
 
-post-install:
-	@strip ${PREFIX}/bin/nmap
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/nmapfe/nmapfe ${PREFIX}/bin
+	cd ${PREFIX}/bin && ${LN} -f nmapfe xnmap
 
 .include <bsd.port.post.mk>
diff --git a/security/zenmap/pkg-comment b/security/zenmap/pkg-comment
index 3de83ad..5678ecd2 100644
--- a/security/zenmap/pkg-comment
+++ b/security/zenmap/pkg-comment
@@ -1 +1 @@
-Port scanning utility for large networks
+GUI frontend for the nmap scanning utility
diff --git a/security/zenmap/pkg-descr b/security/zenmap/pkg-descr
index c591362..ef1316e 100644
--- a/security/zenmap/pkg-descr
+++ b/security/zenmap/pkg-descr
@@ -1,15 +1,6 @@
-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
-incorporats virtually every scanning technique known of.
+nmapfe is a GUI front end for the nmap port scanning tool.
 
 WWW: http://www.insecure.org/nmap/index.html
 
-See the webpage 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/zenmap/pkg-plist b/security/zenmap/pkg-plist
index 3de481e..201a964 100644
--- a/security/zenmap/pkg-plist
+++ b/security/zenmap/pkg-plist
@@ -1,6 +1,3 @@
 @comment $FreeBSD$
-bin/nmap
 bin/nmapfe
 bin/xnmap
-share/misc/nmap-os-fingerprints
-share/misc/nmap-services