Date: Thu, 8 Jul 1999 10:51:24 +0200
From: Udo Schweigert <ust@cert.siemens.de>
To: Hellmuth Michaelis <hm@hcs.de>
Subject: Noch ein patch (4.0-CURRENT)

Irgendwann am letzten Wochenende wurde bpfilter in bpf umbenannt. Daher braucht
man fuer 4.0-CURRENT den folgenden patch (ich habe es erst nach einem 
"config -r" gemerkt). 

---snip---
diff -ru i4b.org/driver/i4b_ipr.c i4b/driver/i4b_ipr.c
--- i4b.org/driver/i4b_ipr.c	Thu May  6 10:24:45 1999
+++ i4b/driver/i4b_ipr.c	Thu Jul  8 09:19:56 1999
@@ -110,7 +110,11 @@
 				/* undef to uncompress in the mbuf itself    */
 #endif /* IPR_VJ */
 
+#if defined(__FreeBSD_version) &&  __FreeBSD_version >= 400008
+#include "bpf.h"
+#else
 #include "bpfilter.h"
+#endif
 #if NBPFILTER > 0
 #include <sys/time.h>
 #include <net/bpf.h>
diff -ru i4b.org/driver/i4b_isppp.c i4b/driver/i4b_isppp.c
--- i4b.org/driver/i4b_isppp.c	Tue Jun  8 10:13:00 1999
+++ i4b/driver/i4b_isppp.c	Thu Jul  8 09:20:11 1999
@@ -80,7 +80,11 @@
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 
+#if defined(__FreeBSD_version) &&  __FreeBSD_version >= 400008                
+#include "bpf.h"     
+#else
 #include "bpfilter.h"
+#endif
 #if NBPFILTER > 0
 #include <sys/time.h>
 #include <net/bpf.h>
diff -ru i4b.org/sppp/spppcontrol/spppcontrol.c i4b/sppp/spppcontrol/spppcontrol.c
--- i4b.org/sppp/spppcontrol/spppcontrol.c	Tue Jun  8 10:13:01 1999
+++ i4b/sppp/spppcontrol/spppcontrol.c	Wed Jul  7 22:32:11 1999
@@ -47,8 +47,10 @@
 #include <sys/time.h>
 
 #include <net/if.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#ifdef __FreeBSD__
+#if  __FreeBSD__ >= 3
 #include <net/if_var.h>
+#endif
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>