5 files changed, 6 insertions, 82 deletions
diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index fca2b59cf7b..ff80dfaff5c 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2007/02/22 19:26:54 wiz Exp $
+# $NetBSD: Makefile,v 1.36.4.1 2007/08/13 08:17:50 ghen Exp $
 
-DISTNAME=		libpcap-0.9.5
+DISTNAME=		libpcap-0.9.7
 SVR4_PKGNAME=		lpcap
 CATEGORIES=		net
 MASTER_SITES=	http://www.tcpdump.org/release/
diff --git a/net/libpcap/distinfo b/net/libpcap/distinfo
index 70f0a9bdfbd..653dd5edbba 100644
--- a/net/libpcap/distinfo
+++ b/net/libpcap/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.17 2007/01/03 13:34:55 adrianp Exp $
+$NetBSD: distinfo,v 1.17.4.1 2007/08/13 08:17:51 ghen Exp $
 
-SHA1 (libpcap-0.9.5.tar.gz) = 3a3b0821f7201b4a72201c69ca2411a3db8a83c3
-RMD160 (libpcap-0.9.5.tar.gz) = 272a167881ad05dddd5a1095b0f64f3ecd845bdc
-Size (libpcap-0.9.5.tar.gz) = 433207 bytes
-SHA1 (patch-ab) = ef8450b6f7ee050fcc40eec8ebdaa3fbb3ebdfe9
+SHA1 (libpcap-0.9.7.tar.gz) = 0e2e494d8a66dd644fff03dcad7887164aef9b0e
+RMD160 (libpcap-0.9.7.tar.gz) = f927552c04aa3ef35f8e62e9286001e8ddb3dcf0
+Size (libpcap-0.9.7.tar.gz) = 517562 bytes
 SHA1 (patch-ac) = b8cf112a9a7cd0114b728e128905a8806a8d1e5a
-SHA1 (patch-ad) = f9d2d6401a62d216b9f0af858fb1adde2098483e
-SHA1 (patch-ae) = 5b00f64d503b44d13814e326c5f171c5a20c7eb3
diff --git a/net/libpcap/patches/patch-ab b/net/libpcap/patches/patch-ab
deleted file mode 100644
index 8a75363e3c4..00000000000
--- a/net/libpcap/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/10/22 14:14:42 wiz Exp $
-
---- pcap-int.h.orig	2005-07-07 08:56:04.000000000 +0200
-+++ pcap-int.h
-@@ -112,6 +112,7 @@ struct pcap_md {
-  * Ultrix, DEC OSF/1^H^H^H^H^H^H^H^H^HDigital UNIX^H^H^H^H^H^H^H^H^H^H^H^H
-  * Tru64 UNIX, and NetBSD pad to make everything line up on a nice boundary.
-  */
-+#include <sys/param.h>
- #if defined(ultrix) || defined(__osf__) || (defined(__NetBSD__) && __NetBSD_Version__ > 106000000)
- #define       PCAP_FDDIPAD 3
- #endif
diff --git a/net/libpcap/patches/patch-ad b/net/libpcap/patches/patch-ad
deleted file mode 100644
index b3a49f503c2..00000000000
--- a/net/libpcap/patches/patch-ad
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/02/24 22:53:41 drochner Exp $
-
---- pcap-bpf.c.orig	2006-02-24 23:23:45.000000000 +0100
-+++ pcap-bpf.c
-@@ -34,6 +34,9 @@ static const char rcsid[] _U_ =
- #include <sys/file.h>
- #include <sys/ioctl.h>
- #include <sys/utsname.h>
-+#ifdef __NetBSD__
-+#include <paths.h>
-+#endif
- 
- #include <net/if.h>
- 
-@@ -523,8 +526,12 @@ static inline int
- bpf_open(pcap_t *p, char *errbuf)
- {
- 	int fd;
-+#ifndef _PATH_BPF
- 	int n = 0;
- 	char device[sizeof "/dev/bpf0000000000"];
-+#else
-+	const char *device = _PATH_BPF;
-+#endif
- 
- #ifdef _AIX
- 	/*
-@@ -536,6 +543,7 @@ bpf_open(pcap_t *p, char *errbuf)
- 		return (-1);
- #endif
- 
-+#ifndef _PATH_BPF
- 	/*
- 	 * Go through all the minors and find one that isn't in use.
- 	 */
-@@ -566,6 +574,12 @@ bpf_open(pcap_t *p, char *errbuf)
- 	if (fd < 0)
- 		snprintf(errbuf, PCAP_ERRBUF_SIZE, "(no devices found) %s: %s",
- 		    device, pcap_strerror(errno));
-+#else
-+	if ((fd = open(device, O_RDWR)) == -1 &&
-+	    (errno != EACCES || (fd = open(device, O_RDONLY)) == -1))
-+		snprintf(errbuf, PCAP_ERRBUF_SIZE,
-+		  "(cannot open device) %s: %s", device, pcap_strerror(errno));
-+#endif
- 
- 	return (fd);
- }
diff --git a/net/libpcap/patches/patch-ae b/net/libpcap/patches/patch-ae
deleted file mode 100644
index 9d98c0b1f31..00000000000
--- a/net/libpcap/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/02/24 23:39:44 drochner Exp $
-
---- optimize.c.orig	2006-02-25 00:31:53.000000000 +0100
-+++ optimize.c
-@@ -624,7 +624,7 @@ fold_op(s, v0, v1)
- 	struct stmt *s;
- 	int v0, v1;
- {
--	bpf_int32 a, b;
-+	bpf_u_int32 a, b;
- 
- 	a = vmap[v0].const_val;
- 	b = vmap[v1].const_val;