pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
doomlegacy-devel: Eliminate MESSAGE
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By: micha
Date: Thu Sep 12 15:38:39 2019 +0200
Changeset: 8339145a1796daa5983ff48c343713b72b9293f8
Modified Files:
doomlegacy-devel/Makefile
doomlegacy-devel/PLIST
doomlegacy-devel/distinfo
Added Files:
doomlegacy-devel/files/INSTALL.pkgsrc
Removed Files:
doomlegacy-devel/MESSAGE.doomlegacy
Log Message:
doomlegacy-devel: Eliminate MESSAGE
Put this information into share/doc hierarchy instead.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8339145a1796daa5983ff48c343713b72b9293f8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
doomlegacy-devel/MESSAGE.doomlegacy | 10 ----------
doomlegacy-devel/Makefile | 20 ++++++++++++++------
doomlegacy-devel/PLIST | 3 ++-
doomlegacy-devel/distinfo | 2 +-
doomlegacy-devel/files/INSTALL.pkgsrc | 6 ++++++
5 files changed, 23 insertions(+), 18 deletions(-)
diffs:
diff --git a/doomlegacy-devel/MESSAGE.doomlegacy b/doomlegacy-devel/MESSAGE.doomlegacy
deleted file mode 100644
index ded7130196..0000000000
--- a/doomlegacy-devel/MESSAGE.doomlegacy
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.doomlegacy,v 1.1 2019/06/17 13:53:22 micha Exp $
-
-Note: The location of the ${PKGNAME} WAD directory has been set to:
-
- ${DOOMWADDIR_CONF}
-
-This is the pkgsrc standard Doom WAD directory location (shared with other
-Doom packages).
-===========================================================================
diff --git a/doomlegacy-devel/Makefile b/doomlegacy-devel/Makefile
index 2892b32739..9ad94434dd 100644
--- a/doomlegacy-devel/Makefile
+++ b/doomlegacy-devel/Makefile
@@ -26,8 +26,8 @@ ONLY_FOR_PLATFORM= Darwin-*-* DragonFly-*-* FreeBSD-*-* Linux-*-* \
NetBSD-*-* OpenBSD-*-* SunOS-*-*
USE_LANGUAGES+= c99
-
USE_TOOLS+= gmake
+# Dependency generation fails with parallel build
MAKE_JOBS_SAFE= no
.include "../../wip/mk/svn-package.mk"
@@ -54,10 +54,6 @@ CFLAGS+= -D__BIG_ENDIAN__
DOOMWADDIR= share/doom
INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 share/doc/doomlegacy ${DOOMWADDIR}
-MESSAGE_SRC+= MESSAGE.doomlegacy
-MESSAGE_SUBST+= PKGNAME=${PKGNAME:C/-.*//}
-MESSAGE_SUBST+= DOOMWADDIR_CONF="${PREFIX}/${DOOMWADDIR}"
-
# Configure to honor environment
SUBST_CLASSES+= makeopt
SUBST_STAGE.makeopt= do-configure
@@ -73,7 +69,15 @@ SUBST_FILES.doomdef= src/doomdef.h
SUBST_SED.doomdef= -e 's,LEGACYWADDIR "/usr/local/share/games/doomlegacy",LEGACYWADDIR "${PREFIX}/${DOOMWADDIR}",g'
SUBST_SED.doomdef+= -e 's,DEFWADS01 "~/games/doomlegacy/wads",DEFWADS01 "${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= ${WRKDIR}/INSTALL.pkgsrc
+SUBST_SED.install= -e 's,DOOMWADDIR,${PREFIX}/${DOOMWADDIR},'
+
pre-configure:
+ ${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
${CP} ${FILESDIR}/doomlegacy.6.in ${WRKDIR}
cd ${WRKSRC} && ${CP} make_options_nix make_options
@@ -96,7 +100,11 @@ do-install:
${DESTDIR}${PREFIX}/${DOOMWADDIR}/legacy.wad; \
cd ${WRKDIR} && \
${INSTALL_MAN} ${WRKDIR}/doomlegacy.6 \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
+ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6; \
+ cd ${WRKDIR} && \
+ ${INSTALL_DATA} INSTALL.pkgsrc \
+ ${DESTDIR}${PREFIX}/share/doc/doomlegacy/INSTALL.pkgsrc
+
# Ensure that at least the shareware Episode 1 of Doom is available
DEPENDS+= doom1-[0-9]*:../../games/doom1
diff --git a/doomlegacy-devel/PLIST b/doomlegacy-devel/PLIST
index 351f5d6655..a349825728 100644
--- a/doomlegacy-devel/PLIST
+++ b/doomlegacy-devel/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2019/06/17 13:53:22 micha Exp $
+@comment $NetBSD$
bin/doomlegacy
man/man6/doomlegacy.6
+share/doc/doomlegacy/INSTALL.pkgsrc
share/doc/doomlegacy/legacy.css
share/doc/doomlegacy/whatsnew.html
share/doom/legacy.wad
diff --git a/doomlegacy-devel/distinfo b/doomlegacy-devel/distinfo
index a04ebee21f..d58d2dbc2e 100644
--- a/doomlegacy-devel/distinfo
+++ b/doomlegacy-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2019/06/17 13:53:22 micha Exp $
+$NetBSD$
SHA1 (doomlegacy_1.47.2_common.zip) = 9e6faaea797b988565a078a47e80bbe2119d78b9
RMD160 (doomlegacy_1.47.2_common.zip) = 1ac1f47563ad2c0d7c5c1bea93a2aaeb1c001c10
diff --git a/doomlegacy-devel/files/INSTALL.pkgsrc b/doomlegacy-devel/files/INSTALL.pkgsrc
new file mode 100644
index 0000000000..b589e67bef
--- /dev/null
+++ b/doomlegacy-devel/files/INSTALL.pkgsrc
@@ -0,0 +1,6 @@
+The location of the doomlegacy WAD directory has been set to:
+
+ DOOMWADDIR
+
+This is the pkgsrc standard Doom WAD directory location (shared with other
+Doom packages).
Home |
Main Index |
Thread Index |
Old Index