6 files changed, 20 insertions, 142 deletions

diff --git a/security/nmapfe/Makefile b/security/nmapfe/Makefile
index 215ef89aebc3..74b1d5008319 100644
--- a/security/nmapfe/Makefile
+++ b/security/nmapfe/Makefile
@@ -6,26 +6,20 @@
 # $FreeBSD$
 #
 
-PORTNAME=	nmapfe
-PORTVERSION=	0.9.5
-CATEGORIES=	security
-MASTER_SITES=	http://codebox.net/download/  \
-		http://www.insecure.org/nmap/dist/
-EXTRACT_SUFX=	.tgz
+MASTERDIR=	${.CURDIR}/../nmap
+PKGDIR=		${.CURDIR}
 
-MAINTAINER=	obrien@FreeBSD.org
+PORTNAME=	nmapfe
 
 RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
 
-.include <bsd.port.pre.mk>
-
-USE_XLIB=	yes
 USE_GTK=	yes
-GNU_CONFIGURE=	yes
-WRKSRC:=	${WRKDIR}/nmapfe
+#WRKSRC:=	${WRKSRC}/nmapfe
+INSTALL_TARGET=	install-nmapfe
+MAN1=		nmapfe.1 xnmap.1
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nmapfe ${PREFIX}/bin
-	cd ${PREFIX}/bin && ${LN} -f nmapfe xnmap
+after-install:
+	test -e ${PREFIX}/bin/nmapfe \
+	    || (cd ${PREFIX}/bin ; ${LN} -f nmapfe xnmap)
 
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/security/nmapfe/files/patch-ab b/security/nmapfe/files/patch-ab
deleted file mode 100644
index 01688d8d4b88..000000000000
--- a/security/nmapfe/files/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.in.orig	Fri May  7 04:51:52 1999
-+++ Makefile.in	Fri Jul 23 10:46:08 1999
-@@ -71,7 +71,7 @@
- PROGRAMS =  $(bin_PROGRAMS)
- 
- 
--DEFS = @DEFS@ -I. -I$(srcdir) 
-+DEFS = @DEFS@ -DNMAP_PATH=\"$(bindir)/\"  -I. -I$(srcdir) 
- CPPFLAGS = @CPPFLAGS@
- STATIC =
- LDFLAGS = @LDFLAGS@ $(STATIC)
-@@ -231,11 +231,11 @@
- maintainer-clean-depend:
- 	-rm -rf .deps
- 
--%.o: %.c
-+.c.o:
- 	@echo '$(COMPILE) -c $<'; \
- 	$(COMPILE) -c $<
- 
--%.lo: %.c
-+.c.lo:
- 	@echo '$(LTCOMPILE) -c $<'; \
- 	$(LTCOMPILE) -c $<
- 	@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
diff --git a/security/nmapfe/files/patch-ac b/security/nmapfe/files/patch-ac
deleted file mode 100644
index 855630c4c89d..000000000000
--- a/security/nmapfe/files/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
---- gladesig.c.orig	Mon Aug 30 11:27:21 1999
-+++ gladesig.c	Sun Apr  1 22:31:42 2001
-@@ -163,7 +163,7 @@
- on_Get_Nmap_Version_activate           (GtkMenuItem    *menuitem,
-                                         gpointer        user_data)
- {
--     execute("nmap -V");
-+     execute( NMAP_PATH "nmap -V");
- }
- 
- 
-@@ -467,7 +467,8 @@
- if (size > command_size)
-   command = realloc(command, size);
- 
-- strcpy(command, "nmap ");
-+ strcpy(command, NMAP_PATH);
-+ strcat(command, "nmap ");
-  /*Uhm... yeah.. Spit out which scan to perform based
-    on the which_scan variable */
-  
-@@ -487,7 +488,7 @@
-  	strncat(command, " -sR ", 5);
-    
-  if (GTK_TOGGLE_BUTTON(MW->fast_check)->active)
--   strncat(command, " -F ", 3);
-+   strncat(command, " -F ", 4);
-  
-  if (GTK_TOGGLE_BUTTON(MW->range_check)->active) {
-    val = gtk_entry_get_text(GTK_ENTRY(MW->range_text));
diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
index 215ef89aebc3..74b1d5008319 100644
--- a/security/zenmap/Makefile
+++ b/security/zenmap/Makefile
@@ -6,26 +6,20 @@
 # $FreeBSD$
 #
 
-PORTNAME=	nmapfe
-PORTVERSION=	0.9.5
-CATEGORIES=	security
-MASTER_SITES=	http://codebox.net/download/  \
-		http://www.insecure.org/nmap/dist/
-EXTRACT_SUFX=	.tgz
+MASTERDIR=	${.CURDIR}/../nmap
+PKGDIR=		${.CURDIR}
 
-MAINTAINER=	obrien@FreeBSD.org
+PORTNAME=	nmapfe
 
 RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
 
-.include <bsd.port.pre.mk>
-
-USE_XLIB=	yes
 USE_GTK=	yes
-GNU_CONFIGURE=	yes
-WRKSRC:=	${WRKDIR}/nmapfe
+#WRKSRC:=	${WRKSRC}/nmapfe
+INSTALL_TARGET=	install-nmapfe
+MAN1=		nmapfe.1 xnmap.1
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nmapfe ${PREFIX}/bin
-	cd ${PREFIX}/bin && ${LN} -f nmapfe xnmap
+after-install:
+	test -e ${PREFIX}/bin/nmapfe \
+	    || (cd ${PREFIX}/bin ; ${LN} -f nmapfe xnmap)
 
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/security/zenmap/files/patch-ab b/security/zenmap/files/patch-ab
deleted file mode 100644
index 01688d8d4b88..000000000000
--- a/security/zenmap/files/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.in.orig	Fri May  7 04:51:52 1999
-+++ Makefile.in	Fri Jul 23 10:46:08 1999
-@@ -71,7 +71,7 @@
- PROGRAMS =  $(bin_PROGRAMS)
- 
- 
--DEFS = @DEFS@ -I. -I$(srcdir) 
-+DEFS = @DEFS@ -DNMAP_PATH=\"$(bindir)/\"  -I. -I$(srcdir) 
- CPPFLAGS = @CPPFLAGS@
- STATIC =
- LDFLAGS = @LDFLAGS@ $(STATIC)
-@@ -231,11 +231,11 @@
- maintainer-clean-depend:
- 	-rm -rf .deps
- 
--%.o: %.c
-+.c.o:
- 	@echo '$(COMPILE) -c $<'; \
- 	$(COMPILE) -c $<
- 
--%.lo: %.c
-+.c.lo:
- 	@echo '$(LTCOMPILE) -c $<'; \
- 	$(LTCOMPILE) -c $<
- 	@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
diff --git a/security/zenmap/files/patch-ac b/security/zenmap/files/patch-ac
deleted file mode 100644
index 855630c4c89d..000000000000
--- a/security/zenmap/files/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
---- gladesig.c.orig	Mon Aug 30 11:27:21 1999
-+++ gladesig.c	Sun Apr  1 22:31:42 2001
-@@ -163,7 +163,7 @@
- on_Get_Nmap_Version_activate           (GtkMenuItem    *menuitem,
-                                         gpointer        user_data)
- {
--     execute("nmap -V");
-+     execute( NMAP_PATH "nmap -V");
- }
- 
- 
-@@ -467,7 +467,8 @@
- if (size > command_size)
-   command = realloc(command, size);
- 
-- strcpy(command, "nmap ");
-+ strcpy(command, NMAP_PATH);
-+ strcat(command, "nmap ");
-  /*Uhm... yeah.. Spit out which scan to perform based
-    on the which_scan variable */
-  
-@@ -487,7 +488,7 @@
-  	strncat(command, " -sR ", 5);
-    
-  if (GTK_TOGGLE_BUTTON(MW->fast_check)->active)
--   strncat(command, " -F ", 3);
-+   strncat(command, " -F ", 4);
-  
-  if (GTK_TOGGLE_BUTTON(MW->range_check)->active) {
-    val = gtk_entry_get_text(GTK_ENTRY(MW->range_text));