summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/apply/apply.c2
-rw-r--r--usr.bin/ar/ar.c2
-rw-r--r--usr.bin/banner/banner.c4
-rw-r--r--usr.bin/basename/basename.c2
-rw-r--r--usr.bin/biff/biff.c4
-rw-r--r--usr.bin/calendar/calendar.c2
-rw-r--r--usr.bin/calendar/calendar.h2
-rw-r--r--usr.bin/calendar/day.c2
-rw-r--r--usr.bin/calendar/io.c2
-rw-r--r--usr.bin/calendar/locale.c2
-rw-r--r--usr.bin/calendar/pathnames.h2
-rw-r--r--usr.bin/calendar/pom.c4
-rw-r--r--usr.bin/cap_mkdb/cap_mkdb.c2
-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/table.c2
-rw-r--r--usr.bin/chpass/util.c2
-rw-r--r--usr.bin/cksum/cksum.c2
-rw-r--r--usr.bin/cksum/crc.c2
-rw-r--r--usr.bin/cksum/extern.h2
-rw-r--r--usr.bin/cksum/print.c2
-rw-r--r--usr.bin/cksum/sum1.c2
-rw-r--r--usr.bin/cksum/sum2.c2
-rw-r--r--usr.bin/cmp/cmp.c2
-rw-r--r--usr.bin/cmp/extern.h2
-rw-r--r--usr.bin/cmp/misc.c2
-rw-r--r--usr.bin/cmp/regular.c2
-rw-r--r--usr.bin/cmp/special.c2
-rw-r--r--usr.bin/col/col.c2
-rw-r--r--usr.bin/colrm/colrm.c2
-rw-r--r--usr.bin/column/column.c4
-rw-r--r--usr.bin/comm/comm.c4
-rw-r--r--usr.bin/compress/compress.c2
-rw-r--r--usr.bin/compress/zopen.c2
-rw-r--r--usr.bin/ctags/C.c4
-rw-r--r--usr.bin/ctags/ctags.c4
-rw-r--r--usr.bin/ctags/ctags.h4
-rw-r--r--usr.bin/ctags/fortran.c4
-rw-r--r--usr.bin/ctags/lisp.c4
-rw-r--r--usr.bin/ctags/print.c4
-rw-r--r--usr.bin/ctags/tree.c4
-rw-r--r--usr.bin/ctags/yacc.c4
-rw-r--r--usr.bin/cut/cut.c2
-rw-r--r--usr.bin/dirname/dirname.c2
-rw-r--r--usr.bin/du/du.c4
-rw-r--r--usr.bin/env/env.c4
-rw-r--r--usr.bin/expand/expand.c4
-rw-r--r--usr.bin/false/false.c4
-rw-r--r--usr.bin/find/extern.h2
-rw-r--r--usr.bin/find/find.c2
-rw-r--r--usr.bin/find/find.h2
-rw-r--r--usr.bin/find/function.c2
-rw-r--r--usr.bin/find/ls.c4
-rw-r--r--usr.bin/find/main.c2
-rw-r--r--usr.bin/find/misc.c2
-rw-r--r--usr.bin/find/operator.c2
-rw-r--r--usr.bin/find/option.c2
-rw-r--r--usr.bin/finger/extern.h2
-rw-r--r--usr.bin/finger/finger.c4
-rw-r--r--usr.bin/finger/finger.h4
-rw-r--r--usr.bin/finger/lprint.c4
-rw-r--r--usr.bin/finger/net.c4
-rw-r--r--usr.bin/finger/sprint.c4
-rw-r--r--usr.bin/finger/util.c4
-rw-r--r--usr.bin/fold/fold.c2
-rw-r--r--usr.bin/from/from.c4
-rw-r--r--usr.bin/fstat/fstat.c2
-rw-r--r--usr.bin/gcore/extern.h2
-rw-r--r--usr.bin/gcore/gcore.c2
-rw-r--r--usr.bin/gprof/amd64.h2
-rw-r--r--usr.bin/gprof/aout.c2
-rw-r--r--usr.bin/gprof/arcs.c4
-rw-r--r--usr.bin/gprof/arm.h2
-rw-r--r--usr.bin/gprof/dfn.c4
-rw-r--r--usr.bin/gprof/elf.c2
-rw-r--r--usr.bin/gprof/gprof.c4
-rw-r--r--usr.bin/gprof/gprof.h4
-rw-r--r--usr.bin/gprof/hertz.c4
-rw-r--r--usr.bin/gprof/i386.h2
-rw-r--r--usr.bin/gprof/lookup.c4
-rw-r--r--usr.bin/gprof/mips.h2
-rw-r--r--usr.bin/gprof/pathnames.h4
-rw-r--r--usr.bin/gprof/powerpc.h2
-rw-r--r--usr.bin/gprof/printgprof.c4
-rw-r--r--usr.bin/gprof/printlist.c4
-rw-r--r--usr.bin/gprof/sparc64.h2
-rw-r--r--usr.bin/gzip/zuncompress.c2
-rw-r--r--usr.bin/head/head.c2
-rw-r--r--usr.bin/hexdump/conv.c4
-rw-r--r--usr.bin/hexdump/display.c4
-rw-r--r--usr.bin/hexdump/hexdump.c4
-rw-r--r--usr.bin/hexdump/hexdump.h4
-rw-r--r--usr.bin/hexdump/hexsyntax.c2
-rw-r--r--usr.bin/hexdump/odsyntax.c2
-rw-r--r--usr.bin/hexdump/parse.c4
-rw-r--r--usr.bin/id/id.c2
-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/join/join.c2
-rw-r--r--usr.bin/jot/jot.c2
-rw-r--r--usr.bin/kdump/kdump.c2
-rw-r--r--usr.bin/ktrace/ktrace.c2
-rw-r--r--usr.bin/ktrace/ktrace.h2
-rw-r--r--usr.bin/ktrace/subr.c2
-rw-r--r--usr.bin/lam/lam.c2
-rw-r--r--usr.bin/last/last.c2
-rw-r--r--usr.bin/lastcomm/lastcomm.c2
-rw-r--r--usr.bin/lastcomm/pathnames.h2
-rw-r--r--usr.bin/leave/leave.c2
-rw-r--r--usr.bin/lex/initparse.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/util.c2
-rw-r--r--usr.bin/lock/lock.c4
-rw-r--r--usr.bin/logger/logger.c4
-rw-r--r--usr.bin/login/login.c2
-rw-r--r--usr.bin/login/login_audit.c4
-rw-r--r--usr.bin/login/pathnames.h2
-rw-r--r--usr.bin/logname/logname.c2
-rw-r--r--usr.bin/look/look.c2
-rw-r--r--usr.bin/look/pathnames.h2
-rw-r--r--usr.bin/lorder/lorder.sh2
-rw-r--r--usr.bin/m4/eval.c4
-rw-r--r--usr.bin/m4/extern.h2
-rw-r--r--usr.bin/m4/look.c4
-rw-r--r--usr.bin/m4/main.c2
-rw-r--r--usr.bin/m4/mdef.h4
-rw-r--r--usr.bin/m4/misc.c4
-rw-r--r--usr.bin/m4/pathnames.h4
-rw-r--r--usr.bin/m4/stdd.h2
-rw-r--r--usr.bin/mail/cmd1.c2
-rw-r--r--usr.bin/mail/cmd2.c4
-rw-r--r--usr.bin/mail/cmd3.c4
-rw-r--r--usr.bin/mail/cmdtab.c4
-rw-r--r--usr.bin/mail/collect.c4
-rw-r--r--usr.bin/mail/def.h4
-rw-r--r--usr.bin/mail/edit.c4
-rw-r--r--usr.bin/mail/extern.h2
-rw-r--r--usr.bin/mail/fio.c4
-rw-r--r--usr.bin/mail/getname.c4
-rw-r--r--usr.bin/mail/glob.h4
-rw-r--r--usr.bin/mail/head.c4
-rw-r--r--usr.bin/mail/lex.c4
-rw-r--r--usr.bin/mail/list.c4
-rw-r--r--usr.bin/mail/main.c4
-rw-r--r--usr.bin/mail/names.c4
-rw-r--r--usr.bin/mail/pathnames.h4
-rw-r--r--usr.bin/mail/popen.c4
-rw-r--r--usr.bin/mail/quit.c4
-rw-r--r--usr.bin/mail/rcv.h4
-rw-r--r--usr.bin/mail/send.c4
-rw-r--r--usr.bin/mail/strings.c4
-rw-r--r--usr.bin/mail/temp.c4
-rw-r--r--usr.bin/mail/tty.c4
-rw-r--r--usr.bin/mail/util.c4
-rw-r--r--usr.bin/mail/v7.local.c4
-rw-r--r--usr.bin/mail/vars.c4
-rw-r--r--usr.bin/mail/version.c4
-rw-r--r--usr.bin/mesg/mesg.c4
-rw-r--r--usr.bin/mkdep/mkdep.gcc.sh2
-rw-r--r--usr.bin/mkdep/mkdep.sh2
-rw-r--r--usr.bin/mkfifo/mkfifo.c4
-rw-r--r--usr.bin/mklocale/extern.h2
-rw-r--r--usr.bin/mklocale/ldef.h2
-rw-r--r--usr.bin/mklocale/lex.l2
-rw-r--r--usr.bin/mklocale/yacc.y2
-rw-r--r--usr.bin/mkstr/mkstr.c4
-rw-r--r--usr.bin/msgs/msgs.c2
-rw-r--r--usr.bin/msgs/pathnames.h4
-rw-r--r--usr.bin/mt/mt.c3
-rw-r--r--usr.bin/netstat/if.c2
-rw-r--r--usr.bin/netstat/inet6.c2
-rw-r--r--usr.bin/netstat/ipsec.c2
-rw-r--r--usr.bin/netstat/main.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/netstat/netstat.h2
-rw-r--r--usr.bin/netstat/pfkey.c2
-rw-r--r--usr.bin/netstat/route.c2
-rw-r--r--usr.bin/netstat/sctp.c2
-rw-r--r--usr.bin/netstat/unix.c2
-rw-r--r--usr.bin/nice/nice.c4
-rw-r--r--usr.bin/nohup/nohup.c4
-rw-r--r--usr.bin/pagesize/pagesize.sh2
-rw-r--r--usr.bin/paste/paste.c4
-rw-r--r--usr.bin/patch/mkpath.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/printenv/printenv.c2
-rw-r--r--usr.bin/printf/printf.c2
-rw-r--r--usr.bin/quota/quota.c2
-rw-r--r--usr.bin/renice/renice.c4
-rw-r--r--usr.bin/rev/rev.c2
-rw-r--r--usr.bin/rs/rs.c2
-rw-r--r--usr.bin/rup/rup.c2
-rw-r--r--usr.bin/ruptime/ruptime.c2
-rw-r--r--usr.bin/rusers/rusers.c2
-rw-r--r--usr.bin/rwall/rwall.c4
-rw-r--r--usr.bin/rwho/rwho.c2
-rw-r--r--usr.bin/script/script.c2
-rw-r--r--usr.bin/sed/compile.c2
-rw-r--r--usr.bin/sed/defs.h2
-rw-r--r--usr.bin/sed/extern.h2
-rw-r--r--usr.bin/sed/main.c2
-rw-r--r--usr.bin/sed/misc.c2
-rw-r--r--usr.bin/sed/process.c2
-rw-r--r--usr.bin/shar/shar.sh2
-rw-r--r--usr.bin/showmount/showmount.c4
-rw-r--r--usr.bin/split/split.c4
-rw-r--r--usr.bin/su/su.c4
-rw-r--r--usr.bin/systat/cmds.c2
-rw-r--r--usr.bin/systat/cmdtab.c2
-rw-r--r--usr.bin/systat/devs.c4
-rw-r--r--usr.bin/systat/extern.h2
-rw-r--r--usr.bin/systat/fetch.c2
-rw-r--r--usr.bin/systat/icmp.c2
-rw-r--r--usr.bin/systat/icmp6.c2
-rw-r--r--usr.bin/systat/iostat.c2
-rw-r--r--usr.bin/systat/ip.c2
-rw-r--r--usr.bin/systat/ip6.c2
-rw-r--r--usr.bin/systat/keyboard.c2
-rw-r--r--usr.bin/systat/main.c2
-rw-r--r--usr.bin/systat/netcmds.c2
-rw-r--r--usr.bin/systat/netstat.c2
-rw-r--r--usr.bin/systat/pigs.c2
-rw-r--r--usr.bin/systat/swap.c2
-rw-r--r--usr.bin/systat/systat.h2
-rw-r--r--usr.bin/systat/tcp.c2
-rw-r--r--usr.bin/systat/vmstat.c2
-rw-r--r--usr.bin/tail/extern.h2
-rw-r--r--usr.bin/tail/forward.c2
-rw-r--r--usr.bin/tail/misc.c2
-rw-r--r--usr.bin/tail/read.c2
-rw-r--r--usr.bin/tail/reverse.c2
-rw-r--r--usr.bin/tail/tail.c2
-rw-r--r--usr.bin/talk/ctl.c4
-rw-r--r--usr.bin/talk/ctl_transact.c4
-rw-r--r--usr.bin/talk/display.c4
-rw-r--r--usr.bin/talk/get_addrs.c4
-rw-r--r--usr.bin/talk/get_names.c4
-rw-r--r--usr.bin/talk/init_disp.c4
-rw-r--r--usr.bin/talk/invite.c4
-rw-r--r--usr.bin/talk/io.c4
-rw-r--r--usr.bin/talk/look_up.c4
-rw-r--r--usr.bin/talk/msgs.c4
-rw-r--r--usr.bin/talk/talk.c4
-rw-r--r--usr.bin/talk/talk.h4
-rw-r--r--usr.bin/talk/talk_ctl.h4
-rw-r--r--usr.bin/tcopy/tcopy.c4
-rw-r--r--usr.bin/tee/tee.c4
-rw-r--r--usr.bin/tftp/main.c4
-rw-r--r--usr.bin/tftp/tftp.c4
-rw-r--r--usr.bin/tftp/tftp.h4
-rw-r--r--usr.bin/time/time.c4
-rw-r--r--usr.bin/tip/libacu/biz22.c4
-rw-r--r--usr.bin/tip/libacu/biz31.c4
-rw-r--r--usr.bin/tip/libacu/courier.c4
-rw-r--r--usr.bin/tip/libacu/df.c4
-rw-r--r--usr.bin/tip/libacu/dn11.c4
-rw-r--r--usr.bin/tip/libacu/hayes.c4
-rw-r--r--usr.bin/tip/libacu/t3000.c4
-rw-r--r--usr.bin/tip/libacu/v3451.c4
-rw-r--r--usr.bin/tip/libacu/v831.c4
-rw-r--r--usr.bin/tip/libacu/ventel.c4
-rw-r--r--usr.bin/tip/tip/acu.c4
-rw-r--r--usr.bin/tip/tip/acutab.c4
-rw-r--r--usr.bin/tip/tip/cmds.c4
-rw-r--r--usr.bin/tip/tip/cmdtab.c4
-rw-r--r--usr.bin/tip/tip/cu.c4
-rw-r--r--usr.bin/tip/tip/hunt.c4
-rw-r--r--usr.bin/tip/tip/log.c4
-rw-r--r--usr.bin/tip/tip/partab.c4
-rw-r--r--usr.bin/tip/tip/pathnames.h4
-rw-r--r--usr.bin/tip/tip/remote.c4
-rw-r--r--usr.bin/tip/tip/tip.c4
-rw-r--r--usr.bin/tip/tip/tip.h4
-rw-r--r--usr.bin/tip/tip/tipout.c4
-rw-r--r--usr.bin/tip/tip/uucplock.c4
-rw-r--r--usr.bin/tip/tip/value.c4
-rw-r--r--usr.bin/tip/tip/vars.c4
-rw-r--r--usr.bin/touch/touch.c4
-rw-r--r--usr.bin/tput/clear.sh2
-rw-r--r--usr.bin/tput/tput.c2
-rw-r--r--usr.bin/tr/extern.h2
-rw-r--r--usr.bin/tr/str.c2
-rw-r--r--usr.bin/tr/tr.c4
-rw-r--r--usr.bin/true/true.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/tset/extern.h2
-rw-r--r--usr.bin/tset/map.c2
-rw-r--r--usr.bin/tset/misc.c2
-rw-r--r--usr.bin/tset/set.c2
-rw-r--r--usr.bin/tset/term.c2
-rw-r--r--usr.bin/tset/tset.c2
-rw-r--r--usr.bin/tset/wrterm.c2
-rw-r--r--usr.bin/tsort/tsort.c4
-rw-r--r--usr.bin/tty/tty.c4
-rw-r--r--usr.bin/ul/ul.c4
-rw-r--r--usr.bin/uname/uname.c2
-rw-r--r--usr.bin/unexpand/unexpand.c2
-rw-r--r--usr.bin/uniq/uniq.c4
-rw-r--r--usr.bin/uudecode/uudecode.c2
-rw-r--r--usr.bin/uuencode/uuencode.c2
-rw-r--r--usr.bin/vgrind/extern.h4
-rw-r--r--usr.bin/vgrind/pathnames.h4
-rw-r--r--usr.bin/vgrind/regexp.c4
-rw-r--r--usr.bin/vgrind/vfontedpr.c4
-rw-r--r--usr.bin/vgrind/vgrind.sh2
-rw-r--r--usr.bin/vmstat/vmstat.c4
-rw-r--r--usr.bin/w/extern.h2
-rw-r--r--usr.bin/w/pr_time.c2
-rw-r--r--usr.bin/w/proc_compare.c2
-rw-r--r--usr.bin/w/w.c2
-rw-r--r--usr.bin/wall/ttymsg.c4
-rw-r--r--usr.bin/wall/wall.c4
-rw-r--r--usr.bin/wc/wc.c4
-rw-r--r--usr.bin/what/what.c4
-rw-r--r--usr.bin/whois/whois.c2
-rw-r--r--usr.bin/write/write.c4
-rw-r--r--usr.bin/xargs/pathnames.h2
-rw-r--r--usr.bin/xargs/xargs.c2
-rw-r--r--usr.bin/xinstall/xinstall.c4
-rw-r--r--usr.bin/xstr/pathnames.h4
-rw-r--r--usr.bin/xstr/xstr.c4
-rw-r--r--usr.bin/yes/yes.c4
351 files changed, 166 insertions, 867 deletions
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index 1d55870..c886660 100644
--- a/usr.bin/apply/apply.c
+++ b/usr.bin/apply/apply.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index e902a8f..c1050aa 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Kai Wang
* Copyright (c) 2007 Tim Kientzle
* Copyright (c) 2007 Joseph Koshy
diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index fab8220..a968c7f 100644
--- a/usr.bin/banner/banner.c
+++ b/usr.bin/banner/banner.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c
index ae4fe3f..4c1023f 100644
--- a/usr.bin/basename/basename.c
+++ b/usr.bin/basename/basename.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index e55415b..0adda01 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index fd54796..84d1880 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/calendar/calendar.h b/usr.bin/calendar/calendar.h
index 22f0881..1113c4a 100644
--- a/usr.bin/calendar/calendar.h
+++ b/usr.bin/calendar/calendar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index 9d52278..dac6115 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index f4eda36..493488d 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/calendar/locale.c b/usr.bin/calendar/locale.c
index 4afeef2..7018428 100644
--- a/usr.bin/calendar/locale.c
+++ b/usr.bin/calendar/locale.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/calendar/pathnames.h b/usr.bin/calendar/pathnames.h
index abe541c..e5507a1 100644
--- a/usr.bin/calendar/pathnames.h
+++ b/usr.bin/calendar/pathnames.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/calendar/pom.c b/usr.bin/calendar/pom.c
index 8c1f756..671763a 100644
--- a/usr.bin/calendar/pom.c
+++ b/usr.bin/calendar/pom.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c
index e3f8440..2f8bd96 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.c
+++ b/usr.bin/cap_mkdb/cap_mkdb.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index ab71872..9f9be53 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -1,6 +1,4 @@
/*-
- * 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 b655c5d..fd3a839 100644
--- a/usr.bin/chpass/chpass.h
+++ b/usr.bin/chpass/chpass.h
@@ -1,6 +1,4 @@
-/*-
- * 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 fbe1015..ce82f8e 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -1,6 +1,4 @@
/*-
- * 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 3b5129c..eac5561 100644
--- a/usr.bin/chpass/field.c
+++ b/usr.bin/chpass/field.c
@@ -1,6 +1,4 @@
-/*-
- * 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/table.c b/usr.bin/chpass/table.c
index 7c6c6dd..a4918b4 100644
--- a/usr.bin/chpass/table.c
+++ b/usr.bin/chpass/table.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index bfece1d..baf160e 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -1,6 +1,4 @@
/*-
- * 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/cksum/cksum.c b/usr.bin/cksum/cksum.c
index 857c515..05dc8bb 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c
index 65393f4..a76876a9 100644
--- a/usr.bin/cksum/crc.c
+++ b/usr.bin/cksum/crc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cksum/extern.h b/usr.bin/cksum/extern.h
index b5fc9b4..84ec8d2 100644
--- a/usr.bin/cksum/extern.h
+++ b/usr.bin/cksum/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cksum/print.c b/usr.bin/cksum/print.c
index 1df4c42..912ffd6 100644
--- a/usr.bin/cksum/print.c
+++ b/usr.bin/cksum/print.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c
index 5b669d2..60640a7 100644
--- a/usr.bin/cksum/sum1.c
+++ b/usr.bin/cksum/sum1.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c
index 1d00c60..540d9e5 100644
--- a/usr.bin/cksum/sum2.c
+++ b/usr.bin/cksum/sum2.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index eb6abfff..f3ac717 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cmp/extern.h b/usr.bin/cmp/extern.h
index d387c25..a35cc3d 100644
--- a/usr.bin/cmp/extern.h
+++ b/usr.bin/cmp/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index 09f59f7..0e94ea5 100644
--- a/usr.bin/cmp/misc.c
+++ b/usr.bin/cmp/misc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index d872143..7ed83c1 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index 2edf935..edb641c 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c
index 0f5049c..13df126 100644
--- a/usr.bin/col/col.c
+++ b/usr.bin/col/col.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 25a4048..c37a3ca 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index c3e1207..eb8ca66 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 684fb62..54763e1 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c
index 3e8209c..87494e3 100644
--- a/usr.bin/compress/compress.c
+++ b/usr.bin/compress/compress.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index e99fb05..8ae3d7d 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1986, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index 8c16b36..2287848 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index d037eae..2819840 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ctags/ctags.h b/usr.bin/ctags/ctags.h
index 3b3ac10..597723d 100644
--- a/usr.bin/ctags/ctags.h
+++ b/usr.bin/ctags/ctags.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c
index c5d4822..66d4b54 100644
--- a/usr.bin/ctags/fortran.c
+++ b/usr.bin/ctags/fortran.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c
index 3977114..0d0e2c2 100644
--- a/usr.bin/ctags/lisp.c
+++ b/usr.bin/ctags/lisp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c
index 27f8c61..ca5b9de 100644
--- a/usr.bin/ctags/print.c
+++ b/usr.bin/ctags/print.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c
index 96e5e91..b9b2c7a 100644
--- a/usr.bin/ctags/tree.c
+++ b/usr.bin/ctags/tree.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c
index cd22509..5678da5 100644
--- a/usr.bin/ctags/yacc.c
+++ b/usr.bin/ctags/yacc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c
index 32d8c79..e343e5a 100644
--- a/usr.bin/cut/cut.c
+++ b/usr.bin/cut/cut.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c
index 59c8eda..c176995 100644
--- a/usr.bin/dirname/dirname.c
+++ b/usr.bin/dirname/dirname.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index 3369677..c121699 100644
--- a/usr.bin/du/du.c
+++ b/usr.bin/du/du.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c
index 931a7c6..3dc152a 100644
--- a/usr.bin/env/env.c
+++ b/usr.bin/env/env.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index a22295f..1d89089 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/false/false.c b/usr.bin/false/false.c
index cba9cb8..99948bc 100644
--- a/usr.bin/false/false.c
+++ b/usr.bin/false/false.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/extern.h b/usr.bin/find/extern.h
index 206fa85..b2e344a 100644
--- a/usr.bin/find/extern.h
+++ b/usr.bin/find/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c
index 240e28d..3e5d56b 100644
--- a/usr.bin/find/find.c
+++ b/usr.bin/find/find.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/find.h b/usr.bin/find/find.h
index cf7fb9b..53cb69f 100644
--- a/usr.bin/find/find.h
+++ b/usr.bin/find/find.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index 9795aee..68372c7 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c
index 4eb394d..953c456 100644
--- a/usr.bin/find/ls.c
+++ b/usr.bin/find/ls.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
index 732efa4..bcbeed5 100644
--- a/usr.bin/find/main.c
+++ b/usr.bin/find/main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c
index 4d5be89..df2e502 100644
--- a/usr.bin/find/misc.c
+++ b/usr.bin/find/misc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/operator.c b/usr.bin/find/operator.c
index 8333a32..b8a6fe4 100644
--- a/usr.bin/find/operator.c
+++ b/usr.bin/find/operator.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index d73c44a..4fc63b6 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/finger/extern.h b/usr.bin/finger/extern.h
index 4176afb..cc2a203 100644
--- a/usr.bin/finger/extern.h
+++ b/usr.bin/finger/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index f01dd2b..0a4e952 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/finger/finger.h b/usr.bin/finger/finger.h
index 2481558f..2b70554 100644
--- a/usr.bin/finger/finger.h
+++ b/usr.bin/finger/finger.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index 349b3c2..db902df 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index a21f61a..db5f96d 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index 6725ecb..afbab4e 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 07cf97c..b7d0d2a 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 662d372..1ce9b5e 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index d07f134..2262703 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index 3d1349f..1aeee67 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-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/usr.bin/gcore/extern.h b/usr.bin/gcore/extern.h
index 0b4c352..cf8a44f 100644
--- a/usr.bin/gcore/extern.h
+++ b/usr.bin/gcore/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index 72d058e..e036c91 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/amd64.h b/usr.bin/gprof/amd64.h
index ee87a87..58b92c5 100644
--- a/usr.bin/gprof/amd64.h
+++ b/usr.bin/gprof/amd64.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/aout.c b/usr.bin/gprof/aout.c
index f7350fd..7907d46 100644
--- a/usr.bin/gprof/aout.c
+++ b/usr.bin/gprof/aout.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index 6cb4716..4bea6c6 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/arm.h b/usr.bin/gprof/arm.h
index ee87a87..58b92c5 100644
--- a/usr.bin/gprof/arm.h
+++ b/usr.bin/gprof/arm.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/dfn.c b/usr.bin/gprof/dfn.c
index a5439fa..a49cd31 100644
--- a/usr.bin/gprof/dfn.c
+++ b/usr.bin/gprof/dfn.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/elf.c b/usr.bin/gprof/elf.c
index 47bb563..3d9c136 100644
--- a/usr.bin/gprof/elf.c
+++ b/usr.bin/gprof/elf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index 67009e1..879b0ac 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/gprof.h b/usr.bin/gprof/gprof.h
index bd4cb35..c8140eb 100644
--- a/usr.bin/gprof/gprof.h
+++ b/usr.bin/gprof/gprof.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/hertz.c b/usr.bin/gprof/hertz.c
index 5c4e868..9a8a2b1 100644
--- a/usr.bin/gprof/hertz.c
+++ b/usr.bin/gprof/hertz.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/i386.h b/usr.bin/gprof/i386.h
index ee87a87..58b92c5 100644
--- a/usr.bin/gprof/i386.h
+++ b/usr.bin/gprof/i386.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/lookup.c b/usr.bin/gprof/lookup.c
index 1db906f..0ef1e0b 100644
--- a/usr.bin/gprof/lookup.c
+++ b/usr.bin/gprof/lookup.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/mips.h b/usr.bin/gprof/mips.h
index 0266a32..e6a1c9c 100644
--- a/usr.bin/gprof/mips.h
+++ b/usr.bin/gprof/mips.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/pathnames.h b/usr.bin/gprof/pathnames.h
index 0df0368..f88bea0 100644
--- a/usr.bin/gprof/pathnames.h
+++ b/usr.bin/gprof/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/powerpc.h b/usr.bin/gprof/powerpc.h
index ee87a87..58b92c5 100644
--- a/usr.bin/gprof/powerpc.h
+++ b/usr.bin/gprof/powerpc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index 1ac187d..303365a 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c
index 9e1bc49..a8eb6b6 100644
--- a/usr.bin/gprof/printlist.c
+++ b/usr.bin/gprof/printlist.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gprof/sparc64.h b/usr.bin/gprof/sparc64.h
index ee87a87..58b92c5 100644
--- a/usr.bin/gprof/sparc64.h
+++ b/usr.bin/gprof/sparc64.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/gzip/zuncompress.c b/usr.bin/gzip/zuncompress.c
index b2f3e8d..d99e70f 100644
--- a/usr.bin/gzip/zuncompress.c
+++ b/usr.bin/gzip/zuncompress.c
@@ -1,8 +1,6 @@
/* $NetBSD: zuncompress.c,v 1.11 2011/08/16 13:55:02 joerg Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1986, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index d558c76..e1caa1f 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1987, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/hexdump/conv.c b/usr.bin/hexdump/conv.c
index 72f7db1..5a04fc4 100644
--- a/usr.bin/hexdump/conv.c
+++ b/usr.bin/hexdump/conv.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index a060c3b..3b33f4d 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index bdc5c32..d3c4bb5 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/hexdump/hexdump.h b/usr.bin/hexdump/hexdump.h
index 2fcc625..e34d3a0 100644
--- a/usr.bin/hexdump/hexdump.h
+++ b/usr.bin/hexdump/hexdump.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index 82f1d78..ac1971a 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index c37a0b4..ebcb720 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index bf9f8fc..1e06120 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index 023fe1f..345e2a6 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index 00456e1..1ecdffe 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -1,6 +1,4 @@
/*-
- * 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 44399fe..2652b2f 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -1,6 +1,4 @@
/*-
- * 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 369d0da..db5b325 100644
--- a/usr.bin/indent/indent_codes.h
+++ b/usr.bin/indent/indent_codes.h
@@ -1,6 +1,4 @@
/*-
- * 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 95a89f1..d2abe00 100644
--- a/usr.bin/indent/indent_globs.h
+++ b/usr.bin/indent/indent_globs.h
@@ -1,6 +1,4 @@
/*-
- * 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 25e3867..f707e16 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -1,6 +1,4 @@
/*-
- * 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 7c6989c..f16e2ff 100644
--- a/usr.bin/indent/lexi.c
+++ b/usr.bin/indent/lexi.c
@@ -1,6 +1,4 @@
/*-
- * 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 c53b444..f6590fd 100644
--- a/usr.bin/indent/parse.c
+++ b/usr.bin/indent/parse.c
@@ -1,6 +1,4 @@
/*-
- * 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 9710b7a..00cb23a 100644
--- a/usr.bin/indent/pr_comment.c
+++ b/usr.bin/indent/pr_comment.c
@@ -1,6 +1,4 @@
/*-
- * 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/join/join.c b/usr.bin/join/join.c
index 63dccb7..723147e 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 382b8a2..779a4b9 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index a5fdca5..7db1a8b 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 245fc52..f993d37 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ktrace/ktrace.h b/usr.bin/ktrace/ktrace.h
index 4b22e4f..f016516 100644
--- a/usr.bin/ktrace/ktrace.h
+++ b/usr.bin/ktrace/ktrace.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 6ca29f1..eacd44c 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index f4efb8f..60d1c52 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index 32e5dcd..1db10b3 100644
--- a/usr.bin/last/last.c
+++ b/usr.bin/last/last.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index fe0f600..b2a0f0f 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/lastcomm/pathnames.h b/usr.bin/lastcomm/pathnames.h
index e00c8be..7415545 100644
--- a/usr.bin/lastcomm/pathnames.h
+++ b/usr.bin/lastcomm/pathnames.h
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index 002cc23..29c89e5 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/lex/initparse.c b/usr.bin/lex/initparse.c
index d5736cd..9bfd5cd 100644
--- a/usr.bin/lex/initparse.c
+++ b/usr.bin/lex/initparse.c
@@ -17,8 +17,6 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93";
#define YYPURE 0
#line 35 "parse.y"
-/ * SPDX-License-Identifier: BSD-2-Clause */
-
/* Copyright (c) 1990 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 fe0011e..6fa2d31 100644
--- a/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr.bin/locate/bigram/locate.bigram.c
@@ -1,6 +1,4 @@
/*
- * 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 18ee68c..9a87c16 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -1,6 +1,4 @@
/*
- * 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 e2f6d74..c15730b 100644
--- a/usr.bin/locate/locate/fastfind.c
+++ b/usr.bin/locate/locate/fastfind.c
@@ -1,6 +1,4 @@
/*
- * 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 7c62659..3a87b14 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -1,6 +1,4 @@
/*
- * 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 7b4f672..c2f27fb 100644
--- a/usr.bin/locate/locate/locate.h
+++ b/usr.bin/locate/locate/locate.h
@@ -1,6 +1,4 @@
/*
- * 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/util.c b/usr.bin/locate/locate/util.c
index 88e8a05..9130e37 100644
--- a/usr.bin/locate/locate/util.c
+++ b/usr.bin/locate/locate/util.c
@@ -1,6 +1,4 @@
/*
- * 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/lock/lock.c b/usr.bin/lock/lock.c
index 257a961..8c12946 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index f811159..49360f4 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 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 e99ee5e..525ccfc 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -1,6 +1,4 @@
/*-
- * 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/login/login_audit.c b/usr.bin/login/login_audit.c
index edb198d..210f2d7 100644
--- a/usr.bin/login/login_audit.c
+++ b/usr.bin/login/login_audit.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2005 Apple Computer, Inc.
* All rights reserved.
*
diff --git a/usr.bin/login/pathnames.h b/usr.bin/login/pathnames.h
index 05750bf..836725f 100644
--- a/usr.bin/login/pathnames.h
+++ b/usr.bin/login/pathnames.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c
index 87dea2b..8a251ae 100644
--- a/usr.bin/logname/logname.c
+++ b/usr.bin/logname/logname.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index 10fedbb..ada6e25 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/look/pathnames.h b/usr.bin/look/pathnames.h
index 6a16dbe..bd870e2 100644
--- a/usr.bin/look/pathnames.h
+++ b/usr.bin/look/pathnames.h
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/lorder/lorder.sh b/usr.bin/lorder/lorder.sh
index bfa296b..4b6243c 100644
--- a/usr.bin/lorder/lorder.sh
+++ b/usr.bin/lorder/lorder.sh
@@ -1,7 +1,5 @@
#!/bin/sh -
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1990, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index 34d956e..f3d72b6 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -1,9 +1,7 @@
/* $OpenBSD: eval.c,v 1.74 2015/02/05 12:59:57 millert Exp $ */
/* $NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h
index 165f573..6d410d8 100644
--- a/usr.bin/m4/extern.h
+++ b/usr.bin/m4/extern.h
@@ -2,8 +2,6 @@
/* $NetBSD: extern.h,v 1.3 1996/01/13 23:25:24 pk Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c
index acda959..383fbc6 100644
--- a/usr.bin/m4/look.c
+++ b/usr.bin/m4/look.c
@@ -1,8 +1,6 @@
/* $OpenBSD: look.c,v 1.24 2014/12/21 09:33:12 espie Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index c43dedd..92d1ea3 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -2,8 +2,6 @@
/* $NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/m4/mdef.h b/usr.bin/m4/mdef.h
index b15f2b5..fc2d32a 100644
--- a/usr.bin/m4/mdef.h
+++ b/usr.bin/m4/mdef.h
@@ -1,9 +1,7 @@
/* $OpenBSD: mdef.h,v 1.33 2015/11/03 16:21:47 deraadt Exp $ */
/* $NetBSD: mdef.h,v 1.7 1996/01/13 23:25:27 pk Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 5b7fb30..aeafea9 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -1,9 +1,7 @@
/* $OpenBSD: misc.c,v 1.46 2015/12/07 14:12:46 espie Exp $ */
/* $NetBSD: misc.c,v 1.6 1995/09/28 05:37:41 tls Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/m4/pathnames.h b/usr.bin/m4/pathnames.h
index 742edc1..668111c 100644
--- a/usr.bin/m4/pathnames.h
+++ b/usr.bin/m4/pathnames.h
@@ -1,9 +1,7 @@
/* $OpenBSD: pathnames.h,v 1.6 2015/11/03 16:21:47 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.6 1995/09/29 00:27:55 cgd Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/m4/stdd.h b/usr.bin/m4/stdd.h
index 2ef1bb1..85e6b00 100644
--- a/usr.bin/m4/stdd.h
+++ b/usr.bin/m4/stdd.h
@@ -2,8 +2,6 @@
/* $NetBSD: stdd.h,v 1.2 1995/09/28 05:37:50 tls Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c
index 10c7210..4782ec9 100644
--- a/usr.bin/mail/cmd1.c
+++ b/usr.bin/mail/cmd1.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c
index 20b25cf..dd7f6dd 100644
--- a/usr.bin/mail/cmd2.c
+++ b/usr.bin/mail/cmd2.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/cmd3.c b/usr.bin/mail/cmd3.c
index 1836a13..11954d1 100644
--- a/usr.bin/mail/cmd3.c
+++ b/usr.bin/mail/cmd3.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/cmdtab.c b/usr.bin/mail/cmdtab.c
index d691859..eb19bc4 100644
--- a/usr.bin/mail/cmdtab.c
+++ b/usr.bin/mail/cmdtab.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c
index 544e677..069eaae 100644
--- a/usr.bin/mail/collect.c
+++ b/usr.bin/mail/collect.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/def.h b/usr.bin/mail/def.h
index fb9ad23..e637252 100644
--- a/usr.bin/mail/def.h
+++ b/usr.bin/mail/def.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/edit.c b/usr.bin/mail/edit.c
index 8c733c3..f9e974d 100644
--- a/usr.bin/mail/edit.c
+++ b/usr.bin/mail/edit.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/extern.h b/usr.bin/mail/extern.h
index aeb06dc..2578d65 100644
--- a/usr.bin/mail/extern.h
+++ b/usr.bin/mail/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/fio.c b/usr.bin/mail/fio.c
index 3638938..d9d4ee1 100644
--- a/usr.bin/mail/fio.c
+++ b/usr.bin/mail/fio.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/getname.c b/usr.bin/mail/getname.c
index b3db32c..4f06354 100644
--- a/usr.bin/mail/getname.c
+++ b/usr.bin/mail/getname.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/glob.h b/usr.bin/mail/glob.h
index e0ff386..a2eeea3 100644
--- a/usr.bin/mail/glob.h
+++ b/usr.bin/mail/glob.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/head.c b/usr.bin/mail/head.c
index f4c528f..d836ce4 100644
--- a/usr.bin/mail/head.c
+++ b/usr.bin/mail/head.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c
index 47137e3..4d799e7 100644
--- a/usr.bin/mail/lex.c
+++ b/usr.bin/mail/lex.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/list.c b/usr.bin/mail/list.c
index e6af32a..3a5cc15 100644
--- a/usr.bin/mail/list.c
+++ b/usr.bin/mail/list.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index 0548ca1..0699a55 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/names.c b/usr.bin/mail/names.c
index e7e0ece..724d201 100644
--- a/usr.bin/mail/names.c
+++ b/usr.bin/mail/names.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/pathnames.h b/usr.bin/mail/pathnames.h
index cda00be..17dd106 100644
--- a/usr.bin/mail/pathnames.h
+++ b/usr.bin/mail/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/popen.c b/usr.bin/mail/popen.c
index 85feb5d..60a0936 100644
--- a/usr.bin/mail/popen.c
+++ b/usr.bin/mail/popen.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/quit.c b/usr.bin/mail/quit.c
index e432c60..4b9bcda 100644
--- a/usr.bin/mail/quit.c
+++ b/usr.bin/mail/quit.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/rcv.h b/usr.bin/mail/rcv.h
index 18481d9..0ee7f2d 100644
--- a/usr.bin/mail/rcv.h
+++ b/usr.bin/mail/rcv.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/send.c b/usr.bin/mail/send.c
index 57e2f12..a199323 100644
--- a/usr.bin/mail/send.c
+++ b/usr.bin/mail/send.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/strings.c b/usr.bin/mail/strings.c
index 5493228..ec9334e 100644
--- a/usr.bin/mail/strings.c
+++ b/usr.bin/mail/strings.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c
index 4b197b2..d274467 100644
--- a/usr.bin/mail/temp.c
+++ b/usr.bin/mail/temp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c
index 8215948..f8635a2 100644
--- a/usr.bin/mail/tty.c
+++ b/usr.bin/mail/tty.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/util.c b/usr.bin/mail/util.c
index 3c7a4e1..43a0a55 100644
--- a/usr.bin/mail/util.c
+++ b/usr.bin/mail/util.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/v7.local.c b/usr.bin/mail/v7.local.c
index 39c1773..0da7b3b 100644
--- a/usr.bin/mail/v7.local.c
+++ b/usr.bin/mail/v7.local.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/vars.c b/usr.bin/mail/vars.c
index 699fb80..f3c6659 100644
--- a/usr.bin/mail/vars.c
+++ b/usr.bin/mail/vars.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mail/version.c b/usr.bin/mail/version.c
index c59592b..379fda8 100644
--- a/usr.bin/mail/version.c
+++ b/usr.bin/mail/version.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index 056e6e8..796a047 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.bin/mkdep/mkdep.gcc.sh b/usr.bin/mkdep/mkdep.gcc.sh
index 0f0f636..ac97621 100644
--- a/usr.bin/mkdep/mkdep.gcc.sh
+++ b/usr.bin/mkdep/mkdep.gcc.sh
@@ -1,7 +1,5 @@
#!/bin/sh -
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/usr.bin/mkdep/mkdep.sh b/usr.bin/mkdep/mkdep.sh
index 72d431b..8524508 100644
--- a/usr.bin/mkdep/mkdep.sh
+++ b/usr.bin/mkdep/mkdep.sh
@@ -1,7 +1,5 @@
#!/bin/sh -
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 4e4b581..7c974bd 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mklocale/extern.h b/usr.bin/mklocale/extern.h
index 6684cbb..60268cc 100644
--- a/usr.bin/mklocale/extern.h
+++ b/usr.bin/mklocale/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mklocale/ldef.h b/usr.bin/mklocale/ldef.h
index fe39445..392252f 100644
--- a/usr.bin/mklocale/ldef.h
+++ b/usr.bin/mklocale/ldef.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mklocale/lex.l b/usr.bin/mklocale/lex.l
index 9f85e81..08fa54a 100644
--- a/usr.bin/mklocale/lex.l
+++ b/usr.bin/mklocale/lex.l
@@ -1,7 +1,5 @@
%{
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mklocale/yacc.y b/usr.bin/mklocale/yacc.y
index 28077bb0..01f9f49 100644
--- a/usr.bin/mklocale/yacc.y
+++ b/usr.bin/mklocale/yacc.y
@@ -1,7 +1,5 @@
%{
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index 79a223f..2025eff 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index e34e387..832e86a 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/msgs/pathnames.h b/usr.bin/msgs/pathnames.h
index f38c115..541d510 100644
--- a/usr.bin/msgs/pathnames.h
+++ b/usr.bin/msgs/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
index e44fe63..985a04e 100644
--- a/usr.bin/mt/mt.c
+++ b/usr.bin/mt/mt.c
@@ -1,6 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
+ * Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 16fc61e..6fb8e63 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2013 Gleb Smirnoff <glebius@FreeBSD.org>
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index 62c1d9d..24e2b88 100644
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -1,7 +1,5 @@
/* BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/netstat/ipsec.c b/usr.bin/netstat/ipsec.c
index 040c62d..69ca6c9 100644
--- a/usr.bin/netstat/ipsec.c
+++ b/usr.bin/netstat/ipsec.c
@@ -1,8 +1,6 @@
/* $KAME: ipsec.c,v 1.33 2003/07/25 09:54:32 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2005 NTT Multimedia Communications Laboratories, Inc.
* All rights reserved.
*
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index b69b244..da69afc 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1988, 1993
* Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index bb3dce99..8b95ddd 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -1,6 +1,4 @@
/*-
- * 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 afc5458..d4d6014 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -1,6 +1,4 @@
/*-
- * 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 6360fd6..8f59c6b 100644
--- a/usr.bin/netstat/mroute6.c
+++ b/usr.bin/netstat/mroute6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-3-Clause
- *
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index 24d5fbe..ee30d3a 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992, 1993
* Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/netstat/pfkey.c b/usr.bin/netstat/pfkey.c
index 03ae82d..e12181b 100644
--- a/usr.bin/netstat/pfkey.c
+++ b/usr.bin/netstat/pfkey.c
@@ -1,8 +1,6 @@
/* $NetBSD: inet.c,v 1.35.2.1 1999/04/29 14:57:08 perry Exp $ */
/* $KAME: ipsec.c,v 1.25 2001/03/12 09:04:39 itojun Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 824e91c..713934f 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c
index 5f67e91..084e9ec 100644
--- a/usr.bin/netstat/sctp.c
+++ b/usr.bin/netstat/sctp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2001-2007, by Weongyo Jeong. All rights reserved.
* Copyright (c) 2011, by Michael Tuexen. All rights reserved.
*
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 3212ac0..b8cddc8 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c
index 6e71b46..9fab9e4 100644
--- a/usr.bin/nice/nice.c
+++ b/usr.bin/nice/nice.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 49b12b5..beb1a35 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/pagesize/pagesize.sh b/usr.bin/pagesize/pagesize.sh
index 863b69b..07b9b3a 100644
--- a/usr.bin/pagesize/pagesize.sh
+++ b/usr.bin/pagesize/pagesize.sh
@@ -1,7 +1,5 @@
#!/bin/sh -
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1994
# The Regents of the University of California. All rights reserved.
#
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index 608d725..f03f784 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/patch/mkpath.c b/usr.bin/patch/mkpath.c
index 2214d4d..04fd537 100644
--- a/usr.bin/patch/mkpath.c
+++ b/usr.bin/patch/mkpath.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 4c60204..22a093a 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -1,6 +1,4 @@
/*-
- * 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 b44eb41..c39e18f 100644
--- a/usr.bin/pr/extern.h
+++ b/usr.bin/pr/extern.h
@@ -1,6 +1,4 @@
/*-
- * 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 cc6d290..0493aec 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -1,6 +1,4 @@
/*-
- * 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 2c9e50f..a4346c7 100644
--- a/usr.bin/pr/pr.h
+++ b/usr.bin/pr/pr.h
@@ -1,6 +1,4 @@
/*-
- * 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/printenv/printenv.c b/usr.bin/printenv/printenv.c
index 3acef4b..27882ab 100644
--- a/usr.bin/printenv/printenv.c
+++ b/usr.bin/printenv/printenv.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index 7f602bd..8636cc1 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 1989, 1993
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index 838fa8c..c88f2aa 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index ed6c9cf..8c8a26e 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index 511aa87..a048427 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1987, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c
index a4516d5..3f50868 100644
--- a/usr.bin/rs/rs.c
+++ b/usr.bin/rs/rs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* 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 5f4f2b4..239b313 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1993, John Brezak
* All rights reserved.
*
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index 4bd4491..2f791be 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index 381d935..4d641dc 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -1,6 +1,4 @@
/*-
- * 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 2daa6a8..c235ea7 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -1,6 +1,4 @@
-/*-
- * 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/rwho/rwho.c b/usr.bin/rwho/rwho.c
index c5a6cc9..3fb0da5 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993 The Regents of the University of California.
* Copyright (c) 2013 Mariusz Zaborski <oshogbo@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index e94fc6d..0128463 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, 2012 David E. O'Brien
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index ffce09e..3e79097 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/sed/defs.h b/usr.bin/sed/defs.h
index 154abbf..fb33676 100644
--- a/usr.bin/sed/defs.h
+++ b/usr.bin/sed/defs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/sed/extern.h b/usr.bin/sed/extern.h
index 36c945f0..f2bd71b 100644
--- a/usr.bin/sed/extern.h
+++ b/usr.bin/sed/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index 4a756ae..2307205 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2013 Johann 'Myrkraverk' Oskarsson.
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index 6a714b0..f3b5137 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index 2d6ed64..33eea13 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/shar/shar.sh b/usr.bin/shar/shar.sh
index 4d81860..3573013 100644
--- a/usr.bin/shar/shar.sh
+++ b/usr.bin/shar/shar.sh
@@ -1,7 +1,5 @@
#!/bin/sh -
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1990, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index a0bcdc1..01c9e26 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c
index ca15db6..9a0b0ec 100644
--- a/usr.bin/split/split.c
+++ b/usr.bin/split/split.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index b8e00a7..e27a4aa 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2002, 2005 Networks Associates Technologies, Inc.
* All rights reserved.
*
diff --git a/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c
index 07da7ab..f461f94 100644
--- a/usr.bin/systat/cmds.c
+++ b/usr.bin/systat/cmds.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c
index 488310c..cb021e0 100644
--- a/usr.bin/systat/cmdtab.c
+++ b/usr.bin/systat/cmdtab.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/devs.c b/usr.bin/systat/devs.c
index d6ded46..3c74fb7 100644
--- a/usr.bin/systat/devs.c
+++ b/usr.bin/systat/devs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1998 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/usr.bin/systat/extern.h b/usr.bin/systat/extern.h
index e8c37b9..272eead 100644
--- a/usr.bin/systat/extern.h
+++ b/usr.bin/systat/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/fetch.c b/usr.bin/systat/fetch.c
index 8e53ffd..d159e51 100644
--- a/usr.bin/systat/fetch.c
+++ b/usr.bin/systat/fetch.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c
index 2be26a0..6085a90 100644
--- a/usr.bin/systat/icmp.c
+++ b/usr.bin/systat/icmp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/icmp6.c b/usr.bin/systat/icmp6.c
index 6c48ed6..2a3bbb7 100644
--- a/usr.bin/systat/icmp6.c
+++ b/usr.bin/systat/icmp6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index 538be90..fa275eb 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1998 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c
index b634324..8e12a6a 100644
--- a/usr.bin/systat/ip.c
+++ b/usr.bin/systat/ip.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/ip6.c b/usr.bin/systat/ip6.c
index 72e8bc5..5d2c210 100644
--- a/usr.bin/systat/ip6.c
+++ b/usr.bin/systat/ip6.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/keyboard.c b/usr.bin/systat/keyboard.c
index d7a4975..d6d793a 100644
--- a/usr.bin/systat/keyboard.c
+++ b/usr.bin/systat/keyboard.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index b074fb3..74195f6 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index 353b9bd..a91af38 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 8b8bd06..90ddd25 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index 2b5d038..d341f7d 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index d3b7752..799dff95 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index ed23957..ebd409e 100644
--- a/usr.bin/systat/systat.h
+++ b/usr.bin/systat/systat.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1989, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c
index 4e0f188..c9e8e9a 100644
--- a/usr.bin/systat/tcp.c
+++ b/usr.bin/systat/tcp.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index 461c4291..25f79d7 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1989, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tail/extern.h b/usr.bin/tail/extern.h
index 6069ea5..dfc63d0 100644
--- a/usr.bin/tail/extern.h
+++ b/usr.bin/tail/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c
index e556fec..5eaae98 100644
--- a/usr.bin/tail/forward.c
+++ b/usr.bin/tail/forward.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tail/misc.c b/usr.bin/tail/misc.c
index ed46296..6944325 100644
--- a/usr.bin/tail/misc.c
+++ b/usr.bin/tail/misc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tail/read.c b/usr.bin/tail/read.c
index b440d1b..79c4fa5 100644
--- a/usr.bin/tail/read.c
+++ b/usr.bin/tail/read.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index 0353a42..88c328a 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c
index 57fcaf8..e5566cb 100644
--- a/usr.bin/tail/tail.c
+++ b/usr.bin/tail/tail.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index 771f16f..0704b28 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index c0b51c9..687de1e 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index 8b4c190..0acf1ce 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index 7ff3ebd..b2af685 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index 5aafe95..8da8e4a 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index 1abd5225..47556c9 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index 6c37dfb..e48302f 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index a4b6e79..eb5df61 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index aedd77e..309f1be 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c
index 214c6f2..e36b37a 100644
--- a/usr.bin/talk/msgs.c
+++ b/usr.bin/talk/msgs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index e1beb69..9bd049f 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/talk.h b/usr.bin/talk/talk.h
index 649c1b4..34ff870 100644
--- a/usr.bin/talk/talk.h
+++ b/usr.bin/talk/talk.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/talk/talk_ctl.h b/usr.bin/talk/talk_ctl.h
index 541d1f3..e3e750b 100644
--- a/usr.bin/talk/talk_ctl.h
+++ b/usr.bin/talk/talk_ctl.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index 1abc257..4fa0a33 100644
--- a/usr.bin/tcopy/tcopy.c
+++ b/usr.bin/tcopy/tcopy.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1985, 1987, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index 340f3cc..302bb97 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index 4176cb6..188ce68 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index 2c5ec84..eaf2a6f 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tftp/tftp.h b/usr.bin/tftp/tftp.h
index 9632f74..4cdef25 100644
--- a/usr.bin/tftp/tftp.h
+++ b/usr.bin/tftp/tftp.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index 57775ba..678a2af 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/biz22.c b/usr.bin/tip/libacu/biz22.c
index 7e0a2ac..99b6fb0 100644
--- a/usr.bin/tip/libacu/biz22.c
+++ b/usr.bin/tip/libacu/biz22.c
@@ -1,9 +1,7 @@
/* $OpenBSD: biz22.c,v 1.13 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: biz22.c,v 1.6 1997/02/11 09:24:11 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/biz31.c b/usr.bin/tip/libacu/biz31.c
index dc8f26a..5bc00ae 100644
--- a/usr.bin/tip/libacu/biz31.c
+++ b/usr.bin/tip/libacu/biz31.c
@@ -1,9 +1,7 @@
/* $OpenBSD: biz31.c,v 1.10 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: biz31.c,v 1.5 1997/02/11 09:24:14 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/courier.c b/usr.bin/tip/libacu/courier.c
index a0a9b5c..b23c28c 100644
--- a/usr.bin/tip/libacu/courier.c
+++ b/usr.bin/tip/libacu/courier.c
@@ -1,9 +1,7 @@
/* $OpenBSD: courier.c,v 1.15 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: courier.c,v 1.7 1997/02/11 09:24:16 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/df.c b/usr.bin/tip/libacu/df.c
index cef9608..03374e1 100644
--- a/usr.bin/tip/libacu/df.c
+++ b/usr.bin/tip/libacu/df.c
@@ -1,9 +1,7 @@
/* $OpenBSD: df.c,v 1.9 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: df.c,v 1.4 1995/10/29 00:49:51 pk Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/dn11.c b/usr.bin/tip/libacu/dn11.c
index 385ba8b..a0b18ba 100644
--- a/usr.bin/tip/libacu/dn11.c
+++ b/usr.bin/tip/libacu/dn11.c
@@ -1,9 +1,7 @@
/* $OpenBSD: dn11.c,v 1.9 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: dn11.c,v 1.4 1995/10/29 00:49:53 pk Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/hayes.c b/usr.bin/tip/libacu/hayes.c
index 12e8401..fe52274 100644
--- a/usr.bin/tip/libacu/hayes.c
+++ b/usr.bin/tip/libacu/hayes.c
@@ -1,9 +1,7 @@
/* $OpenBSD: hayes.c,v 1.13 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: hayes.c,v 1.6 1997/02/11 09:24:17 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/t3000.c b/usr.bin/tip/libacu/t3000.c
index 861d8d0..a640ff3 100644
--- a/usr.bin/tip/libacu/t3000.c
+++ b/usr.bin/tip/libacu/t3000.c
@@ -1,9 +1,7 @@
/* $OpenBSD: t3000.c,v 1.14 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: t3000.c,v 1.5 1997/02/11 09:24:18 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/v3451.c b/usr.bin/tip/libacu/v3451.c
index 3fe6c21..0de679e 100644
--- a/usr.bin/tip/libacu/v3451.c
+++ b/usr.bin/tip/libacu/v3451.c
@@ -1,9 +1,7 @@
/* $OpenBSD: v3451.c,v 1.9 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: v3451.c,v 1.6 1997/02/11 09:24:20 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/v831.c b/usr.bin/tip/libacu/v831.c
index 6066638..7adc3c6 100644
--- a/usr.bin/tip/libacu/v831.c
+++ b/usr.bin/tip/libacu/v831.c
@@ -1,9 +1,7 @@
/* $OpenBSD: v831.c,v 1.11 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: v831.c,v 1.5 1996/12/29 10:42:01 cgd Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/libacu/ventel.c b/usr.bin/tip/libacu/ventel.c
index df08662..399b5d8 100644
--- a/usr.bin/tip/libacu/ventel.c
+++ b/usr.bin/tip/libacu/ventel.c
@@ -1,9 +1,7 @@
/* $OpenBSD: ventel.c,v 1.12 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: ventel.c,v 1.6 1997/02/11 09:24:21 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c
index d24e7f7..5d2cda6 100644
--- a/usr.bin/tip/tip/acu.c
+++ b/usr.bin/tip/tip/acu.c
@@ -1,9 +1,7 @@
/* $OpenBSD: acu.c,v 1.12 2006/03/17 14:43:06 moritz Exp $ */
/* $NetBSD: acu.c,v 1.4 1996/12/29 10:34:03 cgd Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/acutab.c b/usr.bin/tip/tip/acutab.c
index 49f1b4a..5f64968 100644
--- a/usr.bin/tip/tip/acutab.c
+++ b/usr.bin/tip/tip/acutab.c
@@ -1,9 +1,7 @@
/* $OpenBSD: acutab.c,v 1.5 2006/03/17 19:17:13 moritz Exp $ */
/* $NetBSD: acutab.c,v 1.3 1994/12/08 09:30:41 jtc Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c
index 6676ae3..50cedc4 100644
--- a/usr.bin/tip/tip/cmds.c
+++ b/usr.bin/tip/tip/cmds.c
@@ -1,9 +1,7 @@
/* $OpenBSD: cmds.c,v 1.26 2006/06/06 23:24:52 deraadt Exp $ */
/* $NetBSD: cmds.c,v 1.7 1997/02/11 09:24:03 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/cmdtab.c b/usr.bin/tip/tip/cmdtab.c
index d8c1231..3666c12 100644
--- a/usr.bin/tip/tip/cmdtab.c
+++ b/usr.bin/tip/tip/cmdtab.c
@@ -1,9 +1,7 @@
/* $OpenBSD: cmdtab.c,v 1.7 2006/03/17 14:43:06 moritz Exp $ */
/* $NetBSD: cmdtab.c,v 1.3 1994/12/08 09:30:46 jtc Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/cu.c b/usr.bin/tip/tip/cu.c
index 6c888d1..d8d104d 100644
--- a/usr.bin/tip/tip/cu.c
+++ b/usr.bin/tip/tip/cu.c
@@ -1,9 +1,7 @@
/* $OpenBSD: cu.c,v 1.19 2006/05/25 08:41:52 jmc Exp $ */
/* $NetBSD: cu.c,v 1.5 1997/02/11 09:24:05 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/hunt.c b/usr.bin/tip/tip/hunt.c
index 2f6711d..0c104f1 100644
--- a/usr.bin/tip/tip/hunt.c
+++ b/usr.bin/tip/tip/hunt.c
@@ -1,9 +1,7 @@
/* $OpenBSD: hunt.c,v 1.13 2006/03/17 19:39:46 deraadt Exp $ */
/* $NetBSD: hunt.c,v 1.6 1997/04/20 00:02:10 mellon Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/log.c b/usr.bin/tip/tip/log.c
index aeb324a..8123795 100644
--- a/usr.bin/tip/tip/log.c
+++ b/usr.bin/tip/tip/log.c
@@ -1,9 +1,7 @@
/* $OpenBSD: log.c,v 1.8 2006/03/16 19:32:46 deraadt Exp $ */
/* $NetBSD: log.c,v 1.4 1994/12/24 17:56:28 cgd Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/partab.c b/usr.bin/tip/tip/partab.c
index f2d6c31..05bb329 100644
--- a/usr.bin/tip/tip/partab.c
+++ b/usr.bin/tip/tip/partab.c
@@ -1,9 +1,7 @@
/* $OpenBSD: partab.c,v 1.5 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: partab.c,v 1.4 1996/12/29 10:38:21 cgd Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/pathnames.h b/usr.bin/tip/tip/pathnames.h
index a42aed3..66a453d 100644
--- a/usr.bin/tip/tip/pathnames.h
+++ b/usr.bin/tip/tip/pathnames.h
@@ -2,9 +2,7 @@
/* $NetBSD: pathnames.h,v 1.3 1994/12/08 09:30:59 jtc Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c
index 1fe03be..d9993ae 100644
--- a/usr.bin/tip/tip/remote.c
+++ b/usr.bin/tip/tip/remote.c
@@ -1,9 +1,7 @@
/* $OpenBSD: remote.c,v 1.16 2006/06/06 23:24:52 deraadt Exp $ */
/* $NetBSD: remote.c,v 1.5 1997/04/20 00:02:45 mellon Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c
index a65ad61..066d679 100644
--- a/usr.bin/tip/tip/tip.c
+++ b/usr.bin/tip/tip/tip.c
@@ -1,9 +1,7 @@
/* $OpenBSD: tip.c,v 1.30 2006/08/18 03:06:18 jason Exp $ */
/* $NetBSD: tip.c,v 1.13 1997/04/20 00:03:05 mellon Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/tip.h b/usr.bin/tip/tip/tip.h
index 041ba8a..7e7faa6 100644
--- a/usr.bin/tip/tip/tip.h
+++ b/usr.bin/tip/tip/tip.h
@@ -2,9 +2,7 @@
/* $NetBSD: tip.h,v 1.7 1997/04/20 00:02:46 mellon Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/tipout.c b/usr.bin/tip/tip/tipout.c
index 8018229..db6afe4 100644
--- a/usr.bin/tip/tip/tipout.c
+++ b/usr.bin/tip/tip/tipout.c
@@ -1,9 +1,7 @@
/* $OpenBSD: tipout.c,v 1.18 2006/05/31 07:03:08 jason Exp $ */
/* $NetBSD: tipout.c,v 1.5 1996/12/29 10:34:12 cgd Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/uucplock.c b/usr.bin/tip/tip/uucplock.c
index da16015..c82ea78 100644
--- a/usr.bin/tip/tip/uucplock.c
+++ b/usr.bin/tip/tip/uucplock.c
@@ -1,9 +1,7 @@
/* $OpenBSD: uucplock.c,v 1.11 2006/03/16 19:32:46 deraadt Exp $ */
/* $NetBSD: uucplock.c,v 1.7 1997/02/11 09:24:08 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c
index a4776b8..b6cf5c2 100644
--- a/usr.bin/tip/tip/value.c
+++ b/usr.bin/tip/tip/value.c
@@ -1,9 +1,7 @@
/* $OpenBSD: value.c,v 1.14 2006/03/17 22:02:58 moritz Exp $ */
/* $NetBSD: value.c,v 1.6 1997/02/11 09:24:09 mrg Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tip/tip/vars.c b/usr.bin/tip/tip/vars.c
index a412264..a991bcc 100644
--- a/usr.bin/tip/tip/vars.c
+++ b/usr.bin/tip/tip/vars.c
@@ -1,9 +1,7 @@
/* $OpenBSD: vars.c,v 1.8 2006/08/18 03:06:18 jason Exp $ */
/* $NetBSD: vars.c,v 1.3 1994/12/08 09:31:19 jtc Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c
index 6db429b..804af7e 100644
--- a/usr.bin/touch/touch.c
+++ b/usr.bin/touch/touch.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tput/clear.sh b/usr.bin/tput/clear.sh
index c441d6f..4b3531c 100644
--- a/usr.bin/tput/clear.sh
+++ b/usr.bin/tput/clear.sh
@@ -1,7 +1,5 @@
#!/bin/sh -
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1989, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c
index 8cd27e4..0c66d62 100644
--- a/usr.bin/tput/tput.c
+++ b/usr.bin/tput/tput.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tr/extern.h b/usr.bin/tr/extern.h
index 81f9e80..8b68f44 100644
--- a/usr.bin/tr/extern.h
+++ b/usr.bin/tr/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index a8b2fd6..333ca5c 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index f80fb7f..d54e74c 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/true/true.c b/usr.bin/true/true.c
index 1a93713..a557f58 100644
--- a/usr.bin/true/true.c
+++ b/usr.bin/true/true.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The 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 e83e916..7e2ed16 100644
--- a/usr.bin/truss/amd64-freebsd.c
+++ b/usr.bin/truss/amd64-freebsd.c
@@ -1,6 +1,4 @@
-/*-
- * 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 ffb76e4..66ca417 100644
--- a/usr.bin/truss/amd64-freebsd32.c
+++ b/usr.bin/truss/amd64-freebsd32.c
@@ -1,6 +1,4 @@
-/*-
- * 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 ead3880..00eb06f 100644
--- a/usr.bin/truss/amd64-linux.c
+++ b/usr.bin/truss/amd64-linux.c
@@ -1,6 +1,4 @@
-/*-
- * 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 69344e9..70e201a 100644
--- a/usr.bin/truss/amd64-linux32.c
+++ b/usr.bin/truss/amd64-linux32.c
@@ -1,6 +1,4 @@
-/*-
- * 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 683ece5..7538290 100644
--- a/usr.bin/truss/arm-freebsd.c
+++ b/usr.bin/truss/arm-freebsd.c
@@ -1,6 +1,4 @@
-/*-
- * 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 dd160a7..f19a1cb 100644
--- a/usr.bin/truss/extern.h
+++ b/usr.bin/truss/extern.h
@@ -1,6 +1,4 @@
-/*-
- * 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 b222958..8103ca7 100644
--- a/usr.bin/truss/i386-freebsd.c
+++ b/usr.bin/truss/i386-freebsd.c
@@ -1,6 +1,4 @@
-/*-
- * 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 77185d1..e96db16 100644
--- a/usr.bin/truss/i386-linux.c
+++ b/usr.bin/truss/i386-linux.c
@@ -1,6 +1,4 @@
-/*-
- * 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 9ba7968..052546a 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -1,6 +1,4 @@
/*-
- * 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 cade9d6..e3f2a04 100644
--- a/usr.bin/truss/mips-freebsd.c
+++ b/usr.bin/truss/mips-freebsd.c
@@ -1,6 +1,4 @@
-/*-
- * 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 092188a..97dd965 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -1,6 +1,4 @@
/*-
- * 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 d9a5597..d1ae896 100644
--- a/usr.bin/truss/sparc64-freebsd.c
+++ b/usr.bin/truss/sparc64-freebsd.c
@@ -1,6 +1,4 @@
-/*-
- * 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 eebcc32..e5f858f 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -1,6 +1,4 @@
-/*-
- * 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/tset/extern.h b/usr.bin/tset/extern.h
index 597190d..f4a6514 100644
--- a/usr.bin/tset/extern.h
+++ b/usr.bin/tset/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tset/map.c b/usr.bin/tset/map.c
index a6753ae..715f514 100644
--- a/usr.bin/tset/map.c
+++ b/usr.bin/tset/map.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tset/misc.c b/usr.bin/tset/misc.c
index 372e324..52298e5 100644
--- a/usr.bin/tset/misc.c
+++ b/usr.bin/tset/misc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c
index adff6a6..c48a6e7 100644
--- a/usr.bin/tset/set.c
+++ b/usr.bin/tset/set.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tset/term.c b/usr.bin/tset/term.c
index b3998af..106c98f 100644
--- a/usr.bin/tset/term.c
+++ b/usr.bin/tset/term.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index e69d3fa..0196a2d 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tset/wrterm.c b/usr.bin/tset/wrterm.c
index 231189b..77751fa 100644
--- a/usr.bin/tset/wrterm.c
+++ b/usr.bin/tset/wrterm.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index 961ef35..1511b36 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index a0c3be1..450722a 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index 14b1d87..e6df880 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index c3bf573..cf61622 100644
--- a/usr.bin/uname/uname.c
+++ b/usr.bin/uname/uname.c
@@ -1,6 +1,4 @@
/*-
- * 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.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index 51d1128..dcbd7fb 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index 1c9a314..be0ff08 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index fd82ddd..2be5078 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index 9c5a223..e5af907 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/vgrind/extern.h b/usr.bin/vgrind/extern.h
index 4924e55..812592f 100644
--- a/usr.bin/vgrind/extern.h
+++ b/usr.bin/vgrind/extern.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/vgrind/pathnames.h b/usr.bin/vgrind/pathnames.h
index 0eb6ec1..825a06a 100644
--- a/usr.bin/vgrind/pathnames.h
+++ b/usr.bin/vgrind/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c
index 5a9d9fa..994cd2b 100644
--- a/usr.bin/vgrind/regexp.c
+++ b/usr.bin/vgrind/regexp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index 05e3e9e..ec0b4e0 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/vgrind/vgrind.sh b/usr.bin/vgrind/vgrind.sh
index 1779bbd..c01f24d 100644
--- a/usr.bin/vgrind/vgrind.sh
+++ b/usr.bin/vgrind/vgrind.sh
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 1980, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 80323b3..33ce3ad 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/w/extern.h b/usr.bin/w/extern.h
index 366ee81..facc3e8 100644
--- a/usr.bin/w/extern.h
+++ b/usr.bin/w/extern.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index e1bc3e3..123f6c4 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/w/proc_compare.c b/usr.bin/w/proc_compare.c
index 1bf093e..0e73ba4 100644
--- a/usr.bin/w/proc_compare.c
+++ b/usr.bin/w/proc_compare.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 70005fc..20aca78 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index 0b8383d..1317a4b 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index 9c07dd1..b3a63dc 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index ec04d94..a6ca137 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1987, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index 66d7dbd..c72e3fa 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index d8541e7..4f4062b 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index 33d1e79..2008fd2 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/xargs/pathnames.h b/usr.bin/xargs/pathnames.h
index fb8ab10..25c6043 100644
--- a/usr.bin/xargs/pathnames.h
+++ b/usr.bin/xargs/pathnames.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index 5b90a83..955711c 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 15fc2ef..16eba77 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2012, 2013 SRI International
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/xstr/pathnames.h b/usr.bin/xstr/pathnames.h
index 3ee2af8..63f633e 100644
--- a/usr.bin/xstr/pathnames.h
+++ b/usr.bin/xstr/pathnames.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index 1351418..4aad8e6 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c
index 9965813..ef98b4d 100644
--- a/usr.bin/yes/yes.c
+++ b/usr.bin/yes/yes.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
*
OpenPOWER on IntegriCloud