Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

13 files changed, 36 insertions, 88 deletions

diff --git a/games/robots/extern.c b/games/robots/extern.c
index db8d5be8be0..ad0533bdf11 100644
--- a/games/robots/extern.c
+++ b/games/robots/extern.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.c,v 1.3 1999/12/18 11:18:12 pjanzen Exp $	*/
+/*	$OpenBSD: extern.c,v 1.4 2003/06/03 03:01:40 millert Exp $	*/
 /*	$NetBSD: extern.c,v 1.3 1995/04/22 10:08:49 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)extern.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: extern.c,v 1.3 1999/12/18 11:18:12 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: extern.c,v 1.4 2003/06/03 03:01:40 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/games/robots/init_field.c b/games/robots/init_field.c
index d645d70bc3c..92f1bf9db51 100644
--- a/games/robots/init_field.c
+++ b/games/robots/init_field.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_field.c,v 1.4 2002/05/31 04:21:30 pjanzen Exp $	*/
+/*	$OpenBSD: init_field.c,v 1.5 2003/06/03 03:01:40 millert Exp $	*/
 /*	$NetBSD: init_field.c,v 1.3 1995/04/22 10:08:52 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)init_field.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: init_field.c,v 1.4 2002/05/31 04:21:30 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: init_field.c,v 1.5 2003/06/03 03:01:40 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/games/robots/main.c b/games/robots/main.c
index 1a264bb18e8..3bcdb9c3a87 100644
--- a/games/robots/main.c
+++ b/games/robots/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.12 2002/12/06 21:48:51 millert Exp $	*/
+/*	$OpenBSD: main.c,v 1.13 2003/06/03 03:01:40 millert Exp $	*/
 /*	$NetBSD: main.c,v 1.5 1995/04/22 10:08:54 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[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.12 2002/12/06 21:48:51 millert Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.13 2003/06/03 03:01:40 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/games/robots/make_level.c b/games/robots/make_level.c
index 4d936a6949a..3c53e0ffb1d 100644
--- a/games/robots/make_level.c
+++ b/games/robots/make_level.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: make_level.c,v 1.4 2002/05/31 04:21:30 pjanzen Exp $	*/
+/*	$OpenBSD: make_level.c,v 1.5 2003/06/03 03:01:41 millert Exp $	*/
 /*	$NetBSD: make_level.c,v 1.3 1995/04/22 10:08:56 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)make_level.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: make_level.c,v 1.4 2002/05/31 04:21:30 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: make_level.c,v 1.5 2003/06/03 03:01:41 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/games/robots/move.c b/games/robots/move.c
index 9604f1075f6..0f25413c99a 100644
--- a/games/robots/move.c
+++ b/games/robots/move.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: move.c,v 1.6 2002/05/31 04:21:30 pjanzen Exp $	*/
+/*	$OpenBSD: move.c,v 1.7 2003/06/03 03:01:41 millert Exp $	*/
 /*	$NetBSD: move.c,v 1.4 1995/04/22 10:08:58 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)move.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: move.c,v 1.6 2002/05/31 04:21:30 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: move.c,v 1.7 2003/06/03 03:01:41 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/games/robots/move_robs.c b/games/robots/move_robs.c
index 3a5577c374a..380b0fc5d7a 100644
--- a/games/robots/move_robs.c
+++ b/games/robots/move_robs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: move_robs.c,v 1.5 2002/05/31 04:21:30 pjanzen Exp $	*/
+/*	$OpenBSD: move_robs.c,v 1.6 2003/06/03 03:01:41 millert Exp $	*/
 /*	$NetBSD: move_robs.c,v 1.3 1995/04/22 10:08:59 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)move_robs.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: move_robs.c,v 1.5 2002/05/31 04:21:30 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: move_robs.c,v 1.6 2003/06/03 03:01:41 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/games/robots/pathnames.h b/games/robots/pathnames.h
index 64484f201e8..7dc9d3aafb0 100644
--- a/games/robots/pathnames.h
+++ b/games/robots/pathnames.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pathnames.h,v 1.2 1998/08/22 08:55:56 pjanzen Exp $	*/
+/*	$OpenBSD: pathnames.h,v 1.3 2003/06/03 03:01:41 millert Exp $	*/
 /*	$NetBSD: pathnames.h,v 1.3 1995/04/22 10:09:01 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/robots/play_level.c b/games/robots/play_level.c
index efb6e33f2c8..dbf3a88669a 100644
--- a/games/robots/play_level.c
+++ b/games/robots/play_level.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: play_level.c,v 1.6 2002/05/31 04:21:30 pjanzen Exp $	*/
+/*	$OpenBSD: play_level.c,v 1.7 2003/06/03 03:01:41 millert Exp $	*/
 /*	$NetBSD: play_level.c,v 1.3 1995/04/22 10:09:03 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)play_level.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: play_level.c,v 1.6 2002/05/31 04:21:30 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: play_level.c,v 1.7 2003/06/03 03:01:41 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/games/robots/query.c b/games/robots/query.c
index 8736bfcfcbe..af509a2d1e0 100644
--- a/games/robots/query.c
+++ b/games/robots/query.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: query.c,v 1.3 2002/05/31 04:21:30 pjanzen Exp $	*/
+/*	$OpenBSD: query.c,v 1.4 2003/06/03 03:01:41 millert Exp $	*/
 /*	$NetBSD: query.c,v 1.3 1995/04/22 10:09:05 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)query.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: query.c,v 1.3 2002/05/31 04:21:30 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: query.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/games/robots/rnd_pos.c b/games/robots/rnd_pos.c
index e8f3ad5dbf8..e98f4510d82 100644
--- a/games/robots/rnd_pos.c
+++ b/games/robots/rnd_pos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rnd_pos.c,v 1.2 1998/07/09 04:34:23 pjanzen Exp $	*/
+/*	$OpenBSD: rnd_pos.c,v 1.3 2003/06/03 03:01:41 millert Exp $	*/
 
 /*
  * Copyright (c) 1980, 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.
  *
@@ -37,7 +33,7 @@
 #if 0
 static char sccsid[] = "@(#)rnd_pos.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: rnd_pos.c,v 1.2 1998/07/09 04:34:23 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: rnd_pos.c,v 1.3 2003/06/03 03:01:41 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/games/robots/robots.6 b/games/robots/robots.6
index 6e37cdda896..2000b8e33e1 100644
--- a/games/robots/robots.6
+++ b/games/robots/robots.6
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: robots.6,v 1.9 2001/11/17 05:27:09 pjanzen Exp $
+.\"	$OpenBSD: robots.6,v 1.10 2003/06/03 03:01:41 millert Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -11,11 +11,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/robots/robots.h b/games/robots/robots.h
index bd64cefeb3c..0a1e2aae19e 100644
--- a/games/robots/robots.h
+++ b/games/robots/robots.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: robots.h,v 1.5 2002/02/16 21:27:11 millert Exp $	*/
+/*	$OpenBSD: robots.h,v 1.6 2003/06/03 03:01:41 millert Exp $	*/
 /*	$NetBSD: robots.h,v 1.5 1995/04/24 12:24:54 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/robots/score.c b/games/robots/score.c
index 47187b8ed65..f5edc656a1f 100644
--- a/games/robots/score.c
+++ b/games/robots/score.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: score.c,v 1.7 2002/05/31 04:21:30 pjanzen Exp $	*/
+/*	$OpenBSD: score.c,v 1.8 2003/06/03 03:01:41 millert Exp $	*/
 /*	$NetBSD: score.c,v 1.3 1995/04/22 10:09:12 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)score.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: score.c,v 1.7 2002/05/31 04:21:30 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: score.c,v 1.8 2003/06/03 03:01:41 millert Exp $";
 #endif
 #endif /* not lint */