From 3bc70204ae96e1db0ff987615905d8f466efdc26 Mon Sep 17 00:00:00 2001
From: Max Laier <mlaier@FreeBSD.org>
Date: Tue, 16 Oct 2007 02:10:44 +0000
Subject: [PATCH] Update for libpcap 0.9.8 import

---
 lib/libpcap/Makefile |  5 ++++-
 lib/libpcap/config.h | 26 ++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 4b81ceb1896b..6863573ba0e8 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -10,7 +10,7 @@ SRCS=	grammar.y tokdefs.h version.h pcap-bpf.c \
 	pcap.c inet.c fad-getad.c gencode.c optimize.c nametoaddr.c \
 	etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c \
 	scanner.l version.c
-INCS=	pcap.h pcap-int.h pcap-namedb.h
+INCS=	pcap.h pcap-int.h pcap-namedb.h pcap-bpf.h
 MAN=	pcap.3
 CLEANFILES=tokdefs.h version.h version.c
 
@@ -22,6 +22,9 @@ CFLAGS+=-DHAVE_SNPRINTF -DHAVE_VSNPRINTF
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
 .endif
+.if ${MK_PF} != "no"
+CFLAGS+=-DHAVE_NET_PFVAR_H
+.endif
 
 SHLIB_MAJOR=5
 
diff --git a/lib/libpcap/config.h b/lib/libpcap/config.h
index c88624b8bf8d..a96d89180838 100644
--- a/lib/libpcap/config.h
+++ b/lib/libpcap/config.h
@@ -14,9 +14,18 @@
 /* Enable optimizer debugging */
 /* #undef BDEBUG */
 
+/* define if you have a cloning BPF device */
+/* #undef HAVE_CLONING_BPF */
+
 /* define if you have the DAG API */
 /* #undef HAVE_DAG_API */
 
+/* define if you have dag_get_erf_types() */
+/* #undef HAVE_DAG_GET_ERF_TYPES */
+
+/* define if you have streams capable DAG API */
+/* #undef HAVE_DAG_STREAMS_API */
+
 /* Define to 1 if you have the declaration of `ether_hostton', and to 0 if you
    don't. */
 #define HAVE_DECL_ETHER_HOSTTON 1
@@ -27,8 +36,8 @@
 /* Define to 1 if you have the `ether_hostton' function. */
 #define HAVE_ETHER_HOSTTON 1
 
-/* on HP-UX 10.20 */
-/* #undef HAVE_HPUX10_20 */
+/* on HP-UX 10.20 or later */
+/* #undef HAVE_HPUX10_20_OR_LATER */
 
 /* on HP-UX 9.x */
 /* #undef HAVE_HPUX9 */
@@ -51,12 +60,22 @@
 /* Define to 1 if you have the <netinet/if_ether.h> header file. */
 #define HAVE_NETINET_IF_ETHER_H 1
 
+/* Define to 1 if you have the <net/pfvar.h> header file. */
+/* See Makefile */
+/* #undef HAVE_NET_PFVAR_H */
+
 /* if there's an os_proto.h */
 /* #undef HAVE_OS_PROTO_H */
 
+/* Define to 1 if you have the <paths.h> header file. */
+#define HAVE_PATHS_H 1
+
 /* define if you have a /proc/net/dev */
 /* #undef HAVE_PROC_NET_DEV */
 
+/* define if you have a Septel API */
+/* #undef HAVE_SEPTEL_API */
+
 /* Define to 1 if you have the `snprintf' function. */
 #define HAVE_SNPRINTF 1
 
@@ -87,6 +106,9 @@
 /* Define to 1 if you have the `strlcpy' function. */
 #define HAVE_STRLCPY 1
 
+/* Define to 1 if the system has the type `struct ether_addr'. */
+/* #undef HAVE_STRUCT_ETHER_ADDR */
+
 /* Define to 1 if you have the <sys/bufmod.h> header file. */
 /* #undef HAVE_SYS_BUFMOD_H */