Flatten vendor/tcpdump and remove keyword expansion.

316 files changed, 5 insertions, 17 deletions

diff --git a/contrib/tcpdump/CHANGES b/CHANGES
index aa29e305cfdf..aa29e305cfdf 100644
--- a/contrib/tcpdump/CHANGES
+++ b/CHANGES
diff --git a/contrib/tcpdump/CREDITS b/CREDITS
index d327880c083d..d327880c083d 100644
--- a/contrib/tcpdump/CREDITS
+++ b/CREDITS
diff --git a/contrib/tcpdump/FILES b/FILES
index 4e2afa26c610..4e2afa26c610 100644
--- a/contrib/tcpdump/FILES
+++ b/FILES
diff --git a/contrib/tcpdump/INSTALL b/INSTALL
index 745997f3569a..745997f3569a 100644
--- a/contrib/tcpdump/INSTALL
+++ b/INSTALL
diff --git a/contrib/tcpdump/LICENSE b/LICENSE
index dea5f7d54d6b..dea5f7d54d6b 100644
--- a/contrib/tcpdump/LICENSE
+++ b/LICENSE
diff --git a/contrib/tcpdump/Makefile-devel-adds b/Makefile-devel-adds
index 512a1199795c..512a1199795c 100644
--- a/contrib/tcpdump/Makefile-devel-adds
+++ b/Makefile-devel-adds
diff --git a/contrib/tcpdump/Makefile.in b/Makefile.in
index dcc8f40792f1..dcc8f40792f1 100644
--- a/contrib/tcpdump/Makefile.in
+++ b/Makefile.in
diff --git a/contrib/tcpdump/PLATFORMS b/PLATFORMS
index 2e1aedf773d4..2e1aedf773d4 100644
--- a/contrib/tcpdump/PLATFORMS
+++ b/PLATFORMS
diff --git a/contrib/tcpdump/README b/README
index cb51d3092d63..cb51d3092d63 100644
--- a/contrib/tcpdump/README
+++ b/README
diff --git a/contrib/tcpdump/Readme.Win32 b/Readme.Win32
index fdf8b12bc767..fdf8b12bc767 100644
--- a/contrib/tcpdump/Readme.Win32
+++ b/Readme.Win32
diff --git a/contrib/tcpdump/TODO b/TODO
index 12c8b3f51946..12c8b3f51946 100644
--- a/contrib/tcpdump/TODO
+++ b/TODO
diff --git a/contrib/tcpdump/VERSION b/VERSION
index 26cb48590ea4..26cb48590ea4 100644
--- a/contrib/tcpdump/VERSION
+++ b/VERSION
diff --git a/contrib/tcpdump/acconfig.h b/acconfig.h
index f28d52c23043..f28d52c23043 100644
--- a/contrib/tcpdump/acconfig.h
+++ b/acconfig.h
diff --git a/contrib/tcpdump/aclocal.m4 b/aclocal.m4
index 4b7010530422..4b7010530422 100644
--- a/contrib/tcpdump/aclocal.m4
+++ b/aclocal.m4
diff --git a/contrib/tcpdump/acsite.m4 b/acsite.m4
index 746faf1e1a4f..746faf1e1a4f 100644
--- a/contrib/tcpdump/acsite.m4
+++ b/acsite.m4
diff --git a/contrib/tcpdump/addrtoname.c b/addrtoname.c
index 53d615f2c0ef..53d615f2c0ef 100644
--- a/contrib/tcpdump/addrtoname.c
+++ b/addrtoname.c
diff --git a/contrib/tcpdump/addrtoname.h b/addrtoname.h
index 67ded6e69484..67ded6e69484 100644
--- a/contrib/tcpdump/addrtoname.h
+++ b/addrtoname.h
diff --git a/contrib/tcpdump/af.c b/af.c
index 76d61787d495..76d61787d495 100644
--- a/contrib/tcpdump/af.c
+++ b/af.c
diff --git a/contrib/tcpdump/af.h b/af.h
index 1ba766212a27..1ba766212a27 100644
--- a/contrib/tcpdump/af.h
+++ b/af.h
diff --git a/contrib/tcpdump/ah.h b/ah.h
index c22806afe850..c22806afe850 100644
--- a/contrib/tcpdump/ah.h
+++ b/ah.h
diff --git a/contrib/tcpdump/aodv.h b/aodv.h
index 335c175c12c0..335c175c12c0 100644
--- a/contrib/tcpdump/aodv.h
+++ b/aodv.h
diff --git a/contrib/tcpdump/appletalk.h b/appletalk.h
index 67e62ef870f2..67e62ef870f2 100644
--- a/contrib/tcpdump/appletalk.h
+++ b/appletalk.h
diff --git a/contrib/tcpdump/arcnet.h b/arcnet.h
index 6e649f61e02f..6e649f61e02f 100644
--- a/contrib/tcpdump/arcnet.h
+++ b/arcnet.h
diff --git a/contrib/tcpdump/atime.awk b/atime.awk
index b42dec240186..b42dec240186 100644
--- a/contrib/tcpdump/atime.awk
+++ b/atime.awk
diff --git a/contrib/tcpdump/atm.h b/atm.h
index c6ac53ea0719..c6ac53ea0719 100644
--- a/contrib/tcpdump/atm.h
+++ b/atm.h
diff --git a/contrib/tcpdump/atmuni31.h b/atmuni31.h
index 304859a9f14b..304859a9f14b 100644
--- a/contrib/tcpdump/atmuni31.h
+++ b/atmuni31.h
diff --git a/contrib/tcpdump/bgp.h b/bgp.h
index 06be3ea7c0c1..06be3ea7c0c1 100755
--- a/contrib/tcpdump/bgp.h
+++ b/bgp.h
diff --git a/contrib/tcpdump/bootp.h b/bootp.h
index 7c63d0c4a304..7c63d0c4a304 100644
--- a/contrib/tcpdump/bootp.h
+++ b/bootp.h
diff --git a/contrib/tcpdump/bpf_dump.c b/bpf_dump.c
index 0cad4d95542e..0cad4d95542e 100644
--- a/contrib/tcpdump/bpf_dump.c
+++ b/bpf_dump.c
diff --git a/contrib/tcpdump/chdlc.h b/chdlc.h
index 4fb6e1d4e41d..4fb6e1d4e41d 100644
--- a/contrib/tcpdump/chdlc.h
+++ b/chdlc.h
diff --git a/contrib/tcpdump/config.guess b/config.guess
index 4c5bde8a2806..4c5bde8a2806 100755
--- a/contrib/tcpdump/config.guess
+++ b/config.guess
diff --git a/contrib/tcpdump/config.h.in b/config.h.in
index 86ffe06e8892..86ffe06e8892 100644
--- a/contrib/tcpdump/config.h.in
+++ b/config.h.in
diff --git a/contrib/tcpdump/config.sub b/config.sub
index 56981740d6ef..56981740d6ef 100755
--- a/contrib/tcpdump/config.sub
+++ b/config.sub
diff --git a/contrib/tcpdump/configure b/configure
index 2494df5473eb..2494df5473eb 100755
--- a/contrib/tcpdump/configure
+++ b/configure
diff --git a/contrib/tcpdump/configure.in b/configure.in
index 5a010e7bf8ef..5a010e7bf8ef 100755
--- a/contrib/tcpdump/configure.in
+++ b/configure.in
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/cpack.c b/cpack.c
index 14c0a9ee2a3e..14c0a9ee2a3e 100644
--- a/contrib/tcpdump/cpack.c
+++ b/cpack.c
diff --git a/contrib/tcpdump/cpack.h b/cpack.h
index 14ed37692cd9..14ed37692cd9 100644
--- a/contrib/tcpdump/cpack.h
+++ b/cpack.h
diff --git a/contrib/tcpdump/dccp.h b/dccp.h
index 1afa8c0f578a..1afa8c0f578a 100644
--- a/contrib/tcpdump/dccp.h
+++ b/dccp.h
diff --git a/contrib/tcpdump/decnet.h b/decnet.h
index 9a5c147703c9..9a5c147703c9 100644
--- a/contrib/tcpdump/decnet.h
+++ b/decnet.h
diff --git a/contrib/tcpdump/decode_prefix.h b/decode_prefix.h
index b73847142f02..b73847142f02 100644
--- a/contrib/tcpdump/decode_prefix.h
+++ b/decode_prefix.h
diff --git a/contrib/tcpdump/dhcp6.h b/dhcp6.h
index 8381b11f9195..8381b11f9195 100644
--- a/contrib/tcpdump/dhcp6.h
+++ b/dhcp6.h
diff --git a/contrib/tcpdump/dhcp6opt.h b/dhcp6opt.h
index fc6534dd1bb9..fc6534dd1bb9 100644
--- a/contrib/tcpdump/dhcp6opt.h
+++ b/dhcp6opt.h
diff --git a/contrib/tcpdump/enc.h b/enc.h
index f54b4eb6950a..f54b4eb6950a 100644
--- a/contrib/tcpdump/enc.h
+++ b/enc.h
diff --git a/contrib/tcpdump/esp.h b/esp.h
index 56cdada01e2d..56cdada01e2d 100644
--- a/contrib/tcpdump/esp.h
+++ b/esp.h
diff --git a/contrib/tcpdump/ether.h b/ether.h
index 3d3f3be50146..3d3f3be50146 100644
--- a/contrib/tcpdump/ether.h
+++ b/ether.h
diff --git a/contrib/tcpdump/ethertype.h b/ethertype.h
index 36dc8e24d304..36dc8e24d304 100644
--- a/contrib/tcpdump/ethertype.h
+++ b/ethertype.h
diff --git a/contrib/tcpdump/extract.h b/extract.h
index f3db2505dd41..f3db2505dd41 100644
--- a/contrib/tcpdump/extract.h
+++ b/extract.h
diff --git a/contrib/tcpdump/fddi.h b/fddi.h
index 690af48d8747..690af48d8747 100644
--- a/contrib/tcpdump/fddi.h
+++ b/fddi.h
diff --git a/contrib/tcpdump/gmpls.c b/gmpls.c
index 4d4b9aeb3985..4d4b9aeb3985 100644
--- a/contrib/tcpdump/gmpls.c
+++ b/gmpls.c
diff --git a/contrib/tcpdump/gmpls.h b/gmpls.h
index 8c3f051ecc60..8c3f051ecc60 100644
--- a/contrib/tcpdump/gmpls.h
+++ b/gmpls.h
diff --git a/contrib/tcpdump/gmt2local.c b/gmt2local.c
index 926e86cfb7fc..926e86cfb7fc 100644
--- a/contrib/tcpdump/gmt2local.c
+++ b/gmt2local.c
diff --git a/contrib/tcpdump/gmt2local.h b/gmt2local.h
index 81b0e9607235..81b0e9607235 100644
--- a/contrib/tcpdump/gmt2local.h
+++ b/gmt2local.h
diff --git a/contrib/tcpdump/icmp6.h b/icmp6.h
index 20a51e3a6198..20a51e3a6198 100644
--- a/contrib/tcpdump/icmp6.h
+++ b/icmp6.h
diff --git a/contrib/tcpdump/ieee802_11.h b/ieee802_11.h
index f578a43f1a4f..f578a43f1a4f 100644
--- a/contrib/tcpdump/ieee802_11.h
+++ b/ieee802_11.h
diff --git a/contrib/tcpdump/ieee802_11_radio.h b/ieee802_11_radio.h
index 05c8a89e0026..f4416ab9959a 100644
--- a/contrib/tcpdump/ieee802_11_radio.h
+++ b/ieee802_11_radio.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: vendor/tcpdump/dist/contrib/tcpdump/ieee802_11_radio.h 172683 2007-10-16 02:20:42Z mlaier $ */
 /* $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.1.2.1 2006/06/13 22:24:45 guy Exp $ */
 
