summaryrefslogtreecommitdiff
path: root/licenses
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2011-02-06 15:27:52 +0000
committerwiz <wiz@pkgsrc.org>2011-02-06 15:27:52 +0000
commit8eccb1328150aa3540330758accb58a1676c8ba1 (patch)
tree4b96e890b4b1180294aadcbcbd6b51ae120735b6 /licenses
parent78348d4973a8217c0ee576f1c4a7d63f9ffaabd2 (diff)
downloadpkgsrc-8eccb1328150aa3540330758accb58a1676c8ba1.tar.gz
Update to latest version distributed with source.
No relevant changes.
Diffstat (limited to 'licenses')
-rw-r--r--licenses/mame-license35
1 files changed, 19 insertions, 16 deletions
diff --git a/licenses/mame-license b/licenses/mame-license
index e7bd69d9069..33267a54cb1 100644
--- a/licenses/mame-license
+++ b/licenses/mame-license
@@ -1,11 +1,14 @@
-Copyright (c) 1997-2007, Nicola Salmoria and the MAME team
-All rights reserved.
+Unless otherwise explicitly stated, all code in MAME is released under the
+following license:
+
+Copyright Nicola Salmoria and the MAME team
+All rights reserved.
Redistribution and use of this code or any derivative works are permitted
-provided that the following conditions are met:
+provided that the following conditions are met:
* Redistributions may not be sold, nor may they be used in a commercial
-product or activity.
+product or activity.
* Redistributions that are modified from the original source must include the
complete source code, including the source code for all components used by a
@@ -17,16 +20,16 @@ component itself accompanies the executable.
* Redistributions 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.
+materials provided with the distribution.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.