aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/amd/FREEBSD-Xlist2
-rw-r--r--contrib/amd/FREEBSD-upgrade2
-rw-r--r--contrib/amd/amd/amd.82
-rw-r--r--contrib/amd/amd/amd.c2
-rw-r--r--contrib/amd/amq/amq.82
-rw-r--r--contrib/amd/amq/pawd.12
-rw-r--r--contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h2
-rw-r--r--contrib/amd/conf/trap/trap_default.h2
-rw-r--r--contrib/amd/fixmount/fixmount.82
-rw-r--r--contrib/amd/fsinfo/fsinfo.82
-rw-r--r--contrib/amd/hlfsd/hlfsd.82
-rw-r--r--contrib/amd/include/am_defs.h2
-rw-r--r--contrib/amd/mk-amd-map/mk-amd-map.82
-rw-r--r--contrib/amd/scripts/amd.conf.52
-rw-r--r--contrib/amd/wire-test/wire-test.82
-rw-r--r--contrib/bc/FREEBSD-upgrade2
-rw-r--r--contrib/bc/bc/main.c2
-rw-r--r--contrib/bc/bc/scan.l2
-rw-r--r--contrib/bc/doc/bc.12
-rw-r--r--contrib/bc/doc/dc.12
-rw-r--r--[-rwxr-xr-x]contrib/bind9/bin/named/convertxsl.pl0
-rwxr-xr-x[-rw-r--r--]contrib/bind9/doc/arm/Bv9ARM.pdf0
-rw-r--r--[-rwxr-xr-x]contrib/bind9/lib/dns/spnego_asn1.pl0
-rw-r--r--contrib/bind9/lib/isc/alpha/include/isc/atomic.h2
-rw-r--r--contrib/bind9/lib/isc/arm/include/isc/atomic.h2
-rw-r--r--contrib/bind9/lib/isc/include/isc/sha2.h2
-rw-r--r--contrib/bind9/lib/isc/sha2.c2
-rw-r--r--contrib/bind9/lib/isc/sparc64/include/isc/atomic.h2
-rw-r--r--contrib/binutils/FREEBSD-Xlist2
-rw-r--r--contrib/binutils/FREEBSD-deletelist2
-rw-r--r--contrib/binutils/FREEBSD-upgrade2
-rw-r--r--contrib/binutils/bfd/elf.c2
-rw-r--r--contrib/binutils/bfd/freebsd.h2
-rw-r--r--contrib/binutils/ld/Makefile.in2
-rw-r--r--[-rwxr-xr-x]contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh0
-rw-r--r--contrib/binutils/ld/emultempl/elf32.em2
-rw-r--r--contrib/binutils/opcodes/ppc-dis.c2
-rw-r--r--contrib/bsnmp/FREEBSD-Xlist2
-rw-r--r--contrib/bsnmp/FREEBSD-upgrade2
-rw-r--r--contrib/bzip2/FREEBSD-Xlist2
-rw-r--r--contrib/bzip2/FREEBSD-upgrade2
-rw-r--r--contrib/bzip2/FREEBSD-vendor2
-rw-r--r--contrib/bzip2/bzlib.c2
-rw-r--r--contrib/com_err/com_err.32
-rw-r--r--contrib/com_err/com_err.c2
-rw-r--r--contrib/com_err/com_err.h2
-rw-r--r--contrib/com_err/com_right.h2
-rw-r--r--contrib/com_err/compile_et.12
-rw-r--r--contrib/com_err/compile_et.c2
-rw-r--r--contrib/com_err/compile_et.h2
-rw-r--r--contrib/com_err/getarg.c2
-rw-r--r--contrib/com_err/lex.l2
-rw-r--r--contrib/com_err/parse.y2
-rw-r--r--contrib/cpio/FREEBSD-upgrade2
-rw-r--r--contrib/cpio/lib/argp.h2
-rw-r--r--contrib/cpio/src/copyin.c2
-rw-r--r--contrib/cpio/src/copyout.c2
-rw-r--r--contrib/cpio/src/copypass.c2
-rw-r--r--contrib/cpio/src/main.c2
-rw-r--r--contrib/cpio/src/tar.c2
-rw-r--r--contrib/cpio/src/userspec.c2
-rw-r--r--contrib/cpio/src/util.c2
-rw-r--r--contrib/csup/GNUmakefile2
-rw-r--r--contrib/csup/Makefile2
-rw-r--r--contrib/csup/README2
-rw-r--r--contrib/csup/TODO2
-rw-r--r--contrib/csup/config.c2
-rw-r--r--contrib/csup/config.h2
-rw-r--r--contrib/csup/csup.12
-rw-r--r--contrib/csup/detailer.c2
-rw-r--r--contrib/csup/detailer.h2
-rw-r--r--contrib/csup/diff.c2
-rw-r--r--contrib/csup/diff.h2
-rw-r--r--contrib/csup/fattr.c2
-rw-r--r--contrib/csup/fattr.h2
-rw-r--r--contrib/csup/fixups.c2
-rw-r--r--contrib/csup/fixups.h2
-rw-r--r--contrib/csup/globtree.c2
-rw-r--r--contrib/csup/globtree.h2
-rw-r--r--contrib/csup/idcache.c2
-rw-r--r--contrib/csup/idcache.h2
-rw-r--r--contrib/csup/keyword.c2
-rw-r--r--contrib/csup/keyword.h2
-rw-r--r--contrib/csup/lex.rcs.c2
-rw-r--r--contrib/csup/lister.c2
-rw-r--r--contrib/csup/lister.h2
-rw-r--r--contrib/csup/main.c2
-rw-r--r--contrib/csup/misc.c2
-rw-r--r--contrib/csup/misc.h2
-rw-r--r--contrib/csup/mux.c2
-rw-r--r--contrib/csup/mux.h2
-rw-r--r--contrib/csup/parse.y2
-rw-r--r--contrib/csup/pathcomp.c2
-rw-r--r--contrib/csup/pathcomp.h2
-rw-r--r--contrib/csup/proto.c2
-rw-r--r--contrib/csup/proto.h2
-rw-r--r--contrib/csup/queue.h4
-rw-r--r--contrib/csup/rcsfile.c2
-rw-r--r--contrib/csup/rcsfile.h2
-rw-r--r--contrib/csup/rcsparse.c2
-rw-r--r--contrib/csup/rcsparse.h2
-rw-r--r--contrib/csup/rcstokenizer.l2
-rw-r--r--contrib/csup/rsyncfile.c2
-rw-r--r--contrib/csup/rsyncfile.h2
-rw-r--r--contrib/csup/status.c2
-rw-r--r--contrib/csup/status.h2
-rw-r--r--contrib/csup/stream.c2
-rw-r--r--contrib/csup/stream.h2
-rw-r--r--contrib/csup/threads.c2
-rw-r--r--contrib/csup/threads.h2
-rw-r--r--contrib/csup/token.h2
-rw-r--r--contrib/csup/token.l2
-rw-r--r--contrib/csup/updater.c2
-rw-r--r--contrib/csup/updater.h2
-rw-r--r--contrib/cvs/FREEBSD-Xlist2
-rw-r--r--contrib/cvs/FREEBSD-upgrade2
-rw-r--r--contrib/cvs/FREEBSD-vendstock2
-rwxr-xr-xcontrib/cvs/contrib/sccs2rcs.in2
-rw-r--r--contrib/cvs/diff/diff3.c2
-rw-r--r--contrib/cvs/lib/md5.h2
-rw-r--r--contrib/cvs/man/cvs.12
-rw-r--r--contrib/cvs/man/cvsbug.82
-rw-r--r--contrib/cvs/src/buffer.c2
-rw-r--r--contrib/cvs/src/checkout.c2
-rw-r--r--contrib/cvs/src/classify.c2
-rw-r--r--contrib/cvs/src/client.c2
-rw-r--r--contrib/cvs/src/commit.c2
-rw-r--r--contrib/cvs/src/cvs.h2
-rw-r--r--contrib/cvs/src/diff.c2
-rw-r--r--contrib/cvs/src/entries.c2
-rw-r--r--contrib/cvs/src/lock.c2
-rw-r--r--contrib/cvs/src/log.c2
-rw-r--r--contrib/cvs/src/logmsg.c2
-rw-r--r--contrib/cvs/src/main.c2
-rw-r--r--contrib/cvs/src/parseinfo.c2
-rw-r--r--contrib/cvs/src/patch.c2
-rw-r--r--contrib/cvs/src/rcs.c2
-rw-r--r--contrib/cvs/src/rcs.h2
-rw-r--r--contrib/cvs/src/rcscmds.c2
-rw-r--r--contrib/cvs/src/server.c2
-rw-r--r--contrib/cvs/src/tag.c2
-rw-r--r--contrib/cvs/src/update.c2
-rw-r--r--contrib/cvs/src/update.h2
-rw-r--r--contrib/diff/FREEBSD-Xlist2
-rw-r--r--contrib/diff/FREEBSD-upgrade2
-rw-r--r--contrib/diff/config.h2
-rw-r--r--[-rwxr-xr-x]contrib/ee/Makefile0
-rw-r--r--[-rwxr-xr-x]contrib/ee/create.make0
-rw-r--r--[-rwxr-xr-x]contrib/ee/ee.c2
-rw-r--r--contrib/ee/ee.msg2
-rw-r--r--[-rwxr-xr-x]contrib/ee/genstr0
-rw-r--r--contrib/expat/FREEBSD-upgrade2
-rw-r--r--[-rwxr-xr-x]contrib/file/compile0
-rwxr-xr-x[-rw-r--r--]contrib/file/magic2mime0
-rw-r--r--contrib/gcc/FREEBSD-Xlist2
-rw-r--r--contrib/gcc/FREEBSD-deletelist2
-rw-r--r--contrib/gcc/FREEBSD-libiberty2
-rw-r--r--contrib/gcc/FREEBSD-upgrade2
-rw-r--r--contrib/gcc/c-decl.c2
-rw-r--r--contrib/gcc/c-format.c2
-rw-r--r--contrib/gcc/c-opts.c2
-rw-r--r--contrib/gcc/c.opt2
-rw-r--r--contrib/gcc/config/freebsd-spec.h2
-rw-r--r--contrib/gcc/config/freebsd.h2
-rw-r--r--contrib/gcc/config/i386/freebsd.h2
-rw-r--r--contrib/gcc/config/i386/freebsd64.h2
-rw-r--r--contrib/gcc/config/i386/i386.c2
-rw-r--r--contrib/gcc/config/i386/x86-64.h2
-rw-r--r--contrib/gcc/config/mips/freebsd.h2
-rw-r--r--contrib/gcc/config/sparc/freebsd.h2
-rw-r--r--contrib/gcc/cp/ptree.c2
-rw-r--r--contrib/gcc/function.c2
-rw-r--r--contrib/gcc/gcc.c2
-rw-r--r--contrib/gcc/opts.c2
-rw-r--r--contrib/gcc/toplev.c2
-rw-r--r--contrib/gcc/version.c2
-rw-r--r--contrib/gdb/FREEBSD-Xlist2
-rw-r--r--contrib/gdb/FREEBSD-upgrade2
-rw-r--r--contrib/gdtoa/gdtoaimp.h2
-rw-r--r--contrib/gdtoa/hexnan.c2
-rw-r--r--contrib/gdtoa/strtod.c2
-rw-r--r--contrib/gdtoa/strtof.c2
-rw-r--r--contrib/gdtoa/strtorQ.c2
-rw-r--r--contrib/gdtoa/strtorx.c2
-rw-r--r--contrib/gnu-sort/FREEBSD-upgrade2
-rw-r--r--contrib/gnu-sort/lib/hard-locale.c2
-rw-r--r--contrib/gnu-sort/lib/version-etc.c2
-rw-r--r--contrib/gnu-sort/src/sort.c2
-rw-r--r--contrib/gperf/FREEBSD-Xlist2
-rw-r--r--contrib/groff/FREEBSD-Xlist2
-rw-r--r--contrib/groff/FREEBSD-upgrade2
-rw-r--r--contrib/groff/src/devices/grotty/grotty.man2
-rw-r--r--contrib/groff/src/libs/libgroff/cmap.cpp2
-rw-r--r--contrib/groff/src/libs/libgroff/cset.cpp2
-rw-r--r--contrib/groff/src/libs/libgroff/invalid.cpp2
-rw-r--r--contrib/groff/src/preproc/eqn/neqn.sh2
-rw-r--r--contrib/groff/src/roff/groff/groff.man2
-rw-r--r--contrib/groff/src/roff/nroff/nroff.man2
-rwxr-xr-xcontrib/groff/src/roff/nroff/nroff.sh2
-rw-r--r--contrib/groff/tmac/eqnrc2
-rw-r--r--contrib/groff/tmac/troffrc2
-rw-r--r--contrib/groff/tmac/tty-char.tmac2
-rw-r--r--contrib/groff/tmac/tty.tmac2
-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/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/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/gethost.c2
-rw-r--r--contrib/ipfilter/lib/getifname.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/hostname.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/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/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/portname.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/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/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/Makefile2
-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/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
-rw-r--r--contrib/less/FREEBSD-upgrade2
-rw-r--r--contrib/less/command.c2
-rw-r--r--contrib/less/forwback.c2
-rw-r--r--contrib/less/less.h2
-rw-r--r--contrib/less/line.c2
-rw-r--r--contrib/less/main.c2
-rw-r--r--contrib/less/prompt.c2
-rw-r--r--contrib/less/screen.c2
-rw-r--r--contrib/less/search.c2
-rw-r--r--contrib/less/signal.c2
-rw-r--r--contrib/libf2c/FREEBSD-upgrade2
-rw-r--r--contrib/libpcap/.cvsignore13
-rw-r--r--contrib/libpcap/FREEBSD-Xlist2
-rw-r--r--contrib/libpcap/FREEBSD-upgrade2
-rw-r--r--[-rwxr-xr-x]contrib/libpcap/chmod_bpf0
-rw-r--r--contrib/libpcap/gencode.c2
-rw-r--r--contrib/libpcap/gencode.h2
-rw-r--r--contrib/libpcap/grammar.y2
-rw-r--r--contrib/libpcap/ieee80211.h2
-rw-r--r--contrib/libpcap/nametoaddr.c2
-rw-r--r--contrib/libpcap/nlpid.h2
-rw-r--r--contrib/libpcap/pcap-bpf.c2
-rw-r--r--contrib/libpcap/pcap-int.h2
-rw-r--r--contrib/libpcap/pcap-namedb.h2
-rw-r--r--contrib/libpcap/pcap.h2
-rw-r--r--[-rwxr-xr-x]contrib/libpcap/runlex.sh0
-rw-r--r--contrib/libpcap/scanner.l2
-rw-r--r--contrib/libreadline/FREEBSD-upgrade2
-rw-r--r--contrib/libreadline/complete.c2
-rw-r--r--contrib/libreadline/display.c2
-rw-r--r--contrib/libreadline/doc/readline.32
-rw-r--r--contrib/libreadline/readline.h2
-rw-r--r--contrib/libreadline/rlconf.h2
-rw-r--r--contrib/libreadline/shell.c2
-rw-r--r--contrib/libreadline/terminal.c2
-rw-r--r--contrib/libreadline/util.c2
-rw-r--r--contrib/libreadline/vi_mode.c2
-rw-r--r--contrib/lukemftpd/src/ftpd.c2
-rw-r--r--contrib/lukemftpd/src/ftpd.conf.52
-rw-r--r--contrib/ncurses/FREEBSD-Xlist2
-rw-r--r--contrib/ncurses/FREEBSD-upgrade2
-rw-r--r--contrib/ncurses/ncurses/tinfo/comp_scan.c2
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_termcap.c2
-rw-r--r--contrib/netcat/FREEBSD-Xlist2
-rw-r--r--contrib/netcat/FREEBSD-upgrade2
-rw-r--r--contrib/netcat/FREEBSD-vendor2
-rw-r--r--contrib/netcat/nc.12
-rw-r--r--contrib/netcat/netcat.c2
-rw-r--r--contrib/ngatm/FREEBSD-Xlist2
-rw-r--r--contrib/ngatm/FREEBSD-upgrade2
-rw-r--r--[-rwxr-xr-x]contrib/ntp/bootstrap0
-rw-r--r--contrib/ntp/libntp/ntp_random.c2
-rw-r--r--contrib/ntp/ntpd/ntp_control.c2
-rw-r--r--[-rwxr-xr-x]contrib/ntp/scripts/VersionName0
-rw-r--r--[-rwxr-xr-x]contrib/ntp/scripts/genCommitLog0
-rw-r--r--[-rwxr-xr-x]contrib/ntp/scripts/genver0
-rw-r--r--[-rwxr-xr-x]contrib/ntp/scripts/html2man.in0
-rw-r--r--[-rwxr-xr-x]contrib/ntp/sntp/compile0
-rw-r--r--contrib/nvi/cl/cl_screen.c2
-rw-r--r--contrib/nvi/common/exf.c2
-rw-r--r--contrib/nvi/docs/USD.doc/vi.man/vi.12
-rw-r--r--contrib/nvi/docs/USD.doc/vi.ref/vi.ref2
-rw-r--r--contrib/nvi/ex/ex.c2
-rw-r--r--contrib/nvi/perl_api/perl.xs2
-rw-r--r--contrib/nvi/vi/vs_line.c2
-rw-r--r--contrib/nvi/vi/vs_refresh.c2
-rw-r--r--contrib/one-true-awk/FREEBSD-upgrade2
-rw-r--r--contrib/openbsm/FREEBSD-upgrade2
-rw-r--r--contrib/openbsm/etc/audit_class2
-rw-r--r--contrib/openbsm/etc/audit_control2
-rw-r--r--contrib/openbsm/etc/audit_event2
-rw-r--r--contrib/openbsm/etc/audit_user2
-rw-r--r--contrib/openbsm/etc/audit_warn2
-rw-r--r--contrib/openpam/FREEBSD-vendor2
-rw-r--r--contrib/opie/ftpcmd.y2
-rw-r--r--contrib/opie/libopie/challenge.c2
-rw-r--r--contrib/opie/libopie/generator.c2
-rw-r--r--contrib/opie/libopie/hash.c2
-rw-r--r--contrib/opie/libopie/hashlen.c2
-rw-r--r--contrib/opie/libopie/insecure.c2
-rw-r--r--contrib/opie/libopie/lock.c2
-rw-r--r--contrib/opie/libopie/newseed.c2
-rw-r--r--contrib/opie/libopie/readrec.c2
-rw-r--r--contrib/opie/libopie/writerec.c2
-rw-r--r--contrib/opie/opie.42
-rw-r--r--contrib/opie/opie.h2
-rw-r--r--contrib/opie/opie_cfg.h2
-rw-r--r--contrib/opie/opieaccess.52
-rw-r--r--contrib/opie/opieftpd.c2
-rw-r--r--contrib/opie/opieinfo.12
-rw-r--r--contrib/opie/opieinfo.c2
-rw-r--r--contrib/opie/opiekey.12
-rw-r--r--contrib/opie/opiekey.c2
-rw-r--r--contrib/opie/opiekeys.52
-rw-r--r--contrib/opie/opiepasswd.12
-rw-r--r--contrib/opie/opiepasswd.c2
-rw-r--r--contrib/opie/popen.c2
-rw-r--r--contrib/pf/authpf/authpf.82
-rw-r--r--contrib/pf/authpf/authpf.c2
-rw-r--r--contrib/pf/ftp-proxy/ftp-proxy.82
-rw-r--r--contrib/pf/ftp-proxy/ftp-proxy.c2
-rw-r--r--contrib/pf/man/pf.42
-rw-r--r--contrib/pf/man/pf.conf.52
-rw-r--r--contrib/pf/man/pf.os.52
-rw-r--r--contrib/pf/man/pflog.42
-rw-r--r--contrib/pf/man/pfsync.42
-rw-r--r--contrib/pf/pfctl/parse.y2
-rw-r--r--contrib/pf/pfctl/pf_print_state.c2
-rw-r--r--contrib/pf/pfctl/pfctl.82
-rw-r--r--contrib/pf/pfctl/pfctl.c2
-rw-r--r--contrib/pf/pfctl/pfctl.h2
-rw-r--r--contrib/pf/pfctl/pfctl_altq.c2
-rw-r--r--contrib/pf/pfctl/pfctl_optimize.c2
-rw-r--r--contrib/pf/pfctl/pfctl_parser.c2
-rw-r--r--contrib/pf/pfctl/pfctl_parser.h2
-rw-r--r--contrib/pf/pfctl/pfctl_qstats.c2
-rw-r--r--contrib/pf/pfctl/pfctl_table.c2
-rw-r--r--contrib/pf/pflogd/pflogd.82
-rw-r--r--contrib/pf/pflogd/pflogd.c2
-rw-r--r--contrib/pf/pflogd/pidfile.c2
-rw-r--r--contrib/pf/pflogd/pidfile.h2
-rw-r--r--contrib/pf/pflogd/privsep.c2
-rw-r--r--contrib/pf/tftp-proxy/filter.c2
-rw-r--r--contrib/pnpinfo/pnpinfo.82
-rw-r--r--contrib/pnpinfo/pnpinfo.c2
-rw-r--r--contrib/pnpinfo/pnpinfo.h2
-rw-r--r--contrib/sendmail/FREEBSD-upgrade2
-rw-r--r--contrib/sendmail/cf/m4/cfhead.m42
-rw-r--r--contrib/sendmail/cf/sh/makeinfo.sh2
-rw-r--r--contrib/sendmail/mail.local/mail.local.82
-rw-r--r--contrib/sendmail/mail.local/mail.local.c2
-rw-r--r--contrib/sendmail/rmail/rmail.c2
-rw-r--r--contrib/sendmail/smrsh/smrsh.82
-rw-r--r--contrib/sendmail/src/sendmail.82
-rw-r--r--contrib/smbfs/FREEBSD-upgrade2
-rw-r--r--contrib/smbfs/examples/dot.nsmbrc2
-rw-r--r--contrib/smbfs/include/netsmb/nb_lib.h2
-rw-r--r--contrib/smbfs/include/netsmb/smb_lib.h2
-rw-r--r--contrib/smbfs/lib/smb/ctx.c2
-rw-r--r--contrib/smbfs/lib/smb/file.c2
-rw-r--r--contrib/smbfs/lib/smb/kiconv.c2
-rw-r--r--contrib/smbfs/lib/smb/mbuf.c2
-rw-r--r--contrib/smbfs/lib/smb/nb.c2
-rw-r--r--contrib/smbfs/lib/smb/nb_name.c2
-rw-r--r--contrib/smbfs/lib/smb/nb_net.c2
-rw-r--r--contrib/smbfs/lib/smb/nbns_rq.c2
-rw-r--r--contrib/smbfs/lib/smb/nls.c2
-rw-r--r--contrib/smbfs/lib/smb/rap.c2
-rw-r--r--contrib/smbfs/lib/smb/rcfile.c2
-rw-r--r--contrib/smbfs/lib/smb/rq.c2
-rw-r--r--contrib/smbfs/mount_smbfs/mount_smbfs.82
-rw-r--r--contrib/smbfs/mount_smbfs/mount_smbfs.c2
-rw-r--r--contrib/smbfs/smbutil/common.h2
-rw-r--r--contrib/smbfs/smbutil/dumptree.c2
-rw-r--r--contrib/smbfs/smbutil/print.c2
-rw-r--r--contrib/smbfs/smbutil/view.c2
-rw-r--r--contrib/tcp_wrappers/Makefile2
-rw-r--r--contrib/tcp_wrappers/fix_options.c2
-rw-r--r--contrib/tcp_wrappers/hosts_access.52
-rw-r--r--contrib/tcp_wrappers/hosts_access.c2
-rw-r--r--contrib/tcp_wrappers/inetcf.c2
-rw-r--r--contrib/tcp_wrappers/misc.c2
-rw-r--r--contrib/tcp_wrappers/options.c2
-rw-r--r--contrib/tcp_wrappers/refuse.c2
-rw-r--r--contrib/tcp_wrappers/rfc931.c2
-rw-r--r--contrib/tcp_wrappers/scaffold.c2
-rw-r--r--contrib/tcp_wrappers/scaffold.h2
-rw-r--r--contrib/tcp_wrappers/socket.c2
-rw-r--r--contrib/tcp_wrappers/tcpd.c2
-rw-r--r--contrib/tcp_wrappers/tcpd.h2
-rw-r--r--contrib/tcp_wrappers/tcpdchk.c2
-rw-r--r--contrib/tcp_wrappers/tcpdmatch.c2
-rw-r--r--contrib/tcp_wrappers/tli.c2
-rw-r--r--contrib/tcp_wrappers/update.c2
-rw-r--r--contrib/tcp_wrappers/workarounds.c2
-rw-r--r--contrib/tcpdump/.cvsignore12
-rw-r--r--contrib/tcpdump/FREEBSD-Xlist2
-rw-r--r--contrib/tcpdump/addrtoname.c2
-rw-r--r--contrib/tcpdump/ethertype.h2
-rw-r--r--contrib/tcpdump/ieee802_11.h2
-rw-r--r--contrib/tcpdump/ieee802_11_radio.h2
-rw-r--r--contrib/tcpdump/interface.h2
-rw-r--r--contrib/tcpdump/ipproto.h2
-rw-r--r--contrib/tcpdump/nfs.h2
-rw-r--r--contrib/tcpdump/nfsfh.h2
-rw-r--r--contrib/tcpdump/parsenfsfh.c2
-rw-r--r--contrib/tcpdump/pmap_prot.h2
-rw-r--r--contrib/tcpdump/ppp.h2
-rw-r--r--contrib/tcpdump/print-802_11.c2
-rw-r--r--contrib/tcpdump/print-arp.c2
-rw-r--r--contrib/tcpdump/print-atalk.c2
-rw-r--r--contrib/tcpdump/print-atm.c2
-rw-r--r--contrib/tcpdump/print-bootp.c2
-rw-r--r--contrib/tcpdump/print-domain.c2
-rw-r--r--contrib/tcpdump/print-ether.c2
-rw-r--r--contrib/tcpdump/print-fddi.c2
-rw-r--r--contrib/tcpdump/print-fr.c2
-rw-r--r--contrib/tcpdump/print-icmp.c2
-rw-r--r--contrib/tcpdump/print-ip.c2
-rw-r--r--contrib/tcpdump/print-ip6.c2
-rw-r--r--contrib/tcpdump/print-ipx.c2
-rw-r--r--contrib/tcpdump/print-isoclns.c2
-rw-r--r--contrib/tcpdump/print-llc.c2
-rw-r--r--contrib/tcpdump/print-nfs.c2
-rw-r--r--contrib/tcpdump/print-ntp.c2
-rw-r--r--contrib/tcpdump/print-null.c2
-rw-r--r--contrib/tcpdump/print-pim.c2
-rw-r--r--contrib/tcpdump/print-ppp.c2
-rw-r--r--contrib/tcpdump/print-sl.c2
-rw-r--r--contrib/tcpdump/print-sunrpc.c2
-rw-r--r--contrib/tcpdump/print-token.c2
-rw-r--r--contrib/tcpdump/print-udp.c2
-rw-r--r--contrib/tcpdump/rpc_auth.h2
-rw-r--r--contrib/tcpdump/rpc_msg.h2
-rw-r--r--contrib/tcpdump/tcpdump-stdinc.h2
-rw-r--r--contrib/tcpdump/tcpdump.12
-rw-r--r--contrib/tcpdump/tcpdump.c2
-rw-r--r--contrib/tcpdump/token.h2
-rw-r--r--contrib/tcsh/FREEBSD-Xlist2
-rw-r--r--contrib/tcsh/FREEBSD-upgrade2
-rw-r--r--contrib/telnet/arpa/telnet.h2
-rw-r--r--contrib/telnet/libtelnet/auth-proto.h2
-rw-r--r--contrib/telnet/libtelnet/auth.c2
-rw-r--r--contrib/telnet/libtelnet/auth.h2
-rw-r--r--contrib/telnet/libtelnet/enc-proto.h2
-rw-r--r--contrib/telnet/libtelnet/enc_des.c2
-rw-r--r--contrib/telnet/libtelnet/encrypt.c2
-rw-r--r--contrib/telnet/libtelnet/encrypt.h2
-rw-r--r--contrib/telnet/libtelnet/genget.c2
-rw-r--r--contrib/telnet/libtelnet/getent.c2
-rw-r--r--contrib/telnet/libtelnet/kerberos.c2
-rw-r--r--contrib/telnet/libtelnet/kerberos5.c2
-rw-r--r--contrib/telnet/libtelnet/key-proto.h2
-rw-r--r--contrib/telnet/libtelnet/krb4encpwd.c2
-rw-r--r--contrib/telnet/libtelnet/misc-proto.h2
-rw-r--r--contrib/telnet/libtelnet/misc.c2
-rw-r--r--contrib/telnet/libtelnet/pk.c2
-rw-r--r--contrib/telnet/libtelnet/pk.h2
-rw-r--r--contrib/telnet/libtelnet/read_password.c2
-rw-r--r--contrib/telnet/libtelnet/rsaencpwd.c2
-rw-r--r--contrib/telnet/libtelnet/sra.c2
-rw-r--r--contrib/telnet/telnet/authenc.c2
-rw-r--r--contrib/telnet/telnet/commands.c2
-rw-r--r--contrib/telnet/telnet/defines.h2
-rw-r--r--contrib/telnet/telnet/externs.h2
-rw-r--r--contrib/telnet/telnet/main.c2
-rw-r--r--contrib/telnet/telnet/network.c2
-rw-r--r--contrib/telnet/telnet/ring.c2
-rw-r--r--contrib/telnet/telnet/ring.h2
-rw-r--r--contrib/telnet/telnet/sys_bsd.c2
-rw-r--r--contrib/telnet/telnet/telnet.12
-rw-r--r--contrib/telnet/telnet/telnet.c2
-rw-r--r--contrib/telnet/telnet/terminal.c2
-rw-r--r--contrib/telnet/telnet/utilities.c2
-rw-r--r--contrib/telnet/telnetd/authenc.c2
-rw-r--r--contrib/telnet/telnetd/defs.h2
-rw-r--r--contrib/telnet/telnetd/ext.h2
-rw-r--r--contrib/telnet/telnetd/global.c2
-rw-r--r--contrib/telnet/telnetd/pathnames.h2
-rw-r--r--contrib/telnet/telnetd/slc.c2
-rw-r--r--contrib/telnet/telnetd/state.c2
-rw-r--r--contrib/telnet/telnetd/sys_term.c2
-rw-r--r--contrib/telnet/telnetd/telnetd.82
-rw-r--r--contrib/telnet/telnetd/telnetd.c2
-rw-r--r--contrib/telnet/telnetd/telnetd.h2
-rw-r--r--contrib/telnet/telnetd/termstat.c2
-rw-r--r--contrib/telnet/telnetd/utility.c2
-rw-r--r--contrib/texinfo/FREEBSD-Xlist2
-rw-r--r--contrib/texinfo/FREEBSD-upgrade2
-rw-r--r--contrib/texinfo/config.h2
-rw-r--r--contrib/texinfo/util/install-info.c2
-rw-r--r--contrib/top/commands.c2
-rw-r--r--contrib/top/display.c2
-rw-r--r--[-rwxr-xr-x]contrib/top/install-sh0
-rw-r--r--contrib/top/layout.h2
-rw-r--r--contrib/top/machine.h2
-rw-r--r--contrib/top/screen.c2
-rw-r--r--contrib/top/sigconv.awk2
-rw-r--r--contrib/top/top.X2
-rw-r--r--contrib/top/top.c2
-rw-r--r--contrib/top/top.h2
-rw-r--r--contrib/top/username.c2
-rw-r--r--contrib/top/utils.c2
-rw-r--r--contrib/traceroute/FREEBSD-upgrade2
-rw-r--r--contrib/traceroute/VERSION2
-rw-r--r--contrib/traceroute/as.c2
-rw-r--r--contrib/traceroute/as.h2
-rw-r--r--contrib/traceroute/findsaddr-socket.c2
-rw-r--r--contrib/traceroute/traceroute.82
-rw-r--r--contrib/traceroute/traceroute.c2
-rw-r--r--[-rwxr-xr-x]contrib/wpa/hostapd/doc/kerneldoc2doxygen.pl0
-rw-r--r--[-rwxr-xr-x]contrib/wpa/hostapd/logwatch/hostapd0
-rw-r--r--[-rwxr-xr-x]contrib/wpa/wpa_supplicant/doc/kerneldoc2doxygen.pl0
-rw-r--r--[-rwxr-xr-x]contrib/wpa/wpa_supplicant/examples/wpas-test.py0
-rw-r--r--[-rwxr-xr-x]contrib/wpa/wpa_supplicant/tests/test_x509v3_nist.sh0
-rw-r--r--[-rwxr-xr-x]contrib/wpa/wpa_supplicant/tests/test_x509v3_nist2.sh0
705 files changed, 673 insertions, 853 deletions
diff --git a/contrib/amd/FREEBSD-Xlist b/contrib/amd/FREEBSD-Xlist
index 2b2484ed0da4..85ac63a92122 100644
--- a/contrib/amd/FREEBSD-Xlist
+++ b/contrib/amd/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*LSM.am-utils
*Makefile.*
*README.autofs
diff --git a/contrib/amd/FREEBSD-upgrade b/contrib/amd/FREEBSD-upgrade
index 701f0cf6ffb8..1f341e47c0b9 100644
--- a/contrib/amd/FREEBSD-upgrade
+++ b/contrib/amd/FREEBSD-upgrade
@@ -1,5 +1,5 @@
# ex:ts=8
-$FreeBSD$
+$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.16.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
AMD (am-utils) 6.1.5
originals can be found at: ftp://ftp.am-utils.org/pub/am-utils/
diff --git a/contrib/amd/amd/amd.8 b/contrib/amd/amd/amd.8
index efd23f617394..9f7754c0df66 100644
--- a/contrib/amd/amd/amd.8
+++ b/contrib/amd/amd/amd.8
@@ -39,7 +39,7 @@
.\" %W% (Berkeley) %G%
.\"
.\" $Id: amd.8,v 1.14.2.1 2006/01/02 18:48:23 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.24.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd January 2, 2006
.Dt AMD 8
diff --git a/contrib/amd/amd/amd.c b/contrib/amd/amd/amd.c
index 3fc25f833dbb..9cc8c594d705 100644
--- a/contrib/amd/amd/amd.c
+++ b/contrib/amd/amd/amd.c
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/amd/amd/amd.c,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
/*
* Automounter
diff --git a/contrib/amd/amq/amq.8 b/contrib/amd/amq/amq.8
index 1faebc692e1f..545c4f6769f5 100644
--- a/contrib/amd/amq/amq.8
+++ b/contrib/amd/amq/amq.8
@@ -39,7 +39,7 @@
.\" %W% (Berkeley) %G%
.\"
.\" $Id: amq.8,v 1.15.2.1 2006/01/02 18:48:24 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.16.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd January 2, 2006
.Dt AMQ 8
diff --git a/contrib/amd/amq/pawd.1 b/contrib/amd/amq/pawd.1
index cdd8ce5d72ca..bfca45b371a4 100644
--- a/contrib/amd/amq/pawd.1
+++ b/contrib/amd/amq/pawd.1
@@ -39,7 +39,7 @@
.\" %W% (Berkeley) %G%
.\"
.\" $Id: pawd.1,v 1.9.2.1 2006/01/02 18:48:24 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/amq/pawd.1,v 1.9.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd January 2, 2006
.Dt PAWD 1
diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
index 4e1e84a42f81..be776f3dfaa6 100644
--- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
+++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
@@ -39,7 +39,7 @@
*
* File: am-utils/conf/nfs_prot/nfs_prot_freebsd3.h
* $Id: nfs_prot_freebsd3.h,v 1.5.2.7 2004/01/06 03:15:19 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*
*/
diff --git a/contrib/amd/conf/trap/trap_default.h b/contrib/amd/conf/trap/trap_default.h
index f671c419959e..18c8fbe1ef5d 100644
--- a/contrib/amd/conf/trap/trap_default.h
+++ b/contrib/amd/conf/trap/trap_default.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/amd/conf/trap/trap_default.h,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* $srcdir/conf/trap/trap_default.h */
#define MOUNT_TRAP(type, mnt, flags, mnt_data) mount(type, mnt->mnt_dir, flags, mnt_data)
diff --git a/contrib/amd/fixmount/fixmount.8 b/contrib/amd/fixmount/fixmount.8
index 07e34d17ef38..cf275c0ce0c8 100644
--- a/contrib/amd/fixmount/fixmount.8
+++ b/contrib/amd/fixmount/fixmount.8
@@ -39,7 +39,7 @@
.\" %W% (Berkeley) %G%
.\"
.\" $Id: fixmount.8,v 1.12.2.1 2006/01/02 18:48:25 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/fixmount/fixmount.8,v 1.16.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd January 2, 2006
.Dt FIXMOUNT 8
diff --git a/contrib/amd/fsinfo/fsinfo.8 b/contrib/amd/fsinfo/fsinfo.8
index c4f817ec9101..f3da466969c1 100644
--- a/contrib/amd/fsinfo/fsinfo.8
+++ b/contrib/amd/fsinfo/fsinfo.8
@@ -34,7 +34,7 @@
.\"
.\" from: @(#)fsinfo.8 8.1 (Berkeley) 6/28/93
.\" $Id: fsinfo.8,v 1.13.2.1 2006/01/02 18:48:25 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.15.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd January 2, 2006
.Dt FSINFO 8
diff --git a/contrib/amd/hlfsd/hlfsd.8 b/contrib/amd/hlfsd/hlfsd.8
index a750320cc2ca..a54bedbdc6d5 100644
--- a/contrib/amd/hlfsd/hlfsd.8
+++ b/contrib/amd/hlfsd/hlfsd.8
@@ -37,7 +37,7 @@
.\" SUCH DAMAGE.
.\"
.\" $Id: hlfsd.8,v 1.11.2.1 2006/01/02 18:48:25 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/hlfsd/hlfsd.8,v 1.17.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.\" HLFSD was written at Columbia University Computer Science Department, by
.\" Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@smarts.com>
diff --git a/contrib/amd/include/am_defs.h b/contrib/amd/include/am_defs.h
index f3767f5b905e..6b75cbd9f205 100644
--- a/contrib/amd/include/am_defs.h
+++ b/contrib/amd/include/am_defs.h
@@ -39,7 +39,7 @@
*
* File: am-utils/include/am_defs.h
* $Id: am_defs.h,v 1.15.2.16 2004/05/12 15:54:31 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/include/am_defs.h,v 1.15.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*
*/
diff --git a/contrib/amd/mk-amd-map/mk-amd-map.8 b/contrib/amd/mk-amd-map/mk-amd-map.8
index 28bbb9b84fe1..791fc3585721 100644
--- a/contrib/amd/mk-amd-map/mk-amd-map.8
+++ b/contrib/amd/mk-amd-map/mk-amd-map.8
@@ -34,7 +34,7 @@
.\"
.\" from: @(#)mk-amd-map.8 8.1 (Berkeley) 6/28/93
.\" $Id: mk-amd-map.8,v 1.9.2.1 2006/01/02 18:48:26 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/mk-amd-map/mk-amd-map.8,v 1.9.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd January 2, 2006
.Dt MK-AMD-MAP 8
diff --git a/contrib/amd/scripts/amd.conf.5 b/contrib/amd/scripts/amd.conf.5
index de913be5f86d..5e669b7f3b61 100644
--- a/contrib/amd/scripts/amd.conf.5
+++ b/contrib/amd/scripts/amd.conf.5
@@ -39,7 +39,7 @@
.\" %W% (Berkeley) %G%
.\"
.\" $Id: amd.conf.5,v 1.39.2.5 2006/04/21 01:12:04 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.20.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd April 21, 2006
.Dt AMD.CONF 5
diff --git a/contrib/amd/wire-test/wire-test.8 b/contrib/amd/wire-test/wire-test.8
index f84dc84cefa4..94236b287c17 100644
--- a/contrib/amd/wire-test/wire-test.8
+++ b/contrib/amd/wire-test/wire-test.8
@@ -39,7 +39,7 @@
.\" %W% (Berkeley) %G%
.\"
.\" $Id: wire-test.8,v 1.10.2.1 2006/01/02 18:48:26 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/wire-test/wire-test.8,v 1.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd January 2, 2006
.Dt WIRE-TEST 8
diff --git a/contrib/bc/FREEBSD-upgrade b/contrib/bc/FREEBSD-upgrade
index 0174d7bbbe92..9a4c8fc55cf7 100644
--- a/contrib/bc/FREEBSD-upgrade
+++ b/contrib/bc/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/bc/FREEBSD-upgrade,v 1.6.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
bc 1.0.5a
originals can be found at: ftp://prep.ai.mit.edu/pub/gnu/
diff --git a/contrib/bc/bc/main.c b/contrib/bc/bc/main.c
index 8ac2981ad719..15c5dac589a7 100644
--- a/contrib/bc/bc/main.c
+++ b/contrib/bc/bc/main.c
@@ -26,7 +26,7 @@
Western Washington University
Bellingham, WA 98226-9062
-$FreeBSD$
+$FreeBSD: src/contrib/bc/bc/main.c,v 1.8.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*************************************************************************/
diff --git a/contrib/bc/bc/scan.l b/contrib/bc/bc/scan.l
index 8910c66f4c8a..a9a62597d2e8 100644
--- a/contrib/bc/bc/scan.l
+++ b/contrib/bc/bc/scan.l
@@ -1,5 +1,5 @@
%{
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/bc/bc/scan.l,v 1.6.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* scan.l: the (f)lex description file for the scanner. */
/* This file is part of GNU bc.
diff --git a/contrib/bc/doc/bc.1 b/contrib/bc/doc/bc.1
index bb19594421f2..1ec88e8cd7f7 100644
--- a/contrib/bc/doc/bc.1
+++ b/contrib/bc/doc/bc.1
@@ -27,7 +27,7 @@
.\" Western Washington University
.\" Bellingham, WA 98226-9062
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/bc/doc/bc.1,v 1.6.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH bc 1 .\" "Command Manual" v1.06 "Sept 12, 2000"
.SH NAME
diff --git a/contrib/bc/doc/dc.1 b/contrib/bc/doc/dc.1
index adaf5d0cc058..aa4764829223 100644
--- a/contrib/bc/doc/dc.1
+++ b/contrib/bc/doc/dc.1
@@ -20,7 +20,7 @@
.\" 59 Temple Place, Suite 330
.\" Boston, MA 02111 USA
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/bc/doc/dc.1,v 1.4.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH DC 1 "1997-03-25" "GNU Project"
.ds dc \fIdc\fP
diff --git a/contrib/bind9/bin/named/convertxsl.pl b/contrib/bind9/bin/named/convertxsl.pl
index 87550b3c1a58..87550b3c1a58 100755..100644
--- a/contrib/bind9/bin/named/convertxsl.pl
+++ b/contrib/bind9/bin/named/convertxsl.pl
diff --git a/contrib/bind9/doc/arm/Bv9ARM.pdf b/contrib/bind9/doc/arm/Bv9ARM.pdf
index b56a05d52962..b56a05d52962 100644..100755
--- a/contrib/bind9/doc/arm/Bv9ARM.pdf
+++ b/contrib/bind9/doc/arm/Bv9ARM.pdf
diff --git a/contrib/bind9/lib/dns/spnego_asn1.pl b/contrib/bind9/lib/dns/spnego_asn1.pl
index 93dd676752df..93dd676752df 100755..100644
--- a/contrib/bind9/lib/dns/spnego_asn1.pl
+++ b/contrib/bind9/lib/dns/spnego_asn1.pl
diff --git a/contrib/bind9/lib/isc/alpha/include/isc/atomic.h b/contrib/bind9/lib/isc/alpha/include/isc/atomic.h
index f60f9fdc174a..4d51356fb673 100644
--- a/contrib/bind9/lib/isc/alpha/include/isc/atomic.h
+++ b/contrib/bind9/lib/isc/alpha/include/isc/atomic.h
@@ -46,7 +46,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/bind9/lib/isc/alpha/include/isc/atomic.h,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef ISC_ATOMIC_H
diff --git a/contrib/bind9/lib/isc/arm/include/isc/atomic.h b/contrib/bind9/lib/isc/arm/include/isc/atomic.h
index 4c519ee815c5..313e2a5bee46 100644
--- a/contrib/bind9/lib/isc/arm/include/isc/atomic.h
+++ b/contrib/bind9/lib/isc/arm/include/isc/atomic.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/bind9/lib/isc/arm/include/isc/atomic.h,v 1.1.1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef ISC_ATOMIC_H
diff --git a/contrib/bind9/lib/isc/include/isc/sha2.h b/contrib/bind9/lib/isc/include/isc/sha2.h
index 211e25505a95..6e93fe1a09b3 100644
--- a/contrib/bind9/lib/isc/include/isc/sha2.h
+++ b/contrib/bind9/lib/isc/include/isc/sha2.h
@@ -16,7 +16,7 @@
/* $Id: sha2.h,v 1.9 2007/06/19 23:47:18 tbox Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/bind9/lib/isc/include/isc/sha2.h,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* $KAME: sha2.h,v 1.3 2001/03/12 08:27:48 itojun Exp $ */
/*
diff --git a/contrib/bind9/lib/isc/sha2.c b/contrib/bind9/lib/isc/sha2.c
index 70eea4f96700..4c5a97931490 100644
--- a/contrib/bind9/lib/isc/sha2.c
+++ b/contrib/bind9/lib/isc/sha2.c
@@ -16,7 +16,7 @@
/* $Id: sha2.c,v 1.13.332.2 2009/01/18 23:47:41 tbox Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/bind9/lib/isc/sha2.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* $KAME: sha2.c,v 1.8 2001/11/08 01:07:52 itojun Exp $ */
/*
diff --git a/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h b/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h
index b92009561593..93d89d302af3 100644
--- a/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h
+++ b/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h
@@ -48,7 +48,7 @@
* SUCH DAMAGE.
*
* from: FreeBSD: src/sys/i386/include/atomic.h,v 1.20 2001/02/11
- * $FreeBSD$
+ * $FreeBSD: src/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef ISC_ATOMIC_H
diff --git a/contrib/binutils/FREEBSD-Xlist b/contrib/binutils/FREEBSD-Xlist
index af18d97b0967..ee8927482475 100644
--- a/contrib/binutils/FREEBSD-Xlist
+++ b/contrib/binutils/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/binutils/FREEBSD-Xlist,v 1.5.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.cvsignore
mkdep
*-hp*
diff --git a/contrib/binutils/FREEBSD-deletelist b/contrib/binutils/FREEBSD-deletelist
index 89020f423b82..59df3d1d6ff8 100644
--- a/contrib/binutils/FREEBSD-deletelist
+++ b/contrib/binutils/FREEBSD-deletelist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/binutils/FREEBSD-deletelist,v 1.6.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
CVS
testsuite
.cvsignore
diff --git a/contrib/binutils/FREEBSD-upgrade b/contrib/binutils/FREEBSD-upgrade
index ab7c24117f74..a9a0fa4af971 100644
--- a/contrib/binutils/FREEBSD-upgrade
+++ b/contrib/binutils/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/binutils/FREEBSD-upgrade,v 1.10.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
To get a copy of the Binutils source from the Sourceware CVS repository
this command line was used:
diff --git a/contrib/binutils/bfd/elf.c b/contrib/binutils/bfd/elf.c
index 2b16f86cd45e..a9bdacfbe754 100644
--- a/contrib/binutils/bfd/elf.c
+++ b/contrib/binutils/bfd/elf.c
@@ -20,7 +20,7 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/binutils/bfd/elf.c,v 1.19.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* SECTION
diff --git a/contrib/binutils/bfd/freebsd.h b/contrib/binutils/bfd/freebsd.h
index 5b0ede1acb56..8516396c4e5e 100644
--- a/contrib/binutils/bfd/freebsd.h
+++ b/contrib/binutils/bfd/freebsd.h
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/binutils/bfd/freebsd.h,v 1.5.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* FreeBSD QMAGIC files have the header in the text. */
#define N_HEADER_IN_TEXT(x) 1
diff --git a/contrib/binutils/ld/Makefile.in b/contrib/binutils/ld/Makefile.in
index 020064b54c39..7a285a078dc7 100644
--- a/contrib/binutils/ld/Makefile.in
+++ b/contrib/binutils/ld/Makefile.in
@@ -11,7 +11,7 @@
# PARTICULAR PURPOSE.
-# $FreeBSD$
+# $FreeBSD: src/contrib/binutils/ld/Makefile.in,v 1.15.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
SHELL = @SHELL@
diff --git a/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh b/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh
index a1281021039d..a1281021039d 100755..100644
--- a/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh
+++ b/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh
diff --git a/contrib/binutils/ld/emultempl/elf32.em b/contrib/binutils/ld/emultempl/elf32.em
index 4a31b48f6598..7db41adbf9c5 100644
--- a/contrib/binutils/ld/emultempl/elf32.em
+++ b/contrib/binutils/ld/emultempl/elf32.em
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/binutils/ld/emultempl/elf32.em,v 1.14.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
# This shell script emits a C file. -*- C -*-
diff --git a/contrib/binutils/opcodes/ppc-dis.c b/contrib/binutils/opcodes/ppc-dis.c
index 9dc586de8c4a..e1ff00e546a3 100644
--- a/contrib/binutils/opcodes/ppc-dis.c
+++ b/contrib/binutils/opcodes/ppc-dis.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/binutils/opcodes/ppc-dis.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* ppc-dis.c -- Disassemble PowerPC instructions
Copyright 1994, 1995, 2000, 2001, 2002, 2003, 2004
Free Software Foundation, Inc.
diff --git a/contrib/bsnmp/FREEBSD-Xlist b/contrib/bsnmp/FREEBSD-Xlist
index 8a5166240e54..8f4af66150ed 100644
--- a/contrib/bsnmp/FREEBSD-Xlist
+++ b/contrib/bsnmp/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/contrib/bsnmp/FREEBSD-Xlist,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/Makefile.in
*/acinclude.m4
*/aclocal.m4
diff --git a/contrib/bsnmp/FREEBSD-upgrade b/contrib/bsnmp/FREEBSD-upgrade
index 4fb31fd9153c..363017d73ac8 100644
--- a/contrib/bsnmp/FREEBSD-upgrade
+++ b/contrib/bsnmp/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/bsnmp/FREEBSD-upgrade,v 1.2.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
This is the Begemot micro-SNMP daemon. It is the base for the ILMI daemon
for ngATM. Be careful to feed changes back to the maintainer
diff --git a/contrib/bzip2/FREEBSD-Xlist b/contrib/bzip2/FREEBSD-Xlist
index 2725621ac285..2ce3a973deb7 100644
--- a/contrib/bzip2/FREEBSD-Xlist
+++ b/contrib/bzip2/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/bzip2/FREEBSD-Xlist,v 1.1.16.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*README.XML.STUFF
*bz-common.xsl
*bz-fo.xsl
diff --git a/contrib/bzip2/FREEBSD-upgrade b/contrib/bzip2/FREEBSD-upgrade
index 48e788a329a4..17dfed1f0520 100644
--- a/contrib/bzip2/FREEBSD-upgrade
+++ b/contrib/bzip2/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
Julian Seward's bzip2
originals can be found at: http://www.bzip.org/downloads.html
diff --git a/contrib/bzip2/FREEBSD-vendor b/contrib/bzip2/FREEBSD-vendor
index 6847c8b9a495..b12d7822a64f 100644
--- a/contrib/bzip2/FREEBSD-vendor
+++ b/contrib/bzip2/FREEBSD-vendor
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/bzip2/FREEBSD-vendor,v 1.1.2.2.2.1 2009/10/25 01:10:29 kensmith Exp $
Project: bzip2
ProjectURL: http://www.bzip.org/
Version: 1.0.5
diff --git a/contrib/bzip2/bzlib.c b/contrib/bzip2/bzlib.c
index 85dc8ffbfd93..2ae7674ead58 100644
--- a/contrib/bzip2/bzlib.c
+++ b/contrib/bzip2/bzlib.c
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include "bzlib_private.h"
diff --git a/contrib/com_err/com_err.3 b/contrib/com_err/com_err.3
index e6eeea13b852..d7fec6f510eb 100644
--- a/contrib/com_err/com_err.3
+++ b/contrib/com_err/com_err.3
@@ -1,7 +1,7 @@
.\" Copyright (c) 1988 Massachusetts Institute of Technology,
.\" Student Information Processing Board. All rights reserved.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/com_err/com_err.3,v 1.1.58.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH COM_ERR 3 "22 Nov 1988" SIPB
.SH NAME
diff --git a/contrib/com_err/com_err.c b/contrib/com_err/com_err.c
index b6ad85b94769..9cac82e1e981 100644
--- a/contrib/com_err/com_err.c
+++ b/contrib/com_err/com_err.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/com_err.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/contrib/com_err/com_err.h b/contrib/com_err/com_err.h
index 22f1d5cdf6ba..9a5174706748 100644
--- a/contrib/com_err/com_err.h
+++ b/contrib/com_err/com_err.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/com_err.h,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* $Id: com_err.h 15566 2005-07-07 14:58:07Z lha $ */
/* MIT compatible com_err library */
diff --git a/contrib/com_err/com_right.h b/contrib/com_err/com_right.h
index 74d386d8adab..7c7bc60103df 100644
--- a/contrib/com_err/com_right.h
+++ b/contrib/com_err/com_right.h
@@ -32,7 +32,7 @@
*/
/* $Id: com_right.h 14551 2005-02-03 08:45:13Z lha $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/com_right.h,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#ifndef __COM_RIGHT_H__
#define __COM_RIGHT_H__
diff --git a/contrib/com_err/compile_et.1 b/contrib/com_err/compile_et.1
index bdc608ba6ddb..9ada36038372 100644
--- a/contrib/com_err/compile_et.1
+++ b/contrib/com_err/compile_et.1
@@ -1,7 +1,7 @@
.\" Copyright (c) 1988 Massachusetts Institute of Technology,
.\" Student Information Processing Board. All rights reserved.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/com_err/compile_et.1,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd November 22, 1988
.Os
diff --git a/contrib/com_err/compile_et.c b/contrib/com_err/compile_et.c
index 1c78325f4528..48992ff9f5b1 100644
--- a/contrib/com_err/compile_et.c
+++ b/contrib/com_err/compile_et.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/compile_et.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#undef ROKEN_RENAME
#include "compile_et.h"
diff --git a/contrib/com_err/compile_et.h b/contrib/com_err/compile_et.h
index 9b9db9c86daf..c30bd50face7 100644
--- a/contrib/com_err/compile_et.h
+++ b/contrib/com_err/compile_et.h
@@ -32,7 +32,7 @@
*/
/* $Id: compile_et.h 15426 2005-06-16 19:21:42Z lha $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/compile_et.h,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#ifndef __COMPILE_ET_H__
#define __COMPILE_ET_H__
diff --git a/contrib/com_err/getarg.c b/contrib/com_err/getarg.c
index 80f76ab4a5ec..7ce6f704c3eb 100644
--- a/contrib/com_err/getarg.c
+++ b/contrib/com_err/getarg.c
@@ -35,7 +35,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/com_err/getarg.c,v 1.2.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#if 0
diff --git a/contrib/com_err/lex.l b/contrib/com_err/lex.l
index 069fc9377d92..3a821be2ce73 100644
--- a/contrib/com_err/lex.l
+++ b/contrib/com_err/lex.l
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/lex.l,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* This is to handle the definition of this symbol in some AIX
diff --git a/contrib/com_err/parse.y b/contrib/com_err/parse.y
index 7e9cf1016ebf..fd0e8fcf7a71 100644
--- a/contrib/com_err/parse.y
+++ b/contrib/com_err/parse.y
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/parse.y,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include "compile_et.h"
#include "lex.h"
diff --git a/contrib/cpio/FREEBSD-upgrade b/contrib/cpio/FREEBSD-upgrade
index a3e31a0592ec..4faa96a7c73c 100644
--- a/contrib/cpio/FREEBSD-upgrade
+++ b/contrib/cpio/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/cpio/FREEBSD-upgrade,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
GNU cpio:
diff --git a/contrib/cpio/lib/argp.h b/contrib/cpio/lib/argp.h
index b5aadcfcac5c..0034d2f7952a 100644
--- a/contrib/cpio/lib/argp.h
+++ b/contrib/cpio/lib/argp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/lib/argp.h,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* Hierarchial argument parsing, layered over getopt.
Copyright (C) 1995-1999,2003-2007 Free Software Foundation, Inc.
diff --git a/contrib/cpio/src/copyin.c b/contrib/cpio/src/copyin.c
index 56591362325b..a1caaab7abe4 100644
--- a/contrib/cpio/src/copyin.c
+++ b/contrib/cpio/src/copyin.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/src/copyin.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* copyin.c - extract or list a cpio archive
Copyright (C) 1990,1991,1992,2001,2002,2003,2004,
diff --git a/contrib/cpio/src/copyout.c b/contrib/cpio/src/copyout.c
index 5e429faa9da8..8481862c44fa 100644
--- a/contrib/cpio/src/copyout.c
+++ b/contrib/cpio/src/copyout.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/src/copyout.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* copyout.c - create a cpio archive
Copyright (C) 1990, 1991, 1992, 2001, 2003, 2004,
diff --git a/contrib/cpio/src/copypass.c b/contrib/cpio/src/copypass.c
index bdcbbeba7409..ba2ffc2d1e8e 100644
--- a/contrib/cpio/src/copypass.c
+++ b/contrib/cpio/src/copypass.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/src/copypass.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* copypass.c - cpio copy pass sub-function.
Copyright (C) 1990, 1991, 1992, 2001, 2003, 2004,
diff --git a/contrib/cpio/src/main.c b/contrib/cpio/src/main.c
index 675f61e18203..a6c58c21ab38 100644
--- a/contrib/cpio/src/main.c
+++ b/contrib/cpio/src/main.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/src/main.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* main.c - main program and argument processing for cpio.
Copyright (C) 1990, 1991, 1992, 2001, 2003, 2004, 2005, 2006
diff --git a/contrib/cpio/src/tar.c b/contrib/cpio/src/tar.c
index 9340372807e7..e9ca964092c2 100644
--- a/contrib/cpio/src/tar.c
+++ b/contrib/cpio/src/tar.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/src/tar.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* tar.c - read in write tar headers for cpio
Copyright (C) 1992, 2001, 2004, 2006 Free Software Foundation, Inc.
diff --git a/contrib/cpio/src/userspec.c b/contrib/cpio/src/userspec.c
index c33d6e2c21d2..d594dacba7c4 100644
--- a/contrib/cpio/src/userspec.c
+++ b/contrib/cpio/src/userspec.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/src/userspec.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* userspec.c -- Parse a user and group string.
Copyright (C) 1989, 1990, 1991, 1992, 2001,
diff --git a/contrib/cpio/src/util.c b/contrib/cpio/src/util.c
index 8773f7521acd..d40c235f1c83 100644
--- a/contrib/cpio/src/util.c
+++ b/contrib/cpio/src/util.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/src/util.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* util.c - Several utility routines for cpio.
Copyright (C) 1990, 1991, 1992, 2001, 2004,
diff --git a/contrib/csup/GNUmakefile b/contrib/csup/GNUmakefile
index 18fb0718f022..c85dc16a369b 100644
--- a/contrib/csup/GNUmakefile
+++ b/contrib/csup/GNUmakefile
@@ -2,7 +2,7 @@
# be used elsewhere because it assumes that the target system doesn't
# support BSD extended file flags.
#
-# $FreeBSD$
+# $FreeBSD: src/contrib/csup/GNUmakefile,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
#
PREFIX?=/usr/local
diff --git a/contrib/csup/Makefile b/contrib/csup/Makefile
index d82a0f1774d3..046bd39ec775 100644
--- a/contrib/csup/Makefile
+++ b/contrib/csup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/csup/Makefile,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
PREFIX?= /usr/local
BINDIR?= ${PREFIX}/bin
diff --git a/contrib/csup/README b/contrib/csup/README
index 879c4811792e..485a433d4aa5 100644
--- a/contrib/csup/README
+++ b/contrib/csup/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/csup/README,v 1.1.1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
Authors
-------
diff --git a/contrib/csup/TODO b/contrib/csup/TODO
index 41b2408766f2..2417f47206cd 100644
--- a/contrib/csup/TODO
+++ b/contrib/csup/TODO
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/csup/TODO,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
BUGS:
diff --git a/contrib/csup/config.c b/contrib/csup/config.c
index 46ae6cd0c160..e857189c3c47 100644
--- a/contrib/csup/config.c
+++ b/contrib/csup/config.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/config.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/types.h>
diff --git a/contrib/csup/config.h b/contrib/csup/config.h
index 78b699547adb..f70e235a3225 100644
--- a/contrib/csup/config.h
+++ b/contrib/csup/config.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/config.h,v 1.1.1.2.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _CONFIG_H_
#define _CONFIG_H_
diff --git a/contrib/csup/csup.1 b/contrib/csup/csup.1
index 4d22fc437e90..6986f55fda46 100644
--- a/contrib/csup/csup.1
+++ b/contrib/csup/csup.1
@@ -22,7 +22,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $Id: cvsup.1,v 1.70 2003/03/04 18:23:46 jdp Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/csup/csup.1,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd February 1, 2006
.Os FreeBSD
diff --git a/contrib/csup/detailer.c b/contrib/csup/detailer.c
index 559265555674..97a12ff907a9 100644
--- a/contrib/csup/detailer.c
+++ b/contrib/csup/detailer.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/detailer.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/csup/detailer.h b/contrib/csup/detailer.h
index fe82b27f6812..0466ed6722b4 100644
--- a/contrib/csup/detailer.h
+++ b/contrib/csup/detailer.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/detailer.h,v 1.1.1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _DETAILER_H_
#define _DETAILER_H_
diff --git a/contrib/csup/diff.c b/contrib/csup/diff.c
index 805967689985..6e3827bd393f 100644
--- a/contrib/csup/diff.c
+++ b/contrib/csup/diff.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/diff.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/limits.h>
diff --git a/contrib/csup/diff.h b/contrib/csup/diff.h
index b0c8c97581eb..0022f37dd842 100644
--- a/contrib/csup/diff.h
+++ b/contrib/csup/diff.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/diff.h,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _DIFF_H_
#define _DIFF_H_
diff --git a/contrib/csup/fattr.c b/contrib/csup/fattr.c
index b141c2c855d4..e2fc4ceaac52 100644
--- a/contrib/csup/fattr.c
+++ b/contrib/csup/fattr.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/fattr.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/time.h>
diff --git a/contrib/csup/fattr.h b/contrib/csup/fattr.h
index bd4e64970fcd..2859c9117b8f 100644
--- a/contrib/csup/fattr.h
+++ b/contrib/csup/fattr.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/fattr.h,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _FATTR_H_
#define _FATTR_H_
diff --git a/contrib/csup/fixups.c b/contrib/csup/fixups.c
index b105a8f7d48f..0b37d0d0fa3a 100644
--- a/contrib/csup/fixups.c
+++ b/contrib/csup/fixups.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/fixups.c,v 1.1.1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/csup/fixups.h b/contrib/csup/fixups.h
index 0dddc905d1a0..f067c678e7f7 100644
--- a/contrib/csup/fixups.h
+++ b/contrib/csup/fixups.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/fixups.h,v 1.1.1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _FIXUPS_H_
#define _FIXUPS_H_
diff --git a/contrib/csup/globtree.c b/contrib/csup/globtree.c
index 74ac2c162ab1..74869811ffd5 100644
--- a/contrib/csup/globtree.c
+++ b/contrib/csup/globtree.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/globtree.c,v 1.1.1.2.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/types.h>
diff --git a/contrib/csup/globtree.h b/contrib/csup/globtree.h
index 43882e3a8f9a..9fb37dd08798 100644
--- a/contrib/csup/globtree.h
+++ b/contrib/csup/globtree.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/globtree.h,v 1.1.1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _GLOBTREE_H_
#define _GLOBTREE_H_
diff --git a/contrib/csup/idcache.c b/contrib/csup/idcache.c
index 47a3e712c147..1616cb1377b2 100644
--- a/contrib/csup/idcache.c
+++ b/contrib/csup/idcache.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/idcache.c,v 1.1.1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/types.h>
diff --git a/contrib/csup/idcache.h b/contrib/csup/idcache.h
index 558af0ce115f..223623d728fa 100644
--- a/contrib/csup/idcache.h
+++ b/contrib/csup/idcache.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/idcache.h,v 1.1.1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _IDCACHE_H_
#define _IDCACHE_H_
diff --git a/contrib/csup/keyword.c b/contrib/csup/keyword.c
index 049a0115382a..1f3f7ffb1e20 100644
--- a/contrib/csup/keyword.c
+++ b/contrib/csup/keyword.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/keyword.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/csup/keyword.h b/contrib/csup/keyword.h
index 033cb0aa6283..85dc2e9eeb4f 100644
--- a/contrib/csup/keyword.h
+++ b/contrib/csup/keyword.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/keyword.h,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _KEYWORD_H_
#define _KEYWORD_H_
diff --git a/contrib/csup/lex.rcs.c b/contrib/csup/lex.rcs.c
index 5db7a7b60887..2e7f44032d4b 100644
--- a/contrib/csup/lex.rcs.c
+++ b/contrib/csup/lex.rcs.c
@@ -552,7 +552,7 @@ static yyconst flex_int16_t yy_chk[327] =
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/lex.rcs.c,v 1.1.4.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*
*/
/*
diff --git a/contrib/csup/lister.c b/contrib/csup/lister.c
index b10dbd3a17e0..f8455e720e9d 100644
--- a/contrib/csup/lister.c
+++ b/contrib/csup/lister.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/lister.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/csup/lister.h b/contrib/csup/lister.h
index a0a9bbe3556b..47bc5aa5edb2 100644
--- a/contrib/csup/lister.h
+++ b/contrib/csup/lister.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/lister.h,v 1.1.1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _LISTER_H_
#define _LISTER_H_
diff --git a/contrib/csup/main.c b/contrib/csup/main.c
index 74150393bc0b..6f21594e9d93 100644
--- a/contrib/csup/main.c
+++ b/contrib/csup/main.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/main.c,v 1.1.1.2.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/file.h>
diff --git a/contrib/csup/misc.c b/contrib/csup/misc.c
index ae16b59589db..1cb9c6bd025a 100644
--- a/contrib/csup/misc.c
+++ b/contrib/csup/misc.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/misc.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/types.h>
diff --git a/contrib/csup/misc.h b/contrib/csup/misc.h
index a7ca3a625ac0..36e557173cce 100644
--- a/contrib/csup/misc.h
+++ b/contrib/csup/misc.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/misc.h,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _MISC_H_
#define _MISC_H_
diff --git a/contrib/csup/mux.c b/contrib/csup/mux.c
index b344be126c30..63dec012ab80 100644
--- a/contrib/csup/mux.c
+++ b/contrib/csup/mux.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/mux.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/param.h>
diff --git a/contrib/csup/mux.h b/contrib/csup/mux.h
index ff36083c3573..f5443502aeea 100644
--- a/contrib/csup/mux.h
+++ b/contrib/csup/mux.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/mux.h,v 1.1.1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _MUX_H_
#define _MUX_H_
diff --git a/contrib/csup/parse.y b/contrib/csup/parse.y
index 3dcd617421a9..27000b7a4575 100644
--- a/contrib/csup/parse.y
+++ b/contrib/csup/parse.y
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/parse.y,v 1.1.1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/types.h>
diff --git a/contrib/csup/pathcomp.c b/contrib/csup/pathcomp.c
index 380d04298542..872afe969ce2 100644
--- a/contrib/csup/pathcomp.c
+++ b/contrib/csup/pathcomp.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/pathcomp.c,v 1.1.1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/csup/pathcomp.h b/contrib/csup/pathcomp.h
index 3cea41052f58..041b17953cb9 100644
--- a/contrib/csup/pathcomp.h
+++ b/contrib/csup/pathcomp.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/pathcomp.h,v 1.1.1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _PATHCOMP_H
#define _PATHCOMP_H
diff --git a/contrib/csup/proto.c b/contrib/csup/proto.c
index 15c12355073c..0f3654eaebf4 100644
--- a/contrib/csup/proto.c
+++ b/contrib/csup/proto.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/proto.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/param.h>
diff --git a/contrib/csup/proto.h b/contrib/csup/proto.h
index 0c4a78299f11..c2d842fe9f43 100644
--- a/contrib/csup/proto.h
+++ b/contrib/csup/proto.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/proto.h,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _PROTO_H_
#define _PROTO_H_
diff --git a/contrib/csup/queue.h b/contrib/csup/queue.h
index aa9cac165fb4..27880a7fa654 100644
--- a/contrib/csup/queue.h
+++ b/contrib/csup/queue.h
@@ -27,9 +27,9 @@
* SUCH DAMAGE.
*
* @(#)queue.h 8.5 (Berkeley) 8/20/94
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/queue.h,v 1.1.1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/queue.h,v 1.1.1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _QUEUE_H_
diff --git a/contrib/csup/rcsfile.c b/contrib/csup/rcsfile.c
index 1f3ede154cf2..f418b9e8a0fb 100644
--- a/contrib/csup/rcsfile.c
+++ b/contrib/csup/rcsfile.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/rcsfile.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/csup/rcsfile.h b/contrib/csup/rcsfile.h
index 5fa9f31cb1a5..18082afff24b 100644
--- a/contrib/csup/rcsfile.h
+++ b/contrib/csup/rcsfile.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/rcsfile.h,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _RCSFILE_H_
diff --git a/contrib/csup/rcsparse.c b/contrib/csup/rcsparse.c
index 5ea690ccde36..f2eb48379bbf 100644
--- a/contrib/csup/rcsparse.c
+++ b/contrib/csup/rcsparse.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/rcsparse.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/csup/rcsparse.h b/contrib/csup/rcsparse.h
index 01b01563d80c..c22338fe9bbc 100644
--- a/contrib/csup/rcsparse.h
+++ b/contrib/csup/rcsparse.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/rcsparse.h,v 1.1.4.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _RCSPARSE_H_
diff --git a/contrib/csup/rcstokenizer.l b/contrib/csup/rcstokenizer.l
index 56f0f41ccf07..d0e887ada196 100644
--- a/contrib/csup/rcstokenizer.l
+++ b/contrib/csup/rcstokenizer.l
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/rcstokenizer.l,v 1.1.4.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/csup/rsyncfile.c b/contrib/csup/rsyncfile.c
index 7680bccf0ae7..688852efbc8f 100644
--- a/contrib/csup/rsyncfile.c
+++ b/contrib/csup/rsyncfile.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/rsyncfile.c,v 1.1.4.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <errno.h>
diff --git a/contrib/csup/rsyncfile.h b/contrib/csup/rsyncfile.h
index 2c41a28ee4d2..094e0b2defc4 100644
--- a/contrib/csup/rsyncfile.h
+++ b/contrib/csup/rsyncfile.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/rsyncfile.h,v 1.1.4.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _RSYNCFILE_H_
diff --git a/contrib/csup/status.c b/contrib/csup/status.c
index 3482e8ee7be1..12108684cdb8 100644
--- a/contrib/csup/status.c
+++ b/contrib/csup/status.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/status.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/csup/status.h b/contrib/csup/status.h
index 86efdda0e38c..7d76c5392dee 100644
--- a/contrib/csup/status.h
+++ b/contrib/csup/status.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/status.h,v 1.1.1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _STATUS_H_
#define _STATUS_H_
diff --git a/contrib/csup/stream.c b/contrib/csup/stream.c
index aa229b497164..4b1b36d12822 100644
--- a/contrib/csup/stream.c
+++ b/contrib/csup/stream.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/stream.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/types.h>
diff --git a/contrib/csup/stream.h b/contrib/csup/stream.h
index 212863572849..698cf8fdceb6 100644
--- a/contrib/csup/stream.h
+++ b/contrib/csup/stream.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/stream.h,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _STREAM_H_
#define _STREAM_H_
diff --git a/contrib/csup/threads.c b/contrib/csup/threads.c
index 46a98606f282..4ee63a993da5 100644
--- a/contrib/csup/threads.c
+++ b/contrib/csup/threads.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/threads.c,v 1.1.1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/csup/threads.h b/contrib/csup/threads.h
index 66153ce5589d..c610b50608ca 100644
--- a/contrib/csup/threads.h
+++ b/contrib/csup/threads.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/threads.h,v 1.1.1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _THREADS_H_
#define _THREADS_H_
diff --git a/contrib/csup/token.h b/contrib/csup/token.h
index 0dc3ec03fbef..f4c1a4e6f1e7 100644
--- a/contrib/csup/token.h
+++ b/contrib/csup/token.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/token.h,v 1.1.1.2.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _TOKEN_H_
#define _TOKEN_H_
diff --git a/contrib/csup/token.l b/contrib/csup/token.l
index 267e61feff89..0a1f2d240b9b 100644
--- a/contrib/csup/token.l
+++ b/contrib/csup/token.l
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/token.l,v 1.1.1.2.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <err.h>
diff --git a/contrib/csup/updater.c b/contrib/csup/updater.c
index d9f4210b390b..df6522da7b20 100644
--- a/contrib/csup/updater.c
+++ b/contrib/csup/updater.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/updater.c,v 1.7.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/types.h>
diff --git a/contrib/csup/updater.h b/contrib/csup/updater.h
index 9ec9ed7c0945..baa6b149c47f 100644
--- a/contrib/csup/updater.h
+++ b/contrib/csup/updater.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/updater.h,v 1.1.1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _UPDATER_H_
#define _UPDATER_H
diff --git a/contrib/cvs/FREEBSD-Xlist b/contrib/cvs/FREEBSD-Xlist
index f598106742f9..17e84a7eab61 100644
--- a/contrib/cvs/FREEBSD-Xlist
+++ b/contrib/cvs/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/cvs/FREEBSD-Xlist,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/*.com
*/*.dep
*/*.dsp
diff --git a/contrib/cvs/FREEBSD-upgrade b/contrib/cvs/FREEBSD-upgrade
index 67b13c20f3de..a990ad50afad 100644
--- a/contrib/cvs/FREEBSD-upgrade
+++ b/contrib/cvs/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.12.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
MAINTAINER= peter@FreeBSD.org
diff --git a/contrib/cvs/FREEBSD-vendstock b/contrib/cvs/FREEBSD-vendstock
index 7d15f116593f..152e6847fb16 100644
--- a/contrib/cvs/FREEBSD-vendstock
+++ b/contrib/cvs/FREEBSD-vendstock
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/cvs/FREEBSD-vendstock,v 1.1.4.1.2.1 2009/10/25 01:10:29 kensmith Exp $
src/buffer.c
src/commit.c
src/filesubr.c
diff --git a/contrib/cvs/contrib/sccs2rcs.in b/contrib/cvs/contrib/sccs2rcs.in
index 3be8e53d81ff..d86ae76dbbfb 100755
--- a/contrib/cvs/contrib/sccs2rcs.in
+++ b/contrib/cvs/contrib/sccs2rcs.in
@@ -60,7 +60,7 @@
# -Allan G. Schrum schrum@ofsoptics.com agschrum@mindspring.com
# Fri Sep 26 10:40:40 EDT 2003
#
-# $FreeBSD$
+# $FreeBSD: src/contrib/cvs/contrib/sccs2rcs.in,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
#we'll assume the user set up the path correctly
diff --git a/contrib/cvs/diff/diff3.c b/contrib/cvs/diff/diff3.c
index 109e66ee021c..e22c69535aed 100644
--- a/contrib/cvs/diff/diff3.c
+++ b/contrib/cvs/diff/diff3.c
@@ -13,7 +13,7 @@
*/
/*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/diff/diff3.c,v 1.6.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/* Written by Randy Smith */
diff --git a/contrib/cvs/lib/md5.h b/contrib/cvs/lib/md5.h
index 3b5ba05891f2..2d61a32071f4 100644
--- a/contrib/cvs/lib/md5.h
+++ b/contrib/cvs/lib/md5.h
@@ -1,7 +1,7 @@
/* See md5.c for explanation and copyright information. */
/*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/lib/md5.h,v 1.2.56.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef MD5_H
diff --git a/contrib/cvs/man/cvs.1 b/contrib/cvs/man/cvs.1
index 02355c26a7a3..072a6199762e 100644
--- a/contrib/cvs/man/cvs.1
+++ b/contrib/cvs/man/cvs.1
@@ -1,5 +1,5 @@
\fBimport\fR.
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/cvs/man/cvs.1,v 1.23.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.de Id
.ds Rv \\$3
.ds Dt \\$4
diff --git a/contrib/cvs/man/cvsbug.8 b/contrib/cvs/man/cvsbug.8
index 460ca4640d95..397e26a8a23b 100644
--- a/contrib/cvs/man/cvsbug.8
+++ b/contrib/cvs/man/cvsbug.8
@@ -17,7 +17,7 @@
.\" General Public License for more details.
.\"
.\" ---------------------------------------------------------------------------
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/cvs/man/cvsbug.8,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.nh
.TH CVSBUG 8 xVERSIONx "February 1993"
.SH NAME
diff --git a/contrib/cvs/src/buffer.c b/contrib/cvs/src/buffer.c
index db2bea0d663d..890687af6c0e 100644
--- a/contrib/cvs/src/buffer.c
+++ b/contrib/cvs/src/buffer.c
@@ -14,7 +14,7 @@
/* Code for the buffer data structure. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cvs/src/buffer.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include <assert.h>
#include "cvs.h"
diff --git a/contrib/cvs/src/checkout.c b/contrib/cvs/src/checkout.c
index a1cd6cc9fe2e..bf3059af2965 100644
--- a/contrib/cvs/src/checkout.c
+++ b/contrib/cvs/src/checkout.c
@@ -39,7 +39,7 @@
*/
/*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/checkout.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/cvs/src/classify.c b/contrib/cvs/src/classify.c
index 28d7263e2a13..78df1bb984a4 100644
--- a/contrib/cvs/src/classify.c
+++ b/contrib/cvs/src/classify.c
@@ -13,7 +13,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/cvs/src/classify.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include "cvs.h"
diff --git a/contrib/cvs/src/client.c b/contrib/cvs/src/client.c
index 1c8a5d0971e6..3d83c73ab6e1 100644
--- a/contrib/cvs/src/client.c
+++ b/contrib/cvs/src/client.c
@@ -11,7 +11,7 @@
GNU General Public License for more details. */
/*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/client.c,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifdef HAVE_CONFIG_H
diff --git a/contrib/cvs/src/commit.c b/contrib/cvs/src/commit.c
index b3ba47b38dbe..6485fbfb058d 100644
--- a/contrib/cvs/src/commit.c
+++ b/contrib/cvs/src/commit.c
@@ -17,7 +17,7 @@
*
* The call is: cvs commit [options] files...
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/commit.c,v 1.16.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/cvs/src/cvs.h b/contrib/cvs/src/cvs.h
index 4b7d9f5f63e9..e334732093e8 100644
--- a/contrib/cvs/src/cvs.h
+++ b/contrib/cvs/src/cvs.h
@@ -14,7 +14,7 @@
/*
* basic information used in all source files
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/cvs.h,v 1.23.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
diff --git a/contrib/cvs/src/diff.c b/contrib/cvs/src/diff.c
index 8a61f9a2e00a..5cbb351563b5 100644
--- a/contrib/cvs/src/diff.c
+++ b/contrib/cvs/src/diff.c
@@ -18,7 +18,7 @@
* Without any file arguments, runs diff against all the currently modified
* files.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/diff.c,v 1.22.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/cvs/src/entries.c b/contrib/cvs/src/entries.c
index 9592c3c637ad..fd3ee7a78a28 100644
--- a/contrib/cvs/src/entries.c
+++ b/contrib/cvs/src/entries.c
@@ -17,7 +17,7 @@
*/
/*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/entries.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "cvs.h"
#include "getline.h"
diff --git a/contrib/cvs/src/lock.c b/contrib/cvs/src/lock.c
index d8e78fa38e2b..d4ee5c4ae3ab 100644
--- a/contrib/cvs/src/lock.c
+++ b/contrib/cvs/src/lock.c
@@ -14,7 +14,7 @@
*
* Lock file support for CVS.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/lock.c,v 1.15.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/* The node Concurrency in doc/cvs.texinfo has a brief introduction to
diff --git a/contrib/cvs/src/log.c b/contrib/cvs/src/log.c
index 0bf44c756fd0..ad5bd7409796 100644
--- a/contrib/cvs/src/log.c
+++ b/contrib/cvs/src/log.c
@@ -16,7 +16,7 @@
* argument, prints the log information for all the files in the directory
* (recursive by default).
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/log.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "cvs.h"
diff --git a/contrib/cvs/src/logmsg.c b/contrib/cvs/src/logmsg.c
index 6878aaf8c256..6840e61689bb 100644
--- a/contrib/cvs/src/logmsg.c
+++ b/contrib/cvs/src/logmsg.c
@@ -10,7 +10,7 @@
* You may distribute under the terms of the GNU General Public License as
* specified in the README file that comes with the CVS source distribution.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/logmsg.c,v 1.13.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/cvs/src/main.c b/contrib/cvs/src/main.c
index 332946a3ecd3..ed166cb31a5b 100644
--- a/contrib/cvs/src/main.c
+++ b/contrib/cvs/src/main.c
@@ -15,7 +15,7 @@
* Credit to Dick Grune, Vrije Universiteit, Amsterdam, for writing
* the shell-script CVS system that this is based on.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/main.c,v 1.27.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/cvs/src/parseinfo.c b/contrib/cvs/src/parseinfo.c
index bf1e095fdd10..1160b3c3cb92 100644
--- a/contrib/cvs/src/parseinfo.c
+++ b/contrib/cvs/src/parseinfo.c
@@ -10,7 +10,7 @@
* You may distribute under the terms of the GNU General Public License as
* specified in the README file that comes with the CVS source distribution.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "cvs.h"
diff --git a/contrib/cvs/src/patch.c b/contrib/cvs/src/patch.c
index 65f5051ea7c6..60f049c52051 100644
--- a/contrib/cvs/src/patch.c
+++ b/contrib/cvs/src/patch.c
@@ -16,7 +16,7 @@
* current head of a module, or between two releases. Can specify the
* release as either a date or a revision number.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/patch.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/cvs/src/rcs.c b/contrib/cvs/src/rcs.c
index 3358e9142b1e..2f50119b8c7f 100644
--- a/contrib/cvs/src/rcs.c
+++ b/contrib/cvs/src/rcs.c
@@ -13,7 +13,7 @@
* The routines contained in this file do all the rcs file parsing and
* manipulation
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/rcs.c,v 1.30.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/cvs/src/rcs.h b/contrib/cvs/src/rcs.h
index 08b8a5f0698a..ebcfacf204bf 100644
--- a/contrib/cvs/src/rcs.h
+++ b/contrib/cvs/src/rcs.h
@@ -12,7 +12,7 @@
*
* RCS source control definitions needed by rcs.c and friends
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/rcs.h,v 1.12.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/* Strings which indicate a conflict if they occur at the start of a line. */
diff --git a/contrib/cvs/src/rcscmds.c b/contrib/cvs/src/rcscmds.c
index 18182ffce86c..323ac7ce4c74 100644
--- a/contrib/cvs/src/rcscmds.c
+++ b/contrib/cvs/src/rcscmds.c
@@ -13,7 +13,7 @@
* The functions in this file provide an interface for performing
* operations directly on RCS files.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/rcscmds.c,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "cvs.h"
diff --git a/contrib/cvs/src/server.c b/contrib/cvs/src/server.c
index cace89d50437..bcd283fe05dc 100644
--- a/contrib/cvs/src/server.c
+++ b/contrib/cvs/src/server.c
@@ -9,7 +9,7 @@
GNU General Public License for more details. */
/*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/server.c,v 1.26.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <assert.h>
diff --git a/contrib/cvs/src/tag.c b/contrib/cvs/src/tag.c
index 43451ce32939..cbb54083f231 100644
--- a/contrib/cvs/src/tag.c
+++ b/contrib/cvs/src/tag.c
@@ -16,7 +16,7 @@
* Tag uses the checked out revision in the current directory, rtag uses
* the modules database, if necessary.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/tag.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "cvs.h"
diff --git a/contrib/cvs/src/update.c b/contrib/cvs/src/update.c
index f2c80874345a..3fdbc62a6730 100644
--- a/contrib/cvs/src/update.c
+++ b/contrib/cvs/src/update.c
@@ -37,7 +37,7 @@
* directories added to the repository are automatically created and updated
* as well.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/update.c,v 1.16.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "cvs.h"
diff --git a/contrib/cvs/src/update.h b/contrib/cvs/src/update.h
index c886b4c8f1b7..4b98634f92e7 100644
--- a/contrib/cvs/src/update.h
+++ b/contrib/cvs/src/update.h
@@ -11,7 +11,7 @@
GNU General Public License for more details. */
/*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/update.h,v 1.3.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
int do_update PROTO((int argc, char *argv[], char *xoptions, char *xtag,
diff --git a/contrib/diff/FREEBSD-Xlist b/contrib/diff/FREEBSD-Xlist
index 64e22743e7af..03805a107490 100644
--- a/contrib/diff/FREEBSD-Xlist
+++ b/contrib/diff/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/diff/FREEBSD-Xlist,v 1.2.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
INSTALL
Makefile.am
diff --git a/contrib/diff/FREEBSD-upgrade b/contrib/diff/FREEBSD-upgrade
index 61ad0c9435bf..92865d0bfe2d 100644
--- a/contrib/diff/FREEBSD-upgrade
+++ b/contrib/diff/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/diff/FREEBSD-upgrade,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
Import of GNU diff 2.8.7
Original source available as ftp://alpha.gnu.org/pub/gnu/diffutils/diffutils-2.8.7.tar.gz
diff --git a/contrib/diff/config.h b/contrib/diff/config.h
index ce405203c2b2..81d9b9af11bb 100644
--- a/contrib/diff/config.h
+++ b/contrib/diff/config.h
@@ -1,7 +1,7 @@
/* config.h. Generated by configure. */
/* config.hin. Generated from configure.ac by autoheader. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/diff/config.h,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* Define to 1 if the `closedir' function returns void instead of `int'. */
/* #undef CLOSEDIR_VOID */
diff --git a/contrib/ee/Makefile b/contrib/ee/Makefile
index a6525ea57170..a6525ea57170 100755..100644
--- a/contrib/ee/Makefile
+++ b/contrib/ee/Makefile
diff --git a/contrib/ee/create.make b/contrib/ee/create.make
index 5d6ec30624bb..5d6ec30624bb 100755..100644
--- a/contrib/ee/create.make
+++ b/contrib/ee/create.make
diff --git a/contrib/ee/ee.c b/contrib/ee/ee.c
index 070bb9781fe6..029969a65559 100755..100644
--- a/contrib/ee/ee.c
+++ b/contrib/ee/ee.c
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/ee/ee.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
char *ee_copyright_message =
"Copyright (c) 1986, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2009 Hugh Mahon ";
diff --git a/contrib/ee/ee.msg b/contrib/ee/ee.msg
index 28fa542b50c8..40956b82bfcd 100644
--- a/contrib/ee/ee.msg
+++ b/contrib/ee/ee.msg
@@ -4,7 +4,7 @@ $
$ For ee patchlevel 3
$
$ $Header: /home/hugh/sources/old_ae/RCS/ee.msg,v 1.8 1996/11/30 03:23:40 hugh Exp $
-$ $FreeBSD$
+$ $FreeBSD: src/contrib/ee/ee.msg,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
$
$
$set 1
diff --git a/contrib/ee/genstr b/contrib/ee/genstr
index 429f9602f615..429f9602f615 100755..100644
--- a/contrib/ee/genstr
+++ b/contrib/ee/genstr
diff --git a/contrib/expat/FREEBSD-upgrade b/contrib/expat/FREEBSD-upgrade
index b4a5b8e92f8b..0a811c43471c 100644
--- a/contrib/expat/FREEBSD-upgrade
+++ b/contrib/expat/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/expat/FREEBSD-upgrade,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
eXpat from www.libexpat.org
diff --git a/contrib/file/compile b/contrib/file/compile
index 1b1d23216958..1b1d23216958 100755..100644
--- a/contrib/file/compile
+++ b/contrib/file/compile
diff --git a/contrib/file/magic2mime b/contrib/file/magic2mime
index 26f84d28a160..26f84d28a160 100644..100755
--- a/contrib/file/magic2mime
+++ b/contrib/file/magic2mime
diff --git a/contrib/gcc/FREEBSD-Xlist b/contrib/gcc/FREEBSD-Xlist
index 96080bc59e23..a2e60aafe2bf 100644
--- a/contrib/gcc/FREEBSD-Xlist
+++ b/contrib/gcc/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/gcc/FREEBSD-Xlist,v 1.3.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*.brik
*FAQ
*contrib
diff --git a/contrib/gcc/FREEBSD-deletelist b/contrib/gcc/FREEBSD-deletelist
index f5bc81750db9..321f4a1d3184 100644
--- a/contrib/gcc/FREEBSD-deletelist
+++ b/contrib/gcc/FREEBSD-deletelist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gcc/FREEBSD-deletelist,v 1.5.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
CVS
.cvsignore
ABOUT*NLS
diff --git a/contrib/gcc/FREEBSD-libiberty b/contrib/gcc/FREEBSD-libiberty
index 1b8c24940c4b..e21f21e16514 100644
--- a/contrib/gcc/FREEBSD-libiberty
+++ b/contrib/gcc/FREEBSD-libiberty
@@ -1,6 +1,6 @@
#! /bin/sh
-# $FreeBSD$
+# $FreeBSD: src/contrib/gcc/FREEBSD-libiberty,v 1.2.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
for F in \
choose-temp.c \
diff --git a/contrib/gcc/FREEBSD-upgrade b/contrib/gcc/FREEBSD-upgrade
index 922f8eb4d0d0..c80bf63948b4 100644
--- a/contrib/gcc/FREEBSD-upgrade
+++ b/contrib/gcc/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gcc/FREEBSD-upgrade,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
tar -xvjf gcc-3.0.2.tar.bz2 -X FREEBSD-Xlist
diff --git a/contrib/gcc/c-decl.c b/contrib/gcc/c-decl.c
index 64a6fa8fb85a..a9376be46390 100644
--- a/contrib/gcc/c-decl.c
+++ b/contrib/gcc/c-decl.c
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING. If not, write to the Free
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/c-decl.c,v 1.17.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* Merged C99 inline changes from gcc trunk 122565 2007-03-05 */
/* Fixed problems with compiling inline-25.c and inline-26.c */
/* XXX still fails inline-29.c, inline-31.c, and inline-32.c */
diff --git a/contrib/gcc/c-format.c b/contrib/gcc/c-format.c
index cc3f9be7ae40..b96be29254e0 100644
--- a/contrib/gcc/c-format.c
+++ b/contrib/gcc/c-format.c
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING. If not, write to the Free
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/c-format.c,v 1.11.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include "config.h"
#include "system.h"
diff --git a/contrib/gcc/c-opts.c b/contrib/gcc/c-opts.c
index 3e89ec290201..bb38a65ebafb 100644
--- a/contrib/gcc/c-opts.c
+++ b/contrib/gcc/c-opts.c
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING. If not, write to the Free
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/c-opts.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* Merged C99 inline changes from gcc trunk 122565 2007-03-05 */
#include "config.h"
diff --git a/contrib/gcc/c.opt b/contrib/gcc/c.opt
index 876965754097..8747effffd01 100644
--- a/contrib/gcc/c.opt
+++ b/contrib/gcc/c.opt
@@ -20,7 +20,7 @@
; See the GCC internals manual for a description of this file's format.
-; $FreeBSD$
+; $FreeBSD: src/contrib/gcc/c.opt,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
; Please try to keep this file in ASCII collating order.
Language
diff --git a/contrib/gcc/config/freebsd-spec.h b/contrib/gcc/config/freebsd-spec.h
index 06735c8874e1..e60595dbb5f6 100644
--- a/contrib/gcc/config/freebsd-spec.h
+++ b/contrib/gcc/config/freebsd-spec.h
@@ -18,7 +18,7 @@ along with GCC; see the file COPYING. If not, write to
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.26.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* Common FreeBSD configuration.
All FreeBSD architectures should include this file, which will specify
diff --git a/contrib/gcc/config/freebsd.h b/contrib/gcc/config/freebsd.h
index 8eb434e7edc4..3950e0975520 100644
--- a/contrib/gcc/config/freebsd.h
+++ b/contrib/gcc/config/freebsd.h
@@ -26,7 +26,7 @@ Boston, MA 02110-1301, USA. */
Further work by David O'Brien <obrien@FreeBSD.org> and
Loren J. Rittle <ljrittle@acm.org>. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/freebsd.h,v 1.42.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* In case we need to know. */
#define USING_CONFIG_FREEBSD 1
diff --git a/contrib/gcc/config/i386/freebsd.h b/contrib/gcc/config/i386/freebsd.h
index 53de63ffbb89..ab9c12b7cebf 100644
--- a/contrib/gcc/config/i386/freebsd.h
+++ b/contrib/gcc/config/i386/freebsd.h
@@ -22,7 +22,7 @@ along with GCC; see the file COPYING. If not, write to
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.76.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#undef CC1_SPEC
#define CC1_SPEC "%(cc1_cpu) %{profile:-p}"
diff --git a/contrib/gcc/config/i386/freebsd64.h b/contrib/gcc/config/i386/freebsd64.h
index b9e7386c839c..1bef8efda774 100644
--- a/contrib/gcc/config/i386/freebsd64.h
+++ b/contrib/gcc/config/i386/freebsd64.h
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING. If not, write to
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd64.h,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#undef TARGET_VERSION
diff --git a/contrib/gcc/config/i386/i386.c b/contrib/gcc/config/i386/i386.c
index feab422cc383..5f095d1e50d7 100644
--- a/contrib/gcc/config/i386/i386.c
+++ b/contrib/gcc/config/i386/i386.c
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING. If not, write to
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.25.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include "config.h"
#include "system.h"
diff --git a/contrib/gcc/config/i386/x86-64.h b/contrib/gcc/config/i386/x86-64.h
index f288208a160b..c828e8a91e6c 100644
--- a/contrib/gcc/config/i386/x86-64.h
+++ b/contrib/gcc/config/i386/x86-64.h
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING. If not, write to
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/i386/x86-64.h,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#undef ASM_COMMENT_START
#define ASM_COMMENT_START "#"
diff --git a/contrib/gcc/config/mips/freebsd.h b/contrib/gcc/config/mips/freebsd.h
index f4b1cf572e32..0670741d33ae 100644
--- a/contrib/gcc/config/mips/freebsd.h
+++ b/contrib/gcc/config/mips/freebsd.h
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING. If not, write to
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/mips/freebsd.h,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* This defines which switch letters take arguments. -G is a MIPS
special. */
diff --git a/contrib/gcc/config/sparc/freebsd.h b/contrib/gcc/config/sparc/freebsd.h
index bb93ea132824..dcf5ee4aac56 100644
--- a/contrib/gcc/config/sparc/freebsd.h
+++ b/contrib/gcc/config/sparc/freebsd.h
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING. If not, write to
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#undef SUBTARGET_EXTRA_SPECS
#define SUBTARGET_EXTRA_SPECS \
diff --git a/contrib/gcc/cp/ptree.c b/contrib/gcc/cp/ptree.c
index 1de4d2c10f9e..1dfde550f4d2 100644
--- a/contrib/gcc/cp/ptree.c
+++ b/contrib/gcc/cp/ptree.c
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING. If not, write to
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/cp/ptree.c,v 1.9.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include "config.h"
#include "system.h"
diff --git a/contrib/gcc/function.c b/contrib/gcc/function.c
index 7549ec421f07..cc24d82d01e0 100644
--- a/contrib/gcc/function.c
+++ b/contrib/gcc/function.c
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING. If not, write to the Free
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/function.c,v 1.25.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* This file handles the generation of rtl code from tree structure
at the level of the function as a whole.
diff --git a/contrib/gcc/gcc.c b/contrib/gcc/gcc.c
index ddf2f49205e6..d29dec14df8a 100644
--- a/contrib/gcc/gcc.c
+++ b/contrib/gcc/gcc.c
@@ -23,7 +23,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
This paragraph is here to try to keep Sun CC from dying.
The number of chars here seems crucial!!!! */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/gcc.c,v 1.43.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* This program is the user interface to the C compiler and possibly to
other compilers. It is used because compilation is a complicated procedure
diff --git a/contrib/gcc/opts.c b/contrib/gcc/opts.c
index 3de5627174e7..fd2d85453f8b 100644
--- a/contrib/gcc/opts.c
+++ b/contrib/gcc/opts.c
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING. If not, write to the Free
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/opts.c,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include "config.h"
#include "system.h"
diff --git a/contrib/gcc/toplev.c b/contrib/gcc/toplev.c
index 49458c89e766..826ef389908c 100644
--- a/contrib/gcc/toplev.c
+++ b/contrib/gcc/toplev.c
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING. If not, write to the Free
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/toplev.c,v 1.27.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* This is the top level of cc1/c++.
It parses command args, opens files, invokes the various passes
diff --git a/contrib/gcc/version.c b/contrib/gcc/version.c
index 0da50b1c7b9f..17607b7e9796 100644
--- a/contrib/gcc/version.c
+++ b/contrib/gcc/version.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/version.c,v 1.16.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include "version.h"
/* This is the trailing component of the string reported as the
diff --git a/contrib/gdb/FREEBSD-Xlist b/contrib/gdb/FREEBSD-Xlist
index 53f455c8b9d5..55700b4a604a 100644
--- a/contrib/gdb/FREEBSD-Xlist
+++ b/contrib/gdb/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gdb/FREEBSD-Xlist,v 1.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
gdb-*/bfd/*
gdb-*/config/*
gdb-*/etc/*
diff --git a/contrib/gdb/FREEBSD-upgrade b/contrib/gdb/FREEBSD-upgrade
index ac98f9c8f7fc..d8d9f49ece5f 100644
--- a/contrib/gdb/FREEBSD-upgrade
+++ b/contrib/gdb/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gdb/FREEBSD-upgrade,v 1.3.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
To strip down a new version of gdb for import, extract the files like this:
diff --git a/contrib/gdtoa/gdtoaimp.h b/contrib/gdtoa/gdtoaimp.h
index 9991ffac6e96..cff8a95af4e2 100644
--- a/contrib/gdtoa/gdtoaimp.h
+++ b/contrib/gdtoa/gdtoaimp.h
@@ -26,7 +26,7 @@ THIS SOFTWARE.
****************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.11.2.2.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* This is a variation on dtoa.c that converts arbitary binary
floating-point formats to and from decimal notation. It uses
diff --git a/contrib/gdtoa/hexnan.c b/contrib/gdtoa/hexnan.c
index 6faea7813a06..f88a2e80c4d9 100644
--- a/contrib/gdtoa/hexnan.c
+++ b/contrib/gdtoa/hexnan.c
@@ -29,7 +29,7 @@ THIS SOFTWARE.
/* Please send bug reports to David M. Gay (dmg at acm dot org,
* with " at " changed at "@" and " dot " changed to "."). */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gdtoa/hexnan.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include "gdtoaimp.h"
diff --git a/contrib/gdtoa/strtod.c b/contrib/gdtoa/strtod.c
index 5550853ccf8a..cf57a53e9456 100644
--- a/contrib/gdtoa/strtod.c
+++ b/contrib/gdtoa/strtod.c
@@ -29,7 +29,7 @@ THIS SOFTWARE.
/* Please send bug reports to David M. Gay (dmg at acm dot org,
* with " at " changed at "@" and " dot " changed to "."). */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gdtoa/strtod.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include "gdtoaimp.h"
#ifndef NO_FENV_H
diff --git a/contrib/gdtoa/strtof.c b/contrib/gdtoa/strtof.c
index df9a75a4928d..3c005981958f 100644
--- a/contrib/gdtoa/strtof.c
+++ b/contrib/gdtoa/strtof.c
@@ -29,7 +29,7 @@ THIS SOFTWARE.
/* Please send bug reports to David M. Gay (dmg at acm dot org,
* with " at " changed at "@" and " dot " changed to "."). */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gdtoa/strtof.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include "gdtoaimp.h"
diff --git a/contrib/gdtoa/strtorQ.c b/contrib/gdtoa/strtorQ.c
index bd183bc2ac69..fe9ac4772381 100644
--- a/contrib/gdtoa/strtorQ.c
+++ b/contrib/gdtoa/strtorQ.c
@@ -29,7 +29,7 @@ THIS SOFTWARE.
/* Please send bug reports to David M. Gay (dmg at acm dot org,
* with " at " changed at "@" and " dot " changed to "."). */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gdtoa/strtorQ.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include "gdtoaimp.h"
diff --git a/contrib/gdtoa/strtorx.c b/contrib/gdtoa/strtorx.c
index e9fd45f1fbe4..a5b329961791 100644
--- a/contrib/gdtoa/strtorx.c
+++ b/contrib/gdtoa/strtorx.c
@@ -29,7 +29,7 @@ THIS SOFTWARE.
/* Please send bug reports to David M. Gay (dmg at acm dot org,
* with " at " changed at "@" and " dot " changed to "."). */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gdtoa/strtorx.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include "gdtoaimp.h"
diff --git a/contrib/gnu-sort/FREEBSD-upgrade b/contrib/gnu-sort/FREEBSD-upgrade
index 5cb5371d0b1f..2a390702740b 100644
--- a/contrib/gnu-sort/FREEBSD-upgrade
+++ b/contrib/gnu-sort/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gnu-sort/FREEBSD-upgrade,v 1.4.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
GNU Sort
originals can be found at: ftp://ftp.gnu.org/gnu/coreutils/
diff --git a/contrib/gnu-sort/lib/hard-locale.c b/contrib/gnu-sort/lib/hard-locale.c
index 45b7d05dded0..0699e4eac72e 100644
--- a/contrib/gnu-sort/lib/hard-locale.c
+++ b/contrib/gnu-sort/lib/hard-locale.c
@@ -16,7 +16,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gnu-sort/lib/hard-locale.c,v 1.5.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#if HAVE_CONFIG_H
# include <config.h>
diff --git a/contrib/gnu-sort/lib/version-etc.c b/contrib/gnu-sort/lib/version-etc.c
index ccc135be8cb8..05c367232b19 100644
--- a/contrib/gnu-sort/lib/version-etc.c
+++ b/contrib/gnu-sort/lib/version-etc.c
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gnu-sort/lib/version-etc.c,v 1.4.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* Written by Jim Meyering. */
diff --git a/contrib/gnu-sort/src/sort.c b/contrib/gnu-sort/src/sort.c
index 0b9d33fcf4c6..938a4fff3bfe 100644
--- a/contrib/gnu-sort/src/sort.c
+++ b/contrib/gnu-sort/src/sort.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gnu-sort/src/sort.c,v 1.4.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* sort - sort lines of text (with all kinds of options).
Copyright (C) 88, 1991-2004 Free Software Foundation, Inc.
diff --git a/contrib/gperf/FREEBSD-Xlist b/contrib/gperf/FREEBSD-Xlist
index 393d55c838d2..fff196679a36 100644
--- a/contrib/gperf/FREEBSD-Xlist
+++ b/contrib/gperf/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gperf/FREEBSD-Xlist,v 1.2.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/*.dvi
*/*.html
*/*.info
diff --git a/contrib/groff/FREEBSD-Xlist b/contrib/groff/FREEBSD-Xlist
index 4549878106ea..18fc026b9a59 100644
--- a/contrib/groff/FREEBSD-Xlist
+++ b/contrib/groff/FREEBSD-Xlist
@@ -1,3 +1,3 @@
-$FreeBSD$
+$FreeBSD: src/contrib/groff/FREEBSD-Xlist,v 1.4.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/arch
*/src/libs/snprintf
diff --git a/contrib/groff/FREEBSD-upgrade b/contrib/groff/FREEBSD-upgrade
index bf4fe11a124c..66b8203bbfe8 100644
--- a/contrib/groff/FREEBSD-upgrade
+++ b/contrib/groff/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/groff/FREEBSD-upgrade,v 1.6.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
This directory contains virgin copies of the original distribution files
on a "vendor" branch. Do not, under any circumstances, attempt to upgrade
diff --git a/contrib/groff/src/devices/grotty/grotty.man b/contrib/groff/src/devices/grotty/grotty.man
index d626376a2859..b35be113a1b3 100644
--- a/contrib/groff/src/devices/grotty/grotty.man
+++ b/contrib/groff/src/devices/grotty/grotty.man
@@ -1,5 +1,5 @@
.ig
-$FreeBSD$
+$FreeBSD: src/contrib/groff/src/devices/grotty/grotty.man,v 1.9.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
diff --git a/contrib/groff/src/libs/libgroff/cmap.cpp b/contrib/groff/src/libs/libgroff/cmap.cpp
index 91a42f30243d..5e18dae0d1de 100644
--- a/contrib/groff/src/libs/libgroff/cmap.cpp
+++ b/contrib/groff/src/libs/libgroff/cmap.cpp
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along
with groff; see the file COPYING. If not, write to the Free Software
Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/groff/src/libs/libgroff/cmap.cpp,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include <ctype.h>
#ifdef __FreeBSD__
diff --git a/contrib/groff/src/libs/libgroff/cset.cpp b/contrib/groff/src/libs/libgroff/cset.cpp
index 6d79d7ee5839..8feb96604dd1 100644
--- a/contrib/groff/src/libs/libgroff/cset.cpp
+++ b/contrib/groff/src/libs/libgroff/cset.cpp
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along
with groff; see the file COPYING. If not, write to the Free Software
Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/groff/src/libs/libgroff/cset.cpp,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include <ctype.h>
#ifdef __FreeBSD__
diff --git a/contrib/groff/src/libs/libgroff/invalid.cpp b/contrib/groff/src/libs/libgroff/invalid.cpp
index ac0c71dfe31d..65c3b267f884 100644
--- a/contrib/groff/src/libs/libgroff/invalid.cpp
+++ b/contrib/groff/src/libs/libgroff/invalid.cpp
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
with groff; see the file COPYING. If not, write to the Free Software
Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/groff/src/libs/libgroff/invalid.cpp,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include "lib.h"
diff --git a/contrib/groff/src/preproc/eqn/neqn.sh b/contrib/groff/src/preproc/eqn/neqn.sh
index 5390bba6c9ad..1746f9427d9e 100644
--- a/contrib/groff/src/preproc/eqn/neqn.sh
+++ b/contrib/groff/src/preproc/eqn/neqn.sh
@@ -1,7 +1,7 @@
#! /bin/sh
# Provision of this shell script should not be taken to imply that use of
# GNU eqn with groff -Tascii|-Tlatin1|-Tkoi8-r|-Tutf8|-Tcp1047 is supported.
-# $FreeBSD$
+# $FreeBSD: src/contrib/groff/src/preproc/eqn/neqn.sh,v 1.11.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
# Default device.
case "${LC_ALL-${LC_CTYPE-${LANG}}}" in
diff --git a/contrib/groff/src/roff/groff/groff.man b/contrib/groff/src/roff/groff/groff.man
index 23f3fab67136..444c021dc4fd 100644
--- a/contrib/groff/src/roff/groff/groff.man
+++ b/contrib/groff/src/roff/groff/groff.man
@@ -15,7 +15,7 @@ Front-Cover Texts, and with no Back-Cover Texts.
A copy of the Free Documentation License is included as a file called
FDL in the main directory of the groff source package.
-$FreeBSD$
+$FreeBSD: src/contrib/groff/src/roff/groff/groff.man,v 1.10.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
..
.
diff --git a/contrib/groff/src/roff/nroff/nroff.man b/contrib/groff/src/roff/nroff/nroff.man
index f1692295f596..5448ffb21371 100644
--- a/contrib/groff/src/roff/nroff/nroff.man
+++ b/contrib/groff/src/roff/nroff/nroff.man
@@ -16,7 +16,7 @@ versions, except that this permission notice may be included in
translations approved by the Free Software Foundation instead of in
the original English.
- $FreeBSD$
+ $FreeBSD: src/contrib/groff/src/roff/nroff/nroff.man,v 1.12.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
..
.
diff --git a/contrib/groff/src/roff/nroff/nroff.sh b/contrib/groff/src/roff/nroff/nroff.sh
index 4342019831fb..521b41a1c7c3 100755
--- a/contrib/groff/src/roff/nroff/nroff.sh
+++ b/contrib/groff/src/roff/nroff/nroff.sh
@@ -1,6 +1,6 @@
#! /bin/sh
# Emulate nroff with groff.
-# $FreeBSD$
+# $FreeBSD: src/contrib/groff/src/roff/nroff/nroff.sh,v 1.18.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
prog="$0"
# Default device.
diff --git a/contrib/groff/tmac/eqnrc b/contrib/groff/tmac/eqnrc
index e23db463a68c..91264d2cd041 100644
--- a/contrib/groff/tmac/eqnrc
+++ b/contrib/groff/tmac/eqnrc
@@ -1,5 +1,5 @@
.\" Startup file for eqn.
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/groff/tmac/eqnrc,v 1.6.32.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.EQ
sdefine << %{ < back 20 < }%
sdefine >> %{ > back 20 > }%
diff --git a/contrib/groff/tmac/troffrc b/contrib/groff/tmac/troffrc
index 5defe8abc11c..003ff1490b16 100644
--- a/contrib/groff/tmac/troffrc
+++ b/contrib/groff/tmac/troffrc
@@ -1,5 +1,5 @@
.\" Startup file for troff.
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.17.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.
.\" This is tested by pic.
.nr 0p 0
diff --git a/contrib/groff/tmac/tty-char.tmac b/contrib/groff/tmac/tty-char.tmac
index 58f8fdbb5f31..ee7444749a98 100644
--- a/contrib/groff/tmac/tty-char.tmac
+++ b/contrib/groff/tmac/tty-char.tmac
@@ -1,5 +1,5 @@
.\" tty-char.tmac
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/groff/tmac/tty-char.tmac,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.\" This file defines standard troff characters and some groff characters for
.\" use with -Tascii, -Tlatin1, -Tutf8, and -Tcp1047.
diff --git a/contrib/groff/tmac/tty.tmac b/contrib/groff/tmac/tty.tmac
index 6e6a8562eb06..684ebae3f2eb 100644
--- a/contrib/groff/tmac/tty.tmac
+++ b/contrib/groff/tmac/tty.tmac
@@ -1,5 +1,5 @@
.\" tty.tmac
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/groff/tmac/tty.tmac,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.nr _C \n(.C
.cp 0
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..970ee517d644 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.18.1.2.1 2009/10/25 01:10:29 kensmith 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..d8e36cc08ab5 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.18.1.2.1 2009/10/25 01:10:29 kensmith 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..5b52e589c372 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.18.1.2.1 2009/10/25 01:10:29 kensmith 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..4c51efe40731 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.18.1.2.1 2009/10/25 01:10:29 kensmith 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..e515fd4853c2 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.32.1.2.1 2009/10/25 01:10:29 kensmith Exp $
To build a kernel for use with the loadable kernel module, follow these
steps:
diff --git a/contrib/ipfilter/Makefile b/contrib/ipfilter/Makefile
index 334cd4512188..985bacaaf05c 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.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
# Id: Makefile,v 2.76.2.24 2007/09/26 10:04:03 darrenr Exp $
#
SHELL=/bin/sh
diff --git a/contrib/ipfilter/bpf-ipf.h b/contrib/ipfilter/bpf-ipf.h
index dc2b660e2eee..7be6464c955b 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
diff --git a/contrib/ipfilter/bpf_filter.c b/contrib/ipfilter/bpf_filter.c
index d75570e29267..ab045e6e14e3 100644
--- a/contrib/ipfilter/bpf_filter.c
+++ b/contrib/ipfilter/bpf_filter.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.6.10.1.2.1 2009/10/25 01:10:29 kensmith 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 051867220339..b9049e55e338 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.8.2.1.2.1 2009/10/25 01:10:29 kensmith 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..02c6e48359e2 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2003 by Darren Reed
diff --git a/contrib/ipfilter/ipf.h b/contrib/ipfilter/ipf.h
index ae05ca75a906..b4eeafff96cb 100644
--- a/contrib/ipfilter/ipf.h
+++ b/contrib/ipfilter/ipf.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipf.h,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith 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..33bff90468a9 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1997-1998 by Darren Reed.
diff --git a/contrib/ipfilter/iplang/iplang_l.l b/contrib/ipfilter/iplang/iplang_l.l
index f356d0fb4465..7c96dceaa8cb 100644
--- a/contrib/ipfilter/iplang/iplang_l.l
+++ b/contrib/ipfilter/iplang/iplang_l.l
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/iplang/iplang_l.l,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
%{
/*
diff --git a/contrib/ipfilter/iplang/iplang_y.y b/contrib/ipfilter/iplang/iplang_y.y
index 773f27f2c17e..a944a642205a 100644
--- a/contrib/ipfilter/iplang/iplang_y.y
+++ b/contrib/ipfilter/iplang/iplang_y.y
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.9.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
%{
/*
@@ -7,7 +7,7 @@
* See the IPFILTER.LICENCE file for details on licencing.
*
* Id: iplang_y.y,v 2.9.2.4 2006/03/17 12:11:29 darrenr Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.9.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <stdio.h>
diff --git a/contrib/ipfilter/ipmon.h b/contrib/ipfilter/ipmon.h
index afee1f4fb3f7..8f8f44cdff85 100644
--- a/contrib/ipfilter/ipmon.h
+++ b/contrib/ipfilter/ipmon.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipmon.h,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith 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..758d365de214 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* (C)opyright 1995 by Darren Reed.
diff --git a/contrib/ipfilter/ipsd/ipsd.c b/contrib/ipfilter/ipsd/ipsd.c
index ad3dfe20db99..5fd6a79e2e33 100644
--- a/contrib/ipfilter/ipsd/ipsd.c
+++ b/contrib/ipfilter/ipsd/ipsd.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsd/ipsd.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* (C)opyright 1995-1998 Darren Reed.
diff --git a/contrib/ipfilter/ipsd/ipsd.h b/contrib/ipfilter/ipsd/ipsd.h
index f898c9995c35..a7eaeaf8058c 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* (C)opyright 1995-1998 Darren Reed.
diff --git a/contrib/ipfilter/ipsd/ipsdr.c b/contrib/ipfilter/ipsd/ipsdr.c
index 5a907061c631..9f762d51bc80 100644
--- a/contrib/ipfilter/ipsd/ipsdr.c
+++ b/contrib/ipfilter/ipsd/ipsdr.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsd/ipsdr.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* (C)opyright 1995-1998 Darren Reed.
diff --git a/contrib/ipfilter/ipsd/linux.h b/contrib/ipfilter/ipsd/linux.h
index 88eb67aa4cbb..9d5e2c9bbcc3 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1997-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsd/sbpf.c b/contrib/ipfilter/ipsd/sbpf.c
index a724ba5dbfeb..31ca1033cce0 100644
--- a/contrib/ipfilter/ipsd/sbpf.c
+++ b/contrib/ipfilter/ipsd/sbpf.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsd/sbpf.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith 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..5877850e0ca6 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.22.1.2.1 2009/10/25 01:10:29 kensmith 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..f92c7786ff32 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.22.1.2.1 2009/10/25 01:10:29 kensmith 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..0de881048d0b 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.22.1.2.1 2009/10/25 01:10:29 kensmith 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..6c7f85919713 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.22.1.2.1 2009/10/25 01:10:29 kensmith 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 5c07fb6f0890..c7bd58c98906 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.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Based upon 4.4BSD's /usr/sbin/arp
diff --git a/contrib/ipfilter/ipsend/arp.c b/contrib/ipfilter/ipsend/arp.c
index 8670bda76b46..57c9b497f44d 100644
--- a/contrib/ipfilter/ipsend/arp.c
+++ b/contrib/ipfilter/ipsend/arp.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/arp.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* arp.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/dlcommon.c b/contrib/ipfilter/ipsend/dlcommon.c
index c6b6e8a4858f..089b262b9f71 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Common (shared) DLPI test routines.
diff --git a/contrib/ipfilter/ipsend/dltest.h b/contrib/ipfilter/ipsend/dltest.h
index 086782c1fbb7..e6b4bef3ea1d 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Common DLPI Test Suite header file
diff --git a/contrib/ipfilter/ipsend/hpux.c b/contrib/ipfilter/ipsend/hpux.c
index 9cc72995f26b..b3fd41f0242b 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.22.1.2.1 2009/10/25 01:10:29 kensmith 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..6f7629fea00a 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* @(#)in_var.h 1.3 88/08/19 SMI; from UCB 7.1 6/5/86 */
diff --git a/contrib/ipfilter/ipsend/ip.c b/contrib/ipfilter/ipsend/ip.c
index 26a7a892bed3..6430cfde0ec4 100644
--- a/contrib/ipfilter/ipsend/ip.c
+++ b/contrib/ipfilter/ipsend/ip.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/ip.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith 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..b7c0ea2294b0 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.22.1.2.1 2009/10/25 01:10:29 kensmith 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..277b6f7aad45 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH IPRESEND 1
.SH NAME
diff --git a/contrib/ipfilter/ipsend/ipresend.c b/contrib/ipfilter/ipsend/ipresend.c
index 050aecf2093c..85665e53ccf1 100644
--- a/contrib/ipfilter/ipsend/ipresend.c
+++ b/contrib/ipfilter/ipsend/ipresend.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/ipresend.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* ipresend.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/ipsend.1 b/contrib/ipfilter/ipsend/ipsend.1
index 7f0a8e39538a..e3e6bc717ef0 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH IPSEND 1
.SH NAME
diff --git a/contrib/ipfilter/ipsend/ipsend.5 b/contrib/ipfilter/ipsend/ipsend.5
index cd5842cbba18..6e93e27df007 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.TH IPSEND 5
.SH NAME
ipsend \- IP packet description language
diff --git a/contrib/ipfilter/ipsend/ipsend.c b/contrib/ipfilter/ipsend/ipsend.c
index 06191ec054b9..4c85f963dcb7 100644
--- a/contrib/ipfilter/ipsend/ipsend.c
+++ b/contrib/ipfilter/ipsend/ipsend.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/ipsend.c,v 1.14.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* ipsend.c (C) 1995-1998 Darren Reed
*
diff --git a/contrib/ipfilter/ipsend/ipsend.h b/contrib/ipfilter/ipsend/ipsend.h
index 91cfa6c085ed..1d4fe748f903 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* ipsend.h (C) 1997-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/ipsopt.c b/contrib/ipfilter/ipsend/ipsopt.c
index 10f132e6da9a..3b7e0e678c5b 100644
--- a/contrib/ipfilter/ipsend/ipsopt.c
+++ b/contrib/ipfilter/ipsend/ipsopt.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/ipsopt.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1995-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsend/iptest.1 b/contrib/ipfilter/ipsend/iptest.1
index 8f25f4abf256..e50380dd71ee 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH IPTEST 1
.SH NAME
diff --git a/contrib/ipfilter/ipsend/iptest.c b/contrib/ipfilter/ipsend/iptest.c
index cc2ceb8ae2a1..39d52e80586e 100644
--- a/contrib/ipfilter/ipsend/iptest.c
+++ b/contrib/ipfilter/ipsend/iptest.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/iptest.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* ipsend.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/iptests.c b/contrib/ipfilter/ipsend/iptests.c
index 22ef71f5fddc..7fb1d35ebd93 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.15.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1993-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsend/larp.c b/contrib/ipfilter/ipsend/larp.c
index ccb70cc29368..932d0b3d0b80 100644
--- a/contrib/ipfilter/ipsend/larp.c
+++ b/contrib/ipfilter/ipsend/larp.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/larp.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* larp.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/linux.h b/contrib/ipfilter/ipsend/linux.h
index a36d1bfb6a6a..f7fd2a3545aa 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1995-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsend/lsock.c b/contrib/ipfilter/ipsend/lsock.c
index a76bbbb15221..1c19fd9e203b 100644
--- a/contrib/ipfilter/ipsend/lsock.c
+++ b/contrib/ipfilter/ipsend/lsock.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/lsock.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* lsock.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/resend.c b/contrib/ipfilter/ipsend/resend.c
index b988e9b20d94..72f31a7aa79b 100644
--- a/contrib/ipfilter/ipsend/resend.c
+++ b/contrib/ipfilter/ipsend/resend.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/resend.c,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* resend.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/sbpf.c b/contrib/ipfilter/ipsend/sbpf.c
index 9a5cc2e31280..bc521189f11b 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.9.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* (C)opyright 1995-1998 Darren Reed. (from tcplog)
*
diff --git a/contrib/ipfilter/ipsend/sdlpi.c b/contrib/ipfilter/ipsend/sdlpi.c
index f48fd06bbc34..89eb219146af 100644
--- a/contrib/ipfilter/ipsend/sdlpi.c
+++ b/contrib/ipfilter/ipsend/sdlpi.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/sdlpi.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith 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..7bc0e8a8c6d7 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* (C)opyright 1992-1998 Darren Reed.
diff --git a/contrib/ipfilter/ipsend/slinux.c b/contrib/ipfilter/ipsend/slinux.c
index 7e37b3087f97..5de65218ab88 100644
--- a/contrib/ipfilter/ipsend/slinux.c
+++ b/contrib/ipfilter/ipsend/slinux.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/slinux.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/snit.c b/contrib/ipfilter/ipsend/snit.c
index 0ef7e5444841..c6a0ce178cc6 100644
--- a/contrib/ipfilter/ipsend/snit.c
+++ b/contrib/ipfilter/ipsend/snit.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/snit.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/sock.c b/contrib/ipfilter/ipsend/sock.c
index dcff6ebbfcec..719c27b23f98 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.21.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* sock.c (C) 1995-1998 Darren Reed
*
diff --git a/contrib/ipfilter/ipsend/sockraw.c b/contrib/ipfilter/ipsend/sockraw.c
index c9232273ee86..dd544e62291d 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* (C)opyright 2000 Darren Reed.
diff --git a/contrib/ipfilter/ipsend/tcpip.h b/contrib/ipfilter/ipsend/tcpip.h
index 34178931a978..f3aec1468bd4 100644
--- a/contrib/ipfilter/ipsend/tcpip.h
+++ b/contrib/ipfilter/ipsend/tcpip.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/tcpip.h,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
diff --git a/contrib/ipfilter/ipt.h b/contrib/ipfilter/ipt.h
index f3074a8dc9b9..2f6b2ace2400 100644
--- a/contrib/ipfilter/ipt.h
+++ b/contrib/ipfilter/ipt.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipt.h,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/kmem.h b/contrib/ipfilter/kmem.h
index c0864b4fd911..f74f4f0a2f4e 100644
--- a/contrib/ipfilter/kmem.h
+++ b/contrib/ipfilter/kmem.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/kmem.h,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/l4check/l4check.c b/contrib/ipfilter/l4check/l4check.c
index fd2753ea22be..9319c06ebee6 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.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* (C)Copyright March, 2000 - Darren Reed.
diff --git a/contrib/ipfilter/lib/addicmp.c b/contrib/ipfilter/lib/addicmp.c
index ef9abfed3c9c..6efd0611e427 100644
--- a/contrib/ipfilter/lib/addicmp.c
+++ b/contrib/ipfilter/lib/addicmp.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/addicmp.c,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/addipopt.c b/contrib/ipfilter/lib/addipopt.c
index 79155e7e4c57..7482715877bf 100644
--- a/contrib/ipfilter/lib/addipopt.c
+++ b/contrib/ipfilter/lib/addipopt.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/addipopt.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/bcopywrap.c b/contrib/ipfilter/lib/bcopywrap.c
index b2e8427a7b37..94e18044e0cc 100644
--- a/contrib/ipfilter/lib/bcopywrap.c
+++ b/contrib/ipfilter/lib/bcopywrap.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/bcopywrap.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/binprint.c b/contrib/ipfilter/lib/binprint.c
index fcb47ed37e5b..54db38ec6f90 100644
--- a/contrib/ipfilter/lib/binprint.c
+++ b/contrib/ipfilter/lib/binprint.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/binprint.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/buildopts.c b/contrib/ipfilter/lib/buildopts.c
index bdd0538fdd14..0dc99097d75b 100644
--- a/contrib/ipfilter/lib/buildopts.c
+++ b/contrib/ipfilter/lib/buildopts.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/buildopts.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/checkrev.c b/contrib/ipfilter/lib/checkrev.c
index 9e584cc48d89..891bdfbb5f14 100644
--- a/contrib/ipfilter/lib/checkrev.c
+++ b/contrib/ipfilter/lib/checkrev.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/checkrev.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/count4bits.c b/contrib/ipfilter/lib/count4bits.c
index 38e574290c69..b2ea88d412db 100644
--- a/contrib/ipfilter/lib/count4bits.c
+++ b/contrib/ipfilter/lib/count4bits.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/count4bits.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/count6bits.c b/contrib/ipfilter/lib/count6bits.c
index 15538c36c19c..084d92079afd 100644
--- a/contrib/ipfilter/lib/count6bits.c
+++ b/contrib/ipfilter/lib/count6bits.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/count6bits.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/debug.c b/contrib/ipfilter/lib/debug.c
index 3181e78e1e10..dae8ee593f79 100644
--- a/contrib/ipfilter/lib/debug.c
+++ b/contrib/ipfilter/lib/debug.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/debug.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/facpri.c b/contrib/ipfilter/lib/facpri.c
index b89e0f8e0127..1ef16749b9ee 100644
--- a/contrib/ipfilter/lib/facpri.c
+++ b/contrib/ipfilter/lib/facpri.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/facpri.c,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/facpri.h b/contrib/ipfilter/lib/facpri.h
index ca53e051f90d..f13e406f7e89 100644
--- a/contrib/ipfilter/lib/facpri.h
+++ b/contrib/ipfilter/lib/facpri.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/facpri.h,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/fill6bits.c b/contrib/ipfilter/lib/fill6bits.c
index c0faf6ae5f20..5939309b0136 100644
--- a/contrib/ipfilter/lib/fill6bits.c
+++ b/contrib/ipfilter/lib/fill6bits.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/fill6bits.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/flags.c b/contrib/ipfilter/lib/flags.c
index 200484c2231c..87c35ec8369f 100644
--- a/contrib/ipfilter/lib/flags.c
+++ b/contrib/ipfilter/lib/flags.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/flags.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2001-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/gethost.c b/contrib/ipfilter/lib/gethost.c
index be536c1e755d..f42e540d0436 100644
--- a/contrib/ipfilter/lib/gethost.c
+++ b/contrib/ipfilter/lib/gethost.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/gethost.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getifname.c b/contrib/ipfilter/lib/getifname.c
index 7246fbb83714..f4cc5af4e177 100644
--- a/contrib/ipfilter/lib/getifname.c
+++ b/contrib/ipfilter/lib/getifname.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/getifname.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getnattype.c b/contrib/ipfilter/lib/getnattype.c
index 2fb5d174e4a2..1da1b2229877 100644
--- a/contrib/ipfilter/lib/getnattype.c
+++ b/contrib/ipfilter/lib/getnattype.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/getnattype.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getport.c b/contrib/ipfilter/lib/getport.c
index 69e897c660c3..17f32c679584 100644
--- a/contrib/ipfilter/lib/getport.c
+++ b/contrib/ipfilter/lib/getport.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/getport.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getportproto.c b/contrib/ipfilter/lib/getportproto.c
index 23e5fb18a6a5..ca46cb10c57d 100644
--- a/contrib/ipfilter/lib/getportproto.c
+++ b/contrib/ipfilter/lib/getportproto.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/getportproto.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getproto.c b/contrib/ipfilter/lib/getproto.c
index 33f6f47ac1b9..b17c729e2cd1 100644
--- a/contrib/ipfilter/lib/getproto.c
+++ b/contrib/ipfilter/lib/getproto.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/getproto.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getsumd.c b/contrib/ipfilter/lib/getsumd.c
index fdad461673e3..c428f3d5c3ca 100644
--- a/contrib/ipfilter/lib/getsumd.c
+++ b/contrib/ipfilter/lib/getsumd.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/getsumd.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/hostname.c b/contrib/ipfilter/lib/hostname.c
index e8fde98e5efa..f1d30cd1c13e 100644
--- a/contrib/ipfilter/lib/hostname.c
+++ b/contrib/ipfilter/lib/hostname.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/hostname.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/icmpcode.c b/contrib/ipfilter/lib/icmpcode.c
index d558bebf7de6..d616ab279bf7 100644
--- a/contrib/ipfilter/lib/icmpcode.c
+++ b/contrib/ipfilter/lib/icmpcode.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/icmpcode.c,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/inet_addr.c b/contrib/ipfilter/lib/inet_addr.c
index c7ae44375a5e..504297e2dead 100644
--- a/contrib/ipfilter/lib/inet_addr.c
+++ b/contrib/ipfilter/lib/inet_addr.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/inet_addr.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* ++Copyright++ 1983, 1990, 1993
diff --git a/contrib/ipfilter/lib/initparse.c b/contrib/ipfilter/lib/initparse.c
index 6fdfc8a9a161..48c90e7ec922 100644
--- a/contrib/ipfilter/lib/initparse.c
+++ b/contrib/ipfilter/lib/initparse.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/initparse.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ionames.c b/contrib/ipfilter/lib/ionames.c
index d2fc97775452..b7f0fdb08cb7 100644
--- a/contrib/ipfilter/lib/ionames.c
+++ b/contrib/ipfilter/lib/ionames.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/ionames.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipf_dotuning.c b/contrib/ipfilter/lib/ipf_dotuning.c
index 6508a266271c..f106c809fcbe 100644
--- a/contrib/ipfilter/lib/ipf_dotuning.c
+++ b/contrib/ipfilter/lib/ipf_dotuning.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/ipf_dotuning.c,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2003-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_ef.c b/contrib/ipfilter/lib/ipft_ef.c
index 2d50f076bfbe..0b6fbb88fcf4 100644
--- a/contrib/ipfilter/lib/ipft_ef.c
+++ b/contrib/ipfilter/lib/ipft_ef.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/ipft_ef.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_hx.c b/contrib/ipfilter/lib/ipft_hx.c
index d295c21a7d9f..73342b028735 100644
--- a/contrib/ipfilter/lib/ipft_hx.c
+++ b/contrib/ipfilter/lib/ipft_hx.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/ipft_hx.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_pc.c b/contrib/ipfilter/lib/ipft_pc.c
index 0f31a10efd3b..05d2f49b7996 100644
--- a/contrib/ipfilter/lib/ipft_pc.c
+++ b/contrib/ipfilter/lib/ipft_pc.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/ipft_pc.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_sn.c b/contrib/ipfilter/lib/ipft_sn.c
index 2beb6eed704f..62c6793263c1 100644
--- a/contrib/ipfilter/lib/ipft_sn.c
+++ b/contrib/ipfilter/lib/ipft_sn.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/ipft_sn.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_td.c b/contrib/ipfilter/lib/ipft_td.c
index d571ada7b56e..867b085a37d2 100644
--- a/contrib/ipfilter/lib/ipft_td.c
+++ b/contrib/ipfilter/lib/ipft_td.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/ipft_td.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_tx.c b/contrib/ipfilter/lib/ipft_tx.c
index f4475e3c8426..048ebadfbf98 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.7.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipoptsec.c b/contrib/ipfilter/lib/ipoptsec.c
index 66a55c80dbb7..d18325938c86 100644
--- a/contrib/ipfilter/lib/ipoptsec.c
+++ b/contrib/ipfilter/lib/ipoptsec.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/ipoptsec.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2001-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kmem.c b/contrib/ipfilter/lib/kmem.c
index 26da2d0139f7..594dc8bc8d4b 100644
--- a/contrib/ipfilter/lib/kmem.c
+++ b/contrib/ipfilter/lib/kmem.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/kmem.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kmem.h b/contrib/ipfilter/lib/kmem.h
index bcfde06d045d..78ec734bfb43 100644
--- a/contrib/ipfilter/lib/kmem.h
+++ b/contrib/ipfilter/lib/kmem.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/kmem.h,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kmemcpywrap.c b/contrib/ipfilter/lib/kmemcpywrap.c
index 87474915334e..df8e8da61e53 100644
--- a/contrib/ipfilter/lib/kmemcpywrap.c
+++ b/contrib/ipfilter/lib/kmemcpywrap.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/kmemcpywrap.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kvatoname.c b/contrib/ipfilter/lib/kvatoname.c
index c8c0d8fff621..06db33e1936f 100644
--- a/contrib/ipfilter/lib/kvatoname.c
+++ b/contrib/ipfilter/lib/kvatoname.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/kvatoname.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_hash.c b/contrib/ipfilter/lib/load_hash.c
index 7683470b47e8..98933850c49c 100644
--- a/contrib/ipfilter/lib/load_hash.c
+++ b/contrib/ipfilter/lib/load_hash.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/load_hash.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_hashnode.c b/contrib/ipfilter/lib/load_hashnode.c
index 3c3416d95a14..5cebdbeac56a 100644
--- a/contrib/ipfilter/lib/load_hashnode.c
+++ b/contrib/ipfilter/lib/load_hashnode.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/load_hashnode.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2003-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_pool.c b/contrib/ipfilter/lib/load_pool.c
index 08baae767db9..6c2b7767bbfa 100644
--- a/contrib/ipfilter/lib/load_pool.c
+++ b/contrib/ipfilter/lib/load_pool.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/load_pool.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_poolnode.c b/contrib/ipfilter/lib/load_poolnode.c
index 110a8b9c3e5b..f5a19443a4ec 100644
--- a/contrib/ipfilter/lib/load_poolnode.c
+++ b/contrib/ipfilter/lib/load_poolnode.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/load_poolnode.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2003-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/mutex_emul.c b/contrib/ipfilter/lib/mutex_emul.c
index 3983f04c6257..d3dc257a2c8d 100644
--- a/contrib/ipfilter/lib/mutex_emul.c
+++ b/contrib/ipfilter/lib/mutex_emul.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/mutex_emul.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/nametokva.c b/contrib/ipfilter/lib/nametokva.c
index deee4399b946..62d0530e70a1 100644
--- a/contrib/ipfilter/lib/nametokva.c
+++ b/contrib/ipfilter/lib/nametokva.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/nametokva.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/nat_setgroupmap.c b/contrib/ipfilter/lib/nat_setgroupmap.c
index 08b1a0a4475b..e4009de2a3c5 100644
--- a/contrib/ipfilter/lib/nat_setgroupmap.c
+++ b/contrib/ipfilter/lib/nat_setgroupmap.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/nat_setgroupmap.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ntomask.c b/contrib/ipfilter/lib/ntomask.c
index ba91a65b526c..e6a92b799b87 100644
--- a/contrib/ipfilter/lib/ntomask.c
+++ b/contrib/ipfilter/lib/ntomask.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/ntomask.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optname.c b/contrib/ipfilter/lib/optname.c
index f41cab11ea17..56aa6b731422 100644
--- a/contrib/ipfilter/lib/optname.c
+++ b/contrib/ipfilter/lib/optname.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/optname.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optprint.c b/contrib/ipfilter/lib/optprint.c
index 81a3287cf672..67fb067a23fc 100644
--- a/contrib/ipfilter/lib/optprint.c
+++ b/contrib/ipfilter/lib/optprint.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/optprint.c,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optprintv6.c b/contrib/ipfilter/lib/optprintv6.c
index f6ea6eca905e..e984b0d4c017 100644
--- a/contrib/ipfilter/lib/optprintv6.c
+++ b/contrib/ipfilter/lib/optprintv6.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/optprintv6.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optvalue.c b/contrib/ipfilter/lib/optvalue.c
index aa1ef2e7648f..9ee4e4647b41 100644
--- a/contrib/ipfilter/lib/optvalue.c
+++ b/contrib/ipfilter/lib/optvalue.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/optvalue.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2001-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/portname.c b/contrib/ipfilter/lib/portname.c
index f0c8625e6a77..e7e78714c8b4 100644
--- a/contrib/ipfilter/lib/portname.c
+++ b/contrib/ipfilter/lib/portname.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/portname.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/print_toif.c b/contrib/ipfilter/lib/print_toif.c
index 94a4618dbae2..0e78017d1544 100644
--- a/contrib/ipfilter/lib/print_toif.c
+++ b/contrib/ipfilter/lib/print_toif.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/print_toif.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printactivenat.c b/contrib/ipfilter/lib/printactivenat.c
index a2e292406614..452b940eb77e 100644
--- a/contrib/ipfilter/lib/printactivenat.c
+++ b/contrib/ipfilter/lib/printactivenat.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printactivenat.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printaps.c b/contrib/ipfilter/lib/printaps.c
index 87a12cd494fc..178a174c108e 100644
--- a/contrib/ipfilter/lib/printaps.c
+++ b/contrib/ipfilter/lib/printaps.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printaps.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printbuf.c b/contrib/ipfilter/lib/printbuf.c
index b2e209a01325..093032ab6700 100644
--- a/contrib/ipfilter/lib/printbuf.c
+++ b/contrib/ipfilter/lib/printbuf.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printbuf.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printfr.c b/contrib/ipfilter/lib/printfr.c
index 587d8cb01a48..675bd05b12c3 100644
--- a/contrib/ipfilter/lib/printfr.c
+++ b/contrib/ipfilter/lib/printfr.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printfr.c,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printfraginfo.c b/contrib/ipfilter/lib/printfraginfo.c
index d9317e87480d..09437cfcfe88 100644
--- a/contrib/ipfilter/lib/printfraginfo.c
+++ b/contrib/ipfilter/lib/printfraginfo.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printfraginfo.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2004-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhash.c b/contrib/ipfilter/lib/printhash.c
index 975b60eabcd5..8be4aa5a709a 100644
--- a/contrib/ipfilter/lib/printhash.c
+++ b/contrib/ipfilter/lib/printhash.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printhash.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhashnode.c b/contrib/ipfilter/lib/printhashnode.c
index ed83c397b4c5..dc0c6f9d882c 100644
--- a/contrib/ipfilter/lib/printhashnode.c
+++ b/contrib/ipfilter/lib/printhashnode.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printhashnode.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhostmap.c b/contrib/ipfilter/lib/printhostmap.c
index 0c9242f91eef..b26a628cede5 100644
--- a/contrib/ipfilter/lib/printhostmap.c
+++ b/contrib/ipfilter/lib/printhostmap.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printhostmap.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhostmask.c b/contrib/ipfilter/lib/printhostmask.c
index 44703c4c4636..3571cf47601b 100644
--- a/contrib/ipfilter/lib/printhostmask.c
+++ b/contrib/ipfilter/lib/printhostmask.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printhostmask.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printifname.c b/contrib/ipfilter/lib/printifname.c
index 2f7d912cf3e0..441cc277a60b 100644
--- a/contrib/ipfilter/lib/printifname.c
+++ b/contrib/ipfilter/lib/printifname.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printifname.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printip.c b/contrib/ipfilter/lib/printip.c
index 8c008afa9d24..e988bdd92e01 100644
--- a/contrib/ipfilter/lib/printip.c
+++ b/contrib/ipfilter/lib/printip.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printip.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printlog.c b/contrib/ipfilter/lib/printlog.c
index 82c0400759eb..13be89d80000 100644
--- a/contrib/ipfilter/lib/printlog.c
+++ b/contrib/ipfilter/lib/printlog.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printlog.c,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printmask.c b/contrib/ipfilter/lib/printmask.c
index 9230dc0026a5..f1b0de6e7324 100644
--- a/contrib/ipfilter/lib/printmask.c
+++ b/contrib/ipfilter/lib/printmask.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printmask.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printnat.c b/contrib/ipfilter/lib/printnat.c
index 39c43cafdce1..a7b4f5d978eb 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.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpacket.c b/contrib/ipfilter/lib/printpacket.c
index 25a4d5a8f7da..3aa88129e52f 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.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpacket6.c b/contrib/ipfilter/lib/printpacket6.c
index ca3b42133a3e..65d8ccbab7d0 100644
--- a/contrib/ipfilter/lib/printpacket6.c
+++ b/contrib/ipfilter/lib/printpacket6.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printpacket6.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpool.c b/contrib/ipfilter/lib/printpool.c
index 4ab85fac8c35..e095fea84993 100644
--- a/contrib/ipfilter/lib/printpool.c
+++ b/contrib/ipfilter/lib/printpool.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printpool.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpoolnode.c b/contrib/ipfilter/lib/printpoolnode.c
index 3327b8a5a43a..a7ee98992d31 100644
--- a/contrib/ipfilter/lib/printpoolnode.c
+++ b/contrib/ipfilter/lib/printpoolnode.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printpoolnode.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printportcmp.c b/contrib/ipfilter/lib/printportcmp.c
index 6a1a461b6206..fcee45b0c3bb 100644
--- a/contrib/ipfilter/lib/printportcmp.c
+++ b/contrib/ipfilter/lib/printportcmp.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printportcmp.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printsbuf.c b/contrib/ipfilter/lib/printsbuf.c
index f6c633c13fd6..99c725ba6c34 100644
--- a/contrib/ipfilter/lib/printsbuf.c
+++ b/contrib/ipfilter/lib/printsbuf.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printsbuf.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printstate.c b/contrib/ipfilter/lib/printstate.c
index a8777b2b59f2..d4ce40654a91 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.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printtunable.c b/contrib/ipfilter/lib/printtunable.c
index aa7ae5d0e578..5b64124c0488 100644
--- a/contrib/ipfilter/lib/printtunable.c
+++ b/contrib/ipfilter/lib/printtunable.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printtunable.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_hash.c b/contrib/ipfilter/lib/remove_hash.c
index 297db4827d73..f0cf81e39d5b 100644
--- a/contrib/ipfilter/lib/remove_hash.c
+++ b/contrib/ipfilter/lib/remove_hash.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/remove_hash.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_hashnode.c b/contrib/ipfilter/lib/remove_hashnode.c
index 47a19dcaa62f..3980d9408c3d 100644
--- a/contrib/ipfilter/lib/remove_hashnode.c
+++ b/contrib/ipfilter/lib/remove_hashnode.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/remove_hashnode.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_pool.c b/contrib/ipfilter/lib/remove_pool.c
index 1e7fe5f16cdf..d963491d07e2 100644
--- a/contrib/ipfilter/lib/remove_pool.c
+++ b/contrib/ipfilter/lib/remove_pool.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/remove_pool.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_poolnode.c b/contrib/ipfilter/lib/remove_poolnode.c
index c80ff7093c67..7fb556ac4a0d 100644
--- a/contrib/ipfilter/lib/remove_poolnode.c
+++ b/contrib/ipfilter/lib/remove_poolnode.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/remove_poolnode.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/resetlexer.c b/contrib/ipfilter/lib/resetlexer.c
index 8ea83f101a23..a1f8323e91e8 100644
--- a/contrib/ipfilter/lib/resetlexer.c
+++ b/contrib/ipfilter/lib/resetlexer.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/resetlexer.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/rwlock_emul.c b/contrib/ipfilter/lib/rwlock_emul.c
index 1ee247570082..087ab2b1b901 100644
--- a/contrib/ipfilter/lib/rwlock_emul.c
+++ b/contrib/ipfilter/lib/rwlock_emul.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/rwlock_emul.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/tcp_flags.c b/contrib/ipfilter/lib/tcp_flags.c
index 0b602e66ab30..9c582c7643dd 100644
--- a/contrib/ipfilter/lib/tcp_flags.c
+++ b/contrib/ipfilter/lib/tcp_flags.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/tcp_flags.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/tcpflags.c b/contrib/ipfilter/lib/tcpflags.c
index f01d7dc31573..8495b9d08a60 100644
--- a/contrib/ipfilter/lib/tcpflags.c
+++ b/contrib/ipfilter/lib/tcpflags.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/tcpflags.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2001-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/tcpoptnames.c b/contrib/ipfilter/lib/tcpoptnames.c
index 25e3b275a761..d199d9011174 100644
--- a/contrib/ipfilter/lib/tcpoptnames.c
+++ b/contrib/ipfilter/lib/tcpoptnames.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/tcpoptnames.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/v6ionames.c b/contrib/ipfilter/lib/v6ionames.c
index b57b301e67bc..a28b34f1ed31 100644
--- a/contrib/ipfilter/lib/v6ionames.c
+++ b/contrib/ipfilter/lib/v6ionames.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/v6ionames.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2003-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/v6optvalue.c b/contrib/ipfilter/lib/v6optvalue.c
index a60d076bfbb7..5699c8c2952a 100644
--- a/contrib/ipfilter/lib/v6optvalue.c
+++ b/contrib/ipfilter/lib/v6optvalue.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/v6optvalue.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/var.c b/contrib/ipfilter/lib/var.c
index 4a62d7aed2e7..0a5b1c92eef6 100644
--- a/contrib/ipfilter/lib/var.c
+++ b/contrib/ipfilter/lib/var.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/var.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/verbose.c b/contrib/ipfilter/lib/verbose.c
index f1b4516a96cd..afe8624a8ca1 100644
--- a/contrib/ipfilter/lib/verbose.c
+++ b/contrib/ipfilter/lib/verbose.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/lib/verbose.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000-2001 by Darren Reed.
diff --git a/contrib/ipfilter/man/Makefile b/contrib/ipfilter/man/Makefile
index 0b8f2a14c5a3..81a915bafb20 100644
--- a/contrib/ipfilter/man/Makefile
+++ b/contrib/ipfilter/man/Makefile
@@ -3,7 +3,7 @@
#
# See the IPFILTER.LICENCE file for details on licencing.
#
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/man/Makefile,v 1.2.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
#
all:
diff --git a/contrib/ipfilter/man/ipf.4 b/contrib/ipfilter/man/ipf.4
index dfef858d5dd8..dad1bd60646c 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.TH IPF 4
.SH NAME
ipf \- packet filtering kernel interface
diff --git a/contrib/ipfilter/man/ipf.5 b/contrib/ipfilter/man/ipf.5
index 8bdaedcba229..659699dcca36 100644
--- a/contrib/ipfilter/man/ipf.5
+++ b/contrib/ipfilter/man/ipf.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipf.5,v 1.10.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.TH IPF 5
.SH NAME
ipf, ipf.conf, ipf6.conf \- IP packet filter rule syntax
diff --git a/contrib/ipfilter/man/ipf.8 b/contrib/ipfilter/man/ipf.8
index 678010f73d26..01c3899d4026 100644
--- a/contrib/ipfilter/man/ipf.8
+++ b/contrib/ipfilter/man/ipf.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipf.8,v 1.8.10.1.2.1 2009/10/25 01:10:29 kensmith 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..04d259ae2752 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH IP\ FILTER 4
.SH NAME
diff --git a/contrib/ipfilter/man/ipfilter.5 b/contrib/ipfilter/man/ipfilter.5
index 97e504df15fa..a74bad327a99 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.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.TH IPFILTER 1
.SH NAME
IP Filter
diff --git a/contrib/ipfilter/man/ipfs.8 b/contrib/ipfilter/man/ipfs.8
index 01d0c707d60c..016a04a52593 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH IPFS 8
.SH NAME
diff --git a/contrib/ipfilter/man/ipfstat.8 b/contrib/ipfilter/man/ipfstat.8
index 44ba8ba0d430..7dfbd4b4fb40 100644
--- a/contrib/ipfilter/man/ipfstat.8
+++ b/contrib/ipfilter/man/ipfstat.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipfstat.8,v 1.11.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.TH ipfstat 8
.SH NAME
ipfstat \- reports on packet filter statistics and filter list
diff --git a/contrib/ipfilter/man/ipftest.1 b/contrib/ipfilter/man/ipftest.1
index 402195f318e1..8afc2364bd5f 100644
--- a/contrib/ipfilter/man/ipftest.1
+++ b/contrib/ipfilter/man/ipftest.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipftest.1,v 1.7.10.1.2.1 2009/10/25 01:10:29 kensmith 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..b17eacaef019 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH IPL 4
.SH NAME
diff --git a/contrib/ipfilter/man/ipmon.5 b/contrib/ipfilter/man/ipmon.5
index 081fc0856bc1..52af601979ff 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH IPMON 5
.SH NAME
diff --git a/contrib/ipfilter/man/ipmon.8 b/contrib/ipfilter/man/ipmon.8
index 1082e06ec262..452925f674a0 100644
--- a/contrib/ipfilter/man/ipmon.8
+++ b/contrib/ipfilter/man/ipmon.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipmon.8,v 1.18.10.1.2.1 2009/10/25 01:10:29 kensmith 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..2c4ca79abad8 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.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.TH IPNAT 4
.SH NAME
ipnat \- Network Address Translation kernel interface
diff --git a/contrib/ipfilter/man/ipnat.5 b/contrib/ipfilter/man/ipnat.5
index 6d3f9bcff457..7b0191a28bca 100644
--- a/contrib/ipfilter/man/ipnat.5
+++ b/contrib/ipfilter/man/ipnat.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipnat.5,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH IPNAT 5
.SH NAME
diff --git a/contrib/ipfilter/man/ipnat.8 b/contrib/ipfilter/man/ipnat.8
index 192c1e74ccd9..1c79ec5cd339 100644
--- a/contrib/ipfilter/man/ipnat.8
+++ b/contrib/ipfilter/man/ipnat.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipnat.8,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH IPNAT 8
.SH NAME
diff --git a/contrib/ipfilter/man/ippool.5 b/contrib/ipfilter/man/ippool.5
index 367eb8d6f2bb..846633c40f80 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.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH IPPOOL 5
.SH NAME
diff --git a/contrib/ipfilter/man/ippool.8 b/contrib/ipfilter/man/ippool.8
index 986812a14077..9346afcddd17 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH IPPOOL 8
.SH NAME
diff --git a/contrib/ipfilter/man/ipscan.5 b/contrib/ipfilter/man/ipscan.5
index 91bf9b0f5ebe..855d8939f7e3 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH IPSCAN 5
.SH NAME
diff --git a/contrib/ipfilter/man/ipscan.8 b/contrib/ipfilter/man/ipscan.8
index 513dc94a8050..209e4ac10933 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH IPSCAN 8
.SH NAME
diff --git a/contrib/ipfilter/man/mkfilters.1 b/contrib/ipfilter/man/mkfilters.1
index b9e1ddd8872a..6c1393b70a26 100644
--- a/contrib/ipfilter/man/mkfilters.1
+++ b/contrib/ipfilter/man/mkfilters.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/mkfilters.1,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH MKFILTERS 1
.SH NAME
diff --git a/contrib/ipfilter/md5.c b/contrib/ipfilter/md5.c
index 63dd4b415745..7bda8eb7fefe 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
diff --git a/contrib/ipfilter/md5.h b/contrib/ipfilter/md5.h
index 914df74355a0..dedd81f52e4b 100644
--- a/contrib/ipfilter/md5.h
+++ b/contrib/ipfilter/md5.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/md5.h,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
***********************************************************************
diff --git a/contrib/ipfilter/mlf_ipl.c b/contrib/ipfilter/mlf_ipl.c
index ca79596e3844..53f26f666a47 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.18.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/mlf_rule.c b/contrib/ipfilter/mlf_rule.c
index 8b7b9d3a9409..a9e2693f3784 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/mlfk_rule.c b/contrib/ipfilter/mlfk_rule.c
index 5f7aed89a7dd..70afce16ffc0 100644
--- a/contrib/ipfilter/mlfk_rule.c
+++ b/contrib/ipfilter/mlfk_rule.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/mlfk_rule.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000 by Darren Reed.
diff --git a/contrib/ipfilter/mlh_rule.c b/contrib/ipfilter/mlh_rule.c
index dd350dfb7b4f..57f0741c7686 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1993-1998 by Darren Reed.
diff --git a/contrib/ipfilter/net/.cvsignore b/contrib/ipfilter/net/.cvsignore
deleted file mode 100644
index 19f86f493ab1..000000000000
--- a/contrib/ipfilter/net/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-done
diff --git a/contrib/ipfilter/opts.h b/contrib/ipfilter/opts.h
index fa53c8f5fe90..d6d8beee04ae 100644
--- a/contrib/ipfilter/opts.h
+++ b/contrib/ipfilter/opts.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/opts.h,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2000 by Darren Reed.
diff --git a/contrib/ipfilter/pcap-bpf.h b/contrib/ipfilter/pcap-bpf.h
index 51002a3c2bea..5b7eb3d16d0d 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.22.1.2.1 2009/10/25 01:10:29 kensmith 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..dbd1b62111bf 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/radix.c b/contrib/ipfilter/radix.c
index 8c67562553e2..8cd24cb6e639 100644
--- a/contrib/ipfilter/radix.c
+++ b/contrib/ipfilter/radix.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/radix.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (c) 1988, 1989, 1993
diff --git a/contrib/ipfilter/radix_ipf.h b/contrib/ipfilter/radix_ipf.h
index 11e4ba761aae..d2a52788beed 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.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (c) 1988, 1989, 1993
diff --git a/contrib/ipfilter/rules/.cvsignore b/contrib/ipfilter/rules/.cvsignore
deleted file mode 100644
index 3e757656cf36..000000000000
--- a/contrib/ipfilter/rules/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-new
diff --git a/contrib/ipfilter/samples/.cvsignore b/contrib/ipfilter/samples/.cvsignore
deleted file mode 100644
index 4d38251c2f4f..000000000000
--- a/contrib/ipfilter/samples/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-userauth
-proxy
-relay
-trans_relay
diff --git a/contrib/ipfilter/samples/proxy.c b/contrib/ipfilter/samples/proxy.c
index 471cc736506a..4679fe46d423 100644
--- a/contrib/ipfilter/samples/proxy.c
+++ b/contrib/ipfilter/samples/proxy.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/samples/proxy.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Sample transparent proxy program.
diff --git a/contrib/ipfilter/samples/relay.c b/contrib/ipfilter/samples/relay.c
index ac5c60243b8f..297130dd4d8d 100644
--- a/contrib/ipfilter/samples/relay.c
+++ b/contrib/ipfilter/samples/relay.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/samples/relay.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith 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..74a472789578 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/contrib/ipfilter/snoop.h b/contrib/ipfilter/snoop.h
index 3cb54b99cc3f..9392fd9a3fee 100644
--- a/contrib/ipfilter/snoop.h
+++ b/contrib/ipfilter/snoop.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/snoop.h,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith 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..6f031feffd13 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.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
format=$2
mkdir -p results
if [ -f /usr/ucb/touch ] ; then
diff --git a/contrib/ipfilter/tools/ipf.c b/contrib/ipfilter/tools/ipf.c
index fe9fec2581ec..cff3bd62974e 100644
--- a/contrib/ipfilter/tools/ipf.c
+++ b/contrib/ipfilter/tools/ipf.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/tools/ipf.c,v 1.6.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipf_y.y b/contrib/ipfilter/tools/ipf_y.y
index 2ce4291f2ec8..20c6bf526d0a 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.7.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipfcomp.c b/contrib/ipfilter/tools/ipfcomp.c
index e00fe84a9af3..e6929b1e4dfd 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.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2001-2005 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipfs.c b/contrib/ipfilter/tools/ipfs.c
index eab650a7ee36..27f3a83a8012 100644
--- a/contrib/ipfilter/tools/ipfs.c
+++ b/contrib/ipfilter/tools/ipfs.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/tools/ipfs.c,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipfstat.c b/contrib/ipfilter/tools/ipfstat.c
index 3c5bfdd50ac4..c21f76833242 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.7.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipftest.c b/contrib/ipfilter/tools/ipftest.c
index 963ed197cb9c..3a808a71e622 100644
--- a/contrib/ipfilter/tools/ipftest.c
+++ b/contrib/ipfilter/tools/ipftest.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/tools/ipftest.c,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipmon.c b/contrib/ipfilter/tools/ipmon.c
index ceaed82cb4b3..380a660af015 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.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipmon_y.y b/contrib/ipfilter/tools/ipmon_y.y
index 98042d880222..58a6718fb292 100644
--- a/contrib/ipfilter/tools/ipmon_y.y
+++ b/contrib/ipfilter/tools/ipmon_y.y
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/tools/ipmon_y.y,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2001-2004 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipnat.c b/contrib/ipfilter/tools/ipnat.c
index 28e29ec74199..dad247073842 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.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipnat_y.y b/contrib/ipfilter/tools/ipnat_y.y
index 7109f60ec710..3c5cc555e1e1 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.7.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ippool.c b/contrib/ipfilter/tools/ippool.c
index 8b7096050736..92a98ca0725c 100644
--- a/contrib/ipfilter/tools/ippool.c
+++ b/contrib/ipfilter/tools/ippool.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/tools/ippool.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ippool_y.y b/contrib/ipfilter/tools/ippool_y.y
index 24f683bd1c19..842e4f3c2bd2 100644
--- a/contrib/ipfilter/tools/ippool_y.y
+++ b/contrib/ipfilter/tools/ippool_y.y
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/tools/ippool_y.y,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipscan_y.y b/contrib/ipfilter/tools/ipscan_y.y
index 5dbefd6ab5ae..0e583450bf3d 100644
--- a/contrib/ipfilter/tools/ipscan_y.y
+++ b/contrib/ipfilter/tools/ipscan_y.y
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/tools/ipscan_y.y,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2001-2004 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipsyncm.c b/contrib/ipfilter/tools/ipsyncm.c
index 600d39ad0d6c..b144b0889219 100644
--- a/contrib/ipfilter/tools/ipsyncm.c
+++ b/contrib/ipfilter/tools/ipsyncm.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/tools/ipsyncm.c,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipsyncs.c b/contrib/ipfilter/tools/ipsyncs.c
index 887eeab310c6..5451fbd46caf 100644
--- a/contrib/ipfilter/tools/ipsyncs.c
+++ b/contrib/ipfilter/tools/ipsyncs.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/tools/ipsyncs.c,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/lex_var.h b/contrib/ipfilter/tools/lex_var.h
index 78c5efc4263d..5efe3687c3b2 100644
--- a/contrib/ipfilter/tools/lex_var.h
+++ b/contrib/ipfilter/tools/lex_var.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/tools/lex_var.h,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/tools/lexer.c b/contrib/ipfilter/tools/lexer.c
index 989643c966b5..49675727c481 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.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/lexer.h b/contrib/ipfilter/tools/lexer.h
index d973ea42ae35..6c73a2d0e8c2 100644
--- a/contrib/ipfilter/tools/lexer.h
+++ b/contrib/ipfilter/tools/lexer.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/tools/lexer.h,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/less/FREEBSD-upgrade b/contrib/less/FREEBSD-upgrade
index 6d30dfd039c3..54a41fc0cfdb 100644
--- a/contrib/less/FREEBSD-upgrade
+++ b/contrib/less/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/less/FREEBSD-upgrade,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
1. Download latest less(1) tarball. The homepage of less(1) is at:
http://www.greenwoodsoftware.com/less/
diff --git a/contrib/less/command.c b/contrib/less/command.c
index 7e328c06e913..c4c08d047d1a 100644
--- a/contrib/less/command.c
+++ b/contrib/less/command.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/command.c,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1984-2009 Mark Nudelman
*
diff --git a/contrib/less/forwback.c b/contrib/less/forwback.c
index 51b6d453753a..35a6ba5b3192 100644
--- a/contrib/less/forwback.c
+++ b/contrib/less/forwback.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/forwback.c,v 1.9.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1984-2009 Mark Nudelman
*
diff --git a/contrib/less/less.h b/contrib/less/less.h
index ff032d7f1d95..30e4f410246e 100644
--- a/contrib/less/less.h
+++ b/contrib/less/less.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/less.h,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1984-2009 Mark Nudelman
*
diff --git a/contrib/less/line.c b/contrib/less/line.c
index 5a35084e9399..192629d0be52 100644
--- a/contrib/less/line.c
+++ b/contrib/less/line.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/line.c,v 1.9.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1984-2009 Mark Nudelman
*
diff --git a/contrib/less/main.c b/contrib/less/main.c
index 9ae74cac258f..53eb8afdef5c 100644
--- a/contrib/less/main.c
+++ b/contrib/less/main.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/main.c,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1984-2009 Mark Nudelman
*
diff --git a/contrib/less/prompt.c b/contrib/less/prompt.c
index 636624d91b9f..c377581d0c08 100644
--- a/contrib/less/prompt.c
+++ b/contrib/less/prompt.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/prompt.c,v 1.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1984-2009 Mark Nudelman
*
diff --git a/contrib/less/screen.c b/contrib/less/screen.c
index f61d21798dea..edd09468a872 100644
--- a/contrib/less/screen.c
+++ b/contrib/less/screen.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/screen.c,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1984-2009 Mark Nudelman
*
diff --git a/contrib/less/search.c b/contrib/less/search.c
index a70af0fb40d7..a357e7cd10b5 100644
--- a/contrib/less/search.c
+++ b/contrib/less/search.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/search.c,v 1.13.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (C) 1984-2009 Mark Nudelman
*
diff --git a/contrib/less/signal.c b/contrib/less/signal.c
index 08fda859825a..6b9ad17d096e 100644
--- a/contrib/less/signal.c
+++ b/contrib/less/signal.c
@@ -8,7 +8,7 @@
* contact the author, see the README file.
*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/signal.c,v 1.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Routines dealing with signals.
diff --git a/contrib/libf2c/FREEBSD-upgrade b/contrib/libf2c/FREEBSD-upgrade
index e919f546f552..110e2cc7e9ca 100644
--- a/contrib/libf2c/FREEBSD-upgrade
+++ b/contrib/libf2c/FREEBSD-upgrade
@@ -1,5 +1,5 @@
# ex:ts=8
-$FreeBSD$
+$FreeBSD: src/contrib/libf2c/FREEBSD-upgrade,v 1.4.56.1.2.1 2009/10/25 01:10:29 kensmith Exp $
For the import of lib{f,g}2c, files were pruned by:
diff --git a/contrib/libpcap/.cvsignore b/contrib/libpcap/.cvsignore
deleted file mode 100644
index 138c28814a08..000000000000
--- a/contrib/libpcap/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-config.log
-config.cache
-config.status
-config.h
-.devel
-stamp-h
-stamp-h.in
-Makefile
-scanner.c
-grammar.c
-tokdefs.h
-version.c
-version.h
diff --git a/contrib/libpcap/FREEBSD-Xlist b/contrib/libpcap/FREEBSD-Xlist
index 948318c6b996..6e5a3054b532 100644
--- a/contrib/libpcap/FREEBSD-Xlist
+++ b/contrib/libpcap/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/libpcap/FREEBSD-Xlist,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/README.*
*/msdos
*/SUNOS4
diff --git a/contrib/libpcap/FREEBSD-upgrade b/contrib/libpcap/FREEBSD-upgrade
index eea75c2951c4..6f3f0b0e255e 100644
--- a/contrib/libpcap/FREEBSD-upgrade
+++ b/contrib/libpcap/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/libpcap/FREEBSD-upgrade,v 1.6.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
This directory contains virgin copies of the original distribution files
on a "vendor" branch. Do not, under any circumstances, attempt to upgrade
diff --git a/contrib/libpcap/chmod_bpf b/contrib/libpcap/chmod_bpf
index 0a30d99301e4..0a30d99301e4 100755..100644
--- a/contrib/libpcap/chmod_bpf
+++ b/contrib/libpcap/chmod_bpf
diff --git a/contrib/libpcap/gencode.c b/contrib/libpcap/gencode.c
index 0fb9499e10db..9590c5b5acc9 100644
--- a/contrib/libpcap/gencode.c
+++ b/contrib/libpcap/gencode.c
@@ -19,7 +19,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/gencode.c,v 1.18.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
static const char rcsid[] _U_ =
diff --git a/contrib/libpcap/gencode.h b/contrib/libpcap/gencode.h
index 5fdec2867ca5..40c537a0bc72 100644
--- a/contrib/libpcap/gencode.h
+++ b/contrib/libpcap/gencode.h
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/gencode.h,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
* @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.70.2.1 2007/11/18 02:04:55 guy Exp $ (LBL)
*/
diff --git a/contrib/libpcap/grammar.y b/contrib/libpcap/grammar.y
index cc81984e4318..38911f302751 100644
--- a/contrib/libpcap/grammar.y
+++ b/contrib/libpcap/grammar.y
@@ -19,7 +19,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/grammar.y,v 1.13.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
static const char rcsid[] _U_ =
diff --git a/contrib/libpcap/ieee80211.h b/contrib/libpcap/ieee80211.h
index d79f0f8e3656..e6e9f3e98ed8 100644
--- a/contrib/libpcap/ieee80211.h
+++ b/contrib/libpcap/ieee80211.h
@@ -29,7 +29,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/ieee80211.h,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _NET80211_IEEE80211_H_
#define _NET80211_IEEE80211_H_
diff --git a/contrib/libpcap/nametoaddr.c b/contrib/libpcap/nametoaddr.c
index 479f1fd32eaf..80f762f27ff2 100644
--- a/contrib/libpcap/nametoaddr.c
+++ b/contrib/libpcap/nametoaddr.c
@@ -21,7 +21,7 @@
* Name to id translation routines used by the scanner.
* These functions are not time critical.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/nametoaddr.c,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/libpcap/nlpid.h b/contrib/libpcap/nlpid.h
index 7ea2963f108d..a61a4b6f2a96 100644
--- a/contrib/libpcap/nlpid.h
+++ b/contrib/libpcap/nlpid.h
@@ -15,7 +15,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/nlpid.h,v 1.3.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
* @(#) $Header: /tcpdump/master/libpcap/nlpid.h,v 1.2 2002/12/06 00:01:34 hannes Exp $ (Juniper)
*/
diff --git a/contrib/libpcap/pcap-bpf.c b/contrib/libpcap/pcap-bpf.c
index 8f35e4c80802..5ca6e58b2507 100644
--- a/contrib/libpcap/pcap-bpf.c
+++ b/contrib/libpcap/pcap-bpf.c
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap-bpf.c,v 1.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
static const char rcsid[] _U_ =
diff --git a/contrib/libpcap/pcap-int.h b/contrib/libpcap/pcap-int.h
index 3a50406b876d..b222101f428a 100644
--- a/contrib/libpcap/pcap-int.h
+++ b/contrib/libpcap/pcap-int.h
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap-int.h,v 1.15.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
* @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.85.2.9 2008-09-16 00:21:08 guy Exp $ (LBL)
*/
diff --git a/contrib/libpcap/pcap-namedb.h b/contrib/libpcap/pcap-namedb.h
index e9ef300a5ee1..187289dc2f96 100644
--- a/contrib/libpcap/pcap-namedb.h
+++ b/contrib/libpcap/pcap-namedb.h
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap-namedb.h,v 1.7.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
* @(#) $Header: /tcpdump/master/libpcap/pcap-namedb.h,v 1.13 2006/10/04 18:13:32 guy Exp $ (LBL)
*/
diff --git a/contrib/libpcap/pcap.h b/contrib/libpcap/pcap.h
index 270f001e7ee3..e30fea820dce 100644
--- a/contrib/libpcap/pcap.h
+++ b/contrib/libpcap/pcap.h
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.17.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
* @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.59 2006/10/04 18:09:22 guy Exp $ (LBL)
*/
diff --git a/contrib/libpcap/runlex.sh b/contrib/libpcap/runlex.sh
index 497a6186f266..497a6186f266 100755..100644
--- a/contrib/libpcap/runlex.sh
+++ b/contrib/libpcap/runlex.sh
diff --git a/contrib/libpcap/scanner.l b/contrib/libpcap/scanner.l
index 551b2cca9306..049e97fd4c10 100644
--- a/contrib/libpcap/scanner.l
+++ b/contrib/libpcap/scanner.l
@@ -19,7 +19,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/scanner.l,v 1.15.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/libreadline/FREEBSD-upgrade b/contrib/libreadline/FREEBSD-upgrade
index 59b86211481f..2fc22d0e22a2 100644
--- a/contrib/libreadline/FREEBSD-upgrade
+++ b/contrib/libreadline/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
#
# Official patch 001 imported as v5_2_p1
# Official patch 002 imported as v5_2_p2
diff --git a/contrib/libreadline/complete.c b/contrib/libreadline/complete.c
index 9a930a1a0405..a07570254cdb 100644
--- a/contrib/libreadline/complete.c
+++ b/contrib/libreadline/complete.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* complete.c -- filename completion for readline. */
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
diff --git a/contrib/libreadline/display.c b/contrib/libreadline/display.c
index 728364fbab0d..75815dd87682 100644
--- a/contrib/libreadline/display.c
+++ b/contrib/libreadline/display.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/display.c,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* display.c -- readline redisplay facility. */
/* Copyright (C) 1987-2006 Free Software Foundation, Inc.
diff --git a/contrib/libreadline/doc/readline.3 b/contrib/libreadline/doc/readline.3
index d359cb678950..ea6e87637034 100644
--- a/contrib/libreadline/doc/readline.3
+++ b/contrib/libreadline/doc/readline.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/libreadline/doc/readline.3,v 1.12.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.\" MAN PAGE COMMENTS to
.\"
diff --git a/contrib/libreadline/readline.h b/contrib/libreadline/readline.h
index fab2f7f36f75..d3a4a163b111 100644
--- a/contrib/libreadline/readline.h
+++ b/contrib/libreadline/readline.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/readline.h,v 1.18.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* Readline.h -- the names of functions callable from within readline. */
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
diff --git a/contrib/libreadline/rlconf.h b/contrib/libreadline/rlconf.h
index 041abba8a645..1070666aef56 100644
--- a/contrib/libreadline/rlconf.h
+++ b/contrib/libreadline/rlconf.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/rlconf.h,v 1.8.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* rlconf.h -- readline configuration definitions */
/* Copyright (C) 1994 Free Software Foundation, Inc.
diff --git a/contrib/libreadline/shell.c b/contrib/libreadline/shell.c
index 58ecd8e1b8a7..9cc80c3627b7 100644
--- a/contrib/libreadline/shell.c
+++ b/contrib/libreadline/shell.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/shell.c,v 1.10.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* shell.c -- readline utility functions that are normally provided by
bash when readline is linked as part of the shell. */
diff --git a/contrib/libreadline/terminal.c b/contrib/libreadline/terminal.c
index bbc1fa490960..beb2e3842383 100644
--- a/contrib/libreadline/terminal.c
+++ b/contrib/libreadline/terminal.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/terminal.c,v 1.10.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* terminal.c -- controlling the terminal with termcap. */
/* Copyright (C) 1996-2006 Free Software Foundation, Inc.
diff --git a/contrib/libreadline/util.c b/contrib/libreadline/util.c
index 83974e3cd860..96daf4771cd9 100644
--- a/contrib/libreadline/util.c
+++ b/contrib/libreadline/util.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/util.c,v 1.11.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* util.c -- readline utility functions */
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
diff --git a/contrib/libreadline/vi_mode.c b/contrib/libreadline/vi_mode.c
index 342d454851e5..ffcabe394de3 100644
--- a/contrib/libreadline/vi_mode.c
+++ b/contrib/libreadline/vi_mode.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/vi_mode.c,v 1.7.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* vi_mode.c -- A vi emulation mode for Bash.
Derived from code written by Jeff Sparkes (jsparkes@bnr.ca). */
diff --git a/contrib/lukemftpd/src/ftpd.c b/contrib/lukemftpd/src/ftpd.c
index afdd5173fa80..46c2ba3a9029 100644
--- a/contrib/lukemftpd/src/ftpd.c
+++ b/contrib/lukemftpd/src/ftpd.c
@@ -107,7 +107,7 @@ static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: ftpd.c,v 1.176 2006/05/09 20:18:06 mrg Exp $");
#endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/lukemftpd/src/ftpd.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#endif /* not lint */
/*
diff --git a/contrib/lukemftpd/src/ftpd.conf.5 b/contrib/lukemftpd/src/ftpd.conf.5
index be73c48c1537..7080e46debb0 100644
--- a/contrib/lukemftpd/src/ftpd.conf.5
+++ b/contrib/lukemftpd/src/ftpd.conf.5
@@ -1,5 +1,5 @@
.\" $NetBSD: ftpd.conf.5,v 1.32 2005/09/11 23:31:46 wiz Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/lukemftpd/src/ftpd.conf.5,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.\" Copyright (c) 1997-2001, 2005 The NetBSD Foundation, Inc.
.\" All rights reserved.
diff --git a/contrib/ncurses/FREEBSD-Xlist b/contrib/ncurses/FREEBSD-Xlist
index a0ee58e5a0ea..22d79fa4c7fa 100644
--- a/contrib/ncurses/FREEBSD-Xlist
+++ b/contrib/ncurses/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/ncurses/FREEBSD-Xlist,v 1.1.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
Ada95
c++
diff --git a/contrib/ncurses/FREEBSD-upgrade b/contrib/ncurses/FREEBSD-upgrade
index ffa4ccb7b56b..aa43af111814 100644
--- a/contrib/ncurses/FREEBSD-upgrade
+++ b/contrib/ncurses/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/ncurses/FREEBSD-upgrade,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
ncurses
diff --git a/contrib/ncurses/ncurses/tinfo/comp_scan.c b/contrib/ncurses/ncurses/tinfo/comp_scan.c
index da97dad89ad8..aa38376e5466 100644
--- a/contrib/ncurses/ncurses/tinfo/comp_scan.c
+++ b/contrib/ncurses/ncurses/tinfo/comp_scan.c
@@ -32,7 +32,7 @@
* and: Thomas E. Dickey 1996 on *
****************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ncurses/ncurses/tinfo/comp_scan.c,v 1.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* comp_scan.c --- Lexical scanner for terminfo compiler.
diff --git a/contrib/ncurses/ncurses/tinfo/lib_termcap.c b/contrib/ncurses/ncurses/tinfo/lib_termcap.c
index addcc2472bd7..ce86562df83e 100644
--- a/contrib/ncurses/ncurses/tinfo/lib_termcap.c
+++ b/contrib/ncurses/ncurses/tinfo/lib_termcap.c
@@ -36,7 +36,7 @@
* (but it has changed a lot) *
****************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ncurses/ncurses/tinfo/lib_termcap.c,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#define __INTERNAL_CAPS_VISIBLE
#include <curses.priv.h>
diff --git a/contrib/netcat/FREEBSD-Xlist b/contrib/netcat/FREEBSD-Xlist
index b69f5e4de371..9cd708aef4a7 100644
--- a/contrib/netcat/FREEBSD-Xlist
+++ b/contrib/netcat/FREEBSD-Xlist
@@ -1,3 +1,3 @@
-$FreeBSD$
+$FreeBSD: src/contrib/netcat/FREEBSD-Xlist,v 1.1.24.1.2.1 2009/10/25 01:10:29 kensmith Exp $
Makefile
diff --git a/contrib/netcat/FREEBSD-upgrade b/contrib/netcat/FREEBSD-upgrade
index 5a52ebc64816..cc838765e3ec 100644
--- a/contrib/netcat/FREEBSD-upgrade
+++ b/contrib/netcat/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/netcat/FREEBSD-upgrade,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
1. Export from OpenBSD's nc(1) into an empty directory (say "v-nc").
2. while read pattern; do rm ${pattern} ; done < FREEBSD-Xlist
diff --git a/contrib/netcat/FREEBSD-vendor b/contrib/netcat/FREEBSD-vendor
index 1009e388e2e0..45ccf4965c81 100644
--- a/contrib/netcat/FREEBSD-vendor
+++ b/contrib/netcat/FREEBSD-vendor
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/netcat/FREEBSD-vendor,v 1.2.2.2.2.1 2009/10/25 01:10:29 kensmith Exp $
Project: netcat (aka src/usr.bin/nc in OpenBSD)
ProjectURL: http://www.openbsd.org/
Version: 4.4
diff --git a/contrib/netcat/nc.1 b/contrib/netcat/nc.1
index b770a527e09a..47ddd2578f1a 100644
--- a/contrib/netcat/nc.1
+++ b/contrib/netcat/nc.1
@@ -25,7 +25,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd May 6 2008
.Dt NC 1
diff --git a/contrib/netcat/netcat.c b/contrib/netcat/netcat.c
index d0c3881e3faf..8d22df34e752 100644
--- a/contrib/netcat/netcat.c
+++ b/contrib/netcat/netcat.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/netcat/netcat.c,v 1.10.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/ngatm/FREEBSD-Xlist b/contrib/ngatm/FREEBSD-Xlist
index 32e28ddb55fb..ce4764cbd192 100644
--- a/contrib/ngatm/FREEBSD-Xlist
+++ b/contrib/ngatm/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/contrib/ngatm/FREEBSD-Xlist,v 1.1.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/VERSION
*/README
*/Makefile.in
diff --git a/contrib/ngatm/FREEBSD-upgrade b/contrib/ngatm/FREEBSD-upgrade
index 4557bf72bad2..811bb30c4de6 100644
--- a/contrib/ngatm/FREEBSD-upgrade
+++ b/contrib/ngatm/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/ngatm/FREEBSD-upgrade,v 1.1.32.1.2.1 2009/10/25 01:10:29 kensmith Exp $
This is the user part of the NgATM stuff. Be careful to feed changes
back to the maintainer <harti@freebsd.org>, because the code here is
diff --git a/contrib/ntp/bootstrap b/contrib/ntp/bootstrap
index 1a5aff06dcc8..1a5aff06dcc8 100755..100644
--- a/contrib/ntp/bootstrap
+++ b/contrib/ntp/bootstrap
diff --git a/contrib/ntp/libntp/ntp_random.c b/contrib/ntp/libntp/ntp_random.c
index 700b4ee65101..c589b4ef4572 100644
--- a/contrib/ntp/libntp/ntp_random.c
+++ b/contrib/ntp/libntp/ntp_random.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/stdlib/random.c,v 1.4.2.2 1999/09/05 11:16:45 peter Exp $
+ * $FreeBSD: src/contrib/ntp/libntp/ntp_random.c,v 1.1.6.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*
*/
diff --git a/contrib/ntp/ntpd/ntp_control.c b/contrib/ntp/ntpd/ntp_control.c
index 15f5856f2798..b450f5080eb6 100644
--- a/contrib/ntp/ntpd/ntp_control.c
+++ b/contrib/ntp/ntpd/ntp_control.c
@@ -3,7 +3,7 @@
*/
/*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/ntp/ntpd/ntp_control.c,v 1.10.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifdef HAVE_CONFIG_H
diff --git a/contrib/ntp/scripts/VersionName b/contrib/ntp/scripts/VersionName
index f601cc34821e..f601cc34821e 100755..100644
--- a/contrib/ntp/scripts/VersionName
+++ b/contrib/ntp/scripts/VersionName
diff --git a/contrib/ntp/scripts/genCommitLog b/contrib/ntp/scripts/genCommitLog
index 2a258add4301..2a258add4301 100755..100644
--- a/contrib/ntp/scripts/genCommitLog
+++ b/contrib/ntp/scripts/genCommitLog
diff --git a/contrib/ntp/scripts/genver b/contrib/ntp/scripts/genver
index 0ce192213b48..0ce192213b48 100755..100644
--- a/contrib/ntp/scripts/genver
+++ b/contrib/ntp/scripts/genver
diff --git a/contrib/ntp/scripts/html2man.in b/contrib/ntp/scripts/html2man.in
index b7cebce32b0a..b7cebce32b0a 100755..100644
--- a/contrib/ntp/scripts/html2man.in
+++ b/contrib/ntp/scripts/html2man.in
diff --git a/contrib/ntp/sntp/compile b/contrib/ntp/sntp/compile
index 1b1d23216958..1b1d23216958 100755..100644
--- a/contrib/ntp/sntp/compile
+++ b/contrib/ntp/sntp/compile
diff --git a/contrib/nvi/cl/cl_screen.c b/contrib/nvi/cl/cl_screen.c
index bfb9199352d9..b86c930e3536 100644
--- a/contrib/nvi/cl/cl_screen.c
+++ b/contrib/nvi/cl/cl_screen.c
@@ -6,7 +6,7 @@
*
* See the LICENSE file for redistribution information.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/nvi/cl/cl_screen.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "config.h"
diff --git a/contrib/nvi/common/exf.c b/contrib/nvi/common/exf.c
index e332f4700e71..3663e9d7d6d7 100644
--- a/contrib/nvi/common/exf.c
+++ b/contrib/nvi/common/exf.c
@@ -15,7 +15,7 @@
static const char sccsid[] = "@(#)exf.c 10.49 (Berkeley) 10/10/96";
#endif
static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/contrib/nvi/common/exf.c,v 1.5.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/contrib/nvi/docs/USD.doc/vi.man/vi.1 b/contrib/nvi/docs/USD.doc/vi.man/vi.1
index 4d8c08db54ff..9031e9a9304e 100644
--- a/contrib/nvi/docs/USD.doc/vi.man/vi.1
+++ b/contrib/nvi/docs/USD.doc/vi.man/vi.1
@@ -9,7 +9,7 @@
.\" See the LICENSE file for redistribution information.
.\"
.\" @(#)vi.1 8.51 (Berkeley) 10/10/96
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/nvi/docs/USD.doc/vi.man/vi.1,v 1.5.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH VI 1 "October 10, 1996"
.UC
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/vi.ref b/contrib/nvi/docs/USD.doc/vi.ref/vi.ref
index 12a483f1edb1..e8da353a8ba2 100644
--- a/contrib/nvi/docs/USD.doc/vi.ref/vi.ref
+++ b/contrib/nvi/docs/USD.doc/vi.ref/vi.ref
@@ -10,7 +10,7 @@
.\"
.\" @(#)vi.ref 8.88 (Berkeley) 10/19/96
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/nvi/docs/USD.doc/vi.ref/vi.ref,v 1.2.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.so ref.so
.tp
diff --git a/contrib/nvi/ex/ex.c b/contrib/nvi/ex/ex.c
index ecdae4b86934..72ffc7e3c12d 100644
--- a/contrib/nvi/ex/ex.c
+++ b/contrib/nvi/ex/ex.c
@@ -7,7 +7,7 @@
* See the LICENSE file for redistribution information.
*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/nvi/ex/ex.c,v 1.2.56.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include "config.h"
diff --git a/contrib/nvi/perl_api/perl.xs b/contrib/nvi/perl_api/perl.xs
index 3b89ea44cc92..3423304fcc7f 100644
--- a/contrib/nvi/perl_api/perl.xs
+++ b/contrib/nvi/perl_api/perl.xs
@@ -10,7 +10,7 @@
*
* See the LICENSE file for redistribution information.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/nvi/perl_api/perl.xs,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "config.h"
diff --git a/contrib/nvi/vi/vs_line.c b/contrib/nvi/vi/vs_line.c
index 495e75e8f1b6..fdadf7aa7ae6 100644
--- a/contrib/nvi/vi/vs_line.c
+++ b/contrib/nvi/vi/vs_line.c
@@ -14,7 +14,7 @@
static const char sccsid[] = "@(#)vs_line.c 10.19 (Berkeley) 9/26/96";
#endif
static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/contrib/nvi/vi/vs_line.c,v 1.5.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/contrib/nvi/vi/vs_refresh.c b/contrib/nvi/vi/vs_refresh.c
index f69d3820db7f..bcd21f9e05ff 100644
--- a/contrib/nvi/vi/vs_refresh.c
+++ b/contrib/nvi/vi/vs_refresh.c
@@ -14,7 +14,7 @@
static const char sccsid[] = "@(#)vs_refresh.c 10.44 (Berkeley) 10/13/96";
#endif
static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/contrib/nvi/vi/vs_refresh.c,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/contrib/one-true-awk/FREEBSD-upgrade b/contrib/one-true-awk/FREEBSD-upgrade
index f0f70ab7b17b..d8117e80cd3c 100644
--- a/contrib/one-true-awk/FREEBSD-upgrade
+++ b/contrib/one-true-awk/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
Import of the 2005/04/24 version of the "one true awk", as described
in "The AWK Programming Language", by Al Aho, Brian Kernighan, and
diff --git a/contrib/openbsm/FREEBSD-upgrade b/contrib/openbsm/FREEBSD-upgrade
index e1776753355e..fd2c946f11f9 100644
--- a/contrib/openbsm/FREEBSD-upgrade
+++ b/contrib/openbsm/FREEBSD-upgrade
@@ -53,4 +53,4 @@ the version in contrib/openbsm/bsm, so buildworld tests before committing
are necessary, and the commits to various parts of the system must be
made in close succession.
-$FreeBSD$
+$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.7.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
diff --git a/contrib/openbsm/etc/audit_class b/contrib/openbsm/etc/audit_class
index 9e020ebbd624..4fb72a4e0654 100644
--- a/contrib/openbsm/etc/audit_class
+++ b/contrib/openbsm/etc/audit_class
@@ -1,6 +1,6 @@
#
# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_class#6 $
-# $FreeBSD$
+# $FreeBSD: src/contrib/openbsm/etc/audit_class,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
#
0x00000000:no:invalid class
0x00000001:fr:file read
diff --git a/contrib/openbsm/etc/audit_control b/contrib/openbsm/etc/audit_control
index 42e7cd30e93c..d5b319316bfa 100644
--- a/contrib/openbsm/etc/audit_control
+++ b/contrib/openbsm/etc/audit_control
@@ -1,6 +1,6 @@
#
# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#8 $
-# $FreeBSD$
+# $FreeBSD: src/contrib/openbsm/etc/audit_control,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
#
dir:/var/audit
flags:lo,aa
diff --git a/contrib/openbsm/etc/audit_event b/contrib/openbsm/etc/audit_event
index 46c4d6e5240e..e77ebd7fcf51 100644
--- a/contrib/openbsm/etc/audit_event
+++ b/contrib/openbsm/etc/audit_event
@@ -1,6 +1,6 @@
#
# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#41 $
-# $FreeBSD$
+# $FreeBSD: src/contrib/openbsm/etc/audit_event,v 1.15.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
#
# The mapping between event identifiers and values is also hard-coded in
# audit_kevents.h and audit_uevents.h, so changes must occur in both places,
diff --git a/contrib/openbsm/etc/audit_user b/contrib/openbsm/etc/audit_user
index 0cce4f197439..ba49c67fd100 100644
--- a/contrib/openbsm/etc/audit_user
+++ b/contrib/openbsm/etc/audit_user
@@ -1,5 +1,5 @@
#
# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_user#3 $
-# $FreeBSD$
+# $FreeBSD: src/contrib/openbsm/etc/audit_user,v 1.2.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
#
root:lo:no
diff --git a/contrib/openbsm/etc/audit_warn b/contrib/openbsm/etc/audit_warn
index c5a31590fc8d..11c2b73a0592 100644
--- a/contrib/openbsm/etc/audit_warn
+++ b/contrib/openbsm/etc/audit_warn
@@ -1,6 +1,6 @@
#!/bin/sh
#
# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_warn#3 $
-# $FreeBSD$
+# $FreeBSD: src/contrib/openbsm/etc/audit_warn,v 1.2.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
#
logger -p security.warning "audit warning: $@"
diff --git a/contrib/openpam/FREEBSD-vendor b/contrib/openpam/FREEBSD-vendor
index 51a8bbfa4803..892b32b900b7 100644
--- a/contrib/openpam/FREEBSD-vendor
+++ b/contrib/openpam/FREEBSD-vendor
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/openpam/FREEBSD-vendor,v 1.1.2.2.2.1 2009/10/25 01:10:29 kensmith Exp $
Project: OpenPAM
ProjectURL: http://www.openpam.org/
Version: Hydrangea (20071221)
diff --git a/contrib/opie/ftpcmd.y b/contrib/opie/ftpcmd.y
index abcffdc69568..ba6ae33ab35a 100644
--- a/contrib/opie/ftpcmd.y
+++ b/contrib/opie/ftpcmd.y
@@ -23,7 +23,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
Modified at NRL for OPIE 2.0.
Originally from BSD.
-$FreeBSD$
+$FreeBSD: src/contrib/opie/ftpcmd.y,v 1.4.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
* Copyright (c) 1985, 1988 Regents of the University of California.
diff --git a/contrib/opie/libopie/challenge.c b/contrib/opie/libopie/challenge.c
index fc836aa6cc5d..c02e7cbf6275 100644
--- a/contrib/opie/libopie/challenge.c
+++ b/contrib/opie/libopie/challenge.c
@@ -21,7 +21,7 @@ License Agreement applies to this software.
Modified by cmetz for OPIE 2.2. Use FUNCTION declaration et al.
Created at NRL for OPIE 2.2 from opiesubr2.c
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/challenge.c,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "opie_cfg.h"
diff --git a/contrib/opie/libopie/generator.c b/contrib/opie/libopie/generator.c
index d4888f990e3b..10a13a8f1cb1 100644
--- a/contrib/opie/libopie/generator.c
+++ b/contrib/opie/libopie/generator.c
@@ -29,7 +29,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
Bug fixes.
Created at NRL for OPIE 2.2.
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/generator.c,v 1.5.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "opie_cfg.h"
diff --git a/contrib/opie/libopie/hash.c b/contrib/opie/libopie/hash.c
index babcbfae3aa9..03bc0db77f87 100644
--- a/contrib/opie/libopie/hash.c
+++ b/contrib/opie/libopie/hash.c
@@ -14,7 +14,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
they killed thread-safety.
Created by cmetz for OPIE 2.3 using the old hash.c as a guide.
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/hash.c,v 1.6.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "opie_cfg.h"
diff --git a/contrib/opie/libopie/hashlen.c b/contrib/opie/libopie/hashlen.c
index 29d855deaa3b..a999c72ef45e 100644
--- a/contrib/opie/libopie/hashlen.c
+++ b/contrib/opie/libopie/hashlen.c
@@ -11,7 +11,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
Modified by cmetz for OPIE 2.4. Use struct opie_otpkey, isolate variables.
Created by cmetz for OPIE 2.3.
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/hashlen.c,v 1.6.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "opie_cfg.h"
diff --git a/contrib/opie/libopie/insecure.c b/contrib/opie/libopie/insecure.c
index bc61c5457ea3..eb4f4a7bef99 100644
--- a/contrib/opie/libopie/insecure.c
+++ b/contrib/opie/libopie/insecure.c
@@ -28,7 +28,7 @@ License Agreement applies to this software.
Created at NRL for OPIE 2.2 from opiesubr.c. Fixed pointer
assignment that should have been a comparison.
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/insecure.c,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "opie_cfg.h"
diff --git a/contrib/opie/libopie/lock.c b/contrib/opie/libopie/lock.c
index 865d270bb527..b02fb55b35b6 100644
--- a/contrib/opie/libopie/lock.c
+++ b/contrib/opie/libopie/lock.c
@@ -29,7 +29,7 @@ License Agreement applies to this software.
Avoid NULL.
Created at NRL for OPIE 2.2 from opiesubr2.c
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/lock.c,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "opie_cfg.h"
#if HAVE_STRING_H
diff --git a/contrib/opie/libopie/newseed.c b/contrib/opie/libopie/newseed.c
index 2965b0efc6a7..4018efbf4819 100644
--- a/contrib/opie/libopie/newseed.c
+++ b/contrib/opie/libopie/newseed.c
@@ -14,7 +14,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
Modified by cmetz for OPIE 2.31. Added time.h.
Created by cmetz for OPIE 2.22.
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/newseed.c,v 1.5.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "opie_cfg.h"
diff --git a/contrib/opie/libopie/readrec.c b/contrib/opie/libopie/readrec.c
index f56af7ffb73d..c0262f645bf1 100644
--- a/contrib/opie/libopie/readrec.c
+++ b/contrib/opie/libopie/readrec.c
@@ -15,7 +15,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
records. Set read flag.
Created by cmetz for OPIE 2.3.
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/readrec.c,v 1.2.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "opie_cfg.h"
diff --git a/contrib/opie/libopie/writerec.c b/contrib/opie/libopie/writerec.c
index 3d88b34c228b..2c40bdae2396 100644
--- a/contrib/opie/libopie/writerec.c
+++ b/contrib/opie/libopie/writerec.c
@@ -14,7 +14,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
support. Fixed passwd bug.
Created by cmetz for OPIE 2.3 from passwd.c.
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/writerec.c,v 1.2.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "opie_cfg.h"
diff --git a/contrib/opie/opie.4 b/contrib/opie/opie.4
index 3ac19324a39d..f42725c1c18e 100644
--- a/contrib/opie/opie.4
+++ b/contrib/opie/opie.4
@@ -21,7 +21,7 @@
.\" Definition of "seed" written by Neil Haller of Bellcore
.\" Written at NRL for OPIE 2.0.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/opie/opie.4,v 1.8.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH OPIE 4 "January 10, 1995"
.SH NAME
diff --git a/contrib/opie/opie.h b/contrib/opie/opie.h
index be508c77f73d..c162065adb30 100644
--- a/contrib/opie/opie.h
+++ b/contrib/opie/opie.h
@@ -37,7 +37,7 @@ License Agreement applies to this software.
Written at Bellcore for the S/Key Version 1 software distribution
(skey.h).
-$FreeBSD$
+$FreeBSD: src/contrib/opie/opie.h,v 1.8.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _OPIE_H
#define _OPIE_H 1
diff --git a/contrib/opie/opie_cfg.h b/contrib/opie/opie_cfg.h
index bd000ae60a33..d54b4ec2b758 100644
--- a/contrib/opie/opie_cfg.h
+++ b/contrib/opie/opie_cfg.h
@@ -48,7 +48,7 @@ License Agreement applies to this software.
Gutted for autoconf. Split up for autoconf.
Written at NRL for OPIE 2.0.
-$FreeBSD$
+$FreeBSD: src/contrib/opie/opie_cfg.h,v 1.5.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _OPIE_CFG_H
diff --git a/contrib/opie/opieaccess.5 b/contrib/opie/opieaccess.5
index 41b1ec0e03b7..0f1e2f7f609c 100644
--- a/contrib/opie/opieaccess.5
+++ b/contrib/opie/opieaccess.5
@@ -13,7 +13,7 @@
.ll 6i
.pl 10.5i
.\" @(#)opieaccess.5 2.0 (NRL) 1/10/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/opie/opieaccess.5,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.lt 6.0i
.TH OPIEACCESS 5 "January 10, 1995"
diff --git a/contrib/opie/opieftpd.c b/contrib/opie/opieftpd.c
index eb6015f4130e..57cbd5befad7 100644
--- a/contrib/opie/opieftpd.c
+++ b/contrib/opie/opieftpd.c
@@ -48,7 +48,7 @@ License Agreement applies to this software.
There is some really, really ugly code in here.
-$FreeBSD$
+$FreeBSD: src/contrib/opie/opieftpd.c,v 1.5.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
* Copyright (c) 1985, 1988, 1990 Regents of the University of California.
diff --git a/contrib/opie/opieinfo.1 b/contrib/opie/opieinfo.1
index 41cdebe8dec4..246a22289ba2 100644
--- a/contrib/opie/opieinfo.1
+++ b/contrib/opie/opieinfo.1
@@ -19,7 +19,7 @@
.\" Written at Bellcore for the S/Key Version 1 software distribution
.\" (keyinfo.1).
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/opie/opieinfo.1,v 1.5.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.ll 6i
.pl 10.5i
.lt 6.0i
diff --git a/contrib/opie/opieinfo.c b/contrib/opie/opieinfo.c
index 09f9784241d8..f1ca71197cce 100644
--- a/contrib/opie/opieinfo.c
+++ b/contrib/opie/opieinfo.c
@@ -30,7 +30,7 @@ License Agreement applies to this software.
Written at Bellcore for the S/Key Version 1 software distribution
(keyinfo)
-$FreeBSD$
+$FreeBSD: src/contrib/opie/opieinfo.c,v 1.4.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
diff --git a/contrib/opie/opiekey.1 b/contrib/opie/opiekey.1
index bc62b9460d90..9cdc2e0c29ff 100644
--- a/contrib/opie/opiekey.1
+++ b/contrib/opie/opiekey.1
@@ -25,7 +25,7 @@
.\" Written at Bellcore for the S/Key Version 1 software distribution
.\" (key.1).
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/opie/opiekey.1,v 1.7.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.ll 6i
.pl 10.5i
.lt 6.0i
diff --git a/contrib/opie/opiekey.c b/contrib/opie/opiekey.c
index 20ba658710ee..fc87e4347022 100644
--- a/contrib/opie/opiekey.c
+++ b/contrib/opie/opiekey.c
@@ -37,7 +37,7 @@ License Agreement applies to this software.
Written at Bellcore for the S/Key Version 1 software distribution
(skey.c).
-$FreeBSD$
+$FreeBSD: src/contrib/opie/opiekey.c,v 1.4.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "opie_cfg.h"
diff --git a/contrib/opie/opiekeys.5 b/contrib/opie/opiekeys.5
index 26f08ed06ff8..81e3ea9eb27d 100644
--- a/contrib/opie/opiekeys.5
+++ b/contrib/opie/opiekeys.5
@@ -14,7 +14,7 @@
.ll 6i
.pl 10.5i
.\" @(#)opiekeys.5 2.0 (NRL) 1/10/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/opie/opiekeys.5,v 1.4.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.lt 6.0i
.TH OPIEKEYS 5 "January 10, 1995"
diff --git a/contrib/opie/opiepasswd.1 b/contrib/opie/opiepasswd.1
index 5ce6cb010b4f..53244b64d07f 100644
--- a/contrib/opie/opiepasswd.1
+++ b/contrib/opie/opiepasswd.1
@@ -22,7 +22,7 @@
.\" Written at Bellcore for the S/Key Version 1 software distribution
.\" (keyinit.1).
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/opie/opiepasswd.1,v 1.5.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.ll 6i
.pl 10.5i
.lt 6.0i
diff --git a/contrib/opie/opiepasswd.c b/contrib/opie/opiepasswd.c
index cd4ff018c3a0..6a2f38b4949f 100644
--- a/contrib/opie/opiepasswd.c
+++ b/contrib/opie/opiepasswd.c
@@ -44,7 +44,7 @@ License Agreement applies to this software.
Written at Bellcore for the S/Key Version 1 software distribution
(skeyinit.c).
- $FreeBSD$
+ $FreeBSD: src/contrib/opie/opiepasswd.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include "opie_cfg.h"
diff --git a/contrib/opie/popen.c b/contrib/opie/popen.c
index 99aad17025a6..2badc4280f1c 100644
--- a/contrib/opie/popen.c
+++ b/contrib/opie/popen.c
@@ -23,7 +23,7 @@ License Agreement applies to this software.
Modified at NRL for OPIE 2.0.
Originally from BSD.
-$FreeBSD$
+$FreeBSD: src/contrib/opie/popen.c,v 1.2.32.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
* Copyright (c) 1988, 1993, 1994
diff --git a/contrib/pf/authpf/authpf.8 b/contrib/pf/authpf/authpf.8
index bd4ff402d7de..e021462658f4 100644
--- a/contrib/pf/authpf/authpf.8
+++ b/contrib/pf/authpf/authpf.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/authpf/authpf.8,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\" $OpenBSD: authpf.8,v 1.43 2007/02/24 17:21:04 beck Exp $
.\"
.\" Copyright (c) 1998-2007 Bob Beck (beck@openbsd.org>. All rights reserved.
diff --git a/contrib/pf/authpf/authpf.c b/contrib/pf/authpf/authpf.c
index 56d7728a330c..717014205d43 100644
--- a/contrib/pf/authpf/authpf.c
+++ b/contrib/pf/authpf/authpf.c
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/authpf/authpf.c,v 1.8.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/param.h>
#include <sys/file.h>
diff --git a/contrib/pf/ftp-proxy/ftp-proxy.8 b/contrib/pf/ftp-proxy/ftp-proxy.8
index 69c848e19625..e9ac998f6e1c 100644
--- a/contrib/pf/ftp-proxy/ftp-proxy.8
+++ b/contrib/pf/ftp-proxy/ftp-proxy.8
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/ftp-proxy/ftp-proxy.8,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd November 28, 2004
.Dt FTP-PROXY 8
diff --git a/contrib/pf/ftp-proxy/ftp-proxy.c b/contrib/pf/ftp-proxy/ftp-proxy.c
index 06c848795b8d..52b8a9102627 100644
--- a/contrib/pf/ftp-proxy/ftp-proxy.c
+++ b/contrib/pf/ftp-proxy/ftp-proxy.c
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/ftp-proxy/ftp-proxy.c,v 1.7.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/queue.h>
#include <sys/types.h>
diff --git a/contrib/pf/man/pf.4 b/contrib/pf/man/pf.4
index 16e74abdf9d4..771269f7a45f 100644
--- a/contrib/pf/man/pf.4
+++ b/contrib/pf/man/pf.4
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/man/pf.4,v 1.9.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd February 7, 2005
.Dt PF 4
diff --git a/contrib/pf/man/pf.conf.5 b/contrib/pf/man/pf.conf.5
index 67cb717540e7..138ca5d105df 100644
--- a/contrib/pf/man/pf.conf.5
+++ b/contrib/pf/man/pf.conf.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.15.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\" $OpenBSD: pf.conf.5,v 1.393 2008/02/11 07:46:32 jmc Exp $
.\"
.\" Copyright (c) 2002, Daniel Hartmeier
diff --git a/contrib/pf/man/pf.os.5 b/contrib/pf/man/pf.os.5
index ac2b7a88486d..5604fa90607d 100644
--- a/contrib/pf/man/pf.os.5
+++ b/contrib/pf/man/pf.os.5
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/man/pf.os.5,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd August 18, 2003
.Dt PF.OS 5
diff --git a/contrib/pf/man/pflog.4 b/contrib/pf/man/pflog.4
index 7ab96e977f15..835bd154629b 100644
--- a/contrib/pf/man/pflog.4
+++ b/contrib/pf/man/pflog.4
@@ -23,7 +23,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/man/pflog.4,v 1.6.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd December 10, 2001
.Dt PFLOG 4
diff --git a/contrib/pf/man/pfsync.4 b/contrib/pf/man/pfsync.4
index 63adca9401ba..be0158f62de0 100644
--- a/contrib/pf/man/pfsync.4
+++ b/contrib/pf/man/pfsync.4
@@ -24,7 +24,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/man/pfsync.4,v 1.10.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd June 6, 2006
.Dt PFSYNC 4
diff --git a/contrib/pf/pfctl/parse.y b/contrib/pf/pfctl/parse.y
index 9817e8e23785..76a6d4679af0 100644
--- a/contrib/pf/pfctl/parse.y
+++ b/contrib/pf/pfctl/parse.y
@@ -28,7 +28,7 @@
*/
%{
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.9.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/contrib/pf/pfctl/pf_print_state.c b/contrib/pf/pfctl/pf_print_state.c
index b3a693a5986a..9c09df1a9f81 100644
--- a/contrib/pf/pfctl/pf_print_state.c
+++ b/contrib/pf/pfctl/pf_print_state.c
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pf_print_state.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/contrib/pf/pfctl/pfctl.8 b/contrib/pf/pfctl/pfctl.8
index 24be6e51c487..fe944766bacf 100644
--- a/contrib/pf/pfctl/pfctl.8
+++ b/contrib/pf/pfctl/pfctl.8
@@ -24,7 +24,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/pfctl/pfctl.8,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd November 20, 2002
.Dt PFCTL 8
diff --git a/contrib/pf/pfctl/pfctl.c b/contrib/pf/pfctl/pfctl.c
index 21995f6468de..24544afd7e63 100644
--- a/contrib/pf/pfctl/pfctl.c
+++ b/contrib/pf/pfctl/pfctl.c
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl.c,v 1.7.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/contrib/pf/pfctl/pfctl.h b/contrib/pf/pfctl/pfctl.h
index 98a1bef2a28b..dba01e716670 100644
--- a/contrib/pf/pfctl/pfctl.h
+++ b/contrib/pf/pfctl/pfctl.h
@@ -28,7 +28,7 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/pf/pfctl/pfctl.h,v 1.7.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _PFCTL_H_
diff --git a/contrib/pf/pfctl/pfctl_altq.c b/contrib/pf/pfctl/pfctl_altq.c
index b90e7c6b2742..cc6b402a8c2b 100644
--- a/contrib/pf/pfctl/pfctl_altq.c
+++ b/contrib/pf/pfctl/pfctl_altq.c
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.10.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
diff --git a/contrib/pf/pfctl/pfctl_optimize.c b/contrib/pf/pfctl/pfctl_optimize.c
index 44c04779d61e..adb9710a4fad 100644
--- a/contrib/pf/pfctl/pfctl_optimize.c
+++ b/contrib/pf/pfctl/pfctl_optimize.c
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_optimize.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/contrib/pf/pfctl/pfctl_parser.c b/contrib/pf/pfctl/pfctl_parser.c
index 9f232bdb7832..c41d7acddbcb 100644
--- a/contrib/pf/pfctl/pfctl_parser.c
+++ b/contrib/pf/pfctl/pfctl_parser.c
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_parser.c,v 1.8.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/contrib/pf/pfctl/pfctl_parser.h b/contrib/pf/pfctl/pfctl_parser.h
index 4885203a532b..0b871e91f861 100644
--- a/contrib/pf/pfctl/pfctl_parser.h
+++ b/contrib/pf/pfctl/pfctl_parser.h
@@ -28,7 +28,7 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/pf/pfctl/pfctl_parser.h,v 1.7.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _PFCTL_PARSER_H_
diff --git a/contrib/pf/pfctl/pfctl_qstats.c b/contrib/pf/pfctl/pfctl_qstats.c
index d4089d6fbc83..2e84b3d65ba8 100644
--- a/contrib/pf/pfctl/pfctl_qstats.c
+++ b/contrib/pf/pfctl/pfctl_qstats.c
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_qstats.c,v 1.7.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/contrib/pf/pfctl/pfctl_table.c b/contrib/pf/pfctl/pfctl_table.c
index 3d54466a4493..568420685a2f 100644
--- a/contrib/pf/pfctl/pfctl_table.c
+++ b/contrib/pf/pfctl/pfctl_table.c
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_table.c,v 1.8.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/contrib/pf/pflogd/pflogd.8 b/contrib/pf/pflogd/pflogd.8
index 22643fc920fb..e294b7eabeab 100644
--- a/contrib/pf/pflogd/pflogd.8
+++ b/contrib/pf/pflogd/pflogd.8
@@ -24,7 +24,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/pflogd/pflogd.8,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd July 9, 2001
.Dt PFLOGD 8
diff --git a/contrib/pf/pflogd/pflogd.c b/contrib/pf/pflogd/pflogd.c
index 74e35693c63a..927d36cce4b0 100644
--- a/contrib/pf/pflogd/pflogd.c
+++ b/contrib/pf/pflogd/pflogd.c
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pflogd/pflogd.c,v 1.13.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/contrib/pf/pflogd/pidfile.c b/contrib/pf/pflogd/pidfile.c
index db6007f1f339..72ed5d1c7c00 100644
--- a/contrib/pf/pflogd/pidfile.c
+++ b/contrib/pf/pflogd/pidfile.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.6.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* $OpenBSD: pidfile.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $ */
/* $NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $ */
diff --git a/contrib/pf/pflogd/pidfile.h b/contrib/pf/pflogd/pidfile.h
index 7281dcca24c0..acb65d99dfa9 100644
--- a/contrib/pf/pflogd/pidfile.h
+++ b/contrib/pf/pflogd/pidfile.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/pf/pflogd/pidfile.h,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
int pidfile(const char *);
diff --git a/contrib/pf/pflogd/privsep.c b/contrib/pf/pflogd/privsep.c
index a07d1414fd44..44ae33b7a5ad 100644
--- a/contrib/pf/pflogd/privsep.c
+++ b/contrib/pf/pflogd/privsep.c
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pflogd/privsep.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/types.h>
#include <sys/time.h>
diff --git a/contrib/pf/tftp-proxy/filter.c b/contrib/pf/tftp-proxy/filter.c
index e5a769a62a54..51db359f7cff 100644
--- a/contrib/pf/tftp-proxy/filter.c
+++ b/contrib/pf/tftp-proxy/filter.c
@@ -1,5 +1,5 @@
/* $OpenBSD: filter.c,v 1.1 2005/12/28 19:07:07 jcs Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/pf/tftp-proxy/filter.c,v 1.2.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl>
diff --git a/contrib/pnpinfo/pnpinfo.8 b/contrib/pnpinfo/pnpinfo.8
index f6257d552a99..884df433db53 100644
--- a/contrib/pnpinfo/pnpinfo.8
+++ b/contrib/pnpinfo/pnpinfo.8
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pnpinfo/pnpinfo.8,v 1.7.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd January 7, 1996
.Dt PNPINFO 8
diff --git a/contrib/pnpinfo/pnpinfo.c b/contrib/pnpinfo/pnpinfo.c
index 790cfd8028dc..6c263d59c104 100644
--- a/contrib/pnpinfo/pnpinfo.c
+++ b/contrib/pnpinfo/pnpinfo.c
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pnpinfo/pnpinfo.c,v 1.10.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/time.h>
diff --git a/contrib/pnpinfo/pnpinfo.h b/contrib/pnpinfo/pnpinfo.h
index abe14271d9d9..09c0f070c922 100644
--- a/contrib/pnpinfo/pnpinfo.h
+++ b/contrib/pnpinfo/pnpinfo.h
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/pnpinfo/pnpinfo.h,v 1.2.56.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
diff --git a/contrib/sendmail/FREEBSD-upgrade b/contrib/sendmail/FREEBSD-upgrade
index 670c6d6faa0b..589d5657b616 100644
--- a/contrib/sendmail/FREEBSD-upgrade
+++ b/contrib/sendmail/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.35.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
sendmail 8.14.3
originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/
diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4
index dc1d8ba65614..a4f020bbfc63 100644
--- a/contrib/sendmail/cf/m4/cfhead.m4
+++ b/contrib/sendmail/cf/m4/cfhead.m4
@@ -9,7 +9,7 @@
# forth in the LICENSE file which can be found at the top level of
# the sendmail distribution.
#
-# $FreeBSD$
+# $FreeBSD: src/contrib/sendmail/cf/m4/cfhead.m4,v 1.17.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
#
######################################################################
diff --git a/contrib/sendmail/cf/sh/makeinfo.sh b/contrib/sendmail/cf/sh/makeinfo.sh
index 1758e99ba980..988365201254 100644
--- a/contrib/sendmail/cf/sh/makeinfo.sh
+++ b/contrib/sendmail/cf/sh/makeinfo.sh
@@ -13,7 +13,7 @@
#
# $Id: makeinfo.sh,v 8.14 1999/02/07 07:26:25 gshapiro Exp $
#
-# $FreeBSD$
+# $FreeBSD: src/contrib/sendmail/cf/sh/makeinfo.sh,v 1.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
#
usewhoami=0
diff --git a/contrib/sendmail/mail.local/mail.local.8 b/contrib/sendmail/mail.local/mail.local.8
index 7811451c5c30..466e7554afa9 100644
--- a/contrib/sendmail/mail.local/mail.local.8
+++ b/contrib/sendmail/mail.local/mail.local.8
@@ -161,4 +161,4 @@ appeared in
Version 7 AT&T UNIX
as the program
.BR mail .
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/sendmail/mail.local/mail.local.8,v 1.13.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
diff --git a/contrib/sendmail/mail.local/mail.local.c b/contrib/sendmail/mail.local/mail.local.c
index e20d9158862f..9b9e2f4ddcc4 100644
--- a/contrib/sendmail/mail.local/mail.local.c
+++ b/contrib/sendmail/mail.local/mail.local.c
@@ -8,7 +8,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/sendmail/mail.local/mail.local.c,v 1.28.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*
*/
diff --git a/contrib/sendmail/rmail/rmail.c b/contrib/sendmail/rmail/rmail.c
index 5cdc9bb14213..f23a8b551489 100644
--- a/contrib/sendmail/rmail/rmail.c
+++ b/contrib/sendmail/rmail/rmail.c
@@ -8,7 +8,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/sendmail/rmail/rmail.c,v 1.13.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*
*/
diff --git a/contrib/sendmail/smrsh/smrsh.8 b/contrib/sendmail/smrsh/smrsh.8
index f0ed01c0a8cb..05ddadcf5913 100644
--- a/contrib/sendmail/smrsh/smrsh.8
+++ b/contrib/sendmail/smrsh/smrsh.8
@@ -95,4 +95,4 @@ to change the default program directory
.SH SEE ALSO
sendmail(8)
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/sendmail/smrsh/smrsh.8,v 1.13.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
diff --git a/contrib/sendmail/src/sendmail.8 b/contrib/sendmail/src/sendmail.8
index 540d55480ae1..e6cb2acbb2ed 100644
--- a/contrib/sendmail/src/sendmail.8
+++ b/contrib/sendmail/src/sendmail.8
@@ -746,4 +746,4 @@ The
.B sendmail
command appeared in
4.2BSD.
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/sendmail/src/sendmail.8,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
diff --git a/contrib/smbfs/FREEBSD-upgrade b/contrib/smbfs/FREEBSD-upgrade
index 6fad7c6d729e..7edb41e331b7 100644
--- a/contrib/smbfs/FREEBSD-upgrade
+++ b/contrib/smbfs/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/smbfs/FREEBSD-upgrade,v 1.1.38.1.2.1 2009/10/25 01:10:29 kensmith Exp $
The smbfs distribution was written with FreeBSD in mind, so the only
change required before an import is:
diff --git a/contrib/smbfs/examples/dot.nsmbrc b/contrib/smbfs/examples/dot.nsmbrc
index d92d8e44e593..79062f3542f8 100644
--- a/contrib/smbfs/examples/dot.nsmbrc
+++ b/contrib/smbfs/examples/dot.nsmbrc
@@ -1,5 +1,5 @@
# $Id: dot.nsmbrc,v 1.7 2002/04/10 04:21:11 bp Exp $
-# $FreeBSD$
+# $FreeBSD: src/contrib/smbfs/examples/dot.nsmbrc,v 1.2.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
#
# Example for .nsmbrc file
#
diff --git a/contrib/smbfs/include/netsmb/nb_lib.h b/contrib/smbfs/include/netsmb/nb_lib.h
index 13498cfb6ca6..b8a6194e5168 100644
--- a/contrib/smbfs/include/netsmb/nb_lib.h
+++ b/contrib/smbfs/include/netsmb/nb_lib.h
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* $Id: nb_lib.h,v 1.2 2000/07/17 01:49:27 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/include/netsmb/nb_lib.h,v 1.2.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _NETSMB_NB_LIB_H_
#define _NETSMB_NB_LIB_H_
diff --git a/contrib/smbfs/include/netsmb/smb_lib.h b/contrib/smbfs/include/netsmb/smb_lib.h
index 04e8279abf39..7344e393b20b 100644
--- a/contrib/smbfs/include/netsmb/smb_lib.h
+++ b/contrib/smbfs/include/netsmb/smb_lib.h
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* $Id: smb_lib.h,v 1.24 2001/12/20 15:19:43 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/include/netsmb/smb_lib.h,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _NETSMB_SMB_LIB_H_
#define _NETSMB_SMB_LIB_H_
diff --git a/contrib/smbfs/lib/smb/ctx.c b/contrib/smbfs/lib/smb/ctx.c
index 0709b6b9a9b5..4c1c0df5669d 100644
--- a/contrib/smbfs/lib/smb/ctx.c
+++ b/contrib/smbfs/lib/smb/ctx.c
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* $Id: ctx.c,v 1.24 2002/04/13 14:35:28 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/ctx.c,v 1.7.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/contrib/smbfs/lib/smb/file.c b/contrib/smbfs/lib/smb/file.c
index 2ac3300155c7..005820dd8e82 100644
--- a/contrib/smbfs/lib/smb/file.c
+++ b/contrib/smbfs/lib/smb/file.c
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* $Id: file.c,v 1.2 2001/04/16 04:33:01 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/file.c,v 1.2.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/contrib/smbfs/lib/smb/kiconv.c b/contrib/smbfs/lib/smb/kiconv.c
index d84d9091fd36..6fe97cc1f196 100644
--- a/contrib/smbfs/lib/smb/kiconv.c
+++ b/contrib/smbfs/lib/smb/kiconv.c
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* $Id: kiconv.c,v 1.3 2001/08/22 03:31:36 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/kiconv.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/types.h>
diff --git a/contrib/smbfs/lib/smb/mbuf.c b/contrib/smbfs/lib/smb/mbuf.c
index 729b5c53d11e..42f32445bc1f 100644
--- a/contrib/smbfs/lib/smb/mbuf.c
+++ b/contrib/smbfs/lib/smb/mbuf.c
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/mbuf.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/types.h>
#include <sys/endian.h>
diff --git a/contrib/smbfs/lib/smb/nb.c b/contrib/smbfs/lib/smb/nb.c
index 652a05717a08..dfddf8a91fb4 100644
--- a/contrib/smbfs/lib/smb/nb.c
+++ b/contrib/smbfs/lib/smb/nb.c
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* $Id: nb.c,v 1.4 2001/04/16 04:33:01 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/nb.c,v 1.2.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/contrib/smbfs/lib/smb/nb_name.c b/contrib/smbfs/lib/smb/nb_name.c
index 2346ec748f1e..5f3f0d52a270 100644
--- a/contrib/smbfs/lib/smb/nb_name.c
+++ b/contrib/smbfs/lib/smb/nb_name.c
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/nb_name.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/param.h>
#include <sys/endian.h>
diff --git a/contrib/smbfs/lib/smb/nb_net.c b/contrib/smbfs/lib/smb/nb_net.c
index 41fc3846116f..8061f50a44b0 100644
--- a/contrib/smbfs/lib/smb/nb_net.c
+++ b/contrib/smbfs/lib/smb/nb_net.c
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* $Id: nb_net.c,v 1.4 2001/02/16 02:46:12 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/nb_net.c,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/contrib/smbfs/lib/smb/nbns_rq.c b/contrib/smbfs/lib/smb/nbns_rq.c
index 9d55b2569d48..fb39bde64a95 100644
--- a/contrib/smbfs/lib/smb/nbns_rq.c
+++ b/contrib/smbfs/lib/smb/nbns_rq.c
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* $Id: nbns_rq.c,v 1.5 2001/02/17 03:07:24 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/nbns_rq.c,v 1.2.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/contrib/smbfs/lib/smb/nls.c b/contrib/smbfs/lib/smb/nls.c
index 32744288a8c1..f88b39e617f1 100644
--- a/contrib/smbfs/lib/smb/nls.c
+++ b/contrib/smbfs/lib/smb/nls.c
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/nls.c,v 1.2.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/types.h>
#include <sys/iconv.h>
diff --git a/contrib/smbfs/lib/smb/rap.c b/contrib/smbfs/lib/smb/rap.c
index 19e803df9cce..be4ca2341f6b 100644
--- a/contrib/smbfs/lib/smb/rap.c
+++ b/contrib/smbfs/lib/smb/rap.c
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* $Id: rap.c,v 1.8 2001/02/24 15:56:05 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/rap.c,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*
* This is very simple implementation of RAP protocol.
*/
diff --git a/contrib/smbfs/lib/smb/rcfile.c b/contrib/smbfs/lib/smb/rcfile.c
index 5f92c8a311f4..cea45223bae1 100644
--- a/contrib/smbfs/lib/smb/rcfile.c
+++ b/contrib/smbfs/lib/smb/rcfile.c
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/rcfile.c,v 1.2.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/contrib/smbfs/lib/smb/rq.c b/contrib/smbfs/lib/smb/rq.c
index 7ecbb36406ee..a32769fd8b76 100644
--- a/contrib/smbfs/lib/smb/rq.c
+++ b/contrib/smbfs/lib/smb/rq.c
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* $Id: rq.c,v 1.7 2001/04/16 04:33:01 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/rq.c,v 1.3.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/param.h>
#include <sys/ioctl.h>
diff --git a/contrib/smbfs/mount_smbfs/mount_smbfs.8 b/contrib/smbfs/mount_smbfs/mount_smbfs.8
index 85ee6e3efefb..d576305974e4 100644
--- a/contrib/smbfs/mount_smbfs/mount_smbfs.8
+++ b/contrib/smbfs/mount_smbfs/mount_smbfs.8
@@ -1,5 +1,5 @@
.\" $Id: mount_smbfs.8,v 1.10 2002/04/16 02:47:41 bp Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.8,v 1.7.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.Dd January 21, 2008
.Dt MOUNT_SMBFS 8
.Os
diff --git a/contrib/smbfs/mount_smbfs/mount_smbfs.c b/contrib/smbfs/mount_smbfs/mount_smbfs.c
index 3025c797612b..d974721e3b70 100644
--- a/contrib/smbfs/mount_smbfs/mount_smbfs.c
+++ b/contrib/smbfs/mount_smbfs/mount_smbfs.c
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* $Id: mount_smbfs.c,v 1.17 2002/04/10 04:17:51 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.c,v 1.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/contrib/smbfs/smbutil/common.h b/contrib/smbfs/smbutil/common.h
index 00843943600c..9461d1dffe5c 100644
--- a/contrib/smbfs/smbutil/common.h
+++ b/contrib/smbfs/smbutil/common.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/smbfs/smbutil/common.h,v 1.3.32.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#define iprintf(ident,args...) do { printf("%-" # ident "s", ""); \
printf(args);}while(0)
diff --git a/contrib/smbfs/smbutil/dumptree.c b/contrib/smbfs/smbutil/dumptree.c
index 74a97f3a114b..d1309d93dba9 100644
--- a/contrib/smbfs/smbutil/dumptree.c
+++ b/contrib/smbfs/smbutil/dumptree.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/smbfs/smbutil/dumptree.c,v 1.2.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
#include <sys/param.h>
#include <sys/time.h>
diff --git a/contrib/smbfs/smbutil/print.c b/contrib/smbfs/smbutil/print.c
index d87ec78587c6..a797612ebff5 100644
--- a/contrib/smbfs/smbutil/print.c
+++ b/contrib/smbfs/smbutil/print.c
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/smbfs/smbutil/print.c,v 1.2.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/param.h>
#include <sys/errno.h>
diff --git a/contrib/smbfs/smbutil/view.c b/contrib/smbfs/smbutil/view.c
index 87f5e0cc7fc6..337aae3955ba 100644
--- a/contrib/smbfs/smbutil/view.c
+++ b/contrib/smbfs/smbutil/view.c
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/smbfs/smbutil/view.c,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/endian.h>
#include <sys/param.h>
diff --git a/contrib/tcp_wrappers/Makefile b/contrib/tcp_wrappers/Makefile
index 10ede819e4de..6b27d71743a1 100644
--- a/contrib/tcp_wrappers/Makefile
+++ b/contrib/tcp_wrappers/Makefile
@@ -1,5 +1,5 @@
# @(#) Makefile 1.23 97/03/21 19:27:20
-# $FreeBSD$
+# $FreeBSD: src/contrib/tcp_wrappers/Makefile,v 1.2.56.1.2.1 2009/10/25 01:10:29 kensmith Exp $
what:
@echo
diff --git a/contrib/tcp_wrappers/fix_options.c b/contrib/tcp_wrappers/fix_options.c
index 4983a55a47a1..8ea45a70af99 100644
--- a/contrib/tcp_wrappers/fix_options.c
+++ b/contrib/tcp_wrappers/fix_options.c
@@ -4,7 +4,7 @@
*
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcp_wrappers/fix_options.c,v 1.2.56.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcp_wrappers/hosts_access.5 b/contrib/tcp_wrappers/hosts_access.5
index 27ab2ae648b6..1f85adec648c 100644
--- a/contrib/tcp_wrappers/hosts_access.5
+++ b/contrib/tcp_wrappers/hosts_access.5
@@ -396,4 +396,4 @@ Eindhoven University of Technology
Den Dolech 2, P.O. Box 513,
5600 MB Eindhoven, The Netherlands
\" @(#) hosts_access.5 1.20 95/01/30 19:51:46
-\" $FreeBSD$
+\" $FreeBSD: src/contrib/tcp_wrappers/hosts_access.5,v 1.3.56.1.2.1 2009/10/25 01:10:29 kensmith Exp $
diff --git a/contrib/tcp_wrappers/hosts_access.c b/contrib/tcp_wrappers/hosts_access.c
index 8220e6497065..87fce6e1280c 100644
--- a/contrib/tcp_wrappers/hosts_access.c
+++ b/contrib/tcp_wrappers/hosts_access.c
@@ -16,7 +16,7 @@
*
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcp_wrappers/hosts_access.c,v 1.5.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcp_wrappers/inetcf.c b/contrib/tcp_wrappers/inetcf.c
index 1ace3527fc7c..1d5eff1c9e9b 100644
--- a/contrib/tcp_wrappers/inetcf.c
+++ b/contrib/tcp_wrappers/inetcf.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tcp_wrappers/inetcf.c,v 1.3.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Routines to parse an inetd.conf or tlid.conf file. This would be a great
* job for a PERL script.
diff --git a/contrib/tcp_wrappers/misc.c b/contrib/tcp_wrappers/misc.c
index 8f04f870e1b4..d413e3ea411e 100644
--- a/contrib/tcp_wrappers/misc.c
+++ b/contrib/tcp_wrappers/misc.c
@@ -3,7 +3,7 @@
*
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcp_wrappers/misc.c,v 1.2.56.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcp_wrappers/options.c b/contrib/tcp_wrappers/options.c
index 97d312703924..aed4be5e4468 100644
--- a/contrib/tcp_wrappers/options.c
+++ b/contrib/tcp_wrappers/options.c
@@ -27,7 +27,7 @@
* such options should clear the "dry_run" flag to inform the caller of this
* course of action.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcp_wrappers/options.c,v 1.2.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcp_wrappers/refuse.c b/contrib/tcp_wrappers/refuse.c
index fd04e08ae9bf..b73911fefc7c 100644
--- a/contrib/tcp_wrappers/refuse.c
+++ b/contrib/tcp_wrappers/refuse.c
@@ -6,7 +6,7 @@
*
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcp_wrappers/refuse.c,v 1.2.56.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcp_wrappers/rfc931.c b/contrib/tcp_wrappers/rfc931.c
index e7fb3d1d1294..812d667e27e5 100644
--- a/contrib/tcp_wrappers/rfc931.c
+++ b/contrib/tcp_wrappers/rfc931.c
@@ -8,7 +8,7 @@
*
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcp_wrappers/rfc931.c,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcp_wrappers/scaffold.c b/contrib/tcp_wrappers/scaffold.c
index 8da9df0c6861..91aaeb7764ab 100644
--- a/contrib/tcp_wrappers/scaffold.c
+++ b/contrib/tcp_wrappers/scaffold.c
@@ -3,7 +3,7 @@
*
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcp_wrappers/scaffold.c,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcp_wrappers/scaffold.h b/contrib/tcp_wrappers/scaffold.h
index ea568b722507..6f1d17eb2e8d 100644
--- a/contrib/tcp_wrappers/scaffold.h
+++ b/contrib/tcp_wrappers/scaffold.h
@@ -3,7 +3,7 @@
*
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcp_wrappers/scaffold.h,v 1.2.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifdef INET6
diff --git a/contrib/tcp_wrappers/socket.c b/contrib/tcp_wrappers/socket.c
index ed959ac8fb90..3b16b41279cc 100644
--- a/contrib/tcp_wrappers/socket.c
+++ b/contrib/tcp_wrappers/socket.c
@@ -14,7 +14,7 @@
*
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcp_wrappers/socket.c,v 1.8.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcp_wrappers/tcpd.c b/contrib/tcp_wrappers/tcpd.c
index 55c6853c1881..0d8d1f8df9ad 100644
--- a/contrib/tcp_wrappers/tcpd.c
+++ b/contrib/tcp_wrappers/tcpd.c
@@ -9,7 +9,7 @@
*
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcp_wrappers/tcpd.c,v 1.2.56.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcp_wrappers/tcpd.h b/contrib/tcp_wrappers/tcpd.h
index fec20a262baf..719dcf28766f 100644
--- a/contrib/tcp_wrappers/tcpd.h
+++ b/contrib/tcp_wrappers/tcpd.h
@@ -3,7 +3,7 @@
*
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcp_wrappers/tcpd.h,v 1.2.56.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/* Structure to describe one communications endpoint. */
diff --git a/contrib/tcp_wrappers/tcpdchk.c b/contrib/tcp_wrappers/tcpdchk.c
index 99ec49525300..7287c40aac4b 100644
--- a/contrib/tcp_wrappers/tcpdchk.c
+++ b/contrib/tcp_wrappers/tcpdchk.c
@@ -13,7 +13,7 @@
*
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcp_wrappers/tcpdchk.c,v 1.4.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcp_wrappers/tcpdmatch.c b/contrib/tcp_wrappers/tcpdmatch.c
index 94f3e7009606..2932214ef43a 100644
--- a/contrib/tcp_wrappers/tcpdmatch.c
+++ b/contrib/tcp_wrappers/tcpdmatch.c
@@ -12,7 +12,7 @@
*
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcp_wrappers/tcpdmatch.c,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcp_wrappers/tli.c b/contrib/tcp_wrappers/tli.c
index 36d6f7eff398..564f75c5cd57 100644
--- a/contrib/tcp_wrappers/tli.c
+++ b/contrib/tcp_wrappers/tli.c
@@ -13,7 +13,7 @@
*
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcp_wrappers/tli.c,v 1.2.56.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcp_wrappers/update.c b/contrib/tcp_wrappers/update.c
index b612d5e02466..c7e3443c4d71 100644
--- a/contrib/tcp_wrappers/update.c
+++ b/contrib/tcp_wrappers/update.c
@@ -12,7 +12,7 @@
*
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcp_wrappers/update.c,v 1.2.56.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcp_wrappers/workarounds.c b/contrib/tcp_wrappers/workarounds.c
index 1ad2c6471ef3..7e9b1708be0e 100644
--- a/contrib/tcp_wrappers/workarounds.c
+++ b/contrib/tcp_wrappers/workarounds.c
@@ -6,7 +6,7 @@
*
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcp_wrappers/workarounds.c,v 1.2.56.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/.cvsignore b/contrib/tcpdump/.cvsignore
deleted file mode 100644
index 791f14cdb7cf..000000000000
--- a/contrib/tcpdump/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-version.c
-Makefile
-Makefile-devel.in
-config.status
-config.log
-config.cache
-config.h
-.devel
-stamp-h
-stamp-h.in
-tcpdump
-autom4te.cache
diff --git a/contrib/tcpdump/FREEBSD-Xlist b/contrib/tcpdump/FREEBSD-Xlist
index eb234c17b681..d2be6d996b27 100644
--- a/contrib/tcpdump/FREEBSD-Xlist
+++ b/contrib/tcpdump/FREEBSD-Xlist
@@ -1,3 +1,3 @@
-$FreeBSD$
+$FreeBSD: src/contrib/tcpdump/FREEBSD-Xlist,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
Readme.win32
*/win32
diff --git a/contrib/tcpdump/addrtoname.c b/contrib/tcpdump/addrtoname.c
index 0540343602d0..4d604b008fc9 100644
--- a/contrib/tcpdump/addrtoname.c
+++ b/contrib/tcpdump/addrtoname.c
@@ -21,7 +21,7 @@
* Internet, ethernet, port, and protocol string to address
* and address to string conversion routines
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/addrtoname.c,v 1.17.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/ethertype.h b/contrib/tcpdump/ethertype.h
index 456a7d628ecd..1d68f6a39096 100644
--- a/contrib/tcpdump/ethertype.h
+++ b/contrib/tcpdump/ethertype.h
@@ -19,7 +19,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.29.2.1 2008-02-06 10:49:22 guy Exp $ (LBL)
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/ethertype.h,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/tcpdump/ieee802_11.h b/contrib/tcpdump/ieee802_11.h
index b514f901702a..27c8f7e5ea9d 100644
--- a/contrib/tcpdump/ieee802_11.h
+++ b/contrib/tcpdump/ieee802_11.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tcpdump/ieee802_11.h,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* @(#) $Header: /tcpdump/master/tcpdump/ieee802_11.h,v 1.12 2007-07-22 19:59:06 guy Exp $ (LBL) */
/*
* Copyright (c) 2001
diff --git a/contrib/tcpdump/ieee802_11_radio.h b/contrib/tcpdump/ieee802_11_radio.h
index 472a0d982b1c..5bc56063cbea 100644
--- a/contrib/tcpdump/ieee802_11_radio.h
+++ b/contrib/tcpdump/ieee802_11_radio.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tcpdump/ieee802_11_radio.h,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* $NetBSD: ieee802_11_radio.h,v 1.2 2006/02/26 03:04:03 dyoung Exp $ */
/* $Header: /tcpdump/master/tcpdump/ieee802_11_radio.h,v 1.3 2007-08-29 02:31:44 mcr Exp $ */
diff --git a/contrib/tcpdump/interface.h b/contrib/tcpdump/interface.h
index 5e4a5eb7381a..6d22a148fe02 100644
--- a/contrib/tcpdump/interface.h
+++ b/contrib/tcpdump/interface.h
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/interface.h,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
* @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.280.2.4 2008-04-04 19:42:52 guy Exp $ (LBL)
*/
diff --git a/contrib/tcpdump/ipproto.h b/contrib/tcpdump/ipproto.h
index ea339b127116..3c7b052c7da0 100644
--- a/contrib/tcpdump/ipproto.h
+++ b/contrib/tcpdump/ipproto.h
@@ -34,7 +34,7 @@
*
* From:
* @(#)in.h 8.3 (Berkeley) 1/3/94
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/ipproto.h,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
* FreeBSD: src/sys/netinet/in.h,v 1.38.2.3 1999/08/29 16:29:34 peter Exp
*/
diff --git a/contrib/tcpdump/nfs.h b/contrib/tcpdump/nfs.h
index 36b788c72810..b7cb5c71797c 100644
--- a/contrib/tcpdump/nfs.h
+++ b/contrib/tcpdump/nfs.h
@@ -36,7 +36,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/nfs.h,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
* @(#)nfsproto.h 8.2 (Berkeley) 3/30/95
*/
diff --git a/contrib/tcpdump/nfsfh.h b/contrib/tcpdump/nfsfh.h
index 823671321957..756496168e70 100644
--- a/contrib/tcpdump/nfsfh.h
+++ b/contrib/tcpdump/nfsfh.h
@@ -39,7 +39,7 @@
* Jeffrey C. Mogul
* Digital Equipment Corporation
* Western Research Laboratory
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/nfsfh.h,v 1.9.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
* $NetBSD: nfsfh.h,v 1.1.1.2 1997/10/03 17:25:13 christos Exp $
*/
diff --git a/contrib/tcpdump/parsenfsfh.c b/contrib/tcpdump/parsenfsfh.c
index bf575e0eef80..88977036dde7 100644
--- a/contrib/tcpdump/parsenfsfh.c
+++ b/contrib/tcpdump/parsenfsfh.c
@@ -39,7 +39,7 @@
* Digital Equipment Corporation
* Western Research Laboratory
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/parsenfsfh.c,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/pmap_prot.h b/contrib/tcpdump/pmap_prot.h
index 949c3994515f..a3eceadeef64 100644
--- a/contrib/tcpdump/pmap_prot.h
+++ b/contrib/tcpdump/pmap_prot.h
@@ -29,7 +29,7 @@
*
* from: @(#)pmap_prot.h 1.14 88/02/08 SMI
* from: @(#)pmap_prot.h 2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/pmap_prot.h,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
* FreeBSD: src/include/rpc/pmap_prot.h,v 1.9.2.1 1999/08/29 14:39:05 peter Exp
*/
diff --git a/contrib/tcpdump/ppp.h b/contrib/tcpdump/ppp.h
index 3ae519b6eb1c..dd07550e28bf 100644
--- a/contrib/tcpdump/ppp.h
+++ b/contrib/tcpdump/ppp.h
@@ -15,7 +15,7 @@
* suitability of this software for any purpose. It is provided "as is"
* without express or implied warranty.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/ppp.h,v 1.9.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#define PPP_HDRLEN 4 /* length of PPP header */
diff --git a/contrib/tcpdump/print-802_11.c b/contrib/tcpdump/print-802_11.c
index bd892714ad50..9862e0c2e376 100644
--- a/contrib/tcpdump/print-802_11.c
+++ b/contrib/tcpdump/print-802_11.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* Copyright (c) 2001
* Fortress Technologies, Inc. All rights reserved.
diff --git a/contrib/tcpdump/print-arp.c b/contrib/tcpdump/print-arp.c
index b15ae50092ff..571151282849 100644
--- a/contrib/tcpdump/print-arp.c
+++ b/contrib/tcpdump/print-arp.c
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-arp.c,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-atalk.c b/contrib/tcpdump/print-atalk.c
index 6a8056bf5563..156e1324c114 100644
--- a/contrib/tcpdump/print-atalk.c
+++ b/contrib/tcpdump/print-atalk.c
@@ -20,7 +20,7 @@
*
* Format and print AppleTalk packets.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-atalk.c,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-atm.c b/contrib/tcpdump/print-atm.c
index 3f000e3a9eee..d2689814f278 100644
--- a/contrib/tcpdump/print-atm.c
+++ b/contrib/tcpdump/print-atm.c
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-atm.c,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/print-bootp.c b/contrib/tcpdump/print-bootp.c
index 0715eb16c57f..4f485ebd1583 100644
--- a/contrib/tcpdump/print-bootp.c
+++ b/contrib/tcpdump/print-bootp.c
@@ -20,7 +20,7 @@
*
* Format and print bootp packets.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-bootp.c,v 1.13.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/print-domain.c b/contrib/tcpdump/print-domain.c
index 39abda573fd0..01305384d29c 100644
--- a/contrib/tcpdump/print-domain.c
+++ b/contrib/tcpdump/print-domain.c
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-domain.c,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-ether.c b/contrib/tcpdump/print-ether.c
index 0fbdf3b5246b..369310bb2a87 100644
--- a/contrib/tcpdump/print-ether.c
+++ b/contrib/tcpdump/print-ether.c
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ether.c,v 1.19.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/print-fddi.c b/contrib/tcpdump/print-fddi.c
index 94e9be7fb955..3bd29cc52645 100644
--- a/contrib/tcpdump/print-fddi.c
+++ b/contrib/tcpdump/print-fddi.c
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-fddi.c,v 1.13.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-fr.c b/contrib/tcpdump/print-fr.c
index d0956f6c0716..0b398285ada2 100644
--- a/contrib/tcpdump/print-fr.c
+++ b/contrib/tcpdump/print-fr.c
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-fr.c,v 1.9.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-icmp.c b/contrib/tcpdump/print-icmp.c
index 811d5994b7fb..27aa3af290eb 100644
--- a/contrib/tcpdump/print-icmp.c
+++ b/contrib/tcpdump/print-icmp.c
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-icmp.c,v 1.13.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-ip.c b/contrib/tcpdump/print-ip.c
index 6563d5390ae2..273217348902 100644
--- a/contrib/tcpdump/print-ip.c
+++ b/contrib/tcpdump/print-ip.c
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ip.c,v 1.16.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-ip6.c b/contrib/tcpdump/print-ip6.c
index 179397471f0a..45f676b89814 100644
--- a/contrib/tcpdump/print-ip6.c
+++ b/contrib/tcpdump/print-ip6.c
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ip6.c,v 1.10.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-ipx.c b/contrib/tcpdump/print-ipx.c
index 8184425efa33..d82b6f67dbf9 100644
--- a/contrib/tcpdump/print-ipx.c
+++ b/contrib/tcpdump/print-ipx.c
@@ -21,7 +21,7 @@
* Format and print Novell IPX packets.
* Contributed by Brad Parker (brad@fcr.com).
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ipx.c,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-isoclns.c b/contrib/tcpdump/print-isoclns.c
index fe06a9ca09cb..af2c69d23bc0 100644
--- a/contrib/tcpdump/print-isoclns.c
+++ b/contrib/tcpdump/print-isoclns.c
@@ -23,7 +23,7 @@
* Extensively modified by Hannes Gredler (hannes@juniper.net) for more
* complete IS-IS & CLNP support.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-isoclns.c,v 1.18.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-llc.c b/contrib/tcpdump/print-llc.c
index 315704c423fe..52435f3497fd 100644
--- a/contrib/tcpdump/print-llc.c
+++ b/contrib/tcpdump/print-llc.c
@@ -21,7 +21,7 @@
* Code by Matt Thomas, Digital Equipment Corporation
* with an awful lot of hacking by Jeffrey Mogul, DECWRL
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-llc.c,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-nfs.c b/contrib/tcpdump/print-nfs.c
index c6483572f30c..5272b8a6444d 100644
--- a/contrib/tcpdump/print-nfs.c
+++ b/contrib/tcpdump/print-nfs.c
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-nfs.c,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-ntp.c b/contrib/tcpdump/print-ntp.c
index 8676cbe383b2..c7353493a683 100644
--- a/contrib/tcpdump/print-ntp.c
+++ b/contrib/tcpdump/print-ntp.c
@@ -22,7 +22,7 @@
* By Jeffrey Mogul/DECWRL
* loosely based on print-bootp.c
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ntp.c,v 1.12.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-null.c b/contrib/tcpdump/print-null.c
index ba26733f7a87..68967bdad889 100644
--- a/contrib/tcpdump/print-null.c
+++ b/contrib/tcpdump/print-null.c
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-null.c,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-pim.c b/contrib/tcpdump/print-pim.c
index 01080f3fd669..668b79738b0a 100644
--- a/contrib/tcpdump/print-pim.c
+++ b/contrib/tcpdump/print-pim.c
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-pim.c,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-ppp.c b/contrib/tcpdump/print-ppp.c
index ba5d836572b0..219d489669ee 100644
--- a/contrib/tcpdump/print-ppp.c
+++ b/contrib/tcpdump/print-ppp.c
@@ -21,7 +21,7 @@
* Extensively modified by Motonori Shindo (mshindo@mshindo.net) for more
* complete PPP support.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ppp.c,v 1.18.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/tcpdump/print-sl.c b/contrib/tcpdump/print-sl.c
index dd0276720c01..6560cb2b6f0a 100644
--- a/contrib/tcpdump/print-sl.c
+++ b/contrib/tcpdump/print-sl.c
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-sl.c,v 1.10.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-sunrpc.c b/contrib/tcpdump/print-sunrpc.c
index 565cbfdd2e77..72df3ffb783d 100644
--- a/contrib/tcpdump/print-sunrpc.c
+++ b/contrib/tcpdump/print-sunrpc.c
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-sunrpc.c,v 1.12.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/print-token.c b/contrib/tcpdump/print-token.c
index 8fe96c6e8bd9..6fc840729e11 100644
--- a/contrib/tcpdump/print-token.c
+++ b/contrib/tcpdump/print-token.c
@@ -23,7 +23,7 @@
* Further tweaked to more closely resemble print-fddi.c
* Guy Harris <guy@alum.mit.edu>
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-token.c,v 1.10.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/print-udp.c b/contrib/tcpdump/print-udp.c
index 0c70544bb529..2a58ab225d69 100644
--- a/contrib/tcpdump/print-udp.c
+++ b/contrib/tcpdump/print-udp.c
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-udp.c,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef lint
diff --git a/contrib/tcpdump/rpc_auth.h b/contrib/tcpdump/rpc_auth.h
index 0e5a1c1294bb..c1629ef5ba06 100644
--- a/contrib/tcpdump/rpc_auth.h
+++ b/contrib/tcpdump/rpc_auth.h
@@ -29,7 +29,7 @@
*
* from: @(#)auth.h 1.17 88/02/08 SMI
* from: @(#)auth.h 2.3 88/08/07 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/rpc_auth.h,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
* FreeBSD: src/include/rpc/auth.h,v 1.14.2.1 1999/08/29 14:39:02 peter Exp
*/
diff --git a/contrib/tcpdump/rpc_msg.h b/contrib/tcpdump/rpc_msg.h
index 9c2770c2b035..cab586bd6a15 100644
--- a/contrib/tcpdump/rpc_msg.h
+++ b/contrib/tcpdump/rpc_msg.h
@@ -29,7 +29,7 @@
*
* from: @(#)rpc_msg.h 1.7 86/07/16 SMI
* from: @(#)rpc_msg.h 2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/rpc_msg.h,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
* FreeBSD: src/include/rpc/rpc_msg.h,v 1.11.2.1 1999/08/29 14:39:07 peter Exp
*/
diff --git a/contrib/tcpdump/tcpdump-stdinc.h b/contrib/tcpdump/tcpdump-stdinc.h
index 5b10ef8223fe..de92d2a22c57 100644
--- a/contrib/tcpdump/tcpdump-stdinc.h
+++ b/contrib/tcpdump/tcpdump-stdinc.h
@@ -29,7 +29,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/tcpdump-stdinc.h,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
* @(#) $Header: /tcpdump/master/tcpdump/tcpdump-stdinc.h,v 1.17 2006-05-19 17:55:34 hannes Exp $ (LBL)
*/
diff --git a/contrib/tcpdump/tcpdump.1 b/contrib/tcpdump/tcpdump.1
index 1635ff66b248..4ed621356c4f 100644
--- a/contrib/tcpdump/tcpdump.1
+++ b/contrib/tcpdump/tcpdump.1
@@ -22,7 +22,7 @@
.\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/tcpdump/tcpdump.1,v 1.19.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH TCPDUMP 1 "07 January 2008"
.SH NAME
diff --git a/contrib/tcpdump/tcpdump.c b/contrib/tcpdump/tcpdump.c
index f19878b4f69a..820181109e99 100644
--- a/contrib/tcpdump/tcpdump.c
+++ b/contrib/tcpdump/tcpdump.c
@@ -33,7 +33,7 @@ static const char rcsid[] _U_ =
"@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.271.2.11 2008-09-25 21:50:04 guy Exp $ (LBL)";
#endif
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tcpdump/tcpdump.c,v 1.14.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/*
* tcpdump - monitor tcp/ip traffic on an ethernet.
diff --git a/contrib/tcpdump/token.h b/contrib/tcpdump/token.h
index 152503879cd5..d0aebb95fb05 100644
--- a/contrib/tcpdump/token.h
+++ b/contrib/tcpdump/token.h
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/token.h,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#define TOKEN_HDRLEN 14
diff --git a/contrib/tcsh/FREEBSD-Xlist b/contrib/tcsh/FREEBSD-Xlist
index b6e5636aa567..1b9898719079 100644
--- a/contrib/tcsh/FREEBSD-Xlist
+++ b/contrib/tcsh/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/tcsh/FREEBSD-Xlist,v 1.4.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/BUGS
*/config/a*
*/config/bs2000
diff --git a/contrib/tcsh/FREEBSD-upgrade b/contrib/tcsh/FREEBSD-upgrade
index 7bfdaf8a2091..512c3b7e6139 100644
--- a/contrib/tcsh/FREEBSD-upgrade
+++ b/contrib/tcsh/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/tcsh/FREEBSD-upgrade,v 1.2.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
Christos Zoulas `tcsh'
originals can be found at: ftp://ftp.astron.com/pub/tcsh/
diff --git a/contrib/telnet/arpa/telnet.h b/contrib/telnet/arpa/telnet.h
index 26f75fb31303..ce269652983d 100644
--- a/contrib/telnet/arpa/telnet.h
+++ b/contrib/telnet/arpa/telnet.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)telnet.h 8.2 (Berkeley) 12/15/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/arpa/telnet.h,v 1.10.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef _ARPA_TELNET_H_
diff --git a/contrib/telnet/libtelnet/auth-proto.h b/contrib/telnet/libtelnet/auth-proto.h
index 6d3ba7f07493..570be3189e0b 100644
--- a/contrib/telnet/libtelnet/auth-proto.h
+++ b/contrib/telnet/libtelnet/auth-proto.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)auth-proto.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/auth-proto.h,v 1.7.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/telnet/libtelnet/auth.c b/contrib/telnet/libtelnet/auth.c
index 46426559e088..5f8710e96388 100644
--- a/contrib/telnet/libtelnet/auth.c
+++ b/contrib/telnet/libtelnet/auth.c
@@ -38,7 +38,7 @@ static const char sccsid[] = "@(#)auth.c 8.3 (Berkeley) 5/30/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/auth.c,v 1.10.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
/*
diff --git a/contrib/telnet/libtelnet/auth.h b/contrib/telnet/libtelnet/auth.h
index a8ee04831d67..edcce9eabbbf 100644
--- a/contrib/telnet/libtelnet/auth.h
+++ b/contrib/telnet/libtelnet/auth.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)auth.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/auth.h,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/telnet/libtelnet/enc-proto.h b/contrib/telnet/libtelnet/enc-proto.h
index 46663c7789e2..29926c0458de 100644
--- a/contrib/telnet/libtelnet/enc-proto.h
+++ b/contrib/telnet/libtelnet/enc-proto.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)enc-proto.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/enc-proto.h,v 1.7.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/telnet/libtelnet/enc_des.c b/contrib/telnet/libtelnet/enc_des.c
index 2f7fe6e74402..385feaa5c603 100644
--- a/contrib/telnet/libtelnet/enc_des.c
+++ b/contrib/telnet/libtelnet/enc_des.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)enc_des.c 8.3 (Berkeley) 5/30/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/enc_des.c,v 1.10.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#ifdef ENCRYPTION
# ifdef AUTHENTICATION
diff --git a/contrib/telnet/libtelnet/encrypt.c b/contrib/telnet/libtelnet/encrypt.c
index 8bdf672ab3ba..45b4e82841d0 100644
--- a/contrib/telnet/libtelnet/encrypt.c
+++ b/contrib/telnet/libtelnet/encrypt.c
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/encrypt.c,v 1.9.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#ifndef lint
#if 0
diff --git a/contrib/telnet/libtelnet/encrypt.h b/contrib/telnet/libtelnet/encrypt.h
index eda8d57e0328..d9b31951ce48 100644
--- a/contrib/telnet/libtelnet/encrypt.h
+++ b/contrib/telnet/libtelnet/encrypt.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)encrypt.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/encrypt.h,v 1.6.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/telnet/libtelnet/genget.c b/contrib/telnet/libtelnet/genget.c
index e24bb4458455..ec10e9f46bbe 100644
--- a/contrib/telnet/libtelnet/genget.c
+++ b/contrib/telnet/libtelnet/genget.c
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/genget.c,v 1.7.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#ifndef lint
#if 0
diff --git a/contrib/telnet/libtelnet/getent.c b/contrib/telnet/libtelnet/getent.c
index d6e8d9c88475..35361d0165e7 100644
--- a/contrib/telnet/libtelnet/getent.c
+++ b/contrib/telnet/libtelnet/getent.c
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/getent.c,v 1.7.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#ifndef lint
#if 0
diff --git a/contrib/telnet/libtelnet/kerberos.c b/contrib/telnet/libtelnet/kerberos.c
index 2380c27daa5e..ca96e3c65b6f 100644
--- a/contrib/telnet/libtelnet/kerberos.c
+++ b/contrib/telnet/libtelnet/kerberos.c
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/kerberos.c,v 1.8.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#ifndef lint
static const char sccsid[] = "@(#)kerberos.c 8.3 (Berkeley) 5/30/95";
diff --git a/contrib/telnet/libtelnet/kerberos5.c b/contrib/telnet/libtelnet/kerberos5.c
index ab7b2dce47b8..5d6532855d60 100644
--- a/contrib/telnet/libtelnet/kerberos5.c
+++ b/contrib/telnet/libtelnet/kerberos5.c
@@ -53,7 +53,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/kerberos5.c,v 1.7.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#ifdef KRB5
diff --git a/contrib/telnet/libtelnet/key-proto.h b/contrib/telnet/libtelnet/key-proto.h
index 2f3f3466daa5..ce1efdfa49da 100644
--- a/contrib/telnet/libtelnet/key-proto.h
+++ b/contrib/telnet/libtelnet/key-proto.h
@@ -52,7 +52,7 @@
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/key-proto.h,v 1.2.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef __KEY_PROTO__
diff --git a/contrib/telnet/libtelnet/krb4encpwd.c b/contrib/telnet/libtelnet/krb4encpwd.c
index e0530f6e63c3..a05a8d701cf8 100644
--- a/contrib/telnet/libtelnet/krb4encpwd.c
+++ b/contrib/telnet/libtelnet/krb4encpwd.c
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/krb4encpwd.c,v 1.7.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#ifndef lint
static char sccsid[] = "@(#)krb4encpwd.c 8.3 (Berkeley) 5/30/95";
diff --git a/contrib/telnet/libtelnet/misc-proto.h b/contrib/telnet/libtelnet/misc-proto.h
index aea753c3ff93..84aafecbaaee 100644
--- a/contrib/telnet/libtelnet/misc-proto.h
+++ b/contrib/telnet/libtelnet/misc-proto.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)misc-proto.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/misc-proto.h,v 1.4.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/telnet/libtelnet/misc.c b/contrib/telnet/libtelnet/misc.c
index 97299ad53b77..d6b8e6d9abd4 100644
--- a/contrib/telnet/libtelnet/misc.c
+++ b/contrib/telnet/libtelnet/misc.c
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/misc.c,v 1.8.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#ifndef lint
#if 0
diff --git a/contrib/telnet/libtelnet/pk.c b/contrib/telnet/libtelnet/pk.c
index 05b74f43d414..b4d824092afd 100644
--- a/contrib/telnet/libtelnet/pk.c
+++ b/contrib/telnet/libtelnet/pk.c
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/pk.c,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
/* public key routines */
/* functions:
diff --git a/contrib/telnet/libtelnet/pk.h b/contrib/telnet/libtelnet/pk.h
index 555d8ebdeb78..bbb6b4f65daf 100644
--- a/contrib/telnet/libtelnet/pk.h
+++ b/contrib/telnet/libtelnet/pk.h
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/pk.h,v 1.6.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/* header for the des routines that we will use */
diff --git a/contrib/telnet/libtelnet/read_password.c b/contrib/telnet/libtelnet/read_password.c
index badf21417dcc..3291d7b3ed83 100644
--- a/contrib/telnet/libtelnet/read_password.c
+++ b/contrib/telnet/libtelnet/read_password.c
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/read_password.c,v 1.5.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#ifndef lint
#if 0
diff --git a/contrib/telnet/libtelnet/rsaencpwd.c b/contrib/telnet/libtelnet/rsaencpwd.c
index fba0c6b61735..3940a58eb48b 100644
--- a/contrib/telnet/libtelnet/rsaencpwd.c
+++ b/contrib/telnet/libtelnet/rsaencpwd.c
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/rsaencpwd.c,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#ifndef lint
static char sccsid[] = "@(#)rsaencpwd.c 8.3 (Berkeley) 5/30/95";
diff --git a/contrib/telnet/libtelnet/sra.c b/contrib/telnet/libtelnet/sra.c
index 194048532b4e..d4ef9a766d2e 100644
--- a/contrib/telnet/libtelnet/sra.c
+++ b/contrib/telnet/libtelnet/sra.c
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/sra.c,v 1.16.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#ifdef SRA
#ifdef ENCRYPTION
diff --git a/contrib/telnet/telnet/authenc.c b/contrib/telnet/telnet/authenc.c
index 85f389b2e55d..fb5bf7c82457 100644
--- a/contrib/telnet/telnet/authenc.c
+++ b/contrib/telnet/telnet/authenc.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)authenc.c 8.1 (Berkeley) 6/6/93";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/authenc.c,v 1.6.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#ifdef AUTHENTICATION
#ifdef ENCRYPTION
diff --git a/contrib/telnet/telnet/commands.c b/contrib/telnet/telnet/commands.c
index a64d763b64ac..e18485f34d67 100644
--- a/contrib/telnet/telnet/commands.c
+++ b/contrib/telnet/telnet/commands.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/commands.c,v 1.35.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/param.h>
#include <sys/un.h>
diff --git a/contrib/telnet/telnet/defines.h b/contrib/telnet/telnet/defines.h
index 840666deacb6..7b9357b79233 100644
--- a/contrib/telnet/telnet/defines.h
+++ b/contrib/telnet/telnet/defines.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)defines.h 8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnet/defines.h,v 1.2.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#define settimer(x) clocks.x = clocks.system++
diff --git a/contrib/telnet/telnet/externs.h b/contrib/telnet/telnet/externs.h
index 73743c025ed8..45f14b4c1588 100644
--- a/contrib/telnet/telnet/externs.h
+++ b/contrib/telnet/telnet/externs.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)externs.h 8.3 (Berkeley) 5/30/95
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnet/externs.h,v 1.11.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#ifndef BSD
diff --git a/contrib/telnet/telnet/main.c b/contrib/telnet/telnet/main.c
index f6eb1ffb08ef..898779ed48f5 100644
--- a/contrib/telnet/telnet/main.c
+++ b/contrib/telnet/telnet/main.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/main.c,v 1.20.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/contrib/telnet/telnet/network.c b/contrib/telnet/telnet/network.c
index bb75d6309f90..8ba01ab859a7 100644
--- a/contrib/telnet/telnet/network.c
+++ b/contrib/telnet/telnet/network.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)network.c 8.2 (Berkeley) 12/15/93";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/network.c,v 1.7.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/contrib/telnet/telnet/ring.c b/contrib/telnet/telnet/ring.c
index 6c2b7efc5a51..d8e8940310ee 100644
--- a/contrib/telnet/telnet/ring.c
+++ b/contrib/telnet/telnet/ring.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)ring.c 8.2 (Berkeley) 5/30/95";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/ring.c,v 1.7.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
/*
* This defines a structure for a ring buffer.
diff --git a/contrib/telnet/telnet/ring.h b/contrib/telnet/telnet/ring.h
index 516b7a5d806a..d24dcd5e0de2 100644
--- a/contrib/telnet/telnet/ring.h
+++ b/contrib/telnet/telnet/ring.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ring.h 8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnet/ring.h,v 1.4.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#if defined(P)
diff --git a/contrib/telnet/telnet/sys_bsd.c b/contrib/telnet/telnet/sys_bsd.c
index 45ef1e2aa3cd..d9615a48d919 100644
--- a/contrib/telnet/telnet/sys_bsd.c
+++ b/contrib/telnet/telnet/sys_bsd.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/sys_bsd.c,v 1.12.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
/*
* The following routines try to encapsulate what is system dependent
diff --git a/contrib/telnet/telnet/telnet.1 b/contrib/telnet/telnet/telnet.1
index 0acfe78931ec..b9ce8b109b28 100644
--- a/contrib/telnet/telnet/telnet.1
+++ b/contrib/telnet/telnet/telnet.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)telnet.1 8.6 (Berkeley) 6/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/telnet/telnet/telnet.1,v 1.20.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd September 18, 2006
.Dt TELNET 1
diff --git a/contrib/telnet/telnet/telnet.c b/contrib/telnet/telnet/telnet.c
index 28237bdf9d07..a41a27460c22 100644
--- a/contrib/telnet/telnet/telnet.c
+++ b/contrib/telnet/telnet/telnet.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/telnet.c,v 1.16.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/types.h>
diff --git a/contrib/telnet/telnet/terminal.c b/contrib/telnet/telnet/terminal.c
index 3dda1c5bf886..6e5c50bb72e7 100644
--- a/contrib/telnet/telnet/terminal.c
+++ b/contrib/telnet/telnet/terminal.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/terminal.c,v 1.7.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <arpa/telnet.h>
#include <sys/types.h>
diff --git a/contrib/telnet/telnet/utilities.c b/contrib/telnet/telnet/utilities.c
index b0cfe37bbabd..204fd7e988d3 100644
--- a/contrib/telnet/telnet/utilities.c
+++ b/contrib/telnet/telnet/utilities.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/utilities.c,v 1.8.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#define TELOPTS
#define TELCMDS
diff --git a/contrib/telnet/telnetd/authenc.c b/contrib/telnet/telnetd/authenc.c
index 9377b522c972..11079e7efa6c 100644
--- a/contrib/telnet/telnetd/authenc.c
+++ b/contrib/telnet/telnetd/authenc.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)authenc.c 8.2 (Berkeley) 5/30/95";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/authenc.c,v 1.8.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#ifdef AUTHENTICATION
#ifdef ENCRYPTION
diff --git a/contrib/telnet/telnetd/defs.h b/contrib/telnet/telnetd/defs.h
index d727f367c045..303fb98feeeb 100644
--- a/contrib/telnet/telnetd/defs.h
+++ b/contrib/telnet/telnetd/defs.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)defs.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnetd/defs.h,v 1.2.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/telnet/telnetd/ext.h b/contrib/telnet/telnetd/ext.h
index 25db496374fa..bea5235151ef 100644
--- a/contrib/telnet/telnetd/ext.h
+++ b/contrib/telnet/telnetd/ext.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ext.h 8.2 (Berkeley) 12/15/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnetd/ext.h,v 1.12.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/telnet/telnetd/global.c b/contrib/telnet/telnetd/global.c
index 2ed82d0b6aee..151e8bd6a7a4 100644
--- a/contrib/telnet/telnetd/global.c
+++ b/contrib/telnet/telnetd/global.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)global.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/global.c,v 1.6.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
/*
* Allocate global variables. We do this
diff --git a/contrib/telnet/telnetd/pathnames.h b/contrib/telnet/telnetd/pathnames.h
index ed8ee887a39e..72edcb5e87e5 100644
--- a/contrib/telnet/telnetd/pathnames.h
+++ b/contrib/telnet/telnetd/pathnames.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)pathnames.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnetd/pathnames.h,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#if BSD > 43
diff --git a/contrib/telnet/telnetd/slc.c b/contrib/telnet/telnetd/slc.c
index ad034418d313..c41718d33de6 100644
--- a/contrib/telnet/telnetd/slc.c
+++ b/contrib/telnet/telnetd/slc.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)slc.c 8.2 (Berkeley) 5/30/95";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/slc.c,v 1.9.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include "telnetd.h"
diff --git a/contrib/telnet/telnetd/state.c b/contrib/telnet/telnetd/state.c
index 300421f6dec4..5c550f17e97a 100644
--- a/contrib/telnet/telnetd/state.c
+++ b/contrib/telnet/telnetd/state.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)state.c 8.5 (Berkeley) 5/30/95";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/state.c,v 1.15.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <stdarg.h>
#include "telnetd.h"
diff --git a/contrib/telnet/telnetd/sys_term.c b/contrib/telnet/telnetd/sys_term.c
index 7b2dbdb2dfa3..6452662acaaa 100644
--- a/contrib/telnet/telnetd/sys_term.c
+++ b/contrib/telnet/telnetd/sys_term.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)sys_term.c 8.4+1 (Berkeley) 5/30/95";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/sys_term.c,v 1.21.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include <sys/types.h>
#include <sys/tty.h>
diff --git a/contrib/telnet/telnetd/telnetd.8 b/contrib/telnet/telnetd/telnetd.8
index 59907b980e2e..d6cd748dc9ad 100644
--- a/contrib/telnet/telnetd/telnetd.8
+++ b/contrib/telnet/telnetd/telnetd.8
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)telnetd.8 8.4 (Berkeley) 6/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/telnet/telnetd/telnetd.8,v 1.22.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.Dd August 28, 2008
.Dt TELNETD 8
diff --git a/contrib/telnet/telnetd/telnetd.c b/contrib/telnet/telnetd/telnetd.c
index ad1e45953e9e..59e7bf3ac269 100644
--- a/contrib/telnet/telnetd/telnetd.c
+++ b/contrib/telnet/telnetd/telnetd.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/telnetd.c,v 1.30.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include "telnetd.h"
#include "pathnames.h"
diff --git a/contrib/telnet/telnetd/telnetd.h b/contrib/telnet/telnetd/telnetd.h
index 5bfc572f518d..f8113f327556 100644
--- a/contrib/telnet/telnetd/telnetd.h
+++ b/contrib/telnet/telnetd/telnetd.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)telnetd.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnetd/telnetd.h,v 1.2.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
diff --git a/contrib/telnet/telnetd/termstat.c b/contrib/telnet/telnetd/termstat.c
index 88425206da56..47dad7b0f480 100644
--- a/contrib/telnet/telnetd/termstat.c
+++ b/contrib/telnet/telnetd/termstat.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)termstat.c 8.2 (Berkeley) 5/30/95";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/termstat.c,v 1.13.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#include "telnetd.h"
diff --git a/contrib/telnet/telnetd/utility.c b/contrib/telnet/telnetd/utility.c
index 54e23270be18..4705967b487f 100644
--- a/contrib/telnet/telnetd/utility.c
+++ b/contrib/telnet/telnetd/utility.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)utility.c 8.4 (Berkeley) 5/30/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/utility.c,v 1.13.34.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
#ifdef __FreeBSD__
#include <locale.h>
diff --git a/contrib/texinfo/FREEBSD-Xlist b/contrib/texinfo/FREEBSD-Xlist
index 702690cc397c..50be98c58f1b 100644
--- a/contrib/texinfo/FREEBSD-Xlist
+++ b/contrib/texinfo/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/texinfo/FREEBSD-Xlist,v 1.6.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/ABOUT-NLS
*/INSTALL.generic
*/Makefile.am
diff --git a/contrib/texinfo/FREEBSD-upgrade b/contrib/texinfo/FREEBSD-upgrade
index 888c727d5ec5..11da0c50823c 100644
--- a/contrib/texinfo/FREEBSD-upgrade
+++ b/contrib/texinfo/FREEBSD-upgrade
@@ -1,5 +1,5 @@
# ex:ts=8
-$FreeBSD$
+$FreeBSD: src/contrib/texinfo/FREEBSD-upgrade,v 1.7.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
GNU Texinfo 4.8
originals can be found at: ftp://ftp.gnu.org/gnu/texinfo/
diff --git a/contrib/texinfo/config.h b/contrib/texinfo/config.h
index ad0a116dfa6d..a03592f2c599 100644
--- a/contrib/texinfo/config.h
+++ b/contrib/texinfo/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/texinfo/config.h,v 1.7.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* config.h. Generated by configure. */
/* config.in. Generated from configure.ac by autoheader. */
diff --git a/contrib/texinfo/util/install-info.c b/contrib/texinfo/util/install-info.c
index 50ed3d46f944..280bede58423 100644
--- a/contrib/texinfo/util/install-info.c
+++ b/contrib/texinfo/util/install-info.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/texinfo/util/install-info.c,v 1.16.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* install-info -- create Info directory entry(ies) for an Info file.
$Id: install-info.c,v 1.12 2004/04/11 17:56:47 karl Exp $
diff --git a/contrib/top/commands.c b/contrib/top/commands.c
index 83f966d5e21b..80e51d8cc256 100644
--- a/contrib/top/commands.c
+++ b/contrib/top/commands.c
@@ -8,7 +8,7 @@
* Copyright (c) 1984, 1989, William LeFebvre, Rice University
* Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/commands.c,v 1.15.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/top/display.c b/contrib/top/display.c
index 3fca57b5fdc7..059c2c9db3eb 100644
--- a/contrib/top/display.c
+++ b/contrib/top/display.c
@@ -8,7 +8,7 @@
* Copyright (c) 1984, 1989, William LeFebvre, Rice University
* Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/display.c,v 1.10.2.2.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/top/install-sh b/contrib/top/install-sh
index d8b6283eaca1..d8b6283eaca1 100755..100644
--- a/contrib/top/install-sh
+++ b/contrib/top/install-sh
diff --git a/contrib/top/layout.h b/contrib/top/layout.h
index 1b2564e0a657..520148fb77d3 100644
--- a/contrib/top/layout.h
+++ b/contrib/top/layout.h
@@ -5,7 +5,7 @@
* display. These definitions are used by the routines in "display.c" for
* cursor addressing.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/layout.h,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
extern int x_lastpid; /* 10 */
diff --git a/contrib/top/machine.h b/contrib/top/machine.h
index a09424c19ca2..e095994dee75 100644
--- a/contrib/top/machine.h
+++ b/contrib/top/machine.h
@@ -1,5 +1,5 @@
/*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/machine.h,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/top/screen.c b/contrib/top/screen.c
index 348304cc2836..4995d9ec3f61 100644
--- a/contrib/top/screen.c
+++ b/contrib/top/screen.c
@@ -8,7 +8,7 @@
* Copyright (c) 1984, 1989, William LeFebvre, Rice University
* Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/screen.c,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/* This file contains the routines that interface to termcap and stty/gtty.
diff --git a/contrib/top/sigconv.awk b/contrib/top/sigconv.awk
index 8e065fa1a355..e3b6549dbe72 100644
--- a/contrib/top/sigconv.awk
+++ b/contrib/top/sigconv.awk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/top/sigconv.awk,v 1.2.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
BEGIN {
nsig = 0;
diff --git a/contrib/top/top.X b/contrib/top/top.X
index 830e50dd2346..d51bef9a5545 100644
--- a/contrib/top/top.X
+++ b/contrib/top/top.X
@@ -1,6 +1,6 @@
.\" NOTE: changes to the manual page for "top" should be made in the
.\" file "top.X" and NOT in the file "top.1".
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/top/top.X,v 1.21.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.nr N %topn%
.nr D %delay%
.TH TOP 1 Local
diff --git a/contrib/top/top.c b/contrib/top/top.c
index 762efaa2a723..6c21acf1e74c 100644
--- a/contrib/top/top.c
+++ b/contrib/top/top.c
@@ -13,7 +13,7 @@ char *copyright =
* Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory
* Copyright (c) 1996, William LeFebvre, Group sys Consulting
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/top.c,v 1.26.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/top/top.h b/contrib/top/top.h
index a281957c34bd..bd68d0986aca 100644
--- a/contrib/top/top.h
+++ b/contrib/top/top.h
@@ -1,5 +1,5 @@
/*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/top.h,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
* Top - a top users display for Berkeley Unix
diff --git a/contrib/top/username.c b/contrib/top/username.c
index 23591866eb83..4eb8a2a1a886 100644
--- a/contrib/top/username.c
+++ b/contrib/top/username.c
@@ -8,7 +8,7 @@
* Copyright (c) 1984, 1989, William LeFebvre, Rice University
* Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/username.c,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/top/utils.c b/contrib/top/utils.c
index 906170ad67a3..3fc07eb46d5a 100644
--- a/contrib/top/utils.c
+++ b/contrib/top/utils.c
@@ -8,7 +8,7 @@
* Copyright (c) 1984, 1989, William LeFebvre, Rice University
* Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/utils.c,v 1.4.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/*
diff --git a/contrib/traceroute/FREEBSD-upgrade b/contrib/traceroute/FREEBSD-upgrade
index bc4918eb146f..fec0b50e8aee 100644
--- a/contrib/traceroute/FREEBSD-upgrade
+++ b/contrib/traceroute/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/traceroute/FREEBSD-upgrade,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
This directory contains virgin copies of the original distribution files
on a "vendor" branch. Do not, under any circumstances, attempt to upgrade
diff --git a/contrib/traceroute/VERSION b/contrib/traceroute/VERSION
index 26e2f7609197..4830638d968e 100644
--- a/contrib/traceroute/VERSION
+++ b/contrib/traceroute/VERSION
@@ -1,2 +1,2 @@
1.4a12+FreeBSD
-$FreeBSD$
+$FreeBSD: src/contrib/traceroute/VERSION,v 1.3.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
diff --git a/contrib/traceroute/as.c b/contrib/traceroute/as.c
index 689848a89cf6..757e790b8180 100644
--- a/contrib/traceroute/as.c
+++ b/contrib/traceroute/as.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/traceroute/as.c,v 1.1.4.2.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* $NetBSD: as.c,v 1.1 2001/11/04 23:14:36 atatat Exp $ */
/*
diff --git a/contrib/traceroute/as.h b/contrib/traceroute/as.h
index 3b7d3a660a58..9af3b9e42e0f 100644
--- a/contrib/traceroute/as.h
+++ b/contrib/traceroute/as.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/traceroute/as.h,v 1.1.4.2.2.1 2009/10/25 01:10:29 kensmith Exp $ */
/* $NetBSD: as.h,v 1.1 2001/11/04 23:14:36 atatat Exp $ */
/*
diff --git a/contrib/traceroute/findsaddr-socket.c b/contrib/traceroute/findsaddr-socket.c
index 00af84366c52..5606da96add1 100644
--- a/contrib/traceroute/findsaddr-socket.c
+++ b/contrib/traceroute/findsaddr-socket.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/traceroute/findsaddr-socket.c,v 1.3.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
/* XXX Yes this is WAY too complicated */
diff --git a/contrib/traceroute/traceroute.8 b/contrib/traceroute/traceroute.8
index 9d54bc6d2c9f..407b4377910e 100644
--- a/contrib/traceroute/traceroute.8
+++ b/contrib/traceroute/traceroute.8
@@ -14,7 +14,7 @@
.\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
.\"
.\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.17.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
.\"
.TH TRACEROUTE 8 "19 February 2008"
.UC 6
diff --git a/contrib/traceroute/traceroute.c b/contrib/traceroute/traceroute.c
index 120d1cd9e57f..c911d250a652 100644
--- a/contrib/traceroute/traceroute.c
+++ b/contrib/traceroute/traceroute.c
@@ -28,7 +28,7 @@ static const char rcsid[] =
"@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)";
#endif
static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.35.2.2.2.1 2009/10/25 01:10:29 kensmith Exp $";
#endif
/*
diff --git a/contrib/wpa/hostapd/doc/kerneldoc2doxygen.pl b/contrib/wpa/hostapd/doc/kerneldoc2doxygen.pl
index 68835a1ddd31..68835a1ddd31 100755..100644
--- a/contrib/wpa/hostapd/doc/kerneldoc2doxygen.pl
+++ b/contrib/wpa/hostapd/doc/kerneldoc2doxygen.pl
diff --git a/contrib/wpa/hostapd/logwatch/hostapd b/contrib/wpa/hostapd/logwatch/hostapd
index 97b24ef6e1b8..97b24ef6e1b8 100755..100644
--- a/contrib/wpa/hostapd/logwatch/hostapd
+++ b/contrib/wpa/hostapd/logwatch/hostapd
diff --git a/contrib/wpa/wpa_supplicant/doc/kerneldoc2doxygen.pl b/contrib/wpa/wpa_supplicant/doc/kerneldoc2doxygen.pl
index 61bc367b4964..61bc367b4964 100755..100644
--- a/contrib/wpa/wpa_supplicant/doc/kerneldoc2doxygen.pl
+++ b/contrib/wpa/wpa_supplicant/doc/kerneldoc2doxygen.pl
diff --git a/contrib/wpa/wpa_supplicant/examples/wpas-test.py b/contrib/wpa/wpa_supplicant/examples/wpas-test.py
index fd7f73d428b8..fd7f73d428b8 100755..100644
--- a/contrib/wpa/wpa_supplicant/examples/wpas-test.py
+++ b/contrib/wpa/wpa_supplicant/examples/wpas-test.py
diff --git a/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist.sh b/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist.sh
index c33e36289dcb..c33e36289dcb 100755..100644
--- a/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist.sh
+++ b/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist.sh
diff --git a/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist2.sh b/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist2.sh
index 0be29b7feb31..0be29b7feb31 100755..100644
--- a/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist2.sh
+++ b/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist2.sh