Skip to content

Commit e5aeb4e

Browse files
committed
Move UCB-licensed code from 4-clause to 3-clause licence.
Patches provided by Joel Baker in PR 22269, verified by myself.
1 parent 74b7d6e commit e5aeb4e

File tree

363 files changed

+987
-2439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

363 files changed

+987
-2439
lines changed

games/adventure/adventure.6

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" $NetBSD: adventure.6,v 1.3 1997/10/10 11:59:33 lukem Exp $
1+
.\" $NetBSD: adventure.6,v 1.4 2003/08/07 09:36:50 agc Exp $
22
.\"
33
.\" Copyright (c) 1991, 1993
44
.\" The Regents of the University of California. All rights reserved.
@@ -16,11 +16,7 @@
1616
.\" 2. Redistributions in binary form must reproduce the above copyright
1717
.\" notice, this list of conditions and the following disclaimer in the
1818
.\" documentation and/or other materials provided with the distribution.
19-
.\" 3. All advertising materials mentioning features or use of this software
20-
.\" must display the following acknowledgement:
21-
.\" This product includes software developed by the University of
22-
.\" California, Berkeley and its contributors.
23-
.\" 4. Neither the name of the University nor the names of its contributors
19+
.\" 3. Neither the name of the University nor the names of its contributors
2420
.\" may be used to endorse or promote products derived from this software
2521
.\" without specific prior written permission.
2622
.\"

games/adventure/crc.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: crc.c,v 1.7 1999/02/10 00:29:21 hubertf Exp $ */
1+
/* $NetBSD: crc.c,v 1.8 2003/08/07 09:36:50 agc Exp $ */
22

33
/*-
44
* Copyright (c) 1993
@@ -15,11 +15,7 @@
1515
* 2. Redistributions in binary form must reproduce the above copyright
1616
* notice, this list of conditions and the following disclaimer in the
1717
* documentation and/or other materials provided with the distribution.
18-
* 3. All advertising materials mentioning features or use of this software
19-
* must display the following acknowledgement:
20-
* This product includes software developed by the University of
21-
* California, Berkeley and its contributors.
22-
* 4. Neither the name of the University nor the names of its contributors
18+
* 3. Neither the name of the University nor the names of its contributors
2319
* may be used to endorse or promote products derived from this software
2420
* without specific prior written permission.
2521
*
@@ -42,7 +38,7 @@
4238
static char sccsid[] = "@(#)crc.c 8.1 (Berkeley) 5/31/93";
4339
static char ORIGINAL_sccsid[] = "@(#)crc.c 5.2 (Berkeley) 4/4/91";
4440
#else
45-
__RCSID("$NetBSD: crc.c,v 1.7 1999/02/10 00:29:21 hubertf Exp $");
41+
__RCSID("$NetBSD: crc.c,v 1.8 2003/08/07 09:36:50 agc Exp $");
4642
#endif
4743
#endif /* not lint */
4844

games/adventure/done.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: done.c,v 1.7 2000/07/03 03:57:39 matt Exp $ */
1+
/* $NetBSD: done.c,v 1.8 2003/08/07 09:36:50 agc Exp $ */
22

33
/*-
44
* Copyright (c) 1991, 1993
@@ -17,11 +17,7 @@
1717
* 2. Redistributions in binary form must reproduce the above copyright
1818
* notice, this list of conditions and the following disclaimer in the
1919
* documentation and/or other materials provided with the distribution.
20-
* 3. All advertising materials mentioning features or use of this software
21-
* must display the following acknowledgement:
22-
* This product includes software developed by the University of
23-
* California, Berkeley and its contributors.
24-
* 4. Neither the name of the University nor the names of its contributors
20+
* 3. Neither the name of the University nor the names of its contributors
2521
* may be used to endorse or promote products derived from this software
2622
* without specific prior written permission.
2723
*
@@ -43,7 +39,7 @@
4339
#if 0
4440
static char sccsid[] = "@(#)done.c 8.1 (Berkeley) 5/31/93";
4541
#else
46-
__RCSID("$NetBSD: done.c,v 1.7 2000/07/03 03:57:39 matt Exp $");
42+
__RCSID("$NetBSD: done.c,v 1.8 2003/08/07 09:36:50 agc Exp $");
4743
#endif
4844
#endif /* not lint */
4945

games/adventure/hdr.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: hdr.h,v 1.9 2001/02/05 00:20:05 christos Exp $ */
1+
/* $NetBSD: hdr.h,v 1.10 2003/08/07 09:36:50 agc Exp $ */
22

