From 6dbd89070fe1573b0cb5730079e45e1817b70fd8 Mon Sep 17 00:00:00 2001
From: Michael Baeuerle <micha@NetBSD.org>
Date: Mon, 4 Jan 2021 17:51:40 +0100
Subject: [PATCH] doomlegacy-devel: Update to SVN revision 1568

Sync with games/doomlegacy.
---
 doomlegacy-devel/Makefile |  8 +++++---
 doomlegacy-devel/TODO     | 33 ++-------------------------------
 doomlegacy-devel/distinfo |  8 ++++----
 3 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/doomlegacy-devel/Makefile b/doomlegacy-devel/Makefile
index fcc84618dc..9477e0da0e 100644
--- a/doomlegacy-devel/Makefile
+++ b/doomlegacy-devel/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD$
 
-VERS=		1.48.6
+VERS=		1.48.8
 #PKGNAME=	doomlegacy-${VERS}
-SVNVERS=	1567
+SVNVERS=	1568
 DISTNAME=	doomlegacy-devel-0r${SVNVERS}
 CATEGORIES=	games
 
@@ -20,6 +20,8 @@ LICENSE=		gnu-gpl-v2
 
 CONFLICTS+=		doomlegacy-[0-9]*
 
+#GCC_REQD+=		10
+
 # Tested on Linux/ppc (32bit Big Endian) and NetBSD/amd64 (64bit Little Endian)
 # Untested: In general the source code has support for the other listed OS too
 ONLY_FOR_PLATFORM=	Darwin-*-* DragonFly-*-* FreeBSD-*-* Linux-*-* \
@@ -70,7 +72,7 @@ SUBST_SED.makeopt=	-e 's,\#[ ]*COMP_ENVIRONMENT,COMP_ENVIRONMENT,'
 SUBST_SED.makeopt+=	-e 's,HAVE_LIBZIP,\# HAVE_LIBZIP,'
 SUBST_SED.makeopt+=	-e 's,HAVE_DLOPEN,\# HAVE_DLOPEN,'
 SUBST_SED.makeopt+=	-e 's,\# ARCH=-march=native,ARCH=-march=native,'
-SUBST_SED.makeopt+=	-e 's,\ARCH=-march=i686,\# ARCH=-march=native,'
+SUBST_SED.makeopt+=	-e 's,ARCH=-march=i686,\# ARCH=-march=native,'
 # Enable debug build
 #SUBST_SED.makeopt+=	-e 's,\# DEBUG=1,DEBUG=1,'
 
diff --git a/doomlegacy-devel/TODO b/doomlegacy-devel/TODO
index ba1961783a..09689fcc12 100644
--- a/doomlegacy-devel/TODO
+++ b/doomlegacy-devel/TODO
@@ -42,39 +42,10 @@ Make it possible to play maps with broken blockmaps (or no blockmaps at all).
 [X] Updated upstream feature request #96
 
 
-Part 14: Import final release
-=============================
-[X] Import version 1.48.6 to pkgsrc
-    Parts 10 to 13 are now available in games/doomlegacy
-
-
-Part 15: Savegame buffer overflow
-=================================
-[X] Created upstream bug report #667
-[X] Investigate crash with Antaresian Reliquary (Maps 4 and 6)
-    https://doomworld.com/idgames/levels/doom2/Ports/a-c/anta_req
-    Fixed in SVN revision 1553
-    => Works as expected
-
-
-Part 16: Sky is not rendered correctly
-======================================
-[X] Created upstream bug report #668
-    Fixed in SVN revision 1560
-    => Works as expected
-
-
-Part 17: Undefined behaviour
-============================
-GCC 10 produce several warnings while compiling the code.
-[X] Created upstream bug report #671
-    Fixed in SVN revisions 1561 and 1564
-    => Works as expected
-
-
 Part 18: Import final release
 =============================
-[ ] Import version 1.48.8 to pkgsrc
+[X] Import version 1.48.8 to pkgsrc
+    Parts 10 to 17 are now available in games/doomlegacy
 
 
 EOF
diff --git a/doomlegacy-devel/distinfo b/doomlegacy-devel/distinfo
index 8554f6b352..e91a1c5b04 100644
--- a/doomlegacy-devel/distinfo
+++ b/doomlegacy-devel/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (doomlegacy_1.48.6_common.zip) = 24662975b4f4d5fa0e4e09747029014159dcfe81
-RMD160 (doomlegacy_1.48.6_common.zip) = d5c0e8edc763d92e84494766f14c3ff995a60965
-SHA512 (doomlegacy_1.48.6_common.zip) = 92ab453df6c48397f1228e922e04d5426f445c87683265f6ee5543662631eeaf1696d2681c1d3015b2821a644241c1c691d1a6c7ba6abacf07eb4fce050e020f
-Size (doomlegacy_1.48.6_common.zip) = 1007223 bytes
+SHA1 (doomlegacy_1.48.8_common.zip) = 536f387824d50208e7494547afd21a92a6ef877d
+RMD160 (doomlegacy_1.48.8_common.zip) = 7fa66010f384411972f052ecf3676ce22d43f267
+SHA512 (doomlegacy_1.48.8_common.zip) = 4b93aed03bcfd9eb0dd22f0b9231e93e63ee2cc0eee6a3a9854def384c4c290dbdb586eb8d888392c53d8a5d549718eb7b4f55cecb1c4924c03b18125876b292
+Size (doomlegacy_1.48.8_common.zip) = 1011350 bytes
 SHA1 (patch-src_Makefile) = 34c323bdd96787cb6afe0be5dc99b129ab8f1552
 SHA1 (patch-src_am__map.c) = 14b3c8b70c63778ad043827ab2f0b6f4fe07bcde
 SHA1 (patch-src_doomdata.h) = 8c3186dafbf11a8a75262a06755dd9807cb58612