Use remove-advertising-clause script to edit BSD licenses

This edits licenses held by Berkeley and NetBSD, both of which
have removed the advertising requirement from their licenses.

Signed-off-by: Keith Packard <keithp@keithp.com>

7 files changed, 7 insertions, 19 deletions

diff --git a/libgloss/i386/cygmon-gmon.c b/libgloss/i386/cygmon-gmon.c
index 480b2ec99..3c15b70d3 100644
--- a/libgloss/i386/cygmon-gmon.c
+++ b/libgloss/i386/cygmon-gmon.c
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libgloss/m32r/Makefile.in b/libgloss/m32r/Makefile.in
index 12a1be60e..0b8b19368 100644
--- a/libgloss/m32r/Makefile.in
+++ b/libgloss/m32r/Makefile.in
@@ -5,7 +5,7 @@
 # Redistribution and use in source and binary forms are permitted
 # provided that the above copyright notice and this paragraph are
 # duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
+# and/or other materials related to such
 # distribution and use acknowledge that the software was developed
 # at Cygnus Support, Inc.  Cygnus Support, Inc. may not be used to
 # endorse or promote products derived from this software without
diff --git a/libgloss/nds32/Makefile.in b/libgloss/nds32/Makefile.in
index 99ccae814..326009c00 100644
--- a/libgloss/nds32/Makefile.in
+++ b/libgloss/nds32/Makefile.in
@@ -5,7 +5,7 @@
 # Redistribution and use in source and binary forms are permitted
 # provided that the above copyright notice and this paragraph are
 # duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
+# and/or other materials related to such
 # distribution and use acknowledge that the software was developed
 # at Cygnus Support, Inc.  Cygnus Support, Inc. may not be used to
 # endorse or promote products derived from this software without
diff --git a/libgloss/sparc/libsys/Makefile.in b/libgloss/sparc/libsys/Makefile.in
index b4c4be695..b732137c5 100644
--- a/libgloss/sparc/libsys/Makefile.in
+++ b/libgloss/sparc/libsys/Makefile.in
@@ -5,7 +5,7 @@
 # Redistribution and use in source and binary forms are permitted
 # provided that the above copyright notice and this paragraph are
 # duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
+# and/or other materials related to such
 # distribution and use acknowledge that the software was developed
 # at Cygnus Support, Inc.  Cygnus Support, Inc. may not be used to
 # endorse or promote products derived from this software without
diff --git a/libgloss/sparc/libsys/configure.in b/libgloss/sparc/libsys/configure.in
index 4d8a5fad6..1e0652927 100644
--- a/libgloss/sparc/libsys/configure.in
+++ b/libgloss/sparc/libsys/configure.in
@@ -5,7 +5,7 @@
 # Redistribution and use in source and binary forms are permitted
 # provided that the above copyright notice and this paragraph are
 # duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
+# and/or other materials related to such
 # distribution and use acknowledge that the software was developed
 # at Cygnus Support, Inc.  Cygnus Support, Inc. may not be used to
 # endorse or promote products derived from this software without
diff --git a/libgloss/sparc_leon/asm-leon/leonbare_kernel_queue.h b/libgloss/sparc_leon/asm-leon/leonbare_kernel_queue.h
index a51df105b..f01d59aa7 100644
--- a/libgloss/sparc_leon/asm-leon/leonbare_kernel_queue.h
+++ b/libgloss/sparc_leon/asm-leon/leonbare_kernel_queue.h
@@ -26,11 +26,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/libgloss/sparc_leon/asm-leon/queue.h b/libgloss/sparc_leon/asm-leon/queue.h
index 621bc3016..384a027a7 100644
--- a/libgloss/sparc_leon/asm-leon/queue.h
+++ b/libgloss/sparc_leon/asm-leon/queue.h
@@ -26,11 +26,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *