Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/notes merge port-specific legal sections into the co...
details: https://anonhg.NetBSD.org/src/rev/e90680eaaad6
branches: trunk
changeset: 338364:e90680eaaad6
user: snj <snj%NetBSD.org@localhost>
date: Wed May 20 05:19:19 2015 +0000
description:
merge port-specific legal sections into the common file. most of these
entries were already in the common file, and it's a pain to maintain
them separately.
diffstat:
distrib/notes/Makefile.inc | 4 +-
distrib/notes/acorn26/legal | 8 --
distrib/notes/acorn32/legal | 6 -
distrib/notes/alpha/legal | 9 --
distrib/notes/amd64/legal | 1 -
distrib/notes/amiga/legal | 4 -
distrib/notes/arc/legal | 15 ----
distrib/notes/atari/legal | 6 -
distrib/notes/bebox/legal | 2 -
distrib/notes/cats/legal | 6 -
distrib/notes/common/legal.common | 142 ++++++++++++++++++++++++++++++++++++-
distrib/notes/common/main | 3 +-
distrib/notes/emips/legal | 75 --------------------
distrib/notes/evbarm/legal | 8 --
distrib/notes/evbppc/legal | 2 -
distrib/notes/ews4800mips/legal | 2 -
distrib/notes/hp300/legal | 5 -
distrib/notes/hpcarm/legal | 2 -
distrib/notes/hpcmips/legal | 2 -
distrib/notes/hpcsh/legal | 2 -
distrib/notes/hppa/legal | 2 -
distrib/notes/i386/legal | 29 -------
distrib/notes/landisk/legal | 2 -
distrib/notes/mac68k/legal | 16 ----
distrib/notes/macppc/legal | 31 --------
distrib/notes/mmeye/legal | 2 -
distrib/notes/mvme68k/legal | 2 -
distrib/notes/news68k/legal | 2 -
distrib/notes/newsmips/legal | 4 -
distrib/notes/next68k/legal | 4 -
distrib/notes/ofppc/legal | 2 -
distrib/notes/pmax/legal | 136 ------------------------------------
distrib/notes/prep/legal | 2 -
distrib/notes/rs6000/legal | 2 -
distrib/notes/sandpoint/legal | 2 -
distrib/notes/sgimips/legal | 2 -
distrib/notes/shark/legal | 6 -
distrib/notes/sparc/legal | 6 -
distrib/notes/sparc64/legal | 3 -
distrib/notes/sun2/legal | 2 -
distrib/notes/sun3/legal | 2 -
distrib/notes/vax/legal | 2 -
distrib/notes/x68k/legal | 18 ----
distrib/notes/xen/legal | 2 -
44 files changed, 138 insertions(+), 447 deletions(-)
diffs (truncated from 832 to 300 lines):
diff -r d2b19276485b -r e90680eaaad6 distrib/notes/Makefile.inc
--- a/distrib/notes/Makefile.inc Wed May 20 04:37:45 2015 +0000
+++ b/distrib/notes/Makefile.inc Wed May 20 05:19:19 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.42 2014/01/26 17:00:03 apb Exp $
+# $NetBSD: Makefile.inc,v 1.43 2015/05/20 05:19:19 snj Exp $
#
# Ross Harvey <ross%NetBSD.org@localhost>
@@ -20,7 +20,7 @@
${TARG}.more.toc
SRCS= ${MAIN} whatis ${COMMON}/contents hardware xfer prep \
${.CURDIR}/install ${COMMON}/postinstall upgrade \
- ${COMMON}/legal.common legal ${COMMON}/netboot \
+ ${COMMON}/legal.common ${COMMON}/netboot \
${COMMON}/sysinst \
${.CURDIR}/../Makefile.inc ${MERGED_SRCS}
diff -r d2b19276485b -r e90680eaaad6 distrib/notes/acorn26/legal
--- a/distrib/notes/acorn26/legal Wed May 20 04:37:45 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-.\" $NetBSD: legal,v 1.4 2009/10/23 02:56:01 snj Exp $
-.
-.\" db_disasm.c locore.S disklabel.h disklabel_acorn.h fp.h frame.h signal.h
-.\" undefined.h iocreg.h iic.h rtc.c podulebus.h
-.
-.It
-.\" param.h
-This product includes software developed by the RiscBSD team.
diff -r d2b19276485b -r e90680eaaad6 distrib/notes/acorn32/legal
--- a/distrib/notes/acorn32/legal Wed May 20 04:37:45 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-.\" $NetBSD: legal,v 1.4 2015/05/09 08:13:34 snj Exp $
-.
-.It
-This product includes software developed by the RiscBSD kernel team.
-.It
-This product includes software developed by Scott Stevens.
diff -r d2b19276485b -r e90680eaaad6 distrib/notes/alpha/legal
--- a/distrib/notes/alpha/legal Wed May 20 04:37:45 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-.\" $NetBSD: legal,v 1.9 2002/06/15 14:41:10 itojun Exp $
-.
-.It
-In the following statement, "This software" refers to the parallel port driver:
-.(item -offset indent -compact
-.It
-This software is a component of "386BSD" developed by
-William F. Jolitz, TeleMuse.
-.item)
diff -r d2b19276485b -r e90680eaaad6 distrib/notes/amd64/legal
--- a/distrib/notes/amd64/legal Wed May 20 04:37:45 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-.\"$NetBSD: legal,v 1.1 2005/08/21 18:35:26 riz Exp $
diff -r d2b19276485b -r e90680eaaad6 distrib/notes/amiga/legal
--- a/distrib/notes/amiga/legal Wed May 20 04:37:45 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-.\" $NetBSD: legal,v 1.11 2009/10/23 16:57:21 snj Exp $
-.
-.It
-This product includes software developed by Lutz Vieweg.
diff -r d2b19276485b -r e90680eaaad6 distrib/notes/arc/legal
--- a/distrib/notes/arc/legal Wed May 20 04:37:45 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-.\" $NetBSD: legal,v 1.7 2002/06/15 14:41:10 itojun Exp $
-.
-.It
-This product includes software developed by Per Fogelstrom.
-.It
-This product includes software developed under OpenBSD by Per Fogelstrom.
-.It
-This product includes software developed under OpenBSD by Per Fogelstrom,
-Opsycon AB.
-.It
-In the following statement, "This software" refers to the parallel port driver:
-.(item -offset indent -compact
-This software is a component of "386BSD" developed by
-William F. Jolitz, TeleMuse.
-.item)
diff -r d2b19276485b -r e90680eaaad6 distrib/notes/atari/legal
--- a/distrib/notes/atari/legal Wed May 20 04:37:45 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-.\" $NetBSD: legal,v 1.6 2002/05/20 23:48:43 itojun Exp $
-.
-.It
-This product includes software developed by Thomas Gerner
-.It
-This product includes software developed by Waldi Ravens.
diff -r d2b19276485b -r e90680eaaad6 distrib/notes/bebox/legal
--- a/distrib/notes/bebox/legal Wed May 20 04:37:45 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-.\" $NetBSD: legal,v 1.1 2010/11/13 05:20:21 kiyohara Exp $
-.
diff -r d2b19276485b -r e90680eaaad6 distrib/notes/cats/legal
--- a/distrib/notes/cats/legal Wed May 20 04:37:45 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-.\" $NetBSD: legal,v 1.4 2015/05/09 08:13:34 snj Exp $
-.
-.It
-This product includes software developed by the RiscBSD kernel team.
-.It
-This product includes software developed by Scott Stevens.
diff -r d2b19276485b -r e90680eaaad6 distrib/notes/common/legal.common
--- a/distrib/notes/common/legal.common Wed May 20 04:37:45 2015 +0000
+++ b/distrib/notes/common/legal.common Wed May 20 05:19:19 2015 +0000
@@ -1,4 +1,3 @@
-.\" $NetBSD: legal.common,v 1.93 2015/05/09 08:13:34 snj Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -104,7 +103,7 @@
.It
This product includes software developed by Alex Zepeda.
.It
-This product includes software developed by Allen Briggs
+This product includes software developed by Allen Briggs.
.It
This product includes software developed by Amancio Hasty and
Roger Hardiman
@@ -300,8 +299,12 @@
.It
This product includes software developed by Matthew Fredette.
.It
+This product includes software developed by Matt DeBergalis.
+.It
This product includes software developed by Michael Smith.
.It
+This product includes software developed by Microsoft.
+.It
This product includes software developed by Mike Pritchard.
.It
This product includes software developed by Mike Pritchard and
@@ -372,6 +375,8 @@
This product includes software developed by Texas A&M University
and its contributors.
.It
+This product includes software developed by Thomas Gerner.
+.It
This product includes software developed by TooLs GmbH.
.It
This product includes software developed by Trimble Navigation, Ltd.
@@ -383,6 +388,8 @@
.It
This product includes software developed by Winning Strategies, Inc.
.It
+This product includes software developed by Yasushi Yamasaki.
+.It
This product includes software developed by Yen Yen Lim and
North Dakota State University.
.It
@@ -410,7 +417,7 @@
This product includes software developed by the PocketBSD project
and its contributors.
.It
-This product includes software developed by the RiscBSD kernel team
+This product includes software developed by the RiscBSD kernel team.
.It
This product includes software developed by the RiscBSD team.
.It
@@ -502,9 +509,6 @@
This product includes software developed under OpenBSD by
Per Fogelstrom.
.It
-This software is a component of "386BSD" developed by
-William F. Jolitz, TeleMuse.
-.It
This software was developed by Holger Veit and Brian Moore
for use with "386BSD" and similar operating systems.
"Similar operating systems" includes mainly non-profit oriented
@@ -542,4 +546,128 @@
The original Standard can be obtained online at
http://www.opengroup.org/unix/online.html.
.Pp
-This notice shall appear on any product containing this material
+This notice shall appear on any product containing this material.
+.Pp
+In the following statement, "This software" refers to the parallel port driver:
+.(item -offset indent -compact
+This software is a component of "386BSD" developed by
+William F. Jolitz, TeleMuse.
+.item)
+.Pp
+Some files have the following copyright:
+.(item -offset indent -compact
+Mach Operating System
+.br
+Copyright (c) 1991,1990,1989 Carnegie Mellon University
+.br
+All Rights Reserved.
+.Pp
+Permission to use, copy, modify and distribute this software and its
+documentation is hereby granted, provided that both the copyright
+notice and this permission notice appear in all copies of the
+software, derivative works or modified versions, and any portions
+thereof, and that both notices appear in supporting documentation.
+.Pp
+CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS
+CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+.Pp
+Carnegie Mellon requests users of this software to return to
+.br
+Software Distribution Coordinator or Software.Distribution%CS.CMU.EDU@localhost
+.br
+School of Computer Science
+.br
+Carnegie Mellon University
+.br
+Pittsburgh PA 15213-3890
+.Pp
+any improvements or extensions that they make and grant Carnegie the
+rights to redistribute these changes.
+.item)
+.Pp
+Some files have the following copyright:
+.(item -offset indent -compact
+Copyright (c) 1994, 1995 Carnegie-Mellon University.
+.br
+All rights reserved.
+.Pp
+Author: Chris G. Demetriou
+.Pp
+Permission to use, copy, modify and distribute this software and
+its documentation is hereby granted, provided that both the copyright
+notice and this permission notice appear in all copies of the
+software, derivative works or modified versions, and any portions
+thereof, and that both notices appear in supporting documentation.
+.br
+CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
+FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+.Pp
+Carnegie Mellon requests users of this software to return to
+.br
+Software Distribution Coordinator or Software.Distribution%CS.CMU.EDU@localhost
+.br
+School of Computer Science
+.br
+Carnegie Mellon University
+.br
+Pittsburgh PA 15213-3890
+.Pp
+any improvements or extensions that they make and grant Carnegie the
+rights to redistribute these changes.
+.item)
+.if \n[mipseb]:\n[mipsel] \{\
+.Pp
+Some files have the following copyright:
+.(item -offset indent -compact
+ Copyright (C) 1989 Digital Equipment Corporation.
+.br
+Permission to use, copy, modify, and distribute this software and
+its documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appears in all copies.
+Digital Equipment Corporation makes no representations about the
+suitability of this software for any purpose. It is provided "as is"
+without express or implied warranty.
+.item)
+.\}
+.if \n[pmax] \{\
+.Pp
+Some files have the following copyright:
+.(item -offset indent -compact
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+.Pp
+ All Rights Reserved
+.Pp
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Digital or MIT not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+.Pp
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+.item)
+.\}
+.Pp
+Some files have the following copyright:
+.(item -offset indent -compact
+Copyright 1996 The Board of Trustees of The Leland Stanford
+Junior University. All Rights Reserved.
+.Pp
Home |
Main Index |
Thread Index |
Old Index