[src/trunk]: src Change copyright to 2-clause BSD-copyright.

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

details:   https://anonhg.NetBSD.org/src/rev/e48b0eed4ed5
branches:  trunk
changeset: 569987:e48b0eed4ed5
user:      hubertf <hubertf%NetBSD.org@localhost>
date:      Wed Sep 15 19:45:17 2004 +0000

description:
Change copyright to 2-clause BSD-copyright.
Changed with explicit permission of Thorsten Lockert (tholo sigmasoft com)

diffstat:

 bin/pax/cpio.1                    |  7 +------
 bin/pax/tar.1                     |  7 +------
 distrib/notes/common/legal.common |  4 +---
 lib/libc/gen/ftok.3               |  4 +---
 lib/libc/gen/ftok.c               |  6 ++----
 usr.bin/ipcs/ipcs.1               |  7 +------
 usr.bin/ipcs/ipcs.c               |  7 +------
 7 files changed, 8 insertions(+), 34 deletions(-)

diffs (147 lines):

diff -r daecc5c3c3d5 -r e48b0eed4ed5 bin/pax/cpio.1
--- a/bin/pax/cpio.1    Wed Sep 15 15:54:23 2004 +0000
+++ b/bin/pax/cpio.1    Wed Sep 15 19:45:17 2004 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: cpio.1,v 1.7 2004/02/13 23:25:01 snj Exp $
+.\" $NetBSD: cpio.1,v 1.8 2004/09/15 19:45:17 hubertf Exp $
 .\"
 .\" Copyright (c) 1997 SigmaSoft, Th. Lockert
 .\" All rights reserved.
@@ -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 SigmaSoft, Th. Lockert.
-.\" 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 daecc5c3c3d5 -r e48b0eed4ed5 bin/pax/tar.1
--- a/bin/pax/tar.1     Wed Sep 15 15:54:23 2004 +0000
+++ b/bin/pax/tar.1     Wed Sep 15 19:45:17 2004 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: tar.1,v 1.14 2004/05/04 13:13:01 grant Exp $
+.\" $NetBSD: tar.1,v 1.15 2004/09/15 19:45:17 hubertf Exp $
 .\"
 .\" Copyright (c) 1996 SigmaSoft, Th. Lockert
 .\" All rights reserved.
@@ -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 SigmaSoft, Th. Lockert.
-.\" 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 daecc5c3c3d5 -r e48b0eed4ed5 distrib/notes/common/legal.common
--- a/distrib/notes/common/legal.common Wed Sep 15 15:54:23 2004 +0000
+++ b/distrib/notes/common/legal.common Wed Sep 15 19:45:17 2004 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: legal.common,v 1.36 2004/08/21 22:30:56 hubertf Exp $
+.\"    $NetBSD: legal.common,v 1.37 2004/09/15 19:45:17 hubertf Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -449,8 +449,6 @@
 .It
 This product includes software developed by Shingo WATANABE.
 .It
-This product includes software developed by SigmaSoft, Th. Lockert.
-.It
 This product includes software developed by Softweyr LLC, the
 University of California, Berkeley, and its contributors.
 .It
diff -r daecc5c3c3d5 -r e48b0eed4ed5 lib/libc/gen/ftok.3
--- a/lib/libc/gen/ftok.3       Wed Sep 15 15:54:23 2004 +0000
+++ b/lib/libc/gen/ftok.3       Wed Sep 15 19:45:17 2004 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ftok.3,v 1.12 2003/06/27 13:23:11 wiz Exp $
+.\"    $NetBSD: ftok.3,v 1.13 2004/09/15 19:45:17 hubertf Exp $
 .\"
 .\" Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo%sigmasoft.com@localhost>
 .\" All rights reserved.
@@ -11,8 +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. 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 daecc5c3c3d5 -r e48b0eed4ed5 lib/libc/gen/ftok.c
--- a/lib/libc/gen/ftok.c       Wed Sep 15 15:54:23 2004 +0000
+++ b/lib/libc/gen/ftok.c       Wed Sep 15 19:45:17 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftok.c,v 1.9 2000/01/22 22:19:10 mycroft Exp $ */
+/*     $NetBSD: ftok.c,v 1.10 2004/09/15 19:45:17 hubertf Exp $        */
 
 /*
  * Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo%sigmasoft.com@localhost>
@@ -12,8 +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. 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
@@ -29,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ftok.c,v 1.9 2000/01/22 22:19:10 mycroft Exp $");
+__RCSID("$NetBSD: ftok.c,v 1.10 2004/09/15 19:45:17 hubertf Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
diff -r daecc5c3c3d5 -r e48b0eed4ed5 usr.bin/ipcs/ipcs.1
--- a/usr.bin/ipcs/ipcs.1       Wed Sep 15 15:54:23 2004 +0000
+++ b/usr.bin/ipcs/ipcs.1       Wed Sep 15 19:45:17 2004 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ipcs.1,v 1.15 2004/03/21 18:48:20 snj Exp $
+.\"    $NetBSD: ipcs.1,v 1.16 2004/09/15 19:45:17 hubertf Exp $
 .\"
 .\" Copyright (c) 1994 SigmaSoft, Th. Lockert
 .\" All rights reserved.
@@ -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 SigmaSoft, Th. Lockert.
-.\" 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 daecc5c3c3d5 -r e48b0eed4ed5 usr.bin/ipcs/ipcs.c
--- a/usr.bin/ipcs/ipcs.c       Wed Sep 15 15:54:23 2004 +0000
+++ b/usr.bin/ipcs/ipcs.c       Wed Sep 15 19:45:17 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipcs.c,v 1.32 2004/03/21 10:02:12 simonb Exp $ */
+/*     $NetBSD: ipcs.c,v 1.33 2004/09/15 19:45:17 hubertf Exp $        */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -48,11 +48,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 SigmaSoft, Th.  Lockert.
- * 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 ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY