CVS commit: pkgsrc

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Aug 30 17:04:31 UTC 2019

Modified Files:
        pkgsrc/games/doom1: DESCR Makefile PLIST distinfo
Added Files:
        pkgsrc/licenses: doom1-iwad-shareware-license

Log Message:
doom1: Update to 1.9

- Update to latest shareware data file
- Add License (taken from Debian)
- Take maintainership

OK from wiz@.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/games/doom1/DESCR \
    pkgsrc/games/doom1/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/doom1/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/doom1/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/licenses/doom1-iwad-shareware-license

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/doom1/DESCR
diff -u pkgsrc/games/doom1/DESCR:1.1.1.1 pkgsrc/games/doom1/DESCR:1.2
--- pkgsrc/games/doom1/DESCR:1.1.1.1    Mon Feb 22 22:12:52 2010
+++ pkgsrc/games/doom1/DESCR    Fri Aug 30 17:04:31 2019
@@ -1,2 +1,4 @@
-This package contains the shareware level data for Doom,
-ID software's famous 3D shooter.
+This package contains the shareware level data for Doom, ID software's
+famous 3D shooter.
+
+Only the first episode is available to play.
Index: pkgsrc/games/doom1/PLIST
diff -u pkgsrc/games/doom1/PLIST:1.1.1.1 pkgsrc/games/doom1/PLIST:1.2
--- pkgsrc/games/doom1/PLIST:1.1.1.1    Mon Feb 22 22:12:52 2010
+++ pkgsrc/games/doom1/PLIST    Fri Aug 30 17:04:31 2019
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/22 22:12:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/08/30 17:04:31 micha Exp $
 share/doom/doom1.wad

Index: pkgsrc/games/doom1/Makefile
diff -u pkgsrc/games/doom1/Makefile:1.5 pkgsrc/games/doom1/Makefile:1.6
--- pkgsrc/games/doom1/Makefile:1.5     Sun Jan 14 17:33:58 2018
+++ pkgsrc/games/doom1/Makefile Fri Aug 30 17:04:31 2019
@@ -1,25 +1,27 @@
-# $NetBSD: Makefile,v 1.5 2018/01/14 17:33:58 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2019/08/30 17:04:31 micha Exp $
 
-DISTNAME=      doom-1.8.wad
-PKGNAME=       doom1-1.8
+DISTNAME=      shareware_doom_iwad
+PKGNAME=       doom1-1.9
 CATEGORIES=    games
-MASTER_SITES=  ftp://ftp.idsoftware.com/idstuff/doom/
-MASTER_SITES+= http://www.gamers.org/pub/games/idgames/idstuff/doom/
-EXTRACT_SUFX=  .gz
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-# HOMEPAGE=    https://www.idsoftware.com/archives/doomarc.html
-# AWOL
+MASTER_SITES=  http://www.doomworld.com/3ddownloads/ports/
+DIST_SUBDIR=   ${PKGNAME_NOREV}
+EXTRACT_SUFX=  .zip
+
+MAINTAINER=    micha%NetBSD.org@localhost
+# The SHA1 hash listed here was checked while generating pkgsrc distinfo
+HOMEPAGE=      https://doomwiki.org/wiki/DOOM1.WAD
 COMMENT=       Shareware levels for Doom
+LICENSE=       doom1-iwad-shareware-license
 
 CONFLICTS+=    xdoom<1.10nb4
-WRKSRC=                ${WRKDIR}
 
+WRKSRC=                        ${WRKDIR}
 INSTALLATION_DIRS=     share/doom
+
 NO_BUILD=              YES
 
 do-install:
-       ${INSTALL_DATA} ${WRKSRC}/doom-1.8.wad \
+       ${INSTALL_DATA} ${WRKSRC}/DOOM1.WAD \
                ${DESTDIR}${PREFIX}/share/doom/doom1.wad
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/doom1/distinfo
diff -u pkgsrc/games/doom1/distinfo:1.2 pkgsrc/games/doom1/distinfo:1.3
--- pkgsrc/games/doom1/distinfo:1.2     Tue Nov  3 20:56:47 2015
+++ pkgsrc/games/doom1/distinfo Fri Aug 30 17:04:31 2019
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 20:56:47 agc Exp $
+$NetBSD: distinfo,v 1.3 2019/08/30 17:04:31 micha Exp $
 
