5 files changed, 17 insertions, 33 deletions

diff --git a/net/ipfw-graph/Makefile b/net/ipfw-graph/Makefile
index 7a89241859ed..90fb357aee0b 100644
--- a/net/ipfw-graph/Makefile
+++ b/net/ipfw-graph/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ipfw-graph
-PORTVERSION=	1.3
+PORTVERSION=	1.4
 CATEGORIES=	net
 MASTER_SITES=	http://www.mavetju.org/download/
 
@@ -17,4 +17,7 @@ MAKE_ENV+=	MANPREFIX="${MANPREFIX}"
 
 MAN8=		ipfw-al.8 ipfw-graph.8
 
+pre-patch:
+	@${PERL} -pi -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/ipfw-graph.h
+
 .include <bsd.port.mk>
diff --git a/net/ipfw-graph/distinfo b/net/ipfw-graph/distinfo
index a5ea2854fb5b..1e949f1bacaa 100644
--- a/net/ipfw-graph/distinfo
+++ b/net/ipfw-graph/distinfo
@@ -1 +1 @@
-MD5 (ipfw-graph-1.3.tar.gz) = d624be15caf4f0f5401658138ad04850
+MD5 (ipfw-graph-1.4.tar.gz) = 44a1a43ad982fe976bca9608deaeb5d9
diff --git a/net/ipfw-graph/files/patch-Makefile b/net/ipfw-graph/files/patch-Makefile
index 8724046c19ff..6c2315283ebb 100644
--- a/net/ipfw-graph/files/patch-Makefile
+++ b/net/ipfw-graph/files/patch-Makefile
@@ -1,31 +1,23 @@
---- Makefile.orig	Fri Nov 16 02:46:59 2001
-+++ Makefile	Sat Nov 17 15:56:24 2001
-@@ -2,12 +2,11 @@
- # $Id: Makefile,v 1.8 2001/11/16 04:46:20 mavetju Exp $
+--- Makefile.orig	Thu Nov 22 23:12:38 2001
++++ Makefile	Fri Nov 23 00:33:25 2001
+@@ -2,7 +2,6 @@
+ # $Id: Makefile,v 1.10 2001/11/23 04:09:03 mavetju Exp $
  #
  
--CC	= gcc
--OPT_C	= -c -Wall -g
-+OPT_C	= -c -Wall -g $(CFLAGS)
- OPT_L	= -g
- 
--GTK_C	= `gtk12-config --cflags`
--GTK_L	= `gtk12-config --libs`
-+GTK_C	= `${GTK_CONFIG} --cflags`
-+GTK_L	= `${GTK_CONFIG} --libs`
+-GTK_CONFIG ?= gtk12-config
  
- OFILES	= ipfw-core.o ipfw-data.o ipfw-gtk.o ipfw-default.o ipfw-log.o \
- 	  ipfw-linear.o ipfw-allowonly.o ipfw-denyonly.o
-@@ -38,7 +37,8 @@
+ OPT_C	= -c -Wall -g $(CFLAGS)
+ OPT_L	= -g
+@@ -39,7 +38,8 @@
  	rm /usr/local/man/man8/ipfw-graph.8
  
  install:
--	install -o root -g wheel -m 4755 ipfw-al /usr/local/sbin
+-	install -o root -g wheel -m 4755 ipfw-al /usr/local/bin
 -	install -o root -g wheel -m 0755 ipfw-graph /usr/local/bin
 -	install -o root -g wheel -m 0644 ipfw-al.8 /usr/local/man/man8
 -	install -o root -g wheel -m 0644 ipfw-graph.8 /usr/local/man/man8
-+	${BSD_INSTALL_PROGRAM} ipfw-al ${PREFIX}/sbin
-+	chmod u+s ${PREFIX}/sbin/ipfw-al
++	${BSD_INSTALL_PROGRAM} ipfw-al ${PREFIX}/bin
++	chmod u+s ${PREFIX}/bin/ipfw-al
 +	${BSD_INSTALL_PROGRAM} ipfw-graph ${PREFIX}/bin
 +	${BSD_INSTALL_MAN} ipfw-al.8 ${MANPREFIX}/man/man8
 +	${BSD_INSTALL_MAN} ipfw-graph.8 ${MANPREFIX}/man/man8
diff --git a/net/ipfw-graph/files/patch-ipfw-gtk.c b/net/ipfw-graph/files/patch-ipfw-gtk.c
deleted file mode 100644
index 277067d5654d..000000000000
--- a/net/ipfw-graph/files/patch-ipfw-gtk.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ipfw-gtk.c.orig	Sat Nov 17 15:50:05 2001
-+++ ipfw-gtk.c	Sat Nov 17 15:50:14 2001
-@@ -230,7 +230,7 @@
- 
- //  text_area=gtk_label_new("blaat");
-     text_area=gtk_entry_new();
--    gtk_entry_set_text(text_area,"blaat");
-+    gtk_entry_set_text((GtkEntry *)text_area,"blaat");
-     gtk_box_pack_start(GTK_BOX(vbox),text_area,FALSE,FALSE,0);
-     gtk_widget_show(text_area);
- 
diff --git a/net/ipfw-graph/pkg-plist b/net/ipfw-graph/pkg-plist
index 8916d598db9b..78f9c15832e6 100644
--- a/net/ipfw-graph/pkg-plist
+++ b/net/ipfw-graph/pkg-plist
@@ -1,2 +1,2 @@
 bin/ipfw-graph
-sbin/ipfw-al
+bin/ipfw-al