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

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

13 files changed, 36 insertions, 88 deletions

diff --git a/hangman/endgame.c b/hangman/endgame.c
index 56066b0c..c329dbd1 100644
--- a/hangman/endgame.c
+++ b/hangman/endgame.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: endgame.c,v 1.4 1997/10/11 01:16:26 lukem Exp $	*/
+/*	$NetBSD: endgame.c,v 1.5 2003/08/07 09:37:20 agc 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)endgame.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: endgame.c,v 1.4 1997/10/11 01:16:26 lukem Exp $");
+__RCSID("$NetBSD: endgame.c,v 1.5 2003/08/07 09:37:20 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/hangman/extern.c b/hangman/extern.c
index 9b9585e9..d5cb8b27 100644
--- a/hangman/extern.c
+++ b/hangman/extern.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.c,v 1.7 2002/01/20 00:42:51 jsm Exp $	*/
+/*	$NetBSD: extern.c,v 1.8 2003/08/07 09:37:20 agc 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)extern.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: extern.c,v 1.7 2002/01/20 00:42:51 jsm Exp $");
+__RCSID("$NetBSD: extern.c,v 1.8 2003/08/07 09:37:20 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/hangman/getguess.c b/hangman/getguess.c
index 4f248bda..0dbac3b3 100644
--- a/hangman/getguess.c
+++ b/hangman/getguess.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getguess.c,v 1.7 1997/10/11 01:16:29 lukem Exp $	*/
+/*	$NetBSD: getguess.c,v 1.8 2003/08/07 09:37:21 agc 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)getguess.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: getguess.c,v 1.7 1997/10/11 01:16:29 lukem Exp $");
+__RCSID("$NetBSD: getguess.c,v 1.8 2003/08/07 09:37:21 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/hangman/getword.c b/hangman/getword.c
index 571f0d0c..8d8cc726 100644
--- a/hangman/getword.c
+++ b/hangman/getword.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getword.c,v 1.7 2002/01/20 00:42:51 jsm Exp $	*/
+/*	$NetBSD: getword.c,v 1.8 2003/08/07 09:37:21 agc 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)getword.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: getword.c,v 1.7 2002/01/20 00:42:51 jsm Exp $");
+__RCSID("$NetBSD: getword.c,v 1.8 2003/08/07 09:37:21 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/hangman/hangman.6 b/hangman/hangman.6
index 4a4fae9a..28b836f2 100644
--- a/hangman/hangman.6
+++ b/hangman/hangman.6
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hangman.6,v 1.11 2003/02/25 10:34:46 wiz Exp $
+.\"	$NetBSD: hangman.6,v 1.12 2003/08/07 09:37:21 agc Exp $
 .\"
 .\" Copyright (c) 1983, 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/hangman/hangman.h b/hangman/hangman.h
index eddf4fff..3389f2d8 100644
--- a/hangman/hangman.h
+++ b/hangman/hangman.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: hangman.h,v 1.11 2002/01/20 00:42:51 jsm Exp $	*/
+/*	$NetBSD: hangman.h,v 1.12 2003/08/07 09:37:21 agc 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/hangman/main.c b/hangman/main.c
index 3b94565c..a59e212d 100644
--- a/hangman/main.c
+++ b/hangman/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.10 2002/01/20 00:42:51 jsm Exp $	*/
+/*	$NetBSD: main.c,v 1.11 2003/08/07 09:37:22 agc 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.
  *
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.10 2002/01/20 00:42:51 jsm Exp $");
+__RCSID("$NetBSD: main.c,v 1.11 2003/08/07 09:37:22 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/hangman/pathnames.h b/hangman/pathnames.h
index 5b539e37..74c7b7b6 100644
--- a/hangman/pathnames.h
+++ b/hangman/pathnames.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pathnames.h,v 1.3 1995/03/23 08:32:51 cgd Exp $	*/
+/*	$NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:22 agc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 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/hangman/playgame.c b/hangman/playgame.c
index f8f15232..0a7f3d39 100644
--- a/hangman/playgame.c
+++ b/hangman/playgame.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: playgame.c,v 1.4 1997/10/11 01:16:36 lukem Exp $	*/
+/*	$NetBSD: playgame.c,v 1.5 2003/08/07 09:37:22 agc 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)playgame.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: playgame.c,v 1.4 1997/10/11 01:16:36 lukem Exp $");
+__RCSID("$NetBSD: playgame.c,v 1.5 2003/08/07 09:37:22 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/hangman/prdata.c b/hangman/prdata.c
index 5ee00228..c5959009 100644
--- a/hangman/prdata.c
+++ b/hangman/prdata.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: prdata.c,v 1.4 1997/10/11 01:16:37 lukem Exp $	*/
+/*	$NetBSD: prdata.c,v 1.5 2003/08/07 09:37:22 agc 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)prdata.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: prdata.c,v 1.4 1997/10/11 01:16:37 lukem Exp $");
+__RCSID("$NetBSD: prdata.c,v 1.5 2003/08/07 09:37:22 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/hangman/prman.c b/hangman/prman.c
index fc16408f..f1b2c50d 100644
--- a/hangman/prman.c
+++ b/hangman/prman.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: prman.c,v 1.4 1997/10/11 01:16:39 lukem Exp $	*/
+/*	$NetBSD: prman.c,v 1.5 2003/08/07 09:37:22 agc 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)prman.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: prman.c,v 1.4 1997/10/11 01:16:39 lukem Exp $");
+__RCSID("$NetBSD: prman.c,v 1.5 2003/08/07 09:37:22 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/hangman/prword.c b/hangman/prword.c
index b1da612f..06b108a5 100644
--- a/hangman/prword.c
+++ b/hangman/prword.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: prword.c,v 1.4 1997/10/11 01:16:40 lukem Exp $	*/
+/*	$NetBSD: prword.c,v 1.5 2003/08/07 09:37:22 agc 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)prword.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: prword.c,v 1.4 1997/10/11 01:16:40 lukem Exp $");
+__RCSID("$NetBSD: prword.c,v 1.5 2003/08/07 09:37:22 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/hangman/setup.c b/hangman/setup.c
index f625e879..aa07a0e9 100644
--- a/hangman/setup.c
+++ b/hangman/setup.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: setup.c,v 1.9 2001/12/06 12:07:37 blymn Exp $	*/
+/*	$NetBSD: setup.c,v 1.10 2003/08/07 09:37:22 agc 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)setup.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: setup.c,v 1.9 2001/12/06 12:07:37 blymn Exp $");
+__RCSID("$NetBSD: setup.c,v 1.10 2003/08/07 09:37:22 agc Exp $");
 #endif
 #endif				/* not lint */