[pkgsrc/trunk]: pkgsrc/games/woof games/woof: Build fix

[micha <micha%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7e6c5f2c86c7
branches:  trunk
changeset: 457330:7e6c5f2c86c7
user:      micha <micha%pkgsrc.org@localhost>
date:      Mon Aug 23 14:27:43 2021 +0000

description:
games/woof: Build fix

Renamed variable "time" to unbreak build on SmartOS.
No bump for PKGREVISION required.

diffstat:

 games/woof/distinfo                         |   3 +-
 games/woof/patches/patch-Source_wi__stuff.c |  46 +++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletions(-)

diffs (63 lines):

diff -r 647684bf30ef -r 7e6c5f2c86c7 games/woof/distinfo
--- a/games/woof/distinfo       Mon Aug 23 13:28:56 2021 +0000
+++ b/games/woof/distinfo       Mon Aug 23 14:27:43 2021 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.21 2021/08/20 15:23:05 micha Exp $
+$NetBSD: distinfo,v 1.22 2021/08/23 14:27:43 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 (patch-Source_d__iwad.c) = fc897f508e31653495bfed26152a7e6d70021089
+SHA1 (patch-Source_wi__stuff.c) = 94d16305a725ac269e37038d2a8ce3c969a0d2ee
diff -r 647684bf30ef -r 7e6c5f2c86c7 games/woof/patches/patch-Source_wi__stuff.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/woof/patches/patch-Source_wi__stuff.c       Mon Aug 23 14:27:43 2021 +0000
@@ -0,0 +1,46 @@
+$NetBSD: patch-Source_wi__stuff.c,v 1.1 2021/08/23 14:27:43 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;
+      |                   ^~~~
+
+--- 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);