Hi all,

In https://marc.info/?l=openbsd-ports&m=156470666814542&w=2 Daniel
Jakots showed that some ports where I'm listed as MAINTAINER have
broken homepages.  Here's the first step to fix that: games/doomdata/
shareware doesn't only have a broken HOMEPAGE, its MASTER_SITES is
also broken.  As id doesn't seem to really have a page on (classic)
doom anymore, I've removed HOMEPAGE.  Thanks to Stuart who still had a
copy of the original file, the broken MASTER_SITES can be fixed by
hosting the distfile myself.

Then, 10 years ago (!!!), Daniel Dickman pointed out that the link to
a quote from John Carmack was *also* broken.  Back then he suggested
including the quote in the Makefile directly as a comment.  Note that
this quote is basically a mail John sent in 1999 (20 years ago!),
explaining that the DOOM shareware wad is freely distributable.  I
promised Daniel to look into this when I had more time .. so with
apologies to Daniel I'm finally coming around to that.

I've tested the wad with games/prboom and can confirm it works fine.

Can someone please review and, if OK, commit this?

Thanks,

Paul

Index: Makefile
===================================================================
RCS file: /home/OpenBSD/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    4 Oct 2019 19:41:33 -0000
@@ -4,21 +4,39 @@ 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/
-
 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
+# The license does not appear to grant distribution permission.  Email
+# from John Carmack of ID Software provided this clarification:
+#
+# X-Sender: [email protected]
+# X-Mailer: Windows Eudora Pro Version 3.0 (32)
+# Date: Sat, 23 Oct 1999 20:01:30 -0500
+# To: Joe Drew <[email protected]>
+# From: [email protected] (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
+#
 PERMIT_PACKAGE =       Yes
 
-MASTER_SITES =         ftp://ftp.idsoftware.com/idstuff/doom/
+MASTER_SITES =         http://www.weirdnet.nl/OpenBSD/ports/dist/
 
 WRKSRC =               ${WRKDIR}
 

-- 
>++++++++[<++++++++++>-]<+++++++.>+++[<------>-]<.>+++[<+
+++++++++++>-]<.>++[<------------>-]<+.--------------.[-]
                 http://www.weirdnet.nl/                 

Reply via email to