aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libc/arm/gen/fabs.c4
-rw-r--r--lib/libc/locale/euc.c2
-rw-r--r--lib/libc/mips/SYS.h2
-rw-r--r--lib/libc/mips/gen/fabs.c4
-rw-r--r--lib/libc/net/ether_addr.c4
-rw-r--r--lib/libc/rpc/crypt_client.c4
-rw-r--r--lib/libcam/camlib.h4
-rw-r--r--lib/libcam/scsi_cmdparse.c5
-rw-r--r--lib/libkiconv/xlat16_sysctl.c4
-rw-r--r--lib/libprocstat/cd9660.c2
-rw-r--r--lib/libprocstat/common_kvm.c2
-rw-r--r--lib/libprocstat/libprocstat.c2
-rw-r--r--lib/libprocstat/msdosfs.c4
-rw-r--r--lib/librpcsvc/yp_passwd.c4
-rw-r--r--lib/librpcsvc/yp_update.c4
-rw-r--r--lib/libthr/sys/thr_error.c4
-rw-r--r--lib/libthr/thread/thr_attr.c4
-rw-r--r--lib/libthr/thread/thr_autoinit.c4
-rw-r--r--lib/libthr/thread/thr_concurrency.c4
-rw-r--r--lib/libthr/thread/thr_getschedparam.c4
-rw-r--r--lib/libthr/thread/thr_init.c4
-rw-r--r--lib/libthr/thread/thr_mutex.c4
-rw-r--r--lib/libthr/thread/thr_setschedparam.c4
-rw-r--r--lib/libthr/thread/thr_switch_np.c4
-rw-r--r--lib/msun/bsdsrc/b_exp.c4
-rw-r--r--lib/msun/bsdsrc/b_log.c4
-rw-r--r--lib/msun/bsdsrc/b_tgamma.c2
-rw-r--r--lib/msun/bsdsrc/mathimpl.h4
-rw-r--r--libexec/mknetid/hash.c4
-rw-r--r--libexec/mknetid/hash.h4
-rw-r--r--libexec/mknetid/mknetid.c4
-rw-r--r--libexec/revnetgroup/hash.c4
-rw-r--r--libexec/revnetgroup/hash.h4
-rw-r--r--libexec/revnetgroup/revnetgroup.c4
-rw-r--r--libexec/ypxfr/yp_dbwrite.c4
-rw-r--r--libexec/ypxfr/ypxfr_extern.h4
-rw-r--r--libexec/ypxfr/ypxfr_getmap.c4
-rw-r--r--libexec/ypxfr/ypxfr_main.c4
-rw-r--r--libexec/ypxfr/ypxfr_misc.c4
-rw-r--r--libexec/ypxfr/ypxfrd_getmap.c4
-rw-r--r--release/picobsd/tinyware/login/pathnames.h2
-rw-r--r--release/picobsd/tinyware/login/pico-login.c2
-rw-r--r--release/picobsd/tinyware/passwd/extern.h4
-rw-r--r--release/picobsd/tinyware/passwd/local_passwd.c2
-rw-r--r--release/picobsd/tinyware/passwd/passwd.c4
-rw-r--r--release/picobsd/tinyware/passwd/pw_copy.c2
-rw-r--r--release/picobsd/tinyware/passwd/pw_util.c2
-rw-r--r--release/picobsd/tinyware/passwd/pw_util.h2
-rw-r--r--sbin/bsdlabel/bsdlabel.c4
-rw-r--r--sbin/etherswitchcfg/ifmedia.c4
-rw-r--r--sbin/ffsinfo/ffsinfo.c4
-rw-r--r--sbin/growfs/debug.c4
-rw-r--r--sbin/growfs/debug.h4
-rw-r--r--sbin/growfs/growfs.c4
-rw-r--r--sbin/gvinum/gvinum.h2
-rw-r--r--sbin/ifconfig/ifmedia.c4
-rw-r--r--sbin/ifconfig/ifvlan.c4
-rw-r--r--sbin/rcorder/ealloc.c4
-rw-r--r--sbin/rcorder/hash.c4
-rw-r--r--sbin/rcorder/hash.h4
-rw-r--r--sbin/rcorder/sprite.h5
-rw-r--r--sys/amd64/amd64/in_cksum.c2
-rw-r--r--sys/amd64/amd64/machdep.c2
-rw-r--r--sys/amd64/amd64/pmap.c2
-rw-r--r--sys/amd64/amd64/trap.c2
-rw-r--r--sys/amd64/amd64/vm_machdep.c2
-rw-r--r--sys/amd64/ia32/ia32_syscall.c2
-rw-r--r--sys/amd64/include/floatingpoint.h2
-rw-r--r--sys/amd64/include/ieeefp.h2
-rw-r--r--sys/amd64/include/param.h2
-rw-r--r--sys/amd64/include/varargs.h2
-rw-r--r--sys/amd64/include/vmparam.h2
-rw-r--r--sys/arm/arm/autoconf.c2
-rw-r--r--sys/arm/arm/in_cksum.c2
-rw-r--r--sys/arm/arm/vm_machdep.c2
-rw-r--r--sys/arm/include/_align.h2
-rw-r--r--sys/arm/include/_types.h2
-rw-r--r--sys/arm/include/floatingpoint.h2
-rw-r--r--sys/arm/include/param.h2
-rw-r--r--sys/arm/include/proc.h2
-rw-r--r--sys/arm/include/profile.h2
-rw-r--r--sys/arm/include/reloc.h2
-rw-r--r--sys/compat/linprocfs/linprocfs.c2
-rw-r--r--sys/compat/ndis/cfg_var.h2
-rw-r--r--sys/compat/ndis/hal_var.h2
-rw-r--r--sys/compat/ndis/kern_ndis.c2
-rw-r--r--sys/compat/ndis/kern_windrv.c2
-rw-r--r--sys/compat/ndis/ndis_var.h2
-rw-r--r--sys/compat/ndis/ntoskrnl_var.h2
-rw-r--r--sys/compat/ndis/pe_var.h2
-rw-r--r--sys/compat/ndis/resource_var.h2
-rw-r--r--sys/compat/ndis/subr_hal.c2
-rw-r--r--sys/compat/ndis/subr_ndis.c2
-rw-r--r--sys/compat/ndis/subr_ntoskrnl.c2
-rw-r--r--sys/compat/ndis/subr_pe.c2
-rw-r--r--sys/compat/ndis/subr_usbd.c2
-rw-r--r--sys/compat/ndis/usbd_var.h2
-rw-r--r--sys/dev/an/if_aironet_ieee.h2
-rw-r--r--sys/dev/an/if_an.c2
-rw-r--r--sys/dev/an/if_an_isa.c2
-rw-r--r--sys/dev/an/if_an_pccard.c2
-rw-r--r--sys/dev/an/if_an_pci.c2
-rw-r--r--sys/dev/an/if_anreg.h2
-rw-r--r--sys/dev/bge/if_bge.c2
-rw-r--r--sys/dev/bge/if_bgereg.h2
-rw-r--r--sys/dev/dc/dcphy.c2
-rw-r--r--sys/dev/dc/if_dc.c2
-rw-r--r--sys/dev/dc/if_dcreg.h2
-rw-r--r--sys/dev/dc/pnphy.c2
-rw-r--r--sys/dev/dcons/dcons.c2
-rw-r--r--sys/dev/dcons/dcons.h2
-rw-r--r--sys/dev/dcons/dcons_crom.c2
-rw-r--r--sys/dev/dcons/dcons_os.c2
-rw-r--r--sys/dev/dcons/dcons_os.h2
-rw-r--r--sys/dev/firewire/fwcrom.c2
-rw-r--r--sys/dev/firewire/fwdma.c2
-rw-r--r--sys/dev/firewire/fwdma.h2
-rw-r--r--sys/dev/firewire/fwmem.c2
-rw-r--r--sys/dev/firewire/fwmem.h2
-rw-r--r--sys/dev/firewire/fwphyreg.h2
-rw-r--r--sys/dev/firewire/if_fwe.c2
-rw-r--r--sys/dev/firewire/if_fwevar.h2
-rw-r--r--sys/dev/firewire/if_fwip.c2
-rw-r--r--sys/dev/firewire/if_fwipvar.h2
-rw-r--r--sys/dev/firewire/sbp_targ.c2
-rw-r--r--sys/dev/ic/i82586.h2
-rw-r--r--sys/dev/if_ndis/if_ndis.c2
-rw-r--r--sys/dev/if_ndis/if_ndis_pccard.c2
-rw-r--r--sys/dev/if_ndis/if_ndis_pci.c2
-rw-r--r--sys/dev/if_ndis/if_ndis_usb.c2
-rw-r--r--sys/dev/if_ndis/if_ndisvar.h2
-rw-r--r--sys/dev/lge/if_lge.c2
-rw-r--r--sys/dev/lge/if_lgereg.h2
-rw-r--r--sys/dev/mii/amphy.c2
-rw-r--r--sys/dev/mii/amphyreg.h2
-rw-r--r--sys/dev/mii/brgphy.c2
-rw-r--r--sys/dev/mii/brgphyreg.h2
-rw-r--r--sys/dev/mii/ciphy.c2
-rw-r--r--sys/dev/mii/ciphyreg.h2
-rw-r--r--sys/dev/mii/mlphy.c2
-rw-r--r--sys/dev/mii/nsgphyreg.h2
-rw-r--r--sys/dev/mii/pnaphy.c2
-rw-r--r--sys/dev/mii/rgephy.c2
-rw-r--r--sys/dev/mii/rgephyreg.h2
-rw-r--r--sys/dev/mii/rlphy.c2
-rw-r--r--sys/dev/mii/rlswitch.c2
-rw-r--r--sys/dev/mii/xmphy.c2
-rw-r--r--sys/dev/mii/xmphyreg.h2
-rw-r--r--sys/dev/msk/if_msk.c2
-rw-r--r--sys/dev/msk/if_mskreg.h2
-rw-r--r--sys/dev/nge/if_nge.c2
-rw-r--r--sys/dev/nge/if_ngereg.h2
-rw-r--r--sys/dev/pcn/if_pcn.c2
-rw-r--r--sys/dev/pcn/if_pcnreg.h2
-rw-r--r--sys/dev/ppbus/lpt.c2
-rw-r--r--sys/dev/re/if_re.c2
-rw-r--r--sys/dev/sf/if_sf.c2
-rw-r--r--sys/dev/sf/if_sfreg.h2
-rw-r--r--sys/dev/sge/if_sge.c2
-rw-r--r--sys/dev/sge/if_sgereg.h2
-rw-r--r--sys/dev/sis/if_sis.c2
-rw-r--r--sys/dev/sis/if_sisreg.h2
-rw-r--r--sys/dev/sk/if_sk.c2
-rw-r--r--sys/dev/sk/if_skreg.h2
-rw-r--r--sys/dev/sk/xmaciireg.h2
-rw-r--r--sys/dev/ste/if_ste.c2
-rw-r--r--sys/dev/ste/if_stereg.h2
-rw-r--r--sys/dev/ti/if_ti.c2
-rw-r--r--sys/dev/ti/if_tireg.h2
-rw-r--r--sys/dev/tl/if_tl.c2
-rw-r--r--sys/dev/tl/if_tlreg.h2
-rw-r--r--sys/dev/txp/if_txp.c2
-rw-r--r--sys/dev/usb/net/if_aue.c2
-rw-r--r--sys/dev/usb/net/if_auereg.h2
-rw-r--r--sys/dev/usb/net/if_axe.c2
-rw-r--r--sys/dev/usb/net/if_axereg.h2
-rw-r--r--sys/dev/usb/net/if_cdce.c2
-rw-r--r--sys/dev/usb/net/if_cdcereg.h2
-rw-r--r--sys/dev/usb/net/if_cue.c2
-rw-r--r--sys/dev/usb/net/if_cuereg.h2
-rw-r--r--sys/dev/usb/net/if_kue.c2
-rw-r--r--sys/dev/usb/net/if_kuefw.h2
-rw-r--r--sys/dev/usb/net/if_kuereg.h2
-rw-r--r--sys/dev/usb/net/if_mosreg.h2
-rw-r--r--sys/dev/usb/net/if_rue.c2
-rw-r--r--sys/dev/vge/if_vge.c2
-rw-r--r--sys/dev/vge/if_vgereg.h2
-rw-r--r--sys/dev/vge/if_vgevar.h2
-rw-r--r--sys/dev/vr/if_vr.c2
-rw-r--r--sys/dev/vr/if_vrreg.h2
-rw-r--r--sys/dev/wb/if_wb.c2
-rw-r--r--sys/dev/wb/if_wbreg.h2
-rw-r--r--sys/dev/wi/if_wavelan_ieee.h2
-rw-r--r--sys/dev/wi/if_wi_macio.c2
-rw-r--r--sys/dev/wi/if_wi_pccard.c2
-rw-r--r--sys/dev/wi/if_wi_pci.c2
-rw-r--r--sys/dev/wi/if_wireg.h2
-rw-r--r--sys/dev/wi/if_wivar.h2
-rw-r--r--sys/dev/xl/if_xl.c2
-rw-r--r--sys/dev/xl/if_xlreg.h2
-rw-r--r--sys/fs/procfs/procfs.c2
-rw-r--r--sys/fs/procfs/procfs_rlimit.c2
-rw-r--r--sys/geom/vinum/geom_vinum_share.c2
-rw-r--r--sys/geom/vinum/geom_vinum_subr.c2
-rw-r--r--sys/geom/vinum/geom_vinum_var.h4
-rw-r--r--sys/i386/i386/longrun.c2
-rw-r--r--sys/i386/i386/machdep.c2
-rw-r--r--sys/i386/i386/pmap.c2
-rw-r--r--sys/i386/i386/trap.c2
-rw-r--r--sys/i386/i386/vm_machdep.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_misc.c2
-rw-r--r--sys/i386/include/floatingpoint.h2
-rw-r--r--sys/i386/include/ieeefp.h2
-rw-r--r--sys/isa/pnpreg.h2
-rw-r--r--sys/kern/init_main.c2
-rw-r--r--sys/kern/kern_acct.c2
-rw-r--r--sys/kern/ksched.c2
-rw-r--r--sys/kern/p1003_1b.c2
-rw-r--r--sys/kern/posix4_mib.c2
-rw-r--r--sys/kern/subr_syscall.c2
-rw-r--r--sys/kern/subr_trap.c2
-rw-r--r--sys/libkern/strcasecmp.c2
-rw-r--r--sys/libkern/strstr.c2
-rw-r--r--sys/mips/include/_types.h2
-rw-r--r--sys/mips/include/cpuinfo.h2
-rw-r--r--sys/mips/include/floatingpoint.h2
-rw-r--r--sys/mips/include/reloc.h2
-rw-r--r--sys/mips/mips/db_disasm.c2
-rw-r--r--sys/mips/mips/in_cksum.c2
-rw-r--r--sys/mips/mips/sys_machdep.c2
-rw-r--r--sys/net/fddi.h2
-rw-r--r--sys/net/if_arcsubr.c2
-rw-r--r--sys/net/if_fddisubr.c2
-rw-r--r--sys/netinet6/ip6_id.c2
-rw-r--r--sys/netsmb/smb_crypt.c2
-rw-r--r--sys/nfs/bootp_subr.c2
-rw-r--r--sys/nfs/krpc_subr.c2
-rw-r--r--sys/powerpc/fpu/fpu_emu.c4
-rw-r--r--sys/powerpc/include/_align.h2
-rw-r--r--sys/powerpc/include/_types.h2
-rw-r--r--sys/powerpc/include/param.h2
-rw-r--r--sys/powerpc/powerpc/in_cksum.c2
-rw-r--r--sys/powerpc/powerpc/vm_machdep.c2
-rw-r--r--sys/riscv/riscv/in_cksum.c2
-rw-r--r--sys/riscv/riscv/pmap.c2
-rw-r--r--sys/sparc64/include/cache.h2
-rw-r--r--sys/sparc64/sparc64/cache.c2
-rw-r--r--sys/sparc64/sparc64/eeprom.c2
-rw-r--r--sys/sys/kernel.h2
-rw-r--r--sys/sys/pioctl.h2
-rw-r--r--sys/sys/posix4.h2
-rw-r--r--sys/sys/sched.h2
-rw-r--r--sys/sys/tiio.h2
-rw-r--r--sys/vm/swap_pager.c2
-rw-r--r--sys/vm/vm_fault.c2
-rw-r--r--sys/vm/vm_pageout.c2
-rw-r--r--sys/vm/vnode_pager.c2
-rw-r--r--sys/x86/include/_align.h2
-rw-r--r--sys/x86/include/_types.h2
-rw-r--r--tools/regression/p1003_1b/fifo.c4
-rw-r--r--tools/regression/p1003_1b/memlock.c4
-rw-r--r--tools/regression/p1003_1b/p26.c4
-rw-r--r--tools/regression/p1003_1b/sched.c4
-rw-r--r--tools/regression/p1003_1b/yield.c4
-rw-r--r--usr.bin/chpass/chpass.c2
-rw-r--r--usr.bin/chpass/chpass.h4
-rw-r--r--usr.bin/chpass/edit.c2
-rw-r--r--usr.bin/chpass/field.c4
-rw-r--r--usr.bin/chpass/util.c2
-rw-r--r--usr.bin/diff/diffreg.c4
-rw-r--r--usr.bin/indent/args.c2
-rw-r--r--usr.bin/indent/indent.c2
-rw-r--r--usr.bin/indent/indent_codes.h2
-rw-r--r--usr.bin/indent/indent_globs.h2
-rw-r--r--usr.bin/indent/io.c2
-rw-r--r--usr.bin/indent/lexi.c2
-rw-r--r--usr.bin/indent/parse.c2
-rw-r--r--usr.bin/indent/pr_comment.c2
-rw-r--r--usr.bin/locate/bigram/locate.bigram.c2
-rw-r--r--usr.bin/locate/code/locate.code.c2
-rw-r--r--usr.bin/locate/locate/fastfind.c2
-rw-r--r--usr.bin/locate/locate/locate.c2
-rw-r--r--usr.bin/locate/locate/locate.h2
-rw-r--r--usr.bin/locate/locate/pathnames.h2
-rw-r--r--usr.bin/locate/locate/util.c2
-rw-r--r--usr.bin/login/login.c2
-rw-r--r--usr.bin/netstat/mbuf.c2
-rw-r--r--usr.bin/netstat/mroute.c2
-rw-r--r--usr.bin/netstat/mroute6.c2
-rw-r--r--usr.bin/pr/egetopt.c2
-rw-r--r--usr.bin/pr/extern.h2
-rw-r--r--usr.bin/pr/pr.c2
-rw-r--r--usr.bin/pr/pr.h2
-rw-r--r--usr.bin/rup/rup.c2
-rw-r--r--usr.bin/rusers/rusers.c2
-rw-r--r--usr.bin/rwall/rwall.c4
-rw-r--r--usr.bin/truss/amd64-freebsd.c4
-rw-r--r--usr.bin/truss/amd64-freebsd32.c4
-rw-r--r--usr.bin/truss/amd64-linux.c4
-rw-r--r--usr.bin/truss/amd64-linux32.c4
-rw-r--r--usr.bin/truss/arm-freebsd.c4
-rw-r--r--usr.bin/truss/extern.h4
-rw-r--r--usr.bin/truss/i386-freebsd.c4
-rw-r--r--usr.bin/truss/i386-linux.c4
-rw-r--r--usr.bin/truss/main.c2
-rw-r--r--usr.bin/truss/mips-freebsd.c4
-rw-r--r--usr.bin/truss/setup.c2
-rw-r--r--usr.bin/truss/sparc64-freebsd.c4
-rw-r--r--usr.bin/truss/syscalls.c4
-rw-r--r--usr.bin/uname/uname.c2
-rw-r--r--usr.sbin/ancontrol/ancontrol.c4
-rw-r--r--usr.sbin/dconschat/dconschat.c4
-rw-r--r--usr.sbin/fwcontrol/fwcontrol.c4
-rw-r--r--usr.sbin/fwcontrol/fwdv.c4
-rw-r--r--usr.sbin/fwcontrol/fwmpegts.c4
-rw-r--r--usr.sbin/kldxref/ef.c4
-rw-r--r--usr.sbin/kldxref/ef_obj.c4
-rw-r--r--usr.sbin/kldxref/kldxref.c4
-rw-r--r--usr.sbin/lpr/common_source/common.c4
-rw-r--r--usr.sbin/lpr/common_source/net.c4
-rw-r--r--usr.sbin/lpr/common_source/printcap.c4
-rw-r--r--usr.sbin/lpr/lpr/lpr.c4
-rw-r--r--usr.sbin/makefs/ffs.c4
-rw-r--r--usr.sbin/manctl/manctl.sh2
-rw-r--r--usr.sbin/ndiscvt/inf-parse.y4
-rw-r--r--usr.sbin/ndiscvt/inf-token.l4
-rw-r--r--usr.sbin/ndiscvt/inf.c4
-rw-r--r--usr.sbin/ndiscvt/ndiscvt.c2
-rw-r--r--usr.sbin/ndiscvt/ndisgen.sh2
-rw-r--r--usr.sbin/ndiscvt/windrv_stub.c2
-rw-r--r--usr.sbin/rpc.lockd/lock_proc.c4
-rw-r--r--usr.sbin/rpc.lockd/lockd.c4
-rw-r--r--usr.sbin/rpc.lockd/lockd.h4
-rw-r--r--usr.sbin/rpc.lockd/lockd_lock.c4
-rw-r--r--usr.sbin/rpc.statd/file.c4
-rw-r--r--usr.sbin/rpc.statd/procs.c4
-rw-r--r--usr.sbin/rpc.statd/statd.c4
-rw-r--r--usr.sbin/rpc.statd/statd.h4
-rw-r--r--usr.sbin/rpc.yppasswdd/yppasswdd_extern.h4
-rw-r--r--usr.sbin/rpc.yppasswdd/yppasswdd_main.c2
-rw-r--r--usr.sbin/rpc.yppasswdd/yppasswdd_server.c4
-rw-r--r--usr.sbin/rpc.ypupdated/yp_dbdelete.c4
-rw-r--r--usr.sbin/rpc.ypupdated/yp_dbupdate.c4
-rw-r--r--usr.sbin/rpc.ypupdated/ypupdated_main.c4
-rw-r--r--usr.sbin/rpc.ypupdated/ypupdated_server.c4
-rw-r--r--usr.sbin/rpc.ypxfrd/ypxfrd_extern.h4
-rw-r--r--usr.sbin/rpc.ypxfrd/ypxfrd_main.c4
-rw-r--r--usr.sbin/rpc.ypxfrd/ypxfrd_server.c4
-rw-r--r--usr.sbin/rrenumd/rrenumd.h4
-rw-r--r--usr.sbin/wpa/ndis_events/ndis_events.c2
-rw-r--r--usr.sbin/wpa/wpa_supplicant/Packet32.c2
-rw-r--r--usr.sbin/wpa/wpa_supplicant/Packet32.h2
-rw-r--r--usr.sbin/yp_mkdb/yp_mkdb.c4
-rw-r--r--usr.sbin/ypbind/yp_ping.c2
-rw-r--r--usr.sbin/yppush/yppush_main.c4
-rw-r--r--usr.sbin/ypserv/yp_access.c4
-rw-r--r--usr.sbin/ypserv/yp_dblookup.c4
-rw-r--r--usr.sbin/ypserv/yp_dnslookup.c4
-rw-r--r--usr.sbin/ypserv/yp_error.c4
-rw-r--r--usr.sbin/ypserv/yp_extern.h4
-rw-r--r--usr.sbin/ypserv/yp_main.c4
-rw-r--r--usr.sbin/ypserv/yp_server.c4
-rw-r--r--usr.sbin/ypserv/yp_svc_udp.c4
363 files changed, 842 insertions, 114 deletions
diff --git a/lib/libc/arm/gen/fabs.c b/lib/libc/arm/gen/fabs.c
index 8bb15025aead..6730a6746289 100644
--- a/lib/libc/arm/gen/fabs.c
+++ b/lib/libc/arm/gen/fabs.c
@@ -1,6 +1,8 @@
/* $NetBSD: fabs.c,v 1.2 2002/05/26 11:48:01 wiz Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996 Mark Brinicombe
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/locale/euc.c b/lib/libc/locale/euc.c
index 2fe40462e9be..f5b5fd473068 100644
--- a/lib/libc/locale/euc.c
+++ b/lib/libc/locale/euc.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
diff --git a/lib/libc/mips/SYS.h b/lib/libc/mips/SYS.h
index ceb68121b07d..99d3b470fa92 100644
--- a/lib/libc/mips/SYS.h
+++ b/lib/libc/mips/SYS.h
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996 Jonathan Stone
* All rights reserved.
*
diff --git a/lib/libc/mips/gen/fabs.c b/lib/libc/mips/gen/fabs.c
index 8bb15025aead..6730a6746289 100644
--- a/lib/libc/mips/gen/fabs.c
+++ b/lib/libc/mips/gen/fabs.c
@@ -1,6 +1,8 @@
/* $NetBSD: fabs.c,v 1.2 2002/05/26 11:48:01 wiz Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996 Mark Brinicombe
*
* Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/net/ether_addr.c b/lib/libc/net/ether_addr.c
index 19aa6f64e8c4..98e5398096ff 100644
--- a/lib/libc/net/ether_addr.c
+++ b/lib/libc/net/ether_addr.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Bill Paul <wpaul@ctr.columbia.edu>.
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libc/rpc/crypt_client.c b/lib/libc/rpc/crypt_client.c
index b7f0d1fff48c..c2ed109e10bb 100644
--- a/lib/libc/rpc/crypt_client.c
+++ b/lib/libc/rpc/crypt_client.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/lib/libcam/camlib.h b/lib/libcam/camlib.h
index 5c14740c6ed8..4aab63b31952 100644
--- a/lib/libcam/camlib.h
+++ b/lib/libcam/camlib.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, 1998 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/lib/libcam/scsi_cmdparse.c b/lib/libcam/scsi_cmdparse.c
index 4561b0b7e86c..b123d2747ca9 100644
--- a/lib/libcam/scsi_cmdparse.c
+++ b/lib/libcam/scsi_cmdparse.c
@@ -1,7 +1,10 @@
/*
* Taken from the original FreeBSD user SCSI library.
*/
-/* Copyright (c) 1994 HD Associates
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
+ * Copyright (c) 1994 HD Associates
* (contact: dufault@hda.com)
* All rights reserved.
*
diff --git a/lib/libkiconv/xlat16_sysctl.c b/lib/libkiconv/xlat16_sysctl.c
index ae4dae7a5158..4eb6a681584e 100644
--- a/lib/libkiconv/xlat16_sysctl.c
+++ b/lib/libkiconv/xlat16_sysctl.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000-2001, Boris Popov
* All rights reserved.
*
diff --git a/lib/libprocstat/cd9660.c b/lib/libprocstat/cd9660.c
index cc3c363f7bed..26e0b732eb55 100644
--- a/lib/libprocstat/cd9660.c
+++ b/lib/libprocstat/cd9660.c
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000 Peter Edwards
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libprocstat/common_kvm.c b/lib/libprocstat/common_kvm.c
index 4ca25145b75d..2889f802775d 100644
--- a/lib/libprocstat/common_kvm.c
+++ b/lib/libprocstat/common_kvm.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c
index d5961c6af990..450ccdb5481f 100644
--- a/lib/libprocstat/libprocstat.c
+++ b/lib/libprocstat/libprocstat.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2017 Dell EMC
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
* Copyright (c) 1988, 1993
diff --git a/lib/libprocstat/msdosfs.c b/lib/libprocstat/msdosfs.c
index 84b437e6c95a..87906423f9b6 100644
--- a/lib/libprocstat/msdosfs.c
+++ b/lib/libprocstat/msdosfs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000 Peter Edwards
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/lib/librpcsvc/yp_passwd.c b/lib/librpcsvc/yp_passwd.c
index e7c59145fa2e..b8d99a66ab59 100644
--- a/lib/librpcsvc/yp_passwd.c
+++ b/lib/librpcsvc/yp_passwd.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/lib/librpcsvc/yp_update.c b/lib/librpcsvc/yp_update.c
index 1d2848d4ea61..081ef4f547f7 100644
--- a/lib/librpcsvc/yp_update.c
+++ b/lib/librpcsvc/yp_update.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/lib/libthr/sys/thr_error.c b/lib/libthr/sys/thr_error.c
index 852588a21092..922d818c3ca8 100644
--- a/lib/libthr/sys/thr_error.c
+++ b/lib/libthr/sys/thr_error.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* Copyright (c) 1994 by Chris Provenzano, proven@mit.edu
* All rights reserved.
diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c
index a79048325104..4a5b4afc93ee 100644
--- a/lib/libthr/thread/thr_attr.c
+++ b/lib/libthr/thread/thr_attr.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003 Craig Rodrigues <rodrigc@attbi.com>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_autoinit.c b/lib/libthr/thread/thr_autoinit.c
index 7d9e52cc6ee4..d741f3cf1af7 100644
--- a/lib/libthr/thread/thr_autoinit.c
+++ b/lib/libthr/thread/thr_autoinit.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2002 Alfred Perlstein <alfred@freebsd.org>.
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
diff --git a/lib/libthr/thread/thr_concurrency.c b/lib/libthr/thread/thr_concurrency.c
index 24714e6cbd3d..9f60dca1e445 100644
--- a/lib/libthr/thread/thr_concurrency.c
+++ b/lib/libthr/thread/thr_concurrency.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003 Sergey Osokin <osa@FreeBSD.org.ru>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_getschedparam.c b/lib/libthr/thread/thr_getschedparam.c
index 04ff3991b9cc..8301b4bf8743 100644
--- a/lib/libthr/thread/thr_getschedparam.c
+++ b/lib/libthr/thread/thr_getschedparam.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c
index 909f14236d17..65f7d111f73d 100644
--- a/lib/libthr/thread/thr_init.c
+++ b/lib/libthr/thread/thr_init.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003 Daniel M. Eischen <deischen@freebsd.org>
* Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c
index 4ab7720b665b..f3f815c99684 100644
--- a/lib/libthr/thread/thr_mutex.c
+++ b/lib/libthr/thread/thr_mutex.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* Copyright (c) 2006 David Xu <davidxu@freebsd.org>.
* Copyright (c) 2015, 2016 The FreeBSD Foundation
diff --git a/lib/libthr/thread/thr_setschedparam.c b/lib/libthr/thread/thr_setschedparam.c
index 4db09e759ec4..cf2c1f919e12 100644
--- a/lib/libthr/thread/thr_setschedparam.c
+++ b/lib/libthr/thread/thr_setschedparam.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
* All rights reserved.
*
diff --git a/lib/libthr/thread/thr_switch_np.c b/lib/libthr/thread/thr_switch_np.c
index 4380386e09f1..aad8641e4806 100644
--- a/lib/libthr/thread/thr_switch_np.c
+++ b/lib/libthr/thread/thr_switch_np.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
* All rights reserved.
*
diff --git a/lib/msun/bsdsrc/b_exp.c b/lib/msun/bsdsrc/b_exp.c
index 4400992795b6..f922d02a03aa 100644
--- a/lib/msun/bsdsrc/b_exp.c
+++ b/lib/msun/bsdsrc/b_exp.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/msun/bsdsrc/b_log.c b/lib/msun/bsdsrc/b_log.c
index 5a4b9644f7b3..04a92522d5a0 100644
--- a/lib/msun/bsdsrc/b_log.c
+++ b/lib/msun/bsdsrc/b_log.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/msun/bsdsrc/b_tgamma.c b/lib/msun/bsdsrc/b_tgamma.c
index 1d0af4432863..832a729c20f8 100644
--- a/lib/msun/bsdsrc/b_tgamma.c
+++ b/lib/msun/bsdsrc/b_tgamma.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/lib/msun/bsdsrc/mathimpl.h b/lib/msun/bsdsrc/mathimpl.h
index 04a4b6e3d788..abf299658615 100644
--- a/lib/msun/bsdsrc/mathimpl.h
+++ b/lib/msun/bsdsrc/mathimpl.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/libexec/mknetid/hash.c b/libexec/mknetid/hash.c
index b4a39cbc12ec..d340142aad90 100644
--- a/libexec/mknetid/hash.c
+++ b/libexec/mknetid/hash.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/mknetid/hash.h b/libexec/mknetid/hash.h
index 7918ae2e95f0..c1cf98cb2765 100644
--- a/libexec/mknetid/hash.h
+++ b/libexec/mknetid/hash.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/mknetid/mknetid.c b/libexec/mknetid/mknetid.c
index 66868664c3c5..3a39b4b3e675 100644
--- a/libexec/mknetid/mknetid.c
+++ b/libexec/mknetid/mknetid.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/revnetgroup/hash.c b/libexec/revnetgroup/hash.c
index 118008023551..2dd1a3f91d74 100644
--- a/libexec/revnetgroup/hash.c
+++ b/libexec/revnetgroup/hash.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/revnetgroup/hash.h b/libexec/revnetgroup/hash.h
index 2485901ed68e..b12c91e8d293 100644
--- a/libexec/revnetgroup/hash.h
+++ b/libexec/revnetgroup/hash.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/revnetgroup/revnetgroup.c b/libexec/revnetgroup/revnetgroup.c
index 505c482b3be8..11fba515a7ba 100644
--- a/libexec/revnetgroup/revnetgroup.c
+++ b/libexec/revnetgroup/revnetgroup.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/ypxfr/yp_dbwrite.c b/libexec/ypxfr/yp_dbwrite.c
index 488f9e4ad446..120e6748b609 100644
--- a/libexec/ypxfr/yp_dbwrite.c
+++ b/libexec/ypxfr/yp_dbwrite.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/ypxfr/ypxfr_extern.h b/libexec/ypxfr/ypxfr_extern.h
index f843b645b6dd..6929bf38f27e 100644
--- a/libexec/ypxfr/ypxfr_extern.h
+++ b/libexec/ypxfr/ypxfr_extern.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/ypxfr/ypxfr_getmap.c b/libexec/ypxfr/ypxfr_getmap.c
index 1bde10efe3d4..5fc45b327d85 100644
--- a/libexec/ypxfr/ypxfr_getmap.c
+++ b/libexec/ypxfr/ypxfr_getmap.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/ypxfr/ypxfr_main.c b/libexec/ypxfr/ypxfr_main.c
index 03ebbe12fcaf..d7eb75a94c51 100644
--- a/libexec/ypxfr/ypxfr_main.c
+++ b/libexec/ypxfr/ypxfr_main.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/ypxfr/ypxfr_misc.c b/libexec/ypxfr/ypxfr_misc.c
index 323fd53cf9cd..3ee3ff58b8d5 100644
--- a/libexec/ypxfr/ypxfr_misc.c
+++ b/libexec/ypxfr/ypxfr_misc.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/libexec/ypxfr/ypxfrd_getmap.c b/libexec/ypxfr/ypxfrd_getmap.c
index a5ac92da578d..2358b68b9be2 100644
--- a/libexec/ypxfr/ypxfrd_getmap.c
+++ b/libexec/ypxfr/ypxfrd_getmap.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/release/picobsd/tinyware/login/pathnames.h b/release/picobsd/tinyware/login/pathnames.h
index 333c2ca280fa..1984631aa944 100644
--- a/release/picobsd/tinyware/login/pathnames.h
+++ b/release/picobsd/tinyware/login/pathnames.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/release/picobsd/tinyware/login/pico-login.c b/release/picobsd/tinyware/login/pico-login.c
index e540ca861a51..080954c8bfcd 100644
--- a/release/picobsd/tinyware/login/pico-login.c
+++ b/release/picobsd/tinyware/login/pico-login.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/release/picobsd/tinyware/passwd/extern.h b/release/picobsd/tinyware/passwd/extern.h
index eae768c6e82a..0c6c9f505ec6 100644
--- a/release/picobsd/tinyware/passwd/extern.h
+++ b/release/picobsd/tinyware/passwd/extern.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/release/picobsd/tinyware/passwd/local_passwd.c b/release/picobsd/tinyware/passwd/local_passwd.c
index 33af88ac38c7..41b6fe998443 100644
--- a/release/picobsd/tinyware/passwd/local_passwd.c
+++ b/release/picobsd/tinyware/passwd/local_passwd.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/release/picobsd/tinyware/passwd/passwd.c b/release/picobsd/tinyware/passwd/passwd.c
index 42ebd8c1fd48..419396390afe 100644
--- a/release/picobsd/tinyware/passwd/passwd.c
+++ b/release/picobsd/tinyware/passwd/passwd.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/release/picobsd/tinyware/passwd/pw_copy.c b/release/picobsd/tinyware/passwd/pw_copy.c
index 753e1a67ff81..7586980e4a55 100644
--- a/release/picobsd/tinyware/passwd/pw_copy.c
+++ b/release/picobsd/tinyware/passwd/pw_copy.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/release/picobsd/tinyware/passwd/pw_util.c b/release/picobsd/tinyware/passwd/pw_util.c
index 1c163d2d57ed..cfab6e115269 100644
--- a/release/picobsd/tinyware/passwd/pw_util.c
+++ b/release/picobsd/tinyware/passwd/pw_util.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/release/picobsd/tinyware/passwd/pw_util.h b/release/picobsd/tinyware/passwd/pw_util.h
index 1000a9abdc7f..d441b1907966 100644
--- a/release/picobsd/tinyware/passwd/pw_util.h
+++ b/release/picobsd/tinyware/passwd/pw_util.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index 83df67ae0fe3..f013cde3ef09 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994, 1995 Gordon W. Ross
* Copyright (c) 1994 Theo de Raadt
* All rights reserved.
diff --git a/sbin/etherswitchcfg/ifmedia.c b/sbin/etherswitchcfg/ifmedia.c
index b9bd3b9c56ff..fd2a7fb86db2 100644
--- a/sbin/etherswitchcfg/ifmedia.c
+++ b/sbin/etherswitchcfg/ifmedia.c
@@ -1,7 +1,9 @@
/* $NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $ */
/* $FreeBSD$ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997 Jason R. Thorpe.
* All rights reserved.
*
diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c
index 1c082aba8fb0..5e08d35e5d91 100644
--- a/sbin/ffsinfo/ffsinfo.c
+++ b/sbin/ffsinfo/ffsinfo.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
* Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
* All rights reserved.
diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c
index 9a320ecd89ee..e0dfc997fcf6 100644
--- a/sbin/growfs/debug.c
+++ b/sbin/growfs/debug.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
* Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
* All rights reserved.
diff --git a/sbin/growfs/debug.h b/sbin/growfs/debug.h
index 3cad9d97874c..068e89c3441f 100644
--- a/sbin/growfs/debug.h
+++ b/sbin/growfs/debug.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
* Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
* All rights reserved.
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index 2e8271b39d5d..7670317caae7 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
* Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
* Copyright (c) 2012 The FreeBSD Foundation
diff --git a/sbin/gvinum/gvinum.h b/sbin/gvinum/gvinum.h
index 8b72eea7834f..e9c112a5e936 100644
--- a/sbin/gvinum/gvinum.h
+++ b/sbin/gvinum/gvinum.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998
* Nan Yang Computer Services Limited. All rights reserved.
*
diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c
index abcad7f368c7..0c586331bbec 100644
--- a/sbin/ifconfig/ifmedia.c
+++ b/sbin/ifconfig/ifmedia.c
@@ -1,7 +1,9 @@
/* $NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $ */
/* $FreeBSD$ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997 Jason R. Thorpe.
* All rights reserved.
*
diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c
index 3b37160c3c85..a29c50f11efa 100644
--- a/sbin/ifconfig/ifvlan.c
+++ b/sbin/ifconfig/ifvlan.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1999 Bill Paul <wpaul@ctr.columbia.edu>
* Copyright (c) 2012 ADARA Networks, Inc.
* All rights reserved.
diff --git a/sbin/rcorder/ealloc.c b/sbin/rcorder/ealloc.c
index 997119315531..eae8bb67d69a 100644
--- a/sbin/rcorder/ealloc.c
+++ b/sbin/rcorder/ealloc.c
@@ -1,7 +1,9 @@
/* $FreeBSD$ */
/* $NetBSD: ealloc.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1989 by Berkeley Softworks
diff --git a/sbin/rcorder/hash.c b/sbin/rcorder/hash.c
index 34b95ce82f7a..3dcb77054960 100644
--- a/sbin/rcorder/hash.c
+++ b/sbin/rcorder/hash.c
@@ -1,7 +1,9 @@
/* $FreeBSD$ */
/* $NetBSD: hash.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
diff --git a/sbin/rcorder/hash.h b/sbin/rcorder/hash.h
index fd2f9783377b..d190633861a0 100644
--- a/sbin/rcorder/hash.h
+++ b/sbin/rcorder/hash.h
@@ -1,7 +1,9 @@
/* $FreeBSD$ */
/* $NetBSD: hash.h,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
diff --git a/sbin/rcorder/sprite.h b/sbin/rcorder/sprite.h
index 5e5d7f3640f7..e311ee6e0f66 100644
--- a/sbin/rcorder/sprite.h
+++ b/sbin/rcorder/sprite.h
@@ -1,6 +1,8 @@
/* $NetBSD: sprite.h,v 1.1 1999/11/23 05:28:22 mrg Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1989 by Berkeley Softworks
@@ -38,6 +40,7 @@
* SUCH DAMAGE.
*
* from: @(#)sprite.h 8.1 (Berkeley) 6/6/93
+ * $FreeBSD$
*/
/*
diff --git a/sys/amd64/amd64/in_cksum.c b/sys/amd64/amd64/in_cksum.c
index ae02e91d9203..30e90f043cc3 100644
--- a/sys/amd64/amd64/in_cksum.c
+++ b/sys/amd64/amd64/in_cksum.c
@@ -1,6 +1,8 @@
/* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1988, 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1996
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 4ce0285b1fa6..3175616d0ce0 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003 Peter Wemm.
* Copyright (c) 1992 Terrence R. Lambert.
* Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index e93936685347..f200a34af6c8 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index e5a69d715a7b..35cded01ecce 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1994, David Greenman
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index fae37d731b06..24fc65a4af3c 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1982, 1986 The Regents of the University of California.
* Copyright (c) 1989, 1990 William Jolitz
* Copyright (c) 1994 John Dyson
diff --git a/sys/amd64/ia32/ia32_syscall.c b/sys/amd64/ia32/ia32_syscall.c
index c07b38cb438a..22d6f211fb41 100644
--- a/sys/amd64/ia32/ia32_syscall.c
+++ b/sys/amd64/ia32/ia32_syscall.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1994, David Greenman
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/amd64/include/floatingpoint.h b/sys/amd64/include/floatingpoint.h
index cda9e46230ca..b7c154743d0c 100644
--- a/sys/amd64/include/floatingpoint.h
+++ b/sys/amd64/include/floatingpoint.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993 Andrew Moore, Talke Studio
* All rights reserved.
*
diff --git a/sys/amd64/include/ieeefp.h b/sys/amd64/include/ieeefp.h
index a40366092d57..df2263098f46 100644
--- a/sys/amd64/include/ieeefp.h
+++ b/sys/amd64/include/ieeefp.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003 Peter Wemm.
* Copyright (c) 1990 Andrew Moore, Talke Studio
* All rights reserved.
diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h
index 23fce271e901..86f7e08d9725 100644
--- a/sys/amd64/include/param.h
+++ b/sys/amd64/include/param.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2002 David E. O'Brien. All rights reserved.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/amd64/include/varargs.h b/sys/amd64/include/varargs.h
index 93faac6a84dd..8d1d7d7e1f38 100644
--- a/sys/amd64/include/varargs.h
+++ b/sys/amd64/include/varargs.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2002 David E. O'Brien. All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h
index 381097adf8b1..6d63201c6581 100644
--- a/sys/amd64/include/vmparam.h
+++ b/sys/amd64/include/vmparam.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/arm/arm/autoconf.c b/sys/arm/arm/autoconf.c
index f18f67dcda8f..3b9036200406 100644
--- a/sys/arm/arm/autoconf.c
+++ b/sys/arm/arm/autoconf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/arm/arm/in_cksum.c b/sys/arm/arm/in_cksum.c
index 3bce65018397..d37c68720d2a 100644
--- a/sys/arm/arm/in_cksum.c
+++ b/sys/arm/arm/in_cksum.c
@@ -1,6 +1,8 @@
/* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1988, 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1996
diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c
index bebae6c703af..f16c884637c8 100644
--- a/sys/arm/arm/vm_machdep.c
+++ b/sys/arm/arm/vm_machdep.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1982, 1986 The Regents of the University of California.
* Copyright (c) 1989, 1990 William Jolitz
* Copyright (c) 1994 John Dyson
diff --git a/sys/arm/include/_align.h b/sys/arm/include/_align.h
index e382fe2ac311..8b575ceca082 100644
--- a/sys/arm/include/_align.h
+++ b/sys/arm/include/_align.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 David E. O'Brien
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h
index 204d8b3c42c5..de299e9bb680 100644
--- a/sys/arm/include/_types.h
+++ b/sys/arm/include/_types.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/arm/include/floatingpoint.h b/sys/arm/include/floatingpoint.h
index fd328a9d739b..b1c28e91d79e 100644
--- a/sys/arm/include/floatingpoint.h
+++ b/sys/arm/include/floatingpoint.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993 Andrew Moore, Talke Studio
* All rights reserved.
*
diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h
index 6c20dd28716b..39dcc5e341bf 100644
--- a/sys/arm/include/param.h
+++ b/sys/arm/include/param.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 David E. O'Brien
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/arm/include/proc.h b/sys/arm/include/proc.h
index fc4b31eabac1..94855b6f60e7 100644
--- a/sys/arm/include/proc.h
+++ b/sys/arm/include/proc.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/arm/include/profile.h b/sys/arm/include/profile.h
index 49769a93ee82..a4973175f3bd 100644
--- a/sys/arm/include/profile.h
+++ b/sys/arm/include/profile.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/arm/include/reloc.h b/sys/arm/include/reloc.h
index df4a126eb1a9..688475703225 100644
--- a/sys/arm/include/reloc.h
+++ b/sys/arm/include/reloc.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c
index b707a18d3e87..686d417d00fc 100644
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000 Dag-Erling Coïdan Smørgrav
* Copyright (c) 1999 Pierre Beyssac
* Copyright (c) 1993 Jan-Simon Pendry
diff --git a/sys/compat/ndis/cfg_var.h b/sys/compat/ndis/cfg_var.h
index 1fb44ce268a1..ff40a85926be 100644
--- a/sys/compat/ndis/cfg_var.h
+++ b/sys/compat/ndis/cfg_var.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/hal_var.h b/sys/compat/ndis/hal_var.h
index 699b01ca0efd..f8864e2e7071 100644
--- a/sys/compat/ndis/hal_var.h
+++ b/sys/compat/ndis/hal_var.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c
index fb9dcaaf7a8d..0542f40cd877 100644
--- a/sys/compat/ndis/kern_ndis.c
+++ b/sys/compat/ndis/kern_ndis.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/kern_windrv.c b/sys/compat/ndis/kern_windrv.c
index 5572988ca3d4..597b8362b37e 100644
--- a/sys/compat/ndis/kern_windrv.c
+++ b/sys/compat/ndis/kern_windrv.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/ndis_var.h b/sys/compat/ndis/ndis_var.h
index 92e62a1fbdbc..0782853cf661 100644
--- a/sys/compat/ndis/ndis_var.h
+++ b/sys/compat/ndis/ndis_var.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/ntoskrnl_var.h b/sys/compat/ndis/ntoskrnl_var.h
index 48ddcd9d8baf..9c8c19964504 100644
--- a/sys/compat/ndis/ntoskrnl_var.h
+++ b/sys/compat/ndis/ntoskrnl_var.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/pe_var.h b/sys/compat/ndis/pe_var.h
index 9729f0b5e4bf..2e5758c592e1 100644
--- a/sys/compat/ndis/pe_var.h
+++ b/sys/compat/ndis/pe_var.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/resource_var.h b/sys/compat/ndis/resource_var.h
index 5ce096c08e02..b06a2e09f910 100644
--- a/sys/compat/ndis/resource_var.h
+++ b/sys/compat/ndis/resource_var.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/subr_hal.c b/sys/compat/ndis/subr_hal.c
index 7bb3f28e6caf..ea30675d66b0 100644
--- a/sys/compat/ndis/subr_hal.c
+++ b/sys/compat/ndis/subr_hal.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/subr_ndis.c b/sys/compat/ndis/subr_ndis.c
index 98a0a284ce8f..e1ba8cc12cd6 100644
--- a/sys/compat/ndis/subr_ndis.c
+++ b/sys/compat/ndis/subr_ndis.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/subr_ntoskrnl.c b/sys/compat/ndis/subr_ntoskrnl.c
index cfa97275d7ee..5bf3e7aeee49 100644
--- a/sys/compat/ndis/subr_ntoskrnl.c
+++ b/sys/compat/ndis/subr_ntoskrnl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/subr_pe.c b/sys/compat/ndis/subr_pe.c
index 47bef25499c1..1cd698fdd51c 100644
--- a/sys/compat/ndis/subr_pe.c
+++ b/sys/compat/ndis/subr_pe.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/subr_usbd.c b/sys/compat/ndis/subr_usbd.c
index eca2708bfc1a..2c877ea533a5 100644
--- a/sys/compat/ndis/subr_usbd.c
+++ b/sys/compat/ndis/subr_usbd.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/usbd_var.h b/sys/compat/ndis/usbd_var.h
index 019bd32a9715..6566a29d52d6 100644
--- a/sys/compat/ndis/usbd_var.h
+++ b/sys/compat/ndis/usbd_var.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/an/if_aironet_ieee.h b/sys/dev/an/if_aironet_ieee.h
index 28e4f72148e9..bc1247e041a2 100644
--- a/sys/dev/an/if_aironet_ieee.h
+++ b/sys/dev/an/if_aironet_ieee.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index cae604c055c1..c1871e513d4d 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/an/if_an_isa.c b/sys/dev/an/if_an_isa.c
index 19e5cd07552d..a6d3c81d52da 100644
--- a/sys/dev/an/if_an_isa.c
+++ b/sys/dev/an/if_an_isa.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c
index 6f26d7a39035..4c9f94350ec9 100644
--- a/sys/dev/an/if_an_pccard.c
+++ b/sys/dev/an/if_an_pccard.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/an/if_an_pci.c b/sys/dev/an/if_an_pci.c
index db658cfa6139..5fa071e0f8b7 100644
--- a/sys/dev/an/if_an_pci.c
+++ b/sys/dev/an/if_an_pci.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/an/if_anreg.h b/sys/dev/an/if_anreg.h
index ee69b8856019..b9a6d523cb10 100644
--- a/sys/dev/an/if_anreg.h
+++ b/sys/dev/an/if_anreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 929bedc5ee0a..1edf2a274632 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
* Bill Paul <wpaul@windriver.com>. All rights reserved.
diff --git a/sys/dev/bge/if_bgereg.h b/sys/dev/bge/if_bgereg.h
index 0cf9ca18c9bc..eb7686e70d05 100644
--- a/sys/dev/bge/if_bgereg.h
+++ b/sys/dev/bge/if_bgereg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
* Bill Paul <wpaul@windriver.com>. All rights reserved.
diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index f96a9b360bb2..8b28d462a5b3 100644
--- a/sys/dev/dc/dcphy.c
+++ b/sys/dev/dc/dcphy.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index 421e326d256c..dba0f642906e 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/dc/if_dcreg.h b/sys/dev/dc/if_dcreg.h
index e290881fa017..9ae26cc6e59f 100644
--- a/sys/dev/dc/if_dcreg.h
+++ b/sys/dev/dc/if_dcreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c
index f8d31de782ef..f2da30cc6cf0 100644
--- a/sys/dev/dc/pnphy.c
+++ b/sys/dev/dc/pnphy.c
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/dcons/dcons.c b/sys/dev/dcons/dcons.c
index da5183e15cd3..07dda2940621 100644
--- a/sys/dev/dcons/dcons.c
+++ b/sys/dev/dcons/dcons.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 2003,2004
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/dcons/dcons.h b/sys/dev/dcons/dcons.h
index e613f5bbe51d..c7ade863b6ef 100644
--- a/sys/dev/dcons/dcons.h
+++ b/sys/dev/dcons/dcons.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 2002-2004
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/dcons/dcons_crom.c b/sys/dev/dcons/dcons_crom.c
index cb206752be9f..1fa7dcb92efe 100644
--- a/sys/dev/dcons/dcons_crom.c
+++ b/sys/dev/dcons/dcons_crom.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/dcons/dcons_os.c b/sys/dev/dcons/dcons_os.c
index 01e61663e5b0..3b17ffeaa5c4 100644
--- a/sys/dev/dcons/dcons_os.c
+++ b/sys/dev/dcons/dcons_os.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 2003,2004
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/dcons/dcons_os.h b/sys/dev/dcons/dcons_os.h
index bd6dfeff8009..7421b4734d78 100644
--- a/sys/dev/dcons/dcons_os.h
+++ b/sys/dev/dcons/dcons_os.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 2002-2004
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/fwcrom.c b/sys/dev/firewire/fwcrom.c
index e53d3b678cd6..251173a7e71b 100644
--- a/sys/dev/firewire/fwcrom.c
+++ b/sys/dev/firewire/fwcrom.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/fwdma.c b/sys/dev/firewire/fwdma.c
index 45598f2828d7..27599c41bdf8 100644
--- a/sys/dev/firewire/fwdma.c
+++ b/sys/dev/firewire/fwdma.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/fwdma.h b/sys/dev/firewire/fwdma.h
index ec67971ad229..dfa942d91448 100644
--- a/sys/dev/firewire/fwdma.h
+++ b/sys/dev/firewire/fwdma.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/fwmem.c b/sys/dev/firewire/fwmem.c
index 034481d086d0..2faa4d3d3618 100644
--- a/sys/dev/firewire/fwmem.c
+++ b/sys/dev/firewire/fwmem.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/fwmem.h b/sys/dev/firewire/fwmem.h
index de717947e844..f79dec68eccf 100644
--- a/sys/dev/firewire/fwmem.h
+++ b/sys/dev/firewire/fwmem.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/fwphyreg.h b/sys/dev/firewire/fwphyreg.h
index c54881e582b4..6b9c11e8cc60 100644
--- a/sys/dev/firewire/fwphyreg.h
+++ b/sys/dev/firewire/fwphyreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index 07b41ef6230b..3541d199c0b2 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/if_fwevar.h b/sys/dev/firewire/if_fwevar.h
index 4b8eb76d0605..cb043cb35481 100644
--- a/sys/dev/firewire/if_fwevar.h
+++ b/sys/dev/firewire/if_fwevar.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
index 3928ef13ae5b..bc72709a3915 100644
--- a/sys/dev/firewire/if_fwip.c
+++ b/sys/dev/firewire/if_fwip.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2004
* Doug Rabson
* Copyright (c) 2002-2003
diff --git a/sys/dev/firewire/if_fwipvar.h b/sys/dev/firewire/if_fwipvar.h
index 57e7904b5f81..acf6fb93598b 100644
--- a/sys/dev/firewire/if_fwipvar.h
+++ b/sys/dev/firewire/if_fwipvar.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2004
* Doug Rabson
* Copyright (c) 2002-2003
diff --git a/sys/dev/firewire/sbp_targ.c b/sys/dev/firewire/sbp_targ.c
index cf4457d3ac41..f1b302528213 100644
--- a/sys/dev/firewire/sbp_targ.c
+++ b/sys/dev/firewire/sbp_targ.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/ic/i82586.h b/sys/dev/ic/i82586.h
index d594730a0dd5..8a0f9dc4356e 100644
--- a/sys/dev/ic/i82586.h
+++ b/sys/dev/ic/i82586.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1992, University of Vermont and State Agricultural College.
* Copyright (c) 1992, Garrett A. Wollman.
* All rights reserved.
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index 6083d9778c01..c0a4a3cc1907 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c
index 7cbc0cef8753..36d52986691d 100644
--- a/sys/dev/if_ndis/if_ndis_pccard.c
+++ b/sys/dev/if_ndis/if_ndis_pccard.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c
index bf2f313023df..b9d860f9d889 100644
--- a/sys/dev/if_ndis/if_ndis_pci.c
+++ b/sys/dev/if_ndis/if_ndis_pci.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/if_ndis/if_ndis_usb.c b/sys/dev/if_ndis/if_ndis_usb.c
index a9a8d67aabde..d88dc59c1968 100644
--- a/sys/dev/if_ndis/if_ndis_usb.c
+++ b/sys/dev/if_ndis/if_ndis_usb.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/if_ndis/if_ndisvar.h b/sys/dev/if_ndis/if_ndisvar.h
index 7259127aa34c..0182e15f6e2a 100644
--- a/sys/dev/if_ndis/if_ndisvar.h
+++ b/sys/dev/if_ndis/if_ndisvar.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index 115d2fa74729..dba01794b139 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
* Bill Paul <william.paul@windriver.com>. All rights reserved.
diff --git a/sys/dev/lge/if_lgereg.h b/sys/dev/lge/if_lgereg.h
index bb794c2fad6e..e5e8893fb733 100644
--- a/sys/dev/lge/if_lgereg.h
+++ b/sys/dev/lge/if_lgereg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
* Bill Paul <wpaul@bsdi.com>. All rights reserved.
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index ae3827db9a22..bd6b75e2b2b0 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/amphyreg.h b/sys/dev/mii/amphyreg.h
index 6cdbc95647b5..30bac3028b05 100644
--- a/sys/dev/mii/amphyreg.h
+++ b/sys/dev/mii/amphyreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index eea3588f7038..6d77b11a1e7a 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/brgphyreg.h b/sys/dev/mii/brgphyreg.h
index b3535d59fbc2..5cceb392a02b 100644
--- a/sys/dev/mii/brgphyreg.h
+++ b/sys/dev/mii/brgphyreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index 2d2816cddf0a..b91b19f8c89a 100644
--- a/sys/dev/mii/ciphy.c
+++ b/sys/dev/mii/ciphy.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2004
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/mii/ciphyreg.h b/sys/dev/mii/ciphyreg.h
index dd73f87783dc..ce91db480ada 100644
--- a/sys/dev/mii/ciphyreg.h
+++ b/sys/dev/mii/ciphyreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2004
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index 89b4f2cc0b48..486a2fa0241d 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/nsgphyreg.h b/sys/dev/mii/nsgphyreg.h
index 44899191715e..02dff78b97c8 100644
--- a/sys/dev/mii/nsgphyreg.h
+++ b/sys/dev/mii/nsgphyreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 2001
* Bill Paul <wpaul@bsdi.com>. All rights reserved.
diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index 6e5c51b255cf..c03c57844985 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000 Berkeley Software Design, Inc.
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@osd.bsdi.com>. All rights reserved.
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index 25cea3abdbaf..362aa200cba0 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/mii/rgephyreg.h b/sys/dev/mii/rgephyreg.h
index 35917daa69c9..39efaee4ddd0 100644
--- a/sys/dev/mii/rgephyreg.h
+++ b/sys/dev/mii/rgephyreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index 782fc3c807b5..6433faf23142 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/rlswitch.c b/sys/dev/mii/rlswitch.c
index d3e3c938df7e..e21797a4c9a6 100644
--- a/sys/dev/mii/rlswitch.c
+++ b/sys/dev/mii/rlswitch.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
* Copyright (c) 2006 Bernd Walter. All rights reserved.
diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index 8c35aa5cf749..c0c67e4d19e5 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/xmphyreg.h b/sys/dev/mii/xmphyreg.h
index 92b9f78b4617..30877233ff34 100644
--- a/sys/dev/mii/xmphyreg.h
+++ b/sys/dev/mii/xmphyreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c
index 9d6373111a5d..ea500fa2f4ea 100644
--- a/sys/dev/msk/if_msk.c
+++ b/sys/dev/msk/if_msk.c
@@ -46,6 +46,8 @@
*****************************************************************************/
/*-
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-3-Clause
+ *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/msk/if_mskreg.h b/sys/dev/msk/if_mskreg.h
index 8f2ea634b50d..7bd0b53a49af 100644
--- a/sys/dev/msk/if_mskreg.h
+++ b/sys/dev/msk/if_mskreg.h
@@ -46,6 +46,8 @@
******************************************************************************/
/*-
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-3-Clause
+ *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index 2bd49e1e2799..8d9e1861bea5 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
* Bill Paul <wpaul@bsdi.com>. All rights reserved.
diff --git a/sys/dev/nge/if_ngereg.h b/sys/dev/nge/if_ngereg.h
index 9df0d92c8142..ed638438ef71 100644
--- a/sys/dev/nge/if_ngereg.h
+++ b/sys/dev/nge/if_ngereg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
* Bill Paul <wpaul@bsdi.com>. All rights reserved.
diff --git a/sys/dev/pcn/if_pcn.c b/sys/dev/pcn/if_pcn.c
index a81bd0178b7d..5a35cac26493 100644
--- a/sys/dev/pcn/if_pcn.c
+++ b/sys/dev/pcn/if_pcn.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000 Berkeley Software Design, Inc.
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@osd.bsdi.com>. All rights reserved.
diff --git a/sys/dev/pcn/if_pcnreg.h b/sys/dev/pcn/if_pcnreg.h
index a10edfd76aa4..95cf0ec8f847 100644
--- a/sys/dev/pcn/if_pcnreg.h
+++ b/sys/dev/pcn/if_pcnreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000 Berkeley Software Design, Inc.
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index ce08ccc605c2..9fc3b1b48104 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1990 William F. Jolitz, TeleMuse
* All rights reserved.
*
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index 00c27642b568..e9328b5ec1d1 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998-2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index 2d0df0ffa5d8..ef07f5db7fc2 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/sf/if_sfreg.h b/sys/dev/sf/if_sfreg.h
index 0ed20acb6e15..bec92f1c813c 100644
--- a/sys/dev/sf/if_sfreg.h
+++ b/sys/dev/sf/if_sfreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/sge/if_sge.c b/sys/dev/sge/if_sge.c
index 9aefce1e32e5..7c9bdd954700 100644
--- a/sys/dev/sge/if_sge.c
+++ b/sys/dev/sge/if_sge.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2008-2010 Nikolay Denev <ndenev@gmail.com>
* Copyright (c) 2007-2008 Alexander Pohoyda <alexander.pohoyda@gmx.net>
* Copyright (c) 1997, 1998, 1999
diff --git a/sys/dev/sge/if_sgereg.h b/sys/dev/sge/if_sgereg.h
index a72d1a5a5646..5b7d75ed6913 100644
--- a/sys/dev/sge/if_sgereg.h
+++ b/sys/dev/sge/if_sgereg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2008, 2009, 2010 Nikolay Denev <ndenev@gmail.com>
* Copyright (c) 2007, 2008 Alexander Pohoyda <alexander.pohoyda@gmx.net>
* Copyright (c) 1997, 1998, 1999
diff --git a/sys/dev/sis/if_sis.c b/sys/dev/sis/if_sis.c
index 71593e6b9b00..cf719ec310dc 100644
--- a/sys/dev/sis/if_sis.c
+++ b/sys/dev/sis/if_sis.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2005 Poul-Henning Kamp <phk@FreeBSD.org>
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
diff --git a/sys/dev/sis/if_sisreg.h b/sys/dev/sis/if_sisreg.h
index 6256fde33f04..9523af1d2ec8 100644
--- a/sys/dev/sis/if_sisreg.h
+++ b/sys/dev/sis/if_sisreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index 265172970634..a288b5145b07 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -1,6 +1,8 @@
/* $OpenBSD: if_sk.c,v 2.33 2003/08/12 05:23:06 nate Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/sk/if_skreg.h b/sys/dev/sk/if_skreg.h
index 49c958320b90..85d3f14ea625 100644
--- a/sys/dev/sk/if_skreg.h
+++ b/sys/dev/sk/if_skreg.h
@@ -1,6 +1,8 @@
/* $OpenBSD: if_skreg.h,v 1.10 2003/08/12 05:23:06 nate Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/sk/xmaciireg.h b/sys/dev/sk/xmaciireg.h
index 604073b72a38..30bd16c9a749 100644
--- a/sys/dev/sk/xmaciireg.h
+++ b/sys/dev/sk/xmaciireg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/ste/if_ste.c b/sys/dev/ste/if_ste.c
index e6cffb3d23b2..0005615a6304 100644
--- a/sys/dev/ste/if_ste.c
+++ b/sys/dev/ste/if_ste.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/ste/if_stereg.h b/sys/dev/ste/if_stereg.h
index e3aa51bff266..a27cb0a89a25 100644
--- a/sys/dev/ste/if_stereg.h
+++ b/sys/dev/ste/if_stereg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 421f5fd16145..c966302c7136 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/ti/if_tireg.h b/sys/dev/ti/if_tireg.h
index d55e1507fff0..a6b358bc1ea9 100644
--- a/sys/dev/ti/if_tireg.h
+++ b/sys/dev/ti/if_tireg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/tl/if_tl.c b/sys/dev/tl/if_tl.c
index 5d218e794f5e..70c1d17ec3fc 100644
--- a/sys/dev/tl/if_tl.c
+++ b/sys/dev/tl/if_tl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/tl/if_tlreg.h b/sys/dev/tl/if_tlreg.h
index 4a82cc5d9727..51fb6820bd8e 100644
--- a/sys/dev/tl/if_tlreg.h
+++ b/sys/dev/tl/if_tlreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index b048ad92d0d7..f4031bf47ccf 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -1,6 +1,8 @@
/* $OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001
* Jason L. Wright <jason@thought.net>, Theo de Raadt, and
* Aaron Campbell <aaron@monkey.org>. All rights reserved.
diff --git a/sys/dev/usb/net/if_aue.c b/sys/dev/usb/net/if_aue.c
index a756820bf358..5669e3fc4b47 100644
--- a/sys/dev/usb/net/if_aue.c
+++ b/sys/dev/usb/net/if_aue.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_auereg.h b/sys/dev/usb/net/if_auereg.h
index 4d0843eb8b1a..dfbaac424bf8 100644
--- a/sys/dev/usb/net/if_auereg.h
+++ b/sys/dev/usb/net/if_auereg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_axe.c b/sys/dev/usb/net/if_axe.c
index aa1ce0ed4c37..68f4479d8e21 100644
--- a/sys/dev/usb/net/if_axe.c
+++ b/sys/dev/usb/net/if_axe.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999, 2000-2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_axereg.h b/sys/dev/usb/net/if_axereg.h
index 64cb2352485a..2654bbbab9af 100644
--- a/sys/dev/usb/net/if_axereg.h
+++ b/sys/dev/usb/net/if_axereg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999, 2000-2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c
index 8b220ae84051..d3662fe22e86 100644
--- a/sys/dev/usb/net/if_cdce.c
+++ b/sys/dev/usb/net/if_cdce.c
@@ -1,6 +1,8 @@
/* $NetBSD: if_cdce.c,v 1.4 2004/10/24 12:50:54 augustss Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
* Copyright (c) 2003-2005 Craig Boston
* Copyright (c) 2004 Daniel Hartmeier
diff --git a/sys/dev/usb/net/if_cdcereg.h b/sys/dev/usb/net/if_cdcereg.h
index 1bc2d6039dc1..26d037c593b8 100644
--- a/sys/dev/usb/net/if_cdcereg.h
+++ b/sys/dev/usb/net/if_cdcereg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003-2005 Craig Boston
* All rights reserved.
*
diff --git a/sys/dev/usb/net/if_cue.c b/sys/dev/usb/net/if_cue.c
index 1190f98231e2..9d66e51289b9 100644
--- a/sys/dev/usb/net/if_cue.c
+++ b/sys/dev/usb/net/if_cue.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_cuereg.h b/sys/dev/usb/net/if_cuereg.h
index ff245c0513eb..b5cccee42c19 100644
--- a/sys/dev/usb/net/if_cuereg.h
+++ b/sys/dev/usb/net/if_cuereg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_kue.c b/sys/dev/usb/net/if_kue.c
index 562ead2809e7..4c07043e1712 100644
--- a/sys/dev/usb/net/if_kue.c
+++ b/sys/dev/usb/net/if_kue.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_kuefw.h b/sys/dev/usb/net/if_kuefw.h
index 2b055a92ed7b..8b799f01f850 100644
--- a/sys/dev/usb/net/if_kuefw.h
+++ b/sys/dev/usb/net/if_kuefw.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_kuereg.h b/sys/dev/usb/net/if_kuereg.h
index 16ad044d07ef..2f5d7ccb3b38 100644
--- a/sys/dev/usb/net/if_kuereg.h
+++ b/sys/dev/usb/net/if_kuereg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_mosreg.h b/sys/dev/usb/net/if_mosreg.h
index c811d55279e3..b8034feb8e44 100644
--- a/sys/dev/usb/net/if_mosreg.h
+++ b/sys/dev/usb/net/if_mosreg.h
@@ -32,6 +32,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999, 2000-2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/usb/net/if_rue.c b/sys/dev/usb/net/if_rue.c
index 9b86e88474b8..3766c993e4ed 100644
--- a/sys/dev/usb/net/if_rue.c
+++ b/sys/dev/usb/net/if_rue.c
@@ -25,6 +25,8 @@
* SUCH DAMAGE.
*/
/*-
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
index 315f273eef9d..e0ae98fa0b39 100644
--- a/sys/dev/vge/if_vge.c
+++ b/sys/dev/vge/if_vge.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2004
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/vge/if_vgereg.h b/sys/dev/vge/if_vgereg.h
index c8b3f1bb459b..88e6f22f3124 100644
--- a/sys/dev/vge/if_vgereg.h
+++ b/sys/dev/vge/if_vgereg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2004
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/vge/if_vgevar.h b/sys/dev/vge/if_vgevar.h
index ca899cc5fc0a..6e707e2d5965 100644
--- a/sys/dev/vge/if_vgevar.h
+++ b/sys/dev/vge/if_vgevar.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2004
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 5ffee24c1588..b1c7b540155c 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/vr/if_vrreg.h b/sys/dev/vr/if_vrreg.h
index 3618c1bae936..fdb581ace0a2 100644
--- a/sys/dev/vr/if_vrreg.h
+++ b/sys/dev/vr/if_vrreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wb/if_wb.c b/sys/dev/wb/if_wb.c
index aa882f0d26c0..e91d38739f94 100644
--- a/sys/dev/wb/if_wb.c
+++ b/sys/dev/wb/if_wb.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wb/if_wbreg.h b/sys/dev/wb/if_wbreg.h
index 16eb8a1cc2f8..a1dd905ea4d5 100644
--- a/sys/dev/wb/if_wbreg.h
+++ b/sys/dev/wb/if_wbreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wi/if_wavelan_ieee.h b/sys/dev/wi/if_wavelan_ieee.h
index c2a8e1b2fd46..dd8a9883eda3 100644
--- a/sys/dev/wi/if_wavelan_ieee.h
+++ b/sys/dev/wi/if_wavelan_ieee.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wi/if_wi_macio.c b/sys/dev/wi/if_wi_macio.c
index 6f25553af013..96d2f9906fa4 100644
--- a/sys/dev/wi/if_wi_macio.c
+++ b/sys/dev/wi/if_wi_macio.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2013 Justin Hibbits
* All rights reserved.
* Copyright (c) 1997, 1998, 1999
diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c
index 82c1680bd08f..22bd0d6f8dfa 100644
--- a/sys/dev/wi/if_wi_pccard.c
+++ b/sys/dev/wi/if_wi_pccard.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wi/if_wi_pci.c b/sys/dev/wi/if_wi_pci.c
index 0478a6d42b25..c347f2b3f0d3 100644
--- a/sys/dev/wi/if_wi_pci.c
+++ b/sys/dev/wi/if_wi_pci.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wi/if_wireg.h b/sys/dev/wi/if_wireg.h
index d5e12cabe514..4bc504e3bb9d 100644
--- a/sys/dev/wi/if_wireg.h
+++ b/sys/dev/wi/if_wireg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wi/if_wivar.h b/sys/dev/wi/if_wivar.h
index 55151fe9a43d..ce9a07ad61f2 100644
--- a/sys/dev/wi/if_wivar.h
+++ b/sys/dev/wi/if_wivar.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2002
* M Warner Losh <imp@freebsd.org>. All rights reserved.
* Copyright (c) 1997, 1998, 1999
diff --git a/sys/dev/xl/if_xl.c b/sys/dev/xl/if_xl.c
index 4c1c238981d1..48b1962051db 100644
--- a/sys/dev/xl/if_xl.c
+++ b/sys/dev/xl/if_xl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/xl/if_xlreg.h b/sys/dev/xl/if_xlreg.h
index b27e038e2580..56d073a6e2e8 100644
--- a/sys/dev/xl/if_xlreg.h
+++ b/sys/dev/xl/if_xlreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997, 1998
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/fs/procfs/procfs.c b/sys/fs/procfs/procfs.c
index 91ef0d83efd2..f6d0b90512d6 100644
--- a/sys/fs/procfs/procfs.c
+++ b/sys/fs/procfs/procfs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 Dag-Erling Smørgrav
* Copyright (c) 1993 Jan-Simon Pendry
* Copyright (c) 1993
diff --git a/sys/fs/procfs/procfs_rlimit.c b/sys/fs/procfs/procfs_rlimit.c
index 3885f566f6ea..8e16b8939e6c 100644
--- a/sys/fs/procfs/procfs_rlimit.c
+++ b/sys/fs/procfs/procfs_rlimit.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1999 Adrian Chadd
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/geom/vinum/geom_vinum_share.c b/sys/geom/vinum/geom_vinum_share.c
index eb70c28bcc63..5ca245a40554 100644
--- a/sys/geom/vinum/geom_vinum_share.c
+++ b/sys/geom/vinum/geom_vinum_share.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2004, 2007 Lukas Ertl
* Copyright (c) 1997, 1998, 1999
* Nan Yang Computer Services Limited. All rights reserved.
diff --git a/sys/geom/vinum/geom_vinum_subr.c b/sys/geom/vinum/geom_vinum_subr.c
index a2642c29ece7..6e65a65f3389 100644
--- a/sys/geom/vinum/geom_vinum_subr.c
+++ b/sys/geom/vinum/geom_vinum_subr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2004, 2007 Lukas Ertl
* Copyright (c) 2007, 2009 Ulf Lilleengen
* Copyright (c) 1997, 1998, 1999
diff --git a/sys/geom/vinum/geom_vinum_var.h b/sys/geom/vinum/geom_vinum_var.h
index 350661c73236..ee4e30ba53d1 100644
--- a/sys/geom/vinum/geom_vinum_var.h
+++ b/sys/geom/vinum/geom_vinum_var.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2004, 2007 Lukas Ertl
* Copyright (c) 1997, 1998, 1999
* Nan Yang Computer Services Limited. All rights reserved.
@@ -7,7 +9,7 @@
* Parts written by Greg Lehey.
*
* This software is distributed under the so-called ``Berkeley
- * License'': *
+ * License'': *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
diff --git a/sys/i386/i386/longrun.c b/sys/i386/i386/longrun.c
index 08fe3b1b27b1..d298ba06bacf 100644
--- a/sys/i386/i386/longrun.c
+++ b/sys/i386/i386/longrun.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 Tamotsu Hattori.
* Copyright (c) 2001 Mitsuru IWASAKI.
* All rights reserved.
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 4ea9a1583b10..68a452208582 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1992 Terrence R. Lambert.
* Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index d0dbf5162c16..0c2a507a7885 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 2acdb6cfc4f8..6a112354c19d 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1994, David Greenman
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 40a84db91818..ec95c80aac78 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1982, 1986 The Regents of the University of California.
* Copyright (c) 1989, 1990 William Jolitz
* Copyright (c) 1994 John Dyson
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index 6e1b43ffdf27..c166d78a1486 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Steven Wallace
* Copyright (c) 1994, 1995 Scott Bartram
* Copyright (c) 1992, 1993
diff --git a/sys/i386/include/floatingpoint.h b/sys/i386/include/floatingpoint.h
index cda9e46230ca..b7c154743d0c 100644
--- a/sys/i386/include/floatingpoint.h
+++ b/sys/i386/include/floatingpoint.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993 Andrew Moore, Talke Studio
* All rights reserved.
*
diff --git a/sys/i386/include/ieeefp.h b/sys/i386/include/ieeefp.h
index c676c4541831..9ece4e968c7b 100644
--- a/sys/i386/include/ieeefp.h
+++ b/sys/i386/include/ieeefp.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003 Peter Wemm.
* Copyright (c) 1990 Andrew Moore, Talke Studio
* All rights reserved.
diff --git a/sys/isa/pnpreg.h b/sys/isa/pnpreg.h
index 1b4cdc77822f..982ea98bd029 100644
--- a/sys/isa/pnpreg.h
+++ b/sys/isa/pnpreg.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996, Sujal M. Patel
* All rights reserved.
*
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index dc4b836b7e61..645d120d9807 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Terrence R. Lambert
* All rights reserved.
*
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index c13baa5d3891..b1602c6bb59b 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sys/kern/ksched.c b/sys/kern/ksched.c
index 27aea72a3e94..bf03a46315c2 100644
--- a/sys/kern/ksched.c
+++ b/sys/kern/ksched.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996, 1997
* HD Associates, Inc. All rights reserved.
*
diff --git a/sys/kern/p1003_1b.c b/sys/kern/p1003_1b.c
index 07049c7399a7..c1f51dd60a7a 100644
--- a/sys/kern/p1003_1b.c
+++ b/sys/kern/p1003_1b.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996, 1997, 1998
* HD Associates, Inc. All rights reserved.
*
diff --git a/sys/kern/posix4_mib.c b/sys/kern/posix4_mib.c
index a4d7951305d7..f95b1be832ed 100644
--- a/sys/kern/posix4_mib.c
+++ b/sys/kern/posix4_mib.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1998
* HD Associates, Inc. All rights reserved.
*
diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c
index 6a5dc3f601ae..bca47edaf613 100644
--- a/sys/kern/subr_syscall.c
+++ b/sys/kern/subr_syscall.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1994, David Greenman
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index d382628c6e7b..6d36b2b92919 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1994, David Greenman
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/libkern/strcasecmp.c b/sys/libkern/strcasecmp.c
index a7bba221d02d..cfa2d8ed9a59 100644
--- a/sys/libkern/strcasecmp.c
+++ b/sys/libkern/strcasecmp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/libkern/strstr.c b/sys/libkern/strstr.c
index 2f0ad6ac8ea2..b7494f3235da 100644
--- a/sys/libkern/strstr.c
+++ b/sys/libkern/strstr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/_types.h b/sys/mips/include/_types.h
index d37b1bc99886..1f654c4894f5 100644
--- a/sys/mips/include/_types.h
+++ b/sys/mips/include/_types.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/mips/include/cpuinfo.h b/sys/mips/include/cpuinfo.h
index 5111f65f4973..cdc98ef8e098 100644
--- a/sys/mips/include/cpuinfo.h
+++ b/sys/mips/include/cpuinfo.h
@@ -1,6 +1,8 @@
/* $NetBSD: cpu.h,v 1.70 2003/01/17 23:36:08 thorpej Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/include/floatingpoint.h b/sys/mips/include/floatingpoint.h
index cda9e46230ca..b7c154743d0c 100644
--- a/sys/mips/include/floatingpoint.h
+++ b/sys/mips/include/floatingpoint.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993 Andrew Moore, Talke Studio
* All rights reserved.
*
diff --git a/sys/mips/include/reloc.h b/sys/mips/include/reloc.h
index 113745f82623..7b5610bda2af 100644
--- a/sys/mips/include/reloc.h
+++ b/sys/mips/include/reloc.h
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/sys/mips/mips/db_disasm.c b/sys/mips/mips/db_disasm.c
index 4adf6f31dfeb..8df7e0e0197e 100644
--- a/sys/mips/mips/db_disasm.c
+++ b/sys/mips/mips/db_disasm.c
@@ -1,5 +1,7 @@
/* $OpenBSD: db_disasm.c,v 1.1 1998/03/16 09:03:24 pefo Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/mips/mips/in_cksum.c b/sys/mips/mips/in_cksum.c
index 31bcd3ebdd0a..8f9a2d9de106 100644
--- a/sys/mips/mips/in_cksum.c
+++ b/sys/mips/mips/in_cksum.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1988, 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1996
diff --git a/sys/mips/mips/sys_machdep.c b/sys/mips/mips/sys_machdep.c
index 551b30504adf..5c4941ea75af 100644
--- a/sys/mips/mips/sys_machdep.c
+++ b/sys/mips/mips/sys_machdep.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/net/fddi.h b/sys/net/fddi.h
index 71e3b6fbd438..0badcc3c38b9 100644
--- a/sys/net/fddi.h
+++ b/sys/net/fddi.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1995 Matt Thomas (thomas@lkg.dec.com)
diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c
index 6296e2e267dd..0e97125f19ef 100644
--- a/sys/net/if_arcsubr.c
+++ b/sys/net/if_arcsubr.c
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994, 1995 Ignatios Souvatzis
* Copyright (c) 1982, 1989, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 67a72c1f293e..5afe0c4525ea 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -1,3 +1,5 @@
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
/*-
* Copyright (c) 1995, 1996
* Matt Thomas <matt@3am-software.com>. All rights reserved.
diff --git a/sys/netinet6/ip6_id.c b/sys/netinet6/ip6_id.c
index 9a8086f48c53..5939ae9830cc 100644
--- a/sys/netinet6/ip6_id.c
+++ b/sys/netinet6/ip6_id.c
@@ -30,6 +30,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-3-Clause
+ *
* Copyright 1998 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
*
diff --git a/sys/netsmb/smb_crypt.c b/sys/netsmb/smb_crypt.c
index b647afd09ae8..394b026523a9 100644
--- a/sys/netsmb/smb_crypt.c
+++ b/sys/netsmb/smb_crypt.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000-2001, Boris Popov
* All rights reserved.
*
diff --git a/sys/nfs/bootp_subr.c b/sys/nfs/bootp_subr.c
index 51c76e767755..74bee40d5846 100644
--- a/sys/nfs/bootp_subr.c
+++ b/sys/nfs/bootp_subr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Gordon Ross, Adam Glass
* Copyright (c) 1992 Regents of the University of California.
* All rights reserved.
diff --git a/sys/nfs/krpc_subr.c b/sys/nfs/krpc_subr.c
index 7ec8332d2781..21e8e3ad44d0 100644
--- a/sys/nfs/krpc_subr.c
+++ b/sys/nfs/krpc_subr.c
@@ -1,6 +1,8 @@
/* $NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Gordon Ross, Adam Glass
* Copyright (c) 1992 Regents of the University of California.
* All rights reserved.
diff --git a/sys/powerpc/fpu/fpu_emu.c b/sys/powerpc/fpu/fpu_emu.c
index 6d4e20cd7a82..75f44c7b786a 100644
--- a/sys/powerpc/fpu/fpu_emu.c
+++ b/sys/powerpc/fpu/fpu_emu.c
@@ -1,6 +1,8 @@
/* $NetBSD: fpu_emu.c,v 1.14 2005/12/11 12:18:42 christos Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 2001 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/sys/powerpc/include/_align.h b/sys/powerpc/include/_align.h
index 6eb8be28777d..9b425b6ee1e1 100644
--- a/sys/powerpc/include/_align.h
+++ b/sys/powerpc/include/_align.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 David E. O'Brien
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/powerpc/include/_types.h b/sys/powerpc/include/_types.h
index 0e5a941b4617..9ed2d8f62a13 100644
--- a/sys/powerpc/include/_types.h
+++ b/sys/powerpc/include/_types.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/powerpc/include/param.h b/sys/powerpc/include/param.h
index a74ccf212a8f..9039d307f586 100644
--- a/sys/powerpc/include/param.h
+++ b/sys/powerpc/include/param.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 David E. O'Brien
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/in_cksum.c b/sys/powerpc/powerpc/in_cksum.c
index f4f5fff96d05..ed0881d7520a 100644
--- a/sys/powerpc/powerpc/in_cksum.c
+++ b/sys/powerpc/powerpc/in_cksum.c
@@ -2,6 +2,8 @@
/* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1988, 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1996
diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c
index 858fb1453820..cc9eea85a378 100644
--- a/sys/powerpc/powerpc/vm_machdep.c
+++ b/sys/powerpc/powerpc/vm_machdep.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1982, 1986 The Regents of the University of California.
* Copyright (c) 1989, 1990 William Jolitz
* Copyright (c) 1994 John Dyson
diff --git a/sys/riscv/riscv/in_cksum.c b/sys/riscv/riscv/in_cksum.c
index ae02e91d9203..30e90f043cc3 100644
--- a/sys/riscv/riscv/in_cksum.c
+++ b/sys/riscv/riscv/in_cksum.c
@@ -1,6 +1,8 @@
/* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1988, 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1996
diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c
index 0fee628470f9..0fe2db214fcf 100644
--- a/sys/riscv/riscv/pmap.c
+++ b/sys/riscv/riscv/pmap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/sparc64/include/cache.h b/sys/sparc64/include/cache.h
index 3d0ac4f17648..a299f2e4974a 100644
--- a/sys/sparc64/include/cache.h
+++ b/sys/sparc64/include/cache.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996
* The President and Fellows of Harvard College. All rights reserved.
* Copyright (c) 1992, 1993
diff --git a/sys/sparc64/sparc64/cache.c b/sys/sparc64/sparc64/cache.c
index 0dc3aa1662a1..5d92a4286660 100644
--- a/sys/sparc64/sparc64/cache.c
+++ b/sys/sparc64/sparc64/cache.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996
* The President and Fellows of Harvard College. All rights reserved.
* Copyright (c) 1992, 1993
diff --git a/sys/sparc64/sparc64/eeprom.c b/sys/sparc64/sparc64/eeprom.c
index 9470bafeab54..fa385ea35eb7 100644
--- a/sys/sparc64/sparc64/eeprom.c
+++ b/sys/sparc64/sparc64/eeprom.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1994 Gordon W. Ross
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index 6b6564668ae6..ea3bf2620dab 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Terrence R. Lambert
* All rights reserved.
*
diff --git a/sys/sys/pioctl.h b/sys/sys/pioctl.h
index 93bdbeccd2f8..1a0bf11f8794 100644
--- a/sys/sys/pioctl.h
+++ b/sys/sys/pioctl.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/sys/posix4.h b/sys/sys/posix4.h
index 8dcf36dec335..3019c6d5ccf8 100644
--- a/sys/sys/posix4.h
+++ b/sys/sys/posix4.h
@@ -1,6 +1,8 @@
#ifndef _P1003_1B_P1003_1B_H_
#define _P1003_1B_P1003_1B_H_
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996, 1997, 1998
* HD Associates, Inc. All rights reserved.
*
diff --git a/sys/sys/sched.h b/sys/sys/sched.h
index 576c8b1fc2b1..812434eba18b 100644
--- a/sys/sys/sched.h
+++ b/sys/sys/sched.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996, 1997
* HD Associates, Inc. All rights reserved.
*
diff --git a/sys/sys/tiio.h b/sys/sys/tiio.h
index 442dceb012c0..9de9dd927587 100644
--- a/sys/sys/tiio.h
+++ b/sys/sys/tiio.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999, 2000 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 19601431d440..2350c92729de 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1998 Matthew Dillon,
* Copyright (c) 1994 John S. Dyson
* Copyright (c) 1990 University of Utah.
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index 23284a6df5ac..1b03af4314d0 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index c61010cf81af..e6086be03850 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index e569503cc74d..cd5a749d4f9d 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1990 University of Utah.
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/x86/include/_align.h b/sys/x86/include/_align.h
index 9f7b6b953236..efb8d59bb70f 100644
--- a/sys/x86/include/_align.h
+++ b/sys/x86/include/_align.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 David E. O'Brien
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/x86/include/_types.h b/sys/x86/include/_types.h
index 8aa0e2ba01b7..c9a7787fcab6 100644
--- a/sys/x86/include/_types.h
+++ b/sys/x86/include/_types.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/tools/regression/p1003_1b/fifo.c b/tools/regression/p1003_1b/fifo.c
index 925e7c21368e..bf8fae0bb262 100644
--- a/tools/regression/p1003_1b/fifo.c
+++ b/tools/regression/p1003_1b/fifo.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996 - 2000
* HD Associates, Inc. All rights reserved.
*
diff --git a/tools/regression/p1003_1b/memlock.c b/tools/regression/p1003_1b/memlock.c
index b55b4056dac8..3033fbbacfd5 100644
--- a/tools/regression/p1003_1b/memlock.c
+++ b/tools/regression/p1003_1b/memlock.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996 - 1999
* HD Associates, Inc. All rights reserved.
*
diff --git a/tools/regression/p1003_1b/p26.c b/tools/regression/p1003_1b/p26.c
index 538deaf87863..ae869bffddf3 100644
--- a/tools/regression/p1003_1b/p26.c
+++ b/tools/regression/p1003_1b/p26.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996-1999
* HD Associates, Inc. All rights reserved.
*
diff --git a/tools/regression/p1003_1b/sched.c b/tools/regression/p1003_1b/sched.c
index 1814c79194e4..ea6fcc7a461f 100644
--- a/tools/regression/p1003_1b/sched.c
+++ b/tools/regression/p1003_1b/sched.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996-1999
* HD Associates, Inc. All rights reserved.
*
diff --git a/tools/regression/p1003_1b/yield.c b/tools/regression/p1003_1b/yield.c
index a9b7badb3452..479ce50ef886 100644
--- a/tools/regression/p1003_1b/yield.c
+++ b/tools/regression/p1003_1b/yield.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996-1999
* HD Associates, Inc. All rights reserved.
*
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index 74c96beb92e7..643b0f387c3a 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.bin/chpass/chpass.h b/usr.bin/chpass/chpass.h
index fd3a8390378e..b655c5dd0b59 100644
--- a/usr.bin/chpass/chpass.h
+++ b/usr.bin/chpass/chpass.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index ce82f8ee4644..fbe101592b3a 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.bin/chpass/field.c b/usr.bin/chpass/field.c
index eac5561a8dc2..3b5129c085a1 100644
--- a/usr.bin/chpass/field.c
+++ b/usr.bin/chpass/field.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index baf160e8762e..bfece1d4ae10 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c
index f9bffbaff26f..6113d2b3e63c 100644
--- a/usr.bin/diff/diffreg.c
+++ b/usr.bin/diff/diffreg.c
@@ -1,6 +1,8 @@
/* $OpenBSD: diffreg.c,v 1.91 2016/03/01 20:57:35 natano Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) Caldera International Inc. 2001-2002.
* All rights reserved.
*
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index 9f5b08f2d1ce..d2d30c7d0587 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index 3c6f27f42585..f63b3c49aa3a 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
* Copyright (c) 1980, 1993
diff --git a/usr.bin/indent/indent_codes.h b/usr.bin/indent/indent_codes.h
index 7b23997b6e70..ee9afc5f4ebb 100644
--- a/usr.bin/indent/indent_codes.h
+++ b/usr.bin/indent/indent_codes.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/indent/indent_globs.h b/usr.bin/indent/indent_globs.h
index 018badb7e89b..bdc00647e1a4 100644
--- a/usr.bin/indent/indent_globs.h
+++ b/usr.bin/indent/indent_globs.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index fea13c1d44f0..5f0ad9908b30 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/indent/lexi.c b/usr.bin/indent/lexi.c
index 8634591018a2..3b81ec753740 100644
--- a/usr.bin/indent/lexi.c
+++ b/usr.bin/indent/lexi.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/indent/parse.c b/usr.bin/indent/parse.c
index f6590fd253c2..c53b4447ac6d 100644
--- a/usr.bin/indent/parse.c
+++ b/usr.bin/indent/parse.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/indent/pr_comment.c b/usr.bin/indent/pr_comment.c
index 723247b77c83..6a7ce5c036dc 100644
--- a/usr.bin/indent/pr_comment.c
+++ b/usr.bin/indent/pr_comment.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index 90111e7e2516..24bd0009e97d 100644
--- a/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr.bin/locate/bigram/locate.bigram.c
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index 9a87c16bb6e6..18ee68c93527 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/locate/locate/fastfind.c b/usr.bin/locate/locate/fastfind.c
index c15730ba5af4..e2f6d74552ec 100644
--- a/usr.bin/locate/locate/fastfind.c
+++ b/usr.bin/locate/locate/fastfind.c
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index ee9d26d0fccc..31b75efd1b09 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/locate/locate/locate.h b/usr.bin/locate/locate/locate.h
index c2f27fb33759..7b4f672f7d80 100644
--- a/usr.bin/locate/locate/locate.h
+++ b/usr.bin/locate/locate/locate.h
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/locate/locate/pathnames.h b/usr.bin/locate/locate/pathnames.h
index 8665fd76561c..dfd8084b2598 100644
--- a/usr.bin/locate/locate/pathnames.h
+++ b/usr.bin/locate/locate/pathnames.h
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c
index a315d50c6a7f..fa208f3dfe8e 100644
--- a/usr.bin/locate/locate/util.c
+++ b/usr.bin/locate/locate/util.c
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 525ccfcf672b..e99ee5efc2eb 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Networks Associates Technologies, Inc.
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index c1d0dd35376f..2391de8b2c9c 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California.
* Copyright (c) 2005 Robert N. M. Watson
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
index d4d60145f18e..afc5458e5e11 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1989 Stephen Deering
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c
index 8f59c6b544cc..6360fd6ed4ee 100644
--- a/usr.bin/netstat/mroute6.c
+++ b/usr.bin/netstat/mroute6.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-3-Clause
+ *
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 22a093a61ba9..4c60204c10e0 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/pr/extern.h b/usr.bin/pr/extern.h
index c39e18f89bfc..b44eb4187757 100644
--- a/usr.bin/pr/extern.h
+++ b/usr.bin/pr/extern.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index 0493aec0d0b7..cc6d290ca4c2 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/pr/pr.h b/usr.bin/pr/pr.h
index a4346c788dcc..2c9e50f6b4fa 100644
--- a/usr.bin/pr/pr.h
+++ b/usr.bin/pr/pr.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index 239b313ce811..5f4f2b45e8bf 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993, John Brezak
* All rights reserved.
*
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index 4d641dcd070f..381d935611b1 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993, John Brezak
* All rights reserved.
*
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index c235ea72e560..2daa6a8b6ea7 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993 Christopher G. Demetriou
* Copyright (c) 1988, 1990 Regents of the University of California.
* All rights reserved.
diff --git a/usr.bin/truss/amd64-freebsd.c b/usr.bin/truss/amd64-freebsd.c
index 7e2ed160a90d..e83e916d1bc0 100644
--- a/usr.bin/truss/amd64-freebsd.c
+++ b/usr.bin/truss/amd64-freebsd.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/amd64-freebsd32.c b/usr.bin/truss/amd64-freebsd32.c
index 66ca417e9495..ffb76e46b8ba 100644
--- a/usr.bin/truss/amd64-freebsd32.c
+++ b/usr.bin/truss/amd64-freebsd32.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/amd64-linux.c b/usr.bin/truss/amd64-linux.c
index 00eb06ff75f8..ead388008a64 100644
--- a/usr.bin/truss/amd64-linux.c
+++ b/usr.bin/truss/amd64-linux.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/amd64-linux32.c b/usr.bin/truss/amd64-linux32.c
index 70e201adfe91..69344e9fce8f 100644
--- a/usr.bin/truss/amd64-linux32.c
+++ b/usr.bin/truss/amd64-linux32.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/arm-freebsd.c b/usr.bin/truss/arm-freebsd.c
index 753829005946..683ece5d22c9 100644
--- a/usr.bin/truss/arm-freebsd.c
+++ b/usr.bin/truss/arm-freebsd.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/extern.h b/usr.bin/truss/extern.h
index f19a1cbb7c92..dd160a7d2cc2 100644
--- a/usr.bin/truss/extern.h
+++ b/usr.bin/truss/extern.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/i386-freebsd.c b/usr.bin/truss/i386-freebsd.c
index 8103ca7beead..b222958df247 100644
--- a/usr.bin/truss/i386-freebsd.c
+++ b/usr.bin/truss/i386-freebsd.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c
index e96db16c7a91..77185d156b4e 100644
--- a/usr.bin/truss/i386-linux.c
+++ b/usr.bin/truss/i386-linux.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index 052546a032c0..9ba7968828fc 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/mips-freebsd.c b/usr.bin/truss/mips-freebsd.c
index e3f2a04e97fb..cade9d65d8f6 100644
--- a/usr.bin/truss/mips-freebsd.c
+++ b/usr.bin/truss/mips-freebsd.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 1998 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index 97dd9650189b..092188a4b60c 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/sparc64-freebsd.c b/usr.bin/truss/sparc64-freebsd.c
index d1ae89685de7..d9a55973e358 100644
--- a/usr.bin/truss/sparc64-freebsd.c
+++ b/usr.bin/truss/sparc64-freebsd.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 1998 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index 251a43f6cec3..b80f5ba17444 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 1997 Sean Eric Fagan
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index cf616223275c..c3bf57303b3c 100644
--- a/usr.bin/uname/uname.c
+++ b/usr.bin/uname/uname.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2002 Juli Mallett.
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.sbin/ancontrol/ancontrol.c b/usr.sbin/ancontrol/ancontrol.c
index ba2419a7f90e..6d76f0770f4a 100644
--- a/usr.sbin/ancontrol/ancontrol.c
+++ b/usr.sbin/ancontrol/ancontrol.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/dconschat/dconschat.c b/usr.sbin/dconschat/dconschat.c
index dba568aac7de..6d4750585df6 100644
--- a/usr.sbin/dconschat/dconschat.c
+++ b/usr.sbin/dconschat/dconschat.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/usr.sbin/fwcontrol/fwcontrol.c b/usr.sbin/fwcontrol/fwcontrol.c
index 36efea16030e..48dfa4b94afc 100644
--- a/usr.sbin/fwcontrol/fwcontrol.c
+++ b/usr.sbin/fwcontrol/fwcontrol.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 2002
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/usr.sbin/fwcontrol/fwdv.c b/usr.sbin/fwcontrol/fwdv.c
index afb3ada34e64..e35281f73735 100644
--- a/usr.sbin/fwcontrol/fwdv.c
+++ b/usr.sbin/fwcontrol/fwdv.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/usr.sbin/fwcontrol/fwmpegts.c b/usr.sbin/fwcontrol/fwmpegts.c
index ae9a52b9db57..509d941021c8 100644
--- a/usr.sbin/fwcontrol/fwmpegts.c
+++ b/usr.sbin/fwcontrol/fwmpegts.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 2005
* Petr Holub, Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/usr.sbin/kldxref/ef.c b/usr.sbin/kldxref/ef.c
index d700b2a6d102..6ac694015630 100644
--- a/usr.sbin/kldxref/ef.c
+++ b/usr.sbin/kldxref/ef.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000, Boris Popov
* All rights reserved.
*
diff --git a/usr.sbin/kldxref/ef_obj.c b/usr.sbin/kldxref/ef_obj.c
index e6099f2e1fe8..d35aa76e7216 100644
--- a/usr.sbin/kldxref/ef_obj.c
+++ b/usr.sbin/kldxref/ef_obj.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000, Boris Popov
* Copyright (c) 1998-2000 Doug Rabson
* Copyright (c) 2004 Peter Wemm
diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c
index fe28cbce24a8..493ca3435922 100644
--- a/usr.sbin/kldxref/kldxref.c
+++ b/usr.sbin/kldxref/kldxref.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2000, Boris Popov
* All rights reserved.
*
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c
index 729e0c9d9887..b20855515adb 100644
--- a/usr.sbin/lpr/common_source/common.c
+++ b/usr.sbin/lpr/common_source/common.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.sbin/lpr/common_source/net.c b/usr.sbin/lpr/common_source/net.c
index c495bbbe93fb..3954b2286dc6 100644
--- a/usr.sbin/lpr/common_source/net.c
+++ b/usr.sbin/lpr/common_source/net.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.sbin/lpr/common_source/printcap.c b/usr.sbin/lpr/common_source/printcap.c
index 707b7b824d9a..2cf4de4a395a 100644
--- a/usr.sbin/lpr/common_source/printcap.c
+++ b/usr.sbin/lpr/common_source/printcap.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 9a4382f12c5f..72ba2b3929f1 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1983, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index 0f686eabaa09..706f7e14f0d5 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -1,6 +1,8 @@
/* $NetBSD: ffs.c,v 1.45 2011/10/09 22:49:26 christos Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/manctl/manctl.sh b/usr.sbin/manctl/manctl.sh
index 8264e00582ac..e79da64868a9 100644
--- a/usr.sbin/manctl/manctl.sh
+++ b/usr.sbin/manctl/manctl.sh
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-4-Clause
+#
# Copyright (c) 1994 Geoffrey M. Rehmet, Rhodes University
# All rights reserved.
#
diff --git a/usr.sbin/ndiscvt/inf-parse.y b/usr.sbin/ndiscvt/inf-parse.y
index 2a8876d2eb5d..740aba5e87d1 100644
--- a/usr.sbin/ndiscvt/inf-parse.y
+++ b/usr.sbin/ndiscvt/inf-parse.y
@@ -1,5 +1,7 @@
%{
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/ndiscvt/inf-token.l b/usr.sbin/ndiscvt/inf-token.l
index 3e2a1278d530..56359263074e 100644
--- a/usr.sbin/ndiscvt/inf-token.l
+++ b/usr.sbin/ndiscvt/inf-token.l
@@ -1,5 +1,7 @@
%{
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/ndiscvt/inf.c b/usr.sbin/ndiscvt/inf.c
index 4b30da0a3024..eb1015083dbb 100644
--- a/usr.sbin/ndiscvt/inf.c
+++ b/usr.sbin/ndiscvt/inf.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/ndiscvt/ndiscvt.c b/usr.sbin/ndiscvt/ndiscvt.c
index 7636c4c75059..09f7faeb3068 100644
--- a/usr.sbin/ndiscvt/ndiscvt.c
+++ b/usr.sbin/ndiscvt/ndiscvt.c
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/ndiscvt/ndisgen.sh b/usr.sbin/ndiscvt/ndisgen.sh
index 1674ea105c7a..c5a0dbd4fc46 100644
--- a/usr.sbin/ndiscvt/ndisgen.sh
+++ b/usr.sbin/ndiscvt/ndisgen.sh
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-4-Clause
+#
# Copyright (c) 2005
# Bill Paul <wpaul@windriver.com>. All rights reserved.
#
diff --git a/usr.sbin/ndiscvt/windrv_stub.c b/usr.sbin/ndiscvt/windrv_stub.c
index 46a0e8384415..8aaa23835cba 100644
--- a/usr.sbin/ndiscvt/windrv_stub.c
+++ b/usr.sbin/ndiscvt/windrv_stub.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/rpc.lockd/lock_proc.c b/usr.sbin/rpc.lockd/lock_proc.c
index 3b040e5f14a0..160e1844e5a8 100644
--- a/usr.sbin/rpc.lockd/lock_proc.c
+++ b/usr.sbin/rpc.lockd/lock_proc.c
@@ -1,6 +1,8 @@
/* $NetBSD: lock_proc.c,v 1.7 2000/10/11 20:23:56 is Exp $ */
/* $FreeBSD$ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c
index 6ac4962c078d..a208fdbf3352 100644
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -1,7 +1,9 @@
/* $NetBSD: lockd.c,v 1.7 2000/08/12 18:08:44 thorpej Exp $ */
/* $FreeBSD$ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.lockd/lockd.h b/usr.sbin/rpc.lockd/lockd.h
index 0a8e2e60b616..23cb19fd79c6 100644
--- a/usr.sbin/rpc.lockd/lockd.h
+++ b/usr.sbin/rpc.lockd/lockd.h
@@ -1,7 +1,9 @@
/* $NetBSD: lockd.h,v 1.2 2000/06/07 14:34:40 bouyer Exp $ */
/* $FreeBSD$ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.lockd/lockd_lock.c b/usr.sbin/rpc.lockd/lockd_lock.c
index 59a312df3a66..594d01f7e1ec 100644
--- a/usr.sbin/rpc.lockd/lockd_lock.c
+++ b/usr.sbin/rpc.lockd/lockd_lock.c
@@ -1,6 +1,8 @@
/* $NetBSD: lockd_lock.c,v 1.5 2000/11/21 03:47:41 enami Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 Andrew P. Lentvorski, Jr.
* Copyright (c) 2000 Manuel Bouyer.
*
diff --git a/usr.sbin/rpc.statd/file.c b/usr.sbin/rpc.statd/file.c
index beef0e4db904..c2207c73aebf 100644
--- a/usr.sbin/rpc.statd/file.c
+++ b/usr.sbin/rpc.statd/file.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.statd/procs.c b/usr.sbin/rpc.statd/procs.c
index f6067e7acb70..517c3f62414e 100644
--- a/usr.sbin/rpc.statd/procs.c
+++ b/usr.sbin/rpc.statd/procs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.statd/statd.c b/usr.sbin/rpc.statd/statd.c
index 1a79ac2b7ed4..b789f8149106 100644
--- a/usr.sbin/rpc.statd/statd.c
+++ b/usr.sbin/rpc.statd/statd.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.statd/statd.h b/usr.sbin/rpc.statd/statd.h
index a82d760f96f2..ede159039ada 100644
--- a/usr.sbin/rpc.statd/statd.h
+++ b/usr.sbin/rpc.statd/statd.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h b/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
index db15be228a6d..563d47c2205f 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
index 38719c4a5c1a..349f1cd59e17 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
index ae5ca5964053..8845d0d10f9b 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypupdated/yp_dbdelete.c b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
index 0552aab9d3ea..7ef145867391 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbdelete.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypupdated/yp_dbupdate.c b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
index 3481a6b2b3c4..84bacb905ac3 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbupdate.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_main.c b/usr.sbin/rpc.ypupdated/ypupdated_main.c
index 92d8374a7162..96bf4460a251 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_main.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_main.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_server.c b/usr.sbin/rpc.ypupdated/ypupdated_server.c
index c4e163a50919..67fa05eceee5 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_server.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_server.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h b/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
index 5aba934a6ec4..165b144f2c45 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
index 8fa3e2205b43..62420a48c0a9 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
index 5f60712e9fef..ca8a2a3c4fe4 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rrenumd/rrenumd.h b/usr.sbin/rrenumd/rrenumd.h
index df0280b2591e..2e9390d023fd 100644
--- a/usr.sbin/rrenumd/rrenumd.h
+++ b/usr.sbin/rrenumd/rrenumd.h
@@ -1,6 +1,8 @@
/* $KAME: rrenumd.h,v 1.2 2000/07/03 02:54:09 itojun Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/wpa/ndis_events/ndis_events.c b/usr.sbin/wpa/ndis_events/ndis_events.c
index b61fd0a297ab..cfd971af8ea1 100644
--- a/usr.sbin/wpa/ndis_events/ndis_events.c
+++ b/usr.sbin/wpa/ndis_events/ndis_events.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/wpa/wpa_supplicant/Packet32.c b/usr.sbin/wpa/wpa_supplicant/Packet32.c
index 8e7da035af95..3f852b722080 100644
--- a/usr.sbin/wpa/wpa_supplicant/Packet32.c
+++ b/usr.sbin/wpa/wpa_supplicant/Packet32.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/wpa/wpa_supplicant/Packet32.h b/usr.sbin/wpa/wpa_supplicant/Packet32.h
index e0598e70d4fd..c96553afc8a1 100644
--- a/usr.sbin/wpa/wpa_supplicant/Packet32.h
+++ b/usr.sbin/wpa/wpa_supplicant/Packet32.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.c b/usr.sbin/yp_mkdb/yp_mkdb.c
index 290e40500de6..c8c545306e18 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.c
+++ b/usr.sbin/yp_mkdb/yp_mkdb.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypbind/yp_ping.c b/usr.sbin/ypbind/yp_ping.c
index 2efc7a2d0617..d65c5eb695e2 100644
--- a/usr.sbin/ypbind/yp_ping.c
+++ b/usr.sbin/ypbind/yp_ping.c
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996, 1997
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/yppush/yppush_main.c b/usr.sbin/yppush/yppush_main.c
index 5a712e5a41b0..e5e852280095 100644
--- a/usr.sbin/yppush/yppush_main.c
+++ b/usr.sbin/yppush/yppush_main.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_access.c b/usr.sbin/ypserv/yp_access.c
index dddde7405bba..bee8dd4231dd 100644
--- a/usr.sbin/ypserv/yp_access.c
+++ b/usr.sbin/ypserv/yp_access.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_dblookup.c b/usr.sbin/ypserv/yp_dblookup.c
index ecd90522f7ad..291daba0da09 100644
--- a/usr.sbin/ypserv/yp_dblookup.c
+++ b/usr.sbin/ypserv/yp_dblookup.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_dnslookup.c b/usr.sbin/ypserv/yp_dnslookup.c
index 6534967cfa98..b33b80c2e82c 100644
--- a/usr.sbin/ypserv/yp_dnslookup.c
+++ b/usr.sbin/ypserv/yp_dnslookup.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_error.c b/usr.sbin/ypserv/yp_error.c
index a5b12902d0d1..9bc287280c76 100644
--- a/usr.sbin/ypserv/yp_error.c
+++ b/usr.sbin/ypserv/yp_error.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_extern.h b/usr.sbin/ypserv/yp_extern.h
index 2e574b6c3bfe..4a1c6b3528dc 100644
--- a/usr.sbin/ypserv/yp_extern.h
+++ b/usr.sbin/ypserv/yp_extern.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_main.c b/usr.sbin/ypserv/yp_main.c
index 8c538ca8ca46..d0fff1eb1e8d 100644
--- a/usr.sbin/ypserv/yp_main.c
+++ b/usr.sbin/ypserv/yp_main.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_server.c b/usr.sbin/ypserv/yp_server.c
index 304fd50efe34..828957788b2b 100644
--- a/usr.sbin/ypserv/yp_server.c
+++ b/usr.sbin/ypserv/yp_server.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_svc_udp.c b/usr.sbin/ypserv/yp_svc_udp.c
index 33d058ef9b87..c865c01d9b7e 100644
--- a/usr.sbin/ypserv/yp_svc_udp.c
+++ b/usr.sbin/ypserv/yp_svc_udp.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*