Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

7 files changed, 16 insertions, 44 deletions

diff --git a/games/fortune/fortune/fortune.6 b/games/fortune/fortune/fortune.6
index 6a0f457dc07..0f9edf2e2c2 100644
--- a/games/fortune/fortune/fortune.6
+++ b/games/fortune/fortune/fortune.6
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fortune.6,v 1.7 1999/07/09 13:35:56 aaron Exp $
+.\"	$OpenBSD: fortune.6,v 1.8 2003/06/03 03:01:39 millert Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -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.
 .\"
diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c
index 6ee809601b4..0761169cf45 100644
--- a/games/fortune/fortune/fortune.c
+++ b/games/fortune/fortune/fortune.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fortune.c,v 1.17 2003/04/07 00:26:22 millert Exp $	*/
+/*	$OpenBSD: fortune.c,v 1.18 2003/06/03 03:01:39 millert Exp $	*/
 /*	$NetBSD: fortune.c,v 1.8 1995/03/23 08:28:40 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[] = "@(#)fortune.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: fortune.c,v 1.17 2003/04/07 00:26:22 millert Exp $";
+static char rcsid[] = "$OpenBSD: fortune.c,v 1.18 2003/06/03 03:01:39 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/games/fortune/fortune/pathnames.h b/games/fortune/fortune/pathnames.h
index 6719cf28b9b..c52c028df15 100644
--- a/games/fortune/fortune/pathnames.h
+++ b/games/fortune/fortune/pathnames.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pathnames.h,v 1.2 2001/01/28 23:41:40 niklas Exp $	*/
+/*	$OpenBSD: pathnames.h,v 1.3 2003/06/03 03:01:39 millert Exp $	*/
 /*	$NetBSD: pathnames.h,v 1.3 1995/03/23 08:28:42 cgd Exp $	*/
 
 /*-
@@ -13,11 +13,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/games/fortune/strfile/strfile.8 b/games/fortune/strfile/strfile.8
index 19152b3aff0..45d56cf9ea4 100644
--- a/games/fortune/strfile/strfile.8
+++ b/games/fortune/strfile/strfile.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strfile.8,v 1.10 2001/11/17 05:35:02 pjanzen Exp $
+.\"	$OpenBSD: strfile.8,v 1.11 2003/06/03 03:01:39 millert Exp $
 .\"	$NetBSD: strfile.8,v 1.3 1995/03/23 08:28:45 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 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.
 .\"
diff --git a/games/fortune/strfile/strfile.c b/games/fortune/strfile/strfile.c
index e7ad75dab9c..1223bfd7f3d 100644
--- a/games/fortune/strfile/strfile.c
+++ b/games/fortune/strfile/strfile.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strfile.c,v 1.12 2003/04/06 18:50:37 deraadt Exp $	*/
+/*	$OpenBSD: strfile.c,v 1.13 2003/06/03 03:01:39 millert Exp $	*/
 /*	$NetBSD: strfile.c,v 1.4 1995/04/24 12:23:09 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[] = "@(#)strfile.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: strfile.c,v 1.12 2003/04/06 18:50:37 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: strfile.c,v 1.13 2003/06/03 03:01:39 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/games/fortune/strfile/strfile.h b/games/fortune/strfile/strfile.h
index 6a2dd613935..d1cd7d06cef 100644
--- a/games/fortune/strfile/strfile.h
+++ b/games/fortune/strfile/strfile.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strfile.h,v 1.3 2001/01/28 23:41:41 niklas Exp $	*/
+/*	$OpenBSD: strfile.h,v 1.4 2003/06/03 03:01:39 millert Exp $	*/
 /*	$NetBSD: strfile.h,v 1.3 1995/03/23 08:28:49 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.
  *
diff --git a/games/fortune/unstr/unstr.c b/games/fortune/unstr/unstr.c
index d696af0e472..d0c5be2d888 100644
--- a/games/fortune/unstr/unstr.c
+++ b/games/fortune/unstr/unstr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unstr.c,v 1.7 2002/02/16 21:27:09 millert Exp $	*/
+/*	$OpenBSD: unstr.c,v 1.8 2003/06/03 03:01:39 millert Exp $	*/
 /*	$NetBSD: unstr.c,v 1.3 1995/03/23 08:29:00 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.
  *