summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreadler <eadler@FreeBSD.org>2018-03-05 07:26:05 +0000
committereadler <eadler@FreeBSD.org>2018-03-05 07:26:05 +0000
commitfc195e04d9ebb262bd1863735758e138682de6e1 (patch)
tree912d569f5ccd477bf8a409b3db72c12aebd27846
parente04bce9b4972e0f91b7874fed99e7a1c35f19095 (diff)
downloadFreeBSD-src-fc195e04d9ebb262bd1863735758e138682de6e1.zip
FreeBSD-src-fc195e04d9ebb262bd1863735758e138682de6e1.tar.gz
MFC r326276:
various: general adoption of SPDX licensing ID tags. Mainly focus on files that use BSD 2-Clause license, however the tool I was using misidentified many licenses so this was mostly a manual - error prone - task. The Software Package Data Exchange (SPDX) group provides a specification to make it easier for automated tools to detect and summarize well known opensource licenses. We are gradually adopting the specification, noting that the tags are considered only advisory and do not, in any way, superceed or replace the license texts. No functional change intended.
-rw-r--r--bin/pkill/pkill.c2
-rw-r--r--etc/pam.d/convert.pl2
-rw-r--r--kerberos5/lib/libgssapi_krb5/gss_krb5.c2
-rw-r--r--kerberos5/lib/libgssapi_krb5/pname_to_uid.c2
-rw-r--r--kerberos5/lib/libgssapi_krb5/prefix.c2
-rw-r--r--kerberos5/lib/libgssapi_ntlm/prefix.c2
-rw-r--r--kerberos5/lib/libgssapi_spnego/freebsd_compat.c2
-rw-r--r--sbin/adjkerntz/adjkerntz.c4
-rw-r--r--sbin/adjkerntz/pathnames.h6
-rw-r--r--sbin/camcontrol/camcontrol.h4
-rw-r--r--sbin/camcontrol/fwdownload.c2
-rw-r--r--sbin/camcontrol/modeedit.c2
-rw-r--r--sbin/camcontrol/progress.c2
-rw-r--r--sbin/camcontrol/progress.h2
-rw-r--r--sbin/camcontrol/util.c4
-rw-r--r--sbin/ccdconfig/ccdconfig.c4
-rw-r--r--sbin/ccdconfig/pathnames.h4
-rw-r--r--sbin/comcontrol/comcontrol.c2
-rw-r--r--sbin/conscontrol/conscontrol.c2
-rw-r--r--sbin/ddb/ddb.c2
-rw-r--r--sbin/ddb/ddb.h2
-rw-r--r--sbin/ddb/ddb_capture.c2
-rw-r--r--sbin/ddb/ddb_script.c2
-rw-r--r--sbin/devd/devd.h2
-rw-r--r--sbin/devd/devd.hh2
-rw-r--r--sbin/devd/parse.y2
-rw-r--r--sbin/devd/token.l2
-rw-r--r--sbin/devfs/devfs.c2
-rw-r--r--sbin/devfs/extern.h2
-rw-r--r--sbin/devfs/rule.c2
-rw-r--r--sbin/etherswitchcfg/etherswitchcfg.c2
-rw-r--r--sbin/fsck/fsutil.h4
-rw-r--r--sbin/fsck_ffs/ea.c4
-rw-r--r--sbin/fsck_ffs/suj.c2
-rw-r--r--sbin/fsck_msdosfs/boot.c4
-rw-r--r--sbin/fsck_msdosfs/check.c4
-rw-r--r--sbin/fsck_msdosfs/dir.c4
-rw-r--r--sbin/fsck_msdosfs/dosfs.h4
-rw-r--r--sbin/fsck_msdosfs/ext.h4
-rw-r--r--sbin/fsck_msdosfs/fat.c4
-rw-r--r--sbin/fsck_msdosfs/main.c4
-rw-r--r--sbin/fsdb/fsdb.c4
-rw-r--r--sbin/fsdb/fsdb.h4
-rw-r--r--sbin/fsdb/fsdbutil.c4
-rw-r--r--sbin/fsirand/fsirand.c4
-rw-r--r--sbin/gbde/gbde.c2
-rw-r--r--sbin/geom/class/cache/geom_cache.c2
-rw-r--r--sbin/geom/class/concat/geom_concat.c2
-rw-r--r--sbin/geom/class/eli/geom_eli.c2
-rw-r--r--sbin/geom/class/journal/geom_journal.c2
-rw-r--r--sbin/geom/class/journal/geom_journal.h2
-rw-r--r--sbin/geom/class/journal/geom_journal_ufs.c2
-rw-r--r--sbin/geom/class/label/geom_label.c2
-rw-r--r--sbin/geom/class/mirror/geom_mirror.c2
-rw-r--r--sbin/geom/class/mountver/geom_mountver.c2
-rw-r--r--sbin/geom/class/multipath/geom_multipath.c2
-rw-r--r--sbin/geom/class/nop/geom_nop.c2
-rw-r--r--sbin/geom/class/part/geom_part.c2
-rw-r--r--sbin/geom/class/raid/geom_raid.c2
-rw-r--r--sbin/geom/class/raid3/geom_raid3.c2
-rw-r--r--sbin/geom/class/sched/geom_sched.c2
-rw-r--r--sbin/geom/class/shsec/geom_shsec.c2
-rw-r--r--sbin/geom/class/stripe/geom_stripe.c2
-rw-r--r--sbin/geom/class/virstor/geom_virstor.c2
-rw-r--r--sbin/geom/core/geom.c2
-rw-r--r--sbin/geom/core/geom.h2
-rw-r--r--sbin/geom/misc/subr.c2
-rw-r--r--sbin/geom/misc/subr.h2
-rw-r--r--sbin/ggate/ggatec/ggatec.c2
-rw-r--r--sbin/ggate/ggated/ggated.c2
-rw-r--r--sbin/ggate/ggatel/ggatel.c2
-rw-r--r--sbin/ggate/shared/ggate.c2
-rw-r--r--sbin/ggate/shared/ggate.h2
-rw-r--r--sbin/gvinum/gvinum.c4
-rw-r--r--sbin/hastctl/hastctl.c2
-rw-r--r--sbin/hastd/activemap.c2
-rw-r--r--sbin/hastd/activemap.h2
-rw-r--r--sbin/hastd/control.c2
-rw-r--r--sbin/hastd/control.h2
-rw-r--r--sbin/hastd/ebuf.c2
-rw-r--r--sbin/hastd/ebuf.h2
-rw-r--r--sbin/hastd/event.c2
-rw-r--r--sbin/hastd/event.h2
-rw-r--r--sbin/hastd/hast.h2
-rw-r--r--sbin/hastd/hast_checksum.c2
-rw-r--r--sbin/hastd/hast_checksum.h2
-rw-r--r--sbin/hastd/hast_compression.c2
-rw-r--r--sbin/hastd/hast_compression.h2
-rw-r--r--sbin/hastd/hast_proto.c2
-rw-r--r--sbin/hastd/hast_proto.h2
-rw-r--r--sbin/hastd/hastd.c2
-rw-r--r--sbin/hastd/hastd.h2
-rw-r--r--sbin/hastd/hooks.c2
-rw-r--r--sbin/hastd/hooks.h2
-rw-r--r--sbin/hastd/lzf.c4
-rw-r--r--sbin/hastd/lzf.h4
-rw-r--r--sbin/hastd/metadata.c2
-rw-r--r--sbin/hastd/metadata.h2
-rw-r--r--sbin/hastd/nv.c2
-rw-r--r--sbin/hastd/nv.h2
-rw-r--r--sbin/hastd/parse.y2
-rw-r--r--sbin/hastd/pjdlog.c2
-rw-r--r--sbin/hastd/pjdlog.h2
-rw-r--r--sbin/hastd/primary.c2
-rw-r--r--sbin/hastd/proto.c2
-rw-r--r--sbin/hastd/proto.h2
-rw-r--r--sbin/hastd/proto_common.c2
-rw-r--r--sbin/hastd/proto_impl.h2
-rw-r--r--sbin/hastd/proto_socketpair.c2
-rw-r--r--sbin/hastd/proto_tcp.c2
-rw-r--r--sbin/hastd/proto_uds.c2
-rw-r--r--sbin/hastd/rangelock.c2
-rw-r--r--sbin/hastd/rangelock.h2
-rw-r--r--sbin/hastd/refcnt.h2
-rw-r--r--sbin/hastd/secondary.c2
-rw-r--r--sbin/hastd/subr.c2
-rw-r--r--sbin/hastd/subr.h2
-rw-r--r--sbin/hastd/synch.h2
-rw-r--r--sbin/hastd/token.l2
-rw-r--r--sbin/ifconfig/af_nd6.c4
-rw-r--r--sbin/ifconfig/carp.c4
-rw-r--r--sbin/ifconfig/ifbridge.c2
-rw-r--r--sbin/ifconfig/ifconfig.h4
-rw-r--r--sbin/ifconfig/iffib.c2
-rw-r--r--sbin/ifconfig/ifgif.c2
-rw-r--r--sbin/ifconfig/ifgre.c2
-rw-r--r--sbin/ifconfig/ifgroup.c2
-rw-r--r--sbin/ifconfig/ifieee80211.c4
-rw-r--r--sbin/ifconfig/ifmac.c2
-rw-r--r--sbin/ifconfig/ifpfsync.c4
-rw-r--r--sbin/iscontrol/auth_subr.c2
-rw-r--r--sbin/iscontrol/config.c4
-rw-r--r--sbin/iscontrol/fsm.c2
-rw-r--r--sbin/iscontrol/iscontrol.c2
-rw-r--r--sbin/iscontrol/iscontrol.h2
-rw-r--r--sbin/iscontrol/login.c2
-rw-r--r--sbin/iscontrol/misc.c2
-rw-r--r--sbin/iscontrol/pdu.c2
-rw-r--r--sbin/kldconfig/kldconfig.c4
-rw-r--r--sbin/kldload/kldload.c2
-rw-r--r--sbin/kldstat/kldstat.c2
-rw-r--r--sbin/kldunload/kldunload.c2
-rw-r--r--sbin/ldconfig/elfhints.c2
-rw-r--r--sbin/ldconfig/ldconfig.c4
-rw-r--r--sbin/ldconfig/ldconfig.h2
-rw-r--r--sbin/mdconfig/mdconfig.c2
-rw-r--r--sbin/mdmfs/mdmfs.c4
-rw-r--r--sbin/mksnap_ffs/mksnap_ffs.c4
-rw-r--r--sbin/mount/extern.h2
-rw-r--r--sbin/mount_fusefs/mount_fusefs.c2
-rw-r--r--sbin/mount_msdosfs/mount_msdosfs.c4
-rw-r--r--sbin/nandfs/lssnap.c2
-rw-r--r--sbin/nandfs/mksnap.c2
-rw-r--r--sbin/nandfs/nandfs.c2
-rw-r--r--sbin/nandfs/nandfs.h2
-rw-r--r--sbin/nandfs/rmsnap.c2
-rw-r--r--sbin/newfs_msdos/newfs_msdos.c4
-rw-r--r--sbin/newfs_nandfs/newfs_nandfs.c2
-rw-r--r--sbin/nos-tun/nos-tun.c4
-rw-r--r--sbin/nvmecontrol/devlist.c2
-rw-r--r--sbin/nvmecontrol/firmware.c2
-rw-r--r--sbin/nvmecontrol/identify.c2
-rw-r--r--sbin/nvmecontrol/logpage.c2
-rw-r--r--sbin/nvmecontrol/nvmecontrol.c2
-rw-r--r--sbin/nvmecontrol/nvmecontrol.h2
-rw-r--r--sbin/nvmecontrol/perftest.c2
-rw-r--r--sbin/nvmecontrol/reset.c2
-rw-r--r--sbin/pfctl/parse.y4
-rw-r--r--sbin/pfctl/pf_print_state.c4
-rw-r--r--sbin/pfctl/pfctl.c4
-rw-r--r--sbin/pfctl/pfctl.h4
-rw-r--r--sbin/pfctl/pfctl_parser.c4
-rw-r--r--sbin/pfctl/pfctl_parser.h4
-rw-r--r--sbin/pfctl/pfctl_radix.c4
-rw-r--r--sbin/pfctl/pfctl_table.c4
-rw-r--r--sbin/rcorder/rcorder.c4
-rw-r--r--sbin/reboot/nextboot.sh2
-rw-r--r--sbin/spppcontrol/spppcontrol.c4
-rw-r--r--usr.bin/ar/acplex.l2
-rw-r--r--usr.bin/ar/acpyacc.y2
-rw-r--r--usr.bin/ar/ar.h2
-rw-r--r--usr.bin/ar/read.c2
-rw-r--r--usr.bin/ar/util.c2
-rw-r--r--usr.bin/ar/write.c2
-rw-r--r--usr.bin/asa/asa.c4
-rw-r--r--usr.bin/at/at.c5
-rw-r--r--usr.bin/at/at.h5
-rw-r--r--usr.bin/at/panic.c5
-rw-r--r--usr.bin/at/panic.h5
-rw-r--r--usr.bin/at/parsetime.c5
-rw-r--r--usr.bin/at/parsetime.h7
-rw-r--r--usr.bin/at/perm.c5
-rw-r--r--usr.bin/at/perm.h5
-rw-r--r--usr.bin/at/privs.h7
-rw-r--r--usr.bin/bluetooth/bthost/bthost.c4
-rw-r--r--usr.bin/bluetooth/btsockstat/btsockstat.c4
-rw-r--r--usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c4
-rw-r--r--usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c2
-rw-r--r--usr.bin/brandelf/brandelf.c2
-rw-r--r--usr.bin/bsdiff/bsdiff/bsdiff.c2
-rw-r--r--usr.bin/bsdiff/bspatch/bspatch.c2
-rw-r--r--usr.bin/c89/c89.c2
-rw-r--r--usr.bin/c99/c99.c2
-rw-r--r--usr.bin/calendar/dates.c2
-rw-r--r--usr.bin/calendar/events.c2
-rw-r--r--usr.bin/calendar/ostern.c2
-rw-r--r--usr.bin/calendar/parsedata.c2
-rw-r--r--usr.bin/calendar/paskha.c2
-rw-r--r--usr.bin/calendar/sunpos.c2
-rw-r--r--usr.bin/cmp/link.c2
-rw-r--r--usr.bin/colldef/parse.y2
-rw-r--r--usr.bin/colldef/scan.l2
-rw-r--r--usr.bin/compress/zopen.h4
-rw-r--r--usr.bin/cpuset/cpuset.c4
-rw-r--r--usr.bin/csplit/csplit.c2
-rw-r--r--usr.bin/ctlstat/ctlstat.c2
-rw-r--r--usr.bin/dtc/checking.cc2
-rw-r--r--usr.bin/dtc/checking.hh2
-rw-r--r--usr.bin/dtc/dtb.cc2
-rw-r--r--usr.bin/dtc/dtb.hh2
-rw-r--r--usr.bin/dtc/dtc.cc2
-rw-r--r--usr.bin/dtc/fdt.cc2
-rw-r--r--usr.bin/dtc/fdt.hh2
-rw-r--r--usr.bin/dtc/input_buffer.cc2
-rw-r--r--usr.bin/dtc/input_buffer.hh2
-rw-r--r--usr.bin/dtc/string.cc2
-rw-r--r--usr.bin/dtc/util.hh2
-rw-r--r--usr.bin/elf2aout/elf2aout.c2
-rw-r--r--usr.bin/elfdump/elfdump.c2
-rw-r--r--usr.bin/env/envopts.c2
-rw-r--r--usr.bin/env/envopts.h2
-rw-r--r--usr.bin/fetch/fetch.c2
-rw-r--r--usr.bin/finger/pathnames.h2
-rw-r--r--usr.bin/fstat/functions.h2
-rw-r--r--usr.bin/fstat/fuser.c2
-rw-r--r--usr.bin/fstat/main.c2
-rw-r--r--usr.bin/fsync/fsync.c2
-rw-r--r--usr.bin/gcore/elfcore.c2
-rw-r--r--usr.bin/gencat/gencat.c4
-rw-r--r--usr.bin/getent/getent.c2
-rw-r--r--usr.bin/grep/file.c2
-rw-r--r--usr.bin/grep/grep.c2
-rw-r--r--usr.bin/grep/grep.h2
-rw-r--r--usr.bin/grep/queue.c2
-rw-r--r--usr.bin/grep/regex/fastmatch.c2
-rw-r--r--usr.bin/grep/regex/hashtable.c2
-rw-r--r--usr.bin/grep/regex/tre-fastmatch.c2
-rw-r--r--usr.bin/grep/util.c2
-rw-r--r--usr.bin/gzip/gzip.c2
-rw-r--r--usr.bin/gzip/unbzip2.c2
-rw-r--r--usr.bin/gzip/unpack.c2
-rw-r--r--usr.bin/gzip/unxz.c2
-rw-r--r--usr.bin/iconv/iconv.c2
-rw-r--r--usr.bin/indent/indent.h2
-rw-r--r--usr.bin/ipcrm/ipcrm.c4
-rw-r--r--usr.bin/ipcs/ipc.c4
-rw-r--r--usr.bin/ipcs/ipc.h4
-rw-r--r--usr.bin/ipcs/ipcs.c4
-rw-r--r--usr.bin/iscsictl/iscsictl.c2
-rw-r--r--usr.bin/iscsictl/iscsictl.h2
-rw-r--r--usr.bin/iscsictl/parse.y2
-rw-r--r--usr.bin/iscsictl/periphs.c4
-rw-r--r--usr.bin/iscsictl/token.l2
-rw-r--r--usr.bin/killall/killall.c2
-rw-r--r--usr.bin/ktrdump/ktrdump.c2
-rw-r--r--usr.bin/lastcomm/readrec.c2
-rw-r--r--usr.bin/ldd/extern.h4
-rw-r--r--usr.bin/ldd/ldd.c4
-rw-r--r--usr.bin/ldd/sods.c4
-rw-r--r--usr.bin/locale/locale.c2
-rw-r--r--usr.bin/locate/locate/concatdb.sh2
-rw-r--r--usr.bin/locate/locate/mklocatedb.sh2
-rw-r--r--usr.bin/locate/locate/updatedb.sh2
-rw-r--r--usr.bin/lockf/lockf.c4
-rw-r--r--usr.bin/login/login.h2
-rw-r--r--usr.bin/logins/logins.c2
-rw-r--r--usr.bin/m4/gnum4.c4
-rw-r--r--usr.bin/m4/trace.c2
-rwxr-xr-xusr.bin/man/man.sh2
-rw-r--r--usr.bin/mkcsmapper/ldef.h2
-rw-r--r--usr.bin/mkcsmapper/lex.l2
-rw-r--r--usr.bin/mkcsmapper/yacc.y2
-rw-r--r--usr.bin/mkesdb/ldef.h2
-rw-r--r--usr.bin/mkesdb/lex.l2
-rw-r--r--usr.bin/mkesdb/yacc.y2
-rw-r--r--usr.bin/mktemp/mktemp.c2
-rw-r--r--usr.bin/mkuzip/mkuzip.c4
-rw-r--r--usr.bin/ncal/ncal.c2
-rw-r--r--usr.bin/netstat/bpf.c2
-rw-r--r--usr.bin/netstat/netisr.c2
-rw-r--r--usr.bin/newgrp/newgrp.c2
-rw-r--r--usr.bin/nl/nl.c2
-rw-r--r--usr.bin/passwd/passwd.c2
-rw-r--r--usr.bin/pathchk/pathchk.c2
-rw-r--r--usr.bin/perror/perror.c2
-rw-r--r--usr.bin/procstat/procstat.c2
-rw-r--r--usr.bin/procstat/procstat.h2
-rw-r--r--usr.bin/procstat/procstat_args.c2
-rw-r--r--usr.bin/procstat/procstat_auxv.c2
-rw-r--r--usr.bin/procstat/procstat_basic.c2
-rw-r--r--usr.bin/procstat/procstat_bin.c2
-rw-r--r--usr.bin/procstat/procstat_cred.c2
-rw-r--r--usr.bin/procstat/procstat_files.c2
-rw-r--r--usr.bin/procstat/procstat_kstack.c2
-rw-r--r--usr.bin/procstat/procstat_rlimit.c2
-rw-r--r--usr.bin/procstat/procstat_sigs.c2
-rw-r--r--usr.bin/procstat/procstat_threads.c2
-rw-r--r--usr.bin/procstat/procstat_vm.c2
-rw-r--r--usr.bin/protect/protect.c2
-rw-r--r--usr.bin/rctl/rctl.c2
-rw-r--r--usr.bin/revoke/revoke.c2
-rw-r--r--usr.bin/seq/seq.c4
-rw-r--r--usr.bin/setchannel/setchannel.c2
-rw-r--r--usr.bin/sockstat/sockstat.c2
-rw-r--r--usr.bin/sort/bwstring.c2
-rw-r--r--usr.bin/sort/bwstring.h2
-rw-r--r--usr.bin/sort/coll.c2
-rw-r--r--usr.bin/sort/coll.h2
-rw-r--r--usr.bin/sort/file.c2
-rw-r--r--usr.bin/sort/file.h2
-rw-r--r--usr.bin/sort/mem.c2
-rw-r--r--usr.bin/sort/mem.h2
-rw-r--r--usr.bin/sort/radixsort.c2
-rw-r--r--usr.bin/sort/radixsort.h2
-rw-r--r--usr.bin/sort/sort.c2
-rw-r--r--usr.bin/sort/sort.h2
-rw-r--r--usr.bin/sort/vsort.c2
-rw-r--r--usr.bin/sort/vsort.h2
-rwxr-xr-xusr.bin/ssh-copy-id/ssh-copy-id.sh2
-rw-r--r--usr.bin/stat/stat.c4
-rw-r--r--usr.bin/stdbuf/stdbuf.c2
-rw-r--r--usr.bin/systat/convtbl.c4
-rw-r--r--usr.bin/systat/convtbl.h4
-rw-r--r--usr.bin/systat/devs.h2
-rw-r--r--usr.bin/systat/ifcmds.c4
-rw-r--r--usr.bin/systat/ifstat.c4
-rw-r--r--usr.bin/tabs/tabs.c2
-rw-r--r--usr.bin/tr/cmap.c2
-rw-r--r--usr.bin/tr/cmap.h2
-rw-r--r--usr.bin/tr/cset.c2
-rw-r--r--usr.bin/tr/cset.h2
-rw-r--r--usr.bin/truncate/truncate.c2
-rw-r--r--usr.bin/truss/truss.h4
-rw-r--r--usr.bin/unifdef/unifdef.c4
-rw-r--r--usr.bin/unifdef/unifdef.h4
-rw-r--r--usr.bin/unifdef/unifdefall.sh2
-rw-r--r--usr.bin/units/units.c4
-rw-r--r--usr.bin/unzip/unzip.c2
-rw-r--r--usr.bin/usbhidaction/usbhidaction.c4
-rw-r--r--usr.bin/usbhidctl/usbhid.c4
-rw-r--r--usr.bin/whereis/pathnames.h4
-rw-r--r--usr.bin/whereis/whereis.c4
-rw-r--r--usr.bin/which/which.c4
-rw-r--r--usr.bin/who/who.c2
-rw-r--r--usr.bin/ypcat/ypcat.c4
-rw-r--r--usr.bin/ypmatch/ypmatch.c4
-rw-r--r--usr.bin/ypwhich/ypwhich.c4
-rw-r--r--usr.sbin/ac/ac.c2
-rw-r--r--usr.sbin/acpi/acpiconf/acpiconf.c2
-rw-r--r--usr.sbin/acpi/acpidb/acpidb.c2
-rw-r--r--usr.sbin/acpi/acpidump/acpi.c2
-rw-r--r--usr.sbin/acpi/acpidump/acpi_user.c2
-rw-r--r--usr.sbin/acpi/acpidump/acpidump.c2
-rw-r--r--usr.sbin/acpi/acpidump/acpidump.h2
-rw-r--r--usr.sbin/adduser/adduser.sh2
-rw-r--r--usr.sbin/adduser/rmuser.sh2
-rw-r--r--usr.sbin/apmd/apmd.c2
-rw-r--r--usr.sbin/apmd/apmd.h2
-rw-r--r--usr.sbin/apmd/apmdlex.l2
-rw-r--r--usr.sbin/apmd/apmdparse.y2
-rw-r--r--usr.sbin/asf/asf.c2
-rw-r--r--usr.sbin/asf/asf.h2
-rw-r--r--usr.sbin/asf/asf_kld.c2
-rw-r--r--usr.sbin/asf/asf_kvm.c2
-rw-r--r--usr.sbin/asf/asf_prog.c2
-rw-r--r--usr.sbin/bhyve/acpi.c2
-rw-r--r--usr.sbin/bhyve/acpi.h2
-rw-r--r--usr.sbin/bhyve/ahci.h2
-rw-r--r--usr.sbin/bhyve/bhyverun.c2
-rw-r--r--usr.sbin/bhyve/bhyverun.h2
-rw-r--r--usr.sbin/bhyve/block_if.c2
-rw-r--r--usr.sbin/bhyve/block_if.h2
-rw-r--r--usr.sbin/bhyve/consport.c2
-rw-r--r--usr.sbin/bhyve/dbgport.c2
-rw-r--r--usr.sbin/bhyve/dbgport.h2
-rw-r--r--usr.sbin/bhyve/inout.c2
-rw-r--r--usr.sbin/bhyve/inout.h2
-rw-r--r--usr.sbin/bhyve/ioapic.c2
-rw-r--r--usr.sbin/bhyve/ioapic.h2
-rw-r--r--usr.sbin/bhyve/mem.c2
-rw-r--r--usr.sbin/bhyve/mem.h2
-rw-r--r--usr.sbin/bhyve/mevent.c2
-rw-r--r--usr.sbin/bhyve/mevent.h2
-rw-r--r--usr.sbin/bhyve/mevent_test.c2
-rw-r--r--usr.sbin/bhyve/mptbl.c2
-rw-r--r--usr.sbin/bhyve/mptbl.h2
-rw-r--r--usr.sbin/bhyve/pci_ahci.c2
-rw-r--r--usr.sbin/bhyve/pci_emul.c2
-rw-r--r--usr.sbin/bhyve/pci_emul.h2
-rw-r--r--usr.sbin/bhyve/pci_hostbridge.c2
-rw-r--r--usr.sbin/bhyve/pci_lpc.c2
-rw-r--r--usr.sbin/bhyve/pci_lpc.h2
-rw-r--r--usr.sbin/bhyve/pci_passthru.c2
-rw-r--r--usr.sbin/bhyve/pci_uart.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_block.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_net.c2
-rw-r--r--usr.sbin/bhyve/pm.c2
-rw-r--r--usr.sbin/bhyve/post.c2
-rw-r--r--usr.sbin/bhyve/rtc.c2
-rw-r--r--usr.sbin/bhyve/rtc.h4
-rw-r--r--usr.sbin/bhyve/smbiostbl.c2
-rw-r--r--usr.sbin/bhyve/smbiostbl.h2
-rw-r--r--usr.sbin/bhyve/spinup_ap.c2
-rw-r--r--usr.sbin/bhyve/spinup_ap.h2
-rw-r--r--usr.sbin/bhyve/uart_emul.c2
-rw-r--r--usr.sbin/bhyve/uart_emul.h2
-rw-r--r--usr.sbin/bhyve/virtio.c2
-rw-r--r--usr.sbin/bhyve/virtio.h2
-rw-r--r--usr.sbin/bhyve/xmsr.c2
-rw-r--r--usr.sbin/bhyve/xmsr.h2
-rw-r--r--usr.sbin/bhyvectl/bhyvectl.c2
-rw-r--r--usr.sbin/bhyveload/bhyveload.c2
-rw-r--r--usr.sbin/bluetooth/bcmfw/bcmfw.c4
-rw-r--r--usr.sbin/bluetooth/bt3cfw/bt3cfw.c4
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c4
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h4
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/hid.c4
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/sdp.c4
-rw-r--r--usr.sbin/bluetooth/bthidd/bthid_config.h2
-rw-r--r--usr.sbin/bluetooth/bthidd/bthidd.c2
-rw-r--r--usr.sbin/bluetooth/bthidd/bthidd.h2
-rw-r--r--usr.sbin/bluetooth/bthidd/client.c2
-rw-r--r--usr.sbin/bluetooth/bthidd/hid.c2
-rw-r--r--usr.sbin/bluetooth/bthidd/kbd.c2
-rw-r--r--usr.sbin/bluetooth/bthidd/kbd.h2
-rw-r--r--usr.sbin/bluetooth/bthidd/lexer.l2
-rw-r--r--usr.sbin/bluetooth/bthidd/parser.y2
-rw-r--r--usr.sbin/bluetooth/bthidd/server.c2
-rw-r--r--usr.sbin/bluetooth/bthidd/session.c2
-rw-r--r--usr.sbin/bluetooth/btpand/bnep.c2
-rw-r--r--usr.sbin/bluetooth/btpand/bnep.h2
-rw-r--r--usr.sbin/bluetooth/btpand/btpand.c2
-rw-r--r--usr.sbin/bluetooth/btpand/btpand.h2
-rw-r--r--usr.sbin/bluetooth/btpand/channel.c2
-rw-r--r--usr.sbin/bluetooth/btpand/client.c2
-rw-r--r--usr.sbin/bluetooth/btpand/event.c2
-rw-r--r--usr.sbin/bluetooth/btpand/event.h2
-rw-r--r--usr.sbin/bluetooth/btpand/packet.c2
-rw-r--r--usr.sbin/bluetooth/btpand/sdp.c2
-rw-r--r--usr.sbin/bluetooth/btpand/sdp.h2
-rw-r--r--usr.sbin/bluetooth/btpand/server.c2
-rw-r--r--usr.sbin/bluetooth/btpand/tap.c2
-rw-r--r--usr.sbin/bluetooth/hccontrol/hccontrol.c4
-rw-r--r--usr.sbin/bluetooth/hccontrol/hccontrol.h4
-rw-r--r--usr.sbin/bluetooth/hccontrol/host_controller_baseband.c4
-rw-r--r--usr.sbin/bluetooth/hccontrol/info.c4
-rw-r--r--usr.sbin/bluetooth/hccontrol/link_control.c4
-rw-r--r--usr.sbin/bluetooth/hccontrol/link_policy.c4
-rw-r--r--usr.sbin/bluetooth/hccontrol/node.c4
-rw-r--r--usr.sbin/bluetooth/hccontrol/send_recv.c4
-rw-r--r--usr.sbin/bluetooth/hccontrol/status.c4
-rw-r--r--usr.sbin/bluetooth/hccontrol/util.c4
-rw-r--r--usr.sbin/bluetooth/hcsecd/hcsecd.c4
-rw-r--r--usr.sbin/bluetooth/hcsecd/hcsecd.h4
-rw-r--r--usr.sbin/bluetooth/hcsecd/lexer.l4
-rw-r--r--usr.sbin/bluetooth/hcsecd/parser.y4
-rw-r--r--usr.sbin/bluetooth/hcseriald/hcseriald.c4
-rw-r--r--usr.sbin/bluetooth/l2control/l2cap.c4
-rw-r--r--usr.sbin/bluetooth/l2control/l2control.c4
-rw-r--r--usr.sbin/bluetooth/l2control/l2control.h4
-rw-r--r--usr.sbin/bluetooth/l2ping/l2ping.c4
-rw-r--r--usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c2
-rw-r--r--usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c4
-rw-r--r--usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h4
-rw-r--r--usr.sbin/bluetooth/sdpcontrol/search.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/bgd.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/dun.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/ftrn.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/gn.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/irmc.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/irmc_command.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/lan.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/log.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/log.h4
-rw-r--r--usr.sbin/bluetooth/sdpd/main.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/nap.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/opush.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/panu.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/profile.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/profile.h2
-rw-r--r--usr.sbin/bluetooth/sdpd/provider.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/provider.h4
-rw-r--r--usr.sbin/bluetooth/sdpd/sar.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/scr.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/sd.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/server.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/server.h4
-rw-r--r--usr.sbin/bluetooth/sdpd/sp.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/srr.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/ssar.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/ssr.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/sur.c4
-rw-r--r--usr.sbin/bluetooth/sdpd/uuid-private.h4
-rw-r--r--usr.sbin/bluetooth/sdpd/uuid.c4
-rw-r--r--usr.sbin/boot0cfg/boot0cfg.c2
-rw-r--r--usr.sbin/bsdinstall/distextract/distextract.c2
-rw-r--r--usr.sbin/bsdinstall/distfetch/distfetch.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/diskeditor.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/diskeditor.h2
-rw-r--r--usr.sbin/bsdinstall/partedit/gpart_ops.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/part_wizard.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/partedit.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/partedit.h2
-rw-r--r--usr.sbin/bsdinstall/partedit/partedit_generic.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/partedit_powerpc.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/partedit_sparc64.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/partedit_x86.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/scripted.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c2
-rw-r--r--usr.sbin/btxld/btx.h4
-rw-r--r--usr.sbin/btxld/btxld.c4
-rw-r--r--usr.sbin/btxld/elfh.c4
-rw-r--r--usr.sbin/btxld/elfh.h4
-rw-r--r--usr.sbin/chkgrp/chkgrp.c2
-rw-r--r--usr.sbin/ckdist/ckdist.c4
-rw-r--r--usr.sbin/clear_locks/clear_locks.c2
-rw-r--r--usr.sbin/cpucontrol/amd.c2
-rw-r--r--usr.sbin/cpucontrol/amd.h2
-rw-r--r--usr.sbin/cpucontrol/cpucontrol.c2
-rw-r--r--usr.sbin/cpucontrol/cpucontrol.h2
-rw-r--r--usr.sbin/cpucontrol/intel.c2
-rw-r--r--usr.sbin/cpucontrol/intel.h2
-rw-r--r--usr.sbin/cpucontrol/via.c2
-rw-r--r--usr.sbin/cpucontrol/via.h2
-rw-r--r--usr.sbin/crunch/crunchide/exec_elf32.c4
-rw-r--r--usr.sbin/crunch/crunchide/exec_elf64.c5
-rw-r--r--usr.sbin/crunch/crunchide/extern.h4
-rw-r--r--usr.sbin/ctladm/ctladm.h4
-rw-r--r--usr.sbin/ctladm/util.c4
-rw-r--r--usr.sbin/ctld/ctld.c2
-rw-r--r--usr.sbin/ctld/ctld.h2
-rw-r--r--usr.sbin/ctld/discovery.c2
-rw-r--r--usr.sbin/ctld/kernel.c2
-rw-r--r--usr.sbin/ctld/keys.c2
-rw-r--r--usr.sbin/ctld/log.c2
-rw-r--r--usr.sbin/ctld/login.c2
-rw-r--r--usr.sbin/ctld/parse.y2
-rw-r--r--usr.sbin/ctld/pdu.c2
-rw-r--r--usr.sbin/ctld/token.l2
-rw-r--r--usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c4
-rw-r--r--usr.sbin/daemon/daemon.c2
-rw-r--r--usr.sbin/devinfo/devinfo.c2
-rw-r--r--usr.sbin/digictl/digictl.c2
-rw-r--r--usr.sbin/diskinfo/diskinfo.c2
-rw-r--r--usr.sbin/dumpcis/cardinfo.h2
-rw-r--r--usr.sbin/dumpcis/cis.h2
-rw-r--r--usr.sbin/dumpcis/main.c4
-rw-r--r--usr.sbin/dumpcis/printcis.c4
-rw-r--r--usr.sbin/dumpcis/readcis.c4
-rw-r--r--usr.sbin/dumpcis/readcis.h4
-rw-r--r--usr.sbin/eeprom/eeprom.c2
-rw-r--r--usr.sbin/eeprom/ofw_options.c2
-rw-r--r--usr.sbin/eeprom/ofw_options.h2
-rwxr-xr-xusr.sbin/etcupdate/etcupdate.sh2
-rw-r--r--usr.sbin/extattr/rmextattr.c2
-rw-r--r--usr.sbin/extattrctl/extattrctl.c2
-rw-r--r--usr.sbin/fdcontrol/fdcontrol.c4
-rw-r--r--usr.sbin/fdformat/fdformat.c4
-rw-r--r--usr.sbin/fdread/fdread.c4
-rw-r--r--usr.sbin/fdread/fdutil.c4
-rw-r--r--usr.sbin/fdread/fdutil.h4
-rw-r--r--usr.sbin/fifolog/fifolog_create/fifolog_create.c2
-rw-r--r--usr.sbin/fifolog/fifolog_reader/fifolog_reader.c2
-rw-r--r--usr.sbin/fifolog/fifolog_writer/fifolog_writer.c2
-rw-r--r--usr.sbin/fifolog/lib/fifolog.h2
-rw-r--r--usr.sbin/fifolog/lib/fifolog_create.c2
-rw-r--r--usr.sbin/fifolog/lib/fifolog_int.c2
-rw-r--r--usr.sbin/fifolog/lib/fifolog_reader.c2
-rw-r--r--usr.sbin/fifolog/lib/fifolog_write.h2
-rw-r--r--usr.sbin/fifolog/lib/fifolog_write_poll.c2
-rw-r--r--usr.sbin/fifolog/lib/libfifolog.h2
-rw-r--r--usr.sbin/fifolog/lib/libfifolog_int.h2
-rw-r--r--usr.sbin/fifolog/lib/miniobj.h2
-rw-r--r--usr.sbin/flowctl/flowctl.c2
-rw-r--r--usr.sbin/freebsd-update/freebsd-update.sh2
-rw-r--r--usr.sbin/getfmac/getfmac.c2
-rw-r--r--usr.sbin/getpmac/getpmac.c2
-rw-r--r--usr.sbin/gpioctl/gpioctl.c2
-rw-r--r--usr.sbin/gssd/gssd.c2
-rw-r--r--usr.sbin/gstat/gstat.c2
-rw-r--r--usr.sbin/i2c/i2c.c2
-rw-r--r--usr.sbin/inetd/builtins.c2
-rw-r--r--usr.sbin/iscsid/discovery.c2
-rw-r--r--usr.sbin/iscsid/iscsid.c2
-rw-r--r--usr.sbin/iscsid/iscsid.h2
-rw-r--r--usr.sbin/iscsid/keys.c2
-rw-r--r--usr.sbin/iscsid/log.c2
-rw-r--r--usr.sbin/iscsid/login.c2
-rw-r--r--usr.sbin/iscsid/pdu.c2
-rw-r--r--usr.sbin/jail/command.c2
-rw-r--r--usr.sbin/jail/config.c2
-rw-r--r--usr.sbin/jail/jail.c2
-rw-r--r--usr.sbin/jail/jaillex.l2
-rw-r--r--usr.sbin/jail/jailp.h2
-rw-r--r--usr.sbin/jail/jailparse.y2
-rw-r--r--usr.sbin/jail/state.c2
-rw-r--r--usr.sbin/jexec/jexec.c2
-rw-r--r--usr.sbin/jls/jls.c2
-rw-r--r--usr.sbin/kbdcontrol/kbdcontrol.c2
-rw-r--r--usr.sbin/kbdcontrol/lex.h2
-rw-r--r--usr.sbin/kbdcontrol/lex.l2
-rw-r--r--usr.sbin/kbdmap/kbdmap.c2
-rw-r--r--usr.sbin/kbdmap/kbdmap.h2
-rw-r--r--usr.sbin/kgzip/aouthdr.c4
-rw-r--r--usr.sbin/kgzip/aouthdr.h4
-rw-r--r--usr.sbin/kgzip/elfhdr.c4
-rw-r--r--usr.sbin/kgzip/elfhdr.h4
-rw-r--r--usr.sbin/kgzip/kgz.h4
-rw-r--r--usr.sbin/kgzip/kgzcmp.c4
-rw-r--r--usr.sbin/kgzip/kgzip.c4
-rw-r--r--usr.sbin/kgzip/kgzip.h4
-rw-r--r--usr.sbin/kgzip/kgzld.c4
-rw-r--r--usr.sbin/kgzip/xio.c4
-rw-r--r--usr.sbin/kldxref/ef_amd64.c2
-rw-r--r--usr.sbin/kldxref/ef_i386.c2
-rw-r--r--usr.sbin/kldxref/ef_nop.c2
-rw-r--r--usr.sbin/kldxref/ef_powerpc.c2
-rw-r--r--usr.sbin/kldxref/ef_sparc64.c2
-rw-r--r--usr.sbin/lastlogin/lastlogin.c4
-rw-r--r--usr.sbin/lpr/chkprintcap/skimprintcap.c4
-rw-r--r--usr.sbin/lpr/chkprintcap/skimprintcap.h4
-rw-r--r--usr.sbin/lpr/common_source/ctlinfo.c4
-rw-r--r--usr.sbin/lpr/common_source/ctlinfo.h4
-rw-r--r--usr.sbin/lpr/common_source/lp.cdefs.h2
-rw-r--r--usr.sbin/lpr/common_source/matchjobs.c4
-rw-r--r--usr.sbin/lpr/common_source/matchjobs.h4
-rw-r--r--usr.sbin/lpr/filters.ru/koi2855/koi2855.c4
-rw-r--r--usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c4
-rw-r--r--usr.sbin/lpr/lp/lp.sh2
-rw-r--r--usr.sbin/lpr/lpc/movejobs.c4
-rw-r--r--usr.sbin/lptcontrol/lptcontrol.c4
-rw-r--r--usr.sbin/mailwrapper/mailwrapper.c4
-rw-r--r--usr.sbin/mailwrapper/pathnames.h4
-rw-r--r--usr.sbin/makefs/cd9660.c4
-rw-r--r--usr.sbin/makefs/cd9660.h4
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_archimedes.c2
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_archimedes.h2
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_conversion.c4
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_debug.c4
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_eltorito.c4
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_eltorito.h4
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_strings.c4
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_write.c4
-rw-r--r--usr.sbin/makefs/cd9660/iso9660_rrip.c4
-rw-r--r--usr.sbin/makefs/cd9660/iso9660_rrip.h4
-rw-r--r--usr.sbin/makefs/ffs.h4
-rw-r--r--usr.sbin/makefs/ffs/buf.c4
-rw-r--r--usr.sbin/makefs/ffs/buf.h4
-rw-r--r--usr.sbin/makefs/ffs/ffs_bswap.c4
-rw-r--r--usr.sbin/makefs/ffs/newfs_extern.h4
-rw-r--r--usr.sbin/makefs/ffs/ufs_bswap.h4
-rw-r--r--usr.sbin/makefs/makefs.c4
-rw-r--r--usr.sbin/makefs/makefs.h4
-rw-r--r--usr.sbin/makefs/mtree.c2
-rw-r--r--usr.sbin/makefs/walk.c2
-rw-r--r--usr.sbin/memcontrol/memcontrol.c2
-rw-r--r--usr.sbin/mfiutil/mfi_bbu.c2
-rw-r--r--usr.sbin/mfiutil/mfi_cmd.c2
-rw-r--r--usr.sbin/mfiutil/mfi_config.c2
-rw-r--r--usr.sbin/mfiutil/mfi_drive.c2
-rw-r--r--usr.sbin/mfiutil/mfi_evt.c2
-rw-r--r--usr.sbin/mfiutil/mfi_flash.c2
-rw-r--r--usr.sbin/mfiutil/mfi_foreign.c4
-rw-r--r--usr.sbin/mfiutil/mfi_patrol.c2
-rw-r--r--usr.sbin/mfiutil/mfi_properties.c2
-rw-r--r--usr.sbin/mfiutil/mfi_show.c2
-rw-r--r--usr.sbin/mfiutil/mfi_volume.c2
-rw-r--r--usr.sbin/mfiutil/mfiutil.c2
-rw-r--r--usr.sbin/mfiutil/mfiutil.h2
-rw-r--r--usr.sbin/mlxcontrol/command.c2
-rw-r--r--usr.sbin/mlxcontrol/config.c2
-rw-r--r--usr.sbin/mlxcontrol/interface.c2
-rw-r--r--usr.sbin/mlxcontrol/mlxcontrol.h2
-rw-r--r--usr.sbin/mlxcontrol/util.c2
-rw-r--r--usr.sbin/moused/moused.c2
-rw-r--r--usr.sbin/mptable/mptable.c4
-rw-r--r--usr.sbin/mtest/mtest.c2
-rw-r--r--usr.sbin/nandsim/nandsim.c2
-rw-r--r--usr.sbin/nandsim/nandsim_cfgparse.c2
-rw-r--r--usr.sbin/nandsim/nandsim_cfgparse.h2
-rw-r--r--usr.sbin/nandtool/nand_erase.c2
-rw-r--r--usr.sbin/nandtool/nand_info.c2
-rw-r--r--usr.sbin/nandtool/nand_read.c2
-rw-r--r--usr.sbin/nandtool/nand_readoob.c2
-rw-r--r--usr.sbin/nandtool/nand_write.c2
-rw-r--r--usr.sbin/nandtool/nand_writeoob.c2
-rw-r--r--usr.sbin/nandtool/nandtool.c2
-rw-r--r--usr.sbin/nandtool/nandtool.h2
-rw-r--r--usr.sbin/nandtool/usage.h2
-rw-r--r--usr.sbin/newsyslog/extern.h2
-rw-r--r--usr.sbin/pciconf/err.c2
-rw-r--r--usr.sbin/pkg/config.c2
-rw-r--r--usr.sbin/pkg/config.h2
-rw-r--r--usr.sbin/pkg/dns_utils.c2
-rw-r--r--usr.sbin/pkg/dns_utils.h2
-rw-r--r--usr.sbin/pkg/pkg.c2
-rw-r--r--usr.sbin/pmcannotate/pmcannotate.c2
-rw-r--r--usr.sbin/pmccontrol/pmccontrol.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_annotate.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_annotate.h2
-rw-r--r--usr.sbin/pmcstat/pmcpl_annotate_cg.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_annotate_cg.h2
-rw-r--r--usr.sbin/pmcstat/pmcpl_callgraph.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_callgraph.h2
-rw-r--r--usr.sbin/pmcstat/pmcpl_calltree.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_calltree.h2
-rw-r--r--usr.sbin/pmcstat/pmcpl_gprof.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_gprof.h2
-rw-r--r--usr.sbin/pmcstat/pmcstat.c2
-rw-r--r--usr.sbin/pmcstat/pmcstat.h2
-rw-r--r--usr.sbin/pmcstat/pmcstat_log.c2
-rw-r--r--usr.sbin/pmcstat/pmcstat_log.h2
-rw-r--r--usr.sbin/pmcstat/pmcstat_top.h2
-rw-r--r--usr.sbin/portsnap/make_index/make_index.c2
-rw-r--r--usr.sbin/portsnap/phttpget/phttpget.c2
-rw-r--r--usr.sbin/portsnap/portsnap/portsnap.sh2
-rw-r--r--usr.sbin/powerd/powerd.c2
-rw-r--r--usr.sbin/ppp/acf.c2
-rw-r--r--usr.sbin/ppp/acf.h2
-rw-r--r--usr.sbin/ppp/arp.c2
-rw-r--r--usr.sbin/ppp/arp.h2
-rw-r--r--usr.sbin/ppp/async.c2
-rw-r--r--usr.sbin/ppp/async.h2
-rw-r--r--usr.sbin/ppp/auth.c2
-rw-r--r--usr.sbin/ppp/auth.h2
-rw-r--r--usr.sbin/ppp/bundle.c2
-rw-r--r--usr.sbin/ppp/bundle.h2
-rw-r--r--usr.sbin/ppp/cbcp.c2
-rw-r--r--usr.sbin/ppp/cbcp.h2
-rw-r--r--usr.sbin/ppp/ccp.c2
-rw-r--r--usr.sbin/ppp/ccp.h2
-rw-r--r--usr.sbin/ppp/chap.c2
-rw-r--r--usr.sbin/ppp/chap.h2
-rw-r--r--usr.sbin/ppp/chap_ms.c2
-rw-r--r--usr.sbin/ppp/chap_ms.h2
-rw-r--r--usr.sbin/ppp/chat.c2
-rw-r--r--usr.sbin/ppp/chat.h2
-rw-r--r--usr.sbin/ppp/command.c2
-rw-r--r--usr.sbin/ppp/command.h2
-rw-r--r--usr.sbin/ppp/datalink.c2
-rw-r--r--usr.sbin/ppp/datalink.h2
-rw-r--r--usr.sbin/ppp/deflate.c2
-rw-r--r--usr.sbin/ppp/deflate.h2
-rw-r--r--usr.sbin/ppp/defs.c2
-rw-r--r--usr.sbin/ppp/defs.h2
-rw-r--r--usr.sbin/ppp/descriptor.h2
-rw-r--r--usr.sbin/ppp/ether.c2
-rw-r--r--usr.sbin/ppp/ether.h2
-rw-r--r--usr.sbin/ppp/exec.c2
-rw-r--r--usr.sbin/ppp/exec.h2
-rw-r--r--usr.sbin/ppp/filter.c2
-rw-r--r--usr.sbin/ppp/filter.h2
-rw-r--r--usr.sbin/ppp/fsm.c2
-rw-r--r--usr.sbin/ppp/fsm.h2
-rw-r--r--usr.sbin/ppp/hdlc.c2
-rw-r--r--usr.sbin/ppp/hdlc.h2
-rw-r--r--usr.sbin/ppp/i4b.h2
-rw-r--r--usr.sbin/ppp/id.c2
-rw-r--r--usr.sbin/ppp/id.h2
-rw-r--r--usr.sbin/ppp/iface.c2
-rw-r--r--usr.sbin/ppp/iface.h2
-rw-r--r--usr.sbin/ppp/ip.c2
-rw-r--r--usr.sbin/ppp/ip.h2
-rw-r--r--usr.sbin/ppp/ipcp.c2
-rw-r--r--usr.sbin/ppp/ipcp.h2
-rw-r--r--usr.sbin/ppp/iplist.c2
-rw-r--r--usr.sbin/ppp/iplist.h2
-rw-r--r--usr.sbin/ppp/ipv6cp.c2
-rw-r--r--usr.sbin/ppp/ipv6cp.h2
-rw-r--r--usr.sbin/ppp/layer.h2
-rw-r--r--usr.sbin/ppp/lcp.c2
-rw-r--r--usr.sbin/ppp/lcp.h2
-rw-r--r--usr.sbin/ppp/link.c2
-rw-r--r--usr.sbin/ppp/link.h2
-rw-r--r--usr.sbin/ppp/log.c2
-rw-r--r--usr.sbin/ppp/log.h2
-rw-r--r--usr.sbin/ppp/lqr.c2
-rw-r--r--usr.sbin/ppp/lqr.h2
-rw-r--r--usr.sbin/ppp/main.c2
-rw-r--r--usr.sbin/ppp/main.h2
-rw-r--r--usr.sbin/ppp/mbuf.c2
-rw-r--r--usr.sbin/ppp/mbuf.h2
-rw-r--r--usr.sbin/ppp/mp.c2
-rw-r--r--usr.sbin/ppp/mp.h2
-rw-r--r--usr.sbin/ppp/mppe.c2
-rw-r--r--usr.sbin/ppp/mppe.h2
-rw-r--r--usr.sbin/ppp/nat_cmd.c2
-rw-r--r--usr.sbin/ppp/nat_cmd.h2
-rw-r--r--usr.sbin/ppp/ncp.c2
-rw-r--r--usr.sbin/ppp/ncp.h2
-rw-r--r--usr.sbin/ppp/ncpaddr.c2
-rw-r--r--usr.sbin/ppp/ncpaddr.h2
-rw-r--r--usr.sbin/ppp/netgraph.c2
-rw-r--r--usr.sbin/ppp/netgraph.h2
-rw-r--r--usr.sbin/ppp/pap.c2
-rw-r--r--usr.sbin/ppp/pap.h2
-rw-r--r--usr.sbin/ppp/pred.c2
-rw-r--r--usr.sbin/ppp/pred.h2
-rw-r--r--usr.sbin/ppp/probe.c2
-rw-r--r--usr.sbin/ppp/probe.h2
-rw-r--r--usr.sbin/ppp/prompt.c2
-rw-r--r--usr.sbin/ppp/prompt.h2
-rw-r--r--usr.sbin/ppp/proto.c2
-rw-r--r--usr.sbin/ppp/proto.h2
-rw-r--r--usr.sbin/ppp/radius.c4
-rw-r--r--usr.sbin/ppp/radius.h2
-rw-r--r--usr.sbin/ppp/route.c2
-rw-r--r--usr.sbin/ppp/route.h2
-rw-r--r--usr.sbin/ppp/server.c2
-rw-r--r--usr.sbin/ppp/server.h2
-rw-r--r--usr.sbin/ppp/sig.c2
-rw-r--r--usr.sbin/ppp/sig.h2
-rw-r--r--usr.sbin/ppp/sync.c2
-rw-r--r--usr.sbin/ppp/sync.h2
-rw-r--r--usr.sbin/ppp/systems.c2
-rw-r--r--usr.sbin/ppp/systems.h2
-rw-r--r--usr.sbin/ppp/tcp.c2
-rw-r--r--usr.sbin/ppp/tcp.h2
-rw-r--r--usr.sbin/ppp/tcpmss.c2
-rw-r--r--usr.sbin/ppp/tcpmss.h2
-rw-r--r--usr.sbin/ppp/throughput.c2
-rw-r--r--usr.sbin/ppp/throughput.h2
-rw-r--r--usr.sbin/ppp/timer.c2
-rw-r--r--usr.sbin/ppp/timer.h2
-rw-r--r--usr.sbin/ppp/tty.c2
-rw-r--r--usr.sbin/ppp/tty.h2
-rw-r--r--usr.sbin/ppp/tun.c2
-rw-r--r--usr.sbin/ppp/tun.h2
-rw-r--r--usr.sbin/ppp/ua.h2
-rw-r--r--usr.sbin/ppp/udp.c2
-rw-r--r--usr.sbin/ppp/udp.h2
-rw-r--r--usr.sbin/ppp/vjcomp.c2
-rw-r--r--usr.sbin/ppp/vjcomp.h2
-rw-r--r--usr.sbin/pppctl/pppctl.c2
-rw-r--r--usr.sbin/pw/bitmap.c2
-rw-r--r--usr.sbin/pw/bitmap.h2
-rw-r--r--usr.sbin/pw/cpdir.c2
-rw-r--r--usr.sbin/pw/grupd.c2
-rw-r--r--usr.sbin/pw/psdate.c2
-rw-r--r--usr.sbin/pw/psdate.h2
-rw-r--r--usr.sbin/pw/pw.c2
-rw-r--r--usr.sbin/pw/pw.h2
-rw-r--r--usr.sbin/pw/pw_conf.c2
-rw-r--r--usr.sbin/pw/pw_group.c2
-rw-r--r--usr.sbin/pw/pw_log.c2
-rw-r--r--usr.sbin/pw/pw_nis.c2
-rw-r--r--usr.sbin/pw/pw_user.c2
-rw-r--r--usr.sbin/pw/pw_vpw.c2
-rw-r--r--usr.sbin/pw/pwupd.c2
-rw-r--r--usr.sbin/pw/pwupd.h2
-rw-r--r--usr.sbin/pw/rm_r.c2
-rw-r--r--usr.sbin/quot/quot.c4
-rw-r--r--usr.sbin/rarpd/rarpd.c4
-rw-r--r--usr.sbin/rpc.lockd/kern.c2
-rw-r--r--usr.sbin/rpc.umntall/mounttab.c4
-rw-r--r--usr.sbin/rpc.umntall/mounttab.h4
-rw-r--r--usr.sbin/rpc.umntall/rpc.umntall.c4
-rw-r--r--usr.sbin/rpcbind/util.c2
-rw-r--r--usr.sbin/rtadvctl/rtadvctl.c2
-rw-r--r--usr.sbin/rtadvd/advcap.h4
-rw-r--r--usr.sbin/rtadvd/control.c2
-rw-r--r--usr.sbin/rtadvd/control.h2
-rw-r--r--usr.sbin/rtadvd/control_client.c2
-rw-r--r--usr.sbin/rtadvd/control_client.h4
-rw-r--r--usr.sbin/rtadvd/control_server.c2
-rw-r--r--usr.sbin/rtadvd/control_server.h2
-rw-r--r--usr.sbin/rtprio/rtprio.c4
-rw-r--r--usr.sbin/sa/db.c2
-rw-r--r--usr.sbin/sa/extern.h4
-rw-r--r--usr.sbin/sa/main.c4
-rw-r--r--usr.sbin/sa/pathnames.h4
-rw-r--r--usr.sbin/sa/pdb.c4
-rw-r--r--usr.sbin/sa/usrdb.c4
-rwxr-xr-xusr.sbin/service/service.sh2
-rw-r--r--usr.sbin/services_mkdb/extern.h2
-rw-r--r--usr.sbin/services_mkdb/services_mkdb.c2
-rw-r--r--usr.sbin/services_mkdb/uniq.c2
-rw-r--r--usr.sbin/setfmac/setfmac.c2
-rw-r--r--usr.sbin/setpmac/setpmac.c2
-rw-r--r--usr.sbin/smbmsg/pathnames.h2
-rw-r--r--usr.sbin/smbmsg/smbmsg.c2
-rw-r--r--usr.sbin/snapinfo/snapinfo.c2
-rw-r--r--usr.sbin/spkrtest/spkrtest.sh2
-rw-r--r--usr.sbin/spray/spray.c4
-rw-r--r--usr.sbin/traceroute/findsaddr-udp.c2
-rw-r--r--usr.sbin/uathload/uathload.c2
-rw-r--r--usr.sbin/ugidfw/ugidfw.c2
-rw-r--r--usr.sbin/uhsoctl/uhsoctl.c2
-rwxr-xr-xusr.sbin/unbound/local-setup/local-unbound-setup.sh2
-rw-r--r--usr.sbin/usbconfig/dump.c2
-rw-r--r--usr.sbin/usbconfig/dump.h2
-rw-r--r--usr.sbin/usbconfig/usbconfig.c2
-rw-r--r--usr.sbin/usbdump/usbdump.c2
-rw-r--r--usr.sbin/utx/utx.c2
-rw-r--r--usr.sbin/vidcontrol/decode.c2
-rw-r--r--usr.sbin/vidcontrol/vidcontrol.c2
-rw-r--r--usr.sbin/wake/wake.c4
-rw-r--r--usr.sbin/watch/watch.c4
-rw-r--r--usr.sbin/watchdogd/watchdogd.c2
-rw-r--r--usr.sbin/wlandebug/wlandebug.c2
-rw-r--r--usr.sbin/ypbind/ypbind.c4
-rw-r--r--usr.sbin/yppoll/yppoll.c4
-rw-r--r--usr.sbin/ypset/ypset.c4
924 files changed, 2089 insertions, 227 deletions
diff --git a/bin/pkill/pkill.c b/bin/pkill/pkill.c
index 8a307a6..0ffa5ab 100644
--- a/bin/pkill/pkill.c
+++ b/bin/pkill/pkill.c
@@ -1,6 +1,8 @@
/* $NetBSD: pkill.c,v 1.16 2005/10/10 22:13:20 kleink Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2002 The NetBSD Foundation, Inc.
* Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/etc/pam.d/convert.pl b/etc/pam.d/convert.pl
index f4c0676..4686387 100644
--- a/etc/pam.d/convert.pl
+++ b/etc/pam.d/convert.pl
@@ -1,5 +1,7 @@
#!/usr/bin/perl -w
#-
+# SPDX-License-Identifier: BSD-3-Clause
+#
# Copyright (c) 2001,2002 Networks Associates Technologies, Inc.
# All rights reserved.
#
diff --git a/kerberos5/lib/libgssapi_krb5/gss_krb5.c b/kerberos5/lib/libgssapi_krb5/gss_krb5.c
index 36c69cb..94237e2 100644
--- a/kerberos5/lib/libgssapi_krb5/gss_krb5.c
+++ b/kerberos5/lib/libgssapi_krb5/gss_krb5.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
diff --git a/kerberos5/lib/libgssapi_krb5/pname_to_uid.c b/kerberos5/lib/libgssapi_krb5/pname_to_uid.c
index 043ec22..0b19edc 100644
--- a/kerberos5/lib/libgssapi_krb5/pname_to_uid.c
+++ b/kerberos5/lib/libgssapi_krb5/pname_to_uid.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
diff --git a/kerberos5/lib/libgssapi_krb5/prefix.c b/kerberos5/lib/libgssapi_krb5/prefix.c
index 086b744..539ea93 100644
--- a/kerberos5/lib/libgssapi_krb5/prefix.c
+++ b/kerberos5/lib/libgssapi_krb5/prefix.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
diff --git a/kerberos5/lib/libgssapi_ntlm/prefix.c b/kerberos5/lib/libgssapi_ntlm/prefix.c
index 1c497ce..f3e82f3 100644
--- a/kerberos5/lib/libgssapi_ntlm/prefix.c
+++ b/kerberos5/lib/libgssapi_ntlm/prefix.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
diff --git a/kerberos5/lib/libgssapi_spnego/freebsd_compat.c b/kerberos5/lib/libgssapi_spnego/freebsd_compat.c
index d6a9a6e..7abca22 100644
--- a/kerberos5/lib/libgssapi_spnego/freebsd_compat.c
+++ b/kerberos5/lib/libgssapi_spnego/freebsd_compat.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c
index c42379d..e6cadcf 100644
--- a/sbin/adjkerntz/adjkerntz.c
+++ b/sbin/adjkerntz/adjkerntz.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993-1998 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
*
diff --git a/sbin/adjkerntz/pathnames.h b/sbin/adjkerntz/pathnames.h
index c0e7526..43356cd 100644
--- a/sbin/adjkerntz/pathnames.h
+++ b/sbin/adjkerntz/pathnames.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993 by Andrew A. Chernov, Moscow, Russia.
* All rights reserved.
*
@@ -22,6 +24,8 @@
* LIABILITY, OR TORT (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$
*/
#include <paths.h>
diff --git a/sbin/camcontrol/camcontrol.h b/sbin/camcontrol/camcontrol.h
index 1756da6..f6a0a39 100644
--- a/sbin/camcontrol/camcontrol.h
+++ b/sbin/camcontrol/camcontrol.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1998 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/sbin/camcontrol/fwdownload.c b/sbin/camcontrol/fwdownload.c
index a233a49..20a35a6 100644
--- a/sbin/camcontrol/fwdownload.c
+++ b/sbin/camcontrol/fwdownload.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Sandvine Incorporated. All rights reserved.
* Copyright (c) 2002-2011 Andre Albsmeier <andre@albsmeier.net>
* All rights reserved.
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c
index e7b877d..4a2c8e9 100644
--- a/sbin/camcontrol/modeedit.c
+++ b/sbin/camcontrol/modeedit.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Kelly Yancey <kbyanc@posi.net>
* Derived from work done by Julian Elischer <julian@tfs.com,
* julian@dialix.oz.au>, 1993, and Peter Dufault <dufault@hda.com>, 1994.
diff --git a/sbin/camcontrol/progress.c b/sbin/camcontrol/progress.c
index f76305c..054b3f5 100644
--- a/sbin/camcontrol/progress.c
+++ b/sbin/camcontrol/progress.c
@@ -1,6 +1,8 @@
/* $NetBSD: progressbar.c,v 1.21 2009/04/12 10:18:52 lukem Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sbin/camcontrol/progress.h b/sbin/camcontrol/progress.h
index a457c32..1234c11 100644
--- a/sbin/camcontrol/progress.h
+++ b/sbin/camcontrol/progress.h
@@ -1,6 +1,8 @@
/* $NetBSD: progressbar.c,v 1.21 2009/04/12 10:18:52 lukem Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1997-2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sbin/camcontrol/util.c b/sbin/camcontrol/util.c
index 3609281..c22f3a0 100644
--- a/sbin/camcontrol/util.c
+++ b/sbin/camcontrol/util.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Written By Julian ELischer
* Copyright julian Elischer 1993.
* Permission is granted to use or redistribute this file in any way as long
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index 76867ba..b47331c 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003 Poul-Henning Kamp
* Copyright (c) 1995 Jason R. Thorpe.
* All rights reserved.
diff --git a/sbin/ccdconfig/pathnames.h b/sbin/ccdconfig/pathnames.h
index 538cfed..1622df8 100644
--- a/sbin/ccdconfig/pathnames.h
+++ b/sbin/ccdconfig/pathnames.h
@@ -1,6 +1,8 @@
/* $NetBSD: pathnames.h,v 1.1 1995/08/17 16:37:20 thorpej Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Jason R. Thorpe.
* All rights reserved.
*
diff --git a/sbin/comcontrol/comcontrol.c b/sbin/comcontrol/comcontrol.c
index a7c696c..6bfb47b 100644
--- a/sbin/comcontrol/comcontrol.c
+++ b/sbin/comcontrol/comcontrol.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1992 Christopher G. Demetriou
* All rights reserved.
*
diff --git a/sbin/conscontrol/conscontrol.c b/sbin/conscontrol/conscontrol.c
index 3d49709..f4298eb 100644
--- a/sbin/conscontrol/conscontrol.c
+++ b/sbin/conscontrol/conscontrol.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jonathan Lemon <jlemon@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/ddb/ddb.c b/sbin/ddb/ddb.c
index edba7f8..a90a693 100644
--- a/sbin/ddb/ddb.c
+++ b/sbin/ddb/ddb.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sbin/ddb/ddb.h b/sbin/ddb/ddb.h
index 8363bcc..6f9a6f9 100644
--- a/sbin/ddb/ddb.h
+++ b/sbin/ddb/ddb.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sbin/ddb/ddb_capture.c b/sbin/ddb/ddb_capture.c
index 370fc00..d8836f5 100644
--- a/sbin/ddb/ddb_capture.c
+++ b/sbin/ddb/ddb_capture.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sbin/ddb/ddb_script.c b/sbin/ddb/ddb_script.c
index 1382904..06f8a4e 100644
--- a/sbin/ddb/ddb_script.c
+++ b/sbin/ddb/ddb_script.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sbin/devd/devd.h b/sbin/devd/devd.h
index becfe82..ca78ec0 100644
--- a/sbin/devd/devd.h
+++ b/sbin/devd/devd.h
@@ -1,6 +1,8 @@
/*-
* DEVD (Device action daemon)
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 M. Warner Losh <imp@freebsd.org>.
* All rights reserved.
*
diff --git a/sbin/devd/devd.hh b/sbin/devd/devd.hh
index c8a7610..47e22a2 100644
--- a/sbin/devd/devd.hh
+++ b/sbin/devd/devd.hh
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002-2003 M. Warner Losh.
* All rights reserved.
*
diff --git a/sbin/devd/parse.y b/sbin/devd/parse.y
index 6334b4e..ae5cbdf 100644
--- a/sbin/devd/parse.y
+++ b/sbin/devd/parse.y
@@ -2,6 +2,8 @@
/*-
* DEVD (Device action daemon)
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 M. Warner Losh <imp@freebsd.org>.
* All rights reserved.
*
diff --git a/sbin/devd/token.l b/sbin/devd/token.l
index b3441c3..2221dcf 100644
--- a/sbin/devd/token.l
+++ b/sbin/devd/token.l
@@ -2,6 +2,8 @@
/*-
* DEVD (Device action daemon)
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 M. Warner Losh <imp@freebsd.org>.
* All rights reserved.
*
diff --git a/sbin/devfs/devfs.c b/sbin/devfs/devfs.c
index bd6fea9..7be94c4 100644
--- a/sbin/devfs/devfs.c
+++ b/sbin/devfs/devfs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001, 2002 Dima Dorfman.
* All rights reserved.
*
diff --git a/sbin/devfs/extern.h b/sbin/devfs/extern.h
index a9f8d22..c02a7af 100644
--- a/sbin/devfs/extern.h
+++ b/sbin/devfs/extern.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Dima Dorfman.
* All rights reserved.
*
diff --git a/sbin/devfs/rule.c b/sbin/devfs/rule.c
index bb3ebe1..cd868b6 100644
--- a/sbin/devfs/rule.c
+++ b/sbin/devfs/rule.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Dima Dorfman.
* All rights reserved.
*
diff --git a/sbin/etherswitchcfg/etherswitchcfg.c b/sbin/etherswitchcfg/etherswitchcfg.c
index 0ab110b..93cd083 100644
--- a/sbin/etherswitchcfg/etherswitchcfg.c
+++ b/sbin/etherswitchcfg/etherswitchcfg.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
*
diff --git a/sbin/fsck/fsutil.h b/sbin/fsck/fsutil.h
index 013b821..c6300a0 100644
--- a/sbin/fsck/fsutil.h
+++ b/sbin/fsck/fsutil.h
@@ -1,6 +1,8 @@
/* $NetBSD: fsutil.h,v 1.114 2009/10/21 01:07:46 snj Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c
index e9c3fce..29e5f46 100644
--- a/sbin/fsck_ffs/ea.c
+++ b/sbin/fsck_ffs/ea.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c
index 3ab14d1..bf04c12 100644
--- a/sbin/fsck_ffs/suj.c
+++ b/sbin/fsck_ffs/suj.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2009, 2010 Jeffrey W. Roberson <jeff@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/fsck_msdosfs/boot.c b/sbin/fsck_msdosfs/boot.c
index 667af93..35a81ee 100644
--- a/sbin/fsck_msdosfs/boot.c
+++ b/sbin/fsck_msdosfs/boot.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1995, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
*
diff --git a/sbin/fsck_msdosfs/check.c b/sbin/fsck_msdosfs/check.c
index 083389e..6d027bb 100644
--- a/sbin/fsck_msdosfs/check.c
+++ b/sbin/fsck_msdosfs/check.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
*
diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c
index 93f4ca5..38c7014 100644
--- a/sbin/fsck_msdosfs/dir.c
+++ b/sbin/fsck_msdosfs/dir.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
* Some structure declaration borrowed from Paul Popelka
diff --git a/sbin/fsck_msdosfs/dosfs.h b/sbin/fsck_msdosfs/dosfs.h
index 485b3a1..3d84ea0 100644
--- a/sbin/fsck_msdosfs/dosfs.h
+++ b/sbin/fsck_msdosfs/dosfs.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
* Some structure declaration borrowed from Paul Popelka
diff --git a/sbin/fsck_msdosfs/ext.h b/sbin/fsck_msdosfs/ext.h
index ef9c420..ebc9467 100644
--- a/sbin/fsck_msdosfs/ext.h
+++ b/sbin/fsck_msdosfs/ext.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
*
diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c
index b509c50..8a54837 100644
--- a/sbin/fsck_msdosfs/fat.c
+++ b/sbin/fsck_msdosfs/fat.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
*
diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c
index e9baf84..8425d8a 100644
--- a/sbin/fsck_msdosfs/main.c
+++ b/sbin/fsck_msdosfs/main.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (C) 1995 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
*
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 1315aec..b93ac34 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -1,6 +1,8 @@
/* $NetBSD: fsdb.c,v 1.2 1995/10/08 23:18:10 thorpej Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 John T. Kohl
* All rights reserved.
*
diff --git a/sbin/fsdb/fsdb.h b/sbin/fsdb/fsdb.h
index ddd1515..b8dc1e0 100644
--- a/sbin/fsdb/fsdb.h
+++ b/sbin/fsdb/fsdb.h
@@ -1,6 +1,8 @@
/* $NetBSD: fsdb.h,v 1.2 1995/10/08 23:18:11 thorpej Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 John T. Kohl
* All rights reserved.
*
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
index 265a096..534c5c7 100644
--- a/sbin/fsdb/fsdbutil.c
+++ b/sbin/fsdb/fsdbutil.c
@@ -1,6 +1,8 @@
/* $NetBSD: fsdbutil.c,v 1.2 1995/10/08 23:18:12 thorpej Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 John T. Kohl
* All rights reserved.
*
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index 0fea239..b0a055c 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -1,6 +1,8 @@
/* $OpenBSD: fsirand.c,v 1.9 1997/02/28 00:46:33 millert Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
* All rights reserved.
*
diff --git a/sbin/gbde/gbde.c b/sbin/gbde/gbde.c
index 710ae2c..16afe5e 100644
--- a/sbin/gbde/gbde.c
+++ b/sbin/gbde/gbde.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/sbin/geom/class/cache/geom_cache.c b/sbin/geom/class/cache/geom_cache.c
index 4b18e67..fca9f4d 100644
--- a/sbin/geom/class/cache/geom_cache.c
+++ b/sbin/geom/class/cache/geom_cache.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Ruslan Ermilov <ru@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/concat/geom_concat.c b/sbin/geom/class/concat/geom_concat.c
index d4f3645..f2a7ffd 100644
--- a/sbin/geom/class/concat/geom_concat.c
+++ b/sbin/geom/class/concat/geom_concat.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/eli/geom_eli.c b/sbin/geom/class/eli/geom_eli.c
index a6fc71a..ff520bf 100644
--- a/sbin/geom/class/eli/geom_eli.c
+++ b/sbin/geom/class/eli/geom_eli.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/journal/geom_journal.c b/sbin/geom/class/journal/geom_journal.c
index 681ff47..a828e26 100644
--- a/sbin/geom/class/journal/geom_journal.c
+++ b/sbin/geom/class/journal/geom_journal.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/journal/geom_journal.h b/sbin/geom/class/journal/geom_journal.h
index 63d35b4..6725fe0 100644
--- a/sbin/geom/class/journal/geom_journal.h
+++ b/sbin/geom/class/journal/geom_journal.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/journal/geom_journal_ufs.c b/sbin/geom/class/journal/geom_journal_ufs.c
index 07d1922..324be17 100644
--- a/sbin/geom/class/journal/geom_journal_ufs.c
+++ b/sbin/geom/class/journal/geom_journal_ufs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/label/geom_label.c b/sbin/geom/class/label/geom_label.c
index 8a2f57c..e69b93f 100644
--- a/sbin/geom/class/label/geom_label.c
+++ b/sbin/geom/class/label/geom_label.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/mirror/geom_mirror.c b/sbin/geom/class/mirror/geom_mirror.c
index f30b96c..668b0a3 100644
--- a/sbin/geom/class/mirror/geom_mirror.c
+++ b/sbin/geom/class/mirror/geom_mirror.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2009 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/mountver/geom_mountver.c b/sbin/geom/class/mountver/geom_mountver.c
index bff69c5..0d065d7 100644
--- a/sbin/geom/class/mountver/geom_mountver.c
+++ b/sbin/geom/class/mountver/geom_mountver.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Edward Tomasz Napierala <trasz@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/multipath/geom_multipath.c b/sbin/geom/class/multipath/geom_multipath.c
index 5743911..12f194f 100644
--- a/sbin/geom/class/multipath/geom_multipath.c
+++ b/sbin/geom/class/multipath/geom_multipath.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Mathew Jacob <mjacob@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/nop/geom_nop.c b/sbin/geom/class/nop/geom_nop.c
index 35e2b94..65dc07c 100644
--- a/sbin/geom/class/nop/geom_nop.c
+++ b/sbin/geom/class/nop/geom_nop.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/part/geom_part.c b/sbin/geom/class/part/geom_part.c
index 15aec3a..865337f 100644
--- a/sbin/geom/class/part/geom_part.c
+++ b/sbin/geom/class/part/geom_part.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007, 2008 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sbin/geom/class/raid/geom_raid.c b/sbin/geom/class/raid/geom_raid.c
index d3383bc..efb356f 100644
--- a/sbin/geom/class/raid/geom_raid.c
+++ b/sbin/geom/class/raid/geom_raid.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/raid3/geom_raid3.c b/sbin/geom/class/raid3/geom_raid3.c
index cd0aa65..1ad347d 100644
--- a/sbin/geom/class/raid3/geom_raid3.c
+++ b/sbin/geom/class/raid3/geom_raid3.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/sched/geom_sched.c b/sbin/geom/class/sched/geom_sched.c
index 727913c..7b7b281 100644
--- a/sbin/geom/class/sched/geom_sched.c
+++ b/sbin/geom/class/sched/geom_sched.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Fabio Checconi
* Copyright (c) 2010 Luigi Rizzo, Universita` di Pisa
* All rights reserved.
diff --git a/sbin/geom/class/shsec/geom_shsec.c b/sbin/geom/class/shsec/geom_shsec.c
index a5d1b66..78e27b3 100644
--- a/sbin/geom/class/shsec/geom_shsec.c
+++ b/sbin/geom/class/shsec/geom_shsec.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/stripe/geom_stripe.c b/sbin/geom/class/stripe/geom_stripe.c
index 1fb16e9..038d2ce 100644
--- a/sbin/geom/class/stripe/geom_stripe.c
+++ b/sbin/geom/class/stripe/geom_stripe.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/class/virstor/geom_virstor.c b/sbin/geom/class/virstor/geom_virstor.c
index 7b83852..f44b2ce 100644
--- a/sbin/geom/class/virstor/geom_virstor.c
+++ b/sbin/geom/class/virstor/geom_virstor.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Ivan Voras <ivoras@freebsd.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c
index e0b77ba..b4c5661 100644
--- a/sbin/geom/core/geom.c
+++ b/sbin/geom/core/geom.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2009 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/core/geom.h b/sbin/geom/core/geom.h
index 3b0a8eb..89c5828 100644
--- a/sbin/geom/core/geom.h
+++ b/sbin/geom/core/geom.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/misc/subr.c b/sbin/geom/misc/subr.c
index cf0d9b0..ffc6d99 100644
--- a/sbin/geom/misc/subr.c
+++ b/sbin/geom/misc/subr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/geom/misc/subr.h b/sbin/geom/misc/subr.h
index 5ad1269..579c94c 100644
--- a/sbin/geom/misc/subr.h
+++ b/sbin/geom/misc/subr.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/ggate/ggatec/ggatec.c b/sbin/ggate/ggatec/ggatec.c
index ea4f701..a2aa49e 100644
--- a/sbin/ggate/ggatec/ggatec.c
+++ b/sbin/ggate/ggatec/ggatec.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/ggate/ggated/ggated.c b/sbin/ggate/ggated/ggated.c
index e234cb5..e52bdd7 100644
--- a/sbin/ggate/ggated/ggated.c
+++ b/sbin/ggate/ggated/ggated.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/ggate/ggatel/ggatel.c b/sbin/ggate/ggatel/ggatel.c
index 0b89df0..4659cac 100644
--- a/sbin/ggate/ggatel/ggatel.c
+++ b/sbin/ggate/ggatel/ggatel.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/ggate/shared/ggate.c b/sbin/ggate/shared/ggate.c
index cf9b9ca..2f544f7 100644
--- a/sbin/ggate/shared/ggate.c
+++ b/sbin/ggate/shared/ggate.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/ggate/shared/ggate.h b/sbin/ggate/shared/ggate.h
index 898efea..9ea9010 100644
--- a/sbin/ggate/shared/ggate.h
+++ b/sbin/ggate/shared/ggate.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/gvinum/gvinum.c b/sbin/gvinum/gvinum.c
index 4feaa81..7c35cff 100644
--- a/sbin/gvinum/gvinum.c
+++ b/sbin/gvinum/gvinum.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Lukas Ertl
* Copyright (c) 2005 Chris Jones
* Copyright (c) 2007 Ulf Lilleengen
diff --git a/sbin/hastctl/hastctl.c b/sbin/hastctl/hastctl.c
index 474f1b2..162ba26 100644
--- a/sbin/hastctl/hastctl.c
+++ b/sbin/hastctl/hastctl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/activemap.c b/sbin/hastd/activemap.c
index 5728ea0..73577d2 100644
--- a/sbin/hastd/activemap.c
+++ b/sbin/hastd/activemap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/activemap.h b/sbin/hastd/activemap.h
index 42f0221..e42a37e 100644
--- a/sbin/hastd/activemap.h
+++ b/sbin/hastd/activemap.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/control.c b/sbin/hastd/control.c
index 364225b..52e567a 100644
--- a/sbin/hastd/control.c
+++ b/sbin/hastd/control.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/control.h b/sbin/hastd/control.h
index 0795c70..1809616 100644
--- a/sbin/hastd/control.h
+++ b/sbin/hastd/control.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/ebuf.c b/sbin/hastd/ebuf.c
index 1ae2a26..22d3251 100644
--- a/sbin/hastd/ebuf.c
+++ b/sbin/hastd/ebuf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/ebuf.h b/sbin/hastd/ebuf.h
index 06275e7..83500ed 100644
--- a/sbin/hastd/ebuf.h
+++ b/sbin/hastd/ebuf.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/event.c b/sbin/hastd/event.c
index ef65df1..105939f 100644
--- a/sbin/hastd/event.c
+++ b/sbin/hastd/event.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/hastd/event.h b/sbin/hastd/event.h
index 1614bf1..c377329 100644
--- a/sbin/hastd/event.h
+++ b/sbin/hastd/event.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/hastd/hast.h b/sbin/hastd/hast.h
index c529de5..b1e2537 100644
--- a/sbin/hastd/hast.h
+++ b/sbin/hastd/hast.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/hast_checksum.c b/sbin/hastd/hast_checksum.c
index 795744e..efaf3b7 100644
--- a/sbin/hastd/hast_checksum.c
+++ b/sbin/hastd/hast_checksum.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
*
diff --git a/sbin/hastd/hast_checksum.h b/sbin/hastd/hast_checksum.h
index 9799828..ea37a2f 100644
--- a/sbin/hastd/hast_checksum.h
+++ b/sbin/hastd/hast_checksum.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
*
diff --git a/sbin/hastd/hast_compression.c b/sbin/hastd/hast_compression.c
index f524eb1..e6a2192 100644
--- a/sbin/hastd/hast_compression.c
+++ b/sbin/hastd/hast_compression.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
*
diff --git a/sbin/hastd/hast_compression.h b/sbin/hastd/hast_compression.h
index eabdfb2..b7ea662 100644
--- a/sbin/hastd/hast_compression.h
+++ b/sbin/hastd/hast_compression.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
*
diff --git a/sbin/hastd/hast_proto.c b/sbin/hastd/hast_proto.c
index dd41fb1..038e1a5 100644
--- a/sbin/hastd/hast_proto.c
+++ b/sbin/hastd/hast_proto.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/hast_proto.h b/sbin/hastd/hast_proto.h
index 49f3b56..3a0a3fb 100644
--- a/sbin/hastd/hast_proto.h
+++ b/sbin/hastd/hast_proto.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/hastd.c b/sbin/hastd/hastd.c
index 3d42f5d..160dfef 100644
--- a/sbin/hastd/hastd.c
+++ b/sbin/hastd/hastd.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2010-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/hastd.h b/sbin/hastd/hastd.h
index d23e855..965a63d 100644
--- a/sbin/hastd/hastd.h
+++ b/sbin/hastd/hastd.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/hooks.c b/sbin/hastd/hooks.c
index 8cff3bf..0aeb1e0 100644
--- a/sbin/hastd/hooks.c
+++ b/sbin/hastd/hooks.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/hastd/hooks.h b/sbin/hastd/hooks.h
index 4ce435e..3ace6d3 100644
--- a/sbin/hastd/hooks.h
+++ b/sbin/hastd/hooks.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/hastd/lzf.c b/sbin/hastd/lzf.c
index cca6a17..687cd08 100644
--- a/sbin/hastd/lzf.c
+++ b/sbin/hastd/lzf.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2008 Marc Alexander Lehmann <schmorp@schmorp.de>
*
* Redistribution and use in source and binary forms, with or without modifica-
diff --git a/sbin/hastd/lzf.h b/sbin/hastd/lzf.h
index b1ad52e..b3a3b09 100644
--- a/sbin/hastd/lzf.h
+++ b/sbin/hastd/lzf.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2008 Marc Alexander Lehmann <schmorp@schmorp.de>
*
* Redistribution and use in source and binary forms, with or without modifica-
diff --git a/sbin/hastd/metadata.c b/sbin/hastd/metadata.c
index 6d9f366..2d998b7 100644
--- a/sbin/hastd/metadata.c
+++ b/sbin/hastd/metadata.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/metadata.h b/sbin/hastd/metadata.h
index 83d35f4..4efd13f 100644
--- a/sbin/hastd/metadata.h
+++ b/sbin/hastd/metadata.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/nv.c b/sbin/hastd/nv.c
index fefc2df..81def8a 100644
--- a/sbin/hastd/nv.c
+++ b/sbin/hastd/nv.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/nv.h b/sbin/hastd/nv.h
index d49fa5d..7d93a71 100644
--- a/sbin/hastd/nv.h
+++ b/sbin/hastd/nv.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/parse.y b/sbin/hastd/parse.y
index 6bfb537..4e7687c 100644
--- a/sbin/hastd/parse.y
+++ b/sbin/hastd/parse.y
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/pjdlog.c b/sbin/hastd/pjdlog.c
index bc4018f..9ac9a69 100644
--- a/sbin/hastd/pjdlog.c
+++ b/sbin/hastd/pjdlog.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/hastd/pjdlog.h b/sbin/hastd/pjdlog.h
index 0f01f79..6a1833d 100644
--- a/sbin/hastd/pjdlog.h
+++ b/sbin/hastd/pjdlog.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c
index 8fa3383..620cb6e 100644
--- a/sbin/hastd/primary.c
+++ b/sbin/hastd/primary.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 The FreeBSD Foundation
* Copyright (c) 2010-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/proto.c b/sbin/hastd/proto.c
index 53bbf7a..249da7d 100644
--- a/sbin/hastd/proto.c
+++ b/sbin/hastd/proto.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/proto.h b/sbin/hastd/proto.h
index 1a60e5b..b7f2d44 100644
--- a/sbin/hastd/proto.h
+++ b/sbin/hastd/proto.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/proto_common.c b/sbin/hastd/proto_common.c
index 843366b..5a927f5 100644
--- a/sbin/hastd/proto_common.c
+++ b/sbin/hastd/proto_common.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/proto_impl.h b/sbin/hastd/proto_impl.h
index d62f26f..2d035be 100644
--- a/sbin/hastd/proto_impl.h
+++ b/sbin/hastd/proto_impl.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/proto_socketpair.c b/sbin/hastd/proto_socketpair.c
index d13caa9..9c4e9f1 100644
--- a/sbin/hastd/proto_socketpair.c
+++ b/sbin/hastd/proto_socketpair.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/proto_tcp.c b/sbin/hastd/proto_tcp.c
index 6dc0661..d2bf983 100644
--- a/sbin/hastd/proto_tcp.c
+++ b/sbin/hastd/proto_tcp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/proto_uds.c b/sbin/hastd/proto_uds.c
index 087b788..5c18a2c 100644
--- a/sbin/hastd/proto_uds.c
+++ b/sbin/hastd/proto_uds.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/rangelock.c b/sbin/hastd/rangelock.c
index e14c5b8..129b82b 100644
--- a/sbin/hastd/rangelock.c
+++ b/sbin/hastd/rangelock.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/rangelock.h b/sbin/hastd/rangelock.h
index 2ad9895..93281a3 100644
--- a/sbin/hastd/rangelock.h
+++ b/sbin/hastd/rangelock.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/refcnt.h b/sbin/hastd/refcnt.h
index 11801cb..5e86f13 100644
--- a/sbin/hastd/refcnt.h
+++ b/sbin/hastd/refcnt.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/hastd/secondary.c b/sbin/hastd/secondary.c
index 5e1207a..fa3142e 100644
--- a/sbin/hastd/secondary.c
+++ b/sbin/hastd/secondary.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/hastd/subr.c b/sbin/hastd/subr.c
index 62818b2..51e0a55 100644
--- a/sbin/hastd/subr.c
+++ b/sbin/hastd/subr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/subr.h b/sbin/hastd/subr.h
index c765754..93e344d 100644
--- a/sbin/hastd/subr.h
+++ b/sbin/hastd/subr.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/synch.h b/sbin/hastd/synch.h
index db4d83b..2644e54 100644
--- a/sbin/hastd/synch.h
+++ b/sbin/hastd/synch.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/hastd/token.l b/sbin/hastd/token.l
index e8f6760..bc423e1 100644
--- a/sbin/hastd/token.l
+++ b/sbin/hastd/token.l
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/ifconfig/af_nd6.c b/sbin/ifconfig/af_nd6.c
index 68789ca..8c57611 100644
--- a/sbin/ifconfig/af_nd6.c
+++ b/sbin/ifconfig/af_nd6.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Hiroki Sato. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sbin/ifconfig/carp.c b/sbin/ifconfig/carp.c
index 2a2ee47..dcf966d 100644
--- a/sbin/ifconfig/carp.c
+++ b/sbin/ifconfig/carp.c
@@ -1,7 +1,9 @@
/* $FreeBSD$ */
/* from $OpenBSD: ifconfig.c,v 1.82 2003/10/19 05:43:35 mcbride Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
* Copyright (c) 2003 Ryan McBride. All rights reserved.
*
diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c
index b61c7b5..e726811 100644
--- a/sbin/ifconfig/ifbridge.c
+++ b/sbin/ifconfig/ifbridge.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 2001 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
index ada224f..5a9af3a 100644
--- a/sbin/ifconfig/ifconfig.h
+++ b/sbin/ifconfig/ifconfig.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997 Peter Wemm.
* All rights reserved.
*
diff --git a/sbin/ifconfig/iffib.c b/sbin/ifconfig/iffib.c
index 1921948..7cb21ce 100644
--- a/sbin/ifconfig/iffib.c
+++ b/sbin/ifconfig/iffib.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Alexander V. Chernikov
* Copyright (c) 2011 Christian S.J. Peron
* Copyright (c) 2011 Bjoern A. Zeeb
diff --git a/sbin/ifconfig/ifgif.c b/sbin/ifconfig/ifgif.c
index 72ceb1b..b75dd4e 100644
--- a/sbin/ifconfig/ifgif.c
+++ b/sbin/ifconfig/ifgif.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Hiroki Sato. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sbin/ifconfig/ifgre.c b/sbin/ifconfig/ifgre.c
index 3689678..cdd129a 100644
--- a/sbin/ifconfig/ifgre.c
+++ b/sbin/ifconfig/ifgre.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Andrew Thompson. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sbin/ifconfig/ifgroup.c b/sbin/ifconfig/ifgroup.c
index d12c5fb..d3792e0 100644
--- a/sbin/ifconfig/ifgroup.c
+++ b/sbin/ifconfig/ifgroup.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Max Laier. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c
index 7e44556..b09fe47 100644
--- a/sbin/ifconfig/ifieee80211.c
+++ b/sbin/ifconfig/ifieee80211.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2001 The Aerospace Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sbin/ifconfig/ifmac.c b/sbin/ifconfig/ifmac.c
index 3b171ea..31f4e97 100644
--- a/sbin/ifconfig/ifmac.c
+++ b/sbin/ifconfig/ifmac.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2001 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/sbin/ifconfig/ifpfsync.c b/sbin/ifconfig/ifpfsync.c
index 82199ee..3c9a9ed 100644
--- a/sbin/ifconfig/ifpfsync.c
+++ b/sbin/ifconfig/ifpfsync.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Ryan McBride. All rights reserved.
* Copyright (c) 2004 Max Laier. All rights reserved.
*
diff --git a/sbin/iscontrol/auth_subr.c b/sbin/iscontrol/auth_subr.c
index 5f82929..a4c17ba 100644
--- a/sbin/iscontrol/auth_subr.c
+++ b/sbin/iscontrol/auth_subr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sbin/iscontrol/config.c b/sbin/iscontrol/config.c
index 639a702..2fe4451 100644
--- a/sbin/iscontrol/config.c
+++ b/sbin/iscontrol/config.c
@@ -1,4 +1,6 @@
- /*-
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2009 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sbin/iscontrol/fsm.c b/sbin/iscontrol/fsm.c
index bfeeb7f..8efbe66 100644
--- a/sbin/iscontrol/fsm.c
+++ b/sbin/iscontrol/fsm.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sbin/iscontrol/iscontrol.c b/sbin/iscontrol/iscontrol.c
index 2e8f2ea..967795b 100644
--- a/sbin/iscontrol/iscontrol.c
+++ b/sbin/iscontrol/iscontrol.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sbin/iscontrol/iscontrol.h b/sbin/iscontrol/iscontrol.h
index 6aa5612..cc7a6cb 100644
--- a/sbin/iscontrol/iscontrol.h
+++ b/sbin/iscontrol/iscontrol.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sbin/iscontrol/login.c b/sbin/iscontrol/login.c
index 92bbc64b..7cb9900 100644
--- a/sbin/iscontrol/login.c
+++ b/sbin/iscontrol/login.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sbin/iscontrol/misc.c b/sbin/iscontrol/misc.c
index b6fe6df..3397634 100644
--- a/sbin/iscontrol/misc.c
+++ b/sbin/iscontrol/misc.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sbin/iscontrol/pdu.c b/sbin/iscontrol/pdu.c
index 7ce90ea..3133e53 100644
--- a/sbin/iscontrol/pdu.c
+++ b/sbin/iscontrol/pdu.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
*
diff --git a/sbin/kldconfig/kldconfig.c b/sbin/kldconfig/kldconfig.c
index 8c7d732..2dbd88b 100644
--- a/sbin/kldconfig/kldconfig.c
+++ b/sbin/kldconfig/kldconfig.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Peter Pentchev
* All rights reserved.
*
diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c
index cd31c52..df03d3c 100644
--- a/sbin/kldload/kldload.c
+++ b/sbin/kldload/kldload.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Doug Rabson
* All rights reserved.
*
diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c
index ee819cd..d9e6bef 100644
--- a/sbin/kldstat/kldstat.c
+++ b/sbin/kldstat/kldstat.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Doug Rabson
* All rights reserved.
*
diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c
index 8a3ea61..637b9f6 100644
--- a/sbin/kldunload/kldunload.c
+++ b/sbin/kldunload/kldunload.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Doug Rabson
* All rights reserved.
*
diff --git a/sbin/ldconfig/elfhints.c b/sbin/ldconfig/elfhints.c
index 9bdf56e..bbedac6 100644
--- a/sbin/ldconfig/elfhints.c
+++ b/sbin/ldconfig/elfhints.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 John D. Polstra
* All rights reserved.
*
diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c
index 85d97e6..b51d53b 100644
--- a/sbin/ldconfig/ldconfig.c
+++ b/sbin/ldconfig/ldconfig.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993,1995 Paul Kranenburg
* All rights reserved.
*
diff --git a/sbin/ldconfig/ldconfig.h b/sbin/ldconfig/ldconfig.h
index 859bcbd..9b27825 100644
--- a/sbin/ldconfig/ldconfig.h
+++ b/sbin/ldconfig/ldconfig.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 John D. Polstra
* All rights reserved.
*
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index 1b4e4ce..e5547d6 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2004 Poul-Henning Kamp <phk@FreeBSD.org>
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c
index ee2faf0..cbe64d4 100644
--- a/sbin/mdmfs/mdmfs.c
+++ b/sbin/mdmfs/mdmfs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Dima Dorfman.
* All rights reserved.
*
diff --git a/sbin/mksnap_ffs/mksnap_ffs.c b/sbin/mksnap_ffs/mksnap_ffs.c
index db49fdb..374617b 100644
--- a/sbin/mksnap_ffs/mksnap_ffs.c
+++ b/sbin/mksnap_ffs/mksnap_ffs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/sbin/mount/extern.h b/sbin/mount/extern.h
index 91e2ec4..29c6e49 100644
--- a/sbin/mount/extern.h
+++ b/sbin/mount/extern.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 FreeBSD Inc.
* All rights reserved.
*
diff --git a/sbin/mount_fusefs/mount_fusefs.c b/sbin/mount_fusefs/mount_fusefs.c
index 7d4b9a1..2dd2dca 100644
--- a/sbin/mount_fusefs/mount_fusefs.c
+++ b/sbin/mount_fusefs/mount_fusefs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Jean-Sebastien Pedron
* Copyright (c) 2005 Csaba Henk
* All rights reserved.
diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c
index 8814fdd..d439ba6 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.c
+++ b/sbin/mount_msdosfs/mount_msdosfs.c
@@ -1,6 +1,8 @@
/* $NetBSD: mount_msdos.c,v 1.18 1997/09/16 12:24:18 lukem Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Christopher G. Demetriou
* All rights reserved.
*
diff --git a/sbin/nandfs/lssnap.c b/sbin/nandfs/lssnap.c
index fbee3cd..cb240fb 100644
--- a/sbin/nandfs/lssnap.c
+++ b/sbin/nandfs/lssnap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/nandfs/mksnap.c b/sbin/nandfs/mksnap.c
index cd2d130..f75eda3 100644
--- a/sbin/nandfs/mksnap.c
+++ b/sbin/nandfs/mksnap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/nandfs/nandfs.c b/sbin/nandfs/nandfs.c
index f7ddda1..b319b58 100644
--- a/sbin/nandfs/nandfs.c
+++ b/sbin/nandfs/nandfs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/nandfs/nandfs.h b/sbin/nandfs/nandfs.h
index f544cc2..993d933 100644
--- a/sbin/nandfs/nandfs.h
+++ b/sbin/nandfs/nandfs.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/nandfs/rmsnap.c b/sbin/nandfs/rmsnap.c
index df2cbd5..c07439d 100644
--- a/sbin/nandfs/rmsnap.c
+++ b/sbin/nandfs/rmsnap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c
index 0d3340d..a82c575 100644
--- a/sbin/newfs_msdos/newfs_msdos.c
+++ b/sbin/newfs_msdos/newfs_msdos.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Robert Nordier
* All rights reserved.
*
diff --git a/sbin/newfs_nandfs/newfs_nandfs.c b/sbin/newfs_nandfs/newfs_nandfs.c
index f3fb6f2..00de0ee 100644
--- a/sbin/newfs_nandfs/newfs_nandfs.c
+++ b/sbin/newfs_nandfs/newfs_nandfs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
diff --git a/sbin/nos-tun/nos-tun.c b/sbin/nos-tun/nos-tun.c
index ee0fc4c..76e11ba 100644
--- a/sbin/nos-tun/nos-tun.c
+++ b/sbin/nos-tun/nos-tun.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996, Nickolay Dudorov
* All rights reserved.
*
diff --git a/sbin/nvmecontrol/devlist.c b/sbin/nvmecontrol/devlist.c
index 35a46c1..2a37245 100644
--- a/sbin/nvmecontrol/devlist.c
+++ b/sbin/nvmecontrol/devlist.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
*
diff --git a/sbin/nvmecontrol/firmware.c b/sbin/nvmecontrol/firmware.c
index a9aa49f..cc2833b 100644
--- a/sbin/nvmecontrol/firmware.c
+++ b/sbin/nvmecontrol/firmware.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 EMC Corp.
* All rights reserved.
*
diff --git a/sbin/nvmecontrol/identify.c b/sbin/nvmecontrol/identify.c
index e799452..423bbc8 100644
--- a/sbin/nvmecontrol/identify.c
+++ b/sbin/nvmecontrol/identify.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
*
diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c
index ccda7f0..7c19730 100644
--- a/sbin/nvmecontrol/logpage.c
+++ b/sbin/nvmecontrol/logpage.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 EMC Corp.
* All rights reserved.
*
diff --git a/sbin/nvmecontrol/nvmecontrol.c b/sbin/nvmecontrol/nvmecontrol.c
index 6c658d2..55caf0b 100644
--- a/sbin/nvmecontrol/nvmecontrol.c
+++ b/sbin/nvmecontrol/nvmecontrol.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
*
diff --git a/sbin/nvmecontrol/nvmecontrol.h b/sbin/nvmecontrol/nvmecontrol.h
index 92898db..d3f6bad 100644
--- a/sbin/nvmecontrol/nvmecontrol.h
+++ b/sbin/nvmecontrol/nvmecontrol.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
*
diff --git a/sbin/nvmecontrol/perftest.c b/sbin/nvmecontrol/perftest.c
index cc91198..cdedd1b 100644
--- a/sbin/nvmecontrol/perftest.c
+++ b/sbin/nvmecontrol/perftest.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
*
diff --git a/sbin/nvmecontrol/reset.c b/sbin/nvmecontrol/reset.c
index 8ce597e..7cb3359 100644
--- a/sbin/nvmecontrol/reset.c
+++ b/sbin/nvmecontrol/reset.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
*
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 8d799f5..a5fd471 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,6 +1,8 @@
/* $OpenBSD: parse.y,v 1.554 2008/10/17 12:59:53 henning Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2001 Daniel Hartmeier. All rights reserved.
* Copyright (c) 2001 Theo de Raadt. All rights reserved.
diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c
index 346e623..810c773 100644
--- a/sbin/pfctl/pf_print_state.c
+++ b/sbin/pfctl/pf_print_state.c
@@ -1,6 +1,8 @@
/* $OpenBSD: pf_print_state.c,v 1.52 2008/08/12 16:40:18 david Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2001 Daniel Hartmeier
* All rights reserved.
*
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index 43d9dc5..ae69777 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -1,6 +1,8 @@
/* $OpenBSD: pfctl.c,v 1.278 2008/08/31 20:18:17 jmc Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2001 Daniel Hartmeier
* Copyright (c) 2002,2003 Henning Brauer
* All rights reserved.
diff --git a/sbin/pfctl/pfctl.h b/sbin/pfctl/pfctl.h
index 2c69bc2..a432f10 100644
--- a/sbin/pfctl/pfctl.h
+++ b/sbin/pfctl/pfctl.h
@@ -1,6 +1,8 @@
/* $OpenBSD: pfctl.h,v 1.42 2007/12/05 12:01:47 chl Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2001 Daniel Hartmeier
* All rights reserved.
*
diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index 4bb1477..b180a51 100644
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -1,6 +1,8 @@
/* $OpenBSD: pfctl_parser.c,v 1.240 2008/06/10 20:55:02 mcbride Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2001 Daniel Hartmeier
* Copyright (c) 2002,2003 Henning Brauer
* All rights reserved.
diff --git a/sbin/pfctl/pfctl_parser.h b/sbin/pfctl/pfctl_parser.h
index 2b7fea7..e652c97 100644
--- a/sbin/pfctl/pfctl_parser.h
+++ b/sbin/pfctl/pfctl_parser.h
@@ -1,6 +1,8 @@
/* $OpenBSD: pfctl_parser.h,v 1.86 2006/10/31 23:46:25 mcbride Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2001 Daniel Hartmeier
* All rights reserved.
*
diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c
index 38f16c4..2fc6606 100644
--- a/sbin/pfctl/pfctl_radix.c
+++ b/sbin/pfctl/pfctl_radix.c
@@ -1,6 +1,8 @@
/* $OpenBSD: pfctl_radix.c,v 1.27 2005/05/21 21:03:58 henning Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2002 Cedric Berger
* All rights reserved.
*
diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c
index f3a1efd..db338fb 100644
--- a/sbin/pfctl/pfctl_table.c
+++ b/sbin/pfctl/pfctl_table.c
@@ -1,6 +1,8 @@
/* $OpenBSD: pfctl_table.c,v 1.67 2008/06/10 20:55:02 mcbride Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2002 Cedric Berger
* All rights reserved.
*
diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c
index 37faa24..86fba7c 100644
--- a/sbin/rcorder/rcorder.c
+++ b/sbin/rcorder/rcorder.c
@@ -2,7 +2,9 @@
/* $NetBSD: rcorder.c,v 1.7 2000/08/04 07:33:55 enami Exp $ */
#endif
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998, 1999 Matthew R. Green
* All rights reserved.
* Copyright (c) 1998
diff --git a/sbin/reboot/nextboot.sh b/sbin/reboot/nextboot.sh
index d9bbb25..e975215 100644
--- a/sbin/reboot/nextboot.sh
+++ b/sbin/reboot/nextboot.sh
@@ -1,5 +1,7 @@
#! /bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2002 Gordon Tetlow. All rights reserved.
# Copyright (c) 2012 Sandvine Incorporated. All rights reserved.
#
diff --git a/sbin/spppcontrol/spppcontrol.c b/sbin/spppcontrol/spppcontrol.c
index 9cb84ab..e56310c 100644
--- a/sbin/spppcontrol/spppcontrol.c
+++ b/sbin/spppcontrol/spppcontrol.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, 2001 Joerg Wunsch
*
* All rights reserved.
diff --git a/usr.bin/ar/acplex.l b/usr.bin/ar/acplex.l
index 589888e..f74821a 100644
--- a/usr.bin/ar/acplex.l
+++ b/usr.bin/ar/acplex.l
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Kai Wang
* All rights reserved.
*
diff --git a/usr.bin/ar/acpyacc.y b/usr.bin/ar/acpyacc.y
index 456ee1f..b335598 100644
--- a/usr.bin/ar/acpyacc.y
+++ b/usr.bin/ar/acpyacc.y
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Kai Wang
* All rights reserved.
*
diff --git a/usr.bin/ar/ar.h b/usr.bin/ar/ar.h
index 957a985..1966898 100644
--- a/usr.bin/ar/ar.h
+++ b/usr.bin/ar/ar.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Kai Wang
* All rights reserved.
*
diff --git a/usr.bin/ar/read.c b/usr.bin/ar/read.c
index 704812c..7825054 100644
--- a/usr.bin/ar/read.c
+++ b/usr.bin/ar/read.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Kai Wang
* Copyright (c) 2007 Tim Kientzle
* All rights reserved.
diff --git a/usr.bin/ar/util.c b/usr.bin/ar/util.c
index e1230e3..d6eb36e 100644
--- a/usr.bin/ar/util.c
+++ b/usr.bin/ar/util.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2007 Tim Kientzle
* All rights reserved.
*
diff --git a/usr.bin/ar/write.c b/usr.bin/ar/write.c
index 49f539b..15fedbc 100644
--- a/usr.bin/ar/write.c
+++ b/usr.bin/ar/write.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Kai Wang
* All rights reserved.
*
diff --git a/usr.bin/asa/asa.c b/usr.bin/asa/asa.c
index 692b8375..22174ed 100644
--- a/usr.bin/asa/asa.c
+++ b/usr.bin/asa/asa.c
@@ -1,6 +1,8 @@
/* $NetBSD: asa.c,v 1.11 1997/09/20 14:55:00 lukem Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993,94 Winning Strategies, Inc.
* All rights reserved.
*
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index fec0df3..63b0e3a 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -1,5 +1,8 @@
-/*
+/*-
* at.c : Put file into atrun queue
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993, 1994 Thomas Koenig
*
* Atrun & Atq modifications
diff --git a/usr.bin/at/at.h b/usr.bin/at/at.h
index 3d72bbb..8bdc65d 100644
--- a/usr.bin/at/at.h
+++ b/usr.bin/at/at.h
@@ -1,5 +1,8 @@
-/*
+/*-
* at.h - header for at(1)
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993 Thomas Koenig
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index ef5265b..63cd68c 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -1,5 +1,8 @@
-/*
+/*-
* panic.c - terminate fast in case of error
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993 Thomas Koenig
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/at/panic.h b/usr.bin/at/panic.h
index 832de83..d514048 100644
--- a/usr.bin/at/panic.h
+++ b/usr.bin/at/panic.h
@@ -1,5 +1,8 @@
-/*
+/*-
* panic.h - header for at(1)
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993 Thomas Koenig
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index 418b7eb..97f533c 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -1,5 +1,8 @@
-/*
+/*-
* parsetime.c - parse time for at(1)
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993, 1994 Thomas Koenig
*
* modifications for English-language times
diff --git a/usr.bin/at/parsetime.h b/usr.bin/at/parsetime.h
index 30c3f20..c320164 100644
--- a/usr.bin/at/parsetime.h
+++ b/usr.bin/at/parsetime.h
@@ -1,5 +1,8 @@
-/*
+/*-
* at.h - header for at(1)
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993 Thomas Koenig
*
* Redistribution and use in source and binary forms, with or without
@@ -21,6 +24,8 @@
* THEORY OF LIABILITY, WETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (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$
*/
time_t parsetime(int argc, char **argv);
diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c
index 91176b4..e2fb86e 100644
--- a/usr.bin/at/perm.c
+++ b/usr.bin/at/perm.c
@@ -1,5 +1,8 @@
-/*
+/*-
* perm.c - check user permission for at(1)
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1994 Thomas Koenig
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/at/perm.h b/usr.bin/at/perm.h
index b55b5fb..59e1031 100644
--- a/usr.bin/at/perm.h
+++ b/usr.bin/at/perm.h
@@ -1,5 +1,8 @@
-/*
+/*-
* perm.h - header for at(1)
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1994 Thomas Koenig
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/at/privs.h b/usr.bin/at/privs.h
index 2b0d34a..ba84ec9 100644
--- a/usr.bin/at/privs.h
+++ b/usr.bin/at/privs.h
@@ -1,5 +1,8 @@
-/*
- * privs.h - header for privileged operations
+/*-
+ * privs.h - header for privileged operations
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993 Thomas Koenig
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/bluetooth/bthost/bthost.c b/usr.bin/bluetooth/bthost/bthost.c
index 69ce3f5..b5c5b72 100644
--- a/usr.bin/bluetooth/bthost/bthost.c
+++ b/usr.bin/bluetooth/bthost/bthost.c
@@ -1,6 +1,8 @@
-/*
+/*-
* bthost.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.bin/bluetooth/btsockstat/btsockstat.c b/usr.bin/bluetooth/btsockstat/btsockstat.c
index 78f6127..95ffd25 100644
--- a/usr.bin/bluetooth/btsockstat/btsockstat.c
+++ b/usr.bin/bluetooth/btsockstat/btsockstat.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* btsockstat.c
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
index 239597d..116c5c8 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
@@ -1,6 +1,8 @@
-/*
+/*-
* rfcomm_sdp.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
index 309bab9..ff99591 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index ce462e9..e30f45e 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2000, 2001 David O'Brien
* Copyright (c) 1996 Søren Schmidt
* All rights reserved.
diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.c b/usr.bin/bsdiff/bsdiff/bsdiff.c
index 4646e4e..57243fc 100644
--- a/usr.bin/bsdiff/bsdiff/bsdiff.c
+++ b/usr.bin/bsdiff/bsdiff/bsdiff.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2003-2005 Colin Percival
* All rights reserved
*
diff --git a/usr.bin/bsdiff/bspatch/bspatch.c b/usr.bin/bsdiff/bspatch/bspatch.c
index fc7c07d..c66f28e 100644
--- a/usr.bin/bsdiff/bspatch/bspatch.c
+++ b/usr.bin/bsdiff/bspatch/bspatch.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2003-2005 Colin Percival
* All rights reserved
*
diff --git a/usr.bin/c89/c89.c b/usr.bin/c89/c89.c
index 930153f..fbccf39 100644
--- a/usr.bin/c89/c89.c
+++ b/usr.bin/c89/c89.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* This is the Posix.2 mandated C compiler. Basically, a hook to the
* cc(1) command.
*
diff --git a/usr.bin/c99/c99.c b/usr.bin/c99/c99.c
index 79cca89..093023f 100644
--- a/usr.bin/c99/c99.c
+++ b/usr.bin/c99/c99.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/calendar/dates.c b/usr.bin/calendar/dates.c
index 86d8a1f..e30e864 100644
--- a/usr.bin/calendar/dates.c
+++ b/usr.bin/calendar/dates.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1992-2009 Edwin Groothuis <edwin@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.bin/calendar/events.c b/usr.bin/calendar/events.c
index d6f358a..5d7255e 100644
--- a/usr.bin/calendar/events.c
+++ b/usr.bin/calendar/events.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1992-2009 Edwin Groothuis <edwin@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index 3cce299..53a5a89 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* All rights reserved.
*
diff --git a/usr.bin/calendar/parsedata.c b/usr.bin/calendar/parsedata.c
index 1a19164..32f0cb8 100644
--- a/usr.bin/calendar/parsedata.c
+++ b/usr.bin/calendar/parsedata.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1992-2009 Edwin Groothuis <edwin@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.bin/calendar/paskha.c b/usr.bin/calendar/paskha.c
index ab369ad..46936e6 100644
--- a/usr.bin/calendar/paskha.c
+++ b/usr.bin/calendar/paskha.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993-1996 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
*
diff --git a/usr.bin/calendar/sunpos.c b/usr.bin/calendar/sunpos.c
index 1e39cba..48dd893 100644
--- a/usr.bin/calendar/sunpos.c
+++ b/usr.bin/calendar/sunpos.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 Edwin Groothuis <edwin@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.bin/cmp/link.c b/usr.bin/cmp/link.c
index fe45def..3aecf4f 100644
--- a/usr.bin/cmp/link.c
+++ b/usr.bin/cmp/link.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Brian Somers <brian@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y
index 44a62cd..c7b1b88 100644
--- a/usr.bin/colldef/parse.y
+++ b/usr.bin/colldef/parse.y
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
* at Electronni Visti IA, Kiev, Ukraine.
* All rights reserved.
diff --git a/usr.bin/colldef/scan.l b/usr.bin/colldef/scan.l
index b396ed0..f83078b 100644
--- a/usr.bin/colldef/scan.l
+++ b/usr.bin/colldef/scan.l
@@ -1,6 +1,8 @@
%x string name charmap defn nchar subs subs2
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
* at Electronni Visti IA, Kiev, Ukraine.
* All rights reserved.
diff --git a/usr.bin/compress/zopen.h b/usr.bin/compress/zopen.h
index a27a4f9..229a736 100644
--- a/usr.bin/compress/zopen.h
+++ b/usr.bin/compress/zopen.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* FreeBSD Inc. All rights reserved.
*
diff --git a/usr.bin/cpuset/cpuset.c b/usr.bin/cpuset/cpuset.c
index c619259..160d76e 100644
--- a/usr.bin/cpuset/cpuset.c
+++ b/usr.bin/cpuset/cpuset.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007, 2008 Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
*
diff --git a/usr.bin/csplit/csplit.c b/usr.bin/csplit/csplit.c
index b23c85d..97ccd09 100644
--- a/usr.bin/csplit/csplit.c
+++ b/usr.bin/csplit/csplit.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/ctlstat/ctlstat.c b/usr.bin/ctlstat/ctlstat.c
index 70c1f7a..34e340f 100644
--- a/usr.bin/ctlstat/ctlstat.c
+++ b/usr.bin/ctlstat/ctlstat.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004, 2008, 2009 Silicon Graphics International Corp.
* Copyright (c) 2017 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/dtc/checking.cc b/usr.bin/dtc/checking.cc
index ffd6d24..33b0717 100644
--- a/usr.bin/dtc/checking.cc
+++ b/usr.bin/dtc/checking.cc
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/checking.hh b/usr.bin/dtc/checking.hh
index d833ffd..5c5a6a0 100644
--- a/usr.bin/dtc/checking.hh
+++ b/usr.bin/dtc/checking.hh
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/dtb.cc b/usr.bin/dtc/dtb.cc
index b18674c..6594774 100644
--- a/usr.bin/dtc/dtb.cc
+++ b/usr.bin/dtc/dtb.cc
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/dtb.hh b/usr.bin/dtc/dtb.hh
index fa93178..d0e42a1 100644
--- a/usr.bin/dtc/dtb.hh
+++ b/usr.bin/dtc/dtb.hh
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/dtc.cc b/usr.bin/dtc/dtc.cc
index fded151..4a34419 100644
--- a/usr.bin/dtc/dtc.cc
+++ b/usr.bin/dtc/dtc.cc
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/fdt.cc b/usr.bin/dtc/fdt.cc
index 27f7135..a153756 100644
--- a/usr.bin/dtc/fdt.cc
+++ b/usr.bin/dtc/fdt.cc
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/fdt.hh b/usr.bin/dtc/fdt.hh
index 1a5270b..cc80aed 100644
--- a/usr.bin/dtc/fdt.hh
+++ b/usr.bin/dtc/fdt.hh
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/input_buffer.cc b/usr.bin/dtc/input_buffer.cc
index 429e219..d0fa022 100644
--- a/usr.bin/dtc/input_buffer.cc
+++ b/usr.bin/dtc/input_buffer.cc
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/input_buffer.hh b/usr.bin/dtc/input_buffer.hh
index 76ad7c7..2a6d741 100644
--- a/usr.bin/dtc/input_buffer.hh
+++ b/usr.bin/dtc/input_buffer.hh
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/string.cc b/usr.bin/dtc/string.cc
index 8891556..71a304a 100644
--- a/usr.bin/dtc/string.cc
+++ b/usr.bin/dtc/string.cc
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/util.hh b/usr.bin/dtc/util.hh
index 91f4fa8..337685e 100644
--- a/usr.bin/dtc/util.hh
+++ b/usr.bin/dtc/util.hh
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/elf2aout/elf2aout.c b/usr.bin/elf2aout/elf2aout.c
index 7e1ece6..2782d89 100644
--- a/usr.bin/elf2aout/elf2aout.c
+++ b/usr.bin/elf2aout/elf2aout.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Jake Burkholder
* All rights reserved.
*
diff --git a/usr.bin/elfdump/elfdump.c b/usr.bin/elfdump/elfdump.c
index eda56ce..58d1cb2 100644
--- a/usr.bin/elfdump/elfdump.c
+++ b/usr.bin/elfdump/elfdump.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 David O'Brien. All rights reserved.
* Copyright (c) 2001 Jake Burkholder
* All rights reserved.
diff --git a/usr.bin/env/envopts.c b/usr.bin/env/envopts.c
index 5740062..5c15b36 100644
--- a/usr.bin/env/envopts.c
+++ b/usr.bin/env/envopts.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 - Garance Alistair Drosehn <gad@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.bin/env/envopts.h b/usr.bin/env/envopts.h
index 1f15c69..5c6dcf6 100644
--- a/usr.bin/env/envopts.h
+++ b/usr.bin/env/envopts.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 - Garance Alistair Drosehn <gad@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c
index 3fbf343..a37821f 100644
--- a/usr.bin/fetch/fetch.c
+++ b/usr.bin/fetch/fetch.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2000-2014 Dag-Erling Smørgrav
* Copyright (c) 2013 Michael Gmelin <freebsd@grem.de>
* All rights reserved.
diff --git a/usr.bin/finger/pathnames.h b/usr.bin/finger/pathnames.h
index 7c9ad19..a60ce7d 100644
--- a/usr.bin/finger/pathnames.h
+++ b/usr.bin/finger/pathnames.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Mark Knight <markk@knigma.org>
* All rights reserved.
*
diff --git a/usr.bin/fstat/functions.h b/usr.bin/fstat/functions.h
index a23d27e..ba46aa4 100644
--- a/usr.bin/fstat/functions.h
+++ b/usr.bin/fstat/functions.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/fstat/fuser.c b/usr.bin/fstat/fuser.c
index dbb0d86..b422532 100644
--- a/usr.bin/fstat/fuser.c
+++ b/usr.bin/fstat/fuser.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2009 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/fstat/main.c b/usr.bin/fstat/main.c
index 4123e64..ab08386 100644
--- a/usr.bin/fstat/main.c
+++ b/usr.bin/fstat/main.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.bin/fsync/fsync.c b/usr.bin/fsync/fsync.c
index 78aeb21..f6a4286 100644
--- a/usr.bin/fsync/fsync.c
+++ b/usr.bin/fsync/fsync.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Paul Saab <ps@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c
index e0be1c2..6b507b6 100644
--- a/usr.bin/gcore/elfcore.c
+++ b/usr.bin/gcore/elfcore.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2017 Dell EMC
* Copyright (c) 2007 Sandvine Incorporated
* Copyright (c) 1998 John D. Polstra
diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c
index 6d4098a..323914e 100644
--- a/usr.bin/gencat/gencat.c
+++ b/usr.bin/gencat/gencat.c
@@ -3,7 +3,9 @@
/* $NetBSD: gencat.c,v 1.18 2003/10/27 00:12:43 lukem Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND MIT
+ *
* Copyright (c) 1996 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/getent/getent.c b/usr.bin/getent/getent.c
index 977f147..1b1427e 100644
--- a/usr.bin/getent/getent.c
+++ b/usr.bin/getent/getent.c
@@ -1,6 +1,8 @@
/* $NetBSD: getent.c,v 1.7 2005/08/24 14:31:02 ginsbach Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c
index bea7c72..7de58a6 100644
--- a/usr.bin/grep/file.c
+++ b/usr.bin/grep/file.c
@@ -3,6 +3,8 @@
/* $OpenBSD: file.c,v 1.11 2010/07/02 20:48:48 nicm Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* Copyright (C) 2008-2010 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2010 Dimitry Andric <dimitry@andric.com>
diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c
index 3113fba..e48613b 100644
--- a/usr.bin/grep/grep.c
+++ b/usr.bin/grep/grep.c
@@ -3,6 +3,8 @@
/* $OpenBSD: grep.c,v 1.42 2010/07/02 22:18:03 tedu Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* Copyright (C) 2008-2009 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/grep/grep.h b/usr.bin/grep/grep.h
index 7cd8c38..8167a9a 100644
--- a/usr.bin/grep/grep.h
+++ b/usr.bin/grep/grep.h
@@ -3,6 +3,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008-2009 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/grep/queue.c b/usr.bin/grep/queue.c
index f094f8a..b5f3aa1 100644
--- a/usr.bin/grep/queue.c
+++ b/usr.bin/grep/queue.c
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
diff --git a/usr.bin/grep/regex/fastmatch.c b/usr.bin/grep/regex/fastmatch.c
index db5899a..6e3e3f8 100644
--- a/usr.bin/grep/regex/fastmatch.c
+++ b/usr.bin/grep/regex/fastmatch.c
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2011 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/grep/regex/hashtable.c b/usr.bin/grep/regex/hashtable.c
index 41ebcd1..1767d0a 100644
--- a/usr.bin/grep/regex/hashtable.c
+++ b/usr.bin/grep/regex/hashtable.c
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2011 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/grep/regex/tre-fastmatch.c b/usr.bin/grep/regex/tre-fastmatch.c
index 6bf7c44..c286456 100644
--- a/usr.bin/grep/regex/tre-fastmatch.c
+++ b/usr.bin/grep/regex/tre-fastmatch.c
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* Copyright (C) 2008-2011 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c
index 2741380..6fd841c 100644
--- a/usr.bin/grep/util.c
+++ b/usr.bin/grep/util.c
@@ -3,6 +3,8 @@
/* $OpenBSD: util.c,v 1.39 2010/07/02 22:18:03 tedu Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* Copyright (C) 2008-2010 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2017 Kyle Evans <kevans@FreeBSD.org>
diff --git a/usr.bin/gzip/gzip.c b/usr.bin/gzip/gzip.c
index 68f83fe..e56b089 100644
--- a/usr.bin/gzip/gzip.c
+++ b/usr.bin/gzip/gzip.c
@@ -1,6 +1,8 @@
/* $NetBSD: gzip.c,v 1.112 2017/08/23 13:04:17 christos Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008, 2009, 2010, 2011, 2015, 2017
* Matthew R. Green
* All rights reserved.
diff --git a/usr.bin/gzip/unbzip2.c b/usr.bin/gzip/unbzip2.c
index 3eb29c3..f6807e0 100644
--- a/usr.bin/gzip/unbzip2.c
+++ b/usr.bin/gzip/unbzip2.c
@@ -1,6 +1,8 @@
/* $NetBSD: unbzip2.c,v 1.14 2017/08/04 07:27:08 mrg Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2006 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/gzip/unpack.c b/usr.bin/gzip/unpack.c
index f07cae0..8e8f7c0 100644
--- a/usr.bin/gzip/unpack.c
+++ b/usr.bin/gzip/unpack.c
@@ -2,6 +2,8 @@
/* $NetBSD: unpack.c,v 1.3 2017/08/04 07:27:08 mrg Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Xin LI <delphij@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/gzip/unxz.c b/usr.bin/gzip/unxz.c
index 6b01485..390c916 100644
--- a/usr.bin/gzip/unxz.c
+++ b/usr.bin/gzip/unxz.c
@@ -1,6 +1,8 @@
/* $NetBSD: unxz.c,v 1.7 2017/08/04 07:27:08 mrg Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/iconv/iconv.c b/usr.bin/iconv/iconv.c
index 161b22e..e693dad 100644
--- a/usr.bin/iconv/iconv.c
+++ b/usr.bin/iconv/iconv.c
@@ -2,6 +2,8 @@
/* $NetBSD: iconv.c,v 1.16 2009/02/20 15:28:21 yamt Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/usr.bin/indent/indent.h b/usr.bin/indent/indent.h
index 4c52bf8..b1473a0 100644
--- a/usr.bin/indent/indent.h
+++ b/usr.bin/indent/indent.h
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jens Schweikhardt
* All rights reserved.
*
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index 98c4555..8cfeec3 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Adam Glass
* All rights reserved.
*
diff --git a/usr.bin/ipcs/ipc.c b/usr.bin/ipcs/ipc.c
index 9bb795c..3106e13 100644
--- a/usr.bin/ipcs/ipc.c
+++ b/usr.bin/ipcs/ipc.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
* All rights reserved.
*
diff --git a/usr.bin/ipcs/ipc.h b/usr.bin/ipcs/ipc.h
index 0b6188a..6e89e48 100644
--- a/usr.bin/ipcs/ipc.h
+++ b/usr.bin/ipcs/ipc.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
* All rights reserved.
*
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index be6ca56..3d7be14 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
* All rights reserved.
*
diff --git a/usr.bin/iscsictl/iscsictl.c b/usr.bin/iscsictl/iscsictl.c
index 45a0912..e71ba90 100644
--- a/usr.bin/iscsictl/iscsictl.c
+++ b/usr.bin/iscsictl/iscsictl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.bin/iscsictl/iscsictl.h b/usr.bin/iscsictl/iscsictl.h
index 79d89b8..aac86e7 100644
--- a/usr.bin/iscsictl/iscsictl.h
+++ b/usr.bin/iscsictl/iscsictl.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.bin/iscsictl/parse.y b/usr.bin/iscsictl/parse.y
index 84c05b8..1e414a6 100644
--- a/usr.bin/iscsictl/parse.y
+++ b/usr.bin/iscsictl/parse.y
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.bin/iscsictl/periphs.c b/usr.bin/iscsictl/periphs.c
index 0697860..e4d4f99 100644
--- a/usr.bin/iscsictl/periphs.c
+++ b/usr.bin/iscsictl/periphs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997-2007 Kenneth D. Merry
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
diff --git a/usr.bin/iscsictl/token.l b/usr.bin/iscsictl/token.l
index c9e3e72..fc731f4 100644
--- a/usr.bin/iscsictl/token.l
+++ b/usr.bin/iscsictl/token.l
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c
index cdb62da..aca0830 100644
--- a/usr.bin/killall/killall.c
+++ b/usr.bin/killall/killall.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Peter Wemm <peter@FreeBSD.org>
* Copyright (c) 2000 Paul Saab <ps@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/ktrdump/ktrdump.c b/usr.bin/ktrdump/ktrdump.c
index d1cf061..388e4bb 100644
--- a/usr.bin/ktrdump/ktrdump.c
+++ b/usr.bin/ktrdump/ktrdump.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Jake Burkholder
* Copyright (c) 2004 Robert Watson
* All rights reserved.
diff --git a/usr.bin/lastcomm/readrec.c b/usr.bin/lastcomm/readrec.c
index 5de7c5c..b83a612 100644
--- a/usr.bin/lastcomm/readrec.c
+++ b/usr.bin/lastcomm/readrec.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Diomidis Spinellis
* All rights reserved.
*
diff --git a/usr.bin/ldd/extern.h b/usr.bin/ldd/extern.h
index 4df6759..840ca0e 100644
--- a/usr.bin/ldd/extern.h
+++ b/usr.bin/ldd/extern.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 FreeBSD, Inc
* All rights reserved.
*
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index e1bebe0..915db38 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993 Paul Kranenburg
* All rights reserved.
*
diff --git a/usr.bin/ldd/sods.c b/usr.bin/ldd/sods.c
index 7e69cec..fb70e9f 100644
--- a/usr.bin/ldd/sods.c
+++ b/usr.bin/ldd/sods.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996-1997 John D. Polstra. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/locale/locale.c b/usr.bin/locale/locale.c
index a62eff1..8f47f8e 100644
--- a/usr.bin/locale/locale.c
+++ b/usr.bin/locale/locale.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002, 2003 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/locate/locate/concatdb.sh b/usr.bin/locate/locate/concatdb.sh
index 156f21a..ead4743 100644
--- a/usr.bin/locate/locate/concatdb.sh
+++ b/usr.bin/locate/locate/concatdb.sh
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
# All rights reserved.
#
diff --git a/usr.bin/locate/locate/mklocatedb.sh b/usr.bin/locate/locate/mklocatedb.sh
index 39d15d7..284ea64 100644
--- a/usr.bin/locate/locate/mklocatedb.sh
+++ b/usr.bin/locate/locate/mklocatedb.sh
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
# All rights reserved.
#
diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh
index 97f096d..c01dcf9 100644
--- a/usr.bin/locate/locate/updatedb.sh
+++ b/usr.bin/locate/locate/updatedb.sh
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
# All rights reserved.
#
diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c
index 5555c48..471bedf 100644
--- a/usr.bin/lockf/lockf.c
+++ b/usr.bin/lockf/lockf.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1997 John D. Polstra. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/login/login.h b/usr.bin/login/login.h
index 48ef31b..3a27d46 100644
--- a/usr.bin/login/login.h
+++ b/usr.bin/login/login.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 FreeBSD, Inc
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/logins/logins.c b/usr.bin/logins/logins.c
index 5cc60d7..535efa1 100644
--- a/usr.bin/logins/logins.c
+++ b/usr.bin/logins/logins.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2004 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
diff --git a/usr.bin/m4/gnum4.c b/usr.bin/m4/gnum4.c
index 61f96d4..4ac7196 100644
--- a/usr.bin/m4/gnum4.c
+++ b/usr.bin/m4/gnum4.c
@@ -1,6 +1,8 @@
/* $OpenBSD: gnum4.c,v 1.50 2015/04/29 00:13:26 millert Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 1999 Marc Espie
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/m4/trace.c b/usr.bin/m4/trace.c
index 90e913d..cce4c79 100644
--- a/usr.bin/m4/trace.c
+++ b/usr.bin/m4/trace.c
@@ -1,5 +1,7 @@
/* $OpenBSD: trace.c,v 1.16 2010/09/07 19:58:09 marco Exp $ */
/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2001 Marc Espie.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh
index 3aa9ab9..4d72773 100755
--- a/usr.bin/man/man.sh
+++ b/usr.bin/man/man.sh
@@ -1,5 +1,7 @@
#! /bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 Gordon Tetlow
# All rights reserved.
#
diff --git a/usr.bin/mkcsmapper/ldef.h b/usr.bin/mkcsmapper/ldef.h
index d585703..0aedc56 100644
--- a/usr.bin/mkcsmapper/ldef.h
+++ b/usr.bin/mkcsmapper/ldef.h
@@ -2,6 +2,8 @@
/* $NetBSD: ldef.h,v 1.2 2006/09/09 14:35:17 tnozaki Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2003, 2006 Citrus Project,
* All rights reserved.
*
diff --git a/usr.bin/mkcsmapper/lex.l b/usr.bin/mkcsmapper/lex.l
index 33b7f8e..adbdf78 100644
--- a/usr.bin/mkcsmapper/lex.l
+++ b/usr.bin/mkcsmapper/lex.l
@@ -3,6 +3,8 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/usr.bin/mkcsmapper/yacc.y b/usr.bin/mkcsmapper/yacc.y
index 89ce5fd..fc43ea8 100644
--- a/usr.bin/mkcsmapper/yacc.y
+++ b/usr.bin/mkcsmapper/yacc.y
@@ -3,6 +3,8 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2003, 2006 Citrus Project,
* All rights reserved.
*
diff --git a/usr.bin/mkesdb/ldef.h b/usr.bin/mkesdb/ldef.h
index 45b4e60..e543936 100644
--- a/usr.bin/mkesdb/ldef.h
+++ b/usr.bin/mkesdb/ldef.h
@@ -2,6 +2,8 @@
/* $NetBSD: ldef.h,v 1.2 2005/06/27 01:23:59 fvdl Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/usr.bin/mkesdb/lex.l b/usr.bin/mkesdb/lex.l
index c9d9cc1..3d6b836 100644
--- a/usr.bin/mkesdb/lex.l
+++ b/usr.bin/mkesdb/lex.l
@@ -3,6 +3,8 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/usr.bin/mkesdb/yacc.y b/usr.bin/mkesdb/yacc.y
index 7b6e140..4b3f9c7 100644
--- a/usr.bin/mkesdb/yacc.y
+++ b/usr.bin/mkesdb/yacc.y
@@ -3,6 +3,8 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c
index 277104f..0b320e8 100644
--- a/usr.bin/mktemp/mktemp.c
+++ b/usr.bin/mktemp/mktemp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1994, 1995, 1996, 1998 Peter Wemm <peter@netplex.com.au>
* All rights reserved.
*
diff --git a/usr.bin/mkuzip/mkuzip.c b/usr.bin/mkuzip/mkuzip.c
index 074df03..be0a9b2 100644
--- a/usr.bin/mkuzip/mkuzip.c
+++ b/usr.bin/mkuzip/mkuzip.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2016 Maxim Sobolev <sobomax@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c
index 25bc76f..621b839 100644
--- a/usr.bin/ncal/ncal.c
+++ b/usr.bin/ncal/ncal.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Wolfgang Helbig
* All rights reserved.
*
diff --git a/usr.bin/netstat/bpf.c b/usr.bin/netstat/bpf.c
index 60546e3..4251746 100644
--- a/usr.bin/netstat/bpf.c
+++ b/usr.bin/netstat/bpf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Christian S.J. Peron
* All rights reserved.
*
diff --git a/usr.bin/netstat/netisr.c b/usr.bin/netstat/netisr.c
index b384d6a..9c9f05f 100644
--- a/usr.bin/netstat/netisr.c
+++ b/usr.bin/netstat/netisr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2011 Juniper Networks, Inc.
* All rights reserved.
*
diff --git a/usr.bin/newgrp/newgrp.c b/usr.bin/newgrp/newgrp.c
index 8fc90f3..f8f54f7 100644
--- a/usr.bin/newgrp/newgrp.c
+++ b/usr.bin/newgrp/newgrp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c
index 1770b78..92111a8 100644
--- a/usr.bin/nl/nl.c
+++ b/usr.bin/nl/nl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index 2d399c5..7896428 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Networks Associates Technologies, Inc.
* All rights reserved.
*
diff --git a/usr.bin/pathchk/pathchk.c b/usr.bin/pathchk/pathchk.c
index be80ec9..314454f 100644
--- a/usr.bin/pathchk/pathchk.c
+++ b/usr.bin/pathchk/pathchk.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/perror/perror.c b/usr.bin/perror/perror.c
index 62af5df..1cf502a 100644
--- a/usr.bin/perror/perror.c
+++ b/usr.bin/perror/perror.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Hudson River Trading LLC
* Written by: George V. Neville-Neil <gnn@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat.c b/usr.bin/procstat/procstat.c
index eca2790..c912829 100644
--- a/usr.bin/procstat/procstat.c
+++ b/usr.bin/procstat/procstat.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007, 2011 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* Copyright (c) 2017 Dell EMC
diff --git a/usr.bin/procstat/procstat.h b/usr.bin/procstat/procstat.h
index dd35c9c..e2cb96a 100644
--- a/usr.bin/procstat/procstat.h
+++ b/usr.bin/procstat/procstat.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* Copyright (c) 2017 Dell EMC
diff --git a/usr.bin/procstat/procstat_args.c b/usr.bin/procstat/procstat_args.c
index fd5f3d3..917d8a2 100644
--- a/usr.bin/procstat/procstat_args.c
+++ b/usr.bin/procstat/procstat_args.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_auxv.c b/usr.bin/procstat/procstat_auxv.c
index f4a2265..cc85c3e 100644
--- a/usr.bin/procstat/procstat_auxv.c
+++ b/usr.bin/procstat/procstat_auxv.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Mikolaj Golub
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_basic.c b/usr.bin/procstat/procstat_basic.c
index 75bb7a8..5cd2b08 100644
--- a/usr.bin/procstat/procstat_basic.c
+++ b/usr.bin/procstat/procstat_basic.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_bin.c b/usr.bin/procstat/procstat_bin.c
index 8b2b8a1..91cc7dc 100644
--- a/usr.bin/procstat/procstat_bin.c
+++ b/usr.bin/procstat/procstat_bin.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_cred.c b/usr.bin/procstat/procstat_cred.c
index 940c952..520dc63 100644
--- a/usr.bin/procstat/procstat_cred.c
+++ b/usr.bin/procstat/procstat_cred.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2008 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c
index 1626697..3b20199 100644
--- a/usr.bin/procstat/procstat_files.c
+++ b/usr.bin/procstat/procstat_files.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2011 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_kstack.c b/usr.bin/procstat/procstat_kstack.c
index 374f9d0..ad800bc 100644
--- a/usr.bin/procstat/procstat_kstack.c
+++ b/usr.bin/procstat/procstat_kstack.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_rlimit.c b/usr.bin/procstat/procstat_rlimit.c
index 5088c59..81147c9 100644
--- a/usr.bin/procstat/procstat_rlimit.c
+++ b/usr.bin/procstat/procstat_rlimit.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Mikolaj Golub
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_sigs.c b/usr.bin/procstat/procstat_sigs.c
index 7bc73ec..4f98e2d 100644
--- a/usr.bin/procstat/procstat_sigs.c
+++ b/usr.bin/procstat/procstat_sigs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Konstantin Belousov
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_threads.c b/usr.bin/procstat/procstat_threads.c
index 40e1b4b..df8a1d9 100644
--- a/usr.bin/procstat/procstat_threads.c
+++ b/usr.bin/procstat/procstat_threads.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_vm.c b/usr.bin/procstat/procstat_vm.c
index 8c641e5..83536e8 100644
--- a/usr.bin/procstat/procstat_vm.c
+++ b/usr.bin/procstat/procstat_vm.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/protect/protect.c b/usr.bin/protect/protect.c
index 16b0d29..d9990be 100644
--- a/usr.bin/protect/protect.c
+++ b/usr.bin/protect/protect.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/rctl/rctl.c b/usr.bin/rctl/rctl.c
index 05809d3..74073c1 100644
--- a/usr.bin/rctl/rctl.c
+++ b/usr.bin/rctl/rctl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.bin/revoke/revoke.c b/usr.bin/revoke/revoke.c
index bc9f838..ca976ac 100644
--- a/usr.bin/revoke/revoke.c
+++ b/usr.bin/revoke/revoke.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/seq/seq.c b/usr.bin/seq/seq.c
index 6d715e1..b8c3fae 100644
--- a/usr.bin/seq/seq.c
+++ b/usr.bin/seq/seq.c
@@ -1,5 +1,7 @@
/* $NetBSD: seq.c,v 1.7 2010/05/27 08:40:19 dholland Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/setchannel/setchannel.c b/usr.bin/setchannel/setchannel.c
index e7b00fe..a229290 100644
--- a/usr.bin/setchannel/setchannel.c
+++ b/usr.bin/setchannel/setchannel.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003, 2004, 2005
* John Wehle <john@feith.com>. All rights reserved.
*
diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c
index dea195c..22442ba 100644
--- a/usr.bin/sockstat/sockstat.c
+++ b/usr.bin/sockstat/sockstat.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
diff --git a/usr.bin/sort/bwstring.c b/usr.bin/sort/bwstring.c
index 5ece88e..cb60680 100644
--- a/usr.bin/sort/bwstring.c
+++ b/usr.bin/sort/bwstring.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/bwstring.h b/usr.bin/sort/bwstring.h
index 7402ec6..9d62eaf 100644
--- a/usr.bin/sort/bwstring.h
+++ b/usr.bin/sort/bwstring.h
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/coll.c b/usr.bin/sort/coll.c
index 6372f3d..aa16114 100644
--- a/usr.bin/sort/coll.c
+++ b/usr.bin/sort/coll.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/coll.h b/usr.bin/sort/coll.h
index 6e3f9b4..10505a4 100644
--- a/usr.bin/sort/coll.h
+++ b/usr.bin/sort/coll.h
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c
index 47d59af..92aabef 100644
--- a/usr.bin/sort/file.c
+++ b/usr.bin/sort/file.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/file.h b/usr.bin/sort/file.h
index e87fafd..f3a7d3a 100644
--- a/usr.bin/sort/file.h
+++ b/usr.bin/sort/file.h
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/mem.c b/usr.bin/sort/mem.c
index c6e9a53..dea37bb 100644
--- a/usr.bin/sort/mem.c
+++ b/usr.bin/sort/mem.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/mem.h b/usr.bin/sort/mem.h
index 36671e3..cb21d6d 100644
--- a/usr.bin/sort/mem.h
+++ b/usr.bin/sort/mem.h
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/radixsort.c b/usr.bin/sort/radixsort.c
index b3a31a0..8c43c61 100644
--- a/usr.bin/sort/radixsort.c
+++ b/usr.bin/sort/radixsort.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/sort/radixsort.h b/usr.bin/sort/radixsort.h
index 8743728..6d5b928 100644
--- a/usr.bin/sort/radixsort.h
+++ b/usr.bin/sort/radixsort.h
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c
index 7f5b3e8..5edc5af 100644
--- a/usr.bin/sort/sort.c
+++ b/usr.bin/sort/sort.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/sort.h b/usr.bin/sort/sort.h
index 41dd60e..b472fd1 100644
--- a/usr.bin/sort/sort.h
+++ b/usr.bin/sort/sort.h
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/vsort.c b/usr.bin/sort/vsort.c
index 5d15f9a..804b575 100644
--- a/usr.bin/sort/vsort.c
+++ b/usr.bin/sort/vsort.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/sort/vsort.h b/usr.bin/sort/vsort.h
index 5f9db74..8ab1612 100644
--- a/usr.bin/sort/vsort.h
+++ b/usr.bin/sort/vsort.h
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/ssh-copy-id/ssh-copy-id.sh b/usr.bin/ssh-copy-id/ssh-copy-id.sh
index f03d5c0..303340e 100755
--- a/usr.bin/ssh-copy-id/ssh-copy-id.sh
+++ b/usr.bin/ssh-copy-id/ssh-copy-id.sh
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2012 Eitan Adler
# All rights reserved.
#
diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c
index ddbb9ab..0c9ba68 100644
--- a/usr.bin/stat/stat.c
+++ b/usr.bin/stat/stat.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2002 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/stdbuf/stdbuf.c b/usr.bin/stdbuf/stdbuf.c
index c05a44d..d9355e4 100644
--- a/usr.bin/stdbuf/stdbuf.c
+++ b/usr.bin/stdbuf/stdbuf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Jeremie Le Hen <jlh@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/systat/convtbl.c b/usr.bin/systat/convtbl.c
index bebb040..6b299d0 100644
--- a/usr.bin/systat/convtbl.c
+++ b/usr.bin/systat/convtbl.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003, Trent Nelson, <trent@arpa.com>.
* All rights reserved.
*
diff --git a/usr.bin/systat/convtbl.h b/usr.bin/systat/convtbl.h
index 051e1cd..f525e85 100644
--- a/usr.bin/systat/convtbl.h
+++ b/usr.bin/systat/convtbl.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003, Trent Nelson, <trent@arpa.com>.
* All rights reserved.
*
diff --git a/usr.bin/systat/devs.h b/usr.bin/systat/devs.h
index 9217008..b25cc96 100644
--- a/usr.bin/systat/devs.h
+++ b/usr.bin/systat/devs.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 David E. O'Brien
* All rights reserved.
*
diff --git a/usr.bin/systat/ifcmds.c b/usr.bin/systat/ifcmds.c
index 101c939..f509160 100644
--- a/usr.bin/systat/ifcmds.c
+++ b/usr.bin/systat/ifcmds.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003, Trent Nelson, <trent@arpa.com>.
* All rights reserved.
*
diff --git a/usr.bin/systat/ifstat.c b/usr.bin/systat/ifstat.c
index 35e5756..4c174c0 100644
--- a/usr.bin/systat/ifstat.c
+++ b/usr.bin/systat/ifstat.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003, Trent Nelson, <trent@arpa.com>.
* All rights reserved.
*
diff --git a/usr.bin/tabs/tabs.c b/usr.bin/tabs/tabs.c
index d03a741..c980920 100644
--- a/usr.bin/tabs/tabs.c
+++ b/usr.bin/tabs/tabs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/tr/cmap.c b/usr.bin/tr/cmap.c
index 811040c..1df2c99 100644
--- a/usr.bin/tr/cmap.c
+++ b/usr.bin/tr/cmap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/tr/cmap.h b/usr.bin/tr/cmap.h
index 9a81e13..d7df72e 100644
--- a/usr.bin/tr/cmap.h
+++ b/usr.bin/tr/cmap.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/tr/cset.c b/usr.bin/tr/cset.c
index 58a927c..3b2a08d 100644
--- a/usr.bin/tr/cset.c
+++ b/usr.bin/tr/cset.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/tr/cset.h b/usr.bin/tr/cset.h
index ab3eabd..5d41107 100644
--- a/usr.bin/tr/cset.h
+++ b/usr.bin/tr/cset.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/truncate/truncate.c b/usr.bin/truncate/truncate.c
index d45533e..072c72d 100644
--- a/usr.bin/truncate/truncate.c
+++ b/usr.bin/truncate/truncate.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Sheldon Hearn <sheldonh@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.bin/truss/truss.h b/usr.bin/truss/truss.h
index 5328296..e63dbcb 100644
--- a/usr.bin/truss/truss.h
+++ b/usr.bin/truss/truss.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2001 Jamey Wood
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index 290a15a..c354b31 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 - 2015 Tony Finch <dot@dotat.at>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/unifdef/unifdef.h b/usr.bin/unifdef/unifdef.h
index 6e58e4f..8d061c8 100644
--- a/usr.bin/unifdef/unifdef.h
+++ b/usr.bin/unifdef/unifdef.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 - 2013 Tony Finch <dot@dotat.at>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/unifdef/unifdefall.sh b/usr.bin/unifdef/unifdefall.sh
index 6abf60b..e9c394e 100644
--- a/usr.bin/unifdef/unifdefall.sh
+++ b/usr.bin/unifdef/unifdefall.sh
@@ -2,6 +2,8 @@
#
# unifdefall: remove all the #if's from a source file
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2002 - 2013 Tony Finch <dot@dotat.at>
# Copyright (c) 2009 - 2010 Jonathan Nieder <jrnieder@gmail.com>
#
diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index bff203fb..4499d9f 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* units.c Copyright (c) 1993 by Adrian Mariano (adrian@cam.cornell.edu)
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/unzip/unzip.c b/usr.bin/unzip/unzip.c
index fb123db..c9e53f2 100644
--- a/usr.bin/unzip/unzip.c
+++ b/usr.bin/unzip/unzip.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, 2010 Joerg Sonnenberger <joerg@NetBSD.org>
* Copyright (c) 2007-2008 Dag-Erling Smørgrav
* All rights reserved.
diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c
index 49cf0af..5f45849 100644
--- a/usr.bin/usbhidaction/usbhidaction.c
+++ b/usr.bin/usbhidaction/usbhidaction.c
@@ -1,7 +1,9 @@
/* $NetBSD: usbhidaction.c,v 1.8 2002/06/11 06:06:21 itojun Exp $ */
/* $FreeBSD$ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/usbhidctl/usbhid.c b/usr.bin/usbhidctl/usbhid.c
index 06a79c8..58a8ae0 100644
--- a/usr.bin/usbhidctl/usbhid.c
+++ b/usr.bin/usbhidctl/usbhid.c
@@ -1,7 +1,9 @@
/* $NetBSD: usbhid.c,v 1.14 2000/07/03 02:51:37 matt Exp $ */
/* $FreeBSD$ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/whereis/pathnames.h b/usr.bin/whereis/pathnames.h
index f5d27d1..c177720 100644
--- a/usr.bin/whereis/pathnames.h
+++ b/usr.bin/whereis/pathnames.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright © 2002, Jörg Wunsch
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/whereis/whereis.c b/usr.bin/whereis/whereis.c
index 3d85711..b9b8f78 100644
--- a/usr.bin/whereis/whereis.c
+++ b/usr.bin/whereis/whereis.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright © 2002, Jörg Wunsch
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/which/which.c b/usr.bin/which/which.c
index 0f4c1b4..abc23c8 100644
--- a/usr.bin/which/which.c
+++ b/usr.bin/which/which.c
@@ -1,4 +1,6 @@
-/**
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2000 Dan Papasian. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index 75493b1..6ad4f18 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c
index b729e36..bc2458a 100644
--- a/usr.bin/ypcat/ypcat.c
+++ b/usr.bin/ypcat/ypcat.c
@@ -1,6 +1,8 @@
/* $OpenBSD: ypcat.c,v 1.16 2015/02/08 23:40:35 deraadt Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1992, 1993, 1996 Theo de Raadt <deraadt@theos.com>
* All rights reserved.
*
diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index e1e209b..791a3e2 100644
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -1,7 +1,9 @@
/* $OpenBSD: ypmatch.c,v 1.16 2015/02/08 23:40:35 deraadt Exp $ */
/* $NetBSD: ypmatch.c,v 1.8 1996/05/07 01:24:52 jtc Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1992, 1993, 1996 Theo de Raadt <deraadt@theos.com>
* All rights reserved.
*
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index 55e1b13..9e752f3 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -1,7 +1,9 @@
/* $OpenBSD: ypwhich.c,v 1.23 2015/02/08 23:40:35 deraadt Exp $ */
/* $NetBSD: ypwhich.c,v 1.6 1996/05/13 02:43:48 thorpej Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1992, 1993 Theo de Raadt <deraadt@theos.com>
* All rights reserved.
*
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index f5d4bda..8e7ed24 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1994 Christopher G. Demetriou
* Copyright (c) 1994 Simon J. Gerraty
* Copyright (c) 2012 Ed Schouten <ed@FreeBSD.org>
diff --git a/usr.sbin/acpi/acpiconf/acpiconf.c b/usr.sbin/acpi/acpiconf/acpiconf.c
index 574d401..da82726 100644
--- a/usr.sbin/acpi/acpiconf/acpiconf.c
+++ b/usr.sbin/acpi/acpiconf/acpiconf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c
index 1f20cb5..96ef446 100644
--- a/usr.sbin/acpi/acpidb/acpidb.c
+++ b/usr.sbin/acpi/acpidb/acpidb.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2002 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c
index 44fa594..0854551 100644
--- a/usr.sbin/acpi/acpidump/acpi.c
+++ b/usr.sbin/acpi/acpidump/acpi.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Doug Rabson
* Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/acpi/acpidump/acpi_user.c b/usr.sbin/acpi/acpidump/acpi_user.c
index d759ea7..afdba12 100644
--- a/usr.sbin/acpi/acpidump/acpi_user.c
+++ b/usr.sbin/acpi/acpidump/acpi_user.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Doug Rabson
* Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/acpi/acpidump/acpidump.c b/usr.sbin/acpi/acpidump/acpidump.c
index b51810e..bc541e1 100644
--- a/usr.sbin/acpi/acpidump/acpidump.c
+++ b/usr.sbin/acpi/acpidump/acpidump.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/acpi/acpidump/acpidump.h b/usr.sbin/acpi/acpidump/acpidump.h
index 3421519..f717101 100644
--- a/usr.sbin/acpi/acpidump/acpidump.h
+++ b/usr.sbin/acpi/acpidump/acpidump.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Doug Rabson
* Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh
index 4b0a6f6..5f80d77 100644
--- a/usr.sbin/adduser/adduser.sh
+++ b/usr.sbin/adduser/adduser.sh
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2002-2004 Michael Telahun Makonnen. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/adduser/rmuser.sh b/usr.sbin/adduser/rmuser.sh
index 6b09225..abaf004 100644
--- a/usr.sbin/adduser/rmuser.sh
+++ b/usr.sbin/adduser/rmuser.sh
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2002, 2003 Michael Telahun Makonnen. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c
index d910c31..1d2a964 100644
--- a/usr.sbin/apmd/apmd.c
+++ b/usr.sbin/apmd/apmd.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* APM (Advanced Power Management) Event Dispatcher
*
* Copyright (c) 1999 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
diff --git a/usr.sbin/apmd/apmd.h b/usr.sbin/apmd/apmd.h
index d379feb..e56005e 100644
--- a/usr.sbin/apmd/apmd.h
+++ b/usr.sbin/apmd/apmd.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* APM (Advanced Power Management) Event Dispatcher
*
* Copyright (c) 1999 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
diff --git a/usr.sbin/apmd/apmdlex.l b/usr.sbin/apmd/apmdlex.l
index 6434966..05b929f 100644
--- a/usr.sbin/apmd/apmdlex.l
+++ b/usr.sbin/apmd/apmdlex.l
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* APM (Advanced Power Management) Event Dispatcher
*
* Copyright (c) 1999 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
diff --git a/usr.sbin/apmd/apmdparse.y b/usr.sbin/apmd/apmdparse.y
index 97abd28..6f13593 100644
--- a/usr.sbin/apmd/apmdparse.y
+++ b/usr.sbin/apmd/apmdparse.y
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* APM (Advanced Power Management) Event Dispatcher
*
* Copyright (c) 1999 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
diff --git a/usr.sbin/asf/asf.c b/usr.sbin/asf/asf.c
index c913e3d..3bcbb2d 100644
--- a/usr.sbin/asf/asf.c
+++ b/usr.sbin/asf/asf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002, 2003 Greg Lehey
* All rights reserved.
*
diff --git a/usr.sbin/asf/asf.h b/usr.sbin/asf/asf.h
index d034936..5f120a6 100644
--- a/usr.sbin/asf/asf.h
+++ b/usr.sbin/asf/asf.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 The FreeBSD Project
* All rights reserved.
*
diff --git a/usr.sbin/asf/asf_kld.c b/usr.sbin/asf/asf_kld.c
index f0bd699..6ce1502 100644
--- a/usr.sbin/asf/asf_kld.c
+++ b/usr.sbin/asf/asf_kld.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 The FreeBSD Project
* All rights reserved.
*
diff --git a/usr.sbin/asf/asf_kvm.c b/usr.sbin/asf/asf_kvm.c
index aa4effe..ba1558d 100644
--- a/usr.sbin/asf/asf_kvm.c
+++ b/usr.sbin/asf/asf_kvm.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 The FreeBSD Project
* All rights reserved.
*
diff --git a/usr.sbin/asf/asf_prog.c b/usr.sbin/asf/asf_prog.c
index 9a13cd6..25b9f1d 100644
--- a/usr.sbin/asf/asf_prog.c
+++ b/usr.sbin/asf/asf_prog.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002, 2003 Greg Lehey
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c
index 57fe783..87f7a92 100644
--- a/usr.sbin/bhyve/acpi.c
+++ b/usr.sbin/bhyve/acpi.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/acpi.h b/usr.sbin/bhyve/acpi.h
index 652164a..4c6d86d 100644
--- a/usr.sbin/bhyve/acpi.h
+++ b/usr.sbin/bhyve/acpi.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/ahci.h b/usr.sbin/bhyve/ahci.h
index 1fd9f20..1fd3bff 100644
--- a/usr.sbin/bhyve/ahci.h
+++ b/usr.sbin/bhyve/ahci.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* Copyright (c) 2009-2012 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
index a39d8a8..502a71d 100644
--- a/usr.sbin/bhyve/bhyverun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/bhyverun.h b/usr.sbin/bhyve/bhyverun.h
index 39e115d..fe4508e 100644
--- a/usr.sbin/bhyve/bhyverun.h
+++ b/usr.sbin/bhyve/bhyverun.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c
index 4688870..1defd40 100644
--- a/usr.sbin/bhyve/block_if.c
+++ b/usr.sbin/bhyve/block_if.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Peter Grehan <grehan@freebsd.org>
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/block_if.h b/usr.sbin/bhyve/block_if.h
index 8e63407..ee06492 100644
--- a/usr.sbin/bhyve/block_if.h
+++ b/usr.sbin/bhyve/block_if.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Peter Grehan <grehan@freebsd.org>
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/consport.c b/usr.sbin/bhyve/consport.c
index 5b76ade..12c452d 100644
--- a/usr.sbin/bhyve/consport.c
+++ b/usr.sbin/bhyve/consport.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/dbgport.c b/usr.sbin/bhyve/dbgport.c
index 94cfd34..b64488f 100644
--- a/usr.sbin/bhyve/dbgport.c
+++ b/usr.sbin/bhyve/dbgport.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/dbgport.h b/usr.sbin/bhyve/dbgport.h
index 2ddcbf8..407ff3f 100644
--- a/usr.sbin/bhyve/dbgport.h
+++ b/usr.sbin/bhyve/dbgport.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/inout.c b/usr.sbin/bhyve/inout.c
index 929bb3c..693c4fd 100644
--- a/usr.sbin/bhyve/inout.c
+++ b/usr.sbin/bhyve/inout.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/inout.h b/usr.sbin/bhyve/inout.h
index 7f39095..439fef8 100644
--- a/usr.sbin/bhyve/inout.h
+++ b/usr.sbin/bhyve/inout.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/ioapic.c b/usr.sbin/bhyve/ioapic.c
index 5ed08f9..acdbb51 100644
--- a/usr.sbin/bhyve/ioapic.c
+++ b/usr.sbin/bhyve/ioapic.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/ioapic.h b/usr.sbin/bhyve/ioapic.h
index 87773a8..3a7fa76 100644
--- a/usr.sbin/bhyve/ioapic.h
+++ b/usr.sbin/bhyve/ioapic.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/mem.c b/usr.sbin/bhyve/mem.c
index 2a9f430..e01d617 100644
--- a/usr.sbin/bhyve/mem.c
+++ b/usr.sbin/bhyve/mem.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/mem.h b/usr.sbin/bhyve/mem.h
index f671eae..f9f86fa 100644
--- a/usr.sbin/bhyve/mem.h
+++ b/usr.sbin/bhyve/mem.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/mevent.c b/usr.sbin/bhyve/mevent.c
index adc047d..00bf564 100644
--- a/usr.sbin/bhyve/mevent.c
+++ b/usr.sbin/bhyve/mevent.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/mevent.h b/usr.sbin/bhyve/mevent.h
index d6a59c6..e6b96f0 100644
--- a/usr.sbin/bhyve/mevent.h
+++ b/usr.sbin/bhyve/mevent.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/mevent_test.c b/usr.sbin/bhyve/mevent_test.c
index 9c68ff7..6cd5ac7 100644
--- a/usr.sbin/bhyve/mevent_test.c
+++ b/usr.sbin/bhyve/mevent_test.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/mptbl.c b/usr.sbin/bhyve/mptbl.c
index 904d103..afe06be 100644
--- a/usr.sbin/bhyve/mptbl.c
+++ b/usr.sbin/bhyve/mptbl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/mptbl.h b/usr.sbin/bhyve/mptbl.h
index e9e1c42..ebc8d85 100644
--- a/usr.sbin/bhyve/mptbl.h
+++ b/usr.sbin/bhyve/mptbl.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c
index 032241e..7ead45b 100644
--- a/usr.sbin/bhyve/pci_ahci.c
+++ b/usr.sbin/bhyve/pci_ahci.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Zhixiang Yu <zcore@freebsd.org>
* Copyright (c) 2015-2016 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c
index 7fcf7a4..eeb6871 100644
--- a/usr.sbin/bhyve/pci_emul.c
+++ b/usr.sbin/bhyve/pci_emul.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/pci_emul.h b/usr.sbin/bhyve/pci_emul.h
index 0fffb19..d0bd9c5 100644
--- a/usr.sbin/bhyve/pci_emul.h
+++ b/usr.sbin/bhyve/pci_emul.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/pci_hostbridge.c b/usr.sbin/bhyve/pci_hostbridge.c
index 5c9ea28..559496a 100644
--- a/usr.sbin/bhyve/pci_hostbridge.c
+++ b/usr.sbin/bhyve/pci_hostbridge.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/pci_lpc.c b/usr.sbin/bhyve/pci_lpc.c
index 2203a00..477eb18 100644
--- a/usr.sbin/bhyve/pci_lpc.c
+++ b/usr.sbin/bhyve/pci_lpc.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_lpc.h b/usr.sbin/bhyve/pci_lpc.h
index 431f5cf..8cab52f 100644
--- a/usr.sbin/bhyve/pci_lpc.h
+++ b/usr.sbin/bhyve/pci_lpc.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c
index f314679..51adc8b 100644
--- a/usr.sbin/bhyve/pci_passthru.c
+++ b/usr.sbin/bhyve/pci_passthru.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/pci_uart.c b/usr.sbin/bhyve/pci_uart.c
index 21b93bf..093d0cb 100644
--- a/usr.sbin/bhyve/pci_uart.c
+++ b/usr.sbin/bhyve/pci_uart.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/pci_virtio_block.c b/usr.sbin/bhyve/pci_virtio_block.c
index a437c1c..6a40985 100644
--- a/usr.sbin/bhyve/pci_virtio_block.c
+++ b/usr.sbin/bhyve/pci_virtio_block.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/pci_virtio_net.c b/usr.sbin/bhyve/pci_virtio_net.c
index c6104a6..f1d0919 100644
--- a/usr.sbin/bhyve/pci_virtio_net.c
+++ b/usr.sbin/bhyve/pci_virtio_net.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/pm.c b/usr.sbin/bhyve/pm.c
index f7c1c23..da62aa2 100644
--- a/usr.sbin/bhyve/pm.c
+++ b/usr.sbin/bhyve/pm.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/post.c b/usr.sbin/bhyve/post.c
index 5215a0c..d3040a8 100644
--- a/usr.sbin/bhyve/post.c
+++ b/usr.sbin/bhyve/post.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/rtc.c b/usr.sbin/bhyve/rtc.c
index 5c70154..73b5610 100644
--- a/usr.sbin/bhyve/rtc.c
+++ b/usr.sbin/bhyve/rtc.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/rtc.h b/usr.sbin/bhyve/rtc.h
index 5b08ca3..1c108ee 100644
--- a/usr.sbin/bhyve/rtc.h
+++ b/usr.sbin/bhyve/rtc.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Peter Grehan <grehan@freebsd.org>
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/smbiostbl.c b/usr.sbin/bhyve/smbiostbl.c
index 59a1358..f9ee3ad 100644
--- a/usr.sbin/bhyve/smbiostbl.c
+++ b/usr.sbin/bhyve/smbiostbl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/smbiostbl.h b/usr.sbin/bhyve/smbiostbl.h
index e8b3a4f..027f600 100644
--- a/usr.sbin/bhyve/smbiostbl.h
+++ b/usr.sbin/bhyve/smbiostbl.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/spinup_ap.c b/usr.sbin/bhyve/spinup_ap.c
index c597023..7c4186f 100644
--- a/usr.sbin/bhyve/spinup_ap.c
+++ b/usr.sbin/bhyve/spinup_ap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/spinup_ap.h b/usr.sbin/bhyve/spinup_ap.h
index 2749ee9..226542f 100644
--- a/usr.sbin/bhyve/spinup_ap.h
+++ b/usr.sbin/bhyve/spinup_ap.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/uart_emul.c b/usr.sbin/bhyve/uart_emul.c
index 063d131..8b73f5d 100644
--- a/usr.sbin/bhyve/uart_emul.c
+++ b/usr.sbin/bhyve/uart_emul.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 NetApp, Inc.
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/uart_emul.h b/usr.sbin/bhyve/uart_emul.h
index 993b92e..a87202d 100644
--- a/usr.sbin/bhyve/uart_emul.h
+++ b/usr.sbin/bhyve/uart_emul.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/virtio.c b/usr.sbin/bhyve/virtio.c
index 11b1e62..fc0525c 100644
--- a/usr.sbin/bhyve/virtio.c
+++ b/usr.sbin/bhyve/virtio.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Chris Torek <torek @ torek net>
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/virtio.h b/usr.sbin/bhyve/virtio.h
index ce40c7d..7b20877 100644
--- a/usr.sbin/bhyve/virtio.h
+++ b/usr.sbin/bhyve/virtio.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Chris Torek <torek @ torek net>
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/xmsr.c b/usr.sbin/bhyve/xmsr.c
index 5b7bfbb..b0aded5 100644
--- a/usr.sbin/bhyve/xmsr.c
+++ b/usr.sbin/bhyve/xmsr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyve/xmsr.h b/usr.sbin/bhyve/xmsr.h
index bcf65b7..1fb47c3 100644
--- a/usr.sbin/bhyve/xmsr.h
+++ b/usr.sbin/bhyve/xmsr.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c
index 40e5170..18a3bf1 100644
--- a/usr.sbin/bhyvectl/bhyvectl.c
+++ b/usr.sbin/bhyvectl/bhyvectl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c
index d6d9b0a..b49f203 100644
--- a/usr.sbin/bhyveload/bhyveload.c
+++ b/usr.sbin/bhyveload/bhyveload.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bcmfw/bcmfw.c b/usr.sbin/bluetooth/bcmfw/bcmfw.c
index 29d9996c..f385eae 100644
--- a/usr.sbin/bluetooth/bcmfw/bcmfw.c
+++ b/usr.sbin/bluetooth/bcmfw/bcmfw.c
@@ -1,6 +1,8 @@
-/*
+/*-
* bcmfw.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bt3cfw/bt3cfw.c b/usr.sbin/bluetooth/bt3cfw/bt3cfw.c
index fcc8d1d..a446b69 100644
--- a/usr.sbin/bluetooth/bt3cfw/bt3cfw.c
+++ b/usr.sbin/bluetooth/bt3cfw/bt3cfw.c
@@ -1,6 +1,8 @@
-/*
+/*-
* bt3cfw.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
index 0f795dd..c7b3a06 100644
--- a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
+++ b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
@@ -1,6 +1,8 @@
-/*
+/*-
* bthidcontrol.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h
index 50ed2fa..a35e070 100644
--- a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h
+++ b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h
@@ -1,6 +1,8 @@
-/*
+/*-
* bthidcontrol.h
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bthidcontrol/hid.c b/usr.sbin/bluetooth/bthidcontrol/hid.c
index e43ef6a..793d174 100644
--- a/usr.sbin/bluetooth/bthidcontrol/hid.c
+++ b/usr.sbin/bluetooth/bthidcontrol/hid.c
@@ -1,6 +1,8 @@
-/*
+/*-
* hid.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bthidcontrol/sdp.c b/usr.sbin/bluetooth/bthidcontrol/sdp.c
index 3beabc1..7c78d1f 100644
--- a/usr.sbin/bluetooth/bthidcontrol/sdp.c
+++ b/usr.sbin/bluetooth/bthidcontrol/sdp.c
@@ -1,6 +1,8 @@
-/*
+/*-
* sdp.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bthidd/bthid_config.h b/usr.sbin/bluetooth/bthidd/bthid_config.h
index 71cb425..6fa9064 100644
--- a/usr.sbin/bluetooth/bthidd/bthid_config.h
+++ b/usr.sbin/bluetooth/bthidd/bthid_config.h
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.c b/usr.sbin/bluetooth/bthidd/bthidd.c
index 7e988fc..501a5cf 100644
--- a/usr.sbin/bluetooth/bthidd/bthidd.c
+++ b/usr.sbin/bluetooth/bthidd/bthidd.c
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.h b/usr.sbin/bluetooth/bthidd/bthidd.h
index 3485fc3..9912c39 100644
--- a/usr.sbin/bluetooth/bthidd/bthidd.h
+++ b/usr.sbin/bluetooth/bthidd/bthidd.h
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bthidd/client.c b/usr.sbin/bluetooth/bthidd/client.c
index 5f01133..2a919be 100644
--- a/usr.sbin/bluetooth/bthidd/client.c
+++ b/usr.sbin/bluetooth/bthidd/client.c
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bthidd/hid.c b/usr.sbin/bluetooth/bthidd/hid.c
index 69a6fdc..317ced1 100644
--- a/usr.sbin/bluetooth/bthidd/hid.c
+++ b/usr.sbin/bluetooth/bthidd/hid.c
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bthidd/kbd.c b/usr.sbin/bluetooth/bthidd/kbd.c
index e946f01..c0f46df 100644
--- a/usr.sbin/bluetooth/bthidd/kbd.c
+++ b/usr.sbin/bluetooth/bthidd/kbd.c
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bthidd/kbd.h b/usr.sbin/bluetooth/bthidd/kbd.h
index 552f310..a13e0b0 100644
--- a/usr.sbin/bluetooth/bthidd/kbd.h
+++ b/usr.sbin/bluetooth/bthidd/kbd.h
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bthidd/lexer.l b/usr.sbin/bluetooth/bthidd/lexer.l
index 6d913ee..da7d3c8 100644
--- a/usr.sbin/bluetooth/bthidd/lexer.l
+++ b/usr.sbin/bluetooth/bthidd/lexer.l
@@ -4,6 +4,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bthidd/parser.y b/usr.sbin/bluetooth/bthidd/parser.y
index dbb2763..74f26e6 100644
--- a/usr.sbin/bluetooth/bthidd/parser.y
+++ b/usr.sbin/bluetooth/bthidd/parser.y
@@ -4,6 +4,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bthidd/server.c b/usr.sbin/bluetooth/bthidd/server.c
index 26aeb4a..5c1c3be 100644
--- a/usr.sbin/bluetooth/bthidd/server.c
+++ b/usr.sbin/bluetooth/bthidd/server.c
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/bthidd/session.c b/usr.sbin/bluetooth/bthidd/session.c
index 260cb86..ccdfcf5 100644
--- a/usr.sbin/bluetooth/bthidd/session.c
+++ b/usr.sbin/bluetooth/bthidd/session.c
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/btpand/bnep.c b/usr.sbin/bluetooth/btpand/bnep.c
index 3a2bc67..16a3faa 100644
--- a/usr.sbin/bluetooth/btpand/bnep.c
+++ b/usr.sbin/bluetooth/btpand/bnep.c
@@ -1,6 +1,8 @@
/* $NetBSD: bnep.c,v 1.1 2008/08/17 13:20:57 plunky Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2008 Iain Hibbert
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/btpand/bnep.h b/usr.sbin/bluetooth/btpand/bnep.h
index 2fc6a77..9fc6093 100644
--- a/usr.sbin/bluetooth/btpand/bnep.h
+++ b/usr.sbin/bluetooth/btpand/bnep.h
@@ -1,6 +1,8 @@
/* $NetBSD: bnep.h,v 1.1 2008/08/17 13:20:57 plunky Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2008 Iain Hibbert
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/btpand/btpand.c b/usr.sbin/bluetooth/btpand/btpand.c
index 4ab823c..e24152d 100644
--- a/usr.sbin/bluetooth/btpand/btpand.c
+++ b/usr.sbin/bluetooth/btpand/btpand.c
@@ -1,6 +1,8 @@
/* $NetBSD: btpand.c,v 1.1 2008/08/17 13:20:57 plunky Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2008 Iain Hibbert
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/btpand/btpand.h b/usr.sbin/bluetooth/btpand/btpand.h
index 3bcd1f7..566fac3 100644
--- a/usr.sbin/bluetooth/btpand/btpand.h
+++ b/usr.sbin/bluetooth/btpand/btpand.h
@@ -1,6 +1,8 @@
/* $NetBSD: btpand.h,v 1.1 2008/08/17 13:20:57 plunky Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2008 Iain Hibbert
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/btpand/channel.c b/usr.sbin/bluetooth/btpand/channel.c
index 32f2487..a8a0d6a 100644
--- a/usr.sbin/bluetooth/btpand/channel.c
+++ b/usr.sbin/bluetooth/btpand/channel.c
@@ -1,6 +1,8 @@
/* $NetBSD: channel.c,v 1.1 2008/08/17 13:20:57 plunky Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2008 Iain Hibbert
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/btpand/client.c b/usr.sbin/bluetooth/btpand/client.c
index f88dc6e..bf61dfc 100644
--- a/usr.sbin/bluetooth/btpand/client.c
+++ b/usr.sbin/bluetooth/btpand/client.c
@@ -1,6 +1,8 @@
/* $NetBSD: client.c,v 1.2 2008/12/06 20:01:14 plunky Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Iain Hibbert
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/btpand/event.c b/usr.sbin/bluetooth/btpand/event.c
index ac51f57..502b73e 100644
--- a/usr.sbin/bluetooth/btpand/event.c
+++ b/usr.sbin/bluetooth/btpand/event.c
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/btpand/event.h b/usr.sbin/bluetooth/btpand/event.h
index e53ba77..e70b7ce 100644
--- a/usr.sbin/bluetooth/btpand/event.h
+++ b/usr.sbin/bluetooth/btpand/event.h
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/btpand/packet.c b/usr.sbin/bluetooth/btpand/packet.c
index 21a563c..8e20696 100644
--- a/usr.sbin/bluetooth/btpand/packet.c
+++ b/usr.sbin/bluetooth/btpand/packet.c
@@ -1,6 +1,8 @@
/* $NetBSD: packet.c,v 1.1 2008/08/17 13:20:57 plunky Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2008 Iain Hibbert
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/btpand/sdp.c b/usr.sbin/bluetooth/btpand/sdp.c
index 3cad3f8..82fc5baaf 100644
--- a/usr.sbin/bluetooth/btpand/sdp.c
+++ b/usr.sbin/bluetooth/btpand/sdp.c
@@ -1,6 +1,8 @@
/* $NetBSD: sdp.c,v 1.2 2008/12/06 20:01:14 plunky Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2008 Iain Hibbert
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/btpand/sdp.h b/usr.sbin/bluetooth/btpand/sdp.h
index 32dd95d..a1a9758 100644
--- a/usr.sbin/bluetooth/btpand/sdp.h
+++ b/usr.sbin/bluetooth/btpand/sdp.h
@@ -1,6 +1,8 @@
/* $NetBSD: sdp.h,v 1.2 2008/12/06 20:01:15 plunky Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2008 Iain Hibbert
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/btpand/server.c b/usr.sbin/bluetooth/btpand/server.c
index b72b032..583017a 100644
--- a/usr.sbin/bluetooth/btpand/server.c
+++ b/usr.sbin/bluetooth/btpand/server.c
@@ -1,6 +1,8 @@
/* $NetBSD: server.c,v 1.2 2009/01/24 17:29:28 plunky Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2008 Iain Hibbert
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/btpand/tap.c b/usr.sbin/bluetooth/btpand/tap.c
index 644bf02..d9d9a3e 100644
--- a/usr.sbin/bluetooth/btpand/tap.c
+++ b/usr.sbin/bluetooth/btpand/tap.c
@@ -1,6 +1,8 @@
/* $NetBSD: tap.c,v 1.1 2008/08/17 13:20:57 plunky Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2008 Iain Hibbert
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/hccontrol/hccontrol.c b/usr.sbin/bluetooth/hccontrol/hccontrol.c
index b72854f..4aaabe1 100644
--- a/usr.sbin/bluetooth/hccontrol/hccontrol.c
+++ b/usr.sbin/bluetooth/hccontrol/hccontrol.c
@@ -1,6 +1,8 @@
-/*
+/*-
* hccontrol.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/hccontrol/hccontrol.h b/usr.sbin/bluetooth/hccontrol/hccontrol.h
index c96aab0..baf7c01a 100644
--- a/usr.sbin/bluetooth/hccontrol/hccontrol.h
+++ b/usr.sbin/bluetooth/hccontrol/hccontrol.h
@@ -1,6 +1,8 @@
-/*
+/*-
* hccontrol.h
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c b/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
index 532ca1c..9476be2 100644
--- a/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
+++ b/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
@@ -1,6 +1,8 @@
-/*
+/*-
* host_controller_baseband.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/hccontrol/info.c b/usr.sbin/bluetooth/hccontrol/info.c
index ee9d1a1..1d0b7b9 100644
--- a/usr.sbin/bluetooth/hccontrol/info.c
+++ b/usr.sbin/bluetooth/hccontrol/info.c
@@ -1,6 +1,8 @@
-/*
+/*-
* info.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/hccontrol/link_control.c b/usr.sbin/bluetooth/hccontrol/link_control.c
index a55426c..586246c 100644
--- a/usr.sbin/bluetooth/hccontrol/link_control.c
+++ b/usr.sbin/bluetooth/hccontrol/link_control.c
@@ -1,6 +1,8 @@
-/*
+/*-
* link_control.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/hccontrol/link_policy.c b/usr.sbin/bluetooth/hccontrol/link_policy.c
index 8142b23..52e02e3 100644
--- a/usr.sbin/bluetooth/hccontrol/link_policy.c
+++ b/usr.sbin/bluetooth/hccontrol/link_policy.c
@@ -1,6 +1,8 @@
-/*
+/*-
* link_policy.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/hccontrol/node.c b/usr.sbin/bluetooth/hccontrol/node.c
index f1f2694..c730c33 100644
--- a/usr.sbin/bluetooth/hccontrol/node.c
+++ b/usr.sbin/bluetooth/hccontrol/node.c
@@ -1,6 +1,8 @@
-/*
+/*-
* node.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/hccontrol/send_recv.c b/usr.sbin/bluetooth/hccontrol/send_recv.c
index 5c2aea9..dd9a7aa 100644
--- a/usr.sbin/bluetooth/hccontrol/send_recv.c
+++ b/usr.sbin/bluetooth/hccontrol/send_recv.c
@@ -1,6 +1,8 @@
-/*
+/*-
* send_recv.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/hccontrol/status.c b/usr.sbin/bluetooth/hccontrol/status.c
index 3364576..fe5dfb7 100644
--- a/usr.sbin/bluetooth/hccontrol/status.c
+++ b/usr.sbin/bluetooth/hccontrol/status.c
@@ -1,6 +1,8 @@
-/*
+/*-
* status.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/hccontrol/util.c b/usr.sbin/bluetooth/hccontrol/util.c
index 1b05170..8b627e1 100644
--- a/usr.sbin/bluetooth/hccontrol/util.c
+++ b/usr.sbin/bluetooth/hccontrol/util.c
@@ -1,6 +1,8 @@
-/*
+/*-
* util.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.c b/usr.sbin/bluetooth/hcsecd/hcsecd.c
index 15b5ca4..160b77e 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.c
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.c
@@ -1,6 +1,8 @@
-/*
+/*-
* hcsecd.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.h b/usr.sbin/bluetooth/hcsecd/hcsecd.h
index acfc887..1500c00 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.h
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.h
@@ -1,6 +1,8 @@
-/*
+/*-
* hcsecd.h
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/hcsecd/lexer.l b/usr.sbin/bluetooth/hcsecd/lexer.l
index 578b42f..d2fecc4 100644
--- a/usr.sbin/bluetooth/hcsecd/lexer.l
+++ b/usr.sbin/bluetooth/hcsecd/lexer.l
@@ -1,7 +1,9 @@
%{
-/*
+/*-
* lexer.l
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/hcsecd/parser.y b/usr.sbin/bluetooth/hcsecd/parser.y
index cfaeb02..3ff9bac 100644
--- a/usr.sbin/bluetooth/hcsecd/parser.y
+++ b/usr.sbin/bluetooth/hcsecd/parser.y
@@ -1,7 +1,9 @@
%{
-/*
+/*-
* parser.y
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/hcseriald/hcseriald.c b/usr.sbin/bluetooth/hcseriald/hcseriald.c
index 440b0d4..3d2fc60 100644
--- a/usr.sbin/bluetooth/hcseriald/hcseriald.c
+++ b/usr.sbin/bluetooth/hcseriald/hcseriald.c
@@ -1,6 +1,8 @@
-/*
+/*-
* hcseriald.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/l2control/l2cap.c b/usr.sbin/bluetooth/l2control/l2cap.c
index 44009ef..cc92c77 100644
--- a/usr.sbin/bluetooth/l2control/l2cap.c
+++ b/usr.sbin/bluetooth/l2control/l2cap.c
@@ -1,6 +1,8 @@
-/*
+/*-
* l2cap.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/l2control/l2control.c b/usr.sbin/bluetooth/l2control/l2control.c
index 87ec237..a8dceb1 100644
--- a/usr.sbin/bluetooth/l2control/l2control.c
+++ b/usr.sbin/bluetooth/l2control/l2control.c
@@ -1,6 +1,8 @@
-/*
+/*-
* l2control.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/l2control/l2control.h b/usr.sbin/bluetooth/l2control/l2control.h
index 43d4561..00eeef5 100644
--- a/usr.sbin/bluetooth/l2control/l2control.h
+++ b/usr.sbin/bluetooth/l2control/l2control.h
@@ -1,6 +1,8 @@
-/*
+/*-
* l2control.h
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/l2ping/l2ping.c b/usr.sbin/bluetooth/l2ping/l2ping.c
index 92e7a0a..49e9005 100644
--- a/usr.sbin/bluetooth/l2ping/l2ping.c
+++ b/usr.sbin/bluetooth/l2ping/l2ping.c
@@ -1,6 +1,8 @@
-/*
+/*-
* l2ping.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
index e970fb0..b107772 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
+++ b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2008 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
index 65ee3d0..8a3c4d3 100644
--- a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
+++ b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
@@ -1,6 +1,8 @@
-/*
+/*-
* sdpcontrol.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h
index 4a1ee76f..ec0c829 100644
--- a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h
+++ b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h
@@ -1,6 +1,8 @@
-/*
+/*-
* sdpcontrol.h
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpcontrol/search.c b/usr.sbin/bluetooth/sdpcontrol/search.c
index 6a2808c..1d143e0 100644
--- a/usr.sbin/bluetooth/sdpcontrol/search.c
+++ b/usr.sbin/bluetooth/sdpcontrol/search.c
@@ -1,6 +1,8 @@
-/*
+/*-
* search.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/bgd.c b/usr.sbin/bluetooth/sdpd/bgd.c
index 2c4e4d9..75306ce 100644
--- a/usr.sbin/bluetooth/sdpd/bgd.c
+++ b/usr.sbin/bluetooth/sdpd/bgd.c
@@ -1,6 +1,8 @@
-/*
+/*-
* bgd.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/dun.c b/usr.sbin/bluetooth/sdpd/dun.c
index 1496285..8c21604 100644
--- a/usr.sbin/bluetooth/sdpd/dun.c
+++ b/usr.sbin/bluetooth/sdpd/dun.c
@@ -1,6 +1,8 @@
-/*
+/*-
* dun.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/ftrn.c b/usr.sbin/bluetooth/sdpd/ftrn.c
index bc1095e..23cfab4 100644
--- a/usr.sbin/bluetooth/sdpd/ftrn.c
+++ b/usr.sbin/bluetooth/sdpd/ftrn.c
@@ -1,6 +1,8 @@
-/*
+/*-
* ftrn.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/gn.c b/usr.sbin/bluetooth/sdpd/gn.c
index c2bea48..894701b 100644
--- a/usr.sbin/bluetooth/sdpd/gn.c
+++ b/usr.sbin/bluetooth/sdpd/gn.c
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/irmc.c b/usr.sbin/bluetooth/sdpd/irmc.c
index 2b8f317..ee91335 100644
--- a/usr.sbin/bluetooth/sdpd/irmc.c
+++ b/usr.sbin/bluetooth/sdpd/irmc.c
@@ -1,6 +1,8 @@
-/*
+/*-
* irmc.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/irmc_command.c b/usr.sbin/bluetooth/sdpd/irmc_command.c
index a55e133..3b7e38b 100644
--- a/usr.sbin/bluetooth/sdpd/irmc_command.c
+++ b/usr.sbin/bluetooth/sdpd/irmc_command.c
@@ -1,6 +1,8 @@
-/*
+/*-
* irmc_command_command_command.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/lan.c b/usr.sbin/bluetooth/sdpd/lan.c
index 3ed2b12..86ef71f 100644
--- a/usr.sbin/bluetooth/sdpd/lan.c
+++ b/usr.sbin/bluetooth/sdpd/lan.c
@@ -1,6 +1,8 @@
-/*
+/*-
* lan.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/log.c b/usr.sbin/bluetooth/sdpd/log.c
index b03f7e1..98d3526 100644
--- a/usr.sbin/bluetooth/sdpd/log.c
+++ b/usr.sbin/bluetooth/sdpd/log.c
@@ -1,6 +1,8 @@
-/*
+/*-
* log.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/log.h b/usr.sbin/bluetooth/sdpd/log.h
index 8c9ce77..b2c780e 100644
--- a/usr.sbin/bluetooth/sdpd/log.h
+++ b/usr.sbin/bluetooth/sdpd/log.h
@@ -1,6 +1,8 @@
-/*
+/*-
* log.h
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/main.c b/usr.sbin/bluetooth/sdpd/main.c
index a287b9b..a041795 100644
--- a/usr.sbin/bluetooth/sdpd/main.c
+++ b/usr.sbin/bluetooth/sdpd/main.c
@@ -1,6 +1,8 @@
-/*
+/*-
* main.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/nap.c b/usr.sbin/bluetooth/sdpd/nap.c
index c034ee6..16054af 100644
--- a/usr.sbin/bluetooth/sdpd/nap.c
+++ b/usr.sbin/bluetooth/sdpd/nap.c
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/opush.c b/usr.sbin/bluetooth/sdpd/opush.c
index bcdfda2..91e08af 100644
--- a/usr.sbin/bluetooth/sdpd/opush.c
+++ b/usr.sbin/bluetooth/sdpd/opush.c
@@ -1,6 +1,8 @@
-/*
+/*-
* opush.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/panu.c b/usr.sbin/bluetooth/sdpd/panu.c
index 5b2773e..353c287 100644
--- a/usr.sbin/bluetooth/sdpd/panu.c
+++ b/usr.sbin/bluetooth/sdpd/panu.c
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/profile.c b/usr.sbin/bluetooth/sdpd/profile.c
index 5c25d03..d2be21e 100644
--- a/usr.sbin/bluetooth/sdpd/profile.c
+++ b/usr.sbin/bluetooth/sdpd/profile.c
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/profile.h b/usr.sbin/bluetooth/sdpd/profile.h
index 0b0d86d..82e0e37 100644
--- a/usr.sbin/bluetooth/sdpd/profile.h
+++ b/usr.sbin/bluetooth/sdpd/profile.h
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/provider.c b/usr.sbin/bluetooth/sdpd/provider.c
index 0243305..532cdac 100644
--- a/usr.sbin/bluetooth/sdpd/provider.c
+++ b/usr.sbin/bluetooth/sdpd/provider.c
@@ -1,6 +1,8 @@
-/*
+/*-
* provider.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/provider.h b/usr.sbin/bluetooth/sdpd/provider.h
index b48bc8d..6f6bed3 100644
--- a/usr.sbin/bluetooth/sdpd/provider.h
+++ b/usr.sbin/bluetooth/sdpd/provider.h
@@ -1,6 +1,8 @@
-/*
+/*-
* provider.h
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/sar.c b/usr.sbin/bluetooth/sdpd/sar.c
index 705f716..ce91191 100644
--- a/usr.sbin/bluetooth/sdpd/sar.c
+++ b/usr.sbin/bluetooth/sdpd/sar.c
@@ -1,6 +1,8 @@
-/*
+/*-
* sar.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/scr.c b/usr.sbin/bluetooth/sdpd/scr.c
index 1df72d1..b344291 100644
--- a/usr.sbin/bluetooth/sdpd/scr.c
+++ b/usr.sbin/bluetooth/sdpd/scr.c
@@ -1,6 +1,8 @@
-/*
+/*-
* scr.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/sd.c b/usr.sbin/bluetooth/sdpd/sd.c
index c5397ce..e69e336 100644
--- a/usr.sbin/bluetooth/sdpd/sd.c
+++ b/usr.sbin/bluetooth/sdpd/sd.c
@@ -1,6 +1,8 @@
-/*
+/*-
* sd.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/server.c b/usr.sbin/bluetooth/sdpd/server.c
index abd1815..6910807 100644
--- a/usr.sbin/bluetooth/sdpd/server.c
+++ b/usr.sbin/bluetooth/sdpd/server.c
@@ -1,6 +1,8 @@
-/*
+/*-
* server.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/server.h b/usr.sbin/bluetooth/sdpd/server.h
index d7ef55e..01629e8 100644
--- a/usr.sbin/bluetooth/sdpd/server.h
+++ b/usr.sbin/bluetooth/sdpd/server.h
@@ -1,6 +1,8 @@
-/*
+/*-
* server.h
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/sp.c b/usr.sbin/bluetooth/sdpd/sp.c
index 48edc77..a909cd1 100644
--- a/usr.sbin/bluetooth/sdpd/sp.c
+++ b/usr.sbin/bluetooth/sdpd/sp.c
@@ -1,6 +1,8 @@
-/*
+/*-
* sp.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/srr.c b/usr.sbin/bluetooth/sdpd/srr.c
index 60f48ca..4f031f5 100644
--- a/usr.sbin/bluetooth/sdpd/srr.c
+++ b/usr.sbin/bluetooth/sdpd/srr.c
@@ -1,6 +1,8 @@
-/*
+/*-
* srr.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/ssar.c b/usr.sbin/bluetooth/sdpd/ssar.c
index 5e52e80..6e84ab2 100644
--- a/usr.sbin/bluetooth/sdpd/ssar.c
+++ b/usr.sbin/bluetooth/sdpd/ssar.c
@@ -1,6 +1,8 @@
-/*
+/*-
* ssar.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/ssr.c b/usr.sbin/bluetooth/sdpd/ssr.c
index 785c8ca..939283d 100644
--- a/usr.sbin/bluetooth/sdpd/ssr.c
+++ b/usr.sbin/bluetooth/sdpd/ssr.c
@@ -1,6 +1,8 @@
-/*
+/*-
* ssr.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/sur.c b/usr.sbin/bluetooth/sdpd/sur.c
index 581b593..ca561f6 100644
--- a/usr.sbin/bluetooth/sdpd/sur.c
+++ b/usr.sbin/bluetooth/sdpd/sur.c
@@ -1,6 +1,8 @@
-/*
+/*-
* sur.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/uuid-private.h b/usr.sbin/bluetooth/sdpd/uuid-private.h
index db8d13b..7f3d299 100644
--- a/usr.sbin/bluetooth/sdpd/uuid-private.h
+++ b/usr.sbin/bluetooth/sdpd/uuid-private.h
@@ -1,6 +1,8 @@
-/*
+/*-
* uuid-private.h
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/bluetooth/sdpd/uuid.c b/usr.sbin/bluetooth/sdpd/uuid.c
index dff8d2c..3d41ea3 100644
--- a/usr.sbin/bluetooth/sdpd/uuid.c
+++ b/usr.sbin/bluetooth/sdpd/uuid.c
@@ -1,6 +1,8 @@
-/*
+/*-
* uuid.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.sbin/boot0cfg/boot0cfg.c b/usr.sbin/boot0cfg/boot0cfg.c
index 9670af9..501283d 100644
--- a/usr.sbin/boot0cfg/boot0cfg.c
+++ b/usr.sbin/boot0cfg/boot0cfg.c
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Luigi Rizzo
* Copyright (c) 1999 Robert Nordier
* All rights reserved.
diff --git a/usr.sbin/bsdinstall/distextract/distextract.c b/usr.sbin/bsdinstall/distextract/distextract.c
index 94536bc..95287a5 100644
--- a/usr.sbin/bsdinstall/distextract/distextract.c
+++ b/usr.sbin/bsdinstall/distextract/distextract.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Nathan Whitehorn
* Copyright (c) 2014 Devin Teske <dteske@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bsdinstall/distfetch/distfetch.c b/usr.sbin/bsdinstall/distfetch/distfetch.c
index 219847d..5f26234 100644
--- a/usr.sbin/bsdinstall/distfetch/distfetch.c
+++ b/usr.sbin/bsdinstall/distfetch/distfetch.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Nathan Whitehorn
* Copyright (c) 2014 Devin Teske <dteske@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bsdinstall/partedit/diskeditor.c b/usr.sbin/bsdinstall/partedit/diskeditor.c
index 4840ae7..1679def 100644
--- a/usr.sbin/bsdinstall/partedit/diskeditor.c
+++ b/usr.sbin/bsdinstall/partedit/diskeditor.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/usr.sbin/bsdinstall/partedit/diskeditor.h b/usr.sbin/bsdinstall/partedit/diskeditor.h
index f122267..186dc31 100644
--- a/usr.sbin/bsdinstall/partedit/diskeditor.h
+++ b/usr.sbin/bsdinstall/partedit/diskeditor.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c
index 59d0de5..76823cf 100644
--- a/usr.sbin/bsdinstall/partedit/gpart_ops.c
+++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/usr.sbin/bsdinstall/partedit/part_wizard.c b/usr.sbin/bsdinstall/partedit/part_wizard.c
index 0724e25..f1df461 100644
--- a/usr.sbin/bsdinstall/partedit/part_wizard.c
+++ b/usr.sbin/bsdinstall/partedit/part_wizard.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c
index 6723af5..80430c6 100644
--- a/usr.sbin/bsdinstall/partedit/partedit.c
+++ b/usr.sbin/bsdinstall/partedit/partedit.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/usr.sbin/bsdinstall/partedit/partedit.h b/usr.sbin/bsdinstall/partedit/partedit.h
index 3eb9173..d25b730 100644
--- a/usr.sbin/bsdinstall/partedit/partedit.h
+++ b/usr.sbin/bsdinstall/partedit/partedit.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/usr.sbin/bsdinstall/partedit/partedit_generic.c b/usr.sbin/bsdinstall/partedit/partedit_generic.c
index ceee95a..b83ceee 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_generic.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_generic.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/usr.sbin/bsdinstall/partedit/partedit_powerpc.c b/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
index 6a5dbb2..b3928a8 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/usr.sbin/bsdinstall/partedit/partedit_sparc64.c b/usr.sbin/bsdinstall/partedit/partedit_sparc64.c
index c420f6a..ab943ae 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_sparc64.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_sparc64.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/usr.sbin/bsdinstall/partedit/partedit_x86.c b/usr.sbin/bsdinstall/partedit/partedit_x86.c
index a5f65ba..0197531 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_x86.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_x86.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
diff --git a/usr.sbin/bsdinstall/partedit/scripted.c b/usr.sbin/bsdinstall/partedit/scripted.c
index 876df54..ec7cd05 100644
--- a/usr.sbin/bsdinstall/partedit/scripted.c
+++ b/usr.sbin/bsdinstall/partedit/scripted.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Nathan Whitehorn
* All rights reserved.
*
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
index 33de19f..c4e969b 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Shteryana Shopova <syrinx@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
index fd7fba0..5644d9e 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Shteryana Shopova <syrinx@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c
index 0ad8cbf..8c07d33 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Shteryana Shopova <syrinx@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
index cbb8dc8..b948236 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Shteryana Shopova <syrinx@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c
index 81acc4d..cf8b362 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Shteryana Shopova <syrinx@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h
index 7f48950..0f5dd34 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Shteryana Shopova <syrinx@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
index eaf344b..4eff1f3 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Shteryana Shopova <syrinx@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c b/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
index 210db9e..402a878 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Mikolaj Golub <trociny@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
index d8206ca..9666b01 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Philip Paeps <philip@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c
index 92091f0..09f6a86 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h
index de6587f..d72db29 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c
index 9db30ae..93e2566 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/usr.sbin/btxld/btx.h b/usr.sbin/btxld/btx.h
index 86f0ede..54b165a 100644
--- a/usr.sbin/btxld/btx.h
+++ b/usr.sbin/btxld/btx.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Robert Nordier
* All rights reserved.
*
diff --git a/usr.sbin/btxld/btxld.c b/usr.sbin/btxld/btxld.c
index c2f4b5b..d18c9fc 100644
--- a/usr.sbin/btxld/btxld.c
+++ b/usr.sbin/btxld/btxld.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Robert Nordier
* All rights reserved.
*
diff --git a/usr.sbin/btxld/elfh.c b/usr.sbin/btxld/elfh.c
index 2790d5a..115329e 100644
--- a/usr.sbin/btxld/elfh.c
+++ b/usr.sbin/btxld/elfh.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Robert Nordier
* All rights reserved.
*
diff --git a/usr.sbin/btxld/elfh.h b/usr.sbin/btxld/elfh.h
index a4ab134..03b7d95 100644
--- a/usr.sbin/btxld/elfh.h
+++ b/usr.sbin/btxld/elfh.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Robert Nordier
* All rights reserved.
*
diff --git a/usr.sbin/chkgrp/chkgrp.c b/usr.sbin/chkgrp/chkgrp.c
index 81cb83b..06e78d4 100644
--- a/usr.sbin/chkgrp/chkgrp.c
+++ b/usr.sbin/chkgrp/chkgrp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
diff --git a/usr.sbin/ckdist/ckdist.c b/usr.sbin/ckdist/ckdist.c
index dcaa9f3..22bd048 100644
--- a/usr.sbin/ckdist/ckdist.c
+++ b/usr.sbin/ckdist/ckdist.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Robert Nordier
* All rights reserved.
*
diff --git a/usr.sbin/clear_locks/clear_locks.c b/usr.sbin/clear_locks/clear_locks.c
index 1249c12..af4132c 100644
--- a/usr.sbin/clear_locks/clear_locks.c
+++ b/usr.sbin/clear_locks/clear_locks.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
diff --git a/usr.sbin/cpucontrol/amd.c b/usr.sbin/cpucontrol/amd.c
index 3ba435c..a875afd 100644
--- a/usr.sbin/cpucontrol/amd.c
+++ b/usr.sbin/cpucontrol/amd.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006, 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.sbin/cpucontrol/amd.h b/usr.sbin/cpucontrol/amd.h
index 64eb352..dd83687 100644
--- a/usr.sbin/cpucontrol/amd.h
+++ b/usr.sbin/cpucontrol/amd.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006, 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.sbin/cpucontrol/cpucontrol.c b/usr.sbin/cpucontrol/cpucontrol.c
index 554395c..b20247d 100644
--- a/usr.sbin/cpucontrol/cpucontrol.c
+++ b/usr.sbin/cpucontrol/cpucontrol.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008-2011 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.sbin/cpucontrol/cpucontrol.h b/usr.sbin/cpucontrol/cpucontrol.h
index 63d3995..555e931 100644
--- a/usr.sbin/cpucontrol/cpucontrol.h
+++ b/usr.sbin/cpucontrol/cpucontrol.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.sbin/cpucontrol/intel.c b/usr.sbin/cpucontrol/intel.c
index 557cbac..7eca224 100644
--- a/usr.sbin/cpucontrol/intel.c
+++ b/usr.sbin/cpucontrol/intel.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006, 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.sbin/cpucontrol/intel.h b/usr.sbin/cpucontrol/intel.h
index 0303e69..a30fc50 100644
--- a/usr.sbin/cpucontrol/intel.h
+++ b/usr.sbin/cpucontrol/intel.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006, 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.sbin/cpucontrol/via.c b/usr.sbin/cpucontrol/via.c
index 8985ae6..354817e 100644
--- a/usr.sbin/cpucontrol/via.c
+++ b/usr.sbin/cpucontrol/via.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Fabien Thomas <fabient@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.sbin/cpucontrol/via.h b/usr.sbin/cpucontrol/via.h
index ea99eac..4427ff3 100644
--- a/usr.sbin/cpucontrol/via.h
+++ b/usr.sbin/cpucontrol/via.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Fabien Thomas <fabient@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.sbin/crunch/crunchide/exec_elf32.c b/usr.sbin/crunch/crunchide/exec_elf32.c
index 9aa29fd..d42172f 100644
--- a/usr.sbin/crunch/crunchide/exec_elf32.c
+++ b/usr.sbin/crunch/crunchide/exec_elf32.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997 Christopher G. Demetriou. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/crunch/crunchide/exec_elf64.c b/usr.sbin/crunch/crunchide/exec_elf64.c
index 962cc07..c447116 100644
--- a/usr.sbin/crunch/crunchide/exec_elf64.c
+++ b/usr.sbin/crunch/crunchide/exec_elf64.c
@@ -1,6 +1,8 @@
/* $NetBSD: exec_elf64.c,v 1.2 1997/08/02 21:30:19 perry Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997 Christopher G. Demetriou. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -34,6 +36,7 @@
#ifndef lint
__IDSTRING(elf64rcsid, "$NetBSD: exec_elf64.c,v 1.2 1997/08/02 21:30:19 perry Exp $");
#endif
+__FBSDID("$FreeBSD$");
#define ELFSIZE 64
diff --git a/usr.sbin/crunch/crunchide/extern.h b/usr.sbin/crunch/crunchide/extern.h
index 1e7809a..b5f9165 100644
--- a/usr.sbin/crunch/crunchide/extern.h
+++ b/usr.sbin/crunch/crunchide/extern.h
@@ -1,7 +1,9 @@
/* $NetBSD: extern.h,v 1.5 1998/05/06 13:16:57 mycroft Exp $ */
/* $FreeBSD$ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997 Christopher G. Demetriou. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/ctladm/ctladm.h b/usr.sbin/ctladm/ctladm.h
index b2e9f12..ce945ec 100644
--- a/usr.sbin/ctladm/ctladm.h
+++ b/usr.sbin/ctladm/ctladm.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/usr.sbin/ctladm/util.c b/usr.sbin/ctladm/util.c
index 52d8d17..60293e4 100644
--- a/usr.sbin/ctladm/util.c
+++ b/usr.sbin/ctladm/util.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Written By Julian ELischer
* Copyright julian Elischer 1993.
* Permission is granted to use or redistribute this file in any way as long
diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c
index 95294b0..8bc4e9d 100644
--- a/usr.sbin/ctld/ctld.c
+++ b/usr.sbin/ctld/ctld.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/ctld/ctld.h b/usr.sbin/ctld/ctld.h
index b6175d1..dc5a006 100644
--- a/usr.sbin/ctld/ctld.h
+++ b/usr.sbin/ctld/ctld.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/ctld/discovery.c b/usr.sbin/ctld/discovery.c
index c5aea6f..1f8c9c8 100644
--- a/usr.sbin/ctld/discovery.c
+++ b/usr.sbin/ctld/discovery.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c
index e7f92ef..2302e01 100644
--- a/usr.sbin/ctld/kernel.c
+++ b/usr.sbin/ctld/kernel.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003, 2004 Silicon Graphics International Corp.
* Copyright (c) 1997-2007 Kenneth D. Merry
* Copyright (c) 2012 The FreeBSD Foundation
diff --git a/usr.sbin/ctld/keys.c b/usr.sbin/ctld/keys.c
index a3b12f0..bcd3cbd 100644
--- a/usr.sbin/ctld/keys.c
+++ b/usr.sbin/ctld/keys.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/ctld/log.c b/usr.sbin/ctld/log.c
index ed66c31..481134e 100644
--- a/usr.sbin/ctld/log.c
+++ b/usr.sbin/ctld/log.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/ctld/login.c b/usr.sbin/ctld/login.c
index 5216c7e..79e16e9 100644
--- a/usr.sbin/ctld/login.c
+++ b/usr.sbin/ctld/login.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/ctld/parse.y b/usr.sbin/ctld/parse.y
index dc7ff71..3d8f2fc 100644
--- a/usr.sbin/ctld/parse.y
+++ b/usr.sbin/ctld/parse.y
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/ctld/pdu.c b/usr.sbin/ctld/pdu.c
index 2d4fcc6..44803e9 100644
--- a/usr.sbin/ctld/pdu.c
+++ b/usr.sbin/ctld/pdu.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/ctld/token.l b/usr.sbin/ctld/token.l
index e8cbf3b..8691c7c 100644
--- a/usr.sbin/ctld/token.l
+++ b/usr.sbin/ctld/token.l
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c b/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c
index 2dd6e86..ac56847 100644
--- a/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c
+++ b/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996, Gary J. Palmer
* All rights reserved.
*
diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c
index e09315f..9018d8a 100644
--- a/usr.sbin/daemon/daemon.c
+++ b/usr.sbin/daemon/daemon.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c
index 734d563..68804bc 100644
--- a/usr.sbin/devinfo/devinfo.c
+++ b/usr.sbin/devinfo/devinfo.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000, 2001 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
diff --git a/usr.sbin/digictl/digictl.c b/usr.sbin/digictl/digictl.c
index 0aa5f68..ea25249 100644
--- a/usr.sbin/digictl/digictl.c
+++ b/usr.sbin/digictl/digictl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/diskinfo/diskinfo.c b/usr.sbin/diskinfo/diskinfo.c
index e3378a3..00dd968 100644
--- a/usr.sbin/diskinfo/diskinfo.c
+++ b/usr.sbin/diskinfo/diskinfo.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003 Poul-Henning Kamp
* Copyright (c) 2015 Spectra Logic Corporation
* Copyright (c) 2017 Alexander Motin <mav@FreeBSD.org>
diff --git a/usr.sbin/dumpcis/cardinfo.h b/usr.sbin/dumpcis/cardinfo.h
index 9489067..5cd810d 100644
--- a/usr.sbin/dumpcis/cardinfo.h
+++ b/usr.sbin/dumpcis/cardinfo.h
@@ -4,6 +4,8 @@
*-------------------------------------------------------------------------
*/
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 Andrew McRae. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/dumpcis/cis.h b/usr.sbin/dumpcis/cis.h
index 6cc935b..e511a85 100644
--- a/usr.sbin/dumpcis/cis.h
+++ b/usr.sbin/dumpcis/cis.h
@@ -6,6 +6,8 @@
*-------------------------------------------------------------------------
*/
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 Andrew McRae. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/dumpcis/main.c b/usr.sbin/dumpcis/main.c
index 2e66506..ab5563c 100644
--- a/usr.sbin/dumpcis/main.c
+++ b/usr.sbin/dumpcis/main.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/dumpcis/printcis.c b/usr.sbin/dumpcis/printcis.c
index ff2ac90..82f894d 100644
--- a/usr.sbin/dumpcis/printcis.c
+++ b/usr.sbin/dumpcis/printcis.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 Andrew McRae. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/dumpcis/readcis.c b/usr.sbin/dumpcis/readcis.c
index 25bd396..7192f67 100644
--- a/usr.sbin/dumpcis/readcis.c
+++ b/usr.sbin/dumpcis/readcis.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 Andrew McRae. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/dumpcis/readcis.h b/usr.sbin/dumpcis/readcis.h
index 8fc2e2d..397587d 100644
--- a/usr.sbin/dumpcis/readcis.h
+++ b/usr.sbin/dumpcis/readcis.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 Andrew McRae. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/eeprom/eeprom.c b/usr.sbin/eeprom/eeprom.c
index 30c1a93..b6fef59 100644
--- a/usr.sbin/eeprom/eeprom.c
+++ b/usr.sbin/eeprom/eeprom.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1996 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/eeprom/ofw_options.c b/usr.sbin/eeprom/ofw_options.c
index 6e6aa85..3b9e312 100644
--- a/usr.sbin/eeprom/ofw_options.c
+++ b/usr.sbin/eeprom/ofw_options.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marius Strobl
* All rights reserved.
*
diff --git a/usr.sbin/eeprom/ofw_options.h b/usr.sbin/eeprom/ofw_options.h
index 5bc6656..41b2640 100644
--- a/usr.sbin/eeprom/ofw_options.h
+++ b/usr.sbin/eeprom/ofw_options.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marius Strobl
* All rights reserved.
*
diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh
index 2b4c145..97a4c50 100755
--- a/usr.sbin/etcupdate/etcupdate.sh
+++ b/usr.sbin/etcupdate/etcupdate.sh
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010-2013 Hudson River Trading LLC
# Written by: John H. Baldwin <jhb@FreeBSD.org>
# All rights reserved.
diff --git a/usr.sbin/extattr/rmextattr.c b/usr.sbin/extattr/rmextattr.c
index 4373fd6..d146c16 100644
--- a/usr.sbin/extattr/rmextattr.c
+++ b/usr.sbin/extattr/rmextattr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
* Copyright (c) 2002 Poul-Henning Kamp.
* Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
diff --git a/usr.sbin/extattrctl/extattrctl.c b/usr.sbin/extattrctl/extattrctl.c
index 377d3ba..a8ac064 100644
--- a/usr.sbin/extattrctl/extattrctl.c
+++ b/usr.sbin/extattrctl/extattrctl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999-2002 Robert N. M. Watson
* All rights reserved.
*
diff --git a/usr.sbin/fdcontrol/fdcontrol.c b/usr.sbin/fdcontrol/fdcontrol.c
index 91877e6..e6e4fa5 100644
--- a/usr.sbin/fdcontrol/fdcontrol.c
+++ b/usr.sbin/fdcontrol/fdcontrol.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1994, 2001 by Joerg Wunsch, Dresden
* All rights reserved.
*
diff --git a/usr.sbin/fdformat/fdformat.c b/usr.sbin/fdformat/fdformat.c
index b7bab86..383609d 100644
--- a/usr.sbin/fdformat/fdformat.c
+++ b/usr.sbin/fdformat/fdformat.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1992-1994,2001 by Joerg Wunsch, Dresden
* All rights reserved.
*
diff --git a/usr.sbin/fdread/fdread.c b/usr.sbin/fdread/fdread.c
index a0cdd85..58d8e67 100644
--- a/usr.sbin/fdread/fdread.c
+++ b/usr.sbin/fdread/fdread.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Joerg Wunsch
*
* All rights reserved.
diff --git a/usr.sbin/fdread/fdutil.c b/usr.sbin/fdread/fdutil.c
index bdd295a..96626ce 100644
--- a/usr.sbin/fdread/fdutil.c
+++ b/usr.sbin/fdread/fdutil.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Joerg Wunsch
*
* All rights reserved.
diff --git a/usr.sbin/fdread/fdutil.h b/usr.sbin/fdread/fdutil.h
index a093228..bb65748 100644
--- a/usr.sbin/fdread/fdutil.h
+++ b/usr.sbin/fdread/fdutil.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Joerg Wunsch
*
* All rights reserved.
diff --git a/usr.sbin/fifolog/fifolog_create/fifolog_create.c b/usr.sbin/fifolog/fifolog_create/fifolog_create.c
index 470c64c..5bb4fe7 100644
--- a/usr.sbin/fifolog/fifolog_create/fifolog_create.c
+++ b/usr.sbin/fifolog/fifolog_create/fifolog_create.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c b/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c
index 73fc50d..7d6fdbf 100644
--- a/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c
+++ b/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c b/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c
index 77776b8..1b6702d 100644
--- a/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c
+++ b/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/usr.sbin/fifolog/lib/fifolog.h b/usr.sbin/fifolog/lib/fifolog.h
index 0575a46..c8a10fd 100644
--- a/usr.sbin/fifolog/lib/fifolog.h
+++ b/usr.sbin/fifolog/lib/fifolog.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/usr.sbin/fifolog/lib/fifolog_create.c b/usr.sbin/fifolog/lib/fifolog_create.c
index 17f38c9..b0d5514 100644
--- a/usr.sbin/fifolog/lib/fifolog_create.c
+++ b/usr.sbin/fifolog/lib/fifolog_create.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/usr.sbin/fifolog/lib/fifolog_int.c b/usr.sbin/fifolog/lib/fifolog_int.c
index f8aabdc..d22bd47 100644
--- a/usr.sbin/fifolog/lib/fifolog_int.c
+++ b/usr.sbin/fifolog/lib/fifolog_int.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/usr.sbin/fifolog/lib/fifolog_reader.c b/usr.sbin/fifolog/lib/fifolog_reader.c
index e771f88..1ef6a4e 100644
--- a/usr.sbin/fifolog/lib/fifolog_reader.c
+++ b/usr.sbin/fifolog/lib/fifolog_reader.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/usr.sbin/fifolog/lib/fifolog_write.h b/usr.sbin/fifolog/lib/fifolog_write.h
index 957ced8..841ec4a 100644
--- a/usr.sbin/fifolog/lib/fifolog_write.h
+++ b/usr.sbin/fifolog/lib/fifolog_write.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/usr.sbin/fifolog/lib/fifolog_write_poll.c b/usr.sbin/fifolog/lib/fifolog_write_poll.c
index 885ba7f..4281e1b 100644
--- a/usr.sbin/fifolog/lib/fifolog_write_poll.c
+++ b/usr.sbin/fifolog/lib/fifolog_write_poll.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/usr.sbin/fifolog/lib/libfifolog.h b/usr.sbin/fifolog/lib/libfifolog.h
index eb5cc58..46d20af 100644
--- a/usr.sbin/fifolog/lib/libfifolog.h
+++ b/usr.sbin/fifolog/lib/libfifolog.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/usr.sbin/fifolog/lib/libfifolog_int.h b/usr.sbin/fifolog/lib/libfifolog_int.h
index 2b82241..69cd734 100644
--- a/usr.sbin/fifolog/lib/libfifolog_int.h
+++ b/usr.sbin/fifolog/lib/libfifolog_int.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008
* All rights reserved.
*
diff --git a/usr.sbin/fifolog/lib/miniobj.h b/usr.sbin/fifolog/lib/miniobj.h
index ee94a10..3edc42c 100644
--- a/usr.sbin/fifolog/lib/miniobj.h
+++ b/usr.sbin/fifolog/lib/miniobj.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/usr.sbin/flowctl/flowctl.c b/usr.sbin/flowctl/flowctl.c
index 0c7539a..66c6431 100644
--- a/usr.sbin/flowctl/flowctl.c
+++ b/usr.sbin/flowctl/flowctl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Gleb Smirnoff <glebius@FreeBSD.org>
* Copyright (c) 2001-2003 Roman V. Palagin <romanp@unshadow.net>
* All rights reserved.
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
index decece7..e24bcb2 100644
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -1,6 +1,8 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright 2004-2007 Colin Percival
# All rights reserved
#
diff --git a/usr.sbin/getfmac/getfmac.c b/usr.sbin/getfmac/getfmac.c
index 7c03d59..cf6d042 100644
--- a/usr.sbin/getfmac/getfmac.c
+++ b/usr.sbin/getfmac/getfmac.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/getpmac/getpmac.c b/usr.sbin/getpmac/getpmac.c
index 2abe87f..aef1341 100644
--- a/usr.sbin/getpmac/getpmac.c
+++ b/usr.sbin/getpmac/getpmac.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/gpioctl/gpioctl.c b/usr.sbin/gpioctl/gpioctl.c
index f786ef6..04068f4 100644
--- a/usr.sbin/gpioctl/gpioctl.c
+++ b/usr.sbin/gpioctl/gpioctl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2014, Rui Paulo <rpaulo@FreeBSD.org>
* Copyright (c) 2015, Emmanuel Vadot <manu@bidouilliste.com>
diff --git a/usr.sbin/gssd/gssd.c b/usr.sbin/gssd/gssd.c
index 7a00192..488c7de 100644
--- a/usr.sbin/gssd/gssd.c
+++ b/usr.sbin/gssd/gssd.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
diff --git a/usr.sbin/gstat/gstat.c b/usr.sbin/gstat/gstat.c
index 480cf3c..1f21e1f 100644
--- a/usr.sbin/gstat/gstat.c
+++ b/usr.sbin/gstat/gstat.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/usr.sbin/i2c/i2c.c b/usr.sbin/i2c/i2c.c
index 8ab5821..be88d9e 100644
--- a/usr.sbin/i2c/i2c.c
+++ b/usr.sbin/i2c/i2c.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008-2009 Semihalf, Michal Hajduk and Bartlomiej Sieka
* All rights reserved.
*
diff --git a/usr.sbin/inetd/builtins.c b/usr.sbin/inetd/builtins.c
index 10a2107..b6e4800 100644
--- a/usr.sbin/inetd/builtins.c
+++ b/usr.sbin/inetd/builtins.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1983, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/iscsid/discovery.c b/usr.sbin/iscsid/discovery.c
index d31a15b..8a033a9 100644
--- a/usr.sbin/iscsid/discovery.c
+++ b/usr.sbin/iscsid/discovery.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c
index 1671dda..2dcacc5 100644
--- a/usr.sbin/iscsid/iscsid.c
+++ b/usr.sbin/iscsid/iscsid.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/iscsid/iscsid.h b/usr.sbin/iscsid/iscsid.h
index df4b8ec..55d8915 100644
--- a/usr.sbin/iscsid/iscsid.h
+++ b/usr.sbin/iscsid/iscsid.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/iscsid/keys.c b/usr.sbin/iscsid/keys.c
index 4126bee..72cd050 100644
--- a/usr.sbin/iscsid/keys.c
+++ b/usr.sbin/iscsid/keys.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/iscsid/log.c b/usr.sbin/iscsid/log.c
index 920c081..08ab320 100644
--- a/usr.sbin/iscsid/log.c
+++ b/usr.sbin/iscsid/log.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/iscsid/login.c b/usr.sbin/iscsid/login.c
index c2a8e06..e1040ad 100644
--- a/usr.sbin/iscsid/login.c
+++ b/usr.sbin/iscsid/login.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/iscsid/pdu.c b/usr.sbin/iscsid/pdu.c
index 4222446..c5a9d41 100644
--- a/usr.sbin/iscsid/pdu.c
+++ b/usr.sbin/iscsid/pdu.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c
index f95344c..96e85b4 100644
--- a/usr.sbin/jail/command.c
+++ b/usr.sbin/jail/command.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 James Gritton
* All rights reserved.
*
diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c
index cb06bac..cb353ed 100644
--- a/usr.sbin/jail/config.c
+++ b/usr.sbin/jail/config.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 James Gritton
* All rights reserved.
*
diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c
index 24f4536..04f062c 100644
--- a/usr.sbin/jail/jail.c
+++ b/usr.sbin/jail/jail.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Poul-Henning Kamp.
* Copyright (c) 2009-2012 James Gritton
* All rights reserved.
diff --git a/usr.sbin/jail/jaillex.l b/usr.sbin/jail/jaillex.l
index 74b5191..5bffb6f 100644
--- a/usr.sbin/jail/jaillex.l
+++ b/usr.sbin/jail/jaillex.l
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 James Gritton
* All rights reserved.
*
diff --git a/usr.sbin/jail/jailp.h b/usr.sbin/jail/jailp.h
index 5c4efd5..399d0b8 100644
--- a/usr.sbin/jail/jailp.h
+++ b/usr.sbin/jail/jailp.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 James Gritton.
* All rights reserved.
*
diff --git a/usr.sbin/jail/jailparse.y b/usr.sbin/jail/jailparse.y
index 515fc58..ff673c7 100644
--- a/usr.sbin/jail/jailparse.y
+++ b/usr.sbin/jail/jailparse.y
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 James Gritton
* All rights reserved.
*
diff --git a/usr.sbin/jail/state.c b/usr.sbin/jail/state.c
index 05522e3..0989c86 100644
--- a/usr.sbin/jail/state.c
+++ b/usr.sbin/jail/state.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 James Gritton
* All rights reserved.
*
diff --git a/usr.sbin/jexec/jexec.c b/usr.sbin/jexec/jexec.c
index f8974dc..5eb1b92 100644
--- a/usr.sbin/jexec/jexec.c
+++ b/usr.sbin/jexec/jexec.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 2008 Bjoern A. Zeeb <bz@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c
index 9dd7641..aa837cc 100644
--- a/usr.sbin/jls/jls.c
+++ b/usr.sbin/jls/jls.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 2008 Bjoern A. Zeeb <bz@FreeBSD.org>
* Copyright (c) 2009 James Gritton <jamie@FreeBSD.org>
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index f381bd7..73ee449 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
*
diff --git a/usr.sbin/kbdcontrol/lex.h b/usr.sbin/kbdcontrol/lex.h
index 3806dc7..a852a30 100644
--- a/usr.sbin/kbdcontrol/lex.h
+++ b/usr.sbin/kbdcontrol/lex.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
*
diff --git a/usr.sbin/kbdcontrol/lex.l b/usr.sbin/kbdcontrol/lex.l
index d4c6508..9a1ea41 100644
--- a/usr.sbin/kbdcontrol/lex.l
+++ b/usr.sbin/kbdcontrol/lex.l
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
*
diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c
index 0670d1b..e1dbdbe 100644
--- a/usr.sbin/kbdmap/kbdmap.c
+++ b/usr.sbin/kbdmap/kbdmap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Jonathan Belson <jon@witchspace.com>
* All rights reserved.
*
diff --git a/usr.sbin/kbdmap/kbdmap.h b/usr.sbin/kbdmap/kbdmap.h
index 89d27b1..1d33b9a 100644
--- a/usr.sbin/kbdmap/kbdmap.h
+++ b/usr.sbin/kbdmap/kbdmap.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Jonathan Belson <jon@witchspace.com>
* All rights reserved.
*
diff --git a/usr.sbin/kgzip/aouthdr.c b/usr.sbin/kgzip/aouthdr.c
index 27541e6..5ebd199 100644
--- a/usr.sbin/kgzip/aouthdr.c
+++ b/usr.sbin/kgzip/aouthdr.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Robert Nordier
* All rights reserved.
*
diff --git a/usr.sbin/kgzip/aouthdr.h b/usr.sbin/kgzip/aouthdr.h
index 63c2dff..2fd990d 100644
--- a/usr.sbin/kgzip/aouthdr.h
+++ b/usr.sbin/kgzip/aouthdr.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Robert Nordier
* All rights reserved.
*
diff --git a/usr.sbin/kgzip/elfhdr.c b/usr.sbin/kgzip/elfhdr.c
index 12b1d5f..9d5dab2 100644
--- a/usr.sbin/kgzip/elfhdr.c
+++ b/usr.sbin/kgzip/elfhdr.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Global Technology Associates, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/kgzip/elfhdr.h b/usr.sbin/kgzip/elfhdr.h
index 57333b0..de57ce4 100644
--- a/usr.sbin/kgzip/elfhdr.h
+++ b/usr.sbin/kgzip/elfhdr.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Global Technology Associates, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/kgzip/kgz.h b/usr.sbin/kgzip/kgz.h
index 3cc8e13..54d37f7 100644
--- a/usr.sbin/kgzip/kgz.h
+++ b/usr.sbin/kgzip/kgz.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Global Technology Associates, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/kgzip/kgzcmp.c b/usr.sbin/kgzip/kgzcmp.c
index 0ea4f0e..b9d59a0 100644
--- a/usr.sbin/kgzip/kgzcmp.c
+++ b/usr.sbin/kgzip/kgzcmp.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Global Technology Associates, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/kgzip/kgzip.c b/usr.sbin/kgzip/kgzip.c
index d6c48f2..7c11fff 100644
--- a/usr.sbin/kgzip/kgzip.c
+++ b/usr.sbin/kgzip/kgzip.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Global Technology Associates, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/kgzip/kgzip.h b/usr.sbin/kgzip/kgzip.h
index f04f2a4..3151a12 100644
--- a/usr.sbin/kgzip/kgzip.h
+++ b/usr.sbin/kgzip/kgzip.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Global Technology Associates, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/kgzip/kgzld.c b/usr.sbin/kgzip/kgzld.c
index 11a20a5..f717a90 100644
--- a/usr.sbin/kgzip/kgzld.c
+++ b/usr.sbin/kgzip/kgzld.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Global Technology Associates, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/kgzip/xio.c b/usr.sbin/kgzip/xio.c
index 64481ff..d72f0ec 100644
--- a/usr.sbin/kgzip/xio.c
+++ b/usr.sbin/kgzip/xio.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Global Technology Associates, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/kldxref/ef_amd64.c b/usr.sbin/kldxref/ef_amd64.c
index b90882d..270f27a 100644
--- a/usr.sbin/kldxref/ef_amd64.c
+++ b/usr.sbin/kldxref/ef_amd64.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Jake Burkholder.
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
diff --git a/usr.sbin/kldxref/ef_i386.c b/usr.sbin/kldxref/ef_i386.c
index b953f4a..34bc9ad 100644
--- a/usr.sbin/kldxref/ef_i386.c
+++ b/usr.sbin/kldxref/ef_i386.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Jake Burkholder.
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
diff --git a/usr.sbin/kldxref/ef_nop.c b/usr.sbin/kldxref/ef_nop.c
index cbbd43c..420dba5 100644
--- a/usr.sbin/kldxref/ef_nop.c
+++ b/usr.sbin/kldxref/ef_nop.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
diff --git a/usr.sbin/kldxref/ef_powerpc.c b/usr.sbin/kldxref/ef_powerpc.c
index a96a727..9bc3b5e 100644
--- a/usr.sbin/kldxref/ef_powerpc.c
+++ b/usr.sbin/kldxref/ef_powerpc.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Peter Grehan.
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
diff --git a/usr.sbin/kldxref/ef_sparc64.c b/usr.sbin/kldxref/ef_sparc64.c
index 7ba2a43..27abfc7 100644
--- a/usr.sbin/kldxref/ef_sparc64.c
+++ b/usr.sbin/kldxref/ef_sparc64.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
diff --git a/usr.sbin/lastlogin/lastlogin.c b/usr.sbin/lastlogin/lastlogin.c
index 2f8dd78..8b62eb3 100644
--- a/usr.sbin/lastlogin/lastlogin.c
+++ b/usr.sbin/lastlogin/lastlogin.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996 John M. Vinopal
* All rights reserved.
*
diff --git a/usr.sbin/lpr/chkprintcap/skimprintcap.c b/usr.sbin/lpr/chkprintcap/skimprintcap.c
index da28282..9b8d4a7 100644
--- a/usr.sbin/lpr/chkprintcap/skimprintcap.c
+++ b/usr.sbin/lpr/chkprintcap/skimprintcap.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2001 - Garance Alistair Drosehn <gad@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/lpr/chkprintcap/skimprintcap.h b/usr.sbin/lpr/chkprintcap/skimprintcap.h
index af74b48..29b5627 100644
--- a/usr.sbin/lpr/chkprintcap/skimprintcap.h
+++ b/usr.sbin/lpr/chkprintcap/skimprintcap.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2001 - Garance Alistair Drosehn <gad@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/lpr/common_source/ctlinfo.c b/usr.sbin/lpr/common_source/ctlinfo.c
index c23e419..9d2f310 100644
--- a/usr.sbin/lpr/common_source/ctlinfo.c
+++ b/usr.sbin/lpr/common_source/ctlinfo.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2001,2011 - Garance Alistair Drosehn <gad@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/lpr/common_source/ctlinfo.h b/usr.sbin/lpr/common_source/ctlinfo.h
index 49bf532..5966485 100644
--- a/usr.sbin/lpr/common_source/ctlinfo.h
+++ b/usr.sbin/lpr/common_source/ctlinfo.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2001,2011 - Garance Alistair Drosehn <gad@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/lpr/common_source/lp.cdefs.h b/usr.sbin/lpr/common_source/lp.cdefs.h
index 5806f39..cadef37 100644
--- a/usr.sbin/lpr/common_source/lp.cdefs.h
+++ b/usr.sbin/lpr/common_source/lp.cdefs.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2003,2013 - Garance Alistair Drosehn <gad@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/lpr/common_source/matchjobs.c b/usr.sbin/lpr/common_source/matchjobs.c
index c7dd165..6d7379e 100644
--- a/usr.sbin/lpr/common_source/matchjobs.c
+++ b/usr.sbin/lpr/common_source/matchjobs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2002,2011 - Garance Alistair Drosehn <gad@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/lpr/common_source/matchjobs.h b/usr.sbin/lpr/common_source/matchjobs.h
index 6e4b9ff..98de13b 100644
--- a/usr.sbin/lpr/common_source/matchjobs.h
+++ b/usr.sbin/lpr/common_source/matchjobs.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2002 - Garance Alistair Drosehn <gad@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/lpr/filters.ru/koi2855/koi2855.c b/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
index 8ecc3ef..2baee03 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
+++ b/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1999 by Andrey A. Chernov, Moscow, Russia.
* (C) 18 Sep 1999, Alex G. Bulushev (bag@demos.su)
* All rights reserved.
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c b/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
index a7a5b5d..9bbeb81 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
+++ b/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993-98 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
*
diff --git a/usr.sbin/lpr/lp/lp.sh b/usr.sbin/lpr/lp/lp.sh
index dbec053..af6b9d1 100644
--- a/usr.sbin/lpr/lp/lp.sh
+++ b/usr.sbin/lpr/lp/lp.sh
@@ -1,6 +1,8 @@
#!/bin/sh
#
#
+# SPDX-License-Identifier: BSD-4-Clause
+#
# Copyright (c) 1995 Joerg Wunsch
#
# All rights reserved.
diff --git a/usr.sbin/lpr/lpc/movejobs.c b/usr.sbin/lpr/lpc/movejobs.c
index c349601..26c4d4f 100644
--- a/usr.sbin/lpr/lpc/movejobs.c
+++ b/usr.sbin/lpr/lpc/movejobs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2002 - Garance Alistair Drosehn <gad@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/lptcontrol/lptcontrol.c b/usr.sbin/lptcontrol/lptcontrol.c
index 62e5b85..834f624 100644
--- a/usr.sbin/lptcontrol/lptcontrol.c
+++ b/usr.sbin/lptcontrol/lptcontrol.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Geoffrey M. Rehmet
* All rights reserved.
*
diff --git a/usr.sbin/mailwrapper/mailwrapper.c b/usr.sbin/mailwrapper/mailwrapper.c
index 96c9190..1ad4053 100644
--- a/usr.sbin/mailwrapper/mailwrapper.c
+++ b/usr.sbin/mailwrapper/mailwrapper.c
@@ -1,7 +1,9 @@
/* $OpenBSD: mailwrapper.c,v 1.18 2007/11/06 14:39:19 otto Exp $ */
/* $NetBSD: mailwrapper.c,v 1.9 2003/03/09 08:10:43 mjl Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1998
* Perry E. Metzger. All rights reserved.
*
diff --git a/usr.sbin/mailwrapper/pathnames.h b/usr.sbin/mailwrapper/pathnames.h
index d8ae498..5511d1e 100644
--- a/usr.sbin/mailwrapper/pathnames.h
+++ b/usr.sbin/mailwrapper/pathnames.h
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1998
* Perry E. Metzger. All rights reserved.
*
diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c
index a2698ef..93c4a5a 100644
--- a/usr.sbin/makefs/cd9660.c
+++ b/usr.sbin/makefs/cd9660.c
@@ -1,6 +1,8 @@
/* $NetBSD: cd9660.c,v 1.31 2011/08/06 23:25:19 christos Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause
+ *
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
* Perez-Rathke and Ram Vedam. All rights reserved.
*
diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h
index 41125b7..370acdf 100644
--- a/usr.sbin/makefs/cd9660.h
+++ b/usr.sbin/makefs/cd9660.h
@@ -1,6 +1,8 @@
/* $NetBSD: cd9660.h,v 1.17 2011/06/23 02:35:56 enami Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
* Perez-Rathke and Ram Vedam. All rights reserved.
*
diff --git a/usr.sbin/makefs/cd9660/cd9660_archimedes.c b/usr.sbin/makefs/cd9660/cd9660_archimedes.c
index d18a0f7..2c386ee 100644
--- a/usr.sbin/makefs/cd9660/cd9660_archimedes.c
+++ b/usr.sbin/makefs/cd9660/cd9660_archimedes.c
@@ -1,6 +1,8 @@
/* $NetBSD: cd9660_archimedes.c,v 1.1 2009/01/10 22:06:29 bjh21 Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998, 2009 Ben Harris
* All rights reserved.
*
diff --git a/usr.sbin/makefs/cd9660/cd9660_archimedes.h b/usr.sbin/makefs/cd9660/cd9660_archimedes.h
index 2717bf4..96e3033 100644
--- a/usr.sbin/makefs/cd9660/cd9660_archimedes.h
+++ b/usr.sbin/makefs/cd9660/cd9660_archimedes.h
@@ -1,6 +1,8 @@
/* $NetBSD: cd9660_archimedes.h,v 1.1 2009/01/10 22:06:29 bjh21 Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998, 2009 Ben Harris
* All rights reserved.
*
diff --git a/usr.sbin/makefs/cd9660/cd9660_conversion.c b/usr.sbin/makefs/cd9660/cd9660_conversion.c
index 43fc7c5..57a1c62 100644
--- a/usr.sbin/makefs/cd9660/cd9660_conversion.c
+++ b/usr.sbin/makefs/cd9660/cd9660_conversion.c
@@ -1,6 +1,8 @@
/* $NetBSD: cd9660_conversion.c,v 1.4 2007/03/14 14:11:17 christos Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
* Perez-Rathke and Ram Vedam. All rights reserved.
*
diff --git a/usr.sbin/makefs/cd9660/cd9660_debug.c b/usr.sbin/makefs/cd9660/cd9660_debug.c
index d94ccbe..11f8fd0 100644
--- a/usr.sbin/makefs/cd9660/cd9660_debug.c
+++ b/usr.sbin/makefs/cd9660/cd9660_debug.c
@@ -1,6 +1,8 @@
/* $NetBSD: cd9660_debug.c,v 1.11 2010/10/27 18:51:35 christos Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
* Perez-Rathke and Ram Vedam. All rights reserved.
*
diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
index f26a554..7a14eaf 100644
--- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c
+++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
@@ -1,6 +1,8 @@
/* $NetBSD: cd9660_eltorito.c,v 1.17 2011/06/23 02:35:56 enami Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
* Perez-Rathke and Ram Vedam. All rights reserved.
*
diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.h b/usr.sbin/makefs/cd9660/cd9660_eltorito.h
index 02f153d..976dd98 100644
--- a/usr.sbin/makefs/cd9660/cd9660_eltorito.h
+++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.h
@@ -1,6 +1,8 @@
/* $NetBSD: cd9660_eltorito.h,v 1.5 2009/07/04 14:31:38 ahoka Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
* Perez-Rathke and Ram Vedam. All rights reserved.
*
diff --git a/usr.sbin/makefs/cd9660/cd9660_strings.c b/usr.sbin/makefs/cd9660/cd9660_strings.c
index 6280a5c..12d7566 100644
--- a/usr.sbin/makefs/cd9660/cd9660_strings.c
+++ b/usr.sbin/makefs/cd9660/cd9660_strings.c
@@ -1,6 +1,8 @@
/* $NetBSD: cd9660_strings.c,v 1.4 2007/01/16 17:32:05 hubertf Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
* Perez-Rathke and Ram Vedam. All rights reserved.
*
diff --git a/usr.sbin/makefs/cd9660/cd9660_write.c b/usr.sbin/makefs/cd9660/cd9660_write.c
index e17752a..333b632 100644
--- a/usr.sbin/makefs/cd9660/cd9660_write.c
+++ b/usr.sbin/makefs/cd9660/cd9660_write.c
@@ -1,6 +1,8 @@
/* $NetBSD: cd9660_write.c,v 1.14 2011/01/04 09:48:21 wiz Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
* Perez-Rathke and Ram Vedam. All rights reserved.
*
diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.c b/usr.sbin/makefs/cd9660/iso9660_rrip.c
index 749747b..ef1ee56 100644
--- a/usr.sbin/makefs/cd9660/iso9660_rrip.c
+++ b/usr.sbin/makefs/cd9660/iso9660_rrip.c
@@ -1,6 +1,8 @@
/* $NetBSD: iso9660_rrip.c,v 1.14 2014/05/30 13:14:47 martin Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
* Perez-Rathke and Ram Vedam. All rights reserved.
*
diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.h b/usr.sbin/makefs/cd9660/iso9660_rrip.h
index 3570301..04acf03 100644
--- a/usr.sbin/makefs/cd9660/iso9660_rrip.h
+++ b/usr.sbin/makefs/cd9660/iso9660_rrip.h
@@ -1,6 +1,8 @@
/* $NetBSD: iso9660_rrip.h,v 1.5 2009/01/10 22:06:29 bjh21 Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
* Perez-Rathke and Ram Vedam. All rights reserved.
*
diff --git a/usr.sbin/makefs/ffs.h b/usr.sbin/makefs/ffs.h
index 65cfbd0..9f120c4 100644
--- a/usr.sbin/makefs/ffs.h
+++ b/usr.sbin/makefs/ffs.h
@@ -1,6 +1,8 @@
/* $NetBSD: ffs.h,v 1.1 2004/12/20 20:51:42 jmc Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001-2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/makefs/ffs/buf.c b/usr.sbin/makefs/ffs/buf.c
index 15dcfe8..d77164b 100644
--- a/usr.sbin/makefs/ffs/buf.c
+++ b/usr.sbin/makefs/ffs/buf.c
@@ -1,6 +1,8 @@
/* $NetBSD: buf.c,v 1.13 2004/06/20 22:20:18 jmc Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/makefs/ffs/buf.h b/usr.sbin/makefs/ffs/buf.h
index b082f48..0aa3b4c 100644
--- a/usr.sbin/makefs/ffs/buf.h
+++ b/usr.sbin/makefs/ffs/buf.h
@@ -1,6 +1,8 @@
/* $NetBSD: buf.h,v 1.3 2001/11/02 03:12:49 lukem Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/makefs/ffs/ffs_bswap.c b/usr.sbin/makefs/ffs/ffs_bswap.c
index d2a3781..7ee73cd 100644
--- a/usr.sbin/makefs/ffs/ffs_bswap.c
+++ b/usr.sbin/makefs/ffs/ffs_bswap.c
@@ -1,6 +1,8 @@
/* $NetBSD: ffs_bswap.c,v 1.28 2004/05/25 14:54:59 hannken Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1998 Manuel Bouyer.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/makefs/ffs/newfs_extern.h b/usr.sbin/makefs/ffs/newfs_extern.h
index a135541..636c86b 100644
--- a/usr.sbin/makefs/ffs/newfs_extern.h
+++ b/usr.sbin/makefs/ffs/newfs_extern.h
@@ -1,7 +1,9 @@
/* $NetBSD: newfs_extern.h,v 1.4 2015/12/21 00:58:08 christos Exp $ */
/* From: NetBSD: extern.h,v 1.3 2000/12/01 12:03:27 simonb Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/makefs/ffs/ufs_bswap.h b/usr.sbin/makefs/ffs/ufs_bswap.h
index 6e7cc42..8dcb271 100644
--- a/usr.sbin/makefs/ffs/ufs_bswap.h
+++ b/usr.sbin/makefs/ffs/ufs_bswap.h
@@ -1,6 +1,8 @@
/* $NetBSD: ufs_bswap.h,v 1.13 2003/10/05 17:48:50 bouyer Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1998 Manuel Bouyer.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c
index c1cf502..a57369e 100644
--- a/usr.sbin/makefs/makefs.c
+++ b/usr.sbin/makefs/makefs.c
@@ -1,6 +1,8 @@
/* $NetBSD: makefs.c,v 1.26 2006/10/22 21:11:56 christos Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001-2003 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/makefs/makefs.h b/usr.sbin/makefs/makefs.h
index 3d7e92b..4218144 100644
--- a/usr.sbin/makefs/makefs.h
+++ b/usr.sbin/makefs/makefs.h
@@ -1,6 +1,8 @@
/* $NetBSD: makefs.h,v 1.20 2008/12/28 21:51:46 christos Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/makefs/mtree.c b/usr.sbin/makefs/mtree.c
index 64bcb3b..fd2722d 100644
--- a/usr.sbin/makefs/mtree.c
+++ b/usr.sbin/makefs/mtree.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Marcel Moolenaar
* All rights reserved.
*
diff --git a/usr.sbin/makefs/walk.c b/usr.sbin/makefs/walk.c
index 7110170..f31c549 100644
--- a/usr.sbin/makefs/walk.c
+++ b/usr.sbin/makefs/walk.c
@@ -1,6 +1,8 @@
/* $NetBSD: walk.c,v 1.24 2008/12/28 21:51:46 christos Exp $ */
/*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/memcontrol/memcontrol.c b/usr.sbin/memcontrol/memcontrol.c
index 36329af..0b345b9 100644
--- a/usr.sbin/memcontrol/memcontrol.c
+++ b/usr.sbin/memcontrol/memcontrol.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
* All rights reserved.
*
diff --git a/usr.sbin/mfiutil/mfi_bbu.c b/usr.sbin/mfiutil/mfi_bbu.c
index db16367..343d101 100644
--- a/usr.sbin/mfiutil/mfi_bbu.c
+++ b/usr.sbin/mfiutil/mfi_bbu.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Sandvine Inc.
* All rights reserved.
*
diff --git a/usr.sbin/mfiutil/mfi_cmd.c b/usr.sbin/mfiutil/mfi_cmd.c
index 3cf703a..33bd01d 100644
--- a/usr.sbin/mfiutil/mfi_cmd.c
+++ b/usr.sbin/mfiutil/mfi_cmd.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2008, 2009 Yahoo!, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/mfiutil/mfi_config.c b/usr.sbin/mfiutil/mfi_config.c
index a919214..0ee78fc 100644
--- a/usr.sbin/mfiutil/mfi_config.c
+++ b/usr.sbin/mfiutil/mfi_config.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2008, 2009 Yahoo!, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/mfiutil/mfi_drive.c b/usr.sbin/mfiutil/mfi_drive.c
index 2bc902e..4fd8fb9 100644
--- a/usr.sbin/mfiutil/mfi_drive.c
+++ b/usr.sbin/mfiutil/mfi_drive.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2008, 2009 Yahoo!, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/mfiutil/mfi_evt.c b/usr.sbin/mfiutil/mfi_evt.c
index 4bf24d9..915fbb7 100644
--- a/usr.sbin/mfiutil/mfi_evt.c
+++ b/usr.sbin/mfiutil/mfi_evt.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2008, 2009 Yahoo!, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/mfiutil/mfi_flash.c b/usr.sbin/mfiutil/mfi_flash.c
index d640cf7..239390a 100644
--- a/usr.sbin/mfiutil/mfi_flash.c
+++ b/usr.sbin/mfiutil/mfi_flash.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2008, 2009 Yahoo!, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/mfiutil/mfi_foreign.c b/usr.sbin/mfiutil/mfi_foreign.c
index 25e2add..ce4b8a7 100644
--- a/usr.sbin/mfiutil/mfi_foreign.c
+++ b/usr.sbin/mfiutil/mfi_foreign.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 smh@freebsd.org
* All rights reserved.
*
diff --git a/usr.sbin/mfiutil/mfi_patrol.c b/usr.sbin/mfiutil/mfi_patrol.c
index c3e47f3..a1dbb13 100644
--- a/usr.sbin/mfiutil/mfi_patrol.c
+++ b/usr.sbin/mfiutil/mfi_patrol.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2008, 2009 Yahoo!, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/mfiutil/mfi_properties.c b/usr.sbin/mfiutil/mfi_properties.c
index b03d522..f5affe1 100644
--- a/usr.sbin/mfiutil/mfi_properties.c
+++ b/usr.sbin/mfiutil/mfi_properties.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Yahoo!, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/mfiutil/mfi_show.c b/usr.sbin/mfiutil/mfi_show.c
index f541045..17c9677 100644
--- a/usr.sbin/mfiutil/mfi_show.c
+++ b/usr.sbin/mfiutil/mfi_show.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2008, 2009 Yahoo!, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/mfiutil/mfi_volume.c b/usr.sbin/mfiutil/mfi_volume.c
index 2306256..2bc9133 100644
--- a/usr.sbin/mfiutil/mfi_volume.c
+++ b/usr.sbin/mfiutil/mfi_volume.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2008, 2009 Yahoo!, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/mfiutil/mfiutil.c b/usr.sbin/mfiutil/mfiutil.c
index 85ce25c..8d4dffc 100644
--- a/usr.sbin/mfiutil/mfiutil.c
+++ b/usr.sbin/mfiutil/mfiutil.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2008, 2009 Yahoo!, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/mfiutil/mfiutil.h b/usr.sbin/mfiutil/mfiutil.h
index 251816a..cedac5a 100644
--- a/usr.sbin/mfiutil/mfiutil.h
+++ b/usr.sbin/mfiutil/mfiutil.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2008, 2009 Yahoo!, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/mlxcontrol/command.c b/usr.sbin/mlxcontrol/command.c
index a7dc88f..9e2f5dd 100644
--- a/usr.sbin/mlxcontrol/command.c
+++ b/usr.sbin/mlxcontrol/command.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Michael Smith
* All rights reserved.
*
diff --git a/usr.sbin/mlxcontrol/config.c b/usr.sbin/mlxcontrol/config.c
index a525658..d236e5d 100644
--- a/usr.sbin/mlxcontrol/config.c
+++ b/usr.sbin/mlxcontrol/config.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Michael Smith
* All rights reserved.
*
diff --git a/usr.sbin/mlxcontrol/interface.c b/usr.sbin/mlxcontrol/interface.c
index c0c241b..41ec08d 100644
--- a/usr.sbin/mlxcontrol/interface.c
+++ b/usr.sbin/mlxcontrol/interface.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Michael Smith
* All rights reserved.
*
diff --git a/usr.sbin/mlxcontrol/mlxcontrol.h b/usr.sbin/mlxcontrol/mlxcontrol.h
index ab0f2ab..79f7a19 100644
--- a/usr.sbin/mlxcontrol/mlxcontrol.h
+++ b/usr.sbin/mlxcontrol/mlxcontrol.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Michael Smith
* All rights reserved.
*
diff --git a/usr.sbin/mlxcontrol/util.c b/usr.sbin/mlxcontrol/util.c
index 37cd2b7..137c9e4 100644
--- a/usr.sbin/mlxcontrol/util.c
+++ b/usr.sbin/mlxcontrol/util.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Michael Smith
* All rights reserved.
*
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index 51f2b9a..7f98256 100644
--- a/usr.sbin/moused/moused.c
+++ b/usr.sbin/moused/moused.c
@@ -1,4 +1,6 @@
/**
+ ** SPDX-License-Identifier: BSD-4-Clause
+ **
** Copyright (c) 1995 Michael Smith, All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/mptable/mptable.c b/usr.sbin/mptable/mptable.c
index c6fca67..6c5efee 100644
--- a/usr.sbin/mptable/mptable.c
+++ b/usr.sbin/mptable/mptable.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996, by Steve Passe
* All rights reserved.
*
diff --git a/usr.sbin/mtest/mtest.c b/usr.sbin/mtest/mtest.c
index af522e2..d7190ee 100644
--- a/usr.sbin/mtest/mtest.c
+++ b/usr.sbin/mtest/mtest.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2009 Bruce Simpson.
* Copyright (c) 2000 Wilbert De Graaf.
* All rights reserved.
diff --git a/usr.sbin/nandsim/nandsim.c b/usr.sbin/nandsim/nandsim.c
index bd3d080..10eadcb 100644
--- a/usr.sbin/nandsim/nandsim.c
+++ b/usr.sbin/nandsim/nandsim.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/usr.sbin/nandsim/nandsim_cfgparse.c b/usr.sbin/nandsim/nandsim_cfgparse.c
index 2cbb89d..4a310fb 100644
--- a/usr.sbin/nandsim/nandsim_cfgparse.c
+++ b/usr.sbin/nandsim/nandsim_cfgparse.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/usr.sbin/nandsim/nandsim_cfgparse.h b/usr.sbin/nandsim/nandsim_cfgparse.h
index b9c642a..1236566 100644
--- a/usr.sbin/nandsim/nandsim_cfgparse.h
+++ b/usr.sbin/nandsim/nandsim_cfgparse.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009-2012 Semihalf
* All rights reserved.
*
diff --git a/usr.sbin/nandtool/nand_erase.c b/usr.sbin/nandtool/nand_erase.c
index 50bfaa6..e9742d1 100644
--- a/usr.sbin/nandtool/nand_erase.c
+++ b/usr.sbin/nandtool/nand_erase.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
diff --git a/usr.sbin/nandtool/nand_info.c b/usr.sbin/nandtool/nand_info.c
index 38fe010..79f84ab 100644
--- a/usr.sbin/nandtool/nand_info.c
+++ b/usr.sbin/nandtool/nand_info.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
diff --git a/usr.sbin/nandtool/nand_read.c b/usr.sbin/nandtool/nand_read.c
index 58a41ba..395b0c3 100644
--- a/usr.sbin/nandtool/nand_read.c
+++ b/usr.sbin/nandtool/nand_read.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
diff --git a/usr.sbin/nandtool/nand_readoob.c b/usr.sbin/nandtool/nand_readoob.c
index cc66ad3..6c5bb37 100644
--- a/usr.sbin/nandtool/nand_readoob.c
+++ b/usr.sbin/nandtool/nand_readoob.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
diff --git a/usr.sbin/nandtool/nand_write.c b/usr.sbin/nandtool/nand_write.c
index 157c6aa..481f1a4 100644
--- a/usr.sbin/nandtool/nand_write.c
+++ b/usr.sbin/nandtool/nand_write.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
diff --git a/usr.sbin/nandtool/nand_writeoob.c b/usr.sbin/nandtool/nand_writeoob.c
index 53cb32a..f1143b8 100644
--- a/usr.sbin/nandtool/nand_writeoob.c
+++ b/usr.sbin/nandtool/nand_writeoob.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
diff --git a/usr.sbin/nandtool/nandtool.c b/usr.sbin/nandtool/nandtool.c
index bd7075b..e87ed73 100644
--- a/usr.sbin/nandtool/nandtool.c
+++ b/usr.sbin/nandtool/nandtool.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
diff --git a/usr.sbin/nandtool/nandtool.h b/usr.sbin/nandtool/nandtool.h
index 639f95e..c0dd1c0 100644
--- a/usr.sbin/nandtool/nandtool.h
+++ b/usr.sbin/nandtool/nandtool.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
diff --git a/usr.sbin/nandtool/usage.h b/usr.sbin/nandtool/usage.h
index 74e8543..0dbb70a 100644
--- a/usr.sbin/nandtool/usage.h
+++ b/usr.sbin/nandtool/usage.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
diff --git a/usr.sbin/newsyslog/extern.h b/usr.sbin/newsyslog/extern.h
index c014cbb..909da2c 100644
--- a/usr.sbin/newsyslog/extern.h
+++ b/usr.sbin/newsyslog/extern.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2003 - Garance Alistair Drosehn <gad@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/pciconf/err.c b/usr.sbin/pciconf/err.c
index 7a77903..9092b62 100644
--- a/usr.sbin/pciconf/err.c
+++ b/usr.sbin/pciconf/err.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c
index 2fea11f..e467a3c 100644
--- a/usr.sbin/pkg/config.c
+++ b/usr.sbin/pkg/config.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 Baptiste Daroussin <bapt@FreeBSD.org>
* Copyright (c) 2013 Bryan Drewery <bdrewery@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/pkg/config.h b/usr.sbin/pkg/config.h
index 4ff0a16..a63997a 100644
--- a/usr.sbin/pkg/config.h
+++ b/usr.sbin/pkg/config.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Baptiste Daroussin <bapt@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/pkg/dns_utils.c b/usr.sbin/pkg/dns_utils.c
index a3c3a7e..78ebdd4 100644
--- a/usr.sbin/pkg/dns_utils.c
+++ b/usr.sbin/pkg/dns_utils.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012-2013 Baptiste Daroussin <bapt@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/pkg/dns_utils.h b/usr.sbin/pkg/dns_utils.h
index b1418bb..da14825 100644
--- a/usr.sbin/pkg/dns_utils.h
+++ b/usr.sbin/pkg/dns_utils.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Baptiste Daroussin <bapt@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c
index bd3076c..e711de7 100644
--- a/usr.sbin/pkg/pkg.c
+++ b/usr.sbin/pkg/pkg.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012-2014 Baptiste Daroussin <bapt@FreeBSD.org>
* Copyright (c) 2013 Bryan Drewery <bdrewery@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/pmcannotate/pmcannotate.c b/usr.sbin/pmcannotate/pmcannotate.c
index b22d0dc..867c009 100644
--- a/usr.sbin/pmcannotate/pmcannotate.c
+++ b/usr.sbin/pmcannotate/pmcannotate.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Nokia Corporation
* All rights reserved.
*
diff --git a/usr.sbin/pmccontrol/pmccontrol.c b/usr.sbin/pmccontrol/pmccontrol.c
index 62c074c..b80db1f 100644
--- a/usr.sbin/pmccontrol/pmccontrol.c
+++ b/usr.sbin/pmccontrol/pmccontrol.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003,2004 Joseph Koshy
* All rights reserved.
*
diff --git a/usr.sbin/pmcstat/pmcpl_annotate.c b/usr.sbin/pmcstat/pmcpl_annotate.c
index 802983c..18d37c0 100644
--- a/usr.sbin/pmcstat/pmcpl_annotate.c
+++ b/usr.sbin/pmcstat/pmcpl_annotate.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/usr.sbin/pmcstat/pmcpl_annotate.h b/usr.sbin/pmcstat/pmcpl_annotate.h
index 482bcd4..35b6412 100644
--- a/usr.sbin/pmcstat/pmcpl_annotate.h
+++ b/usr.sbin/pmcstat/pmcpl_annotate.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/usr.sbin/pmcstat/pmcpl_annotate_cg.c b/usr.sbin/pmcstat/pmcpl_annotate_cg.c
index e90bda1..b8ad3c6 100644
--- a/usr.sbin/pmcstat/pmcpl_annotate_cg.c
+++ b/usr.sbin/pmcstat/pmcpl_annotate_cg.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* Copyright (c) 2014, Adrian Chadd, Netflix Inc.
diff --git a/usr.sbin/pmcstat/pmcpl_annotate_cg.h b/usr.sbin/pmcstat/pmcpl_annotate_cg.h
index bd655f7..cf11c8d 100644
--- a/usr.sbin/pmcstat/pmcpl_annotate_cg.h
+++ b/usr.sbin/pmcstat/pmcpl_annotate_cg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* Copyright (c) 2014, Adrian Chadd, Netflix Inc.
diff --git a/usr.sbin/pmcstat/pmcpl_callgraph.c b/usr.sbin/pmcstat/pmcpl_callgraph.c
index 33998b5..606d2f0 100644
--- a/usr.sbin/pmcstat/pmcpl_callgraph.c
+++ b/usr.sbin/pmcstat/pmcpl_callgraph.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/usr.sbin/pmcstat/pmcpl_callgraph.h b/usr.sbin/pmcstat/pmcpl_callgraph.h
index aaf0e1b..3a6754b 100644
--- a/usr.sbin/pmcstat/pmcpl_callgraph.h
+++ b/usr.sbin/pmcstat/pmcpl_callgraph.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/usr.sbin/pmcstat/pmcpl_calltree.c b/usr.sbin/pmcstat/pmcpl_calltree.c
index 0f95ac1..2d29c8a 100644
--- a/usr.sbin/pmcstat/pmcpl_calltree.c
+++ b/usr.sbin/pmcstat/pmcpl_calltree.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012, Fabien Thomas
* All rights reserved.
*
diff --git a/usr.sbin/pmcstat/pmcpl_calltree.h b/usr.sbin/pmcstat/pmcpl_calltree.h
index f54957f..0d79899 100644
--- a/usr.sbin/pmcstat/pmcpl_calltree.h
+++ b/usr.sbin/pmcstat/pmcpl_calltree.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Fabien Thomas
* All rights reserved.
*
diff --git a/usr.sbin/pmcstat/pmcpl_gprof.c b/usr.sbin/pmcstat/pmcpl_gprof.c
index acb339e..b30f12f 100644
--- a/usr.sbin/pmcstat/pmcpl_gprof.c
+++ b/usr.sbin/pmcstat/pmcpl_gprof.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* Copyright (c) 2009, Fabien Thomas
diff --git a/usr.sbin/pmcstat/pmcpl_gprof.h b/usr.sbin/pmcstat/pmcpl_gprof.h
index 069082f..4ce59dd 100644
--- a/usr.sbin/pmcstat/pmcpl_gprof.h
+++ b/usr.sbin/pmcstat/pmcpl_gprof.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* Copyright (c) 2009, Fabien Thomas
diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c
index 81b0cd0..7db29b2 100644
--- a/usr.sbin/pmcstat/pmcstat.c
+++ b/usr.sbin/pmcstat/pmcstat.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2008, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/usr.sbin/pmcstat/pmcstat.h b/usr.sbin/pmcstat/pmcstat.h
index 5b1d3d9..2892366 100644
--- a/usr.sbin/pmcstat/pmcstat.h
+++ b/usr.sbin/pmcstat/pmcstat.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/usr.sbin/pmcstat/pmcstat_log.c b/usr.sbin/pmcstat/pmcstat_log.c
index aaca292..04d9f7a 100644
--- a/usr.sbin/pmcstat/pmcstat_log.c
+++ b/usr.sbin/pmcstat/pmcstat_log.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
diff --git a/usr.sbin/pmcstat/pmcstat_log.h b/usr.sbin/pmcstat/pmcstat_log.h
index 32a22f4..3251bc6 100644
--- a/usr.sbin/pmcstat/pmcstat_log.h
+++ b/usr.sbin/pmcstat/pmcstat_log.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* Copyright (c) 2009, Fabien Thomas
diff --git a/usr.sbin/pmcstat/pmcstat_top.h b/usr.sbin/pmcstat/pmcstat_top.h
index 281410b..f9173a4 100644
--- a/usr.sbin/pmcstat/pmcstat_top.h
+++ b/usr.sbin/pmcstat/pmcstat_top.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Fabien Thomas
* All rights reserved.
*
diff --git a/usr.sbin/portsnap/make_index/make_index.c b/usr.sbin/portsnap/make_index/make_index.c
index c15ce10..642404b 100644
--- a/usr.sbin/portsnap/make_index/make_index.c
+++ b/usr.sbin/portsnap/make_index/make_index.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2005 Colin Percival
* All rights reserved
*
diff --git a/usr.sbin/portsnap/phttpget/phttpget.c b/usr.sbin/portsnap/phttpget/phttpget.c
index 33e969a..17935b1 100644
--- a/usr.sbin/portsnap/phttpget/phttpget.c
+++ b/usr.sbin/portsnap/phttpget/phttpget.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2005 Colin Percival
* All rights reserved
*
diff --git a/usr.sbin/portsnap/portsnap/portsnap.sh b/usr.sbin/portsnap/portsnap/portsnap.sh
index dd33ee3..9db381e 100644
--- a/usr.sbin/portsnap/portsnap/portsnap.sh
+++ b/usr.sbin/portsnap/portsnap/portsnap.sh
@@ -1,6 +1,8 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright 2004-2005 Colin Percival
# All rights reserved
#
diff --git a/usr.sbin/powerd/powerd.c b/usr.sbin/powerd/powerd.c
index 78d977f..f7a9c14 100644
--- a/usr.sbin/powerd/powerd.c
+++ b/usr.sbin/powerd/powerd.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Colin Percival
* Copyright (c) 2005 Nate Lawson
* All rights reserved.
diff --git a/usr.sbin/ppp/acf.c b/usr.sbin/ppp/acf.c
index 6c3ec05..dd5d5c0 100644
--- a/usr.sbin/ppp/acf.c
+++ b/usr.sbin/ppp/acf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/acf.h b/usr.sbin/ppp/acf.h
index e32adbc..0ef231e 100644
--- a/usr.sbin/ppp/acf.h
+++ b/usr.sbin/ppp/acf.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/arp.c b/usr.sbin/ppp/arp.c
index b38b97a..7c964e0 100644
--- a/usr.sbin/ppp/arp.c
+++ b/usr.sbin/ppp/arp.c
@@ -2,6 +2,8 @@
* sys-bsd.c - System-dependent procedures for setting up
* PPP interfaces on bsd-4.4-ish systems (including 386BSD, NetBSD, etc.)
*
+ * SPDX-License-Identifier: MIT
+ *
* Copyright (c) 1989 Carnegie Mellon University.
* All rights reserved.
*
diff --git a/usr.sbin/ppp/arp.h b/usr.sbin/ppp/arp.h
index 81e3fa6..c835e20 100644
--- a/usr.sbin/ppp/arp.h
+++ b/usr.sbin/ppp/arp.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c
index a2a8e04..1ed8d95 100644
--- a/usr.sbin/ppp/async.c
+++ b/usr.sbin/ppp/async.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/async.h b/usr.sbin/ppp/async.h
index 309f597..5413e80 100644
--- a/usr.sbin/ppp/async.h
+++ b/usr.sbin/ppp/async.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/auth.c b/usr.sbin/ppp/auth.c
index fbfc929..f52f738 100644
--- a/usr.sbin/ppp/auth.c
+++ b/usr.sbin/ppp/auth.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/auth.h b/usr.sbin/ppp/auth.h
index 3e1047d..12638c7 100644
--- a/usr.sbin/ppp/auth.h
+++ b/usr.sbin/ppp/auth.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index c12209e..a35b752 100644
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/bundle.h b/usr.sbin/ppp/bundle.h
index e2f9e7f..6658c56 100644
--- a/usr.sbin/ppp/bundle.h
+++ b/usr.sbin/ppp/bundle.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/cbcp.c b/usr.sbin/ppp/cbcp.c
index 23366c8..76d2e1d 100644
--- a/usr.sbin/ppp/cbcp.c
+++ b/usr.sbin/ppp/cbcp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/cbcp.h b/usr.sbin/ppp/cbcp.h
index 46bf274..30c417b 100644
--- a/usr.sbin/ppp/cbcp.h
+++ b/usr.sbin/ppp/cbcp.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/ccp.c b/usr.sbin/ppp/ccp.c
index f5bbf0c..be9a247 100644
--- a/usr.sbin/ppp/ccp.c
+++ b/usr.sbin/ppp/ccp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/ccp.h b/usr.sbin/ppp/ccp.h
index bc867b6..ca072de 100644
--- a/usr.sbin/ppp/ccp.h
+++ b/usr.sbin/ppp/ccp.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/chap.c b/usr.sbin/ppp/chap.c
index 75de650..61ba177 100644
--- a/usr.sbin/ppp/chap.c
+++ b/usr.sbin/ppp/chap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/chap.h b/usr.sbin/ppp/chap.h
index 08c6865..c7d145b 100644
--- a/usr.sbin/ppp/chap.h
+++ b/usr.sbin/ppp/chap.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/chap_ms.c b/usr.sbin/ppp/chap_ms.c
index 24e959c..1179255 100644
--- a/usr.sbin/ppp/chap_ms.c
+++ b/usr.sbin/ppp/chap_ms.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Gabor Kincses <gabor@acm.org>
* 1997 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Eric Rosenquist
diff --git a/usr.sbin/ppp/chap_ms.h b/usr.sbin/ppp/chap_ms.h
index 8a69f93..014a284 100644
--- a/usr.sbin/ppp/chap_ms.h
+++ b/usr.sbin/ppp/chap_ms.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Gabor Kincses <gabor@acm.org>
* 1997 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Eric Rosenquist
diff --git a/usr.sbin/ppp/chat.c b/usr.sbin/ppp/chat.c
index daa52cd..b7eebb3 100644
--- a/usr.sbin/ppp/chat.c
+++ b/usr.sbin/ppp/chat.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/chat.h b/usr.sbin/ppp/chat.h
index 91fc7b4..984f9bf 100644
--- a/usr.sbin/ppp/chat.h
+++ b/usr.sbin/ppp/chat.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index d0664e8..77bde9a 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/command.h b/usr.sbin/ppp/command.h
index 8eb1e38..7a61fd6 100644
--- a/usr.sbin/ppp/command.h
+++ b/usr.sbin/ppp/command.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/datalink.c b/usr.sbin/ppp/datalink.c
index d47b11a..ff81a0d 100644
--- a/usr.sbin/ppp/datalink.c
+++ b/usr.sbin/ppp/datalink.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/datalink.h b/usr.sbin/ppp/datalink.h
index 6fd7e9b..6911603 100644
--- a/usr.sbin/ppp/datalink.h
+++ b/usr.sbin/ppp/datalink.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/deflate.c b/usr.sbin/ppp/deflate.c
index 57c9004..a2095db 100644
--- a/usr.sbin/ppp/deflate.c
+++ b/usr.sbin/ppp/deflate.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/deflate.h b/usr.sbin/ppp/deflate.h
index a478b24..474c222 100644
--- a/usr.sbin/ppp/deflate.h
+++ b/usr.sbin/ppp/deflate.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/defs.c b/usr.sbin/ppp/defs.c
index 856c200..7f89ef8 100644
--- a/usr.sbin/ppp/defs.c
+++ b/usr.sbin/ppp/defs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/defs.h b/usr.sbin/ppp/defs.h
index d320a53..dcda03a 100644
--- a/usr.sbin/ppp/defs.h
+++ b/usr.sbin/ppp/defs.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/descriptor.h b/usr.sbin/ppp/descriptor.h
index a3c1b10..506c12a 100644
--- a/usr.sbin/ppp/descriptor.h
+++ b/usr.sbin/ppp/descriptor.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/ether.c b/usr.sbin/ppp/ether.c
index a86f3bd..2256a83 100644
--- a/usr.sbin/ppp/ether.c
+++ b/usr.sbin/ppp/ether.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/ether.h b/usr.sbin/ppp/ether.h
index 94511bd..c0c8c30 100644
--- a/usr.sbin/ppp/ether.h
+++ b/usr.sbin/ppp/ether.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/exec.c b/usr.sbin/ppp/exec.c
index a53db37..2520532 100644
--- a/usr.sbin/ppp/exec.c
+++ b/usr.sbin/ppp/exec.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/exec.h b/usr.sbin/ppp/exec.h
index 32bd748..0bc5b41 100644
--- a/usr.sbin/ppp/exec.h
+++ b/usr.sbin/ppp/exec.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/filter.c b/usr.sbin/ppp/filter.c
index af5691b..8dc894a 100644
--- a/usr.sbin/ppp/filter.c
+++ b/usr.sbin/ppp/filter.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/filter.h b/usr.sbin/ppp/filter.h
index ce67420..74af3f9 100644
--- a/usr.sbin/ppp/filter.h
+++ b/usr.sbin/ppp/filter.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c
index 78530b9..1d35baf 100644
--- a/usr.sbin/ppp/fsm.c
+++ b/usr.sbin/ppp/fsm.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/fsm.h b/usr.sbin/ppp/fsm.h
index d233899..361f483 100644
--- a/usr.sbin/ppp/fsm.h
+++ b/usr.sbin/ppp/fsm.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/hdlc.c b/usr.sbin/ppp/hdlc.c
index 517c3c5..57d1486 100644
--- a/usr.sbin/ppp/hdlc.c
+++ b/usr.sbin/ppp/hdlc.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/hdlc.h b/usr.sbin/ppp/hdlc.h
index b9211a6..9f51d09 100644
--- a/usr.sbin/ppp/hdlc.h
+++ b/usr.sbin/ppp/hdlc.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/i4b.h b/usr.sbin/ppp/i4b.h
index 3545c84..a196583 100644
--- a/usr.sbin/ppp/i4b.h
+++ b/usr.sbin/ppp/i4b.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/id.c b/usr.sbin/ppp/id.c
index ec66574..48ea7ce 100644
--- a/usr.sbin/ppp/id.c
+++ b/usr.sbin/ppp/id.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/id.h b/usr.sbin/ppp/id.h
index 2357dc7..83b34a8 100644
--- a/usr.sbin/ppp/id.h
+++ b/usr.sbin/ppp/id.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/iface.c b/usr.sbin/ppp/iface.c
index 5f17769..b56bb24 100644
--- a/usr.sbin/ppp/iface.c
+++ b/usr.sbin/ppp/iface.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/iface.h b/usr.sbin/ppp/iface.h
index ea3e06d..04bb2c5 100644
--- a/usr.sbin/ppp/iface.h
+++ b/usr.sbin/ppp/iface.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c
index 5c25a09..d04fb9d 100644
--- a/usr.sbin/ppp/ip.c
+++ b/usr.sbin/ppp/ip.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/ip.h b/usr.sbin/ppp/ip.h
index a4c4179..db9e7b2 100644
--- a/usr.sbin/ppp/ip.h
+++ b/usr.sbin/ppp/ip.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c
index dbb1e79..e442695 100644
--- a/usr.sbin/ppp/ipcp.c
+++ b/usr.sbin/ppp/ipcp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/ipcp.h b/usr.sbin/ppp/ipcp.h
index dc1ed9e..a6864d8 100644
--- a/usr.sbin/ppp/ipcp.h
+++ b/usr.sbin/ppp/ipcp.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/iplist.c b/usr.sbin/ppp/iplist.c
index a7fae6e..c963530 100644
--- a/usr.sbin/ppp/iplist.c
+++ b/usr.sbin/ppp/iplist.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/iplist.h b/usr.sbin/ppp/iplist.h
index 5805a2c..e4bcea4 100644
--- a/usr.sbin/ppp/iplist.h
+++ b/usr.sbin/ppp/iplist.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/ipv6cp.c b/usr.sbin/ppp/ipv6cp.c
index 9088680..dd70216 100644
--- a/usr.sbin/ppp/ipv6cp.c
+++ b/usr.sbin/ppp/ipv6cp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/ipv6cp.h b/usr.sbin/ppp/ipv6cp.h
index 53f7153..390b2af 100644
--- a/usr.sbin/ppp/ipv6cp.h
+++ b/usr.sbin/ppp/ipv6cp.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/layer.h b/usr.sbin/ppp/layer.h
index 4ee59a1..8d7382c 100644
--- a/usr.sbin/ppp/layer.h
+++ b/usr.sbin/ppp/layer.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c
index cf75718..d447c9e 100644
--- a/usr.sbin/ppp/lcp.c
+++ b/usr.sbin/ppp/lcp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/lcp.h b/usr.sbin/ppp/lcp.h
index e0382a8..05c66de 100644
--- a/usr.sbin/ppp/lcp.h
+++ b/usr.sbin/ppp/lcp.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/link.c b/usr.sbin/ppp/link.c
index f802b95..0cc32f0 100644
--- a/usr.sbin/ppp/link.c
+++ b/usr.sbin/ppp/link.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/link.h b/usr.sbin/ppp/link.h
index 822474b..72e4dd4 100644
--- a/usr.sbin/ppp/link.h
+++ b/usr.sbin/ppp/link.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/log.c b/usr.sbin/ppp/log.c
index 76043b4..72f1ca9 100644
--- a/usr.sbin/ppp/log.c
+++ b/usr.sbin/ppp/log.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/log.h b/usr.sbin/ppp/log.h
index 139863d..f5bbace 100644
--- a/usr.sbin/ppp/log.h
+++ b/usr.sbin/ppp/log.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/lqr.c b/usr.sbin/ppp/lqr.c
index 7ce1513..787faea 100644
--- a/usr.sbin/ppp/lqr.c
+++ b/usr.sbin/ppp/lqr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/lqr.h b/usr.sbin/ppp/lqr.h
index 13d378f..522f0ab 100644
--- a/usr.sbin/ppp/lqr.h
+++ b/usr.sbin/ppp/lqr.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index de867ea..3545d47 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/main.h b/usr.sbin/ppp/main.h
index 0c7399a..e94c1f3 100644
--- a/usr.sbin/ppp/main.h
+++ b/usr.sbin/ppp/main.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/mbuf.c b/usr.sbin/ppp/mbuf.c
index 4773224..5d0d27d 100644
--- a/usr.sbin/ppp/mbuf.c
+++ b/usr.sbin/ppp/mbuf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/mbuf.h b/usr.sbin/ppp/mbuf.h
index 980d649..81d1116 100644
--- a/usr.sbin/ppp/mbuf.h
+++ b/usr.sbin/ppp/mbuf.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/mp.c b/usr.sbin/ppp/mp.c
index b2cb46c..91fdaf0 100644
--- a/usr.sbin/ppp/mp.c
+++ b/usr.sbin/ppp/mp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/mp.h b/usr.sbin/ppp/mp.h
index 7cf5a8e..7020275 100644
--- a/usr.sbin/ppp/mp.h
+++ b/usr.sbin/ppp/mp.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/mppe.c b/usr.sbin/ppp/mppe.c
index f1fadc3..2589141 100644
--- a/usr.sbin/ppp/mppe.c
+++ b/usr.sbin/ppp/mppe.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Semen Ustimenko <semenu@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/mppe.h b/usr.sbin/ppp/mppe.h
index c70a609..c9566e3 100644
--- a/usr.sbin/ppp/mppe.h
+++ b/usr.sbin/ppp/mppe.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Semen Ustimenko <semenu@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/nat_cmd.c b/usr.sbin/ppp/nat_cmd.c
index accb149..a413fbb 100644
--- a/usr.sbin/ppp/nat_cmd.c
+++ b/usr.sbin/ppp/nat_cmd.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
* Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/nat_cmd.h b/usr.sbin/ppp/nat_cmd.h
index f4c3655..40f4bc7 100644
--- a/usr.sbin/ppp/nat_cmd.h
+++ b/usr.sbin/ppp/nat_cmd.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
* Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/ncp.c b/usr.sbin/ppp/ncp.c
index 1c12fc5..1c6c6be 100644
--- a/usr.sbin/ppp/ncp.c
+++ b/usr.sbin/ppp/ncp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/ncp.h b/usr.sbin/ppp/ncp.h
index 99580cf..0943a29 100644
--- a/usr.sbin/ppp/ncp.h
+++ b/usr.sbin/ppp/ncp.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/ncpaddr.c b/usr.sbin/ppp/ncpaddr.c
index 0b16999..b4c166a 100644
--- a/usr.sbin/ppp/ncpaddr.c
+++ b/usr.sbin/ppp/ncpaddr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/ncpaddr.h b/usr.sbin/ppp/ncpaddr.h
index 8c6b886..72b9596 100644
--- a/usr.sbin/ppp/ncpaddr.h
+++ b/usr.sbin/ppp/ncpaddr.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/netgraph.c b/usr.sbin/ppp/netgraph.c
index 23a575b..1a96ccc 100644
--- a/usr.sbin/ppp/netgraph.c
+++ b/usr.sbin/ppp/netgraph.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/netgraph.h b/usr.sbin/ppp/netgraph.h
index a5b4082..007c16d 100644
--- a/usr.sbin/ppp/netgraph.h
+++ b/usr.sbin/ppp/netgraph.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/pap.c b/usr.sbin/ppp/pap.c
index 8eda020..01b2cb3 100644
--- a/usr.sbin/ppp/pap.c
+++ b/usr.sbin/ppp/pap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/pap.h b/usr.sbin/ppp/pap.h
index 8e8d457..f9f685c 100644
--- a/usr.sbin/ppp/pap.h
+++ b/usr.sbin/ppp/pap.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/pred.c b/usr.sbin/ppp/pred.c
index 43d5d94..270cfa2 100644
--- a/usr.sbin/ppp/pred.c
+++ b/usr.sbin/ppp/pred.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* Ian Donaldson <iand@labtam.labtam.oz.au>
* Carsten Bormann <cabo@cs.tu-berlin.de>
diff --git a/usr.sbin/ppp/pred.h b/usr.sbin/ppp/pred.h
index 1afb77a..395c57d 100644
--- a/usr.sbin/ppp/pred.h
+++ b/usr.sbin/ppp/pred.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/probe.c b/usr.sbin/ppp/probe.c
index a33734c..34e65d0 100644
--- a/usr.sbin/ppp/probe.c
+++ b/usr.sbin/ppp/probe.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/probe.h b/usr.sbin/ppp/probe.h
index 5a7dce9..de838a6 100644
--- a/usr.sbin/ppp/probe.h
+++ b/usr.sbin/ppp/probe.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/prompt.c b/usr.sbin/ppp/prompt.c
index de331ef..48c264c 100644
--- a/usr.sbin/ppp/prompt.c
+++ b/usr.sbin/ppp/prompt.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/prompt.h b/usr.sbin/ppp/prompt.h
index 0489338..dbc1425 100644
--- a/usr.sbin/ppp/prompt.h
+++ b/usr.sbin/ppp/prompt.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/proto.c b/usr.sbin/ppp/proto.c
index 2c2c26d..45c57b1 100644
--- a/usr.sbin/ppp/proto.c
+++ b/usr.sbin/ppp/proto.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/proto.h b/usr.sbin/ppp/proto.h
index 8c93327..e49cc91 100644
--- a/usr.sbin/ppp/proto.h
+++ b/usr.sbin/ppp/proto.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/radius.c b/usr.sbin/ppp/radius.c
index 12b0c0f..92735e7 100644
--- a/usr.sbin/ppp/radius.c
+++ b/usr.sbin/ppp/radius.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 1999 Internet Business Solutions Ltd., Switzerland
* All rights reserved.
*
diff --git a/usr.sbin/ppp/radius.h b/usr.sbin/ppp/radius.h
index ab144a5..5ffbbef 100644
--- a/usr.sbin/ppp/radius.h
+++ b/usr.sbin/ppp/radius.h
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 1999 Internet Business Solutions Ltd., Switzerland
* All rights reserved.
*
diff --git a/usr.sbin/ppp/route.c b/usr.sbin/ppp/route.c
index 643bf0f..cfce3ac 100644
--- a/usr.sbin/ppp/route.c
+++ b/usr.sbin/ppp/route.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/route.h b/usr.sbin/ppp/route.h
index bb8bd38..c088752 100644
--- a/usr.sbin/ppp/route.h
+++ b/usr.sbin/ppp/route.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/server.c b/usr.sbin/ppp/server.c
index 3997eaf..162eb44 100644
--- a/usr.sbin/ppp/server.c
+++ b/usr.sbin/ppp/server.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/server.h b/usr.sbin/ppp/server.h
index 9fdc52c..b053ae2 100644
--- a/usr.sbin/ppp/server.h
+++ b/usr.sbin/ppp/server.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/sig.c b/usr.sbin/ppp/sig.c
index a42194b..c7b2f46 100644
--- a/usr.sbin/ppp/sig.c
+++ b/usr.sbin/ppp/sig.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 - 1999, 2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/sig.h b/usr.sbin/ppp/sig.h
index 27d264c..2775845 100644
--- a/usr.sbin/ppp/sig.h
+++ b/usr.sbin/ppp/sig.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/sync.c b/usr.sbin/ppp/sync.c
index 712e036..a9703f8 100644
--- a/usr.sbin/ppp/sync.c
+++ b/usr.sbin/ppp/sync.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/sync.h b/usr.sbin/ppp/sync.h
index 4f5bfee..acf7a83 100644
--- a/usr.sbin/ppp/sync.h
+++ b/usr.sbin/ppp/sync.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/systems.c b/usr.sbin/ppp/systems.c
index 36cb4e9..f7f871e 100644
--- a/usr.sbin/ppp/systems.c
+++ b/usr.sbin/ppp/systems.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/systems.h b/usr.sbin/ppp/systems.h
index 9091e73..857f069 100644
--- a/usr.sbin/ppp/systems.h
+++ b/usr.sbin/ppp/systems.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/tcp.c b/usr.sbin/ppp/tcp.c
index 4ace882..13dbd22 100644
--- a/usr.sbin/ppp/tcp.c
+++ b/usr.sbin/ppp/tcp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/tcp.h b/usr.sbin/ppp/tcp.h
index f6a8235..ad7a954 100644
--- a/usr.sbin/ppp/tcp.h
+++ b/usr.sbin/ppp/tcp.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/tcpmss.c b/usr.sbin/ppp/tcpmss.c
index 38d2920..765668e 100644
--- a/usr.sbin/ppp/tcpmss.c
+++ b/usr.sbin/ppp/tcpmss.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Ruslan Ermilov and Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/tcpmss.h b/usr.sbin/ppp/tcpmss.h
index ffd7b82..1b84e28 100644
--- a/usr.sbin/ppp/tcpmss.h
+++ b/usr.sbin/ppp/tcpmss.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/throughput.c b/usr.sbin/ppp/throughput.c
index a3e948a..697223f 100644
--- a/usr.sbin/ppp/throughput.c
+++ b/usr.sbin/ppp/throughput.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/throughput.h b/usr.sbin/ppp/throughput.h
index 21e5450..8ece5ad 100644
--- a/usr.sbin/ppp/throughput.h
+++ b/usr.sbin/ppp/throughput.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c
index c1b589b7..581e297 100644
--- a/usr.sbin/ppp/timer.c
+++ b/usr.sbin/ppp/timer.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001, 2009 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/timer.h b/usr.sbin/ppp/timer.h
index 02fcdd1..c68733f 100644
--- a/usr.sbin/ppp/timer.h
+++ b/usr.sbin/ppp/timer.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/tty.c b/usr.sbin/ppp/tty.c
index ab984cc..66b8b57 100644
--- a/usr.sbin/ppp/tty.c
+++ b/usr.sbin/ppp/tty.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/tty.h b/usr.sbin/ppp/tty.h
index 0991c81..8115b68 100644
--- a/usr.sbin/ppp/tty.h
+++ b/usr.sbin/ppp/tty.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/tun.c b/usr.sbin/ppp/tun.c
index 883cd5c..66d7254 100644
--- a/usr.sbin/ppp/tun.c
+++ b/usr.sbin/ppp/tun.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/tun.h b/usr.sbin/ppp/tun.h
index 1bb0712..720e538 100644
--- a/usr.sbin/ppp/tun.h
+++ b/usr.sbin/ppp/tun.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/ua.h b/usr.sbin/ppp/ua.h
index dbd89e5..9c13aab 100644
--- a/usr.sbin/ppp/ua.h
+++ b/usr.sbin/ppp/ua.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/udp.c b/usr.sbin/ppp/udp.c
index d9f3252..3990b67 100644
--- a/usr.sbin/ppp/udp.c
+++ b/usr.sbin/ppp/udp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/udp.h b/usr.sbin/ppp/udp.h
index c89e276..5c25187 100644
--- a/usr.sbin/ppp/udp.h
+++ b/usr.sbin/ppp/udp.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/ppp/vjcomp.c b/usr.sbin/ppp/vjcomp.c
index 97166af..1b2ff64 100644
--- a/usr.sbin/ppp/vjcomp.c
+++ b/usr.sbin/ppp/vjcomp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
* Internet Initiative Japan, Inc (IIJ)
diff --git a/usr.sbin/ppp/vjcomp.h b/usr.sbin/ppp/vjcomp.h
index 2956122..20465c4 100644
--- a/usr.sbin/ppp/vjcomp.h
+++ b/usr.sbin/ppp/vjcomp.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/pppctl/pppctl.c b/usr.sbin/pppctl/pppctl.c
index d8e7b42..6467328 100644
--- a/usr.sbin/pppctl/pppctl.c
+++ b/usr.sbin/pppctl/pppctl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
diff --git a/usr.sbin/pw/bitmap.c b/usr.sbin/pw/bitmap.c
index 8e96bff..be82b2c 100644
--- a/usr.sbin/pw/bitmap.c
+++ b/usr.sbin/pw/bitmap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/pw/bitmap.h b/usr.sbin/pw/bitmap.h
index 4d6cfe4..570c678 100644
--- a/usr.sbin/pw/bitmap.h
+++ b/usr.sbin/pw/bitmap.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/pw/cpdir.c b/usr.sbin/pw/cpdir.c
index 679758b..4e6ca88 100644
--- a/usr.sbin/pw/cpdir.c
+++ b/usr.sbin/pw/cpdir.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/pw/grupd.c b/usr.sbin/pw/grupd.c
index 5d0df02..e98dd29 100644
--- a/usr.sbin/pw/grupd.c
+++ b/usr.sbin/pw/grupd.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/pw/psdate.c b/usr.sbin/pw/psdate.c
index 1ce628f..8c833b5 100644
--- a/usr.sbin/pw/psdate.c
+++ b/usr.sbin/pw/psdate.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/pw/psdate.h b/usr.sbin/pw/psdate.h
index 6ae1db2..29bfb33 100644
--- a/usr.sbin/pw/psdate.h
+++ b/usr.sbin/pw/psdate.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/pw/pw.c b/usr.sbin/pw/pw.c
index 700a7b2..5f02a15 100644
--- a/usr.sbin/pw/pw.c
+++ b/usr.sbin/pw/pw.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/pw/pw.h b/usr.sbin/pw/pw.h
index 16cf793..9cb0751 100644
--- a/usr.sbin/pw/pw.h
+++ b/usr.sbin/pw/pw.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/pw/pw_conf.c b/usr.sbin/pw/pw_conf.c
index d4fa99a..36bb8b6 100644
--- a/usr.sbin/pw/pw_conf.c
+++ b/usr.sbin/pw/pw_conf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/pw/pw_group.c b/usr.sbin/pw/pw_group.c
index 0a2b1eb..dd65062 100644
--- a/usr.sbin/pw/pw_group.c
+++ b/usr.sbin/pw/pw_group.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/pw/pw_log.c b/usr.sbin/pw/pw_log.c
index fe8d803..17e14d1 100644
--- a/usr.sbin/pw/pw_log.c
+++ b/usr.sbin/pw/pw_log.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/pw/pw_nis.c b/usr.sbin/pw/pw_nis.c
index 087c946..4b70bc1 100644
--- a/usr.sbin/pw/pw_nis.c
+++ b/usr.sbin/pw/pw_nis.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
index 61931c1..62a1613 100644
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/pw/pw_vpw.c b/usr.sbin/pw/pw_vpw.c
index 08c8bd5..141e203 100644
--- a/usr.sbin/pw/pw_vpw.c
+++ b/usr.sbin/pw/pw_vpw.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/pw/pwupd.c b/usr.sbin/pw/pwupd.c
index 87c3c99..ac91c9e 100644
--- a/usr.sbin/pw/pwupd.c
+++ b/usr.sbin/pw/pwupd.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/pw/pwupd.h b/usr.sbin/pw/pwupd.h
index 7fecffb..bd19755 100644
--- a/usr.sbin/pw/pwupd.h
+++ b/usr.sbin/pw/pwupd.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/pw/rm_r.c b/usr.sbin/pw/rm_r.c
index 45fc5d1..940266d 100644
--- a/usr.sbin/pw/rm_r.c
+++ b/usr.sbin/pw/rm_r.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
*
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index 9e9ae79..705dba2 100644
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1991, 1994 Wolfgang Solfrank.
* Copyright (C) 1991, 1994 TooLs GmbH.
* All rights reserved.
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index 2bb333c..bcdd8ab 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: 0BSD
+ *
* Copyright (c) 1990, 1991, 1992, 1993, 1996
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/rpc.lockd/kern.c b/usr.sbin/rpc.lockd/kern.c
index 759e147..08566a5 100644
--- a/usr.sbin/rpc.lockd/kern.c
+++ b/usr.sbin/rpc.lockd/kern.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/rpc.umntall/mounttab.c b/usr.sbin/rpc.umntall/mounttab.c
index 56333ca..a0e0d7f 100644
--- a/usr.sbin/rpc.umntall/mounttab.c
+++ b/usr.sbin/rpc.umntall/mounttab.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Martin Blapp
* All rights reserved.
*
diff --git a/usr.sbin/rpc.umntall/mounttab.h b/usr.sbin/rpc.umntall/mounttab.h
index 9999b03..904f2ec 100644
--- a/usr.sbin/rpc.umntall/mounttab.h
+++ b/usr.sbin/rpc.umntall/mounttab.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Martin Blapp
* All rights reserved.
*
diff --git a/usr.sbin/rpc.umntall/rpc.umntall.c b/usr.sbin/rpc.umntall/rpc.umntall.c
index a64fae6..74df093 100644
--- a/usr.sbin/rpc.umntall/rpc.umntall.c
+++ b/usr.sbin/rpc.umntall/rpc.umntall.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Martin Blapp
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/util.c b/usr.sbin/rpcbind/util.c
index 1539b18..0393bff 100644
--- a/usr.sbin/rpcbind/util.c
+++ b/usr.sbin/rpcbind/util.c
@@ -4,6 +4,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvctl/rtadvctl.c b/usr.sbin/rtadvctl/rtadvctl.c
index f1657d7..556f9ac 100644
--- a/usr.sbin/rtadvctl/rtadvctl.c
+++ b/usr.sbin/rtadvctl/rtadvctl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/advcap.h b/usr.sbin/rtadvd/advcap.h
index 3cc124a..3414e20 100644
--- a/usr.sbin/rtadvd/advcap.h
+++ b/usr.sbin/rtadvd/advcap.h
@@ -1,7 +1,9 @@
/* $FreeBSD$ */
/* $KAME: advcap.h,v 1.5 2003/06/09 05:40:54 t-momose Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1994,1995 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/control.c b/usr.sbin/rtadvd/control.c
index fc6d536..4ef2e83 100644
--- a/usr.sbin/rtadvd/control.c
+++ b/usr.sbin/rtadvd/control.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/control.h b/usr.sbin/rtadvd/control.h
index 2168302..1086519 100644
--- a/usr.sbin/rtadvd/control.h
+++ b/usr.sbin/rtadvd/control.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/control_client.c b/usr.sbin/rtadvd/control_client.c
index ca5cb68..64d7d68 100644
--- a/usr.sbin/rtadvd/control_client.c
+++ b/usr.sbin/rtadvd/control_client.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/control_client.h b/usr.sbin/rtadvd/control_client.h
index 2f50f17..d1af84d 100644
--- a/usr.sbin/rtadvd/control_client.h
+++ b/usr.sbin/rtadvd/control_client.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/control_server.c b/usr.sbin/rtadvd/control_server.c
index 76ca541..c6cf695 100644
--- a/usr.sbin/rtadvd/control_server.c
+++ b/usr.sbin/rtadvd/control_server.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/control_server.h b/usr.sbin/rtadvd/control_server.h
index 76fe9cd..072caa1 100644
--- a/usr.sbin/rtadvd/control_server.h
+++ b/usr.sbin/rtadvd/control_server.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/rtprio/rtprio.c b/usr.sbin/rtprio/rtprio.c
index a0b67ea..9ce74b5 100644
--- a/usr.sbin/rtprio/rtprio.c
+++ b/usr.sbin/rtprio/rtprio.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 David Greenman
* Copyright (c) 1994 Henrik Vestergaard Draboel (hvd@terry.ping.dk)
* All rights reserved.
diff --git a/usr.sbin/sa/db.c b/usr.sbin/sa/db.c
index 6634e54..b0c9656 100644
--- a/usr.sbin/sa/db.c
+++ b/usr.sbin/sa/db.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Diomidis Spinellis
* All rights reserved.
*
diff --git a/usr.sbin/sa/extern.h b/usr.sbin/sa/extern.h
index 70f97a7..10ae02f 100644
--- a/usr.sbin/sa/extern.h
+++ b/usr.sbin/sa/extern.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Christopher G. Demetriou
* All rights reserved.
*
diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c
index 64736ac..96720f6 100644
--- a/usr.sbin/sa/main.c
+++ b/usr.sbin/sa/main.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Christopher G. Demetriou
* All rights reserved.
*
diff --git a/usr.sbin/sa/pathnames.h b/usr.sbin/sa/pathnames.h
index 7a7edf6..7352818 100644
--- a/usr.sbin/sa/pathnames.h
+++ b/usr.sbin/sa/pathnames.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Christopher G. Demetriou
* All rights reserved.
*
diff --git a/usr.sbin/sa/pdb.c b/usr.sbin/sa/pdb.c
index e5e35f5..eb3f4a4 100644
--- a/usr.sbin/sa/pdb.c
+++ b/usr.sbin/sa/pdb.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Christopher G. Demetriou
* All rights reserved.
*
diff --git a/usr.sbin/sa/usrdb.c b/usr.sbin/sa/usrdb.c
index 50778ef..50a33e1 100644
--- a/usr.sbin/sa/usrdb.c
+++ b/usr.sbin/sa/usrdb.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Christopher G. Demetriou
* All rights reserved.
*
diff --git a/usr.sbin/service/service.sh b/usr.sbin/service/service.sh
index bb1dd7e..1927bc4 100755
--- a/usr.sbin/service/service.sh
+++ b/usr.sbin/service/service.sh
@@ -2,6 +2,8 @@
# $FreeBSD$
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2009 Douglas Barton
# All rights reserved.
#
diff --git a/usr.sbin/services_mkdb/extern.h b/usr.sbin/services_mkdb/extern.h
index b973972..07c2f22 100644
--- a/usr.sbin/services_mkdb/extern.h
+++ b/usr.sbin/services_mkdb/extern.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/services_mkdb/services_mkdb.c b/usr.sbin/services_mkdb/services_mkdb.c
index 7a992c3..99d737b 100644
--- a/usr.sbin/services_mkdb/services_mkdb.c
+++ b/usr.sbin/services_mkdb/services_mkdb.c
@@ -1,6 +1,8 @@
/* $NetBSD: services_mkdb.c,v 1.14 2008/04/28 20:24:17 martin Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/services_mkdb/uniq.c b/usr.sbin/services_mkdb/uniq.c
index e1bac38..7498446 100644
--- a/usr.sbin/services_mkdb/uniq.c
+++ b/usr.sbin/services_mkdb/uniq.c
@@ -1,6 +1,8 @@
/* $NetBSD: uniq.c,v 1.4 2008/04/28 20:24:17 martin Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/setfmac/setfmac.c b/usr.sbin/setfmac/setfmac.c
index e3da25d..dd361aa 100644
--- a/usr.sbin/setfmac/setfmac.c
+++ b/usr.sbin/setfmac/setfmac.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002, 2004 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/setpmac/setpmac.c b/usr.sbin/setpmac/setpmac.c
index bc096bb..386d765 100644
--- a/usr.sbin/setpmac/setpmac.c
+++ b/usr.sbin/setpmac/setpmac.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/smbmsg/pathnames.h b/usr.sbin/smbmsg/pathnames.h
index aff7335..d5a0a24 100644
--- a/usr.sbin/smbmsg/pathnames.h
+++ b/usr.sbin/smbmsg/pathnames.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2004 Joerg Wunsch
* All Rights Reserved.
*
diff --git a/usr.sbin/smbmsg/smbmsg.c b/usr.sbin/smbmsg/smbmsg.c
index 1472651..bd552be 100644
--- a/usr.sbin/smbmsg/smbmsg.c
+++ b/usr.sbin/smbmsg/smbmsg.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2004 Joerg Wunsch
* All Rights Reserved.
*
diff --git a/usr.sbin/snapinfo/snapinfo.c b/usr.sbin/snapinfo/snapinfo.c
index 23c3b4b..9758979 100644
--- a/usr.sbin/snapinfo/snapinfo.c
+++ b/usr.sbin/snapinfo/snapinfo.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Mark Santcroos <marks@freebsd.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/spkrtest/spkrtest.sh b/usr.sbin/spkrtest/spkrtest.sh
index f9f0f06..4acfb67 100644
--- a/usr.sbin/spkrtest/spkrtest.sh
+++ b/usr.sbin/spkrtest/spkrtest.sh
@@ -1,6 +1,8 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2002 The FreeBSD Project
# All rights reserved.
#
diff --git a/usr.sbin/spray/spray.c b/usr.sbin/spray/spray.c
index 69691d1..bfbc5fd 100644
--- a/usr.sbin/spray/spray.c
+++ b/usr.sbin/spray/spray.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993 Winning Strategies, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/traceroute/findsaddr-udp.c b/usr.sbin/traceroute/findsaddr-udp.c
index 3da72c7..57ecc27 100644
--- a/usr.sbin/traceroute/findsaddr-udp.c
+++ b/usr.sbin/traceroute/findsaddr-udp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Bjoern A. Zeeb <bz@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/uathload/uathload.c b/usr.sbin/uathload/uathload.c
index 50e9eb6..2a8d4ef 100644
--- a/usr.sbin/uathload/uathload.c
+++ b/usr.sbin/uathload/uathload.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/usr.sbin/ugidfw/ugidfw.c b/usr.sbin/ugidfw/ugidfw.c
index 977922a..f748b4d 100644
--- a/usr.sbin/ugidfw/ugidfw.c
+++ b/usr.sbin/ugidfw/ugidfw.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002, 2004 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/uhsoctl/uhsoctl.c b/usr.sbin/uhsoctl/uhsoctl.c
index 9dc13ab..a033d48 100644
--- a/usr.sbin/uhsoctl/uhsoctl.c
+++ b/usr.sbin/uhsoctl/uhsoctl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008-2009 Fredrik Lindberg
* All rights reserved.
*
diff --git a/usr.sbin/unbound/local-setup/local-unbound-setup.sh b/usr.sbin/unbound/local-setup/local-unbound-setup.sh
index cd21f6f..c1c0ece 100755
--- a/usr.sbin/unbound/local-setup/local-unbound-setup.sh
+++ b/usr.sbin/unbound/local-setup/local-unbound-setup.sh
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2013 Dag-Erling Smørgrav
# All rights reserved.
#
diff --git a/usr.sbin/usbconfig/dump.c b/usr.sbin/usbconfig/dump.c
index df5cde0..e818c03 100644
--- a/usr.sbin/usbconfig/dump.c
+++ b/usr.sbin/usbconfig/dump.c
@@ -1,5 +1,7 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/usbconfig/dump.h b/usr.sbin/usbconfig/dump.h
index 581684a..4538a56 100644
--- a/usr.sbin/usbconfig/dump.h
+++ b/usr.sbin/usbconfig/dump.h
@@ -1,5 +1,7 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/usbconfig/usbconfig.c b/usr.sbin/usbconfig/usbconfig.c
index c046003..18cdf9f 100644
--- a/usr.sbin/usbconfig/usbconfig.c
+++ b/usr.sbin/usbconfig/usbconfig.c
@@ -1,5 +1,7 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/usbdump/usbdump.c b/usr.sbin/usbdump/usbdump.c
index 0b8b391..ef4476f 100644
--- a/usr.sbin/usbdump/usbdump.c
+++ b/usr.sbin/usbdump/usbdump.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Weongyo Jeong <weongyo@freebsd.org>
* All rights reserved.
*
diff --git a/usr.sbin/utx/utx.c b/usr.sbin/utx/utx.c
index 59edf3b..75a3e00 100644
--- a/usr.sbin/utx/utx.c
+++ b/usr.sbin/utx/utx.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011-2012 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.sbin/vidcontrol/decode.c b/usr.sbin/vidcontrol/decode.c
index c7f416e..160a6ca 100644
--- a/usr.sbin/vidcontrol/decode.c
+++ b/usr.sbin/vidcontrol/decode.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 Søren Schmidt
* All rights reserved.
*
diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c
index 9807de81..c393c5a 100644
--- a/usr.sbin/vidcontrol/vidcontrol.c
+++ b/usr.sbin/vidcontrol/vidcontrol.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-1996 Søren Schmidt
* All rights reserved.
*
diff --git a/usr.sbin/wake/wake.c b/usr.sbin/wake/wake.c
index b7737da..ca600e1 100644
--- a/usr.sbin/wake/wake.c
+++ b/usr.sbin/wake/wake.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2006, 2007, 2008, 2009, 2010 Marc Balmer <marc@msys.ch>
* Copyright (C) 2000 Eugene M. Kim. All rights reserved.
*
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index 766d45a..e6c6b23 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: MIT
+ *
* Copyright (c) 1995 Ugen J.S.Antsilevich
*
* Redistribution and use in source forms, with and without modification,
diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c
index 1271bbf..6fe2664 100644
--- a/usr.sbin/watchdogd/watchdogd.c
+++ b/usr.sbin/watchdogd/watchdogd.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2004 Sean M. Kelly <smkelly@FreeBSD.org>
* Copyright (c) 2013 iXsystems.com,
* author: Alfred Perlstein <alfred@freebsd.org>
diff --git a/usr.sbin/wlandebug/wlandebug.c b/usr.sbin/wlandebug/wlandebug.c
index 9bec123..6e5d46f 100644
--- a/usr.sbin/wlandebug/wlandebug.c
+++ b/usr.sbin/wlandebug/wlandebug.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index 15f8394..60d439d 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
* All rights reserved.
*
diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index 4560c21..0382823 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -1,7 +1,9 @@
/* $OpenBSD: yppoll.c,v 1.15 2015/01/16 06:40:22 deraadt Exp $ */
/* $NetBSD: yppoll.c,v 1.5 1996/05/13 02:46:36 thorpej Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1992, 1993 Theo de Raadt <deraadt@openbsd.org>
* Copyright (c) 1992, 1993 John Brezak
* All rights reserved.
diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c
index c156661..95153ca 100644
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@@ -1,7 +1,9 @@
/* $OpenBSD: ypset.c,v 1.20 2015/01/16 06:40:23 deraadt Exp $ */
/* $NetBSD: ypset.c,v 1.8 1996/05/13 02:46:33 thorpej Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1992, 1993 Theo de Raadt <deraadt@theos.com>
* All rights reserved.
*
OpenPOWER on IntegriCloud