games/woof: Update to 7.0.0

Woof! 7.0.0
-----------
- Options loaded from a PWAD are now disabled in the menu instead of
  merely skipped (@rfomin).
- Trim trailing spaces off the demo footer.
- OPL emulation based on Nuked OPL3 Version1.8 has been ported over
  from Chocolate Doom.
- Avoid namespace clash with the time symbol, e.g. on SmartOS.
- Use unambigious integer types in the BMP screenshot saving code.
- The Alt-Tab bug workaround has been extended to SDL 2.0.16 (@rfomin).
- The actual sample frequency is now fed back into snd_samplerate config
  variable.
- Native Windows MIDI support has been implemented, replacing
  woof-midiproc (@rfomin).
- The demo_version value is now logged in P_SetupLevel().
- Don't change MUSINFO music if nomusicparm is set (@rfomin).
- Fix wrong generalised door sounds (@rfomin).
- Fix the Boom elevators movement interpolation (@rfomin).
- Enable cosmetic compatibility options for all complevels, i.e.
  comp_blazing, comp_doorlight and comp_skymap (@rfomin).
- Next level key also skips the current demo (@rfomin).
- cmake: always unzip SDL2 binaries in build directory (@melak47).
- Fix M_PAUSE graphics location in hires mode (@rfomin).
- Make keyed doors flash on the automap, ported over from Crispy Doom
  (@rfomin).
- Keep the map static in overlay mode if not following the player.
- Implement DSDHacked support (@rfomin).
- Fix the dehacked string replacement behavior (@rfomin).
- Fixed a bug in DeHackEd string replacements with a length of exactly
  four (@JadingTsunami).
- Add comp_voodooscroller, MBF21 v1.3 update (@rfomin).
- Demo features (@rfomin).
    - If a new game is started during demo recording, start a new demo.
    - Add key to finish demo recording.
    - Count spawned monsters
    - Add demo file name suffix counter, rngseed is generated before
      restart recording.
- Use SDL functions to load a WAV lump (@rfomin).

3 files changed, 7 insertions, 64 deletions

diff --git a/games/woof/Makefile b/games/woof/Makefile
index d16a93e0d39..23b455334e3 100644
--- a/games/woof/Makefile
+++ b/games/woof/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2021/09/08 21:05:10 nia Exp $
+# $NetBSD: Makefile,v 1.27 2021/09/29 11:54:40 micha Exp $
 
-DISTNAME=	woof_6.3.1
+DISTNAME=	woof_7.0.0
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=fabiangreffrath/}
 GITHUB_TAG=	${DISTNAME}
@@ -31,13 +30,6 @@ SUBST_FILES.waddir=	Source/d_iwad.c
 SUBST_SED.waddir=	-e 's,PKGSRC_PREFIX,"${PREFIX}",'
 SUBST_SED.waddir+=	-e 's,PKGSRC_DOOMWADDIR,"/${DOOMWADDIR}",'
 
-# Rename uint_t (defined by unistd.h on SmartOS)
-SUBST_CLASSES+=		uint
-SUBST_STAGE.uint=	pre-configure
-SUBST_MESSAGE.uint=	Preparing m_misc.c file ...
-SUBST_FILES.uint=	Source/m_misc.c
-SUBST_SED.uint=		-e 's,uint_t,woof_uint_t,'
-
 # XDG desktop file and icon are installed by the build system with the logic:
 #     if(UNIX AND NOT APPLE)
 # Remove Apple exception because pkgsrc users maybe have X11 on Apple machines
diff --git a/games/woof/distinfo b/games/woof/distinfo
index 786477c2f9a..a873708a0f5 100644
--- a/games/woof/distinfo
+++ b/games/woof/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.23 2021/08/27 10:47:40 micha Exp $
+$NetBSD: distinfo,v 1.24 2021/09/29 11:54:40 micha Exp $
 
