Changes from Michael Lorenz - make it work on machines where long != uint32 -

it works on sparc64 now.

4 files changed, 65 insertions, 2 deletions

diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile
index 82e0cc89084..6791b946915 100644
--- a/games/xscavenger/Makefile
+++ b/games/xscavenger/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:58 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/09/08 13:39:21 martin Exp $
 #
 
 DISTNAME=	xscavenger-1.4.4
+PKGREVISION=	1
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.xdr.com/dash/
 EXTRACT_SUFX=	.tgz
diff --git a/games/xscavenger/distinfo b/games/xscavenger/distinfo
index cf1568ebce4..885158bac09 100644
--- a/games/xscavenger/distinfo
+++ b/games/xscavenger/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 23:12:05 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/09/08 13:39:21 martin Exp $
 
 SHA1 (xscavenger-1.4.4.tgz) = d9ef34d2ec1a9dfeca398004725cae4878bf9f2e
 RMD160 (xscavenger-1.4.4.tgz) = e410c86dbf406243cfac3d0f81ea83e79cdeab32
 Size (xscavenger-1.4.4.tgz) = 193346 bytes
 SHA1 (patch-aa) = 41145bdd7b44a53b0fea555e232915dc4a64f646
 SHA1 (patch-ab) = 64b844663ac8167f98751650b29b6faf1c126c53
+SHA1 (patch-ac) = b553b7925ac36cff519a049298346ddccf905101
+SHA1 (patch-ad) = f2586214c0e4fc65018d05830dc4fc75f8353b65
diff --git a/games/xscavenger/patches/patch-ac b/games/xscavenger/patches/patch-ac
new file mode 100644
index 00000000000..d0c84a3fbbe
--- /dev/null
+++ b/games/xscavenger/patches/patch-ac
@@ -0,0 +1,47 @@
+$NetBSD: patch-ac,v 1.1 2005/09/08 13:39:21 martin Exp $
+
+--- scav.c.orig	2002-02-10 01:35:36.000000000 +0100
++++ scav.c	2005-09-08 14:53:03.000000000 +0200
+@@ -240,17 +240,18 @@ void *configtab[]=
+ 
+ 
+ 
+-long readlong()
++uint32_t readlong()
+ {
+-long val1=0;
++	uint32_t val1=0;
+ 
+-	val1=myci()<<24L;
+-	val1|=myci()<<16L;
+-	val1|=myci()<<8;
+-	val1|=myci();
++	val1=(myci() & 0xff)<<24L;
++	val1|=(myci() & 0xff)<<16L;
++	val1|=(myci() & 0xff)<<8;
++	val1|=(myci() & 0xff);
+ 
+ 	return val1;
+ }
++
+ int rbs()
+ {
+ 	int ch;
+@@ -274,7 +275,7 @@ int myci()
+ 
+ uchar *doiff(uchar *name)
+ {
+-long type,size;
++uint32_t type,size;
+ uchar comp;
+ int i,j;
+ /*
+@@ -309,7 +310,7 @@ uchar temparea[256];
+ 	bmw=bmh=byteswide=0;
+ 	while( (type=readlong()) )
+ 	{
+-		if(type==0xffffffffL) break;
++		if(type==0xffffffff) break;
+ 		size=readlong();
+ 		if(size&1) size++;
+ 		if(type==BMHD)
diff --git a/games/xscavenger/patches/patch-ad b/games/xscavenger/patches/patch-ad
new file mode 100644
index 00000000000..a2cfe53ea4b
--- /dev/null
+++ b/games/xscavenger/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2005/09/08 13:39:21 martin Exp $
+
+--- scav.h.orig	2001-01-10 17:10:22.000000000 +0100
++++ scav.h	2005-09-08 14:52:08.000000000 +0200
+@@ -383,7 +383,7 @@ extern uchar ibuff[IBUFFLEN];
+ extern uchar *getgfx();
+ 
+ 
+-extern long readlong();
++extern uint32_t readlong();	/* because that's what it reads */
+ extern int rbs();
+ extern int myci();
+