aboutsummaryrefslogtreecommitdiff
path: root/contrib/ipfilter
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/ipfilter')
-rw-r--r--contrib/ipfilter/.cvsignore28
-rw-r--r--contrib/ipfilter/BSD/.cvsignore22
-rwxr-xr-xcontrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.02
-rw-r--r--contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.12
-rw-r--r--contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.22
-rw-r--r--contrib/ipfilter/INST.FreeBSD-2.22
-rw-r--r--contrib/ipfilter/INSTALL.xBSD2
-rw-r--r--contrib/ipfilter/Makefile2
-rw-r--r--contrib/ipfilter/bpf-ipf.h2
-rw-r--r--contrib/ipfilter/bpf_filter.c2
-rw-r--r--contrib/ipfilter/ip_fil.c2
-rw-r--r--contrib/ipfilter/ip_msnrpc_pxy.c2
-rw-r--r--contrib/ipfilter/ipf.h2
-rw-r--r--contrib/ipfilter/iplang/.cvsignore9
-rw-r--r--contrib/ipfilter/iplang/iplang.h2
-rw-r--r--contrib/ipfilter/iplang/iplang_l.l2
-rw-r--r--contrib/ipfilter/iplang/iplang_y.y4
-rw-r--r--contrib/ipfilter/ipmon.h2
-rw-r--r--contrib/ipfilter/ipsd/Celler/ip_compat.h2
-rw-r--r--contrib/ipfilter/ipsd/ipsd.c2
-rw-r--r--contrib/ipfilter/ipsd/ipsd.h2
-rw-r--r--contrib/ipfilter/ipsd/ipsdr.c2
-rw-r--r--contrib/ipfilter/ipsd/linux.h2
-rw-r--r--contrib/ipfilter/ipsd/sbpf.c2
-rw-r--r--contrib/ipfilter/ipsd/sdlpi.c2
-rw-r--r--contrib/ipfilter/ipsd/slinux.c2
-rw-r--r--contrib/ipfilter/ipsd/snit.c2
-rw-r--r--contrib/ipfilter/ipsend/.OLD/ip_compat.h2
-rw-r--r--contrib/ipfilter/ipsend/.cvsignore3
-rw-r--r--contrib/ipfilter/ipsend/44arp.c2
-rw-r--r--contrib/ipfilter/ipsend/arp.c2
-rw-r--r--contrib/ipfilter/ipsend/dlcommon.c2
-rw-r--r--contrib/ipfilter/ipsend/dltest.h2
-rw-r--r--contrib/ipfilter/ipsend/hpux.c2
-rw-r--r--contrib/ipfilter/ipsend/in_var.h2
-rw-r--r--contrib/ipfilter/ipsend/ip.c2
-rw-r--r--contrib/ipfilter/ipsend/ip_var.h2
-rw-r--r--contrib/ipfilter/ipsend/ipresend.12
-rw-r--r--contrib/ipfilter/ipsend/ipresend.c2
-rw-r--r--contrib/ipfilter/ipsend/ipsend.12
-rw-r--r--contrib/ipfilter/ipsend/ipsend.52
-rw-r--r--contrib/ipfilter/ipsend/ipsend.c2
-rw-r--r--contrib/ipfilter/ipsend/ipsend.h2
-rw-r--r--contrib/ipfilter/ipsend/ipsopt.c2
-rw-r--r--contrib/ipfilter/ipsend/iptest.12
-rw-r--r--contrib/ipfilter/ipsend/iptest.c2
-rw-r--r--contrib/ipfilter/ipsend/iptests.c2
-rw-r--r--contrib/ipfilter/ipsend/larp.c2
-rw-r--r--contrib/ipfilter/ipsend/linux.h2
-rw-r--r--contrib/ipfilter/ipsend/lsock.c2
-rw-r--r--contrib/ipfilter/ipsend/resend.c2
-rw-r--r--contrib/ipfilter/ipsend/sbpf.c2
-rw-r--r--contrib/ipfilter/ipsend/sdlpi.c2
-rw-r--r--contrib/ipfilter/ipsend/sirix.c2
-rw-r--r--contrib/ipfilter/ipsend/slinux.c2
-rw-r--r--contrib/ipfilter/ipsend/snit.c2
-rw-r--r--contrib/ipfilter/ipsend/sock.c2
-rw-r--r--contrib/ipfilter/ipsend/sockraw.c2
-rw-r--r--contrib/ipfilter/ipsend/tcpip.h2
-rw-r--r--contrib/ipfilter/ipt.h2
-rw-r--r--contrib/ipfilter/kmem.h2
-rw-r--r--contrib/ipfilter/l4check/l4check.c2
-rw-r--r--contrib/ipfilter/lib/addicmp.c2
-rw-r--r--contrib/ipfilter/lib/addipopt.c2
-rw-r--r--contrib/ipfilter/lib/addkeep.c2
-rw-r--r--contrib/ipfilter/lib/bcopywrap.c2
-rw-r--r--contrib/ipfilter/lib/binprint.c2
-rw-r--r--contrib/ipfilter/lib/buildopts.c2
-rw-r--r--contrib/ipfilter/lib/checkrev.c2
-rw-r--r--contrib/ipfilter/lib/count4bits.c2
-rw-r--r--contrib/ipfilter/lib/count6bits.c2
-rw-r--r--contrib/ipfilter/lib/debug.c2
-rw-r--r--contrib/ipfilter/lib/extras.c2
-rw-r--r--contrib/ipfilter/lib/facpri.c2
-rw-r--r--contrib/ipfilter/lib/facpri.h2
-rw-r--r--contrib/ipfilter/lib/fill6bits.c2
-rw-r--r--contrib/ipfilter/lib/flags.c2
-rw-r--r--contrib/ipfilter/lib/genmask.c2
-rw-r--r--contrib/ipfilter/lib/gethost.c2
-rw-r--r--contrib/ipfilter/lib/getifname.c2
-rw-r--r--contrib/ipfilter/lib/getline.c2
-rw-r--r--contrib/ipfilter/lib/getnattype.c2
-rw-r--r--contrib/ipfilter/lib/getport.c2
-rw-r--r--contrib/ipfilter/lib/getportproto.c2
-rw-r--r--contrib/ipfilter/lib/getproto.c2
-rw-r--r--contrib/ipfilter/lib/getsumd.c2
-rw-r--r--contrib/ipfilter/lib/hexdump.c2
-rw-r--r--contrib/ipfilter/lib/hostmask.c2
-rw-r--r--contrib/ipfilter/lib/hostname.c2
-rw-r--r--contrib/ipfilter/lib/hostnum.c2
-rw-r--r--contrib/ipfilter/lib/icmpcode.c2
-rw-r--r--contrib/ipfilter/lib/inet_addr.c2
-rw-r--r--contrib/ipfilter/lib/initparse.c2
-rw-r--r--contrib/ipfilter/lib/ionames.c2
-rw-r--r--contrib/ipfilter/lib/ipf_dotuning.c2
-rw-r--r--contrib/ipfilter/lib/ipft_ef.c2
-rw-r--r--contrib/ipfilter/lib/ipft_hx.c2
-rw-r--r--contrib/ipfilter/lib/ipft_pc.c2
-rw-r--r--contrib/ipfilter/lib/ipft_sn.c2
-rw-r--r--contrib/ipfilter/lib/ipft_td.c2
-rw-r--r--contrib/ipfilter/lib/ipft_tx.c2
-rw-r--r--contrib/ipfilter/lib/ipoptsec.c2
-rw-r--r--contrib/ipfilter/lib/kmem.c2
-rw-r--r--contrib/ipfilter/lib/kmem.h2
-rw-r--r--contrib/ipfilter/lib/kmemcpywrap.c2
-rw-r--r--contrib/ipfilter/lib/kvatoname.c2
-rw-r--r--contrib/ipfilter/lib/load_hash.c2
-rw-r--r--contrib/ipfilter/lib/load_hashnode.c2
-rw-r--r--contrib/ipfilter/lib/load_pool.c2
-rw-r--r--contrib/ipfilter/lib/load_poolnode.c2
-rw-r--r--contrib/ipfilter/lib/loglevel.c2
-rw-r--r--contrib/ipfilter/lib/make_range.c2
-rw-r--r--contrib/ipfilter/lib/mutex_emul.c2
-rw-r--r--contrib/ipfilter/lib/nametokva.c2
-rw-r--r--contrib/ipfilter/lib/nat_setgroupmap.c2
-rw-r--r--contrib/ipfilter/lib/natparse.c2
-rw-r--r--contrib/ipfilter/lib/ntomask.c2
-rw-r--r--contrib/ipfilter/lib/optname.c2
-rw-r--r--contrib/ipfilter/lib/optprint.c2
-rw-r--r--contrib/ipfilter/lib/optprintv6.c2
-rw-r--r--contrib/ipfilter/lib/optvalue.c2
-rw-r--r--contrib/ipfilter/lib/parse.c2
-rw-r--r--contrib/ipfilter/lib/portname.c2
-rw-r--r--contrib/ipfilter/lib/portnum.c2
-rw-r--r--contrib/ipfilter/lib/ports.c2
-rw-r--r--contrib/ipfilter/lib/print_toif.c2
-rw-r--r--contrib/ipfilter/lib/printactivenat.c2
-rw-r--r--contrib/ipfilter/lib/printaps.c2
-rw-r--r--contrib/ipfilter/lib/printbuf.c2
-rw-r--r--contrib/ipfilter/lib/printfr.c2
-rw-r--r--contrib/ipfilter/lib/printfraginfo.c2
-rw-r--r--contrib/ipfilter/lib/printhash.c2
-rw-r--r--contrib/ipfilter/lib/printhashnode.c2
-rw-r--r--contrib/ipfilter/lib/printhostmap.c2
-rw-r--r--contrib/ipfilter/lib/printhostmask.c2
-rw-r--r--contrib/ipfilter/lib/printifname.c2
-rw-r--r--contrib/ipfilter/lib/printip.c2
-rw-r--r--contrib/ipfilter/lib/printlog.c2
-rw-r--r--contrib/ipfilter/lib/printmask.c2
-rw-r--r--contrib/ipfilter/lib/printnat.c2
-rw-r--r--contrib/ipfilter/lib/printpacket.c2
-rw-r--r--contrib/ipfilter/lib/printpacket6.c2
-rw-r--r--contrib/ipfilter/lib/printpool.c2
-rw-r--r--contrib/ipfilter/lib/printpoolnode.c2
-rw-r--r--contrib/ipfilter/lib/printportcmp.c2
-rw-r--r--contrib/ipfilter/lib/printsbuf.c2
-rw-r--r--contrib/ipfilter/lib/printstate.c2
-rw-r--r--contrib/ipfilter/lib/printtunable.c2
-rw-r--r--contrib/ipfilter/lib/ratoi.c2
-rw-r--r--contrib/ipfilter/lib/ratoui.c2
-rw-r--r--contrib/ipfilter/lib/remove_hash.c2
-rw-r--r--contrib/ipfilter/lib/remove_hashnode.c2
-rw-r--r--contrib/ipfilter/lib/remove_pool.c2
-rw-r--r--contrib/ipfilter/lib/remove_poolnode.c2
-rw-r--r--contrib/ipfilter/lib/resetlexer.c2
-rw-r--r--contrib/ipfilter/lib/rwlock_emul.c2
-rw-r--r--contrib/ipfilter/lib/tcp_flags.c2
-rw-r--r--contrib/ipfilter/lib/tcpflags.c2
-rw-r--r--contrib/ipfilter/lib/tcpoptnames.c2
-rw-r--r--contrib/ipfilter/lib/to_interface.c2
-rw-r--r--contrib/ipfilter/lib/v6ionames.c2
-rw-r--r--contrib/ipfilter/lib/v6optvalue.c2
-rw-r--r--contrib/ipfilter/lib/var.c2
-rw-r--r--contrib/ipfilter/lib/verbose.c2
-rw-r--r--contrib/ipfilter/man/ipf.42
-rw-r--r--contrib/ipfilter/man/ipf.52
-rw-r--r--contrib/ipfilter/man/ipf.82
-rw-r--r--contrib/ipfilter/man/ipfilter.42
-rw-r--r--contrib/ipfilter/man/ipfilter.52
-rw-r--r--contrib/ipfilter/man/ipfs.82
-rw-r--r--contrib/ipfilter/man/ipfstat.82
-rw-r--r--contrib/ipfilter/man/ipftest.12
-rw-r--r--contrib/ipfilter/man/ipl.42
-rw-r--r--contrib/ipfilter/man/ipmon.52
-rw-r--r--contrib/ipfilter/man/ipmon.82
-rw-r--r--contrib/ipfilter/man/ipnat.42
-rw-r--r--contrib/ipfilter/man/ipnat.52
-rw-r--r--contrib/ipfilter/man/ipnat.82
-rw-r--r--contrib/ipfilter/man/ippool.52
-rw-r--r--contrib/ipfilter/man/ippool.82
-rw-r--r--contrib/ipfilter/man/ipscan.52
-rw-r--r--contrib/ipfilter/man/ipscan.82
-rw-r--r--contrib/ipfilter/man/mkfilters.12
-rw-r--r--contrib/ipfilter/md5.c2
-rw-r--r--contrib/ipfilter/md5.h2
-rw-r--r--contrib/ipfilter/mlf_ipl.c2
-rw-r--r--contrib/ipfilter/mlf_rule.c2
-rw-r--r--contrib/ipfilter/mlfk_rule.c2
-rw-r--r--contrib/ipfilter/mlh_rule.c2
-rw-r--r--contrib/ipfilter/net/.cvsignore1
-rw-r--r--contrib/ipfilter/opts.h2
-rw-r--r--contrib/ipfilter/pcap-bpf.h2
-rw-r--r--contrib/ipfilter/pcap-ipf.h2
-rw-r--r--contrib/ipfilter/radix.c2
-rw-r--r--contrib/ipfilter/radix_ipf.h2
-rw-r--r--contrib/ipfilter/rules/.cvsignore1
-rw-r--r--contrib/ipfilter/rules/example.12
-rw-r--r--contrib/ipfilter/rules/example.102
-rw-r--r--contrib/ipfilter/rules/example.112
-rw-r--r--contrib/ipfilter/rules/example.122
-rw-r--r--contrib/ipfilter/rules/example.132
-rw-r--r--contrib/ipfilter/rules/example.22
-rw-r--r--contrib/ipfilter/rules/example.32
-rw-r--r--contrib/ipfilter/rules/example.42
-rw-r--r--contrib/ipfilter/rules/example.52
-rw-r--r--contrib/ipfilter/rules/example.62
-rw-r--r--contrib/ipfilter/rules/example.72
-rw-r--r--contrib/ipfilter/rules/example.82
-rw-r--r--contrib/ipfilter/rules/example.92
-rw-r--r--contrib/ipfilter/rules/example.sr2
-rw-r--r--contrib/ipfilter/samples/.cvsignore4
-rw-r--r--contrib/ipfilter/samples/proxy.c2
-rw-r--r--contrib/ipfilter/samples/relay.c2
-rw-r--r--contrib/ipfilter/samples/userauth.c2
-rw-r--r--contrib/ipfilter/snoop.h2
-rw-r--r--contrib/ipfilter/test/.cvsignore87
-rwxr-xr-xcontrib/ipfilter/test/logtest2
-rw-r--r--contrib/ipfilter/tools/ipf.c2
-rw-r--r--contrib/ipfilter/tools/ipf_y.y2
-rw-r--r--contrib/ipfilter/tools/ipfcomp.c2
-rw-r--r--contrib/ipfilter/tools/ipfs.c2
-rw-r--r--contrib/ipfilter/tools/ipfstat.c2
-rw-r--r--contrib/ipfilter/tools/ipftest.c2
-rw-r--r--contrib/ipfilter/tools/ipmon.c2
-rw-r--r--contrib/ipfilter/tools/ipmon_y.y2
-rw-r--r--contrib/ipfilter/tools/ipnat.c2
-rw-r--r--contrib/ipfilter/tools/ipnat_y.y2
-rw-r--r--contrib/ipfilter/tools/ippool.c2
-rw-r--r--contrib/ipfilter/tools/ippool_y.y2
-rw-r--r--contrib/ipfilter/tools/ipscan_y.y2
-rw-r--r--contrib/ipfilter/tools/ipsyncm.c2
-rw-r--r--contrib/ipfilter/tools/ipsyncs.c2
-rw-r--r--contrib/ipfilter/tools/lex_var.h2
-rw-r--r--contrib/ipfilter/tools/lexer.c2
-rw-r--r--contrib/ipfilter/tools/lexer.h2
235 files changed, 228 insertions, 383 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 7b1d7d302e4c..3ac04b52c177 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.4 2005/04/25 18:20:08 darrenr Exp $
# Id: Makefile,v 2.76.2.13 2004/11/08 18:42:40 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 f5cc58821c80..5ef41a792286 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.3 2005/04/26 15:18:45 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 a4ec02c3dc51..eca26fd47a3f 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.3 2005/04/26 15:18:45 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 60a2013ac3af..d0fad83fc3ed 100644
--- a/contrib/ipfilter/ipf.h
+++ b/contrib/ipfilter/ipf.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipf.h,v 1.2 2005/04/25 18:20:08 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 71e478b05a0c..e31a345b9a33 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.2 2005/04/25 18:20:10 darrenr Exp $ */
%{
/*
diff --git a/contrib/ipfilter/iplang/iplang_y.y b/contrib/ipfilter/iplang/iplang_y.y
index 22ea40bd19be..88da7233f8b3 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.6 2005/04/25 18:20:10 darrenr Exp $ */
%{
/*
@@ -7,7 +7,7 @@
* See the IPFILTER.LICENCE file for details on licencing.
*
* Id: iplang_y.y,v 2.9.2.2 2004/12/09 19:41:10 darrenr Exp
- * $FreeBSD$
+ * $FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.6 2005/04/25 18:20:10 darrenr Exp $
*/
#include <stdio.h>
diff --git a/contrib/ipfilter/ipmon.h b/contrib/ipfilter/ipmon.h
index 6d14e52251c8..821dc508df4e 100644
--- a/contrib/ipfilter/ipmon.h
+++ b/contrib/ipfilter/ipmon.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipmon.h,v 1.2 2005/04/25 18:20:08 darrenr 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 970b47ef26d2..486533fb23ae 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.2 2005/04/25 18:20:10 darrenr 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 df8b9a88afa5..f198e8635116 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.2 2005/04/25 18:20:10 darrenr 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 6d4f83d2bbf6..1bd0bed6f7b7 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.2 2005/04/25 18:20:10 darrenr 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 1063d3a752e0..e1aae0ef30f4 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.2 2005/04/25 18:20:10 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 f90fc3cea1fd..d634abede63d 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.2 2005/04/25 18:20:10 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 cc9f6b9a5e1f..a1501aba82f0 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.2 2005/04/25 18:20:10 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 3a11d83242e8..bfce110fbf30 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.2 2005/04/25 18:20:10 darrenr 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 06be7115d951..fac0e249a91c 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.12 2005/04/25 18:20:11 darrenr 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 a85f1629713a..d8a767b7bbc9 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.2 2005/04/25 18:20:11 darrenr 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 0e81ec5b6f86..23462a631fda 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.2 2005/04/25 18:20:11 darrenr Exp $ */
/*
* ipsend.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/iptests.c b/contrib/ipfilter/ipsend/iptests.c
index 51715d87e87c..2da91dfd7d95 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.10 2005/04/25 18:20:11 darrenr Exp $ */
/*
* Copyright (C) 1993-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsend/larp.c b/contrib/ipfilter/ipsend/larp.c
index 1e0b1697f93f..515bc4d785f1 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.2 2005/04/25 18:20:11 darrenr 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 8c6616db986d..e83e2e5aa112 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.2 2005/04/25 18:20:11 darrenr Exp $ */
/*
* lsock.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/resend.c b/contrib/ipfilter/ipsend/resend.c
index fb2d8bd50ac3..da8a3d34b2d0 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.2 2005/04/25 18:20:11 darrenr Exp $ */
/*
* resend.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/sbpf.c b/contrib/ipfilter/ipsend/sbpf.c
index c25a4232a467..19c8ef6742c3 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.6 2005/04/25 18:20:11 darrenr Exp $ */
/*
* (C)opyright 1995-1998 Darren Reed. (from tcplog)
*
diff --git a/contrib/ipfilter/ipsend/sdlpi.c b/contrib/ipfilter/ipsend/sdlpi.c
index 3ff9d4b3c82c..400501755498 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.2 2005/04/25 18:20:11 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 1021acf6d3c0..af505edddf8c 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.2 2005/04/25 18:20:11 darrenr Exp $ */
/*
* (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/snit.c b/contrib/ipfilter/ipsend/snit.c
index b57609b0240c..5c0c7778ceb4 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.2 2005/04/25 18:20:11 darrenr Exp $ */
/*
* (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/sock.c b/contrib/ipfilter/ipsend/sock.c
index 5020a4aaf234..2bdcf7fd8af8 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.15 2005/04/25 18:20:11 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 c6094343fc2e..ce33df8f57db 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.2 2005/04/25 18:20:11 darrenr Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
diff --git a/contrib/ipfilter/ipt.h b/contrib/ipfilter/ipt.h
index 57d8b46e5048..cbf752ae82c6 100644
--- a/contrib/ipfilter/ipt.h
+++ b/contrib/ipfilter/ipt.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipt.h,v 1.2 2005/04/25 18:20:08 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/kmem.h b/contrib/ipfilter/kmem.h
index 38b97b453735..4b2fc6372582 100644
--- a/contrib/ipfilter/kmem.h
+++ b/contrib/ipfilter/kmem.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/kmem.h,v 1.2 2005/04/25 18:20:08 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/l4check/l4check.c b/contrib/ipfilter/l4check/l4check.c
index 5c44a3703e52..3dd0675bd5eb 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 2005/04/25 18:20:12 darrenr Exp $ */
/*
* (C)Copyright March, 2000 - Darren Reed.
diff --git a/contrib/ipfilter/lib/addicmp.c b/contrib/ipfilter/lib/addicmp.c
index eb6e8a7afa59..8e2ec422742f 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/addipopt.c b/contrib/ipfilter/lib/addipopt.c
index e775184777f0..3a3ca8c9d6a9 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/addkeep.c b/contrib/ipfilter/lib/addkeep.c
index 5765c52731ad..c470708da5e3 100644
--- a/contrib/ipfilter/lib/addkeep.c
+++ b/contrib/ipfilter/lib/addkeep.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/addkeep.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/bcopywrap.c b/contrib/ipfilter/lib/bcopywrap.c
index 4c689309a6b9..0252028271eb 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/binprint.c b/contrib/ipfilter/lib/binprint.c
index 6d992182dbc5..a2090747358e 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/buildopts.c b/contrib/ipfilter/lib/buildopts.c
index 92686f60b86a..2facf34f615e 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/checkrev.c b/contrib/ipfilter/lib/checkrev.c
index 882aeb7d58ad..220dfbe3e698 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/count4bits.c b/contrib/ipfilter/lib/count4bits.c
index 56b4c86aea0e..e70157fd8970 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/count6bits.c b/contrib/ipfilter/lib/count6bits.c
index fe1bf4b33b4c..78c21049cbab 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/debug.c b/contrib/ipfilter/lib/debug.c
index 58974c1ea7dd..5dd879864cc1 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/extras.c b/contrib/ipfilter/lib/extras.c
index 5d3c8dcaf3f5..ca90bf340a32 100644
--- a/contrib/ipfilter/lib/extras.c
+++ b/contrib/ipfilter/lib/extras.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/extras.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/facpri.c b/contrib/ipfilter/lib/facpri.c
index 4637916a8be0..213c474ad8e4 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/facpri.h b/contrib/ipfilter/lib/facpri.h
index c902086f4797..e742f055b29b 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1999-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/fill6bits.c b/contrib/ipfilter/lib/fill6bits.c
index 12e657989e4a..cbc459e01777 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/flags.c b/contrib/ipfilter/lib/flags.c
index 543d61b18622..57814dba40c0 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/genmask.c b/contrib/ipfilter/lib/genmask.c
index 178c466ff290..8d14469cf279 100644
--- a/contrib/ipfilter/lib/genmask.c
+++ b/contrib/ipfilter/lib/genmask.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/genmask.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/gethost.c b/contrib/ipfilter/lib/gethost.c
index f9034ccbbee5..e099a431ff2e 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/getifname.c b/contrib/ipfilter/lib/getifname.c
index 35acb32a62c7..6bf8dda4ae12 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/getline.c b/contrib/ipfilter/lib/getline.c
index 137068fa0296..b51de18a3f59 100644
--- a/contrib/ipfilter/lib/getline.c
+++ b/contrib/ipfilter/lib/getline.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/getline.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getnattype.c b/contrib/ipfilter/lib/getnattype.c
index 90d7ba400405..562341cf75af 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getport.c b/contrib/ipfilter/lib/getport.c
index 99e1d4f62600..e301c047c0ea 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/getportproto.c b/contrib/ipfilter/lib/getportproto.c
index 02e3c2041288..93ebc9f2f565 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include <ctype.h>
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/getproto.c b/contrib/ipfilter/lib/getproto.c
index 2581e283765b..eec60b68809e 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/getsumd.c b/contrib/ipfilter/lib/getsumd.c
index 44ff3aa6f331..a78e60bb5d24 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/hexdump.c b/contrib/ipfilter/lib/hexdump.c
index f6cc156910c8..46b962b386b9 100644
--- a/contrib/ipfilter/lib/hexdump.c
+++ b/contrib/ipfilter/lib/hexdump.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/hexdump.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
#include <ctype.h>
diff --git a/contrib/ipfilter/lib/hostmask.c b/contrib/ipfilter/lib/hostmask.c
index b6ea5ad8ec83..57438100c8c9 100644
--- a/contrib/ipfilter/lib/hostmask.c
+++ b/contrib/ipfilter/lib/hostmask.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/hostmask.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/hostname.c b/contrib/ipfilter/lib/hostname.c
index c4950e9ab9e8..062bb2998630 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/hostnum.c b/contrib/ipfilter/lib/hostnum.c
index f517860b2fd3..feb85384c579 100644
--- a/contrib/ipfilter/lib/hostnum.c
+++ b/contrib/ipfilter/lib/hostnum.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/hostnum.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/icmpcode.c b/contrib/ipfilter/lib/icmpcode.c
index c458d284487d..48e80cb7624b 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/inet_addr.c b/contrib/ipfilter/lib/inet_addr.c
index 287e5ff319e6..e5760e514e0f 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* ++Copyright++ 1983, 1990, 1993
diff --git a/contrib/ipfilter/lib/initparse.c b/contrib/ipfilter/lib/initparse.c
index 1f565d259126..3d56672b4e57 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ionames.c b/contrib/ipfilter/lib/ionames.c
index 0f7060b2b958..b1d63e01ac8a 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipf_dotuning.c b/contrib/ipfilter/lib/ipf_dotuning.c
index 3f146d7bb520..b9a3e8634b8b 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.4 2005/06/23 14:19:02 darrenr Exp $ */
#include "ipf.h"
#include "netinet/ipl.h"
diff --git a/contrib/ipfilter/lib/ipft_ef.c b/contrib/ipfilter/lib/ipft_ef.c
index b9a7054d3d73..f0a8c182a92a 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_hx.c b/contrib/ipfilter/lib/ipft_hx.c
index 4e0f98ea2ca5..bbdc0504a6cf 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1995-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_pc.c b/contrib/ipfilter/lib/ipft_pc.c
index 9b7da653e5ed..eb653028f43a 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_sn.c b/contrib/ipfilter/lib/ipft_sn.c
index 61ce875f5736..5d057175be3c 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_td.c b/contrib/ipfilter/lib/ipft_td.c
index e6367ff741dd..6fe4d4057e9d 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_tx.c b/contrib/ipfilter/lib/ipft_tx.c
index 2f9cff93caa2..29416f30da07 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.3 2005/04/26 14:27:12 darrenr Exp $ */
/*
* Copyright (C) 1995-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipoptsec.c b/contrib/ipfilter/lib/ipoptsec.c
index 24a58ac4e5ba..49e8fef3692b 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kmem.c b/contrib/ipfilter/lib/kmem.c
index 789219eeacd8..2425b8c68aaf 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kmem.h b/contrib/ipfilter/lib/kmem.h
index dc29a5290233..1299402e3a2a 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kmemcpywrap.c b/contrib/ipfilter/lib/kmemcpywrap.c
index 4eeb62d17c42..8f2d0c0dbdf5 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
#include "kmem.h"
diff --git a/contrib/ipfilter/lib/kvatoname.c b/contrib/ipfilter/lib/kvatoname.c
index a3764e46fd27..245022a3d9d1 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/load_hash.c b/contrib/ipfilter/lib/load_hash.c
index 4a13624db2bc..6c9964467c31 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_hashnode.c b/contrib/ipfilter/lib/load_hashnode.c
index cf422805ea43..c18bab7d37b4 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_pool.c b/contrib/ipfilter/lib/load_pool.c
index 65ea05d64528..2d06661c4a99 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_poolnode.c b/contrib/ipfilter/lib/load_poolnode.c
index eb1748122e87..306b7cbd7e15 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/loglevel.c b/contrib/ipfilter/lib/loglevel.c
index 4dc875f73517..945572926bac 100644
--- a/contrib/ipfilter/lib/loglevel.c
+++ b/contrib/ipfilter/lib/loglevel.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/loglevel.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/make_range.c b/contrib/ipfilter/lib/make_range.c
index ae576dfde310..20b5d7aef443 100644
--- a/contrib/ipfilter/lib/make_range.c
+++ b/contrib/ipfilter/lib/make_range.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/make_range.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/mutex_emul.c b/contrib/ipfilter/lib/mutex_emul.c
index 10472e589f65..0d2dceb82f38 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/nametokva.c b/contrib/ipfilter/lib/nametokva.c
index b2854d6d7f87..5ed0c56576d4 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/nat_setgroupmap.c b/contrib/ipfilter/lib/nat_setgroupmap.c
index 5c732b1b1439..bb2e8ec78ead 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/natparse.c b/contrib/ipfilter/lib/natparse.c
index de5b3887df4b..9fdd70dcb33c 100644
--- a/contrib/ipfilter/lib/natparse.c
+++ b/contrib/ipfilter/lib/natparse.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/natparse.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ntomask.c b/contrib/ipfilter/lib/ntomask.c
index c95f78fe79ae..cb51ada17f4e 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/optname.c b/contrib/ipfilter/lib/optname.c
index d56c4d57c303..00b7c5b10b73 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optprint.c b/contrib/ipfilter/lib/optprint.c
index 890eb537c6cc..f598afa00081 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optprintv6.c b/contrib/ipfilter/lib/optprintv6.c
index 8f3330582459..2d5b209cd589 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optvalue.c b/contrib/ipfilter/lib/optvalue.c
index b30e030f3af6..1f225e481dd5 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/parse.c b/contrib/ipfilter/lib/parse.c
index 30fc117f3fad..c449b38c1cdb 100644
--- a/contrib/ipfilter/lib/parse.c
+++ b/contrib/ipfilter/lib/parse.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/parse.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/portname.c b/contrib/ipfilter/lib/portname.c
index 0709fc5766ec..1d1bf2f994bf 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/portnum.c b/contrib/ipfilter/lib/portnum.c
index c290c93fb412..8b4ad35fe4cc 100644
--- a/contrib/ipfilter/lib/portnum.c
+++ b/contrib/ipfilter/lib/portnum.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/portnum.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ports.c b/contrib/ipfilter/lib/ports.c
index deee05ea96a3..2e2c28437539 100644
--- a/contrib/ipfilter/lib/ports.c
+++ b/contrib/ipfilter/lib/ports.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/ports.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/print_toif.c b/contrib/ipfilter/lib/print_toif.c
index be6eaec7a565..365f595618b7 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printactivenat.c b/contrib/ipfilter/lib/printactivenat.c
index 78b0ed91d215..08ebe34a0775 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printaps.c b/contrib/ipfilter/lib/printaps.c
index df69a7b0e25d..137af241724f 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printbuf.c b/contrib/ipfilter/lib/printbuf.c
index fa24fbe1620a..93b760e0ffd0 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printfr.c b/contrib/ipfilter/lib/printfr.c
index a7ab1d217303..81d889e7c432 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printfraginfo.c b/contrib/ipfilter/lib/printfraginfo.c
index 461d49748d49..8248860f60d3 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhash.c b/contrib/ipfilter/lib/printhash.c
index fab0659281d8..5cacacc820fd 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhashnode.c b/contrib/ipfilter/lib/printhashnode.c
index b5eda15e0b93..023acb7b951b 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhostmap.c b/contrib/ipfilter/lib/printhostmap.c
index d4ffd443d47b..593581a85f46 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/printhostmask.c b/contrib/ipfilter/lib/printhostmask.c
index 05121c3c7975..72dae1c53070 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printifname.c b/contrib/ipfilter/lib/printifname.c
index 8726e625d5bd..02a6dc5d6595 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printip.c b/contrib/ipfilter/lib/printip.c
index 01b06bd004bc..e5ca2f89d0e4 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printlog.c b/contrib/ipfilter/lib/printlog.c
index c255cf1a65f5..bcba50d3d482 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printmask.c b/contrib/ipfilter/lib/printmask.c
index a477c66c79f0..ee8ecb2880b5 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printnat.c b/contrib/ipfilter/lib/printnat.c
index 09056b110709..d4553e6f0fff 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpacket.c b/contrib/ipfilter/lib/printpacket.c
index 4791b08e84c0..1c78a79b09f1 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpacket6.c b/contrib/ipfilter/lib/printpacket6.c
index 2ddffed67276..542e2115ef63 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/printpool.c b/contrib/ipfilter/lib/printpool.c
index 4bd48aa6bf73..cd860acab92e 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpoolnode.c b/contrib/ipfilter/lib/printpoolnode.c
index ec8ac3e9fffa..7ef2e6bf4000 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printportcmp.c b/contrib/ipfilter/lib/printportcmp.c
index 14854be5254a..c204b187c2ba 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printsbuf.c b/contrib/ipfilter/lib/printsbuf.c
index cfa9171d1f4a..48d208a5408a 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#ifdef IPFILTER_SCAN
diff --git a/contrib/ipfilter/lib/printstate.c b/contrib/ipfilter/lib/printstate.c
index 26920523ac7f..6001358cebbd 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.3 2005/04/28 21:36:30 darrenr Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printtunable.c b/contrib/ipfilter/lib/printtunable.c
index 12e019dbc6c1..2be91f9ea969 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/ratoi.c b/contrib/ipfilter/lib/ratoi.c
index f6f70811cf2c..1323cbdae310 100644
--- a/contrib/ipfilter/lib/ratoi.c
+++ b/contrib/ipfilter/lib/ratoi.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/ratoi.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ratoui.c b/contrib/ipfilter/lib/ratoui.c
index 0a54cebbabbf..77cfebccd568 100644
--- a/contrib/ipfilter/lib/ratoui.c
+++ b/contrib/ipfilter/lib/ratoui.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/ratoui.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_hash.c b/contrib/ipfilter/lib/remove_hash.c
index fc52a0a71370..f099f107352c 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_hashnode.c b/contrib/ipfilter/lib/remove_hashnode.c
index 271c853c116b..1d7627f5adcd 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_pool.c b/contrib/ipfilter/lib/remove_pool.c
index 2663cb828a26..43d51bcf65db 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_poolnode.c b/contrib/ipfilter/lib/remove_poolnode.c
index 5a1d6394c642..8b5f32cef2cc 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/resetlexer.c b/contrib/ipfilter/lib/resetlexer.c
index 19eb161460a7..2fefcbddf046 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/rwlock_emul.c b/contrib/ipfilter/lib/rwlock_emul.c
index d3beb6037b74..2b7eba4d3ce9 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include "ipf.h"
diff --git a/contrib/ipfilter/lib/tcp_flags.c b/contrib/ipfilter/lib/tcp_flags.c
index 7a57124b8acb..0b4eb316ce40 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/tcpflags.c b/contrib/ipfilter/lib/tcpflags.c
index 2e65bdb3d395..c4771e98f8ba 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/tcpoptnames.c b/contrib/ipfilter/lib/tcpoptnames.c
index 7f2dfb628292..afedfe055280 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/to_interface.c b/contrib/ipfilter/lib/to_interface.c
index fb97cee4b99c..133d7f695340 100644
--- a/contrib/ipfilter/lib/to_interface.c
+++ b/contrib/ipfilter/lib/to_interface.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/to_interface.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/v6ionames.c b/contrib/ipfilter/lib/v6ionames.c
index a2ce683e8fa5..47ecd3af941c 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/v6optvalue.c b/contrib/ipfilter/lib/v6optvalue.c
index b81ed7a74f6b..900b00193fdc 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/var.c b/contrib/ipfilter/lib/var.c
index 5f3e0150fba5..76c7e7b68c8e 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.2 2005/04/25 18:20:12 darrenr Exp $ */
#include <ctype.h>
diff --git a/contrib/ipfilter/lib/verbose.c b/contrib/ipfilter/lib/verbose.c
index cc81516f491c..665a3f6d509c 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.2 2005/04/25 18:20:12 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
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 d6b6ac1f8a0c..65199077e6ad 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.9 2005/04/25 18:20:14 darrenr 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 bcf9307e0d91..b495cbedcd8a 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.7 2005/04/25 18:20:14 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 d0cb2a932b44..a01088e499d1 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.10 2005/05/27 01:09:42 eivind 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 df8320af63a8..f8c18727f998 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.6 2005/04/25 18:20:14 darrenr 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 48b2a4122941..173aa85791b2 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.15 2005/04/25 18:20:14 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 210f09abca07..7abd0a7a952d 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.2 2005/04/25 18:20:14 darrenr Exp $
.\"
.TH IPNAT 5
.SH NAME
diff --git a/contrib/ipfilter/man/ipnat.8 b/contrib/ipfilter/man/ipnat.8
index 87f2da5723db..2f0e5b30beb3 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.2 2005/04/25 18:20:14 darrenr Exp $
.\"
.TH IPNAT 8
.SH NAME
diff --git a/contrib/ipfilter/man/ippool.5 b/contrib/ipfilter/man/ippool.5
index 974a0e8981fb..77912ad0c040 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 2005/04/25 18:20:14 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 89a8d47e0214..b2d03b107e2f 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.2 2005/04/25 18:20:14 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 82705312fbed..635c7b216992 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 2005/04/25 18:20:08 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 b5aa0baa9745..681f4626c8a1 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.2 2005/04/25 18:20:08 darrenr 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 6a9494a9edcc..90f2773cdfab 100644
--- a/contrib/ipfilter/opts.h
+++ b/contrib/ipfilter/opts.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/opts.h,v 1.2 2005/04/25 18:20:08 darrenr 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 8bef078dc050..7eee9d7835ad 100644
--- a/contrib/ipfilter/radix.c
+++ b/contrib/ipfilter/radix.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/radix.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $ */
/*
* Copyright (c) 1988, 1989, 1993
diff --git a/contrib/ipfilter/radix_ipf.h b/contrib/ipfilter/radix_ipf.h
index cc046fedb986..5ec3ba8c726b 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.2 2005/04/25 18:20:08 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/rules/example.1 b/contrib/ipfilter/rules/example.1
index 3da9f3ccab5c..646dc88e40e5 100644
--- a/contrib/ipfilter/rules/example.1
+++ b/contrib/ipfilter/rules/example.1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/rules/example.1,v 1.1.1.3 2005/04/25 17:31:24 darrenr Exp $
#
# block all incoming TCP packets on le0 from host 10.1.1.1 to any destination.
#
diff --git a/contrib/ipfilter/rules/example.10 b/contrib/ipfilter/rules/example.10
index f7a0b011e144..fb44d4bb57c7 100644
--- a/contrib/ipfilter/rules/example.10
+++ b/contrib/ipfilter/rules/example.10
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/rules/example.10,v 1.1.1.3 2005/04/25 17:31:24 darrenr Exp $
#
# pass ack packets (ie established connection)
#
diff --git a/contrib/ipfilter/rules/example.11 b/contrib/ipfilter/rules/example.11
index 1cefa9a3b35d..ee1ecc3ad76e 100644
--- a/contrib/ipfilter/rules/example.11
+++ b/contrib/ipfilter/rules/example.11
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/rules/example.11,v 1.1.1.3 2005/04/25 17:31:24 darrenr Exp $
#
# allow any TCP packets from the same subnet as foo is on through to host
# 10.1.1.2 if they are destined for port 6667.
diff --git a/contrib/ipfilter/rules/example.12 b/contrib/ipfilter/rules/example.12
index 6dbaef58c561..b60c6f20a3a6 100644
--- a/contrib/ipfilter/rules/example.12
+++ b/contrib/ipfilter/rules/example.12
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/rules/example.12,v 1.1.1.2 2005/04/25 17:31:24 darrenr Exp $
#
# get rid of all short IP fragments (too small for valid comparison)
#
diff --git a/contrib/ipfilter/rules/example.13 b/contrib/ipfilter/rules/example.13
index ca741148931e..3f4f8c0b78ff 100644
--- a/contrib/ipfilter/rules/example.13
+++ b/contrib/ipfilter/rules/example.13
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/rules/example.13,v 1.1.1.3 2005/04/25 17:31:24 darrenr Exp $
#
# Log all short TCP packets to qe3, with 10.3.3.3 as the intended
# destination for the packet.
diff --git a/contrib/ipfilter/rules/example.2 b/contrib/ipfilter/rules/example.2
index 81e7d25c7c71..bcf297594f8e 100644
--- a/contrib/ipfilter/rules/example.2
+++ b/contrib/ipfilter/rules/example.2
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/rules/example.2,v 1.1.1.4 2005/04/25 17:31:24 darrenr Exp $
#
# block all outgoing TCP packets on le0 from any host to port 23 of
# host 10.1.1.2
diff --git a/contrib/ipfilter/rules/example.3 b/contrib/ipfilter/rules/example.3
index c5b4344f91ce..4b439d64a669 100644
--- a/contrib/ipfilter/rules/example.3
+++ b/contrib/ipfilter/rules/example.3
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/rules/example.3,v 1.1.1.2 2005/04/25 17:31:24 darrenr Exp $
#
# block all inbound packets.
#
diff --git a/contrib/ipfilter/rules/example.4 b/contrib/ipfilter/rules/example.4
index f18dcdd0cd27..78e0c962904d 100644
--- a/contrib/ipfilter/rules/example.4
+++ b/contrib/ipfilter/rules/example.4
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/rules/example.4,v 1.1.1.2 2005/04/25 17:31:24 darrenr Exp $
#
# block all ICMP packets.
#
diff --git a/contrib/ipfilter/rules/example.5 b/contrib/ipfilter/rules/example.5
index 959dfb836371..ae8ec6158ce1 100644
--- a/contrib/ipfilter/rules/example.5
+++ b/contrib/ipfilter/rules/example.5
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/rules/example.5,v 1.1.1.3 2005/04/25 17:31:24 darrenr Exp $
#
# test ruleset
#
diff --git a/contrib/ipfilter/rules/example.6 b/contrib/ipfilter/rules/example.6
index e9ce23ac27e6..271f88eddad5 100644
--- a/contrib/ipfilter/rules/example.6
+++ b/contrib/ipfilter/rules/example.6
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/rules/example.6,v 1.1.1.2 2005/04/25 17:31:24 darrenr Exp $
#
# block all TCP packets with only the SYN flag set (this is the first
# packet sent to establish a connection) out of the SYN-ACK pair.
diff --git a/contrib/ipfilter/rules/example.7 b/contrib/ipfilter/rules/example.7
index 0ddd7f77628b..a9a2d3cfe551 100644
--- a/contrib/ipfilter/rules/example.7
+++ b/contrib/ipfilter/rules/example.7
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/rules/example.7,v 1.1.1.2 2005/04/25 17:31:25 darrenr Exp $
# block all ICMP packets.
#
block in proto icmp all
diff --git a/contrib/ipfilter/rules/example.8 b/contrib/ipfilter/rules/example.8
index 2276b525b17d..5f8924f148c9 100644
--- a/contrib/ipfilter/rules/example.8
+++ b/contrib/ipfilter/rules/example.8
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/rules/example.8,v 1.1.1.2 2005/04/25 17:31:25 darrenr Exp $
#
# block all incoming TCP connections but send back a TCP-RST for ones to
# the ident port
diff --git a/contrib/ipfilter/rules/example.9 b/contrib/ipfilter/rules/example.9
index 50bb46a672d8..34400b5d8fc9 100644
--- a/contrib/ipfilter/rules/example.9
+++ b/contrib/ipfilter/rules/example.9
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/rules/example.9,v 1.1.1.3 2005/04/25 17:31:25 darrenr Exp $
#
# drop all packets without IP security options
#
diff --git a/contrib/ipfilter/rules/example.sr b/contrib/ipfilter/rules/example.sr
index 46fb6f14aaf6..b8cedba4eba8 100644
--- a/contrib/ipfilter/rules/example.sr
+++ b/contrib/ipfilter/rules/example.sr
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/rules/example.sr,v 1.1.1.2 2005/04/25 17:31:25 darrenr Exp $
#
# log all inbound packet on le0 which has IP options present
#
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 c1854b512804..3d740cec1715 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.2 2005/04/25 18:20:15 darrenr Exp $ */
/*
* Sample transparent proxy program.
diff --git a/contrib/ipfilter/samples/relay.c b/contrib/ipfilter/samples/relay.c
index f775cbdc410e..90b0e064457e 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.3 2005/04/26 15:18:45 darrenr 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 97fa767eac38..84a634f0ec35 100644
--- a/contrib/ipfilter/snoop.h
+++ b/contrib/ipfilter/snoop.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/snoop.h,v 1.2 2005/04/25 18:20:08 darrenr 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 e9af9443754b..0f539678873e 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.2 2005/04/25 18:20:15 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipf_y.y b/contrib/ipfilter/tools/ipf_y.y
index 47113c79f017..e4608c26765b 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.3 2005/05/16 16:22:55 darrenr Exp $ */
%{
#include "ipf.h"
diff --git a/contrib/ipfilter/tools/ipfcomp.c b/contrib/ipfilter/tools/ipfcomp.c
index de60f6901315..93044f675bdf 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.2 2005/04/25 18:20:15 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipfs.c b/contrib/ipfilter/tools/ipfs.c
index a587a4261628..aa66f9ade131 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.3 2005/04/26 15:18:45 darrenr Exp $ */
/*
* Copyright (C) 1999-2001, 2003 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipfstat.c b/contrib/ipfilter/tools/ipfstat.c
index 0ce970cb22a2..95e3e05d4085 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.2 2005/04/25 18:20:15 darrenr Exp $ */
/*
* Copyright (C) 1993-2001, 2003 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipftest.c b/contrib/ipfilter/tools/ipftest.c
index 6dbf21fc336c..f2afbe9e7237 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.2 2005/04/25 18:20:15 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipmon.c b/contrib/ipfilter/tools/ipmon.c
index 06ade23a83ee..8e0de6b60fe7 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.4 2005/05/24 21:25:32 cognet Exp $ */
/*
* Copyright (C) 1993-2001, 2003 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipmon_y.y b/contrib/ipfilter/tools/ipmon_y.y
index e1aa81204607..7bebe5dcdddf 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.2 2005/04/25 18:20:15 darrenr Exp $ */
%{
#include "ipf.h"
diff --git a/contrib/ipfilter/tools/ipnat.c b/contrib/ipfilter/tools/ipnat.c
index 7b002812e669..7b199549b964 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.3 2005/04/26 15:18:45 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipnat_y.y b/contrib/ipfilter/tools/ipnat_y.y
index 5f7ec8cf42f1..41dd481e5339 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.2 2005/04/25 18:20:15 darrenr Exp $ */
%{
#ifdef __FreeBSD__
diff --git a/contrib/ipfilter/tools/ippool.c b/contrib/ipfilter/tools/ippool.c
index 5cefc66fd80a..03e2d8b801c3 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.3 2005/04/28 16:26:33 darrenr Exp $ */
/*
* Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ippool_y.y b/contrib/ipfilter/tools/ippool_y.y
index f0ba451a2003..546411e71c73 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.2 2005/04/25 18:20:15 darrenr Exp $ */
%{
#include <sys/types.h>
diff --git a/contrib/ipfilter/tools/ipscan_y.y b/contrib/ipfilter/tools/ipscan_y.y
index af360d446400..4fa6297ae5bb 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.2 2005/04/25 18:20:15 darrenr Exp $ */
%{
#include <sys/types.h>
diff --git a/contrib/ipfilter/tools/ipsyncm.c b/contrib/ipfilter/tools/ipsyncm.c
index da9065ecd1d8..9a5890b714e8 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.2 2005/04/25 18:20:15 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipsyncs.c b/contrib/ipfilter/tools/ipsyncs.c
index cd79e1ac3b48..6a75c1cfb2d4 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.2 2005/04/25 18:20:15 darrenr Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/tools/lex_var.h b/contrib/ipfilter/tools/lex_var.h
index 547ebf310cf3..5bdd6d038548 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.2 2005/04/25 18:20:15 darrenr Exp $ */
extern long string_start;
diff --git a/contrib/ipfilter/tools/lexer.c b/contrib/ipfilter/tools/lexer.c
index 14882e4e5066..db2bad31f998 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.2 2005/04/25 18:20:15 darrenr Exp $ */
/*
* Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/tools/lexer.h b/contrib/ipfilter/tools/lexer.h
index b172c9351866..5e62ac331bc3 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.2 2005/04/25 18:20:15 darrenr Exp $ */
typedef struct wordtab {