-SHA1 (doom-1.8.wad.gz) = e43334e5f31d93cadaf8f1ede6cd432f9b0aca68
-RMD160 (doom-1.8.wad.gz) = 5d951d1f685bedd68033a332a6581b5056213c21
-SHA512 (doom-1.8.wad.gz) = f64edd2dde5dc09be2861ce80f40ade72874c8c59973da75e10acb84086a4714fe06cfb302afd365ad28fa46e6acc1fd73b0f6ce0e8fed19189e60d1b537bcbd
-Size (doom-1.8.wad.gz) = 1756050 bytes
+SHA1 (doom1-1.9/shareware_doom_iwad.zip) = 2d274030c4ba07b9bd1409e5e80f47a6df4efd3a
+RMD160 (doom1-1.9/shareware_doom_iwad.zip) = 3591afbdf5ec84e86425709b06b45e83aac4420d
+SHA512 (doom1-1.9/shareware_doom_iwad.zip) = 9fe5a32a24efa622ff7017303d3c8fdc7b4e6c4ec548e50bea402bfa9a1f320ce3f316f4a7f62e64786af876776d51b20fc7688f497896aa176f97b85ada30f9
+Size (doom1-1.9/shareware_doom_iwad.zip) = 1782482 bytes

Added files:

Index: pkgsrc/licenses/doom1-iwad-shareware-license
diff -u /dev/null pkgsrc/licenses/doom1-iwad-shareware-license:1.1
--- /dev/null   Fri Aug 30 17:04:31 2019
+++ pkgsrc/licenses/doom1-iwad-shareware-license        Fri Aug 30 17:04:31 2019
@@ -0,0 +1,137 @@
+This license for pkgsrc was taken from the Debian package of the Doom
+shareware episode. The following text was copied from:
+https://metadata.ftp-master.debian.org/changelogs/non-free/d/doom-wad-shareware/doom-wad-shareware_1.9.fixed-2_copyright
+
+This package was originally debianized by Joe Drew <hoserhead%woot.net@localhost> on
+Sat, 23 Oct 1999 21:20:41 -0400. From version
+
+It was downloaded from ftp.cdrom.com:/pub/idgames
+
+No modifications were performed on this file, other than decompressing
+it.
+
+The Doom 1 shareware WAD file is � 1994 Id Software
+
+             LIMITED USE SOFTWARE LICENSE AGREEMENT
+
+This Limited Use Software License Agreement (the "Agreement") is a legal 
+agreement between you, the end-user, and Id Software, Inc. ("ID").  By 
+continuing the installation of this game program, by loading or running 
+the game, or by placing or copying the game program onto your computer 
+hard drive, you are agreeing to be bound by the terms of this Agreement.  
+
+ID SOFTWARE LICENSE
+
+     1.   Grant of License.  ID grants to you the right to use the 
+Id Software game program (the "Software"), which is the shareware version 
+or episode one  of the game program.  For purposes of this section, "use" 
+means loading the Software into RAM, as well as installation on a hard disk 
+or other storage  device.  You may not:  modify, translate, disassemble, 
+decompile, reverse engineer, or create derivative works based upon the 
+Software.  You agree thatd the Software will not be shipped, transferred or 
+exported into any country in violation of the U.S. Export Administration Act 
+and that you will not utilize, in any other manner, the Software in violation 
+of any applicable law.
+
+     2.   Copyright.  The Software is owned by ID and is protected by United 
+States copyright laws and international treaty provisions.  You must treat 
+the Software like any other copyrighted material, except that you may make 
+copies of the Software to give to other persons.  You may not charge or 
+receive any consideration from any other person for the receipt or use of 
+the Software without receiving ID's prior written consent as specified in the 
+VENDOR.DOC file.  You agree to use your best efforts to see that any user of 
+the Software licensed hereunder complies with this Agreement.
+
+     3.   Limited Warranty.  ID warrants that if properly installed and 
+operated on a computer for which it is designed, the Software will perform 
+substantially in accordance with its designed purpose for a period of ninety 
+(90) days from the date the Software is first obtained by an end-user.   ID's 
+entire liability and your exclusive remedy shall be, at ID's option, either 
+(a) return of the retail price paid, if any, or (b) repair or replacement of 
+the Software that does not meet ID's Limited Warranty.  To make a warranty 
+claim, return the Software to the point of purchase, accompanied by proof of
+purchase, your name, your address, and a statement of defect, or return the 
+Software with the above information to ID.  This Limited Warranty is void if 
+failure of the Software has resulted in whole or in part from accident, 
+abuse, misapplication or violation of this Agreement.  Any replacement 
+Software will be warranted for the remainder of the original warranty period 
+or thirty (30) days, whichever is longer.  This warranty allocates risks of 
+product failure between Licensee and ID.  ID's product pricing reflects this 
+allocation of risk and the limitations of liability contained in this 
+warranty.
+
+     4.   NO OTHER WARRANTIES.  ID DISCLAIMS ALL OTHER WARRANTIES, EITHER 
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, IMPLIED WARRANTIES OF 
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE WITH RESPECT TO THE 
+SOFTWARE AND THE ACCOMPANYING WRITTEN MATERIALS, IF ANY.  THIS LIMITED 
+WARRANTY GIVES YOU SPECIFIC LEGAL RIGHTS.  YOU MAY HAVE OTHERS WHICH VARY 
+FROM JURISDICTION TO JURISDICTION.  ID DOES NOT WARRANT THAT THE OPERATION 
+OF THE SOFTWARE WILL BE UNINTERRUPTED, ERROR FREE OR MEET LICENSEE'S 
+SPECIFIC REQUIREMENTS.  THE WARRANTY SET FORTH ABOVE IS IN LIEU OF ALL OTHER 
+EXPRESS WARRANTIES WHETHER ORAL OR WRITTEN.  THE AGENTS, EMPLOYEES, 
+DISTRIBUTORS, AND DEALERS OF ID ARE NOT AUTHORIZED TO MAKE MODIFICATIONS TO 
+THIS WARRANTY, OR ADDITIONAL WARRANTIES ON BEHALF OF ID.  ADDITIONAL 
+STATEMENTS SUCH AS DEALER ADVERTISING OR PRESENTATIONS, WHETHER ORAL OR 
+WRITTEN, DO NOT CONSTITUTE WARRANTIES BY ID AND SHOULD NOT BE RELIED UPON.
+
+     5.   Exclusive Remedies.  You agree that your exclusive remedy against 
+ID, its affiliates, contractors, suppliers, and agents for loss or damage 
+caused by any defect or failure in the Software regardless of the form of 
+action, whether in contract, tort, including negligence, strict liability or
+otherwise, shall be the return of the retail purchase price paid, if any, or 
+replacement of the Software.   This Agreement shall be construed in 
+accordance with and governed by the laws of the State of Texas.  Copyright 
+and other proprietary matters will be governed by United States laws and 
+international treaties.  IN ANY CASE, ID SHALL NOT BE LIABLE FOR LOSS OF 
+DATA, LOSS OF PROFITS, LOST SAVINGS, SPECIAL, INCIDENTAL, CONSEQUENTIAL, 
+INDIRECT OR OTHER SIMILAR DAMAGES ARISING FROM BREACH OF WARRANTY, BREACH OF 
+CONTRACT, NEGLIGENCE, OR OTHER LEGAL THEORY EVEN IF ID OR ITS AGENT HAS BEEN 
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER 
+PARTY.  Some jurisdictions do not allow the exclusion or limitation of 
+incidental or consequential damages, so the above limitation or exclusion 
+may not apply to you.
+
+     6.   General Provisions.  Neither this Agreement nor any part or portion 
+hereof shall be assigned or sublicensed, except as described herein.  Should 
+any provision of this Agreement be held to be void, invalid, unenforceable or 
+illegal by a court, the validity and enforceability of the other provisions 
+shall not be affected thereby.  If any provision is determined to be 
+unenforceable, you agree to a modification of such provision to provide for 
+enforcement of the provision's intent, to the extent permitted by applicable 
+law.  Failure of a party to enforce any provision of this Agreement shall not
+constitute or be construed as a waiver of such provision or of the right to 
+enforce such provision.  If you fail to comply with any terms of this 
+Agreement, YOUR LICENSE IS AUTOMATICALLY TERMINATED.
+
+     YOU ACKNOWLEDGE THAT YOU HAVE READ THIS AGREEMENT, YOU UNDERSTAND THIS
+AGREEMENT, AND UNDERSTAND THAT BY CONTINUING THE INSTALLATION OF THE 
+SOFTWARE, BY LOADING OR RUNNING THE SOFTWARE, OR BY PLACING OR COPYING THE 
+SOFTWARE ONTO YOUR COMPUTER HARD DRIVE, YOU AGREE TO BE BOUND BY THIS 
+AGREEMENT'S TERMS AND CONDITIONS.  YOU FURTHER AGREE THAT, EXCEPT FOR WRITTEN 
+SEPARATE AGREEMENTS BETWEEN ID AND YOU, THIS AGREEMENT IS A COMPLETE AND 
+EXCLUSIVE STATEMENT OF THE RIGHTS AND LIABILITIES OF THE PARTIES.  THIS 
+AGREEMENT SUPERSEDES ALL PRIOR ORAL AGREEMENTS, PROPOSALS OR UNDERSTANDINGS, 
+AND ANY OTHER COMMUNICATIONS BETWEEN ID AND YOU RELATING TO THE SUBJECT 
+MATTER OF THIS AGREEMENT.
+
+The above license does not appear to grant distribution permission.  Email
+from John Carmack of ID Software provided this clarification:
+
+X-Sender: johnc%mail.idsoftware.com@localhost
+X-Mailer: Windows Eudora Pro Version 3.0 (32)
+Date: Sat, 23 Oct 1999 20:01:30 -0500
+To: Joe Drew <hoserhead%woot.net@localhost>
+From: johnc%idsoftware.com@localhost (John Carmack)
+Subject: Re: Doom shareware WAD license
+
+At 08:02 PM 10/23/99 -0400, you wrote:
+>Can you give me a definite license on the doom 1 shareware wad? I find certain
+>things that say "freely distribute" and others that say "get vendor's license"
+>... All I need to have is a license so I can package it up for Debian.
+>Thanks.
+>Joe
+
+The DOOM shareware wad is freely distributable.  No Quake data is freely
+distributable.
+
+John Carmack