33
/*-
44
* Copyright (c) 1991, 1993
@@ -17,11 +17,7 @@
1717
* 2. Redistributions in binary form must reproduce the above copyright
1818
* notice, this list of conditions and the following disclaimer in the
1919
* documentation and/or other materials provided with the distribution.
20-
* 3. All advertising materials mentioning features or use of this software
21-
* must display the following acknowledgement:
22-
* This product includes software developed by the University of
23-
* California, Berkeley and its contributors.
24-
* 4. Neither the name of the University nor the names of its contributors
20+
* 3. Neither the name of the University nor the names of its contributors
2521
* may be used to endorse or promote products derived from this software
2622
* without specific prior written permission.
2723
*

games/adventure/init.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: init.c,v 1.13 2001/02/05 00:20:05 christos Exp $ */
1+
/* $NetBSD: init.c,v 1.14 2003/08/07 09:36:50 agc Exp $ */
22

33
/*-
44
* Copyright (c) 1993
@@ -17,11 +17,7 @@
1717
* 2. Redistributions in binary form must reproduce the above copyright
1818
* notice, this list of conditions and the following disclaimer in the
1919
* documentation and/or other materials provided with the distribution.
20-
* 3. All advertising materials mentioning features or use of this software
21-
* must display the following acknowledgement:
22-
* This product includes software developed by the University of
23-
* California, Berkeley and its contributors.
24-
* 4. Neither the name of the University nor the names of its contributors
20+
* 3. Neither the name of the University nor the names of its contributors
2521
* may be used to endorse or promote products derived from this software
2622
* without specific prior written permission.
2723
*
@@ -43,7 +39,7 @@
4339
#if 0
4440
static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 6/2/93";
4541
#else
46-
__RCSID("$NetBSD: init.c,v 1.13 2001/02/05 00:20:05 christos Exp $");
42+
__RCSID("$NetBSD: init.c,v 1.14 2003/08/07 09:36:50 agc Exp $");
4743
#endif
4844
#endif /* not lint */
4945

games/adventure/io.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: io.c,v 1.12 2000/01/09 17:17:19 jsm Exp $ */
1+
/* $NetBSD: io.c,v 1.13 2003/08/07 09:36:50 agc Exp $ */
22

33
/*-
44
* Copyright (c) 1991, 1993
@@ -17,11 +17,7 @@
1717
* 2. Redistributions in binary form must reproduce the above copyright
1818
* notice, this list of conditions and the following disclaimer in the
1919
* documentation and/or other materials provided with the distribution.
20-
* 3. All advertising materials mentioning features or use of this software
21-
* must display the following acknowledgement:
22-
* This product includes software developed by the University of
23-
* California, Berkeley and its contributors.
24-
* 4. Neither the name of the University nor the names of its contributors
20+
* 3. Neither the name of the University nor the names of its contributors
2521
* may be used to endorse or promote products derived from this software
2622
* without specific prior written permission.
2723
*
@@ -43,7 +39,7 @@
4339
#if 0
4440
static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 5/31/93";
4541
#else
46-
__RCSID("$NetBSD: io.c,v 1.12 2000/01/09 17:17:19 jsm Exp $");
42+
__RCSID("$NetBSD: io.c,v 1.13 2003/08/07 09:36:50 agc Exp $");
4743
#endif
4844
#endif /* not lint */
4945

games/adventure/main.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: main.c,v 1.16 2000/07/03 03:57:39 matt Exp $ */
1+
/* $NetBSD: main.c,v 1.17 2003/08/07 09:36:51 agc Exp $ */
22

33
/*-
44
* Copyright (c) 1991, 1993
@@ -17,11 +17,7 @@
1717
* 2. Redistributions in binary form must reproduce the above copyright
1818
* notice, this list of conditions and the following disclaimer in the
1919
* documentation and/or other materials provided with the distribution.
20-
* 3. All advertising materials mentioning features or use of this software
21-
* must display the following acknowledgement:
22-
* This product includes software developed by the University of
23-
* California, Berkeley and its contributors.
24-
* 4. Neither the name of the University nor the names of its contributors
20+
* 3. Neither the name of the University nor the names of its contributors
2521
* may be used to endorse or promote products derived from this software
2622
* without specific prior written permission.
2723
*
@@ -48,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
4844
#if 0
4945
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/2/93";
5046
#else
51-
__RCSID("$NetBSD: main.c,v 1.16 2000/07/03 03:57:39 matt Exp $");
47+
__RCSID("$NetBSD: main.c,v 1.17 2003/08/07 09:36:51 agc Exp $");
5248
#endif
5349
#endif /* not lint */
5450

