diff options
| author | Max Laier <mlaier@FreeBSD.org> | 2005-05-04 17:16:23 +0000 |
|---|---|---|
| committer | Max Laier <mlaier@FreeBSD.org> | 2005-05-04 17:16:23 +0000 |
| commit | b45042909e12258ed6b2d3d4f98fa04e7e3c17f1 (patch) | |
| tree | 3d04a34ca9efe04943147d77e5fbbd908322f4d7 /sysutils/pftop | |
| parent | 0e7f23e2488c8668ec7b7247f2cdf1acf05692ef (diff) | |
| download | ports-b45042909e12258ed6b2d3d4f98fa04e7e3c17f1.tar.gz ports-b45042909e12258ed6b2d3d4f98fa04e7e3c17f1.zip | |
Update pftop for the pf 3.7 import.
Submitted by: Edwin Brown <edwin(!)brown(at)gmail(!)com> (w/changes)
Approved by: pav
Notes
Notes:
svn path=/head/; revision=134621
Diffstat (limited to 'sysutils/pftop')
| -rw-r--r-- | sysutils/pftop/Makefile | 9 | ||||
| -rw-r--r-- | sysutils/pftop/files/patch-aa | 10 | ||||
| -rw-r--r-- | sysutils/pftop/files/patch-ab | 30 |
3 files changed, 39 insertions, 10 deletions
diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile index 3eeca665b58c..b03dbe16f911 100644 --- a/sysutils/pftop/Makefile +++ b/sysutils/pftop/Makefile @@ -7,7 +7,7 @@ PORTNAME= pftop PORTVERSION= 0.4 -PORTREVISION= 1 +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} < 500000 -IGNORE= "Only for 5.0 and above" +IGNORE= Only for 5.0 and above .endif .if ${OSVERSION} < 502116 @@ -30,8 +30,11 @@ MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=34 .if defined(WITH_ALTQ) && (${WITH_ALTQ} == "yes") CFLAGS+= -DHAVE_ALTQ=1 .endif -.else +.elif ${OSVERSION} < 600025 MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=35 +CFLAGS+= -DHAVE_ALTQ=1 -DHAVE_RULE_ANCHOR=1 +.else +MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=37 CFLAGS+= -DHAVE_ALTQ=1 .endif diff --git a/sysutils/pftop/files/patch-aa b/sysutils/pftop/files/patch-aa index 419d0ba1a47a..3016c1a35c1c 100644 --- a/sysutils/pftop/files/patch-aa +++ b/sysutils/pftop/files/patch-aa @@ -1,11 +1,13 @@ ---- config.h.orig Sat Sep 27 14:21:58 2003 -+++ config.h Sat Sep 27 14:22:21 2003 -@@ -24,7 +24,7 @@ +--- 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_ANCHOR */ #define HAVE_RULE_TOS #endif + diff --git a/sysutils/pftop/files/patch-ab b/sysutils/pftop/files/patch-ab index 82a0772f17b1..7cb45afb7940 100644 --- a/sysutils/pftop/files/patch-ab +++ b/sysutils/pftop/files/patch-ab @@ -1,6 +1,30 @@ ---- ../pftop-0.4.orig/pftop.c Tue Aug 5 10:20:39 2003 -+++ ./pftop.c Fri Sep 26 13:03:55 2003 -@@ -1983,10 +1983,10 @@ +--- 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], |