[src/trunk]: src Move Eduardo Horvath's license to 2 clause. OK eeh@.

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

details:   https://anonhg.NetBSD.org/src/rev/cc249bdde2d5
branches:  trunk
changeset: 748290:cc249bdde2d5
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Oct 19 18:12:37 2009 +0000

description:
Move Eduardo Horvath's license to 2 clause.  OK eeh@.

diffstat:

 sys/arch/sparc/stand/bootblk/bootblk.fth |  7 +------
 sys/arch/sparc64/sparc64/cpu_in_cksum.S  |  7 +------
 sys/kern/cnmagic.c                       |  9 ++-------
 usr.bin/fgen/fgen.1                      |  7 +------
 usr.bin/fgen/fgen.h                      |  7 +------
 usr.bin/fgen/fgen.l                      |  9 ++-------
 6 files changed, 8 insertions(+), 38 deletions(-)

diffs (145 lines):

diff -r 6b0715b57a02 -r cc249bdde2d5 sys/arch/sparc/stand/bootblk/bootblk.fth
--- a/sys/arch/sparc/stand/bootblk/bootblk.fth  Mon Oct 19 17:53:36 2009 +0000
+++ b/sys/arch/sparc/stand/bootblk/bootblk.fth  Mon Oct 19 18:12:37 2009 +0000
@@ -1,4 +1,4 @@
-\      $NetBSD: bootblk.fth,v 1.8 2008/06/29 14:13:23 jdc Exp $
+\      $NetBSD: bootblk.fth,v 1.9 2009/10/19 18:12:37 snj Exp $
 \
 \      IEEE 1275 Open Firmware Boot Block
 \
@@ -16,11 +16,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 Eduardo Horvath.
-\      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
diff -r 6b0715b57a02 -r cc249bdde2d5 sys/arch/sparc64/sparc64/cpu_in_cksum.S
--- a/sys/arch/sparc64/sparc64/cpu_in_cksum.S   Mon Oct 19 17:53:36 2009 +0000
+++ b/sys/arch/sparc64/sparc64/cpu_in_cksum.S   Mon Oct 19 18:12:37 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_in_cksum.S,v 1.1 2008/02/03 13:27:12 martin Exp $ */
+/*     $NetBSD: cpu_in_cksum.S,v 1.2 2009/10/19 18:12:37 snj Exp $ */
 
 /*
  * Copyright (c) 2001 Eduardo Horvath
@@ -11,11 +11,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 Eduardo Horvath.
- * 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
diff -r 6b0715b57a02 -r cc249bdde2d5 sys/kern/cnmagic.c
--- a/sys/kern/cnmagic.c        Mon Oct 19 17:53:36 2009 +0000
+++ b/sys/kern/cnmagic.c        Mon Oct 19 18:12:37 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cnmagic.c,v 1.9 2006/11/01 10:17:58 yamt Exp $ */
+/*     $NetBSD: cnmagic.c,v 1.10 2009/10/19 18:12:37 snj Exp $ */
 
 /*
  * Copyright (c) 2000 Eduardo Horvath
@@ -12,11 +12,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 Eduardo Horvath.
- * 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 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cnmagic.c,v 1.9 2006/11/01 10:17:58 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cnmagic.c,v 1.10 2009/10/19 18:12:37 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 6b0715b57a02 -r cc249bdde2d5 usr.bin/fgen/fgen.1
--- a/usr.bin/fgen/fgen.1       Mon Oct 19 17:53:36 2009 +0000
+++ b/usr.bin/fgen/fgen.1       Mon Oct 19 18:12:37 2009 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: fgen.1,v 1.8 2002/02/08 01:36:22 ross Exp $
+.\"    $NetBSD: fgen.1,v 1.9 2009/10/19 18:12:37 snj Exp $
 .\"
 .\" Copyright (c) 1998 Eduardo Horvath, All Rights Reserved.
 .\"
@@ -10,11 +10,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 Eduardo Horvath.
-.\" 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
diff -r 6b0715b57a02 -r cc249bdde2d5 usr.bin/fgen/fgen.h
--- a/usr.bin/fgen/fgen.h       Mon Oct 19 17:53:36 2009 +0000
+++ b/usr.bin/fgen/fgen.h       Mon Oct 19 18:12:37 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fgen.h,v 1.7 2009/04/12 03:35:43 lukem Exp $   */
+/*     $NetBSD: fgen.h,v 1.8 2009/10/19 18:12:37 snj Exp $     */
 /*
  * fgen.h -- stuff for the fcode tokenizer.
  *
@@ -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 Eduardo Horvath.
- * 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
diff -r 6b0715b57a02 -r cc249bdde2d5 usr.bin/fgen/fgen.l
--- a/usr.bin/fgen/fgen.l       Mon Oct 19 17:53:36 2009 +0000
+++ b/usr.bin/fgen/fgen.l       Mon Oct 19 18:12:37 2009 +0000
@@ -1,5 +1,5 @@
 %{
-/*     $NetBSD: fgen.l,v 1.30 2009/04/12 03:35:43 lukem Exp $  */
+/*     $NetBSD: fgen.l,v 1.31 2009/10/19 18:12:37 snj Exp $    */
 /* FLEX input for FORTH input file scanner */
 /*  
  * Copyright (c) 1998 Eduardo Horvath.
@@ -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 Eduardo Horvath.
- * 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
@@ -47,7 +42,7 @@
 #endif
 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: fgen.l,v 1.30 2009/04/12 03:35:43 lukem Exp $");
+__RCSID("$NetBSD: fgen.l,v 1.31 2009/10/19 18:12:37 snj Exp $");
 #endif
 
 %}