This commit was manufactured by cvs2svn to create tagrelease/7.0.0_cvs

'RELENG_7_0_0_RELEASE'.

This commit was manufactured to restore the state of the 7.0-RELEASE image.

206 files changed, 199 insertions, 354 deletions

diff --git a/contrib/ipfilter/.cvsignore b/contrib/ipfilter/.cvsignore
deleted file mode 100644
index 616828f4144d..000000000000
--- a/contrib/ipfilter/.cvsignore
+++ /dev/null
@@ -1,28 +0,0 @@
-ipf
-sparcv7
-sparcv9
-h
-ipf-darren
-bugs
-ipftest
-patches
-state
-cbits
-CVS
-old
-new
-netinet
-import
-bak
-streams
-cvs.diff
-threads
-glibc
-hp
-windows
-ipnat
-opt_inet6.h
-ippool
-ipmon
-ip_rules.c
-ip_rules.h
diff --git a/contrib/ipfilter/BSD/.cvsignore b/contrib/ipfilter/BSD/.cvsignore
deleted file mode 100644
index c149a0043f45..000000000000
--- a/contrib/ipfilter/BSD/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
-ipf
-ipfs
-ipfstat
-ipftest
-ipmon
-ipnat
-ipresend
-ipsend
-iptest
-vnode_if.h
-if_ipl
-i386
-amiga
-FreeBSD*
-BSDOS*
-NetBSD*
-OpenBSD*
-*_lex_var.h
-*_y.c
-*_l.c
-*_y.h
-ip_rules.*
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0 b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0
index 149580135216..3d7d8438cc78 100755
--- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0
+++ b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0,v 1.2 2005/04/25 18:20:10 darrenr Exp $
 .\"
 *** ip6_input.c.orig	Sun Feb 13 14:32:01 2000
 --- ip6_input.c	Wed Apr 26 22:31:34 2000
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1 b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1
index 2e1d7e80673f..db3f0e521bf6 100644
--- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1
+++ b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1,v 1.2 2005/04/25 18:20:10 darrenr Exp $
 .\"
 *** ip6_input.c.orig	Sat Jul 15 07:14:34 2000
 --- ip6_input.c	Thu Oct 19 17:14:37 2000
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2 b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2
index 2e1d7e80673f..0432d2990a1b 100644
--- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2
+++ b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2,v 1.2 2005/04/25 18:20:10 darrenr Exp $
 .\"
 *** ip6_input.c.orig	Sat Jul 15 07:14:34 2000
 --- ip6_input.c	Thu Oct 19 17:14:37 2000
diff --git a/contrib/ipfilter/INST.FreeBSD-2.2 b/contrib/ipfilter/INST.FreeBSD-2.2
index d668c39f7b58..21a41daddc0d 100644
--- a/contrib/ipfilter/INST.FreeBSD-2.2
+++ b/contrib/ipfilter/INST.FreeBSD-2.2
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/INST.FreeBSD-2.2,v 1.2 2005/04/25 18:20:08 darrenr Exp $
 .\"
 
 To build a kernel for use with the loadable kernel module, follow these
diff --git a/contrib/ipfilter/INSTALL.xBSD b/contrib/ipfilter/INSTALL.xBSD
index 2f933ffc7018..bbf9320d2dbd 100644
--- a/contrib/ipfilter/INSTALL.xBSD
+++ b/contrib/ipfilter/INSTALL.xBSD
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/INSTALL.xBSD,v 1.3 2000/07/19 23:10:29 darrenr Exp $
 
 To build a kernel for use with the loadable kernel module, follow these
 steps:
diff --git a/contrib/ipfilter/Makefile b/contrib/ipfilter/Makefile
index 334cd4512188..c853e90613a2 100644
--- a/contrib/ipfilter/Makefile
+++ b/contrib/ipfilter/Makefile
@@ -5,7 +5,7 @@
 # provided that this notice is preserved and due credit is given
 # to the original author and the contributors.
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.7.2.1 2007/10/31 05:00:34 darrenr Exp $
 # Id: Makefile,v 2.76.2.24 2007/09/26 10:04:03 darrenr Exp $
 #
 SHELL=/bin/sh
