Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

5 files changed, 14 insertions, 34 deletions

diff --git a/lib/libc/arch/hppa/gen/frexp.c b/lib/libc/arch/hppa/gen/frexp.c
index a2835d59a03..f586d4a77b5 100644
--- a/lib/libc/arch/hppa/gen/frexp.c
+++ b/lib/libc/arch/hppa/gen/frexp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frexp.c,v 1.1 2002/03/11 02:59:01 miod Exp $	*/
+/*	$OpenBSD: frexp.c,v 1.2 2003/06/02 20:18:30 millert Exp $	*/
 
 /*
  * Copyright (c) 1992, 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.
  *
@@ -38,7 +34,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: frexp.c,v 1.1 2002/03/11 02:59:01 miod Exp $";
+static char rcsid[] = "$OpenBSD: frexp.c,v 1.2 2003/06/02 20:18:30 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/arch/hppa/gen/isinf.c b/lib/libc/arch/hppa/gen/isinf.c
index 1bd6b1d4e92..124834d8fce 100644
--- a/lib/libc/arch/hppa/gen/isinf.c
+++ b/lib/libc/arch/hppa/gen/isinf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isinf.c,v 1.2 2001/09/10 22:38:11 millert Exp $	*/
+/*	$OpenBSD: isinf.c,v 1.3 2003/06/02 20:18:30 millert Exp $	*/
 
 /*
  * Copyright (c) 1992, 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.
  *
@@ -38,7 +34,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: isinf.c,v 1.2 2001/09/10 22:38:11 millert Exp $";
+static char rcsid[] = "$OpenBSD: isinf.c,v 1.3 2003/06/02 20:18:30 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/arch/hppa/gen/isnan.c b/lib/libc/arch/hppa/gen/isnan.c
index 93dc7187c3e..94fe19f76e7 100644
--- a/lib/libc/arch/hppa/gen/isnan.c
+++ b/lib/libc/arch/hppa/gen/isnan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isnan.c,v 1.2 2001/09/10 22:38:11 millert Exp $	*/
+/*	$OpenBSD: isnan.c,v 1.3 2003/06/02 20:18:30 millert Exp $	*/
 
 /*
  * Copyright (c) 1992, 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.
  *
@@ -38,7 +34,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: isnan.c,v 1.2 2001/09/10 22:38:11 millert Exp $";
+static char rcsid[] = "$OpenBSD: isnan.c,v 1.3 2003/06/02 20:18:30 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/arch/hppa/gen/ldexp.c b/lib/libc/arch/hppa/gen/ldexp.c
index 898482262e2..e7bd51ef82a 100644
--- a/lib/libc/arch/hppa/gen/ldexp.c
+++ b/lib/libc/arch/hppa/gen/ldexp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldexp.c,v 1.1 2002/03/11 02:59:01 miod Exp $	*/
+/*	$OpenBSD: ldexp.c,v 1.2 2003/06/02 20:18:30 millert Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -15,11 +15,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/lib/libc/arch/hppa/gen/setjmp.S b/lib/libc/arch/hppa/gen/setjmp.S
index 942ab686153..82751446fa4 100644
--- a/lib/libc/arch/hppa/gen/setjmp.S
+++ b/lib/libc/arch/hppa/gen/setjmp.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setjmp.S,v 1.5 2002/10/21 20:14:57 mickey Exp $	*/
+/*	$OpenBSD: setjmp.S,v 1.6 2003/06/02 20:18:30 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -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.
  *
@@ -44,7 +40,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	.text
-	.asciz	"$OpenBSD: setjmp.S,v 1.5 2002/10/21 20:14:57 mickey Exp $"
+	.asciz	"$OpenBSD: setjmp.S,v 1.6 2003/06/02 20:18:30 millert Exp $"
 	.align	4
 #endif /* LIBC_SCCS and not lint */