diff options
| author | agc <agc@pkgsrc.org> | 1999-12-31 22:07:48 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 1999-12-31 22:07:48 +0000 |
| commit | 936b3a27a58e44ac91314310c81c9f80c572ef47 (patch) | |
| tree | 3a8fab1b5f4b00514121ca3904742b002556ac9e /audio/rio | |
| parent | 261774871dbdc56791d5506402259e5482a27863 (diff) | |
| download | pkgsrc-936b3a27a58e44ac91314310c81c9f80c572ef47.tar.gz | |
Add the XFree86 copyright notice from the file from which inb() and
outb() were taken.
Regenerate patchsum.
Diffstat (limited to 'audio/rio')
| -rw-r--r-- | audio/rio/files/patch-sum | 4 | ||||
| -rw-r--r-- | audio/rio/patches/patch-ab | 33 |
2 files changed, 31 insertions, 6 deletions
diff --git a/audio/rio/files/patch-sum b/audio/rio/files/patch-sum index e4419345546..a861f0533a7 100644 --- a/audio/rio/files/patch-sum +++ b/audio/rio/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.1.1.1 1999/12/31 21:19:50 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/12/31 22:07:48 agc Exp $ MD5 (patch-aa) = e92f08157c6eaf9a0f3963ac91a85a89 -MD5 (patch-ab) = 829e7a99dfc821cc42acb2e3c6003a44 +MD5 (patch-ab) = db36766759a252533e2c22737493ebf6 diff --git a/audio/rio/patches/patch-ab b/audio/rio/patches/patch-ab index da45d68c780..bfa5e9bd134 100644 --- a/audio/rio/patches/patch-ab +++ b/audio/rio/patches/patch-ab @@ -1,11 +1,11 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/12/31 21:19:50 agc Exp $ +$NetBSD: patch-ab,v 1.2 1999/12/31 22:07:49 agc Exp $ Add NetBSD and Solaris platforms Add inb() and outb() from XFree86 sources. --- rio.cpp 1999/12/17 17:42:31 1.1 +++ rio.cpp 1999/12/17 17:44:25 -@@ -109,9 +109,53 @@ +@@ -109,9 +109,78 @@ #define CLOCK_SECOND ((int)CLOCKS_PER_SEC) #define DELETEARRAY delete @@ -38,8 +38,33 @@ Add inb() and outb() from XFree86 sources. +#endif + +#if defined(__NetBSD__) -+/* copied from the XFree86 sources */ -+/* xc/programs/Xserver/hw/xfree86/common/compiler.h */ ++/* copied from the XFree86 sources, the copyright notice follows (agc): */ ++ ++/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.24.2.4 1998/10/18 20:42:10 hohndel Exp $ */ ++/* ++ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, 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 name of Thomas Roell not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Thomas Roell makes no representations ++ * about the suitability of this software for any purpose. It is provided ++ * "as is" without express or implied warranty. ++ * ++ * THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL THOMAS ROELL 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. ++ * ++ */ ++/* $XConsortium: compiler.h /main/16 1996/10/25 15:38:34 kaleb $ */ ++ +static __inline__ unsigned int +inb(unsigned short int port) +{ |