aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/Makefile1
-rw-r--r--usr.sbin/Makefile.amd641
-rw-r--r--usr.sbin/Makefile.arm1
-rw-r--r--usr.sbin/Makefile.arm641
-rw-r--r--usr.sbin/Makefile.i3861
-rw-r--r--usr.sbin/Makefile.inc1
-rw-r--r--usr.sbin/Makefile.mips1
-rw-r--r--usr.sbin/Makefile.powerpc1
-rw-r--r--usr.sbin/Makefile.riscv1
-rw-r--r--usr.sbin/ac/Makefile1
-rw-r--r--usr.sbin/ac/Makefile.depend1
-rw-r--r--usr.sbin/accton/Makefile1
-rw-r--r--usr.sbin/accton/Makefile.depend1
-rw-r--r--usr.sbin/acpi/Makefile1
-rw-r--r--usr.sbin/acpi/Makefile.inc1
-rw-r--r--usr.sbin/acpi/acpiconf/Makefile1
-rw-r--r--usr.sbin/acpi/acpiconf/Makefile.depend1
-rw-r--r--usr.sbin/acpi/acpidb/Makefile1
-rw-r--r--usr.sbin/acpi/acpidb/Makefile.depend1
-rw-r--r--usr.sbin/acpi/acpidump/Makefile1
-rw-r--r--usr.sbin/acpi/acpidump/Makefile.depend1
-rw-r--r--usr.sbin/acpi/iasl/Makefile1
-rw-r--r--usr.sbin/acpi/iasl/Makefile.depend1
-rw-r--r--usr.sbin/adduser/Makefile1
-rw-r--r--usr.sbin/adduser/Makefile.depend1
-rw-r--r--usr.sbin/adduser/adduser.sh1
-rw-r--r--usr.sbin/adduser/rmuser.sh1
-rw-r--r--usr.sbin/ancontrol/Makefile1
-rw-r--r--usr.sbin/ancontrol/Makefile.depend1
-rw-r--r--usr.sbin/apm/Makefile1
-rw-r--r--usr.sbin/apm/Makefile.depend1
-rw-r--r--usr.sbin/apmd/Makefile1
-rw-r--r--usr.sbin/apmd/Makefile.depend1
-rw-r--r--usr.sbin/apmd/apmd.conf1
-rw-r--r--usr.sbin/arp/Makefile1
-rw-r--r--usr.sbin/arp/Makefile.depend1
-rw-r--r--usr.sbin/audit/Makefile1
-rw-r--r--usr.sbin/audit/Makefile.depend1
-rw-r--r--usr.sbin/auditd/Makefile1
-rw-r--r--usr.sbin/auditd/Makefile.depend1
-rw-r--r--usr.sbin/auditdistd/Makefile1
-rw-r--r--usr.sbin/auditdistd/Makefile.depend1
-rw-r--r--usr.sbin/auditreduce/Makefile1
-rw-r--r--usr.sbin/auditreduce/Makefile.depend1
-rw-r--r--usr.sbin/authpf/Makefile1
-rw-r--r--usr.sbin/authpf/Makefile.depend1
-rw-r--r--usr.sbin/autofs/Makefile1
-rw-r--r--usr.sbin/autofs/Makefile.depend1
-rw-r--r--usr.sbin/autofs/auto_master1
-rw-r--r--usr.sbin/autofs/autofs/Makefile1
-rw-r--r--usr.sbin/autofs/autofs/include_ldap1
-rw-r--r--usr.sbin/autofs/autofs/include_nis1
-rw-r--r--usr.sbin/autofs/autofs/include_nis_nullfs1
-rw-r--r--usr.sbin/autofs/autofs/special_hosts1
-rwxr-xr-xusr.sbin/autofs/autofs/special_media1
-rwxr-xr-xusr.sbin/autofs/autofs/special_noauto1
-rw-r--r--usr.sbin/autofs/autofs/special_null1
-rw-r--r--usr.sbin/bhyve/Makefile1
-rw-r--r--usr.sbin/bhyve/Makefile.depend1
-rw-r--r--usr.sbin/bhyve/Makefile.depend.options1
-rw-r--r--usr.sbin/bhyve/kbdlayout/Makefile1
-rw-r--r--usr.sbin/bhyve/kbdlayout/Makefile.depend1
-rw-r--r--usr.sbin/bhyve/kbdlayout/am1
-rw-r--r--usr.sbin/bhyve/kbdlayout/be1
-rw-r--r--usr.sbin/bhyve/kbdlayout/be_acc1
-rw-r--r--usr.sbin/bhyve/kbdlayout/bg_bds1
-rw-r--r--usr.sbin/bhyve/kbdlayout/bg_phonetic1
-rw-r--r--usr.sbin/bhyve/kbdlayout/br1
-rw-r--r--usr.sbin/bhyve/kbdlayout/br_noacc1
-rw-r--r--usr.sbin/bhyve/kbdlayout/centraleuropean1
-rw-r--r--usr.sbin/bhyve/kbdlayout/ch1
-rw-r--r--usr.sbin/bhyve/kbdlayout/ch-fr1
-rw-r--r--usr.sbin/bhyve/kbdlayout/ch-fr_acc1
-rw-r--r--usr.sbin/bhyve/kbdlayout/ch_acc1
-rw-r--r--usr.sbin/bhyve/kbdlayout/ch_macbook_acc1
-rw-r--r--usr.sbin/bhyve/kbdlayout/cz1
-rw-r--r--usr.sbin/bhyve/kbdlayout/de1
-rw-r--r--usr.sbin/bhyve/kbdlayout/de_acc1
-rw-r--r--usr.sbin/bhyve/kbdlayout/de_noacc1
-rw-r--r--usr.sbin/bhyve/kbdlayout/default1
-rw-r--r--usr.sbin/bhyve/kbdlayout/dk1
-rw-r--r--usr.sbin/bhyve/kbdlayout/dk_macbook1
-rw-r--r--usr.sbin/bhyve/kbdlayout/ee1
-rw-r--r--usr.sbin/bhyve/kbdlayout/es1
-rw-r--r--usr.sbin/bhyve/kbdlayout/es_acc1
-rw-r--r--usr.sbin/bhyve/kbdlayout/es_dvorak1
-rw-r--r--usr.sbin/bhyve/kbdlayout/fi1
-rw-r--r--usr.sbin/bhyve/kbdlayout/fr1
-rw-r--r--usr.sbin/bhyve/kbdlayout/fr_acc1
-rw-r--r--usr.sbin/bhyve/kbdlayout/fr_dvorak1
-rw-r--r--usr.sbin/bhyve/kbdlayout/fr_dvorak_acc1
-rw-r--r--usr.sbin/bhyve/kbdlayout/fr_macbook1
-rw-r--r--usr.sbin/bhyve/kbdlayout/gr1
-rw-r--r--usr.sbin/bhyve/kbdlayout/gr_101_acc1
-rw-r--r--usr.sbin/bhyve/kbdlayout/gr_elot_acc1
-rw-r--r--usr.sbin/bhyve/kbdlayout/hr1
-rw-r--r--usr.sbin/bhyve/kbdlayout/hu_1011
-rw-r--r--usr.sbin/bhyve/kbdlayout/hu_1021
-rw-r--r--usr.sbin/bhyve/kbdlayout/is1
-rw-r--r--usr.sbin/bhyve/kbdlayout/is_acc1
-rw-r--r--usr.sbin/bhyve/kbdlayout/it1
-rw-r--r--usr.sbin/bhyve/kbdlayout/jp1
-rw-r--r--usr.sbin/bhyve/kbdlayout/jp_capsctrl1
-rw-r--r--usr.sbin/bhyve/kbdlayout/kz_io1
-rw-r--r--usr.sbin/bhyve/kbdlayout/kz_kst1
-rw-r--r--usr.sbin/bhyve/kbdlayout/latinamerican1
-rw-r--r--usr.sbin/bhyve/kbdlayout/latinamerican_acc1
-rw-r--r--usr.sbin/bhyve/kbdlayout/lt1
-rw-r--r--usr.sbin/bhyve/kbdlayout/nl1
-rw-r--r--usr.sbin/bhyve/kbdlayout/no1
-rw-r--r--usr.sbin/bhyve/kbdlayout/no_dvorak1
-rw-r--r--usr.sbin/bhyve/kbdlayout/nordic_asus-eee1
-rw-r--r--usr.sbin/bhyve/kbdlayout/pl_dvorak1
-rw-r--r--usr.sbin/bhyve/kbdlayout/pt1
-rw-r--r--usr.sbin/bhyve/kbdlayout/pt_acc1
-rw-r--r--usr.sbin/bhyve/kbdlayout/ru1
-rw-r--r--usr.sbin/bhyve/kbdlayout/ru_shift1
-rw-r--r--usr.sbin/bhyve/kbdlayout/ru_win1
-rw-r--r--usr.sbin/bhyve/kbdlayout/se1
-rw-r--r--usr.sbin/bhyve/kbdlayout/si1
-rw-r--r--usr.sbin/bhyve/kbdlayout/tr1
-rw-r--r--usr.sbin/bhyve/kbdlayout/tr_f1
-rw-r--r--usr.sbin/bhyve/kbdlayout/ua1
-rw-r--r--usr.sbin/bhyve/kbdlayout/ua_shift_alt1
-rw-r--r--usr.sbin/bhyve/kbdlayout/uk1
-rw-r--r--usr.sbin/bhyve/kbdlayout/uk_capsctrl1
-rw-r--r--usr.sbin/bhyve/kbdlayout/uk_dvorak1
-rw-r--r--usr.sbin/bhyve/kbdlayout/uk_macbook1
-rw-r--r--usr.sbin/bhyve/kbdlayout/us_dvorak1
-rw-r--r--usr.sbin/bhyve/kbdlayout/us_dvorakl1
-rw-r--r--usr.sbin/bhyve/kbdlayout/us_dvorakp1
-rw-r--r--usr.sbin/bhyve/kbdlayout/us_dvorakr1
-rw-r--r--usr.sbin/bhyve/kbdlayout/us_dvorakx1
-rw-r--r--usr.sbin/bhyve/kbdlayout/us_emacs1
-rw-r--r--usr.sbin/bhyve/kbdlayout/us_unix1
-rw-r--r--usr.sbin/bhyvectl/Makefile1
-rw-r--r--usr.sbin/bhyvectl/Makefile.depend1
-rw-r--r--usr.sbin/bhyveload/Makefile1
-rw-r--r--usr.sbin/bhyveload/Makefile.depend1
-rw-r--r--usr.sbin/binmiscctl/Makefile1
-rw-r--r--usr.sbin/binmiscctl/Makefile.depend1
-rw-r--r--usr.sbin/blacklistctl/Makefile1
-rw-r--r--usr.sbin/blacklistctl/Makefile.depend1
-rw-r--r--usr.sbin/blacklistd/Makefile1
-rw-r--r--usr.sbin/blacklistd/Makefile.depend1
-rw-r--r--usr.sbin/blacklistd/blacklistd.conf1
-rw-r--r--usr.sbin/bluetooth/Makefile1
-rw-r--r--usr.sbin/bluetooth/Makefile.inc1
-rw-r--r--usr.sbin/bluetooth/ath3kfw/Makefile1
-rw-r--r--usr.sbin/bluetooth/ath3kfw/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/bcmfw/Makefile1
-rw-r--r--usr.sbin/bluetooth/bcmfw/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/bluetooth-config/Makefile1
-rwxr-xr-xusr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh1
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/Makefile1
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/bthidd/Makefile1
-rw-r--r--usr.sbin/bluetooth/bthidd/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/bthidd/bthidd.conf.sample1
-rw-r--r--usr.sbin/bluetooth/btpand/Makefile1
-rw-r--r--usr.sbin/bluetooth/btpand/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/hccontrol/Makefile1
-rw-r--r--usr.sbin/bluetooth/hccontrol/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/hccontrol/bluetooth.device.conf1
-rw-r--r--usr.sbin/bluetooth/hcsecd/Makefile1
-rw-r--r--usr.sbin/bluetooth/hcsecd/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/hcsecd/hcsecd.conf1
-rw-r--r--usr.sbin/bluetooth/hcseriald/Makefile1
-rw-r--r--usr.sbin/bluetooth/hcseriald/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/iwmbtfw/Makefile1
-rw-r--r--usr.sbin/bluetooth/iwmbtfw/iwmbtfw.conf1
-rw-r--r--usr.sbin/bluetooth/l2control/Makefile1
-rw-r--r--usr.sbin/bluetooth/l2control/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/l2ping/Makefile1
-rw-r--r--usr.sbin/bluetooth/l2ping/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/rfcomm_pppd/Makefile1
-rw-r--r--usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/sdpcontrol/Makefile1
-rw-r--r--usr.sbin/bluetooth/sdpcontrol/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/sdpd/Makefile1
-rw-r--r--usr.sbin/bluetooth/sdpd/Makefile.depend1
-rw-r--r--usr.sbin/boot0cfg/Makefile1
-rw-r--r--usr.sbin/boot0cfg/Makefile.depend1
-rw-r--r--usr.sbin/bootparamd/Makefile1
-rw-r--r--usr.sbin/bootparamd/Makefile.inc1
-rw-r--r--usr.sbin/bootparamd/bootparamd/Makefile1
-rw-r--r--usr.sbin/bootparamd/bootparamd/Makefile.depend1
-rw-r--r--usr.sbin/bootparamd/callbootd/Makefile1
-rw-r--r--usr.sbin/bootparamd/callbootd/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/Makefile1
-rw-r--r--usr.sbin/bsdconfig/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/USAGE1
-rwxr-xr-xusr.sbin/bsdconfig/bsdconfig1
-rw-r--r--usr.sbin/bsdconfig/console/INDEX1
-rw-r--r--usr.sbin/bsdconfig/console/Makefile1
-rw-r--r--usr.sbin/bsdconfig/console/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/console/USAGE1
-rwxr-xr-xusr.sbin/bsdconfig/console/console1
-rwxr-xr-xusr.sbin/bsdconfig/console/font1
-rw-r--r--usr.sbin/bsdconfig/console/include/Makefile1
-rw-r--r--usr.sbin/bsdconfig/console/include/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/console/include/messages.subr1
-rwxr-xr-xusr.sbin/bsdconfig/console/keymap1
-rwxr-xr-xusr.sbin/bsdconfig/console/repeat1
-rwxr-xr-xusr.sbin/bsdconfig/console/saver1
-rwxr-xr-xusr.sbin/bsdconfig/console/screenmap1
-rwxr-xr-xusr.sbin/bsdconfig/console/ttys1
-rw-r--r--usr.sbin/bsdconfig/diskmgmt/INDEX1
-rw-r--r--usr.sbin/bsdconfig/diskmgmt/Makefile1
-rw-r--r--usr.sbin/bsdconfig/diskmgmt/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/diskmgmt/USAGE1
-rwxr-xr-xusr.sbin/bsdconfig/diskmgmt/diskmgmt1
-rw-r--r--usr.sbin/bsdconfig/diskmgmt/include/Makefile1
-rw-r--r--usr.sbin/bsdconfig/diskmgmt/include/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/diskmgmt/include/messages.subr1
-rw-r--r--usr.sbin/bsdconfig/docsinstall/INDEX1
-rw-r--r--usr.sbin/bsdconfig/docsinstall/Makefile1
-rw-r--r--usr.sbin/bsdconfig/docsinstall/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/docsinstall/USAGE1
-rwxr-xr-xusr.sbin/bsdconfig/docsinstall/docsinstall1
-rw-r--r--usr.sbin/bsdconfig/docsinstall/include/Makefile1
-rw-r--r--usr.sbin/bsdconfig/docsinstall/include/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/docsinstall/include/messages.subr1
-rw-r--r--usr.sbin/bsdconfig/dot/INDEX1
-rw-r--r--usr.sbin/bsdconfig/dot/Makefile1
-rw-r--r--usr.sbin/bsdconfig/dot/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/dot/USAGE1
-rwxr-xr-xusr.sbin/bsdconfig/dot/dot1
-rw-r--r--usr.sbin/bsdconfig/dot/include/Makefile1
-rw-r--r--usr.sbin/bsdconfig/dot/include/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/dot/include/messages.subr1
-rw-r--r--usr.sbin/bsdconfig/examples/Makefile1
-rw-r--r--usr.sbin/bsdconfig/examples/Makefile.depend1
-rwxr-xr-xusr.sbin/bsdconfig/examples/add_some_packages.sh1
-rwxr-xr-xusr.sbin/bsdconfig/examples/browse_packages_http.sh1
-rw-r--r--usr.sbin/bsdconfig/examples/bsdconfigrc1
-rw-r--r--usr.sbin/bsdconfig/include/Makefile1
-rw-r--r--usr.sbin/bsdconfig/include/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/include/messages.subr1
-rw-r--r--usr.sbin/bsdconfig/includes/INDEX1
-rw-r--r--usr.sbin/bsdconfig/includes/Makefile1
-rw-r--r--usr.sbin/bsdconfig/includes/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/includes/USAGE1
-rw-r--r--usr.sbin/bsdconfig/includes/include/Makefile1
-rw-r--r--usr.sbin/bsdconfig/includes/include/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/includes/include/messages.subr1
-rwxr-xr-xusr.sbin/bsdconfig/includes/includes.sh1
-rw-r--r--usr.sbin/bsdconfig/mouse/INDEX1
-rw-r--r--usr.sbin/bsdconfig/mouse/Makefile1
-rw-r--r--usr.sbin/bsdconfig/mouse/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/mouse/USAGE1
-rwxr-xr-xusr.sbin/bsdconfig/mouse/disable1
-rwxr-xr-xusr.sbin/bsdconfig/mouse/enable1
-rwxr-xr-xusr.sbin/bsdconfig/mouse/flags1
-rw-r--r--usr.sbin/bsdconfig/mouse/include/Makefile1
-rw-r--r--usr.sbin/bsdconfig/mouse/include/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/mouse/include/messages.subr1
-rwxr-xr-xusr.sbin/bsdconfig/mouse/mouse1
-rwxr-xr-xusr.sbin/bsdconfig/mouse/port1
-rwxr-xr-xusr.sbin/bsdconfig/mouse/type1
-rw-r--r--usr.sbin/bsdconfig/networking/INDEX1
-rw-r--r--usr.sbin/bsdconfig/networking/Makefile1
-rw-r--r--usr.sbin/bsdconfig/networking/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/networking/USAGE1
-rwxr-xr-xusr.sbin/bsdconfig/networking/defaultrouter1
-rwxr-xr-xusr.sbin/bsdconfig/networking/devices1
-rwxr-xr-xusr.sbin/bsdconfig/networking/hostname1
-rw-r--r--usr.sbin/bsdconfig/networking/include/Makefile1
-rw-r--r--usr.sbin/bsdconfig/networking/include/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/networking/include/messages.subr1
-rwxr-xr-xusr.sbin/bsdconfig/networking/nameservers1
-rwxr-xr-xusr.sbin/bsdconfig/networking/networking1
-rw-r--r--usr.sbin/bsdconfig/networking/share/Makefile1
-rw-r--r--usr.sbin/bsdconfig/networking/share/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/networking/share/common.subr1
-rw-r--r--usr.sbin/bsdconfig/networking/share/device.subr1
-rw-r--r--usr.sbin/bsdconfig/networking/share/hostname.subr1
-rw-r--r--usr.sbin/bsdconfig/networking/share/ipaddr.subr1
-rw-r--r--usr.sbin/bsdconfig/networking/share/media.subr1
-rw-r--r--usr.sbin/bsdconfig/networking/share/netmask.subr1
-rw-r--r--usr.sbin/bsdconfig/networking/share/resolv.subr1
-rw-r--r--usr.sbin/bsdconfig/networking/share/routing.subr1
-rw-r--r--usr.sbin/bsdconfig/networking/share/services.subr1
-rwxr-xr-xusr.sbin/bsdconfig/networking/wlanconfig1
-rw-r--r--usr.sbin/bsdconfig/packages/INDEX1
-rw-r--r--usr.sbin/bsdconfig/packages/Makefile1
-rw-r--r--usr.sbin/bsdconfig/packages/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/packages/USAGE1
-rw-r--r--usr.sbin/bsdconfig/packages/include/Makefile1
-rw-r--r--usr.sbin/bsdconfig/packages/include/Makefile.depend1
-rwxr-xr-xusr.sbin/bsdconfig/packages/include/messages.subr1
-rwxr-xr-xusr.sbin/bsdconfig/packages/packages1
-rw-r--r--usr.sbin/bsdconfig/password/INDEX1
-rw-r--r--usr.sbin/bsdconfig/password/Makefile1
-rw-r--r--usr.sbin/bsdconfig/password/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/password/USAGE1
-rw-r--r--usr.sbin/bsdconfig/password/include/Makefile1
-rw-r--r--usr.sbin/bsdconfig/password/include/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/password/include/messages.subr1
-rwxr-xr-xusr.sbin/bsdconfig/password/password1
-rw-r--r--usr.sbin/bsdconfig/password/share/Makefile1
-rw-r--r--usr.sbin/bsdconfig/password/share/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/password/share/password.subr1
-rw-r--r--usr.sbin/bsdconfig/security/INDEX1
-rw-r--r--usr.sbin/bsdconfig/security/Makefile1
-rw-r--r--usr.sbin/bsdconfig/security/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/security/USAGE1
-rw-r--r--usr.sbin/bsdconfig/security/include/Makefile1
-rw-r--r--usr.sbin/bsdconfig/security/include/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/security/include/messages.subr1
-rwxr-xr-xusr.sbin/bsdconfig/security/kern_securelevel1
-rwxr-xr-xusr.sbin/bsdconfig/security/security1
-rw-r--r--usr.sbin/bsdconfig/share/Makefile1
-rw-r--r--usr.sbin/bsdconfig/share/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/share/common.subr1
-rw-r--r--usr.sbin/bsdconfig/share/device.subr1
-rw-r--r--usr.sbin/bsdconfig/share/dialog.subr1
-rw-r--r--usr.sbin/bsdconfig/share/geom.subr1
-rw-r--r--usr.sbin/bsdconfig/share/keymap.subr1
-rw-r--r--usr.sbin/bsdconfig/share/media/Makefile1
-rw-r--r--usr.sbin/bsdconfig/share/media/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/share/media/any.subr1
-rw-r--r--usr.sbin/bsdconfig/share/media/cdrom.subr1
-rw-r--r--usr.sbin/bsdconfig/share/media/common.subr1
-rw-r--r--usr.sbin/bsdconfig/share/media/directory.subr1
-rw-r--r--usr.sbin/bsdconfig/share/media/dos.subr1
-rw-r--r--usr.sbin/bsdconfig/share/media/floppy.subr1
-rw-r--r--usr.sbin/bsdconfig/share/media/ftp.subr1
-rw-r--r--usr.sbin/bsdconfig/share/media/http.subr1
-rw-r--r--usr.sbin/bsdconfig/share/media/httpproxy.subr1
-rw-r--r--usr.sbin/bsdconfig/share/media/network.subr1
-rw-r--r--usr.sbin/bsdconfig/share/media/nfs.subr1
-rw-r--r--usr.sbin/bsdconfig/share/media/options.subr1
-rw-r--r--usr.sbin/bsdconfig/share/media/tcpip.subr1
-rw-r--r--usr.sbin/bsdconfig/share/media/ufs.subr1
-rw-r--r--usr.sbin/bsdconfig/share/media/usb.subr1
-rw-r--r--usr.sbin/bsdconfig/share/media/wlan.subr1
-rw-r--r--usr.sbin/bsdconfig/share/mustberoot.subr1
-rw-r--r--usr.sbin/bsdconfig/share/packages/Makefile1
-rw-r--r--usr.sbin/bsdconfig/share/packages/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/share/packages/categories.subr1
-rw-r--r--usr.sbin/bsdconfig/share/packages/index.subr1
-rw-r--r--usr.sbin/bsdconfig/share/packages/musthavepkg.subr1
-rw-r--r--usr.sbin/bsdconfig/share/packages/packages.subr1
-rw-r--r--usr.sbin/bsdconfig/share/script.subr1
-rw-r--r--usr.sbin/bsdconfig/share/strings.subr1
-rw-r--r--usr.sbin/bsdconfig/share/struct.subr1
-rw-r--r--usr.sbin/bsdconfig/share/sysrc.subr1
-rw-r--r--usr.sbin/bsdconfig/share/variable.subr1
-rw-r--r--usr.sbin/bsdconfig/startup/INDEX1
-rw-r--r--usr.sbin/bsdconfig/startup/Makefile1
-rw-r--r--usr.sbin/bsdconfig/startup/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/startup/USAGE1
-rw-r--r--usr.sbin/bsdconfig/startup/include/Makefile1
-rw-r--r--usr.sbin/bsdconfig/startup/include/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/startup/include/messages.subr1
-rwxr-xr-xusr.sbin/bsdconfig/startup/misc1
-rwxr-xr-xusr.sbin/bsdconfig/startup/rcadd1
-rwxr-xr-xusr.sbin/bsdconfig/startup/rcconf1
-rwxr-xr-xusr.sbin/bsdconfig/startup/rcdelete1
-rwxr-xr-xusr.sbin/bsdconfig/startup/rcedit1
-rwxr-xr-xusr.sbin/bsdconfig/startup/rcvar1
-rw-r--r--usr.sbin/bsdconfig/startup/share/Makefile1
-rw-r--r--usr.sbin/bsdconfig/startup/share/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/startup/share/rcconf.subr1
-rw-r--r--usr.sbin/bsdconfig/startup/share/rcedit.subr1
-rw-r--r--usr.sbin/bsdconfig/startup/share/rcvar.subr1
-rwxr-xr-xusr.sbin/bsdconfig/startup/startup1
-rw-r--r--usr.sbin/bsdconfig/timezone/INDEX1
-rw-r--r--usr.sbin/bsdconfig/timezone/Makefile1
-rw-r--r--usr.sbin/bsdconfig/timezone/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/timezone/USAGE1
-rw-r--r--usr.sbin/bsdconfig/timezone/include/Makefile1
-rw-r--r--usr.sbin/bsdconfig/timezone/include/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/timezone/include/messages.subr1
-rw-r--r--usr.sbin/bsdconfig/timezone/share/Makefile1
-rw-r--r--usr.sbin/bsdconfig/timezone/share/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/timezone/share/continents.subr1
-rw-r--r--usr.sbin/bsdconfig/timezone/share/countries.subr1
-rw-r--r--usr.sbin/bsdconfig/timezone/share/iso3166.subr1
-rw-r--r--usr.sbin/bsdconfig/timezone/share/menus.subr1
-rw-r--r--usr.sbin/bsdconfig/timezone/share/zones.subr1
-rwxr-xr-xusr.sbin/bsdconfig/timezone/timezone1
-rw-r--r--usr.sbin/bsdconfig/ttys/INDEX1
-rw-r--r--usr.sbin/bsdconfig/ttys/Makefile1
-rw-r--r--usr.sbin/bsdconfig/ttys/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/ttys/USAGE1
-rw-r--r--usr.sbin/bsdconfig/ttys/include/Makefile1
-rw-r--r--usr.sbin/bsdconfig/ttys/include/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/ttys/include/messages.subr1
-rwxr-xr-xusr.sbin/bsdconfig/ttys/ttys1
-rw-r--r--usr.sbin/bsdconfig/usermgmt/INDEX1
-rw-r--r--usr.sbin/bsdconfig/usermgmt/Makefile1
-rw-r--r--usr.sbin/bsdconfig/usermgmt/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/usermgmt/USAGE1
-rwxr-xr-xusr.sbin/bsdconfig/usermgmt/groupadd1
-rwxr-xr-xusr.sbin/bsdconfig/usermgmt/groupdel1
-rwxr-xr-xusr.sbin/bsdconfig/usermgmt/groupedit1
-rw-r--r--usr.sbin/bsdconfig/usermgmt/include/Makefile1
-rw-r--r--usr.sbin/bsdconfig/usermgmt/include/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/usermgmt/include/messages.subr1
-rw-r--r--usr.sbin/bsdconfig/usermgmt/share/Makefile1
-rw-r--r--usr.sbin/bsdconfig/usermgmt/share/Makefile.depend1
-rw-r--r--usr.sbin/bsdconfig/usermgmt/share/group.subr1
-rw-r--r--usr.sbin/bsdconfig/usermgmt/share/group_input.subr1
-rw-r--r--usr.sbin/bsdconfig/usermgmt/share/user.subr1
-rw-r--r--usr.sbin/bsdconfig/usermgmt/share/user_input.subr1
-rwxr-xr-xusr.sbin/bsdconfig/usermgmt/useradd1
-rwxr-xr-xusr.sbin/bsdconfig/usermgmt/userdel1
-rwxr-xr-xusr.sbin/bsdconfig/usermgmt/useredit1
-rwxr-xr-xusr.sbin/bsdconfig/usermgmt/usermgmt1
-rw-r--r--usr.sbin/bsdinstall/Makefile1
-rw-r--r--usr.sbin/bsdinstall/Makefile.depend1
-rwxr-xr-xusr.sbin/bsdinstall/bsdinstall1
-rw-r--r--usr.sbin/bsdinstall/distextract/Makefile1
-rw-r--r--usr.sbin/bsdinstall/distextract/Makefile.depend1
-rw-r--r--usr.sbin/bsdinstall/distfetch/Makefile1
-rw-r--r--usr.sbin/bsdinstall/distfetch/Makefile.depend1
-rw-r--r--usr.sbin/bsdinstall/partedit/Makefile1
-rw-r--r--usr.sbin/bsdinstall/partedit/Makefile.depend1
-rw-r--r--usr.sbin/bsdinstall/scripts/Makefile1
-rw-r--r--usr.sbin/bsdinstall/scripts/Makefile.depend1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/adduser1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/auto1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/bootconfig1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/checksum1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/config1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/docsinstall1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/entropy1
-rw-r--r--usr.sbin/bsdinstall/scripts/fetchmissingdists1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/hardening1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/hostname1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/jail1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/keymap1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/mirrorselect1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/mount1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/netconfig1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/netconfig_ipv41
-rwxr-xr-xusr.sbin/bsdinstall/scripts/netconfig_ipv61
-rwxr-xr-xusr.sbin/bsdinstall/scripts/rootpass1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/script1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/services1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/time1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/umount1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/wlanconfig1
-rwxr-xr-xusr.sbin/bsdinstall/scripts/zfsboot1
-rw-r--r--usr.sbin/bsnmpd/Makefile1
-rw-r--r--usr.sbin/bsnmpd/Makefile.inc1
-rw-r--r--usr.sbin/bsnmpd/bsnmpd/Makefile1
-rw-r--r--usr.sbin/bsnmpd/bsnmpd/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/bsnmpd/Makefile.depend.options1
-rw-r--r--usr.sbin/bsnmpd/bsnmpd/snmpd.config1
-rw-r--r--usr.sbin/bsnmpd/gensnmptree/Makefile1
-rw-r--r--usr.sbin/bsnmpd/gensnmptree/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/Makefile.inc1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hast/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hostres/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_lm75/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_lm75/lm75_tree.def1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_mibII/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_pf/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_target/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_usm/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_vacm/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def1
-rw-r--r--usr.sbin/bsnmpd/tools/Makefile1
-rw-r--r--usr.sbin/bsnmpd/tools/Makefile.inc1
-rw-r--r--usr.sbin/bsnmpd/tools/bsnmptools/Makefile1
-rw-r--r--usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/tools/libbsnmptools/Makefile1
-rw-r--r--usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend1
-rw-r--r--usr.sbin/btxld/Makefile1
-rw-r--r--usr.sbin/btxld/Makefile.depend1
-rw-r--r--usr.sbin/camdd/Makefile1
-rw-r--r--usr.sbin/camdd/Makefile.depend1
-rw-r--r--usr.sbin/cdcontrol/Makefile1
-rw-r--r--usr.sbin/cdcontrol/Makefile.depend1
-rw-r--r--usr.sbin/certctl/Makefile1
-rwxr-xr-xusr.sbin/certctl/certctl.sh1
-rw-r--r--usr.sbin/chkgrp/Makefile1
-rw-r--r--usr.sbin/chkgrp/Makefile.depend1
-rw-r--r--usr.sbin/chown/Makefile1
-rw-r--r--usr.sbin/chown/Makefile.depend1
-rw-r--r--usr.sbin/chown/tests/Makefile1
-rw-r--r--usr.sbin/chown/tests/Makefile.depend1
-rwxr-xr-xusr.sbin/chown/tests/chown_test.sh1
-rw-r--r--usr.sbin/chroot/Makefile1
-rw-r--r--usr.sbin/chroot/Makefile.depend1
-rw-r--r--usr.sbin/ckdist/Makefile1
-rw-r--r--usr.sbin/ckdist/Makefile.depend1
-rw-r--r--usr.sbin/clear_locks/Makefile1
-rw-r--r--usr.sbin/clear_locks/Makefile.depend1
-rw-r--r--usr.sbin/config/Makefile1
-rw-r--r--usr.sbin/config/Makefile.depend1
-rw-r--r--usr.sbin/cpucontrol/Makefile1
-rw-r--r--usr.sbin/cpucontrol/Makefile.depend1
-rw-r--r--usr.sbin/crashinfo/Makefile1
-rw-r--r--usr.sbin/crashinfo/Makefile.depend1
-rwxr-xr-xusr.sbin/crashinfo/crashinfo.sh1
-rw-r--r--usr.sbin/cron/Makefile1
-rw-r--r--usr.sbin/cron/Makefile.inc1
-rw-r--r--usr.sbin/cron/cron/Makefile1
-rw-r--r--usr.sbin/cron/cron/Makefile.depend1
-rw-r--r--usr.sbin/cron/cron/crontab1
-rw-r--r--usr.sbin/cron/crontab/Makefile1
-rw-r--r--usr.sbin/cron/crontab/Makefile.depend1
-rw-r--r--usr.sbin/cron/doc/Makefile.vixie1
-rw-r--r--usr.sbin/cron/lib/Makefile1
-rw-r--r--usr.sbin/cron/lib/Makefile.depend1
-rw-r--r--usr.sbin/crunch/Makefile1
-rw-r--r--usr.sbin/crunch/Makefile.inc1
-rw-r--r--usr.sbin/crunch/crunchgen/Makefile1
-rw-r--r--usr.sbin/crunch/crunchgen/Makefile.depend1
-rw-r--r--usr.sbin/crunch/crunchide/Makefile1
-rw-r--r--usr.sbin/crunch/crunchide/Makefile.depend1
-rw-r--r--usr.sbin/crunch/examples/Makefile1
-rw-r--r--usr.sbin/crunch/examples/filesystem.conf1
-rw-r--r--usr.sbin/crunch/examples/fixit.conf1
-rw-r--r--usr.sbin/crunch/examples/kcopy.conf1
-rw-r--r--usr.sbin/crunch/examples/really-big.conf1
-rw-r--r--usr.sbin/ctladm/Makefile1
-rw-r--r--usr.sbin/ctladm/Makefile.depend1
-rw-r--r--usr.sbin/ctld/Makefile1
-rw-r--r--usr.sbin/ctld/Makefile.depend1
-rw-r--r--usr.sbin/cxgbetool/Makefile1
-rw-r--r--usr.sbin/cxgbetool/Makefile.depend1
-rw-r--r--usr.sbin/daemon/Makefile1
-rw-r--r--usr.sbin/daemon/Makefile.depend1
-rw-r--r--usr.sbin/daemon/tests/Makefile1
-rw-r--r--usr.sbin/daemon/tests/daemon_test.sh2
-rw-r--r--usr.sbin/dconschat/Makefile1
-rw-r--r--usr.sbin/dconschat/Makefile.depend1
-rw-r--r--usr.sbin/devctl/Makefile1
-rw-r--r--usr.sbin/devctl/Makefile.depend1
-rw-r--r--usr.sbin/devinfo/Makefile1
-rw-r--r--usr.sbin/devinfo/Makefile.depend1
-rw-r--r--usr.sbin/diskinfo/Makefile1
-rw-r--r--usr.sbin/diskinfo/Makefile.depend1
-rw-r--r--usr.sbin/dumpcis/Makefile1
-rw-r--r--usr.sbin/dumpcis/Makefile.depend1
-rw-r--r--usr.sbin/editmap/Makefile1
-rw-r--r--usr.sbin/editmap/Makefile.depend1
-rw-r--r--usr.sbin/edquota/Makefile1
-rw-r--r--usr.sbin/edquota/Makefile.depend1
-rw-r--r--usr.sbin/efibootmgr/Makefile1
-rw-r--r--usr.sbin/efidp/Makefile1
-rw-r--r--usr.sbin/efidp/Makefile.depend1
-rw-r--r--usr.sbin/efivar/Makefile1
-rw-r--r--usr.sbin/efivar/Makefile.depend1
-rw-r--r--usr.sbin/etcupdate/Makefile1
-rw-r--r--usr.sbin/etcupdate/Makefile.depend1
-rwxr-xr-xusr.sbin/etcupdate/etcupdate.sh1
-rw-r--r--usr.sbin/etcupdate/tests/Makefile1
-rw-r--r--usr.sbin/etcupdate/tests/Makefile.depend1
-rw-r--r--usr.sbin/etcupdate/tests/always_test.sh1
-rw-r--r--usr.sbin/etcupdate/tests/conflicts_test.sh1
-rw-r--r--usr.sbin/etcupdate/tests/fbsdid_test.sh1
-rw-r--r--usr.sbin/etcupdate/tests/ignore_test.sh1
-rw-r--r--usr.sbin/etcupdate/tests/preworld_test.sh1
-rw-r--r--usr.sbin/etcupdate/tests/tests_test.sh1
-rw-r--r--usr.sbin/etcupdate/tests/tzsetup_test.sh1
-rw-r--r--usr.sbin/extattr/Makefile1
-rw-r--r--usr.sbin/extattr/Makefile.depend1
-rw-r--r--usr.sbin/extattr/tests/Makefile1
-rw-r--r--usr.sbin/extattr/tests/Makefile.depend1
-rwxr-xr-xusr.sbin/extattr/tests/extattr_test.sh1
-rw-r--r--usr.sbin/extattrctl/Makefile1
-rw-r--r--usr.sbin/extattrctl/Makefile.depend1
-rw-r--r--usr.sbin/fdcontrol/Makefile1
-rw-r--r--usr.sbin/fdcontrol/Makefile.depend1
-rw-r--r--usr.sbin/fdformat/Makefile1
-rw-r--r--usr.sbin/fdformat/Makefile.depend1
-rw-r--r--usr.sbin/fdread/Makefile1
-rw-r--r--usr.sbin/fdread/Makefile.depend1
-rw-r--r--usr.sbin/fdwrite/Makefile1
-rw-r--r--usr.sbin/fdwrite/Makefile.depend1
-rw-r--r--usr.sbin/fifolog/Makefile1
-rw-r--r--usr.sbin/fifolog/Makefile.inc1
-rw-r--r--usr.sbin/fifolog/fifolog_create/Makefile1
-rw-r--r--usr.sbin/fifolog/fifolog_create/Makefile.depend1
-rw-r--r--usr.sbin/fifolog/fifolog_reader/Makefile1
-rw-r--r--usr.sbin/fifolog/fifolog_reader/Makefile.depend1
-rw-r--r--usr.sbin/fifolog/fifolog_writer/Makefile1
-rw-r--r--usr.sbin/fifolog/fifolog_writer/Makefile.depend1
-rw-r--r--usr.sbin/fifolog/lib/Makefile1
-rw-r--r--usr.sbin/fifolog/lib/Makefile.depend1
-rw-r--r--usr.sbin/flowctl/Makefile1
-rw-r--r--usr.sbin/flowctl/Makefile.depend1
-rw-r--r--usr.sbin/fmtree/Makefile1
-rw-r--r--usr.sbin/fmtree/Makefile.depend1
-rw-r--r--usr.sbin/fmtree/test/test00.sh1
-rw-r--r--usr.sbin/fmtree/test/test01.sh1
-rw-r--r--usr.sbin/fmtree/test/test02.sh1
-rw-r--r--usr.sbin/fmtree/test/test03.sh1
-rw-r--r--usr.sbin/fmtree/test/test04.sh1
-rw-r--r--usr.sbin/fmtree/test/test05.sh1
-rw-r--r--usr.sbin/freebsd-update/Makefile1
-rw-r--r--usr.sbin/freebsd-update/Makefile.depend1
-rw-r--r--usr.sbin/freebsd-update/freebsd-update.conf1
-rw-r--r--usr.sbin/freebsd-update/freebsd-update.sh2
-rw-r--r--usr.sbin/fstyp/Makefile1
-rw-r--r--usr.sbin/fstyp/Makefile.depend1
-rw-r--r--usr.sbin/fstyp/Makefile.depend.options1
-rw-r--r--usr.sbin/fstyp/tests/Makefile1
-rw-r--r--usr.sbin/fstyp/tests/Makefile.depend1
-rwxr-xr-xusr.sbin/fstyp/tests/fstyp_test.sh2
-rw-r--r--usr.sbin/ftp-proxy/Makefile1
-rw-r--r--usr.sbin/ftp-proxy/Makefile.depend1
-rw-r--r--usr.sbin/fwcontrol/Makefile1
-rw-r--r--usr.sbin/fwcontrol/Makefile.depend1
-rw-r--r--usr.sbin/getfmac/Makefile1
-rw-r--r--usr.sbin/getfmac/Makefile.depend1
-rw-r--r--usr.sbin/getpmac/Makefile1
-rw-r--r--usr.sbin/getpmac/Makefile.depend1
-rw-r--r--usr.sbin/gpioctl/Makefile1
-rw-r--r--usr.sbin/gpioctl/Makefile.depend1
-rw-r--r--usr.sbin/gssd/Makefile1
-rw-r--r--usr.sbin/gssd/Makefile.depend1
-rw-r--r--usr.sbin/gssd/Makefile.depend.options1
-rw-r--r--usr.sbin/gstat/Makefile1
-rw-r--r--usr.sbin/gstat/Makefile.depend1
-rw-r--r--usr.sbin/hyperv/Makefile1
-rw-r--r--usr.sbin/hyperv/Makefile.inc1
-rw-r--r--usr.sbin/hyperv/tools/Makefile.inc1
-rw-r--r--usr.sbin/hyperv/tools/kvp/Makefile1
-rw-r--r--usr.sbin/hyperv/tools/kvp/Makefile.depend1
-rw-r--r--usr.sbin/hyperv/tools/vss/Makefile1
-rw-r--r--usr.sbin/hyperv/tools/vss/Makefile.depend1
-rw-r--r--usr.sbin/i2c/Makefile1
-rw-r--r--usr.sbin/i2c/Makefile.depend1
-rw-r--r--usr.sbin/ifmcstat/Makefile1
-rw-r--r--usr.sbin/ifmcstat/Makefile.depend1
-rw-r--r--usr.sbin/inetd/Makefile1
-rw-r--r--usr.sbin/inetd/Makefile.depend1
-rw-r--r--usr.sbin/inetd/Makefile.depend.options1
-rw-r--r--usr.sbin/inetd/inetd.conf1
-rw-r--r--usr.sbin/iostat/Makefile1
-rw-r--r--usr.sbin/iostat/Makefile.depend1
-rw-r--r--usr.sbin/iovctl/Makefile1
-rw-r--r--usr.sbin/iovctl/Makefile.depend1
-rw-r--r--usr.sbin/ip6addrctl/Makefile1
-rw-r--r--usr.sbin/ip6addrctl/Makefile.depend1
-rw-r--r--usr.sbin/ip6addrctl/ip6addrctl.conf.sample1
-rw-r--r--usr.sbin/ipfwpcap/Makefile1
-rw-r--r--usr.sbin/ipfwpcap/Makefile.depend1
-rw-r--r--usr.sbin/iscsid/Makefile1
-rw-r--r--usr.sbin/iscsid/Makefile.depend1
-rw-r--r--usr.sbin/jail/Makefile1
-rw-r--r--usr.sbin/jail/Makefile.depend1
-rw-r--r--usr.sbin/jail/tests/Makefile1
-rw-r--r--usr.sbin/jail/tests/commands.jail.conf1
-rwxr-xr-xusr.sbin/jail/tests/jail_basic_test.sh2
-rw-r--r--usr.sbin/jexec/Makefile1
-rw-r--r--usr.sbin/jexec/Makefile.depend1
-rw-r--r--usr.sbin/jls/Makefile1
-rw-r--r--usr.sbin/jls/Makefile.depend1
-rw-r--r--usr.sbin/kbdcontrol/Makefile1
-rw-r--r--usr.sbin/kbdcontrol/Makefile.depend1
-rw-r--r--usr.sbin/kbdmap/Makefile1
-rw-r--r--usr.sbin/kbdmap/Makefile.depend1
-rw-r--r--usr.sbin/keyserv/Makefile1
-rw-r--r--usr.sbin/keyserv/Makefile.depend1
-rw-r--r--usr.sbin/kgmon/Makefile1
-rw-r--r--usr.sbin/kgmon/Makefile.depend1
-rw-r--r--usr.sbin/kldxref/Makefile1
-rw-r--r--usr.sbin/kldxref/Makefile.depend1
-rw-r--r--usr.sbin/lastlogin/Makefile1
-rw-r--r--usr.sbin/lastlogin/Makefile.depend1
-rw-r--r--usr.sbin/lpr/Makefile1
-rw-r--r--usr.sbin/lpr/Makefile.inc1
-rw-r--r--usr.sbin/lpr/chkprintcap/Makefile1
-rw-r--r--usr.sbin/lpr/chkprintcap/Makefile.depend1
-rw-r--r--usr.sbin/lpr/common_source/Makefile1
-rw-r--r--usr.sbin/lpr/common_source/Makefile.depend1
-rw-r--r--usr.sbin/lpr/filters.ru/Makefile1
-rw-r--r--usr.sbin/lpr/filters.ru/Makefile.depend1
-rw-r--r--usr.sbin/lpr/filters.ru/Makefile.inc1
-rw-r--r--usr.sbin/lpr/filters.ru/koi2855/Makefile1
-rw-r--r--usr.sbin/lpr/filters.ru/koi2855/Makefile.depend1
-rw-r--r--usr.sbin/lpr/filters.ru/koi2alt/Makefile1
-rw-r--r--usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend1
-rw-r--r--usr.sbin/lpr/filters/Makefile1
-rw-r--r--usr.sbin/lpr/filters/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lp/Makefile1
-rw-r--r--usr.sbin/lpr/lp/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lp/lp.sh1
-rw-r--r--usr.sbin/lpr/lpc/Makefile1
-rw-r--r--usr.sbin/lpr/lpc/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lpd/Makefile1
-rw-r--r--usr.sbin/lpr/lpd/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lpd/hosts.lpd1
-rw-r--r--usr.sbin/lpr/lpd/printcap1
-rw-r--r--usr.sbin/lpr/lpq/Makefile1
-rw-r--r--usr.sbin/lpr/lpq/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lpr/Makefile1
-rw-r--r--usr.sbin/lpr/lpr/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lprm/Makefile1
-rw-r--r--usr.sbin/lpr/lprm/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lptest/Makefile1
-rw-r--r--usr.sbin/lpr/lptest/Makefile.depend1
-rw-r--r--usr.sbin/lpr/pac/Makefile1
-rw-r--r--usr.sbin/lpr/pac/Makefile.depend1
-rw-r--r--usr.sbin/lptcontrol/Makefile1
-rw-r--r--usr.sbin/lptcontrol/Makefile.depend1
-rw-r--r--usr.sbin/mailstats/Makefile1
-rw-r--r--usr.sbin/mailstats/Makefile.depend1
-rw-r--r--usr.sbin/mailwrapper/Makefile1
-rw-r--r--usr.sbin/mailwrapper/Makefile.depend1
-rw-r--r--usr.sbin/makefs/Makefile1
-rw-r--r--usr.sbin/makefs/Makefile.depend1
-rw-r--r--usr.sbin/makefs/cd9660/Makefile.inc1
-rw-r--r--usr.sbin/makefs/ffs/Makefile.inc1
-rw-r--r--usr.sbin/makefs/msdos/Makefile.inc1
-rw-r--r--usr.sbin/makefs/tests/Makefile1
-rw-r--r--usr.sbin/makefs/tests/Makefile.depend1
-rw-r--r--usr.sbin/makefs/tests/makefs_cd9660_tests.sh1
-rw-r--r--usr.sbin/makefs/tests/makefs_ffs_tests.sh1
-rw-r--r--usr.sbin/makefs/tests/makefs_tests_common.sh1
-rw-r--r--usr.sbin/makemap/Makefile1
-rw-r--r--usr.sbin/makemap/Makefile.depend1
-rw-r--r--usr.sbin/manctl/Makefile1
-rw-r--r--usr.sbin/manctl/Makefile.depend1
-rw-r--r--usr.sbin/manctl/manctl.sh1
-rw-r--r--usr.sbin/memcontrol/Makefile1
-rw-r--r--usr.sbin/memcontrol/Makefile.depend1
-rw-r--r--usr.sbin/mergemaster/Makefile1
-rw-r--r--usr.sbin/mergemaster/Makefile.depend1
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh2
-rw-r--r--usr.sbin/mfiutil/Makefile1
-rw-r--r--usr.sbin/mfiutil/Makefile.depend1
-rw-r--r--usr.sbin/mixer/Makefile1
-rw-r--r--usr.sbin/mixer/Makefile.depend1
-rw-r--r--usr.sbin/mixer/tests/Makefile1
-rwxr-xr-xusr.sbin/mixer/tests/mixer_test.sh2
-rw-r--r--usr.sbin/mld6query/Makefile1
-rw-r--r--usr.sbin/mld6query/Makefile.depend1
-rw-r--r--usr.sbin/mlx5tool/Makefile1
-rw-r--r--usr.sbin/mlxcontrol/Makefile1
-rw-r--r--usr.sbin/mlxcontrol/Makefile.depend1
-rw-r--r--usr.sbin/mount_smbfs/Makefile1
-rw-r--r--usr.sbin/mount_smbfs/Makefile.depend1
-rw-r--r--usr.sbin/mountd/Makefile1
-rw-r--r--usr.sbin/mountd/Makefile.depend1
-rw-r--r--usr.sbin/moused/Makefile1
-rw-r--r--usr.sbin/moused/Makefile.depend1
-rw-r--r--usr.sbin/mpsutil/Makefile1
-rw-r--r--usr.sbin/mpsutil/Makefile.depend1
-rw-r--r--usr.sbin/mptable/Makefile1
-rw-r--r--usr.sbin/mptable/Makefile.depend1
-rw-r--r--usr.sbin/mptutil/Makefile1
-rw-r--r--usr.sbin/mptutil/Makefile.depend1
-rw-r--r--usr.sbin/mtest/Makefile1
-rw-r--r--usr.sbin/mtest/Makefile.depend1
-rw-r--r--usr.sbin/ndiscvt/Makefile1
-rw-r--r--usr.sbin/ndiscvt/Makefile.depend1
-rw-r--r--usr.sbin/ndiscvt/ndisgen.sh1
-rw-r--r--usr.sbin/ndp/Makefile1
-rw-r--r--usr.sbin/ndp/Makefile.depend1
-rw-r--r--usr.sbin/newsyslog/Makefile1
-rw-r--r--usr.sbin/newsyslog/Makefile.depend1
-rw-r--r--usr.sbin/newsyslog/newsyslog.conf1
-rw-r--r--usr.sbin/newsyslog/newsyslog.conf.d/Makefile1
-rw-r--r--usr.sbin/newsyslog/newsyslog.conf.d/Makefile.depend1
-rw-r--r--usr.sbin/newsyslog/newsyslog.conf.d/amd.conf1
-rw-r--r--usr.sbin/newsyslog/newsyslog.conf.d/ftp.conf1
-rw-r--r--usr.sbin/newsyslog/newsyslog.conf.d/lpr.conf1
-rw-r--r--usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf1
-rw-r--r--usr.sbin/newsyslog/newsyslog.conf.d/pf.conf1
-rw-r--r--usr.sbin/newsyslog/newsyslog.conf.d/ppp.conf1
-rw-r--r--usr.sbin/newsyslog/newsyslog.conf.d/sendmail.conf1
-rw-r--r--usr.sbin/newsyslog/tests/Makefile1
-rw-r--r--usr.sbin/newsyslog/tests/Makefile.depend1
-rw-r--r--usr.sbin/newsyslog/tests/legacy_test.sh2
-rw-r--r--usr.sbin/nfscbd/Makefile1
-rw-r--r--usr.sbin/nfscbd/Makefile.depend1
-rw-r--r--usr.sbin/nfsd/Makefile1
-rw-r--r--usr.sbin/nfsd/Makefile.depend1
-rw-r--r--usr.sbin/nfsdumpstate/Makefile1
-rw-r--r--usr.sbin/nfsdumpstate/Makefile.depend1
-rw-r--r--usr.sbin/nfsrevoke/Makefile1
-rw-r--r--usr.sbin/nfsrevoke/Makefile.depend1
-rw-r--r--usr.sbin/nfsuserd/Makefile1
-rw-r--r--usr.sbin/nfsuserd/Makefile.depend1
-rw-r--r--usr.sbin/ngctl/Makefile1
-rw-r--r--usr.sbin/ngctl/Makefile.depend1
-rw-r--r--usr.sbin/ngctl/Makefile.depend.options1
-rw-r--r--usr.sbin/nghook/Makefile1
-rw-r--r--usr.sbin/nghook/Makefile.depend1
-rw-r--r--usr.sbin/nmtree/Makefile1
-rw-r--r--usr.sbin/nmtree/Makefile.depend1
-rw-r--r--usr.sbin/nmtree/tests/Makefile1
-rw-r--r--usr.sbin/nmtree/tests/Makefile.depend1
-rw-r--r--usr.sbin/nologin/Makefile1
-rw-r--r--usr.sbin/nologin/Makefile.depend1
-rw-r--r--usr.sbin/nscd/Makefile1
-rw-r--r--usr.sbin/nscd/Makefile.depend1
-rw-r--r--usr.sbin/nscd/agents/Makefile.inc1
-rw-r--r--usr.sbin/nscd/nscd.conf1
-rw-r--r--usr.sbin/ntp/Makefile1
-rw-r--r--usr.sbin/ntp/Makefile.inc1
-rw-r--r--usr.sbin/ntp/doc/Makefile1
-rw-r--r--usr.sbin/ntp/doc/Makefile.depend1
-rw-r--r--usr.sbin/ntp/doc/drivers/Makefile1
-rw-r--r--usr.sbin/ntp/doc/drivers/Makefile.depend1
-rw-r--r--usr.sbin/ntp/doc/drivers/icons/Makefile1
-rw-r--r--usr.sbin/ntp/doc/drivers/icons/Makefile.depend1
-rw-r--r--usr.sbin/ntp/doc/drivers/scripts/Makefile1
-rw-r--r--usr.sbin/ntp/doc/drivers/scripts/Makefile.depend1
-rw-r--r--usr.sbin/ntp/doc/hints/Makefile1
-rw-r--r--usr.sbin/ntp/doc/hints/Makefile.depend1
-rw-r--r--usr.sbin/ntp/doc/icons/Makefile1
-rw-r--r--usr.sbin/ntp/doc/icons/Makefile.depend1
-rw-r--r--usr.sbin/ntp/doc/pic/Makefile1
-rw-r--r--usr.sbin/ntp/doc/pic/Makefile.depend1
-rw-r--r--usr.sbin/ntp/doc/scripts/Makefile1
-rw-r--r--usr.sbin/ntp/doc/scripts/Makefile.depend1
-rw-r--r--usr.sbin/ntp/libntp/Makefile1
-rw-r--r--usr.sbin/ntp/libntp/Makefile.depend1
-rw-r--r--usr.sbin/ntp/libntpevent/Makefile1
-rw-r--r--usr.sbin/ntp/libntpevent/Makefile.depend1
-rw-r--r--usr.sbin/ntp/libopts/Makefile1
-rw-r--r--usr.sbin/ntp/libopts/Makefile.depend1
-rw-r--r--usr.sbin/ntp/libparse/Makefile1
-rw-r--r--usr.sbin/ntp/libparse/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntp-keygen/Makefile1
-rw-r--r--usr.sbin/ntp/ntp-keygen/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntp-keygen/Makefile.depend.options1
-rw-r--r--usr.sbin/ntp/ntpd/Makefile1
-rw-r--r--usr.sbin/ntp/ntpd/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntpd/Makefile.depend.options1
-rw-r--r--usr.sbin/ntp/ntpd/ntp.conf1
-rw-r--r--usr.sbin/ntp/ntpdate/Makefile1
-rw-r--r--usr.sbin/ntp/ntpdate/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntpdate/Makefile.depend.options1
-rw-r--r--usr.sbin/ntp/ntpdc/Makefile1
-rw-r--r--usr.sbin/ntp/ntpdc/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntpdc/Makefile.depend.options1
-rw-r--r--usr.sbin/ntp/ntpq/Makefile1
-rw-r--r--usr.sbin/ntp/ntpq/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntpq/Makefile.depend.options1
-rw-r--r--usr.sbin/ntp/ntptime/Makefile1
-rw-r--r--usr.sbin/ntp/ntptime/Makefile.depend1
-rwxr-xr-xusr.sbin/ntp/scripts/mkver1
-rw-r--r--usr.sbin/ntp/scripts/ntptrace1
-rwxr-xr-xusr.sbin/ntp/scripts/ntpver1
-rw-r--r--usr.sbin/ntp/sntp/Makefile1
-rw-r--r--usr.sbin/ntp/sntp/Makefile.depend1
-rw-r--r--usr.sbin/ntp/sntp/Makefile.depend.options1
-rw-r--r--usr.sbin/nvram/Makefile1
-rw-r--r--usr.sbin/ofwdump/Makefile1
-rw-r--r--usr.sbin/ofwdump/Makefile.depend1
-rw-r--r--usr.sbin/pciconf/Makefile1
-rw-r--r--usr.sbin/pciconf/Makefile.depend1
-rw-r--r--usr.sbin/periodic/Makefile1
-rw-r--r--usr.sbin/periodic/Makefile.depend1
-rw-r--r--usr.sbin/periodic/etc/Makefile1
-rw-r--r--usr.sbin/periodic/etc/Makefile.inc1
-rwxr-xr-xusr.sbin/periodic/etc/daily/100.clean-disks1
-rwxr-xr-xusr.sbin/periodic/etc/daily/110.clean-tmps1
-rwxr-xr-xusr.sbin/periodic/etc/daily/120.clean-preserve1
-rwxr-xr-xusr.sbin/periodic/etc/daily/130.clean-msgs1
-rwxr-xr-xusr.sbin/periodic/etc/daily/140.clean-rwho1
-rwxr-xr-xusr.sbin/periodic/etc/daily/150.clean-hoststat1
-rwxr-xr-xusr.sbin/periodic/etc/daily/200.backup-passwd1
-rwxr-xr-xusr.sbin/periodic/etc/daily/210.backup-aliases1
-rwxr-xr-xusr.sbin/periodic/etc/daily/221.backup-gpart2
-rwxr-xr-xusr.sbin/periodic/etc/daily/222.backup-gmirror2
-rwxr-xr-xusr.sbin/periodic/etc/daily/223.backup-zfs2
-rwxr-xr-xusr.sbin/periodic/etc/daily/300.calendar1
-rwxr-xr-xusr.sbin/periodic/etc/daily/310.accounting1
-rwxr-xr-xusr.sbin/periodic/etc/daily/330.news1
-rwxr-xr-xusr.sbin/periodic/etc/daily/400.status-disks1
-rwxr-xr-xusr.sbin/periodic/etc/daily/401.status-graid1
-rwxr-xr-xusr.sbin/periodic/etc/daily/404.status-zfs1
-rwxr-xr-xusr.sbin/periodic/etc/daily/406.status-gmirror1
-rwxr-xr-xusr.sbin/periodic/etc/daily/407.status-graid31
-rwxr-xr-xusr.sbin/periodic/etc/daily/408.status-gstripe1
-rwxr-xr-xusr.sbin/periodic/etc/daily/409.status-gconcat1
-rw-r--r--usr.sbin/periodic/etc/daily/410.status-mfi1
-rwxr-xr-xusr.sbin/periodic/etc/daily/420.status-network1
-rwxr-xr-xusr.sbin/periodic/etc/daily/430.status-uptime1
-rwxr-xr-xusr.sbin/periodic/etc/daily/440.status-mailq1
-rwxr-xr-xusr.sbin/periodic/etc/daily/450.status-security1
-rwxr-xr-xusr.sbin/periodic/etc/daily/460.status-mail-rejects1
-rwxr-xr-xusr.sbin/periodic/etc/daily/480.leapfile-ntpd1
-rwxr-xr-xusr.sbin/periodic/etc/daily/480.status-ntpd1
-rwxr-xr-xusr.sbin/periodic/etc/daily/500.queuerun1
-rwxr-xr-xusr.sbin/periodic/etc/daily/510.status-world-kernel1
-rwxr-xr-xusr.sbin/periodic/etc/daily/800.scrub-zfs1
-rwxr-xr-xusr.sbin/periodic/etc/daily/999.local1
-rw-r--r--usr.sbin/periodic/etc/daily/Makefile1
-rwxr-xr-xusr.sbin/periodic/etc/monthly/200.accounting1
-rwxr-xr-xusr.sbin/periodic/etc/monthly/450.status-security1
-rwxr-xr-xusr.sbin/periodic/etc/monthly/999.local1
-rw-r--r--usr.sbin/periodic/etc/monthly/Makefile1
-rwxr-xr-xusr.sbin/periodic/etc/security/100.chksetuid1
-rwxr-xr-xusr.sbin/periodic/etc/security/110.neggrpperm1
-rwxr-xr-xusr.sbin/periodic/etc/security/200.chkmounts1
-rwxr-xr-xusr.sbin/periodic/etc/security/300.chkuid01
-rwxr-xr-xusr.sbin/periodic/etc/security/400.passwdless1
-rwxr-xr-xusr.sbin/periodic/etc/security/410.logincheck1
-rwxr-xr-xusr.sbin/periodic/etc/security/500.ipfwdenied1
-rwxr-xr-xusr.sbin/periodic/etc/security/510.ipfdenied1
-rwxr-xr-xusr.sbin/periodic/etc/security/520.pfdenied1
-rwxr-xr-xusr.sbin/periodic/etc/security/550.ipfwlimit1
-rwxr-xr-xusr.sbin/periodic/etc/security/610.ipf6denied1
-rwxr-xr-xusr.sbin/periodic/etc/security/700.kernelmsg1
-rwxr-xr-xusr.sbin/periodic/etc/security/800.loginfail1
-rwxr-xr-xusr.sbin/periodic/etc/security/900.tcpwrap1
-rw-r--r--usr.sbin/periodic/etc/security/Makefile1
-rw-r--r--usr.sbin/periodic/etc/security/security.functions1
-rwxr-xr-xusr.sbin/periodic/etc/weekly/310.locate1
-rwxr-xr-xusr.sbin/periodic/etc/weekly/320.whatis1
-rwxr-xr-xusr.sbin/periodic/etc/weekly/340.noid1
-rwxr-xr-xusr.sbin/periodic/etc/weekly/450.status-security1
-rwxr-xr-xusr.sbin/periodic/etc/weekly/999.local1
-rw-r--r--usr.sbin/periodic/etc/weekly/Makefile1
-rw-r--r--usr.sbin/periodic/periodic.conf1
-rw-r--r--usr.sbin/periodic/periodic.sh1
-rw-r--r--usr.sbin/pkg/FreeBSD.conf.latest1
-rw-r--r--usr.sbin/pkg/FreeBSD.conf.quarterly1
-rw-r--r--usr.sbin/pkg/Makefile1
-rw-r--r--usr.sbin/pkg/Makefile.depend1
-rw-r--r--usr.sbin/pmc/Makefile1
-rw-r--r--usr.sbin/pmcannotate/Makefile1
-rw-r--r--usr.sbin/pmcannotate/Makefile.depend1
-rw-r--r--usr.sbin/pmccontrol/Makefile1
-rw-r--r--usr.sbin/pmccontrol/Makefile.depend1
-rw-r--r--usr.sbin/pmcstat/Makefile1
-rw-r--r--usr.sbin/pmcstat/Makefile.depend1
-rw-r--r--usr.sbin/pmcstudy/Makefile1
-rw-r--r--usr.sbin/pmcstudy/Makefile.depend1
-rw-r--r--usr.sbin/pnfsdscopymr/Makefile1
-rw-r--r--usr.sbin/pnfsdsfile/Makefile1
-rw-r--r--usr.sbin/pnfsdskill/Makefile1
-rw-r--r--usr.sbin/pnpinfo/Makefile1
-rw-r--r--usr.sbin/pnpinfo/Makefile.depend1
-rw-r--r--usr.sbin/portsnap/Makefile1
-rw-r--r--usr.sbin/portsnap/Makefile.inc1
-rw-r--r--usr.sbin/portsnap/make_index/Makefile1
-rw-r--r--usr.sbin/portsnap/make_index/Makefile.depend1
-rw-r--r--usr.sbin/portsnap/portsnap/Makefile1
-rw-r--r--usr.sbin/portsnap/portsnap/Makefile.depend1
-rw-r--r--usr.sbin/portsnap/portsnap/portsnap.conf1
-rw-r--r--usr.sbin/portsnap/portsnap/portsnap.sh2
-rw-r--r--usr.sbin/powerd/Makefile1
-rw-r--r--usr.sbin/powerd/Makefile.depend1
-rw-r--r--usr.sbin/ppp/Makefile1
-rw-r--r--usr.sbin/ppp/Makefile.depend1
-rw-r--r--usr.sbin/ppp/ppp.conf1
-rw-r--r--usr.sbin/pppctl/Makefile1
-rw-r--r--usr.sbin/pppctl/Makefile.depend1
-rw-r--r--usr.sbin/praliases/Makefile1
-rw-r--r--usr.sbin/praliases/Makefile.depend1
-rw-r--r--usr.sbin/praudit/Makefile1
-rw-r--r--usr.sbin/praudit/Makefile.depend1
-rw-r--r--usr.sbin/praudit/tests/Makefile1
-rw-r--r--usr.sbin/praudit/tests/praudit_test.sh1
-rw-r--r--usr.sbin/prometheus_sysctl_exporter/Makefile1
-rw-r--r--usr.sbin/prometheus_sysctl_exporter/Makefile.depend1
-rw-r--r--usr.sbin/pstat/Makefile1
-rw-r--r--usr.sbin/pstat/Makefile.depend1
-rw-r--r--usr.sbin/pw/Makefile1
-rw-r--r--usr.sbin/pw/Makefile.depend1
-rw-r--r--usr.sbin/pw/tests/Makefile1
-rw-r--r--usr.sbin/pw/tests/Makefile.depend1
-rw-r--r--usr.sbin/pw/tests/group1
-rwxr-xr-xusr.sbin/pw/tests/helper_functions.shin1
-rw-r--r--usr.sbin/pw/tests/master.passwd1
-rwxr-xr-xusr.sbin/pw/tests/pw_config_test.sh1
-rwxr-xr-xusr.sbin/pw/tests/pw_etcdir_test.sh1
-rwxr-xr-xusr.sbin/pw/tests/pw_groupadd_test.sh1
-rwxr-xr-xusr.sbin/pw/tests/pw_groupdel_test.sh1
-rwxr-xr-xusr.sbin/pw/tests/pw_groupmod_test.sh1
-rwxr-xr-xusr.sbin/pw/tests/pw_groupshow_test.sh1
-rwxr-xr-xusr.sbin/pw/tests/pw_lock_test.sh1
-rwxr-xr-xusr.sbin/pw/tests/pw_useradd_test.sh1
-rwxr-xr-xusr.sbin/pw/tests/pw_userdel_test.sh1
-rwxr-xr-xusr.sbin/pw/tests/pw_usermod_test.sh1
-rwxr-xr-xusr.sbin/pw/tests/pw_usernext_test.sh1
-rwxr-xr-xusr.sbin/pw/tests/pw_usershow_test.sh1
-rw-r--r--usr.sbin/pwd_mkdb/Makefile1
-rw-r--r--usr.sbin/pwd_mkdb/Makefile.depend1
-rw-r--r--usr.sbin/pwm/Makefile1
-rw-r--r--usr.sbin/quot/Makefile1
-rw-r--r--usr.sbin/quot/Makefile.depend1
-rw-r--r--usr.sbin/quotaon/Makefile1
-rw-r--r--usr.sbin/quotaon/Makefile.depend1
-rw-r--r--usr.sbin/rarpd/Makefile1
-rw-r--r--usr.sbin/rarpd/Makefile.depend1
-rw-r--r--usr.sbin/repquota/Makefile1
-rw-r--r--usr.sbin/repquota/Makefile.depend1
-rw-r--r--usr.sbin/rip6query/Makefile1
-rw-r--r--usr.sbin/rip6query/Makefile.depend1
-rw-r--r--usr.sbin/rmt/Makefile1
-rw-r--r--usr.sbin/rmt/Makefile.depend1
-rw-r--r--usr.sbin/route6d/Makefile1
-rw-r--r--usr.sbin/route6d/Makefile.depend1
-rwxr-xr-xusr.sbin/route6d/misc/chkrt1
-rw-r--r--usr.sbin/rpc.lockd/Makefile1
-rw-r--r--usr.sbin/rpc.lockd/Makefile.depend1
-rw-r--r--usr.sbin/rpc.statd/Makefile1
-rw-r--r--usr.sbin/rpc.statd/Makefile.depend1
-rw-r--r--usr.sbin/rpc.tlsclntd/Makefile1
-rw-r--r--usr.sbin/rpc.tlsservd/Makefile1
-rw-r--r--usr.sbin/rpc.umntall/Makefile1
-rw-r--r--usr.sbin/rpc.umntall/Makefile.depend1
-rw-r--r--usr.sbin/rpc.yppasswdd/Makefile1
-rw-r--r--usr.sbin/rpc.yppasswdd/Makefile.depend1
-rw-r--r--usr.sbin/rpc.yppasswdd/yppwupdate1
-rw-r--r--usr.sbin/rpc.ypupdated/Makefile1
-rw-r--r--usr.sbin/rpc.ypupdated/Makefile.depend1
-rwxr-xr-xusr.sbin/rpc.ypupdated/ypupdate1
-rw-r--r--usr.sbin/rpc.ypxfrd/Makefile1
-rw-r--r--usr.sbin/rpc.ypxfrd/Makefile.depend1
-rw-r--r--usr.sbin/rpcbind/Makefile1
-rw-r--r--usr.sbin/rpcbind/Makefile.depend1
-rw-r--r--usr.sbin/rpcbind/Makefile.depend.options1
-rw-r--r--usr.sbin/rpcbind/tests/Makefile1
-rw-r--r--usr.sbin/rpcbind/tests/Makefile.depend1
-rw-r--r--usr.sbin/rrenumd/Makefile1
-rw-r--r--usr.sbin/rrenumd/Makefile.depend1
-rw-r--r--usr.sbin/rtadvctl/Makefile1
-rw-r--r--usr.sbin/rtadvctl/Makefile.depend1
-rw-r--r--usr.sbin/rtadvd/Makefile1
-rw-r--r--usr.sbin/rtadvd/Makefile.depend1
-rw-r--r--usr.sbin/rtadvd/rtadvd.conf1
-rw-r--r--usr.sbin/rtprio/Makefile1
-rw-r--r--usr.sbin/rtprio/Makefile.depend1
-rw-r--r--usr.sbin/rtsold/Makefile1
-rw-r--r--usr.sbin/rtsold/Makefile.depend1
-rw-r--r--usr.sbin/rtsold/Makefile.depend.options1
-rw-r--r--usr.sbin/rwhod/Makefile1
-rw-r--r--usr.sbin/rwhod/Makefile.depend1
-rw-r--r--usr.sbin/sa/Makefile1
-rw-r--r--usr.sbin/sa/Makefile.depend1
-rw-r--r--usr.sbin/sa/tests/Makefile1
-rw-r--r--usr.sbin/sa/tests/Makefile.depend1
-rw-r--r--usr.sbin/sa/tests/legacy_test.sh1
-rwxr-xr-xusr.sbin/sa/tests/prime.sh1
-rw-r--r--usr.sbin/sendmail/Makefile1
-rw-r--r--usr.sbin/sendmail/Makefile.depend1
-rw-r--r--usr.sbin/sendmail/Makefile.depend.options1
-rw-r--r--usr.sbin/service/Makefile1
-rw-r--r--usr.sbin/service/Makefile.depend1
-rwxr-xr-xusr.sbin/service/service.sh2
-rw-r--r--usr.sbin/services_mkdb/Makefile1
-rw-r--r--usr.sbin/services_mkdb/Makefile.depend1
-rw-r--r--usr.sbin/services_mkdb/services1
-rw-r--r--usr.sbin/sesutil/Makefile1
-rw-r--r--usr.sbin/sesutil/Makefile.depend1
-rw-r--r--usr.sbin/setfib/Makefile1
-rw-r--r--usr.sbin/setfib/Makefile.depend1
-rw-r--r--usr.sbin/setfmac/Makefile1
-rw-r--r--usr.sbin/setfmac/Makefile.depend1
-rw-r--r--usr.sbin/setpmac/Makefile1
-rw-r--r--usr.sbin/setpmac/Makefile.depend1
-rw-r--r--usr.sbin/smbmsg/Makefile1
-rw-r--r--usr.sbin/smbmsg/Makefile.depend1
-rw-r--r--usr.sbin/snapinfo/Makefile1
-rw-r--r--usr.sbin/snapinfo/Makefile.depend1
-rw-r--r--usr.sbin/spi/Makefile1
-rw-r--r--usr.sbin/spkrtest/Makefile1
-rw-r--r--usr.sbin/spkrtest/Makefile.depend1
-rw-r--r--usr.sbin/spkrtest/spkrtest.sh1
-rw-r--r--usr.sbin/spray/Makefile1
-rw-r--r--usr.sbin/spray/Makefile.depend1
-rw-r--r--usr.sbin/syslogd/Makefile1
-rw-r--r--usr.sbin/syslogd/Makefile.depend1
-rw-r--r--usr.sbin/syslogd/ftp.conf1
-rw-r--r--usr.sbin/syslogd/lpr.conf1
-rw-r--r--usr.sbin/syslogd/ppp.conf1
-rw-r--r--usr.sbin/syslogd/syslog.conf1
-rw-r--r--usr.sbin/sysrc/Makefile1
-rw-r--r--usr.sbin/sysrc/Makefile.depend1
-rw-r--r--usr.sbin/sysrc/sysrc1
-rw-r--r--usr.sbin/tcpdchk/Makefile1
-rw-r--r--usr.sbin/tcpdchk/Makefile.depend1
-rw-r--r--usr.sbin/tcpdmatch/Makefile1
-rw-r--r--usr.sbin/tcpdmatch/Makefile.depend1
-rw-r--r--usr.sbin/tcpdrop/Makefile1
-rw-r--r--usr.sbin/tcpdrop/Makefile.depend1
-rw-r--r--usr.sbin/tcpdump/Makefile1
-rw-r--r--usr.sbin/tcpdump/Makefile.inc1
-rw-r--r--usr.sbin/tcpdump/tcpdump/Makefile1
-rw-r--r--usr.sbin/tcpdump/tcpdump/Makefile.depend1
-rw-r--r--usr.sbin/tcpdump/tcpdump/Makefile.depend.options1
-rw-r--r--usr.sbin/tests/Makefile1
-rw-r--r--usr.sbin/tests/Makefile.depend1
-rw-r--r--usr.sbin/traceroute/Makefile1
-rw-r--r--usr.sbin/traceroute/Makefile.depend1
-rw-r--r--usr.sbin/traceroute/Makefile.depend.options1
-rw-r--r--usr.sbin/traceroute6/Makefile1
-rw-r--r--usr.sbin/traceroute6/Makefile.depend1
-rw-r--r--usr.sbin/trim/Makefile1
-rw-r--r--usr.sbin/trpt/Makefile1
-rw-r--r--usr.sbin/trpt/Makefile.depend1
-rw-r--r--usr.sbin/tzsetup/Makefile1
-rw-r--r--usr.sbin/tzsetup/Makefile.depend1
-rw-r--r--usr.sbin/tzsetup/Makefile.depend.options1
-rw-r--r--usr.sbin/uathload/Makefile1
-rw-r--r--usr.sbin/uathload/Makefile.depend1
-rw-r--r--usr.sbin/uefisign/Makefile1
-rw-r--r--usr.sbin/uefisign/Makefile.depend1
-rw-r--r--usr.sbin/ugidfw/Makefile1
-rw-r--r--usr.sbin/ugidfw/Makefile.depend1
-rw-r--r--usr.sbin/uhsoctl/Makefile1
-rw-r--r--usr.sbin/uhsoctl/Makefile.depend1
-rw-r--r--usr.sbin/unbound/Makefile1
-rw-r--r--usr.sbin/unbound/Makefile.inc1
-rw-r--r--usr.sbin/unbound/anchor/Makefile1
-rw-r--r--usr.sbin/unbound/anchor/Makefile.depend1
-rw-r--r--usr.sbin/unbound/checkconf/Makefile1
-rw-r--r--usr.sbin/unbound/checkconf/Makefile.depend1
-rw-r--r--usr.sbin/unbound/control/Makefile1
-rw-r--r--usr.sbin/unbound/control/Makefile.depend1
-rw-r--r--usr.sbin/unbound/daemon/Makefile1
-rw-r--r--usr.sbin/unbound/daemon/Makefile.depend1
-rw-r--r--usr.sbin/unbound/setup/Makefile1
-rw-r--r--usr.sbin/unbound/setup/Makefile.depend1
-rwxr-xr-xusr.sbin/unbound/setup/local-unbound-setup.sh1
-rw-r--r--usr.sbin/usbconfig/Makefile1
-rw-r--r--usr.sbin/usbconfig/Makefile.depend1
-rw-r--r--usr.sbin/usbdump/Makefile1
-rw-r--r--usr.sbin/usbdump/Makefile.depend1
-rw-r--r--usr.sbin/utx/Makefile1
-rw-r--r--usr.sbin/utx/Makefile.depend1
-rw-r--r--usr.sbin/valectl/Makefile1
-rw-r--r--usr.sbin/vidcontrol/Makefile1
-rw-r--r--usr.sbin/vidcontrol/Makefile.depend1
-rw-r--r--usr.sbin/vigr/Makefile1
-rw-r--r--usr.sbin/vigr/Makefile.depend1
-rw-r--r--usr.sbin/vigr/vigr.sh1
-rw-r--r--usr.sbin/vipw/Makefile1
-rw-r--r--usr.sbin/vipw/Makefile.depend1
-rw-r--r--usr.sbin/wake/Makefile1
-rw-r--r--usr.sbin/wake/Makefile.depend1
-rw-r--r--usr.sbin/watch/Makefile1
-rw-r--r--usr.sbin/watch/Makefile.depend1
-rw-r--r--usr.sbin/watchdogd/Makefile1
-rw-r--r--usr.sbin/watchdogd/Makefile.depend1
-rw-r--r--usr.sbin/wlandebug/Makefile1
-rw-r--r--usr.sbin/wlandebug/Makefile.depend1
-rw-r--r--usr.sbin/wpa/Makefile1
-rw-r--r--usr.sbin/wpa/Makefile.crypto1
-rw-r--r--usr.sbin/wpa/Makefile.depend.options1
-rw-r--r--usr.sbin/wpa/Makefile.inc1
-rw-r--r--usr.sbin/wpa/hostapd/Makefile1
-rw-r--r--usr.sbin/wpa/hostapd/Makefile.depend1
-rw-r--r--usr.sbin/wpa/hostapd_cli/Makefile1
-rw-r--r--usr.sbin/wpa/hostapd_cli/Makefile.depend1
-rw-r--r--usr.sbin/wpa/ndis_events/Makefile1
-rw-r--r--usr.sbin/wpa/ndis_events/Makefile.depend1
-rw-r--r--usr.sbin/wpa/wpa_cli/Makefile1
-rw-r--r--usr.sbin/wpa/wpa_cli/Makefile.depend1
-rw-r--r--usr.sbin/wpa/wpa_passphrase/Makefile1
-rw-r--r--usr.sbin/wpa/wpa_passphrase/Makefile.depend1
-rw-r--r--usr.sbin/wpa/wpa_priv/Makefile1
-rw-r--r--usr.sbin/wpa/wpa_supplicant/Makefile1
-rw-r--r--usr.sbin/wpa/wpa_supplicant/Makefile.depend1
-rw-r--r--usr.sbin/yp_mkdb/Makefile1
-rw-r--r--usr.sbin/yp_mkdb/Makefile.depend1
-rw-r--r--usr.sbin/ypbind/Makefile1
-rw-r--r--usr.sbin/ypbind/Makefile.depend1
-rw-r--r--usr.sbin/ypldap/Makefile1
-rw-r--r--usr.sbin/ypldap/Makefile.depend1
-rw-r--r--usr.sbin/yppoll/Makefile1
-rw-r--r--usr.sbin/yppoll/Makefile.depend1
-rw-r--r--usr.sbin/yppush/Makefile1
-rw-r--r--usr.sbin/yppush/Makefile.depend1
-rw-r--r--usr.sbin/ypserv/Makefile1
-rw-r--r--usr.sbin/ypserv/Makefile.depend1
-rw-r--r--usr.sbin/ypserv/Makefile.depend.options1
-rw-r--r--usr.sbin/ypserv/Makefile.yp1
-rw-r--r--usr.sbin/ypserv/ypinit.sh1
-rw-r--r--usr.sbin/ypset/Makefile1
-rw-r--r--usr.sbin/ypset/Makefile.depend1
-rw-r--r--usr.sbin/zdump/Makefile1
-rw-r--r--usr.sbin/zdump/Makefile.depend1
-rw-r--r--usr.sbin/zic/Makefile1
-rw-r--r--usr.sbin/zic/Makefile.depend1
-rw-r--r--usr.sbin/zonectl/Makefile1
-rw-r--r--usr.sbin/zonectl/Makefile.depend1
-rw-r--r--usr.sbin/zzz/Makefile1
-rw-r--r--usr.sbin/zzz/Makefile.depend1
-rw-r--r--usr.sbin/zzz/zzz.sh1
1207 files changed, 0 insertions, 1219 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index e387625e158e..4864c345bb39 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,5 +1,4 @@
# From: @(#)Makefile 5.20 (Berkeley) 6/12/93
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/Makefile.amd64 b/usr.sbin/Makefile.amd64
index fca60eae07e1..c023a5f77e6d 100644
--- a/usr.sbin/Makefile.amd64
+++ b/usr.sbin/Makefile.amd64
@@ -1,4 +1,3 @@
-# $FreeBSD$
# mptable: broken (not 64 bit clean)
# pnpinfo: crashes (not really useful anyway)
diff --git a/usr.sbin/Makefile.arm b/usr.sbin/Makefile.arm
index 84cff4ab3314..36c77fc6c9b8 100644
--- a/usr.sbin/Makefile.arm
+++ b/usr.sbin/Makefile.arm
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR+= kgmon
SUBDIR+= ofwdump
diff --git a/usr.sbin/Makefile.arm64 b/usr.sbin/Makefile.arm64
index c2d5f36a1738..e819369f4340 100644
--- a/usr.sbin/Makefile.arm64
+++ b/usr.sbin/Makefile.arm64
@@ -1,4 +1,3 @@
-# $FreeBSD$
.if ${MK_ACPI} != "no"
SUBDIR+= acpi
diff --git a/usr.sbin/Makefile.i386 b/usr.sbin/Makefile.i386
index 6724115b8217..d28a686d472d 100644
--- a/usr.sbin/Makefile.i386
+++ b/usr.sbin/Makefile.i386
@@ -1,4 +1,3 @@
-# $FreeBSD$
.if ${MK_ACPI} != "no"
SUBDIR+= acpi
diff --git a/usr.sbin/Makefile.inc b/usr.sbin/Makefile.inc
index 4347591cf563..fd9286474425 100644
--- a/usr.sbin/Makefile.inc
+++ b/usr.sbin/Makefile.inc
@@ -1,4 +1,3 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
BINDIR?= /usr/sbin
diff --git a/usr.sbin/Makefile.mips b/usr.sbin/Makefile.mips
index 8987110dba31..3767c8c9e1ca 100644
--- a/usr.sbin/Makefile.mips
+++ b/usr.sbin/Makefile.mips
@@ -1,3 +1,2 @@
-# $FreeBSD$
SUBDIR+= ofwdump
diff --git a/usr.sbin/Makefile.powerpc b/usr.sbin/Makefile.powerpc
index 4e234ab8dce9..a6d5b3b35ad4 100644
--- a/usr.sbin/Makefile.powerpc
+++ b/usr.sbin/Makefile.powerpc
@@ -1,4 +1,3 @@
-# $FreeBSD$
.if ${MACHINE_ARCH} != "powerpcspe"
SUBDIR+= nvram
diff --git a/usr.sbin/Makefile.riscv b/usr.sbin/Makefile.riscv
index 8987110dba31..3767c8c9e1ca 100644
--- a/usr.sbin/Makefile.riscv
+++ b/usr.sbin/Makefile.riscv
@@ -1,3 +1,2 @@
-# $FreeBSD$
SUBDIR+= ofwdump
diff --git a/usr.sbin/ac/Makefile b/usr.sbin/ac/Makefile
index daade986de91..9a90c4566433 100644
--- a/usr.sbin/ac/Makefile
+++ b/usr.sbin/ac/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= ac
PACKAGE= acct
diff --git a/usr.sbin/ac/Makefile.depend b/usr.sbin/ac/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/ac/Makefile.depend
+++ b/usr.sbin/ac/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/accton/Makefile b/usr.sbin/accton/Makefile
index 94c87ac4ce36..b03b32b3b67e 100644
--- a/usr.sbin/accton/Makefile
+++ b/usr.sbin/accton/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
PROG= accton
MAN= accton.8
diff --git a/usr.sbin/accton/Makefile.depend b/usr.sbin/accton/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/accton/Makefile.depend
+++ b/usr.sbin/accton/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/acpi/Makefile b/usr.sbin/acpi/Makefile
index 8190bc7c3037..c44a4146f44b 100644
--- a/usr.sbin/acpi/Makefile
+++ b/usr.sbin/acpi/Makefile
@@ -1,6 +1,5 @@
# Makefile for acpi tools
# $Id: Makefile,v 1.1 2000/07/14 18:16:22 iwasaki Exp $
-# $FreeBSD$
SUBDIR= acpiconf acpidb acpidump iasl
diff --git a/usr.sbin/acpi/Makefile.inc b/usr.sbin/acpi/Makefile.inc
index 27e16d001380..6bc7076909a2 100644
--- a/usr.sbin/acpi/Makefile.inc
+++ b/usr.sbin/acpi/Makefile.inc
@@ -1,5 +1,4 @@
# $Id: Makefile.inc,v 1.1 2000/07/14 18:16:22 iwasaki Exp $
-# $FreeBSD$
ACPICA_DIR= ${SRCTOP}/sys/contrib/dev/acpica
CFLAGS+= -I${SRCTOP}/sys
diff --git a/usr.sbin/acpi/acpiconf/Makefile b/usr.sbin/acpi/acpiconf/Makefile
index 0bbadc1e8fb9..c9778bbc9032 100644
--- a/usr.sbin/acpi/acpiconf/Makefile
+++ b/usr.sbin/acpi/acpiconf/Makefile
@@ -1,5 +1,4 @@
# $Id: Makefile,v 1.2 2000/07/14 18:16:25 iwasaki Exp $
-# $FreeBSD$
PROG= acpiconf
MAN= acpiconf.8
diff --git a/usr.sbin/acpi/acpiconf/Makefile.depend b/usr.sbin/acpi/acpiconf/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/acpi/acpiconf/Makefile.depend
+++ b/usr.sbin/acpi/acpiconf/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index ed28a26a67a7..98f31ba24fa8 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= acpidb
SRCS= acpidb.c
diff --git a/usr.sbin/acpi/acpidb/Makefile.depend b/usr.sbin/acpi/acpidb/Makefile.depend
index 8bb1973e0ff5..a6b2561a99a8 100644
--- a/usr.sbin/acpi/acpidb/Makefile.depend
+++ b/usr.sbin/acpi/acpidb/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/acpi/acpidump/Makefile b/usr.sbin/acpi/acpidump/Makefile
index e258f8e34f05..9bd54a80f779 100644
--- a/usr.sbin/acpi/acpidump/Makefile
+++ b/usr.sbin/acpi/acpidump/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= acpidump
MAN= acpidump.8
diff --git a/usr.sbin/acpi/acpidump/Makefile.depend b/usr.sbin/acpi/acpidump/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/acpi/acpidump/Makefile.depend
+++ b/usr.sbin/acpi/acpidump/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index 6b0e77d08de8..0f53d1ee8688 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= iasl
diff --git a/usr.sbin/acpi/iasl/Makefile.depend b/usr.sbin/acpi/iasl/Makefile.depend
index d084433f911c..cc2866325c43 100644
--- a/usr.sbin/acpi/iasl/Makefile.depend
+++ b/usr.sbin/acpi/iasl/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/adduser/Makefile b/usr.sbin/adduser/Makefile
index 0ca2dae1e97b..2f18381073a0 100644
--- a/usr.sbin/adduser/Makefile
+++ b/usr.sbin/adduser/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SCRIPTS=adduser.sh rmuser.sh
MAN= adduser.conf.5 adduser.8 rmuser.8
diff --git a/usr.sbin/adduser/Makefile.depend b/usr.sbin/adduser/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/adduser/Makefile.depend
+++ b/usr.sbin/adduser/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh
index fb4b51fc23e3..89dec9cf3d25 100644
--- a/usr.sbin/adduser/adduser.sh
+++ b/usr.sbin/adduser/adduser.sh
@@ -26,7 +26,6 @@
#
# Email: Mike Makonnen <mtm@FreeBSD.Org>
#
-# $FreeBSD$
#
# err msg
diff --git a/usr.sbin/adduser/rmuser.sh b/usr.sbin/adduser/rmuser.sh
index 50dff7241211..4c1e4049763a 100644
--- a/usr.sbin/adduser/rmuser.sh
+++ b/usr.sbin/adduser/rmuser.sh
@@ -26,7 +26,6 @@
#
# Email: Mike Makonnen <mtm@FreeBSD.Org>
#
-# $FreeBSD$
#
ATJOBDIR="/var/at/jobs"
diff --git a/usr.sbin/ancontrol/Makefile b/usr.sbin/ancontrol/Makefile
index 61dd02bf8481..a98bc6962528 100644
--- a/usr.sbin/ancontrol/Makefile
+++ b/usr.sbin/ancontrol/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= ancontrol
MAN= ancontrol.8
diff --git a/usr.sbin/ancontrol/Makefile.depend b/usr.sbin/ancontrol/Makefile.depend
index 9dfb51c0b371..8da2430b89ac 100644
--- a/usr.sbin/ancontrol/Makefile.depend
+++ b/usr.sbin/ancontrol/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index f52453c62522..c18a841b9c16 100644
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= apm
MAN= apm.8
diff --git a/usr.sbin/apm/Makefile.depend b/usr.sbin/apm/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/apm/Makefile.depend
+++ b/usr.sbin/apm/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
index 5bc28dd59835..57c07bff721d 100644
--- a/usr.sbin/apmd/Makefile
+++ b/usr.sbin/apmd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
CONFS= apmd.conf
PROG= apmd
diff --git a/usr.sbin/apmd/Makefile.depend b/usr.sbin/apmd/Makefile.depend
index c729e17c52db..77f8f90c31c3 100644
--- a/usr.sbin/apmd/Makefile.depend
+++ b/usr.sbin/apmd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/apmd/apmd.conf b/usr.sbin/apmd/apmd.conf
index be4a6c3ddd4c..28bb16de46e2 100644
--- a/usr.sbin/apmd/apmd.conf
+++ b/usr.sbin/apmd/apmd.conf
@@ -1,6 +1,5 @@
# apmd Configuration File
#
-# $FreeBSD$
#
apm_event SUSPENDREQ {
diff --git a/usr.sbin/arp/Makefile b/usr.sbin/arp/Makefile
index b6ff7a3e253c..d923696a9f9a 100644
--- a/usr.sbin/arp/Makefile
+++ b/usr.sbin/arp/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.2 (Berkeley) 4/18/94
-# $FreeBSD$
PROG= arp
MAN= arp.4 arp.8
diff --git a/usr.sbin/arp/Makefile.depend b/usr.sbin/arp/Makefile.depend
index a0d0ea100062..077ce1f17eb5 100644
--- a/usr.sbin/arp/Makefile.depend
+++ b/usr.sbin/arp/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/audit/Makefile b/usr.sbin/audit/Makefile
index 4fa6856e8cab..55ddfa4bc9a5 100644
--- a/usr.sbin/audit/Makefile
+++ b/usr.sbin/audit/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
OPENBSMDIR=${SRCTOP}/contrib/openbsm
diff --git a/usr.sbin/audit/Makefile.depend b/usr.sbin/audit/Makefile.depend
index 2511c90c76b0..89f2ffd3f211 100644
--- a/usr.sbin/audit/Makefile.depend
+++ b/usr.sbin/audit/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/auditd/Makefile b/usr.sbin/auditd/Makefile
index 5385463a6e3b..b13ff5355c4b 100644
--- a/usr.sbin/auditd/Makefile
+++ b/usr.sbin/auditd/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
OPENBSMDIR=${SRCTOP}/contrib/openbsm
diff --git a/usr.sbin/auditd/Makefile.depend b/usr.sbin/auditd/Makefile.depend
index b5a4efa4ee85..fa08452da4a4 100644
--- a/usr.sbin/auditd/Makefile.depend
+++ b/usr.sbin/auditd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/auditdistd/Makefile b/usr.sbin/auditdistd/Makefile
index ef323152f171..80badad7e596 100644
--- a/usr.sbin/auditdistd/Makefile
+++ b/usr.sbin/auditdistd/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
OPENBSMDIR=${SRCTOP}/contrib/openbsm
diff --git a/usr.sbin/auditdistd/Makefile.depend b/usr.sbin/auditdistd/Makefile.depend
index 5d5b308975cf..5cd8b52fe790 100644
--- a/usr.sbin/auditdistd/Makefile.depend
+++ b/usr.sbin/auditdistd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/auditreduce/Makefile b/usr.sbin/auditreduce/Makefile
index d7f23285e69b..66bc55af87a9 100644
--- a/usr.sbin/auditreduce/Makefile
+++ b/usr.sbin/auditreduce/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
OPENBSMDIR=${SRCTOP}/contrib/openbsm
diff --git a/usr.sbin/auditreduce/Makefile.depend b/usr.sbin/auditreduce/Makefile.depend
index 2511c90c76b0..89f2ffd3f211 100644
--- a/usr.sbin/auditreduce/Makefile.depend
+++ b/usr.sbin/auditreduce/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/authpf/Makefile b/usr.sbin/authpf/Makefile
index 62fe84086c16..aa6c6e1058a5 100644
--- a/usr.sbin/authpf/Makefile
+++ b/usr.sbin/authpf/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/contrib/pf/authpf
diff --git a/usr.sbin/authpf/Makefile.depend b/usr.sbin/authpf/Makefile.depend
index 0f7ec3606b47..79a78ad12c87 100644
--- a/usr.sbin/authpf/Makefile.depend
+++ b/usr.sbin/authpf/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/autofs/Makefile b/usr.sbin/autofs/Makefile
index 3a649062ae6e..195281df7cf2 100644
--- a/usr.sbin/autofs/Makefile
+++ b/usr.sbin/autofs/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
CONFS= auto_master
PACKAGE=autofs
diff --git a/usr.sbin/autofs/Makefile.depend b/usr.sbin/autofs/Makefile.depend
index 991757ecadc0..ffc295f2fe8a 100644
--- a/usr.sbin/autofs/Makefile.depend
+++ b/usr.sbin/autofs/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/autofs/auto_master b/usr.sbin/autofs/auto_master
index 9083001abba1..bbe05c533708 100644
--- a/usr.sbin/autofs/auto_master
+++ b/usr.sbin/autofs/auto_master
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# Automounter master map, see auto_master(5) for details.
#
diff --git a/usr.sbin/autofs/autofs/Makefile b/usr.sbin/autofs/autofs/Makefile
index 42060884f710..d602381bbced 100644
--- a/usr.sbin/autofs/autofs/Makefile
+++ b/usr.sbin/autofs/autofs/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= autofs
diff --git a/usr.sbin/autofs/autofs/include_ldap b/usr.sbin/autofs/autofs/include_ldap
index 4cf70bfeef81..46c873a57691 100644
--- a/usr.sbin/autofs/autofs/include_ldap
+++ b/usr.sbin/autofs/autofs/include_ldap
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# Modify this to suit your needs. The "$1" is the map name, eg. "auto_master".
diff --git a/usr.sbin/autofs/autofs/include_nis b/usr.sbin/autofs/autofs/include_nis
index 5289984639a1..fc9c19b7f0ca 100644
--- a/usr.sbin/autofs/autofs/include_nis
+++ b/usr.sbin/autofs/autofs/include_nis
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
if [ -n "$2" ]; then
diff --git a/usr.sbin/autofs/autofs/include_nis_nullfs b/usr.sbin/autofs/autofs/include_nis_nullfs
index 6ef815d57c6b..706f43e7e0b3 100644
--- a/usr.sbin/autofs/autofs/include_nis_nullfs
+++ b/usr.sbin/autofs/autofs/include_nis_nullfs
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
#
diff --git a/usr.sbin/autofs/autofs/special_hosts b/usr.sbin/autofs/autofs/special_hosts
index c49854681451..45e865c37c53 100644
--- a/usr.sbin/autofs/autofs/special_hosts
+++ b/usr.sbin/autofs/autofs/special_hosts
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
if [ $# -eq 0 ]; then
diff --git a/usr.sbin/autofs/autofs/special_media b/usr.sbin/autofs/autofs/special_media
index dbd7457b445f..d72ddddddb2e 100755
--- a/usr.sbin/autofs/autofs/special_media
+++ b/usr.sbin/autofs/autofs/special_media
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# Print newline-separated list of devices available for mounting.
diff --git a/usr.sbin/autofs/autofs/special_noauto b/usr.sbin/autofs/autofs/special_noauto
index 219ec7ea6994..b24d08a4b148 100755
--- a/usr.sbin/autofs/autofs/special_noauto
+++ b/usr.sbin/autofs/autofs/special_noauto
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
print_available() {
diff --git a/usr.sbin/autofs/autofs/special_null b/usr.sbin/autofs/autofs/special_null
index 41c10001e676..e62b57ee17f7 100644
--- a/usr.sbin/autofs/autofs/special_null
+++ b/usr.sbin/autofs/autofs/special_null
@@ -1,4 +1,3 @@
#!/usr/bin/true
#
-# $FreeBSD$
#
diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
index 2f282567eb87..7743865400ce 100644
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
.include <src.opts.mk>
diff --git a/usr.sbin/bhyve/Makefile.depend b/usr.sbin/bhyve/Makefile.depend
index 8222ceb6ad25..bcdcc44006a3 100644
--- a/usr.sbin/bhyve/Makefile.depend
+++ b/usr.sbin/bhyve/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bhyve/Makefile.depend.options b/usr.sbin/bhyve/Makefile.depend.options
index fa96b2506b2c..b374d7a1fd52 100644
--- a/usr.sbin/bhyve/Makefile.depend.options
+++ b/usr.sbin/bhyve/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= OPENSSL
diff --git a/usr.sbin/bhyve/kbdlayout/Makefile b/usr.sbin/bhyve/kbdlayout/Makefile
index 4fa9c220747c..ed3f3dc9fbc4 100644
--- a/usr.sbin/bhyve/kbdlayout/Makefile
+++ b/usr.sbin/bhyve/kbdlayout/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= bhyve
FILESDIR= ${SHAREDIR}/bhyve/kbdlayout
diff --git a/usr.sbin/bhyve/kbdlayout/Makefile.depend b/usr.sbin/bhyve/kbdlayout/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bhyve/kbdlayout/Makefile.depend
+++ b/usr.sbin/bhyve/kbdlayout/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bhyve/kbdlayout/am b/usr.sbin/bhyve/kbdlayout/am
index c102fb10801a..a49e33e99aff 100644
--- a/usr.sbin/bhyve/kbdlayout/am
+++ b/usr.sbin/bhyve/kbdlayout/am
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
')',0x87; ) (0x29)
'+',0xce; + (0x2b)
diff --git a/usr.sbin/bhyve/kbdlayout/be b/usr.sbin/bhyve/kbdlayout/be
index 26f8cdc3acbc..5cc0669ea036 100644
--- a/usr.sbin/bhyve/kbdlayout/be
+++ b/usr.sbin/bhyve/kbdlayout/be
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'!',0x3e; ! (0x21)
'"',0x26; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/be_acc b/usr.sbin/bhyve/kbdlayout/be_acc
index adf136634eb2..b9190d76a3d2 100644
--- a/usr.sbin/bhyve/kbdlayout/be_acc
+++ b/usr.sbin/bhyve/kbdlayout/be_acc
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'!',0x3e; ! (0x21)
'"',0x26; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/bg_bds b/usr.sbin/bhyve/kbdlayout/bg_bds
index 9c25ed4640d3..c1207ebc6768 100644
--- a/usr.sbin/bhyve/kbdlayout/bg_bds
+++ b/usr.sbin/bhyve/kbdlayout/bg_bds
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'(',0xa9; ( (0x28)
'*',0xb7; * (0x2a)
diff --git a/usr.sbin/bhyve/kbdlayout/bg_phonetic b/usr.sbin/bhyve/kbdlayout/bg_phonetic
index dfe972db5b5b..0ce3e5604f8e 100644
--- a/usr.sbin/bhyve/kbdlayout/bg_phonetic
+++ b/usr.sbin/bhyve/kbdlayout/bg_phonetic
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'*',0xb7; * (0x2a)
diff --git a/usr.sbin/bhyve/kbdlayout/br b/usr.sbin/bhyve/kbdlayout/br
index b4605e1748c3..35a6f84537b2 100644
--- a/usr.sbin/bhyve/kbdlayout/br
+++ b/usr.sbin/bhyve/kbdlayout/br
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x0e; " (0x22)
''',0x0e; ' (0x27)
diff --git a/usr.sbin/bhyve/kbdlayout/br_noacc b/usr.sbin/bhyve/kbdlayout/br_noacc
index 62bea6254ced..4d69b285af0b 100644
--- a/usr.sbin/bhyve/kbdlayout/br_noacc
+++ b/usr.sbin/bhyve/kbdlayout/br_noacc
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x0e; " (0x22)
''',0x0e; ' (0x27)
diff --git a/usr.sbin/bhyve/kbdlayout/centraleuropean b/usr.sbin/bhyve/kbdlayout/centraleuropean
index 7b3a2f883aaa..1098198c8db0 100644
--- a/usr.sbin/bhyve/kbdlayout/centraleuropean
+++ b/usr.sbin/bhyve/kbdlayout/centraleuropean
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'Y',0x1a; Y (0x59)
'Z',0x35; Z (0x5a)
diff --git a/usr.sbin/bhyve/kbdlayout/ch b/usr.sbin/bhyve/kbdlayout/ch
index c68f78a49ede..40de835af9d2 100644
--- a/usr.sbin/bhyve/kbdlayout/ch
+++ b/usr.sbin/bhyve/kbdlayout/ch
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'!',0x5b; ! (0x21)
'"',0x1e; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/ch-fr b/usr.sbin/bhyve/kbdlayout/ch-fr
index 33d747f58f5a..a434255e9b58 100644
--- a/usr.sbin/bhyve/kbdlayout/ch-fr
+++ b/usr.sbin/bhyve/kbdlayout/ch-fr
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'!',0x5b; ! (0x21)
'"',0x1e; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/ch-fr_acc b/usr.sbin/bhyve/kbdlayout/ch-fr_acc
index 3d081fb6711c..52a22ff173d3 100644
--- a/usr.sbin/bhyve/kbdlayout/ch-fr_acc
+++ b/usr.sbin/bhyve/kbdlayout/ch-fr_acc
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'!',0x5b; ! (0x21)
'"',0x1e; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/ch_acc b/usr.sbin/bhyve/kbdlayout/ch_acc
index 5b916d444e6f..9e0acd51d443 100644
--- a/usr.sbin/bhyve/kbdlayout/ch_acc
+++ b/usr.sbin/bhyve/kbdlayout/ch_acc
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'!',0x5b; ! (0x21)
'"',0x1e; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/ch_macbook_acc b/usr.sbin/bhyve/kbdlayout/ch_macbook_acc
index 3c7a032bebe6..5496a990d6eb 100644
--- a/usr.sbin/bhyve/kbdlayout/ch_macbook_acc
+++ b/usr.sbin/bhyve/kbdlayout/ch_macbook_acc
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'!',0x5b; ! (0x21)
'"',0x1e; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/cz b/usr.sbin/bhyve/kbdlayout/cz
index 98f6108231ee..53e435de965c 100644
--- a/usr.sbin/bhyve/kbdlayout/cz
+++ b/usr.sbin/bhyve/kbdlayout/cz
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
')',0x9b; ) (0x29)
'*',0xb7; * (0x2a)
diff --git a/usr.sbin/bhyve/kbdlayout/de b/usr.sbin/bhyve/kbdlayout/de
index 82381f705a87..e1c8f6682322 100644
--- a/usr.sbin/bhyve/kbdlayout/de
+++ b/usr.sbin/bhyve/kbdlayout/de
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'#',0x5d; # (0x23)
diff --git a/usr.sbin/bhyve/kbdlayout/de_acc b/usr.sbin/bhyve/kbdlayout/de_acc
index 4ee39b9b05e8..bc39e6ef1c11 100644
--- a/usr.sbin/bhyve/kbdlayout/de_acc
+++ b/usr.sbin/bhyve/kbdlayout/de_acc
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'#',0x5d; # (0x23)
diff --git a/usr.sbin/bhyve/kbdlayout/de_noacc b/usr.sbin/bhyve/kbdlayout/de_noacc
index 6dfcbc63ae7b..b6312d77b0f0 100644
--- a/usr.sbin/bhyve/kbdlayout/de_noacc
+++ b/usr.sbin/bhyve/kbdlayout/de_noacc
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'#',0x5d; # (0x23)
diff --git a/usr.sbin/bhyve/kbdlayout/default b/usr.sbin/bhyve/kbdlayout/default
index 8674c280280b..2c6356d588ee 100644
--- a/usr.sbin/bhyve/kbdlayout/default
+++ b/usr.sbin/bhyve/kbdlayout/default
@@ -2,7 +2,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
# for those who create the Keyboard Layout File. ******************************
# To create the keyboard layout file, first copy this 'default' file into the
diff --git a/usr.sbin/bhyve/kbdlayout/dk b/usr.sbin/bhyve/kbdlayout/dk
index 5183691bfb78..ac7a1696efce 100644
--- a/usr.sbin/bhyve/kbdlayout/dk
+++ b/usr.sbin/bhyve/kbdlayout/dk
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x5b; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/dk_macbook b/usr.sbin/bhyve/kbdlayout/dk_macbook
index a9d9c1b7435e..3757f9c17127 100644
--- a/usr.sbin/bhyve/kbdlayout/dk_macbook
+++ b/usr.sbin/bhyve/kbdlayout/dk_macbook
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'$',0x0e; $ (0x24)
diff --git a/usr.sbin/bhyve/kbdlayout/ee b/usr.sbin/bhyve/kbdlayout/ee
index c2ebbdb08116..03bf2b724f9c 100644
--- a/usr.sbin/bhyve/kbdlayout/ee
+++ b/usr.sbin/bhyve/kbdlayout/ee
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/es b/usr.sbin/bhyve/kbdlayout/es
index 54ffb24bfc10..26745c952666 100644
--- a/usr.sbin/bhyve/kbdlayout/es
+++ b/usr.sbin/bhyve/kbdlayout/es
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/es_acc b/usr.sbin/bhyve/kbdlayout/es_acc
index cd091791c055..70e6ea44c158 100644
--- a/usr.sbin/bhyve/kbdlayout/es_acc
+++ b/usr.sbin/bhyve/kbdlayout/es_acc
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/es_dvorak b/usr.sbin/bhyve/kbdlayout/es_dvorak
index b84e95c91354..c98e907b9d1e 100644
--- a/usr.sbin/bhyve/kbdlayout/es_dvorak
+++ b/usr.sbin/bhyve/kbdlayout/es_dvorak
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/fi b/usr.sbin/bhyve/kbdlayout/fi
index c4bdea09a617..6fe5beb58890 100644
--- a/usr.sbin/bhyve/kbdlayout/fi
+++ b/usr.sbin/bhyve/kbdlayout/fi
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/fr b/usr.sbin/bhyve/kbdlayout/fr
index 6009090ff090..0efb1c72ec52 100644
--- a/usr.sbin/bhyve/kbdlayout/fr
+++ b/usr.sbin/bhyve/kbdlayout/fr
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'!',0x4a; ! (0x21)
'"',0x26; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/fr_acc b/usr.sbin/bhyve/kbdlayout/fr_acc
index ef8730f62f46..85ef4e4c8d1a 100644
--- a/usr.sbin/bhyve/kbdlayout/fr_acc
+++ b/usr.sbin/bhyve/kbdlayout/fr_acc
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'!',0x4a; ! (0x21)
'"',0x26; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/fr_dvorak b/usr.sbin/bhyve/kbdlayout/fr_dvorak
index f739c8e15502..9d7726aeb4f3 100644
--- a/usr.sbin/bhyve/kbdlayout/fr_dvorak
+++ b/usr.sbin/bhyve/kbdlayout/fr_dvorak
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'!',0x2c; ! (0x21)
'"',0x45; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/fr_dvorak_acc b/usr.sbin/bhyve/kbdlayout/fr_dvorak_acc
index c126572b7e16..b22ad12a47bb 100644
--- a/usr.sbin/bhyve/kbdlayout/fr_dvorak_acc
+++ b/usr.sbin/bhyve/kbdlayout/fr_dvorak_acc
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'!',0x2c; ! (0x21)
'"',0x45; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/fr_macbook b/usr.sbin/bhyve/kbdlayout/fr_macbook
index ddb756c8a648..ed4425259061 100644
--- a/usr.sbin/bhyve/kbdlayout/fr_macbook
+++ b/usr.sbin/bhyve/kbdlayout/fr_macbook
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'!',0x3e; ! (0x21)
'"',0x26; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/gr b/usr.sbin/bhyve/kbdlayout/gr
index cba917509594..3a8b3355ca47 100644
--- a/usr.sbin/bhyve/kbdlayout/gr
+++ b/usr.sbin/bhyve/kbdlayout/gr
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'*',0xb7; * (0x2a)
diff --git a/usr.sbin/bhyve/kbdlayout/gr_101_acc b/usr.sbin/bhyve/kbdlayout/gr_101_acc
index 1a4ef7657f1d..b274990410ee 100644
--- a/usr.sbin/bhyve/kbdlayout/gr_101_acc
+++ b/usr.sbin/bhyve/kbdlayout/gr_101_acc
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'*',0xb7; * (0x2a)
diff --git a/usr.sbin/bhyve/kbdlayout/gr_elot_acc b/usr.sbin/bhyve/kbdlayout/gr_elot_acc
index 2e84a99633dc..459ef8173f21 100644
--- a/usr.sbin/bhyve/kbdlayout/gr_elot_acc
+++ b/usr.sbin/bhyve/kbdlayout/gr_elot_acc
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'#',0x5d; # (0x23)
diff --git a/usr.sbin/bhyve/kbdlayout/hr b/usr.sbin/bhyve/kbdlayout/hr
index 8ec2e11dcbd3..695c8a3b2c05 100644
--- a/usr.sbin/bhyve/kbdlayout/hr
+++ b/usr.sbin/bhyve/kbdlayout/hr
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/hu_101 b/usr.sbin/bhyve/kbdlayout/hu_101
index 00d4176d1bca..939a3146490b 100644
--- a/usr.sbin/bhyve/kbdlayout/hu_101
+++ b/usr.sbin/bhyve/kbdlayout/hu_101
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'*',0xb7; * (0x2a)
diff --git a/usr.sbin/bhyve/kbdlayout/hu_102 b/usr.sbin/bhyve/kbdlayout/hu_102
index eb9d0ae4e465..8e020192a714 100644
--- a/usr.sbin/bhyve/kbdlayout/hu_102
+++ b/usr.sbin/bhyve/kbdlayout/hu_102
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'!',0x25; ! (0x21)
'"',0x1e; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/is b/usr.sbin/bhyve/kbdlayout/is
index 4cfd793f7326..32aa9257b389 100644
--- a/usr.sbin/bhyve/kbdlayout/is
+++ b/usr.sbin/bhyve/kbdlayout/is
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/is_acc b/usr.sbin/bhyve/kbdlayout/is_acc
index f7391b35298f..69a63a4e2da9 100644
--- a/usr.sbin/bhyve/kbdlayout/is_acc
+++ b/usr.sbin/bhyve/kbdlayout/is_acc
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/it b/usr.sbin/bhyve/kbdlayout/it
index a286bf8684fa..e7d5b6f73d69 100644
--- a/usr.sbin/bhyve/kbdlayout/it
+++ b/usr.sbin/bhyve/kbdlayout/it
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'#',0x52; # (0x23)
diff --git a/usr.sbin/bhyve/kbdlayout/jp b/usr.sbin/bhyve/kbdlayout/jp
index 550571ea1dfe..f01adc0b86f8 100644
--- a/usr.sbin/bhyve/kbdlayout/jp
+++ b/usr.sbin/bhyve/kbdlayout/jp
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
# Alphabet/Number/Sign Keys ---------------------------------------------------
'"',0x1e; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/jp_capsctrl b/usr.sbin/bhyve/kbdlayout/jp_capsctrl
index 46fd6e154a38..12316ef407ef 100644
--- a/usr.sbin/bhyve/kbdlayout/jp_capsctrl
+++ b/usr.sbin/bhyve/kbdlayout/jp_capsctrl
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
# Alphabet/Number/Sign Keys ---------------------------------------------------
'"',0x1e; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/kz_io b/usr.sbin/bhyve/kbdlayout/kz_io
index c158028e0ad5..58a7b5b6f5cd 100644
--- a/usr.sbin/bhyve/kbdlayout/kz_io
+++ b/usr.sbin/bhyve/kbdlayout/kz_io
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x82; " (0x22)
'(',0xa9; ( (0x28)
diff --git a/usr.sbin/bhyve/kbdlayout/kz_kst b/usr.sbin/bhyve/kbdlayout/kz_kst
index 7c1281a7dc4d..3ef3b89d3e89 100644
--- a/usr.sbin/bhyve/kbdlayout/kz_kst
+++ b/usr.sbin/bhyve/kbdlayout/kz_kst
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x82; " (0x22)
'(',0xa9; ( (0x28)
diff --git a/usr.sbin/bhyve/kbdlayout/latinamerican b/usr.sbin/bhyve/kbdlayout/latinamerican
index ac2920ab4af7..092579bec60e 100644
--- a/usr.sbin/bhyve/kbdlayout/latinamerican
+++ b/usr.sbin/bhyve/kbdlayout/latinamerican
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/latinamerican_acc b/usr.sbin/bhyve/kbdlayout/latinamerican_acc
index 7fd97dc3dba8..904575f3689f 100644
--- a/usr.sbin/bhyve/kbdlayout/latinamerican_acc
+++ b/usr.sbin/bhyve/kbdlayout/latinamerican_acc
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/lt b/usr.sbin/bhyve/kbdlayout/lt
index 114d0624dfe2..b876d27f4ab0 100644
--- a/usr.sbin/bhyve/kbdlayout/lt
+++ b/usr.sbin/bhyve/kbdlayout/lt
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'*',0xb7; * (0x2a)
0xffea,0x61; Right alt
diff --git a/usr.sbin/bhyve/kbdlayout/nl b/usr.sbin/bhyve/kbdlayout/nl
index f715494337e4..b9b8138fae23 100644
--- a/usr.sbin/bhyve/kbdlayout/nl
+++ b/usr.sbin/bhyve/kbdlayout/nl
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/no b/usr.sbin/bhyve/kbdlayout/no
index bd2620631616..0d2be75ef415 100644
--- a/usr.sbin/bhyve/kbdlayout/no
+++ b/usr.sbin/bhyve/kbdlayout/no
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/no_dvorak b/usr.sbin/bhyve/kbdlayout/no_dvorak
index f4197864590e..ac62fd4ae73e 100644
--- a/usr.sbin/bhyve/kbdlayout/no_dvorak
+++ b/usr.sbin/bhyve/kbdlayout/no_dvorak
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/nordic_asus-eee b/usr.sbin/bhyve/kbdlayout/nordic_asus-eee
index c0fb79ca4fdd..368d9d6c3406 100644
--- a/usr.sbin/bhyve/kbdlayout/nordic_asus-eee
+++ b/usr.sbin/bhyve/kbdlayout/nordic_asus-eee
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/pl_dvorak b/usr.sbin/bhyve/kbdlayout/pl_dvorak
index 4162839eb89d..9a9daaef652d 100644
--- a/usr.sbin/bhyve/kbdlayout/pl_dvorak
+++ b/usr.sbin/bhyve/kbdlayout/pl_dvorak
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x15; " (0x22)
''',0x15; ' (0x27)
diff --git a/usr.sbin/bhyve/kbdlayout/pt b/usr.sbin/bhyve/kbdlayout/pt
index 9ca6dc125a6b..ab568361a7f9 100644
--- a/usr.sbin/bhyve/kbdlayout/pt
+++ b/usr.sbin/bhyve/kbdlayout/pt
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/pt_acc b/usr.sbin/bhyve/kbdlayout/pt_acc
index 85ca7485afa9..1f179e73cc5f 100644
--- a/usr.sbin/bhyve/kbdlayout/pt_acc
+++ b/usr.sbin/bhyve/kbdlayout/pt_acc
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/ru b/usr.sbin/bhyve/kbdlayout/ru
index 32bcf88dcf79..99552914963a 100644
--- a/usr.sbin/bhyve/kbdlayout/ru
+++ b/usr.sbin/bhyve/kbdlayout/ru
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'!',0x82; ! (0x21)
'"',0x00; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/ru_shift b/usr.sbin/bhyve/kbdlayout/ru_shift
index 1edc9310d2b0..572c378b4e38 100644
--- a/usr.sbin/bhyve/kbdlayout/ru_shift
+++ b/usr.sbin/bhyve/kbdlayout/ru_shift
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'*',0xb7; * (0x2a)
diff --git a/usr.sbin/bhyve/kbdlayout/ru_win b/usr.sbin/bhyve/kbdlayout/ru_win
index 04b2775bf79f..56b555968b60 100644
--- a/usr.sbin/bhyve/kbdlayout/ru_win
+++ b/usr.sbin/bhyve/kbdlayout/ru_win
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'*',0xb7; * (0x2a)
diff --git a/usr.sbin/bhyve/kbdlayout/se b/usr.sbin/bhyve/kbdlayout/se
index afd0aca06cd9..e833a3d8e395 100644
--- a/usr.sbin/bhyve/kbdlayout/se
+++ b/usr.sbin/bhyve/kbdlayout/se
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/si b/usr.sbin/bhyve/kbdlayout/si
index 4c3f119e0351..42482784314a 100644
--- a/usr.sbin/bhyve/kbdlayout/si
+++ b/usr.sbin/bhyve/kbdlayout/si
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/tr b/usr.sbin/bhyve/kbdlayout/tr
index 5c80df6b5067..c5dec89fc2a4 100644
--- a/usr.sbin/bhyve/kbdlayout/tr
+++ b/usr.sbin/bhyve/kbdlayout/tr
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x0e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/tr_f b/usr.sbin/bhyve/kbdlayout/tr_f
index 9f4fe1512b48..5451203e8dbb 100644
--- a/usr.sbin/bhyve/kbdlayout/tr_f
+++ b/usr.sbin/bhyve/kbdlayout/tr_f
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'&',0x36; & (0x26)
diff --git a/usr.sbin/bhyve/kbdlayout/ua b/usr.sbin/bhyve/kbdlayout/ua
index 683b39c5053b..244c3484eea6 100644
--- a/usr.sbin/bhyve/kbdlayout/ua
+++ b/usr.sbin/bhyve/kbdlayout/ua
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'*',0xb7; * (0x2a)
diff --git a/usr.sbin/bhyve/kbdlayout/ua_shift_alt b/usr.sbin/bhyve/kbdlayout/ua_shift_alt
index be5d7041078f..02df04ecacea 100644
--- a/usr.sbin/bhyve/kbdlayout/ua_shift_alt
+++ b/usr.sbin/bhyve/kbdlayout/ua_shift_alt
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'*',0xb7; * (0x2a)
0xffb5,0x71; Keypad 5
diff --git a/usr.sbin/bhyve/kbdlayout/uk b/usr.sbin/bhyve/kbdlayout/uk
index 25289fa6d255..2a71f6726d6a 100644
--- a/usr.sbin/bhyve/kbdlayout/uk
+++ b/usr.sbin/bhyve/kbdlayout/uk
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'#',0x5d; # (0x23)
diff --git a/usr.sbin/bhyve/kbdlayout/uk_capsctrl b/usr.sbin/bhyve/kbdlayout/uk_capsctrl
index 8b869bf88308..ea3b462609c9 100644
--- a/usr.sbin/bhyve/kbdlayout/uk_capsctrl
+++ b/usr.sbin/bhyve/kbdlayout/uk_capsctrl
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'#',0x5d; # (0x23)
diff --git a/usr.sbin/bhyve/kbdlayout/uk_dvorak b/usr.sbin/bhyve/kbdlayout/uk_dvorak
index 0b365b7ead4d..4a7fdd78e4ee 100644
--- a/usr.sbin/bhyve/kbdlayout/uk_dvorak
+++ b/usr.sbin/bhyve/kbdlayout/uk_dvorak
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x1e; " (0x22)
'#',0x5d; # (0x23)
diff --git a/usr.sbin/bhyve/kbdlayout/uk_macbook b/usr.sbin/bhyve/kbdlayout/uk_macbook
index 6283842afa5e..73ef5bc454e9 100644
--- a/usr.sbin/bhyve/kbdlayout/uk_macbook
+++ b/usr.sbin/bhyve/kbdlayout/uk_macbook
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'`',0x61; ` (0x60)
'~',0x61; ~ (0x7e)
diff --git a/usr.sbin/bhyve/kbdlayout/us_dvorak b/usr.sbin/bhyve/kbdlayout/us_dvorak
index 6fa21a2bca75..fea168bf8be3 100644
--- a/usr.sbin/bhyve/kbdlayout/us_dvorak
+++ b/usr.sbin/bhyve/kbdlayout/us_dvorak
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x15; " (0x22)
''',0x15; ' (0x27)
diff --git a/usr.sbin/bhyve/kbdlayout/us_dvorakl b/usr.sbin/bhyve/kbdlayout/us_dvorakl
index 38e6857f69ab..255102e866c8 100644
--- a/usr.sbin/bhyve/kbdlayout/us_dvorakl
+++ b/usr.sbin/bhyve/kbdlayout/us_dvorakl
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'!',0x55; ! (0x21)
'"',0x1a; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/us_dvorakp b/usr.sbin/bhyve/kbdlayout/us_dvorakp
index c66c9d5e4b03..9ebfbccdd005 100644
--- a/usr.sbin/bhyve/kbdlayout/us_dvorakp
+++ b/usr.sbin/bhyve/kbdlayout/us_dvorakp
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'!',0x4e; ! (0x21)
'"',0x1a; " (0x22)
diff --git a/usr.sbin/bhyve/kbdlayout/us_dvorakr b/usr.sbin/bhyve/kbdlayout/us_dvorakr
index 95485730c460..5eade8ad2f60 100644
--- a/usr.sbin/bhyve/kbdlayout/us_dvorakr
+++ b/usr.sbin/bhyve/kbdlayout/us_dvorakr
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x4a; " (0x22)
'%',0x15; % (0x25)
diff --git a/usr.sbin/bhyve/kbdlayout/us_dvorakx b/usr.sbin/bhyve/kbdlayout/us_dvorakx
index 24195875001a..7d74526b94a9 100644
--- a/usr.sbin/bhyve/kbdlayout/us_dvorakx
+++ b/usr.sbin/bhyve/kbdlayout/us_dvorakx
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'"',0x15; " (0x22)
''',0x15; ' (0x27)
diff --git a/usr.sbin/bhyve/kbdlayout/us_emacs b/usr.sbin/bhyve/kbdlayout/us_emacs
index 01b108583fc3..f43a4f28cc16 100644
--- a/usr.sbin/bhyve/kbdlayout/us_emacs
+++ b/usr.sbin/bhyve/kbdlayout/us_emacs
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
0xffff,0x66; Del
diff --git a/usr.sbin/bhyve/kbdlayout/us_unix b/usr.sbin/bhyve/kbdlayout/us_unix
index c4b2739ad194..bdf5a50be15f 100644
--- a/usr.sbin/bhyve/kbdlayout/us_unix
+++ b/usr.sbin/bhyve/kbdlayout/us_unix
@@ -3,7 +3,6 @@
#
# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
#
-# $FreeBSD$
'`',0x76; ` (0x60)
'~',0x76; ~ (0x7e)
diff --git a/usr.sbin/bhyvectl/Makefile b/usr.sbin/bhyvectl/Makefile
index 5b1c04e8ac88..4f15bc35adf8 100644
--- a/usr.sbin/bhyvectl/Makefile
+++ b/usr.sbin/bhyvectl/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
.include <src.opts.mk>
diff --git a/usr.sbin/bhyvectl/Makefile.depend b/usr.sbin/bhyvectl/Makefile.depend
index 0550c3e85424..53e8a2258fdd 100644
--- a/usr.sbin/bhyvectl/Makefile.depend
+++ b/usr.sbin/bhyvectl/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bhyveload/Makefile b/usr.sbin/bhyveload/Makefile
index 59672cca47b5..f4091f8a092d 100644
--- a/usr.sbin/bhyveload/Makefile
+++ b/usr.sbin/bhyveload/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= bhyveload
SRCS= bhyveload.c
diff --git a/usr.sbin/bhyveload/Makefile.depend b/usr.sbin/bhyveload/Makefile.depend
index 0550c3e85424..53e8a2258fdd 100644
--- a/usr.sbin/bhyveload/Makefile.depend
+++ b/usr.sbin/bhyveload/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/binmiscctl/Makefile b/usr.sbin/binmiscctl/Makefile
index 867fc5f045d2..157f21378c7a 100644
--- a/usr.sbin/binmiscctl/Makefile
+++ b/usr.sbin/binmiscctl/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
.include <bsd.own.mk>
diff --git a/usr.sbin/binmiscctl/Makefile.depend b/usr.sbin/binmiscctl/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/binmiscctl/Makefile.depend
+++ b/usr.sbin/binmiscctl/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/blacklistctl/Makefile b/usr.sbin/blacklistctl/Makefile
index fd63b85cecbe..effba6761154 100644
--- a/usr.sbin/blacklistctl/Makefile
+++ b/usr.sbin/blacklistctl/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
BLACKLIST_DIR=${SRCTOP}/contrib/blacklist
.PATH: ${BLACKLIST_DIR}/bin ${BLACKLIST_DIR}/port
diff --git a/usr.sbin/blacklistctl/Makefile.depend b/usr.sbin/blacklistctl/Makefile.depend
index 741c9b987127..022282c2ed38 100644
--- a/usr.sbin/blacklistctl/Makefile.depend
+++ b/usr.sbin/blacklistctl/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/blacklistd/Makefile b/usr.sbin/blacklistd/Makefile
index 8c9a354a7fb3..a33ea1d285b1 100644
--- a/usr.sbin/blacklistd/Makefile
+++ b/usr.sbin/blacklistd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
BLACKLIST_DIR=${SRCTOP}/contrib/blacklist
.PATH: ${BLACKLIST_DIR}/bin ${BLACKLIST_DIR}/port
diff --git a/usr.sbin/blacklistd/Makefile.depend b/usr.sbin/blacklistd/Makefile.depend
index 741c9b987127..022282c2ed38 100644
--- a/usr.sbin/blacklistd/Makefile.depend
+++ b/usr.sbin/blacklistd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/blacklistd/blacklistd.conf b/usr.sbin/blacklistd/blacklistd.conf
index 2b1cf87e60c9..b8dee6768cc7 100644
--- a/usr.sbin/blacklistd/blacklistd.conf
+++ b/usr.sbin/blacklistd/blacklistd.conf
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# Blacklist rule
# adr/mask:port type proto owner name nfail disable
diff --git a/usr.sbin/bluetooth/Makefile b/usr.sbin/bluetooth/Makefile
index 5868ffe90747..6cbbd3161272 100644
--- a/usr.sbin/bluetooth/Makefile
+++ b/usr.sbin/bluetooth/Makefile
@@ -1,5 +1,4 @@
# $Id: Makefile,v 1.5 2003/09/08 02:28:35 max Exp $
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/bluetooth/Makefile.inc b/usr.sbin/bluetooth/Makefile.inc
index 993a2f3616ab..ebb2c23220d8 100644
--- a/usr.sbin/bluetooth/Makefile.inc
+++ b/usr.sbin/bluetooth/Makefile.inc
@@ -1,3 +1,2 @@
-# $FreeBSD$
.include "${.CURDIR:H:H}/Makefile.inc"
diff --git a/usr.sbin/bluetooth/ath3kfw/Makefile b/usr.sbin/bluetooth/ath3kfw/Makefile
index 7b2f2c2086bd..97f2f0083914 100644
--- a/usr.sbin/bluetooth/ath3kfw/Makefile
+++ b/usr.sbin/bluetooth/ath3kfw/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= bluetooth
PROG= ath3kfw
diff --git a/usr.sbin/bluetooth/ath3kfw/Makefile.depend b/usr.sbin/bluetooth/ath3kfw/Makefile.depend
index a93901938c4b..e095e48a8d67 100644
--- a/usr.sbin/bluetooth/ath3kfw/Makefile.depend
+++ b/usr.sbin/bluetooth/ath3kfw/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bluetooth/bcmfw/Makefile b/usr.sbin/bluetooth/bcmfw/Makefile
index c88450bdc187..9d186d9f8869 100644
--- a/usr.sbin/bluetooth/bcmfw/Makefile
+++ b/usr.sbin/bluetooth/bcmfw/Makefile
@@ -1,5 +1,4 @@
# $Id: Makefile,v 1.6 2003/08/14 20:05:58 max Exp $
-# $FreeBSD$
PACKAGE= bluetooth
PROG= bcmfw
diff --git a/usr.sbin/bluetooth/bcmfw/Makefile.depend b/usr.sbin/bluetooth/bcmfw/Makefile.depend
index 3f4cb50e1709..7bdc10ae0f8f 100644
--- a/usr.sbin/bluetooth/bcmfw/Makefile.depend
+++ b/usr.sbin/bluetooth/bcmfw/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bluetooth/bluetooth-config/Makefile b/usr.sbin/bluetooth/bluetooth-config/Makefile
index b567026890e7..19598ebb112c 100644
--- a/usr.sbin/bluetooth/bluetooth-config/Makefile
+++ b/usr.sbin/bluetooth/bluetooth-config/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= bluetooth
SCRIPTS=bluetooth-config.sh
diff --git a/usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh b/usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh
index f010c29c6025..48a399a82fc7 100755
--- a/usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh
+++ b/usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh
@@ -7,7 +7,6 @@
# this stuff is worth it, you can buy me a beer in return Poul-Henning Kamp
# ----------------------------------------------------------------------------
#
-# $FreeBSD$
#
# define our bail out shortcut
diff --git a/usr.sbin/bluetooth/bthidcontrol/Makefile b/usr.sbin/bluetooth/bthidcontrol/Makefile
index 0bdfed6fa682..bc6cc15ab9e7 100644
--- a/usr.sbin/bluetooth/bthidcontrol/Makefile
+++ b/usr.sbin/bluetooth/bthidcontrol/Makefile
@@ -1,5 +1,4 @@
# $Id: Makefile,v 1.2 2004/02/13 21:44:41 max Exp $
-# $FreeBSD$
.PATH: ${.CURDIR:H}/bthidd
diff --git a/usr.sbin/bluetooth/bthidcontrol/Makefile.depend b/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
index 025b326c97f5..26357e5ee840 100644
--- a/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
+++ b/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bluetooth/bthidd/Makefile b/usr.sbin/bluetooth/bthidd/Makefile
index d92b4cff1693..b924d1985e9d 100644
--- a/usr.sbin/bluetooth/bthidd/Makefile
+++ b/usr.sbin/bluetooth/bthidd/Makefile
@@ -1,5 +1,4 @@
# $Id: Makefile,v 1.6 2006/09/07 21:36:55 max Exp $
-# $FreeBSD$
PACKAGE= bluetooth
PROG= bthidd
diff --git a/usr.sbin/bluetooth/bthidd/Makefile.depend b/usr.sbin/bluetooth/bthidd/Makefile.depend
index 1549057016d2..0296123869f3 100644
--- a/usr.sbin/bluetooth/bthidd/Makefile.depend
+++ b/usr.sbin/bluetooth/bthidd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.conf.sample b/usr.sbin/bluetooth/bthidd/bthidd.conf.sample
index deb414870da0..63b3ced5edce 100644
--- a/usr.sbin/bluetooth/bthidd/bthidd.conf.sample
+++ b/usr.sbin/bluetooth/bthidd/bthidd.conf.sample
@@ -1,4 +1,3 @@
-# $FreeBSD$
device {
bdaddr 00:50:f2:e5:68:84;
diff --git a/usr.sbin/bluetooth/btpand/Makefile b/usr.sbin/bluetooth/btpand/Makefile
index e24a9fe7f795..14848e66e42a 100644
--- a/usr.sbin/bluetooth/btpand/Makefile
+++ b/usr.sbin/bluetooth/btpand/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.2 2008/08/18 08:25:32 plunky Exp $
-# $FreeBSD$
PACKAGE= bluetooth
PROG= btpand
diff --git a/usr.sbin/bluetooth/btpand/Makefile.depend b/usr.sbin/bluetooth/btpand/Makefile.depend
index b4d153024640..8ef809e65476 100644
--- a/usr.sbin/bluetooth/btpand/Makefile.depend
+++ b/usr.sbin/bluetooth/btpand/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bluetooth/hccontrol/Makefile b/usr.sbin/bluetooth/hccontrol/Makefile
index 9191b656ff02..b662bc9fbbc2 100644
--- a/usr.sbin/bluetooth/hccontrol/Makefile
+++ b/usr.sbin/bluetooth/hccontrol/Makefile
@@ -1,5 +1,4 @@
# $Id: Makefile,v 1.7 2003/08/14 20:06:17 max Exp $
-# $FreeBSD$
PACKAGE= bluetooth
CONFS= bluetooth.device.conf
diff --git a/usr.sbin/bluetooth/hccontrol/Makefile.depend b/usr.sbin/bluetooth/hccontrol/Makefile.depend
index f556d37ea8e6..a41bdf51d0bf 100644
--- a/usr.sbin/bluetooth/hccontrol/Makefile.depend
+++ b/usr.sbin/bluetooth/hccontrol/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bluetooth/hccontrol/bluetooth.device.conf b/usr.sbin/bluetooth/hccontrol/bluetooth.device.conf
index 330548f97bb5..95b769bae9f3 100644
--- a/usr.sbin/bluetooth/hccontrol/bluetooth.device.conf
+++ b/usr.sbin/bluetooth/hccontrol/bluetooth.device.conf
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
# The authentication_enable parameter controls if the device requires to
# authenticate the remote device at connection setup. At connection setup,
diff --git a/usr.sbin/bluetooth/hcsecd/Makefile b/usr.sbin/bluetooth/hcsecd/Makefile
index b571162a1907..b32e3c670aa1 100644
--- a/usr.sbin/bluetooth/hcsecd/Makefile
+++ b/usr.sbin/bluetooth/hcsecd/Makefile
@@ -1,5 +1,4 @@
# $Id: Makefile,v 1.8 2003/08/14 20:06:20 max Exp $
-# $FreeBSD$
PACKAGE= bluetooth
CONFS= hcsecd.conf
diff --git a/usr.sbin/bluetooth/hcsecd/Makefile.depend b/usr.sbin/bluetooth/hcsecd/Makefile.depend
index 0ef8a0651b9f..c45661d17b0f 100644
--- a/usr.sbin/bluetooth/hcsecd/Makefile.depend
+++ b/usr.sbin/bluetooth/hcsecd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.conf b/usr.sbin/bluetooth/hcsecd/hcsecd.conf
index e6b95998f33b..36ec516ae019 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.conf
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.conf
@@ -1,5 +1,4 @@
# $Id: hcsecd.conf,v 1.1 2003/05/26 22:50:47 max Exp $
-# $FreeBSD$
#
# HCI security daemon configuration file
#
diff --git a/usr.sbin/bluetooth/hcseriald/Makefile b/usr.sbin/bluetooth/hcseriald/Makefile
index 8a0d422ee74a..cf36d5b73564 100644
--- a/usr.sbin/bluetooth/hcseriald/Makefile
+++ b/usr.sbin/bluetooth/hcseriald/Makefile
@@ -1,5 +1,4 @@
# $Id: Makefile,v 1.5 2003/08/14 20:06:21 max Exp $
-# $FreeBSD$
PACKAGE= bluetooth
PROG= hcseriald
diff --git a/usr.sbin/bluetooth/hcseriald/Makefile.depend b/usr.sbin/bluetooth/hcseriald/Makefile.depend
index 3f4cb50e1709..7bdc10ae0f8f 100644
--- a/usr.sbin/bluetooth/hcseriald/Makefile.depend
+++ b/usr.sbin/bluetooth/hcseriald/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bluetooth/iwmbtfw/Makefile b/usr.sbin/bluetooth/iwmbtfw/Makefile
index 03b608edc63f..0a81d7fdbc32 100644
--- a/usr.sbin/bluetooth/iwmbtfw/Makefile
+++ b/usr.sbin/bluetooth/iwmbtfw/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= bluetooth
CONFS= iwmbtfw.conf
diff --git a/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.conf b/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.conf
index 6b417089c68b..ef8d5263383b 100644
--- a/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.conf
+++ b/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.conf
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# Download Intel Wireless 8260/8265 bluetooth adaptor firmware
diff --git a/usr.sbin/bluetooth/l2control/Makefile b/usr.sbin/bluetooth/l2control/Makefile
index 8dab32051c04..e81bed589420 100644
--- a/usr.sbin/bluetooth/l2control/Makefile
+++ b/usr.sbin/bluetooth/l2control/Makefile
@@ -1,5 +1,4 @@
# $Id: Makefile,v 1.7 2003/08/14 20:06:22 max Exp $
-# $FreeBSD$
PACKAGE= bluetooth
PROG= l2control
diff --git a/usr.sbin/bluetooth/l2control/Makefile.depend b/usr.sbin/bluetooth/l2control/Makefile.depend
index f556d37ea8e6..a41bdf51d0bf 100644
--- a/usr.sbin/bluetooth/l2control/Makefile.depend
+++ b/usr.sbin/bluetooth/l2control/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bluetooth/l2ping/Makefile b/usr.sbin/bluetooth/l2ping/Makefile
index 9e3e0bd50a47..70b8d19bc609 100644
--- a/usr.sbin/bluetooth/l2ping/Makefile
+++ b/usr.sbin/bluetooth/l2ping/Makefile
@@ -1,5 +1,4 @@
# $Id: Makefile,v 1.6 2003/08/14 20:06:24 max Exp $
-# $FreeBSD$
PACKAGE= bluetooth
PROG= l2ping
diff --git a/usr.sbin/bluetooth/l2ping/Makefile.depend b/usr.sbin/bluetooth/l2ping/Makefile.depend
index 3dfd9699a934..6ef54abe46fe 100644
--- a/usr.sbin/bluetooth/l2ping/Makefile.depend
+++ b/usr.sbin/bluetooth/l2ping/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/Makefile b/usr.sbin/bluetooth/rfcomm_pppd/Makefile
index 8974f8a3daef..ea3f211ae7dc 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/Makefile
+++ b/usr.sbin/bluetooth/rfcomm_pppd/Makefile
@@ -1,5 +1,4 @@
# $Id: Makefile,v 1.7 2003/09/07 18:32:11 max Exp $
-# $FreeBSD$
.PATH: ${SRCTOP}/usr.bin/bluetooth/rfcomm_sppd
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend b/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend
index 65af16d12ab3..309565f58267 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend
+++ b/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bluetooth/sdpcontrol/Makefile b/usr.sbin/bluetooth/sdpcontrol/Makefile
index 8250cd0e9127..7f1fe3f05b43 100644
--- a/usr.sbin/bluetooth/sdpcontrol/Makefile
+++ b/usr.sbin/bluetooth/sdpcontrol/Makefile
@@ -1,5 +1,4 @@
# $Id: Makefile,v 1.1 2003/09/08 02:27:27 max Exp $
-# $FreeBSD$
PACKAGE= bluetooth
PROG= sdpcontrol
diff --git a/usr.sbin/bluetooth/sdpcontrol/Makefile.depend b/usr.sbin/bluetooth/sdpcontrol/Makefile.depend
index 65af16d12ab3..309565f58267 100644
--- a/usr.sbin/bluetooth/sdpcontrol/Makefile.depend
+++ b/usr.sbin/bluetooth/sdpcontrol/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bluetooth/sdpd/Makefile b/usr.sbin/bluetooth/sdpd/Makefile
index 65c1df35d12c..aabb16d4c3ca 100644
--- a/usr.sbin/bluetooth/sdpd/Makefile
+++ b/usr.sbin/bluetooth/sdpd/Makefile
@@ -1,5 +1,4 @@
# $Id: Makefile,v 1.1 2004/01/20 21:27:55 max Exp $
-# $FreeBSD$
PACKAGE= bluetooth
PROG= sdpd
diff --git a/usr.sbin/bluetooth/sdpd/Makefile.depend b/usr.sbin/bluetooth/sdpd/Makefile.depend
index feddf3a700bc..f68b7e58d4e3 100644
--- a/usr.sbin/bluetooth/sdpd/Makefile.depend
+++ b/usr.sbin/bluetooth/sdpd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/boot0cfg/Makefile b/usr.sbin/boot0cfg/Makefile
index d41945a655a9..3fa3344aeb0e 100644
--- a/usr.sbin/boot0cfg/Makefile
+++ b/usr.sbin/boot0cfg/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= boot0cfg
MAN= boot0cfg.8
diff --git a/usr.sbin/boot0cfg/Makefile.depend b/usr.sbin/boot0cfg/Makefile.depend
index 0220673c9076..b90b813c26ab 100644
--- a/usr.sbin/boot0cfg/Makefile.depend
+++ b/usr.sbin/boot0cfg/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bootparamd/Makefile b/usr.sbin/bootparamd/Makefile
index c4e3361ecfab..c4f61985a209 100644
--- a/usr.sbin/bootparamd/Makefile
+++ b/usr.sbin/bootparamd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= bootparamd callbootd
diff --git a/usr.sbin/bootparamd/Makefile.inc b/usr.sbin/bootparamd/Makefile.inc
index de7ed1c2f55c..9440974e627b 100644
--- a/usr.sbin/bootparamd/Makefile.inc
+++ b/usr.sbin/bootparamd/Makefile.inc
@@ -1,5 +1,4 @@
# @(#)Makefile.inc 5.1 (Berkeley) 5/11/90
-# $FreeBSD$
BINDIR?= /usr/sbin
diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile
index 9bdb70fb1cce..9ef42ec493d2 100644
--- a/usr.sbin/bootparamd/bootparamd/Makefile
+++ b/usr.sbin/bootparamd/bootparamd/Makefile
@@ -1,5 +1,4 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/bootparamd/bootparamd/Makefile.depend b/usr.sbin/bootparamd/bootparamd/Makefile.depend
index faed4b4cc2aa..f4ffb731c7f2 100644
--- a/usr.sbin/bootparamd/bootparamd/Makefile.depend
+++ b/usr.sbin/bootparamd/bootparamd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile
index b9c984ffd538..426ee15da516 100644
--- a/usr.sbin/bootparamd/callbootd/Makefile
+++ b/usr.sbin/bootparamd/callbootd/Makefile
@@ -1,5 +1,4 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $FreeBSD$
PROG= callbootd
MAN=
diff --git a/usr.sbin/bootparamd/callbootd/Makefile.depend b/usr.sbin/bootparamd/callbootd/Makefile.depend
index faed4b4cc2aa..f4ffb731c7f2 100644
--- a/usr.sbin/bootparamd/callbootd/Makefile.depend
+++ b/usr.sbin/bootparamd/callbootd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/Makefile b/usr.sbin/bsdconfig/Makefile
index a203c9aab328..0e2586d276cb 100644
--- a/usr.sbin/bsdconfig/Makefile
+++ b/usr.sbin/bsdconfig/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/bsdconfig/Makefile.depend b/usr.sbin/bsdconfig/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/Makefile.depend
+++ b/usr.sbin/bsdconfig/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/USAGE b/usr.sbin/bsdconfig/USAGE
index 6b70bd6450c8..a41c21fc4394 100644
--- a/usr.sbin/bsdconfig/USAGE
+++ b/usr.sbin/bsdconfig/USAGE
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
Usage:
@PROGRAM_NAME@ [-h]
diff --git a/usr.sbin/bsdconfig/bsdconfig b/usr.sbin/bsdconfig/bsdconfig
index 2ecdb30bc5a9..8ebaf574f4b2 100755
--- a/usr.sbin/bsdconfig/bsdconfig
+++ b/usr.sbin/bsdconfig/bsdconfig
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/console/INDEX b/usr.sbin/bsdconfig/console/INDEX
index e298f340e63c..f99056d0adb7 100644
--- a/usr.sbin/bsdconfig/console/INDEX
+++ b/usr.sbin/bsdconfig/console/INDEX
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Title that will be shown in the bsdconfig menu.
diff --git a/usr.sbin/bsdconfig/console/Makefile b/usr.sbin/bsdconfig/console/Makefile
index bcb2ebd44185..dbe69e4f2a3b 100644
--- a/usr.sbin/bsdconfig/console/Makefile
+++ b/usr.sbin/bsdconfig/console/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= include
diff --git a/usr.sbin/bsdconfig/console/Makefile.depend b/usr.sbin/bsdconfig/console/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/console/Makefile.depend
+++ b/usr.sbin/bsdconfig/console/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/console/USAGE b/usr.sbin/bsdconfig/console/USAGE
index a06d8af24928..66793a155c5c 100644
--- a/usr.sbin/bsdconfig/console/USAGE
+++ b/usr.sbin/bsdconfig/console/USAGE
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
Usage: bsdconfig @PROGRAM_NAME@ [OPTIONS]
diff --git a/usr.sbin/bsdconfig/console/console b/usr.sbin/bsdconfig/console/console
index cfa44bee1abc..87c32cc47fe8 100755
--- a/usr.sbin/bsdconfig/console/console
+++ b/usr.sbin/bsdconfig/console/console
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/console/font b/usr.sbin/bsdconfig/console/font
index ce16730dd258..f72ff32e5e50 100755
--- a/usr.sbin/bsdconfig/console/font
+++ b/usr.sbin/bsdconfig/console/font
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/console/include/Makefile b/usr.sbin/bsdconfig/console/include/Makefile
index 52cb0be9c6e8..771c54f0a8cf 100644
--- a/usr.sbin/bsdconfig/console/include/Makefile
+++ b/usr.sbin/bsdconfig/console/include/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${LIBEXECDIR}/bsdconfig/080.console/include
FILES= messages.subr
diff --git a/usr.sbin/bsdconfig/console/include/Makefile.depend b/usr.sbin/bsdconfig/console/include/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/console/include/Makefile.depend
+++ b/usr.sbin/bsdconfig/console/include/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/console/include/messages.subr b/usr.sbin/bsdconfig/console/include/messages.subr
index 295f3e302db8..e9d5293b8b48 100644
--- a/usr.sbin/bsdconfig/console/include/messages.subr
+++ b/usr.sbin/bsdconfig/console/include/messages.subr
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
hline_choose_a_font="Choose a font"
hline_choose_a_keyboard_map="Choose a keyboard map"
diff --git a/usr.sbin/bsdconfig/console/keymap b/usr.sbin/bsdconfig/console/keymap
index 28c0500cf8ac..bcba46fe63ac 100755
--- a/usr.sbin/bsdconfig/console/keymap
+++ b/usr.sbin/bsdconfig/console/keymap
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/console/repeat b/usr.sbin/bsdconfig/console/repeat
index ff000234dc74..4698531f0f30 100755
--- a/usr.sbin/bsdconfig/console/repeat
+++ b/usr.sbin/bsdconfig/console/repeat
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/console/saver b/usr.sbin/bsdconfig/console/saver
index 0df487c9583d..4227e768edec 100755
--- a/usr.sbin/bsdconfig/console/saver
+++ b/usr.sbin/bsdconfig/console/saver
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/console/screenmap b/usr.sbin/bsdconfig/console/screenmap
index 5bf5bd872da0..70fd19cdba9d 100755
--- a/usr.sbin/bsdconfig/console/screenmap
+++ b/usr.sbin/bsdconfig/console/screenmap
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/console/ttys b/usr.sbin/bsdconfig/console/ttys
index 54dcb66bdd99..b365308134ed 100755
--- a/usr.sbin/bsdconfig/console/ttys
+++ b/usr.sbin/bsdconfig/console/ttys
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/diskmgmt/INDEX b/usr.sbin/bsdconfig/diskmgmt/INDEX
index e04bb79dafe2..8c7cb9123b31 100644
--- a/usr.sbin/bsdconfig/diskmgmt/INDEX
+++ b/usr.sbin/bsdconfig/diskmgmt/INDEX
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Title that will be shown in the bsdconfig menu.
diff --git a/usr.sbin/bsdconfig/diskmgmt/Makefile b/usr.sbin/bsdconfig/diskmgmt/Makefile
index 16a89009bb6e..cdeafba6a559 100644
--- a/usr.sbin/bsdconfig/diskmgmt/Makefile
+++ b/usr.sbin/bsdconfig/diskmgmt/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= include
diff --git a/usr.sbin/bsdconfig/diskmgmt/Makefile.depend b/usr.sbin/bsdconfig/diskmgmt/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/diskmgmt/Makefile.depend
+++ b/usr.sbin/bsdconfig/diskmgmt/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/diskmgmt/USAGE b/usr.sbin/bsdconfig/diskmgmt/USAGE
index a06d8af24928..66793a155c5c 100644
--- a/usr.sbin/bsdconfig/diskmgmt/USAGE
+++ b/usr.sbin/bsdconfig/diskmgmt/USAGE
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
Usage: bsdconfig @PROGRAM_NAME@ [OPTIONS]
diff --git a/usr.sbin/bsdconfig/diskmgmt/diskmgmt b/usr.sbin/bsdconfig/diskmgmt/diskmgmt
index ec567f550e77..1e5912c95490 100755
--- a/usr.sbin/bsdconfig/diskmgmt/diskmgmt
+++ b/usr.sbin/bsdconfig/diskmgmt/diskmgmt
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/diskmgmt/include/Makefile b/usr.sbin/bsdconfig/diskmgmt/include/Makefile
index c9271532ff8c..40afa94a21d3 100644
--- a/usr.sbin/bsdconfig/diskmgmt/include/Makefile
+++ b/usr.sbin/bsdconfig/diskmgmt/include/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${LIBEXECDIR}/bsdconfig/050.diskmgmt/include
FILES= messages.subr
diff --git a/usr.sbin/bsdconfig/diskmgmt/include/Makefile.depend b/usr.sbin/bsdconfig/diskmgmt/include/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/diskmgmt/include/Makefile.depend
+++ b/usr.sbin/bsdconfig/diskmgmt/include/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/diskmgmt/include/messages.subr b/usr.sbin/bsdconfig/diskmgmt/include/messages.subr
index f0b563f970a8..c370d5c29b11 100644
--- a/usr.sbin/bsdconfig/diskmgmt/include/messages.subr
+++ b/usr.sbin/bsdconfig/diskmgmt/include/messages.subr
@@ -22,6 +22,5 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
msg_no_such_file_or_directory="%s: %s: No such file or directory"
diff --git a/usr.sbin/bsdconfig/docsinstall/INDEX b/usr.sbin/bsdconfig/docsinstall/INDEX
index 6308f30cecf7..adce6b038c5c 100644
--- a/usr.sbin/bsdconfig/docsinstall/INDEX
+++ b/usr.sbin/bsdconfig/docsinstall/INDEX
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Title that will be shown in the bsdconfig menu.
diff --git a/usr.sbin/bsdconfig/docsinstall/Makefile b/usr.sbin/bsdconfig/docsinstall/Makefile
index 2ab3a680a4eb..0a4b3a62061c 100644
--- a/usr.sbin/bsdconfig/docsinstall/Makefile
+++ b/usr.sbin/bsdconfig/docsinstall/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= include
diff --git a/usr.sbin/bsdconfig/docsinstall/Makefile.depend b/usr.sbin/bsdconfig/docsinstall/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/docsinstall/Makefile.depend
+++ b/usr.sbin/bsdconfig/docsinstall/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/docsinstall/USAGE b/usr.sbin/bsdconfig/docsinstall/USAGE
index a06d8af24928..66793a155c5c 100644
--- a/usr.sbin/bsdconfig/docsinstall/USAGE
+++ b/usr.sbin/bsdconfig/docsinstall/USAGE
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
Usage: bsdconfig @PROGRAM_NAME@ [OPTIONS]
diff --git a/usr.sbin/bsdconfig/docsinstall/docsinstall b/usr.sbin/bsdconfig/docsinstall/docsinstall
index 19128fed6562..65e8741f640c 100755
--- a/usr.sbin/bsdconfig/docsinstall/docsinstall
+++ b/usr.sbin/bsdconfig/docsinstall/docsinstall
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/docsinstall/include/Makefile b/usr.sbin/bsdconfig/docsinstall/include/Makefile
index a3ca529a7cc4..17ee3a491497 100644
--- a/usr.sbin/bsdconfig/docsinstall/include/Makefile
+++ b/usr.sbin/bsdconfig/docsinstall/include/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${LIBEXECDIR}/bsdconfig/020.docsinstall/include
FILES= messages.subr
diff --git a/usr.sbin/bsdconfig/docsinstall/include/Makefile.depend b/usr.sbin/bsdconfig/docsinstall/include/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/docsinstall/include/Makefile.depend
+++ b/usr.sbin/bsdconfig/docsinstall/include/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/docsinstall/include/messages.subr b/usr.sbin/bsdconfig/docsinstall/include/messages.subr
index 4c55f0fc078a..2531c276c100 100644
--- a/usr.sbin/bsdconfig/docsinstall/include/messages.subr
+++ b/usr.sbin/bsdconfig/docsinstall/include/messages.subr
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
msg_no_such_file_or_directory="%s: %s: No such file or directory"
msg_permission_denied="%s: %s: permission denied"
diff --git a/usr.sbin/bsdconfig/dot/INDEX b/usr.sbin/bsdconfig/dot/INDEX
index fa641e01f120..8bada1852433 100644
--- a/usr.sbin/bsdconfig/dot/INDEX
+++ b/usr.sbin/bsdconfig/dot/INDEX
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Title that will be shown in the bsdconfig menu.
diff --git a/usr.sbin/bsdconfig/dot/Makefile b/usr.sbin/bsdconfig/dot/Makefile
index ccd10b449cb6..51bca33942ca 100644
--- a/usr.sbin/bsdconfig/dot/Makefile
+++ b/usr.sbin/bsdconfig/dot/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= include
diff --git a/usr.sbin/bsdconfig/dot/Makefile.depend b/usr.sbin/bsdconfig/dot/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/dot/Makefile.depend
+++ b/usr.sbin/bsdconfig/dot/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/dot/USAGE b/usr.sbin/bsdconfig/dot/USAGE
index 5bc38cc57071..6de68c1dc3bb 100644
--- a/usr.sbin/bsdconfig/dot/USAGE
+++ b/usr.sbin/bsdconfig/dot/USAGE
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
Usage: bsdconfig @PROGRAM_NAME@ [OPTIONS]
diff --git a/usr.sbin/bsdconfig/dot/dot b/usr.sbin/bsdconfig/dot/dot
index f71c0e81487f..d56629591acd 100755
--- a/usr.sbin/bsdconfig/dot/dot
+++ b/usr.sbin/bsdconfig/dot/dot
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/dot/include/Makefile b/usr.sbin/bsdconfig/dot/include/Makefile
index b687b88cf254..b9ff1af38cb6 100644
--- a/usr.sbin/bsdconfig/dot/include/Makefile
+++ b/usr.sbin/bsdconfig/dot/include/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${LIBEXECDIR}/bsdconfig/dot/include
FILES= messages.subr
diff --git a/usr.sbin/bsdconfig/dot/include/Makefile.depend b/usr.sbin/bsdconfig/dot/include/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/dot/include/Makefile.depend
+++ b/usr.sbin/bsdconfig/dot/include/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/dot/include/messages.subr b/usr.sbin/bsdconfig/dot/include/messages.subr
index f1095f7e4995..5f3887ce72e7 100644
--- a/usr.sbin/bsdconfig/dot/include/messages.subr
+++ b/usr.sbin/bsdconfig/dot/include/messages.subr
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
msg_graph_label_with_command="bsdconfig(8)\\\ndot(1) output generated by \`\`%s''"
msg_graph_label_with_command_and_date="bsdconfig(8)\\\ndot(1) output generated by \`\`%s'' on\\\n%s"
diff --git a/usr.sbin/bsdconfig/examples/Makefile b/usr.sbin/bsdconfig/examples/Makefile
index f66c2b19eff7..8a716f9553ce 100644
--- a/usr.sbin/bsdconfig/examples/Makefile
+++ b/usr.sbin/bsdconfig/examples/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${SHAREDIR}/examples/bsdconfig
FILES= add_some_packages.sh browse_packages_http.sh bsdconfigrc
diff --git a/usr.sbin/bsdconfig/examples/Makefile.depend b/usr.sbin/bsdconfig/examples/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/examples/Makefile.depend
+++ b/usr.sbin/bsdconfig/examples/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/examples/add_some_packages.sh b/usr.sbin/bsdconfig/examples/add_some_packages.sh
index 8750908dbb2c..b9bb8418610b 100755
--- a/usr.sbin/bsdconfig/examples/add_some_packages.sh
+++ b/usr.sbin/bsdconfig/examples/add_some_packages.sh
@@ -1,5 +1,4 @@
#!/bin/sh
-# $FreeBSD$
#
# This sample installs a short list of packages from the main HTTP site.
#
diff --git a/usr.sbin/bsdconfig/examples/browse_packages_http.sh b/usr.sbin/bsdconfig/examples/browse_packages_http.sh
index 91b928d183bb..258e63d25c6a 100755
--- a/usr.sbin/bsdconfig/examples/browse_packages_http.sh
+++ b/usr.sbin/bsdconfig/examples/browse_packages_http.sh
@@ -1,5 +1,4 @@
#!/bin/sh
-# $FreeBSD$
#
# This sample downloads the package digests.txz and packagesite.txz files from
# HTTP to /tmp (if they don't already exist) and then displays the package
diff --git a/usr.sbin/bsdconfig/examples/bsdconfigrc b/usr.sbin/bsdconfig/examples/bsdconfigrc
index 2e3155fda779..b36031b484ec 100644
--- a/usr.sbin/bsdconfig/examples/bsdconfigrc
+++ b/usr.sbin/bsdconfig/examples/bsdconfigrc
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
# This file allows you to customize the behavior of bsdconfig.
# Copy it to your $HOME/.bsdconfigrc and edit to suit.
diff --git a/usr.sbin/bsdconfig/include/Makefile b/usr.sbin/bsdconfig/include/Makefile
index 913481c856ef..00ebf0b7e37e 100644
--- a/usr.sbin/bsdconfig/include/Makefile
+++ b/usr.sbin/bsdconfig/include/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${LIBEXECDIR}/bsdconfig/include
FILES= bsdconfig.hlp media.hlp messages.subr network_device.hlp \
diff --git a/usr.sbin/bsdconfig/include/Makefile.depend b/usr.sbin/bsdconfig/include/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/include/Makefile.depend
+++ b/usr.sbin/bsdconfig/include/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/include/messages.subr b/usr.sbin/bsdconfig/include/messages.subr
index 9d910032616d..8a25939d88c5 100644
--- a/usr.sbin/bsdconfig/include/messages.subr
+++ b/usr.sbin/bsdconfig/include/messages.subr
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
field_password="Password:"
field_username="Username:"
diff --git a/usr.sbin/bsdconfig/includes/INDEX b/usr.sbin/bsdconfig/includes/INDEX
index a6a6c49212a4..628a597c66fa 100644
--- a/usr.sbin/bsdconfig/includes/INDEX
+++ b/usr.sbin/bsdconfig/includes/INDEX
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Title that will be shown in the bsdconfig menu.
diff --git a/usr.sbin/bsdconfig/includes/Makefile b/usr.sbin/bsdconfig/includes/Makefile
index 367776c245a8..a477fce4362f 100644
--- a/usr.sbin/bsdconfig/includes/Makefile
+++ b/usr.sbin/bsdconfig/includes/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= include
diff --git a/usr.sbin/bsdconfig/includes/Makefile.depend b/usr.sbin/bsdconfig/includes/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/includes/Makefile.depend
+++ b/usr.sbin/bsdconfig/includes/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/includes/USAGE b/usr.sbin/bsdconfig/includes/USAGE
index 4af1b732c718..19999fcd7992 100644
--- a/usr.sbin/bsdconfig/includes/USAGE
+++ b/usr.sbin/bsdconfig/includes/USAGE
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
Usage: bsdconfig @PROGRAM_NAME@ [OPTIONS] [include ...]
diff --git a/usr.sbin/bsdconfig/includes/include/Makefile b/usr.sbin/bsdconfig/includes/include/Makefile
index 3b8b3ec66f27..2a0c1d234e76 100644
--- a/usr.sbin/bsdconfig/includes/include/Makefile
+++ b/usr.sbin/bsdconfig/includes/include/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${LIBEXECDIR}/bsdconfig/includes/include
FILES= messages.subr
diff --git a/usr.sbin/bsdconfig/includes/include/Makefile.depend b/usr.sbin/bsdconfig/includes/include/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/includes/include/Makefile.depend
+++ b/usr.sbin/bsdconfig/includes/include/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/includes/include/messages.subr b/usr.sbin/bsdconfig/includes/include/messages.subr
index 8fa881b4cf15..6b84634208d4 100644
--- a/usr.sbin/bsdconfig/includes/include/messages.subr
+++ b/usr.sbin/bsdconfig/includes/include/messages.subr
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
msg_functions_in="Functions in %s:"
msg_functions_in_matching="Functions in %s matching \`%s':"
diff --git a/usr.sbin/bsdconfig/includes/includes.sh b/usr.sbin/bsdconfig/includes/includes.sh
index 6e9906fd0420..a48ff99aa298 100755
--- a/usr.sbin/bsdconfig/includes/includes.sh
+++ b/usr.sbin/bsdconfig/includes/includes.sh
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/mouse/INDEX b/usr.sbin/bsdconfig/mouse/INDEX
index 4a33a792976e..39ab0366a658 100644
--- a/usr.sbin/bsdconfig/mouse/INDEX
+++ b/usr.sbin/bsdconfig/mouse/INDEX
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Title that will be shown in the bsdconfig menu.
diff --git a/usr.sbin/bsdconfig/mouse/Makefile b/usr.sbin/bsdconfig/mouse/Makefile
index 97fa52b60520..e31a29b34032 100644
--- a/usr.sbin/bsdconfig/mouse/Makefile
+++ b/usr.sbin/bsdconfig/mouse/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= include
diff --git a/usr.sbin/bsdconfig/mouse/Makefile.depend b/usr.sbin/bsdconfig/mouse/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/mouse/Makefile.depend
+++ b/usr.sbin/bsdconfig/mouse/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/mouse/USAGE b/usr.sbin/bsdconfig/mouse/USAGE
index a06d8af24928..66793a155c5c 100644
--- a/usr.sbin/bsdconfig/mouse/USAGE
+++ b/usr.sbin/bsdconfig/mouse/USAGE
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
Usage: bsdconfig @PROGRAM_NAME@ [OPTIONS]
diff --git a/usr.sbin/bsdconfig/mouse/disable b/usr.sbin/bsdconfig/mouse/disable
index f2c528f2b7bf..14b401cf633b 100755
--- a/usr.sbin/bsdconfig/mouse/disable
+++ b/usr.sbin/bsdconfig/mouse/disable
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/mouse/enable b/usr.sbin/bsdconfig/mouse/enable
index 9ad6857e139b..f04c6b257b07 100755
--- a/usr.sbin/bsdconfig/mouse/enable
+++ b/usr.sbin/bsdconfig/mouse/enable
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/mouse/flags b/usr.sbin/bsdconfig/mouse/flags
index 181ee3f41c57..7f0732e747ab 100755
--- a/usr.sbin/bsdconfig/mouse/flags
+++ b/usr.sbin/bsdconfig/mouse/flags
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/mouse/include/Makefile b/usr.sbin/bsdconfig/mouse/include/Makefile
index 2cc852f9ac67..0d33ec61c8ed 100644
--- a/usr.sbin/bsdconfig/mouse/include/Makefile
+++ b/usr.sbin/bsdconfig/mouse/include/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${LIBEXECDIR}/bsdconfig/110.mouse/include
FILES= messages.subr
diff --git a/usr.sbin/bsdconfig/mouse/include/Makefile.depend b/usr.sbin/bsdconfig/mouse/include/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/mouse/include/Makefile.depend
+++ b/usr.sbin/bsdconfig/mouse/include/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/mouse/include/messages.subr b/usr.sbin/bsdconfig/mouse/include/messages.subr
index 2699b9a5471c..b5e7f10d38dc 100644
--- a/usr.sbin/bsdconfig/mouse/include/messages.subr
+++ b/usr.sbin/bsdconfig/mouse/include/messages.subr
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
hline_press_enter_or_space="Press enter or space"
msg_auto="Auto"
diff --git a/usr.sbin/bsdconfig/mouse/mouse b/usr.sbin/bsdconfig/mouse/mouse
index 0dce574feea2..22aab33dba26 100755
--- a/usr.sbin/bsdconfig/mouse/mouse
+++ b/usr.sbin/bsdconfig/mouse/mouse
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/mouse/port b/usr.sbin/bsdconfig/mouse/port
index 92c7ff25ea1f..1793179a523c 100755
--- a/usr.sbin/bsdconfig/mouse/port
+++ b/usr.sbin/bsdconfig/mouse/port
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/mouse/type b/usr.sbin/bsdconfig/mouse/type
index 7d99753a62be..0772eb5a823d 100755
--- a/usr.sbin/bsdconfig/mouse/type
+++ b/usr.sbin/bsdconfig/mouse/type
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/networking/INDEX b/usr.sbin/bsdconfig/networking/INDEX
index d05d4948606e..fc4e6793aa5d 100644
--- a/usr.sbin/bsdconfig/networking/INDEX
+++ b/usr.sbin/bsdconfig/networking/INDEX
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Title that will be shown in the bsdconfig menu.
diff --git a/usr.sbin/bsdconfig/networking/Makefile b/usr.sbin/bsdconfig/networking/Makefile
index 6a1eedda8a9f..f870d3df63a5 100644
--- a/usr.sbin/bsdconfig/networking/Makefile
+++ b/usr.sbin/bsdconfig/networking/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= include share
diff --git a/usr.sbin/bsdconfig/networking/Makefile.depend b/usr.sbin/bsdconfig/networking/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/networking/Makefile.depend
+++ b/usr.sbin/bsdconfig/networking/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/networking/USAGE b/usr.sbin/bsdconfig/networking/USAGE
index 872094666bb0..c4c14e52d026 100644
--- a/usr.sbin/bsdconfig/networking/USAGE
+++ b/usr.sbin/bsdconfig/networking/USAGE
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
Usage: bsdconfig @PROGRAM_NAME@ [OPTIONS]
diff --git a/usr.sbin/bsdconfig/networking/defaultrouter b/usr.sbin/bsdconfig/networking/defaultrouter
index b65981f604f2..e2ba61a86435 100755
--- a/usr.sbin/bsdconfig/networking/defaultrouter
+++ b/usr.sbin/bsdconfig/networking/defaultrouter
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/networking/devices b/usr.sbin/bsdconfig/networking/devices
index 433f25c75fa0..e9a5dbf31fc3 100755
--- a/usr.sbin/bsdconfig/networking/devices
+++ b/usr.sbin/bsdconfig/networking/devices
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/networking/hostname b/usr.sbin/bsdconfig/networking/hostname
index d0fff0120eea..8f15d4cb656a 100755
--- a/usr.sbin/bsdconfig/networking/hostname
+++ b/usr.sbin/bsdconfig/networking/hostname
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/networking/include/Makefile b/usr.sbin/bsdconfig/networking/include/Makefile
index 54f66e128407..22fd0ea262f3 100644
--- a/usr.sbin/bsdconfig/networking/include/Makefile
+++ b/usr.sbin/bsdconfig/networking/include/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${LIBEXECDIR}/bsdconfig/120.networking/include
FILES= messages.subr
diff --git a/usr.sbin/bsdconfig/networking/include/Makefile.depend b/usr.sbin/bsdconfig/networking/include/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/networking/include/Makefile.depend
+++ b/usr.sbin/bsdconfig/networking/include/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/networking/include/messages.subr b/usr.sbin/bsdconfig/networking/include/messages.subr
index 55881ffa63f7..3c411c7938cb 100644
--- a/usr.sbin/bsdconfig/networking/include/messages.subr
+++ b/usr.sbin/bsdconfig/networking/include/messages.subr
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
hline_alnum_punc_tab_enter="Use alpha-numeric, punctuation, TAB or ENTER"
hline_arrows_tab_enter="Press arrows, TAB or ENTER"
diff --git a/usr.sbin/bsdconfig/networking/nameservers b/usr.sbin/bsdconfig/networking/nameservers
index e18f00493efb..604652e4964a 100755
--- a/usr.sbin/bsdconfig/networking/nameservers
+++ b/usr.sbin/bsdconfig/networking/nameservers
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/networking/networking b/usr.sbin/bsdconfig/networking/networking
index af37caaf3d6c..ff4a675731b9 100755
--- a/usr.sbin/bsdconfig/networking/networking
+++ b/usr.sbin/bsdconfig/networking/networking
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/networking/share/Makefile b/usr.sbin/bsdconfig/networking/share/Makefile
index 6d77f25c5e9e..8b8a4cc71929 100644
--- a/usr.sbin/bsdconfig/networking/share/Makefile
+++ b/usr.sbin/bsdconfig/networking/share/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${SHAREDIR}/bsdconfig/networking
FILES= common.subr device.subr hostname.subr ipaddr.subr media.subr \
diff --git a/usr.sbin/bsdconfig/networking/share/Makefile.depend b/usr.sbin/bsdconfig/networking/share/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/networking/share/Makefile.depend
+++ b/usr.sbin/bsdconfig/networking/share/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/networking/share/common.subr b/usr.sbin/bsdconfig/networking/share/common.subr
index 152d1aceb03b..120799d552a0 100644
--- a/usr.sbin/bsdconfig/networking/share/common.subr
+++ b/usr.sbin/bsdconfig/networking/share/common.subr
@@ -24,7 +24,6 @@ if [ ! "$_NETWORKING_COMMON_SUBR" ]; then _NETWORKING_COMMON_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/networking/share/device.subr b/usr.sbin/bsdconfig/networking/share/device.subr
index 41ea29def67c..52e7f3c8a71b 100644
--- a/usr.sbin/bsdconfig/networking/share/device.subr
+++ b/usr.sbin/bsdconfig/networking/share/device.subr
@@ -24,7 +24,6 @@ if [ ! "$_NETWORKING_DEVICE_SUBR" ]; then _NETWORKING_DEVICE_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/networking/share/hostname.subr b/usr.sbin/bsdconfig/networking/share/hostname.subr
index 34bfd6e1d572..811c6042ed93 100644
--- a/usr.sbin/bsdconfig/networking/share/hostname.subr
+++ b/usr.sbin/bsdconfig/networking/share/hostname.subr
@@ -24,7 +24,6 @@ if [ ! "$_NETWORKING_HOSTNAME_SUBR" ]; then _NETWORKING_HOSTNAME_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/networking/share/ipaddr.subr b/usr.sbin/bsdconfig/networking/share/ipaddr.subr
index b7624cc792d4..1b959fc16765 100644
--- a/usr.sbin/bsdconfig/networking/share/ipaddr.subr
+++ b/usr.sbin/bsdconfig/networking/share/ipaddr.subr
@@ -24,7 +24,6 @@ if [ ! "$_NETWORKING_IPADDR_SUBR" ]; then _NETWORKING_IPADDR_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/networking/share/media.subr b/usr.sbin/bsdconfig/networking/share/media.subr
index 028944b5eb6b..8ecb25e4d1d1 100644
--- a/usr.sbin/bsdconfig/networking/share/media.subr
+++ b/usr.sbin/bsdconfig/networking/share/media.subr
@@ -24,7 +24,6 @@ if [ ! "$_NETWORKING_MEDIA_SUBR" ]; then _NETWORKING_MEDIA_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/networking/share/netmask.subr b/usr.sbin/bsdconfig/networking/share/netmask.subr
index a7d44a55e00a..ba0c5e906565 100644
--- a/usr.sbin/bsdconfig/networking/share/netmask.subr
+++ b/usr.sbin/bsdconfig/networking/share/netmask.subr
@@ -24,7 +24,6 @@ if [ ! "$_NETWORKING_NETMASK_SUBR" ]; then _NETWORKING_NETMASK_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/networking/share/resolv.subr b/usr.sbin/bsdconfig/networking/share/resolv.subr
index 779863c9981d..056a665ce607 100644
--- a/usr.sbin/bsdconfig/networking/share/resolv.subr
+++ b/usr.sbin/bsdconfig/networking/share/resolv.subr
@@ -24,7 +24,6 @@ if [ ! "$_NETWORKING_RESOLV_SUBR" ]; then _NETWORKING_RESOLV_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/networking/share/routing.subr b/usr.sbin/bsdconfig/networking/share/routing.subr
index 826ac6e10baf..9632af6b0139 100644
--- a/usr.sbin/bsdconfig/networking/share/routing.subr
+++ b/usr.sbin/bsdconfig/networking/share/routing.subr
@@ -24,7 +24,6 @@ if [ ! "$_NETWORKING_ROUTING_SUBR" ]; then _NETWORKING_ROUTING_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/networking/share/services.subr b/usr.sbin/bsdconfig/networking/share/services.subr
index 246d8956e322..263be6dc41ae 100644
--- a/usr.sbin/bsdconfig/networking/share/services.subr
+++ b/usr.sbin/bsdconfig/networking/share/services.subr
@@ -24,7 +24,6 @@ if [ ! "$_NETWORKING_SERVICES_SUBR" ]; then _NETWORKING_SERVICES_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/networking/wlanconfig b/usr.sbin/bsdconfig/networking/wlanconfig
index 989bb794fb8e..72d530ea0a6d 100755
--- a/usr.sbin/bsdconfig/networking/wlanconfig
+++ b/usr.sbin/bsdconfig/networking/wlanconfig
@@ -26,7 +26,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/packages/INDEX b/usr.sbin/bsdconfig/packages/INDEX
index 80434779f202..414eb0a57e82 100644
--- a/usr.sbin/bsdconfig/packages/INDEX
+++ b/usr.sbin/bsdconfig/packages/INDEX
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Title that will be shown in the bsdconfig menu.
diff --git a/usr.sbin/bsdconfig/packages/Makefile b/usr.sbin/bsdconfig/packages/Makefile
index fa5bd302c6d7..e5d4796de5fa 100644
--- a/usr.sbin/bsdconfig/packages/Makefile
+++ b/usr.sbin/bsdconfig/packages/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= include
diff --git a/usr.sbin/bsdconfig/packages/Makefile.depend b/usr.sbin/bsdconfig/packages/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/packages/Makefile.depend
+++ b/usr.sbin/bsdconfig/packages/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/packages/USAGE b/usr.sbin/bsdconfig/packages/USAGE
index 5f99b3826454..1a460cb97054 100644
--- a/usr.sbin/bsdconfig/packages/USAGE
+++ b/usr.sbin/bsdconfig/packages/USAGE
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
Usage: bsdconfig @PROGRAM_NAME@ [OPTIONS]
diff --git a/usr.sbin/bsdconfig/packages/include/Makefile b/usr.sbin/bsdconfig/packages/include/Makefile
index 3d30fd2b4a5f..80fe431c56f3 100644
--- a/usr.sbin/bsdconfig/packages/include/Makefile
+++ b/usr.sbin/bsdconfig/packages/include/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${LIBEXECDIR}/bsdconfig/030.packages/include
FILES= messages.subr
diff --git a/usr.sbin/bsdconfig/packages/include/Makefile.depend b/usr.sbin/bsdconfig/packages/include/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/packages/include/Makefile.depend
+++ b/usr.sbin/bsdconfig/packages/include/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/packages/include/messages.subr b/usr.sbin/bsdconfig/packages/include/messages.subr
index 8e945acc8ab6..d9348d1a38e3 100755
--- a/usr.sbin/bsdconfig/packages/include/messages.subr
+++ b/usr.sbin/bsdconfig/packages/include/messages.subr
@@ -22,6 +22,5 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
msg_package_selection="Package Selection"
diff --git a/usr.sbin/bsdconfig/packages/packages b/usr.sbin/bsdconfig/packages/packages
index ec429f282462..9228ff9f59af 100755
--- a/usr.sbin/bsdconfig/packages/packages
+++ b/usr.sbin/bsdconfig/packages/packages
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/password/INDEX b/usr.sbin/bsdconfig/password/INDEX
index 10f23db67b0b..29432bc7392c 100644
--- a/usr.sbin/bsdconfig/password/INDEX
+++ b/usr.sbin/bsdconfig/password/INDEX
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Title that will be shown in the bsdconfig menu.
diff --git a/usr.sbin/bsdconfig/password/Makefile b/usr.sbin/bsdconfig/password/Makefile
index d660e452a659..d31ca8a906be 100644
--- a/usr.sbin/bsdconfig/password/Makefile
+++ b/usr.sbin/bsdconfig/password/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= include share
diff --git a/usr.sbin/bsdconfig/password/Makefile.depend b/usr.sbin/bsdconfig/password/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/password/Makefile.depend
+++ b/usr.sbin/bsdconfig/password/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/password/USAGE b/usr.sbin/bsdconfig/password/USAGE
index a06d8af24928..66793a155c5c 100644
--- a/usr.sbin/bsdconfig/password/USAGE
+++ b/usr.sbin/bsdconfig/password/USAGE
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
Usage: bsdconfig @PROGRAM_NAME@ [OPTIONS]
diff --git a/usr.sbin/bsdconfig/password/include/Makefile b/usr.sbin/bsdconfig/password/include/Makefile
index a146eb230ae9..530a41bdc326 100644
--- a/usr.sbin/bsdconfig/password/include/Makefile
+++ b/usr.sbin/bsdconfig/password/include/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${LIBEXECDIR}/bsdconfig/040.password/include
FILES= messages.subr
diff --git a/usr.sbin/bsdconfig/password/include/Makefile.depend b/usr.sbin/bsdconfig/password/include/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/password/include/Makefile.depend
+++ b/usr.sbin/bsdconfig/password/include/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/password/include/messages.subr b/usr.sbin/bsdconfig/password/include/messages.subr
index 655160de0724..455419dd0936 100644
--- a/usr.sbin/bsdconfig/password/include/messages.subr
+++ b/usr.sbin/bsdconfig/password/include/messages.subr
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
hline_alnum_punc_tab_enter="Use alpha-numeric, punctuation, TAB or ENTER"
msg_cancel="Cancel"
diff --git a/usr.sbin/bsdconfig/password/password b/usr.sbin/bsdconfig/password/password
index b73a8d0936f0..14f5fabbc2b0 100755
--- a/usr.sbin/bsdconfig/password/password
+++ b/usr.sbin/bsdconfig/password/password
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/password/share/Makefile b/usr.sbin/bsdconfig/password/share/Makefile
index 65f9e8c5c0f1..49edf9ae212e 100644
--- a/usr.sbin/bsdconfig/password/share/Makefile
+++ b/usr.sbin/bsdconfig/password/share/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${SHAREDIR}/bsdconfig/password
FILES= password.subr
diff --git a/usr.sbin/bsdconfig/password/share/Makefile.depend b/usr.sbin/bsdconfig/password/share/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/password/share/Makefile.depend
+++ b/usr.sbin/bsdconfig/password/share/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/password/share/password.subr b/usr.sbin/bsdconfig/password/share/password.subr
index 22803394fc30..2ae3ea275f8b 100644
--- a/usr.sbin/bsdconfig/password/share/password.subr
+++ b/usr.sbin/bsdconfig/password/share/password.subr
@@ -24,7 +24,6 @@ if [ ! "$_PASSWORD_PASSWORD_SUBR" ]; then _PASSWORD_PASSWORD_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/security/INDEX b/usr.sbin/bsdconfig/security/INDEX
index 9e7718690622..e286af7f81b5 100644
--- a/usr.sbin/bsdconfig/security/INDEX
+++ b/usr.sbin/bsdconfig/security/INDEX
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Title that will be shown in the bsdconfig menu.
diff --git a/usr.sbin/bsdconfig/security/Makefile b/usr.sbin/bsdconfig/security/Makefile
index af83cee47158..46742f93ba67 100644
--- a/usr.sbin/bsdconfig/security/Makefile
+++ b/usr.sbin/bsdconfig/security/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= include
diff --git a/usr.sbin/bsdconfig/security/Makefile.depend b/usr.sbin/bsdconfig/security/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/security/Makefile.depend
+++ b/usr.sbin/bsdconfig/security/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/security/USAGE b/usr.sbin/bsdconfig/security/USAGE
index a06d8af24928..66793a155c5c 100644
--- a/usr.sbin/bsdconfig/security/USAGE
+++ b/usr.sbin/bsdconfig/security/USAGE
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
Usage: bsdconfig @PROGRAM_NAME@ [OPTIONS]
diff --git a/usr.sbin/bsdconfig/security/include/Makefile b/usr.sbin/bsdconfig/security/include/Makefile
index 2efcc0f8a399..55a9ec018b00 100644
--- a/usr.sbin/bsdconfig/security/include/Makefile
+++ b/usr.sbin/bsdconfig/security/include/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${LIBEXECDIR}/bsdconfig/130.security/include
FILES= messages.subr securelevel.hlp
diff --git a/usr.sbin/bsdconfig/security/include/Makefile.depend b/usr.sbin/bsdconfig/security/include/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/security/include/Makefile.depend
+++ b/usr.sbin/bsdconfig/security/include/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/security/include/messages.subr b/usr.sbin/bsdconfig/security/include/messages.subr
index f6df66751881..5074b7f2e91c 100644
--- a/usr.sbin/bsdconfig/security/include/messages.subr
+++ b/usr.sbin/bsdconfig/security/include/messages.subr
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
hline_arrows_tab_enter="Press arrows, TAB or ENTER"
hline_select_securelevel_to_operate_at="Select a securelevel to operate at"
diff --git a/usr.sbin/bsdconfig/security/kern_securelevel b/usr.sbin/bsdconfig/security/kern_securelevel
index 9aa79b7de8f7..353e09fb4f37 100755
--- a/usr.sbin/bsdconfig/security/kern_securelevel
+++ b/usr.sbin/bsdconfig/security/kern_securelevel
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/security/security b/usr.sbin/bsdconfig/security/security
index e045ad8a2027..630108babc27 100755
--- a/usr.sbin/bsdconfig/security/security
+++ b/usr.sbin/bsdconfig/security/security
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/Makefile b/usr.sbin/bsdconfig/share/Makefile
index a09697a29d0d..69d045c6f1bc 100644
--- a/usr.sbin/bsdconfig/share/Makefile
+++ b/usr.sbin/bsdconfig/share/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= media packages
diff --git a/usr.sbin/bsdconfig/share/Makefile.depend b/usr.sbin/bsdconfig/share/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/share/Makefile.depend
+++ b/usr.sbin/bsdconfig/share/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/share/common.subr b/usr.sbin/bsdconfig/share/common.subr
index 49b9186f548f..250046cc5436 100644
--- a/usr.sbin/bsdconfig/share/common.subr
+++ b/usr.sbin/bsdconfig/share/common.subr
@@ -25,7 +25,6 @@ if [ ! "$_COMMON_SUBR" ]; then _COMMON_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ CONFIGURATION
diff --git a/usr.sbin/bsdconfig/share/device.subr b/usr.sbin/bsdconfig/share/device.subr
index 97e878424703..c60ad303acfc 100644
--- a/usr.sbin/bsdconfig/share/device.subr
+++ b/usr.sbin/bsdconfig/share/device.subr
@@ -24,7 +24,6 @@ if [ ! "$_DEVICE_SUBR" ]; then _DEVICE_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/dialog.subr b/usr.sbin/bsdconfig/share/dialog.subr
index 5b5c8a32984e..5b7ae9123073 100644
--- a/usr.sbin/bsdconfig/share/dialog.subr
+++ b/usr.sbin/bsdconfig/share/dialog.subr
@@ -24,7 +24,6 @@ if [ ! "$_DIALOG_SUBR" ]; then _DIALOG_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/geom.subr b/usr.sbin/bsdconfig/share/geom.subr
index d6486c6d6543..fda918f920f9 100644
--- a/usr.sbin/bsdconfig/share/geom.subr
+++ b/usr.sbin/bsdconfig/share/geom.subr
@@ -24,7 +24,6 @@ if [ ! "$_GEOM_SUBR" ]; then _GEOM_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/keymap.subr b/usr.sbin/bsdconfig/share/keymap.subr
index ca6f3c8df841..7a159199c6fd 100644
--- a/usr.sbin/bsdconfig/share/keymap.subr
+++ b/usr.sbin/bsdconfig/share/keymap.subr
@@ -24,7 +24,6 @@ if [ ! "$_KEYMAP_SUBR" ]; then _KEYMAP_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/media/Makefile b/usr.sbin/bsdconfig/share/media/Makefile
index e8ec319a0ae4..d6b77d96ee7f 100644
--- a/usr.sbin/bsdconfig/share/media/Makefile
+++ b/usr.sbin/bsdconfig/share/media/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${SHAREDIR}/bsdconfig/media
FILES= any.subr cdrom.subr common.subr directory.subr dos.subr \
diff --git a/usr.sbin/bsdconfig/share/media/Makefile.depend b/usr.sbin/bsdconfig/share/media/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/share/media/Makefile.depend
+++ b/usr.sbin/bsdconfig/share/media/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/share/media/any.subr b/usr.sbin/bsdconfig/share/media/any.subr
index 516d2d2bd4ba..d98f58567bfa 100644
--- a/usr.sbin/bsdconfig/share/media/any.subr
+++ b/usr.sbin/bsdconfig/share/media/any.subr
@@ -24,7 +24,6 @@ if [ ! "$_MEDIA_ANY_SUBR" ]; then _MEDIA_ANY_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/media/cdrom.subr b/usr.sbin/bsdconfig/share/media/cdrom.subr
index bbbd638fec6e..acdf54af9cc3 100644
--- a/usr.sbin/bsdconfig/share/media/cdrom.subr
+++ b/usr.sbin/bsdconfig/share/media/cdrom.subr
@@ -24,7 +24,6 @@ if [ ! "$_MEDIA_CDROM_SUBR" ]; then _MEDIA_CDROM_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/media/common.subr b/usr.sbin/bsdconfig/share/media/common.subr
index 0bd420d58b38..5b932ec003e7 100644
--- a/usr.sbin/bsdconfig/share/media/common.subr
+++ b/usr.sbin/bsdconfig/share/media/common.subr
@@ -24,7 +24,6 @@ if [ ! "$_MEDIA_COMMON_SUBR" ]; then _MEDIA_COMMON_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/media/directory.subr b/usr.sbin/bsdconfig/share/media/directory.subr
index 004cb74bb07e..ca87173dae1d 100644
--- a/usr.sbin/bsdconfig/share/media/directory.subr
+++ b/usr.sbin/bsdconfig/share/media/directory.subr
@@ -24,7 +24,6 @@ if [ ! "$_MEDIA_DIRECTORY_SUBR" ]; then _MEDIA_DIRECTORY_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/media/dos.subr b/usr.sbin/bsdconfig/share/media/dos.subr
index df91aebcd814..802d9e46ac3b 100644
--- a/usr.sbin/bsdconfig/share/media/dos.subr
+++ b/usr.sbin/bsdconfig/share/media/dos.subr
@@ -24,7 +24,6 @@ if [ ! "$_MEDIA_DOS_SUBR" ]; then _MEDIA_DOS_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/media/floppy.subr b/usr.sbin/bsdconfig/share/media/floppy.subr
index bf402e533d33..ae17ee27f282 100644
--- a/usr.sbin/bsdconfig/share/media/floppy.subr
+++ b/usr.sbin/bsdconfig/share/media/floppy.subr
@@ -24,7 +24,6 @@ if [ ! "$_MEDIA_FLOPPY_SUBR" ]; then _MEDIA_FLOPPY_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/media/ftp.subr b/usr.sbin/bsdconfig/share/media/ftp.subr
index fb2579f59f89..f7be354d0c98 100644
--- a/usr.sbin/bsdconfig/share/media/ftp.subr
+++ b/usr.sbin/bsdconfig/share/media/ftp.subr
@@ -24,7 +24,6 @@ if [ ! "$_MEDIA_FTP_SUBR" ]; then _MEDIA_FTP_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/media/http.subr b/usr.sbin/bsdconfig/share/media/http.subr
index b928f7d6a78f..c4b1b131d236 100644
--- a/usr.sbin/bsdconfig/share/media/http.subr
+++ b/usr.sbin/bsdconfig/share/media/http.subr
@@ -24,7 +24,6 @@ if [ ! "$_MEDIA_HTTP_SUBR" ]; then _MEDIA_HTTP_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/media/httpproxy.subr b/usr.sbin/bsdconfig/share/media/httpproxy.subr
index 1ef516f76463..b49a6bfb7901 100644
--- a/usr.sbin/bsdconfig/share/media/httpproxy.subr
+++ b/usr.sbin/bsdconfig/share/media/httpproxy.subr
@@ -24,7 +24,6 @@ if [ ! "$_MEDIA_HTTPPROXY_SUBR" ]; then _MEDIA_HTTPPROXY_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/media/network.subr b/usr.sbin/bsdconfig/share/media/network.subr
index 5a03d80e8163..7d0e757b1cdb 100644
--- a/usr.sbin/bsdconfig/share/media/network.subr
+++ b/usr.sbin/bsdconfig/share/media/network.subr
@@ -24,7 +24,6 @@ if [ ! "$_MEDIA_NETWORK_SUBR" ]; then _MEDIA_NETWORK_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/media/nfs.subr b/usr.sbin/bsdconfig/share/media/nfs.subr
index d83661f46b69..8c9f8c627433 100644
--- a/usr.sbin/bsdconfig/share/media/nfs.subr
+++ b/usr.sbin/bsdconfig/share/media/nfs.subr
@@ -24,7 +24,6 @@ if [ ! "$_MEDIA_NFS_SUBR" ]; then _MEDIA_NFS_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/media/options.subr b/usr.sbin/bsdconfig/share/media/options.subr
index bc9568e65102..340619a50ac1 100644
--- a/usr.sbin/bsdconfig/share/media/options.subr
+++ b/usr.sbin/bsdconfig/share/media/options.subr
@@ -24,7 +24,6 @@ if [ ! "$_MEDIA_OPTIONS_SUBR" ]; then _MEDIA_OPTIONS_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/media/tcpip.subr b/usr.sbin/bsdconfig/share/media/tcpip.subr
index d149bc6036d1..9a08c739f2c5 100644
--- a/usr.sbin/bsdconfig/share/media/tcpip.subr
+++ b/usr.sbin/bsdconfig/share/media/tcpip.subr
@@ -24,7 +24,6 @@ if [ ! "$_MEDIA_TCPIP_SUBR" ]; then _MEDIA_TCPIP_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/media/ufs.subr b/usr.sbin/bsdconfig/share/media/ufs.subr
index 27e2f275b182..5d30d9a02d2e 100644
--- a/usr.sbin/bsdconfig/share/media/ufs.subr
+++ b/usr.sbin/bsdconfig/share/media/ufs.subr
@@ -24,7 +24,6 @@ if [ ! "$_MEDIA_UFS_SUBR" ]; then _MEDIA_UFS_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/media/usb.subr b/usr.sbin/bsdconfig/share/media/usb.subr
index 5ee9bc043800..99efac236a29 100644
--- a/usr.sbin/bsdconfig/share/media/usb.subr
+++ b/usr.sbin/bsdconfig/share/media/usb.subr
@@ -24,7 +24,6 @@ if [ ! "$_MEDIA_USB_SUBR" ]; then _MEDIA_USB_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/media/wlan.subr b/usr.sbin/bsdconfig/share/media/wlan.subr
index f25cddff94cd..3c7833778e08 100644
--- a/usr.sbin/bsdconfig/share/media/wlan.subr
+++ b/usr.sbin/bsdconfig/share/media/wlan.subr
@@ -24,7 +24,6 @@ if [ ! "$_MEDIA_WLAN_SUBR" ]; then _MEDIA_WLAN_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/mustberoot.subr b/usr.sbin/bsdconfig/share/mustberoot.subr
index 88ff81868d45..000e6cfb2c6f 100644
--- a/usr.sbin/bsdconfig/share/mustberoot.subr
+++ b/usr.sbin/bsdconfig/share/mustberoot.subr
@@ -24,7 +24,6 @@ if [ ! "$_MUSTBEROOT_SUBR" ]; then _MUSTBEROOT_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/packages/Makefile b/usr.sbin/bsdconfig/share/packages/Makefile
index bc0e59ad63cd..e694bf4157cf 100644
--- a/usr.sbin/bsdconfig/share/packages/Makefile
+++ b/usr.sbin/bsdconfig/share/packages/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${SHAREDIR}/bsdconfig/packages
FILES= categories.subr index.subr musthavepkg.subr packages.subr
diff --git a/usr.sbin/bsdconfig/share/packages/Makefile.depend b/usr.sbin/bsdconfig/share/packages/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/share/packages/Makefile.depend
+++ b/usr.sbin/bsdconfig/share/packages/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/share/packages/categories.subr b/usr.sbin/bsdconfig/share/packages/categories.subr
index 474c41d948ed..96abaef7f16e 100644
--- a/usr.sbin/bsdconfig/share/packages/categories.subr
+++ b/usr.sbin/bsdconfig/share/packages/categories.subr
@@ -24,7 +24,6 @@ if [ ! "$_PACKAGES_CATEGORIES_SUBR" ]; then _PACKAGES_CATEGORIES_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/packages/index.subr b/usr.sbin/bsdconfig/share/packages/index.subr
index 95260da0de05..dd432adf6adf 100644
--- a/usr.sbin/bsdconfig/share/packages/index.subr
+++ b/usr.sbin/bsdconfig/share/packages/index.subr
@@ -24,7 +24,6 @@ if [ ! "$_PACKAGES_INDEX_SUBR" ]; then _PACKAGES_INDEX_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/packages/musthavepkg.subr b/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
index b336d26d9c2e..9b5d94675345 100644
--- a/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
+++ b/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
@@ -24,7 +24,6 @@ if [ ! "$_PACKAGES_MUSTHAVEPKG_SUBR" ]; then _PACKAGES_MUSTHAVEPKG_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/packages/packages.subr b/usr.sbin/bsdconfig/share/packages/packages.subr
index a22edd8bbb27..554e7f9bb9e0 100644
--- a/usr.sbin/bsdconfig/share/packages/packages.subr
+++ b/usr.sbin/bsdconfig/share/packages/packages.subr
@@ -24,7 +24,6 @@ if [ ! "$_PACKAGES_PACKAGES_SUBR" ]; then _PACKAGES_PACKAGES_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/script.subr b/usr.sbin/bsdconfig/share/script.subr
index b562e99b7303..feac3b47bdef 100644
--- a/usr.sbin/bsdconfig/share/script.subr
+++ b/usr.sbin/bsdconfig/share/script.subr
@@ -24,7 +24,6 @@ if [ ! "$_SCRIPT_SUBR" ]; then _SCRIPT_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/strings.subr b/usr.sbin/bsdconfig/share/strings.subr
index f33f4df566ad..b926e8cd2c91 100644
--- a/usr.sbin/bsdconfig/share/strings.subr
+++ b/usr.sbin/bsdconfig/share/strings.subr
@@ -24,7 +24,6 @@ if [ ! "$_STRINGS_SUBR" ]; then _STRINGS_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/struct.subr b/usr.sbin/bsdconfig/share/struct.subr
index 78c785fc2b51..87e00e1c8e01 100644
--- a/usr.sbin/bsdconfig/share/struct.subr
+++ b/usr.sbin/bsdconfig/share/struct.subr
@@ -24,7 +24,6 @@ if [ ! "$_STRUCT_SUBR" ]; then _STRUCT_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/sysrc.subr b/usr.sbin/bsdconfig/share/sysrc.subr
index 11298f00f47a..5d2a3cd97f7c 100644
--- a/usr.sbin/bsdconfig/share/sysrc.subr
+++ b/usr.sbin/bsdconfig/share/sysrc.subr
@@ -24,7 +24,6 @@ if [ ! "$_SYSRC_SUBR" ]; then _SYSRC_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/share/variable.subr b/usr.sbin/bsdconfig/share/variable.subr
index c453f674ee57..e5e96a686f05 100644
--- a/usr.sbin/bsdconfig/share/variable.subr
+++ b/usr.sbin/bsdconfig/share/variable.subr
@@ -24,7 +24,6 @@ if [ ! "$_VARIABLE_SUBR" ]; then _VARIABLE_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/startup/INDEX b/usr.sbin/bsdconfig/startup/INDEX
index afad3483313a..28bb14edcb2a 100644
--- a/usr.sbin/bsdconfig/startup/INDEX
+++ b/usr.sbin/bsdconfig/startup/INDEX
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Title that will be shown in the bsdconfig menu.
diff --git a/usr.sbin/bsdconfig/startup/Makefile b/usr.sbin/bsdconfig/startup/Makefile
index 62a9e7141efc..b9fd43a101e2 100644
--- a/usr.sbin/bsdconfig/startup/Makefile
+++ b/usr.sbin/bsdconfig/startup/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= include share
diff --git a/usr.sbin/bsdconfig/startup/Makefile.depend b/usr.sbin/bsdconfig/startup/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/startup/Makefile.depend
+++ b/usr.sbin/bsdconfig/startup/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/startup/USAGE b/usr.sbin/bsdconfig/startup/USAGE
index a06d8af24928..66793a155c5c 100644
--- a/usr.sbin/bsdconfig/startup/USAGE
+++ b/usr.sbin/bsdconfig/startup/USAGE
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
Usage: bsdconfig @PROGRAM_NAME@ [OPTIONS]
diff --git a/usr.sbin/bsdconfig/startup/include/Makefile b/usr.sbin/bsdconfig/startup/include/Makefile
index aab9842035cc..7edef4f2406f 100644
--- a/usr.sbin/bsdconfig/startup/include/Makefile
+++ b/usr.sbin/bsdconfig/startup/include/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${LIBEXECDIR}/bsdconfig/140.startup/include
FILES= messages.subr
diff --git a/usr.sbin/bsdconfig/startup/include/Makefile.depend b/usr.sbin/bsdconfig/startup/include/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/startup/include/Makefile.depend
+++ b/usr.sbin/bsdconfig/startup/include/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/startup/include/messages.subr b/usr.sbin/bsdconfig/startup/include/messages.subr
index 66b8bf6c731d..ed5e79741739 100644
--- a/usr.sbin/bsdconfig/startup/include/messages.subr
+++ b/usr.sbin/bsdconfig/startup/include/messages.subr
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
hline_alnum_punc_tab_enter="Use alpha-numeric, punctuation, TAB or ENTER"
hline_arrows_tab_enter="Press arrows, TAB or ENTER"
diff --git a/usr.sbin/bsdconfig/startup/misc b/usr.sbin/bsdconfig/startup/misc
index 24638bfe7e2c..91d18ccead3f 100755
--- a/usr.sbin/bsdconfig/startup/misc
+++ b/usr.sbin/bsdconfig/startup/misc
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/startup/rcadd b/usr.sbin/bsdconfig/startup/rcadd
index 7b536c2be9c5..8286586222ff 100755
--- a/usr.sbin/bsdconfig/startup/rcadd
+++ b/usr.sbin/bsdconfig/startup/rcadd
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/startup/rcconf b/usr.sbin/bsdconfig/startup/rcconf
index 6a6247b818e4..5b9770b9cc70 100755
--- a/usr.sbin/bsdconfig/startup/rcconf
+++ b/usr.sbin/bsdconfig/startup/rcconf
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/startup/rcdelete b/usr.sbin/bsdconfig/startup/rcdelete
index ccc15ba3380f..1ce41c53a113 100755
--- a/usr.sbin/bsdconfig/startup/rcdelete
+++ b/usr.sbin/bsdconfig/startup/rcdelete
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/startup/rcedit b/usr.sbin/bsdconfig/startup/rcedit
index 54061b54e0ad..63a89533a991 100755
--- a/usr.sbin/bsdconfig/startup/rcedit
+++ b/usr.sbin/bsdconfig/startup/rcedit
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/startup/rcvar b/usr.sbin/bsdconfig/startup/rcvar
index ddca9066e6e3..5e6b89c8070d 100755
--- a/usr.sbin/bsdconfig/startup/rcvar
+++ b/usr.sbin/bsdconfig/startup/rcvar
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/startup/share/Makefile b/usr.sbin/bsdconfig/startup/share/Makefile
index 134914cb0880..b58fbf2f53a8 100644
--- a/usr.sbin/bsdconfig/startup/share/Makefile
+++ b/usr.sbin/bsdconfig/startup/share/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${SHAREDIR}/bsdconfig/startup
FILES= rcconf.subr rcedit.subr rcvar.subr
diff --git a/usr.sbin/bsdconfig/startup/share/Makefile.depend b/usr.sbin/bsdconfig/startup/share/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/startup/share/Makefile.depend
+++ b/usr.sbin/bsdconfig/startup/share/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/startup/share/rcconf.subr b/usr.sbin/bsdconfig/startup/share/rcconf.subr
index 80b6504994cc..71ca6f2fbf71 100644
--- a/usr.sbin/bsdconfig/startup/share/rcconf.subr
+++ b/usr.sbin/bsdconfig/startup/share/rcconf.subr
@@ -24,7 +24,6 @@ if [ ! "$_STARTUP_RCCONF_SUBR" ]; then _STARTUP_RCCONF_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/startup/share/rcedit.subr b/usr.sbin/bsdconfig/startup/share/rcedit.subr
index 1adca477ebf4..a5436e7389e5 100644
--- a/usr.sbin/bsdconfig/startup/share/rcedit.subr
+++ b/usr.sbin/bsdconfig/startup/share/rcedit.subr
@@ -24,7 +24,6 @@ if [ ! "$_STARTUP_RCEDIT_SUBR" ]; then _STARTUP_RCEDIT_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/startup/share/rcvar.subr b/usr.sbin/bsdconfig/startup/share/rcvar.subr
index c1a6ff2443e2..6b9665e5d47c 100644
--- a/usr.sbin/bsdconfig/startup/share/rcvar.subr
+++ b/usr.sbin/bsdconfig/startup/share/rcvar.subr
@@ -24,7 +24,6 @@ if [ ! "$_STARTUP_RCVAR_SUBR" ]; then _STARTUP_RCVAR_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/startup/startup b/usr.sbin/bsdconfig/startup/startup
index 17755d120852..458a01d26f3b 100755
--- a/usr.sbin/bsdconfig/startup/startup
+++ b/usr.sbin/bsdconfig/startup/startup
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/timezone/INDEX b/usr.sbin/bsdconfig/timezone/INDEX
index 67fc50b0dcb6..50ac8174d442 100644
--- a/usr.sbin/bsdconfig/timezone/INDEX
+++ b/usr.sbin/bsdconfig/timezone/INDEX
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Title that will be shown in the bsdconfig menu.
diff --git a/usr.sbin/bsdconfig/timezone/Makefile b/usr.sbin/bsdconfig/timezone/Makefile
index 1569e7e49569..4d01453e4ce7 100644
--- a/usr.sbin/bsdconfig/timezone/Makefile
+++ b/usr.sbin/bsdconfig/timezone/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= include share
diff --git a/usr.sbin/bsdconfig/timezone/Makefile.depend b/usr.sbin/bsdconfig/timezone/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/timezone/Makefile.depend
+++ b/usr.sbin/bsdconfig/timezone/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/timezone/USAGE b/usr.sbin/bsdconfig/timezone/USAGE
index 6dbe96d3997d..6a0765e673b6 100644
--- a/usr.sbin/bsdconfig/timezone/USAGE
+++ b/usr.sbin/bsdconfig/timezone/USAGE
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
Usage: bsdconfig @PROGRAM_NAME@ [-ehnrSsvX] [-C chroot_dir] [zinfo_file | zinfo_name]
OPTIONS:
diff --git a/usr.sbin/bsdconfig/timezone/include/Makefile b/usr.sbin/bsdconfig/timezone/include/Makefile
index 8fc6dfc84535..1137f01da109 100644
--- a/usr.sbin/bsdconfig/timezone/include/Makefile
+++ b/usr.sbin/bsdconfig/timezone/include/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${LIBEXECDIR}/bsdconfig/090.timezone/include
FILES= messages.subr
diff --git a/usr.sbin/bsdconfig/timezone/include/Makefile.depend b/usr.sbin/bsdconfig/timezone/include/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/timezone/include/Makefile.depend
+++ b/usr.sbin/bsdconfig/timezone/include/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/timezone/include/messages.subr b/usr.sbin/bsdconfig/timezone/include/messages.subr
index 6a7f045cd4f2..a37e5a43c17c 100644
--- a/usr.sbin/bsdconfig/timezone/include/messages.subr
+++ b/usr.sbin/bsdconfig/timezone/include/messages.subr
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
continent_africa_title="Africa"
continent_america_title="America -- North and South"
diff --git a/usr.sbin/bsdconfig/timezone/share/Makefile b/usr.sbin/bsdconfig/timezone/share/Makefile
index 166fb1020d29..1a9557a1c101 100644
--- a/usr.sbin/bsdconfig/timezone/share/Makefile
+++ b/usr.sbin/bsdconfig/timezone/share/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${SHAREDIR}/bsdconfig/timezone
FILES= continents.subr countries.subr iso3166.subr menus.subr \
diff --git a/usr.sbin/bsdconfig/timezone/share/Makefile.depend b/usr.sbin/bsdconfig/timezone/share/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/timezone/share/Makefile.depend
+++ b/usr.sbin/bsdconfig/timezone/share/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/timezone/share/continents.subr b/usr.sbin/bsdconfig/timezone/share/continents.subr
index 764f33fc6c50..8cdf4bf1645d 100644
--- a/usr.sbin/bsdconfig/timezone/share/continents.subr
+++ b/usr.sbin/bsdconfig/timezone/share/continents.subr
@@ -24,7 +24,6 @@ if [ ! "$_TIMEZONE_CONTINENTS_SUBR" ]; then _TIMEZONE_CONTINENTS_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/timezone/share/countries.subr b/usr.sbin/bsdconfig/timezone/share/countries.subr
index 8958e877c3d8..1eaf34354736 100644
--- a/usr.sbin/bsdconfig/timezone/share/countries.subr
+++ b/usr.sbin/bsdconfig/timezone/share/countries.subr
@@ -24,7 +24,6 @@ if [ ! "$_TIMEZONE_COUNTRIES_SUBR" ]; then _TIMEZONE_COUNTRIES_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ FUNCTIONS
diff --git a/usr.sbin/bsdconfig/timezone/share/iso3166.subr b/usr.sbin/bsdconfig/timezone/share/iso3166.subr
index 205d5f5046fd..d68ed141b19d 100644
--- a/usr.sbin/bsdconfig/timezone/share/iso3166.subr
+++ b/usr.sbin/bsdconfig/timezone/share/iso3166.subr
@@ -24,7 +24,6 @@ if [ ! "$_TIMEZONE_ISO3166_SUBR" ]; then _TIMEZONE_ISO3166_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/timezone/share/menus.subr b/usr.sbin/bsdconfig/timezone/share/menus.subr
index ef3979be49a5..268945a73a59 100644
--- a/usr.sbin/bsdconfig/timezone/share/menus.subr
+++ b/usr.sbin/bsdconfig/timezone/share/menus.subr
@@ -24,7 +24,6 @@ if [ ! "$_TIMEZONE_MENUS_SUBR" ]; then _TIMEZONE_MENUS_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/timezone/share/zones.subr b/usr.sbin/bsdconfig/timezone/share/zones.subr
index 59a933013e57..4cad5ef02425 100644
--- a/usr.sbin/bsdconfig/timezone/share/zones.subr
+++ b/usr.sbin/bsdconfig/timezone/share/zones.subr
@@ -24,7 +24,6 @@ if [ ! "$_TIMEZONE_ZONES_SUBR" ]; then _TIMEZONE_ZONES_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/timezone/timezone b/usr.sbin/bsdconfig/timezone/timezone
index a2914429846e..93cb7a8ec153 100755
--- a/usr.sbin/bsdconfig/timezone/timezone
+++ b/usr.sbin/bsdconfig/timezone/timezone
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/ttys/INDEX b/usr.sbin/bsdconfig/ttys/INDEX
index 83ca0211bd80..64d3304cfcd5 100644
--- a/usr.sbin/bsdconfig/ttys/INDEX
+++ b/usr.sbin/bsdconfig/ttys/INDEX
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Title that will be shown in the bsdconfig menu.
diff --git a/usr.sbin/bsdconfig/ttys/Makefile b/usr.sbin/bsdconfig/ttys/Makefile
index 044fdcf8ca7b..c9e1081c99e0 100644
--- a/usr.sbin/bsdconfig/ttys/Makefile
+++ b/usr.sbin/bsdconfig/ttys/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= include
diff --git a/usr.sbin/bsdconfig/ttys/Makefile.depend b/usr.sbin/bsdconfig/ttys/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/ttys/Makefile.depend
+++ b/usr.sbin/bsdconfig/ttys/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/ttys/USAGE b/usr.sbin/bsdconfig/ttys/USAGE
index a06d8af24928..66793a155c5c 100644
--- a/usr.sbin/bsdconfig/ttys/USAGE
+++ b/usr.sbin/bsdconfig/ttys/USAGE
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
Usage: bsdconfig @PROGRAM_NAME@ [OPTIONS]
diff --git a/usr.sbin/bsdconfig/ttys/include/Makefile b/usr.sbin/bsdconfig/ttys/include/Makefile
index 45c72adf4f13..df8b5c262684 100644
--- a/usr.sbin/bsdconfig/ttys/include/Makefile
+++ b/usr.sbin/bsdconfig/ttys/include/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${LIBEXECDIR}/bsdconfig/150.ttys/include
FILES= messages.subr
diff --git a/usr.sbin/bsdconfig/ttys/include/Makefile.depend b/usr.sbin/bsdconfig/ttys/include/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/ttys/include/Makefile.depend
+++ b/usr.sbin/bsdconfig/ttys/include/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/ttys/include/messages.subr b/usr.sbin/bsdconfig/ttys/include/messages.subr
index 296f75602f71..944f5e0fc3a0 100644
--- a/usr.sbin/bsdconfig/ttys/include/messages.subr
+++ b/usr.sbin/bsdconfig/ttys/include/messages.subr
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
msg_configure_ttys="Configure TTYs"
msg_help_text="Configuration of system TTYs requires editing the /etc/ttys file.\nTypical configuration activities might include enabling getty(8)\non the first serial port to allow login via serial console after\nreboot, or to enable xdm. The default ttys file enables normal\nvirtual consoles, and most sites will not need to perform manual\nconfiguration.\n\nTo load /etc/ttys in the editor, select [Yes], otherwise, [No]."
diff --git a/usr.sbin/bsdconfig/ttys/ttys b/usr.sbin/bsdconfig/ttys/ttys
index ed7ba756b785..d751aa1daa2d 100755
--- a/usr.sbin/bsdconfig/ttys/ttys
+++ b/usr.sbin/bsdconfig/ttys/ttys
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/usermgmt/INDEX b/usr.sbin/bsdconfig/usermgmt/INDEX
index 6fc61eaa131f..b22bd1e8e3be 100644
--- a/usr.sbin/bsdconfig/usermgmt/INDEX
+++ b/usr.sbin/bsdconfig/usermgmt/INDEX
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Title that will be shown in the bsdconfig menu.
diff --git a/usr.sbin/bsdconfig/usermgmt/Makefile b/usr.sbin/bsdconfig/usermgmt/Makefile
index 127c874fbaf6..2408331a508f 100644
--- a/usr.sbin/bsdconfig/usermgmt/Makefile
+++ b/usr.sbin/bsdconfig/usermgmt/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= include share
diff --git a/usr.sbin/bsdconfig/usermgmt/Makefile.depend b/usr.sbin/bsdconfig/usermgmt/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/usermgmt/Makefile.depend
+++ b/usr.sbin/bsdconfig/usermgmt/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/usermgmt/USAGE b/usr.sbin/bsdconfig/usermgmt/USAGE
index a06d8af24928..66793a155c5c 100644
--- a/usr.sbin/bsdconfig/usermgmt/USAGE
+++ b/usr.sbin/bsdconfig/usermgmt/USAGE
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
Usage: bsdconfig @PROGRAM_NAME@ [OPTIONS]
diff --git a/usr.sbin/bsdconfig/usermgmt/groupadd b/usr.sbin/bsdconfig/usermgmt/groupadd
index cba0f2bf7533..60a714fa938c 100755
--- a/usr.sbin/bsdconfig/usermgmt/groupadd
+++ b/usr.sbin/bsdconfig/usermgmt/groupadd
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/usermgmt/groupdel b/usr.sbin/bsdconfig/usermgmt/groupdel
index ea5548970c84..491384675234 100755
--- a/usr.sbin/bsdconfig/usermgmt/groupdel
+++ b/usr.sbin/bsdconfig/usermgmt/groupdel
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/usermgmt/groupedit b/usr.sbin/bsdconfig/usermgmt/groupedit
index 2338d5732270..fb7c4d9c1b9e 100755
--- a/usr.sbin/bsdconfig/usermgmt/groupedit
+++ b/usr.sbin/bsdconfig/usermgmt/groupedit
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/usermgmt/include/Makefile b/usr.sbin/bsdconfig/usermgmt/include/Makefile
index 48396540a331..be07c74cb89b 100644
--- a/usr.sbin/bsdconfig/usermgmt/include/Makefile
+++ b/usr.sbin/bsdconfig/usermgmt/include/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${LIBEXECDIR}/bsdconfig/070.usermgmt/include
FILES= messages.subr usermgmt.hlp
diff --git a/usr.sbin/bsdconfig/usermgmt/include/Makefile.depend b/usr.sbin/bsdconfig/usermgmt/include/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/usermgmt/include/Makefile.depend
+++ b/usr.sbin/bsdconfig/usermgmt/include/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/usermgmt/include/messages.subr b/usr.sbin/bsdconfig/usermgmt/include/messages.subr
index f56b8443fbda..621cb8cf4f97 100644
--- a/usr.sbin/bsdconfig/usermgmt/include/messages.subr
+++ b/usr.sbin/bsdconfig/usermgmt/include/messages.subr
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
hline_alnum_punc_tab_enter="Use alpha-numeric, punctuation, TAB or ENTER"
hline_alnum_space_tab_enter="Use alpha-numeric, SPACE, TAB or ENTER"
diff --git a/usr.sbin/bsdconfig/usermgmt/share/Makefile b/usr.sbin/bsdconfig/usermgmt/share/Makefile
index eba7c1cf0eb6..62230e9a0d25 100644
--- a/usr.sbin/bsdconfig/usermgmt/share/Makefile
+++ b/usr.sbin/bsdconfig/usermgmt/share/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
FILESDIR= ${SHAREDIR}/bsdconfig/usermgmt
FILES= group.subr group_input.subr user.subr user_input.subr
diff --git a/usr.sbin/bsdconfig/usermgmt/share/Makefile.depend b/usr.sbin/bsdconfig/usermgmt/share/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdconfig/usermgmt/share/Makefile.depend
+++ b/usr.sbin/bsdconfig/usermgmt/share/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdconfig/usermgmt/share/group.subr b/usr.sbin/bsdconfig/usermgmt/share/group.subr
index e9c8b1637bc5..fb77938f847d 100644
--- a/usr.sbin/bsdconfig/usermgmt/share/group.subr
+++ b/usr.sbin/bsdconfig/usermgmt/share/group.subr
@@ -25,7 +25,6 @@ if [ ! "$_USERMGMT_GROUP_SUBR" ]; then _USERMGMT_GROUP_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/usermgmt/share/group_input.subr b/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
index 2e8c08647adb..0af624249f7a 100644
--- a/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
+++ b/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
@@ -25,7 +25,6 @@ if [ ! "$_USERMGMT_GROUP_INPUT_SUBR" ]; then _USERMGMT_GROUP_INPUT_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/usermgmt/share/user.subr b/usr.sbin/bsdconfig/usermgmt/share/user.subr
index 27d9d665319e..7d65264919e6 100644
--- a/usr.sbin/bsdconfig/usermgmt/share/user.subr
+++ b/usr.sbin/bsdconfig/usermgmt/share/user.subr
@@ -25,7 +25,6 @@ if [ ! "$_USERMGMT_USER_SUBR" ]; then _USERMGMT_USER_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/usermgmt/share/user_input.subr b/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
index 4f2342ab4b23..37cabb65d191 100644
--- a/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
+++ b/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
@@ -25,7 +25,6 @@ if [ ! "$_USERMGMT_USER_INPUT_SUBR" ]; then _USERMGMT_USER_INPUT_SUBR=1
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/usermgmt/useradd b/usr.sbin/bsdconfig/usermgmt/useradd
index d372be4694b8..3e8d7d2bcf95 100755
--- a/usr.sbin/bsdconfig/usermgmt/useradd
+++ b/usr.sbin/bsdconfig/usermgmt/useradd
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/usermgmt/userdel b/usr.sbin/bsdconfig/usermgmt/userdel
index 9425c7bb4244..75def79555b2 100755
--- a/usr.sbin/bsdconfig/usermgmt/userdel
+++ b/usr.sbin/bsdconfig/usermgmt/userdel
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/usermgmt/useredit b/usr.sbin/bsdconfig/usermgmt/useredit
index 612f3a653d76..5205344b97da 100755
--- a/usr.sbin/bsdconfig/usermgmt/useredit
+++ b/usr.sbin/bsdconfig/usermgmt/useredit
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdconfig/usermgmt/usermgmt b/usr.sbin/bsdconfig/usermgmt/usermgmt
index 79fbc955133c..abe30198bd3e 100755
--- a/usr.sbin/bsdconfig/usermgmt/usermgmt
+++ b/usr.sbin/bsdconfig/usermgmt/usermgmt
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile
index 88cb691d8dda..6286d945c710 100644
--- a/usr.sbin/bsdinstall/Makefile
+++ b/usr.sbin/bsdinstall/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= distextract distfetch partedit scripts
SUBDIR_PARALLEL=
diff --git a/usr.sbin/bsdinstall/Makefile.depend b/usr.sbin/bsdinstall/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdinstall/Makefile.depend
+++ b/usr.sbin/bsdinstall/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdinstall/bsdinstall b/usr.sbin/bsdinstall/bsdinstall
index 1ca03f5c9593..19e27c929aee 100755
--- a/usr.sbin/bsdinstall/bsdinstall
+++ b/usr.sbin/bsdinstall/bsdinstall
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile
index 908a60c6594a..667be9e4a77a 100644
--- a/usr.sbin/bsdinstall/distextract/Makefile
+++ b/usr.sbin/bsdinstall/distextract/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= distextract
diff --git a/usr.sbin/bsdinstall/distextract/Makefile.depend b/usr.sbin/bsdinstall/distextract/Makefile.depend
index 78020ffb2489..4cdb74d8dc86 100644
--- a/usr.sbin/bsdinstall/distextract/Makefile.depend
+++ b/usr.sbin/bsdinstall/distextract/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile
index 044b83a8a1a0..d5153edbd6db 100644
--- a/usr.sbin/bsdinstall/distfetch/Makefile
+++ b/usr.sbin/bsdinstall/distfetch/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= distfetch
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile.depend b/usr.sbin/bsdinstall/distfetch/Makefile.depend
index c1195d955ced..6ae1a3135012 100644
--- a/usr.sbin/bsdinstall/distfetch/Makefile.depend
+++ b/usr.sbin/bsdinstall/distfetch/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile
index a250302a1962..3a0ba63bdccd 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile
+++ b/usr.sbin/bsdinstall/partedit/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= partedit
diff --git a/usr.sbin/bsdinstall/partedit/Makefile.depend b/usr.sbin/bsdinstall/partedit/Makefile.depend
index 2c3bc47c6d42..f00d675b8363 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile.depend
+++ b/usr.sbin/bsdinstall/partedit/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdinstall/scripts/Makefile b/usr.sbin/bsdinstall/scripts/Makefile
index 147f49609921..48d36c19c72d 100644
--- a/usr.sbin/bsdinstall/scripts/Makefile
+++ b/usr.sbin/bsdinstall/scripts/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SCRIPTS= auto adduser bootconfig checksum config docsinstall entropy \
fetchmissingdists hardening hostname jail keymap mirrorselect mount \
diff --git a/usr.sbin/bsdinstall/scripts/Makefile.depend b/usr.sbin/bsdinstall/scripts/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsdinstall/scripts/Makefile.depend
+++ b/usr.sbin/bsdinstall/scripts/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsdinstall/scripts/adduser b/usr.sbin/bsdinstall/scripts/adduser
index 456f76b04319..9e12cbb4ab9c 100755
--- a/usr.sbin/bsdinstall/scripts/adduser
+++ b/usr.sbin/bsdinstall/scripts/adduser
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
clear
echo "FreeBSD Installer"
diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto
index 9f8946880f61..bf14d7c1192e 100755
--- a/usr.sbin/bsdinstall/scripts/auto
+++ b/usr.sbin/bsdinstall/scripts/auto
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdinstall/scripts/bootconfig b/usr.sbin/bsdinstall/scripts/bootconfig
index 8c0e87991248..0f00872fb2ec 100755
--- a/usr.sbin/bsdinstall/scripts/bootconfig
+++ b/usr.sbin/bsdinstall/scripts/bootconfig
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
FREEBSD_BOOTLABEL="FreeBSD"
diff --git a/usr.sbin/bsdinstall/scripts/checksum b/usr.sbin/bsdinstall/scripts/checksum
index ff404d7f587b..3c85d9594346 100755
--- a/usr.sbin/bsdinstall/scripts/checksum
+++ b/usr.sbin/bsdinstall/scripts/checksum
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
test -f $BSDINSTALL_DISTDIR/MANIFEST || exit 0
diff --git a/usr.sbin/bsdinstall/scripts/config b/usr.sbin/bsdinstall/scripts/config
index a909c3faee63..093d38ee0a59 100755
--- a/usr.sbin/bsdinstall/scripts/config
+++ b/usr.sbin/bsdinstall/scripts/config
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ MAIN
diff --git a/usr.sbin/bsdinstall/scripts/docsinstall b/usr.sbin/bsdinstall/scripts/docsinstall
index ee74ec063151..92d1743b5ddc 100755
--- a/usr.sbin/bsdinstall/scripts/docsinstall
+++ b/usr.sbin/bsdinstall/scripts/docsinstall
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdinstall/scripts/entropy b/usr.sbin/bsdinstall/scripts/entropy
index d3938f12cb33..91ccbf99fbcc 100755
--- a/usr.sbin/bsdinstall/scripts/entropy
+++ b/usr.sbin/bsdinstall/scripts/entropy
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
umask 077
for i in /entropy /boot/entropy; do
diff --git a/usr.sbin/bsdinstall/scripts/fetchmissingdists b/usr.sbin/bsdinstall/scripts/fetchmissingdists
index d96ddabb2c25..e293d0ac2901 100644
--- a/usr.sbin/bsdinstall/scripts/fetchmissingdists
+++ b/usr.sbin/bsdinstall/scripts/fetchmissingdists
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
error()
diff --git a/usr.sbin/bsdinstall/scripts/hardening b/usr.sbin/bsdinstall/scripts/hardening
index 58ea0a112e26..f9369844fc71 100755
--- a/usr.sbin/bsdinstall/scripts/hardening
+++ b/usr.sbin/bsdinstall/scripts/hardening
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
: ${DIALOG_OK=0}
diff --git a/usr.sbin/bsdinstall/scripts/hostname b/usr.sbin/bsdinstall/scripts/hostname
index b151ef15c690..2ace524c019d 100755
--- a/usr.sbin/bsdinstall/scripts/hostname
+++ b/usr.sbin/bsdinstall/scripts/hostname
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail
index 13a6de0846a9..1be779c4a7b8 100755
--- a/usr.sbin/bsdinstall/scripts/jail
+++ b/usr.sbin/bsdinstall/scripts/jail
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdinstall/scripts/keymap b/usr.sbin/bsdinstall/scripts/keymap
index 739d0223c4f4..026ece714052 100755
--- a/usr.sbin/bsdinstall/scripts/keymap
+++ b/usr.sbin/bsdinstall/scripts/keymap
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdinstall/scripts/mirrorselect b/usr.sbin/bsdinstall/scripts/mirrorselect
index 77fc785b94ae..4a6fdbd4eb07 100755
--- a/usr.sbin/bsdinstall/scripts/mirrorselect
+++ b/usr.sbin/bsdinstall/scripts/mirrorselect
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
: ${DIALOG_OK=0}
: ${DIALOG_CANCEL=1}
diff --git a/usr.sbin/bsdinstall/scripts/mount b/usr.sbin/bsdinstall/scripts/mount
index 244f11fa215d..2dee51ad7cde 100755
--- a/usr.sbin/bsdinstall/scripts/mount
+++ b/usr.sbin/bsdinstall/scripts/mount
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
TMP_FSTAB=${TMPDIR:-"/tmp"}/bsdinstall-tmp-fstab
diff --git a/usr.sbin/bsdinstall/scripts/netconfig b/usr.sbin/bsdinstall/scripts/netconfig
index f9913c324228..ca39b225841b 100755
--- a/usr.sbin/bsdinstall/scripts/netconfig
+++ b/usr.sbin/bsdinstall/scripts/netconfig
@@ -29,7 +29,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
INTERFACES=""
DIALOG_TAGS=""
diff --git a/usr.sbin/bsdinstall/scripts/netconfig_ipv4 b/usr.sbin/bsdinstall/scripts/netconfig_ipv4
index 2acd9029d150..9dc77f4b386f 100755
--- a/usr.sbin/bsdinstall/scripts/netconfig_ipv4
+++ b/usr.sbin/bsdinstall/scripts/netconfig_ipv4
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdinstall/scripts/netconfig_ipv6 b/usr.sbin/bsdinstall/scripts/netconfig_ipv6
index abc53906f4ad..1c743256b673 100755
--- a/usr.sbin/bsdinstall/scripts/netconfig_ipv6
+++ b/usr.sbin/bsdinstall/scripts/netconfig_ipv6
@@ -29,7 +29,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdinstall/scripts/rootpass b/usr.sbin/bsdinstall/scripts/rootpass
index 7764a51b62fb..0fe85eb93153 100755
--- a/usr.sbin/bsdinstall/scripts/rootpass
+++ b/usr.sbin/bsdinstall/scripts/rootpass
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
clear
echo "FreeBSD Installer"
diff --git a/usr.sbin/bsdinstall/scripts/script b/usr.sbin/bsdinstall/scripts/script
index 24469589d1a5..1c617835c274 100755
--- a/usr.sbin/bsdinstall/scripts/script
+++ b/usr.sbin/bsdinstall/scripts/script
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdinstall/scripts/services b/usr.sbin/bsdinstall/scripts/services
index c59628b2a88c..8e8ee707263c 100755
--- a/usr.sbin/bsdinstall/scripts/services
+++ b/usr.sbin/bsdinstall/scripts/services
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
: ${DIALOG_OK=0}
diff --git a/usr.sbin/bsdinstall/scripts/time b/usr.sbin/bsdinstall/scripts/time
index 67e539b53658..1b2e734be105 100755
--- a/usr.sbin/bsdinstall/scripts/time
+++ b/usr.sbin/bsdinstall/scripts/time
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
# Select timezone
chroot $BSDINSTALL_CHROOT tzsetup
diff --git a/usr.sbin/bsdinstall/scripts/umount b/usr.sbin/bsdinstall/scripts/umount
index a5d96ffffd32..345cd1938b0d 100755
--- a/usr.sbin/bsdinstall/scripts/umount
+++ b/usr.sbin/bsdinstall/scripts/umount
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
# If we mounted the DVD packages, unmount them
if [ -d $BSDINSTALL_CHROOT/dist/packages ]; then
diff --git a/usr.sbin/bsdinstall/scripts/wlanconfig b/usr.sbin/bsdinstall/scripts/wlanconfig
index c2234831be9d..eb45a5f6223d 100755
--- a/usr.sbin/bsdinstall/scripts/wlanconfig
+++ b/usr.sbin/bsdinstall/scripts/wlanconfig
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot
index 9a15bd719f5a..7028ee9ced91 100755
--- a/usr.sbin/bsdinstall/scripts/zfsboot
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/bsnmpd/Makefile b/usr.sbin/bsnmpd/Makefile
index 632753ddc9ea..0ce03a3a4dc4 100644
--- a/usr.sbin/bsnmpd/Makefile
+++ b/usr.sbin/bsnmpd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= gensnmptree \
bsnmpd \
diff --git a/usr.sbin/bsnmpd/Makefile.inc b/usr.sbin/bsnmpd/Makefile.inc
index 3718a5aaf44d..62cabd439578 100644
--- a/usr.sbin/bsnmpd/Makefile.inc
+++ b/usr.sbin/bsnmpd/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= bsnmp
.include "../Makefile.inc"
diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile b/usr.sbin/bsnmpd/bsnmpd/Makefile
index 05d617279ff0..245ffc51002f 100644
--- a/usr.sbin/bsnmpd/bsnmpd/Makefile
+++ b/usr.sbin/bsnmpd/bsnmpd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# Author: Harti Brandt <harti@freebsd.org>
diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile.depend b/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
index 382b25c6a944..7070fb045399 100644
--- a/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
+++ b/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile.depend.options b/usr.sbin/bsnmpd/bsnmpd/Makefile.depend.options
index a62a5692d70a..fbc21670804e 100644
--- a/usr.sbin/bsnmpd/bsnmpd/Makefile.depend.options
+++ b/usr.sbin/bsnmpd/bsnmpd/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= TCP_WRAPPERS
diff --git a/usr.sbin/bsnmpd/bsnmpd/snmpd.config b/usr.sbin/bsnmpd/bsnmpd/snmpd.config
index c1a8fa9fe55a..ace83e9c4e2e 100644
--- a/usr.sbin/bsnmpd/bsnmpd/snmpd.config
+++ b/usr.sbin/bsnmpd/bsnmpd/snmpd.config
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# Example configuration file for bsnmpd(1).
#
diff --git a/usr.sbin/bsnmpd/gensnmptree/Makefile b/usr.sbin/bsnmpd/gensnmptree/Makefile
index 52b77f60f2a6..ea58c108edfb 100644
--- a/usr.sbin/bsnmpd/gensnmptree/Makefile
+++ b/usr.sbin/bsnmpd/gensnmptree/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# Author: Harti Brandt <harti@freebsd.org>
diff --git a/usr.sbin/bsnmpd/gensnmptree/Makefile.depend b/usr.sbin/bsnmpd/gensnmptree/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/bsnmpd/gensnmptree/Makefile.depend
+++ b/usr.sbin/bsnmpd/gensnmptree/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsnmpd/modules/Makefile b/usr.sbin/bsnmpd/modules/Makefile
index 6640bb62d112..ac1d4ecc647b 100644
--- a/usr.sbin/bsnmpd/modules/Makefile
+++ b/usr.sbin/bsnmpd/modules/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/bsnmpd/modules/Makefile.depend b/usr.sbin/bsnmpd/modules/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/bsnmpd/modules/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsnmpd/modules/Makefile.inc b/usr.sbin/bsnmpd/modules/Makefile.inc
index bf633958e82b..abdd059b3683 100644
--- a/usr.sbin/bsnmpd/modules/Makefile.inc
+++ b/usr.sbin/bsnmpd/modules/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
SHLIB_MAJOR= 6
PACKAGE= bsnmp
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile b/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile
index d072c933074f..1b40edb1d8ce 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
MOD= bridge
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend
index 290addd65b07..39bad4aa8eb1 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def
index 2e88e5ed54fb..70abb4ef9b26 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
#include "tc.def"
diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile
index 72213704e935..9fabe06d3f45 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend
index 3202aed9b615..45c34c0d5653 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def b/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def
index 980de92ff8b0..38da27db97c9 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def
+++ b/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
(1 internet
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile b/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile
index 7166a4e41eb4..85c94e18a6d9 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
LPRSRC= ${SRCTOP}/usr.sbin/lpr/common_source
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
index 2d5480637707..f228d56c35f3 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def
index 83c187b48499..844c0a8d69e9 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# This is the .def file for both HOST-RESOURCES-MIB and HOST-RESOURCES-TYPES
#
diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile b/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile
index f9ee77d37883..d6eb9caab74f 100644
--- a/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <bsd.own.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend
index b9ab90d16f85..4a653d3bfebb 100644
--- a/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/lm75_tree.def b/usr.sbin/bsnmpd/modules/snmp_lm75/lm75_tree.def
index 3bfcd8d3bbcd..c3b1a4fc114a 100644
--- a/usr.sbin/bsnmpd/modules/snmp_lm75/lm75_tree.def
+++ b/usr.sbin/bsnmpd/modules/snmp_lm75/lm75_tree.def
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
(1 internet
diff --git a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
index 22be4123110b..289226bfe1e9 100644
--- a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# Author: Harti Brandt <harti@freebsd.org>
diff --git a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend
index b8b0801c6960..b2b57046f232 100644
--- a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile
index 85057c96eb0a..aa96d6adacc2 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# Author: Harti Brandt <harti@freebsd.org>
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend
index 10b5e77fe5f7..8b4b4703541d 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def b/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def
index eff59ff15c7c..8b1cebe20df0 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def
@@ -27,7 +27,6 @@
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# $FreeBSD$
#
# Definition of the tree implemented by snmp_netgraph.
#
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
index 3ab6e436aa75..4a726ff1cf44 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# Author: Philip Paeps <philip@freebsd.org>
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
index b9ab90d16f85..4a653d3bfebb 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def b/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def
index b545c1e79fae..dcdf676aa752 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
(1 internet
diff --git a/usr.sbin/bsnmpd/modules/snmp_target/Makefile b/usr.sbin/bsnmpd/modules/snmp_target/Makefile
index 610e746541f7..4a0589979f08 100644
--- a/usr.sbin/bsnmpd/modules/snmp_target/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_target/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# Author: Shteryana Shopova <syrinx@freebsd.org>
diff --git a/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
index 8abd5d2de4ea..05bf7e242715 100644
--- a/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsnmpd/modules/snmp_usm/Makefile b/usr.sbin/bsnmpd/modules/snmp_usm/Makefile
index a5e8e8cf9237..40107dba189d 100644
--- a/usr.sbin/bsnmpd/modules/snmp_usm/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_usm/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# Author: Shteryana Shopova <syrinx@freebsd.org>
diff --git a/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
index 8abd5d2de4ea..05bf7e242715 100644
--- a/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile b/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile
index d35842bb44f6..5dced04d3362 100644
--- a/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# Author: Shteryana Shopova <syrinx@freebsd.org>
diff --git a/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
index 8abd5d2de4ea..05bf7e242715 100644
--- a/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile b/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile
index eb6b230210e9..82bcba690416 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
MOD= wlan
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
index f927b80bbaed..368cef5b9d62 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def
index 630e46392f77..c977135d4f63 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
#include "tc.def"
diff --git a/usr.sbin/bsnmpd/tools/Makefile b/usr.sbin/bsnmpd/tools/Makefile
index cba5cee47ea9..30cc032e2557 100644
--- a/usr.sbin/bsnmpd/tools/Makefile
+++ b/usr.sbin/bsnmpd/tools/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Author: Shteryana Shopova <syrinx@FreeBSD.org>
SUBDIR= libbsnmptools \
diff --git a/usr.sbin/bsnmpd/tools/Makefile.inc b/usr.sbin/bsnmpd/tools/Makefile.inc
index db12061896d2..67bb48436ae1 100644
--- a/usr.sbin/bsnmpd/tools/Makefile.inc
+++ b/usr.sbin/bsnmpd/tools/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Author: Shteryana Shopova <syrinx@FreeBSD.org>
BINDIR?= /usr/bin
diff --git a/usr.sbin/bsnmpd/tools/bsnmptools/Makefile b/usr.sbin/bsnmpd/tools/bsnmptools/Makefile
index 09280a48a3b5..55dc768dc16b 100644
--- a/usr.sbin/bsnmpd/tools/bsnmptools/Makefile
+++ b/usr.sbin/bsnmpd/tools/bsnmptools/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Author: Shteryana Shopova <syrinx@FreeBSD.org>
.include <src.opts.mk>
diff --git a/usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend b/usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend
index 8bc992fec38f..336e95540a19 100644
--- a/usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend
+++ b/usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile b/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile
index 970a2e8f0bf8..6be5be8aff6a 100644
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
.PATH: ${.CURDIR}
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend b/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend
index b69d36eac75e..57aa342ba52f 100644
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile
index 32cf99d5edac..ec28d20b49df 100644
--- a/usr.sbin/btxld/Makefile
+++ b/usr.sbin/btxld/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= btxld
MAN= btxld.8
diff --git a/usr.sbin/btxld/Makefile.depend b/usr.sbin/btxld/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/btxld/Makefile.depend
+++ b/usr.sbin/btxld/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/camdd/Makefile b/usr.sbin/camdd/Makefile
index 4719130703ee..3762762ad528 100644
--- a/usr.sbin/camdd/Makefile
+++ b/usr.sbin/camdd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= camdd
SRCS= camdd.c
diff --git a/usr.sbin/camdd/Makefile.depend b/usr.sbin/camdd/Makefile.depend
index 0c2bad278bed..03dff390cad1 100644
--- a/usr.sbin/camdd/Makefile.depend
+++ b/usr.sbin/camdd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile
index de9560644501..8bbd515f4683 100644
--- a/usr.sbin/cdcontrol/Makefile
+++ b/usr.sbin/cdcontrol/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= cdcontrol
diff --git a/usr.sbin/cdcontrol/Makefile.depend b/usr.sbin/cdcontrol/Makefile.depend
index 965e3a120be6..86a805eb6d38 100644
--- a/usr.sbin/cdcontrol/Makefile.depend
+++ b/usr.sbin/cdcontrol/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/certctl/Makefile b/usr.sbin/certctl/Makefile
index df5acb606143..c65654566795 100644
--- a/usr.sbin/certctl/Makefile
+++ b/usr.sbin/certctl/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= caroot
SCRIPTS=certctl.sh
diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh
index 1324ca00d6f3..92ebb2b5ace7 100755
--- a/usr.sbin/certctl/certctl.sh
+++ b/usr.sbin/certctl/certctl.sh
@@ -25,7 +25,6 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $FreeBSD$
############################################################ CONFIGURATION
diff --git a/usr.sbin/chkgrp/Makefile b/usr.sbin/chkgrp/Makefile
index a7bfc548ced1..a079ddb7b185 100644
--- a/usr.sbin/chkgrp/Makefile
+++ b/usr.sbin/chkgrp/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= chkgrp
MAN= chkgrp.8
diff --git a/usr.sbin/chkgrp/Makefile.depend b/usr.sbin/chkgrp/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/chkgrp/Makefile.depend
+++ b/usr.sbin/chkgrp/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile
index b9dff0785363..014f6506fbc0 100644
--- a/usr.sbin/chown/Makefile
+++ b/usr.sbin/chown/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/chown/Makefile.depend b/usr.sbin/chown/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/chown/Makefile.depend
+++ b/usr.sbin/chown/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/chown/tests/Makefile b/usr.sbin/chown/tests/Makefile
index 506d81cbaa8b..f0c8eb8a318c 100644
--- a/usr.sbin/chown/tests/Makefile
+++ b/usr.sbin/chown/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
ATF_TESTS_SH+= chown_test
diff --git a/usr.sbin/chown/tests/Makefile.depend b/usr.sbin/chown/tests/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/chown/tests/Makefile.depend
+++ b/usr.sbin/chown/tests/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/chown/tests/chown_test.sh b/usr.sbin/chown/tests/chown_test.sh
index b8b85ab47b6b..d890d7b4dec5 100755
--- a/usr.sbin/chown/tests/chown_test.sh
+++ b/usr.sbin/chown/tests/chown_test.sh
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
get_filesystem()
{
diff --git a/usr.sbin/chroot/Makefile b/usr.sbin/chroot/Makefile
index 652de797cec4..9d15688403b7 100644
--- a/usr.sbin/chroot/Makefile
+++ b/usr.sbin/chroot/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
PROG= chroot
MAN= chroot.8
diff --git a/usr.sbin/chroot/Makefile.depend b/usr.sbin/chroot/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/chroot/Makefile.depend
+++ b/usr.sbin/chroot/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ckdist/Makefile b/usr.sbin/ckdist/Makefile
index e8a9213d4f6c..14ed52e5f274 100644
--- a/usr.sbin/ckdist/Makefile
+++ b/usr.sbin/ckdist/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/usr.bin/cksum
diff --git a/usr.sbin/ckdist/Makefile.depend b/usr.sbin/ckdist/Makefile.depend
index 31fbf9bc2f9f..01fbcdb0d54c 100644
--- a/usr.sbin/ckdist/Makefile.depend
+++ b/usr.sbin/ckdist/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/clear_locks/Makefile b/usr.sbin/clear_locks/Makefile
index a9355ed2ba29..93eb95d8cad0 100644
--- a/usr.sbin/clear_locks/Makefile
+++ b/usr.sbin/clear_locks/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= nfs
diff --git a/usr.sbin/clear_locks/Makefile.depend b/usr.sbin/clear_locks/Makefile.depend
index 5b0587ae477a..0fe63efcd9a2 100644
--- a/usr.sbin/clear_locks/Makefile.depend
+++ b/usr.sbin/clear_locks/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile
index 32bfa8de0a0e..3d6670395b58 100644
--- a/usr.sbin/config/Makefile
+++ b/usr.sbin/config/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
SRCDIR:=${.PARSEDIR:tA}
diff --git a/usr.sbin/config/Makefile.depend b/usr.sbin/config/Makefile.depend
index 7d98418717a1..818cbc23271b 100644
--- a/usr.sbin/config/Makefile.depend
+++ b/usr.sbin/config/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/cpucontrol/Makefile b/usr.sbin/cpucontrol/Makefile
index df84f7082e87..41f573d02cc2 100644
--- a/usr.sbin/cpucontrol/Makefile
+++ b/usr.sbin/cpucontrol/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= cpucontrol
MAN= cpucontrol.8
diff --git a/usr.sbin/cpucontrol/Makefile.depend b/usr.sbin/cpucontrol/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/cpucontrol/Makefile.depend
+++ b/usr.sbin/cpucontrol/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/crashinfo/Makefile b/usr.sbin/crashinfo/Makefile
index fa2a19c60c5f..f65bed154872 100644
--- a/usr.sbin/crashinfo/Makefile
+++ b/usr.sbin/crashinfo/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SCRIPTS= crashinfo.sh
MAN= crashinfo.8
diff --git a/usr.sbin/crashinfo/Makefile.depend b/usr.sbin/crashinfo/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/crashinfo/Makefile.depend
+++ b/usr.sbin/crashinfo/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/crashinfo/crashinfo.sh b/usr.sbin/crashinfo/crashinfo.sh
index 5c67a29bee73..8a6981ba883c 100755
--- a/usr.sbin/crashinfo/crashinfo.sh
+++ b/usr.sbin/crashinfo/crashinfo.sh
@@ -29,7 +29,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
usage()
{
diff --git a/usr.sbin/cron/Makefile b/usr.sbin/cron/Makefile
index 62f853cd2673..e24c33cb1a80 100644
--- a/usr.sbin/cron/Makefile
+++ b/usr.sbin/cron/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= lib cron crontab
diff --git a/usr.sbin/cron/Makefile.inc b/usr.sbin/cron/Makefile.inc
index 265f86d1ed55..d3b5cbd3a79b 100644
--- a/usr.sbin/cron/Makefile.inc
+++ b/usr.sbin/cron/Makefile.inc
@@ -1,3 +1,2 @@
-# $FreeBSD$
.include "../Makefile.inc"
diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile
index 87c6bab7b495..673ae49e01a1 100644
--- a/usr.sbin/cron/cron/Makefile
+++ b/usr.sbin/cron/cron/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
CONFS= crontab
PROG= cron
diff --git a/usr.sbin/cron/cron/Makefile.depend b/usr.sbin/cron/cron/Makefile.depend
index c4674852688f..b7106ae4f7d8 100644
--- a/usr.sbin/cron/cron/Makefile.depend
+++ b/usr.sbin/cron/cron/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/cron/cron/crontab b/usr.sbin/cron/cron/crontab
index 994d4ae6af00..2f4bc71d8722 100644
--- a/usr.sbin/cron/cron/crontab
+++ b/usr.sbin/cron/cron/crontab
@@ -1,6 +1,5 @@
# /etc/crontab - root's crontab for FreeBSD
#
-# $FreeBSD$
#
SHELL=/bin/sh
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile
index 7b780edc80e3..7b4901b7a281 100644
--- a/usr.sbin/cron/crontab/Makefile
+++ b/usr.sbin/cron/crontab/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
BINDIR= /usr/bin
diff --git a/usr.sbin/cron/crontab/Makefile.depend b/usr.sbin/cron/crontab/Makefile.depend
index cfb82e7beff4..8aac675891fa 100644
--- a/usr.sbin/cron/crontab/Makefile.depend
+++ b/usr.sbin/cron/crontab/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/cron/doc/Makefile.vixie b/usr.sbin/cron/doc/Makefile.vixie
index 8df1301c689d..6068a7319483 100644
--- a/usr.sbin/cron/doc/Makefile.vixie
+++ b/usr.sbin/cron/doc/Makefile.vixie
@@ -17,7 +17,6 @@
# Makefile for vixie's cron
#
-# $FreeBSD$
#
# vix 03mar88 [moved to RCS, rest of log is in there]
# vix 30mar87 [goodbye, time.c; hello, getopt]
diff --git a/usr.sbin/cron/lib/Makefile b/usr.sbin/cron/lib/Makefile
index d8203c5a4df7..cf41f2e72d2c 100644
--- a/usr.sbin/cron/lib/Makefile
+++ b/usr.sbin/cron/lib/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
LIB= cron
INTERNALLIB=
diff --git a/usr.sbin/cron/lib/Makefile.depend b/usr.sbin/cron/lib/Makefile.depend
index cf2961c09880..217d6b6b7bd8 100644
--- a/usr.sbin/cron/lib/Makefile.depend
+++ b/usr.sbin/cron/lib/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/crunch/Makefile b/usr.sbin/crunch/Makefile
index 6bf600fce66b..79c2ab096bbb 100644
--- a/usr.sbin/crunch/Makefile
+++ b/usr.sbin/crunch/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= crunchgen crunchide
diff --git a/usr.sbin/crunch/Makefile.inc b/usr.sbin/crunch/Makefile.inc
index f8ffe675db6e..880f05576e1b 100644
--- a/usr.sbin/crunch/Makefile.inc
+++ b/usr.sbin/crunch/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
# modify to taste
BINDIR?= /usr/bin
diff --git a/usr.sbin/crunch/crunchgen/Makefile b/usr.sbin/crunch/crunchgen/Makefile
index 8d0a78b19027..93d067461d74 100644
--- a/usr.sbin/crunch/crunchgen/Makefile
+++ b/usr.sbin/crunch/crunchgen/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= crunchgen
SRCS= crunchgen.c crunched_skel.c
diff --git a/usr.sbin/crunch/crunchgen/Makefile.depend b/usr.sbin/crunch/crunchgen/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/crunch/crunchgen/Makefile.depend
+++ b/usr.sbin/crunch/crunchgen/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/crunch/crunchide/Makefile b/usr.sbin/crunch/crunchide/Makefile
index 467b0b6d1865..6467e951e0c7 100644
--- a/usr.sbin/crunch/crunchide/Makefile
+++ b/usr.sbin/crunch/crunchide/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= crunchide
SRCS= crunchide.c exec_elf32.c exec_elf64.c
diff --git a/usr.sbin/crunch/crunchide/Makefile.depend b/usr.sbin/crunch/crunchide/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/crunch/crunchide/Makefile.depend
+++ b/usr.sbin/crunch/crunchide/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/crunch/examples/Makefile b/usr.sbin/crunch/examples/Makefile
index 01b924226c45..baef8f899cfc 100644
--- a/usr.sbin/crunch/examples/Makefile
+++ b/usr.sbin/crunch/examples/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
CRUNCHED= fixit
diff --git a/usr.sbin/crunch/examples/filesystem.conf b/usr.sbin/crunch/examples/filesystem.conf
index 1fb93856c7f1..5be30f528cce 100644
--- a/usr.sbin/crunch/examples/filesystem.conf
+++ b/usr.sbin/crunch/examples/filesystem.conf
@@ -1,4 +1,3 @@
-# $FreeBSD$
srcdirs /usr/src/bin /usr/src/sbin /usr/src/gnu/usr.bin /usr/src/usr.sbin
srcdirs /usr/src/sbin/i386
diff --git a/usr.sbin/crunch/examples/fixit.conf b/usr.sbin/crunch/examples/fixit.conf
index 889f2e6e7854..5596d58c45f1 100644
--- a/usr.sbin/crunch/examples/fixit.conf
+++ b/usr.sbin/crunch/examples/fixit.conf
@@ -1,5 +1,4 @@
# fixit.conf - put in anything we think we might want on a fixit floppy
-# $FreeBSD$
# first, we list the source dirs that our programs reside in. These are
# searched in order listed to find the dir containing each program.
diff --git a/usr.sbin/crunch/examples/kcopy.conf b/usr.sbin/crunch/examples/kcopy.conf
index 3284e868c51b..78e92191fc0a 100644
--- a/usr.sbin/crunch/examples/kcopy.conf
+++ b/usr.sbin/crunch/examples/kcopy.conf
@@ -1,4 +1,3 @@
-# $FreeBSD$
srcdirs /usr/src/bin /usr/src/sbin
diff --git a/usr.sbin/crunch/examples/really-big.conf b/usr.sbin/crunch/examples/really-big.conf
index e83680fcd556..e6624a1ad836 100644
--- a/usr.sbin/crunch/examples/really-big.conf
+++ b/usr.sbin/crunch/examples/really-big.conf
@@ -5,7 +5,6 @@
#
# This produces a 4608000 byte binary. Pretty sick and twisted, eh?
#
-# $FreeBSD$
#
# =========================================================================
diff --git a/usr.sbin/ctladm/Makefile b/usr.sbin/ctladm/Makefile
index c98643b50dcb..f9ddd251f96c 100644
--- a/usr.sbin/ctladm/Makefile
+++ b/usr.sbin/ctladm/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ctladm/Makefile.depend b/usr.sbin/ctladm/Makefile.depend
index 89190e05b84a..1c7fd9be8402 100644
--- a/usr.sbin/ctladm/Makefile.depend
+++ b/usr.sbin/ctladm/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ctld/Makefile b/usr.sbin/ctld/Makefile
index 45b9e93be756..b14daccff257 100644
--- a/usr.sbin/ctld/Makefile
+++ b/usr.sbin/ctld/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ctld/Makefile.depend b/usr.sbin/ctld/Makefile.depend
index b19183257618..313453c58df1 100644
--- a/usr.sbin/ctld/Makefile.depend
+++ b/usr.sbin/ctld/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/cxgbetool/Makefile b/usr.sbin/cxgbetool/Makefile
index ed0f90d1ef33..356e93c910a4 100644
--- a/usr.sbin/cxgbetool/Makefile
+++ b/usr.sbin/cxgbetool/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= cxgbe-tools
PROG= cxgbetool
diff --git a/usr.sbin/cxgbetool/Makefile.depend b/usr.sbin/cxgbetool/Makefile.depend
index d5ed563ecfc8..ec18d8c500c6 100644
--- a/usr.sbin/cxgbetool/Makefile.depend
+++ b/usr.sbin/cxgbetool/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/daemon/Makefile b/usr.sbin/daemon/Makefile
index 0bf34c351932..f839079be4e8 100644
--- a/usr.sbin/daemon/Makefile
+++ b/usr.sbin/daemon/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= daemon
MAN= daemon.8
diff --git a/usr.sbin/daemon/Makefile.depend b/usr.sbin/daemon/Makefile.depend
index 991757ecadc0..ffc295f2fe8a 100644
--- a/usr.sbin/daemon/Makefile.depend
+++ b/usr.sbin/daemon/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/daemon/tests/Makefile b/usr.sbin/daemon/tests/Makefile
index c687361ec4e7..c5c6470416db 100644
--- a/usr.sbin/daemon/tests/Makefile
+++ b/usr.sbin/daemon/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= tests
diff --git a/usr.sbin/daemon/tests/daemon_test.sh b/usr.sbin/daemon/tests/daemon_test.sh
index c865e6df441b..948a9f6a8a57 100644
--- a/usr.sbin/daemon/tests/daemon_test.sh
+++ b/usr.sbin/daemon/tests/daemon_test.sh
@@ -25,8 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
-# $FreeBSD$
-
atf_test_case both_pidfile cleanup
both_pidfile_head() {
atf_set "descr" "daemon should write pid files for itself and its child"
diff --git a/usr.sbin/dconschat/Makefile b/usr.sbin/dconschat/Makefile
index c0bc058c22e6..f5f7795f284b 100644
--- a/usr.sbin/dconschat/Makefile
+++ b/usr.sbin/dconschat/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= dconschat
MAN= dconschat.8
diff --git a/usr.sbin/dconschat/Makefile.depend b/usr.sbin/dconschat/Makefile.depend
index daaa39c06eaf..e76311aa14e8 100644
--- a/usr.sbin/dconschat/Makefile.depend
+++ b/usr.sbin/dconschat/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/devctl/Makefile b/usr.sbin/devctl/Makefile
index a7deb3793181..cf52a8632292 100644
--- a/usr.sbin/devctl/Makefile
+++ b/usr.sbin/devctl/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= devctl
MAN= devctl.8
diff --git a/usr.sbin/devctl/Makefile.depend b/usr.sbin/devctl/Makefile.depend
index 74130daab290..6b029f593f28 100644
--- a/usr.sbin/devctl/Makefile.depend
+++ b/usr.sbin/devctl/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/devinfo/Makefile b/usr.sbin/devinfo/Makefile
index a740fd6a9b17..35444d5d5e68 100644
--- a/usr.sbin/devinfo/Makefile
+++ b/usr.sbin/devinfo/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= devmatch
PROG= devinfo
diff --git a/usr.sbin/devinfo/Makefile.depend b/usr.sbin/devinfo/Makefile.depend
index 2c68d7ccef0d..83acd4109b71 100644
--- a/usr.sbin/devinfo/Makefile.depend
+++ b/usr.sbin/devinfo/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/diskinfo/Makefile b/usr.sbin/diskinfo/Makefile
index 41c52da551be..d6e2b3c3a94a 100644
--- a/usr.sbin/diskinfo/Makefile
+++ b/usr.sbin/diskinfo/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= diskinfo
MAN= diskinfo.8
diff --git a/usr.sbin/diskinfo/Makefile.depend b/usr.sbin/diskinfo/Makefile.depend
index 991757ecadc0..ffc295f2fe8a 100644
--- a/usr.sbin/diskinfo/Makefile.depend
+++ b/usr.sbin/diskinfo/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/dumpcis/Makefile b/usr.sbin/dumpcis/Makefile
index 7a5a590090da..790b4a5a18e7 100644
--- a/usr.sbin/dumpcis/Makefile
+++ b/usr.sbin/dumpcis/Makefile
@@ -1,6 +1,5 @@
# pccardc Makefile
#
-# $FreeBSD$
PROG= dumpcis
MAN= dumpcis.8
diff --git a/usr.sbin/dumpcis/Makefile.depend b/usr.sbin/dumpcis/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/dumpcis/Makefile.depend
+++ b/usr.sbin/dumpcis/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/editmap/Makefile b/usr.sbin/editmap/Makefile
index 04ce398f2d51..560c898a816e 100644
--- a/usr.sbin/editmap/Makefile
+++ b/usr.sbin/editmap/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/editmap
diff --git a/usr.sbin/editmap/Makefile.depend b/usr.sbin/editmap/Makefile.depend
index 0feabbf167e0..58a2e5370106 100644
--- a/usr.sbin/editmap/Makefile.depend
+++ b/usr.sbin/editmap/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/edquota/Makefile b/usr.sbin/edquota/Makefile
index 38d6eb3a55ce..40622578ec1c 100644
--- a/usr.sbin/edquota/Makefile
+++ b/usr.sbin/edquota/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
PROG= edquota
MAN= edquota.8
diff --git a/usr.sbin/edquota/Makefile.depend b/usr.sbin/edquota/Makefile.depend
index 991757ecadc0..ffc295f2fe8a 100644
--- a/usr.sbin/edquota/Makefile.depend
+++ b/usr.sbin/edquota/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/efibootmgr/Makefile b/usr.sbin/efibootmgr/Makefile
index 9e98412f6f74..d976656a99c9 100644
--- a/usr.sbin/efibootmgr/Makefile
+++ b/usr.sbin/efibootmgr/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
EFIBOOT=${SRCTOP}/stand/efi
EFIINCL=${SRCTOP}/stand/efi/include
EFIVAR=${SRCTOP}/usr.sbin/efivar
diff --git a/usr.sbin/efidp/Makefile b/usr.sbin/efidp/Makefile
index 7b8bf2d1d556..a1edd8ac5e51 100644
--- a/usr.sbin/efidp/Makefile
+++ b/usr.sbin/efidp/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= efi-tools
diff --git a/usr.sbin/efidp/Makefile.depend b/usr.sbin/efidp/Makefile.depend
index 204b8d257e53..7fe1dbe34316 100644
--- a/usr.sbin/efidp/Makefile.depend
+++ b/usr.sbin/efidp/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/efivar/Makefile b/usr.sbin/efivar/Makefile
index aa00f4b79502..2e794e13968f 100644
--- a/usr.sbin/efivar/Makefile
+++ b/usr.sbin/efivar/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= efi-tools
diff --git a/usr.sbin/efivar/Makefile.depend b/usr.sbin/efivar/Makefile.depend
index 204b8d257e53..7fe1dbe34316 100644
--- a/usr.sbin/efivar/Makefile.depend
+++ b/usr.sbin/efivar/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/etcupdate/Makefile b/usr.sbin/etcupdate/Makefile
index 46edaf03baf1..f2b6bd9ab374 100644
--- a/usr.sbin/etcupdate/Makefile
+++ b/usr.sbin/etcupdate/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/etcupdate/Makefile.depend b/usr.sbin/etcupdate/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/etcupdate/Makefile.depend
+++ b/usr.sbin/etcupdate/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh
index 148aaf63c363..6d8f58d39c54 100755
--- a/usr.sbin/etcupdate/etcupdate.sh
+++ b/usr.sbin/etcupdate/etcupdate.sh
@@ -27,7 +27,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
# This is a tool to manage updating files that are not updated as part
# of 'make installworld' such as files in /etc. Unlike other tools,
diff --git a/usr.sbin/etcupdate/tests/Makefile b/usr.sbin/etcupdate/tests/Makefile
index 45b12b7bb75d..77cd0b87a21c 100644
--- a/usr.sbin/etcupdate/tests/Makefile
+++ b/usr.sbin/etcupdate/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PLAIN_TESTS_SH=
.for test in always_test \
diff --git a/usr.sbin/etcupdate/tests/Makefile.depend b/usr.sbin/etcupdate/tests/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/etcupdate/tests/Makefile.depend
+++ b/usr.sbin/etcupdate/tests/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/etcupdate/tests/always_test.sh b/usr.sbin/etcupdate/tests/always_test.sh
index 2055bb6347a1..321f7beb2a67 100644
--- a/usr.sbin/etcupdate/tests/always_test.sh
+++ b/usr.sbin/etcupdate/tests/always_test.sh
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
# Various regression tests to test the -A flag to the 'update' command.
diff --git a/usr.sbin/etcupdate/tests/conflicts_test.sh b/usr.sbin/etcupdate/tests/conflicts_test.sh
index 71f16fabf35b..87857e7cd0a9 100644
--- a/usr.sbin/etcupdate/tests/conflicts_test.sh
+++ b/usr.sbin/etcupdate/tests/conflicts_test.sh
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
# Various regression tests to run for the 'resolve' command.
diff --git a/usr.sbin/etcupdate/tests/fbsdid_test.sh b/usr.sbin/etcupdate/tests/fbsdid_test.sh
index d8d5cce993c6..b93c2ff1793e 100644
--- a/usr.sbin/etcupdate/tests/fbsdid_test.sh
+++ b/usr.sbin/etcupdate/tests/fbsdid_test.sh
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
# Various regression tests to test the -F flag to the 'update' command.
diff --git a/usr.sbin/etcupdate/tests/ignore_test.sh b/usr.sbin/etcupdate/tests/ignore_test.sh
index 571dd247150c..20d1f9abcd54 100644
--- a/usr.sbin/etcupdate/tests/ignore_test.sh
+++ b/usr.sbin/etcupdate/tests/ignore_test.sh
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
# Various regression tests to test the -I flag to the 'update' command.
diff --git a/usr.sbin/etcupdate/tests/preworld_test.sh b/usr.sbin/etcupdate/tests/preworld_test.sh
index 2c11c37f1aac..e9a7544197a9 100644
--- a/usr.sbin/etcupdate/tests/preworld_test.sh
+++ b/usr.sbin/etcupdate/tests/preworld_test.sh
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
# Regression tests for the pre-world (-p) mode
diff --git a/usr.sbin/etcupdate/tests/tests_test.sh b/usr.sbin/etcupdate/tests/tests_test.sh
index 5382de30da00..794be8065a96 100644
--- a/usr.sbin/etcupdate/tests/tests_test.sh
+++ b/usr.sbin/etcupdate/tests/tests_test.sh
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
# Various regression tests to run for the 'update' command.
diff --git a/usr.sbin/etcupdate/tests/tzsetup_test.sh b/usr.sbin/etcupdate/tests/tzsetup_test.sh
index 5d3fe89d7a24..dd76884e13eb 100644
--- a/usr.sbin/etcupdate/tests/tzsetup_test.sh
+++ b/usr.sbin/etcupdate/tests/tzsetup_test.sh
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
# Various regression tests for the tzsetup handling in the 'update' command.
diff --git a/usr.sbin/extattr/Makefile b/usr.sbin/extattr/Makefile
index 253b61b5a9ac..61171ef385d7 100644
--- a/usr.sbin/extattr/Makefile
+++ b/usr.sbin/extattr/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= rmextattr
MAN= rmextattr.8
diff --git a/usr.sbin/extattr/Makefile.depend b/usr.sbin/extattr/Makefile.depend
index c3cca03a0705..e79b1972cadd 100644
--- a/usr.sbin/extattr/Makefile.depend
+++ b/usr.sbin/extattr/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/extattr/tests/Makefile b/usr.sbin/extattr/tests/Makefile
index 7dec010fe009..3e3218032d07 100644
--- a/usr.sbin/extattr/tests/Makefile
+++ b/usr.sbin/extattr/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
ATF_TESTS_SH= extattr_test
diff --git a/usr.sbin/extattr/tests/Makefile.depend b/usr.sbin/extattr/tests/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/extattr/tests/Makefile.depend
+++ b/usr.sbin/extattr/tests/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/extattr/tests/extattr_test.sh b/usr.sbin/extattr/tests/extattr_test.sh
index c2d96cfcb0bf..0b16350a958a 100755
--- a/usr.sbin/extattr/tests/extattr_test.sh
+++ b/usr.sbin/extattr/tests/extattr_test.sh
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
atf_test_case bad_namespace
bad_namespace_head() {
diff --git a/usr.sbin/extattrctl/Makefile b/usr.sbin/extattrctl/Makefile
index 496a8aa8c7c1..9365aff89230 100644
--- a/usr.sbin/extattrctl/Makefile
+++ b/usr.sbin/extattrctl/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= extattrctl
MAN= extattrctl.8
diff --git a/usr.sbin/extattrctl/Makefile.depend b/usr.sbin/extattrctl/Makefile.depend
index 991757ecadc0..ffc295f2fe8a 100644
--- a/usr.sbin/extattrctl/Makefile.depend
+++ b/usr.sbin/extattrctl/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/fdcontrol/Makefile b/usr.sbin/fdcontrol/Makefile
index a11c6f1292e0..f3d7cc2af36b 100644
--- a/usr.sbin/fdcontrol/Makefile
+++ b/usr.sbin/fdcontrol/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${.CURDIR:H}/fdread
diff --git a/usr.sbin/fdcontrol/Makefile.depend b/usr.sbin/fdcontrol/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/fdcontrol/Makefile.depend
+++ b/usr.sbin/fdcontrol/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/fdformat/Makefile b/usr.sbin/fdformat/Makefile
index 9acde9482c78..f2cd4e4841e9 100644
--- a/usr.sbin/fdformat/Makefile
+++ b/usr.sbin/fdformat/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${.CURDIR:H}/fdread
diff --git a/usr.sbin/fdformat/Makefile.depend b/usr.sbin/fdformat/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/fdformat/Makefile.depend
+++ b/usr.sbin/fdformat/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/fdread/Makefile b/usr.sbin/fdread/Makefile
index 05e588de00e1..4b7570868ccb 100644
--- a/usr.sbin/fdread/Makefile
+++ b/usr.sbin/fdread/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= fdread
SRCS= fdread.c fdutil.c
diff --git a/usr.sbin/fdread/Makefile.depend b/usr.sbin/fdread/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/fdread/Makefile.depend
+++ b/usr.sbin/fdread/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/fdwrite/Makefile b/usr.sbin/fdwrite/Makefile
index b97bdd444821..810ae058c7b0 100644
--- a/usr.sbin/fdwrite/Makefile
+++ b/usr.sbin/fdwrite/Makefile
@@ -5,7 +5,6 @@
# this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
# ----------------------------------------------------------------------------
#
-# $FreeBSD$
PROG= fdwrite
diff --git a/usr.sbin/fdwrite/Makefile.depend b/usr.sbin/fdwrite/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/fdwrite/Makefile.depend
+++ b/usr.sbin/fdwrite/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/fifolog/Makefile b/usr.sbin/fifolog/Makefile
index fbaaa894d2c7..779fec1860de 100644
--- a/usr.sbin/fifolog/Makefile
+++ b/usr.sbin/fifolog/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= lib .WAIT \
fifolog_create fifolog_writer fifolog_reader
diff --git a/usr.sbin/fifolog/Makefile.inc b/usr.sbin/fifolog/Makefile.inc
index 265f86d1ed55..d3b5cbd3a79b 100644
--- a/usr.sbin/fifolog/Makefile.inc
+++ b/usr.sbin/fifolog/Makefile.inc
@@ -1,3 +1,2 @@
-# $FreeBSD$
.include "../Makefile.inc"
diff --git a/usr.sbin/fifolog/fifolog_create/Makefile b/usr.sbin/fifolog/fifolog_create/Makefile
index 04370e6e358c..79dfedbcb83a 100644
--- a/usr.sbin/fifolog/fifolog_create/Makefile
+++ b/usr.sbin/fifolog/fifolog_create/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= fifolog_create
diff --git a/usr.sbin/fifolog/fifolog_create/Makefile.depend b/usr.sbin/fifolog/fifolog_create/Makefile.depend
index ce13a0df74aa..a3fb4a10f16f 100644
--- a/usr.sbin/fifolog/fifolog_create/Makefile.depend
+++ b/usr.sbin/fifolog/fifolog_create/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/fifolog/fifolog_reader/Makefile b/usr.sbin/fifolog/fifolog_reader/Makefile
index 2dd103f91f2c..fd3e09aed919 100644
--- a/usr.sbin/fifolog/fifolog_reader/Makefile
+++ b/usr.sbin/fifolog/fifolog_reader/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= fifolog_reader
diff --git a/usr.sbin/fifolog/fifolog_reader/Makefile.depend b/usr.sbin/fifolog/fifolog_reader/Makefile.depend
index d223e22c5c58..4bcfe39ef903 100644
--- a/usr.sbin/fifolog/fifolog_reader/Makefile.depend
+++ b/usr.sbin/fifolog/fifolog_reader/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/fifolog/fifolog_writer/Makefile b/usr.sbin/fifolog/fifolog_writer/Makefile
index d5b888dd5bc6..ade8308db418 100644
--- a/usr.sbin/fifolog/fifolog_writer/Makefile
+++ b/usr.sbin/fifolog/fifolog_writer/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= fifolog_writer
diff --git a/usr.sbin/fifolog/fifolog_writer/Makefile.depend b/usr.sbin/fifolog/fifolog_writer/Makefile.depend
index d223e22c5c58..4bcfe39ef903 100644
--- a/usr.sbin/fifolog/fifolog_writer/Makefile.depend
+++ b/usr.sbin/fifolog/fifolog_writer/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/fifolog/lib/Makefile b/usr.sbin/fifolog/lib/Makefile
index f60529fa9ef0..831285df8fac 100644
--- a/usr.sbin/fifolog/lib/Makefile
+++ b/usr.sbin/fifolog/lib/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
LIB= fifolog
INTERNALLIB= # API not published or supported.
diff --git a/usr.sbin/fifolog/lib/Makefile.depend b/usr.sbin/fifolog/lib/Makefile.depend
index 5deb34f4f4f5..37782773d8ea 100644
--- a/usr.sbin/fifolog/lib/Makefile.depend
+++ b/usr.sbin/fifolog/lib/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/flowctl/Makefile b/usr.sbin/flowctl/Makefile
index 8bd63893cc6a..1b3a2a1a13f2 100644
--- a/usr.sbin/flowctl/Makefile
+++ b/usr.sbin/flowctl/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
.include <src.opts.mk>
diff --git a/usr.sbin/flowctl/Makefile.depend b/usr.sbin/flowctl/Makefile.depend
index d64c9ccbda7b..5953f23f5b47 100644
--- a/usr.sbin/flowctl/Makefile.depend
+++ b/usr.sbin/flowctl/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/fmtree/Makefile b/usr.sbin/fmtree/Makefile
index c1ba3737b258..3537a069140d 100644
--- a/usr.sbin/fmtree/Makefile
+++ b/usr.sbin/fmtree/Makefile
@@ -1,5 +1,4 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
.include <bsd.own.mk>
diff --git a/usr.sbin/fmtree/Makefile.depend b/usr.sbin/fmtree/Makefile.depend
index 31fbf9bc2f9f..01fbcdb0d54c 100644
--- a/usr.sbin/fmtree/Makefile.depend
+++ b/usr.sbin/fmtree/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/fmtree/test/test00.sh b/usr.sbin/fmtree/test/test00.sh
index fce801bcd20e..d28e0f890b33 100644
--- a/usr.sbin/fmtree/test/test00.sh
+++ b/usr.sbin/fmtree/test/test00.sh
@@ -5,7 +5,6 @@
#
# Please see src/share/examples/etc/bsd-style-copyright.
#
-# $FreeBSD$
#
set -e
diff --git a/usr.sbin/fmtree/test/test01.sh b/usr.sbin/fmtree/test/test01.sh
index e4d3fc302bfe..c243008245c3 100644
--- a/usr.sbin/fmtree/test/test01.sh
+++ b/usr.sbin/fmtree/test/test01.sh
@@ -5,7 +5,6 @@
#
# Please see src/share/examples/etc/bsd-style-copyright.
#
-# $FreeBSD$
#
set -e
diff --git a/usr.sbin/fmtree/test/test02.sh b/usr.sbin/fmtree/test/test02.sh
index a7aa9168382c..67f387f697d6 100644
--- a/usr.sbin/fmtree/test/test02.sh
+++ b/usr.sbin/fmtree/test/test02.sh
@@ -5,7 +5,6 @@
#
# Please see src/share/examples/etc/bsd-style-copyright.
#
-# $FreeBSD$
#
set -e
diff --git a/usr.sbin/fmtree/test/test03.sh b/usr.sbin/fmtree/test/test03.sh
index bb3a5b5397e0..fb780fc9afa0 100644
--- a/usr.sbin/fmtree/test/test03.sh
+++ b/usr.sbin/fmtree/test/test03.sh
@@ -5,7 +5,6 @@
#
# Please see src/share/examples/etc/bsd-style-copyright.
#
-# $FreeBSD$
#
set -e
diff --git a/usr.sbin/fmtree/test/test04.sh b/usr.sbin/fmtree/test/test04.sh
index 38acda2bf469..5648c8a4aa96 100644
--- a/usr.sbin/fmtree/test/test04.sh
+++ b/usr.sbin/fmtree/test/test04.sh
@@ -5,7 +5,6 @@
#
# Please see src/share/examples/etc/bsd-style-copyright.
#
-# $FreeBSD$
#
set -e
diff --git a/usr.sbin/fmtree/test/test05.sh b/usr.sbin/fmtree/test/test05.sh
index eda544f4ff36..fa912b937436 100644
--- a/usr.sbin/fmtree/test/test05.sh
+++ b/usr.sbin/fmtree/test/test05.sh
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# Test for 'optional' keyword.
#
diff --git a/usr.sbin/freebsd-update/Makefile b/usr.sbin/freebsd-update/Makefile
index b64d5c78a88d..14e522adb1a0 100644
--- a/usr.sbin/freebsd-update/Makefile
+++ b/usr.sbin/freebsd-update/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
CONFS= freebsd-update.conf
SCRIPTS=freebsd-update.sh
diff --git a/usr.sbin/freebsd-update/Makefile.depend b/usr.sbin/freebsd-update/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/freebsd-update/Makefile.depend
+++ b/usr.sbin/freebsd-update/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/freebsd-update/freebsd-update.conf b/usr.sbin/freebsd-update/freebsd-update.conf
index 62e6acf96cc8..08cf512ce144 100644
--- a/usr.sbin/freebsd-update/freebsd-update.conf
+++ b/usr.sbin/freebsd-update/freebsd-update.conf
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Trusted keyprint. Changing this is a Bad Idea unless you've received
# a PGP-signed email from <security-officer@FreeBSD.org> telling you to
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
index ea4320ec25be..57023557839b 100644
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -27,8 +27,6 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-# $FreeBSD$
-
#### Usage function -- called from command-line handling code.
# Usage instructions. Options not listed:
diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile
index 161cd0cf3764..6f4aafd1f1bc 100644
--- a/usr.sbin/fstyp/Makefile
+++ b/usr.sbin/fstyp/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/fstyp/Makefile.depend b/usr.sbin/fstyp/Makefile.depend
index 9371e83a7830..d9a37d15fcb7 100644
--- a/usr.sbin/fstyp/Makefile.depend
+++ b/usr.sbin/fstyp/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/fstyp/Makefile.depend.options b/usr.sbin/fstyp/Makefile.depend.options
index d51fe0e13561..3bc806c5cc59 100644
--- a/usr.sbin/fstyp/Makefile.depend.options
+++ b/usr.sbin/fstyp/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= ZFS
diff --git a/usr.sbin/fstyp/tests/Makefile b/usr.sbin/fstyp/tests/Makefile
index c821bc9b45eb..99e7d4e2c51f 100644
--- a/usr.sbin/fstyp/tests/Makefile
+++ b/usr.sbin/fstyp/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= tests
diff --git a/usr.sbin/fstyp/tests/Makefile.depend b/usr.sbin/fstyp/tests/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/fstyp/tests/Makefile.depend
+++ b/usr.sbin/fstyp/tests/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/fstyp/tests/fstyp_test.sh b/usr.sbin/fstyp/tests/fstyp_test.sh
index 81c86d0beebc..af3516e02de1 100755
--- a/usr.sbin/fstyp/tests/fstyp_test.sh
+++ b/usr.sbin/fstyp/tests/fstyp_test.sh
@@ -25,8 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
-# $FreeBSD$
-
atf_test_case befs
befs_head() {
atf_set "descr" "fstyp(8) can detect BeFS and label filesystem"
diff --git a/usr.sbin/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/Makefile
index 768901f99131..12188b804edd 100644
--- a/usr.sbin/ftp-proxy/Makefile
+++ b/usr.sbin/ftp-proxy/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/contrib/pf/ftp-proxy
diff --git a/usr.sbin/ftp-proxy/Makefile.depend b/usr.sbin/ftp-proxy/Makefile.depend
index 34af16caac3e..96de75b86d39 100644
--- a/usr.sbin/ftp-proxy/Makefile.depend
+++ b/usr.sbin/ftp-proxy/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/fwcontrol/Makefile b/usr.sbin/fwcontrol/Makefile
index 4eb8611e8026..ae87135af919 100644
--- a/usr.sbin/fwcontrol/Makefile
+++ b/usr.sbin/fwcontrol/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= fwcontrol
SRCS= fwcontrol.c fwcrom.c fwdv.c fwmpegts.c
diff --git a/usr.sbin/fwcontrol/Makefile.depend b/usr.sbin/fwcontrol/Makefile.depend
index d5ed563ecfc8..ec18d8c500c6 100644
--- a/usr.sbin/fwcontrol/Makefile.depend
+++ b/usr.sbin/fwcontrol/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/getfmac/Makefile b/usr.sbin/getfmac/Makefile
index f9fa1b2e4462..d01845caf2ff 100644
--- a/usr.sbin/getfmac/Makefile
+++ b/usr.sbin/getfmac/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= getfmac
MAN= getfmac.8
diff --git a/usr.sbin/getfmac/Makefile.depend b/usr.sbin/getfmac/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/getfmac/Makefile.depend
+++ b/usr.sbin/getfmac/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/getpmac/Makefile b/usr.sbin/getpmac/Makefile
index 597472866526..b8da866b212e 100644
--- a/usr.sbin/getpmac/Makefile
+++ b/usr.sbin/getpmac/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= getpmac
MAN= getpmac.8
diff --git a/usr.sbin/getpmac/Makefile.depend b/usr.sbin/getpmac/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/getpmac/Makefile.depend
+++ b/usr.sbin/getpmac/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/gpioctl/Makefile b/usr.sbin/gpioctl/Makefile
index 3c86c9909091..dead7a46e202 100644
--- a/usr.sbin/gpioctl/Makefile
+++ b/usr.sbin/gpioctl/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= gpioctl
MAN= gpioctl.8
diff --git a/usr.sbin/gpioctl/Makefile.depend b/usr.sbin/gpioctl/Makefile.depend
index fd3b3da66347..93fa23d02939 100644
--- a/usr.sbin/gpioctl/Makefile.depend
+++ b/usr.sbin/gpioctl/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/gssd/Makefile b/usr.sbin/gssd/Makefile
index d22a01597ced..9621363296b5 100644
--- a/usr.sbin/gssd/Makefile
+++ b/usr.sbin/gssd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/gssd/Makefile.depend b/usr.sbin/gssd/Makefile.depend
index 8b377d145a7a..dea21228f223 100644
--- a/usr.sbin/gssd/Makefile.depend
+++ b/usr.sbin/gssd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/gssd/Makefile.depend.options b/usr.sbin/gssd/Makefile.depend.options
index 098025149aec..fa9c85522a73 100644
--- a/usr.sbin/gssd/Makefile.depend.options
+++ b/usr.sbin/gssd/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= KERBEROS_SUPPORT
diff --git a/usr.sbin/gstat/Makefile b/usr.sbin/gstat/Makefile
index 1c71f2285622..732d26e9e810 100644
--- a/usr.sbin/gstat/Makefile
+++ b/usr.sbin/gstat/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= gstat
MAN= gstat.8
diff --git a/usr.sbin/gstat/Makefile.depend b/usr.sbin/gstat/Makefile.depend
index 7a3e02950915..ccfa0ae0ece5 100644
--- a/usr.sbin/gstat/Makefile.depend
+++ b/usr.sbin/gstat/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/hyperv/Makefile b/usr.sbin/hyperv/Makefile
index d42817f4a747..f5a4cbd4810a 100644
--- a/usr.sbin/hyperv/Makefile
+++ b/usr.sbin/hyperv/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <bsd.own.mk>
diff --git a/usr.sbin/hyperv/Makefile.inc b/usr.sbin/hyperv/Makefile.inc
index edb012926dd1..ceaf3870d9bd 100644
--- a/usr.sbin/hyperv/Makefile.inc
+++ b/usr.sbin/hyperv/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
CFLAGS.gcc+= -Wno-uninitialized
.include "../Makefile.inc"
diff --git a/usr.sbin/hyperv/tools/Makefile.inc b/usr.sbin/hyperv/tools/Makefile.inc
index 7e09f324e3e4..1dc11073a2f3 100644
--- a/usr.sbin/hyperv/tools/Makefile.inc
+++ b/usr.sbin/hyperv/tools/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
CFLAGS.gcc+= -Wno-uninitialized
.include "../../Makefile.inc"
diff --git a/usr.sbin/hyperv/tools/kvp/Makefile b/usr.sbin/hyperv/tools/kvp/Makefile
index ca87371881fb..4fb5f68ce2b1 100644
--- a/usr.sbin/hyperv/tools/kvp/Makefile
+++ b/usr.sbin/hyperv/tools/kvp/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <bsd.own.mk>
diff --git a/usr.sbin/hyperv/tools/kvp/Makefile.depend b/usr.sbin/hyperv/tools/kvp/Makefile.depend
index d5ed563ecfc8..ec18d8c500c6 100644
--- a/usr.sbin/hyperv/tools/kvp/Makefile.depend
+++ b/usr.sbin/hyperv/tools/kvp/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/hyperv/tools/vss/Makefile b/usr.sbin/hyperv/tools/vss/Makefile
index d6fb6a3ef482..03bd6eccd54f 100644
--- a/usr.sbin/hyperv/tools/vss/Makefile
+++ b/usr.sbin/hyperv/tools/vss/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
DIRDEPS = lib/libc
.include <bsd.own.mk>
diff --git a/usr.sbin/hyperv/tools/vss/Makefile.depend b/usr.sbin/hyperv/tools/vss/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/hyperv/tools/vss/Makefile.depend
+++ b/usr.sbin/hyperv/tools/vss/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/i2c/Makefile b/usr.sbin/i2c/Makefile
index 9f377e6ac577..efcc7e950707 100644
--- a/usr.sbin/i2c/Makefile
+++ b/usr.sbin/i2c/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= i2c
MAN= i2c.8
diff --git a/usr.sbin/i2c/Makefile.depend b/usr.sbin/i2c/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/i2c/Makefile.depend
+++ b/usr.sbin/i2c/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ifmcstat/Makefile b/usr.sbin/ifmcstat/Makefile
index adf1304f3dda..0d5de3f6598f 100644
--- a/usr.sbin/ifmcstat/Makefile
+++ b/usr.sbin/ifmcstat/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ifmcstat/Makefile.depend b/usr.sbin/ifmcstat/Makefile.depend
index d5ed563ecfc8..ec18d8c500c6 100644
--- a/usr.sbin/ifmcstat/Makefile.depend
+++ b/usr.sbin/ifmcstat/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile
index b8f216970d7f..f57679e6cb1f 100644
--- a/usr.sbin/inetd/Makefile
+++ b/usr.sbin/inetd/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/inetd/Makefile.depend b/usr.sbin/inetd/Makefile.depend
index 69c4141352e1..3cbe5b8b5fd4 100644
--- a/usr.sbin/inetd/Makefile.depend
+++ b/usr.sbin/inetd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/inetd/Makefile.depend.options b/usr.sbin/inetd/Makefile.depend.options
index a62a5692d70a..fbc21670804e 100644
--- a/usr.sbin/inetd/Makefile.depend.options
+++ b/usr.sbin/inetd/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= TCP_WRAPPERS
diff --git a/usr.sbin/inetd/inetd.conf b/usr.sbin/inetd/inetd.conf
index 0444a6ad5fcd..7fef6c8fea0d 100644
--- a/usr.sbin/inetd/inetd.conf
+++ b/usr.sbin/inetd/inetd.conf
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# Internet server configuration database
#
diff --git a/usr.sbin/iostat/Makefile b/usr.sbin/iostat/Makefile
index 4d74fe163d0b..27efbad1cb2a 100644
--- a/usr.sbin/iostat/Makefile
+++ b/usr.sbin/iostat/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
PROG= iostat
MAN= iostat.8
diff --git a/usr.sbin/iostat/Makefile.depend b/usr.sbin/iostat/Makefile.depend
index 70e72f3ef71d..4cbbd240050a 100644
--- a/usr.sbin/iostat/Makefile.depend
+++ b/usr.sbin/iostat/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/iovctl/Makefile b/usr.sbin/iovctl/Makefile
index 42fca7dab71c..599fc41785e0 100644
--- a/usr.sbin/iovctl/Makefile
+++ b/usr.sbin/iovctl/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= iovctl
SRCS= iovctl.c parse.c validate.c
diff --git a/usr.sbin/iovctl/Makefile.depend b/usr.sbin/iovctl/Makefile.depend
index 2082bfb7951c..da84ed8852b5 100644
--- a/usr.sbin/iovctl/Makefile.depend
+++ b/usr.sbin/iovctl/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ip6addrctl/Makefile b/usr.sbin/ip6addrctl/Makefile
index f484461b3ccb..6fc277d39e63 100644
--- a/usr.sbin/ip6addrctl/Makefile
+++ b/usr.sbin/ip6addrctl/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= runtime
PROG= ip6addrctl
diff --git a/usr.sbin/ip6addrctl/Makefile.depend b/usr.sbin/ip6addrctl/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/ip6addrctl/Makefile.depend
+++ b/usr.sbin/ip6addrctl/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ip6addrctl/ip6addrctl.conf.sample b/usr.sbin/ip6addrctl/ip6addrctl.conf.sample
index a2b3759de5f7..edcf77553f14 100644
--- a/usr.sbin/ip6addrctl/ip6addrctl.conf.sample
+++ b/usr.sbin/ip6addrctl/ip6addrctl.conf.sample
@@ -1,7 +1,6 @@
# default policy table based on RFC 3484.
# usage: ip6addrctl install path_to_this_file
#
-# $FreeBSD$
#
#Format:
#Prefix Precedence Label
diff --git a/usr.sbin/ipfwpcap/Makefile b/usr.sbin/ipfwpcap/Makefile
index dbdd0cae2a56..e5a59fc951de 100644
--- a/usr.sbin/ipfwpcap/Makefile
+++ b/usr.sbin/ipfwpcap/Makefile
@@ -1,7 +1,6 @@
#
# From: Id: Makefile,v 1.2 2004/01/15 16:20:56 pkern Exp
#
-# $FreeBSD$
#
PROG= ipfwpcap
diff --git a/usr.sbin/ipfwpcap/Makefile.depend b/usr.sbin/ipfwpcap/Makefile.depend
index 893e74eb908c..e1dc00101c8d 100644
--- a/usr.sbin/ipfwpcap/Makefile.depend
+++ b/usr.sbin/ipfwpcap/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/iscsid/Makefile b/usr.sbin/iscsid/Makefile
index f9694866b7f6..a4fbcb368650 100644
--- a/usr.sbin/iscsid/Makefile
+++ b/usr.sbin/iscsid/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= iscsi
PROG= iscsid
diff --git a/usr.sbin/iscsid/Makefile.depend b/usr.sbin/iscsid/Makefile.depend
index aa7d77115eb0..48942b5c609a 100644
--- a/usr.sbin/iscsid/Makefile.depend
+++ b/usr.sbin/iscsid/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile
index de1e89e708f0..c81d94992e15 100644
--- a/usr.sbin/jail/Makefile
+++ b/usr.sbin/jail/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/jail/Makefile.depend b/usr.sbin/jail/Makefile.depend
index 7f608aab0712..2bb4d5e88936 100644
--- a/usr.sbin/jail/Makefile.depend
+++ b/usr.sbin/jail/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/jail/tests/Makefile b/usr.sbin/jail/tests/Makefile
index 216a5a581980..66f52faebaa9 100644
--- a/usr.sbin/jail/tests/Makefile
+++ b/usr.sbin/jail/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= tests
diff --git a/usr.sbin/jail/tests/commands.jail.conf b/usr.sbin/jail/tests/commands.jail.conf
index 8787af49eba0..4ea24ec6b058 100644
--- a/usr.sbin/jail/tests/commands.jail.conf
+++ b/usr.sbin/jail/tests/commands.jail.conf
@@ -1,4 +1,3 @@
-# $FreeBSD$
exec.prestop = "echo STOP";
exec.prestart = "echo START";
diff --git a/usr.sbin/jail/tests/jail_basic_test.sh b/usr.sbin/jail/tests/jail_basic_test.sh
index 0eedec65e5f9..a907e713ab9a 100755
--- a/usr.sbin/jail/tests/jail_basic_test.sh
+++ b/usr.sbin/jail/tests/jail_basic_test.sh
@@ -24,8 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
-# $FreeBSD$
-
atf_test_case "basic" "cleanup"
atf_test_case "nested" "cleanup"
atf_test_case "commands" "cleanup"
diff --git a/usr.sbin/jexec/Makefile b/usr.sbin/jexec/Makefile
index 3ecf5676dc55..89445c600a8a 100644
--- a/usr.sbin/jexec/Makefile
+++ b/usr.sbin/jexec/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= jexec
MAN= jexec.8
diff --git a/usr.sbin/jexec/Makefile.depend b/usr.sbin/jexec/Makefile.depend
index 98929049af54..777aff26b747 100644
--- a/usr.sbin/jexec/Makefile.depend
+++ b/usr.sbin/jexec/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/jls/Makefile b/usr.sbin/jls/Makefile
index 34a5023516cb..ffe5704859eb 100644
--- a/usr.sbin/jls/Makefile
+++ b/usr.sbin/jls/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/jls/Makefile.depend b/usr.sbin/jls/Makefile.depend
index d4d0b05e7f43..27cddbb252fb 100644
--- a/usr.sbin/jls/Makefile.depend
+++ b/usr.sbin/jls/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/kbdcontrol/Makefile b/usr.sbin/kbdcontrol/Makefile
index 5a15ef3c9da6..15ecca516e5f 100644
--- a/usr.sbin/kbdcontrol/Makefile
+++ b/usr.sbin/kbdcontrol/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= kbdcontrol
MAN= kbdcontrol.1 kbdmap.5
diff --git a/usr.sbin/kbdcontrol/Makefile.depend b/usr.sbin/kbdcontrol/Makefile.depend
index b3c7e9af13c7..933d46240ce3 100644
--- a/usr.sbin/kbdcontrol/Makefile.depend
+++ b/usr.sbin/kbdcontrol/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/kbdmap/Makefile b/usr.sbin/kbdmap/Makefile
index ec493416a573..a79c379ad76c 100644
--- a/usr.sbin/kbdmap/Makefile
+++ b/usr.sbin/kbdmap/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= kbdmap
LINKS= ${BINDIR}/kbdmap ${BINDIR}/vidfont
diff --git a/usr.sbin/kbdmap/Makefile.depend b/usr.sbin/kbdmap/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/kbdmap/Makefile.depend
+++ b/usr.sbin/kbdmap/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/keyserv/Makefile b/usr.sbin/keyserv/Makefile
index 367919271ee8..18eee0701606 100644
--- a/usr.sbin/keyserv/Makefile
+++ b/usr.sbin/keyserv/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= keyserv
MAN= keyserv.8
diff --git a/usr.sbin/keyserv/Makefile.depend b/usr.sbin/keyserv/Makefile.depend
index 97ec617dcc81..4d5f51972b9a 100644
--- a/usr.sbin/keyserv/Makefile.depend
+++ b/usr.sbin/keyserv/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/kgmon/Makefile b/usr.sbin/kgmon/Makefile
index 5f6a2a37950a..541ac609218c 100644
--- a/usr.sbin/kgmon/Makefile
+++ b/usr.sbin/kgmon/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
PROG= kgmon
MAN= kgmon.8
diff --git a/usr.sbin/kgmon/Makefile.depend b/usr.sbin/kgmon/Makefile.depend
index 4a0ebeceed6f..53188eaeca15 100644
--- a/usr.sbin/kgmon/Makefile.depend
+++ b/usr.sbin/kgmon/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/kldxref/Makefile b/usr.sbin/kldxref/Makefile
index c22960c54e3a..3d4ce7163b48 100644
--- a/usr.sbin/kldxref/Makefile
+++ b/usr.sbin/kldxref/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= runtime
PROG= kldxref
diff --git a/usr.sbin/kldxref/Makefile.depend b/usr.sbin/kldxref/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/kldxref/Makefile.depend
+++ b/usr.sbin/kldxref/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/lastlogin/Makefile b/usr.sbin/lastlogin/Makefile
index 14a4cc03b5d7..b595837075ee 100644
--- a/usr.sbin/lastlogin/Makefile
+++ b/usr.sbin/lastlogin/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= lastlogin
PACKAGE= acct
diff --git a/usr.sbin/lastlogin/Makefile.depend b/usr.sbin/lastlogin/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/lastlogin/Makefile.depend
+++ b/usr.sbin/lastlogin/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/lpr/Makefile b/usr.sbin/lpr/Makefile
index 5873c0758a9a..a36ad649501d 100644
--- a/usr.sbin/lpr/Makefile
+++ b/usr.sbin/lpr/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= common_source .WAIT \
chkprintcap lp lpc lpd lpq lpr lprm lptest pac \
diff --git a/usr.sbin/lpr/Makefile.inc b/usr.sbin/lpr/Makefile.inc
index 59f8ceb1ed55..20800c3bb080 100644
--- a/usr.sbin/lpr/Makefile.inc
+++ b/usr.sbin/lpr/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile
index c8378dc97a41..4895305ba9bb 100644
--- a/usr.sbin/lpr/chkprintcap/Makefile
+++ b/usr.sbin/lpr/chkprintcap/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${.CURDIR:H}/common_source
diff --git a/usr.sbin/lpr/chkprintcap/Makefile.depend b/usr.sbin/lpr/chkprintcap/Makefile.depend
index 5ca32400912b..7684add9aeba 100644
--- a/usr.sbin/lpr/chkprintcap/Makefile.depend
+++ b/usr.sbin/lpr/chkprintcap/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/lpr/common_source/Makefile b/usr.sbin/lpr/common_source/Makefile
index 4f148f9d4c46..1d3a10a60ae3 100644
--- a/usr.sbin/lpr/common_source/Makefile
+++ b/usr.sbin/lpr/common_source/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# Library of internal routines for the print spooler suite.
diff --git a/usr.sbin/lpr/common_source/Makefile.depend b/usr.sbin/lpr/common_source/Makefile.depend
index 56ba32964b9d..f2b0559818dd 100644
--- a/usr.sbin/lpr/common_source/Makefile.depend
+++ b/usr.sbin/lpr/common_source/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/lpr/filters.ru/Makefile b/usr.sbin/lpr/filters.ru/Makefile
index ee15541fae74..c3f7e6162369 100644
--- a/usr.sbin/lpr/filters.ru/Makefile
+++ b/usr.sbin/lpr/filters.ru/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= koi2alt koi2855
diff --git a/usr.sbin/lpr/filters.ru/Makefile.depend b/usr.sbin/lpr/filters.ru/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/lpr/filters.ru/Makefile.depend
+++ b/usr.sbin/lpr/filters.ru/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/lpr/filters.ru/Makefile.inc b/usr.sbin/lpr/filters.ru/Makefile.inc
index 36a6f4641306..ee7dbae5aef7 100644
--- a/usr.sbin/lpr/filters.ru/Makefile.inc
+++ b/usr.sbin/lpr/filters.ru/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
BINDIR= /usr/libexec/lpr/ru
diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile b/usr.sbin/lpr/filters.ru/koi2855/Makefile
index 564867d2be7c..ec6d8cb2c198 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/Makefile
+++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= koi2855
MAN=
diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend b/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend
+++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile b/usr.sbin/lpr/filters.ru/koi2alt/Makefile
index 4e2f7853ddab..84a1e1eb4b00 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile
+++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= koi2alt
MAN=
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend b/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend
+++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile
index a984e78980d0..26200c52bb11 100644
--- a/usr.sbin/lpr/filters/Makefile
+++ b/usr.sbin/lpr/filters/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
BINDIR= ${LIBEXECDIR}/lpr
diff --git a/usr.sbin/lpr/filters/Makefile.depend b/usr.sbin/lpr/filters/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/lpr/filters/Makefile.depend
+++ b/usr.sbin/lpr/filters/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/lpr/lp/Makefile b/usr.sbin/lpr/lp/Makefile
index 2fcec43ec80b..c726c0bb25ee 100644
--- a/usr.sbin/lpr/lp/Makefile
+++ b/usr.sbin/lpr/lp/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
BINDIR= /usr/bin
diff --git a/usr.sbin/lpr/lp/Makefile.depend b/usr.sbin/lpr/lp/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/lpr/lp/Makefile.depend
+++ b/usr.sbin/lpr/lp/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/lpr/lp/lp.sh b/usr.sbin/lpr/lp/lp.sh
index af6b9d16880b..114b8e579ebc 100644
--- a/usr.sbin/lpr/lp/lp.sh
+++ b/usr.sbin/lpr/lp/lp.sh
@@ -38,7 +38,6 @@
#
# Posix 1003.2 compliant print spooler interface.
#
-# $FreeBSD$
#
ncopies=""
diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile
index ab972a5c888b..0b96e15e2e6f 100644
--- a/usr.sbin/lpr/lpc/Makefile
+++ b/usr.sbin/lpr/lpc/Makefile
@@ -1,5 +1,4 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
.PATH: ${.CURDIR:H}/common_source
diff --git a/usr.sbin/lpr/lpc/Makefile.depend b/usr.sbin/lpr/lpc/Makefile.depend
index e59ad46a72f3..bcaf82957b6d 100644
--- a/usr.sbin/lpr/lpc/Makefile.depend
+++ b/usr.sbin/lpr/lpc/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index 6a152c46268f..6e9bc207642f 100644
--- a/usr.sbin/lpr/lpd/Makefile
+++ b/usr.sbin/lpr/lpd/Makefile
@@ -1,5 +1,4 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
CONFS= hosts.lpd printcap
PROG= lpd
diff --git a/usr.sbin/lpr/lpd/Makefile.depend b/usr.sbin/lpr/lpd/Makefile.depend
index 288e8eec083e..41d727bf11f6 100644
--- a/usr.sbin/lpr/lpd/Makefile.depend
+++ b/usr.sbin/lpr/lpd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/lpr/lpd/hosts.lpd b/usr.sbin/lpr/lpd/hosts.lpd
index b53202ab18e5..c440bdec992e 100644
--- a/usr.sbin/lpr/lpd/hosts.lpd
+++ b/usr.sbin/lpr/lpd/hosts.lpd
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# See lpd(8)
#machine.domain
diff --git a/usr.sbin/lpr/lpd/printcap b/usr.sbin/lpr/lpd/printcap
index b1f83b344c8f..96eb0fccff0e 100644
--- a/usr.sbin/lpr/lpd/printcap
+++ b/usr.sbin/lpr/lpd/printcap
@@ -1,5 +1,4 @@
# @(#)printcap 5.3 (Berkeley) 6/30/90
-# $FreeBSD$
#
# This enables a simple local "raw" printer, hooked up to the first
diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile
index 3ce7182480f0..328304f2203f 100644
--- a/usr.sbin/lpr/lpq/Makefile
+++ b/usr.sbin/lpr/lpq/Makefile
@@ -1,5 +1,4 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
BINDIR= /usr/bin
diff --git a/usr.sbin/lpr/lpq/Makefile.depend b/usr.sbin/lpr/lpq/Makefile.depend
index 5ca32400912b..7684add9aeba 100644
--- a/usr.sbin/lpr/lpq/Makefile.depend
+++ b/usr.sbin/lpr/lpq/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile
index a25bb87f2f44..e55e879e4ae1 100644
--- a/usr.sbin/lpr/lpr/Makefile
+++ b/usr.sbin/lpr/lpr/Makefile
@@ -1,5 +1,4 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
.PATH: ${.CURDIR:H}/common_source
diff --git a/usr.sbin/lpr/lpr/Makefile.depend b/usr.sbin/lpr/lpr/Makefile.depend
index 5ca32400912b..7684add9aeba 100644
--- a/usr.sbin/lpr/lpr/Makefile.depend
+++ b/usr.sbin/lpr/lpr/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile
index 8e882c3f8c1b..da1fd69eded8 100644
--- a/usr.sbin/lpr/lprm/Makefile
+++ b/usr.sbin/lpr/lprm/Makefile
@@ -1,5 +1,4 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
.PATH: ${.CURDIR:H}/common_source
diff --git a/usr.sbin/lpr/lprm/Makefile.depend b/usr.sbin/lpr/lprm/Makefile.depend
index 5ca32400912b..7684add9aeba 100644
--- a/usr.sbin/lpr/lprm/Makefile.depend
+++ b/usr.sbin/lpr/lprm/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/lpr/lptest/Makefile b/usr.sbin/lpr/lptest/Makefile
index 18083e529d3b..3129fa913e39 100644
--- a/usr.sbin/lpr/lptest/Makefile
+++ b/usr.sbin/lpr/lptest/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
PROG= lptest
diff --git a/usr.sbin/lpr/lptest/Makefile.depend b/usr.sbin/lpr/lptest/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/usr.sbin/lpr/lptest/Makefile.depend
+++ b/usr.sbin/lpr/lptest/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile
index 81ffc5c96c21..35f7808564cc 100644
--- a/usr.sbin/lpr/pac/Makefile
+++ b/usr.sbin/lpr/pac/Makefile
@@ -1,5 +1,4 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
.PATH: ${.CURDIR:H}/common_source
diff --git a/usr.sbin/lpr/pac/Makefile.depend b/usr.sbin/lpr/pac/Makefile.depend
index 5ca32400912b..7684add9aeba 100644
--- a/usr.sbin/lpr/pac/Makefile.depend
+++ b/usr.sbin/lpr/pac/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/lptcontrol/Makefile b/usr.sbin/lptcontrol/Makefile
index 0cff6202fafa..2a34ba9d6382 100644
--- a/usr.sbin/lptcontrol/Makefile
+++ b/usr.sbin/lptcontrol/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= lptcontrol
MAN= lptcontrol.8
diff --git a/usr.sbin/lptcontrol/Makefile.depend b/usr.sbin/lptcontrol/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/usr.sbin/lptcontrol/Makefile.depend
+++ b/usr.sbin/lptcontrol/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile
index b8dd89225551..e752c61325db 100644
--- a/usr.sbin/mailstats/Makefile
+++ b/usr.sbin/mailstats/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.2 (Berkeley) 9/21/96
-# $FreeBSD$
SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/mailstats
diff --git a/usr.sbin/mailstats/Makefile.depend b/usr.sbin/mailstats/Makefile.depend
index d1b41fcc8417..606c2143ac22 100644
--- a/usr.sbin/mailstats/Makefile.depend
+++ b/usr.sbin/mailstats/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile
index 28e0c3c1ce6d..50cf7229d37d 100644
--- a/usr.sbin/mailwrapper/Makefile
+++ b/usr.sbin/mailwrapper/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/mailwrapper/Makefile.depend b/usr.sbin/mailwrapper/Makefile.depend
index 991757ecadc0..ffc295f2fe8a 100644
--- a/usr.sbin/mailwrapper/Makefile.depend
+++ b/usr.sbin/mailwrapper/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile
index 3fea648f9383..b3f6c08fe361 100644
--- a/usr.sbin/makefs/Makefile
+++ b/usr.sbin/makefs/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SRCDIR:=${.PARSEDIR:tA}
diff --git a/usr.sbin/makefs/Makefile.depend b/usr.sbin/makefs/Makefile.depend
index 00df4e89c233..b5ea35e70f2e 100644
--- a/usr.sbin/makefs/Makefile.depend
+++ b/usr.sbin/makefs/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/makefs/cd9660/Makefile.inc b/usr.sbin/makefs/cd9660/Makefile.inc
index b5012a323699..be08e8e34cd9 100644
--- a/usr.sbin/makefs/cd9660/Makefile.inc
+++ b/usr.sbin/makefs/cd9660/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
.PATH: ${SRCDIR}/cd9660
diff --git a/usr.sbin/makefs/ffs/Makefile.inc b/usr.sbin/makefs/ffs/Makefile.inc
index cff2c30b67c5..bf62ac8bf926 100644
--- a/usr.sbin/makefs/ffs/Makefile.inc
+++ b/usr.sbin/makefs/ffs/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
.PATH: ${SRCDIR}/ffs ${SRCTOP}/sys/ufs/ffs
diff --git a/usr.sbin/makefs/msdos/Makefile.inc b/usr.sbin/makefs/msdos/Makefile.inc
index fa3890d8393b..3fb55c5394fc 100644
--- a/usr.sbin/makefs/msdos/Makefile.inc
+++ b/usr.sbin/makefs/msdos/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
MSDOS= ${SRCTOP}/sys/fs/msdosfs
diff --git a/usr.sbin/makefs/tests/Makefile b/usr.sbin/makefs/tests/Makefile
index 85e4b233aea7..a99186593d53 100644
--- a/usr.sbin/makefs/tests/Makefile
+++ b/usr.sbin/makefs/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
ATF_TESTS_SH+= makefs_cd9660_tests
ATF_TESTS_SH+= makefs_ffs_tests
diff --git a/usr.sbin/makefs/tests/Makefile.depend b/usr.sbin/makefs/tests/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/makefs/tests/Makefile.depend
+++ b/usr.sbin/makefs/tests/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh
index 8a3ac1684032..3f9b37abee4c 100644
--- a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh
+++ b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh
@@ -24,7 +24,6 @@
# (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$
#
# A note on specs:
diff --git a/usr.sbin/makefs/tests/makefs_ffs_tests.sh b/usr.sbin/makefs/tests/makefs_ffs_tests.sh
index 1a415cb5f518..fafec4c885fb 100644
--- a/usr.sbin/makefs/tests/makefs_ffs_tests.sh
+++ b/usr.sbin/makefs/tests/makefs_ffs_tests.sh
@@ -24,7 +24,6 @@
# (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$
#
MAKEFS="makefs -t ffs"
diff --git a/usr.sbin/makefs/tests/makefs_tests_common.sh b/usr.sbin/makefs/tests/makefs_tests_common.sh
index 5eb4ee5bf9f5..08f687fa44a4 100644
--- a/usr.sbin/makefs/tests/makefs_tests_common.sh
+++ b/usr.sbin/makefs/tests/makefs_tests_common.sh
@@ -24,7 +24,6 @@
# (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$
#
KB=1024
diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile
index 2477060b7937..ec1aeaecff8c 100644
--- a/usr.sbin/makemap/Makefile
+++ b/usr.sbin/makemap/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.4 (Berkeley) 6/10/97
-# $FreeBSD$
SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/makemap
diff --git a/usr.sbin/makemap/Makefile.depend b/usr.sbin/makemap/Makefile.depend
index 0feabbf167e0..58a2e5370106 100644
--- a/usr.sbin/makemap/Makefile.depend
+++ b/usr.sbin/makemap/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/manctl/Makefile b/usr.sbin/manctl/Makefile
index 9e0c12ecb9a9..e550b78644d8 100644
--- a/usr.sbin/manctl/Makefile
+++ b/usr.sbin/manctl/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SCRIPTS=manctl.sh
MAN= manctl.8
diff --git a/usr.sbin/manctl/Makefile.depend b/usr.sbin/manctl/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/manctl/Makefile.depend
+++ b/usr.sbin/manctl/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/manctl/manctl.sh b/usr.sbin/manctl/manctl.sh
index e79da64868a9..048066379584 100644
--- a/usr.sbin/manctl/manctl.sh
+++ b/usr.sbin/manctl/manctl.sh
@@ -32,7 +32,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# manctl:
# a utility for manipulating manual pages
diff --git a/usr.sbin/memcontrol/Makefile b/usr.sbin/memcontrol/Makefile
index d465d531a3e9..6010a24ad082 100644
--- a/usr.sbin/memcontrol/Makefile
+++ b/usr.sbin/memcontrol/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= memcontrol
MAN= memcontrol.8
diff --git a/usr.sbin/memcontrol/Makefile.depend b/usr.sbin/memcontrol/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/memcontrol/Makefile.depend
+++ b/usr.sbin/memcontrol/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile
index 257fbeba4ca4..9dd7e2193db3 100644
--- a/usr.sbin/mergemaster/Makefile
+++ b/usr.sbin/mergemaster/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SCRIPTS=mergemaster.sh
MAN= mergemaster.8
diff --git a/usr.sbin/mergemaster/Makefile.depend b/usr.sbin/mergemaster/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/mergemaster/Makefile.depend
+++ b/usr.sbin/mergemaster/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 4a19dda8ff9d..b22affc4c343 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -8,8 +8,6 @@
# Copyright (c) 1998-2012 Douglas Barton, All rights reserved
# Please see detailed copyright below
-# $FreeBSD$
-
PATH=/bin:/usr/bin:/usr/sbin
display_usage () {
diff --git a/usr.sbin/mfiutil/Makefile b/usr.sbin/mfiutil/Makefile
index dc6f3e481593..0523606e55bf 100644
--- a/usr.sbin/mfiutil/Makefile
+++ b/usr.sbin/mfiutil/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= mfiutil
SRCS= mfiutil.c mfi_bbu.c mfi_cmd.c mfi_config.c mfi_drive.c mfi_evt.c \
diff --git a/usr.sbin/mfiutil/Makefile.depend b/usr.sbin/mfiutil/Makefile.depend
index 991757ecadc0..ffc295f2fe8a 100644
--- a/usr.sbin/mfiutil/Makefile.depend
+++ b/usr.sbin/mfiutil/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/mixer/Makefile b/usr.sbin/mixer/Makefile
index dce135bc7891..1fd428047515 100644
--- a/usr.sbin/mixer/Makefile
+++ b/usr.sbin/mixer/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/mixer/Makefile.depend b/usr.sbin/mixer/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/mixer/Makefile.depend
+++ b/usr.sbin/mixer/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/mixer/tests/Makefile b/usr.sbin/mixer/tests/Makefile
index 032cab369f7e..e45eb040e3e0 100644
--- a/usr.sbin/mixer/tests/Makefile
+++ b/usr.sbin/mixer/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
ATF_TESTS_SH+= mixer_test
diff --git a/usr.sbin/mixer/tests/mixer_test.sh b/usr.sbin/mixer/tests/mixer_test.sh
index 87416a668fbc..dd54ea10614f 100755
--- a/usr.sbin/mixer/tests/mixer_test.sh
+++ b/usr.sbin/mixer/tests/mixer_test.sh
@@ -24,8 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
-# $FreeBSD$
-
mixer_unavailable()
{
! { mixer && mixer vol; } >/dev/null 2>&1
diff --git a/usr.sbin/mld6query/Makefile b/usr.sbin/mld6query/Makefile
index 33503600d164..270acdc9ede6 100644
--- a/usr.sbin/mld6query/Makefile
+++ b/usr.sbin/mld6query/Makefile
@@ -12,7 +12,6 @@
# LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE.
#
-# $FreeBSD$
PROG= mld6query
MAN= mld6query.8
diff --git a/usr.sbin/mld6query/Makefile.depend b/usr.sbin/mld6query/Makefile.depend
index d5ed563ecfc8..ec18d8c500c6 100644
--- a/usr.sbin/mld6query/Makefile.depend
+++ b/usr.sbin/mld6query/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/mlx5tool/Makefile b/usr.sbin/mlx5tool/Makefile
index c8d0277c541d..b6896b270b89 100644
--- a/usr.sbin/mlx5tool/Makefile
+++ b/usr.sbin/mlx5tool/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= mlx-tools
diff --git a/usr.sbin/mlxcontrol/Makefile b/usr.sbin/mlxcontrol/Makefile
index 5a425fd003da..d18ed4ac77a5 100644
--- a/usr.sbin/mlxcontrol/Makefile
+++ b/usr.sbin/mlxcontrol/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= mlxcontrol
MAN= mlxcontrol.8
diff --git a/usr.sbin/mlxcontrol/Makefile.depend b/usr.sbin/mlxcontrol/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/mlxcontrol/Makefile.depend
+++ b/usr.sbin/mlxcontrol/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/mount_smbfs/Makefile b/usr.sbin/mount_smbfs/Makefile
index 64f428035700..8a60ef9551ff 100644
--- a/usr.sbin/mount_smbfs/Makefile
+++ b/usr.sbin/mount_smbfs/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= mount_smbfs
SRCS= mount_smbfs.c getmntopts.c
diff --git a/usr.sbin/mount_smbfs/Makefile.depend b/usr.sbin/mount_smbfs/Makefile.depend
index 6d0625c20465..a349d8b96d94 100644
--- a/usr.sbin/mount_smbfs/Makefile.depend
+++ b/usr.sbin/mount_smbfs/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/mountd/Makefile b/usr.sbin/mountd/Makefile
index bc16512c5a26..cc8c10495376 100644
--- a/usr.sbin/mountd/Makefile
+++ b/usr.sbin/mountd/Makefile
@@ -1,5 +1,4 @@
# From: @(#)Makefile 8.3 (Berkeley) 1/25/94
-# $FreeBSD$
PROG= mountd
SRCS= mountd.c getmntopts.c
diff --git a/usr.sbin/mountd/Makefile.depend b/usr.sbin/mountd/Makefile.depend
index 741d5bc5bd59..9d865d4fd2eb 100644
--- a/usr.sbin/mountd/Makefile.depend
+++ b/usr.sbin/mountd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/moused/Makefile b/usr.sbin/moused/Makefile
index 0f9eac5b2417..f4f3873e364b 100644
--- a/usr.sbin/moused/Makefile
+++ b/usr.sbin/moused/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= moused
MAN= moused.8
diff --git a/usr.sbin/moused/Makefile.depend b/usr.sbin/moused/Makefile.depend
index a015e205da56..1eb6d2ed64a8 100644
--- a/usr.sbin/moused/Makefile.depend
+++ b/usr.sbin/moused/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/mpsutil/Makefile b/usr.sbin/mpsutil/Makefile
index 0bc981366650..a19c2f310167 100644
--- a/usr.sbin/mpsutil/Makefile
+++ b/usr.sbin/mpsutil/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= mpsutil
SRCS= mps_cmd.c mps_debug.c mps_flash.c mps_set.c mps_show.c mps_slot.c mpsutil.c
diff --git a/usr.sbin/mpsutil/Makefile.depend b/usr.sbin/mpsutil/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/mpsutil/Makefile.depend
+++ b/usr.sbin/mpsutil/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/mptable/Makefile b/usr.sbin/mptable/Makefile
index cff7602f1e66..08a0bc1024e3 100644
--- a/usr.sbin/mptable/Makefile
+++ b/usr.sbin/mptable/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= mptable
diff --git a/usr.sbin/mptable/Makefile.depend b/usr.sbin/mptable/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/mptable/Makefile.depend
+++ b/usr.sbin/mptable/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/mptutil/Makefile b/usr.sbin/mptutil/Makefile
index 2054c26c5649..6d7e79338f6a 100644
--- a/usr.sbin/mptutil/Makefile
+++ b/usr.sbin/mptutil/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= mptutil
SRCS= mptutil.c mpt_cam.c mpt_cmd.c mpt_config.c mpt_drive.c mpt_evt.c \
diff --git a/usr.sbin/mptutil/Makefile.depend b/usr.sbin/mptutil/Makefile.depend
index ee06e1c20939..b45d0c221240 100644
--- a/usr.sbin/mptutil/Makefile.depend
+++ b/usr.sbin/mptutil/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/mtest/Makefile b/usr.sbin/mtest/Makefile
index 8afee2a87435..9efd1e8d716f 100644
--- a/usr.sbin/mtest/Makefile
+++ b/usr.sbin/mtest/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/mtest/Makefile.depend b/usr.sbin/mtest/Makefile.depend
index d5ed563ecfc8..ec18d8c500c6 100644
--- a/usr.sbin/mtest/Makefile.depend
+++ b/usr.sbin/mtest/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ndiscvt/Makefile b/usr.sbin/ndiscvt/Makefile
index a8be84fe7255..e269f393c1a7 100644
--- a/usr.sbin/ndiscvt/Makefile
+++ b/usr.sbin/ndiscvt/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/sys/compat/ndis
diff --git a/usr.sbin/ndiscvt/Makefile.depend b/usr.sbin/ndiscvt/Makefile.depend
index af1fb7abc88e..eb31c15a8cf9 100644
--- a/usr.sbin/ndiscvt/Makefile.depend
+++ b/usr.sbin/ndiscvt/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ndiscvt/ndisgen.sh b/usr.sbin/ndiscvt/ndisgen.sh
index c5a0dbd4fc46..d36f2fa2c35d 100644
--- a/usr.sbin/ndiscvt/ndisgen.sh
+++ b/usr.sbin/ndiscvt/ndisgen.sh
@@ -32,7 +32,6 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
# THE POSSIBILITY OF SUCH DAMAGE.
#
-# $FreeBSD$
#
header () {
diff --git a/usr.sbin/ndp/Makefile b/usr.sbin/ndp/Makefile
index 84eb586083b3..da2f365a3584 100644
--- a/usr.sbin/ndp/Makefile
+++ b/usr.sbin/ndp/Makefile
@@ -11,7 +11,6 @@
# AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
# LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE.
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ndp/Makefile.depend b/usr.sbin/ndp/Makefile.depend
index d5ed563ecfc8..ec18d8c500c6 100644
--- a/usr.sbin/ndp/Makefile.depend
+++ b/usr.sbin/ndp/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile
index a0f933333320..b2e945b6215a 100644
--- a/usr.sbin/newsyslog/Makefile
+++ b/usr.sbin/newsyslog/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/newsyslog/Makefile.depend b/usr.sbin/newsyslog/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/newsyslog/Makefile.depend
+++ b/usr.sbin/newsyslog/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/newsyslog/newsyslog.conf b/usr.sbin/newsyslog/newsyslog.conf
index 80e8270935a1..f2cae3251f44 100644
--- a/usr.sbin/newsyslog/newsyslog.conf
+++ b/usr.sbin/newsyslog/newsyslog.conf
@@ -1,5 +1,4 @@
# configuration file for newsyslog
-# $FreeBSD$
#
# Entries which do not specify the '/pid_file' field will cause the
# syslogd process to be signalled when that log file is rotated. This
diff --git a/usr.sbin/newsyslog/newsyslog.conf.d/Makefile b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile
index 1c8980c2e383..4b2dff13723b 100644
--- a/usr.sbin/newsyslog/newsyslog.conf.d/Makefile
+++ b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/newsyslog/newsyslog.conf.d/Makefile.depend b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/newsyslog/newsyslog.conf.d/Makefile.depend
+++ b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/newsyslog/newsyslog.conf.d/amd.conf b/usr.sbin/newsyslog/newsyslog.conf.d/amd.conf
index 329652dd5135..6b1abc706b4a 100644
--- a/usr.sbin/newsyslog/newsyslog.conf.d/amd.conf
+++ b/usr.sbin/newsyslog/newsyslog.conf.d/amd.conf
@@ -1,2 +1 @@
-# $FreeBSD$
/var/log/amd.log 644 7 1000 * J
diff --git a/usr.sbin/newsyslog/newsyslog.conf.d/ftp.conf b/usr.sbin/newsyslog/newsyslog.conf.d/ftp.conf
index c12e24d7066f..f935a9a20f6c 100644
--- a/usr.sbin/newsyslog/newsyslog.conf.d/ftp.conf
+++ b/usr.sbin/newsyslog/newsyslog.conf.d/ftp.conf
@@ -1,2 +1 @@
-# $FreeBSD$
/var/log/xferlog 600 7 1000 * JC
diff --git a/usr.sbin/newsyslog/newsyslog.conf.d/lpr.conf b/usr.sbin/newsyslog/newsyslog.conf.d/lpr.conf
index 5febb309c6ec..a797cd6b7a66 100644
--- a/usr.sbin/newsyslog/newsyslog.conf.d/lpr.conf
+++ b/usr.sbin/newsyslog/newsyslog.conf.d/lpr.conf
@@ -1,2 +1 @@
-# $FreeBSD$
/var/log/lpd-errs 644 7 1000 * JC
diff --git a/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf b/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf
index db7113f25afd..5c7d1c74fdbf 100644
--- a/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf
+++ b/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf
@@ -1,3 +1,2 @@
-# $FreeBSD$
/var/log/opensm.log 600 7 1000 * J /var/run/opensm.pid 30
diff --git a/usr.sbin/newsyslog/newsyslog.conf.d/pf.conf b/usr.sbin/newsyslog/newsyslog.conf.d/pf.conf
index 7c41c816c1ff..0fe6186f24a7 100644
--- a/usr.sbin/newsyslog/newsyslog.conf.d/pf.conf
+++ b/usr.sbin/newsyslog/newsyslog.conf.d/pf.conf
@@ -1,2 +1 @@
-# $FreeBSD$
/var/log/pflog 600 3 1000 * JB /var/run/pflogd.pid
diff --git a/usr.sbin/newsyslog/newsyslog.conf.d/ppp.conf b/usr.sbin/newsyslog/newsyslog.conf.d/ppp.conf
index 198579dae27a..02eaeccfec67 100644
--- a/usr.sbin/newsyslog/newsyslog.conf.d/ppp.conf
+++ b/usr.sbin/newsyslog/newsyslog.conf.d/ppp.conf
@@ -1,2 +1 @@
-# $FreeBSD$
/var/log/ppp.log root:network 640 3 1000 * JC
diff --git a/usr.sbin/newsyslog/newsyslog.conf.d/sendmail.conf b/usr.sbin/newsyslog/newsyslog.conf.d/sendmail.conf
index 5cb59c4e8c18..9553cd02eafb 100644
--- a/usr.sbin/newsyslog/newsyslog.conf.d/sendmail.conf
+++ b/usr.sbin/newsyslog/newsyslog.conf.d/sendmail.conf
@@ -1,2 +1 @@
-# $FreeBSD$
/var/log/sendmail.st 640 10 * 168 BN
diff --git a/usr.sbin/newsyslog/tests/Makefile b/usr.sbin/newsyslog/tests/Makefile
index 802a44c01012..3adc1eec5d42 100644
--- a/usr.sbin/newsyslog/tests/Makefile
+++ b/usr.sbin/newsyslog/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
TAP_TESTS_SH= legacy_test
diff --git a/usr.sbin/newsyslog/tests/Makefile.depend b/usr.sbin/newsyslog/tests/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/newsyslog/tests/Makefile.depend
+++ b/usr.sbin/newsyslog/tests/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/newsyslog/tests/legacy_test.sh b/usr.sbin/newsyslog/tests/legacy_test.sh
index a16059b6fa9c..5aecdeacd10a 100644
--- a/usr.sbin/newsyslog/tests/legacy_test.sh
+++ b/usr.sbin/newsyslog/tests/legacy_test.sh
@@ -1,7 +1,5 @@
#!/bin/sh
-# $FreeBSD$
-
# A regular expression matching the format of an RFC-5424 log line header,
# including the timestamp up through the seconds indicator; it does not include
# the (optional) timezone offset.
diff --git a/usr.sbin/nfscbd/Makefile b/usr.sbin/nfscbd/Makefile
index 668914a88154..5703601b9ac3 100644
--- a/usr.sbin/nfscbd/Makefile
+++ b/usr.sbin/nfscbd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= nfs
diff --git a/usr.sbin/nfscbd/Makefile.depend b/usr.sbin/nfscbd/Makefile.depend
index 74a3ee19f459..ab57d98e628f 100644
--- a/usr.sbin/nfscbd/Makefile.depend
+++ b/usr.sbin/nfscbd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/nfsd/Makefile b/usr.sbin/nfsd/Makefile
index e9d9b31fd168..9317b57b153f 100644
--- a/usr.sbin/nfsd/Makefile
+++ b/usr.sbin/nfsd/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
-# $FreeBSD$
PACKAGE= nfs
diff --git a/usr.sbin/nfsd/Makefile.depend b/usr.sbin/nfsd/Makefile.depend
index faed4b4cc2aa..f4ffb731c7f2 100644
--- a/usr.sbin/nfsd/Makefile.depend
+++ b/usr.sbin/nfsd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/nfsdumpstate/Makefile b/usr.sbin/nfsdumpstate/Makefile
index 49f14d7ba4ab..c55425965630 100644
--- a/usr.sbin/nfsdumpstate/Makefile
+++ b/usr.sbin/nfsdumpstate/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/nfsdumpstate/Makefile.depend b/usr.sbin/nfsdumpstate/Makefile.depend
index d5ed563ecfc8..ec18d8c500c6 100644
--- a/usr.sbin/nfsdumpstate/Makefile.depend
+++ b/usr.sbin/nfsdumpstate/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/nfsrevoke/Makefile b/usr.sbin/nfsrevoke/Makefile
index 3583d5e8a67a..f4c1146e2084 100644
--- a/usr.sbin/nfsrevoke/Makefile
+++ b/usr.sbin/nfsrevoke/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= nfs
diff --git a/usr.sbin/nfsrevoke/Makefile.depend b/usr.sbin/nfsrevoke/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/nfsrevoke/Makefile.depend
+++ b/usr.sbin/nfsrevoke/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/nfsuserd/Makefile b/usr.sbin/nfsuserd/Makefile
index c8a3553191a7..be27b4d044c1 100644
--- a/usr.sbin/nfsuserd/Makefile
+++ b/usr.sbin/nfsuserd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/nfsuserd/Makefile.depend b/usr.sbin/nfsuserd/Makefile.depend
index 74a3ee19f459..ab57d98e628f 100644
--- a/usr.sbin/nfsuserd/Makefile.depend
+++ b/usr.sbin/nfsuserd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile
index a4831523c3fc..72a5ccaa96d7 100644
--- a/usr.sbin/ngctl/Makefile
+++ b/usr.sbin/ngctl/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
# $Whistle: Makefile,v 1.3 1999/01/16 00:10:11 archie Exp $
.include <src.opts.mk>
diff --git a/usr.sbin/ngctl/Makefile.depend b/usr.sbin/ngctl/Makefile.depend
index 6f7dfbccc4f0..16bbc85dbe7c 100644
--- a/usr.sbin/ngctl/Makefile.depend
+++ b/usr.sbin/ngctl/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ngctl/Makefile.depend.options b/usr.sbin/ngctl/Makefile.depend.options
index 67c3a5d932ef..7ed4c9792550 100644
--- a/usr.sbin/ngctl/Makefile.depend.options
+++ b/usr.sbin/ngctl/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= LIBTHR
diff --git a/usr.sbin/nghook/Makefile b/usr.sbin/nghook/Makefile
index 8a63d8238e17..ea3db8641298 100644
--- a/usr.sbin/nghook/Makefile
+++ b/usr.sbin/nghook/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
# $Whistle: Makefile,v 1.4 1999/01/16 04:44:33 archie Exp $
PROG= nghook
diff --git a/usr.sbin/nghook/Makefile.depend b/usr.sbin/nghook/Makefile.depend
index 3f4cb50e1709..7bdc10ae0f8f 100644
--- a/usr.sbin/nghook/Makefile.depend
+++ b/usr.sbin/nghook/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/nmtree/Makefile b/usr.sbin/nmtree/Makefile
index 19a4bd9a1516..45610b0b2965 100644
--- a/usr.sbin/nmtree/Makefile
+++ b/usr.sbin/nmtree/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/nmtree/Makefile.depend b/usr.sbin/nmtree/Makefile.depend
index 4e01fee15c05..0886422b6f47 100644
--- a/usr.sbin/nmtree/Makefile.depend
+++ b/usr.sbin/nmtree/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/nmtree/tests/Makefile b/usr.sbin/nmtree/tests/Makefile
index f88b4db110fc..2a5e2e2d92a4 100644
--- a/usr.sbin/nmtree/tests/Makefile
+++ b/usr.sbin/nmtree/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= tests
diff --git a/usr.sbin/nmtree/tests/Makefile.depend b/usr.sbin/nmtree/tests/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/nmtree/tests/Makefile.depend
+++ b/usr.sbin/nmtree/tests/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/nologin/Makefile b/usr.sbin/nologin/Makefile
index d743f60c6a7c..10a765bb6e26 100644
--- a/usr.sbin/nologin/Makefile
+++ b/usr.sbin/nologin/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.2 (Berkeley) 4/22/94
-# $FreeBSD$
PROG= nologin
MAN= nologin.5 nologin.8
diff --git a/usr.sbin/nologin/Makefile.depend b/usr.sbin/nologin/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/usr.sbin/nologin/Makefile.depend
+++ b/usr.sbin/nologin/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/nscd/Makefile b/usr.sbin/nscd/Makefile
index 0a3af09ac2ac..105801a7b9ac 100644
--- a/usr.sbin/nscd/Makefile
+++ b/usr.sbin/nscd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
CONFS= nscd.conf
PROG= nscd
diff --git a/usr.sbin/nscd/Makefile.depend b/usr.sbin/nscd/Makefile.depend
index b208e1c5f44c..51994c8aebeb 100644
--- a/usr.sbin/nscd/Makefile.depend
+++ b/usr.sbin/nscd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/nscd/agents/Makefile.inc b/usr.sbin/nscd/agents/Makefile.inc
index 1be32e1d986f..243f00c5b994 100644
--- a/usr.sbin/nscd/agents/Makefile.inc
+++ b/usr.sbin/nscd/agents/Makefile.inc
@@ -1,3 +1,2 @@
-# $FreeBSD$
SRCS += passwd.c group.c services.c
diff --git a/usr.sbin/nscd/nscd.conf b/usr.sbin/nscd/nscd.conf
index 19a8b5b95452..0d9025221504 100644
--- a/usr.sbin/nscd/nscd.conf
+++ b/usr.sbin/nscd/nscd.conf
@@ -1,6 +1,5 @@
#
# Default caching daemon configuration file
-# $FreeBSD$
#
enable-cache passwd yes
diff --git a/usr.sbin/ntp/Makefile b/usr.sbin/ntp/Makefile
index ad5b5234035a..3701fd297c1a 100644
--- a/usr.sbin/ntp/Makefile
+++ b/usr.sbin/ntp/Makefile
@@ -1,5 +1,4 @@
# Makefile for ntpd.
-# $FreeBSD$
SUBDIR= libopts libntp libntpevent libparse ntpd ntpdc ntpq ntpdate \
ntptime ntp-keygen sntp
diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc
index 2b3b5983dc23..a4174bb99393 100644
--- a/usr.sbin/ntp/Makefile.inc
+++ b/usr.sbin/ntp/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile
index 2ec8d324db3b..345e75d54679 100644
--- a/usr.sbin/ntp/doc/Makefile
+++ b/usr.sbin/ntp/doc/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ntp/doc/Makefile.depend b/usr.sbin/ntp/doc/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/ntp/doc/Makefile.depend
+++ b/usr.sbin/ntp/doc/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/doc/drivers/Makefile b/usr.sbin/ntp/doc/drivers/Makefile
index d1c42bd1eb98..580a62a7a9ed 100644
--- a/usr.sbin/ntp/doc/drivers/Makefile
+++ b/usr.sbin/ntp/doc/drivers/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ntp/doc/drivers/Makefile.depend b/usr.sbin/ntp/doc/drivers/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/ntp/doc/drivers/Makefile.depend
+++ b/usr.sbin/ntp/doc/drivers/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/doc/drivers/icons/Makefile b/usr.sbin/ntp/doc/drivers/icons/Makefile
index 55746bedb7ea..eda2a743078d 100644
--- a/usr.sbin/ntp/doc/drivers/icons/Makefile
+++ b/usr.sbin/ntp/doc/drivers/icons/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ntp/doc/drivers/icons/Makefile.depend b/usr.sbin/ntp/doc/drivers/icons/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/ntp/doc/drivers/icons/Makefile.depend
+++ b/usr.sbin/ntp/doc/drivers/icons/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/doc/drivers/scripts/Makefile b/usr.sbin/ntp/doc/drivers/scripts/Makefile
index 64a2ef8079e8..16b896553114 100644
--- a/usr.sbin/ntp/doc/drivers/scripts/Makefile
+++ b/usr.sbin/ntp/doc/drivers/scripts/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ntp/doc/drivers/scripts/Makefile.depend b/usr.sbin/ntp/doc/drivers/scripts/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/ntp/doc/drivers/scripts/Makefile.depend
+++ b/usr.sbin/ntp/doc/drivers/scripts/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/doc/hints/Makefile b/usr.sbin/ntp/doc/hints/Makefile
index f7571f02df09..899e8adaea0f 100644
--- a/usr.sbin/ntp/doc/hints/Makefile
+++ b/usr.sbin/ntp/doc/hints/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ntp/doc/hints/Makefile.depend b/usr.sbin/ntp/doc/hints/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/ntp/doc/hints/Makefile.depend
+++ b/usr.sbin/ntp/doc/hints/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/doc/icons/Makefile b/usr.sbin/ntp/doc/icons/Makefile
index 2faf147bb7ff..b9608cc2f82e 100644
--- a/usr.sbin/ntp/doc/icons/Makefile
+++ b/usr.sbin/ntp/doc/icons/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ntp/doc/icons/Makefile.depend b/usr.sbin/ntp/doc/icons/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/ntp/doc/icons/Makefile.depend
+++ b/usr.sbin/ntp/doc/icons/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/doc/pic/Makefile b/usr.sbin/ntp/doc/pic/Makefile
index cce1fbcc927b..23cf769892da 100644
--- a/usr.sbin/ntp/doc/pic/Makefile
+++ b/usr.sbin/ntp/doc/pic/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ntp/doc/pic/Makefile.depend b/usr.sbin/ntp/doc/pic/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/ntp/doc/pic/Makefile.depend
+++ b/usr.sbin/ntp/doc/pic/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/doc/scripts/Makefile b/usr.sbin/ntp/doc/scripts/Makefile
index 5cc430b1afae..7b8255a02423 100644
--- a/usr.sbin/ntp/doc/scripts/Makefile
+++ b/usr.sbin/ntp/doc/scripts/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ntp/doc/scripts/Makefile.depend b/usr.sbin/ntp/doc/scripts/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/ntp/doc/scripts/Makefile.depend
+++ b/usr.sbin/ntp/doc/scripts/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile
index b3d7b741e5b1..7cf4a33b8c6d 100644
--- a/usr.sbin/ntp/libntp/Makefile
+++ b/usr.sbin/ntp/libntp/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/contrib/ntp/libntp \
${SRCTOP}/contrib/ntp/libntp/lib/isc \
diff --git a/usr.sbin/ntp/libntp/Makefile.depend b/usr.sbin/ntp/libntp/Makefile.depend
index 1fd58260f7dd..f8251b075841 100644
--- a/usr.sbin/ntp/libntp/Makefile.depend
+++ b/usr.sbin/ntp/libntp/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/libntpevent/Makefile b/usr.sbin/ntp/libntpevent/Makefile
index 487faedc00a3..0c04dae95d47 100644
--- a/usr.sbin/ntp/libntpevent/Makefile
+++ b/usr.sbin/ntp/libntpevent/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ntp/libntpevent/Makefile.depend b/usr.sbin/ntp/libntpevent/Makefile.depend
index 9493af9c2323..f527c2585bed 100644
--- a/usr.sbin/ntp/libntpevent/Makefile.depend
+++ b/usr.sbin/ntp/libntpevent/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/libopts/Makefile b/usr.sbin/ntp/libopts/Makefile
index 17fe6783b3cb..170ff6db61da 100644
--- a/usr.sbin/ntp/libopts/Makefile
+++ b/usr.sbin/ntp/libopts/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/contrib/ntp/sntp/libopts
diff --git a/usr.sbin/ntp/libopts/Makefile.depend b/usr.sbin/ntp/libopts/Makefile.depend
index 18be76b0cb6f..15a1f9c07f7c 100644
--- a/usr.sbin/ntp/libopts/Makefile.depend
+++ b/usr.sbin/ntp/libopts/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile
index 4bbf19853c57..e6c0bbb269cc 100644
--- a/usr.sbin/ntp/libparse/Makefile
+++ b/usr.sbin/ntp/libparse/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/contrib/ntp/libparse
diff --git a/usr.sbin/ntp/libparse/Makefile.depend b/usr.sbin/ntp/libparse/Makefile.depend
index 4bf31bdca104..469861b9c400 100644
--- a/usr.sbin/ntp/libparse/Makefile.depend
+++ b/usr.sbin/ntp/libparse/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile
index a147f3833603..71df31a475a7 100644
--- a/usr.sbin/ntp/ntp-keygen/Makefile
+++ b/usr.sbin/ntp/ntp-keygen/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
MAN=
diff --git a/usr.sbin/ntp/ntp-keygen/Makefile.depend b/usr.sbin/ntp/ntp-keygen/Makefile.depend
index 434e203392a3..9284c867f078 100644
--- a/usr.sbin/ntp/ntp-keygen/Makefile.depend
+++ b/usr.sbin/ntp/ntp-keygen/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/ntp-keygen/Makefile.depend.options b/usr.sbin/ntp/ntp-keygen/Makefile.depend.options
index fa96b2506b2c..b374d7a1fd52 100644
--- a/usr.sbin/ntp/ntp-keygen/Makefile.depend.options
+++ b/usr.sbin/ntp/ntp-keygen/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= OPENSSL
diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile
index beacd96f52a2..d7b5010227f5 100644
--- a/usr.sbin/ntp/ntpd/Makefile
+++ b/usr.sbin/ntp/ntpd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
MAN=
diff --git a/usr.sbin/ntp/ntpd/Makefile.depend b/usr.sbin/ntp/ntpd/Makefile.depend
index 2d2229dcbd62..b0e3a5698fa5 100644
--- a/usr.sbin/ntp/ntpd/Makefile.depend
+++ b/usr.sbin/ntp/ntpd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/ntpd/Makefile.depend.options b/usr.sbin/ntp/ntpd/Makefile.depend.options
index fa96b2506b2c..b374d7a1fd52 100644
--- a/usr.sbin/ntp/ntpd/Makefile.depend.options
+++ b/usr.sbin/ntp/ntpd/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= OPENSSL
diff --git a/usr.sbin/ntp/ntpd/ntp.conf b/usr.sbin/ntp/ntpd/ntp.conf
index 3a56ec9f599c..726729f30f93 100644
--- a/usr.sbin/ntp/ntpd/ntp.conf
+++ b/usr.sbin/ntp/ntpd/ntp.conf
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
# Default NTP servers for the FreeBSD operating system.
#
diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile
index 427986fa3e4c..03afbb5d708b 100644
--- a/usr.sbin/ntp/ntpdate/Makefile
+++ b/usr.sbin/ntp/ntpdate/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ntp/ntpdate/Makefile.depend b/usr.sbin/ntp/ntpdate/Makefile.depend
index dccc5fcb536f..9e8c88745678 100644
--- a/usr.sbin/ntp/ntpdate/Makefile.depend
+++ b/usr.sbin/ntp/ntpdate/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/ntpdate/Makefile.depend.options b/usr.sbin/ntp/ntpdate/Makefile.depend.options
index fa96b2506b2c..b374d7a1fd52 100644
--- a/usr.sbin/ntp/ntpdate/Makefile.depend.options
+++ b/usr.sbin/ntp/ntpdate/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= OPENSSL
diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile
index 9038010ca6d3..8502b7c1b503 100644
--- a/usr.sbin/ntp/ntpdc/Makefile
+++ b/usr.sbin/ntp/ntpdc/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
MAN=
diff --git a/usr.sbin/ntp/ntpdc/Makefile.depend b/usr.sbin/ntp/ntpdc/Makefile.depend
index b41e2855ad23..b64895c6ad92 100644
--- a/usr.sbin/ntp/ntpdc/Makefile.depend
+++ b/usr.sbin/ntp/ntpdc/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/ntpdc/Makefile.depend.options b/usr.sbin/ntp/ntpdc/Makefile.depend.options
index fa96b2506b2c..b374d7a1fd52 100644
--- a/usr.sbin/ntp/ntpdc/Makefile.depend.options
+++ b/usr.sbin/ntp/ntpdc/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= OPENSSL
diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile
index 60b7b0103e5e..be1e9c9034ff 100644
--- a/usr.sbin/ntp/ntpq/Makefile
+++ b/usr.sbin/ntp/ntpq/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
MAN=
diff --git a/usr.sbin/ntp/ntpq/Makefile.depend b/usr.sbin/ntp/ntpq/Makefile.depend
index b41e2855ad23..b64895c6ad92 100644
--- a/usr.sbin/ntp/ntpq/Makefile.depend
+++ b/usr.sbin/ntp/ntpq/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/ntpq/Makefile.depend.options b/usr.sbin/ntp/ntpq/Makefile.depend.options
index fa96b2506b2c..b374d7a1fd52 100644
--- a/usr.sbin/ntp/ntpq/Makefile.depend.options
+++ b/usr.sbin/ntp/ntpq/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= OPENSSL
diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile
index 173e31e4e4bd..027021aa1b16 100644
--- a/usr.sbin/ntp/ntptime/Makefile
+++ b/usr.sbin/ntp/ntptime/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/contrib/ntp/util
diff --git a/usr.sbin/ntp/ntptime/Makefile.depend b/usr.sbin/ntp/ntptime/Makefile.depend
index c7f2a7c3eff4..864936238cc6 100644
--- a/usr.sbin/ntp/ntptime/Makefile.depend
+++ b/usr.sbin/ntp/ntptime/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver
index 16eaa39de1cd..279468a1af1c 100755
--- a/usr.sbin/ntp/scripts/mkver
+++ b/usr.sbin/ntp/scripts/mkver
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
PROG=${1-UNKNOWN}
diff --git a/usr.sbin/ntp/scripts/ntptrace b/usr.sbin/ntp/scripts/ntptrace
index 8a895c4ba0be..994a008cd7e8 100644
--- a/usr.sbin/ntp/scripts/ntptrace
+++ b/usr.sbin/ntp/scripts/ntptrace
@@ -1,6 +1,5 @@
#! /usr/local/bin/perl -w
#
-# $FreeBSD$
# John Hay -- John.Hay@icomtek.csir.co.za / jhay@FreeBSD.org
diff --git a/usr.sbin/ntp/scripts/ntpver b/usr.sbin/ntp/scripts/ntpver
index 6dbc510db8c2..cb216e8a636c 100755
--- a/usr.sbin/ntp/scripts/ntpver
+++ b/usr.sbin/ntp/scripts/ntpver
@@ -1,5 +1,4 @@
#!/bin/sh
-# $FreeBSD$
# print version string of NTP daemon
# Copyright (c) 1997 by Ulrich Windl
# Modified 970318: Harlan Stenn: rewritten...
diff --git a/usr.sbin/ntp/sntp/Makefile b/usr.sbin/ntp/sntp/Makefile
index 325102c3ee09..ebbfb77b4fab 100644
--- a/usr.sbin/ntp/sntp/Makefile
+++ b/usr.sbin/ntp/sntp/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ntp/sntp/Makefile.depend b/usr.sbin/ntp/sntp/Makefile.depend
index c859ede595b8..fdd3beeaa837 100644
--- a/usr.sbin/ntp/sntp/Makefile.depend
+++ b/usr.sbin/ntp/sntp/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ntp/sntp/Makefile.depend.options b/usr.sbin/ntp/sntp/Makefile.depend.options
index fa96b2506b2c..b374d7a1fd52 100644
--- a/usr.sbin/ntp/sntp/Makefile.depend.options
+++ b/usr.sbin/ntp/sntp/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= OPENSSL
diff --git a/usr.sbin/nvram/Makefile b/usr.sbin/nvram/Makefile
index 2c6e43c8fcb4..66ae05294526 100644
--- a/usr.sbin/nvram/Makefile
+++ b/usr.sbin/nvram/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= nvram
MAN= nvram.8
diff --git a/usr.sbin/ofwdump/Makefile b/usr.sbin/ofwdump/Makefile
index ca4f4868db53..cd867da9d0fa 100644
--- a/usr.sbin/ofwdump/Makefile
+++ b/usr.sbin/ofwdump/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= ofwdump
MAN= ofwdump.8
diff --git a/usr.sbin/ofwdump/Makefile.depend b/usr.sbin/ofwdump/Makefile.depend
index 2ff61520f354..ee629ba230bb 100644
--- a/usr.sbin/ofwdump/Makefile.depend
+++ b/usr.sbin/ofwdump/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/pciconf/Makefile b/usr.sbin/pciconf/Makefile
index e288654a4d85..77d2679b4c75 100644
--- a/usr.sbin/pciconf/Makefile
+++ b/usr.sbin/pciconf/Makefile
@@ -1,5 +1,4 @@
# $ANA: Makefile,v 1.1.1.1 1996/09/25 21:12:57 wollman Exp $
-# $FreeBSD$
PROG= pciconf
SRCS= pciconf.c cap.c err.c
diff --git a/usr.sbin/pciconf/Makefile.depend b/usr.sbin/pciconf/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/pciconf/Makefile.depend
+++ b/usr.sbin/pciconf/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/periodic/Makefile b/usr.sbin/periodic/Makefile
index 62a1cff105a2..f991bbd6ae1e 100644
--- a/usr.sbin/periodic/Makefile
+++ b/usr.sbin/periodic/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= periodic
diff --git a/usr.sbin/periodic/Makefile.depend b/usr.sbin/periodic/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/periodic/Makefile.depend
+++ b/usr.sbin/periodic/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/periodic/etc/Makefile b/usr.sbin/periodic/etc/Makefile
index a2d99020fd10..6678f16a49d4 100644
--- a/usr.sbin/periodic/etc/Makefile
+++ b/usr.sbin/periodic/etc/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= daily security weekly monthly
SUBDIR_PARALLEL=
diff --git a/usr.sbin/periodic/etc/Makefile.inc b/usr.sbin/periodic/etc/Makefile.inc
index a1fed7ac7afb..dcd34a07dee9 100644
--- a/usr.sbin/periodic/etc/Makefile.inc
+++ b/usr.sbin/periodic/etc/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
CONFMODE= 755
CONFDIR= ETC_PERIODIC_${.CURDIR:T:U}
diff --git a/usr.sbin/periodic/etc/daily/100.clean-disks b/usr.sbin/periodic/etc/daily/100.clean-disks
index b4ebf3083bc5..7eedcfce6f96 100755
--- a/usr.sbin/periodic/etc/daily/100.clean-disks
+++ b/usr.sbin/periodic/etc/daily/100.clean-disks
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# Remove garbage files more than $daily_clean_disks_days days old
#
diff --git a/usr.sbin/periodic/etc/daily/110.clean-tmps b/usr.sbin/periodic/etc/daily/110.clean-tmps
index 67bcec6f00d3..4780aa72aa42 100755
--- a/usr.sbin/periodic/etc/daily/110.clean-tmps
+++ b/usr.sbin/periodic/etc/daily/110.clean-tmps
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# Perform temporary directory cleaning so that long-lived systems
# don't end up with excessively old files there.
diff --git a/usr.sbin/periodic/etc/daily/120.clean-preserve b/usr.sbin/periodic/etc/daily/120.clean-preserve
index d5b34a12c385..9c2bc86ae48a 100755
--- a/usr.sbin/periodic/etc/daily/120.clean-preserve
+++ b/usr.sbin/periodic/etc/daily/120.clean-preserve
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# Remove stale files in /var/preserve
#
diff --git a/usr.sbin/periodic/etc/daily/130.clean-msgs b/usr.sbin/periodic/etc/daily/130.clean-msgs
index b7890db6d954..df9f6ef2c1e1 100755
--- a/usr.sbin/periodic/etc/daily/130.clean-msgs
+++ b/usr.sbin/periodic/etc/daily/130.clean-msgs
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# Remove system messages
#
diff --git a/usr.sbin/periodic/etc/daily/140.clean-rwho b/usr.sbin/periodic/etc/daily/140.clean-rwho
index 9645d7e60bf7..b34fa80c58f7 100755
--- a/usr.sbin/periodic/etc/daily/140.clean-rwho
+++ b/usr.sbin/periodic/etc/daily/140.clean-rwho
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# Remove stale files in /var/rwho
#
diff --git a/usr.sbin/periodic/etc/daily/150.clean-hoststat b/usr.sbin/periodic/etc/daily/150.clean-hoststat
index 460d1a267908..7023d1e2c521 100755
--- a/usr.sbin/periodic/etc/daily/150.clean-hoststat
+++ b/usr.sbin/periodic/etc/daily/150.clean-hoststat
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# Remove stale persistent host status files
#
diff --git a/usr.sbin/periodic/etc/daily/200.backup-passwd b/usr.sbin/periodic/etc/daily/200.backup-passwd
index 1e9bb8964047..44da5993a3a6 100755
--- a/usr.sbin/periodic/etc/daily/200.backup-passwd
+++ b/usr.sbin/periodic/etc/daily/200.backup-passwd
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/210.backup-aliases b/usr.sbin/periodic/etc/daily/210.backup-aliases
index fe170389ef03..3b689e3eaa1b 100755
--- a/usr.sbin/periodic/etc/daily/210.backup-aliases
+++ b/usr.sbin/periodic/etc/daily/210.backup-aliases
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/221.backup-gpart b/usr.sbin/periodic/etc/daily/221.backup-gpart
index b2bfde820272..da59a6d5d724 100755
--- a/usr.sbin/periodic/etc/daily/221.backup-gpart
+++ b/usr.sbin/periodic/etc/daily/221.backup-gpart
@@ -1,6 +1,4 @@
#!/bin/sh
-
-## $FreeBSD$
## Created by: Miroslav Lachman <000.fbsd@quip.cz>
## Backup of disk partitions layout, useful for gpart restore.
diff --git a/usr.sbin/periodic/etc/daily/222.backup-gmirror b/usr.sbin/periodic/etc/daily/222.backup-gmirror
index 2b14a2d4d5c6..866a00497759 100755
--- a/usr.sbin/periodic/etc/daily/222.backup-gmirror
+++ b/usr.sbin/periodic/etc/daily/222.backup-gmirror
@@ -1,6 +1,4 @@
#!/bin/sh
-
-# $FreeBSD$
# Created by: Miroslav Lachman <000.fbsd@quip.cz>
# Backup output from `gmirror list`, which provides detailed information
diff --git a/usr.sbin/periodic/etc/daily/223.backup-zfs b/usr.sbin/periodic/etc/daily/223.backup-zfs
index e263775fb53f..03876df53f13 100755
--- a/usr.sbin/periodic/etc/daily/223.backup-zfs
+++ b/usr.sbin/periodic/etc/daily/223.backup-zfs
@@ -1,6 +1,4 @@
#!/bin/sh
-
-# $FreeBSD$
# Created by: Miroslav Lachman <000.fbsd@quip.cz>
# Backup of zpool list, zfs list, zpool properties and zfs properties
diff --git a/usr.sbin/periodic/etc/daily/300.calendar b/usr.sbin/periodic/etc/daily/300.calendar
index cc12097162e5..3be90a8c4754 100755
--- a/usr.sbin/periodic/etc/daily/300.calendar
+++ b/usr.sbin/periodic/etc/daily/300.calendar
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# `calendar -a' needs to die. Why? Because it's a bad idea, particular
# with networked home directories, but also in general. If you want the
diff --git a/usr.sbin/periodic/etc/daily/310.accounting b/usr.sbin/periodic/etc/daily/310.accounting
index b0dd786447eb..f8bf038396cb 100755
--- a/usr.sbin/periodic/etc/daily/310.accounting
+++ b/usr.sbin/periodic/etc/daily/310.accounting
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/330.news b/usr.sbin/periodic/etc/daily/330.news
index ec064376d78f..d402e9c762ff 100755
--- a/usr.sbin/periodic/etc/daily/330.news
+++ b/usr.sbin/periodic/etc/daily/330.news
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# Expire news articles
# (This is present only for backwards compatibility, usually the news
diff --git a/usr.sbin/periodic/etc/daily/400.status-disks b/usr.sbin/periodic/etc/daily/400.status-disks
index bab281097dbd..cc1fe8dc0ab3 100755
--- a/usr.sbin/periodic/etc/daily/400.status-disks
+++ b/usr.sbin/periodic/etc/daily/400.status-disks
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/401.status-graid b/usr.sbin/periodic/etc/daily/401.status-graid
index a28fc5bbe569..259722a94a0c 100755
--- a/usr.sbin/periodic/etc/daily/401.status-graid
+++ b/usr.sbin/periodic/etc/daily/401.status-graid
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/404.status-zfs b/usr.sbin/periodic/etc/daily/404.status-zfs
index df23bae7a37e..052f794c0bbc 100755
--- a/usr.sbin/periodic/etc/daily/404.status-zfs
+++ b/usr.sbin/periodic/etc/daily/404.status-zfs
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/406.status-gmirror b/usr.sbin/periodic/etc/daily/406.status-gmirror
index 8fc698c804d2..06fbb9491576 100755
--- a/usr.sbin/periodic/etc/daily/406.status-gmirror
+++ b/usr.sbin/periodic/etc/daily/406.status-gmirror
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/407.status-graid3 b/usr.sbin/periodic/etc/daily/407.status-graid3
index 52750f7d88e5..af73ca4dd754 100755
--- a/usr.sbin/periodic/etc/daily/407.status-graid3
+++ b/usr.sbin/periodic/etc/daily/407.status-graid3
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/408.status-gstripe b/usr.sbin/periodic/etc/daily/408.status-gstripe
index ff74f76e3c7c..1a4c9f053747 100755
--- a/usr.sbin/periodic/etc/daily/408.status-gstripe
+++ b/usr.sbin/periodic/etc/daily/408.status-gstripe
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/409.status-gconcat b/usr.sbin/periodic/etc/daily/409.status-gconcat
index 7dfa91812f68..2fabac1caeed 100755
--- a/usr.sbin/periodic/etc/daily/409.status-gconcat
+++ b/usr.sbin/periodic/etc/daily/409.status-gconcat
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/410.status-mfi b/usr.sbin/periodic/etc/daily/410.status-mfi
index 6e13fbb5a74f..141cd777380c 100644
--- a/usr.sbin/periodic/etc/daily/410.status-mfi
+++ b/usr.sbin/periodic/etc/daily/410.status-mfi
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/420.status-network b/usr.sbin/periodic/etc/daily/420.status-network
index 03166a915a1a..955d6b0e9146 100755
--- a/usr.sbin/periodic/etc/daily/420.status-network
+++ b/usr.sbin/periodic/etc/daily/420.status-network
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/430.status-uptime b/usr.sbin/periodic/etc/daily/430.status-uptime
index 0c8c591a5973..19c4bcd0b0d0 100755
--- a/usr.sbin/periodic/etc/daily/430.status-uptime
+++ b/usr.sbin/periodic/etc/daily/430.status-uptime
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/440.status-mailq b/usr.sbin/periodic/etc/daily/440.status-mailq
index 515f9f42ead9..542c8966b206 100755
--- a/usr.sbin/periodic/etc/daily/440.status-mailq
+++ b/usr.sbin/periodic/etc/daily/440.status-mailq
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/450.status-security b/usr.sbin/periodic/etc/daily/450.status-security
index 31b6d4cf524e..c004e0ae98ac 100755
--- a/usr.sbin/periodic/etc/daily/450.status-security
+++ b/usr.sbin/periodic/etc/daily/450.status-security
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/460.status-mail-rejects b/usr.sbin/periodic/etc/daily/460.status-mail-rejects
index ce633640b6a4..f64a8cb75a24 100755
--- a/usr.sbin/periodic/etc/daily/460.status-mail-rejects
+++ b/usr.sbin/periodic/etc/daily/460.status-mail-rejects
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd
index a693986e0dd1..17db53e625f8 100755
--- a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd
+++ b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/480.status-ntpd b/usr.sbin/periodic/etc/daily/480.status-ntpd
index 1ff5cc516f5a..f77910befea8 100755
--- a/usr.sbin/periodic/etc/daily/480.status-ntpd
+++ b/usr.sbin/periodic/etc/daily/480.status-ntpd
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/500.queuerun b/usr.sbin/periodic/etc/daily/500.queuerun
index f46c24614b2c..cdc4e979b5a8 100755
--- a/usr.sbin/periodic/etc/daily/500.queuerun
+++ b/usr.sbin/periodic/etc/daily/500.queuerun
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/510.status-world-kernel b/usr.sbin/periodic/etc/daily/510.status-world-kernel
index 4e08a04d2a25..e9ebc0a830a9 100755
--- a/usr.sbin/periodic/etc/daily/510.status-world-kernel
+++ b/usr.sbin/periodic/etc/daily/510.status-world-kernel
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# Check that the running userland and kernel versions are in sync.
diff --git a/usr.sbin/periodic/etc/daily/800.scrub-zfs b/usr.sbin/periodic/etc/daily/800.scrub-zfs
index 8cca1ea4d949..3a19c09b4698 100755
--- a/usr.sbin/periodic/etc/daily/800.scrub-zfs
+++ b/usr.sbin/periodic/etc/daily/800.scrub-zfs
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/daily/999.local b/usr.sbin/periodic/etc/daily/999.local
index eca04e5771b8..29c410f416b3 100755
--- a/usr.sbin/periodic/etc/daily/999.local
+++ b/usr.sbin/periodic/etc/daily/999.local
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# Run the old /etc/daily.local script. This is really for backwards
# compatibility more than anything else.
diff --git a/usr.sbin/periodic/etc/daily/Makefile b/usr.sbin/periodic/etc/daily/Makefile
index 2bffdba05d2b..1fb559930eef 100644
--- a/usr.sbin/periodic/etc/daily/Makefile
+++ b/usr.sbin/periodic/etc/daily/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/periodic/etc/monthly/200.accounting b/usr.sbin/periodic/etc/monthly/200.accounting
index 46f153de535a..744e14783ac3 100755
--- a/usr.sbin/periodic/etc/monthly/200.accounting
+++ b/usr.sbin/periodic/etc/monthly/200.accounting
@@ -1,6 +1,5 @@
#!/bin/sh -
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/monthly/450.status-security b/usr.sbin/periodic/etc/monthly/450.status-security
index 61e6b92387bd..ad6312c3cb20 100755
--- a/usr.sbin/periodic/etc/monthly/450.status-security
+++ b/usr.sbin/periodic/etc/monthly/450.status-security
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/monthly/999.local b/usr.sbin/periodic/etc/monthly/999.local
index a017a69540e5..154d8dfe090c 100755
--- a/usr.sbin/periodic/etc/monthly/999.local
+++ b/usr.sbin/periodic/etc/monthly/999.local
@@ -1,6 +1,5 @@
#!/bin/sh -
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/monthly/Makefile b/usr.sbin/periodic/etc/monthly/Makefile
index b4aaf6967891..8de5d5d81c03 100644
--- a/usr.sbin/periodic/etc/monthly/Makefile
+++ b/usr.sbin/periodic/etc/monthly/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/periodic/etc/security/100.chksetuid b/usr.sbin/periodic/etc/security/100.chksetuid
index c850f401d178..071d296cdaff 100755
--- a/usr.sbin/periodic/etc/security/100.chksetuid
+++ b/usr.sbin/periodic/etc/security/100.chksetuid
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/security/110.neggrpperm b/usr.sbin/periodic/etc/security/110.neggrpperm
index 393c83d061c6..6def25fc6a0e 100755
--- a/usr.sbin/periodic/etc/security/110.neggrpperm
+++ b/usr.sbin/periodic/etc/security/110.neggrpperm
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/security/200.chkmounts b/usr.sbin/periodic/etc/security/200.chkmounts
index 7b14866869bb..c6405bb86467 100755
--- a/usr.sbin/periodic/etc/security/200.chkmounts
+++ b/usr.sbin/periodic/etc/security/200.chkmounts
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Show changes in the way filesystems are mounted
diff --git a/usr.sbin/periodic/etc/security/300.chkuid0 b/usr.sbin/periodic/etc/security/300.chkuid0
index 73578e241553..121734357d06 100755
--- a/usr.sbin/periodic/etc/security/300.chkuid0
+++ b/usr.sbin/periodic/etc/security/300.chkuid0
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
diff --git a/usr.sbin/periodic/etc/security/400.passwdless b/usr.sbin/periodic/etc/security/400.passwdless
index 5e851ac847c7..10a80ce43370 100755
--- a/usr.sbin/periodic/etc/security/400.passwdless
+++ b/usr.sbin/periodic/etc/security/400.passwdless
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/security/410.logincheck b/usr.sbin/periodic/etc/security/410.logincheck
index 41e7f65ebf1b..7e1ac5ec1b67 100755
--- a/usr.sbin/periodic/etc/security/410.logincheck
+++ b/usr.sbin/periodic/etc/security/410.logincheck
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/security/500.ipfwdenied b/usr.sbin/periodic/etc/security/500.ipfwdenied
index f39ca0ed9531..f2a435711805 100755
--- a/usr.sbin/periodic/etc/security/500.ipfwdenied
+++ b/usr.sbin/periodic/etc/security/500.ipfwdenied
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/security/510.ipfdenied b/usr.sbin/periodic/etc/security/510.ipfdenied
index bed75e645c2a..3350bfd40fcf 100755
--- a/usr.sbin/periodic/etc/security/510.ipfdenied
+++ b/usr.sbin/periodic/etc/security/510.ipfdenied
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/security/520.pfdenied b/usr.sbin/periodic/etc/security/520.pfdenied
index 69d9df78436b..c295724d8949 100755
--- a/usr.sbin/periodic/etc/security/520.pfdenied
+++ b/usr.sbin/periodic/etc/security/520.pfdenied
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/security/550.ipfwlimit b/usr.sbin/periodic/etc/security/550.ipfwlimit
index 86932c676c7a..7b6f915a1ac5 100755
--- a/usr.sbin/periodic/etc/security/550.ipfwlimit
+++ b/usr.sbin/periodic/etc/security/550.ipfwlimit
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Show ipfw rules which have reached the log limit
diff --git a/usr.sbin/periodic/etc/security/610.ipf6denied b/usr.sbin/periodic/etc/security/610.ipf6denied
index 7e02cfc583f3..a7902e504baa 100755
--- a/usr.sbin/periodic/etc/security/610.ipf6denied
+++ b/usr.sbin/periodic/etc/security/610.ipf6denied
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/security/700.kernelmsg b/usr.sbin/periodic/etc/security/700.kernelmsg
index 8bf6491901ed..cd4391aad98d 100755
--- a/usr.sbin/periodic/etc/security/700.kernelmsg
+++ b/usr.sbin/periodic/etc/security/700.kernelmsg
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Show kernel log messages
diff --git a/usr.sbin/periodic/etc/security/800.loginfail b/usr.sbin/periodic/etc/security/800.loginfail
index 4c78f441639a..713f4fed47bf 100755
--- a/usr.sbin/periodic/etc/security/800.loginfail
+++ b/usr.sbin/periodic/etc/security/800.loginfail
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Show login failures
diff --git a/usr.sbin/periodic/etc/security/900.tcpwrap b/usr.sbin/periodic/etc/security/900.tcpwrap
index 10b02e9e2bb6..132bc9865b18 100755
--- a/usr.sbin/periodic/etc/security/900.tcpwrap
+++ b/usr.sbin/periodic/etc/security/900.tcpwrap
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# Show tcp_wrapper warning messages
diff --git a/usr.sbin/periodic/etc/security/Makefile b/usr.sbin/periodic/etc/security/Makefile
index 02d2264be15a..ddc51a672ae0 100644
--- a/usr.sbin/periodic/etc/security/Makefile
+++ b/usr.sbin/periodic/etc/security/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/periodic/etc/security/security.functions b/usr.sbin/periodic/etc/security/security.functions
index 00a89075dbfd..aa19a99ebf87 100644
--- a/usr.sbin/periodic/etc/security/security.functions
+++ b/usr.sbin/periodic/etc/security/security.functions
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
# This is a library file, so we only try to do something when sourced.
diff --git a/usr.sbin/periodic/etc/weekly/310.locate b/usr.sbin/periodic/etc/weekly/310.locate
index 4079f5e8287e..18444f87e641 100755
--- a/usr.sbin/periodic/etc/weekly/310.locate
+++ b/usr.sbin/periodic/etc/weekly/310.locate
@@ -1,6 +1,5 @@
#!/bin/sh -
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/weekly/320.whatis b/usr.sbin/periodic/etc/weekly/320.whatis
index dfc218ae008c..22d9070a4dbb 100755
--- a/usr.sbin/periodic/etc/weekly/320.whatis
+++ b/usr.sbin/periodic/etc/weekly/320.whatis
@@ -1,6 +1,5 @@
#!/bin/sh -
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/weekly/340.noid b/usr.sbin/periodic/etc/weekly/340.noid
index 06ac3df31ffc..6151840ea3c2 100755
--- a/usr.sbin/periodic/etc/weekly/340.noid
+++ b/usr.sbin/periodic/etc/weekly/340.noid
@@ -1,6 +1,5 @@
#!/bin/sh -
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/weekly/450.status-security b/usr.sbin/periodic/etc/weekly/450.status-security
index d224e44a58a1..8bb0c02859c4 100755
--- a/usr.sbin/periodic/etc/weekly/450.status-security
+++ b/usr.sbin/periodic/etc/weekly/450.status-security
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/weekly/999.local b/usr.sbin/periodic/etc/weekly/999.local
index cc40c07c8840..c53e9113cbd2 100755
--- a/usr.sbin/periodic/etc/weekly/999.local
+++ b/usr.sbin/periodic/etc/weekly/999.local
@@ -1,6 +1,5 @@
#!/bin/sh -
#
-# $FreeBSD$
#
# If there is a global system configuration file, suck it in.
diff --git a/usr.sbin/periodic/etc/weekly/Makefile b/usr.sbin/periodic/etc/weekly/Makefile
index 74ab84f3684e..4d21c098dd10 100644
--- a/usr.sbin/periodic/etc/weekly/Makefile
+++ b/usr.sbin/periodic/etc/weekly/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/periodic/periodic.conf b/usr.sbin/periodic/periodic.conf
index c14f4dd001db..d37928d09925 100644
--- a/usr.sbin/periodic/periodic.conf
+++ b/usr.sbin/periodic/periodic.conf
@@ -13,7 +13,6 @@
# For a more detailed explanation of all the periodic.conf variables, please
# refer to the periodic.conf(5) manual page.
#
-# $FreeBSD$
#
# What files override these defaults ?
diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh
index 97de8192dd28..a45d6af73691 100644
--- a/usr.sbin/periodic/periodic.sh
+++ b/usr.sbin/periodic/periodic.sh
@@ -1,6 +1,5 @@
#!/bin/sh -
#
-# $FreeBSD$
#
# Run nightly periodic scripts
#
diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest
index e4eec8f11451..3f0c4a6243cb 100644
--- a/usr.sbin/pkg/FreeBSD.conf.latest
+++ b/usr.sbin/pkg/FreeBSD.conf.latest
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# To disable this repository, instead of modifying or removing this file,
# create a /usr/local/etc/pkg/repos/FreeBSD.conf file:
diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly
index 68e1d32ac680..31dc1bde8c2a 100644
--- a/usr.sbin/pkg/FreeBSD.conf.quarterly
+++ b/usr.sbin/pkg/FreeBSD.conf.quarterly
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# To disable this repository, instead of modifying or removing this file,
# create a /usr/local/etc/pkg/repos/FreeBSD.conf file:
diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile
index 895438982309..3e0e047382ca 100644
--- a/usr.sbin/pkg/Makefile
+++ b/usr.sbin/pkg/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= pkg-bootstrap
diff --git a/usr.sbin/pkg/Makefile.depend b/usr.sbin/pkg/Makefile.depend
index 0d93f91b60de..e3b11edc91a8 100644
--- a/usr.sbin/pkg/Makefile.depend
+++ b/usr.sbin/pkg/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/pmc/Makefile b/usr.sbin/pmc/Makefile
index b67641de9f62..a982c0d84a7a 100644
--- a/usr.sbin/pmc/Makefile
+++ b/usr.sbin/pmc/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
.include <src.opts.mk>
diff --git a/usr.sbin/pmcannotate/Makefile b/usr.sbin/pmcannotate/Makefile
index cff1efb5ccfa..8f408590a743 100644
--- a/usr.sbin/pmcannotate/Makefile
+++ b/usr.sbin/pmcannotate/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
PROG= pmcannotate
diff --git a/usr.sbin/pmcannotate/Makefile.depend b/usr.sbin/pmcannotate/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/pmcannotate/Makefile.depend
+++ b/usr.sbin/pmcannotate/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/pmccontrol/Makefile b/usr.sbin/pmccontrol/Makefile
index 340c12811a4c..de6224979a60 100644
--- a/usr.sbin/pmccontrol/Makefile
+++ b/usr.sbin/pmccontrol/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
PROG_CXX= pmccontrol
diff --git a/usr.sbin/pmccontrol/Makefile.depend b/usr.sbin/pmccontrol/Makefile.depend
index a52f7b8c67dc..4353e31ce6c4 100644
--- a/usr.sbin/pmccontrol/Makefile.depend
+++ b/usr.sbin/pmccontrol/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/pmcstat/Makefile b/usr.sbin/pmcstat/Makefile
index fa3c8948a7f9..0df22a608398 100644
--- a/usr.sbin/pmcstat/Makefile
+++ b/usr.sbin/pmcstat/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
PROG_CXX= pmcstat
diff --git a/usr.sbin/pmcstat/Makefile.depend b/usr.sbin/pmcstat/Makefile.depend
index 6d010477ce76..8bc55f3e2d6d 100644
--- a/usr.sbin/pmcstat/Makefile.depend
+++ b/usr.sbin/pmcstat/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/pmcstudy/Makefile b/usr.sbin/pmcstudy/Makefile
index 18fd151b6599..c14fd9b32529 100644
--- a/usr.sbin/pmcstudy/Makefile
+++ b/usr.sbin/pmcstudy/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/9/93
-# $FreeBSD$
PROG= pmcstudy
MAN= pmcstudy.8
diff --git a/usr.sbin/pmcstudy/Makefile.depend b/usr.sbin/pmcstudy/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/pmcstudy/Makefile.depend
+++ b/usr.sbin/pmcstudy/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/pnfsdscopymr/Makefile b/usr.sbin/pnfsdscopymr/Makefile
index 4cefca6af690..dcce66b0b6ac 100644
--- a/usr.sbin/pnfsdscopymr/Makefile
+++ b/usr.sbin/pnfsdscopymr/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= nfs
diff --git a/usr.sbin/pnfsdsfile/Makefile b/usr.sbin/pnfsdsfile/Makefile
index 2a85baf33fc1..55af5d58816e 100644
--- a/usr.sbin/pnfsdsfile/Makefile
+++ b/usr.sbin/pnfsdsfile/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= nfs
diff --git a/usr.sbin/pnfsdskill/Makefile b/usr.sbin/pnfsdskill/Makefile
index 49b1c3b00d67..c7f74773f9e1 100644
--- a/usr.sbin/pnfsdskill/Makefile
+++ b/usr.sbin/pnfsdskill/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= nfs
diff --git a/usr.sbin/pnpinfo/Makefile b/usr.sbin/pnpinfo/Makefile
index 450fe740f89d..3a8579835499 100644
--- a/usr.sbin/pnpinfo/Makefile
+++ b/usr.sbin/pnpinfo/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/contrib/pnpinfo
diff --git a/usr.sbin/pnpinfo/Makefile.depend b/usr.sbin/pnpinfo/Makefile.depend
index c729e17c52db..77f8f90c31c3 100644
--- a/usr.sbin/pnpinfo/Makefile.depend
+++ b/usr.sbin/pnpinfo/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/portsnap/Makefile b/usr.sbin/portsnap/Makefile
index 169befd6e726..3d861e0aa6f5 100644
--- a/usr.sbin/portsnap/Makefile
+++ b/usr.sbin/portsnap/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= portsnap make_index
diff --git a/usr.sbin/portsnap/Makefile.inc b/usr.sbin/portsnap/Makefile.inc
index 5f6527edb373..60d01ddaf6ea 100644
--- a/usr.sbin/portsnap/Makefile.inc
+++ b/usr.sbin/portsnap/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
LIBEXECDIR?= /usr/libexec
diff --git a/usr.sbin/portsnap/make_index/Makefile b/usr.sbin/portsnap/make_index/Makefile
index 92e91450e4fd..2d2409788e65 100644
--- a/usr.sbin/portsnap/make_index/Makefile
+++ b/usr.sbin/portsnap/make_index/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= make_index
MAN=
diff --git a/usr.sbin/portsnap/make_index/Makefile.depend b/usr.sbin/portsnap/make_index/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/portsnap/make_index/Makefile.depend
+++ b/usr.sbin/portsnap/make_index/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/portsnap/portsnap/Makefile b/usr.sbin/portsnap/portsnap/Makefile
index 6acd3f523751..da7e7dbf221e 100644
--- a/usr.sbin/portsnap/portsnap/Makefile
+++ b/usr.sbin/portsnap/portsnap/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
CONFS= portsnap.conf
SCRIPTS=portsnap.sh
diff --git a/usr.sbin/portsnap/portsnap/Makefile.depend b/usr.sbin/portsnap/portsnap/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/portsnap/portsnap/Makefile.depend
+++ b/usr.sbin/portsnap/portsnap/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/portsnap/portsnap/portsnap.conf b/usr.sbin/portsnap/portsnap/portsnap.conf
index 9b7af2d5aec2..3ca6f1b3d41a 100644
--- a/usr.sbin/portsnap/portsnap/portsnap.conf
+++ b/usr.sbin/portsnap/portsnap/portsnap.conf
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Default directory where compressed snapshots are stored.
# WORKDIR=/var/db/portsnap
diff --git a/usr.sbin/portsnap/portsnap/portsnap.sh b/usr.sbin/portsnap/portsnap/portsnap.sh
index c6b613cef3bb..bfd4e4ce1413 100644
--- a/usr.sbin/portsnap/portsnap/portsnap.sh
+++ b/usr.sbin/portsnap/portsnap/portsnap.sh
@@ -27,8 +27,6 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-# $FreeBSD$
-
#### Usage function -- called from command-line handling code.
# Usage instructions. Options not listed:
diff --git a/usr.sbin/powerd/Makefile b/usr.sbin/powerd/Makefile
index 4434dcf69318..323a85e821ad 100644
--- a/usr.sbin/powerd/Makefile
+++ b/usr.sbin/powerd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= powerd
MAN= powerd.8
diff --git a/usr.sbin/powerd/Makefile.depend b/usr.sbin/powerd/Makefile.depend
index 991757ecadc0..ffc295f2fe8a 100644
--- a/usr.sbin/powerd/Makefile.depend
+++ b/usr.sbin/powerd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index a7a35d49295e..239fdd586d5e 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ppp/Makefile.depend b/usr.sbin/ppp/Makefile.depend
index 92ea9e3b6910..109410e24e15 100644
--- a/usr.sbin/ppp/Makefile.depend
+++ b/usr.sbin/ppp/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ppp/ppp.conf b/usr.sbin/ppp/ppp.conf
index 576c11cde90a..9838023ea3e2 100644
--- a/usr.sbin/ppp/ppp.conf
+++ b/usr.sbin/ppp/ppp.conf
@@ -5,7 +5,6 @@
#
# See /usr/share/examples/ppp/ for some examples
#
-# $FreeBSD$
#################################################################
default:
diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile
index 064f12dd7763..2c0204c26630 100644
--- a/usr.sbin/pppctl/Makefile
+++ b/usr.sbin/pppctl/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= ppp
PROG= pppctl
diff --git a/usr.sbin/pppctl/Makefile.depend b/usr.sbin/pppctl/Makefile.depend
index 199e18875437..e9a43e530651 100644
--- a/usr.sbin/pppctl/Makefile.depend
+++ b/usr.sbin/pppctl/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile
index fbef36565bda..6a1e394db4e7 100644
--- a/usr.sbin/praliases/Makefile
+++ b/usr.sbin/praliases/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.2 (Berkeley) 9/21/96
-# $FreeBSD$
SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/praliases
diff --git a/usr.sbin/praliases/Makefile.depend b/usr.sbin/praliases/Makefile.depend
index 0feabbf167e0..58a2e5370106 100644
--- a/usr.sbin/praliases/Makefile.depend
+++ b/usr.sbin/praliases/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/praudit/Makefile b/usr.sbin/praudit/Makefile
index 4d0cf2742e56..2eb78dddf292 100644
--- a/usr.sbin/praudit/Makefile
+++ b/usr.sbin/praudit/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
.include <src.opts.mk>
diff --git a/usr.sbin/praudit/Makefile.depend b/usr.sbin/praudit/Makefile.depend
index 2511c90c76b0..89f2ffd3f211 100644
--- a/usr.sbin/praudit/Makefile.depend
+++ b/usr.sbin/praudit/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/praudit/tests/Makefile b/usr.sbin/praudit/tests/Makefile
index 628ed695f940..89cd1e462be8 100644
--- a/usr.sbin/praudit/tests/Makefile
+++ b/usr.sbin/praudit/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= tests
diff --git a/usr.sbin/praudit/tests/praudit_test.sh b/usr.sbin/praudit/tests/praudit_test.sh
index eeaee25eef71..4aa98f0aa138 100644
--- a/usr.sbin/praudit/tests/praudit_test.sh
+++ b/usr.sbin/praudit/tests/praudit_test.sh
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
diff --git a/usr.sbin/prometheus_sysctl_exporter/Makefile b/usr.sbin/prometheus_sysctl_exporter/Makefile
index 7d9b68b2cdc6..20eabbb7dbc4 100644
--- a/usr.sbin/prometheus_sysctl_exporter/Makefile
+++ b/usr.sbin/prometheus_sysctl_exporter/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= prometheus_sysctl_exporter
MAN= prometheus_sysctl_exporter.8
diff --git a/usr.sbin/prometheus_sysctl_exporter/Makefile.depend b/usr.sbin/prometheus_sysctl_exporter/Makefile.depend
index 5ed09d7880db..207978db67cf 100644
--- a/usr.sbin/prometheus_sysctl_exporter/Makefile.depend
+++ b/usr.sbin/prometheus_sysctl_exporter/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/pstat/Makefile b/usr.sbin/pstat/Makefile
index e3b053308282..be1acb97651f 100644
--- a/usr.sbin/pstat/Makefile
+++ b/usr.sbin/pstat/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
PROG= pstat
LINKS= ${BINDIR}/pstat ${BINDIR}/swapinfo
diff --git a/usr.sbin/pstat/Makefile.depend b/usr.sbin/pstat/Makefile.depend
index 1487255a4257..46c387706b2c 100644
--- a/usr.sbin/pstat/Makefile.depend
+++ b/usr.sbin/pstat/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/pw/Makefile b/usr.sbin/pw/Makefile
index d994c289a04c..a1e0167e04d7 100644
--- a/usr.sbin/pw/Makefile
+++ b/usr.sbin/pw/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= runtime
PROG= pw
diff --git a/usr.sbin/pw/Makefile.depend b/usr.sbin/pw/Makefile.depend
index f746d7af1b21..9da2c4647cca 100644
--- a/usr.sbin/pw/Makefile.depend
+++ b/usr.sbin/pw/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/pw/tests/Makefile b/usr.sbin/pw/tests/Makefile
index ecdb0fe1665d..4704adbf995f 100644
--- a/usr.sbin/pw/tests/Makefile
+++ b/usr.sbin/pw/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= tests
diff --git a/usr.sbin/pw/tests/Makefile.depend b/usr.sbin/pw/tests/Makefile.depend
index 9124664318e7..6424d36707cd 100644
--- a/usr.sbin/pw/tests/Makefile.depend
+++ b/usr.sbin/pw/tests/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/pw/tests/group b/usr.sbin/pw/tests/group
index 620c588faa38..2812f56cfa98 100644
--- a/usr.sbin/pw/tests/group
+++ b/usr.sbin/pw/tests/group
@@ -1,3 +1,2 @@
-# $FreeBSD$
#
wheel:*:0:root
diff --git a/usr.sbin/pw/tests/helper_functions.shin b/usr.sbin/pw/tests/helper_functions.shin
index 1ee731a786ef..c03ca98d8709 100755
--- a/usr.sbin/pw/tests/helper_functions.shin
+++ b/usr.sbin/pw/tests/helper_functions.shin
@@ -1,4 +1,3 @@
-# $FreeBSD$
# The pw command
PW="pw -V ${HOME}"
diff --git a/usr.sbin/pw/tests/master.passwd b/usr.sbin/pw/tests/master.passwd
index f7dc837dabca..46728369eb17 100644
--- a/usr.sbin/pw/tests/master.passwd
+++ b/usr.sbin/pw/tests/master.passwd
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
root:*:0:0::0:0:Charlie &:/root:/bin/csh
toor:*:0:0::0:0:Bourne-again Superuser:/root:
diff --git a/usr.sbin/pw/tests/pw_config_test.sh b/usr.sbin/pw/tests/pw_config_test.sh
index fb6489a0b31c..e9209190dc5e 100755
--- a/usr.sbin/pw/tests/pw_config_test.sh
+++ b/usr.sbin/pw/tests/pw_config_test.sh
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Import helper functions
. $(atf_get_srcdir)/helper_functions.shin
diff --git a/usr.sbin/pw/tests/pw_etcdir_test.sh b/usr.sbin/pw/tests/pw_etcdir_test.sh
index b237789ed457..db6f0f30eaf3 100755
--- a/usr.sbin/pw/tests/pw_etcdir_test.sh
+++ b/usr.sbin/pw/tests/pw_etcdir_test.sh
@@ -1,4 +1,3 @@
-# $FreeBSD$
# When the '-V directory' option is provided, the directory must exist
atf_test_case etcdir_must_exist
diff --git a/usr.sbin/pw/tests/pw_groupadd_test.sh b/usr.sbin/pw/tests/pw_groupadd_test.sh
index 5fa7bef0fdf1..cf3c401a361c 100755
--- a/usr.sbin/pw/tests/pw_groupadd_test.sh
+++ b/usr.sbin/pw/tests/pw_groupadd_test.sh
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Import helper functions
. $(atf_get_srcdir)/helper_functions.shin
diff --git a/usr.sbin/pw/tests/pw_groupdel_test.sh b/usr.sbin/pw/tests/pw_groupdel_test.sh
index 88cc0e08b8bf..fa51b3814205 100755
--- a/usr.sbin/pw/tests/pw_groupdel_test.sh
+++ b/usr.sbin/pw/tests/pw_groupdel_test.sh
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Import helper functions
. $(atf_get_srcdir)/helper_functions.shin
diff --git a/usr.sbin/pw/tests/pw_groupmod_test.sh b/usr.sbin/pw/tests/pw_groupmod_test.sh
index 580692553847..ce7106d885d2 100755
--- a/usr.sbin/pw/tests/pw_groupmod_test.sh
+++ b/usr.sbin/pw/tests/pw_groupmod_test.sh
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Import helper functions
. $(atf_get_srcdir)/helper_functions.shin
diff --git a/usr.sbin/pw/tests/pw_groupshow_test.sh b/usr.sbin/pw/tests/pw_groupshow_test.sh
index f348d0ab1f70..06631e912c0f 100755
--- a/usr.sbin/pw/tests/pw_groupshow_test.sh
+++ b/usr.sbin/pw/tests/pw_groupshow_test.sh
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Import helper functions
. $(atf_get_srcdir)/helper_functions.shin
diff --git a/usr.sbin/pw/tests/pw_lock_test.sh b/usr.sbin/pw/tests/pw_lock_test.sh
index 5ec1b09a6956..f8fe03a4d147 100755
--- a/usr.sbin/pw/tests/pw_lock_test.sh
+++ b/usr.sbin/pw/tests/pw_lock_test.sh
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Import helper functions
. $(atf_get_srcdir)/helper_functions.shin
diff --git a/usr.sbin/pw/tests/pw_useradd_test.sh b/usr.sbin/pw/tests/pw_useradd_test.sh
index a50f018ab99d..b191d51104f7 100755
--- a/usr.sbin/pw/tests/pw_useradd_test.sh
+++ b/usr.sbin/pw/tests/pw_useradd_test.sh
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Import helper functions
. $(atf_get_srcdir)/helper_functions.shin
diff --git a/usr.sbin/pw/tests/pw_userdel_test.sh b/usr.sbin/pw/tests/pw_userdel_test.sh
index 694d7bbae6cc..aa508c6205bc 100755
--- a/usr.sbin/pw/tests/pw_userdel_test.sh
+++ b/usr.sbin/pw/tests/pw_userdel_test.sh
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Import helper functions
. $(atf_get_srcdir)/helper_functions.shin
diff --git a/usr.sbin/pw/tests/pw_usermod_test.sh b/usr.sbin/pw/tests/pw_usermod_test.sh
index cf3622f3b222..f8cb66a45b70 100755
--- a/usr.sbin/pw/tests/pw_usermod_test.sh
+++ b/usr.sbin/pw/tests/pw_usermod_test.sh
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Import helper functions
. $(atf_get_srcdir)/helper_functions.shin
diff --git a/usr.sbin/pw/tests/pw_usernext_test.sh b/usr.sbin/pw/tests/pw_usernext_test.sh
index 89f938ec8c33..63a688f573d8 100755
--- a/usr.sbin/pw/tests/pw_usernext_test.sh
+++ b/usr.sbin/pw/tests/pw_usernext_test.sh
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Import helper functions
. $(atf_get_srcdir)/helper_functions.shin
diff --git a/usr.sbin/pw/tests/pw_usershow_test.sh b/usr.sbin/pw/tests/pw_usershow_test.sh
index 530597948e4a..06f7f610936a 100755
--- a/usr.sbin/pw/tests/pw_usershow_test.sh
+++ b/usr.sbin/pw/tests/pw_usershow_test.sh
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Import helper functions
. $(atf_get_srcdir)/helper_functions.shin
diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile
index f8a2b20ef10b..49f299cd9861 100644
--- a/usr.sbin/pwd_mkdb/Makefile
+++ b/usr.sbin/pwd_mkdb/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
.PATH: ${SRCTOP}/lib/libc/gen # for pw_scan.c
diff --git a/usr.sbin/pwd_mkdb/Makefile.depend b/usr.sbin/pwd_mkdb/Makefile.depend
index d5ed563ecfc8..ec18d8c500c6 100644
--- a/usr.sbin/pwd_mkdb/Makefile.depend
+++ b/usr.sbin/pwd_mkdb/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/pwm/Makefile b/usr.sbin/pwm/Makefile
index 732995fc6018..044b1b1b72f1 100644
--- a/usr.sbin/pwm/Makefile
+++ b/usr.sbin/pwm/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= pwm
MAN= pwm.8
diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile
index 3ec74b02ce5c..b18c37126448 100644
--- a/usr.sbin/quot/Makefile
+++ b/usr.sbin/quot/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= quot
MAN= quot.8
diff --git a/usr.sbin/quot/Makefile.depend b/usr.sbin/quot/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/quot/Makefile.depend
+++ b/usr.sbin/quot/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/quotaon/Makefile b/usr.sbin/quotaon/Makefile
index ec3dc1ab7e15..30a76ac482a9 100644
--- a/usr.sbin/quotaon/Makefile
+++ b/usr.sbin/quotaon/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
PROG= quotaon
LINKS= ${BINDIR}/quotaon ${BINDIR}/quotaoff
diff --git a/usr.sbin/quotaon/Makefile.depend b/usr.sbin/quotaon/Makefile.depend
index 991757ecadc0..ffc295f2fe8a 100644
--- a/usr.sbin/quotaon/Makefile.depend
+++ b/usr.sbin/quotaon/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/rarpd/Makefile b/usr.sbin/rarpd/Makefile
index b7816cddedd3..35e477585ee8 100644
--- a/usr.sbin/rarpd/Makefile
+++ b/usr.sbin/rarpd/Makefile
@@ -1,5 +1,4 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $FreeBSD$
PROG= rarpd
MAN= rarpd.8
diff --git a/usr.sbin/rarpd/Makefile.depend b/usr.sbin/rarpd/Makefile.depend
index 4fc5be2a35f0..28acae7b0d55 100644
--- a/usr.sbin/rarpd/Makefile.depend
+++ b/usr.sbin/rarpd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/repquota/Makefile b/usr.sbin/repquota/Makefile
index 78fd39832cf8..4fd3d12b5b96 100644
--- a/usr.sbin/repquota/Makefile
+++ b/usr.sbin/repquota/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
PROG= repquota
MAN= repquota.8
diff --git a/usr.sbin/repquota/Makefile.depend b/usr.sbin/repquota/Makefile.depend
index 991757ecadc0..ffc295f2fe8a 100644
--- a/usr.sbin/repquota/Makefile.depend
+++ b/usr.sbin/repquota/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/rip6query/Makefile b/usr.sbin/rip6query/Makefile
index d33621dae174..43dcf1a7418d 100644
--- a/usr.sbin/rip6query/Makefile
+++ b/usr.sbin/rip6query/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
-# $FreeBSD$
PROG= rip6query
MAN= rip6query.8
diff --git a/usr.sbin/rip6query/Makefile.depend b/usr.sbin/rip6query/Makefile.depend
index d5ed563ecfc8..ec18d8c500c6 100644
--- a/usr.sbin/rip6query/Makefile.depend
+++ b/usr.sbin/rip6query/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/rmt/Makefile b/usr.sbin/rmt/Makefile
index 0cbc67c70880..573bdc3348e1 100644
--- a/usr.sbin/rmt/Makefile
+++ b/usr.sbin/rmt/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
PROG= rmt
MAN= rmt.8
diff --git a/usr.sbin/rmt/Makefile.depend b/usr.sbin/rmt/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/rmt/Makefile.depend
+++ b/usr.sbin/rmt/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile
index df23d33aea57..239aef44d8f0 100644
--- a/usr.sbin/route6d/Makefile
+++ b/usr.sbin/route6d/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
-# $FreeBSD$
PROG= route6d
MAN= route6d.8
diff --git a/usr.sbin/route6d/Makefile.depend b/usr.sbin/route6d/Makefile.depend
index d5ed563ecfc8..ec18d8c500c6 100644
--- a/usr.sbin/route6d/Makefile.depend
+++ b/usr.sbin/route6d/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/route6d/misc/chkrt b/usr.sbin/route6d/misc/chkrt
index 6ae01f37be04..86e61b281140 100755
--- a/usr.sbin/route6d/misc/chkrt
+++ b/usr.sbin/route6d/misc/chkrt
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# $FreeBSD$
#
$dump="/var/tmp/route6d_dump";
$pidfile="/var/run/route6d.pid";
diff --git a/usr.sbin/rpc.lockd/Makefile b/usr.sbin/rpc.lockd/Makefile
index 71c68a2d0ced..2efb5eb4bc76 100644
--- a/usr.sbin/rpc.lockd/Makefile
+++ b/usr.sbin/rpc.lockd/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.12 2000/08/07 16:23:31 thorpej Exp $
-# $FreeBSD$
PACKAGE= nfs
diff --git a/usr.sbin/rpc.lockd/Makefile.depend b/usr.sbin/rpc.lockd/Makefile.depend
index 8939901b94fd..c732701a2dd9 100644
--- a/usr.sbin/rpc.lockd/Makefile.depend
+++ b/usr.sbin/rpc.lockd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile
index c857f62790dc..161eebe9dc78 100644
--- a/usr.sbin/rpc.statd/Makefile
+++ b/usr.sbin/rpc.statd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= rpc.statd
MAN= rpc.statd.8
diff --git a/usr.sbin/rpc.statd/Makefile.depend b/usr.sbin/rpc.statd/Makefile.depend
index 572fc8dbf41a..71ae8785b565 100644
--- a/usr.sbin/rpc.statd/Makefile.depend
+++ b/usr.sbin/rpc.statd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/rpc.tlsclntd/Makefile b/usr.sbin/rpc.tlsclntd/Makefile
index 1c8481a7889c..2dbde13463ca 100644
--- a/usr.sbin/rpc.tlsclntd/Makefile
+++ b/usr.sbin/rpc.tlsclntd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/rpc.tlsservd/Makefile b/usr.sbin/rpc.tlsservd/Makefile
index 4424c38a8502..fb73d2edf7a0 100644
--- a/usr.sbin/rpc.tlsservd/Makefile
+++ b/usr.sbin/rpc.tlsservd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/rpc.umntall/Makefile b/usr.sbin/rpc.umntall/Makefile
index c44441a6de1a..df302dfc23ea 100644
--- a/usr.sbin/rpc.umntall/Makefile
+++ b/usr.sbin/rpc.umntall/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.4 (Berkeley) 6/22/95
-# $FreeBSD$
PACKAGE= nfs
diff --git a/usr.sbin/rpc.umntall/Makefile.depend b/usr.sbin/rpc.umntall/Makefile.depend
index 85338ebe3beb..57b1ea0a3a47 100644
--- a/usr.sbin/rpc.umntall/Makefile.depend
+++ b/usr.sbin/rpc.umntall/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile
index b31b34f4db3a..4b539f66fa81 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile
+++ b/usr.sbin/rpc.yppasswdd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
RPCDIR= ${DESTDIR}/usr/include/rpcsvc
diff --git a/usr.sbin/rpc.yppasswdd/Makefile.depend b/usr.sbin/rpc.yppasswdd/Makefile.depend
index f4474e3dffda..b9ee52a99c40 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile.depend
+++ b/usr.sbin/rpc.yppasswdd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/rpc.yppasswdd/yppwupdate b/usr.sbin/rpc.yppasswdd/yppwupdate
index a9db8f7e5b6c..c0587ada7f1d 100644
--- a/usr.sbin/rpc.yppasswdd/yppwupdate
+++ b/usr.sbin/rpc.yppasswdd/yppwupdate
@@ -8,7 +8,6 @@
#
# Comment out the LOG=yes line to disable logging.
#
-# $FreeBSD$
#
PATH=/bin:/usr/bin; export PATH
diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile
index 1f34a28914d7..1c35f377002b 100644
--- a/usr.sbin/rpc.ypupdated/Makefile
+++ b/usr.sbin/rpc.ypupdated/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr
diff --git a/usr.sbin/rpc.ypupdated/Makefile.depend b/usr.sbin/rpc.ypupdated/Makefile.depend
index 5b0587ae477a..0fe63efcd9a2 100644
--- a/usr.sbin/rpc.ypupdated/Makefile.depend
+++ b/usr.sbin/rpc.ypupdated/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/rpc.ypupdated/ypupdate b/usr.sbin/rpc.ypupdated/ypupdate
index 4a26f4b6d72b..8795ef3baf80 100755
--- a/usr.sbin/rpc.ypupdated/ypupdate
+++ b/usr.sbin/rpc.ypupdated/ypupdate
@@ -8,7 +8,6 @@
#
# Comment out the LOG=yes line to disable logging.
#
-# $FreeBSD$
#
LOG=yes
diff --git a/usr.sbin/rpc.ypxfrd/Makefile b/usr.sbin/rpc.ypxfrd/Makefile
index d07ee6d5c70c..a761275b6377 100644
--- a/usr.sbin/rpc.ypxfrd/Makefile
+++ b/usr.sbin/rpc.ypxfrd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/usr.sbin/ypserv
diff --git a/usr.sbin/rpc.ypxfrd/Makefile.depend b/usr.sbin/rpc.ypxfrd/Makefile.depend
index 572fc8dbf41a..71ae8785b565 100644
--- a/usr.sbin/rpc.ypxfrd/Makefile.depend
+++ b/usr.sbin/rpc.ypxfrd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/rpcbind/Makefile b/usr.sbin/rpcbind/Makefile
index eb7baa7fbcfc..1bb2d7584ed2 100644
--- a/usr.sbin/rpcbind/Makefile
+++ b/usr.sbin/rpcbind/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.3 2000/06/20 13:56:43 fvdl Exp $
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/rpcbind/Makefile.depend b/usr.sbin/rpcbind/Makefile.depend
index 722af65039b3..732a025c9552 100644
--- a/usr.sbin/rpcbind/Makefile.depend
+++ b/usr.sbin/rpcbind/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/rpcbind/Makefile.depend.options b/usr.sbin/rpcbind/Makefile.depend.options
index a62a5692d70a..fbc21670804e 100644
--- a/usr.sbin/rpcbind/Makefile.depend.options
+++ b/usr.sbin/rpcbind/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= TCP_WRAPPERS
diff --git a/usr.sbin/rpcbind/tests/Makefile b/usr.sbin/rpcbind/tests/Makefile
index 515214763421..de157e796cb9 100644
--- a/usr.sbin/rpcbind/tests/Makefile
+++ b/usr.sbin/rpcbind/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/rpcbind/tests/Makefile.depend b/usr.sbin/rpcbind/tests/Makefile.depend
index d313b17d4486..f17dae18048f 100644
--- a/usr.sbin/rpcbind/tests/Makefile.depend
+++ b/usr.sbin/rpcbind/tests/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/rrenumd/Makefile b/usr.sbin/rrenumd/Makefile
index ba6c4ad8f5cd..f2a0415b8607 100644
--- a/usr.sbin/rrenumd/Makefile
+++ b/usr.sbin/rrenumd/Makefile
@@ -12,7 +12,6 @@
# LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE.
#
-# $FreeBSD$
PROG= rrenumd
MAN= rrenumd.conf.5 rrenumd.8
diff --git a/usr.sbin/rrenumd/Makefile.depend b/usr.sbin/rrenumd/Makefile.depend
index ca3301c271b9..b9272b77703e 100644
--- a/usr.sbin/rrenumd/Makefile.depend
+++ b/usr.sbin/rrenumd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/rtadvctl/Makefile b/usr.sbin/rtadvctl/Makefile
index a8dcad163651..f45ab4f0d25a 100644
--- a/usr.sbin/rtadvctl/Makefile
+++ b/usr.sbin/rtadvctl/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
.PATH: ${.CURDIR:H}/rtadvd
diff --git a/usr.sbin/rtadvctl/Makefile.depend b/usr.sbin/rtadvctl/Makefile.depend
index d5ed563ecfc8..ec18d8c500c6 100644
--- a/usr.sbin/rtadvctl/Makefile.depend
+++ b/usr.sbin/rtadvctl/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/rtadvd/Makefile b/usr.sbin/rtadvd/Makefile
index 920c6d966aff..583f9db88ceb 100644
--- a/usr.sbin/rtadvd/Makefile
+++ b/usr.sbin/rtadvd/Makefile
@@ -12,7 +12,6 @@
# LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE.
#
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/rtadvd/Makefile.depend b/usr.sbin/rtadvd/Makefile.depend
index 4fc5be2a35f0..28acae7b0d55 100644
--- a/usr.sbin/rtadvd/Makefile.depend
+++ b/usr.sbin/rtadvd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/rtadvd/rtadvd.conf b/usr.sbin/rtadvd/rtadvd.conf
index 1e42c75b75be..cb97bec97bde 100644
--- a/usr.sbin/rtadvd/rtadvd.conf
+++ b/usr.sbin/rtadvd/rtadvd.conf
@@ -1,4 +1,3 @@
-# $FreeBSD$
# $KAME: rtadvd.conf,v 1.13 2003/06/25 03:45:21 itojun Exp $
#
# Note: All of the following parameters have default values defined
diff --git a/usr.sbin/rtprio/Makefile b/usr.sbin/rtprio/Makefile
index b612f2bc974b..751ee8209272 100644
--- a/usr.sbin/rtprio/Makefile
+++ b/usr.sbin/rtprio/Makefile
@@ -1,5 +1,4 @@
# from: @(#)Makefile 5.5 (Berkeley) 5/11/90
-# $FreeBSD$
PROG= rtprio
LINKS= ${BINDIR}/rtprio ${BINDIR}/idprio
diff --git a/usr.sbin/rtprio/Makefile.depend b/usr.sbin/rtprio/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/rtprio/Makefile.depend
+++ b/usr.sbin/rtprio/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/rtsold/Makefile b/usr.sbin/rtsold/Makefile
index 34da996b0f79..99a01f236e1b 100644
--- a/usr.sbin/rtsold/Makefile
+++ b/usr.sbin/rtsold/Makefile
@@ -12,7 +12,6 @@
# LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE.
#
-# $FreeBSD$
PROG= rtsold
MAN= rtsold.8
diff --git a/usr.sbin/rtsold/Makefile.depend b/usr.sbin/rtsold/Makefile.depend
index d897c480ee77..2326fec704fd 100644
--- a/usr.sbin/rtsold/Makefile.depend
+++ b/usr.sbin/rtsold/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/rtsold/Makefile.depend.options b/usr.sbin/rtsold/Makefile.depend.options
index c20f954f5bc4..a0449df3a893 100644
--- a/usr.sbin/rtsold/Makefile.depend.options
+++ b/usr.sbin/rtsold/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= CASPER
diff --git a/usr.sbin/rwhod/Makefile b/usr.sbin/rwhod/Makefile
index 554f6bec1c3c..270f5539edab 100644
--- a/usr.sbin/rwhod/Makefile
+++ b/usr.sbin/rwhod/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
PROG= rwhod
MAN= rwhod.8
diff --git a/usr.sbin/rwhod/Makefile.depend b/usr.sbin/rwhod/Makefile.depend
index 782b0d5c171e..c05a4a1cdd57 100644
--- a/usr.sbin/rwhod/Makefile.depend
+++ b/usr.sbin/rwhod/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile
index 375b8045e81f..2b7aa79154d0 100644
--- a/usr.sbin/sa/Makefile
+++ b/usr.sbin/sa/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/sa/Makefile.depend b/usr.sbin/sa/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/sa/Makefile.depend
+++ b/usr.sbin/sa/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/sa/tests/Makefile b/usr.sbin/sa/tests/Makefile
index ed2318417842..c049ae25368f 100644
--- a/usr.sbin/sa/tests/Makefile
+++ b/usr.sbin/sa/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= tests
diff --git a/usr.sbin/sa/tests/Makefile.depend b/usr.sbin/sa/tests/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/sa/tests/Makefile.depend
+++ b/usr.sbin/sa/tests/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/sa/tests/legacy_test.sh b/usr.sbin/sa/tests/legacy_test.sh
index d0d8f429366a..718135c8b1ae 100644
--- a/usr.sbin/sa/tests/legacy_test.sh
+++ b/usr.sbin/sa/tests/legacy_test.sh
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $FreeBSD$
#
DIR=`dirname $0`
diff --git a/usr.sbin/sa/tests/prime.sh b/usr.sbin/sa/tests/prime.sh
index 6992f45bce28..cafdc9e58f26 100755
--- a/usr.sbin/sa/tests/prime.sh
+++ b/usr.sbin/sa/tests/prime.sh
@@ -3,7 +3,6 @@
# Configure and run this script to create the files for regression testing
# for a new architecture/configuration.
#
-# $FreeBSD$
#
TZ=UTC; export TZ
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index 12e58ac3df5e..b71e1ab07d20 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.8 (Berkeley) 3/28/97
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/sendmail/Makefile.depend b/usr.sbin/sendmail/Makefile.depend
index 4a376e6292e9..67f70c1a1ba7 100644
--- a/usr.sbin/sendmail/Makefile.depend
+++ b/usr.sbin/sendmail/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/sendmail/Makefile.depend.options b/usr.sbin/sendmail/Makefile.depend.options
index 1feb80a343bb..c0a29e52552f 100644
--- a/usr.sbin/sendmail/Makefile.depend.options
+++ b/usr.sbin/sendmail/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= OPENSSL TCP_WRAPPERS
diff --git a/usr.sbin/service/Makefile b/usr.sbin/service/Makefile
index e8432f5aabf8..95244ab69685 100644
--- a/usr.sbin/service/Makefile
+++ b/usr.sbin/service/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= runtime
SCRIPTS=service.sh
diff --git a/usr.sbin/service/Makefile.depend b/usr.sbin/service/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/service/Makefile.depend
+++ b/usr.sbin/service/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/service/service.sh b/usr.sbin/service/service.sh
index 42846af56f2a..ca08e08ecd62 100755
--- a/usr.sbin/service/service.sh
+++ b/usr.sbin/service/service.sh
@@ -1,7 +1,5 @@
#!/bin/sh
-# $FreeBSD$
-
# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2009 Douglas Barton
diff --git a/usr.sbin/services_mkdb/Makefile b/usr.sbin/services_mkdb/Makefile
index 9d728b6da824..94821e0eeee8 100644
--- a/usr.sbin/services_mkdb/Makefile
+++ b/usr.sbin/services_mkdb/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= runtime
diff --git a/usr.sbin/services_mkdb/Makefile.depend b/usr.sbin/services_mkdb/Makefile.depend
index 991757ecadc0..ffc295f2fe8a 100644
--- a/usr.sbin/services_mkdb/Makefile.depend
+++ b/usr.sbin/services_mkdb/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/services_mkdb/services b/usr.sbin/services_mkdb/services
index 71dda5b8d80f..12c411e8c9c0 100644
--- a/usr.sbin/services_mkdb/services
+++ b/usr.sbin/services_mkdb/services
@@ -17,7 +17,6 @@
# port number for both TCP and UDP; hence, most entries here have two entries
# even if the protocol doesn't support UDP operations.
#
-# $FreeBSD$
# From: @(#)services 5.8 (Berkeley) 5/9/91
#
# WELL KNOWN PORT NUMBERS
diff --git a/usr.sbin/sesutil/Makefile b/usr.sbin/sesutil/Makefile
index fc39434a3704..4e8e08eabd15 100644
--- a/usr.sbin/sesutil/Makefile
+++ b/usr.sbin/sesutil/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= sesutil
SRCS= sesutil.c eltsub.c
diff --git a/usr.sbin/sesutil/Makefile.depend b/usr.sbin/sesutil/Makefile.depend
index 5770a091f2a6..1032566579a2 100644
--- a/usr.sbin/sesutil/Makefile.depend
+++ b/usr.sbin/sesutil/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/setfib/Makefile b/usr.sbin/setfib/Makefile
index 8508ed14ffc6..5b9890002276 100644
--- a/usr.sbin/setfib/Makefile
+++ b/usr.sbin/setfib/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
PROG= setfib
diff --git a/usr.sbin/setfib/Makefile.depend b/usr.sbin/setfib/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/setfib/Makefile.depend
+++ b/usr.sbin/setfib/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/setfmac/Makefile b/usr.sbin/setfmac/Makefile
index bcbd85fe275e..fc2d9fc9917f 100644
--- a/usr.sbin/setfmac/Makefile
+++ b/usr.sbin/setfmac/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= setfmac
LINKS= ${BINDIR}/setfmac ${BINDIR}/setfsmac
diff --git a/usr.sbin/setfmac/Makefile.depend b/usr.sbin/setfmac/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/setfmac/Makefile.depend
+++ b/usr.sbin/setfmac/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/setpmac/Makefile b/usr.sbin/setpmac/Makefile
index a8bc1acca26b..4f134b8e23cb 100644
--- a/usr.sbin/setpmac/Makefile
+++ b/usr.sbin/setpmac/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= setpmac
MAN= setpmac.8
diff --git a/usr.sbin/setpmac/Makefile.depend b/usr.sbin/setpmac/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/setpmac/Makefile.depend
+++ b/usr.sbin/setpmac/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/smbmsg/Makefile b/usr.sbin/smbmsg/Makefile
index 2ae640442808..4d3a498b6d3b 100644
--- a/usr.sbin/smbmsg/Makefile
+++ b/usr.sbin/smbmsg/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
PROG= smbmsg
MAN= smbmsg.8
diff --git a/usr.sbin/smbmsg/Makefile.depend b/usr.sbin/smbmsg/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/smbmsg/Makefile.depend
+++ b/usr.sbin/smbmsg/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/snapinfo/Makefile b/usr.sbin/snapinfo/Makefile
index 3aded69e2fb7..12c2881ca6ca 100644
--- a/usr.sbin/snapinfo/Makefile
+++ b/usr.sbin/snapinfo/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
PACKAGE= ufs
diff --git a/usr.sbin/snapinfo/Makefile.depend b/usr.sbin/snapinfo/Makefile.depend
index 735bf03b75b6..18d3ee63edb7 100644
--- a/usr.sbin/snapinfo/Makefile.depend
+++ b/usr.sbin/snapinfo/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/spi/Makefile b/usr.sbin/spi/Makefile
index 5676e4193064..17d651ce80eb 100644
--- a/usr.sbin/spi/Makefile
+++ b/usr.sbin/spi/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
#.include <src.opts.mk>
diff --git a/usr.sbin/spkrtest/Makefile b/usr.sbin/spkrtest/Makefile
index 8e9245aa753a..1a67586a360c 100644
--- a/usr.sbin/spkrtest/Makefile
+++ b/usr.sbin/spkrtest/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SCRIPTS=spkrtest.sh
MAN= spkrtest.8
diff --git a/usr.sbin/spkrtest/Makefile.depend b/usr.sbin/spkrtest/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/spkrtest/Makefile.depend
+++ b/usr.sbin/spkrtest/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/spkrtest/spkrtest.sh b/usr.sbin/spkrtest/spkrtest.sh
index 2c140fdcd33c..74bb44fbfd97 100644
--- a/usr.sbin/spkrtest/spkrtest.sh
+++ b/usr.sbin/spkrtest/spkrtest.sh
@@ -31,7 +31,6 @@
#
# Inspired on spkrtest.pl, rewritten from scratch to remove perl dependency
# $VER: spkrtest 0.3 (9.5.2002) Riccardo "VIC" Torrini <riccardo@torrini.org>
-# $FreeBSD$
#
cleanExit() {
diff --git a/usr.sbin/spray/Makefile b/usr.sbin/spray/Makefile
index f0070726c820..4342c9658f9b 100644
--- a/usr.sbin/spray/Makefile
+++ b/usr.sbin/spray/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= spray
MAN= spray.8
diff --git a/usr.sbin/spray/Makefile.depend b/usr.sbin/spray/Makefile.depend
index 5b0587ae477a..0fe63efcd9a2 100644
--- a/usr.sbin/spray/Makefile.depend
+++ b/usr.sbin/spray/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile
index f96a72274d60..8bdc107dd1c1 100644
--- a/usr.sbin/syslogd/Makefile
+++ b/usr.sbin/syslogd/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/syslogd/Makefile.depend b/usr.sbin/syslogd/Makefile.depend
index 4fc5be2a35f0..28acae7b0d55 100644
--- a/usr.sbin/syslogd/Makefile.depend
+++ b/usr.sbin/syslogd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/syslogd/ftp.conf b/usr.sbin/syslogd/ftp.conf
index d4d11cfb7a65..b70c91570567 100644
--- a/usr.sbin/syslogd/ftp.conf
+++ b/usr.sbin/syslogd/ftp.conf
@@ -1,2 +1 @@
-# $FreeBSD$
ftp.info /var/log/xferlog
diff --git a/usr.sbin/syslogd/lpr.conf b/usr.sbin/syslogd/lpr.conf
index 0eb6eb06db2a..b8a5a6c0f71b 100644
--- a/usr.sbin/syslogd/lpr.conf
+++ b/usr.sbin/syslogd/lpr.conf
@@ -1,2 +1 @@
-# $FreeBSD$
lpr.info /var/log/lpd-errs
diff --git a/usr.sbin/syslogd/ppp.conf b/usr.sbin/syslogd/ppp.conf
index 57ee868bd142..f23f11fc3989 100644
--- a/usr.sbin/syslogd/ppp.conf
+++ b/usr.sbin/syslogd/ppp.conf
@@ -1,3 +1,2 @@
-# $FreeBSD$
!ppp
*.* /var/log/ppp.log
diff --git a/usr.sbin/syslogd/syslog.conf b/usr.sbin/syslogd/syslog.conf
index a556f309d943..d06d58a1d200 100644
--- a/usr.sbin/syslogd/syslog.conf
+++ b/usr.sbin/syslogd/syslog.conf
@@ -1,4 +1,3 @@
-# $FreeBSD$
#
# Spaces ARE valid field separators in this file. However,
# other *nix-like systems still insist on using tabs as field
diff --git a/usr.sbin/sysrc/Makefile b/usr.sbin/sysrc/Makefile
index 1ace38af4867..831ce5d135bd 100644
--- a/usr.sbin/sysrc/Makefile
+++ b/usr.sbin/sysrc/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SCRIPTS= sysrc
diff --git a/usr.sbin/sysrc/Makefile.depend b/usr.sbin/sysrc/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/sysrc/Makefile.depend
+++ b/usr.sbin/sysrc/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/sysrc/sysrc b/usr.sbin/sysrc/sysrc
index 5c24d1d4f831..1766cf7ab835 100644
--- a/usr.sbin/sysrc/sysrc
+++ b/usr.sbin/sysrc/sysrc
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
############################################################ INCLUDES
diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile
index 2cbadf29f655..93fc23169ea0 100644
--- a/usr.sbin/tcpdchk/Makefile
+++ b/usr.sbin/tcpdchk/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/tcpdchk/Makefile.depend b/usr.sbin/tcpdchk/Makefile.depend
index 8af4779ea996..abf397ae78f3 100644
--- a/usr.sbin/tcpdchk/Makefile.depend
+++ b/usr.sbin/tcpdchk/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile
index 81e04e758225..e12bde64c493 100644
--- a/usr.sbin/tcpdmatch/Makefile
+++ b/usr.sbin/tcpdmatch/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/tcpdmatch/Makefile.depend b/usr.sbin/tcpdmatch/Makefile.depend
index 8af4779ea996..abf397ae78f3 100644
--- a/usr.sbin/tcpdmatch/Makefile.depend
+++ b/usr.sbin/tcpdmatch/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/tcpdrop/Makefile b/usr.sbin/tcpdrop/Makefile
index 2fc606a26392..58a9e05d46a5 100644
--- a/usr.sbin/tcpdrop/Makefile
+++ b/usr.sbin/tcpdrop/Makefile
@@ -1,5 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2004/04/26 19:51:20 markus Exp $
-# $FreeBSD$
PROG= tcpdrop
MAN= tcpdrop.8
diff --git a/usr.sbin/tcpdrop/Makefile.depend b/usr.sbin/tcpdrop/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/tcpdrop/Makefile.depend
+++ b/usr.sbin/tcpdrop/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile
index d183febb134b..10859badcc3d 100644
--- a/usr.sbin/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 0.1 (RGrimes) 4/4/93
-# $FreeBSD$
SUBDIR= tcpdump
diff --git a/usr.sbin/tcpdump/Makefile.inc b/usr.sbin/tcpdump/Makefile.inc
index 6c4b6e22ba1c..4fc7f35d0456 100644
--- a/usr.sbin/tcpdump/Makefile.inc
+++ b/usr.sbin/tcpdump/Makefile.inc
@@ -1,5 +1,4 @@
# @(#)Makefile.inc 5.1 (Berkeley) 5/11/90
-# $FreeBSD$
BINDIR?= /usr/sbin
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile
index 1133a0a150d5..9d9ae2559e10 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/tcpdump/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile.depend b/usr.sbin/tcpdump/tcpdump/Makefile.depend
index 45d244118e6d..6e55564d4b58 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile.depend
+++ b/usr.sbin/tcpdump/tcpdump/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile.depend.options b/usr.sbin/tcpdump/tcpdump/Makefile.depend.options
index e5807369dda2..e111e9fc3536 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile.depend.options
+++ b/usr.sbin/tcpdump/tcpdump/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= CASPER OPENSSL
diff --git a/usr.sbin/tests/Makefile b/usr.sbin/tests/Makefile
index 3b3078f8612a..b8996030aafc 100644
--- a/usr.sbin/tests/Makefile
+++ b/usr.sbin/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/usr.sbin/tests/Makefile.depend b/usr.sbin/tests/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/tests/Makefile.depend
+++ b/usr.sbin/tests/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile
index e90019fedb5d..8ea7ee22d19a 100644
--- a/usr.sbin/traceroute/Makefile
+++ b/usr.sbin/traceroute/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/traceroute/Makefile.depend b/usr.sbin/traceroute/Makefile.depend
index 12fc57a4aaf9..08e6fa51dbf7 100644
--- a/usr.sbin/traceroute/Makefile.depend
+++ b/usr.sbin/traceroute/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/traceroute/Makefile.depend.options b/usr.sbin/traceroute/Makefile.depend.options
index a1c8f6278e92..5d5af2276e30 100644
--- a/usr.sbin/traceroute/Makefile.depend.options
+++ b/usr.sbin/traceroute/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= CASPER
diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile
index 4d28d8f3c347..5086b3c08706 100644
--- a/usr.sbin/traceroute6/Makefile
+++ b/usr.sbin/traceroute6/Makefile
@@ -11,7 +11,6 @@
# AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
# LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE.
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/traceroute6/Makefile.depend b/usr.sbin/traceroute6/Makefile.depend
index b78c121a5f29..66952d55b002 100644
--- a/usr.sbin/traceroute6/Makefile.depend
+++ b/usr.sbin/traceroute6/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/trim/Makefile b/usr.sbin/trim/Makefile
index 6126ef35503a..cb609121be7b 100644
--- a/usr.sbin/trim/Makefile
+++ b/usr.sbin/trim/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= trim
MAN= trim.8
diff --git a/usr.sbin/trpt/Makefile b/usr.sbin/trpt/Makefile
index 33a3d1f81a7f..203727e4ae7c 100644
--- a/usr.sbin/trpt/Makefile
+++ b/usr.sbin/trpt/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/trpt/Makefile.depend b/usr.sbin/trpt/Makefile.depend
index d5ed563ecfc8..ec18d8c500c6 100644
--- a/usr.sbin/trpt/Makefile.depend
+++ b/usr.sbin/trpt/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile
index e3d7526838a1..3ff9b36ff74e 100644
--- a/usr.sbin/tzsetup/Makefile
+++ b/usr.sbin/tzsetup/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/tzsetup/Makefile.depend b/usr.sbin/tzsetup/Makefile.depend
index 5f1a802404d8..9add648af17b 100644
--- a/usr.sbin/tzsetup/Makefile.depend
+++ b/usr.sbin/tzsetup/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/tzsetup/Makefile.depend.options b/usr.sbin/tzsetup/Makefile.depend.options
index 4425320ea3be..5ad18825549e 100644
--- a/usr.sbin/tzsetup/Makefile.depend.options
+++ b/usr.sbin/tzsetup/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= DIALOG
diff --git a/usr.sbin/uathload/Makefile b/usr.sbin/uathload/Makefile
index 10a7cf472747..a3895d2019c4 100644
--- a/usr.sbin/uathload/Makefile
+++ b/usr.sbin/uathload/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= uathload
MAN= uathload.8
diff --git a/usr.sbin/uathload/Makefile.depend b/usr.sbin/uathload/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/uathload/Makefile.depend
+++ b/usr.sbin/uathload/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/uefisign/Makefile b/usr.sbin/uefisign/Makefile
index d404a4c2363a..8c6314fe0f3e 100644
--- a/usr.sbin/uefisign/Makefile
+++ b/usr.sbin/uefisign/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= uefisign
SRCS= uefisign.c child.c pe.c
diff --git a/usr.sbin/uefisign/Makefile.depend b/usr.sbin/uefisign/Makefile.depend
index cdd96948933d..10f629d78dd8 100644
--- a/usr.sbin/uefisign/Makefile.depend
+++ b/usr.sbin/uefisign/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ugidfw/Makefile b/usr.sbin/ugidfw/Makefile
index 7a5453e49d68..959e4d4c1aa2 100644
--- a/usr.sbin/ugidfw/Makefile
+++ b/usr.sbin/ugidfw/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= ugidfw
MAN= ugidfw.8
diff --git a/usr.sbin/ugidfw/Makefile.depend b/usr.sbin/ugidfw/Makefile.depend
index 65c3644dbf39..6bb431578174 100644
--- a/usr.sbin/ugidfw/Makefile.depend
+++ b/usr.sbin/ugidfw/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/uhsoctl/Makefile b/usr.sbin/uhsoctl/Makefile
index 264384b755c1..9d731bbf09dc 100644
--- a/usr.sbin/uhsoctl/Makefile
+++ b/usr.sbin/uhsoctl/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= uhsoctl
MAN= uhsoctl.1
diff --git a/usr.sbin/uhsoctl/Makefile.depend b/usr.sbin/uhsoctl/Makefile.depend
index 4fc5be2a35f0..28acae7b0d55 100644
--- a/usr.sbin/uhsoctl/Makefile.depend
+++ b/usr.sbin/uhsoctl/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/unbound/Makefile b/usr.sbin/unbound/Makefile
index 5e747ebb6952..a4fbd0b4a67b 100644
--- a/usr.sbin/unbound/Makefile
+++ b/usr.sbin/unbound/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= daemon anchor checkconf control
SUBDIR+= setup
diff --git a/usr.sbin/unbound/Makefile.inc b/usr.sbin/unbound/Makefile.inc
index 7cdeaa592d2a..8e4e8818522b 100644
--- a/usr.sbin/unbound/Makefile.inc
+++ b/usr.sbin/unbound/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
MK_WERROR= no
NO_WTHREAD_SAFETY= true
diff --git a/usr.sbin/unbound/anchor/Makefile b/usr.sbin/unbound/anchor/Makefile
index 986c77b02dbc..01a7c53c8ae8 100644
--- a/usr.sbin/unbound/anchor/Makefile
+++ b/usr.sbin/unbound/anchor/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Vendor sources and generated files
LDNSDIR= ${SRCTOP}/contrib/ldns
diff --git a/usr.sbin/unbound/anchor/Makefile.depend b/usr.sbin/unbound/anchor/Makefile.depend
index 75cb691c1c91..8f2ceeda01c9 100644
--- a/usr.sbin/unbound/anchor/Makefile.depend
+++ b/usr.sbin/unbound/anchor/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/unbound/checkconf/Makefile b/usr.sbin/unbound/checkconf/Makefile
index c10f7eb90959..264f3b829fc4 100644
--- a/usr.sbin/unbound/checkconf/Makefile
+++ b/usr.sbin/unbound/checkconf/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Vendor sources and generated files
LDNSDIR= ${SRCTOP}/contrib/ldns
diff --git a/usr.sbin/unbound/checkconf/Makefile.depend b/usr.sbin/unbound/checkconf/Makefile.depend
index 37b991b9f24c..7972f39324f4 100644
--- a/usr.sbin/unbound/checkconf/Makefile.depend
+++ b/usr.sbin/unbound/checkconf/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/unbound/control/Makefile b/usr.sbin/unbound/control/Makefile
index eeadc753f5dd..b5340c0bca67 100644
--- a/usr.sbin/unbound/control/Makefile
+++ b/usr.sbin/unbound/control/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Vendor sources and generated files
LDNSDIR= ${SRCTOP}/contrib/ldns
diff --git a/usr.sbin/unbound/control/Makefile.depend b/usr.sbin/unbound/control/Makefile.depend
index 37b991b9f24c..7972f39324f4 100644
--- a/usr.sbin/unbound/control/Makefile.depend
+++ b/usr.sbin/unbound/control/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/unbound/daemon/Makefile b/usr.sbin/unbound/daemon/Makefile
index ee251acee85f..ad0f5b2fb245 100644
--- a/usr.sbin/unbound/daemon/Makefile
+++ b/usr.sbin/unbound/daemon/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Vendor sources and generated files
LDNSDIR= ${SRCTOP}/contrib/ldns
diff --git a/usr.sbin/unbound/daemon/Makefile.depend b/usr.sbin/unbound/daemon/Makefile.depend
index fb63d6473d7b..4e0be61aaae6 100644
--- a/usr.sbin/unbound/daemon/Makefile.depend
+++ b/usr.sbin/unbound/daemon/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/unbound/setup/Makefile b/usr.sbin/unbound/setup/Makefile
index 7a1bc0441939..b7b811238b9c 100644
--- a/usr.sbin/unbound/setup/Makefile
+++ b/usr.sbin/unbound/setup/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SCRIPTS= local-unbound-setup.sh
MAN= #
diff --git a/usr.sbin/unbound/setup/Makefile.depend b/usr.sbin/unbound/setup/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/unbound/setup/Makefile.depend
+++ b/usr.sbin/unbound/setup/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/unbound/setup/local-unbound-setup.sh b/usr.sbin/unbound/setup/local-unbound-setup.sh
index 4f8ecadf7a15..d52534b46fa3 100755
--- a/usr.sbin/unbound/setup/local-unbound-setup.sh
+++ b/usr.sbin/unbound/setup/local-unbound-setup.sh
@@ -26,7 +26,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
D="${DESTDIR}"
diff --git a/usr.sbin/usbconfig/Makefile b/usr.sbin/usbconfig/Makefile
index bfc4b6354d2a..55a222d7ee4a 100644
--- a/usr.sbin/usbconfig/Makefile
+++ b/usr.sbin/usbconfig/Makefile
@@ -1,5 +1,4 @@
#
-# $FreeBSD$
#
PROG= usbconfig
MAN= usbconfig.8
diff --git a/usr.sbin/usbconfig/Makefile.depend b/usr.sbin/usbconfig/Makefile.depend
index a93901938c4b..e095e48a8d67 100644
--- a/usr.sbin/usbconfig/Makefile.depend
+++ b/usr.sbin/usbconfig/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/usbdump/Makefile b/usr.sbin/usbdump/Makefile
index d42c9b6326cb..fd57c087c998 100644
--- a/usr.sbin/usbdump/Makefile
+++ b/usr.sbin/usbdump/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= usbdump
SRCS= usbdump.c
diff --git a/usr.sbin/usbdump/Makefile.depend b/usr.sbin/usbdump/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/usbdump/Makefile.depend
+++ b/usr.sbin/usbdump/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/utx/Makefile b/usr.sbin/utx/Makefile
index c7710b2a6fcb..98ba06acb92e 100644
--- a/usr.sbin/utx/Makefile
+++ b/usr.sbin/utx/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PACKAGE= acct
diff --git a/usr.sbin/utx/Makefile.depend b/usr.sbin/utx/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/utx/Makefile.depend
+++ b/usr.sbin/utx/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/valectl/Makefile b/usr.sbin/valectl/Makefile
index f9322fa05047..779376536975 100644
--- a/usr.sbin/valectl/Makefile
+++ b/usr.sbin/valectl/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= valectl
MAN= valectl.8
diff --git a/usr.sbin/vidcontrol/Makefile b/usr.sbin/vidcontrol/Makefile
index 8c8f6bb804b2..3de2cde13b0c 100644
--- a/usr.sbin/vidcontrol/Makefile
+++ b/usr.sbin/vidcontrol/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= vidcontrol
SRCS= vidcontrol.c decode.c
diff --git a/usr.sbin/vidcontrol/Makefile.depend b/usr.sbin/vidcontrol/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/vidcontrol/Makefile.depend
+++ b/usr.sbin/vidcontrol/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/vigr/Makefile b/usr.sbin/vigr/Makefile
index 52b548e57ca1..575b2aa5e39b 100644
--- a/usr.sbin/vigr/Makefile
+++ b/usr.sbin/vigr/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SCRIPTS= vigr
MAN= vigr.8
diff --git a/usr.sbin/vigr/Makefile.depend b/usr.sbin/vigr/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/vigr/Makefile.depend
+++ b/usr.sbin/vigr/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/vigr/vigr.sh b/usr.sbin/vigr/vigr.sh
index c5dc65d8be18..ed84cfbb277e 100644
--- a/usr.sbin/vigr/vigr.sh
+++ b/usr.sbin/vigr/vigr.sh
@@ -24,7 +24,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
error() {
diff --git a/usr.sbin/vipw/Makefile b/usr.sbin/vipw/Makefile
index f36825de6df9..890a83b472dc 100644
--- a/usr.sbin/vipw/Makefile
+++ b/usr.sbin/vipw/Makefile
@@ -1,5 +1,4 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
PROG= vipw
MAN= vipw.8
diff --git a/usr.sbin/vipw/Makefile.depend b/usr.sbin/vipw/Makefile.depend
index 991757ecadc0..ffc295f2fe8a 100644
--- a/usr.sbin/vipw/Makefile.depend
+++ b/usr.sbin/vipw/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/wake/Makefile b/usr.sbin/wake/Makefile
index f75d4693d1b5..5da46d9880f4 100644
--- a/usr.sbin/wake/Makefile
+++ b/usr.sbin/wake/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= wake
MAN= wake.8
diff --git a/usr.sbin/wake/Makefile.depend b/usr.sbin/wake/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/wake/Makefile.depend
+++ b/usr.sbin/wake/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/watch/Makefile b/usr.sbin/watch/Makefile
index 981aec0a4749..9b2ccb3a9557 100644
--- a/usr.sbin/watch/Makefile
+++ b/usr.sbin/watch/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= watch
MAN= watch.8
diff --git a/usr.sbin/watch/Makefile.depend b/usr.sbin/watch/Makefile.depend
index 9b2a343de2dc..aea98dbaa941 100644
--- a/usr.sbin/watch/Makefile.depend
+++ b/usr.sbin/watch/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/watchdogd/Makefile b/usr.sbin/watchdogd/Makefile
index bce983f6a92c..1ba414f79846 100644
--- a/usr.sbin/watchdogd/Makefile
+++ b/usr.sbin/watchdogd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= watchdogd
LINKS= ${BINDIR}/watchdogd ${BINDIR}/watchdog
diff --git a/usr.sbin/watchdogd/Makefile.depend b/usr.sbin/watchdogd/Makefile.depend
index a015e205da56..1eb6d2ed64a8 100644
--- a/usr.sbin/watchdogd/Makefile.depend
+++ b/usr.sbin/watchdogd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/wlandebug/Makefile b/usr.sbin/wlandebug/Makefile
index d03fa4a07f82..fe694847cf72 100644
--- a/usr.sbin/wlandebug/Makefile
+++ b/usr.sbin/wlandebug/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= wlandebug
MAN= wlandebug.8
diff --git a/usr.sbin/wlandebug/Makefile.depend b/usr.sbin/wlandebug/Makefile.depend
index 37b288fd73d8..f51a49e5c7f3 100644
--- a/usr.sbin/wlandebug/Makefile.depend
+++ b/usr.sbin/wlandebug/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/wpa/Makefile b/usr.sbin/wpa/Makefile
index 18fc45c24e20..e2c142e0b0e4 100644
--- a/usr.sbin/wpa/Makefile
+++ b/usr.sbin/wpa/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SUBDIR= src .WAIT \
wpa_supplicant \
diff --git a/usr.sbin/wpa/Makefile.crypto b/usr.sbin/wpa/Makefile.crypto
index 2046c32d76ac..7208a4b4fabf 100644
--- a/usr.sbin/wpa/Makefile.crypto
+++ b/usr.sbin/wpa/Makefile.crypto
@@ -1,4 +1,3 @@
-# $FreeBSD$
.if ${MK_OPENSSL} != "no"
LIBADD+= ssl crypto
diff --git a/usr.sbin/wpa/Makefile.depend.options b/usr.sbin/wpa/Makefile.depend.options
index fa96b2506b2c..b374d7a1fd52 100644
--- a/usr.sbin/wpa/Makefile.depend.options
+++ b/usr.sbin/wpa/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= OPENSSL
diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc
index d674d3ae5fd2..ce4f1ec38b4b 100644
--- a/usr.sbin/wpa/Makefile.inc
+++ b/usr.sbin/wpa/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile
index ce3b7d82fd69..04176419084f 100644
--- a/usr.sbin/wpa/hostapd/Makefile
+++ b/usr.sbin/wpa/hostapd/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/usr.sbin/wpa/hostapd/Makefile.depend b/usr.sbin/wpa/hostapd/Makefile.depend
index 59c29ce26572..77becdb6fee9 100644
--- a/usr.sbin/wpa/hostapd/Makefile.depend
+++ b/usr.sbin/wpa/hostapd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/wpa/hostapd_cli/Makefile b/usr.sbin/wpa/hostapd_cli/Makefile
index fef18dab7b32..4c66c2078f4b 100644
--- a/usr.sbin/wpa/hostapd_cli/Makefile
+++ b/usr.sbin/wpa/hostapd_cli/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include "../Makefile.inc"
diff --git a/usr.sbin/wpa/hostapd_cli/Makefile.depend b/usr.sbin/wpa/hostapd_cli/Makefile.depend
index 4fc5be2a35f0..28acae7b0d55 100644
--- a/usr.sbin/wpa/hostapd_cli/Makefile.depend
+++ b/usr.sbin/wpa/hostapd_cli/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/wpa/ndis_events/Makefile b/usr.sbin/wpa/ndis_events/Makefile
index 07caf5a48465..eef565142f30 100644
--- a/usr.sbin/wpa/ndis_events/Makefile
+++ b/usr.sbin/wpa/ndis_events/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= ndis_events
SRCS+= ndis_events.c
diff --git a/usr.sbin/wpa/ndis_events/Makefile.depend b/usr.sbin/wpa/ndis_events/Makefile.depend
index d5ed563ecfc8..ec18d8c500c6 100644
--- a/usr.sbin/wpa/ndis_events/Makefile.depend
+++ b/usr.sbin/wpa/ndis_events/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/wpa/wpa_cli/Makefile b/usr.sbin/wpa/wpa_cli/Makefile
index 2aad727a6785..be5896e74d6d 100644
--- a/usr.sbin/wpa/wpa_cli/Makefile
+++ b/usr.sbin/wpa/wpa_cli/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/wpa/wpa_cli/Makefile.depend b/usr.sbin/wpa/wpa_cli/Makefile.depend
index 4fc5be2a35f0..28acae7b0d55 100644
--- a/usr.sbin/wpa/wpa_cli/Makefile.depend
+++ b/usr.sbin/wpa/wpa_cli/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/wpa/wpa_passphrase/Makefile b/usr.sbin/wpa/wpa_passphrase/Makefile
index 4cd540696d67..eeb71a31ec9d 100644
--- a/usr.sbin/wpa/wpa_passphrase/Makefile
+++ b/usr.sbin/wpa/wpa_passphrase/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include "../Makefile.inc"
diff --git a/usr.sbin/wpa/wpa_passphrase/Makefile.depend b/usr.sbin/wpa/wpa_passphrase/Makefile.depend
index 4fc5be2a35f0..28acae7b0d55 100644
--- a/usr.sbin/wpa/wpa_passphrase/Makefile.depend
+++ b/usr.sbin/wpa/wpa_passphrase/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/wpa/wpa_priv/Makefile b/usr.sbin/wpa/wpa_priv/Makefile
index d3b693341276..4ed75bd22511 100644
--- a/usr.sbin/wpa/wpa_priv/Makefile
+++ b/usr.sbin/wpa/wpa_priv/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include "../Makefile.inc"
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index fb045f804977..d82d18ac025e 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile.depend b/usr.sbin/wpa/wpa_supplicant/Makefile.depend
index 59c29ce26572..77becdb6fee9 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile.depend
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile
index 6ddbfdfd9b09..a556510b8b40 100644
--- a/usr.sbin/yp_mkdb/Makefile
+++ b/usr.sbin/yp_mkdb/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/libexec/ypxfr ${SRCTOP}/usr.sbin/ypserv
diff --git a/usr.sbin/yp_mkdb/Makefile.depend b/usr.sbin/yp_mkdb/Makefile.depend
index 85338ebe3beb..57b1ea0a3a47 100644
--- a/usr.sbin/yp_mkdb/Makefile.depend
+++ b/usr.sbin/yp_mkdb/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ypbind/Makefile b/usr.sbin/ypbind/Makefile
index 1a5844390810..d49e9bd47f1b 100644
--- a/usr.sbin/ypbind/Makefile
+++ b/usr.sbin/ypbind/Makefile
@@ -1,5 +1,4 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $FreeBSD$
PACKAGE= yp
PROG= ypbind
diff --git a/usr.sbin/ypbind/Makefile.depend b/usr.sbin/ypbind/Makefile.depend
index faed4b4cc2aa..f4ffb731c7f2 100644
--- a/usr.sbin/ypbind/Makefile.depend
+++ b/usr.sbin/ypbind/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ypldap/Makefile b/usr.sbin/ypldap/Makefile
index 1fcaf238ca2a..fe2416027b75 100644
--- a/usr.sbin/ypldap/Makefile
+++ b/usr.sbin/ypldap/Makefile
@@ -1,5 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2015/09/09 15:33:18 deraadt Exp $
-# $FreeBSD$
PACKAGE= yp
PROG= ypldap
diff --git a/usr.sbin/ypldap/Makefile.depend b/usr.sbin/ypldap/Makefile.depend
index 2a162b74233c..015eef7da406 100644
--- a/usr.sbin/ypldap/Makefile.depend
+++ b/usr.sbin/ypldap/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/yppoll/Makefile b/usr.sbin/yppoll/Makefile
index b865632fb82f..275027136891 100644
--- a/usr.sbin/yppoll/Makefile
+++ b/usr.sbin/yppoll/Makefile
@@ -1,5 +1,4 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $FreeBSD$
PACKAGE= yp
PROG= yppoll
diff --git a/usr.sbin/yppoll/Makefile.depend b/usr.sbin/yppoll/Makefile.depend
index faed4b4cc2aa..f4ffb731c7f2 100644
--- a/usr.sbin/yppoll/Makefile.depend
+++ b/usr.sbin/yppoll/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile
index 897e308c351c..9dfdd6d7ab65 100644
--- a/usr.sbin/yppush/Makefile
+++ b/usr.sbin/yppush/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
RPCDIR= ${SRCTOP}/include/rpcsvc
.PATH: ${RPCDIR} ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr
diff --git a/usr.sbin/yppush/Makefile.depend b/usr.sbin/yppush/Makefile.depend
index 85338ebe3beb..57b1ea0a3a47 100644
--- a/usr.sbin/yppush/Makefile.depend
+++ b/usr.sbin/yppush/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile
index 6d5948554ec8..18869d5c3345 100644
--- a/usr.sbin/ypserv/Makefile
+++ b/usr.sbin/ypserv/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
diff --git a/usr.sbin/ypserv/Makefile.depend b/usr.sbin/ypserv/Makefile.depend
index 722af65039b3..732a025c9552 100644
--- a/usr.sbin/ypserv/Makefile.depend
+++ b/usr.sbin/ypserv/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/ypserv/Makefile.depend.options b/usr.sbin/ypserv/Makefile.depend.options
index a62a5692d70a..fbc21670804e 100644
--- a/usr.sbin/ypserv/Makefile.depend.options
+++ b/usr.sbin/ypserv/Makefile.depend.options
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file is not autogenerated - take care!
DIRDEPS_OPTIONS= TCP_WRAPPERS
diff --git a/usr.sbin/ypserv/Makefile.yp b/usr.sbin/ypserv/Makefile.yp
index 17eabe5f42f4..18d6509a9fa7 100644
--- a/usr.sbin/ypserv/Makefile.yp
+++ b/usr.sbin/ypserv/Makefile.yp
@@ -1,7 +1,6 @@
#
# Makefile for the NIS databases
#
-# $FreeBSD$
#
# This Makefile should only be run on the NIS master server of a domain.
# All updated maps will be pushed to all NIS slave servers listed in the
diff --git a/usr.sbin/ypserv/ypinit.sh b/usr.sbin/ypserv/ypinit.sh
index 5008bcfe5093..63f4e0706b92 100644
--- a/usr.sbin/ypserv/ypinit.sh
+++ b/usr.sbin/ypserv/ypinit.sh
@@ -1,5 +1,4 @@
#!/bin/sh
-# $FreeBSD$
#
# ypinit.sh - setup a master or slave server.
# (Taken from OpenBSD and modified for FreeBSD.)
diff --git a/usr.sbin/ypset/Makefile b/usr.sbin/ypset/Makefile
index 4c6c86df556e..28e23e175329 100644
--- a/usr.sbin/ypset/Makefile
+++ b/usr.sbin/ypset/Makefile
@@ -1,5 +1,4 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $FreeBSD$
PACKAGE= yp
PROG= ypset
diff --git a/usr.sbin/ypset/Makefile.depend b/usr.sbin/ypset/Makefile.depend
index faed4b4cc2aa..f4ffb731c7f2 100644
--- a/usr.sbin/ypset/Makefile.depend
+++ b/usr.sbin/ypset/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/zdump/Makefile b/usr.sbin/zdump/Makefile
index cbf7c5c566c8..6b18107c2f75 100644
--- a/usr.sbin/zdump/Makefile
+++ b/usr.sbin/zdump/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/contrib/tzcode
diff --git a/usr.sbin/zdump/Makefile.depend b/usr.sbin/zdump/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/zdump/Makefile.depend
+++ b/usr.sbin/zdump/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/zic/Makefile b/usr.sbin/zic/Makefile
index 88d3f12c3016..fdfe6870583a 100644
--- a/usr.sbin/zic/Makefile
+++ b/usr.sbin/zic/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/contrib/tzcode
diff --git a/usr.sbin/zic/Makefile.depend b/usr.sbin/zic/Makefile.depend
index 6cfaab1c3644..84b8ddd67e34 100644
--- a/usr.sbin/zic/Makefile.depend
+++ b/usr.sbin/zic/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/zonectl/Makefile b/usr.sbin/zonectl/Makefile
index 5dac60ddf3f7..9c86470f785e 100644
--- a/usr.sbin/zonectl/Makefile
+++ b/usr.sbin/zonectl/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
PROG= zonectl
SRCS= zonectl.c
diff --git a/usr.sbin/zonectl/Makefile.depend b/usr.sbin/zonectl/Makefile.depend
index ee06e1c20939..b45d0c221240 100644
--- a/usr.sbin/zonectl/Makefile.depend
+++ b/usr.sbin/zonectl/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/zzz/Makefile b/usr.sbin/zzz/Makefile
index 8c4a9beb763a..85191008a0b3 100644
--- a/usr.sbin/zzz/Makefile
+++ b/usr.sbin/zzz/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
SCRIPTS=zzz.sh
MAN= zzz.8
diff --git a/usr.sbin/zzz/Makefile.depend b/usr.sbin/zzz/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/usr.sbin/zzz/Makefile.depend
+++ b/usr.sbin/zzz/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/usr.sbin/zzz/zzz.sh b/usr.sbin/zzz/zzz.sh
index ef9527bb76b3..b2b019a1d9d1 100644
--- a/usr.sbin/zzz/zzz.sh
+++ b/usr.sbin/zzz/zzz.sh
@@ -7,7 +7,6 @@
#
# Mark Santcroos <marks@ripe.net>
#
-# $FreeBSD$
PATH=/sbin:/usr/sbin:/usr/bin:/bin