doomlegacy-devel: Update to SVN revision 1471

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: doomlegacy-devel: Update to SVN revision 1471
From: Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Date: Fri, 04 Oct 2019 11:18:46 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Fri Oct 4 13:18:46 2019 +0200
Changeset:	070b0069d15ae7911e5bd1526aeaa43fe396662b

Modified Files:
	doomlegacy-devel/Makefile
	doomlegacy-devel/PLIST
	doomlegacy-devel/TODO
	doomlegacy-devel/distinfo
Added Files:
	doomlegacy-devel/files/doomlegacy.sh
Removed Files:
	doomlegacy-devel/patches/patch-src_d__main.c

Log Message:
doomlegacy-devel: Update to SVN revision 1471

- Drop pkgsrc patch for launcher, replaced with start script
- Update TODO

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

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

diffstat:
 doomlegacy-devel/Makefile                    | 39 ++++++++++++++--------------
 doomlegacy-devel/PLIST                       |  1 +
 doomlegacy-devel/TODO                        |  7 +++++
 doomlegacy-devel/distinfo                    |  1 -
 doomlegacy-devel/files/doomlegacy.sh         | 12 +++++++++
 doomlegacy-devel/patches/patch-src_d__main.c | 21 ---------------
 6 files changed, 40 insertions(+), 41 deletions(-)

diffs:
diff --git a/doomlegacy-devel/Makefile b/doomlegacy-devel/Makefile
index 19a38e457c..02546c1e23 100644
--- a/doomlegacy-devel/Makefile
+++ b/doomlegacy-devel/Makefile
@@ -2,8 +2,8 @@
 
 VERS=		1.47.2
 #PKGNAME=	doomlegacy-${VERS}
-SVNVERS=	1460
-DISTNAME=	doomlegacy-devel-r${SVNVERS}
+SVNVERS=	1471
+DISTNAME=	doomlegacy-devel-0r${SVNVERS}
 CATEGORIES=	games
 
 DISTFILES=			doomlegacy_${VERS}_common.zip
@@ -11,7 +11,7 @@ MASTER_SITES=			${MASTER_SITE_SOURCEFORGE:=doomlegacy/}
 SVN_REPOSITORIES=		legacy_one
 SVN_REPO.legacy_one=		svn://svn.code.sf.net/p/doomlegacy/svn/legacy_one/trunk
 SVN_REVISION.legacy_one=	${SVNVERS}
-SVN_EXTRACTDIR.legacy_one=	doomlegacy-devel-r${SVNVERS}
+SVN_EXTRACTDIR.legacy_one=	doomlegacy-devel-0r${SVNVERS}
 
 MAINTAINER=		micha%NetBSD.org@localhost
 HOMEPAGE=		http://doomlegacy.sourceforge.net/