diff --git a/contrib/tcpdump/igrp.h b/igrp.h
index 78876d3d8428..78876d3d8428 100644
--- a/contrib/tcpdump/igrp.h
+++ b/igrp.h
diff --git a/contrib/tcpdump/install-sh b/install-sh
index ebc66913e940..ebc66913e940 100755
--- a/contrib/tcpdump/install-sh
+++ b/install-sh
diff --git a/contrib/tcpdump/interface.h b/interface.h
index 49ba87d25711..49ba87d25711 100644
--- a/contrib/tcpdump/interface.h
+++ b/interface.h
diff --git a/contrib/tcpdump/ip.h b/ip.h
index e232ae0d185e..e232ae0d185e 100644
--- a/contrib/tcpdump/ip.h
+++ b/ip.h
diff --git a/contrib/tcpdump/ip6.h b/ip6.h
index acf465c6b082..acf465c6b082 100644
--- a/contrib/tcpdump/ip6.h
+++ b/ip6.h
diff --git a/contrib/tcpdump/ipfc.h b/ipfc.h
index f822d4af2e79..f822d4af2e79 100644
--- a/contrib/tcpdump/ipfc.h
+++ b/ipfc.h
diff --git a/contrib/tcpdump/ipproto.c b/ipproto.c
index 66ea3563ce8f..66ea3563ce8f 100755
--- a/contrib/tcpdump/ipproto.c
+++ b/ipproto.c
diff --git a/contrib/tcpdump/ipproto.h b/ipproto.h
index 1800db4580da..7134d7d5ebe7 100644
--- a/contrib/tcpdump/ipproto.h
+++ b/ipproto.h
@@ -34,7 +34,7 @@
  *
  * From:
  *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $FreeBSD$
+ * $FreeBSD: vendor/tcpdump/dist/contrib/tcpdump/ipproto.h 162017 2006-09-04 20:04:42Z sam $
  */
 
 extern struct tok ipproto_values[];
