Module Name: src
Committed By: snj
Date: Mon Oct 19 18:12:37 UTC 2009
Modified Files:
src/sys/arch/sparc/stand/bootblk: bootblk.fth
src/sys/arch/sparc64/sparc64: cpu_in_cksum.S
src/sys/kern: cnmagic.c
src/usr.bin/fgen: fgen.1 fgen.h fgen.l
Log Message:
Move Eduardo Horvath's license to 2 clause. OK e...@.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc/stand/bootblk/bootblk.fth
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/sparc64/cpu_in_cksum.S
cvs rdiff -u -r1.9 -r1.10 src/sys/kern/cnmagic.c
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/fgen/fgen.1
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/fgen/fgen.h
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/fgen/fgen.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/stand/bootblk/bootblk.fth
diff -u src/sys/arch/sparc/stand/bootblk/bootblk.fth:1.8 src/sys/arch/sparc/stand/bootblk/bootblk.fth:1.9
--- src/sys/arch/sparc/stand/bootblk/bootblk.fth:1.8 Sun Jun 29 14:13:23 2008
+++ src/sys/arch/sparc/stand/bootblk/bootblk.fth Mon Oct 19 18:12:37 2009
@@ -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
Index: src/sys/arch/sparc64/sparc64/cpu_in_cksum.S
diff -u src/sys/arch/sparc64/sparc64/cpu_in_cksum.S:1.1 src/sys/arch/sparc64/sparc64/cpu_in_cksum.S:1.2
--- src/sys/arch/sparc64/sparc64/cpu_in_cksum.S:1.1 Sun Feb 3 13:27:12 2008
+++ src/sys/arch/sparc64/sparc64/cpu_in_cksum.S Mon Oct 19 18:12:37 2009
@@ -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
Index: src/sys/kern/cnmagic.c
diff -u src/sys/kern/cnmagic.c:1.9 src/sys/kern/cnmagic.c:1.10
--- src/sys/kern/cnmagic.c:1.9 Wed Nov 1 10:17:58 2006
+++ src/sys/kern/cnmagic.c Mon Oct 19 18:12:37 2009
@@ -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>
Index: src/usr.bin/fgen/fgen.1
diff -u src/usr.bin/fgen/fgen.1:1.8 src/usr.bin/fgen/fgen.1:1.9
--- src/usr.bin/fgen/fgen.1:1.8 Fri Feb 8 01:36:22 2002
+++ src/usr.bin/fgen/fgen.1 Mon Oct 19 18:12:37 2009
@@ -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
Index: src/usr.bin/fgen/fgen.h
diff -u src/usr.bin/fgen/fgen.h:1.7 src/usr.bin/fgen/fgen.h:1.8
--- src/usr.bin/fgen/fgen.h:1.7 Sun Apr 12 03:35:43 2009
+++ src/usr.bin/fgen/fgen.h Mon Oct 19 18:12:37 2009
@@ -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
Index: src/usr.bin/fgen/fgen.l
diff -u src/usr.bin/fgen/fgen.l:1.30 src/usr.bin/fgen/fgen.l:1.31
--- src/usr.bin/fgen/fgen.l:1.30 Sun Apr 12 03:35:43 2009
+++ src/usr.bin/fgen/fgen.l Mon Oct 19 18:12:37 2009
@@ -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
%}
