Fix badly broken build with gcc4. Make the build stop on error. Also

fix some 64-bit issues. PKGREVISION++

16 files changed, 215 insertions, 9 deletions

diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index cc9fb289083..1fac482aee7 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2008/05/26 23:28:53 tnn Exp $
+# $NetBSD: Makefile,v 1.24 2008/09/01 06:57:58 dholland Exp $
 
 DISTNAME=	rayshade.4.0
 PKGNAME=	rayshade-4.0
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://graphics.stanford.edu/pub/rayshade/	\
 		ftp://ftp.princeton.edu/pub/Graphics/rayshade.4.0/
diff --git a/graphics/rayshade/distinfo b/graphics/rayshade/distinfo
index 47e967a3a2a..b65a1ac3594 100644
--- a/graphics/rayshade/distinfo
+++ b/graphics/rayshade/distinfo
@@ -1,9 +1,22 @@
-$NetBSD: distinfo,v 1.5 2006/06/20 22:50:13 joerg Exp $
+$NetBSD: distinfo,v 1.6 2008/09/01 06:57:58 dholland Exp $
 
 SHA1 (rayshade.4.0.tar.Z) = 5fd1ce05e7ba3bc8e8b337c212eccb6b53b5b4ca
 RMD160 (rayshade.4.0.tar.Z) = a19bf35aa3f66de9ce406a1a98cf7edbde60f356
 Size (rayshade.4.0.tar.Z) = 369527 bytes
 SHA1 (patch-aa) = b510e1b3a98ef25ffe0d23f9b499fb5c16c333f4
 SHA1 (patch-ab) = 13b48848c4a40d86ee5ceef8dddf10988b59e088
-SHA1 (patch-ac) = 3a2d67bf28e6b0e96d2ec037efa5b219e9935a57
+SHA1 (patch-ac) = 496d4d89edaa7a8786cbd22c2fc31679fda96df5
+SHA1 (patch-ad) = 8e599cc859406341ec39c52b7711e7b64f015b57
+SHA1 (patch-ae) = 3663df57825be54a989dcfd2365662c524f8150f
+SHA1 (patch-af) = 84663fa3abc0922e9a56b672127634b515b351b4
+SHA1 (patch-ag) = db5628955bf9629e27d2d40c48ff87d418792f1d
+SHA1 (patch-ah) = 9fb1fdbe73d2422d433777610fb8abf0a5a9b5f5
+SHA1 (patch-ai) = 67086eacd9cac8acc7729129017279c0f3db0bf6
+SHA1 (patch-aj) = c19ca9c4dfe789d9d48605f3ae08fa654a82db08
+SHA1 (patch-ak) = b9237a9dcf2d4f8aacef5c50d83ac41ca3876d77
+SHA1 (patch-al) = bd5931faab8c2544323d89d6102f0d04baaee2e6
+SHA1 (patch-am) = 02102a8f4909db017c008e6998177b51f5bcf684
+SHA1 (patch-an) = 0f1fc819052fc05097d278108934582f8e35a236
+SHA1 (patch-ao) = a4357564a150836dc9080519f36c81ccc049d981
+SHA1 (patch-ap) = 28ab76ad7b65d53bf190a944969b95f0915f6098
 SHA1 (patch-ba) = d36261ceede5f89645ff23f5a108b231fd5ea18d
diff --git a/graphics/rayshade/patches/patch-ac b/graphics/rayshade/patches/patch-ac
index 46d76f509a8..d8d062c6794 100644
--- a/graphics/rayshade/patches/patch-ac
+++ b/graphics/rayshade/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 1999/10/04 21:25:14 hubertf Exp $
+$NetBSD: patch-ac,v 1.2 2008/09/01 06:57:58 dholland Exp $
 
 This fixes an error that will only occur on machines fast enough to
 compile through two directories in the "libray" directorie in 1 
@@ -8,15 +8,33 @@ touched in this very second. Slowing things down here will help.
 (I seem to remember some hacking about this before, maybe in make(1),
 but I don't remember, and I won't start hacking make(1) now ;-)
 
