freedoom,doom2-pwad-struggle: Drop MESSAGE, install info to share/doc instead

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: freedoom,doom2-pwad-struggle: Drop MESSAGE, install info to share/doc instead
From: Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Date: Fri, 23 Aug 2019 12:46:25 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Fri Aug 23 14:46:25 2019 +0200
Changeset:	108ec61bb4c77317d21ca7d262c8ce3f8776bc0f

Modified Files:
	doom2-pwad-struggle/DESCR
	doom2-pwad-struggle/Makefile
	doom2-pwad-struggle/PLIST
	freedoom/Makefile
	freedoom/PLIST
Added Files:
	doom2-pwad-struggle/files/INSTALL.pkgsrc
	freedoom/files/INSTALL.pkgsrc
Removed Files:
	doom2-pwad-struggle/MESSAGE.doom2-pwad-struggle
	freedoom/MESSAGE.freedoom

Log Message:
freedoom,doom2-pwad-struggle: Drop MESSAGE, install info to share/doc instead

Suggested by wiz@.

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

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

diffstat:
 doom2-pwad-struggle/DESCR                       |  2 +-
 doom2-pwad-struggle/MESSAGE.doom2-pwad-struggle | 10 ----------
 doom2-pwad-struggle/Makefile                    | 18 +++++++++++++++---
 doom2-pwad-struggle/PLIST                       |  1 +
 doom2-pwad-struggle/files/INSTALL.pkgsrc        |  6 ++++++
 freedoom/MESSAGE.freedoom                       | 10 ----------
 freedoom/Makefile                               | 17 ++++++++++++++---
 freedoom/PLIST                                  |  1 +
 freedoom/files/INSTALL.pkgsrc                   |  6 ++++++
 9 files changed, 44 insertions(+), 27 deletions(-)

diffs:
diff --git a/doom2-pwad-struggle/DESCR b/doom2-pwad-struggle/DESCR
index bc3110e486..f54b7ceba2 100644
--- a/doom2-pwad-struggle/DESCR
+++ b/doom2-pwad-struggle/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  : Limit removing compatibility
diff --git a/doom2-pwad-struggle/MESSAGE.doom2-pwad-struggle b/doom2-pwad-struggle/MESSAGE.doom2-pwad-struggle
deleted file mode 100644
index f56291536e..0000000000
--- a/doom2-pwad-struggle/MESSAGE.doom2-pwad-struggle
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD$
-
-Note: The PWAD files STRG.wad and STRG_M28.wad have been installed to:
-
-	${DOOMWADDIR}
-
-This is the pkgsrc standard Doom WAD directory location (shared with other
-Doom packages).
-===========================================================================
diff --git a/doom2-pwad-struggle/Makefile b/doom2-pwad-struggle/Makefile
index 9f2dae7970..54cd822b3d 100644
--- a/doom2-pwad-struggle/Makefile
+++ b/doom2-pwad-struggle/Makefile
@@ -3,6 +3,7 @@
 DISTNAME=		strg
 # Use release date from STRG.txt as package version
 PKGNAME=		doom2-pwad-struggle-20180819
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.fu-berlin.de/pc/games/idgames/levels/doom2/Ports/megawads/
 MASTER_SITES+=		ftp://mirrors.syringanetworks.net/idgames/levels/doom2/Ports/megawads/
@@ -16,13 +17,21 @@ LICENSE=		cc-by-nc-v4.0
 
 # DOOMWADDIR is intentionally shared with other Doom packages
 DOOMWADDIR=		share/doom
-INSTALLATION_DIRS=	${DOOMWADDIR}
+INSTALLATION_DIRS=	${DOOMWADDIR} share/doc/doom2-pwad-struggle
 
-MESSAGE_SRC+=		MESSAGE.doom2-pwad-struggle
-MESSAGE_SUBST+=		DOOMWADDIR="${PREFIX}/${DOOMWADDIR}"
+# Configure INSTALL.pkgsrc (formerly displayed as MESSAGE)
+SUBST_CLASSES+=		install
+SUBST_STAGE.install=	do-configure
+SUBST_MESSAGE.install=	Preparing INSTALL.pkgsrc file ...
+SUBST_FILES.install=	INSTALL.pkgsrc
+SUBST_SED.install=	-e 's,DOOMWADDIR,${PREFIX}/${DOOMWADDIR},'
 
 NO_BUILD=		yes
 
+pre-configure:
+	${MKDIR} ${WRKSRC}
+	${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKSRC}
+
 do-install:
 	cd ${WRKDIR} &&							\
 		${INSTALL_DATA} STRG.wad				\
@@ -31,5 +40,8 @@ do-install:
 			${DESTDIR}${PREFIX}/${DOOMWADDIR}/STRG_M28.wad;	\
 		${INSTALL_DATA} STRG.txt				\
 			${DESTDIR}${PREFIX}/${DOOMWADDIR}/STRG.txt
