Avoid conflict with libc symbol setcontext.

4 files changed, 85 insertions, 1 deletions

diff --git a/graphics/radiance/distinfo b/graphics/radiance/distinfo
index 40c32a0df27..0e76f80e63d 100644
--- a/graphics/radiance/distinfo
+++ b/graphics/radiance/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/04/28 16:55:10 joerg Exp $
+$NetBSD: distinfo,v 1.9 2007/04/18 18:47:21 joerg Exp $
 
 SHA1 (rad3R6P1.tar.gz) = 71f46abd1c30be282a93237fa0c162d3bf0b1f99
 RMD160 (rad3R6P1.tar.gz) = 3bcf40518a57cdb5455264c83a3e206b67b3d1fa
@@ -26,3 +26,6 @@ SHA1 (patch-aq) = 3ce1e089c7a26c176cd725eab2e7ceae8c51e557
 SHA1 (patch-ar) = e2afaad398d61f152ce9a7f3ddf451547c359e13
 SHA1 (patch-as) = 9b7c6bef44a4f9640b7a30253522ffab425ffbac
 SHA1 (patch-at) = 34bf252c122727308ebaa47177afabbc888a4f6a
+SHA1 (patch-au) = 35660480163fb7444ebbdb1fee4ad1cebf866ef4
+SHA1 (patch-av) = 0bfd2ec0fb16f3c106a285b49f1cf48a29274fbb
+SHA1 (patch-aw) = 6b57d85e4c4ef4a3501f4a0263ef8a47fbac8958
diff --git a/graphics/radiance/patches/patch-au b/graphics/radiance/patches/patch-au
new file mode 100644
index 00000000000..c65fe93013c
--- /dev/null
+++ b/graphics/radiance/patches/patch-au
@@ -0,0 +1,46 @@
+$NetBSD: patch-au,v 1.1 2007/04/18 18:47:21 joerg Exp $
+
+--- src/rt/func.c.orig	2007-04-18 18:21:19.000000000 +0000
++++ src/rt/func.c
+@@ -56,7 +56,7 @@ getfunc(	/* get function for this modifi
+ 	if (initfile[0]) {		/* initialize on first call */
+ 		esupport |= E_VARIABLE|E_FUNCTION|E_INCHAN|E_RCONST|E_REDEFW;
+ 		esupport &= ~(E_OUTCHAN);
+-		setcontext("");
++		my_setcontext("");
+ 		scompile("Dx=$1;Dy=$2;Dz=$3;", NULL, 0);
+ 		scompile("Nx=$4;Ny=$5;Nz=$6;", NULL, 0);
+ 		scompile("Px=$7;Py=$8;Pz=$9;", NULL, 0);
+@@ -81,12 +81,12 @@ getfunc(	/* get function for this modifi
+ 		goto memerr;
+ 	i = strlen(arg[ff]);			/* set up context */
+ 	if (i == 1 && arg[ff][0] == '.')
+-		setcontext(f->ctx = "");	/* "." means no file */
++		my_setcontext(f->ctx = "");	/* "." means no file */
+ 	else {
+ 		strcpy(sbuf,arg[ff]);		/* file name is context */
+ 		if (i > LCALSUF && !strcmp(sbuf+i-LCALSUF, CALSUF))
+ 			sbuf[i-LCALSUF] = '\0';	/* remove suffix */
+-		setcontext(f->ctx = savestr(sbuf));
++		my_setcontext(f->ctx = savestr(sbuf));
+ 		if (!vardefined(REFVNAME)) {	/* file loaded? */
+ 			loadfunc(arg[ff]);
+ 			varset(REFVNAME, '=', 1.0);
+@@ -150,7 +150,7 @@ freefunc(			/* free memory associated wi
+ 	for (i = 0; f->ep[i] != NULL; i++)
+ 		epfree(f->ep[i]);
+ 	if (f->ctx[0]) {			/* done with definitions */
+-		setcontext(f->ctx);
++		my_setcontext(f->ctx);
+ 		i = varvalue(REFVNAME)-.5;	/* reference_count-- */
+ 		if (i > 0)
+ 			varset(REFVNAME, '=', (double)i);
+@@ -179,7 +179,7 @@ setfunc(			/* set channels for function 
+ 	if ((f = (MFUNC *)m->os) == NULL)
+ 		objerror(m, CONSISTENCY, "setfunc called before getfunc");
+ 					/* set evaluator context */
+-	setcontext(f->ctx);
++	my_setcontext(f->ctx);
+ 					/* check to see if matrix set */
+ 	if (m == fobj && r->rno == lastrno)
+ 		return(0);
diff --git a/graphics/radiance/patches/patch-av b/graphics/radiance/patches/patch-av
new file mode 100644
index 00000000000..d9667b74c21
--- /dev/null
+++ b/graphics/radiance/patches/patch-av
@@ -0,0 +1,13 @@
+$NetBSD: patch-av,v 1.1 2007/04/18 18:47:21 joerg Exp $
+
+--- src/common/calcomp.h.orig	2007-04-18 18:22:13.000000000 +0000
++++ src/common/calcomp.h
+@@ -83,7 +83,7 @@ extern void	varset(char *fname, int assi
+ extern void	dclear(char *name);
+ extern void	dremove(char *name);
+ extern int	vardefined(char *name);
+-extern char	*setcontext(char *ctx);
++extern char	*my_setcontext(char *ctx);
+ extern char	*pushcontext(char *ctx);
+ extern char	*popcontext(void);
+ extern char	*qualname(char *nam, int lvl);
diff --git a/graphics/radiance/patches/patch-aw b/graphics/radiance/patches/patch-aw
new file mode 100644
index 00000000000..88d8bb3f1b8
--- /dev/null
+++ b/graphics/radiance/patches/patch-aw
@@ -0,0 +1,22 @@
+$NetBSD: patch-aw,v 1.1 2007/04/18 18:47:21 joerg Exp $
+
+--- src/common/caldefn.c.orig	2007-04-18 18:22:26.000000000 +0000
++++ src/common/caldefn.c
+@@ -198,7 +198,7 @@ vardefined(	/* return non-zero if variab
+ 
+ 
+ char *
+-setcontext(			/* set a new context path */
++my_setcontext(			/* set a new context path */
+ 	register char  *ctx
+ )
+ {
+@@ -239,7 +239,7 @@ pushcontext(		/* push on another context
+     register int  n;
+ 
+     strcpy(oldcontext, context);	/* save old context */
+-    setcontext(ctx);			/* set new context */
++    my_setcontext(ctx);			/* set new context */
+     n = strlen(context);		/* tack on old */
+     if (n+strlen(oldcontext) > MAXCNTX) {
+ 	strncpy(context+n, oldcontext, MAXCNTX-n);