Vanquish array cast bogon. Fixes "black screen" problem for 16-bit displays

on mac68k. Speculatively remove "NOT_FOR_PLATFORM= NetBSD-alpha-*"; needs
to be verified.

5 files changed, 63 insertions, 3 deletions

diff --git a/www/arena/Makefile b/www/arena/Makefile
index cc6f447fc23..93381e31d38 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/02/06 03:49:47 fredb Exp $
+# $NetBSD: Makefile,v 1.18 2000/02/09 01:01:20 fredb Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/05/04 20:22:31 jseger Exp
 #
 
@@ -17,7 +17,8 @@ DEPENDS+=		libwww-5.2.8:../../www/libwww
 DEPENDS+=		png-1.0.3:../../graphics/png
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
-NOT_FOR_PLATFORM=	*-*-alpha	#Runs, displays black screen
+#XXX "black screen" fixed for 16-bit displays on mac68k, not verified on alpha.
+#NOT_FOR_PLATFORM=	*-*-alpha	#Runs, displays black screen
 
 GNU_CONFIGURE=		yes
 MAKEFILE=		makefile
diff --git a/www/arena/files/patch-sum b/www/arena/files/patch-sum
index 4d5fe936c2d..4512ad67fcd 100644
--- a/www/arena/files/patch-sum
+++ b/www/arena/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/02/06 03:49:49 fredb Exp $
+$NetBSD: patch-sum,v 1.4 2000/02/09 01:01:21 fredb Exp $
 
 MD5 (patch-aa) = 0e622e0708e094ab8df8c846ba74a49d
 MD5 (patch-ab) = 55f4eb5525d3538fc8357305fea81b6a
@@ -7,3 +7,6 @@ MD5 (patch-ad) = 8cceb647b902faea6bbbdf0c895b32fc
 MD5 (patch-ae) = 239dba602d23271695a07188c59fa38c
 MD5 (patch-af) = ff3e759482b7a51afa19a641821b422e
 MD5 (patch-ag) = e416d54f3774c1aa9cf4e8736e928289
+MD5 (patch-ah) = a2d88210caf4ec19b6d1580e6429cde3
+MD5 (patch-ai) = 90304b2bc9888ca277642ecd99e62238
+MD5 (patch-aj) = fade12b5c7be3535dfe1d8a20ac8ac2a
diff --git a/www/arena/patches/patch-ah b/www/arena/patches/patch-ah
new file mode 100644
index 00000000000..82f0b364c95
--- /dev/null
+++ b/www/arena/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2000/02/09 01:01:21 fredb Exp $
+
+--- Arena/Source/image.c.orig	Tue Mar  3 14:27:02 1998
++++ Arena/Source/image.c	Tue Feb  8 16:55:47 2000
+@@ -969,8 +969,8 @@
+ 
+ 	     GetColour(r, g, b, &ulp);
+ 
+-	     *p++ = ((char*)&ulp)[0];   /* LSB first! */
+-	     *p++ = ((char*)&ulp)[1];
++	     *p++ = (ulp      ) & 0xFF;   /* LSB first! */
++	     *p++ = (ulp >>  8) & 0xFF;
+             }
+        }
+ 
diff --git a/www/arena/patches/patch-ai b/www/arena/patches/patch-ai
new file mode 100644
index 00000000000..d3946c7bf07
--- /dev/null
+++ b/www/arena/patches/patch-ai
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.1 2000/02/09 01:01:22 fredb Exp $
+
+--- Arena/Source/gif.c.orig	Sun Feb 15 10:09:16 1998
++++ Arena/Source/gif.c	Tue Feb  8 18:31:08 2000
+@@ -1121,8 +1121,8 @@
+ 
+     if (bpp == 2)
+       {
+-       *pp++ = ((char*)&ulp)[0];   /* LSB first! */
+-       *pp++ = ((char*)&ulp)[1]; 
++       *pp++ = (ulp      ) & 0xff;   /* LSB first! */
++       *pp++ = (ulp >>  8) & 0xff; 
+       }
+      else
+       {
diff --git a/www/arena/patches/patch-aj b/www/arena/patches/patch-aj
new file mode 100644
index 00000000000..e19d55da02a
--- /dev/null
+++ b/www/arena/patches/patch-aj
@@ -0,0 +1,26 @@
+$NetBSD: patch-aj,v 1.1 2000/02/09 01:01:22 fredb Exp $
+
+--- Arena/Source/jpeg.c.orig	Thu Feb 19 09:57:26 1998
++++ Arena/Source/jpeg.c	Tue Feb  8 18:33:17 2000
+@@ -531,8 +531,8 @@
+ 	     case 1:
+ 	       cr = cg = cb = scan_buffer[xpos];
+ 	       GetColour(cr, cg, cb, &ulp);
+-	       *dp++ = ((char*)&ulp)[0];   /* LSB first! */
+-	       *dp++ = ((char*)&ulp)[1];
++	       *dp++ = (ulp      ) & 0xFF;	/* LSB first! */
++	       *dp++ = (ulp >>  8) & 0xFF;
+ 	       break;
+ 
+ 	     case 3:
+@@ -540,8 +540,8 @@
+ 	       cg = scan_buffer[1+(xpos * 3)];
+ 	       cb = scan_buffer[2+(xpos * 3)];
+ 	       GetColour(cr, cg, cb, &ulp);
+-	       *dp++ = ((char*)&ulp)[0];   /* LSB first! */
+-	       *dp++ = ((char*)&ulp)[1];
++	       *dp++ = (ulp      ) & 0xFF;	/* LSB first! */
++	       *dp++ = (ulp >>  8) & 0xFF;
+ 	       break;
+ 
+ 	     default: