Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

4 files changed, 11 insertions, 27 deletions

diff --git a/games/primes/pattern.c b/games/primes/pattern.c
index 81fb01dede0..850ba75065b 100644
--- a/games/primes/pattern.c
+++ b/games/primes/pattern.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pattern.c,v 1.3 1999/09/25 15:52:20 pjanzen Exp $	*/
+/*	$OpenBSD: pattern.c,v 1.4 2003/06/03 03:01:40 millert Exp $	*/
 /*	$NetBSD: pattern.c,v 1.3 1995/03/23 08:35:47 cgd Exp $	*/
 
 /*
@@ -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 0
 static char sccsid[] = "@(#)pattern.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: pattern.c,v 1.3 1999/09/25 15:52:20 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: pattern.c,v 1.4 2003/06/03 03:01:40 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/games/primes/pr_tbl.c b/games/primes/pr_tbl.c
index cac95e399c8..9661e43aaec 100644
--- a/games/primes/pr_tbl.c
+++ b/games/primes/pr_tbl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pr_tbl.c,v 1.3 2001/08/19 17:12:43 pjanzen Exp $	*/
+/*	$OpenBSD: pr_tbl.c,v 1.4 2003/06/03 03:01:40 millert Exp $	*/
 /*	$NetBSD: pr_tbl.c,v 1.3 1995/03/23 08:35:52 cgd Exp $	*/
 
 /*
@@ -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 0
 static char sccsid[] = "@(#)pr_tbl.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: pr_tbl.c,v 1.3 2001/08/19 17:12:43 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: pr_tbl.c,v 1.4 2003/06/03 03:01:40 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/games/primes/primes.c b/games/primes/primes.c
index fdd7e1a46ae..407dece2a38 100644
--- a/games/primes/primes.c
+++ b/games/primes/primes.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: primes.c,v 1.11 2002/05/31 03:40:01 pjanzen Exp $	*/
+/*	$OpenBSD: primes.c,v 1.12 2003/06/03 03:01:40 millert Exp $	*/
 /*	$NetBSD: primes.c,v 1.5 1995/04/24 12:24:47 cgd Exp $	*/
 
 /*
@@ -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.
  *
@@ -47,7 +43,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)primes.c	8.5 (Berkeley) 5/10/95";
 #else
-static char rcsid[] = "$OpenBSD: primes.c,v 1.11 2002/05/31 03:40:01 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: primes.c,v 1.12 2003/06/03 03:01:40 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/games/primes/primes.h b/games/primes/primes.h
index 42b321ba089..f8e98b6e550 100644
--- a/games/primes/primes.h
+++ b/games/primes/primes.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: primes.h,v 1.3 2001/08/19 17:12:43 pjanzen Exp $	*/
+/*	$OpenBSD: primes.h,v 1.4 2003/06/03 03:01:40 millert Exp $	*/
 /*	$NetBSD: primes.h,v 1.4 1995/03/23 08:35:58 cgd Exp $	*/
 
 /*
@@ -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.
  *