summaryrefslogtreecommitdiff
path: root/games/adventure
diff options
context:
space:
mode:
authoragc <agc@NetBSD.org>2003-08-07 09:36:50 +0000
committeragc <agc@NetBSD.org>2003-08-07 09:36:50 +0000
commite5aeb4ea46bbe6a0522c39af347be4ddcd733a80 (patch)
tree85ecdebe92a4e78eecf10d76e625c7749f12d591 /games/adventure
parent74b7d6e9f2ef3862080193e82ba2531e60ffd8a4 (diff)
Move UCB-licensed code from 4-clause to 3-clause licence.
Patches provided by Joel Baker in PR 22269, verified by myself.
Diffstat (limited to 'games/adventure')
-rw-r--r--games/adventure/adventure.68
-rw-r--r--games/adventure/crc.c10
-rw-r--r--games/adventure/done.c10
-rw-r--r--games/adventure/hdr.h8
-rw-r--r--games/adventure/init.c10
-rw-r--r--games/adventure/io.c10
-rw-r--r--games/adventure/main.c10
-rw-r--r--games/adventure/save.c10
-rw-r--r--games/adventure/setup.c10
-rw-r--r--games/adventure/subr.c10
-rw-r--r--games/adventure/vocab.c10
-rw-r--r--games/adventure/wizard.c10
12 files changed, 34 insertions, 82 deletions
diff --git a/games/adventure/adventure.6 b/games/adventure/adventure.6
index 58a26498b9e..cc8c7a85807 100644
--- a/games/adventure/adventure.6
+++ b/games/adventure/adventure.6
@@ -1,4 +1,4 @@
-.\" $NetBSD: adventure.6,v 1.3 1997/10/10 11:59:33 lukem Exp $
+.\" $NetBSD: adventure.6,v 1.4 2003/08/07 09:36:50 agc Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/adventure/crc.c b/games/adventure/crc.c
index 2e000992b30..66504f16870 100644
--- a/games/adventure/crc.c
+++ b/games/adventure/crc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: crc.c,v 1.7 1999/02/10 00:29:21 hubertf Exp $ */
+/* $NetBSD: crc.c,v 1.8 2003/08/07 09:36:50 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.
*
@@ -42,7 +38,7 @@
static char sccsid[] = "@(#)crc.c 8.1 (Berkeley) 5/31/93";
static char ORIGINAL_sccsid[] = "@(#)crc.c 5.2 (Berkeley) 4/4/91";
#else
-__RCSID("$NetBSD: crc.c,v 1.7 1999/02/10 00:29:21 hubertf Exp $");
+__RCSID("$NetBSD: crc.c,v 1.8 2003/08/07 09:36:50 agc Exp $");
#endif
#endif /* not lint */
diff --git a/games/adventure/done.c b/games/adventure/done.c
index eb5def89749..54e5fa6c8d7 100644
--- a/games/adventure/done.c
+++ b/games/adventure/done.c
@@ -1,4 +1,4 @@
-/* $NetBSD: done.c,v 1.7 2000/07/03 03:57:39 matt Exp $ */
+/* $NetBSD: done.c,v 1.8 2003/08/07 09:36:50 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -17,11 +17,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 @@
#if 0
static char sccsid[] = "@(#)done.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: done.c,v 1.7 2000/07/03 03:57:39 matt Exp $");
+__RCSID("$NetBSD: done.c,v 1.8 2003/08/07 09:36:50 agc Exp $");
#endif
#endif /* not lint */
diff --git a/games/adventure/hdr.h b/games/adventure/hdr.h
index 45e5e8b37f2..3843831c64f 100644
--- a/games/adventure/hdr.h
+++ b/games/adventure/hdr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hdr.h,v 1.9 2001/02/05 00:20:05 christos Exp $ */
+/* $NetBSD: hdr.h,v 1.10 2003/08/07 09:36:50 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -17,11 +17,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/adventure/init.c b/games/adventure/init.c
index 7c888a56fe6..1816fc1ab81 100644
--- a/games/adventure/init.c
+++ b/games/adventure/init.c
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.13 2001/02/05 00:20:05 christos Exp $ */
+/* $NetBSD: init.c,v 1.14 2003/08/07 09:36:50 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -17,11 +17,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 @@
#if 0
static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 6/2/93";
#else
-__RCSID("$NetBSD: init.c,v 1.13 2001/02/05 00:20:05 christos Exp $");
+__RCSID("$NetBSD: init.c,v 1.14 2003/08/07 09:36:50 agc Exp $");
#endif
#endif /* not lint */
diff --git a/games/adventure/io.c b/games/adventure/io.c
index e3c80e895cf..169a68e1d75 100644
--- a/games/adventure/io.c
+++ b/games/adventure/io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: io.c,v 1.12 2000/01/09 17:17:19 jsm Exp $ */
+/* $NetBSD: io.c,v 1.13 2003/08/07 09:36:50 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -17,11 +17,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 @@
#if 0
static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: io.c,v 1.12 2000/01/09 17:17:19 jsm Exp $");
+__RCSID("$NetBSD: io.c,v 1.13 2003/08/07 09:36:50 agc Exp $");
#endif
#endif /* not lint */
diff --git a/games/adventure/main.c b/games/adventure/main.c
index 0319ad614ef..9970a9df11f 100644
--- a/games/adventure/main.c
+++ b/games/adventure/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.16 2000/07/03 03:57:39 matt Exp $ */
+/* $NetBSD: main.c,v 1.17 2003/08/07 09:36:51 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -17,11 +17,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.
*
@@ -48,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/2/93";
#else
-__RCSID("$NetBSD: main.c,v 1.16 2000/07/03 03:57:39 matt Exp $");
+__RCSID("$NetBSD: main.c,v 1.17 2003/08/07 09:36:51 agc Exp $");
#endif
#endif /* not lint */
diff --git a/games/adventure/save.c b/games/adventure/save.c
index 71b9e78f409..2f0e355bb80 100644
--- a/games/adventure/save.c
+++ b/games/adventure/save.c
@@ -1,4 +1,4 @@
-/* $NetBSD: save.c,v 1.7 1999/07/17 20:02:48 hubertf Exp $ */
+/* $NetBSD: save.c,v 1.8 2003/08/07 09:36:51 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -17,11 +17,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 @@
#if 0
static char sccsid[] = "@(#)save.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: save.c,v 1.7 1999/07/17 20:02:48 hubertf Exp $");
+__RCSID("$NetBSD: save.c,v 1.8 2003/08/07 09:36:51 agc Exp $");
#endif
#endif /* not lint */
diff --git a/games/adventure/setup.c b/games/adventure/setup.c
index 2923a26d8b1..56a37ddaaac 100644
--- a/games/adventure/setup.c
+++ b/games/adventure/setup.c
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.9 2001/08/29 18:22:56 jsm Exp $ */
+/* $NetBSD: setup.c,v 1.10 2003/08/07 09:36:51 agc Exp $ */
/*-
* Copyright (c) 1991, 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.
*
@@ -43,7 +39,7 @@ static char copyright[] = "@(#) Copyright (c) 1991, 1993\n\
#if 0
static char sccsid[] = "@(#)setup.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$NetBSD: setup.c,v 1.9 2001/08/29 18:22:56 jsm Exp $";
+static char rcsid[] = "$NetBSD: setup.c,v 1.10 2003/08/07 09:36:51 agc Exp $";
#endif
#endif /* not lint */
diff --git a/games/adventure/subr.c b/games/adventure/subr.c
index 6a05a3ea761..297238b0143 100644
--- a/games/adventure/subr.c
+++ b/games/adventure/subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: subr.c,v 1.9 2000/07/03 03:57:39 matt Exp $ */
+/* $NetBSD: subr.c,v 1.10 2003/08/07 09:36:51 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -17,11 +17,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 @@
#if 0
static char sccsid[] = "@(#)subr.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: subr.c,v 1.9 2000/07/03 03:57:39 matt Exp $");
+__RCSID("$NetBSD: subr.c,v 1.10 2003/08/07 09:36:51 agc Exp $");
#endif
#endif /* not lint */
diff --git a/games/adventure/vocab.c b/games/adventure/vocab.c
index f1e4d50302c..78939d3addc 100644
--- a/games/adventure/vocab.c
+++ b/games/adventure/vocab.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vocab.c,v 1.10 2000/01/09 17:17:19 jsm Exp $ */
+/* $NetBSD: vocab.c,v 1.11 2003/08/07 09:36:51 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -17,11 +17,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 @@
#if 0
static char sccsid[] = "@(#)vocab.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: vocab.c,v 1.10 2000/01/09 17:17:19 jsm Exp $");
+__RCSID("$NetBSD: vocab.c,v 1.11 2003/08/07 09:36:51 agc Exp $");
#endif
#endif /* not lint */
diff --git a/games/adventure/wizard.c b/games/adventure/wizard.c
index aed2a56c901..5e206056d11 100644
--- a/games/adventure/wizard.c
+++ b/games/adventure/wizard.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wizard.c,v 1.10 1999/07/16 01:38:20 hubertf Exp $ */
+/* $NetBSD: wizard.c,v 1.11 2003/08/07 09:36:51 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -17,11 +17,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 @@
#if 0
static char sccsid[] = "@(#)wizard.c 8.1 (Berkeley) 6/2/93";
#else
-__RCSID("$NetBSD: wizard.c,v 1.10 1999/07/16 01:38:20 hubertf Exp $");
+__RCSID("$NetBSD: wizard.c,v 1.11 2003/08/07 09:36:51 agc Exp $");
#endif
#endif /* not lint */