diff --git a/contrib/tcpdump/ipsec_doi.h b/ipsec_doi.h
index 83d05ea54bad..83d05ea54bad 100644
--- a/contrib/tcpdump/ipsec_doi.h
+++ b/ipsec_doi.h
diff --git a/contrib/tcpdump/ipx.h b/ipx.h
index a8c1cd5115eb..a8c1cd5115eb 100644
--- a/contrib/tcpdump/ipx.h
+++ b/ipx.h
diff --git a/contrib/tcpdump/isakmp.h b/isakmp.h
index 94fac401d48e..94fac401d48e 100644
--- a/contrib/tcpdump/isakmp.h
+++ b/isakmp.h
diff --git a/contrib/tcpdump/l2tp.h b/l2tp.h
index 156888347f56..156888347f56 100644
--- a/contrib/tcpdump/l2tp.h
+++ b/l2tp.h
diff --git a/contrib/tcpdump/l2vpn.c b/l2vpn.c
index d98e69adfd16..d98e69adfd16 100755
--- a/contrib/tcpdump/l2vpn.c
+++ b/l2vpn.c
diff --git a/contrib/tcpdump/l2vpn.h b/l2vpn.h
index 64eb0247b7d2..64eb0247b7d2 100755
--- a/contrib/tcpdump/l2vpn.h
+++ b/l2vpn.h
diff --git a/contrib/tcpdump/lane.h b/lane.h
index 51b6e19c9392..51b6e19c9392 100644
--- a/contrib/tcpdump/lane.h
+++ b/lane.h
diff --git a/contrib/tcpdump/lbl/gnuc.h b/lbl/gnuc.h
index 1615d437675f..1615d437675f 100644
--- a/contrib/tcpdump/lbl/gnuc.h
+++ b/lbl/gnuc.h
diff --git a/contrib/tcpdump/lbl/os-osf4.h b/lbl/os-osf4.h
index 62866ede5852..62866ede5852 100644
--- a/contrib/tcpdump/lbl/os-osf4.h
+++ b/lbl/os-osf4.h
diff --git a/contrib/tcpdump/lbl/os-solaris2.h b/lbl/os-solaris2.h
index de481c2f7e19..de481c2f7e19 100644
--- a/contrib/tcpdump/lbl/os-solaris2.h
+++ b/lbl/os-solaris2.h
diff --git a/contrib/tcpdump/lbl/os-sunos4.h b/lbl/os-sunos4.h
index 2e0f25fc5827..2e0f25fc5827 100644
--- a/contrib/tcpdump/lbl/os-sunos4.h
+++ b/lbl/os-sunos4.h
diff --git a/contrib/tcpdump/lbl/os-ultrix4.h b/lbl/os-ultrix4.h
index 676b3bdd93eb..676b3bdd93eb 100644
--- a/contrib/tcpdump/lbl/os-ultrix4.h
+++ b/lbl/os-ultrix4.h
diff --git a/contrib/tcpdump/llc.h b/llc.h
index fc04c671f022..fc04c671f022 100644
--- a/contrib/tcpdump/llc.h
+++ b/llc.h
diff --git a/contrib/tcpdump/machdep.c b/machdep.c
index 5b04503a7281..5b04503a7281 100644
--- a/contrib/tcpdump/machdep.c
+++ b/machdep.c
diff --git a/contrib/tcpdump/machdep.h b/machdep.h
index 8d49a7af716b..8d49a7af716b 100644
--- a/contrib/tcpdump/machdep.h
+++ b/machdep.h
diff --git a/contrib/tcpdump/makemib b/makemib
index 2c80bef05832..2c80bef05832 100755
--- a/contrib/tcpdump/makemib
+++ b/makemib
diff --git a/contrib/tcpdump/mib.h b/mib.h
index 92c6c2c58f00..92c6c2c58f00 100644
--- a/contrib/tcpdump/mib.h
+++ b/mib.h
diff --git a/contrib/tcpdump/missing/addrinfo.h b/missing/addrinfo.h
index 09f6a425eaab..09f6a425eaab 100644
--- a/contrib/tcpdump/missing/addrinfo.h
+++ b/missing/addrinfo.h
diff --git a/contrib/tcpdump/missing/addrsize.h b/missing/addrsize.h
index 13db4da9159d..13db4da9159d 100644
--- a/contrib/tcpdump/missing/addrsize.h
+++ b/missing/addrsize.h
diff --git a/contrib/tcpdump/missing/bittypes.h b/missing/bittypes.h
index 31013ae4552a..31013ae4552a 100644
--- a/contrib/tcpdump/missing/bittypes.h
+++ b/missing/bittypes.h
diff --git a/contrib/tcpdump/missing/cdecl_ext.h b/missing/cdecl_ext.h
index 9591db264574..9591db264574 100644
--- a/contrib/tcpdump/missing/cdecl_ext.h
+++ b/missing/cdecl_ext.h
diff --git a/contrib/tcpdump/missing/datalinks.c b/missing/datalinks.c
index 2cc126737945..2cc126737945 100644
--- a/contrib/tcpdump/missing/datalinks.c
+++ b/missing/datalinks.c
diff --git a/contrib/tcpdump/missing/dlnames.c b/missing/dlnames.c
index f4f583ee8670..f4f583ee8670 100644
--- a/contrib/tcpdump/missing/dlnames.c
+++ b/missing/dlnames.c
diff --git a/contrib/tcpdump/missing/getaddrinfo.c b/missing/getaddrinfo.c
index 883032282c41..883032282c41 100644
--- a/contrib/tcpdump/missing/getaddrinfo.c
+++ b/missing/getaddrinfo.c
diff --git a/contrib/tcpdump/missing/getnameinfo.c b/missing/getnameinfo.c
index 6bd5b474438e..6bd5b474438e 100644
--- a/contrib/tcpdump/missing/getnameinfo.c
+++ b/missing/getnameinfo.c
diff --git a/contrib/tcpdump/missing/inet_aton.c b/missing/inet_aton.c
index a4b2eeb3fa3e..a4b2eeb3fa3e 100644
--- a/contrib/tcpdump/missing/inet_aton.c
+++ b/missing/inet_aton.c
diff --git a/contrib/tcpdump/missing/inet_ntop.c b/missing/inet_ntop.c
index 8bbbad619a22..8bbbad619a22 100644
--- a/contrib/tcpdump/missing/inet_ntop.c
+++ b/missing/inet_ntop.c
diff --git a/contrib/tcpdump/missing/inet_pton.c b/missing/inet_pton.c
index 1b8abd2cbab1..1b8abd2cbab1 100644
--- a/contrib/tcpdump/missing/inet_pton.c
+++ b/missing/inet_pton.c
diff --git a/contrib/tcpdump/missing/resolv6.h b/missing/resolv6.h
index ccee03e6c436..ccee03e6c436 100644
--- a/contrib/tcpdump/missing/resolv6.h
+++ b/missing/resolv6.h
diff --git a/contrib/tcpdump/missing/resolv_ext.h b/missing/resolv_ext.h
index 92c531d860cc..92c531d860cc 100644
--- a/contrib/tcpdump/missing/resolv_ext.h
+++ b/missing/resolv_ext.h
diff --git a/contrib/tcpdump/missing/snprintf.c b/missing/snprintf.c
index 4f2bb321238f..4f2bb321238f 100644
--- a/contrib/tcpdump/missing/snprintf.c
+++ b/missing/snprintf.c
diff --git a/contrib/tcpdump/missing/sockstorage.h b/missing/sockstorage.h
index e7333289f176..e7333289f176 100644
--- a/contrib/tcpdump/missing/sockstorage.h
+++ b/missing/sockstorage.h
diff --git a/contrib/tcpdump/missing/strdup.c b/missing/strdup.c
index 103c3b26f6f3..103c3b26f6f3 100644
--- a/contrib/tcpdump/missing/strdup.c
+++ b/missing/strdup.c
diff --git a/contrib/tcpdump/missing/strlcat.c b/missing/strlcat.c
index fca2e8a2f5b6..fca2e8a2f5b6 100644
--- a/contrib/tcpdump/missing/strlcat.c
+++ b/missing/strlcat.c
diff --git a/contrib/tcpdump/missing/strlcpy.c b/missing/strlcpy.c
index 3f1809a7b36d..3f1809a7b36d 100644
--- a/contrib/tcpdump/missing/strlcpy.c
+++ b/missing/strlcpy.c
diff --git a/contrib/tcpdump/missing/strsep.c b/missing/strsep.c
index 19fb6b2c0178..19fb6b2c0178 100644
--- a/contrib/tcpdump/missing/strsep.c
+++ b/missing/strsep.c
diff --git a/contrib/tcpdump/mkdep b/mkdep
index 2a9c221b1f1d..2a9c221b1f1d 100755
--- a/contrib/tcpdump/mkdep
+++ b/mkdep
diff --git a/contrib/tcpdump/mpls.h b/mpls.h
index 69fc9c9176d0..69fc9c9176d0 100644
--- a/contrib/tcpdump/mpls.h
+++ b/mpls.h
diff --git a/contrib/tcpdump/nameser.h b/nameser.h
index e6391f43b9be..e6391f43b9be 100644
--- a/contrib/tcpdump/nameser.h
+++ b/nameser.h
diff --git a/contrib/tcpdump/netbios.h b/netbios.h
index 34abebae8ec0..34abebae8ec0 100644
--- a/contrib/tcpdump/netbios.h
+++ b/netbios.h
diff --git a/contrib/tcpdump/netdissect.h b/netdissect.h
index 3609455e67c2..3609455e67c2 100644
--- a/contrib/tcpdump/netdissect.h
+++ b/netdissect.h
diff --git a/contrib/tcpdump/nfs.h b/nfs.h
index 3d47c7d3d937..3d47c7d3d937 100644
--- a/contrib/tcpdump/nfs.h
+++ b/nfs.h
diff --git a/contrib/tcpdump/nfsfh.h b/nfsfh.h
index b8a82e4bd910..b8a82e4bd910 100644
--- a/contrib/tcpdump/nfsfh.h
+++ b/nfsfh.h
diff --git a/contrib/tcpdump/nfsv2.h b/nfsv2.h
index b2c0ff9929e4..b2c0ff9929e4 100644
--- a/contrib/tcpdump/nfsv2.h
+++ b/nfsv2.h
diff --git a/contrib/tcpdump/nlpid.c b/nlpid.c
index 7dfd6a6f883d..7dfd6a6f883d 100755
--- a/contrib/tcpdump/nlpid.c
+++ b/nlpid.c
diff --git a/contrib/tcpdump/nlpid.h b/nlpid.h
index fdca44655238..fdca44655238 100644
--- a/contrib/tcpdump/nlpid.h
+++ b/nlpid.h
diff --git a/contrib/tcpdump/ntp.h b/ntp.h
index df856699ae89..df856699ae89 100644
--- a/contrib/tcpdump/ntp.h
+++ b/ntp.h
diff --git a/contrib/tcpdump/oakley.h b/oakley.h
index f40d6073eb01..f40d6073eb01 100644
--- a/contrib/tcpdump/oakley.h
+++ b/oakley.h
diff --git a/contrib/tcpdump/ospf.h b/ospf.h
index 91a904fed19c..91a904fed19c 100644
--- a/contrib/tcpdump/ospf.h
+++ b/ospf.h
diff --git a/contrib/tcpdump/ospf6.h b/ospf6.h
index b8298ead9165..b8298ead9165 100644
--- a/contrib/tcpdump/ospf6.h
+++ b/ospf6.h
diff --git a/contrib/tcpdump/oui.c b/oui.c
index 7cdcd40181d7..7cdcd40181d7 100644
--- a/contrib/tcpdump/oui.c
+++ b/oui.c
diff --git a/contrib/tcpdump/oui.h b/oui.h
index 4d79e197d42e..4d79e197d42e 100644
--- a/contrib/tcpdump/oui.h
+++ b/oui.h
diff --git a/contrib/tcpdump/packetdat.awk b/packetdat.awk
index 292e21910a67..292e21910a67 100644
--- a/contrib/tcpdump/packetdat.awk
+++ b/packetdat.awk
diff --git a/contrib/tcpdump/parsenfsfh.c b/parsenfsfh.c
index ef1e0ba38bde..ef1e0ba38bde 100644
--- a/contrib/tcpdump/parsenfsfh.c
+++ b/parsenfsfh.c
diff --git a/contrib/tcpdump/pcap-missing.h b/pcap-missing.h
index 1f2fcb422b95..1f2fcb422b95 100644
--- a/contrib/tcpdump/pcap-missing.h
+++ b/pcap-missing.h
diff --git a/contrib/tcpdump/pcap_dump_ftell.c b/pcap_dump_ftell.c
index 438cd29dbeb9..438cd29dbeb9 100644
--- a/contrib/tcpdump/pcap_dump_ftell.c
+++ b/pcap_dump_ftell.c
diff --git a/contrib/tcpdump/pf.h b/pf.h
index c2d332abb3cd..c2d332abb3cd 100644
--- a/contrib/tcpdump/pf.h
+++ b/pf.h
diff --git a/contrib/tcpdump/pmap_prot.h b/pmap_prot.h
index 17cb92ff9a78..cf6b620b39fe 100644
--- a/contrib/tcpdump/pmap_prot.h
+++ b/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: vendor/tcpdump/dist/contrib/tcpdump/pmap_prot.h 147899 2005-07-11 03:54:22Z sam $
  */
 
 /*
diff --git a/contrib/tcpdump/ppp.h b/ppp.h
index 71621caa9ca7..71621caa9ca7 100644
--- a/contrib/tcpdump/ppp.h
+++ b/ppp.h
diff --git a/contrib/tcpdump/print-802_11.c b/print-802_11.c
index 21e316defcc8..21e316defcc8 100644
--- a/contrib/tcpdump/print-802_11.c
+++ b/print-802_11.c
diff --git a/contrib/tcpdump/print-ah.c b/print-ah.c
index 92ed9094d72d..92ed9094d72d 100644
--- a/contrib/tcpdump/print-ah.c
+++ b/print-ah.c
diff --git a/contrib/tcpdump/print-aodv.c b/print-aodv.c
index 80a547dd305f..80a547dd305f 100644
--- a/contrib/tcpdump/print-aodv.c
+++ b/print-aodv.c
diff --git a/contrib/tcpdump/print-ap1394.c b/print-ap1394.c
index a01ce34cef65..a01ce34cef65 100644
--- a/contrib/tcpdump/print-ap1394.c
+++ b/print-ap1394.c
diff --git a/contrib/tcpdump/print-arcnet.c b/print-arcnet.c
index 63f9c215d7ac..63f9c215d7ac 100644
--- a/contrib/tcpdump/print-arcnet.c
+++ b/print-arcnet.c
diff --git a/contrib/tcpdump/print-arp.c b/print-arp.c
index 68e9dc6894c7..68e9dc6894c7 100644
--- a/contrib/tcpdump/print-arp.c
+++ b/print-arp.c
diff --git a/contrib/tcpdump/print-ascii.c b/print-ascii.c
index cd48edd98d66..cd48edd98d66 100644
--- a/contrib/tcpdump/print-ascii.c
+++ b/print-ascii.c
diff --git a/contrib/tcpdump/print-atalk.c b/print-atalk.c
index f1f45a3cb72d..f1f45a3cb72d 100644
--- a/contrib/tcpdump/print-atalk.c
+++ b/print-atalk.c
diff --git a/contrib/tcpdump/print-atm.c b/print-atm.c
index d664d6e5c310..d664d6e5c310 100644
--- a/contrib/tcpdump/print-atm.c
+++ b/print-atm.c
diff --git a/contrib/tcpdump/print-beep.c b/print-beep.c
index db40d611245a..db40d611245a 100644
--- a/contrib/tcpdump/print-beep.c
+++ b/print-beep.c
diff --git a/contrib/tcpdump/print-bfd.c b/print-bfd.c
index 03e59dc4959f..03e59dc4959f 100644
--- a/contrib/tcpdump/print-bfd.c
+++ b/print-bfd.c
diff --git a/contrib/tcpdump/print-bgp.c b/print-bgp.c
index 34aa7985eca8..34aa7985eca8 100644
--- a/contrib/tcpdump/print-bgp.c
+++ b/print-bgp.c
diff --git a/contrib/tcpdump/print-bootp.c b/print-bootp.c
index e2086e44ea01..e2086e44ea01 100644
--- a/contrib/tcpdump/print-bootp.c
+++ b/print-bootp.c
diff --git a/contrib/tcpdump/print-bxxp.c b/print-bxxp.c
index 56be54fc17f9..56be54fc17f9 100644
--- a/contrib/tcpdump/print-bxxp.c
+++ b/print-bxxp.c
diff --git a/contrib/tcpdump/print-cdp.c b/print-cdp.c
index 4398fbefdae7..4398fbefdae7 100644
--- a/contrib/tcpdump/print-cdp.c
+++ b/print-cdp.c
diff --git a/contrib/tcpdump/print-chdlc.c b/print-chdlc.c
index b7654f5c658b..b7654f5c658b 100644
--- a/contrib/tcpdump/print-chdlc.c
+++ b/print-chdlc.c
diff --git a/contrib/tcpdump/print-cip.c b/print-cip.c
index 774b7002378b..774b7002378b 100644
--- a/contrib/tcpdump/print-cip.c
+++ b/print-cip.c
diff --git a/contrib/tcpdump/print-cnfp.c b/print-cnfp.c
index 9fdfbd4d06c7..9fdfbd4d06c7 100644
--- a/contrib/tcpdump/print-cnfp.c
+++ b/print-cnfp.c
diff --git a/contrib/tcpdump/print-dccp.c b/print-dccp.c
index e6bfca61af94..e6bfca61af94 100644
--- a/contrib/tcpdump/print-dccp.c
+++ b/print-dccp.c
diff --git a/contrib/tcpdump/print-decnet.c b/print-decnet.c
index ae7ba5c4ea55..ae7ba5c4ea55 100644
--- a/contrib/tcpdump/print-decnet.c
+++ b/print-decnet.c
diff --git a/contrib/tcpdump/print-dhcp6.c b/print-dhcp6.c
index 9f4999d70f62..9f4999d70f62 100644
--- a/contrib/tcpdump/print-dhcp6.c
+++ b/print-dhcp6.c
diff --git a/contrib/tcpdump/print-domain.c b/print-domain.c
index d4a35d8c8494..d4a35d8c8494 100644
--- a/contrib/tcpdump/print-domain.c
+++ b/print-domain.c
diff --git a/contrib/tcpdump/print-dvmrp.c b/print-dvmrp.c
index 2c159bf94508..2c159bf94508 100644
--- a/contrib/tcpdump/print-dvmrp.c
+++ b/print-dvmrp.c
diff --git a/contrib/tcpdump/print-eap.c b/print-eap.c
index fb39e76f89b9..fb39e76f89b9 100644
--- a/contrib/tcpdump/print-eap.c
+++ b/print-eap.c
diff --git a/contrib/tcpdump/print-egp.c b/print-egp.c
index e5a811d7dc8d..e5a811d7dc8d 100644
--- a/contrib/tcpdump/print-egp.c
+++ b/print-egp.c
diff --git a/contrib/tcpdump/print-eigrp.c b/print-eigrp.c
index 3168b3ca784c..3168b3ca784c 100644
--- a/contrib/tcpdump/print-eigrp.c
+++ b/print-eigrp.c
diff --git a/contrib/tcpdump/print-enc.c b/print-enc.c
index f9b871b351d8..f9b871b351d8 100644
--- a/contrib/tcpdump/print-enc.c
+++ b/print-enc.c
diff --git a/contrib/tcpdump/print-esp.c b/print-esp.c
index 3ccc899e9cf4..3ccc899e9cf4 100644
--- a/contrib/tcpdump/print-esp.c
+++ b/print-esp.c
diff --git a/contrib/tcpdump/print-ether.c b/print-ether.c
index f71a7ccdca0f..f71a7ccdca0f 100644
--- a/contrib/tcpdump/print-ether.c
+++ b/print-ether.c
diff --git a/contrib/tcpdump/print-fddi.c b/print-fddi.c
index eeb7191b3feb..eeb7191b3feb 100644
--- a/contrib/tcpdump/print-fddi.c
+++ b/print-fddi.c
diff --git a/contrib/tcpdump/print-fr.c b/print-fr.c
index b53a88bdc894..b53a88bdc894 100644
--- a/contrib/tcpdump/print-fr.c
+++ b/print-fr.c
diff --git a/contrib/tcpdump/print-frag6.c b/print-frag6.c
index 2c7788ba2600..2c7788ba2600 100644
--- a/contrib/tcpdump/print-frag6.c
+++ b/print-frag6.c
diff --git a/contrib/tcpdump/print-gre.c b/print-gre.c
index d739356ac818..d739356ac818 100644
--- a/contrib/tcpdump/print-gre.c
+++ b/print-gre.c
diff --git a/contrib/tcpdump/print-hsrp.c b/print-hsrp.c
index 1d22247e8e84..1d22247e8e84 100644
--- a/contrib/tcpdump/print-hsrp.c
+++ b/print-hsrp.c
diff --git a/contrib/tcpdump/print-icmp.c b/print-icmp.c
index e9e8459f41c6..e9e8459f41c6 100644
--- a/contrib/tcpdump/print-icmp.c
+++ b/print-icmp.c
diff --git a/contrib/tcpdump/print-icmp6.c b/print-icmp6.c
index c5039247af11..c5039247af11 100644
--- a/contrib/tcpdump/print-icmp6.c
+++ b/print-icmp6.c
diff --git a/contrib/tcpdump/print-igmp.c b/print-igmp.c
index c310d55b9dc0..c310d55b9dc0 100644
--- a/contrib/tcpdump/print-igmp.c
+++ b/print-igmp.c
diff --git a/contrib/tcpdump/print-igrp.c b/print-igrp.c
index 898471d08f48..898471d08f48 100644
--- a/contrib/tcpdump/print-igrp.c
+++ b/print-igrp.c
diff --git a/contrib/tcpdump/print-ip.c b/print-ip.c
index 07238f51d569..07238f51d569 100644
--- a/contrib/tcpdump/print-ip.c
+++ b/print-ip.c
diff --git a/contrib/tcpdump/print-ip6.c b/print-ip6.c
index 29e5988b19e9..29e5988b19e9 100644
--- a/contrib/tcpdump/print-ip6.c
+++ b/print-ip6.c
diff --git a/contrib/tcpdump/print-ip6opts.c b/print-ip6opts.c
index 82163a261e1d..82163a261e1d 100644
--- a/contrib/tcpdump/print-ip6opts.c
+++ b/print-ip6opts.c
diff --git a/contrib/tcpdump/print-ipcomp.c b/print-ipcomp.c
index 099e5ad9b69e..099e5ad9b69e 100644
--- a/contrib/tcpdump/print-ipcomp.c
+++ b/print-ipcomp.c
diff --git a/contrib/tcpdump/print-ipfc.c b/print-ipfc.c
index 6712e5f92a4c..6712e5f92a4c 100644
--- a/contrib/tcpdump/print-ipfc.c
+++ b/print-ipfc.c
diff --git a/contrib/tcpdump/print-ipx.c b/print-ipx.c
index 5309aa47d123..5309aa47d123 100644
--- a/contrib/tcpdump/print-ipx.c
+++ b/print-ipx.c
diff --git a/contrib/tcpdump/print-isakmp.c b/print-isakmp.c
index 09972f0292b5..09972f0292b5 100644
--- a/contrib/tcpdump/print-isakmp.c
+++ b/print-isakmp.c
diff --git a/contrib/tcpdump/print-isoclns.c b/print-isoclns.c
index d3935fc41196..d3935fc41196 100644
--- a/contrib/tcpdump/print-isoclns.c
+++ b/print-isoclns.c
diff --git a/contrib/tcpdump/print-juniper.c b/print-juniper.c
index b5837e378573..b5837e378573 100644
--- a/contrib/tcpdump/print-juniper.c
+++ b/print-juniper.c
diff --git a/contrib/tcpdump/print-krb.c b/print-krb.c
index d6c8e14f4f7f..d6c8e14f4f7f 100644
--- a/contrib/tcpdump/print-krb.c
+++ b/print-krb.c
diff --git a/contrib/tcpdump/print-l2tp.c b/print-l2tp.c
index 6ceab43e75f6..6ceab43e75f6 100644
--- a/contrib/tcpdump/print-l2tp.c
+++ b/print-l2tp.c
diff --git a/contrib/tcpdump/print-lane.c b/print-lane.c
index 1c3c2c21639f..1c3c2c21639f 100644
--- a/contrib/tcpdump/print-lane.c
+++ b/print-lane.c
diff --git a/contrib/tcpdump/print-lcp.c b/print-lcp.c
index ddea9c6053c7..ddea9c6053c7 100644
--- a/contrib/tcpdump/print-lcp.c
+++ b/print-lcp.c
diff --git a/contrib/tcpdump/print-ldp.c b/print-ldp.c
index 3280d8ca2a86..3280d8ca2a86 100644
--- a/contrib/tcpdump/print-ldp.c
+++ b/print-ldp.c
diff --git a/contrib/tcpdump/print-llc.c b/print-llc.c
index bc4198501ab7..bc4198501ab7 100644
--- a/contrib/tcpdump/print-llc.c
+++ b/print-llc.c
diff --git a/contrib/tcpdump/print-lmp.c b/print-lmp.c
index 84d166f5c18e..84d166f5c18e 100644
--- a/contrib/tcpdump/print-lmp.c
+++ b/print-lmp.c
diff --git a/contrib/tcpdump/print-lspping.c b/print-lspping.c
index a80cdc6d0c8d..a80cdc6d0c8d 100644
--- a/contrib/tcpdump/print-lspping.c
+++ b/print-lspping.c
diff --git a/contrib/tcpdump/print-lwres.c b/print-lwres.c
index d0d6fe1cddfa..d0d6fe1cddfa 100644
--- a/contrib/tcpdump/print-lwres.c
+++ b/print-lwres.c
diff --git a/contrib/tcpdump/print-mobile.c b/print-mobile.c
index fe6f013fa690..fe6f013fa690 100644
--- a/contrib/tcpdump/print-mobile.c
+++ b/print-mobile.c
diff --git a/contrib/tcpdump/print-mobility.c b/print-mobility.c
index 8f9cbee708b9..8f9cbee708b9 100644
--- a/contrib/tcpdump/print-mobility.c
+++ b/print-mobility.c
diff --git a/contrib/tcpdump/print-mpls.c b/print-mpls.c
index 9d545677cc8c..9d545677cc8c 100644
--- a/contrib/tcpdump/print-mpls.c
+++ b/print-mpls.c
diff --git a/contrib/tcpdump/print-msdp.c b/print-msdp.c
index 3f79b68b1ac0..3f79b68b1ac0 100644
--- a/contrib/tcpdump/print-msdp.c
+++ b/print-msdp.c
diff --git a/contrib/tcpdump/print-netbios.c b/print-netbios.c
index 419953cb5c63..419953cb5c63 100644
--- a/contrib/tcpdump/print-netbios.c
+++ b/print-netbios.c
diff --git a/contrib/tcpdump/print-nfs.c b/print-nfs.c
index 45e886978be8..45e886978be8 100644
--- a/contrib/tcpdump/print-nfs.c
+++ b/print-nfs.c
diff --git a/contrib/tcpdump/print-ntp.c b/print-ntp.c
index 606a654de10a..606a654de10a 100644
--- a/contrib/tcpdump/print-ntp.c
+++ b/print-ntp.c
diff --git a/contrib/tcpdump/print-null.c b/print-null.c
index 3d203da4f249..3d203da4f249 100644
--- a/contrib/tcpdump/print-null.c
+++ b/print-null.c
diff --git a/contrib/tcpdump/print-olsr.c b/print-olsr.c
index 174a51eac943..174a51eac943 100644
--- a/contrib/tcpdump/print-olsr.c
+++ b/print-olsr.c
diff --git a/contrib/tcpdump/print-ospf.c b/print-ospf.c
index fd8f111a3c4e..fd8f111a3c4e 100644
--- a/contrib/tcpdump/print-ospf.c
+++ b/print-ospf.c
diff --git a/contrib/tcpdump/print-ospf6.c b/print-ospf6.c
index 6325a2192025..6325a2192025 100644
--- a/contrib/tcpdump/print-ospf6.c
+++ b/print-ospf6.c
diff --git a/contrib/tcpdump/print-pflog.c b/print-pflog.c
index dd9ba495e9b6..dd9ba495e9b6 100644
--- a/contrib/tcpdump/print-pflog.c
+++ b/print-pflog.c
diff --git a/contrib/tcpdump/print-pgm.c b/print-pgm.c
index edaf93333e74..edaf93333e74 100644
--- a/contrib/tcpdump/print-pgm.c
+++ b/print-pgm.c
diff --git a/contrib/tcpdump/print-pim.c b/print-pim.c
index 39c4e4d73835..39c4e4d73835 100644
--- a/contrib/tcpdump/print-pim.c
+++ b/print-pim.c
diff --git a/contrib/tcpdump/print-ppp.c b/print-ppp.c
index 1e99c15f1885..1e99c15f1885 100644
--- a/contrib/tcpdump/print-ppp.c
+++ b/print-ppp.c
diff --git a/contrib/tcpdump/print-pppoe.c b/print-pppoe.c
index 229b5eef60af..229b5eef60af 100644
--- a/contrib/tcpdump/print-pppoe.c
+++ b/print-pppoe.c
diff --git a/contrib/tcpdump/print-pptp.c b/print-pptp.c
index d400589300f7..d400589300f7 100644
--- a/contrib/tcpdump/print-pptp.c
+++ b/print-pptp.c
diff --git a/contrib/tcpdump/print-radius.c b/print-radius.c
index 203c50bd06ab..203c50bd06ab 100644
--- a/contrib/tcpdump/print-radius.c
+++ b/print-radius.c
diff --git a/contrib/tcpdump/print-raw.c b/print-raw.c
index 0fe6dd1947b3..0fe6dd1947b3 100644
--- a/contrib/tcpdump/print-raw.c
+++ b/print-raw.c
diff --git a/contrib/tcpdump/print-rip.c b/print-rip.c
index 772a2e056c7e..772a2e056c7e 100644
--- a/contrib/tcpdump/print-rip.c
+++ b/print-rip.c
diff --git a/contrib/tcpdump/print-ripng.c b/print-ripng.c
index 5e7a02ecc413..5e7a02ecc413 100644
--- a/contrib/tcpdump/print-ripng.c
+++ b/print-ripng.c
diff --git a/contrib/tcpdump/print-rsvp.c b/print-rsvp.c
index ad519305fa81..ad519305fa81 100644
--- a/contrib/tcpdump/print-rsvp.c
+++ b/print-rsvp.c
diff --git a/contrib/tcpdump/print-rt6.c b/print-rt6.c
index 39e22aeaa278..39e22aeaa278 100644
--- a/contrib/tcpdump/print-rt6.c
+++ b/print-rt6.c
diff --git a/contrib/tcpdump/print-rx.c b/print-rx.c
index d99106660ee7..d99106660ee7 100644
--- a/contrib/tcpdump/print-rx.c
+++ b/print-rx.c
diff --git a/contrib/tcpdump/print-sctp.c b/print-sctp.c
index 7a1897812b19..7a1897812b19 100644
--- a/contrib/tcpdump/print-sctp.c
+++ b/print-sctp.c
diff --git a/contrib/tcpdump/print-sip.c b/print-sip.c
index b4d13b132fe8..b4d13b132fe8 100644
--- a/contrib/tcpdump/print-sip.c
+++ b/print-sip.c
diff --git a/contrib/tcpdump/print-sl.c b/print-sl.c
index f28a21a407a3..f28a21a407a3 100644
--- a/contrib/tcpdump/print-sl.c
+++ b/print-sl.c
diff --git a/contrib/tcpdump/print-sll.c b/print-sll.c
index 1735f65095ca..1735f65095ca 100644
--- a/contrib/tcpdump/print-sll.c
+++ b/print-sll.c
diff --git a/contrib/tcpdump/print-slow.c b/print-slow.c
index 96099221b9f7..96099221b9f7 100644
--- a/contrib/tcpdump/print-slow.c
+++ b/print-slow.c
diff --git a/contrib/tcpdump/print-smb.c b/print-smb.c
index 5b963de94bd1..5b963de94bd1 100644
--- a/contrib/tcpdump/print-smb.c
+++ b/print-smb.c
diff --git a/contrib/tcpdump/print-snmp.c b/print-snmp.c
index 0686b6223074..0686b6223074 100644
--- a/contrib/tcpdump/print-snmp.c
+++ b/print-snmp.c
diff --git a/contrib/tcpdump/print-stp.c b/print-stp.c
index 4308ae01b94b..4308ae01b94b 100644
--- a/contrib/tcpdump/print-stp.c
+++ b/print-stp.c
diff --git a/contrib/tcpdump/print-sunatm.c b/print-sunatm.c
index acd38bf7eeb8..acd38bf7eeb8 100644
--- a/contrib/tcpdump/print-sunatm.c
+++ b/print-sunatm.c
diff --git a/contrib/tcpdump/print-sunrpc.c b/print-sunrpc.c
index 03e28a489b0e..03e28a489b0e 100644
--- a/contrib/tcpdump/print-sunrpc.c
+++ b/print-sunrpc.c
diff --git a/contrib/tcpdump/print-symantec.c b/print-symantec.c
index eb72180850f1..eb72180850f1 100644
--- a/contrib/tcpdump/print-symantec.c
+++ b/print-symantec.c
diff --git a/contrib/tcpdump/print-syslog.c b/print-syslog.c
index 099d027b2580..099d027b2580 100755
--- a/contrib/tcpdump/print-syslog.c
+++ b/print-syslog.c
diff --git a/contrib/tcpdump/print-tcp.c b/print-tcp.c
index 11bd6b7ab46f..11bd6b7ab46f 100644
--- a/contrib/tcpdump/print-tcp.c
+++ b/print-tcp.c
diff --git a/contrib/tcpdump/print-telnet.c b/print-telnet.c
index 78887278bfa2..78887278bfa2 100644
--- a/contrib/tcpdump/print-telnet.c
+++ b/print-telnet.c
diff --git a/contrib/tcpdump/print-tftp.c b/print-tftp.c
index b517898b1372..b517898b1372 100644
--- a/contrib/tcpdump/print-tftp.c
+++ b/print-tftp.c
diff --git a/contrib/tcpdump/print-timed.c b/print-timed.c
index 3df224129f74..3df224129f74 100644
--- a/contrib/tcpdump/print-timed.c
+++ b/print-timed.c
diff --git a/contrib/tcpdump/print-token.c b/print-token.c
index 47fcca63ab61..47fcca63ab61 100644
--- a/contrib/tcpdump/print-token.c
+++ b/print-token.c
diff --git a/contrib/tcpdump/print-udp.c b/print-udp.c
index 3f08a1c20b13..3f08a1c20b13 100644
--- a/contrib/tcpdump/print-udp.c
+++ b/print-udp.c
diff --git a/contrib/tcpdump/print-vjc.c b/print-vjc.c
index 55b7d08b26f9..55b7d08b26f9 100644
--- a/contrib/tcpdump/print-vjc.c
+++ b/print-vjc.c
diff --git a/contrib/tcpdump/print-vrrp.c b/print-vrrp.c
index 1e87a5003a17..1e87a5003a17 100644
--- a/contrib/tcpdump/print-vrrp.c
+++ b/print-vrrp.c
diff --git a/contrib/tcpdump/print-wb.c b/print-wb.c
index e28697a6bb3a..e28697a6bb3a 100644
--- a/contrib/tcpdump/print-wb.c
+++ b/print-wb.c
diff --git a/contrib/tcpdump/print-zephyr.c b/print-zephyr.c
index 698faa2f5b46..698faa2f5b46 100644
--- a/contrib/tcpdump/print-zephyr.c
+++ b/print-zephyr.c
diff --git a/contrib/tcpdump/route6d.h b/route6d.h
index ee0033148c0c..ee0033148c0c 100644
--- a/contrib/tcpdump/route6d.h
+++ b/route6d.h
diff --git a/contrib/tcpdump/rpc_auth.h b/rpc_auth.h
index 2b8ddc10164b..b6fa11e29e5f 100644
--- a/contrib/tcpdump/rpc_auth.h
+++ b/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: vendor/tcpdump/dist/contrib/tcpdump/rpc_auth.h 147899 2005-07-11 03:54:22Z sam $
  */
 
 /*
diff --git a/contrib/tcpdump/rpc_msg.h b/rpc_msg.h
index 01185de1ca15..93cb8c109cf4 100644
--- a/contrib/tcpdump/rpc_msg.h
+++ b/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: vendor/tcpdump/dist/contrib/tcpdump/rpc_msg.h 147899 2005-07-11 03:54:22Z sam $
  */
 
 /*
diff --git a/contrib/tcpdump/rx.h b/rx.h
index 1912e51ae33c..1912e51ae33c 100644
--- a/contrib/tcpdump/rx.h
+++ b/rx.h
diff --git a/contrib/tcpdump/savestr.c b/savestr.c
index a81227c9e6d0..a81227c9e6d0 100644
--- a/contrib/tcpdump/savestr.c
+++ b/savestr.c
diff --git a/contrib/tcpdump/savestr.h b/savestr.h
index 8fe995eb21fb..8fe995eb21fb 100644
--- a/contrib/tcpdump/savestr.h
+++ b/savestr.h
diff --git a/contrib/tcpdump/sctpConstants.h b/sctpConstants.h
index f70226b62402..f70226b62402 100644
--- a/contrib/tcpdump/sctpConstants.h
+++ b/sctpConstants.h
diff --git a/contrib/tcpdump/sctpHeader.h b/sctpHeader.h
index 3b26094c1b82..3b26094c1b82 100644
--- a/contrib/tcpdump/sctpHeader.h
+++ b/sctpHeader.h
diff --git a/contrib/tcpdump/send-ack.awk b/send-ack.awk
index f55b7c2f6d13..f55b7c2f6d13 100644
--- a/contrib/tcpdump/send-ack.awk
+++ b/send-ack.awk
diff --git a/contrib/tcpdump/setsignal.c b/setsignal.c
index dbb8678182fb..dbb8678182fb 100644
--- a/contrib/tcpdump/setsignal.c
+++ b/setsignal.c
diff --git a/contrib/tcpdump/setsignal.h b/setsignal.h
index a7fb2a7481bd..a7fb2a7481bd 100644
--- a/contrib/tcpdump/setsignal.h
+++ b/setsignal.h
diff --git a/contrib/tcpdump/slcompress.h b/slcompress.h
index d8a596cf5290..d8a596cf5290 100644
--- a/contrib/tcpdump/slcompress.h
+++ b/slcompress.h
diff --git a/contrib/tcpdump/slip.h b/slip.h
index e64f3015ac3e..e64f3015ac3e 100644
--- a/contrib/tcpdump/slip.h
+++ b/slip.h
diff --git a/contrib/tcpdump/sll.h b/sll.h
index 693f05efa496..693f05efa496 100644
--- a/contrib/tcpdump/sll.h
+++ b/sll.h
diff --git a/contrib/tcpdump/smb.h b/smb.h
index bb05227f1d52..bb05227f1d52 100644
--- a/contrib/tcpdump/smb.h
+++ b/smb.h
diff --git a/contrib/tcpdump/smbutil.c b/smbutil.c
index 86bcb4c93cc8..86bcb4c93cc8 100644
--- a/contrib/tcpdump/smbutil.c
+++ b/smbutil.c
diff --git a/contrib/tcpdump/stime.awk b/stime.awk
index 61891f247b95..61891f247b95 100644
--- a/contrib/tcpdump/stime.awk
+++ b/stime.awk
diff --git a/contrib/tcpdump/strcasecmp.c b/strcasecmp.c
index aa6d0074219b..aa6d0074219b 100644
--- a/contrib/tcpdump/strcasecmp.c
+++ b/strcasecmp.c
diff --git a/contrib/tcpdump/tcp.h b/tcp.h
index 5934cd632e92..5934cd632e92 100644
--- a/contrib/tcpdump/tcp.h
+++ b/tcp.h
diff --git a/contrib/tcpdump/tcpdump-stdinc.h b/tcpdump-stdinc.h
index cd04d09df9b7..cd04d09df9b7 100644
--- a/contrib/tcpdump/tcpdump-stdinc.h
+++ b/tcpdump-stdinc.h
diff --git a/contrib/tcpdump/tcpdump.1 b/tcpdump.1
index d13b4de6f982..d13b4de6f982 100644
--- a/contrib/tcpdump/tcpdump.1
+++ b/tcpdump.1
diff --git a/contrib/tcpdump/tcpdump.c b/tcpdump.c
index caf419ea8a14..caf419ea8a14 100644
--- a/contrib/tcpdump/tcpdump.c
+++ b/tcpdump.c
diff --git a/contrib/tcpdump/telnet.h b/telnet.h
index da11043019f1..da11043019f1 100644
--- a/contrib/tcpdump/telnet.h
+++ b/telnet.h
diff --git a/contrib/tcpdump/tests/.cvsignore b/tests/.cvsignore
index f097c8a945c7..f097c8a945c7 100644
--- a/contrib/tcpdump/tests/.cvsignore
+++ b/tests/.cvsignore
diff --git a/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu b/tests/02-sunrise-sunset-esp.puu
index 0ceffc1c1c83..0ceffc1c1c83 100644
--- a/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu
+++ b/tests/02-sunrise-sunset-esp.puu
diff --git a/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu b/tests/08-sunrise-sunset-aes.puu
index ec8793d02238..ec8793d02238 100644
--- a/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu
+++ b/tests/08-sunrise-sunset-aes.puu
diff --git a/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu b/tests/08-sunrise-sunset-esp2.puu
index 4785f2b808c9..4785f2b808c9 100644
--- a/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu
+++ b/tests/08-sunrise-sunset-esp2.puu
diff --git a/contrib/tcpdump/tests/alltests.sh b/tests/alltests.sh
index 7df25991f1b6..7df25991f1b6 100644
--- a/contrib/tcpdump/tests/alltests.sh
+++ b/tests/alltests.sh
diff --git a/contrib/tcpdump/tests/bgp_vpn_attrset.out b/tests/bgp_vpn_attrset.out
index 7fb12ae4b3e4..7fb12ae4b3e4 100644
--- a/contrib/tcpdump/tests/bgp_vpn_attrset.out
+++ b/tests/bgp_vpn_attrset.out
diff --git a/contrib/tcpdump/tests/bgp_vpn_attrset.sh b/tests/bgp_vpn_attrset.sh
index c32872c83bea..c32872c83bea 100755
--- a/contrib/tcpdump/tests/bgp_vpn_attrset.sh
+++ b/tests/bgp_vpn_attrset.sh
diff --git a/contrib/tcpdump/tests/eapon1.gdbinit b/tests/eapon1.gdbinit
index 37ad0bcd029e..37ad0bcd029e 100644
--- a/contrib/tcpdump/tests/eapon1.gdbinit
+++ b/tests/eapon1.gdbinit
diff --git a/contrib/tcpdump/tests/eapon1.out b/tests/eapon1.out
index c5042e3ff13f..c5042e3ff13f 100644
--- a/contrib/tcpdump/tests/eapon1.out
+++ b/tests/eapon1.out
diff --git a/contrib/tcpdump/tests/eapon1.puu b/tests/eapon1.puu
index 25c14367780a..25c14367780a 100644
--- a/contrib/tcpdump/tests/eapon1.puu
+++ b/tests/eapon1.puu
diff --git a/contrib/tcpdump/tests/eapon1.sh b/tests/eapon1.sh
index 1c8aa631d12b..1c8aa631d12b 100755
--- a/contrib/tcpdump/tests/eapon1.sh
+++ b/tests/eapon1.sh
diff --git a/contrib/tcpdump/tests/eapon2.puu b/tests/eapon2.puu
index 70abb23d6337..70abb23d6337 100644
--- a/contrib/tcpdump/tests/eapon2.puu
+++ b/tests/eapon2.puu
diff --git a/contrib/tcpdump/tests/esp-secrets.txt b/tests/esp-secrets.txt
index 81847a0e3e50..81847a0e3e50 100644
--- a/contrib/tcpdump/tests/esp-secrets.txt
+++ b/tests/esp-secrets.txt
diff --git a/contrib/tcpdump/tests/esp0.out b/tests/esp0.out
index a0ddf1b2dc71..a0ddf1b2dc71 100644
--- a/contrib/tcpdump/tests/esp0.out
+++ b/tests/esp0.out
diff --git a/contrib/tcpdump/tests/esp0.sh b/tests/esp0.sh
index daf407c441e5..daf407c441e5 100644
--- a/contrib/tcpdump/tests/esp0.sh
+++ b/tests/esp0.sh
diff --git a/contrib/tcpdump/tests/esp1.gdbinit b/tests/esp1.gdbinit
index 6c8ae890cbd5..6c8ae890cbd5 100644
--- a/contrib/tcpdump/tests/esp1.gdbinit
+++ b/tests/esp1.gdbinit
diff --git a/contrib/tcpdump/tests/esp1.out b/tests/esp1.out
index 61b2967639ad..61b2967639ad 100644
--- a/contrib/tcpdump/tests/esp1.out
+++ b/tests/esp1.out
diff --git a/contrib/tcpdump/tests/esp1.sh b/tests/esp1.sh
index 87ee3b92df1e..87ee3b92df1e 100644
--- a/contrib/tcpdump/tests/esp1.sh
+++ b/tests/esp1.sh
diff --git a/contrib/tcpdump/tests/esp2.gdbinit b/tests/esp2.gdbinit
index 7c1840758622..7c1840758622 100644
--- a/contrib/tcpdump/tests/esp2.gdbinit
+++ b/tests/esp2.gdbinit
diff --git a/contrib/tcpdump/tests/esp2.out b/tests/esp2.out
index a829c8ea3390..a829c8ea3390 100644
--- a/contrib/tcpdump/tests/esp2.out
+++ b/tests/esp2.out
diff --git a/contrib/tcpdump/tests/esp2.sh b/tests/esp2.sh
index 18a70833e05f..18a70833e05f 100644
--- a/contrib/tcpdump/tests/esp2.sh
+++ b/tests/esp2.sh
diff --git a/contrib/tcpdump/tests/esp3.gdbinit b/tests/esp3.gdbinit
index 71501187a220..71501187a220 100644
--- a/contrib/tcpdump/tests/esp3.gdbinit
+++ b/tests/esp3.gdbinit
diff --git a/contrib/tcpdump/tests/esp3.sh b/tests/esp3.sh
index 122beab97ede..122beab97ede 100644
--- a/contrib/tcpdump/tests/esp3.sh
+++ b/tests/esp3.sh
diff --git a/contrib/tcpdump/tests/esp4.gdbinit b/tests/esp4.gdbinit
index 8007444b74e2..8007444b74e2 100644
--- a/contrib/tcpdump/tests/esp4.gdbinit
+++ b/tests/esp4.gdbinit
diff --git a/contrib/tcpdump/tests/esp4.sh b/tests/esp4.sh
index bba26e722a86..bba26e722a86 100644
--- a/contrib/tcpdump/tests/esp4.sh
+++ b/tests/esp4.sh
diff --git a/contrib/tcpdump/tests/esp5.gdbinit b/tests/esp5.gdbinit
index 2f578e327042..2f578e327042 100644
--- a/contrib/tcpdump/tests/esp5.gdbinit
+++ b/tests/esp5.gdbinit
diff --git a/contrib/tcpdump/tests/esp5.out b/tests/esp5.out
index 73f35e0b2201..73f35e0b2201 100644
--- a/contrib/tcpdump/tests/esp5.out
+++ b/tests/esp5.out
diff --git a/contrib/tcpdump/tests/esp5.sh b/tests/esp5.sh
index 405b677bf36e..405b677bf36e 100644
--- a/contrib/tcpdump/tests/esp5.sh
+++ b/tests/esp5.sh
diff --git a/contrib/tcpdump/tests/espudp1.out b/tests/espudp1.out
index 8999ff4d602b..8999ff4d602b 100644
--- a/contrib/tcpdump/tests/espudp1.out
+++ b/tests/espudp1.out
diff --git a/contrib/tcpdump/tests/espudp1.puu b/tests/espudp1.puu
index 353c1c9c3d5e..353c1c9c3d5e 100644
--- a/contrib/tcpdump/tests/espudp1.puu
+++ b/tests/espudp1.puu
diff --git a/contrib/tcpdump/tests/espudp1.sh b/tests/espudp1.sh
index 35dc0a880367..35dc0a880367 100644
--- a/contrib/tcpdump/tests/espudp1.sh
+++ b/tests/espudp1.sh
diff --git a/contrib/tcpdump/tests/isakmp-delete-segfault.puu b/tests/isakmp-delete-segfault.puu
index 11512b128424..11512b128424 100644
--- a/contrib/tcpdump/tests/isakmp-delete-segfault.puu
+++ b/tests/isakmp-delete-segfault.puu
diff --git a/contrib/tcpdump/tests/isakmp-identification-segfault.puu b/tests/isakmp-identification-segfault.puu
index 6f0ae0e8db38..6f0ae0e8db38 100644
--- a/contrib/tcpdump/tests/isakmp-identification-segfault.puu
+++ b/tests/isakmp-identification-segfault.puu
diff --git a/contrib/tcpdump/tests/isakmp-pointer-loop.puu b/tests/isakmp-pointer-loop.puu
index fc582482c1e7..fc582482c1e7 100644
--- a/contrib/tcpdump/tests/isakmp-pointer-loop.puu
+++ b/tests/isakmp-pointer-loop.puu
diff --git a/contrib/tcpdump/tests/isakmp1.out b/tests/isakmp1.out
index 67a6ed1685a5..67a6ed1685a5 100644
--- a/contrib/tcpdump/tests/isakmp1.out
+++ b/tests/isakmp1.out
diff --git a/contrib/tcpdump/tests/isakmp1.sh b/tests/isakmp1.sh
index ce2de7d1ba79..ce2de7d1ba79 100644
--- a/contrib/tcpdump/tests/isakmp1.sh
+++ b/tests/isakmp1.sh
diff --git a/contrib/tcpdump/tests/isakmp2.out b/tests/isakmp2.out
index 44c28db87b15..44c28db87b15 100644
--- a/contrib/tcpdump/tests/isakmp2.out
+++ b/tests/isakmp2.out
diff --git a/contrib/tcpdump/tests/isakmp2.sh b/tests/isakmp2.sh
index d0006a8feeee..d0006a8feeee 100644
--- a/contrib/tcpdump/tests/isakmp2.sh
+++ b/tests/isakmp2.sh
diff --git a/contrib/tcpdump/tests/isakmp3.out b/tests/isakmp3.out
index 6b37b77af8ec..6b37b77af8ec 100644
--- a/contrib/tcpdump/tests/isakmp3.out
+++ b/tests/isakmp3.out
diff --git a/contrib/tcpdump/tests/isakmp3.sh b/tests/isakmp3.sh
index e6003cc31fc8..e6003cc31fc8 100644
--- a/contrib/tcpdump/tests/isakmp3.sh
+++ b/tests/isakmp3.sh
diff --git a/contrib/tcpdump/tests/isakmp4.out b/tests/isakmp4.out
index 8c5b7daeb0d2..8c5b7daeb0d2 100644
--- a/contrib/tcpdump/tests/isakmp4.out
+++ b/tests/isakmp4.out
diff --git a/contrib/tcpdump/tests/isakmp4.sh b/tests/isakmp4.sh
index dd7bf0780399..dd7bf0780399 100644
--- a/contrib/tcpdump/tests/isakmp4.sh
+++ b/tests/isakmp4.sh
diff --git a/contrib/tcpdump/tests/isakmp4500.puu b/tests/isakmp4500.puu
index 0b55dccfde4a..0b55dccfde4a 100644
--- a/contrib/tcpdump/tests/isakmp4500.puu
+++ b/tests/isakmp4500.puu
diff --git a/contrib/tcpdump/tests/lmp.out b/tests/lmp.out
index ee37bca05923..ee37bca05923 100644
--- a/contrib/tcpdump/tests/lmp.out
+++ b/tests/lmp.out
diff --git a/contrib/tcpdump/tests/lmp.puu b/tests/lmp.puu
index c14cd560c96c..c14cd560c96c 100644
--- a/contrib/tcpdump/tests/lmp.puu
+++ b/tests/lmp.puu
diff --git a/contrib/tcpdump/tests/lmp.sh b/tests/lmp.sh
index 991904480e83..991904480e83 100755
--- a/contrib/tcpdump/tests/lmp.sh
+++ b/tests/lmp.sh
diff --git a/contrib/tcpdump/tests/mpls-ldp-hello.out b/tests/mpls-ldp-hello.out
index fa621ca4c080..fa621ca4c080 100644
--- a/contrib/tcpdump/tests/mpls-ldp-hello.out
+++ b/tests/mpls-ldp-hello.out
diff --git a/contrib/tcpdump/tests/mpls-ldp-hello.puu b/tests/mpls-ldp-hello.puu
index b7f3b625b34e..b7f3b625b34e 100644
--- a/contrib/tcpdump/tests/mpls-ldp-hello.puu
+++ b/tests/mpls-ldp-hello.puu
diff --git a/contrib/tcpdump/tests/mpls-ldp-hello.sh b/tests/mpls-ldp-hello.sh
index b1a5b1941705..b1a5b1941705 100755
--- a/contrib/tcpdump/tests/mpls-ldp-hello.sh
+++ b/tests/mpls-ldp-hello.sh
diff --git a/contrib/tcpdump/tests/ospf-gmpls.out b/tests/ospf-gmpls.out
index 965affc2773a..965affc2773a 100644
--- a/contrib/tcpdump/tests/ospf-gmpls.out
+++ b/tests/ospf-gmpls.out
diff --git a/contrib/tcpdump/tests/ospf-gmpls.puu b/tests/ospf-gmpls.puu
index 691e38e9f54e..691e38e9f54e 100644
--- a/contrib/tcpdump/tests/ospf-gmpls.puu
+++ b/tests/ospf-gmpls.puu
diff --git a/contrib/tcpdump/tests/ospf-gmpls.sh b/tests/ospf-gmpls.sh
index da2dd3ba1758..da2dd3ba1758 100755
--- a/contrib/tcpdump/tests/ospf-gmpls.sh
+++ b/tests/ospf-gmpls.sh
diff --git a/contrib/tcpdump/tests/print-A.out b/tests/print-A.out
index 107ffcbb1d0f..107ffcbb1d0f 100644
--- a/contrib/tcpdump/tests/print-A.out
+++ b/tests/print-A.out
diff --git a/contrib/tcpdump/tests/print-AA.out b/tests/print-AA.out
index 52c0a7751549..52c0a7751549 100644
--- a/contrib/tcpdump/tests/print-AA.out
+++ b/tests/print-AA.out
diff --git a/contrib/tcpdump/tests/print-X.out b/tests/print-X.out
index 53e44edb6b1c..53e44edb6b1c 100644
--- a/contrib/tcpdump/tests/print-X.out
+++ b/tests/print-X.out
diff --git a/contrib/tcpdump/tests/print-XX.out b/tests/print-XX.out
index 6921a017a04a..6921a017a04a 100644
--- a/contrib/tcpdump/tests/print-XX.out
+++ b/tests/print-XX.out
diff --git a/contrib/tcpdump/tests/print-capX.out b/tests/print-capX.out
index 53e44edb6b1c..53e44edb6b1c 100644
--- a/contrib/tcpdump/tests/print-capX.out
+++ b/tests/print-capX.out
diff --git a/contrib/tcpdump/tests/print-capXX.out b/tests/print-capXX.out
index 6921a017a04a..6921a017a04a 100644
--- a/contrib/tcpdump/tests/print-capXX.out
+++ b/tests/print-capXX.out
diff --git a/contrib/tcpdump/tests/print-flags.puu b/tests/print-flags.puu
index bcd8b9926839..bcd8b9926839 100644
--- a/contrib/tcpdump/tests/print-flags.puu
+++ b/tests/print-flags.puu
diff --git a/contrib/tcpdump/tests/print-flags.sh b/tests/print-flags.sh
index c99f78282aeb..c99f78282aeb 100755
--- a/contrib/tcpdump/tests/print-flags.sh
+++ b/tests/print-flags.sh
diff --git a/contrib/tcpdump/tests/print-x.out b/tests/print-x.out
index 0b25bf656378..0b25bf656378 100644
--- a/contrib/tcpdump/tests/print-x.out
+++ b/tests/print-x.out
diff --git a/contrib/tcpdump/tests/print-xx.out b/tests/print-xx.out
index 82323d4210e9..82323d4210e9 100644
--- a/contrib/tcpdump/tests/print-xx.out
+++ b/tests/print-xx.out
diff --git a/contrib/tcpdump/tftp.h b/tftp.h
index 44083042d562..44083042d562 100644
--- a/contrib/tcpdump/tftp.h
+++ b/tftp.h
diff --git a/contrib/tcpdump/timed.h b/timed.h
index 0a5c5fe57a7d..0a5c5fe57a7d 100644
--- a/contrib/tcpdump/timed.h
+++ b/timed.h
diff --git a/contrib/tcpdump/token.h b/token.h
index 8e7fd6d4e27d..8e7fd6d4e27d 100644
--- a/contrib/tcpdump/token.h
+++ b/token.h
diff --git a/contrib/tcpdump/udp.h b/udp.h
index dedc9c18460b..dedc9c18460b 100644
--- a/contrib/tcpdump/udp.h
+++ b/udp.h
diff --git a/contrib/tcpdump/util.c b/util.c
index 912f6f3c76ef..912f6f3c76ef 100644
--- a/contrib/tcpdump/util.c
+++ b/util.c
diff --git a/contrib/tcpdump/vfprintf.c b/vfprintf.c
index 354406ce2c43..354406ce2c43 100644
--- a/contrib/tcpdump/vfprintf.c
+++ b/vfprintf.c