On Wed, Jan 11, 2006 at 04:29:29AM +0200, Can Erkin Acar wrote:
> Update pftop to version 0.5 which is released a couple of minutes ago.
> ok?
Works for me on i386/-current.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/pftop/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 Makefile
> --- Makefile 4 Dec 2005 10:43:02 -0000 1.5
> +++ Makefile 11 Jan 2006 02:08:24 -0000
> @@ -3,8 +3,8 @@
>
> COMMENT= "curses-based real time state and rule display for pf"
>
> -DISTNAME= pftop-0.4
> -PKGNAME= ${DISTNAME}p0
> +DISTNAME= pftop-0.5
> +PKGNAME= ${DISTNAME}
> CATEGORIES= sysutils
>
> HOMEPAGE= http://www.eee.metu.edu.tr/~canacar/pftop/
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/pftop/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 distinfo
> --- distinfo 5 Jan 2005 17:29:35 -0000 1.4
> +++ distinfo 11 Jan 2006 02:08:39 -0000
> @@ -1,4 +1,4 @@
> -MD5 (pftop-0.4.tar.gz) = d33b3a30152bac7d50d019a78bc58c72
> -RMD160 (pftop-0.4.tar.gz) = fc08e6ec45fbfdca30e32bd0d90f04968e323dc4
> -SHA1 (pftop-0.4.tar.gz) = 717d8a9527a412cf21c1a6b7e6fa054bf0298ab2
> -SIZE (pftop-0.4.tar.gz) = 23631
> +MD5 (pftop-0.5.tar.gz) = d4bdb5dfa7722f76ed3027c1d0be1653
> +RMD160 (pftop-0.5.tar.gz) = f52b482534d210770a616a5dee2eb8910751e0ed
> +SHA1 (pftop-0.5.tar.gz) = a735c05414d78a7155e99233529f6deb7e3035c4
> +SIZE (pftop-0.5.tar.gz) = 24855
> Index: patches/patch-config_h
> ===================================================================
> RCS file: patches/patch-config_h
> diff -N patches/patch-config_h
> --- patches/patch-config_h 2 Jun 2004 19:22:56 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-config_h,v 1.1 2004/06/02 19:22:56 canacar Exp $
> ---- config.h.orig 2004-06-01 19:57:53.000000000 +0300
> -+++ config.h 2004-06-01 19:57:59.000000000 +0300
> -@@ -25,7 +25,6 @@
> - #define HAVE_ADDR_MASK
> - #define HAVE_ADDR_TYPE
> - #define HAVE_ALTQ
> --#define HAVE_RULE_ANCHOR
> - #define HAVE_RULE_TOS
> - #endif
> -
> Index: patches/patch-pftop_c
> ===================================================================
> RCS file: patches/patch-pftop_c
> diff -N patches/patch-pftop_c
> --- patches/patch-pftop_c 4 Dec 2005 10:43:03 -0000 1.7
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,31 +0,0 @@
> ---- pftop.c.orig Tue Aug 5 03:20:39 2003
> -+++ pftop.c Sun Dec 4 11:31:18 2005
> -@@ -1802,7 +1802,7 @@ tb_print_fromto(struct pf_rule_addr *src
> - PF_AZERO(PT_MASK(src), AF_INET6))
> - tbprintf("any ");
> - else {
> -- if (src->not)
> -+ if (src->neg)
> - tbprintf("! ");
> - #ifdef HAVE_ADDR_WRAP
> - tb_print_addrw(&src->addr, PT_MASK(src), af);
> -@@ -1823,7 +1823,7 @@ tb_print_fromto(struct pf_rule_addr *src
> - PF_AZERO(PT_MASK(dst), AF_INET6))
> - tbprintf("any ");
> - else {
> -- if (dst->not)
> -+ if (dst->neg)
> - tbprintf("! ");
> - #ifdef HAVE_ADDR_WRAP
> - tb_print_addrw(&dst->addr, PT_MASK(dst), af);
> -@@ -1890,8 +1890,8 @@ print_rule(struct pf_rule *pr)
> - #ifdef HAVE_RULE_STATES
> - print_fld_size(FLD_STATS, pr->states);
> - #endif
> -- print_fld_size(FLD_PKTS, pr->packets);
> -- print_fld_size(FLD_BYTES, pr->bytes);
> -+ print_fld_size(FLD_PKTS, pr->packets[0] + pr->packets[1]);
> -+ print_fld_size(FLD_BYTES, pr->bytes[0] + pr->bytes[1]);
> - print_fld_uint(FLD_RULE, pr->nr);
> - print_fld_str(FLD_DIR, pr->direction == PF_OUT ? "Out" : "In");
> - if (pr->quick)
