Update to 0.5.

PR:		ports/92094
Submitted by:	Jeffrey H dot  Johnson <CPE1704TKS at bellsouth dot net>
Approved by:	maintainer

sysutils/pftop/Makefile

@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	pftop
-PORTVERSION=	0.4
+PORTVERSION=	0.5
-PORTREVISION=	2
+#PORTREVISION=	2
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://www.eee.metu.edu.tr/~canacar/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -22,7 +22,7 @@ MANCOMPRESSED=	no
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 502106
-IGNORE=		Only for 5.3 and above
+IGNORE=		only for 5.3 and above
 .endif
 
 .if ${OSVERSION} < 502116

sysutils/pftop/distinfo

@@ -1,3 +1,3 @@
-MD5 (pftop-0.4.tar.gz) = d33b3a30152bac7d50d019a78bc58c72
+MD5 (pftop-0.5.tar.gz) = d4bdb5dfa7722f76ed3027c1d0be1653
-SHA256 (pftop-0.4.tar.gz) = ec3ae9d8423c27bea20635044fa18ae2ff2dee421f3f77e9c3737b2760e0f95b
+SHA256 (pftop-0.5.tar.gz) = e5d0fd0d84285a52fd0d1944908d4c3e4f545ec0f0e11e9f9c29ce1536a9d0b7
 SIZE (pftop-0.4.tar.gz) = 23631

sysutils/pftop/files/patch-aa

@@ -1,13 +1,23 @@
---- config.h.orig	Tue Aug  5 03:19:58 2003
+*** config.h.orig	Sat Jan 21 04:39:55 2006
-+++ config.h	Wed May  4 18:36:37 2005
+--- config.h	Sat Jan 21 04:40:15 2006
-@@ -24,8 +24,8 @@
+***************
- #if OS_LEVEL > 32
+*** 23,31 ****
- #define HAVE_ADDR_MASK
+  
- #define HAVE_ADDR_TYPE
+  #if OS_LEVEL > 32
--#define HAVE_ALTQ
+  #define HAVE_ADDR_MASK
--#define HAVE_RULE_ANCHOR
+  #define HAVE_ADDR_TYPE
-+/* #define HAVE_ALTQ */
+! #define HAVE_ALTQ
-+/* #define HAVE_RULE_ANCHOR */
+  #define HAVE_RULE_TOS
- #define HAVE_RULE_TOS
+  #define HAVE_OP_RRG
- #endif
+  #endif
- 
+  
+--- 23,31 ----
+  
+  #if OS_LEVEL > 32
+  #define HAVE_ADDR_MASK
+  #define HAVE_ADDR_TYPE
+! /* #define HAVE_ALTQ */
+  #define HAVE_RULE_TOS
+  #define HAVE_OP_RRG
+  #endif
+  

sysutils/pftop/files/patch-ab

@@ -1,39 +1,29 @@
---- pftop.c.orig	Tue Aug  5 03:20:39 2003
+*** pftop.c.orig	Tue Jan 10 21:06:14 2006
-+++ pftop.c	Wed May  4 18:41:13 2005
+--- pftop.c	Sat Jan 21 04:47:06 2006
-@@ -1802,7 +1802,11 @@
+***************
- 			 PF_AZERO(PT_MASK(src), AF_INET6))
+*** 2215,2226 ****
- 			tbprintf("any ");
+  	tb_print_fromto(&pr->src, &pr->dst, pr->af, pr->proto);
- 		else {
+  #ifdef HAVE_RULE_UGID
-+#if OS_LEVEL > 35
+  	if (pr->uid.op)
-+			if (src->neg)
+  		tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1],
-+#else
+! 		        "user", UID_MAX);
- 			if (src->not)
+  	if (pr->gid.op)
-+#endif
+  		tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1],
- 				tbprintf("! ");
+! 		        "group", GID_MAX);
- #ifdef HAVE_ADDR_WRAP
+  #endif
- 			tb_print_addrw(&src->addr, PT_MASK(src), af);
+  
-@@ -1823,7 +1827,11 @@
+  	if (pr->flags || pr->flagset) {
- 			 PF_AZERO(PT_MASK(dst), AF_INET6))
+  		tbprintf(" flags ");
- 			tbprintf("any ");
+--- 2215,2226 ----
- 		else {
+  	tb_print_fromto(&pr->src, &pr->dst, pr->af, pr->proto);
-+#if OS_LEVEL > 35
+  #ifdef HAVE_RULE_UGID
-+			if (dst->neg)
+  	if (pr->uid.op)
-+#else
+  		tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1],
- 			if (dst->not)
+! 		        "user", UINT_MAX);
-+#endif
+  	if (pr->gid.op)
- 				tbprintf("! ");
+  		tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1],
- #ifdef HAVE_ADDR_WRAP
+! 		        "group", UINT_MAX);
- 			tb_print_addrw(&dst->addr, PT_MASK(dst), af);
+  #endif
-@@ -1983,10 +1991,10 @@
+  
- #ifdef HAVE_RULE_UGID
+  	if (pr->flags || pr->flagset) {
- 	if (pr->uid.op)
+  		tbprintf(" flags ");
- 		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) {