Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

3 files changed, 8 insertions, 20 deletions

diff --git a/lib/libc/arch/m68k/stdlib/abs.S b/lib/libc/arch/m68k/stdlib/abs.S
index 9dc56f08bc2..edca8f7bb31 100644
--- a/lib/libc/arch/m68k/stdlib/abs.S
+++ b/lib/libc/arch/m68k/stdlib/abs.S
@@ -14,11 +14,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.
  *
@@ -37,7 +33,7 @@
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: abs.S,v 1.2 1996/08/19 08:15:03 tholo Exp $"
+	.asciz "$OpenBSD: abs.S,v 1.3 2003/06/02 20:18:31 millert Exp $"
 #endif /* LIBC_SCCS */
 
 /* abs - int absolute value */
diff --git a/lib/libc/arch/m68k/stdlib/insque.S b/lib/libc/arch/m68k/stdlib/insque.S
index a14dd4d6250..d9c7c04f649 100644
--- a/lib/libc/arch/m68k/stdlib/insque.S
+++ b/lib/libc/arch/m68k/stdlib/insque.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: insque.S,v 1.1 2003/05/09 19:31:15 millert Exp $	*/
+/*	$OpenBSD: insque.S,v 1.2 2003/06/02 20:18:31 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -16,11 +16,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.
  *
@@ -41,7 +37,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	.text
-	.asciz "$OpenBSD: insque.S,v 1.1 2003/05/09 19:31:15 millert Exp $"
+	.asciz "$OpenBSD: insque.S,v 1.2 2003/06/02 20:18:31 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /* insque(new, pred) */
diff --git a/lib/libc/arch/m68k/stdlib/remque.S b/lib/libc/arch/m68k/stdlib/remque.S
index c77bbea7a39..822f05a37cf 100644
--- a/lib/libc/arch/m68k/stdlib/remque.S
+++ b/lib/libc/arch/m68k/stdlib/remque.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: remque.S,v 1.1 2003/05/09 19:31:15 millert Exp $	*/
+/*	$OpenBSD: remque.S,v 1.2 2003/06/02 20:18:31 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -16,11 +16,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.
  *
@@ -41,7 +37,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	.text
-	.asciz "$OpenBSD: remque.S,v 1.1 2003/05/09 19:31:15 millert Exp $"
+	.asciz "$OpenBSD: remque.S,v 1.2 2003/06/02 20:18:31 millert Exp $"
 #endif /* LIBC_SCCS and not lint */
 
 /* remque(entry) */