Module Name: src
Committed By: snj
Date: Wed May 20 05:19:22 UTC 2015
Modified Files:
src/distrib/notes: Makefile.inc
src/distrib/notes/common: legal.common main
Removed Files:
src/distrib/notes/acorn26: legal
src/distrib/notes/acorn32: legal
src/distrib/notes/alpha: legal
src/distrib/notes/amd64: legal
src/distrib/notes/amiga: legal
src/distrib/notes/arc: legal
src/distrib/notes/atari: legal
src/distrib/notes/bebox: legal
src/distrib/notes/cats: legal
src/distrib/notes/emips: legal
src/distrib/notes/evbarm: legal
src/distrib/notes/evbppc: legal
src/distrib/notes/ews4800mips: legal
src/distrib/notes/hp300: legal
src/distrib/notes/hpcarm: legal
src/distrib/notes/hpcmips: legal
src/distrib/notes/hpcsh: legal
src/distrib/notes/hppa: legal
src/distrib/notes/i386: legal
src/distrib/notes/landisk: legal
src/distrib/notes/mac68k: legal
src/distrib/notes/macppc: legal
src/distrib/notes/mmeye: legal
src/distrib/notes/mvme68k: legal
src/distrib/notes/news68k: legal
src/distrib/notes/newsmips: legal
src/distrib/notes/next68k: legal
src/distrib/notes/ofppc: legal
src/distrib/notes/pmax: legal
src/distrib/notes/prep: legal
src/distrib/notes/rs6000: legal
src/distrib/notes/sandpoint: legal
src/distrib/notes/sgimips: legal
src/distrib/notes/shark: legal
src/distrib/notes/sparc: legal
src/distrib/notes/sparc64: legal
src/distrib/notes/sun2: legal
src/distrib/notes/sun3: legal
src/distrib/notes/vax: legal
src/distrib/notes/x68k: legal
src/distrib/notes/xen: legal
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/distrib/notes/Makefile.inc
cvs rdiff -u -r1.4 -r0 src/distrib/notes/acorn26/legal
cvs rdiff -u -r1.4 -r0 src/distrib/notes/acorn32/legal
cvs rdiff -u -r1.9 -r0 src/distrib/notes/alpha/legal
cvs rdiff -u -r1.1 -r0 src/distrib/notes/amd64/legal
cvs rdiff -u -r1.11 -r0 src/distrib/notes/amiga/legal
cvs rdiff -u -r1.7 -r0 src/distrib/notes/arc/legal
cvs rdiff -u -r1.6 -r0 src/distrib/notes/atari/legal
cvs rdiff -u -r1.1 -r0 src/distrib/notes/bebox/legal
cvs rdiff -u -r1.4 -r0 src/distrib/notes/cats/legal
cvs rdiff -u -r1.93 -r1.94 src/distrib/notes/common/legal.common
cvs rdiff -u -r1.520 -r1.521 src/distrib/notes/common/main
cvs rdiff -u -r1.2 -r0 src/distrib/notes/emips/legal
cvs rdiff -u -r1.5 -r0 src/distrib/notes/evbarm/legal
cvs rdiff -u -r1.3 -r0 src/distrib/notes/evbppc/legal
cvs rdiff -u -r1.1 -r0 src/distrib/notes/ews4800mips/legal
cvs rdiff -u -r1.6 -r0 src/distrib/notes/hp300/legal
cvs rdiff -u -r1.1 -r0 src/distrib/notes/hpcarm/legal
cvs rdiff -u -r1.4 -r0 src/distrib/notes/hpcmips/legal
cvs rdiff -u -r1.1 -r0 src/distrib/notes/hpcsh/legal
cvs rdiff -u -r1.1 -r0 src/distrib/notes/hppa/legal
cvs rdiff -u -r1.13 -r0 src/distrib/notes/i386/legal
cvs rdiff -u -r1.1 -r0 src/distrib/notes/landisk/legal
cvs rdiff -u -r1.17 -r0 src/distrib/notes/mac68k/legal
cvs rdiff -u -r1.6 -r0 src/distrib/notes/macppc/legal
cvs rdiff -u -r1.1 -r0 src/distrib/notes/mmeye/legal
cvs rdiff -u -r1.7 -r0 src/distrib/notes/mvme68k/legal
cvs rdiff -u -r1.2 -r0 src/distrib/notes/news68k/legal
cvs rdiff -u -r1.1 -r0 src/distrib/notes/newsmips/legal
cvs rdiff -u -r1.4 -r0 src/distrib/notes/next68k/legal
cvs rdiff -u -r1.1 -r0 src/distrib/notes/ofppc/legal
cvs rdiff -u -r1.10 -r0 src/distrib/notes/pmax/legal
cvs rdiff -u -r1.2 -r0 src/distrib/notes/prep/legal
cvs rdiff -u -r1.1 -r0 src/distrib/notes/rs6000/legal
cvs rdiff -u -r1.4 -r0 src/distrib/notes/sandpoint/legal
cvs rdiff -u -r1.1 -r0 src/distrib/notes/sgimips/legal
cvs rdiff -u -r1.4 -r0 src/distrib/notes/shark/legal
cvs rdiff -u -r1.8 -r0 src/distrib/notes/sparc/legal
cvs rdiff -u -r1.3 -r0 src/distrib/notes/sparc64/legal
cvs rdiff -u -r1.1 -r0 src/distrib/notes/sun2/legal
cvs rdiff -u -r1.6 -r0 src/distrib/notes/sun3/legal
cvs rdiff -u -r1.7 -r0 src/distrib/notes/vax/legal
cvs rdiff -u -r1.8 -r0 src/distrib/notes/x68k/legal
cvs rdiff -u -r1.3 -r0 src/distrib/notes/xen/legal
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.42 src/distrib/notes/Makefile.inc:1.43
--- src/distrib/notes/Makefile.inc:1.42 Sun Jan 26 17:00:03 2014
+++ src/distrib/notes/Makefile.inc Wed May 20 05:19:19 2015
@@ -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 <[email protected]>
@@ -20,7 +20,7 @@ TOCS= ${TARG}.PostScript.toc ${TARG}.ASC
${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}
Index: src/distrib/notes/common/legal.common
diff -u src/distrib/notes/common/legal.common:1.93 src/distrib/notes/common/legal.common:1.94
--- src/distrib/notes/common/legal.common:1.93 Sat May 9 08:13:34 2015
+++ src/distrib/notes/common/legal.common Wed May 20 05:19:20 2015
@@ -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 @@ Colin Wood for the NetBSD Projet.
.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 @@ This product includes software developed
.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
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 @@ This product includes software developed
.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 @@ for use in the OpenSSL Toolkit. (http://
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 @@ Per Fogelstrom Opsycon AB for RTMX Inc,
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 @@ Standard is the referee document.
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 [email protected]
+.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 [email protected]
+.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
+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. Stanford University
+makes no representations about the suitability of this
+software for any purpose. It is provided "as is"
+without express or implied warranty.
+.item)
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.520 src/distrib/notes/common/main:1.521
--- src/distrib/notes/common/main:1.520 Tue May 19 19:30:27 2015
+++ src/distrib/notes/common/main Wed May 20 05:19:20 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.520 2015/05/19 19:30:27 snj Exp $
+.\" $NetBSD: main,v 1.521 2015/05/20 05:19:20 snj Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -1455,7 +1455,6 @@ the software that we have mentioned in t
.Ht <font size=-1>
.(item -compact
.so ../common/legal.common -----------------------------------------------
-.so legal -----------------------------------------------
.item)
.Ht </font>
.ps
