summaryrefslogtreecommitdiffstats
path: root/include
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 /include
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 'include')
-rw-r--r--include/_ctype.h4
-rw-r--r--include/a.out.h2
-rw-r--r--include/ar.h2
-rw-r--r--include/arpa/ftp.h4
-rw-r--r--include/arpa/inet.h4
-rw-r--r--include/arpa/nameser.h4
-rw-r--r--include/arpa/nameser_compat.h5
-rw-r--r--include/arpa/telnet.h4
-rw-r--r--include/arpa/tftp.h4
-rw-r--r--include/assert.h2
-rw-r--r--include/bitstring.h2
-rw-r--r--include/complex.h2
-rw-r--r--include/cpio.h2
-rw-r--r--include/ctype.h4
-rw-r--r--include/db.h2
-rw-r--r--include/dirent.h2
-rw-r--r--include/dlfcn.h2
-rw-r--r--include/elf-hints.h2
-rw-r--r--include/elf.h2
-rw-r--r--include/err.h2
-rw-r--r--include/fmtmsg.h2
-rw-r--r--include/fnmatch.h2
-rw-r--r--include/fstab.h4
-rw-r--r--include/fts.h4
-rw-r--r--include/getopt.h2
-rw-r--r--include/glob.h4
-rw-r--r--include/grp.h2
-rw-r--r--include/hesiod.h2
-rw-r--r--include/iconv.h2
-rw-r--r--include/inttypes.h2
-rw-r--r--include/iso646.h2
-rw-r--r--include/kenv.h2
-rw-r--r--include/langinfo.h2
-rw-r--r--include/libgen.h4
-rw-r--r--include/limits.h2
-rw-r--r--include/link.h4
-rw-r--r--include/locale.h4
-rw-r--r--include/malloc_np.h2
-rw-r--r--include/memory.h4
-rwxr-xr-xinclude/mk-osreldate.sh2
-rw-r--r--include/monetary.h2
-rw-r--r--include/mpool.h2
-rw-r--r--include/mqueue.h2
-rw-r--r--include/ndbm.h2
-rw-r--r--include/netdb.h2
-rw-r--r--include/nl_types.h2
-rw-r--r--include/nlist.h2
-rw-r--r--include/nss.h2
-rw-r--r--include/nsswitch.h2
-rw-r--r--include/paths.h4
-rw-r--r--include/printf.h2
-rw-r--r--include/proc_service.h4
-rw-r--r--include/protocols/dumprestore.h4
-rw-r--r--include/protocols/routed.h2
-rw-r--r--include/protocols/rwhod.h4
-rw-r--r--include/protocols/talkd.h4
-rw-r--r--include/protocols/timed.h4
-rw-r--r--include/pthread.h4
-rw-r--r--include/pthread_np.h4
-rw-r--r--include/pwd.h2
-rw-r--r--include/ranlib.h2
-rw-r--r--include/regex.h2
-rw-r--r--include/resolv.h4
-rw-r--r--include/rpc/auth.h2
-rw-r--r--include/rpc/auth_des.h2
-rw-r--r--include/rpc/auth_kerb.h2
-rw-r--r--include/rpc/auth_unix.h2
-rw-r--r--include/rpc/clnt.h2
-rw-r--r--include/rpc/clnt_soc.h2
-rw-r--r--include/rpc/des.h2
-rw-r--r--include/rpc/des_crypt.h2
-rw-r--r--include/rpc/nettype.h2
-rw-r--r--include/rpc/pmap_clnt.h2
-rw-r--r--include/rpc/pmap_prot.h2
-rw-r--r--include/rpc/pmap_rmt.h2
-rw-r--r--include/rpc/raw.h2
-rw-r--r--include/rpc/rpc.h2
-rw-r--r--include/rpc/rpc_com.h2
-rw-r--r--include/rpc/rpc_msg.h2
-rw-r--r--include/rpc/rpcb_clnt.h2
-rw-r--r--include/rpc/rpcent.h2
-rw-r--r--include/rpc/rpcsec_gss.h2
-rw-r--r--include/rpc/svc.h2
-rw-r--r--include/rpc/svc_auth.h2
-rw-r--r--include/rpc/svc_dg.h2
-rw-r--r--include/rpc/svc_soc.h2
-rw-r--r--include/rpc/xdr.h2
-rw-r--r--include/rpcsvc/nis_tags.h2
-rw-r--r--include/rpcsvc/yp_prot.h4
-rw-r--r--include/rpcsvc/ypclnt.h4
-rw-r--r--include/runetype.h2
-rw-r--r--include/semaphore.h4
-rw-r--r--include/setjmp.h2
-rw-r--r--include/signal.h2
-rw-r--r--include/spawn.h2
-rw-r--r--include/stab.h2
-rw-r--r--include/stdalign.h2
-rw-r--r--include/stdbool.h2
-rw-r--r--include/stddef.h2
-rw-r--r--include/stdio.h2
-rw-r--r--include/stdlib.h2
-rw-r--r--include/stdnoreturn.h2
-rw-r--r--include/string.h2
-rw-r--r--include/stringlist.h4
-rw-r--r--include/strings.h2
-rw-r--r--include/sysexits.h4
-rw-r--r--include/tar.h2
-rw-r--r--include/termios.h2
-rw-r--r--include/tgmath.h2
-rw-r--r--include/time.h4
-rw-r--r--include/timeconv.h4
-rw-r--r--include/timers.h2
-rw-r--r--include/ttyent.h4
-rw-r--r--include/uchar.h2
-rw-r--r--include/ulimit.h2
-rw-r--r--include/unistd.h2
-rw-r--r--include/utime.h2
-rw-r--r--include/utmpx.h2
-rw-r--r--include/uuid.h2
-rw-r--r--include/varargs.h2
-rw-r--r--include/wchar.h2
-rw-r--r--include/wctype.h2
-rw-r--r--include/wordexp.h2
-rw-r--r--include/xlocale.h2
-rw-r--r--include/xlocale/_ctype.h2
-rw-r--r--include/xlocale/_inttypes.h2
-rw-r--r--include/xlocale/_langinfo.h2
-rw-r--r--include/xlocale/_locale.h2
-rw-r--r--include/xlocale/_monetary.h2
-rw-r--r--include/xlocale/_stdio.h2
-rw-r--r--include/xlocale/_stdlib.h2
-rw-r--r--include/xlocale/_string.h2
-rw-r--r--include/xlocale/_time.h2
-rw-r--r--include/xlocale/_uchar.h2
-rw-r--r--include/xlocale/_wchar.h2
135 files changed, 32 insertions, 303 deletions
diff --git a/include/_ctype.h b/include/_ctype.h
index 96fbaeb..8a43409 100644
--- a/include/_ctype.h
+++ b/include/_ctype.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.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/a.out.h b/include/a.out.h
index d532d06..23f80aa 100644
--- a/include/a.out.h
+++ b/include/a.out.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/include/ar.h b/include/ar.h
index 01a57a5..aa5fac2 100644
--- a/include/ar.h
+++ b/include/ar.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.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/arpa/ftp.h b/include/arpa/ftp.h
index 5ba4315..081c037 100644
--- a/include/arpa/ftp.h
+++ b/include/arpa/ftp.h
@@ -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/include/arpa/inet.h b/include/arpa/inet.h
index 854d720..1078521 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* ++Copyright++ 1983, 1993
* -
* Copyright (c) 1983, 1993
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index f0e3482..ef47b20 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -15,9 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1983, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/arpa/nameser_compat.h b/include/arpa/nameser_compat.h
index a998149..eeea8ec 100644
--- a/include/arpa/nameser_compat.h
+++ b/include/arpa/nameser_compat.h
@@ -1,7 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Copyright (c) 1983, 1989
+/* Copyright (c) 1983, 1989
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/include/arpa/telnet.h b/include/arpa/telnet.h
index 855b3d2..758e9b8 100644
--- a/include/arpa/telnet.h
+++ b/include/arpa/telnet.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/include/arpa/tftp.h b/include/arpa/tftp.h
index 5014713..20733ec 100644
--- a/include/arpa/tftp.h
+++ b/include/arpa/tftp.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/include/assert.h b/include/assert.h
index 702e231..c880a78 100644
--- a/include/assert.h
+++ b/include/assert.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.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/bitstring.h b/include/bitstring.h
index b179880..6dc91d5 100644
--- a/include/bitstring.h
+++ b/include/bitstring.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/include/complex.h b/include/complex.h
index 2ed3825..4811255 100644
--- a/include/complex.h
+++ b/include/complex.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001-2011 The FreeBSD Project.
* All rights reserved.
*
diff --git a/include/cpio.h b/include/cpio.h
index 9cbd44e..e1d27ce 100644
--- a/include/cpio.h
+++ b/include/cpio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/ctype.h b/include/ctype.h
index 1317313..0ca422c 100644
--- a/include/ctype.h
+++ b/include/ctype.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.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/db.h b/include/db.h
index 13fa91d..4d04db41 100644
--- a/include/db.h
+++ b/include/db.h
@@ -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/include/dirent.h b/include/dirent.h
index 0472a01..1ab949c 100644
--- a/include/dirent.h
+++ b/include/dirent.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/include/dlfcn.h b/include/dlfcn.h
index 76a7fa0..c508843 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -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/include/elf-hints.h b/include/elf-hints.h
index 679cc34..e009074 100644
--- a/include/elf-hints.h
+++ b/include/elf-hints.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1997 John D. Polstra.
* All rights reserved.
*
diff --git a/include/elf.h b/include/elf.h
index f230ae7..c094a1c 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 David E. O'Brien.
* All rights reserved.
*
diff --git a/include/err.h b/include/err.h
index 7f0971b..b0e3121 100644
--- a/include/err.h
+++ b/include/err.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/include/fmtmsg.h b/include/fmtmsg.h
index 1251c95..307c844 100644
--- a/include/fmtmsg.h
+++ b/include/fmtmsg.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/fnmatch.h b/include/fnmatch.h
index 3448538..e6403a5 100644
--- a/include/fnmatch.h
+++ b/include/fnmatch.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/include/fstab.h b/include/fstab.h
index 364d132..9b80f73 100644
--- a/include/fstab.h
+++ b/include/fstab.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/include/fts.h b/include/fts.h
index 6f4674e..f453e2b 100644
--- a/include/fts.h
+++ b/include/fts.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/include/getopt.h b/include/getopt.h
index 789b4d1..4451941 100644
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/include/glob.h b/include/glob.h
index 80d78a2..073805b 100644
--- a/include/glob.h
+++ b/include/glob.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/include/grp.h b/include/grp.h
index 5ffc45d..b10fd0f 100644
--- a/include/grp.h
+++ b/include/grp.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.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/hesiod.h b/include/hesiod.h
index 5879632..2c29294 100644
--- a/include/hesiod.h
+++ b/include/hesiod.h
@@ -3,8 +3,6 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/include/iconv.h b/include/iconv.h
index 338ca15..51f0603 100644
--- a/include/iconv.h
+++ b/include/iconv.h
@@ -2,8 +2,6 @@
/* $NetBSD: iconv.h,v 1.6 2005/02/03 04:39:32 perry Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c) 2003 Citrus Project,
* Copyright (c) 2009, 2010 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/include/inttypes.h b/include/inttypes.h
index adf74e5..5109396 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/iso646.h b/include/iso646.h
index a2ab46a..a11101e 100644
--- a/include/iso646.h
+++ b/include/iso646.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 1998 Alex Nash
* All rights reserved.
*
diff --git a/include/kenv.h b/include/kenv.h
index 0f5e8a9..90af929 100644
--- a/include/kenv.h
+++ b/include/kenv.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Maxime Henrion <mux@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/langinfo.h b/include/langinfo.h
index 8727307..46e38c7 100644
--- a/include/langinfo.h
+++ b/include/langinfo.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/libgen.h b/include/libgen.h
index f5a8f18..28c0067 100644
--- a/include/libgen.h
+++ b/include/libgen.h
@@ -1,9 +1,7 @@
/* $OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $ */
/* $FreeBSD$ */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
* All rights reserved.
*
diff --git a/include/limits.h b/include/limits.h
index 274c755..a1e1b98 100644
--- a/include/limits.h
+++ b/include/limits.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/include/link.h b/include/link.h
index 60f6bd6..f95bbe8 100644
--- a/include/link.h
+++ b/include/link.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1993 Paul Kranenburg
* All rights reserved.
*
diff --git a/include/locale.h b/include/locale.h
index de8e03a..0edc3ea 100644
--- a/include/locale.h
+++ b/include/locale.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/include/malloc_np.h b/include/malloc_np.h
index 270bd0f..88919a4 100644
--- a/include/malloc_np.h
+++ b/include/malloc_np.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (C) 2006 Jason Evans <jasone@FreeBSD.org>.
* All rights reserved.
*
diff --git a/include/memory.h b/include/memory.h
index dd0c63a..fb670d4 100644
--- a/include/memory.h
+++ b/include/memory.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/include/mk-osreldate.sh b/include/mk-osreldate.sh
index cf7d55a..e9c6772 100755
--- a/include/mk-osreldate.sh
+++ b/include/mk-osreldate.sh
@@ -1,6 +1,4 @@
#!/bin/sh -
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
-#
# Copyright (c) 2013 Garrett Cooper
# All rights reserved.
#
diff --git a/include/monetary.h b/include/monetary.h
index d7b381b..bca607a 100644
--- a/include/monetary.h
+++ b/include/monetary.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/mpool.h b/include/mpool.h
index 2c68660..3f22ab7 100644
--- a/include/mpool.h
+++ b/include/mpool.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/include/mqueue.h b/include/mqueue.h
index 987cf0b..e1c0f27 100644
--- a/include/mqueue.h
+++ b/include/mqueue.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
diff --git a/include/ndbm.h b/include/ndbm.h
index 2188314..db83803 100644
--- a/include/ndbm.h
+++ b/include/ndbm.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/include/netdb.h b/include/netdb.h
index 9d81d94..0d9cb4e 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1980, 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/nl_types.h b/include/nl_types.h
index bf88144..c9da68e 100644
--- a/include/nl_types.h
+++ b/include/nl_types.h
@@ -1,8 +1,6 @@
/* $NetBSD: nl_types.h,v 1.9 2000/10/03 19:53:32 sommerfeld Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1996 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/include/nlist.h b/include/nlist.h
index 5ea6f5e..a4965fd 100644
--- a/include/nlist.h
+++ b/include/nlist.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.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/nss.h b/include/nss.h
index 0cc155a..1f4d078 100644
--- a/include/nss.h
+++ b/include/nss.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/include/nsswitch.h b/include/nsswitch.h
index f713129..1a97cea 100644
--- a/include/nsswitch.h
+++ b/include/nsswitch.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/include/paths.h b/include/paths.h
index f8df805..709e96d 100644
--- a/include/paths.h
+++ b/include/paths.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/include/printf.h b/include/printf.h
index 2a643f9..c12c3eb 100644
--- a/include/printf.h
+++ b/include/printf.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
*
diff --git a/include/proc_service.h b/include/proc_service.h
index 3b12ff9..c9e6f27 100644
--- a/include/proc_service.h
+++ b/include/proc_service.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h
index 65df37a..9355292 100644
--- a/include/protocols/dumprestore.h
+++ b/include/protocols/dumprestore.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.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/protocols/routed.h b/include/protocols/routed.h
index dab9bba..bf16045 100644
--- a/include/protocols/routed.h
+++ b/include/protocols/routed.h
@@ -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/include/protocols/rwhod.h b/include/protocols/rwhod.h
index f598ec7..49191a2 100644
--- a/include/protocols/rwhod.h
+++ b/include/protocols/rwhod.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/include/protocols/talkd.h b/include/protocols/talkd.h
index f8b74b9..3b2f0de 100644
--- a/include/protocols/talkd.h
+++ b/include/protocols/talkd.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/include/protocols/timed.h b/include/protocols/timed.h
index de4243c..d26b4a2 100644
--- a/include/protocols/timed.h
+++ b/include/protocols/timed.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/include/pthread.h b/include/pthread.h
index 24b2b5b..33267c1 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
* Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu
* Copyright (c) 1995-1998 by John Birrell <jb@cimlogic.com.au>
* All rights reserved.
diff --git a/include/pthread_np.h b/include/pthread_np.h
index 9c32540..1a2dbe9 100644
--- a/include/pthread_np.h
+++ b/include/pthread_np.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1996-98 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/include/pwd.h b/include/pwd.h
index 1548400..2099e33 100644
--- a/include/pwd.h
+++ b/include/pwd.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.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/ranlib.h b/include/ranlib.h
index cdba75f..dd376b4 100644
--- a/include/ranlib.h
+++ b/include/ranlib.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/include/regex.h b/include/regex.h
index 6b0838a..e8b185c 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1992 Henry Spencer.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/include/resolv.h b/include/resolv.h
index 1f4a9bc..e3d4fd1 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1995-2003 Internet Software Consortium.
*
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index bf0d76c..5503762 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -1,8 +1,6 @@
/* $NetBSD: auth.h,v 1.15 2000/06/02 22:57:55 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/auth_des.h b/include/rpc/auth_des.h
index 3b860d8..58b34d7 100644
--- a/include/rpc/auth_des.h
+++ b/include/rpc/auth_des.h
@@ -1,8 +1,6 @@
/* @(#)auth_des.h 2.2 88/07/29 4.0 RPCSRC; from 1.3 88/02/08 SMI */
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/auth_kerb.h b/include/rpc/auth_kerb.h
index 29b09d5..b6c5ae1 100644
--- a/include/rpc/auth_kerb.h
+++ b/include/rpc/auth_kerb.h
@@ -1,7 +1,5 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h
index 6d1fc31..fa47e8b 100644
--- a/include/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index 8d9ce1e..66533e2 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -1,8 +1,6 @@
/* $NetBSD: clnt.h,v 1.14 2000/06/02 22:57:55 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, Oracle America, Inc.
* All rights reserved.
*
diff --git a/include/rpc/clnt_soc.h b/include/rpc/clnt_soc.h
index c16609b..6536a4b 100644
--- a/include/rpc/clnt_soc.h
+++ b/include/rpc/clnt_soc.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/des.h b/include/rpc/des.h
index 93698cc..9400ccd 100644
--- a/include/rpc/des.h
+++ b/include/rpc/des.h
@@ -1,8 +1,6 @@
/* @(#)des.h 2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI */
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/des_crypt.h b/include/rpc/des_crypt.h
index ef938c5..af33e9d 100644
--- a/include/rpc/des_crypt.h
+++ b/include/rpc/des_crypt.h
@@ -6,8 +6,6 @@
* Copyright (C) 1986, Sun Microsystems, Inc.
*/
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/nettype.h b/include/rpc/nettype.h
index 39c1f76..3ded892 100644
--- a/include/rpc/nettype.h
+++ b/include/rpc/nettype.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index 465cb0c..e8314f6 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -1,8 +1,6 @@
/* $NetBSD: pmap_clnt.h,v 1.9 2000/06/02 22:57:55 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index f69bad9..d880c40 100644
--- a/include/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
@@ -1,8 +1,6 @@
/* $NetBSD: pmap_prot.h,v 1.8 2000/06/02 22:57:55 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index 791b3f4..21eb5d1 100644
--- a/include/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
@@ -1,8 +1,6 @@
/* $NetBSD: pmap_rmt.h,v 1.7 1998/02/11 23:01:23 lukem Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/raw.h b/include/rpc/raw.h
index b56b902..a5c7d93 100644
--- a/include/rpc/raw.h
+++ b/include/rpc/raw.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index 561437c..e7a3dc8 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -1,8 +1,6 @@
/* $NetBSD: rpc.h,v 1.13 2000/06/02 22:57:56 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/rpc_com.h b/include/rpc/rpc_com.h
index dd331e2..0996efc 100644
--- a/include/rpc/rpc_com.h
+++ b/include/rpc/rpc_com.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index 136b617..6e8d074 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -1,8 +1,6 @@
/* $NetBSD: rpc_msg.h,v 1.11 2000/06/02 22:57:56 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/rpcb_clnt.h b/include/rpc/rpcb_clnt.h
index b642aac..4552787 100644
--- a/include/rpc/rpcb_clnt.h
+++ b/include/rpc/rpcb_clnt.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/rpcent.h b/include/rpc/rpcent.h
index 15c4ae4..c1650fa 100644
--- a/include/rpc/rpcent.h
+++ b/include/rpc/rpcent.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/rpcsec_gss.h b/include/rpc/rpcsec_gss.h
index 2878ae0..ccd346f 100644
--- a/include/rpc/rpcsec_gss.h
+++ b/include/rpc/rpcsec_gss.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index 912d26b..53b1815 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -1,8 +1,6 @@
/* $NetBSD: svc.h,v 1.17 2000/06/02 22:57:56 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h
index e9b6cd4..87b8efe 100644
--- a/include/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
@@ -1,8 +1,6 @@
/* $NetBSD: svc_auth.h,v 1.8 2000/06/02 22:57:57 fvdl Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/svc_dg.h b/include/rpc/svc_dg.h
index d9f3012..313176e 100644
--- a/include/rpc/svc_dg.h
+++ b/include/rpc/svc_dg.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/svc_soc.h b/include/rpc/svc_soc.h
index 912e2ec..311c832 100644
--- a/include/rpc/svc_soc.h
+++ b/include/rpc/svc_soc.h
@@ -2,8 +2,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index ad1672c..93f1ee4 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -1,8 +1,6 @@
/* $NetBSD: xdr.h,v 1.19 2000/07/17 05:00:45 matt Exp $ */
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2009, Sun Microsystems, Inc.
* All rights reserved.
*
diff --git a/include/rpcsvc/nis_tags.h b/include/rpcsvc/nis_tags.h
index 55920a0..7ee630e 100644
--- a/include/rpcsvc/nis_tags.h
+++ b/include/rpcsvc/nis_tags.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 2010, Oracle America, Inc.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h
index dd73adf..10d5828 100644
--- a/include/rpcsvc/yp_prot.h
+++ b/include/rpcsvc/yp_prot.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
* All rights reserved.
*
diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h
index c0a0a46..abde97c 100644
--- a/include/rpcsvc/ypclnt.h
+++ b/include/rpcsvc/ypclnt.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
* Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
* All rights reserved.
*
diff --git a/include/runetype.h b/include/runetype.h
index 91f045c..6aad915 100644
--- a/include/runetype.h
+++ b/include/runetype.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/include/semaphore.h b/include/semaphore.h
index f330d51..110f7c8 100644
--- a/include/semaphore.h
+++ b/include/semaphore.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
+/*
* Copyright (c) 2010 David Xu <davidxu@freebsd.org>
*
* All rights reserved.
diff --git a/include/setjmp.h b/include/setjmp.h
index 1cc8b77..598e07a 100644
--- a/include/setjmp.h
+++ b/include/setjmp.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.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/signal.h b/include/signal.h
index 56d1b82..f9b6923 100644
--- a/include/signal.h
+++ b/include/signal.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/include/spawn.h b/include/spawn.h
index 79753bb..7889d0e 100644
--- a/include/spawn.h
+++ b/include/spawn.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/stab.h b/include/stab.h
index 9abff13..649bb42 100644
--- a/include/stab.h
+++ b/include/stab.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/include/stdalign.h b/include/stdalign.h
index 6f777fd..2fb13aa 100644
--- a/include/stdalign.h
+++ b/include/stdalign.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/stdbool.h b/include/stdbool.h
index 267e1ad..48070c1 100644
--- a/include/stdbool.h
+++ b/include/stdbool.h
@@ -1,6 +1,4 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2000 Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/stddef.h b/include/stddef.h
index a52e6d3..4916e80 100644
--- a/include/stddef.h
+++ b/include/stddef.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/include/stdio.h b/include/stdio.h
index e792bfc..1ff9aca 100644
--- a/include/stdio.h
+++ b/include/stdio.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/include/stdlib.h b/include/stdlib.h
index 48ec9f2..1e94672 100644
--- a/include/stdlib.h
+++ b/include/stdlib.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/include/stdnoreturn.h b/include/stdnoreturn.h
index e8fc7dc..218a3a0 100644
--- a/include/stdnoreturn.h
+++ b/include/stdnoreturn.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2012 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/string.h b/include/string.h
index 3c5ccea..21698c3 100644
--- a/include/string.h
+++ b/include/string.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/include/stringlist.h b/include/stringlist.h
index b570e63..7222b31 100644
--- a/include/stringlist.h
+++ b/include/stringlist.h
@@ -1,8 +1,6 @@
/* $NetBSD: stringlist.h,v 1.2 1997/01/17 06:11:36 lukem Exp $ */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
+/*
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
*
diff --git a/include/strings.h b/include/strings.h
index 9df19e4..2210df0 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/sysexits.h b/include/sysexits.h
index 5e414f2..e52bb5b 100644
--- a/include/sysexits.h
+++ b/include/sysexits.h
@@ -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/include/tar.h b/include/tar.h
index 3d54476..f9da49a 100644
--- a/include/tar.h
+++ b/include/tar.h
@@ -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/include/termios.h b/include/termios.h
index ce31d44..333ab1c 100644
--- a/include/termios.h
+++ b/include/termios.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
* Copyright (c) 1988, 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/include/tgmath.h b/include/tgmath.h
index bf7a61c..7f4de6f 100644
--- a/include/tgmath.h
+++ b/include/tgmath.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2004 Stefan Farfeleder.
* All rights reserved.
*
diff --git a/include/time.h b/include/time.h
index cacb7f2..54c7e49 100644
--- a/include/time.h
+++ b/include/time.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.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/timeconv.h b/include/timeconv.h
index 1298cc2..147db15 100644
--- a/include/timeconv.h
+++ b/include/timeconv.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.
* (c) UNIX System Laboratories, Inc.
diff --git a/include/timers.h b/include/timers.h
index 20f9575..73180f9 100644
--- a/include/timers.h
+++ b/include/timers.h
@@ -1,6 +1,4 @@
/* ==== timers.h ============================================================
- * SPDX-License-Identifier: BSD-4-Clause
- *
* Copyright (c) 1994 by Chris Provenzano, proven@mit.edu
* All rights reserved.
*
diff --git a/include/ttyent.h b/include/ttyent.h
index 4699d00..f2220ad 100644
--- a/include/ttyent.h
+++ b/include/ttyent.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/include/uchar.h b/include/uchar.h
index a84a58b..a3fd4fd 100644
--- a/include/uchar.h
+++ b/include/uchar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/ulimit.h b/include/ulimit.h
index 2579a52..ffc4067 100644
--- a/include/ulimit.h
+++ b/include/ulimit.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Kyle Martin <mkm@ieee.org>
* All rights reserved.
*
diff --git a/include/unistd.h b/include/unistd.h
index 93fe2fd..fc31064 100644
--- a/include/unistd.h
+++ b/include/unistd.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/include/utime.h b/include/utime.h
index ec1d28b..619c5db 100644
--- a/include/utime.h
+++ b/include/utime.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/include/utmpx.h b/include/utmpx.h
index b71d963..22707e4 100644
--- a/include/utmpx.h
+++ b/include/utmpx.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2010 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/uuid.h b/include/uuid.h
index 8056aca..79ab76b 100644
--- a/include/uuid.h
+++ b/include/uuid.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002,2005 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
* All rights reserved.
diff --git a/include/varargs.h b/include/varargs.h
index 930beca..51a9b59 100644
--- a/include/varargs.h
+++ b/include/varargs.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2003 Alexander Kabaev
* All rights reserved.
*
diff --git a/include/wchar.h b/include/wchar.h
index 5951a2c..26d257a 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999 Citrus Project,
* All rights reserved.
*
diff --git a/include/wctype.h b/include/wctype.h
index 5882615..f176739 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Copyright (c)1999 Citrus Project,
* All rights reserved.
*
diff --git a/include/wordexp.h b/include/wordexp.h
index bda6ff5..b86e6f9 100644
--- a/include/wordexp.h
+++ b/include/wordexp.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
*
diff --git a/include/xlocale.h b/include/xlocale.h
index 647c43b..cdeff3e 100644
--- a/include/xlocale.h
+++ b/include/xlocale.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_ctype.h b/include/xlocale/_ctype.h
index bf4da73..25a9c72 100644
--- a/include/xlocale/_ctype.h
+++ b/include/xlocale/_ctype.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_inttypes.h b/include/xlocale/_inttypes.h
index 2617f5e..58e434e 100644
--- a/include/xlocale/_inttypes.h
+++ b/include/xlocale/_inttypes.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_langinfo.h b/include/xlocale/_langinfo.h
index 0d44394..e4f8c50 100644
--- a/include/xlocale/_langinfo.h
+++ b/include/xlocale/_langinfo.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_locale.h b/include/xlocale/_locale.h
index d48ccf4..2b4387b 100644
--- a/include/xlocale/_locale.h
+++ b/include/xlocale/_locale.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_monetary.h b/include/xlocale/_monetary.h
index 3cfc86b..3481278 100644
--- a/include/xlocale/_monetary.h
+++ b/include/xlocale/_monetary.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_stdio.h b/include/xlocale/_stdio.h
index 2d4f6f5..0aebdcf 100644
--- a/include/xlocale/_stdio.h
+++ b/include/xlocale/_stdio.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_stdlib.h b/include/xlocale/_stdlib.h
index 4b7e27d..35a2580 100644
--- a/include/xlocale/_stdlib.h
+++ b/include/xlocale/_stdlib.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_string.h b/include/xlocale/_string.h
index 7fdad75..a7c146e 100644
--- a/include/xlocale/_string.h
+++ b/include/xlocale/_string.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_time.h b/include/xlocale/_time.h
index 4b47b1a..4493fdd 100644
--- a/include/xlocale/_time.h
+++ b/include/xlocale/_time.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
diff --git a/include/xlocale/_uchar.h b/include/xlocale/_uchar.h
index 0c6ed09..4256c87 100644
--- a/include/xlocale/_uchar.h
+++ b/include/xlocale/_uchar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
diff --git a/include/xlocale/_wchar.h b/include/xlocale/_wchar.h
index 3a72613..6b02d05 100644
--- a/include/xlocale/_wchar.h
+++ b/include/xlocale/_wchar.h
@@ -1,6 +1,4 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
*
OpenPOWER on IntegriCloud