summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authoreadler <eadler@FreeBSD.org>2018-03-05 07:26:05 +0000
committereadler <eadler@FreeBSD.org>2018-03-05 07:26:05 +0000
commitfc195e04d9ebb262bd1863735758e138682de6e1 (patch)
tree912d569f5ccd477bf8a409b3db72c12aebd27846 /usr.bin
parente04bce9b4972e0f91b7874fed99e7a1c35f19095 (diff)
downloadFreeBSD-src-fc195e04d9ebb262bd1863735758e138682de6e1.zip
FreeBSD-src-fc195e04d9ebb262bd1863735758e138682de6e1.tar.gz
MFC r326276:
various: general adoption of SPDX licensing ID tags. Mainly focus on files that use BSD 2-Clause license, however the tool I was using misidentified many licenses so this was mostly a manual - error prone - task. The Software Package Data Exchange (SPDX) group provides a specification to make it easier for automated tools to detect and summarize well known opensource licenses. We are gradually adopting the specification, noting that the tags are considered only advisory and do not, in any way, superceed or replace the license texts. No functional change intended.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ar/acplex.l2
-rw-r--r--usr.bin/ar/acpyacc.y2
-rw-r--r--usr.bin/ar/ar.h2
-rw-r--r--usr.bin/ar/read.c2
-rw-r--r--usr.bin/ar/util.c2
-rw-r--r--usr.bin/ar/write.c2
-rw-r--r--usr.bin/asa/asa.c4
-rw-r--r--usr.bin/at/at.c5
-rw-r--r--usr.bin/at/at.h5
-rw-r--r--usr.bin/at/panic.c5
-rw-r--r--usr.bin/at/panic.h5
-rw-r--r--usr.bin/at/parsetime.c5
-rw-r--r--usr.bin/at/parsetime.h7
-rw-r--r--usr.bin/at/perm.c5
-rw-r--r--usr.bin/at/perm.h5
-rw-r--r--usr.bin/at/privs.h7
-rw-r--r--usr.bin/bluetooth/bthost/bthost.c4
-rw-r--r--usr.bin/bluetooth/btsockstat/btsockstat.c4
-rw-r--r--usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c4
-rw-r--r--usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c2
-rw-r--r--usr.bin/brandelf/brandelf.c2
-rw-r--r--usr.bin/bsdiff/bsdiff/bsdiff.c2
-rw-r--r--usr.bin/bsdiff/bspatch/bspatch.c2
-rw-r--r--usr.bin/c89/c89.c2
-rw-r--r--usr.bin/c99/c99.c2
-rw-r--r--usr.bin/calendar/dates.c2
-rw-r--r--usr.bin/calendar/events.c2
-rw-r--r--usr.bin/calendar/ostern.c2
-rw-r--r--usr.bin/calendar/parsedata.c2
-rw-r--r--usr.bin/calendar/paskha.c2
-rw-r--r--usr.bin/calendar/sunpos.c2
-rw-r--r--usr.bin/cmp/link.c2
-rw-r--r--usr.bin/colldef/parse.y2
-rw-r--r--usr.bin/colldef/scan.l2
-rw-r--r--usr.bin/compress/zopen.h4
-rw-r--r--usr.bin/cpuset/cpuset.c4
-rw-r--r--usr.bin/csplit/csplit.c2
-rw-r--r--usr.bin/ctlstat/ctlstat.c2
-rw-r--r--usr.bin/dtc/checking.cc2
-rw-r--r--usr.bin/dtc/checking.hh2
-rw-r--r--usr.bin/dtc/dtb.cc2
-rw-r--r--usr.bin/dtc/dtb.hh2
-rw-r--r--usr.bin/dtc/dtc.cc2
-rw-r--r--usr.bin/dtc/fdt.cc2
-rw-r--r--usr.bin/dtc/fdt.hh2
-rw-r--r--usr.bin/dtc/input_buffer.cc2
-rw-r--r--usr.bin/dtc/input_buffer.hh2
-rw-r--r--usr.bin/dtc/string.cc2
-rw-r--r--usr.bin/dtc/util.hh2
-rw-r--r--usr.bin/elf2aout/elf2aout.c2
-rw-r--r--usr.bin/elfdump/elfdump.c2
-rw-r--r--usr.bin/env/envopts.c2
-rw-r--r--usr.bin/env/envopts.h2
-rw-r--r--usr.bin/fetch/fetch.c2
-rw-r--r--usr.bin/finger/pathnames.h2
-rw-r--r--usr.bin/fstat/functions.h2
-rw-r--r--usr.bin/fstat/fuser.c2
-rw-r--r--usr.bin/fstat/main.c2
-rw-r--r--usr.bin/fsync/fsync.c2
-rw-r--r--usr.bin/gcore/elfcore.c2
-rw-r--r--usr.bin/gencat/gencat.c4
-rw-r--r--usr.bin/getent/getent.c2
-rw-r--r--usr.bin/grep/file.c2
-rw-r--r--usr.bin/grep/grep.c2
-rw-r--r--usr.bin/grep/grep.h2
-rw-r--r--usr.bin/grep/queue.c2
-rw-r--r--usr.bin/grep/regex/fastmatch.c2
-rw-r--r--usr.bin/grep/regex/hashtable.c2
-rw-r--r--usr.bin/grep/regex/tre-fastmatch.c2
-rw-r--r--usr.bin/grep/util.c2
-rw-r--r--usr.bin/gzip/gzip.c2
-rw-r--r--usr.bin/gzip/unbzip2.c2
-rw-r--r--usr.bin/gzip/unpack.c2
-rw-r--r--usr.bin/gzip/unxz.c2
-rw-r--r--usr.bin/iconv/iconv.c2
-rw-r--r--usr.bin/indent/indent.h2
-rw-r--r--usr.bin/ipcrm/ipcrm.c4
-rw-r--r--usr.bin/ipcs/ipc.c4
-rw-r--r--usr.bin/ipcs/ipc.h4
-rw-r--r--usr.bin/ipcs/ipcs.c4
-rw-r--r--usr.bin/iscsictl/iscsictl.c2
-rw-r--r--usr.bin/iscsictl/iscsictl.h2
-rw-r--r--usr.bin/iscsictl/parse.y2
-rw-r--r--usr.bin/iscsictl/periphs.c4
-rw-r--r--usr.bin/iscsictl/token.l2
-rw-r--r--usr.bin/killall/killall.c2
-rw-r--r--usr.bin/ktrdump/ktrdump.c2
-rw-r--r--usr.bin/lastcomm/readrec.c2
-rw-r--r--usr.bin/ldd/extern.h4
-rw-r--r--usr.bin/ldd/ldd.c4
-rw-r--r--usr.bin/ldd/sods.c4
-rw-r--r--usr.bin/locale/locale.c2
-rw-r--r--usr.bin/locate/locate/concatdb.sh2
-rw-r--r--usr.bin/locate/locate/mklocatedb.sh2
-rw-r--r--usr.bin/locate/locate/updatedb.sh2
-rw-r--r--usr.bin/lockf/lockf.c4
-rw-r--r--usr.bin/login/login.h2
-rw-r--r--usr.bin/logins/logins.c2
-rw-r--r--usr.bin/m4/gnum4.c4
-rw-r--r--usr.bin/m4/trace.c2
-rwxr-xr-xusr.bin/man/man.sh2
-rw-r--r--usr.bin/mkcsmapper/ldef.h2
-rw-r--r--usr.bin/mkcsmapper/lex.l2
-rw-r--r--usr.bin/mkcsmapper/yacc.y2
-rw-r--r--usr.bin/mkesdb/ldef.h2
-rw-r--r--usr.bin/mkesdb/lex.l2
-rw-r--r--usr.bin/mkesdb/yacc.y2
-rw-r--r--usr.bin/mktemp/mktemp.c2
-rw-r--r--usr.bin/mkuzip/mkuzip.c4
-rw-r--r--usr.bin/ncal/ncal.c2
-rw-r--r--usr.bin/netstat/bpf.c2
-rw-r--r--usr.bin/netstat/netisr.c2
-rw-r--r--usr.bin/newgrp/newgrp.c2
-rw-r--r--usr.bin/nl/nl.c2
-rw-r--r--usr.bin/passwd/passwd.c2
-rw-r--r--usr.bin/pathchk/pathchk.c2
-rw-r--r--usr.bin/perror/perror.c2
-rw-r--r--usr.bin/procstat/procstat.c2
-rw-r--r--usr.bin/procstat/procstat.h2
-rw-r--r--usr.bin/procstat/procstat_args.c2
-rw-r--r--usr.bin/procstat/procstat_auxv.c2
-rw-r--r--usr.bin/procstat/procstat_basic.c2
-rw-r--r--usr.bin/procstat/procstat_bin.c2
-rw-r--r--usr.bin/procstat/procstat_cred.c2
-rw-r--r--usr.bin/procstat/procstat_files.c2
-rw-r--r--usr.bin/procstat/procstat_kstack.c2
-rw-r--r--usr.bin/procstat/procstat_rlimit.c2
-rw-r--r--usr.bin/procstat/procstat_sigs.c2
-rw-r--r--usr.bin/procstat/procstat_threads.c2
-rw-r--r--usr.bin/procstat/procstat_vm.c2
-rw-r--r--usr.bin/protect/protect.c2
-rw-r--r--usr.bin/rctl/rctl.c2
-rw-r--r--usr.bin/revoke/revoke.c2
-rw-r--r--usr.bin/seq/seq.c4
-rw-r--r--usr.bin/setchannel/setchannel.c2
-rw-r--r--usr.bin/sockstat/sockstat.c2
-rw-r--r--usr.bin/sort/bwstring.c2
-rw-r--r--usr.bin/sort/bwstring.h2
-rw-r--r--usr.bin/sort/coll.c2
-rw-r--r--usr.bin/sort/coll.h2
-rw-r--r--usr.bin/sort/file.c2
-rw-r--r--usr.bin/sort/file.h2
-rw-r--r--usr.bin/sort/mem.c2
-rw-r--r--usr.bin/sort/mem.h2
-rw-r--r--usr.bin/sort/radixsort.c2
-rw-r--r--usr.bin/sort/radixsort.h2
-rw-r--r--usr.bin/sort/sort.c2
-rw-r--r--usr.bin/sort/sort.h2
-rw-r--r--usr.bin/sort/vsort.c2
-rw-r--r--usr.bin/sort/vsort.h2
-rwxr-xr-xusr.bin/ssh-copy-id/ssh-copy-id.sh2
-rw-r--r--usr.bin/stat/stat.c4
-rw-r--r--usr.bin/stdbuf/stdbuf.c2
-rw-r--r--usr.bin/systat/convtbl.c4
-rw-r--r--usr.bin/systat/convtbl.h4
-rw-r--r--usr.bin/systat/devs.h2
-rw-r--r--usr.bin/systat/ifcmds.c4
-rw-r--r--usr.bin/systat/ifstat.c4
-rw-r--r--usr.bin/tabs/tabs.c2
-rw-r--r--usr.bin/tr/cmap.c2
-rw-r--r--usr.bin/tr/cmap.h2
-rw-r--r--usr.bin/tr/cset.c2
-rw-r--r--usr.bin/tr/cset.h2
-rw-r--r--usr.bin/truncate/truncate.c2
-rw-r--r--usr.bin/truss/truss.h4
-rw-r--r--usr.bin/unifdef/unifdef.c4
-rw-r--r--usr.bin/unifdef/unifdef.h4
-rw-r--r--usr.bin/unifdef/unifdefall.sh2
-rw-r--r--usr.bin/units/units.c4
-rw-r--r--usr.bin/unzip/unzip.c2
-rw-r--r--usr.bin/usbhidaction/usbhidaction.c4
-rw-r--r--usr.bin/usbhidctl/usbhid.c4
-rw-r--r--usr.bin/whereis/pathnames.h4
-rw-r--r--usr.bin/whereis/whereis.c4
-rw-r--r--usr.bin/which/which.c4
-rw-r--r--usr.bin/who/who.c2
-rw-r--r--usr.bin/ypcat/ypcat.c4
-rw-r--r--usr.bin/ypmatch/ypmatch.c4
-rw-r--r--usr.bin/ypwhich/ypwhich.c4
179 files changed, 415 insertions, 46 deletions
diff --git a/usr.bin/ar/acplex.l b/usr.bin/ar/acplex.l
index 589888e..f74821a 100644
--- a/usr.bin/ar/acplex.l
+++ b/usr.bin/ar/acplex.l
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Kai Wang
* All rights reserved.
*
diff --git a/usr.bin/ar/acpyacc.y b/usr.bin/ar/acpyacc.y
index 456ee1f..b335598 100644
--- a/usr.bin/ar/acpyacc.y
+++ b/usr.bin/ar/acpyacc.y
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Kai Wang
* All rights reserved.
*
diff --git a/usr.bin/ar/ar.h b/usr.bin/ar/ar.h
index 957a985..1966898 100644
--- a/usr.bin/ar/ar.h
+++ b/usr.bin/ar/ar.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Kai Wang
* All rights reserved.
*
diff --git a/usr.bin/ar/read.c b/usr.bin/ar/read.c
index 704812c..7825054 100644
--- a/usr.bin/ar/read.c
+++ b/usr.bin/ar/read.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Kai Wang
* Copyright (c) 2007 Tim Kientzle
* All rights reserved.
diff --git a/usr.bin/ar/util.c b/usr.bin/ar/util.c
index e1230e3..d6eb36e 100644
--- a/usr.bin/ar/util.c
+++ b/usr.bin/ar/util.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2007 Tim Kientzle
* All rights reserved.
*
diff --git a/usr.bin/ar/write.c b/usr.bin/ar/write.c
index 49f539b..15fedbc 100644
--- a/usr.bin/ar/write.c
+++ b/usr.bin/ar/write.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Kai Wang
* All rights reserved.
*
diff --git a/usr.bin/asa/asa.c b/usr.bin/asa/asa.c
index 692b8375..22174ed 100644
--- a/usr.bin/asa/asa.c
+++ b/usr.bin/asa/asa.c
@@ -1,6 +1,8 @@
/* $NetBSD: asa.c,v 1.11 1997/09/20 14:55:00 lukem Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993,94 Winning Strategies, Inc.
* All rights reserved.
*
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index fec0df3..63b0e3a 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -1,5 +1,8 @@
-/*
+/*-
* at.c : Put file into atrun queue
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993, 1994 Thomas Koenig
*
* Atrun & Atq modifications
diff --git a/usr.bin/at/at.h b/usr.bin/at/at.h
index 3d72bbb..8bdc65d 100644
--- a/usr.bin/at/at.h
+++ b/usr.bin/at/at.h
@@ -1,5 +1,8 @@
-/*
+/*-
* at.h - header for at(1)
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993 Thomas Koenig
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index ef5265b..63cd68c 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -1,5 +1,8 @@
-/*
+/*-
* panic.c - terminate fast in case of error
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993 Thomas Koenig
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/at/panic.h b/usr.bin/at/panic.h
index 832de83..d514048 100644
--- a/usr.bin/at/panic.h
+++ b/usr.bin/at/panic.h
@@ -1,5 +1,8 @@
-/*
+/*-
* panic.h - header for at(1)
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993 Thomas Koenig
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index 418b7eb..97f533c 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -1,5 +1,8 @@
-/*
+/*-
* parsetime.c - parse time for at(1)
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993, 1994 Thomas Koenig
*
* modifications for English-language times
diff --git a/usr.bin/at/parsetime.h b/usr.bin/at/parsetime.h
index 30c3f20..c320164 100644
--- a/usr.bin/at/parsetime.h
+++ b/usr.bin/at/parsetime.h
@@ -1,5 +1,8 @@
-/*
+/*-
* at.h - header for at(1)
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993 Thomas Koenig
*
* Redistribution and use in source and binary forms, with or without
@@ -21,6 +24,8 @@
* THEORY OF LIABILITY, WETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
time_t parsetime(int argc, char **argv);
diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c
index 91176b4..e2fb86e 100644
--- a/usr.bin/at/perm.c
+++ b/usr.bin/at/perm.c
@@ -1,5 +1,8 @@
-/*
+/*-
* perm.c - check user permission for at(1)
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1994 Thomas Koenig
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/at/perm.h b/usr.bin/at/perm.h
index b55b5fb..59e1031 100644
--- a/usr.bin/at/perm.h
+++ b/usr.bin/at/perm.h
@@ -1,5 +1,8 @@
-/*
+/*-
* perm.h - header for at(1)
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1994 Thomas Koenig
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/at/privs.h b/usr.bin/at/privs.h
index 2b0d34a..ba84ec9 100644
--- a/usr.bin/at/privs.h
+++ b/usr.bin/at/privs.h
@@ -1,5 +1,8 @@
-/*
- * privs.h - header for privileged operations
+/*-
+ * privs.h - header for privileged operations
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993 Thomas Koenig
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/bluetooth/bthost/bthost.c b/usr.bin/bluetooth/bthost/bthost.c
index 69ce3f5..b5c5b72 100644
--- a/usr.bin/bluetooth/bthost/bthost.c
+++ b/usr.bin/bluetooth/bthost/bthost.c
@@ -1,6 +1,8 @@
-/*
+/*-
* bthost.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.bin/bluetooth/btsockstat/btsockstat.c b/usr.bin/bluetooth/btsockstat/btsockstat.c
index 78f6127..95ffd25 100644
--- a/usr.bin/bluetooth/btsockstat/btsockstat.c
+++ b/usr.bin/bluetooth/btsockstat/btsockstat.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* btsockstat.c
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
index 239597d..116c5c8 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
@@ -1,6 +1,8 @@
-/*
+/*-
* rfcomm_sdp.c
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
index 309bab9..ff99591 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index ce462e9..e30f45e 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2000, 2001 David O'Brien
* Copyright (c) 1996 Søren Schmidt
* All rights reserved.
diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.c b/usr.bin/bsdiff/bsdiff/bsdiff.c
index 4646e4e..57243fc 100644
--- a/usr.bin/bsdiff/bsdiff/bsdiff.c
+++ b/usr.bin/bsdiff/bsdiff/bsdiff.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2003-2005 Colin Percival
* All rights reserved
*
diff --git a/usr.bin/bsdiff/bspatch/bspatch.c b/usr.bin/bsdiff/bspatch/bspatch.c
index fc7c07d..c66f28e 100644
--- a/usr.bin/bsdiff/bspatch/bspatch.c
+++ b/usr.bin/bsdiff/bspatch/bspatch.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2003-2005 Colin Percival
* All rights reserved
*
diff --git a/usr.bin/c89/c89.c b/usr.bin/c89/c89.c
index 930153f..fbccf39 100644
--- a/usr.bin/c89/c89.c
+++ b/usr.bin/c89/c89.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* This is the Posix.2 mandated C compiler. Basically, a hook to the
* cc(1) command.
*
diff --git a/usr.bin/c99/c99.c b/usr.bin/c99/c99.c
index 79cca89..093023f 100644
--- a/usr.bin/c99/c99.c
+++ b/usr.bin/c99/c99.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/calendar/dates.c b/usr.bin/calendar/dates.c
index 86d8a1f..e30e864 100644
--- a/usr.bin/calendar/dates.c
+++ b/usr.bin/calendar/dates.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1992-2009 Edwin Groothuis <edwin@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.bin/calendar/events.c b/usr.bin/calendar/events.c
index d6f358a..5d7255e 100644
--- a/usr.bin/calendar/events.c
+++ b/usr.bin/calendar/events.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1992-2009 Edwin Groothuis <edwin@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index 3cce299..53a5a89 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* All rights reserved.
*
diff --git a/usr.bin/calendar/parsedata.c b/usr.bin/calendar/parsedata.c
index 1a19164..32f0cb8 100644
--- a/usr.bin/calendar/parsedata.c
+++ b/usr.bin/calendar/parsedata.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1992-2009 Edwin Groothuis <edwin@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.bin/calendar/paskha.c b/usr.bin/calendar/paskha.c
index ab369ad..46936e6 100644
--- a/usr.bin/calendar/paskha.c
+++ b/usr.bin/calendar/paskha.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993-1996 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
*
diff --git a/usr.bin/calendar/sunpos.c b/usr.bin/calendar/sunpos.c
index 1e39cba..48dd893 100644
--- a/usr.bin/calendar/sunpos.c
+++ b/usr.bin/calendar/sunpos.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 Edwin Groothuis <edwin@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.bin/cmp/link.c b/usr.bin/cmp/link.c
index fe45def..3aecf4f 100644
--- a/usr.bin/cmp/link.c
+++ b/usr.bin/cmp/link.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Brian Somers <brian@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y
index 44a62cd..c7b1b88 100644
--- a/usr.bin/colldef/parse.y
+++ b/usr.bin/colldef/parse.y
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
* at Electronni Visti IA, Kiev, Ukraine.
* All rights reserved.
diff --git a/usr.bin/colldef/scan.l b/usr.bin/colldef/scan.l
index b396ed0..f83078b 100644
--- a/usr.bin/colldef/scan.l
+++ b/usr.bin/colldef/scan.l
@@ -1,6 +1,8 @@
%x string name charmap defn nchar subs subs2
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
* at Electronni Visti IA, Kiev, Ukraine.
* All rights reserved.
diff --git a/usr.bin/compress/zopen.h b/usr.bin/compress/zopen.h
index a27a4f9..229a736 100644
--- a/usr.bin/compress/zopen.h
+++ b/usr.bin/compress/zopen.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* FreeBSD Inc. All rights reserved.
*
diff --git a/usr.bin/cpuset/cpuset.c b/usr.bin/cpuset/cpuset.c
index c619259..160d76e 100644
--- a/usr.bin/cpuset/cpuset.c
+++ b/usr.bin/cpuset/cpuset.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007, 2008 Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
*
diff --git a/usr.bin/csplit/csplit.c b/usr.bin/csplit/csplit.c
index b23c85d..97ccd09 100644
--- a/usr.bin/csplit/csplit.c
+++ b/usr.bin/csplit/csplit.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/ctlstat/ctlstat.c b/usr.bin/ctlstat/ctlstat.c
index 70c1f7a..34e340f 100644
--- a/usr.bin/ctlstat/ctlstat.c
+++ b/usr.bin/ctlstat/ctlstat.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004, 2008, 2009 Silicon Graphics International Corp.
* Copyright (c) 2017 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/dtc/checking.cc b/usr.bin/dtc/checking.cc
index ffd6d24..33b0717 100644
--- a/usr.bin/dtc/checking.cc
+++ b/usr.bin/dtc/checking.cc
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/checking.hh b/usr.bin/dtc/checking.hh
index d833ffd..5c5a6a0 100644
--- a/usr.bin/dtc/checking.hh
+++ b/usr.bin/dtc/checking.hh
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/dtb.cc b/usr.bin/dtc/dtb.cc
index b18674c..6594774 100644
--- a/usr.bin/dtc/dtb.cc
+++ b/usr.bin/dtc/dtb.cc
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/dtb.hh b/usr.bin/dtc/dtb.hh
index fa93178..d0e42a1 100644
--- a/usr.bin/dtc/dtb.hh
+++ b/usr.bin/dtc/dtb.hh
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/dtc.cc b/usr.bin/dtc/dtc.cc
index fded151..4a34419 100644
--- a/usr.bin/dtc/dtc.cc
+++ b/usr.bin/dtc/dtc.cc
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/fdt.cc b/usr.bin/dtc/fdt.cc
index 27f7135..a153756 100644
--- a/usr.bin/dtc/fdt.cc
+++ b/usr.bin/dtc/fdt.cc
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/fdt.hh b/usr.bin/dtc/fdt.hh
index 1a5270b..cc80aed 100644
--- a/usr.bin/dtc/fdt.hh
+++ b/usr.bin/dtc/fdt.hh
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/input_buffer.cc b/usr.bin/dtc/input_buffer.cc
index 429e219..d0fa022 100644
--- a/usr.bin/dtc/input_buffer.cc
+++ b/usr.bin/dtc/input_buffer.cc
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/input_buffer.hh b/usr.bin/dtc/input_buffer.hh
index 76ad7c7..2a6d741 100644
--- a/usr.bin/dtc/input_buffer.hh
+++ b/usr.bin/dtc/input_buffer.hh
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/string.cc b/usr.bin/dtc/string.cc
index 8891556..71a304a 100644
--- a/usr.bin/dtc/string.cc
+++ b/usr.bin/dtc/string.cc
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/dtc/util.hh b/usr.bin/dtc/util.hh
index 91f4fa8..337685e 100644
--- a/usr.bin/dtc/util.hh
+++ b/usr.bin/dtc/util.hh
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 David Chisnall
* All rights reserved.
*
diff --git a/usr.bin/elf2aout/elf2aout.c b/usr.bin/elf2aout/elf2aout.c
index 7e1ece6..2782d89 100644
--- a/usr.bin/elf2aout/elf2aout.c
+++ b/usr.bin/elf2aout/elf2aout.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Jake Burkholder
* All rights reserved.
*
diff --git a/usr.bin/elfdump/elfdump.c b/usr.bin/elfdump/elfdump.c
index eda56ce..58d1cb2 100644
--- a/usr.bin/elfdump/elfdump.c
+++ b/usr.bin/elfdump/elfdump.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 David O'Brien. All rights reserved.
* Copyright (c) 2001 Jake Burkholder
* All rights reserved.
diff --git a/usr.bin/env/envopts.c b/usr.bin/env/envopts.c
index 5740062..5c15b36 100644
--- a/usr.bin/env/envopts.c
+++ b/usr.bin/env/envopts.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 - Garance Alistair Drosehn <gad@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.bin/env/envopts.h b/usr.bin/env/envopts.h
index 1f15c69..5c6dcf6 100644
--- a/usr.bin/env/envopts.h
+++ b/usr.bin/env/envopts.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 - Garance Alistair Drosehn <gad@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c
index 3fbf343..a37821f 100644
--- a/usr.bin/fetch/fetch.c
+++ b/usr.bin/fetch/fetch.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2000-2014 Dag-Erling Smørgrav
* Copyright (c) 2013 Michael Gmelin <freebsd@grem.de>
* All rights reserved.
diff --git a/usr.bin/finger/pathnames.h b/usr.bin/finger/pathnames.h
index 7c9ad19..a60ce7d 100644
--- a/usr.bin/finger/pathnames.h
+++ b/usr.bin/finger/pathnames.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Mark Knight <markk@knigma.org>
* All rights reserved.
*
diff --git a/usr.bin/fstat/functions.h b/usr.bin/fstat/functions.h
index a23d27e..ba46aa4 100644
--- a/usr.bin/fstat/functions.h
+++ b/usr.bin/fstat/functions.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/fstat/fuser.c b/usr.bin/fstat/fuser.c
index dbb0d86..b422532 100644
--- a/usr.bin/fstat/fuser.c
+++ b/usr.bin/fstat/fuser.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2009 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/fstat/main.c b/usr.bin/fstat/main.c
index 4123e64..ab08386 100644
--- a/usr.bin/fstat/main.c
+++ b/usr.bin/fstat/main.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.bin/fsync/fsync.c b/usr.bin/fsync/fsync.c
index 78aeb21..f6a4286 100644
--- a/usr.bin/fsync/fsync.c
+++ b/usr.bin/fsync/fsync.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Paul Saab <ps@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c
index e0be1c2..6b507b6 100644
--- a/usr.bin/gcore/elfcore.c
+++ b/usr.bin/gcore/elfcore.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2017 Dell EMC
* Copyright (c) 2007 Sandvine Incorporated
* Copyright (c) 1998 John D. Polstra
diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c
index 6d4098a..323914e 100644
--- a/usr.bin/gencat/gencat.c
+++ b/usr.bin/gencat/gencat.c
@@ -3,7 +3,9 @@
/* $NetBSD: gencat.c,v 1.18 2003/10/27 00:12:43 lukem Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND MIT
+ *
* Copyright (c) 1996 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/getent/getent.c b/usr.bin/getent/getent.c
index 977f147..1b1427e 100644
--- a/usr.bin/getent/getent.c
+++ b/usr.bin/getent/getent.c
@@ -1,6 +1,8 @@
/* $NetBSD: getent.c,v 1.7 2005/08/24 14:31:02 ginsbach Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c
index bea7c72..7de58a6 100644
--- a/usr.bin/grep/file.c
+++ b/usr.bin/grep/file.c
@@ -3,6 +3,8 @@
/* $OpenBSD: file.c,v 1.11 2010/07/02 20:48:48 nicm Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* Copyright (C) 2008-2010 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2010 Dimitry Andric <dimitry@andric.com>
diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c
index 3113fba..e48613b 100644
--- a/usr.bin/grep/grep.c
+++ b/usr.bin/grep/grep.c
@@ -3,6 +3,8 @@
/* $OpenBSD: grep.c,v 1.42 2010/07/02 22:18:03 tedu Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* Copyright (C) 2008-2009 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/grep/grep.h b/usr.bin/grep/grep.h
index 7cd8c38..8167a9a 100644
--- a/usr.bin/grep/grep.h
+++ b/usr.bin/grep/grep.h
@@ -3,6 +3,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008-2009 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/grep/queue.c b/usr.bin/grep/queue.c
index f094f8a..b5f3aa1 100644
--- a/usr.bin/grep/queue.c
+++ b/usr.bin/grep/queue.c
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
diff --git a/usr.bin/grep/regex/fastmatch.c b/usr.bin/grep/regex/fastmatch.c
index db5899a..6e3e3f8 100644
--- a/usr.bin/grep/regex/fastmatch.c
+++ b/usr.bin/grep/regex/fastmatch.c
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2011 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/grep/regex/hashtable.c b/usr.bin/grep/regex/hashtable.c
index 41ebcd1..1767d0a 100644
--- a/usr.bin/grep/regex/hashtable.c
+++ b/usr.bin/grep/regex/hashtable.c
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2011 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/grep/regex/tre-fastmatch.c b/usr.bin/grep/regex/tre-fastmatch.c
index 6bf7c44..c286456 100644
--- a/usr.bin/grep/regex/tre-fastmatch.c
+++ b/usr.bin/grep/regex/tre-fastmatch.c
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* Copyright (C) 2008-2011 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c
index 2741380..6fd841c 100644
--- a/usr.bin/grep/util.c
+++ b/usr.bin/grep/util.c
@@ -3,6 +3,8 @@
/* $OpenBSD: util.c,v 1.39 2010/07/02 22:18:03 tedu Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* Copyright (C) 2008-2010 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2017 Kyle Evans <kevans@FreeBSD.org>
diff --git a/usr.bin/gzip/gzip.c b/usr.bin/gzip/gzip.c
index 68f83fe..e56b089 100644
--- a/usr.bin/gzip/gzip.c
+++ b/usr.bin/gzip/gzip.c
@@ -1,6 +1,8 @@
/* $NetBSD: gzip.c,v 1.112 2017/08/23 13:04:17 christos Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008, 2009, 2010, 2011, 2015, 2017
* Matthew R. Green
* All rights reserved.
diff --git a/usr.bin/gzip/unbzip2.c b/usr.bin/gzip/unbzip2.c
index 3eb29c3..f6807e0 100644
--- a/usr.bin/gzip/unbzip2.c
+++ b/usr.bin/gzip/unbzip2.c
@@ -1,6 +1,8 @@
/* $NetBSD: unbzip2.c,v 1.14 2017/08/04 07:27:08 mrg Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2006 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/gzip/unpack.c b/usr.bin/gzip/unpack.c
index f07cae0..8e8f7c0 100644
--- a/usr.bin/gzip/unpack.c
+++ b/usr.bin/gzip/unpack.c
@@ -2,6 +2,8 @@
/* $NetBSD: unpack.c,v 1.3 2017/08/04 07:27:08 mrg Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Xin LI <delphij@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/gzip/unxz.c b/usr.bin/gzip/unxz.c
index 6b01485..390c916 100644
--- a/usr.bin/gzip/unxz.c
+++ b/usr.bin/gzip/unxz.c
@@ -1,6 +1,8 @@
/* $NetBSD: unxz.c,v 1.7 2017/08/04 07:27:08 mrg Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/iconv/iconv.c b/usr.bin/iconv/iconv.c
index 161b22e..e693dad 100644
--- a/usr.bin/iconv/iconv.c
+++ b/usr.bin/iconv/iconv.c
@@ -2,6 +2,8 @@
/* $NetBSD: iconv.c,v 1.16 2009/02/20 15:28:21 yamt Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/usr.bin/indent/indent.h b/usr.bin/indent/indent.h
index 4c52bf8..b1473a0 100644
--- a/usr.bin/indent/indent.h
+++ b/usr.bin/indent/indent.h
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jens Schweikhardt
* All rights reserved.
*
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index 98c4555..8cfeec3 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Adam Glass
* All rights reserved.
*
diff --git a/usr.bin/ipcs/ipc.c b/usr.bin/ipcs/ipc.c
index 9bb795c..3106e13 100644
--- a/usr.bin/ipcs/ipc.c
+++ b/usr.bin/ipcs/ipc.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
* All rights reserved.
*
diff --git a/usr.bin/ipcs/ipc.h b/usr.bin/ipcs/ipc.h
index 0b6188a..6e89e48 100644
--- a/usr.bin/ipcs/ipc.h
+++ b/usr.bin/ipcs/ipc.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
* All rights reserved.
*
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index be6ca56..3d7be14 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
* All rights reserved.
*
diff --git a/usr.bin/iscsictl/iscsictl.c b/usr.bin/iscsictl/iscsictl.c
index 45a0912..e71ba90 100644
--- a/usr.bin/iscsictl/iscsictl.c
+++ b/usr.bin/iscsictl/iscsictl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.bin/iscsictl/iscsictl.h b/usr.bin/iscsictl/iscsictl.h
index 79d89b8..aac86e7 100644
--- a/usr.bin/iscsictl/iscsictl.h
+++ b/usr.bin/iscsictl/iscsictl.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.bin/iscsictl/parse.y b/usr.bin/iscsictl/parse.y
index 84c05b8..1e414a6 100644
--- a/usr.bin/iscsictl/parse.y
+++ b/usr.bin/iscsictl/parse.y
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.bin/iscsictl/periphs.c b/usr.bin/iscsictl/periphs.c
index 0697860..e4d4f99 100644
--- a/usr.bin/iscsictl/periphs.c
+++ b/usr.bin/iscsictl/periphs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997-2007 Kenneth D. Merry
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
diff --git a/usr.bin/iscsictl/token.l b/usr.bin/iscsictl/token.l
index c9e3e72..fc731f4 100644
--- a/usr.bin/iscsictl/token.l
+++ b/usr.bin/iscsictl/token.l
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c
index cdb62da..aca0830 100644
--- a/usr.bin/killall/killall.c
+++ b/usr.bin/killall/killall.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Peter Wemm <peter@FreeBSD.org>
* Copyright (c) 2000 Paul Saab <ps@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/ktrdump/ktrdump.c b/usr.bin/ktrdump/ktrdump.c
index d1cf061..388e4bb 100644
--- a/usr.bin/ktrdump/ktrdump.c
+++ b/usr.bin/ktrdump/ktrdump.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Jake Burkholder
* Copyright (c) 2004 Robert Watson
* All rights reserved.
diff --git a/usr.bin/lastcomm/readrec.c b/usr.bin/lastcomm/readrec.c
index 5de7c5c..b83a612 100644
--- a/usr.bin/lastcomm/readrec.c
+++ b/usr.bin/lastcomm/readrec.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Diomidis Spinellis
* All rights reserved.
*
diff --git a/usr.bin/ldd/extern.h b/usr.bin/ldd/extern.h
index 4df6759..840ca0e 100644
--- a/usr.bin/ldd/extern.h
+++ b/usr.bin/ldd/extern.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 FreeBSD, Inc
* All rights reserved.
*
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index e1bebe0..915db38 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993 Paul Kranenburg
* All rights reserved.
*
diff --git a/usr.bin/ldd/sods.c b/usr.bin/ldd/sods.c
index 7e69cec..fb70e9f 100644
--- a/usr.bin/ldd/sods.c
+++ b/usr.bin/ldd/sods.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996-1997 John D. Polstra. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/locale/locale.c b/usr.bin/locale/locale.c
index a62eff1..8f47f8e 100644
--- a/usr.bin/locale/locale.c
+++ b/usr.bin/locale/locale.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002, 2003 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/locate/locate/concatdb.sh b/usr.bin/locate/locate/concatdb.sh
index 156f21a..ead4743 100644
--- a/usr.bin/locate/locate/concatdb.sh
+++ b/usr.bin/locate/locate/concatdb.sh
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
# All rights reserved.
#
diff --git a/usr.bin/locate/locate/mklocatedb.sh b/usr.bin/locate/locate/mklocatedb.sh
index 39d15d7..284ea64 100644
--- a/usr.bin/locate/locate/mklocatedb.sh
+++ b/usr.bin/locate/locate/mklocatedb.sh
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
# All rights reserved.
#
diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh
index 97f096d..c01dcf9 100644
--- a/usr.bin/locate/locate/updatedb.sh
+++ b/usr.bin/locate/locate/updatedb.sh
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
# All rights reserved.
#
diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c
index 5555c48..471bedf 100644
--- a/usr.bin/lockf/lockf.c
+++ b/usr.bin/lockf/lockf.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1997 John D. Polstra. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/login/login.h b/usr.bin/login/login.h
index 48ef31b..3a27d46 100644
--- a/usr.bin/login/login.h
+++ b/usr.bin/login/login.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 FreeBSD, Inc
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/logins/logins.c b/usr.bin/logins/logins.c
index 5cc60d7..535efa1 100644
--- a/usr.bin/logins/logins.c
+++ b/usr.bin/logins/logins.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2004 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
diff --git a/usr.bin/m4/gnum4.c b/usr.bin/m4/gnum4.c
index 61f96d4..4ac7196 100644
--- a/usr.bin/m4/gnum4.c
+++ b/usr.bin/m4/gnum4.c
@@ -1,6 +1,8 @@
/* $OpenBSD: gnum4.c,v 1.50 2015/04/29 00:13:26 millert Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 1999 Marc Espie
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/m4/trace.c b/usr.bin/m4/trace.c
index 90e913d..cce4c79 100644
--- a/usr.bin/m4/trace.c
+++ b/usr.bin/m4/trace.c
@@ -1,5 +1,7 @@
/* $OpenBSD: trace.c,v 1.16 2010/09/07 19:58:09 marco Exp $ */
/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2001 Marc Espie.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh
index 3aa9ab9..4d72773 100755
--- a/usr.bin/man/man.sh
+++ b/usr.bin/man/man.sh
@@ -1,5 +1,7 @@
#! /bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 Gordon Tetlow
# All rights reserved.
#
diff --git a/usr.bin/mkcsmapper/ldef.h b/usr.bin/mkcsmapper/ldef.h
index d585703..0aedc56 100644
--- a/usr.bin/mkcsmapper/ldef.h
+++ b/usr.bin/mkcsmapper/ldef.h
@@ -2,6 +2,8 @@
/* $NetBSD: ldef.h,v 1.2 2006/09/09 14:35:17 tnozaki Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2003, 2006 Citrus Project,
* All rights reserved.
*
diff --git a/usr.bin/mkcsmapper/lex.l b/usr.bin/mkcsmapper/lex.l
index 33b7f8e..adbdf78 100644
--- a/usr.bin/mkcsmapper/lex.l
+++ b/usr.bin/mkcsmapper/lex.l
@@ -3,6 +3,8 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/usr.bin/mkcsmapper/yacc.y b/usr.bin/mkcsmapper/yacc.y
index 89ce5fd..fc43ea8 100644
--- a/usr.bin/mkcsmapper/yacc.y
+++ b/usr.bin/mkcsmapper/yacc.y
@@ -3,6 +3,8 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2003, 2006 Citrus Project,
* All rights reserved.
*
diff --git a/usr.bin/mkesdb/ldef.h b/usr.bin/mkesdb/ldef.h
index 45b4e60..e543936 100644
--- a/usr.bin/mkesdb/ldef.h
+++ b/usr.bin/mkesdb/ldef.h
@@ -2,6 +2,8 @@
/* $NetBSD: ldef.h,v 1.2 2005/06/27 01:23:59 fvdl Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/usr.bin/mkesdb/lex.l b/usr.bin/mkesdb/lex.l
index c9d9cc1..3d6b836 100644
--- a/usr.bin/mkesdb/lex.l
+++ b/usr.bin/mkesdb/lex.l
@@ -3,6 +3,8 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/usr.bin/mkesdb/yacc.y b/usr.bin/mkesdb/yacc.y
index 7b6e140..4b3f9c7 100644
--- a/usr.bin/mkesdb/yacc.y
+++ b/usr.bin/mkesdb/yacc.y
@@ -3,6 +3,8 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c
index 277104f..0b320e8 100644
--- a/usr.bin/mktemp/mktemp.c
+++ b/usr.bin/mktemp/mktemp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1994, 1995, 1996, 1998 Peter Wemm <peter@netplex.com.au>
* All rights reserved.
*
diff --git a/usr.bin/mkuzip/mkuzip.c b/usr.bin/mkuzip/mkuzip.c
index 074df03..be0a9b2 100644
--- a/usr.bin/mkuzip/mkuzip.c
+++ b/usr.bin/mkuzip/mkuzip.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2016 Maxim Sobolev <sobomax@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c
index 25bc76f..621b839 100644
--- a/usr.bin/ncal/ncal.c
+++ b/usr.bin/ncal/ncal.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Wolfgang Helbig
* All rights reserved.
*
diff --git a/usr.bin/netstat/bpf.c b/usr.bin/netstat/bpf.c
index 60546e3..4251746 100644
--- a/usr.bin/netstat/bpf.c
+++ b/usr.bin/netstat/bpf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Christian S.J. Peron
* All rights reserved.
*
diff --git a/usr.bin/netstat/netisr.c b/usr.bin/netstat/netisr.c
index b384d6a..9c9f05f 100644
--- a/usr.bin/netstat/netisr.c
+++ b/usr.bin/netstat/netisr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2011 Juniper Networks, Inc.
* All rights reserved.
*
diff --git a/usr.bin/newgrp/newgrp.c b/usr.bin/newgrp/newgrp.c
index 8fc90f3..f8f54f7 100644
--- a/usr.bin/newgrp/newgrp.c
+++ b/usr.bin/newgrp/newgrp.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c
index 1770b78..92111a8 100644
--- a/usr.bin/nl/nl.c
+++ b/usr.bin/nl/nl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index 2d399c5..7896428 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Networks Associates Technologies, Inc.
* All rights reserved.
*
diff --git a/usr.bin/pathchk/pathchk.c b/usr.bin/pathchk/pathchk.c
index be80ec9..314454f 100644
--- a/usr.bin/pathchk/pathchk.c
+++ b/usr.bin/pathchk/pathchk.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/perror/perror.c b/usr.bin/perror/perror.c
index 62af5df..1cf502a 100644
--- a/usr.bin/perror/perror.c
+++ b/usr.bin/perror/perror.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Hudson River Trading LLC
* Written by: George V. Neville-Neil <gnn@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat.c b/usr.bin/procstat/procstat.c
index eca2790..c912829 100644
--- a/usr.bin/procstat/procstat.c
+++ b/usr.bin/procstat/procstat.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007, 2011 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* Copyright (c) 2017 Dell EMC
diff --git a/usr.bin/procstat/procstat.h b/usr.bin/procstat/procstat.h
index dd35c9c..e2cb96a 100644
--- a/usr.bin/procstat/procstat.h
+++ b/usr.bin/procstat/procstat.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* Copyright (c) 2017 Dell EMC
diff --git a/usr.bin/procstat/procstat_args.c b/usr.bin/procstat/procstat_args.c
index fd5f3d3..917d8a2 100644
--- a/usr.bin/procstat/procstat_args.c
+++ b/usr.bin/procstat/procstat_args.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_auxv.c b/usr.bin/procstat/procstat_auxv.c
index f4a2265..cc85c3e 100644
--- a/usr.bin/procstat/procstat_auxv.c
+++ b/usr.bin/procstat/procstat_auxv.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Mikolaj Golub
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_basic.c b/usr.bin/procstat/procstat_basic.c
index 75bb7a8..5cd2b08 100644
--- a/usr.bin/procstat/procstat_basic.c
+++ b/usr.bin/procstat/procstat_basic.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_bin.c b/usr.bin/procstat/procstat_bin.c
index 8b2b8a1..91cc7dc 100644
--- a/usr.bin/procstat/procstat_bin.c
+++ b/usr.bin/procstat/procstat_bin.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_cred.c b/usr.bin/procstat/procstat_cred.c
index 940c952..520dc63 100644
--- a/usr.bin/procstat/procstat_cred.c
+++ b/usr.bin/procstat/procstat_cred.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2008 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c
index 1626697..3b20199 100644
--- a/usr.bin/procstat/procstat_files.c
+++ b/usr.bin/procstat/procstat_files.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2011 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_kstack.c b/usr.bin/procstat/procstat_kstack.c
index 374f9d0..ad800bc 100644
--- a/usr.bin/procstat/procstat_kstack.c
+++ b/usr.bin/procstat/procstat_kstack.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_rlimit.c b/usr.bin/procstat/procstat_rlimit.c
index 5088c59..81147c9 100644
--- a/usr.bin/procstat/procstat_rlimit.c
+++ b/usr.bin/procstat/procstat_rlimit.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Mikolaj Golub
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_sigs.c b/usr.bin/procstat/procstat_sigs.c
index 7bc73ec..4f98e2d 100644
--- a/usr.bin/procstat/procstat_sigs.c
+++ b/usr.bin/procstat/procstat_sigs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Konstantin Belousov
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_threads.c b/usr.bin/procstat/procstat_threads.c
index 40e1b4b..df8a1d9 100644
--- a/usr.bin/procstat/procstat_threads.c
+++ b/usr.bin/procstat/procstat_threads.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_vm.c b/usr.bin/procstat/procstat_vm.c
index 8c641e5..83536e8 100644
--- a/usr.bin/procstat/procstat_vm.c
+++ b/usr.bin/procstat/procstat_vm.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/protect/protect.c b/usr.bin/protect/protect.c
index 16b0d29..d9990be 100644
--- a/usr.bin/protect/protect.c
+++ b/usr.bin/protect/protect.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/rctl/rctl.c b/usr.bin/rctl/rctl.c
index 05809d3..74073c1 100644
--- a/usr.bin/rctl/rctl.c
+++ b/usr.bin/rctl/rctl.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/usr.bin/revoke/revoke.c b/usr.bin/revoke/revoke.c
index bc9f838..ca976ac 100644
--- a/usr.bin/revoke/revoke.c
+++ b/usr.bin/revoke/revoke.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/seq/seq.c b/usr.bin/seq/seq.c
index 6d715e1..b8c3fae 100644
--- a/usr.bin/seq/seq.c
+++ b/usr.bin/seq/seq.c
@@ -1,5 +1,7 @@
/* $NetBSD: seq.c,v 1.7 2010/05/27 08:40:19 dholland Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/setchannel/setchannel.c b/usr.bin/setchannel/setchannel.c
index e7b00fe..a229290 100644
--- a/usr.bin/setchannel/setchannel.c
+++ b/usr.bin/setchannel/setchannel.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003, 2004, 2005
* John Wehle <john@feith.com>. All rights reserved.
*
diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c
index dea195c..22442ba 100644
--- a/usr.bin/sockstat/sockstat.c
+++ b/usr.bin/sockstat/sockstat.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
diff --git a/usr.bin/sort/bwstring.c b/usr.bin/sort/bwstring.c
index 5ece88e..cb60680 100644
--- a/usr.bin/sort/bwstring.c
+++ b/usr.bin/sort/bwstring.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/bwstring.h b/usr.bin/sort/bwstring.h
index 7402ec6..9d62eaf 100644
--- a/usr.bin/sort/bwstring.h
+++ b/usr.bin/sort/bwstring.h
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/coll.c b/usr.bin/sort/coll.c
index 6372f3d..aa16114 100644
--- a/usr.bin/sort/coll.c
+++ b/usr.bin/sort/coll.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/coll.h b/usr.bin/sort/coll.h
index 6e3f9b4..10505a4 100644
--- a/usr.bin/sort/coll.h
+++ b/usr.bin/sort/coll.h
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c
index 47d59af..92aabef 100644
--- a/usr.bin/sort/file.c
+++ b/usr.bin/sort/file.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/file.h b/usr.bin/sort/file.h
index e87fafd..f3a7d3a 100644
--- a/usr.bin/sort/file.h
+++ b/usr.bin/sort/file.h
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/mem.c b/usr.bin/sort/mem.c
index c6e9a53..dea37bb 100644
--- a/usr.bin/sort/mem.c
+++ b/usr.bin/sort/mem.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/mem.h b/usr.bin/sort/mem.h
index 36671e3..cb21d6d 100644
--- a/usr.bin/sort/mem.h
+++ b/usr.bin/sort/mem.h
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/radixsort.c b/usr.bin/sort/radixsort.c
index b3a31a0..8c43c61 100644
--- a/usr.bin/sort/radixsort.c
+++ b/usr.bin/sort/radixsort.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/sort/radixsort.h b/usr.bin/sort/radixsort.h
index 8743728..6d5b928 100644
--- a/usr.bin/sort/radixsort.h
+++ b/usr.bin/sort/radixsort.h
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c
index 7f5b3e8..5edc5af 100644
--- a/usr.bin/sort/sort.c
+++ b/usr.bin/sort/sort.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/sort.h b/usr.bin/sort/sort.h
index 41dd60e..b472fd1 100644
--- a/usr.bin/sort/sort.h
+++ b/usr.bin/sort/sort.h
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* All rights reserved.
diff --git a/usr.bin/sort/vsort.c b/usr.bin/sort/vsort.c
index 5d15f9a..804b575 100644
--- a/usr.bin/sort/vsort.c
+++ b/usr.bin/sort/vsort.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/sort/vsort.h b/usr.bin/sort/vsort.h
index 5f9db74..8ab1612 100644
--- a/usr.bin/sort/vsort.h
+++ b/usr.bin/sort/vsort.h
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/ssh-copy-id/ssh-copy-id.sh b/usr.bin/ssh-copy-id/ssh-copy-id.sh
index f03d5c0..303340e 100755
--- a/usr.bin/ssh-copy-id/ssh-copy-id.sh
+++ b/usr.bin/ssh-copy-id/ssh-copy-id.sh
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2012 Eitan Adler
# All rights reserved.
#
diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c
index ddbb9ab..0c9ba68 100644
--- a/usr.bin/stat/stat.c
+++ b/usr.bin/stat/stat.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2002 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/stdbuf/stdbuf.c b/usr.bin/stdbuf/stdbuf.c
index c05a44d..d9355e4 100644
--- a/usr.bin/stdbuf/stdbuf.c
+++ b/usr.bin/stdbuf/stdbuf.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Jeremie Le Hen <jlh@FreeBSD.org>
* All rights reserved.
*
diff --git a/usr.bin/systat/convtbl.c b/usr.bin/systat/convtbl.c
index bebb040..6b299d0 100644
--- a/usr.bin/systat/convtbl.c
+++ b/usr.bin/systat/convtbl.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003, Trent Nelson, <trent@arpa.com>.
* All rights reserved.
*
diff --git a/usr.bin/systat/convtbl.h b/usr.bin/systat/convtbl.h
index 051e1cd..f525e85 100644
--- a/usr.bin/systat/convtbl.h
+++ b/usr.bin/systat/convtbl.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003, Trent Nelson, <trent@arpa.com>.
* All rights reserved.
*
diff --git a/usr.bin/systat/devs.h b/usr.bin/systat/devs.h
index 9217008..b25cc96 100644
--- a/usr.bin/systat/devs.h
+++ b/usr.bin/systat/devs.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 David E. O'Brien
* All rights reserved.
*
diff --git a/usr.bin/systat/ifcmds.c b/usr.bin/systat/ifcmds.c
index 101c939..f509160 100644
--- a/usr.bin/systat/ifcmds.c
+++ b/usr.bin/systat/ifcmds.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003, Trent Nelson, <trent@arpa.com>.
* All rights reserved.
*
diff --git a/usr.bin/systat/ifstat.c b/usr.bin/systat/ifstat.c
index 35e5756..4c174c0 100644
--- a/usr.bin/systat/ifstat.c
+++ b/usr.bin/systat/ifstat.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003, Trent Nelson, <trent@arpa.com>.
* All rights reserved.
*
diff --git a/usr.bin/tabs/tabs.c b/usr.bin/tabs/tabs.c
index d03a741..c980920 100644
--- a/usr.bin/tabs/tabs.c
+++ b/usr.bin/tabs/tabs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/tr/cmap.c b/usr.bin/tr/cmap.c
index 811040c..1df2c99 100644
--- a/usr.bin/tr/cmap.c
+++ b/usr.bin/tr/cmap.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/tr/cmap.h b/usr.bin/tr/cmap.h
index 9a81e13..d7df72e 100644
--- a/usr.bin/tr/cmap.h
+++ b/usr.bin/tr/cmap.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/tr/cset.c b/usr.bin/tr/cset.c
index 58a927c..3b2a08d 100644
--- a/usr.bin/tr/cset.c
+++ b/usr.bin/tr/cset.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/tr/cset.h b/usr.bin/tr/cset.h
index ab3eabd..5d41107 100644
--- a/usr.bin/tr/cset.h
+++ b/usr.bin/tr/cset.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/truncate/truncate.c b/usr.bin/truncate/truncate.c
index d45533e..072c72d 100644
--- a/usr.bin/truncate/truncate.c
+++ b/usr.bin/truncate/truncate.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Sheldon Hearn <sheldonh@FreeBSD.org>.
* All rights reserved.
*
diff --git a/usr.bin/truss/truss.h b/usr.bin/truss/truss.h
index 5328296..e63dbcb 100644
--- a/usr.bin/truss/truss.h
+++ b/usr.bin/truss/truss.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2001 Jamey Wood
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index 290a15a..c354b31 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 - 2015 Tony Finch <dot@dotat.at>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/unifdef/unifdef.h b/usr.bin/unifdef/unifdef.h
index 6e58e4f..8d061c8 100644
--- a/usr.bin/unifdef/unifdef.h
+++ b/usr.bin/unifdef/unifdef.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 - 2013 Tony Finch <dot@dotat.at>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/unifdef/unifdefall.sh b/usr.bin/unifdef/unifdefall.sh
index 6abf60b..e9c394e 100644
--- a/usr.bin/unifdef/unifdefall.sh
+++ b/usr.bin/unifdef/unifdefall.sh
@@ -2,6 +2,8 @@
#
# unifdefall: remove all the #if's from a source file
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2002 - 2013 Tony Finch <dot@dotat.at>
# Copyright (c) 2009 - 2010 Jonathan Nieder <jrnieder@gmail.com>
#
diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index bff203fb..4499d9f 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* units.c Copyright (c) 1993 by Adrian Mariano (adrian@cam.cornell.edu)
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/unzip/unzip.c b/usr.bin/unzip/unzip.c
index fb123db..c9e53f2 100644
--- a/usr.bin/unzip/unzip.c
+++ b/usr.bin/unzip/unzip.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, 2010 Joerg Sonnenberger <joerg@NetBSD.org>
* Copyright (c) 2007-2008 Dag-Erling Smørgrav
* All rights reserved.
diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c
index 49cf0af..5f45849 100644
--- a/usr.bin/usbhidaction/usbhidaction.c
+++ b/usr.bin/usbhidaction/usbhidaction.c
@@ -1,7 +1,9 @@
/* $NetBSD: usbhidaction.c,v 1.8 2002/06/11 06:06:21 itojun Exp $ */
/* $FreeBSD$ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/usbhidctl/usbhid.c b/usr.bin/usbhidctl/usbhid.c
index 06a79c8..58a8ae0 100644
--- a/usr.bin/usbhidctl/usbhid.c
+++ b/usr.bin/usbhidctl/usbhid.c
@@ -1,7 +1,9 @@
/* $NetBSD: usbhid.c,v 1.14 2000/07/03 02:51:37 matt Exp $ */
/* $FreeBSD$ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/usr.bin/whereis/pathnames.h b/usr.bin/whereis/pathnames.h
index f5d27d1..c177720 100644
--- a/usr.bin/whereis/pathnames.h
+++ b/usr.bin/whereis/pathnames.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright © 2002, Jörg Wunsch
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/whereis/whereis.c b/usr.bin/whereis/whereis.c
index 3d85711..b9b8f78 100644
--- a/usr.bin/whereis/whereis.c
+++ b/usr.bin/whereis/whereis.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright © 2002, Jörg Wunsch
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/which/which.c b/usr.bin/which/which.c
index 0f4c1b4..abc23c8 100644
--- a/usr.bin/which/which.c
+++ b/usr.bin/which/which.c
@@ -1,4 +1,6 @@
-/**
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2000 Dan Papasian. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index 75493b1..6ad4f18 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c
index b729e36..bc2458a 100644
--- a/usr.bin/ypcat/ypcat.c
+++ b/usr.bin/ypcat/ypcat.c
@@ -1,6 +1,8 @@
/* $OpenBSD: ypcat.c,v 1.16 2015/02/08 23:40:35 deraadt Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1992, 1993, 1996 Theo de Raadt <deraadt@theos.com>
* All rights reserved.
*
diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index e1e209b..791a3e2 100644
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -1,7 +1,9 @@
/* $OpenBSD: ypmatch.c,v 1.16 2015/02/08 23:40:35 deraadt Exp $ */
/* $NetBSD: ypmatch.c,v 1.8 1996/05/07 01:24:52 jtc Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1992, 1993, 1996 Theo de Raadt <deraadt@theos.com>
* All rights reserved.
*
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index 55e1b13..9e752f3 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -1,7 +1,9 @@
/* $OpenBSD: ypwhich.c,v 1.23 2015/02/08 23:40:35 deraadt Exp $ */
/* $NetBSD: ypwhich.c,v 1.6 1996/05/13 02:43:48 thorpej Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1992, 1993 Theo de Raadt <deraadt@theos.com>
* All rights reserved.
*
OpenPOWER on IntegriCloud