Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22269, verified by myself.

11 files changed, 30 insertions, 74 deletions

diff --git a/boggle/boggle/bog.c b/boggle/boggle/bog.c
index 036db8c9..d1231a64 100644
--- a/boggle/boggle/bog.c
+++ b/boggle/boggle/bog.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bog.c,v 1.16 2000/05/08 07:56:02 mycroft Exp $	*/
+/*	$NetBSD: bog.c,v 1.17 2003/08/07 09:37:05 agc Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -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.
  *
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\
 #if 0
 static char sccsid[] = "@(#)bog.c	8.2 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: bog.c,v 1.16 2000/05/08 07:56:02 mycroft Exp $");
+__RCSID("$NetBSD: bog.c,v 1.17 2003/08/07 09:37:05 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/boggle/boggle/bog.h b/boggle/boggle/bog.h
index ae6654eb..06d2f5b2 100644
--- a/boggle/boggle/bog.h
+++ b/boggle/boggle/bog.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: bog.h,v 1.2 1995/03/21 12:14:32 cgd Exp $	*/
+/*	$NetBSD: bog.h,v 1.3 2003/08/07 09:37:05 agc Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -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/boggle/boggle/boggle.6 b/boggle/boggle/boggle.6
index 0cffeed7..6befc4f6 100644
--- a/boggle/boggle/boggle.6
+++ b/boggle/boggle/boggle.6
@@ -1,4 +1,4 @@
-.\"	$NetBSD: boggle.6,v 1.6 2003/06/27 22:47:44 wiz Exp $
+.\"	$NetBSD: boggle.6,v 1.7 2003/08/07 09:37:05 agc Exp $
 .\"
 .\" Copyright (c) 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/boggle/boggle/extern.h b/boggle/boggle/extern.h
index b76b68cb..fa2a0ab9 100644
--- a/boggle/boggle/extern.h
+++ b/boggle/boggle/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.6 1999/09/09 17:30:18 jsm Exp $	*/
+/*	$NetBSD: extern.h,v 1.7 2003/08/07 09:37:05 agc Exp $	*/
 
 /*-
  * Copyright (c) 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/boggle/boggle/help.c b/boggle/boggle/help.c
index fad25088..2ca00330 100644
--- a/boggle/boggle/help.c
+++ b/boggle/boggle/help.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: help.c,v 1.4 2001/02/05 00:27:35 christos Exp $	*/
+/*	$NetBSD: help.c,v 1.5 2003/08/07 09:37:05 agc Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -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.
  *
@@ -41,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)help.c	8.1 (Berkeley) 6/11/93";
 #else
-__RCSID("$NetBSD: help.c,v 1.4 2001/02/05 00:27:35 christos Exp $");
+__RCSID("$NetBSD: help.c,v 1.5 2003/08/07 09:37:05 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/boggle/boggle/mach.c b/boggle/boggle/mach.c
index 92ccc37e..e6202dd6 100644
--- a/boggle/boggle/mach.c
+++ b/boggle/boggle/mach.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mach.c,v 1.11 2001/02/05 00:27:35 christos Exp $	*/
+/*	$NetBSD: mach.c,v 1.12 2003/08/07 09:37:05 agc Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -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.
  *
@@ -41,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)mach.c	8.1 (Berkeley) 6/11/93";
 #else
-__RCSID("$NetBSD: mach.c,v 1.11 2001/02/05 00:27:35 christos Exp $");
+__RCSID("$NetBSD: mach.c,v 1.12 2003/08/07 09:37:05 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/boggle/boggle/prtable.c b/boggle/boggle/prtable.c
index 6796df97..6c3d507a 100644
--- a/boggle/boggle/prtable.c
+++ b/boggle/boggle/prtable.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: prtable.c,v 1.6 2000/03/13 22:49:31 soren Exp $	*/
+/*	$NetBSD: prtable.c,v 1.7 2003/08/07 09:37:05 agc Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -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.
  *
@@ -40,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: prtable.c,v 1.6 2000/03/13 22:49:31 soren Exp $");
+__RCSID("$NetBSD: prtable.c,v 1.7 2003/08/07 09:37:05 agc Exp $");
 #endif /* not lint */
 
 #include <curses.h>
diff --git a/boggle/boggle/timer.c b/boggle/boggle/timer.c
index 1f480774..0d015fac 100644
--- a/boggle/boggle/timer.c
+++ b/boggle/boggle/timer.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: timer.c,v 1.7 2002/09/19 21:26:56 mycroft Exp $	*/
+/*	$NetBSD: timer.c,v 1.8 2003/08/07 09:37:06 agc Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -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.
  *
@@ -41,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)timer.c	8.2 (Berkeley) 2/22/94";
 #else
-__RCSID("$NetBSD: timer.c,v 1.7 2002/09/19 21:26:56 mycroft Exp $");
+__RCSID("$NetBSD: timer.c,v 1.8 2003/08/07 09:37:06 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/boggle/boggle/word.c b/boggle/boggle/word.c
index ec112843..2d5abb46 100644
--- a/boggle/boggle/word.c
+++ b/boggle/boggle/word.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: word.c,v 1.6 2001/02/05 00:27:35 christos Exp $	*/
+/*	$NetBSD: word.c,v 1.7 2003/08/07 09:37:06 agc Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -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.
  *
@@ -41,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)word.c	8.1 (Berkeley) 6/11/93";
 #else
-__RCSID("$NetBSD: word.c,v 1.6 2001/02/05 00:27:35 christos Exp $");
+__RCSID("$NetBSD: word.c,v 1.7 2003/08/07 09:37:06 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/boggle/mkdict/mkdict.c b/boggle/mkdict/mkdict.c
index c47fbace..ce698893 100644
--- a/boggle/mkdict/mkdict.c
+++ b/boggle/mkdict/mkdict.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkdict.c,v 1.8 2001/08/29 18:22:56 jsm Exp $ */
+/* $NetBSD: mkdict.c,v 1.9 2003/08/07 09:37:06 agc Exp $ */
 
 /*-
  * Copyright (c) 1993
@@ -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.
  *
@@ -44,7 +40,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mkdict.c	8.1 (Berkeley) 6/11/93";
 #else
 static const char rcsid[] = 
-    "$NetBSD: mkdict.c,v 1.8 2001/08/29 18:22:56 jsm Exp $";
+    "$NetBSD: mkdict.c,v 1.9 2003/08/07 09:37:06 agc Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/boggle/mkindex/mkindex.c b/boggle/mkindex/mkindex.c
index ef0126ed..657942ff 100644
--- a/boggle/mkindex/mkindex.c
+++ b/boggle/mkindex/mkindex.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkindex.c,v 1.8 2000/07/31 11:29:48 simonb Exp $ */
+/* $NetBSD: mkindex.c,v 1.9 2003/08/07 09:37:06 agc Exp $ */
 
 /*-
  * Copyright (c) 1993
@@ -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.
  *
@@ -44,7 +40,7 @@ static char copyright[] = "@(#) Copyright (c) 1993\n\
 static char sccsid[] = "@(#)mkindex.c	8.1 (Berkeley) 6/11/93";
 #else
 static char rcsid[] =
-    "$NetBSD: mkindex.c,v 1.8 2000/07/31 11:29:48 simonb Exp $";
+    "$NetBSD: mkindex.c,v 1.9 2003/08/07 09:37:06 agc Exp $";
 #endif
 #endif /* not lint */