diff -ruN --exclude=CVS /usr/ports/sysutils/pftop/Makefile /usr/home/trn/pftop/Makefile --- /usr/ports/sysutils/pftop/Makefile Wed Sep 14 19:27:00 2005 +++ /usr/home/trn/pftop/Makefile Sat Jan 21 04:37:35 2006 @@ -6,8 +6,8 @@ # PORTNAME= pftop -PORTVERSION= 0.4 -PORTREVISION= 2 +PORTVERSION= 0.5 +#PORTREVISION= 2 CATEGORIES= sysutils net MASTER_SITES= http://www.eee.metu.edu.tr/~canacar/ DISTNAME= ${PORTNAME}-${PORTVERSION} @@ -22,7 +22,7 @@ .include .if ${OSVERSION} < 502106 -IGNORE= Only for 5.3 and above +IGNORE= only for 5.3 and above .endif .if ${OSVERSION} < 502116 diff -ruN --exclude=CVS /usr/ports/sysutils/pftop/distinfo /usr/home/trn/pftop/distinfo --- /usr/ports/sysutils/pftop/distinfo Thu Mar 18 20:51:14 2004 +++ /usr/home/trn/pftop/distinfo Sat Jan 21 04:37:11 2006 @@ -1,2 +1,2 @@ -MD5 (pftop-0.4.tar.gz) = d33b3a30152bac7d50d019a78bc58c72 -SIZE (pftop-0.4.tar.gz) = 23631 +MD5 (pftop-0.5.tar.gz) = d4bdb5dfa7722f76ed3027c1d0be1653 +SHA256 (pftop-0.5.tar.gz) = e5d0fd0d84285a52fd0d1944908d4c3e4f545ec0f0e11e9f9c29ce1536a9d0b7 diff -ruN --exclude=CVS /usr/ports/sysutils/pftop/files/patch-aa /usr/home/trn/pftop/files/patch-aa --- /usr/ports/sysutils/pftop/files/patch-aa Wed May 4 13:16:23 2005 +++ /usr/home/trn/pftop/files/patch-aa Sat Jan 21 04:41:53 2006 @@ -1,13 +1,23 @@ ---- config.h.orig Tue Aug 5 03:19:58 2003 -+++ config.h Wed May 4 18:36:37 2005 -@@ -24,8 +24,8 @@ - #if OS_LEVEL > 32 - #define HAVE_ADDR_MASK - #define HAVE_ADDR_TYPE --#define HAVE_ALTQ --#define HAVE_RULE_ANCHOR -+/* #define HAVE_ALTQ */ -+/* #define HAVE_RULE_ANCHOR */ - #define HAVE_RULE_TOS - #endif - +*** config.h.orig Sat Jan 21 04:39:55 2006 +--- config.h Sat Jan 21 04:40:15 2006 +*************** +*** 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 + +--- 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 + diff -ruN --exclude=CVS /usr/ports/sysutils/pftop/files/patch-ab /usr/home/trn/pftop/files/patch-ab --- /usr/ports/sysutils/pftop/files/patch-ab Wed May 4 13:16:23 2005 +++ /usr/home/trn/pftop/files/patch-ab Sat Jan 21 04:47:22 2006 @@ -1,39 +1,29 @@ ---- pftop.c.orig Tue Aug 5 03:20:39 2003 -+++ pftop.c Wed May 4 18:41:13 2005 -@@ -1802,7 +1802,11 @@ - PF_AZERO(PT_MASK(src), AF_INET6)) - tbprintf("any "); - else { -+#if OS_LEVEL > 35 -+ if (src->neg) -+#else - if (src->not) -+#endif - tbprintf("! "); - #ifdef HAVE_ADDR_WRAP - tb_print_addrw(&src->addr, PT_MASK(src), af); -@@ -1823,7 +1827,11 @@ - PF_AZERO(PT_MASK(dst), AF_INET6)) - tbprintf("any "); - else { -+#if OS_LEVEL > 35 -+ if (dst->neg) -+#else - if (dst->not) -+#endif - tbprintf("! "); - #ifdef HAVE_ADDR_WRAP - tb_print_addrw(&dst->addr, PT_MASK(dst), af); -@@ -1983,10 +1991,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) { +*** 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 ");