Module Name: src
Committed By: is
Date: Mon Nov 9 15:35:28 UTC 2009
Modified Files:
src/external/bsd/file/dist/magic/magdir: os9
src/lib/libm/arch/m68060: makeas.sh
src/sys/arch/amiga/dev: grf_ultms.g gvpio.c
Log Message:
Move to two-clause license.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/magic/magdir/os9
cvs rdiff -u -r1.6 -r1.7 src/lib/libm/arch/m68060/makeas.sh
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amiga/dev/grf_ultms.g
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amiga/dev/gvpio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/file/dist/magic/magdir/os9
diff -u src/external/bsd/file/dist/magic/magdir/os9:1.1.1.1 src/external/bsd/file/dist/magic/magdir/os9:1.2
--- src/external/bsd/file/dist/magic/magdir/os9:1.1.1.1 Fri May 8 16:35:09 2009
+++ src/external/bsd/file/dist/magic/magdir/os9 Mon Nov 9 15:35:28 2009
@@ -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
Index: src/lib/libm/arch/m68060/makeas.sh
diff -u src/lib/libm/arch/m68060/makeas.sh:1.6 src/lib/libm/arch/m68060/makeas.sh:1.7
--- src/lib/libm/arch/m68060/makeas.sh:1.6 Tue May 16 19:05:37 2000
+++ src/lib/libm/arch/m68060/makeas.sh Mon Nov 9 15:35:28 2009
@@ -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
Index: src/sys/arch/amiga/dev/grf_ultms.g
diff -u src/sys/arch/amiga/dev/grf_ultms.g:1.9 src/sys/arch/amiga/dev/grf_ultms.g:1.10
--- src/sys/arch/amiga/dev/grf_ultms.g:1.9 Sun Dec 11 12:16:28 2005
+++ src/sys/arch/amiga/dev/grf_ultms.g Mon Nov 9 15:35:27 2009
@@ -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
Index: src/sys/arch/amiga/dev/gvpio.c
diff -u src/sys/arch/amiga/dev/gvpio.c:1.16 src/sys/arch/amiga/dev/gvpio.c:1.17
--- src/sys/arch/amiga/dev/gvpio.c:1.16 Sun Mar 4 05:59:20 2007
+++ src/sys/arch/amiga/dev/gvpio.c Mon Nov 9 15:35:27 2009
@@ -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
