12 files changed, 11 insertions, 24 deletions
diff --git a/contrib/libpcap/.cvsignore b/contrib/libpcap/.cvsignore
deleted file mode 100644
index 138c28814a08..000000000000
--- a/contrib/libpcap/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-config.log
-config.cache
-config.status
-config.h
-.devel
-stamp-h
-stamp-h.in
-Makefile
-scanner.c
-grammar.c
-tokdefs.h
-version.c
-version.h
diff --git a/contrib/libpcap/FREEBSD-upgrade b/contrib/libpcap/FREEBSD-upgrade
index 78d134cfe52b..98abbe87c3da 100644
--- a/contrib/libpcap/FREEBSD-upgrade
+++ b/contrib/libpcap/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/libpcap/FREEBSD-upgrade,v 1.5 2002/02/08 19:45:58 obrien Exp $
 
 This directory contains virgin copies of the original distribution files
 on a "vendor" branch.  Do not, under any circumstances, attempt to upgrade
diff --git a/contrib/libpcap/gencode.c b/contrib/libpcap/gencode.c
index 41957af5078e..de5feff069ca 100644
--- a/contrib/libpcap/gencode.c
+++ b/contrib/libpcap/gencode.c
@@ -19,7 +19,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/gencode.c,v 1.13 2004/03/31 09:13:37 bms Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/libpcap/gencode.h b/contrib/libpcap/gencode.h
index fccdf3c961bf..9ce54486eaa2 100644
--- a/contrib/libpcap/gencode.h
+++ b/contrib/libpcap/gencode.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/gencode.h,v 1.6 2004/03/31 09:13:37 bms Exp $
  * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.58.2.1 2004/03/28 21:45:31 fenner Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/grammar.y b/contrib/libpcap/grammar.y
index 63ca86311242..a16cf590b552 100644
--- a/contrib/libpcap/grammar.y
+++ b/contrib/libpcap/grammar.y
@@ -19,7 +19,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/grammar.y,v 1.8 2004/03/31 09:13:37 bms Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/libpcap/nametoaddr.c b/contrib/libpcap/nametoaddr.c
index 678163e31449..5f0fc6c98a31 100644
--- a/contrib/libpcap/nametoaddr.c
+++ b/contrib/libpcap/nametoaddr.c
@@ -21,7 +21,7 @@
  * Name to id translation routines used by the scanner.
  * These functions are not time critical.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/nametoaddr.c,v 1.10 2004/03/31 09:13:37 bms Exp $
  */
 
 #ifndef lint
diff --git a/contrib/libpcap/nlpid.h b/contrib/libpcap/nlpid.h
index 7ea2963f108d..e5ff50c4333e 100644
--- a/contrib/libpcap/nlpid.h
+++ b/contrib/libpcap/nlpid.h
@@ -15,7 +15,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/nlpid.h,v 1.3 2004/03/31 09:13:37 bms Exp $
  * @(#) $Header: /tcpdump/master/libpcap/nlpid.h,v 1.2 2002/12/06 00:01:34 hannes Exp $ (Juniper)
  */
 
diff --git a/contrib/libpcap/pcap-int.h b/contrib/libpcap/pcap-int.h
index 9da493bb89ad..e9e62373d1b9 100644
--- a/contrib/libpcap/pcap-int.h
+++ b/contrib/libpcap/pcap-int.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap-int.h,v 1.9 2004/03/31 18:15:37 bms Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.55.2.4 2003/12/15 01:42:24 guy Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/pcap-namedb.h b/contrib/libpcap/pcap-namedb.h
index 43fe1edf55e4..02772be531c7 100644
--- a/contrib/libpcap/pcap-namedb.h
+++ b/contrib/libpcap/pcap-namedb.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap-namedb.h,v 1.4 2001/04/03 04:32:48 fenner Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap-namedb.h,v 1.8 2000/07/29 07:36:43 guy Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/pcap.3 b/contrib/libpcap/pcap.3
index 807d1c790d8e..594d1c018c7c 100644
--- a/contrib/libpcap/pcap.3
+++ b/contrib/libpcap/pcap.3
@@ -19,7 +19,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/libpcap/pcap.3,v 1.12 2004/03/31 09:13:37 bms Exp $
 .\"
 .TH PCAP 3 "27 February 2004"
 .SH NAME
diff --git a/contrib/libpcap/pcap.h b/contrib/libpcap/pcap.h
index 34a93d1edfe3..e47a2a239d89 100644
--- a/contrib/libpcap/pcap.h
+++ b/contrib/libpcap/pcap.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.9 2004/03/31 10:21:28 bms Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.45.2.4 2004/01/27 22:56:20 guy Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/scanner.l b/contrib/libpcap/scanner.l
index 21e800277ceb..9db6d6fd513c 100644
--- a/contrib/libpcap/scanner.l
+++ b/contrib/libpcap/scanner.l
@@ -19,7 +19,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/scanner.l,v 1.10 2004/03/31 09:13:37 bms Exp $
  */
 
 #ifndef lint