5 files changed, 47 insertions, 33 deletions

diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile
index ee1ca21bc784..f109893c3af9 100644
--- a/sysutils/pftop/Makefile
+++ b/sysutils/pftop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pftop
-PORTVERSION=	0.6
+PORTVERSION=	0.7
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://www.eee.metu.edu.tr/~canacar/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -45,6 +45,10 @@ PLIST_FILES=	sbin/pftop
 post-patch:
 	@${REINPLACE_CMD} -e 's|<sys/queue.h>|"${FILESDIR}/queue.h"|g' \
 	    ${WRKSRC}/engine.c
+	@${REINPLACE_CMD} -e 's|__dead|__dead2|g' ${WRKSRC}/sf-gencode.h
+	@${REINPLACE_CMD} -e 's|__dead|__dead2|g' ${WRKSRC}/sf-gencode.c
+	@${REINPLACE_CMD} -e 's|#include <net/if_pflog.h>||g' \
+	    ${WRKSRC}/sf-gencode.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pftop ${PREFIX}/sbin
diff --git a/sysutils/pftop/distinfo b/sysutils/pftop/distinfo
index 3d132c00505c..56e6202f6544 100644
--- a/sysutils/pftop/distinfo
+++ b/sysutils/pftop/distinfo
@@ -1,3 +1,3 @@
-MD5 (pftop-0.6.tar.gz) = c84fb960d36e9a9271c211c98efae062
-SHA256 (pftop-0.6.tar.gz) = bc6e9f93405b6a941074e4e5454adb56c63e24b3def4660d32c826237a8faaba
-SIZE (pftop-0.6.tar.gz) = 26236
+MD5 (pftop-0.7.tar.gz) = 2fdef1e3fffc38ae40f27aa2dfdcf6fc
+SHA256 (pftop-0.7.tar.gz) = afde859fab77597e4aae1ef6b87f1bb26a5ad8cb2b1d7316a12e5098153492af
+SIZE (pftop-0.7.tar.gz) = 59765
diff --git a/sysutils/pftop/files/patch-ab b/sysutils/pftop/files/patch-ab
deleted file mode 100644
index 1048d1acdb42..000000000000
--- a/sysutils/pftop/files/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-*** pftop.c.orig	Tue Jan 10 21:06:14 2006
---- pftop.c	Sat Jan 21 04:47:06 2006
-***************
-*** 2215,2226 ****
-  	tb_print_fromto(&pr->src, &pr->dst, pr->af, pr->proto);
-  #ifdef HAVE_RULE_UGID
-  	if (pr->uid.op)
-  		tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1],
-! 		        "user", UID_MAX);
-  	if (pr->gid.op)
-  		tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1],
-! 		        "group", GID_MAX);
-  #endif
-  
-  	if (pr->flags || pr->flagset) {
-  		tbprintf(" flags ");
---- 2215,2226 ----
-  	tb_print_fromto(&pr->src, &pr->dst, pr->af, pr->proto);
-  #ifdef HAVE_RULE_UGID
-  	if (pr->uid.op)
-  		tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1],
-! 		        "user", UINT_MAX);
-  	if (pr->gid.op)
-  		tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1],
-! 		        "group", UINT_MAX);
-  #endif
-  
-  	if (pr->flags || pr->flagset) {
-  		tbprintf(" flags ");
diff --git a/sysutils/pftop/files/patch-pftop.c b/sysutils/pftop/files/patch-pftop.c
new file mode 100644
index 000000000000..34f8fc455a79
--- /dev/null
+++ b/sysutils/pftop/files/patch-pftop.c
@@ -0,0 +1,28 @@
+--- pftop.c.orig	2007-11-07 07:36:46.000000000 +0100
++++ pftop.c	2008-04-01 17:03:25.847268996 +0200
+@@ -1570,10 +1570,10 @@
+ #ifdef HAVE_RULE_UGID
+ 	if (pr->uid.op)
+ 		tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1],
+-		        "user", UID_MAX);
++		        "user", UINT_MAX);
+ 	if (pr->gid.op)
+ 		tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1],
+-		        "group", GID_MAX);
++		        "group", UINT_MAX);
+ #endif
+ 
+ 	if (pr->flags || pr->flagset) {
+@@ -1765,7 +1765,12 @@
+ 				  strerror(errno));
+ 			return (-1);
+ 		}
++#ifdef PFALTQ_FLAG_IF_REMOVED
++		if (pa.altq.qid > 0 &&
++		    !(pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED)) {
++#else
+ 		if (pa.altq.qid > 0) {
++#endif
+ 			pq.nr = nr;
+ 			pq.ticket = pa.ticket;
+ 			pq.buf = &qstats;
diff --git a/sysutils/pftop/files/patch-sf-scanner.l b/sysutils/pftop/files/patch-sf-scanner.l
new file mode 100644
index 000000000000..94d9e2d856af
--- /dev/null
+++ b/sysutils/pftop/files/patch-sf-scanner.l
@@ -0,0 +1,11 @@
+--- sf-scanner.l.orig	2007-11-07 07:34:18.000000000 +0100
++++ sf-scanner.l	2008-04-01 17:03:25.853268641 +0200
+@@ -233,7 +233,7 @@
+ 			size_t len = strlen(yytext) * 4 + 1;
+ 			char *v = malloc(len);
+ 			if (v != NULL)
+-				strnvis(v, yytext, len, 0);
++				strvis(v, yytext, 0);
+ 			sf_error("illegal token: %s", v);
+ 			free(v);
+ 			}