[src/trunk]: src/sys/arch/amiga Drop 3rd and 4th clauses (except in one case, ...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ef2e6ae0ff26
branches:  trunk
changeset: 749061:ef2e6ae0ff26
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Nov 15 20:38:35 2009 +0000

description:
Drop 3rd and 4th clauses (except in one case, where copyright is shared
with UCB and only the 3rd clause is dropped).  Approved by mhitch@ and is@
(copyright holders).

diffstat:

 sys/arch/amiga/dev/bztzsc.c                         |  10 +++-------
 sys/arch/amiga/stand/bootblock/boot/main.c          |   7 +------
 sys/arch/amiga/stand/bootblock/boot/startit.s       |   9 ++-------
 sys/arch/amiga/stand/bootblock/bootxx_ffs/main.c    |   7 +------
 sys/arch/amiga/stand/bootblock/bootxx_ffs/startit.s |   9 ++-------
 5 files changed, 9 insertions(+), 33 deletions(-)

diffs (135 lines):

diff -r 241177b79bc6 -r ef2e6ae0ff26 sys/arch/amiga/dev/bztzsc.c
--- a/sys/arch/amiga/dev/bztzsc.c       Sun Nov 15 20:16:41 2009 +0000
+++ b/sys/arch/amiga/dev/bztzsc.c       Sun Nov 15 20:38:35 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bztzsc.c,v 1.31 2008/04/13 04:55:52 tsutsui Exp $ */
+/*     $NetBSD: bztzsc.c,v 1.32 2009/11/15 20:38:35 snj Exp $ */
 
 /*
  * Copyright (c) 1997 Michael L. Hitch
@@ -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 contains software written by Ignatios Souvatzis and
- *     Michael L. Hitch for the NetBSD project.
- * 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 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bztzsc.c,v 1.31 2008/04/13 04:55:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bztzsc.c,v 1.32 2009/11/15 20:38:35 snj Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff -r 241177b79bc6 -r ef2e6ae0ff26 sys/arch/amiga/stand/bootblock/boot/main.c
--- a/sys/arch/amiga/stand/bootblock/boot/main.c        Sun Nov 15 20:16:41 2009 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/main.c        Sun Nov 15 20:38:35 2009 +0000
@@ -1,5 +1,5 @@
 /*
- * $NetBSD: main.c,v 1.24 2009/01/12 07:42:30 tsutsui Exp $
+ * $NetBSD: main.c,v 1.25 2009/11/15 20:38:35 snj Exp $
  *
  *
  * Copyright (c) 1996,1999 Ignatios Souvatzis
@@ -14,11 +14,6 @@
  * 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 Michael L. Hitch.
- * 4. The name of the authors may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 241177b79bc6 -r ef2e6ae0ff26 sys/arch/amiga/stand/bootblock/boot/startit.s
--- a/sys/arch/amiga/stand/bootblock/boot/startit.s     Sun Nov 15 20:16:41 2009 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/startit.s     Sun Nov 15 20:38:35 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: startit.s,v 1.8 2001/03/02 16:43:26 mhitch Exp $       */
+/*     $NetBSD: startit.s,v 1.9 2009/11/15 20:38:36 snj Exp $  */
 
 /*
  * Copyright (c) 1996 Ignatios Souvatzis
@@ -13,11 +13,6 @@
  * 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 Michael L. Hitch.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -31,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *
- * From: $NetBSD: startit.s,v 1.8 2001/03/02 16:43:26 mhitch Exp $
+ * From: $NetBSD: startit.s,v 1.9 2009/11/15 20:38:36 snj Exp $
  */
 #include <machine/asm.h>
 
diff -r 241177b79bc6 -r ef2e6ae0ff26 sys/arch/amiga/stand/bootblock/bootxx_ffs/main.c
--- a/sys/arch/amiga/stand/bootblock/bootxx_ffs/main.c  Sun Nov 15 20:16:41 2009 +0000
+++ b/sys/arch/amiga/stand/bootblock/bootxx_ffs/main.c  Sun Nov 15 20:38:35 2009 +0000
@@ -1,5 +1,5 @@
 /*
- * $NetBSD: main.c,v 1.8 2009/01/12 07:42:30 tsutsui Exp $
+ * $NetBSD: main.c,v 1.9 2009/11/15 20:38:36 snj Exp $
  *
  *
  * Copyright (c) 1996,1999 Ignatios Souvatzis
@@ -14,11 +14,6 @@
  * 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 Michael L. Hitch.
- * 4. The name of the authors may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 241177b79bc6 -r ef2e6ae0ff26 sys/arch/amiga/stand/bootblock/bootxx_ffs/startit.s
--- a/sys/arch/amiga/stand/bootblock/bootxx_ffs/startit.s       Sun Nov 15 20:16:41 2009 +0000
+++ b/sys/arch/amiga/stand/bootblock/bootxx_ffs/startit.s       Sun Nov 15 20:38:35 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: startit.s,v 1.2 2002/05/20 05:58:45 mhitch Exp $       */
+/*     $NetBSD: startit.s,v 1.3 2009/11/15 20:38:36 snj Exp $  */
 
 /*
  * Copyright (c) 1996 Ignatios Souvatzis
@@ -13,11 +13,6 @@
  * 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 Michael L. Hitch.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -31,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *
- * From: $NetBSD: startit.s,v 1.2 2002/05/20 05:58:45 mhitch Exp $
+ * From: $NetBSD: startit.s,v 1.3 2009/11/15 20:38:36 snj Exp $
  */
 #include "machine/asm.h"