diff --git a/contrib/ipfilter/bpf-ipf.h b/contrib/ipfilter/bpf-ipf.h
index dc2b660e2eee..4576b76dac75 100644
--- a/contrib/ipfilter/bpf-ipf.h
+++ b/contrib/ipfilter/bpf-ipf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/bpf-ipf.h,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
diff --git a/contrib/ipfilter/bpf_filter.c b/contrib/ipfilter/bpf_filter.c
index d75570e29267..96b897c9ff2a 100644
--- a/contrib/ipfilter/bpf_filter.c
+++ b/contrib/ipfilter/bpf_filter.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.6 2007/06/04 02:54:31 darrenr Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
diff --git a/contrib/ipfilter/ip_fil.c b/contrib/ipfilter/ip_fil.c
index a3efa871b251..50597e59a644 100644
--- a/contrib/ipfilter/ip_fil.c
+++ b/contrib/ipfilter/ip_fil.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.5.2.1 2007/10/31 05:00:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/ip_msnrpc_pxy.c b/contrib/ipfilter/ip_msnrpc_pxy.c
index 40bc084cbb5d..adbf977fa24f 100644
--- a/contrib/ipfilter/ip_msnrpc_pxy.c
+++ b/contrib/ipfilter/ip_msnrpc_pxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ip_msnrpc_pxy.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2003 by Darren Reed
diff --git a/contrib/ipfilter/ipf.h b/contrib/ipfilter/ipf.h
index ae05ca75a906..ed7b6362c7e7 100644
--- a/contrib/ipfilter/ipf.h
+++ b/contrib/ipfilter/ipf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipf.h,v 1.5 2007/06/04 02:54:31 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001, 2003 by Darren Reed.
diff --git a/contrib/ipfilter/iplang/.cvsignore b/contrib/ipfilter/iplang/.cvsignore
deleted file mode 100644
index 68b5b4e4e985..000000000000
--- a/contrib/ipfilter/iplang/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-y.tab.h
-y.output
-lex.yy.c
-y.tab.c
-y.tab.o
-lex.yy.o
-iplang_y.output
-iplang_y.tab.c
-iplang_y.tab.h
diff --git a/contrib/ipfilter/iplang/iplang.h b/contrib/ipfilter/iplang/iplang.h
index 2b2d1db5a6e2..cc91e52f97e2 100644
--- a/contrib/ipfilter/iplang/iplang.h
+++ b/contrib/ipfilter/iplang/iplang.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/iplang/iplang.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1997-1998 by Darren Reed.
diff --git a/contrib/ipfilter/iplang/iplang_l.l b/contrib/ipfilter/iplang/iplang_l.l
index f356d0fb4465..4244ed22f467 100644
--- a/contrib/ipfilter/iplang/iplang_l.l
+++ b/contrib/ipfilter/iplang/iplang_l.l
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/iplang/iplang_l.l,v 1.3 2005/12/30 11:52:22 guido Exp $	*/
 
 %{
 /*
diff --git a/contrib/ipfilter/iplang/iplang_y.y b/contrib/ipfilter/iplang/iplang_y.y
index 773f27f2c17e..479ff7e3332f 100644
--- a/contrib/ipfilter/iplang/iplang_y.y
+++ b/contrib/ipfilter/iplang/iplang_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.9 2007/06/04 02:54:31 darrenr Exp $	*/
 
 %{
 /*
@@ -7,7 +7,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * Id: iplang_y.y,v 2.9.2.4 2006/03/17 12:11:29 darrenr Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.9 2007/06/04 02:54:31 darrenr Exp $
  */
 
 #include <stdio.h>
diff --git a/contrib/ipfilter/ipmon.h b/contrib/ipfilter/ipmon.h
index afee1f4fb3f7..07249be7df78 100644
--- a/contrib/ipfilter/ipmon.h
+++ b/contrib/ipfilter/ipmon.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipmon.h,v 1.4 2006/08/16 12:23:01 guido Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/ipsd/Celler/ip_compat.h b/contrib/ipfilter/ipsd/Celler/ip_compat.h
index 57937763a5a9..63d82019aa93 100644
--- a/contrib/ipfilter/ipsd/Celler/ip_compat.h
+++ b/contrib/ipfilter/ipsd/Celler/ip_compat.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/Celler/ip_compat.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1995 by Darren Reed.
diff --git a/contrib/ipfilter/ipsd/ipsd.c b/contrib/ipfilter/ipsd/ipsd.c
index ad3dfe20db99..56d45889509d 100644
--- a/contrib/ipfilter/ipsd/ipsd.c
+++ b/contrib/ipfilter/ipsd/ipsd.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/ipsd.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * (C)opyright 1995-1998 Darren Reed.
diff --git a/contrib/ipfilter/ipsd/ipsd.h b/contrib/ipfilter/ipsd/ipsd.h
index f898c9995c35..24a96eb5109a 100644
--- a/contrib/ipfilter/ipsd/ipsd.h
+++ b/contrib/ipfilter/ipsd/ipsd.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/ipsd.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1995-1998 Darren Reed.
diff --git a/contrib/ipfilter/ipsd/ipsdr.c b/contrib/ipfilter/ipsd/ipsdr.c
index 5a907061c631..99255bea3611 100644
--- a/contrib/ipfilter/ipsd/ipsdr.c
+++ b/contrib/ipfilter/ipsd/ipsdr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/ipsdr.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * (C)opyright 1995-1998 Darren Reed.
diff --git a/contrib/ipfilter/ipsd/linux.h b/contrib/ipfilter/ipsd/linux.h
index 88eb67aa4cbb..5159688c2a8d 100644
--- a/contrib/ipfilter/ipsd/linux.h
+++ b/contrib/ipfilter/ipsd/linux.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/linux.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1997-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsd/sbpf.c b/contrib/ipfilter/ipsd/sbpf.c
index a724ba5dbfeb..b7ca9ce839a6 100644
--- a/contrib/ipfilter/ipsd/sbpf.c
+++ b/contrib/ipfilter/ipsd/sbpf.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/sbpf.c,v 1.3 2006/08/16 12:23:01 guido Exp $	*/
 
 /*
  * (C)opyright 1995-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsd/sdlpi.c b/contrib/ipfilter/ipsd/sdlpi.c
index b7515f1dbac0..783ca86eb704 100644
--- a/contrib/ipfilter/ipsd/sdlpi.c
+++ b/contrib/ipfilter/ipsd/sdlpi.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/sdlpi.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsd/slinux.c b/contrib/ipfilter/ipsd/slinux.c
index c0847951cd66..2f3e164e507d 100644
--- a/contrib/ipfilter/ipsd/slinux.c
+++ b/contrib/ipfilter/ipsd/slinux.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/slinux.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsd/snit.c b/contrib/ipfilter/ipsd/snit.c
index 0d5a52a1cee4..bca508115d7a 100644
--- a/contrib/ipfilter/ipsd/snit.c
+++ b/contrib/ipfilter/ipsd/snit.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/snit.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/.OLD/ip_compat.h b/contrib/ipfilter/ipsend/.OLD/ip_compat.h
index b5b8f0741c25..a433eda79631 100644
--- a/contrib/ipfilter/ipsend/.OLD/ip_compat.h
+++ b/contrib/ipfilter/ipsend/.OLD/ip_compat.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/.OLD/ip_compat.h,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * (C)opyright 1995 by Darren Reed.
diff --git a/contrib/ipfilter/ipsend/.cvsignore b/contrib/ipfilter/ipsend/.cvsignore
deleted file mode 100644
index b7aea24eb881..000000000000
--- a/contrib/ipfilter/ipsend/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-ipsend
-ipresend
-iptest
diff --git a/contrib/ipfilter/ipsend/44arp.c b/contrib/ipfilter/ipsend/44arp.c
index 6ee4f1b58f87..5f524b6feab5 100644
--- a/contrib/ipfilter/ipsend/44arp.c
+++ b/contrib/ipfilter/ipsend/44arp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/44arp.c,v 1.3 2007/06/04 02:54:31 darrenr Exp $	*/
 
 /*
  * Based upon 4.4BSD's /usr/sbin/arp
diff --git a/contrib/ipfilter/ipsend/arp.c b/contrib/ipfilter/ipsend/arp.c
index 8670bda76b46..19573b2d5b2f 100644
--- a/contrib/ipfilter/ipsend/arp.c
+++ b/contrib/ipfilter/ipsend/arp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/arp.c,v 1.4 2007/06/04 02:54:31 darrenr Exp $	*/
 
 /*
  * arp.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/dlcommon.c b/contrib/ipfilter/ipsend/dlcommon.c
index c6b6e8a4858f..ed0b5802fc63 100644
--- a/contrib/ipfilter/ipsend/dlcommon.c
+++ b/contrib/ipfilter/ipsend/dlcommon.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/dlcommon.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * Common (shared) DLPI test routines.
diff --git a/contrib/ipfilter/ipsend/dltest.h b/contrib/ipfilter/ipsend/dltest.h
index 086782c1fbb7..aa28c3b6b168 100644
--- a/contrib/ipfilter/ipsend/dltest.h
+++ b/contrib/ipfilter/ipsend/dltest.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/dltest.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * Common DLPI Test Suite header file
diff --git a/contrib/ipfilter/ipsend/hpux.c b/contrib/ipfilter/ipsend/hpux.c
index 9cc72995f26b..6d3ca855a824 100644
--- a/contrib/ipfilter/ipsend/hpux.c
+++ b/contrib/ipfilter/ipsend/hpux.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/hpux.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1997-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/in_var.h b/contrib/ipfilter/ipsend/in_var.h
index 3523f77051fc..3cbd2a4ed321 100644
--- a/contrib/ipfilter/ipsend/in_var.h
+++ b/contrib/ipfilter/ipsend/in_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/in_var.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*	@(#)in_var.h 1.3 88/08/19 SMI; from UCB 7.1 6/5/86	*/
 
diff --git a/contrib/ipfilter/ipsend/ip.c b/contrib/ipfilter/ipsend/ip.c
index 26a7a892bed3..04b77e27fbed 100644
--- a/contrib/ipfilter/ipsend/ip.c
+++ b/contrib/ipfilter/ipsend/ip.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/ip.c,v 1.4 2007/06/04 02:54:31 darrenr Exp $	*/
 
 /*
  * ip.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/ip_var.h b/contrib/ipfilter/ipsend/ip_var.h
index ab9813ec828e..c720ea92d30c 100644
--- a/contrib/ipfilter/ipsend/ip_var.h
+++ b/contrib/ipfilter/ipsend/ip_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/ip_var.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*	@(#)ip_var.h 1.11 88/08/19 SMI; from UCB 7.1 6/5/86	*/
 
diff --git a/contrib/ipfilter/ipsend/ipresend.1 b/contrib/ipfilter/ipsend/ipresend.1
index 6761a183caea..497855a960c2 100644
--- a/contrib/ipfilter/ipsend/ipresend.1
+++ b/contrib/ipfilter/ipsend/ipresend.1
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/ipsend/ipresend.1,v 1.2 2005/04/25 18:20:10 darrenr Exp $
 .\"
 .TH IPRESEND 1
 .SH NAME
diff --git a/contrib/ipfilter/ipsend/ipresend.c b/contrib/ipfilter/ipsend/ipresend.c
index 050aecf2093c..3aa673ca15ee 100644
--- a/contrib/ipfilter/ipsend/ipresend.c
+++ b/contrib/ipfilter/ipsend/ipresend.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/ipresend.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * ipresend.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/ipsend.1 b/contrib/ipfilter/ipsend/ipsend.1
index 7f0a8e39538a..000f67260051 100644
--- a/contrib/ipfilter/ipsend/ipsend.1
+++ b/contrib/ipfilter/ipsend/ipsend.1
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/ipsend/ipsend.1,v 1.2 2005/04/25 18:20:10 darrenr Exp $
 .\"
 .TH IPSEND 1
 .SH NAME
diff --git a/contrib/ipfilter/ipsend/ipsend.5 b/contrib/ipfilter/ipsend/ipsend.5
index cd5842cbba18..6686b40b882a 100644
--- a/contrib/ipfilter/ipsend/ipsend.5
+++ b/contrib/ipfilter/ipsend/ipsend.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/ipsend/ipsend.5,v 1.4 2005/04/25 18:20:10 darrenr Exp $
 .TH IPSEND 5
 .SH NAME
 ipsend \- IP packet description language
diff --git a/contrib/ipfilter/ipsend/ipsend.c b/contrib/ipfilter/ipsend/ipsend.c
index 06191ec054b9..46655c8eb1d4 100644
--- a/contrib/ipfilter/ipsend/ipsend.c
+++ b/contrib/ipfilter/ipsend/ipsend.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/ipsend.c,v 1.14 2006/08/16 12:23:01 guido Exp $ */
 /*
  * ipsend.c (C) 1995-1998 Darren Reed
  *
diff --git a/contrib/ipfilter/ipsend/ipsend.h b/contrib/ipfilter/ipsend/ipsend.h
index 91cfa6c085ed..94ec7ba508e7 100644
--- a/contrib/ipfilter/ipsend/ipsend.h
+++ b/contrib/ipfilter/ipsend/ipsend.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/ipsend.h,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * ipsend.h (C) 1997-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/ipsopt.c b/contrib/ipfilter/ipsend/ipsopt.c
index 10f132e6da9a..d22a2a7a4410 100644
--- a/contrib/ipfilter/ipsend/ipsopt.c
+++ b/contrib/ipfilter/ipsend/ipsopt.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/ipsopt.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * Copyright (C) 1995-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsend/iptest.1 b/contrib/ipfilter/ipsend/iptest.1
index 8f25f4abf256..a5956289552b 100644
--- a/contrib/ipfilter/ipsend/iptest.1
+++ b/contrib/ipfilter/ipsend/iptest.1
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/ipsend/iptest.1,v 1.4 2005/04/25 18:20:11 darrenr Exp $
 .\"
 .TH IPTEST 1
 .SH NAME
diff --git a/contrib/ipfilter/ipsend/iptest.c b/contrib/ipfilter/ipsend/iptest.c
index cc2ceb8ae2a1..412411d211d8 100644
--- a/contrib/ipfilter/ipsend/iptest.c
+++ b/contrib/ipfilter/ipsend/iptest.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/iptest.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * ipsend.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/iptests.c b/contrib/ipfilter/ipsend/iptests.c
index 0dd96b831320..dc339db08270 100644
--- a/contrib/ipfilter/ipsend/iptests.c
+++ b/contrib/ipfilter/ipsend/iptests.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.13.2.1 2007/10/31 05:00:35 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsend/larp.c b/contrib/ipfilter/ipsend/larp.c
index ccb70cc29368..38708a44d2d7 100644
--- a/contrib/ipfilter/ipsend/larp.c
+++ b/contrib/ipfilter/ipsend/larp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/larp.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * larp.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/linux.h b/contrib/ipfilter/ipsend/linux.h
index a36d1bfb6a6a..449a95a0079b 100644
--- a/contrib/ipfilter/ipsend/linux.h
+++ b/contrib/ipfilter/ipsend/linux.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/linux.h,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsend/lsock.c b/contrib/ipfilter/ipsend/lsock.c
index a76bbbb15221..9a1696a43682 100644
--- a/contrib/ipfilter/ipsend/lsock.c
+++ b/contrib/ipfilter/ipsend/lsock.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/lsock.c,v 1.4 2006/08/16 12:23:01 guido Exp $	*/
 
 /*
  * lsock.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/resend.c b/contrib/ipfilter/ipsend/resend.c
index b988e9b20d94..e7ec2f7bfa55 100644
--- a/contrib/ipfilter/ipsend/resend.c
+++ b/contrib/ipfilter/ipsend/resend.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/resend.c,v 1.5 2007/06/04 02:54:31 darrenr Exp $	*/
 
 /*
  * resend.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/sbpf.c b/contrib/ipfilter/ipsend/sbpf.c
index b8778c669167..8c8063e3e4d7 100644
--- a/contrib/ipfilter/ipsend/sbpf.c
+++ b/contrib/ipfilter/ipsend/sbpf.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/sbpf.c,v 1.8 2006/08/16 12:23:01 guido Exp $ */
 /*
  * (C)opyright 1995-1998 Darren Reed. (from tcplog)
  *
diff --git a/contrib/ipfilter/ipsend/sdlpi.c b/contrib/ipfilter/ipsend/sdlpi.c
index f48fd06bbc34..826a8f22cf7c 100644
--- a/contrib/ipfilter/ipsend/sdlpi.c
+++ b/contrib/ipfilter/ipsend/sdlpi.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/sdlpi.c,v 1.4 2007/06/04 02:54:31 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/sirix.c b/contrib/ipfilter/ipsend/sirix.c
index 5057c4f2c871..4bebe3cb0478 100644
--- a/contrib/ipfilter/ipsend/sirix.c
+++ b/contrib/ipfilter/ipsend/sirix.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/sirix.c,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed.
diff --git a/contrib/ipfilter/ipsend/slinux.c b/contrib/ipfilter/ipsend/slinux.c
index 7e37b3087f97..bf674d36aef3 100644
--- a/contrib/ipfilter/ipsend/slinux.c
+++ b/contrib/ipfilter/ipsend/slinux.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/slinux.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/snit.c b/contrib/ipfilter/ipsend/snit.c
index 0ef7e5444841..56872152b7fa 100644
--- a/contrib/ipfilter/ipsend/snit.c
+++ b/contrib/ipfilter/ipsend/snit.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/snit.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/sock.c b/contrib/ipfilter/ipsend/sock.c
index 9a2cfc3fb667..8685e8b99630 100644
--- a/contrib/ipfilter/ipsend/sock.c
+++ b/contrib/ipfilter/ipsend/sock.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.18.2.1 2007/10/31 05:00:35 darrenr Exp $ */
 /*
  * sock.c (C) 1995-1998 Darren Reed
  *
diff --git a/contrib/ipfilter/ipsend/sockraw.c b/contrib/ipfilter/ipsend/sockraw.c
index c9232273ee86..a4156469ad02 100644
--- a/contrib/ipfilter/ipsend/sockraw.c
+++ b/contrib/ipfilter/ipsend/sockraw.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/sockraw.c,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * (C)opyright 2000 Darren Reed.
diff --git a/contrib/ipfilter/ipsend/tcpip.h b/contrib/ipfilter/ipsend/tcpip.h
index 34178931a978..ab4ae39bec60 100644
--- a/contrib/ipfilter/ipsend/tcpip.h
+++ b/contrib/ipfilter/ipsend/tcpip.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/tcpip.h,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
diff --git a/contrib/ipfilter/ipt.h b/contrib/ipfilter/ipt.h
index f3074a8dc9b9..1d1d3505430e 100644
--- a/contrib/ipfilter/ipt.h
+++ b/contrib/ipfilter/ipt.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipt.h,v 1.4 2006/08/16 12:23:01 guido Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/kmem.h b/contrib/ipfilter/kmem.h
index c0864b4fd911..44273cbf4a62 100644
--- a/contrib/ipfilter/kmem.h
+++ b/contrib/ipfilter/kmem.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/kmem.h,v 1.3 2005/12/30 11:52:22 guido Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/l4check/l4check.c b/contrib/ipfilter/l4check/l4check.c
index fd2753ea22be..602325ff3367 100644
--- a/contrib/ipfilter/l4check/l4check.c
+++ b/contrib/ipfilter/l4check/l4check.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/l4check/l4check.c,v 1.2.10.1 2007/10/31 05:00:35 darrenr Exp $	*/
 
 /*
  * (C)Copyright March, 2000 - Darren Reed.
diff --git a/contrib/ipfilter/lib/addicmp.c b/contrib/ipfilter/lib/addicmp.c
index ef9abfed3c9c..97ce3461b7cb 100644
--- a/contrib/ipfilter/lib/addicmp.c
+++ b/contrib/ipfilter/lib/addicmp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/addicmp.c,v 1.5 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/addipopt.c b/contrib/ipfilter/lib/addipopt.c
index 79155e7e4c57..576716d1d2fa 100644
--- a/contrib/ipfilter/lib/addipopt.c
+++ b/contrib/ipfilter/lib/addipopt.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/addipopt.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/bcopywrap.c b/contrib/ipfilter/lib/bcopywrap.c
index b2e8427a7b37..44d6e7da4e8c 100644
--- a/contrib/ipfilter/lib/bcopywrap.c
+++ b/contrib/ipfilter/lib/bcopywrap.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/bcopywrap.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/binprint.c b/contrib/ipfilter/lib/binprint.c
index fcb47ed37e5b..59aebb86cf30 100644
--- a/contrib/ipfilter/lib/binprint.c
+++ b/contrib/ipfilter/lib/binprint.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/binprint.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/buildopts.c b/contrib/ipfilter/lib/buildopts.c
index bdd0538fdd14..ac43d5ab54d3 100644
--- a/contrib/ipfilter/lib/buildopts.c
+++ b/contrib/ipfilter/lib/buildopts.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/buildopts.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/checkrev.c b/contrib/ipfilter/lib/checkrev.c
index 9e584cc48d89..aa9b6d01ff26 100644
--- a/contrib/ipfilter/lib/checkrev.c
+++ b/contrib/ipfilter/lib/checkrev.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/checkrev.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/count4bits.c b/contrib/ipfilter/lib/count4bits.c
index 38e574290c69..2fdb90ed909e 100644
--- a/contrib/ipfilter/lib/count4bits.c
+++ b/contrib/ipfilter/lib/count4bits.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/count4bits.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/count6bits.c b/contrib/ipfilter/lib/count6bits.c
index 15538c36c19c..ddba34895740 100644
--- a/contrib/ipfilter/lib/count6bits.c
+++ b/contrib/ipfilter/lib/count6bits.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/count6bits.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/debug.c b/contrib/ipfilter/lib/debug.c
index 3181e78e1e10..0fa4393175a1 100644
--- a/contrib/ipfilter/lib/debug.c
+++ b/contrib/ipfilter/lib/debug.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/debug.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/facpri.c b/contrib/ipfilter/lib/facpri.c
index b89e0f8e0127..0c41ae6b0fa9 100644
--- a/contrib/ipfilter/lib/facpri.c
+++ b/contrib/ipfilter/lib/facpri.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/facpri.c,v 1.5 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/facpri.h b/contrib/ipfilter/lib/facpri.h
index ca53e051f90d..6bbd876c52cc 100644
--- a/contrib/ipfilter/lib/facpri.h
+++ b/contrib/ipfilter/lib/facpri.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/facpri.h,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/fill6bits.c b/contrib/ipfilter/lib/fill6bits.c
index c0faf6ae5f20..ba95c1b5e236 100644
--- a/contrib/ipfilter/lib/fill6bits.c
+++ b/contrib/ipfilter/lib/fill6bits.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/fill6bits.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/flags.c b/contrib/ipfilter/lib/flags.c
index 200484c2231c..867af0fb8934 100644
--- a/contrib/ipfilter/lib/flags.c
+++ b/contrib/ipfilter/lib/flags.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/flags.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/gethost.c b/contrib/ipfilter/lib/gethost.c
index be536c1e755d..9172e8809ab9 100644
--- a/contrib/ipfilter/lib/gethost.c
+++ b/contrib/ipfilter/lib/gethost.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/gethost.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getifname.c b/contrib/ipfilter/lib/getifname.c
index 7246fbb83714..491bff654d2f 100644
--- a/contrib/ipfilter/lib/getifname.c
+++ b/contrib/ipfilter/lib/getifname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getifname.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getnattype.c b/contrib/ipfilter/lib/getnattype.c
index 2fb5d174e4a2..2e74744b67b7 100644
--- a/contrib/ipfilter/lib/getnattype.c
+++ b/contrib/ipfilter/lib/getnattype.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getnattype.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getport.c b/contrib/ipfilter/lib/getport.c
index 69e897c660c3..8ef0fe930852 100644
--- a/contrib/ipfilter/lib/getport.c
+++ b/contrib/ipfilter/lib/getport.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getport.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getportproto.c b/contrib/ipfilter/lib/getportproto.c
index 23e5fb18a6a5..2a693ccd394d 100644
--- a/contrib/ipfilter/lib/getportproto.c
+++ b/contrib/ipfilter/lib/getportproto.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getportproto.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getproto.c b/contrib/ipfilter/lib/getproto.c
index 33f6f47ac1b9..bd03ee66abec 100644
--- a/contrib/ipfilter/lib/getproto.c
+++ b/contrib/ipfilter/lib/getproto.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getproto.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getsumd.c b/contrib/ipfilter/lib/getsumd.c
index fdad461673e3..a8474d7c6889 100644
--- a/contrib/ipfilter/lib/getsumd.c
+++ b/contrib/ipfilter/lib/getsumd.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getsumd.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/hostname.c b/contrib/ipfilter/lib/hostname.c
index e8fde98e5efa..d7251c4295d9 100644
--- a/contrib/ipfilter/lib/hostname.c
+++ b/contrib/ipfilter/lib/hostname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/hostname.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/icmpcode.c b/contrib/ipfilter/lib/icmpcode.c
index d558bebf7de6..adb880903eb0 100644
--- a/contrib/ipfilter/lib/icmpcode.c
+++ b/contrib/ipfilter/lib/icmpcode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/icmpcode.c,v 1.5 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/inet_addr.c b/contrib/ipfilter/lib/inet_addr.c
index c7ae44375a5e..100ca8b9caf1 100644
--- a/contrib/ipfilter/lib/inet_addr.c
+++ b/contrib/ipfilter/lib/inet_addr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/inet_addr.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * ++Copyright++ 1983, 1990, 1993
diff --git a/contrib/ipfilter/lib/initparse.c b/contrib/ipfilter/lib/initparse.c
index 6fdfc8a9a161..b7025a7b2a76 100644
--- a/contrib/ipfilter/lib/initparse.c
+++ b/contrib/ipfilter/lib/initparse.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/initparse.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ionames.c b/contrib/ipfilter/lib/ionames.c
index d2fc97775452..36f1be435e9d 100644
--- a/contrib/ipfilter/lib/ionames.c
+++ b/contrib/ipfilter/lib/ionames.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ionames.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipf_dotuning.c b/contrib/ipfilter/lib/ipf_dotuning.c
index 6508a266271c..d28a719dc8f9 100644
--- a/contrib/ipfilter/lib/ipf_dotuning.c
+++ b/contrib/ipfilter/lib/ipf_dotuning.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipf_dotuning.c,v 1.5 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_ef.c b/contrib/ipfilter/lib/ipft_ef.c
index 2d50f076bfbe..f5cc9f1f725b 100644
--- a/contrib/ipfilter/lib/ipft_ef.c
+++ b/contrib/ipfilter/lib/ipft_ef.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_ef.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_hx.c b/contrib/ipfilter/lib/ipft_hx.c
index d295c21a7d9f..d4c535df1e5a 100644
--- a/contrib/ipfilter/lib/ipft_hx.c
+++ b/contrib/ipfilter/lib/ipft_hx.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_hx.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_pc.c b/contrib/ipfilter/lib/ipft_pc.c
index 0f31a10efd3b..2082b8eb0ffd 100644
--- a/contrib/ipfilter/lib/ipft_pc.c
+++ b/contrib/ipfilter/lib/ipft_pc.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_pc.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_sn.c b/contrib/ipfilter/lib/ipft_sn.c
index 2beb6eed704f..c3f336e32f89 100644
--- a/contrib/ipfilter/lib/ipft_sn.c
+++ b/contrib/ipfilter/lib/ipft_sn.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_sn.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_td.c b/contrib/ipfilter/lib/ipft_td.c
index d571ada7b56e..e50a743e1bc3 100644
--- a/contrib/ipfilter/lib/ipft_td.c
+++ b/contrib/ipfilter/lib/ipft_td.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_td.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_tx.c b/contrib/ipfilter/lib/ipft_tx.c
index f4475e3c8426..3b6e5225faf3 100644
--- a/contrib/ipfilter/lib/ipft_tx.c
+++ b/contrib/ipfilter/lib/ipft_tx.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_tx.c,v 1.6.2.1 2007/10/31 05:00:35 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipoptsec.c b/contrib/ipfilter/lib/ipoptsec.c
index 66a55c80dbb7..58904c6afa97 100644
--- a/contrib/ipfilter/lib/ipoptsec.c
+++ b/contrib/ipfilter/lib/ipoptsec.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipoptsec.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kmem.c b/contrib/ipfilter/lib/kmem.c
index 26da2d0139f7..4674521c89e9 100644
--- a/contrib/ipfilter/lib/kmem.c
+++ b/contrib/ipfilter/lib/kmem.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/kmem.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kmem.h b/contrib/ipfilter/lib/kmem.h
index bcfde06d045d..a680d0c3dba8 100644
--- a/contrib/ipfilter/lib/kmem.h
+++ b/contrib/ipfilter/lib/kmem.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/kmem.h,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kmemcpywrap.c b/contrib/ipfilter/lib/kmemcpywrap.c
index 87474915334e..54e9bfb48285 100644
--- a/contrib/ipfilter/lib/kmemcpywrap.c
+++ b/contrib/ipfilter/lib/kmemcpywrap.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/kmemcpywrap.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kvatoname.c b/contrib/ipfilter/lib/kvatoname.c
index c8c0d8fff621..76aac8a16e39 100644
--- a/contrib/ipfilter/lib/kvatoname.c
+++ b/contrib/ipfilter/lib/kvatoname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/kvatoname.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_hash.c b/contrib/ipfilter/lib/load_hash.c
index 7683470b47e8..5f796a5d73df 100644
--- a/contrib/ipfilter/lib/load_hash.c
+++ b/contrib/ipfilter/lib/load_hash.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/load_hash.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_hashnode.c b/contrib/ipfilter/lib/load_hashnode.c
index 3c3416d95a14..f168d99b8595 100644
--- a/contrib/ipfilter/lib/load_hashnode.c
+++ b/contrib/ipfilter/lib/load_hashnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/load_hashnode.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_pool.c b/contrib/ipfilter/lib/load_pool.c
index 08baae767db9..4dcb90bdd76c 100644
--- a/contrib/ipfilter/lib/load_pool.c
+++ b/contrib/ipfilter/lib/load_pool.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/load_pool.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_poolnode.c b/contrib/ipfilter/lib/load_poolnode.c
index 110a8b9c3e5b..66c5a2669acf 100644
--- a/contrib/ipfilter/lib/load_poolnode.c
+++ b/contrib/ipfilter/lib/load_poolnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/load_poolnode.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/mutex_emul.c b/contrib/ipfilter/lib/mutex_emul.c
index 3983f04c6257..4c03773b446d 100644
--- a/contrib/ipfilter/lib/mutex_emul.c
+++ b/contrib/ipfilter/lib/mutex_emul.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/mutex_emul.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/nametokva.c b/contrib/ipfilter/lib/nametokva.c
index deee4399b946..13f748dfd762 100644
--- a/contrib/ipfilter/lib/nametokva.c
+++ b/contrib/ipfilter/lib/nametokva.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/nametokva.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/nat_setgroupmap.c b/contrib/ipfilter/lib/nat_setgroupmap.c
index 08b1a0a4475b..fde81b6ad7d3 100644
--- a/contrib/ipfilter/lib/nat_setgroupmap.c
+++ b/contrib/ipfilter/lib/nat_setgroupmap.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/nat_setgroupmap.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ntomask.c b/contrib/ipfilter/lib/ntomask.c
index ba91a65b526c..7df583c0ab18 100644
--- a/contrib/ipfilter/lib/ntomask.c
+++ b/contrib/ipfilter/lib/ntomask.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ntomask.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optname.c b/contrib/ipfilter/lib/optname.c
index f41cab11ea17..7d3a398f768c 100644
--- a/contrib/ipfilter/lib/optname.c
+++ b/contrib/ipfilter/lib/optname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/optname.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optprint.c b/contrib/ipfilter/lib/optprint.c
index 81a3287cf672..17bb81a9b001 100644
--- a/contrib/ipfilter/lib/optprint.c
+++ b/contrib/ipfilter/lib/optprint.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/optprint.c,v 1.5 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optprintv6.c b/contrib/ipfilter/lib/optprintv6.c
index f6ea6eca905e..12fc9142a38c 100644
--- a/contrib/ipfilter/lib/optprintv6.c
+++ b/contrib/ipfilter/lib/optprintv6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/optprintv6.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optvalue.c b/contrib/ipfilter/lib/optvalue.c
index aa1ef2e7648f..642cfcd50cdd 100644
--- a/contrib/ipfilter/lib/optvalue.c
+++ b/contrib/ipfilter/lib/optvalue.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/optvalue.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/portname.c b/contrib/ipfilter/lib/portname.c
index f0c8625e6a77..1e00335d175a 100644
--- a/contrib/ipfilter/lib/portname.c
+++ b/contrib/ipfilter/lib/portname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/portname.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/print_toif.c b/contrib/ipfilter/lib/print_toif.c
index 94a4618dbae2..44e89d5ba825 100644
--- a/contrib/ipfilter/lib/print_toif.c
+++ b/contrib/ipfilter/lib/print_toif.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/print_toif.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printactivenat.c b/contrib/ipfilter/lib/printactivenat.c
index a2e292406614..6085bfcdce18 100644
--- a/contrib/ipfilter/lib/printactivenat.c
+++ b/contrib/ipfilter/lib/printactivenat.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printactivenat.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printaps.c b/contrib/ipfilter/lib/printaps.c
index 87a12cd494fc..00f1a954d34a 100644
--- a/contrib/ipfilter/lib/printaps.c
+++ b/contrib/ipfilter/lib/printaps.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printaps.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printbuf.c b/contrib/ipfilter/lib/printbuf.c
index b2e209a01325..6a27f4359198 100644
--- a/contrib/ipfilter/lib/printbuf.c
+++ b/contrib/ipfilter/lib/printbuf.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printbuf.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printfr.c b/contrib/ipfilter/lib/printfr.c
index 587d8cb01a48..b5f493cfb352 100644
--- a/contrib/ipfilter/lib/printfr.c
+++ b/contrib/ipfilter/lib/printfr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printfr.c,v 1.5 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printfraginfo.c b/contrib/ipfilter/lib/printfraginfo.c
index d9317e87480d..e4c32a9323fe 100644
--- a/contrib/ipfilter/lib/printfraginfo.c
+++ b/contrib/ipfilter/lib/printfraginfo.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printfraginfo.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2004-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhash.c b/contrib/ipfilter/lib/printhash.c
index 975b60eabcd5..0892b2e32e29 100644
--- a/contrib/ipfilter/lib/printhash.c
+++ b/contrib/ipfilter/lib/printhash.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printhash.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhashnode.c b/contrib/ipfilter/lib/printhashnode.c
index ed83c397b4c5..8502f3bb23d4 100644
--- a/contrib/ipfilter/lib/printhashnode.c
+++ b/contrib/ipfilter/lib/printhashnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printhashnode.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhostmap.c b/contrib/ipfilter/lib/printhostmap.c
index 0c9242f91eef..403fea92a056 100644
--- a/contrib/ipfilter/lib/printhostmap.c
+++ b/contrib/ipfilter/lib/printhostmap.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printhostmap.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhostmask.c b/contrib/ipfilter/lib/printhostmask.c
index 44703c4c4636..edaa3ce73d82 100644
--- a/contrib/ipfilter/lib/printhostmask.c
+++ b/contrib/ipfilter/lib/printhostmask.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printhostmask.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printifname.c b/contrib/ipfilter/lib/printifname.c
index 2f7d912cf3e0..73fd43b467f5 100644
--- a/contrib/ipfilter/lib/printifname.c
+++ b/contrib/ipfilter/lib/printifname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printifname.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printip.c b/contrib/ipfilter/lib/printip.c
index 8c008afa9d24..c3c8bf7270a2 100644
--- a/contrib/ipfilter/lib/printip.c
+++ b/contrib/ipfilter/lib/printip.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printip.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printlog.c b/contrib/ipfilter/lib/printlog.c
index 82c0400759eb..60cdc1ded90b 100644
--- a/contrib/ipfilter/lib/printlog.c
+++ b/contrib/ipfilter/lib/printlog.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printlog.c,v 1.5 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printmask.c b/contrib/ipfilter/lib/printmask.c
index 9230dc0026a5..65dbcafb9f5e 100644
--- a/contrib/ipfilter/lib/printmask.c
+++ b/contrib/ipfilter/lib/printmask.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printmask.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printnat.c b/contrib/ipfilter/lib/printnat.c
index 62942ce4d4ea..a74396b0a93e 100644
--- a/contrib/ipfilter/lib/printnat.c
+++ b/contrib/ipfilter/lib/printnat.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printnat.c,v 1.4.2.1 2007/10/31 05:00:35 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpacket.c b/contrib/ipfilter/lib/printpacket.c
index 25a4d5a8f7da..bb37c71b7432 100644
--- a/contrib/ipfilter/lib/printpacket.c
+++ b/contrib/ipfilter/lib/printpacket.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printpacket.c,v 1.4.2.1 2007/10/31 05:00:35 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpacket6.c b/contrib/ipfilter/lib/printpacket6.c
index ca3b42133a3e..3a0d7f20e4d5 100644
--- a/contrib/ipfilter/lib/printpacket6.c
+++ b/contrib/ipfilter/lib/printpacket6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printpacket6.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpool.c b/contrib/ipfilter/lib/printpool.c
index 4ab85fac8c35..a2e0468e8d46 100644
--- a/contrib/ipfilter/lib/printpool.c
+++ b/contrib/ipfilter/lib/printpool.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printpool.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpoolnode.c b/contrib/ipfilter/lib/printpoolnode.c
index 3327b8a5a43a..4d13abbbb81c 100644
--- a/contrib/ipfilter/lib/printpoolnode.c
+++ b/contrib/ipfilter/lib/printpoolnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printpoolnode.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printportcmp.c b/contrib/ipfilter/lib/printportcmp.c
index 6a1a461b6206..7075ea2e471a 100644
--- a/contrib/ipfilter/lib/printportcmp.c
+++ b/contrib/ipfilter/lib/printportcmp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printportcmp.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printsbuf.c b/contrib/ipfilter/lib/printsbuf.c
index f6c633c13fd6..4a179fbe86f1 100644
--- a/contrib/ipfilter/lib/printsbuf.c
+++ b/contrib/ipfilter/lib/printsbuf.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printsbuf.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printstate.c b/contrib/ipfilter/lib/printstate.c
index a8777b2b59f2..0deee2cdea58 100644
--- a/contrib/ipfilter/lib/printstate.c
+++ b/contrib/ipfilter/lib/printstate.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printstate.c,v 1.5.2.1 2007/10/31 05:00:35 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printtunable.c b/contrib/ipfilter/lib/printtunable.c
index aa7ae5d0e578..702c19d124ad 100644
--- a/contrib/ipfilter/lib/printtunable.c
+++ b/contrib/ipfilter/lib/printtunable.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printtunable.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_hash.c b/contrib/ipfilter/lib/remove_hash.c
index 297db4827d73..675dd7a7911e 100644
--- a/contrib/ipfilter/lib/remove_hash.c
+++ b/contrib/ipfilter/lib/remove_hash.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/remove_hash.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_hashnode.c b/contrib/ipfilter/lib/remove_hashnode.c
index 47a19dcaa62f..2c8da5ac4271 100644
--- a/contrib/ipfilter/lib/remove_hashnode.c
+++ b/contrib/ipfilter/lib/remove_hashnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/remove_hashnode.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_pool.c b/contrib/ipfilter/lib/remove_pool.c
index 1e7fe5f16cdf..3b68bb28f690 100644
--- a/contrib/ipfilter/lib/remove_pool.c
+++ b/contrib/ipfilter/lib/remove_pool.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/remove_pool.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_poolnode.c b/contrib/ipfilter/lib/remove_poolnode.c
index c80ff7093c67..a56418896c59 100644
--- a/contrib/ipfilter/lib/remove_poolnode.c
+++ b/contrib/ipfilter/lib/remove_poolnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/remove_poolnode.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/resetlexer.c b/contrib/ipfilter/lib/resetlexer.c
index 8ea83f101a23..035e700230ee 100644
--- a/contrib/ipfilter/lib/resetlexer.c
+++ b/contrib/ipfilter/lib/resetlexer.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/resetlexer.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/rwlock_emul.c b/contrib/ipfilter/lib/rwlock_emul.c
index 1ee247570082..0ee910256a27 100644
--- a/contrib/ipfilter/lib/rwlock_emul.c
+++ b/contrib/ipfilter/lib/rwlock_emul.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/rwlock_emul.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/tcp_flags.c b/contrib/ipfilter/lib/tcp_flags.c
index 0b602e66ab30..10945543abcb 100644
--- a/contrib/ipfilter/lib/tcp_flags.c
+++ b/contrib/ipfilter/lib/tcp_flags.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/tcp_flags.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/tcpflags.c b/contrib/ipfilter/lib/tcpflags.c
index f01d7dc31573..5052fe81c667 100644
--- a/contrib/ipfilter/lib/tcpflags.c
+++ b/contrib/ipfilter/lib/tcpflags.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/tcpflags.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/tcpoptnames.c b/contrib/ipfilter/lib/tcpoptnames.c
index 25e3b275a761..cc5b161b4d49 100644
--- a/contrib/ipfilter/lib/tcpoptnames.c
+++ b/contrib/ipfilter/lib/tcpoptnames.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/tcpoptnames.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/v6ionames.c b/contrib/ipfilter/lib/v6ionames.c
index b57b301e67bc..b0b3db0449f3 100644
--- a/contrib/ipfilter/lib/v6ionames.c
+++ b/contrib/ipfilter/lib/v6ionames.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/v6ionames.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/v6optvalue.c b/contrib/ipfilter/lib/v6optvalue.c
index a60d076bfbb7..7bfca83132ea 100644
--- a/contrib/ipfilter/lib/v6optvalue.c
+++ b/contrib/ipfilter/lib/v6optvalue.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/v6optvalue.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/var.c b/contrib/ipfilter/lib/var.c
index 4a62d7aed2e7..c1ab0dd792f0 100644
--- a/contrib/ipfilter/lib/var.c
+++ b/contrib/ipfilter/lib/var.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/var.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/verbose.c b/contrib/ipfilter/lib/verbose.c
index f1b4516a96cd..3f736ef642d9 100644
--- a/contrib/ipfilter/lib/verbose.c
+++ b/contrib/ipfilter/lib/verbose.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/verbose.c,v 1.4 2007/06/04 02:54:33 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2001 by Darren Reed.
diff --git a/contrib/ipfilter/man/Makefile b/contrib/ipfilter/man/Makefile
index 0b8f2a14c5a3..833a7e132366 100644
--- a/contrib/ipfilter/man/Makefile
+++ b/contrib/ipfilter/man/Makefile
@@ -3,7 +3,7 @@
 #
 # See the IPFILTER.LICENCE file for details on licencing.
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/man/Makefile,v 1.2 2006/02/27 11:22:20 darrenr Exp $
 #
 
 all:
diff --git a/contrib/ipfilter/man/ipf.4 b/contrib/ipfilter/man/ipf.4
index dfef858d5dd8..381c8b357458 100644
--- a/contrib/ipfilter/man/ipf.4
+++ b/contrib/ipfilter/man/ipf.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipf.4,v 1.7 2005/04/25 18:20:14 darrenr Exp $
 .TH IPF 4
 .SH NAME
 ipf \- packet filtering kernel interface
diff --git a/contrib/ipfilter/man/ipf.5 b/contrib/ipfilter/man/ipf.5
index 8bdaedcba229..382448ee4b86 100644
--- a/contrib/ipfilter/man/ipf.5
+++ b/contrib/ipfilter/man/ipf.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipf.5,v 1.10 2005/12/30 11:52:25 guido Exp $
 .TH IPF 5
 .SH NAME
 ipf, ipf.conf, ipf6.conf \- IP packet filter rule syntax
diff --git a/contrib/ipfilter/man/ipf.8 b/contrib/ipfilter/man/ipf.8
index 678010f73d26..e6debcb9084c 100644
--- a/contrib/ipfilter/man/ipf.8
+++ b/contrib/ipfilter/man/ipf.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipf.8,v 1.8 2007/06/04 02:54:34 darrenr Exp $
 .TH IPF 8
 .SH NAME
 ipf \- alters packet filtering lists for IP packet input and output
diff --git a/contrib/ipfilter/man/ipfilter.4 b/contrib/ipfilter/man/ipfilter.4
index 09eb4db8f1af..731db249296c 100644
--- a/contrib/ipfilter/man/ipfilter.4
+++ b/contrib/ipfilter/man/ipfilter.4
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipfilter.4,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IP\ FILTER 4
 .SH NAME
diff --git a/contrib/ipfilter/man/ipfilter.5 b/contrib/ipfilter/man/ipfilter.5
index 97e504df15fa..e1f5446444ab 100644
--- a/contrib/ipfilter/man/ipfilter.5
+++ b/contrib/ipfilter/man/ipfilter.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipfilter.5,v 1.4 2002/03/19 11:48:16 darrenr Exp $
 .TH IPFILTER 1
 .SH NAME
 IP Filter
diff --git a/contrib/ipfilter/man/ipfs.8 b/contrib/ipfilter/man/ipfs.8
index 01d0c707d60c..38007a729aa6 100644
--- a/contrib/ipfilter/man/ipfs.8
+++ b/contrib/ipfilter/man/ipfs.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipfs.8,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPFS 8
 .SH NAME
diff --git a/contrib/ipfilter/man/ipfstat.8 b/contrib/ipfilter/man/ipfstat.8
index 44ba8ba0d430..ccc0dfeeba41 100644
--- a/contrib/ipfilter/man/ipfstat.8
+++ b/contrib/ipfilter/man/ipfstat.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipfstat.8,v 1.11 2007/06/04 02:54:34 darrenr Exp $
 .TH ipfstat 8
 .SH NAME
 ipfstat \- reports on packet filter statistics and filter list
diff --git a/contrib/ipfilter/man/ipftest.1 b/contrib/ipfilter/man/ipftest.1
index 402195f318e1..0c79bd473f1b 100644
--- a/contrib/ipfilter/man/ipftest.1
+++ b/contrib/ipfilter/man/ipftest.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipftest.1,v 1.7 2005/12/30 11:52:25 guido Exp $
 .TH ipftest 1
 .SH NAME
 ipftest \- test packet filter rules with arbitrary input.
diff --git a/contrib/ipfilter/man/ipl.4 b/contrib/ipfilter/man/ipl.4
index da1d9e61ce0f..626212adb1bf 100644
--- a/contrib/ipfilter/man/ipl.4
+++ b/contrib/ipfilter/man/ipl.4
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipl.4,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPL 4
 .SH NAME
diff --git a/contrib/ipfilter/man/ipmon.5 b/contrib/ipfilter/man/ipmon.5
index 081fc0856bc1..fbb9c9918433 100644
--- a/contrib/ipfilter/man/ipmon.5
+++ b/contrib/ipfilter/man/ipmon.5
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipmon.5,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPMON 5
 .SH NAME
diff --git a/contrib/ipfilter/man/ipmon.8 b/contrib/ipfilter/man/ipmon.8
index 1082e06ec262..ef2c23309ebf 100644
--- a/contrib/ipfilter/man/ipmon.8
+++ b/contrib/ipfilter/man/ipmon.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipmon.8,v 1.18 2007/06/04 02:54:34 darrenr Exp $
 .TH ipmon 8
 .SH NAME
 ipmon \- monitors /dev/ipl for logged packets
diff --git a/contrib/ipfilter/man/ipnat.4 b/contrib/ipfilter/man/ipnat.4
index 095e4e5e1904..94d1a727364f 100644
--- a/contrib/ipfilter/man/ipnat.4
+++ b/contrib/ipfilter/man/ipnat.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipnat.4,v 1.5 2000/10/26 12:47:40 darrenr Exp $
 .TH IPNAT 4
 .SH NAME
 ipnat \- Network Address Translation kernel interface
diff --git a/contrib/ipfilter/man/ipnat.5 b/contrib/ipfilter/man/ipnat.5
index 6d3f9bcff457..b80a3346aae1 100644
--- a/contrib/ipfilter/man/ipnat.5
+++ b/contrib/ipfilter/man/ipnat.5
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipnat.5,v 1.3 2005/12/30 11:52:25 guido Exp $
 .\"
 .TH IPNAT 5
 .SH NAME
diff --git a/contrib/ipfilter/man/ipnat.8 b/contrib/ipfilter/man/ipnat.8
index 192c1e74ccd9..5f76c5195f2e 100644
--- a/contrib/ipfilter/man/ipnat.8
+++ b/contrib/ipfilter/man/ipnat.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipnat.8,v 1.3 2005/12/30 11:52:25 guido Exp $
 .\"
 .TH IPNAT 8
 .SH NAME
diff --git a/contrib/ipfilter/man/ippool.5 b/contrib/ipfilter/man/ippool.5
index 367eb8d6f2bb..86f12863bccf 100644
--- a/contrib/ipfilter/man/ippool.5
+++ b/contrib/ipfilter/man/ippool.5
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ippool.5,v 1.2.10.1 2007/10/31 05:00:36 darrenr Exp $
 .\"
 .TH IPPOOL 5
 .SH NAME
diff --git a/contrib/ipfilter/man/ippool.8 b/contrib/ipfilter/man/ippool.8
index 986812a14077..05fbe4546619 100644
--- a/contrib/ipfilter/man/ippool.8
+++ b/contrib/ipfilter/man/ippool.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ippool.8,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPPOOL 8
 .SH NAME
diff --git a/contrib/ipfilter/man/ipscan.5 b/contrib/ipfilter/man/ipscan.5
index 91bf9b0f5ebe..32c63710390c 100644
--- a/contrib/ipfilter/man/ipscan.5
+++ b/contrib/ipfilter/man/ipscan.5
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipscan.5,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPSCAN 5
 .SH NAME
diff --git a/contrib/ipfilter/man/ipscan.8 b/contrib/ipfilter/man/ipscan.8
index 513dc94a8050..e5af001c85e1 100644
--- a/contrib/ipfilter/man/ipscan.8
+++ b/contrib/ipfilter/man/ipscan.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipscan.8,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPSCAN 8
 .SH NAME
diff --git a/contrib/ipfilter/man/mkfilters.1 b/contrib/ipfilter/man/mkfilters.1
index b9e1ddd8872a..d9dad23a97bd 100644
--- a/contrib/ipfilter/man/mkfilters.1
+++ b/contrib/ipfilter/man/mkfilters.1
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/mkfilters.1,v 1.3 2006/02/27 11:22:20 darrenr Exp $
 .\"
 .TH MKFILTERS 1
 .SH NAME
diff --git a/contrib/ipfilter/md5.c b/contrib/ipfilter/md5.c
index 63dd4b415745..c1a6e3d54e71 100644
--- a/contrib/ipfilter/md5.c
+++ b/contrib/ipfilter/md5.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/md5.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 
 
diff --git a/contrib/ipfilter/md5.h b/contrib/ipfilter/md5.h
index 914df74355a0..e86229a6bf8e 100644
--- a/contrib/ipfilter/md5.h
+++ b/contrib/ipfilter/md5.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/md5.h,v 1.2.10.1 2007/10/31 05:00:34 darrenr Exp $	*/
 
 /*
  ***********************************************************************
diff --git a/contrib/ipfilter/mlf_ipl.c b/contrib/ipfilter/mlf_ipl.c
index ca79596e3844..e6271dc49035 100644
--- a/contrib/ipfilter/mlf_ipl.c
+++ b/contrib/ipfilter/mlf_ipl.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/mlf_ipl.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/mlf_rule.c b/contrib/ipfilter/mlf_rule.c
index 8b7b9d3a9409..5692ec9aed8d 100644
--- a/contrib/ipfilter/mlf_rule.c
+++ b/contrib/ipfilter/mlf_rule.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/mlf_rule.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/mlfk_rule.c b/contrib/ipfilter/mlfk_rule.c
index 5f7aed89a7dd..fd22275c1df4 100644
--- a/contrib/ipfilter/mlfk_rule.c
+++ b/contrib/ipfilter/mlfk_rule.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/mlfk_rule.c,v 1.3 2005/12/30 11:52:22 guido Exp $	*/
 
 /*
  * Copyright (C) 2000 by Darren Reed.
diff --git a/contrib/ipfilter/mlh_rule.c b/contrib/ipfilter/mlh_rule.c
index dd350dfb7b4f..a869aab12ac1 100644
--- a/contrib/ipfilter/mlh_rule.c
+++ b/contrib/ipfilter/mlh_rule.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/mlh_rule.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
diff --git a/contrib/ipfilter/net/.cvsignore b/contrib/ipfilter/net/.cvsignore
deleted file mode 100644
index 19f86f493ab1..000000000000
--- a/contrib/ipfilter/net/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-done
diff --git a/contrib/ipfilter/opts.h b/contrib/ipfilter/opts.h
index fa53c8f5fe90..04ba428725a5 100644
--- a/contrib/ipfilter/opts.h
+++ b/contrib/ipfilter/opts.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/opts.h,v 1.3 2005/12/30 11:52:22 guido Exp $	*/
 
 /*
  * Copyright (C) 2000 by Darren Reed.
diff --git a/contrib/ipfilter/pcap-bpf.h b/contrib/ipfilter/pcap-bpf.h
index 51002a3c2bea..2ad4d3ccaf8f 100644
--- a/contrib/ipfilter/pcap-bpf.h
+++ b/contrib/ipfilter/pcap-bpf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/pcap-bpf.h,v 1.1 2005/05/16 16:22:55 darrenr Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
diff --git a/contrib/ipfilter/pcap-ipf.h b/contrib/ipfilter/pcap-ipf.h
index 71250ad61389..211ad52c34ca 100644
--- a/contrib/ipfilter/pcap-ipf.h
+++ b/contrib/ipfilter/pcap-ipf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/pcap-ipf.h,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/radix.c b/contrib/ipfilter/radix.c
index 8c67562553e2..0e8ba878b856 100644
--- a/contrib/ipfilter/radix.c
+++ b/contrib/ipfilter/radix.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/radix.c,v 1.4.2.1 2007/10/31 05:00:34 darrenr Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1993
diff --git a/contrib/ipfilter/radix_ipf.h b/contrib/ipfilter/radix_ipf.h
index 11e4ba761aae..62bf26a91645 100644
--- a/contrib/ipfilter/radix_ipf.h
+++ b/contrib/ipfilter/radix_ipf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/radix_ipf.h,v 1.4.2.1 2007/10/31 05:00:34 darrenr Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1993
diff --git a/contrib/ipfilter/rules/.cvsignore b/contrib/ipfilter/rules/.cvsignore
deleted file mode 100644
index 3e757656cf36..000000000000
--- a/contrib/ipfilter/rules/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-new
diff --git a/contrib/ipfilter/samples/.cvsignore b/contrib/ipfilter/samples/.cvsignore
deleted file mode 100644
index 4d38251c2f4f..000000000000
--- a/contrib/ipfilter/samples/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-userauth
-proxy
-relay
-trans_relay
diff --git a/contrib/ipfilter/samples/proxy.c b/contrib/ipfilter/samples/proxy.c
index 471cc736506a..3a757c23744b 100644
--- a/contrib/ipfilter/samples/proxy.c
+++ b/contrib/ipfilter/samples/proxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/samples/proxy.c,v 1.4 2006/08/16 12:23:02 guido Exp $	*/
 
 /*
  * Sample transparent proxy program.
diff --git a/contrib/ipfilter/samples/relay.c b/contrib/ipfilter/samples/relay.c
index ac5c60243b8f..23b721655d1f 100644
--- a/contrib/ipfilter/samples/relay.c
+++ b/contrib/ipfilter/samples/relay.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/samples/relay.c,v 1.4 2005/12/30 11:52:25 guido Exp $	*/
 
 /*
  * Sample program to be used as a transparent proxy.
diff --git a/contrib/ipfilter/samples/userauth.c b/contrib/ipfilter/samples/userauth.c
index 620bd7220057..94ec70fff07f 100644
--- a/contrib/ipfilter/samples/userauth.c
+++ b/contrib/ipfilter/samples/userauth.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/samples/userauth.c,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/contrib/ipfilter/snoop.h b/contrib/ipfilter/snoop.h
index 3cb54b99cc3f..f476cb0b393b 100644
--- a/contrib/ipfilter/snoop.h
+++ b/contrib/ipfilter/snoop.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/snoop.h,v 1.3 2005/12/30 11:52:22 guido Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/test/.cvsignore b/contrib/ipfilter/test/.cvsignore
deleted file mode 100644
index 5825abcde9c7..000000000000
--- a/contrib/ipfilter/test/.cvsignore
+++ /dev/null
@@ -1,87 +0,0 @@
-results
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-i1
-i2
-i3
-i4
-i5
-i6
-i7
-i8
-i9
-i10
-i11
-f1
-f2
-f3
-f4
-f5
-f6
-f7
-f8
-f9
-f10
-f11
-f12
-f13
-f14
-n1
-n2
-n3
-n4
-n5
-n6
-n7
-f15
-f16
-ipv6.1
-ipv6.2
-l1
-ni1
-ni2
-ni3
-ni4
-f17
-in1
-in2
-in3
-in4
-p1
-p2
-i12
-ip1
-p3
-i13
-ni5
-ni6
-i14
-in5
-ipv6.3
-n8
-n9
-n10
-n11
-ni7
-ni8
-ni9
-ni10
-ni11
-ni12
-n12
-in6
-i15
-ni13
-ni14
-ni15
-ni16
diff --git a/contrib/ipfilter/test/logtest b/contrib/ipfilter/test/logtest
index 1c8ac5bca2c3..146702a93416 100755
--- a/contrib/ipfilter/test/logtest
+++ b/contrib/ipfilter/test/logtest
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/test/logtest,v 1.4 2005/04/25 18:20:15 darrenr Exp $
 format=$2
 mkdir -p results
 if [ -f /usr/ucb/touch ] ; then
diff --git a/contrib/ipfilter/tools/ipf.c b/contrib/ipfilter/tools/ipf.c
index fe9fec2581ec..34a196d4f3f2 100644
--- a/contrib/ipfilter/tools/ipf.c
+++ b/contrib/ipfilter/tools/ipf.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipf.c,v 1.6 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipf_y.y b/contrib/ipfilter/tools/ipf_y.y
index 2ce4291f2ec8..2017c9e81b8a 100644
--- a/contrib/ipfilter/tools/ipf_y.y
+++ b/contrib/ipfilter/tools/ipf_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipf_y.y,v 1.6.2.1 2007/10/31 05:00:37 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipfcomp.c b/contrib/ipfilter/tools/ipfcomp.c
index 1e26de5966c3..e5f9eaef3224 100644
--- a/contrib/ipfilter/tools/ipfcomp.c
+++ b/contrib/ipfilter/tools/ipfcomp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipfcomp.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2005 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipfs.c b/contrib/ipfilter/tools/ipfs.c
index eab650a7ee36..96d6a8a7bd42 100644
--- a/contrib/ipfilter/tools/ipfs.c
+++ b/contrib/ipfilter/tools/ipfs.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipfs.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipfstat.c b/contrib/ipfilter/tools/ipfstat.c
index 3c5bfdd50ac4..4e0e3d1dd706 100644
--- a/contrib/ipfilter/tools/ipfstat.c
+++ b/contrib/ipfilter/tools/ipfstat.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipfstat.c,v 1.6.2.1 2007/10/31 05:00:37 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipftest.c b/contrib/ipfilter/tools/ipftest.c
index 963ed197cb9c..197735dbc359 100644
--- a/contrib/ipfilter/tools/ipftest.c
+++ b/contrib/ipfilter/tools/ipftest.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipftest.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipmon.c b/contrib/ipfilter/tools/ipmon.c
index ceaed82cb4b3..104ceb338415 100644
--- a/contrib/ipfilter/tools/ipmon.c
+++ b/contrib/ipfilter/tools/ipmon.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipmon.c,v 1.7.2.1 2007/10/31 05:00:37 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipmon_y.y b/contrib/ipfilter/tools/ipmon_y.y
index 98042d880222..5732fe935f91 100644
--- a/contrib/ipfilter/tools/ipmon_y.y
+++ b/contrib/ipfilter/tools/ipmon_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipmon_y.y,v 1.3 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2004 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipnat.c b/contrib/ipfilter/tools/ipnat.c
index 28e29ec74199..5ba352312503 100644
--- a/contrib/ipfilter/tools/ipnat.c
+++ b/contrib/ipfilter/tools/ipnat.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipnat.c,v 1.5.2.1 2007/10/31 05:00:37 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipnat_y.y b/contrib/ipfilter/tools/ipnat_y.y
index cce717d8ee05..19ab5a80e4fd 100644
--- a/contrib/ipfilter/tools/ipnat_y.y
+++ b/contrib/ipfilter/tools/ipnat_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipnat_y.y,v 1.5.2.1 2007/10/31 05:00:37 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ippool.c b/contrib/ipfilter/tools/ippool.c
index 8b7096050736..323957266010 100644
--- a/contrib/ipfilter/tools/ippool.c
+++ b/contrib/ipfilter/tools/ippool.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ippool.c,v 1.4 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ippool_y.y b/contrib/ipfilter/tools/ippool_y.y
index 24f683bd1c19..46b45c8be970 100644
--- a/contrib/ipfilter/tools/ippool_y.y
+++ b/contrib/ipfilter/tools/ippool_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ippool_y.y,v 1.3 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipscan_y.y b/contrib/ipfilter/tools/ipscan_y.y
index 5dbefd6ab5ae..813496cab2bf 100644
--- a/contrib/ipfilter/tools/ipscan_y.y
+++ b/contrib/ipfilter/tools/ipscan_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipscan_y.y,v 1.3 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2004 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipsyncm.c b/contrib/ipfilter/tools/ipsyncm.c
index 600d39ad0d6c..46e351a4b1fb 100644
--- a/contrib/ipfilter/tools/ipsyncm.c
+++ b/contrib/ipfilter/tools/ipsyncm.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipsyncm.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipsyncs.c b/contrib/ipfilter/tools/ipsyncs.c
index 887eeab310c6..d58a72de145e 100644
--- a/contrib/ipfilter/tools/ipsyncs.c
+++ b/contrib/ipfilter/tools/ipsyncs.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipsyncs.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/lex_var.h b/contrib/ipfilter/tools/lex_var.h
index 78c5efc4263d..6fa0c5e4cf10 100644
--- a/contrib/ipfilter/tools/lex_var.h
+++ b/contrib/ipfilter/tools/lex_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/lex_var.h,v 1.3 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/tools/lexer.c b/contrib/ipfilter/tools/lexer.c
index 989643c966b5..c164937596a7 100644
--- a/contrib/ipfilter/tools/lexer.c
+++ b/contrib/ipfilter/tools/lexer.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/lexer.c,v 1.4.2.1 2007/10/31 05:00:37 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/lexer.h b/contrib/ipfilter/tools/lexer.h
index d973ea42ae35..8d5458ec5162 100644
--- a/contrib/ipfilter/tools/lexer.h
+++ b/contrib/ipfilter/tools/lexer.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/lexer.h,v 1.3 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2004 by Darren Reed.