Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

4 files changed, 10 insertions, 26 deletions

diff --git a/games/canfield/canfield/canfield.6 b/games/canfield/canfield/canfield.6
index 7fa55aa2b7d..967d3f27f2a 100644
--- a/games/canfield/canfield/canfield.6
+++ b/games/canfield/canfield/canfield.6
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: canfield.6,v 1.6 2001/08/18 03:27:17 pjanzen Exp $
+.\"	$OpenBSD: canfield.6,v 1.7 2003/06/03 03:01:39 millert Exp $
 .\"	$NetBSD: canfield.6,v 1.4 1995/03/21 15:08:30 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1993
@@ -12,11 +12,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/canfield/canfield/canfield.c b/games/canfield/canfield/canfield.c
index 498a14c4787..978dfb04665 100644
--- a/games/canfield/canfield/canfield.c
+++ b/games/canfield/canfield/canfield.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: canfield.c,v 1.8 2002/12/06 21:48:51 millert Exp $	*/
+/*	$OpenBSD: canfield.c,v 1.9 2003/06/03 03:01:39 millert Exp $	*/
 /*	$NetBSD: canfield.c,v 1.7 1995/05/13 07:28:35 jtc 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.
  *
@@ -44,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)canfield.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: canfield.c,v 1.8 2002/12/06 21:48:51 millert Exp $";
+static char rcsid[] = "$OpenBSD: canfield.c,v 1.9 2003/06/03 03:01:39 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/games/canfield/canfield/pathnames.h b/games/canfield/canfield/pathnames.h
index 9fefc5b9162..1fd26619b18 100644
--- a/games/canfield/canfield/pathnames.h
+++ b/games/canfield/canfield/pathnames.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pathnames.h,v 1.2 2000/07/23 21:49:04 pjanzen Exp $	*/
+/*	$OpenBSD: pathnames.h,v 1.3 2003/06/03 03:01:39 millert Exp $	*/
 /*	$NetBSD: pathnames.h,v 1.3 1995/03/21 15:08:34 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/canfield/cfscores/cfscores.c b/games/canfield/cfscores/cfscores.c
index 54aa3c41820..e5f34ecf17e 100644
--- a/games/canfield/cfscores/cfscores.c
+++ b/games/canfield/cfscores/cfscores.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cfscores.c,v 1.9 2002/06/23 03:01:13 deraadt Exp $	*/
+/*	$OpenBSD: cfscores.c,v 1.10 2003/06/03 03:01:39 millert Exp $	*/
 /*	$NetBSD: cfscores.c,v 1.3 1995/03/21 15:08:37 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.
  *
@@ -44,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)cfscores.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: cfscores.c,v 1.9 2002/06/23 03:01:13 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cfscores.c,v 1.10 2003/06/03 03:01:39 millert Exp $";
 #endif
 #endif /* not lint */