-SHA1 (woof_6.3.1.tar.gz) = 03336e19759847187fe1e2ae0a2893577a90782d
-RMD160 (woof_6.3.1.tar.gz) = 2186d9d90c888b68d92776723ce78fefae0b578f
-SHA512 (woof_6.3.1.tar.gz) = aad2a66b36480012ff01d25b6692d0f0d6048d90f5ecf1e0de081a2423884afdedc9e1fd97dec621d2641033907b528fa05481b9d7eeb6e96e4cc226651f8259
-Size (woof_6.3.1.tar.gz) = 1986946 bytes
+SHA1 (woof_7.0.0.tar.gz) = cbbc9f934ff21e2d596101eef4b1dd2a22caf9c8
+RMD160 (woof_7.0.0.tar.gz) = 2998d100f8b66ce7e0a02a31b7c6cff83cd9b622
+SHA512 (woof_7.0.0.tar.gz) = 002ea3f3d899ce44f6f81a9141c259eed9b7c1bc435a7cf0b1590411a9ce2fd977c381f32bc33bd26be3330baecb284bedd28fb6db489c81d1973c51a1e58b03
+Size (woof_7.0.0.tar.gz) = 2016725 bytes
 SHA1 (patch-Source_d__iwad.c) = a58291e4717699efaefa3e56294666cfc6e65c75
-SHA1 (patch-Source_wi__stuff.c) = 656f25d82a9125f109800ebc6544d6d729d26947
diff --git a/games/woof/patches/patch-Source_wi__stuff.c b/games/woof/patches/patch-Source_wi__stuff.c
deleted file mode 100644
index c5e439ab381..00000000000
--- a/games/woof/patches/patch-Source_wi__stuff.c
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-Source_wi__stuff.c,v 1.2 2021/08/27 10:47:40 micha Exp $
-
-Workaround for namespace clash on SmartOS:
-
-/home/pbulk/build/games/woof/work/woof-woof_6.3.1/Source/wi_stuff.c:366:19: error: 'time' redeclared as different kind of symbol
-  366 | static patch_t*   time;
-      |                   ^~~~
-
-Already merged upstream. Remove this patch for next release.
-
---- Source/wi_stuff.c.orig	2021-08-13 13:18:32.000000000 +0000
-+++ Source/wi_stuff.c
-@@ -363,7 +363,7 @@ static patch_t*   items;
- static patch_t*   frags;
- 
- // Time sucks.
--static patch_t*   time;
-+static patch_t*   woof_time;
- static patch_t*   par;
- static patch_t*   sucks;
- 
-@@ -897,7 +897,7 @@ static void WI_unloadData(void)
-   Z_ChangeTag(sp_secret, PU_CACHE);
-   Z_ChangeTag(items, PU_CACHE);
-   Z_ChangeTag(frags, PU_CACHE);
--  Z_ChangeTag(time, PU_CACHE);
-+  Z_ChangeTag(woof_time, PU_CACHE);
-   Z_ChangeTag(sucks, PU_CACHE);
-   Z_ChangeTag(par, PU_CACHE);
- 
-@@ -1815,7 +1815,7 @@ static void WI_drawStats(void)
-   V_DrawPatch(SP_STATSX, SP_STATSY+2*lh, FB, sp_secret);
-   WI_drawPercent(ORIGWIDTH - SP_STATSX, SP_STATSY+2*lh, cnt_secret[0]);
- 
--  V_DrawPatch(SP_TIMEX, SP_TIMEY, FB, time);
-+  V_DrawPatch(SP_TIMEX, SP_TIMEY, FB, woof_time);
-   WI_drawTime(ORIGWIDTH/2 - SP_TIMEX, SP_TIMEY, cnt_time, true);
- 
-   // Ty 04/11/98: redid logic: should skip only if with pwad but 
-@@ -2077,7 +2077,7 @@ void WI_loadData(void)
-   colon = W_CacheLumpName("WICOLON", PU_STATIC); 
- 
-   // "time"
--  time = W_CacheLumpName("WITIME", PU_STATIC);   
-+  woof_time = W_CacheLumpName("WITIME", PU_STATIC);   
- 
-   // "sucks"
-   sucks = W_CacheLumpName("WISUCKS", PU_STATIC);