On Fri, Nov 01, 2019 at 05:12:10PM +0100, Paul de Weerd wrote:
> Hi Jonathan,
>
> On Mon, Oct 28, 2019 at 08:13:39PM +1100, Jonathan Gray wrote:
> | Perhaps include the email and the original license text as files
> | which are installed?
>
> I like this approach even better. I'm OK with your diff.
>
> Thanks!
>
> Paul
Sorry to drag this out but doing some more digging it turns out that
doom 1.8 shareware has LICENSE.DOC which adds a clause allowing
electronic distribution. Still not sure why the 1.9 shareware didn't
include LICENSE.DOC/VENDOR.DOC.
" 2. Commercial Use is Prohibited: Under no circumstances shall you, the
end
user, be permitted, allowed or authorized to commercially exploit the
Software.
Neither you nor anyone at your direction shall do the following acts:
a. Rent the Software;
b. Sell the Software;
c. Lease the Software;
d. Offer the Software on a pay-per-play basis;
e. Distribute the Software for money or other consideration; or
f. In any manner and through any medium whatsoever commercially exploit the
software or use the software for any commercial purpose.;
3 Electronic Distribution is Permitted: ID grants to you the right to
distribute, royalty free
and by electronic means only, the Software; provided, however the Software must
be so
distributed only in compressed format."
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/doomdata/shareware/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 12 Jul 2019 20:46:16 -0000 1.4
+++ Makefile 2 Nov 2019 02:35:47 -0000
@@ -4,30 +4,40 @@ COMMENT = DOOM I Shareware data files
DISTNAME = doom19s
PKGNAME = doomdata-1.9
-REVISION = 0
+REVISION = 1
EXTRACT_SUFX = .zip
CATEGORIES = games
-HOMEPAGE = http://www.idsoftware.com/games/doom/doom-collectors/
+DISTFILES = doom_v18.zip doom19s.zip:0
MAINTAINER = Paul de Weerd <[email protected]>
PKG_ARCH = *
-# John Carmack says "freely distributable" :
-#
http://sinusforschung.com/cgi-bin/dwww/usr/share/doc/doom-wad-shareware/copyright
+# no commercial use, electronic distribution permitted
PERMIT_PACKAGE = Yes
-MASTER_SITES = ftp://ftp.idsoftware.com/idstuff/doom/
+# 1.8 first so 1.9 files are preferred
+MASTER_SITES = http://www.gamers.org/pub/idgames/historic/
+MASTER_SITES0 = http://www.gamers.org/pub/idgames/idstuff/doom/
WRKSRC = ${WRKDIR}
do-build:
- cd ${WRKBUILD} && cat DOOMS_19.[12] > DOOMS_19.ZIP
- cd ${WRKBUILD} && unzip DOOMS_19.ZIP
+ cd ${WRKBUILD} && cat DOOMS_19.[12] > DOOMS_19.ZIP && \
+ unzip DOOMS_19.ZIP
+ cd ${WRKBUILD} && cat DOOM18S.[12] > DOOM18S.ZIP && \
+ unzip DOOM18S.ZIP LICENSE.DOC VENDOR.DOC && \
+ tr -d '\r' < LICENSE.DOC > LICENSE && \
+ tr -d '\r' < VENDOR.DOC > VENDOR
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doom/
${INSTALL_DATA} ${WRKBUILD}/DOOM1.WAD ${PREFIX}/share/doom/doom1.wad
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/doomdata/
+ ${INSTALL_DATA} ${WRKBUILD}/LICENSE \
+ ${PREFIX}/share/doc/doomdata/LICENSE.DOC
+ ${INSTALL_DATA} ${WRKBUILD}/VENDOR \
+ ${PREFIX}/share/doc/doomdata/VENDOR.DOC
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/doomdata/shareware/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 18 Jan 2015 03:13:57 -0000 1.2
+++ distinfo 2 Nov 2019 02:35:47 -0000
@@ -1,2 +1,4 @@
SHA256 (doom19s.zip) = ys8BQrMcoa8AeWtKAzngeZKsXyG8P4HnUy/hteG0huY=
+SHA256 (doom_v18.zip) = OLQC8z5eG+EyIIhhRYuKvKvBnw/jrlz9e8v4j9y8r4g=
SIZE (doom19s.zip) = 2450688
+SIZE (doom_v18.zip) = 2481633
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/doomdata/shareware/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 23 Mar 2012 09:05:23 -0000 1.2
+++ pkg/PLIST 2 Nov 2019 02:35:47 -0000
@@ -1,3 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2012/03/23 09:05:23 rfreeman Exp $
+share/doc/doomdata/
+share/doc/doomdata/LICENSE.DOC
+share/doc/doomdata/VENDOR.DOC
share/doom/
share/doom/doom1.wad