+	cd ${WRKSRC} &&							\
+		${INSTALL_DATA} INSTALL.pkgsrc				\
+			${DESTDIR}${PREFIX}/share/doc/doom2-pwad-struggle/INSTALL.pkgsrc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/doom2-pwad-struggle/PLIST b/doom2-pwad-struggle/PLIST
index 21563373ff..adc0735b03 100644
--- a/doom2-pwad-struggle/PLIST
+++ b/doom2-pwad-struggle/PLIST
@@ -1,4 +1,5 @@
 @comment $NetBSD$
+share/doc/doom2-pwad-struggle/INSTALL.pkgsrc
 share/doom/STRG.txt
 share/doom/STRG.wad
 share/doom/STRG_M28.wad
diff --git a/doom2-pwad-struggle/files/INSTALL.pkgsrc b/doom2-pwad-struggle/files/INSTALL.pkgsrc
new file mode 100644
index 0000000000..7c20e892d9
--- /dev/null
+++ b/doom2-pwad-struggle/files/INSTALL.pkgsrc
@@ -0,0 +1,6 @@
+The PWAD files STRG.wad and STRG_M28.wad have been installed to:
+
+   DOOMWADDIR
+
+This is the pkgsrc standard Doom WAD directory location (shared with other Doom
+packages).
diff --git a/freedoom/MESSAGE.freedoom b/freedoom/MESSAGE.freedoom
deleted file mode 100644
index 577a95147c..0000000000
--- a/freedoom/MESSAGE.freedoom
+++ /dev/null
@@ -1,10 +0,0 @@
-============================================================================
-$NetBSD$
-
-Note: The IWAD files freedoom1.wad and freedoom2.wad have been installed to:
-
-	${DOOMWADDIR}
-
-This is the pkgsrc standard Doom WAD directory location (shared with other
-Doom packages).
-============================================================================
diff --git a/freedoom/Makefile b/freedoom/Makefile
index 70b30b090a..b4c0de8430 100644
--- a/freedoom/Makefile
+++ b/freedoom/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	freedoom-0.11.3
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=freedoom/}
 GITHUB_RELEASE=	v${PKGVERSION_NOREV}
@@ -15,17 +16,27 @@ USE_LANGUAGES=	# none
 
 # DOOMWADDIR is intentionally shared with other Doom packages
 DOOMWADDIR=		share/doom
-INSTALLATION_DIRS=	${DOOMWADDIR}
+INSTALLATION_DIRS=	${DOOMWADDIR} share/doc/freedoom
 
-MESSAGE_SRC+=		MESSAGE.freedoom
-MESSAGE_SUBST+=		DOOMWADDIR="${PREFIX}/${DOOMWADDIR}"
+# Configure INSTALL.pkgsrc (formerly displayed as MESSAGE)
+SUBST_CLASSES+=		install
+SUBST_STAGE.install=	do-configure
+SUBST_MESSAGE.install=	Preparing INSTALL.pkgsrc file ...
+SUBST_FILES.install=	INSTALL.pkgsrc
+SUBST_SED.install=	-e 's,DOOMWADDIR,${PREFIX}/${DOOMWADDIR},'
 
 NO_BUILD=		yes
 
+pre-configure:
+	${MKDIR} ${WRKSRC}
+	${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKSRC}
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/freedoom1.wad \
 		${DESTDIR}${PREFIX}/share/doom/freedoom1.wad
 	${INSTALL_DATA} ${WRKSRC}/freedoom2.wad \
 		${DESTDIR}${PREFIX}/share/doom/freedoom2.wad
+	${INSTALL_DATA} ${WRKSRC}/INSTALL.pkgsrc \
+		${DESTDIR}${PREFIX}/share/doc/freedoom/INSTALL.pkgsrc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/freedoom/PLIST b/freedoom/PLIST
index 602e5d8b67..89a0880bc8 100644
--- a/freedoom/PLIST
+++ b/freedoom/PLIST
@@ -1,3 +1,4 @@
 @comment $NetBSD$
+share/doc/freedoom/INSTALL.pkgsrc
 share/doom/freedoom1.wad
 share/doom/freedoom2.wad
diff --git a/freedoom/files/INSTALL.pkgsrc b/freedoom/files/INSTALL.pkgsrc
new file mode 100644
index 0000000000..e07c4e302c
--- /dev/null
+++ b/freedoom/files/INSTALL.pkgsrc
@@ -0,0 +1,6 @@
+The IWAD files freedoom1.wad and freedoom2.wad have been installed to:
+
+   DOOMWADDIR
+
+This is the pkgsrc standard Doom WAD directory location (shared with other Doom
+packages).
Prev by Date: doom2-pwad-preacher: Remove MESSAGE, Renamed license
Next by Date: doom-pwad-sigil: Import Doom Episode 5 as wip/doom-pwad-sigil
Previous by Thread: doom2-pwad-preacher: Remove MESSAGE, Renamed license
Next by Thread: doom-pwad-sigil: Import Doom Episode 5 as wip/doom-pwad-sigil
Indexes:
Home | Main Index | Thread Index | Old Index