doomlegacy devel: Update to SVN revision 1596

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Mon Oct 18 13:29:52 2021 +0200
Changeset:	893a86ff61292bc16efa94d1306afaf05b1b38fd

Modified Files:
	doomlegacy-devel/Makefile
	doomlegacy-devel/TODO
	doomlegacy-devel/distinfo
Removed Files:
	doomlegacy-devel/patches/patch-src_hardware_hw__main.c

Log Message:
doomlegacy devel: Update to SVN revision 1596

Fix for bug #679 merged upstream. pkgsrc patch removed.

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

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

diffstat:
 doomlegacy-devel/Makefile                              |  2 +-
 doomlegacy-devel/TODO                                  |  2 ++
 doomlegacy-devel/distinfo                              |  1 -
 doomlegacy-devel/patches/patch-src_hardware_hw__main.c | 18 ------------------
 4 files changed, 3 insertions(+), 20 deletions(-)

diffs:
diff --git a/doomlegacy-devel/Makefile b/doomlegacy-devel/Makefile
index 7a69ecfbf2..296c1fa543 100644
--- a/doomlegacy-devel/Makefile
+++ b/doomlegacy-devel/Makefile
@@ -2,7 +2,7 @@
 
 VERS=		1.48.8
 #PKGNAME=	doomlegacy-${VERS}
-SVNVERS=	1595
+SVNVERS=	1596
 DISTNAME=	doomlegacy-devel-0r${SVNVERS}
 CATEGORIES=	games
 
diff --git a/doomlegacy-devel/TODO b/doomlegacy-devel/TODO
index 54011ba09d..3a9e463020 100644
--- a/doomlegacy-devel/TODO
+++ b/doomlegacy-devel/TODO
@@ -67,5 +67,7 @@ Tested with GCC 7.4.0.
 
 [X] Created upstream bug report #679
 
+Merged in SVN revision 1596.
+
 
 EOF
diff --git a/doomlegacy-devel/distinfo b/doomlegacy-devel/distinfo
index 3a82a1633c..2bf3b23ab5 100644
--- a/doomlegacy-devel/distinfo
+++ b/doomlegacy-devel/distinfo
@@ -5,4 +5,3 @@ 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_am__map.c) = 14b3c8b70c63778ad043827ab2f0b6f4fe07bcde
-SHA1 (patch-src_hardware_hw__main.c) = 39fb78e49e8ea155f6bce07780ed2cab3d5353e6
diff --git a/doomlegacy-devel/patches/patch-src_hardware_hw__main.c b/doomlegacy-devel/patches/patch-src_hardware_hw__main.c
deleted file mode 100644
index 56c522f153..0000000000
--- a/doomlegacy-devel/patches/patch-src_hardware_hw__main.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Add null statement in #else branch. Otherwise a label is located at the end of
-a block.
-https://sourceforge.net/p/doomlegacy/bugs/679/
-
---- src/hardware/hw_main.c.orig	2021-10-15 10:34:51.000000000 +0000
-+++ src/hardware/hw_main.c
-@@ -3118,6 +3118,9 @@ bad_subsector:
-         // Error situations, should not get here.
- #ifdef PARANOIA
-         GenPrintf( EMSG_warn, "Bad BSP subsector: %i\n", subsecnum );
-+#else
-+       // [MB] Required for the label "bad_subsector" (block ends here)
-+       ;  // [MB] null statement as defined in C99 Section 6.8.3
- #endif
-     }
-     return;