head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.90
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.88
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.86
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.84
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.82
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.80
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.78
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.76
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.74
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.72
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.70
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.68
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.66
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.64
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.62
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.60
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.58
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.56
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.54
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.52
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.50
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.48
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.2.0.46
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.42
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.22
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.2.0.44
	pkgsrc-2019Q4-base:1.2
	pkgsrc-2019Q3:1.2.0.40
	pkgsrc-2019Q3-base:1.2
	pkgsrc-2019Q2:1.2.0.38
	pkgsrc-2019Q2-base:1.2
	pkgsrc-2019Q1:1.2.0.36
	pkgsrc-2019Q1-base:1.2
	pkgsrc-2018Q4:1.2.0.34
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.32
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.2.0.30
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.28
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.2.0.26
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.24
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.2.0.20
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.18
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.16
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.14
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.12
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.10
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.8
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.6
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.4
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.2
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.1.0.32
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.30
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.28
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.26
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.24
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.22
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.20
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.18
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.16
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.14
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.12
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.10
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.8
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.6
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.4
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.2
	pkgsrc-2011Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2015.01.14.20.39.42;	author rumko;	state Exp;
branches;
next	1.1;
commitid	wRuoyQBTwzZ0826y;

1.1
date	2011.02.09.22.51.38;	author rumko;	state Exp;
branches;
next	;


desc
@@


1.2
log
@sysutils/pftop: fix build on fbsd >= 10

Ok@@ wiz
@
text
@$NetBSD: patch-al,v 1.1 2011/02/09 22:51:38 rumko Exp $
$OpenBSD: patch-cache_h,v 1.1 2008/06/13 00:38:12 canacar Exp $

FreeBSD compatibility.
Patches to support PF > 4.1 taken from OpenBSD's ports.

--- cache.h.orig	2007-11-07 06:34:18.000000000 +0000
+++ cache.h
@@@@ -31,14 +31,24 @@@@
 struct sc_ent {
         RB_ENTRY(sc_ent)    tlink;
 	TAILQ_ENTRY(sc_ent) qlink;
+#ifdef HAVE_PFSYNC_STATE
+#if defined(__FreeBSD__) && __FreeBSD_version > 1000017
+	u_int64_t	    id;
+#else
+	u_int32_t	    id[2];
+#endif
+#else
 	struct pf_addr      addr[2];
+#endif
 	double		    peak;
 	double		    rate;
 	time_t		    t;
 	u_int32_t	    bytes;
+#ifndef HAVE_PFSYNC_STATE
         u_int16_t           port[2];
         u_int8_t            af;
         u_int8_t            proto;
+#endif
 };
 
 int cache_init(int);
@


1.1
log
@sysutils/pftop: support newer PF and depend on osabi

* In order for pftop to be built successfully with newer PF
versions (> 4.1), additional patches are necessary which were taken
from OpenBSD's ports as seen in PR pkg/44339
* Pftop compiled for another PF version will not work (properly),
so to avoid any problems we must depend on the OS version

ok@@ wiz
@
text
@d1 1
a1 1
$NetBSD$
d4 1
d7 3
a9 3
--- cache.h.orig	Tue Nov  6 23:34:18 2007
+++ cache.h	Wed Jun 11 19:50:07 2008
@@@@ -31,14 +31,20 @@@@
d14 3
d18 1
@