@@ -78,32 +78,33 @@ SUBST_SED.install=	-e 's,DOOMWADDIR,${PREFIX}/${DOOMWADDIR},'
 
 pre-configure:
 	${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
+	${CP} ${FILESDIR}/doomlegacy.sh ${WRKDIR}
 	${CP} ${FILESDIR}/doomlegacy.6.in ${WRKDIR}
 	cd ${WRKSRC} && ${CP} make_options_nix make_options
 
 # Move configure options and process manpage template
 do-configure:
-	cd ${WRKDIR} &&							\
-		${SED} -e 's,$$NAME,doomlegacy,g'			\
-			-e 's,$$VERSION,${VERS},g'			\
-			-e 's,$$WADDIR,${PREFIX}/${DOOMWADDIR},g'	\
-			doomlegacy.6.in >doomlegacy.6
+	cd ${WRKDIR} && ${SED} -e 's,$$PREFIX,${PREFIX},'		\
+		 doomlegacy.sh >doomlegacy
+	cd ${WRKDIR} && ${SED} -e 's,$$NAME,doomlegacy,g'		\
+		-e 's,$$VERSION,${VERS},g'				\
+		-e 's,$$WADDIR,${PREFIX}/${DOOMWADDIR},g'		\
+		doomlegacy.6.in >doomlegacy.6
 
 do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/doomlegacy			\
+		${DESTDIR}${PREFIX}/bin/doomlegacy.bin
+	${INSTALL_SCRIPT} ${WRKDIR}/doomlegacy				\
+		${DESTDIR}${PREFIX}/bin/doomlegacy
+	${INSTALL_DATA} ${WRKDIR}/doomlegacy_${VERS}/legacy.wad		\
+		${DESTDIR}${PREFIX}/${DOOMWADDIR}/legacy.wad
 	cd ${WRKSRC} &&							\
-		${INSTALL_PROGRAM} bin/doomlegacy			\
-			${DESTDIR}${PREFIX}/bin;			\
 		${INSTALL_DATA} docs/legacy.css docs/whatsnew.html	\
 			${DESTDIR}${PREFIX}/share/doc/doomlegacy
-	cd ${WRKDIR}/doomlegacy_${VERS} &&				\
-		${INSTALL_DATA} legacy.wad				\
-			${DESTDIR}${PREFIX}/${DOOMWADDIR}/legacy.wad
-	cd ${WRKDIR} &&							\
-		${INSTALL_MAN} ${WRKDIR}/doomlegacy.6			\
-			${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
-	cd ${WRKDIR} &&							\
-		${INSTALL_DATA} INSTALL.pkgsrc				\
-			${DESTDIR}${PREFIX}/share/doc/doomlegacy/INSTALL.pkgsrc
+	${INSTALL_DATA} ${WRKDIR}/INSTALL.pkgsrc			\
+		${DESTDIR}${PREFIX}/share/doc/doomlegacy/INSTALL.pkgsrc
+	${INSTALL_MAN} ${WRKDIR}/doomlegacy.6				\
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
 
 
 # Ensure that at least the shareware Episode 1 of Doom is available
diff --git a/doomlegacy-devel/PLIST b/doomlegacy-devel/PLIST
index a349825728..80dbb48818 100644
--- a/doomlegacy-devel/PLIST
+++ b/doomlegacy-devel/PLIST
@@ -1,5 +1,6 @@
 @comment $NetBSD$
 bin/doomlegacy
+bin/doomlegacy.bin
 man/man6/doomlegacy.6
 share/doc/doomlegacy/INSTALL.pkgsrc
 share/doc/doomlegacy/legacy.css
diff --git a/doomlegacy-devel/TODO b/doomlegacy-devel/TODO
index 1a1d23f94a..11db3ae134 100644
--- a/doomlegacy-devel/TODO
+++ b/doomlegacy-devel/TODO
@@ -83,4 +83,11 @@ Some compressed blockmaps can interfere with the overflow detection.
 Part 4 finished.
 
 
+Part 5: Rendering problems on big endian machine
+================================================
+On some maps the rendering is broken (only in parts of the map).
+
+[X] Reported upstream as Bug #655
+
+
 EOF
diff --git a/doomlegacy-devel/distinfo b/doomlegacy-devel/distinfo
index d58d2dbc2e..1a9cfbc2e3 100644
--- a/doomlegacy-devel/distinfo
+++ b/doomlegacy-devel/distinfo
@@ -5,4 +5,3 @@ RMD160 (doomlegacy_1.47.2_common.zip) = 1ac1f47563ad2c0d7c5c1bea93a2aaeb1c001c10
 SHA512 (doomlegacy_1.47.2_common.zip) = 7c7c2a0cbab5b9b4645a3fe166addd597de533db7ab41f8011c6c526a868bb04c8dd6b0d27b48765406fbab328bf64fc7827770b395e6c0e5d861d99c4d3865a
 Size (doomlegacy_1.47.2_common.zip) = 981654 bytes
 SHA1 (patch-src_am__map.c) = 8d7d17d29c0934c92ca933e8976a5ecc692e465d
-SHA1 (patch-src_d__main.c) = 3311e44522e863fa3e1a855754b876c03c96f128
diff --git a/doomlegacy-devel/files/doomlegacy.sh b/doomlegacy-devel/files/doomlegacy.sh
new file mode 100644
index 0000000000..9bff891517
--- /dev/null
+++ b/doomlegacy-devel/files/doomlegacy.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+#
+# Start script for doomlegacy
+#
+# The option "-no_launcher" doesn't exist, but disables the launcher
+# (this method was suggested by upstream).
+#
+
+$PREFIX/bin/doomlegacy.bin -no_launcher $@
+
+
+# EOF
diff --git a/doomlegacy-devel/patches/patch-src_d__main.c b/doomlegacy-devel/patches/patch-src_d__main.c
deleted file mode 100644
index b98e8c7e4c..0000000000
--- a/doomlegacy-devel/patches/patch-src_d__main.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-Without command line arguments the launcher menu is displayed by default.
-This is not desired because we have already prepared the shareware Episode 1
-for pkgsrc.
-
---- src/d_main.c.orig	2019-08-21 09:16:46.000000000 +0000
-+++ src/d_main.c
-@@ -2578,8 +2578,10 @@ restart_command:
-     EOUT_flags = EOUT_text | EOUT_log | EOUT_con;
- 
- 
--#ifdef LAUNCHER   
--    if ( fatal_error || init_sequence == 1 || (init_sequence == 0 && myargc < 2 ))
-+#ifdef LAUNCHER
-+    // Disable argc check for pkgsrc (shareware episode already prepared)
-+    // if ( fatal_error || init_sequence == 1 || (init_sequence == 0 && myargc < 2 ))
-+    if ( fatal_error || init_sequence == 1 )
-     {
-         // [WDJ] Invoke built-in launcher command line
- #if 0
Prev by Date: file-roller: Add reference to CVE-2019-16680
Next by Date: eureka-devel: Update TODO
Previous by Thread: file-roller: Add reference to CVE-2019-16680
Next by Thread: eureka-devel: Update TODO
Indexes:
Home | Main Index | Thread Index | Old Index