games/adventure/save.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: save.c,v 1.7 1999/07/17 20:02:48 hubertf Exp $ */
1+
/* $NetBSD: save.c,v 1.8 2003/08/07 09:36:51 agc Exp $ */
22

33
/*-
44
* Copyright (c) 1991, 1993
@@ -17,11 +17,7 @@
1717
* 2. Redistributions in binary form must reproduce the above copyright
1818
* notice, this list of conditions and the following disclaimer in the
1919
* documentation and/or other materials provided with the distribution.
20-
* 3. All advertising materials mentioning features or use of this software
21-
* must display the following acknowledgement:
22-
* This product includes software developed by the University of
23-
* California, Berkeley and its contributors.
24-
* 4. Neither the name of the University nor the names of its contributors
20+
* 3. Neither the name of the University nor the names of its contributors
2521
* may be used to endorse or promote products derived from this software
2622
* without specific prior written permission.
2723
*
@@ -43,7 +39,7 @@
4339
#if 0
4440
static char sccsid[] = "@(#)save.c 8.1 (Berkeley) 5/31/93";
4541
#else
46-
__RCSID("$NetBSD: save.c,v 1.7 1999/07/17 20:02:48 hubertf Exp $");
42+
__RCSID("$NetBSD: save.c,v 1.8 2003/08/07 09:36:51 agc Exp $");
4743
#endif
4844
#endif /* not lint */
4945

games/adventure/setup.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: setup.c,v 1.9 2001/08/29 18:22:56 jsm Exp $ */
1+
/* $NetBSD: setup.c,v 1.10 2003/08/07 09:36:51 agc Exp $ */
22

33
/*-
44
* Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
1515
* 2. Redistributions in binary form must reproduce the above copyright
1616
* notice, this list of conditions and the following disclaimer in the
1717
* documentation and/or other materials provided with the distribution.
18-
* 3. All advertising materials mentioning features or use of this software
19-
* must display the following acknowledgement:
20-
* This product includes software developed by the University of
21-
* California, Berkeley and its contributors.
22-
* 4. Neither the name of the University nor the names of its contributors
18+
* 3. Neither the name of the University nor the names of its contributors
2319
* may be used to endorse or promote products derived from this software
2420
* without specific prior written permission.
2521
*
@@ -43,7 +39,7 @@ static char copyright[] = "@(#) Copyright (c) 1991, 1993\n\
4339
#if 0
4440
static char sccsid[] = "@(#)setup.c 8.1 (Berkeley) 5/31/93";
4541
#else
46-
static char rcsid[] = "$NetBSD: setup.c,v 1.9 2001/08/29 18:22:56 jsm Exp $";
42+
static char rcsid[] = "$NetBSD: setup.c,v 1.10 2003/08/07 09:36:51 agc Exp $";
4743
#endif
4844
#endif /* not lint */
4945

games/adventure/subr.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: subr.c,v 1.9 2000/07/03 03:57:39 matt Exp $ */
1+
/* $NetBSD: subr.c,v 1.10 2003/08/07 09:36:51 agc Exp $ */
22

33
/*-
44
* Copyright (c) 1991, 1993
@@ -17,11 +17,7 @@
1717
* 2. Redistributions in binary form must reproduce the above copyright
1818
* notice, this list of conditions and the following disclaimer in the
1919
* documentation and/or other materials provided with the distribution.
20-
* 3. All advertising materials mentioning features or use of this software
21-
* must display the following acknowledgement:
22-
* This product includes software developed by the University of
23-
* California, Berkeley and its contributors.
24-
* 4. Neither the name of the University nor the names of its contributors
20+
* 3. Neither the name of the University nor the names of its contributors
2521
* may be used to endorse or promote products derived from this software
2622
* without specific prior written permission.
2723
*
@@ -43,7 +39,7 @@
4339
#if 0
4440
static char sccsid[] = "@(#)subr.c 8.1 (Berkeley) 5/31/93";
4541
#else
46-
__RCSID("$NetBSD: subr.c,v 1.9 2000/07/03 03:57:39 matt Exp $");
42+
__RCSID("$NetBSD: subr.c,v 1.10 2003/08/07 09:36:51 agc Exp $");
4743
#endif
4844
#endif /* not lint */
4945

0 commit comments

Comments
 (0)