pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

doom2-pwad-preacher: Remove MESSAGE, Renamed license



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Fri Aug 23 14:39:05 2019 +0200
Changeset:	3c225a82113f96ec46056bbe4972a8ae4f6acead

Modified Files:
	doom2-pwad-preacher/DESCR
	doom2-pwad-preacher/Makefile
Added Files:
	doom2-pwad-preacher/doom-pwad-license
Removed Files:
	doom2-pwad-preacher/MESSAGE.doom2-pwad-preacher
	doom2-pwad-preacher/preacher-license

Log Message:
doom2-pwad-preacher: Remove MESSAGE, Renamed license

Looks like this is a generic license used by other pwad packages too.
Use a name not specific to this package.
Rewrite the pkgsrc comment to be not specific to this package.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3c225a82113f96ec46056bbe4972a8ae4f6acead

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

diffstat:
 doom2-pwad-preacher/DESCR                       |  6 +++---
 doom2-pwad-preacher/MESSAGE.doom2-pwad-preacher | 10 ----------
 doom2-pwad-preacher/Makefile                    |  2 +-
 doom2-pwad-preacher/doom-pwad-license           | 16 ++++++++++++++++
 doom2-pwad-preacher/preacher-license            | 17 -----------------
 5 files changed, 20 insertions(+), 31 deletions(-)

diffs:
diff --git a/doom2-pwad-preacher/DESCR b/doom2-pwad-preacher/DESCR
index 526c0ddeb4..6532d24d61 100644
--- a/doom2-pwad-preacher/DESCR
+++ b/doom2-pwad-preacher/DESCR
@@ -4,7 +4,7 @@ It has received one of the 2018 Cacowards on Doomworld.
 For the look & feel intended by the author, you need the original Doom II
 from id Software as base (doom2.wad as IWAD).
 If you don't have Doom II, you can use Freedoom (freedoom2.wad as IWAD) to
-play, but the Freedoom graphics don't match well to the style of this mod.
+play, but the Freedoom graphics doesn't match well to the style of this mod.
 
 ===========================================================================
 Advanced engine needed  : Boom compatible
@@ -16,5 +16,5 @@ hears a voice in his head impelling him to take down all evil in the World.
 
 Layouts are open and non linear, and start spots are randomized.
 
-There are graphic and sound replacements, but weapon and enemy behaviours are
-untouched.
+There are graphic and sound replacements, but weapon and enemy behaviours
+are untouched.
diff --git a/doom2-pwad-preacher/MESSAGE.doom2-pwad-preacher b/doom2-pwad-preacher/MESSAGE.doom2-pwad-preacher
deleted file mode 100644
index 6e47d4e05f..0000000000
--- a/doom2-pwad-preacher/MESSAGE.doom2-pwad-preacher
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD$
-
-Note: The PWAD file PREACHER.wad has been installed to:
-
-	${DOOMWADDIR}
-
-This is the pkgsrc standard Doom WAD directory location (shared with other
-Doom packages).
-===========================================================================
diff --git a/doom2-pwad-preacher/Makefile b/doom2-pwad-preacher/Makefile
index 1974e44331..d1f1085e30 100644
--- a/doom2-pwad-preacher/Makefile
+++ b/doom2-pwad-preacher/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=		.zip
 
 MAINTAINER=		micha%NetBSD.org@localhost
 COMMENT=		Doom II mod
-LICENSE=		preacher-license
+LICENSE=		doom-pwad-license
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/doom2-pwad-preacher/doom-pwad-license b/doom2-pwad-preacher/doom-pwad-license
new file mode 100644
index 0000000000..6f63c184da
--- /dev/null
+++ b/doom2-pwad-preacher/doom-pwad-license
@@ -0,0 +1,16 @@
+================================================================================
+Authors may NOT use the contents of this file as a base for modification or
+reuse [without explicit permission of the original mappers].  Permissions
+have been obtained from original authors for any of their resources modified
+or included in this file.
+
+You MAY distribute this file, provided you include this text file, with no
+modifications.  You may distribute this file in any electronic format (BBS,
+Diskette, CD, etc) as long as you include this file intact.  I have
+received permission from the original authors of any modified or included
+content in this file to allow further distribution.
+================================================================================
+
+Note for pkgsrc:
+The "text file" referenced in the license above is included in the package
+and installed to the ${PREFIX}/share/doom directory.
diff --git a/doom2-pwad-preacher/preacher-license b/doom2-pwad-preacher/preacher-license
deleted file mode 100644
index 54a97ce442..0000000000
--- a/doom2-pwad-preacher/preacher-license
+++ /dev/null
@@ -1,17 +0,0 @@
-================================================================================
-Authors may NOT use the contents of this file as a base for modification or
-reuse.  Permissions have been obtained from original authors for any of
-their resources modified or included in this file.
-
-You MAY distribute this file, provided you include this text file, with no
-modifications.  You may distribute this file in any electronic format (BBS,
-Diskette, CD, etc) as long as you include this file intact.  I have
-received permission from the original authors of any modified or included
-content in this file to allow further distribution.
-================================================================================
-
-Note for pkgsrc:
-The "text file" referenced in the license text above is installed as
-PREACHER.txt to the ${PREFIX}/share/doom directory. The name was converted to
-uppercase so that it is printed next to PREACHER.wad in a directory listing.
-The content is unmodified!


Home | Main Index | Thread Index | Old Index