summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authoreadler <eadler@FreeBSD.org>2018-03-29 02:50:57 +0000
committereadler <eadler@FreeBSD.org>2018-03-29 02:50:57 +0000
commitcc72c823b60e2b6c75664545cf46e07f6b40d94a (patch)
treef64a2aebb1ac9925d884f8e87440e4fff3bfb5ee /usr.sbin
parentdd2b5d7309ab212f7aa37c7402a95935137d1a1a (diff)
downloadFreeBSD-src-cc72c823b60e2b6c75664545cf46e07f6b40d94a.zip
FreeBSD-src-cc72c823b60e2b6c75664545cf46e07f6b40d94a.tar.gz
Revert r330897:
This was intended to be a non-functional change. It wasn't. The commit message was thus wrong. In addition it broke arm, and merged crypto related code. Revert with prejudice. This revert skips files touched in r316370 since that commit was since MFCed. This revert also skips files that require $FreeBSD$ property changes. Thank you to those who helped me get out of this mess including but not limited to gonzo, kevans, rgrimes. Requested by: gjb (re)
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/accton/accton.c4
-rw-r--r--usr.sbin/ancontrol/ancontrol.c4
-rw-r--r--usr.sbin/arp/arp.c4
-rw-r--r--usr.sbin/chown/chown.c4
-rw-r--r--usr.sbin/chroot/chroot.c4
-rw-r--r--usr.sbin/config/config.h4
-rw-r--r--usr.sbin/config/config.y4
-rw-r--r--usr.sbin/config/lang.l2
-rw-r--r--usr.sbin/config/main.c4
-rw-r--r--usr.sbin/config/mkheaders.c4
-rw-r--r--usr.sbin/config/mkmakefile.c4
-rw-r--r--usr.sbin/config/mkoptions.c4
-rwxr-xr-xusr.sbin/crashinfo/crashinfo.sh2
-rw-r--r--usr.sbin/dconschat/dconschat.c4
-rw-r--r--usr.sbin/edquota/edquota.c4
-rw-r--r--usr.sbin/edquota/pathnames.h4
-rw-r--r--usr.sbin/fwcontrol/fwcontrol.c4
-rw-r--r--usr.sbin/fwcontrol/fwdv.c4
-rw-r--r--usr.sbin/fwcontrol/fwmpegts.c4
-rw-r--r--usr.sbin/ifmcstat/ifmcstat.c4
-rw-r--r--usr.sbin/ifmcstat/printb.c4
-rw-r--r--usr.sbin/inetd/inetd.c4
-rw-r--r--usr.sbin/inetd/inetd.h4
-rw-r--r--usr.sbin/inetd/pathnames.h4
-rw-r--r--usr.sbin/iostat/iostat.c4
-rw-r--r--usr.sbin/ip6addrctl/ip6addrctl.c4
-rw-r--r--usr.sbin/kgmon/kgmon.c4
-rw-r--r--usr.sbin/kldxref/ef.c4
-rw-r--r--usr.sbin/kldxref/ef_obj.c4
-rw-r--r--usr.sbin/kldxref/kldxref.c4
-rw-r--r--usr.sbin/lpr/common_source/common.c4
-rw-r--r--usr.sbin/lpr/common_source/displayq.c4
-rw-r--r--usr.sbin/lpr/common_source/lp.h4
-rw-r--r--usr.sbin/lpr/common_source/lp.local.h2
-rw-r--r--usr.sbin/lpr/common_source/net.c4
-rw-r--r--usr.sbin/lpr/common_source/pathnames.h4
-rw-r--r--usr.sbin/lpr/common_source/printcap.c4
-rw-r--r--usr.sbin/lpr/common_source/rmjob.c4
-rw-r--r--usr.sbin/lpr/common_source/startdaemon.c4
-rw-r--r--usr.sbin/lpr/filters/lpf.c4
-rw-r--r--usr.sbin/lpr/lpc/cmds.c4
-rw-r--r--usr.sbin/lpr/lpc/cmdtab.c4
-rw-r--r--usr.sbin/lpr/lpc/extern.h4
-rw-r--r--usr.sbin/lpr/lpc/lpc.c4
-rw-r--r--usr.sbin/lpr/lpc/lpc.h4
-rw-r--r--usr.sbin/lpr/lpd/extern.h4
-rw-r--r--usr.sbin/lpr/lpd/lpd.c4
-rw-r--r--usr.sbin/lpr/lpd/lpdchar.c4
-rw-r--r--usr.sbin/lpr/lpd/modes.c2
-rw-r--r--usr.sbin/lpr/lpd/printjob.c4
-rw-r--r--usr.sbin/lpr/lpd/recvjob.c4
-rw-r--r--usr.sbin/lpr/lpq/lpq.c4
-rw-r--r--usr.sbin/lpr/lpr/lpr.c4
-rw-r--r--usr.sbin/lpr/lprm/lprm.c4
-rw-r--r--usr.sbin/lpr/lptest/lptest.c4
-rw-r--r--usr.sbin/lpr/pac/pac.c4
-rw-r--r--usr.sbin/makefs/ffs.c4
-rw-r--r--usr.sbin/makefs/ffs/ffs_alloc.c4
-rw-r--r--usr.sbin/makefs/ffs/ffs_balloc.c4
-rw-r--r--usr.sbin/makefs/ffs/ffs_extern.h2
-rw-r--r--usr.sbin/makefs/ffs/ffs_subr.c4
-rw-r--r--usr.sbin/makefs/ffs/mkfs.c4
-rw-r--r--usr.sbin/makefs/ffs/ufs_bmap.c4
-rw-r--r--usr.sbin/makefs/ffs/ufs_inode.h4
-rw-r--r--usr.sbin/manctl/manctl.sh2
-rw-r--r--usr.sbin/mld6query/mld6.c4
-rw-r--r--usr.sbin/mountd/mountd.c4
-rw-r--r--usr.sbin/mountd/pathnames.h4
-rw-r--r--usr.sbin/mptutil/mpt_cam.c2
-rw-r--r--usr.sbin/mptutil/mpt_cmd.c2
-rw-r--r--usr.sbin/mptutil/mpt_config.c2
-rw-r--r--usr.sbin/mptutil/mpt_drive.c2
-rw-r--r--usr.sbin/mptutil/mpt_evt.c2
-rw-r--r--usr.sbin/mptutil/mpt_show.c2
-rw-r--r--usr.sbin/mptutil/mpt_volume.c2
-rw-r--r--usr.sbin/mptutil/mptutil.c2
-rw-r--r--usr.sbin/mptutil/mptutil.h2
-rw-r--r--usr.sbin/nandsim/nandsim_rcfile.c2
-rw-r--r--usr.sbin/nandsim/nandsim_rcfile.h4
-rw-r--r--usr.sbin/ndiscvt/inf-parse.y4
-rw-r--r--usr.sbin/ndiscvt/inf-token.l4
-rw-r--r--usr.sbin/ndiscvt/inf.c4
-rw-r--r--usr.sbin/ndiscvt/ndiscvt.c2
-rw-r--r--usr.sbin/ndiscvt/ndisgen.sh2
-rw-r--r--usr.sbin/ndiscvt/windrv_stub.c2
-rw-r--r--usr.sbin/ndp/ndp.c4
-rw-r--r--usr.sbin/nfsd/nfsd.c4
-rw-r--r--usr.sbin/pciconf/cap.c2
-rw-r--r--usr.sbin/pciconf/pciconf.h2
-rw-r--r--usr.sbin/ppp/slcompress.c2
-rw-r--r--usr.sbin/ppp/slcompress.h4
-rw-r--r--usr.sbin/pstat/pstat.c2
-rw-r--r--usr.sbin/pwd_mkdb/pwd_mkdb.c2
-rw-r--r--usr.sbin/quotaon/quotaon.c4
-rw-r--r--usr.sbin/repquota/repquota.c4
-rw-r--r--usr.sbin/rip6query/rip6query.c4
-rw-r--r--usr.sbin/rmt/rmt.c4
-rw-r--r--usr.sbin/route6d/misc/cksum.c4
-rw-r--r--usr.sbin/route6d/route6d.c4
-rw-r--r--usr.sbin/route6d/route6d.h4
-rw-r--r--usr.sbin/rpc.lockd/lock_proc.c4
-rw-r--r--usr.sbin/rpc.lockd/lockd.c4
-rw-r--r--usr.sbin/rpc.lockd/lockd.h4
-rw-r--r--usr.sbin/rpc.lockd/lockd_lock.c4
-rw-r--r--usr.sbin/rpc.statd/file.c4
-rw-r--r--usr.sbin/rpc.statd/procs.c4
-rw-r--r--usr.sbin/rpc.statd/statd.c4
-rw-r--r--usr.sbin/rpc.statd/statd.h4
-rw-r--r--usr.sbin/rpc.yppasswdd/yppasswdd_extern.h4
-rw-r--r--usr.sbin/rpc.yppasswdd/yppasswdd_main.c2
-rw-r--r--usr.sbin/rpc.yppasswdd/yppasswdd_server.c4
-rw-r--r--usr.sbin/rpc.ypupdated/yp_dbdelete.c4
-rw-r--r--usr.sbin/rpc.ypupdated/yp_dbupdate.c4
-rw-r--r--usr.sbin/rpc.ypupdated/ypupdated_main.c4
-rw-r--r--usr.sbin/rpc.ypupdated/ypupdated_server.c4
-rw-r--r--usr.sbin/rpc.ypxfrd/ypxfrd_extern.h4
-rw-r--r--usr.sbin/rpc.ypxfrd/ypxfrd_main.c4
-rw-r--r--usr.sbin/rpc.ypxfrd/ypxfrd_server.c4
-rw-r--r--usr.sbin/rpcbind/check_bound.c2
-rw-r--r--usr.sbin/rpcbind/pmap_svc.c2
-rw-r--r--usr.sbin/rpcbind/rpcb_stat.c2
-rw-r--r--usr.sbin/rpcbind/rpcb_svc.c2
-rw-r--r--usr.sbin/rpcbind/rpcb_svc_4.c2
-rw-r--r--usr.sbin/rpcbind/rpcb_svc_com.c2
-rw-r--r--usr.sbin/rpcbind/rpcbind.c2
-rw-r--r--usr.sbin/rpcbind/rpcbind.h2
-rw-r--r--usr.sbin/rpcbind/warmstart.c2
-rw-r--r--usr.sbin/rrenumd/lexer.l4
-rw-r--r--usr.sbin/rrenumd/parser.y4
-rw-r--r--usr.sbin/rrenumd/rrenumd.c4
-rw-r--r--usr.sbin/rrenumd/rrenumd.h4
-rw-r--r--usr.sbin/rtadvd/advcap.c4
-rw-r--r--usr.sbin/rtadvd/config.c4
-rw-r--r--usr.sbin/rtadvd/config.h4
-rw-r--r--usr.sbin/rtadvd/if.c4
-rw-r--r--usr.sbin/rtadvd/if.h4
-rw-r--r--usr.sbin/rtadvd/rrenum.c4
-rw-r--r--usr.sbin/rtadvd/rrenum.h4
-rw-r--r--usr.sbin/rtadvd/rtadvd.c4
-rw-r--r--usr.sbin/rtadvd/rtadvd.h4
-rw-r--r--usr.sbin/rtadvd/timer.c4
-rw-r--r--usr.sbin/rtadvd/timer.h4
-rw-r--r--usr.sbin/rtadvd/timer_subr.c4
-rw-r--r--usr.sbin/rtadvd/timer_subr.h4
-rw-r--r--usr.sbin/rtsold/dump.c4
-rw-r--r--usr.sbin/rtsold/if.c4
-rw-r--r--usr.sbin/rtsold/probe.c4
-rw-r--r--usr.sbin/rtsold/rtsock.c4
-rw-r--r--usr.sbin/rtsold/rtsol.c4
-rw-r--r--usr.sbin/rtsold/rtsold.c4
-rw-r--r--usr.sbin/rtsold/rtsold.h4
-rw-r--r--usr.sbin/rwhod/rwhod.c2
-rw-r--r--usr.sbin/setfib/setfib.c4
-rw-r--r--usr.sbin/syslogd/pathnames.h4
-rw-r--r--usr.sbin/syslogd/syslogd.c4
-rw-r--r--usr.sbin/timed/timed/acksend.c2
-rw-r--r--usr.sbin/timed/timed/byteorder.c2
-rw-r--r--usr.sbin/timed/timed/candidate.c2
-rw-r--r--usr.sbin/timed/timed/cksum.c2
-rw-r--r--usr.sbin/timed/timed/correct.c2
-rw-r--r--usr.sbin/timed/timed/extern.h2
-rw-r--r--usr.sbin/timed/timed/globals.h2
-rw-r--r--usr.sbin/timed/timed/master.c2
-rw-r--r--usr.sbin/timed/timed/measure.c2
-rw-r--r--usr.sbin/timed/timed/networkdelta.c2
-rw-r--r--usr.sbin/timed/timed/pathnames.h2
-rw-r--r--usr.sbin/timed/timed/readmsg.c2
-rw-r--r--usr.sbin/timed/timed/slave.c2
-rw-r--r--usr.sbin/timed/timed/timed.c2
-rw-r--r--usr.sbin/timed/timedc/cmds.c2
-rw-r--r--usr.sbin/timed/timedc/cmdtab.c4
-rw-r--r--usr.sbin/timed/timedc/extern.h2
-rw-r--r--usr.sbin/timed/timedc/timedc.c2
-rw-r--r--usr.sbin/timed/timedc/timedc.h2
-rw-r--r--usr.sbin/traceroute6/traceroute6.c4
-rw-r--r--usr.sbin/trpt/trpt.c4
-rw-r--r--usr.sbin/vipw/vipw.c4
-rw-r--r--usr.sbin/wpa/ndis_events/ndis_events.c2
-rw-r--r--usr.sbin/wpa/wpa_supplicant/Packet32.c2
-rw-r--r--usr.sbin/wpa/wpa_supplicant/Packet32.h2
-rw-r--r--usr.sbin/yp_mkdb/yp_mkdb.c4
-rw-r--r--usr.sbin/ypbind/yp_ping.c2
-rw-r--r--usr.sbin/yppush/yppush_main.c4
-rw-r--r--usr.sbin/ypserv/yp_access.c4
-rw-r--r--usr.sbin/ypserv/yp_dblookup.c4
-rw-r--r--usr.sbin/ypserv/yp_dnslookup.c4
-rw-r--r--usr.sbin/ypserv/yp_error.c4
-rw-r--r--usr.sbin/ypserv/yp_extern.h4
-rw-r--r--usr.sbin/ypserv/yp_main.c4
-rw-r--r--usr.sbin/ypserv/yp_server.c4
-rw-r--r--usr.sbin/ypserv/yp_svc_udp.c4
191 files changed, 135 insertions, 515 deletions
diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c
index 275cd17..33e6604 100644
--- a/usr.sbin/accton/accton.c
+++ b/usr.sbin/accton/accton.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.sbin/ancontrol/ancontrol.c b/usr.sbin/ancontrol/ancontrol.c
index 6d76f07..ba2419a 100644
--- a/usr.sbin/ancontrol/ancontrol.c
+++ b/usr.sbin/ancontrol/ancontrol.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index 4e6967d..1f82aac 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1984, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c
index cf53970..457068a 100644
--- a/usr.sbin/chown/chown.c
+++ b/usr.sbin/chown/chown.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.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c
index 459aa8d..9db0192 100644
--- a/usr.sbin/chroot/chroot.c
+++ b/usr.sbin/chroot/chroot.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.sbin/config/config.h b/usr.sbin/config/config.h
index 9478e56..703d053 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.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.sbin/config/config.y b/usr.sbin/config/config.y
index 16c3287..c7198a0 100644
--- a/usr.sbin/config/config.y
+++ b/usr.sbin/config/config.y
@@ -36,9 +36,7 @@
%{
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l
index f6ce2a9..a13d1eb 100644
--- a/usr.sbin/config/lang.l
+++ b/usr.sbin/config/lang.l
@@ -1,7 +1,5 @@
%{
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 00e13e7..c87f3bb 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/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.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c
index 8387f48..fd7f1b3 100644
--- a/usr.sbin/config/mkheaders.c
+++ b/usr.sbin/config/mkheaders.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.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index d898105..582ca9e 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.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.sbin/config/mkoptions.c b/usr.sbin/config/mkoptions.c
index 3e07f87..8aca410 100644
--- a/usr.sbin/config/mkoptions.c
+++ b/usr.sbin/config/mkoptions.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1995 Peter Wemm
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.sbin/crashinfo/crashinfo.sh b/usr.sbin/crashinfo/crashinfo.sh
index cb8f0e5..14021d9 100755
--- a/usr.sbin/crashinfo/crashinfo.sh
+++ b/usr.sbin/crashinfo/crashinfo.sh
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-3-Clause
-#
# Copyright (c) 2008 Yahoo!, Inc.
# All rights reserved.
#
diff --git a/usr.sbin/dconschat/dconschat.c b/usr.sbin/dconschat/dconschat.c
index 6d47505..dba568a 100644
--- a/usr.sbin/dconschat/dconschat.c
+++ b/usr.sbin/dconschat/dconschat.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index 417f175..6a6c194 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.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.sbin/edquota/pathnames.h b/usr.sbin/edquota/pathnames.h
index 2e59789..53bfbfe 100644
--- a/usr.sbin/edquota/pathnames.h
+++ b/usr.sbin/edquota/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.sbin/fwcontrol/fwcontrol.c b/usr.sbin/fwcontrol/fwcontrol.c
index 48dfa4b..36efea1 100644
--- a/usr.sbin/fwcontrol/fwcontrol.c
+++ b/usr.sbin/fwcontrol/fwcontrol.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (C) 2002
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/usr.sbin/fwcontrol/fwdv.c b/usr.sbin/fwcontrol/fwdv.c
index 2baf1c4..28c63f1 100644
--- a/usr.sbin/fwcontrol/fwdv.c
+++ b/usr.sbin/fwcontrol/fwdv.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/usr.sbin/fwcontrol/fwmpegts.c b/usr.sbin/fwcontrol/fwmpegts.c
index 509d941..ae9a52b 100644
--- a/usr.sbin/fwcontrol/fwmpegts.c
+++ b/usr.sbin/fwcontrol/fwmpegts.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (C) 2005
* Petr Holub, Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c
index 81befd3..bbcacc3 100644
--- a/usr.sbin/ifmcstat/ifmcstat.c
+++ b/usr.sbin/ifmcstat/ifmcstat.c
@@ -1,8 +1,6 @@
/* $KAME: ifmcstat.c,v 1.48 2006/11/15 05:13:59 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2007-2009 Bruce Simpson.
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
diff --git a/usr.sbin/ifmcstat/printb.c b/usr.sbin/ifmcstat/printb.c
index a02f552..58249f6 100644
--- a/usr.sbin/ifmcstat/printb.c
+++ b/usr.sbin/ifmcstat/printb.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.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 497ad52..569154a 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/inetd/inetd.h b/usr.sbin/inetd/inetd.h
index 325692a..06600f8 100644
--- a/usr.sbin/inetd/inetd.h
+++ b/usr.sbin/inetd/inetd.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/inetd/pathnames.h b/usr.sbin/inetd/pathnames.h
index 4993d4a..d4fd81d 100644
--- a/usr.sbin/inetd/pathnames.h
+++ b/usr.sbin/inetd/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.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index e0ce539..69882f1 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1997, 1998, 2000, 2001 Kenneth D. Merry
* All rights reserved.
*
diff --git a/usr.sbin/ip6addrctl/ip6addrctl.c b/usr.sbin/ip6addrctl/ip6addrctl.c
index 06d527d..79388ff 100644
--- a/usr.sbin/ip6addrctl/ip6addrctl.c
+++ b/usr.sbin/ip6addrctl/ip6addrctl.c
@@ -1,8 +1,6 @@
/* $KAME: ip6addrctl.c,v 1.3 2003/12/16 08:14:28 suz Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 2001 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index bfec92f..60c7507 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.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.sbin/kldxref/ef.c b/usr.sbin/kldxref/ef.c
index 7a3955b..99f844b 100644
--- a/usr.sbin/kldxref/ef.c
+++ b/usr.sbin/kldxref/ef.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2000, Boris Popov
* All rights reserved.
*
diff --git a/usr.sbin/kldxref/ef_obj.c b/usr.sbin/kldxref/ef_obj.c
index ba9c37e..9268b60 100644
--- a/usr.sbin/kldxref/ef_obj.c
+++ b/usr.sbin/kldxref/ef_obj.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2000, Boris Popov
* Copyright (c) 1998-2000 Doug Rabson
* Copyright (c) 2004 Peter Wemm
diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c
index b7a2c42..fa93972 100644
--- a/usr.sbin/kldxref/kldxref.c
+++ b/usr.sbin/kldxref/kldxref.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2000, Boris Popov
* All rights reserved.
*
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c
index b208555..729e0c9 100644
--- a/usr.sbin/lpr/common_source/common.c
+++ b/usr.sbin/lpr/common_source/common.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c
index 7bacf1a..d987cfa 100644
--- a/usr.sbin/lpr/common_source/displayq.c
+++ b/usr.sbin/lpr/common_source/displayq.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.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h
index e18cbef..a6ae607 100644
--- a/usr.sbin/lpr/common_source/lp.h
+++ b/usr.sbin/lpr/common_source/lp.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.sbin/lpr/common_source/lp.local.h b/usr.sbin/lpr/common_source/lp.local.h
index e7ddd8f..79cc52a 100644
--- a/usr.sbin/lpr/common_source/lp.local.h
+++ b/usr.sbin/lpr/common_source/lp.local.h
@@ -1,4 +1,4 @@
-/*-
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/lpr/common_source/net.c b/usr.sbin/lpr/common_source/net.c
index 3954b22..c495bbb 100644
--- a/usr.sbin/lpr/common_source/net.c
+++ b/usr.sbin/lpr/common_source/net.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.sbin/lpr/common_source/pathnames.h b/usr.sbin/lpr/common_source/pathnames.h
index 79154b5..0be302a 100644
--- a/usr.sbin/lpr/common_source/pathnames.h
+++ b/usr.sbin/lpr/common_source/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.sbin/lpr/common_source/printcap.c b/usr.sbin/lpr/common_source/printcap.c
index 2cf4de4..707b7b8 100644
--- a/usr.sbin/lpr/common_source/printcap.c
+++ b/usr.sbin/lpr/common_source/printcap.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c
index b22ef91..700e3c2 100644
--- a/usr.sbin/lpr/common_source/rmjob.c
+++ b/usr.sbin/lpr/common_source/rmjob.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.sbin/lpr/common_source/startdaemon.c b/usr.sbin/lpr/common_source/startdaemon.c
index 7a0e806..8e4f60a 100644
--- a/usr.sbin/lpr/common_source/startdaemon.c
+++ b/usr.sbin/lpr/common_source/startdaemon.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.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c
index 2239b62..f8ffe52 100644
--- a/usr.sbin/lpr/filters/lpf.c
+++ b/usr.sbin/lpr/filters/lpf.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.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index 3068e2f..d85e8ea 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.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.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c
index b7945b5..1e8e4da 100644
--- a/usr.sbin/lpr/lpc/cmdtab.c
+++ b/usr.sbin/lpr/lpc/cmdtab.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.sbin/lpr/lpc/extern.h b/usr.sbin/lpr/lpc/extern.h
index 856357c..45844a5 100644
--- a/usr.sbin/lpr/lpc/extern.h
+++ b/usr.sbin/lpr/lpc/extern.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.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c
index afd90d3..2be4c84 100644
--- a/usr.sbin/lpr/lpc/lpc.c
+++ b/usr.sbin/lpr/lpc/lpc.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.sbin/lpr/lpc/lpc.h b/usr.sbin/lpr/lpc/lpc.h
index 557b184..ee52903 100644
--- a/usr.sbin/lpr/lpc/lpc.h
+++ b/usr.sbin/lpr/lpc/lpc.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.sbin/lpr/lpd/extern.h b/usr.sbin/lpr/lpd/extern.h
index 173dd05..90eb0be 100644
--- a/usr.sbin/lpr/lpd/extern.h
+++ b/usr.sbin/lpr/lpd/extern.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.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index 8ba9d3a..925d00f 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.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.sbin/lpr/lpd/lpdchar.c b/usr.sbin/lpr/lpd/lpdchar.c
index 9e1fa27..cb9f355 100644
--- a/usr.sbin/lpr/lpd/lpdchar.c
+++ b/usr.sbin/lpr/lpd/lpdchar.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.sbin/lpr/lpd/modes.c b/usr.sbin/lpr/lpd/modes.c
index f105240..52f1229 100644
--- a/usr.sbin/lpr/lpd/modes.c
+++ b/usr.sbin/lpr/lpd/modes.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.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index f4433cc..a2d61c3 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.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.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index 6ad26dd..c7ee4e9 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.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.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c
index 49b3b9b..f39c81b 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.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.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 72ba2b3..9a4382f 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1983, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c
index 2acc82b..35d8814 100644
--- a/usr.sbin/lpr/lprm/lprm.c
+++ b/usr.sbin/lpr/lprm/lprm.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.sbin/lpr/lptest/lptest.c b/usr.sbin/lpr/lptest/lptest.c
index 762f06e..07c90d7 100644
--- a/usr.sbin/lpr/lptest/lptest.c
+++ b/usr.sbin/lpr/lptest/lptest.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.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index b93d644..5fdd54f 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.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.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index fb46f48..d50bd7b 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -1,8 +1,6 @@
/* $NetBSD: ffs.c,v 1.45 2011/10/09 22:49:26 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2001 Wasabi Systems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/makefs/ffs/ffs_alloc.c b/usr.sbin/makefs/ffs/ffs_alloc.c
index c030d50..5147d04 100644
--- a/usr.sbin/makefs/ffs/ffs_alloc.c
+++ b/usr.sbin/makefs/ffs/ffs_alloc.c
@@ -1,9 +1,7 @@
/* $NetBSD: ffs_alloc.c,v 1.14 2004/06/20 22:20:18 jmc Exp $ */
/* From: NetBSD: ffs_alloc.c,v 1.50 2001/09/06 02:16:01 lukem Exp */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/makefs/ffs/ffs_balloc.c b/usr.sbin/makefs/ffs/ffs_balloc.c
index 89bbec0..0ce4f75 100644
--- a/usr.sbin/makefs/ffs/ffs_balloc.c
+++ b/usr.sbin/makefs/ffs/ffs_balloc.c
@@ -1,9 +1,7 @@
/* $NetBSD: ffs_balloc.c,v 1.13 2004/06/20 22:20:18 jmc Exp $ */
/* From NetBSD: ffs_balloc.c,v 1.25 2001/08/08 08:36:36 lukem Exp */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/makefs/ffs/ffs_extern.h b/usr.sbin/makefs/ffs/ffs_extern.h
index b4d4bba..7755823 100644
--- a/usr.sbin/makefs/ffs/ffs_extern.h
+++ b/usr.sbin/makefs/ffs/ffs_extern.h
@@ -2,8 +2,6 @@
/* From: NetBSD: ffs_extern.h,v 1.19 2001/08/17 02:18:48 lukem Exp */
/*-
- * 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.sbin/makefs/ffs/ffs_subr.c b/usr.sbin/makefs/ffs/ffs_subr.c
index 0d5ac2a..b55174d 100644
--- a/usr.sbin/makefs/ffs/ffs_subr.c
+++ b/usr.sbin/makefs/ffs/ffs_subr.c
@@ -1,8 +1,6 @@
/* $NetBSD: ffs_subr.c,v 1.32 2003/12/30 12:33:24 pk Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/makefs/ffs/mkfs.c b/usr.sbin/makefs/ffs/mkfs.c
index e7b037e..3cd8546 100644
--- a/usr.sbin/makefs/ffs/mkfs.c
+++ b/usr.sbin/makefs/ffs/mkfs.c
@@ -1,8 +1,6 @@
/* $NetBSD: mkfs.c,v 1.22 2011/10/09 22:30:13 christos Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/makefs/ffs/ufs_bmap.c b/usr.sbin/makefs/ffs/ufs_bmap.c
index ac3869a..b65b416 100644
--- a/usr.sbin/makefs/ffs/ufs_bmap.c
+++ b/usr.sbin/makefs/ffs/ufs_bmap.c
@@ -1,9 +1,7 @@
/* $NetBSD: ufs_bmap.c,v 1.14 2004/06/20 22:20:18 jmc Exp $ */
/* From: NetBSD: ufs_bmap.c,v 1.14 2001/11/08 05:00:51 chs Exp */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.sbin/makefs/ffs/ufs_inode.h b/usr.sbin/makefs/ffs/ufs_inode.h
index d502338..8286f86 100644
--- a/usr.sbin/makefs/ffs/ufs_inode.h
+++ b/usr.sbin/makefs/ffs/ufs_inode.h
@@ -1,9 +1,7 @@
/* $NetBSD: ufs_inode.h,v 1.3 2003/08/07 11:25:34 agc Exp $ */
/* From: NetBSD: inode.h,v 1.27 2001/12/18 10:57:23 fvdl Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1982, 1989, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/usr.sbin/manctl/manctl.sh b/usr.sbin/manctl/manctl.sh
index 85ed845..23e2087 100644
--- a/usr.sbin/manctl/manctl.sh
+++ b/usr.sbin/manctl/manctl.sh
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-4-Clause
-#
# Copyright (c) 1994 Geoffrey M. Rehmet, Rhodes University
# All rights reserved.
#
diff --git a/usr.sbin/mld6query/mld6.c b/usr.sbin/mld6query/mld6.c
index dcdd15a..a3c8342 100644
--- a/usr.sbin/mld6query/mld6.c
+++ b/usr.sbin/mld6query/mld6.c
@@ -1,8 +1,6 @@
/* $KAME: mld6.c,v 1.15 2003/04/02 11:29:54 suz Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c
index d4790a3..1e35cc5 100644
--- a/usr.sbin/mountd/mountd.c
+++ b/usr.sbin/mountd/mountd.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.sbin/mountd/pathnames.h b/usr.sbin/mountd/pathnames.h
index 6deae6d..2b73977 100644
--- a/usr.sbin/mountd/pathnames.h
+++ b/usr.sbin/mountd/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.sbin/mptutil/mpt_cam.c b/usr.sbin/mptutil/mpt_cam.c
index 56b923b..264cb47 100644
--- a/usr.sbin/mptutil/mpt_cam.c
+++ b/usr.sbin/mptutil/mpt_cam.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/mptutil/mpt_cmd.c b/usr.sbin/mptutil/mpt_cmd.c
index 79422c1..8104fc9 100644
--- a/usr.sbin/mptutil/mpt_cmd.c
+++ b/usr.sbin/mptutil/mpt_cmd.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/mptutil/mpt_config.c b/usr.sbin/mptutil/mpt_config.c
index 6dc5d19..17b9945 100644
--- a/usr.sbin/mptutil/mpt_config.c
+++ b/usr.sbin/mptutil/mpt_config.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/mptutil/mpt_drive.c b/usr.sbin/mptutil/mpt_drive.c
index c71896d..049ce71 100644
--- a/usr.sbin/mptutil/mpt_drive.c
+++ b/usr.sbin/mptutil/mpt_drive.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/mptutil/mpt_evt.c b/usr.sbin/mptutil/mpt_evt.c
index 9fb41d5..9ccdebd 100644
--- a/usr.sbin/mptutil/mpt_evt.c
+++ b/usr.sbin/mptutil/mpt_evt.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/mptutil/mpt_show.c b/usr.sbin/mptutil/mpt_show.c
index 313f985..153d73e 100644
--- a/usr.sbin/mptutil/mpt_show.c
+++ b/usr.sbin/mptutil/mpt_show.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/mptutil/mpt_volume.c b/usr.sbin/mptutil/mpt_volume.c
index 0e437ed..2b273c7 100644
--- a/usr.sbin/mptutil/mpt_volume.c
+++ b/usr.sbin/mptutil/mpt_volume.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/mptutil/mptutil.c b/usr.sbin/mptutil/mptutil.c
index 8148766..63e8efa 100644
--- a/usr.sbin/mptutil/mptutil.c
+++ b/usr.sbin/mptutil/mptutil.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/mptutil/mptutil.h b/usr.sbin/mptutil/mptutil.h
index 191c8d2..3951235 100644
--- a/usr.sbin/mptutil/mptutil.h
+++ b/usr.sbin/mptutil/mptutil.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/nandsim/nandsim_rcfile.c b/usr.sbin/nandsim/nandsim_rcfile.c
index 8e9cca1..0f99e7b 100644
--- a/usr.sbin/nandsim/nandsim_rcfile.c
+++ b/usr.sbin/nandsim/nandsim_rcfile.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1999, Boris Popov
* All rights reserved.
*
diff --git a/usr.sbin/nandsim/nandsim_rcfile.h b/usr.sbin/nandsim/nandsim_rcfile.h
index d92ae87..f5c3ce9 100644
--- a/usr.sbin/nandsim/nandsim_rcfile.h
+++ b/usr.sbin/nandsim/nandsim_rcfile.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1999, Boris Popov
* All rights reserved.
*
diff --git a/usr.sbin/ndiscvt/inf-parse.y b/usr.sbin/ndiscvt/inf-parse.y
index 740aba5..2a8876d 100644
--- a/usr.sbin/ndiscvt/inf-parse.y
+++ b/usr.sbin/ndiscvt/inf-parse.y
@@ -1,7 +1,5 @@
%{
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/ndiscvt/inf-token.l b/usr.sbin/ndiscvt/inf-token.l
index 5635926..3e2a127 100644
--- a/usr.sbin/ndiscvt/inf-token.l
+++ b/usr.sbin/ndiscvt/inf-token.l
@@ -1,7 +1,5 @@
%{
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/ndiscvt/inf.c b/usr.sbin/ndiscvt/inf.c
index eb10150..4b30da0 100644
--- a/usr.sbin/ndiscvt/inf.c
+++ b/usr.sbin/ndiscvt/inf.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/ndiscvt/ndiscvt.c b/usr.sbin/ndiscvt/ndiscvt.c
index 09f7fae..7636c4c 100644
--- a/usr.sbin/ndiscvt/ndiscvt.c
+++ b/usr.sbin/ndiscvt/ndiscvt.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/ndiscvt/ndisgen.sh b/usr.sbin/ndiscvt/ndisgen.sh
index c5a0dbd..1674ea1 100644
--- a/usr.sbin/ndiscvt/ndisgen.sh
+++ b/usr.sbin/ndiscvt/ndisgen.sh
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-4-Clause
-#
# Copyright (c) 2005
# Bill Paul <wpaul@windriver.com>. All rights reserved.
#
diff --git a/usr.sbin/ndiscvt/windrv_stub.c b/usr.sbin/ndiscvt/windrv_stub.c
index 8aaa238..46a0e83 100644
--- a/usr.sbin/ndiscvt/windrv_stub.c
+++ b/usr.sbin/ndiscvt/windrv_stub.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index cf609a1..95ee865 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: ndp.c,v 1.104 2003/06/27 07:48: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.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c
index 96e01ba..c9b8f77 100644
--- a/usr.sbin/nfsd/nfsd.c
+++ b/usr.sbin/nfsd/nfsd.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.sbin/pciconf/cap.c b/usr.sbin/pciconf/cap.c
index 03490e4..130b58b 100644
--- a/usr.sbin/pciconf/cap.c
+++ b/usr.sbin/pciconf/cap.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/pciconf/pciconf.h b/usr.sbin/pciconf/pciconf.h
index 4b31372..734007e 100644
--- a/usr.sbin/pciconf/pciconf.h
+++ b/usr.sbin/pciconf/pciconf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2007 Yahoo!, Inc.
* All rights reserved.
* Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/ppp/slcompress.c b/usr.sbin/ppp/slcompress.c
index adfdcd6..48928c7 100644
--- a/usr.sbin/ppp/slcompress.c
+++ b/usr.sbin/ppp/slcompress.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.sbin/ppp/slcompress.h b/usr.sbin/ppp/slcompress.h
index 9694d3a..9c415cb 100644
--- a/usr.sbin/ppp/slcompress.h
+++ b/usr.sbin/ppp/slcompress.h
@@ -1,8 +1,6 @@
-/*-
+/*
* Definitions for tcp compression routines.
*
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 418679d..b5ceb2e 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.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.
* Copyright (c) 2002 Networks Associates Technologies, Inc.
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index 648bf5f..0b4df5e 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.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.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index 326897b..740df39 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.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.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index 0c48292..4ffc2e6 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.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.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c
index b3d7459..a35c750 100644
--- a/usr.sbin/rip6query/rip6query.c
+++ b/usr.sbin/rip6query/rip6query.c
@@ -1,8 +1,6 @@
/* $KAME: rip6query.c,v 1.11 2001/05/08 04:36:37 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c
index d11aa37..57c8439 100644
--- a/usr.sbin/rmt/rmt.c
+++ b/usr.sbin/rmt/rmt.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.sbin/route6d/misc/cksum.c b/usr.sbin/route6d/misc/cksum.c
index 200eecc..bff7e2d 100644
--- a/usr.sbin/route6d/misc/cksum.c
+++ b/usr.sbin/route6d/misc/cksum.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index 5b049b9..41f8fe3 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: route6d.c,v 1.104 2003/10/31 00:30:20 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/route6d/route6d.h b/usr.sbin/route6d/route6d.h
index d556799..49a7d5a 100644
--- a/usr.sbin/route6d/route6d.h
+++ b/usr.sbin/route6d/route6d.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: route6d.h,v 1.8 2003/05/28 09:11:13 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rpc.lockd/lock_proc.c b/usr.sbin/rpc.lockd/lock_proc.c
index 160e184..3b040e5 100644
--- a/usr.sbin/rpc.lockd/lock_proc.c
+++ b/usr.sbin/rpc.lockd/lock_proc.c
@@ -1,8 +1,6 @@
/* $NetBSD: lock_proc.c,v 1.7 2000/10/11 20:23:56 is Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c
index a208fdb..6ac4962 100644
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -1,9 +1,7 @@
/* $NetBSD: lockd.c,v 1.7 2000/08/12 18:08:44 thorpej Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.lockd/lockd.h b/usr.sbin/rpc.lockd/lockd.h
index 23cb19f..0a8e2e6 100644
--- a/usr.sbin/rpc.lockd/lockd.h
+++ b/usr.sbin/rpc.lockd/lockd.h
@@ -1,9 +1,7 @@
/* $NetBSD: lockd.h,v 1.2 2000/06/07 14:34:40 bouyer Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.lockd/lockd_lock.c b/usr.sbin/rpc.lockd/lockd_lock.c
index 594d01f..59a312d 100644
--- a/usr.sbin/rpc.lockd/lockd_lock.c
+++ b/usr.sbin/rpc.lockd/lockd_lock.c
@@ -1,8 +1,6 @@
/* $NetBSD: lockd_lock.c,v 1.5 2000/11/21 03:47:41 enami Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 2001 Andrew P. Lentvorski, Jr.
* Copyright (c) 2000 Manuel Bouyer.
*
diff --git a/usr.sbin/rpc.statd/file.c b/usr.sbin/rpc.statd/file.c
index c2207c7..beef0e4 100644
--- a/usr.sbin/rpc.statd/file.c
+++ b/usr.sbin/rpc.statd/file.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.statd/procs.c b/usr.sbin/rpc.statd/procs.c
index 517c3f6..f6067e7 100644
--- a/usr.sbin/rpc.statd/procs.c
+++ b/usr.sbin/rpc.statd/procs.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.statd/statd.c b/usr.sbin/rpc.statd/statd.c
index b789f81..1a79ac2 100644
--- a/usr.sbin/rpc.statd/statd.c
+++ b/usr.sbin/rpc.statd/statd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.statd/statd.h b/usr.sbin/rpc.statd/statd.h
index ede1590..a82d760 100644
--- a/usr.sbin/rpc.statd/statd.h
+++ b/usr.sbin/rpc.statd/statd.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved.
*
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h b/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
index 563d47c..db15be2 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
index 349f1cd..38719c4 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
index 8845d0d..ae5ca59 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypupdated/yp_dbdelete.c b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
index 7ef1458..0552aab 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbdelete.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypupdated/yp_dbupdate.c b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
index 84bacb9..3481a6b 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbupdate.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_main.c b/usr.sbin/rpc.ypupdated/ypupdated_main.c
index 96bf446..92d8374 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_main.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_server.c b/usr.sbin/rpc.ypupdated/ypupdated_server.c
index 67fa05e..c4e163a 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_server.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_server.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h b/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
index 165b144..5aba934 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
index 62420a4..8fa3e22 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
index ca8a2a3..5f60712 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/rpcbind/check_bound.c b/usr.sbin/rpcbind/check_bound.c
index becd201..b08979d 100644
--- a/usr.sbin/rpcbind/check_bound.c
+++ b/usr.sbin/rpcbind/check_bound.c
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/pmap_svc.c b/usr.sbin/rpcbind/pmap_svc.c
index 991a28d..d20f18f 100644
--- a/usr.sbin/rpcbind/pmap_svc.c
+++ b/usr.sbin/rpcbind/pmap_svc.c
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/rpcb_stat.c b/usr.sbin/rpcbind/rpcb_stat.c
index 65bd164..12aab64 100644
--- a/usr.sbin/rpcbind/rpcb_stat.c
+++ b/usr.sbin/rpcbind/rpcb_stat.c
@@ -3,8 +3,6 @@
* $FreeBSD$
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/rpcb_svc.c b/usr.sbin/rpcbind/rpcb_svc.c
index 9ae4196..7aa5393 100644
--- a/usr.sbin/rpcbind/rpcb_svc.c
+++ b/usr.sbin/rpcbind/rpcb_svc.c
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/rpcb_svc_4.c b/usr.sbin/rpcbind/rpcb_svc_4.c
index 9bb48be..852abaf 100644
--- a/usr.sbin/rpcbind/rpcb_svc_4.c
+++ b/usr.sbin/rpcbind/rpcb_svc_4.c
@@ -4,8 +4,6 @@
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/rpcb_svc_com.c b/usr.sbin/rpcbind/rpcb_svc_com.c
index 7c72041..d5beb13 100644
--- a/usr.sbin/rpcbind/rpcb_svc_com.c
+++ b/usr.sbin/rpcbind/rpcb_svc_com.c
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/rpcbind.c b/usr.sbin/rpcbind/rpcbind.c
index bac11a9..9d5a608b 100644
--- a/usr.sbin/rpcbind/rpcbind.c
+++ b/usr.sbin/rpcbind/rpcbind.c
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/rpcbind.h b/usr.sbin/rpcbind/rpcbind.h
index f78b2ee..309bc0b 100644
--- a/usr.sbin/rpcbind/rpcbind.h
+++ b/usr.sbin/rpcbind/rpcbind.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rpcbind/warmstart.c b/usr.sbin/rpcbind/warmstart.c
index 74ad912..473b6f7 100644
--- a/usr.sbin/rpcbind/warmstart.c
+++ b/usr.sbin/rpcbind/warmstart.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/usr.sbin/rrenumd/lexer.l b/usr.sbin/rrenumd/lexer.l
index 31ca4b2..47656e8 100644
--- a/usr.sbin/rrenumd/lexer.l
+++ b/usr.sbin/rrenumd/lexer.l
@@ -1,8 +1,6 @@
/* $KAME: lexer.l,v 1.7 2000/11/08 02:40:53 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rrenumd/parser.y b/usr.sbin/rrenumd/parser.y
index 96f37ae..6436df7 100644
--- a/usr.sbin/rrenumd/parser.y
+++ b/usr.sbin/rrenumd/parser.y
@@ -1,8 +1,6 @@
/* $KAME: parser.y,v 1.8 2000/11/08 03:03:34 jinmei Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rrenumd/rrenumd.c b/usr.sbin/rrenumd/rrenumd.c
index dd08396..68f6847 100644
--- a/usr.sbin/rrenumd/rrenumd.c
+++ b/usr.sbin/rrenumd/rrenumd.c
@@ -1,8 +1,6 @@
/* $KAME: rrenumd.c,v 1.20 2000/11/08 02:40:53 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rrenumd/rrenumd.h b/usr.sbin/rrenumd/rrenumd.h
index 2e9390d..df0280b 100644
--- a/usr.sbin/rrenumd/rrenumd.h
+++ b/usr.sbin/rrenumd/rrenumd.h
@@ -1,8 +1,6 @@
/* $KAME: rrenumd.h,v 1.2 2000/07/03 02:54:09 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/advcap.c b/usr.sbin/rtadvd/advcap.c
index 8416359..542e066 100644
--- a/usr.sbin/rtadvd/advcap.c
+++ b/usr.sbin/rtadvd/advcap.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: advcap.c,v 1.11 2003/05/19 09:46:50 keiichi Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983 The Regents of the University of California.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c
index 1c4f838..db16e33 100644
--- a/usr.sbin/rtadvd/config.c
+++ b/usr.sbin/rtadvd/config.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: config.c,v 1.84 2003/08/05 12:34:23 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/rtadvd/config.h b/usr.sbin/rtadvd/config.h
index 24e6f49..219390b 100644
--- a/usr.sbin/rtadvd/config.h
+++ b/usr.sbin/rtadvd/config.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: config.h,v 1.8 2003/06/17 08:26:22 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.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c
index 20a5099..72ea36a 100644
--- a/usr.sbin/rtadvd/if.c
+++ b/usr.sbin/rtadvd/if.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: if.c,v 1.17 2001/01/21 15:27:30 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/rtadvd/if.h b/usr.sbin/rtadvd/if.h
index 42b4be7..6efdd56 100644
--- a/usr.sbin/rtadvd/if.h
+++ b/usr.sbin/rtadvd/if.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: if.h,v 1.10 2003/02/24 11:29:10 ono Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/rrenum.c b/usr.sbin/rtadvd/rrenum.c
index 7e3bac2..eede4b6 100644
--- a/usr.sbin/rtadvd/rrenum.c
+++ b/usr.sbin/rtadvd/rrenum.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: rrenum.c,v 1.12 2002/06/10 19:59:47 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/rrenum.h b/usr.sbin/rtadvd/rrenum.h
index 93cd96b..2b20d59 100644
--- a/usr.sbin/rtadvd/rrenum.h
+++ b/usr.sbin/rtadvd/rrenum.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: rrenum.h,v 1.3 2001/01/21 15:37:14 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c
index d461858..9976c78 100644
--- a/usr.sbin/rtadvd/rtadvd.c
+++ b/usr.sbin/rtadvd/rtadvd.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: rtadvd.c,v 1.82 2003/08/05 12:34:23 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/rtadvd/rtadvd.h b/usr.sbin/rtadvd/rtadvd.h
index 005a42c..e7ed87f 100644
--- a/usr.sbin/rtadvd/rtadvd.h
+++ b/usr.sbin/rtadvd/rtadvd.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: rtadvd.h,v 1.26 2003/08/05 12:34:23 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/rtadvd/timer.c b/usr.sbin/rtadvd/timer.c
index 94c5dcd..452add4 100644
--- a/usr.sbin/rtadvd/timer.c
+++ b/usr.sbin/rtadvd/timer.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: timer.c,v 1.9 2002/06/10 19:59:47 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/rtadvd/timer.h b/usr.sbin/rtadvd/timer.h
index 74ac7d4..4498aaf 100644
--- a/usr.sbin/rtadvd/timer.h
+++ b/usr.sbin/rtadvd/timer.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: timer.h,v 1.5 2002/05/31 13:30:38 jinmei Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/timer_subr.c b/usr.sbin/rtadvd/timer_subr.c
index 7a7a23c..0ddf0a4 100644
--- a/usr.sbin/rtadvd/timer_subr.c
+++ b/usr.sbin/rtadvd/timer_subr.c
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: timer.c,v 1.9 2002/06/10 19:59:47 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtadvd/timer_subr.h b/usr.sbin/rtadvd/timer_subr.h
index 36e8b3b..32e1bb1 100644
--- a/usr.sbin/rtadvd/timer_subr.h
+++ b/usr.sbin/rtadvd/timer_subr.h
@@ -1,9 +1,7 @@
/* $FreeBSD$ */
/* $KAME: timer.h,v 1.5 2002/05/31 13:30:38 jinmei Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtsold/dump.c b/usr.sbin/rtsold/dump.c
index 282b71d..a0bf2c2 100644
--- a/usr.sbin/rtsold/dump.c
+++ b/usr.sbin/rtsold/dump.c
@@ -1,8 +1,6 @@
/* $KAME: dump.c,v 1.13 2003/10/05 00:09:36 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1999 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtsold/if.c b/usr.sbin/rtsold/if.c
index e1e9a00..0d50062 100644
--- a/usr.sbin/rtsold/if.c
+++ b/usr.sbin/rtsold/if.c
@@ -1,8 +1,6 @@
/* $KAME: if.c,v 1.27 2003/10/05 00:09:36 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtsold/probe.c b/usr.sbin/rtsold/probe.c
index 2a5ddfc..3aa5303 100644
--- a/usr.sbin/rtsold/probe.c
+++ b/usr.sbin/rtsold/probe.c
@@ -1,8 +1,6 @@
/* $KAME: probe.c,v 1.17 2003/10/05 00:09:36 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtsold/rtsock.c b/usr.sbin/rtsold/rtsock.c
index 6e57eaf..702ffe1 100644
--- a/usr.sbin/rtsold/rtsock.c
+++ b/usr.sbin/rtsold/rtsock.c
@@ -1,9 +1,7 @@
/* $KAME: rtsock.c,v 1.3 2000/10/10 08:46:45 itojun Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 2000 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtsold/rtsol.c b/usr.sbin/rtsold/rtsol.c
index 04a92de..cff2831 100644
--- a/usr.sbin/rtsold/rtsol.c
+++ b/usr.sbin/rtsold/rtsol.c
@@ -1,8 +1,6 @@
/* $KAME: rtsol.c,v 1.27 2003/10/05 00:09:36 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (C) 2011 Hiroki Sato
* All rights reserved.
diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c
index a8e5b23..9cfe5c3 100644
--- a/usr.sbin/rtsold/rtsold.c
+++ b/usr.sbin/rtsold/rtsold.c
@@ -1,8 +1,6 @@
/* $KAME: rtsold.c,v 1.67 2003/05/17 18:16:15 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rtsold/rtsold.h b/usr.sbin/rtsold/rtsold.h
index 7af0441..f19fb3c 100644
--- a/usr.sbin/rtsold/rtsold.h
+++ b/usr.sbin/rtsold/rtsold.h
@@ -1,8 +1,6 @@
/* $KAME: rtsold.h,v 1.19 2003/04/16 09:48:15 itojun Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index 4e6fc43..9a9dad8 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.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.sbin/setfib/setfib.c b/usr.sbin/setfib/setfib.c
index 0f5305b..f4b6c3d 100644
--- a/usr.sbin/setfib/setfib.c
+++ b/usr.sbin/setfib/setfib.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.
* Copyright (c) 2008 Cisco Systems, All rights reserved
diff --git a/usr.sbin/syslogd/pathnames.h b/usr.sbin/syslogd/pathnames.h
index b1ed907..00631e0 100644
--- a/usr.sbin/syslogd/pathnames.h
+++ b/usr.sbin/syslogd/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.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index cf90d1d..ac7a167 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/acksend.c b/usr.sbin/timed/timed/acksend.c
index 6543c60..dca3a68 100644
--- a/usr.sbin/timed/timed/acksend.c
+++ b/usr.sbin/timed/timed/acksend.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/byteorder.c b/usr.sbin/timed/timed/byteorder.c
index 1e45e4d..abacbd6 100644
--- a/usr.sbin/timed/timed/byteorder.c
+++ b/usr.sbin/timed/timed/byteorder.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/candidate.c b/usr.sbin/timed/timed/candidate.c
index 0f013a4..c92ae70 100644
--- a/usr.sbin/timed/timed/candidate.c
+++ b/usr.sbin/timed/timed/candidate.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/cksum.c b/usr.sbin/timed/timed/cksum.c
index 227e03b..7fa0a5e 100644
--- a/usr.sbin/timed/timed/cksum.c
+++ b/usr.sbin/timed/timed/cksum.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/correct.c b/usr.sbin/timed/timed/correct.c
index 1cb412f..8a5b464 100644
--- a/usr.sbin/timed/timed/correct.c
+++ b/usr.sbin/timed/timed/correct.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/extern.h b/usr.sbin/timed/timed/extern.h
index 6994cb1..c4cb642 100644
--- a/usr.sbin/timed/timed/extern.h
+++ b/usr.sbin/timed/timed/extern.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/globals.h b/usr.sbin/timed/timed/globals.h
index 2a56fec..0492d79 100644
--- a/usr.sbin/timed/timed/globals.h
+++ b/usr.sbin/timed/timed/globals.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/master.c b/usr.sbin/timed/timed/master.c
index 9879b26..24b1de0 100644
--- a/usr.sbin/timed/timed/master.c
+++ b/usr.sbin/timed/timed/master.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/measure.c b/usr.sbin/timed/timed/measure.c
index a382124..8fe43b5 100644
--- a/usr.sbin/timed/timed/measure.c
+++ b/usr.sbin/timed/timed/measure.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/networkdelta.c b/usr.sbin/timed/timed/networkdelta.c
index 3f8dad4..bf2a353 100644
--- a/usr.sbin/timed/timed/networkdelta.c
+++ b/usr.sbin/timed/timed/networkdelta.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/pathnames.h b/usr.sbin/timed/timed/pathnames.h
index 49e2939..a2396e1 100644
--- a/usr.sbin/timed/timed/pathnames.h
+++ b/usr.sbin/timed/timed/pathnames.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/readmsg.c b/usr.sbin/timed/timed/readmsg.c
index 2e0c306..e637912 100644
--- a/usr.sbin/timed/timed/readmsg.c
+++ b/usr.sbin/timed/timed/readmsg.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/slave.c b/usr.sbin/timed/timed/slave.c
index fcac7b3..0ec10da 100644
--- a/usr.sbin/timed/timed/slave.c
+++ b/usr.sbin/timed/timed/slave.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timed/timed.c b/usr.sbin/timed/timed/timed.c
index 8bafc7a..a8efd6d 100644
--- a/usr.sbin/timed/timed/timed.c
+++ b/usr.sbin/timed/timed/timed.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timedc/cmds.c b/usr.sbin/timed/timedc/cmds.c
index 9cc7e8c..1eb6a75f 100644
--- a/usr.sbin/timed/timedc/cmds.c
+++ b/usr.sbin/timed/timedc/cmds.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timedc/cmdtab.c b/usr.sbin/timed/timedc/cmdtab.c
index d5a697c..62c01da 100644
--- a/usr.sbin/timed/timedc/cmdtab.c
+++ b/usr.sbin/timed/timedc/cmdtab.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.sbin/timed/timedc/extern.h b/usr.sbin/timed/timedc/extern.h
index 705e92f..bbbd83e 100644
--- a/usr.sbin/timed/timedc/extern.h
+++ b/usr.sbin/timed/timedc/extern.h
@@ -1,8 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timedc/timedc.c b/usr.sbin/timed/timedc/timedc.c
index 3f74468..4124661 100644
--- a/usr.sbin/timed/timedc/timedc.c
+++ b/usr.sbin/timed/timedc/timedc.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/timed/timedc/timedc.h b/usr.sbin/timed/timedc/timedc.h
index 04f7e0b..bfeef28 100644
--- a/usr.sbin/timed/timedc/timedc.h
+++ b/usr.sbin/timed/timedc/timedc.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index ab2a19e..62dfc6a 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -1,8 +1,6 @@
/* $KAME: traceroute6.c,v 1.68 2004/01/25 11:16:12 suz Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index a18bba1..d85d41d 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.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.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c
index ba0d47b..4a0a700 100644
--- a/usr.sbin/vipw/vipw.c
+++ b/usr.sbin/vipw/vipw.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.
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.sbin/wpa/ndis_events/ndis_events.c b/usr.sbin/wpa/ndis_events/ndis_events.c
index cfd971a..b61fd0a 100644
--- a/usr.sbin/wpa/ndis_events/ndis_events.c
+++ b/usr.sbin/wpa/ndis_events/ndis_events.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/wpa/wpa_supplicant/Packet32.c b/usr.sbin/wpa/wpa_supplicant/Packet32.c
index 3f852b7..8e7da03 100644
--- a/usr.sbin/wpa/wpa_supplicant/Packet32.c
+++ b/usr.sbin/wpa/wpa_supplicant/Packet32.c
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/wpa/wpa_supplicant/Packet32.h b/usr.sbin/wpa/wpa_supplicant/Packet32.h
index c96553a..e0598e7 100644
--- a/usr.sbin/wpa/wpa_supplicant/Packet32.h
+++ b/usr.sbin/wpa/wpa_supplicant/Packet32.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 2005
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.c b/usr.sbin/yp_mkdb/yp_mkdb.c
index c8c5453..290e405 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.c
+++ b/usr.sbin/yp_mkdb/yp_mkdb.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypbind/yp_ping.c b/usr.sbin/ypbind/yp_ping.c
index d65c5eb..2efc7a2 100644
--- a/usr.sbin/ypbind/yp_ping.c
+++ b/usr.sbin/ypbind/yp_ping.c
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1996, 1997
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/yppush/yppush_main.c b/usr.sbin/yppush/yppush_main.c
index e5e8522..5a712e5 100644
--- a/usr.sbin/yppush/yppush_main.c
+++ b/usr.sbin/yppush/yppush_main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_access.c b/usr.sbin/ypserv/yp_access.c
index bee8dd4..dddde74 100644
--- a/usr.sbin/ypserv/yp_access.c
+++ b/usr.sbin/ypserv/yp_access.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_dblookup.c b/usr.sbin/ypserv/yp_dblookup.c
index 291daba..ecd9052 100644
--- a/usr.sbin/ypserv/yp_dblookup.c
+++ b/usr.sbin/ypserv/yp_dblookup.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_dnslookup.c b/usr.sbin/ypserv/yp_dnslookup.c
index b33b80c..6534967 100644
--- a/usr.sbin/ypserv/yp_dnslookup.c
+++ b/usr.sbin/ypserv/yp_dnslookup.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_error.c b/usr.sbin/ypserv/yp_error.c
index 9bc2872..a5b1290 100644
--- a/usr.sbin/ypserv/yp_error.c
+++ b/usr.sbin/ypserv/yp_error.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_extern.h b/usr.sbin/ypserv/yp_extern.h
index 4a1c6b3..2e574b6 100644
--- a/usr.sbin/ypserv/yp_extern.h
+++ b/usr.sbin/ypserv/yp_extern.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_main.c b/usr.sbin/ypserv/yp_main.c
index d0fff1e..8c538ca 100644
--- a/usr.sbin/ypserv/yp_main.c
+++ b/usr.sbin/ypserv/yp_main.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_server.c b/usr.sbin/ypserv/yp_server.c
index 8289577..304fd50 100644
--- a/usr.sbin/ypserv/yp_server.c
+++ b/usr.sbin/ypserv/yp_server.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/usr.sbin/ypserv/yp_svc_udp.c b/usr.sbin/ypserv/yp_svc_udp.c
index c865c01..33d058e 100644
--- a/usr.sbin/ypserv/yp_svc_udp.c
+++ b/usr.sbin/ypserv/yp_svc_udp.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1996
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
OpenPOWER on IntegriCloud