[src/trunk]: src Move to two-clause license.

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

details:   https://anonhg.NetBSD.org/src/rev/e2432fa28d1f
branches:  trunk
changeset: 748901:e2432fa28d1f
user:      is <is%NetBSD.org@localhost>
date:      Mon Nov 09 15:35:27 2009 +0000

description:
Move to two-clause license.

diffstat:

 external/bsd/file/dist/magic/magdir/os9 |   7 -------
 lib/libm/arch/m68060/makeas.sh          |   8 +-------
 sys/arch/amiga/dev/grf_ultms.g          |   8 +-------
 sys/arch/amiga/dev/gvpio.c              |  10 ++--------
 4 files changed, 4 insertions(+), 29 deletions(-)

diffs (94 lines):

diff -r 76386b6d3aa8 -r e2432fa28d1f external/bsd/file/dist/magic/magdir/os9
--- a/external/bsd/file/dist/magic/magdir/os9   Mon Nov 09 14:35:38 2009 +0000
+++ b/external/bsd/file/dist/magic/magdir/os9   Mon Nov 09 15:35:27 2009 +0000
@@ -9,13 +9,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 Ignatios Souvatzis for
-#      the NetBSD project.
-# 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 76386b6d3aa8 -r e2432fa28d1f lib/libm/arch/m68060/makeas.sh
--- a/lib/libm/arch/m68060/makeas.sh    Mon Nov 09 14:35:38 2009 +0000
+++ b/lib/libm/arch/m68060/makeas.sh    Mon Nov 09 15:35:27 2009 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: makeas.sh,v 1.6 2000/05/16 19:05:37 is Exp $
+# $NetBSD: makeas.sh,v 1.7 2009/11/09 15:35:28 is Exp $
 
 # Copyright (c) 1999, 2000 Ignatios Souvatzis
 # All rights reserved.
@@ -13,12 +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 for the NetBSD Project
-#      by Ignatios Souvatzis.
-# 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 76386b6d3aa8 -r e2432fa28d1f sys/arch/amiga/dev/grf_ultms.g
--- a/sys/arch/amiga/dev/grf_ultms.g    Mon Nov 09 14:35:38 2009 +0000
+++ b/sys/arch/amiga/dev/grf_ultms.g    Mon Nov 09 15:35:27 2009 +0000
@@ -1,4 +1,4 @@
-; $NetBSD: grf_ultms.g,v 1.9 2005/12/11 12:16:28 christos Exp $
+; $NetBSD: grf_ultms.g,v 1.10 2009/11/09 15:35:27 is Exp $
 ;
 ; ite support for A2410.
 
@@ -14,12 +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 contains software developed by Ignatios Souvatzis
-;      for the NetBSD project.
-; 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 76386b6d3aa8 -r e2432fa28d1f sys/arch/amiga/dev/gvpio.c
--- a/sys/arch/amiga/dev/gvpio.c        Mon Nov 09 14:35:38 2009 +0000
+++ b/sys/arch/amiga/dev/gvpio.c        Mon Nov 09 15:35:27 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gvpio.c,v 1.16 2007/03/04 05:59:20 christos Exp $ */
+/*     $NetBSD: gvpio.c,v 1.17 2009/11/09 15:35:27 is Exp $ */
 
 /*
  * Copyright (c) 1997 Ignatios Souvatzis
@@ -12,12 +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 Ignatios Souvatzis
- *      for the NetBSD Project.
- * 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
@@ -32,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gvpio.c,v 1.16 2007/03/04 05:59:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gvpio.c,v 1.17 2009/11/09 15:35:27 is Exp $");
 
 /*
  * GVP I/O Extender