+(Note from 2008: still pertinent, because the build misuses ar to add
+objects into the same .a file repeatedly. I could hack it to not do
+that, but for now I'm choosing not to. However, I am fixing the
+makefile to stop on error.)
 
---- libray/Makefile.orig	Mon Oct  4 23:12:55 1999
-+++ libray/Makefile	Mon Oct  4 23:13:10 1999
-@@ -10,7 +10,7 @@
+--- libray/Makefile.orig	1992-02-09 22:03:05.000000000 -0500
++++ libray/Makefile	2008-09-01 02:06:03.000000000 -0400
+@@ -10,7 +10,7 @@ SHELL = /bin/sh
  
  default:
  	for i in $(STUFF); do \
 -		(cd $$i && $(MAKE)); \
-+		(echo $$i ; cd $$i && $(MAKE) ; sleep 1); \
++		(echo $$i ; cd $$i && $(MAKE) && sleep 1) || exit 1; \
  	done
  
  #
+@@ -20,11 +20,11 @@ default:
+ 
+ depend:
+ 	for i in $(STUFF); do \
+-		(cd $$i && $(MAKE) depend); \
++		(cd $$i && $(MAKE) depend) || exit 1; \
+ 	done
+ 
+ clean:
+ 	for i in $(STUFF); do \
+-		(cd $$i && $(MAKE) clean); \
++		(cd $$i && $(MAKE) clean) || exit 1; \
+ 	done
+ 	rm -f libray.a
diff --git a/graphics/rayshade/patches/patch-ad b/graphics/rayshade/patches/patch-ad
new file mode 100644
index 00000000000..85f91ddea70
--- /dev/null
+++ b/graphics/rayshade/patches/patch-ad
@@ -0,0 +1,28 @@
+$NetBSD: patch-ad,v 1.1 2008/09/01 06:57:58 dholland Exp $
+
+--- Makefile~	1992-02-09 22:03:04.000000000 -0500
++++ Makefile	2008-09-01 02:03:03.000000000 -0400
+@@ -11,7 +11,7 @@ SHELL = /bin/sh
+ 
+ default:
+ 	for i in $(STUFF); do \
+-		(cd $$i && $(MAKE)); \
++		(cd $$i && $(MAKE)) || exit 1; \
+ 	done
+ 
+ #
+@@ -21,12 +21,12 @@ default:
+ 
+ depend:
+ 	for i in $(STUFF); do \
+-		(cd $$i && $(MAKE) depend); \
++		(cd $$i && $(MAKE) depend) || exit 1; \
+ 	done
+ 
+ clean:
+ 	for i in $(STUFF); do \
+-		(cd $$i && $(MAKE) clean); \
++		(cd $$i && $(MAKE) clean) || exit 1; \
+ 	done
+ 
+ kit:
diff --git a/graphics/rayshade/patches/patch-ae b/graphics/rayshade/patches/patch-ae
new file mode 100644
index 00000000000..e6f2a4ab39e
--- /dev/null
+++ b/graphics/rayshade/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2008/09/01 06:57:58 dholland Exp $
+
+--- libray/libcommon/memory.c~	1992-02-09 22:03:29.000000000 -0500
++++ libray/libcommon/memory.c	2008-09-01 02:07:19.000000000 -0400
+@@ -20,6 +20,8 @@
+  * Initial version.
+  * 
+  */
++#include <string.h>
++#include <stdlib.h>
+ #ifdef SYSV
+ #include <memory.h>
+ #endif
diff --git a/graphics/rayshade/patches/patch-af b/graphics/rayshade/patches/patch-af
new file mode 100644
index 00000000000..cd9e324554c
--- /dev/null
+++ b/graphics/rayshade/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2008/09/01 06:57:58 dholland Exp $
+
+--- libray/libobj/hf.c~	1992-02-09 22:04:18.000000000 -0500
++++ libray/libobj/hf.c	2008-09-01 02:08:11.000000000 -0400
+@@ -42,7 +42,7 @@ typedef struct {
+ 	Vector cp, pDX, pDY;
+ } Trav2D;
+ 
+-hfTri *CreateHfTriangle(), *GetQueuedTri();
++static hfTri *CreateHfTriangle(), *GetQueuedTri();
+ 
+ unsigned long HFTests, HFHits;
+ 
diff --git a/graphics/rayshade/patches/patch-ag b/graphics/rayshade/patches/patch-ag
new file mode 100644
index 00000000000..3c794209528
--- /dev/null
+++ b/graphics/rayshade/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2008/09/01 06:57:58 dholland Exp $
+
+--- libray/liblight/extended.h~	1992-02-09 22:03:11.000000000 -0500
++++ libray/liblight/extended.h	2008-09-01 02:09:05.000000000 -0400
+@@ -33,7 +33,7 @@ typedef struct {
+ 
+ extern Extended *ExtendedCreate();
+ extern LightMethods *ExtendedMethods();
+-extern int ExtendedIntens();
++/*extern int ExtendedIntens();*/
+ extern void ExtendedDirection();
+ 
+ #endif /* EXTENDED_H */
diff --git a/graphics/rayshade/patches/patch-ah b/graphics/rayshade/patches/patch-ah
new file mode 100644
index 00000000000..ff7229ec0c9
--- /dev/null
+++ b/graphics/rayshade/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2008/09/01 06:57:58 dholland Exp $
+
+--- libray/libsurf/fog.c~	1992-02-09 22:03:33.000000000 -0500
++++ libray/libsurf/fog.c	2008-09-01 02:09:44.000000000 -0400
+@@ -28,7 +28,6 @@ FogCreate(color, trans)
+ Color *color, *trans;
+ {
+ 	Fog *fog;
+-	static void ComputeFog();
+ 
+ 	fog = (Fog *)Malloc(sizeof(Fog));
+ 
diff --git a/graphics/rayshade/patches/patch-ai b/graphics/rayshade/patches/patch-ai
new file mode 100644
index 00000000000..6290d62fd13
--- /dev/null
+++ b/graphics/rayshade/patches/patch-ai
@@ -0,0 +1,10 @@
+$NetBSD: patch-ai,v 1.1 2008/09/01 06:57:58 dholland Exp $
+
+--- libray/libtext/texture.h~	1992-02-09 22:03:41.000000000 -0500
++++ libray/libtext/texture.h	2008-09-01 02:10:15.000000000 -0400
+@@ -76,4 +76,4 @@ Color		*ColormapRead();
+ 
+ extern Trans	model2text, prim2text, world2text;
+ 
+-#endif TEXTURE_H
++#endif /* TEXTURE_H */
diff --git a/graphics/rayshade/patches/patch-aj b/graphics/rayshade/patches/patch-aj
new file mode 100644
index 00000000000..985e299f7e9
--- /dev/null
+++ b/graphics/rayshade/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2008/09/01 06:57:58 dholland Exp $
+
+--- libray/libtext/noise.c~	1992-02-09 22:04:06.000000000 -0500
++++ libray/libtext/noise.c	2008-09-01 02:11:06.000000000 -0400
+@@ -121,7 +121,7 @@ Vector *v;
+ 	v->y *= .12345;
+ 	v->z *= .12345;
+ 
+-	return Crc16(v, sizeof(Vector));
++	return Crc16((char *)v, sizeof(Vector));
+ }
+ 
+ /*
diff --git a/graphics/rayshade/patches/patch-ak b/graphics/rayshade/patches/patch-ak
new file mode 100644
index 00000000000..314ecbc191e
--- /dev/null
+++ b/graphics/rayshade/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 2008/09/01 06:57:58 dholland Exp $
+
+--- libshade/misc.c~	1992-02-09 22:03:59.000000000 -0500
++++ libshade/misc.c	2008-09-01 02:12:18.000000000 -0400
+@@ -23,6 +23,7 @@
+  * Initial version.
+  * 
+  */
++#include <stdlib.h>
+ #include "rayshade.h"
+ #ifdef RUSAGE
+ #include <sys/time.h>
diff --git a/graphics/rayshade/patches/patch-al b/graphics/rayshade/patches/patch-al
new file mode 100644
index 00000000000..5bf5c1d82df
--- /dev/null
+++ b/graphics/rayshade/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2008/09/01 06:57:58 dholland Exp $
+
+--- etc/rsconvert/main.c~	1992-02-09 22:03:28.000000000 -0500
++++ etc/rsconvert/main.c	2008-09-01 02:15:11.000000000 -0400
+@@ -24,6 +24,8 @@
+  * 
+  */
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #ifdef SYSV
+ #include <memory.h>
+ #endif
diff --git a/graphics/rayshade/patches/patch-am b/graphics/rayshade/patches/patch-am
new file mode 100644
index 00000000000..2f00a5f29ca
--- /dev/null
+++ b/graphics/rayshade/patches/patch-am
@@ -0,0 +1,11 @@
+$NetBSD: patch-am,v 1.1 2008/09/01 06:57:58 dholland Exp $
+
+--- etc/rsconvert/yacc.y~	1992-02-09 22:04:17.000000000 -0500
++++ etc/rsconvert/yacc.y	2008-09-01 02:15:45.000000000 -0400
+@@ -15,5 +15,6 @@
+ %{
+ #include <stdio.h>
++#include <string.h>
+ #include "libcommon/common.h"
+ 
+ #define NEWLINE()	WriteNewline()
diff --git a/graphics/rayshade/patches/patch-an b/graphics/rayshade/patches/patch-an
new file mode 100644
index 00000000000..b568a143beb
--- /dev/null
+++ b/graphics/rayshade/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2008/09/01 06:57:58 dholland Exp $
+
+--- libray/liblight/extended.c~	1992-02-09 22:03:43.000000000 -0500
++++ libray/liblight/extended.c	2008-09-01 02:17:28.000000000 -0400
+@@ -24,6 +24,8 @@
+ #include "libcommon/sampling.h"
+ #include "extended.h"
+ 
++static int ExtendedIntens();
++
+ static LightMethods *iExtendedMethods = NULL;
+ 
+ Extended *
diff --git a/graphics/rayshade/patches/patch-ao b/graphics/rayshade/patches/patch-ao
new file mode 100644
index 00000000000..4071d72aa40
--- /dev/null
+++ b/graphics/rayshade/patches/patch-ao
@@ -0,0 +1,12 @@
+$NetBSD: patch-ao,v 1.1 2008/09/01 06:57:58 dholland Exp $
+
+--- libray/libsurf/fogdeck.c~	1992-02-09 22:03:45.000000000 -0500
++++ libray/libsurf/fogdeck.c	2008-09-01 02:18:42.000000000 -0400
+@@ -31,7 +31,6 @@ int octaves;
+ Color *color, *trans;
+ {
+ 	Fogdeck *fogdeck;
+-	static void ComputeFogdeck();
+ 
+ 	fogdeck = (Fogdeck *)Malloc(sizeof(Fogdeck));
+ 
diff --git a/graphics/rayshade/patches/patch-ap b/graphics/rayshade/patches/patch-ap
new file mode 100644
index 00000000000..99eebaaf391
--- /dev/null
+++ b/graphics/rayshade/patches/patch-ap
@@ -0,0 +1,12 @@
+$NetBSD: patch-ap,v 1.1 2008/09/01 06:57:58 dholland Exp $
+
+--- libshade/options.c~	1992-02-09 22:04:09.000000000 -0500
++++ libshade/options.c	2008-09-01 02:28:43.000000000 -0400
+@@ -30,6 +30,7 @@
+  * Initial version.
+  * 
+  */
++#include <stdlib.h>
+ #include "rayshade.h"
+ #include "options.h"
+ #include "stats.h"