+++ /dev/null
-diff -ur ray.orig/src/cal/calc/Makefile ray/src/cal/calc/Makefile
---- ray.orig/src/cal/calc/Makefile Sat Jul 6 18:20:18 2002
-+++ ray/src/cal/calc/Makefile Sat Jul 6 22:31:06 2002
-@@ -24,7 +24,7 @@
- caldefn.o calfunc.o calprnt.o ealloc.o savestr.o $(COMPAT) $(MLIB)
-
- install: calc
-- cp calc $(INSTDIR)
-+ install calc $(DESTDIR)$(INSTDIR)
-
- clean:
- set nonomatch; rm -f *.o calc
-diff -ur ray.orig/src/cal/calc/Rmakefile ray/src/cal/calc/Rmakefile
---- ray.orig/src/cal/calc/Rmakefile Sat Jul 6 18:20:18 2002
-+++ ray/src/cal/calc/Rmakefile Sat Jul 6 22:31:06 2002
-@@ -24,7 +24,7 @@
- caldefn.o calfunc.o calprnt.o ealloc.o savestr.o $(COMPAT) $(MLIB)
-
- install: calc
-- cp calc $(INSTDIR)
-+ install calc $(DESTDIR)$(INSTDIR)
-
- clean:
- set nonomatch; rm -f *.o calc
-diff -ur ray.orig/src/cal/ev/Makefile ray/src/cal/ev/Makefile
---- ray.orig/src/cal/ev/Makefile Sat Jul 6 18:20:18 2002
-+++ ray/src/cal/ev/Makefile Sat Jul 6 22:31:06 2002
-@@ -21,7 +21,7 @@
- calfunc.o ealloc.o savestr.o $(MLIB)
-
- install: ev
-- cp ev $(INSTDIR)
-+ install ev $(DESTDIR)$(INSTDIR)
-
- clean:
- set nonomatch; rm -f *.o ev
-diff -ur ray.orig/src/cal/ev/Rmakefile ray/src/cal/ev/Rmakefile
---- ray.orig/src/cal/ev/Rmakefile Sat Jul 6 18:20:18 2002
-+++ ray/src/cal/ev/Rmakefile Sat Jul 6 22:31:06 2002
-@@ -21,7 +21,7 @@
- calfunc.o ealloc.o savestr.o $(MLIB)
-
- install: ev
-- cp ev $(INSTDIR)
-+ install ev $(DESTDIR)$(INSTDIR)
-
- clean:
- set nonomatch; rm -f *.o ev
-diff -ur ray.orig/src/cal/rcalc/Makefile ray/src/cal/rcalc/Makefile
---- ray.orig/src/cal/rcalc/Makefile Sat Jul 6 18:20:18 2002
-+++ ray/src/cal/rcalc/Makefile Sat Jul 6 22:31:06 2002
-@@ -24,7 +24,7 @@
- caldefn.o calfunc.o ealloc.o savestr.o $(COMPAT) $(MLIB)
-
- install: rcalc
-- cp rcalc $(INSTDIR)
-+ install rcalc $(DESTDIR)$(INSTDIR)
-
- clean:
- set nonomatch; rm -f *.o rcalc
-diff -ur ray.orig/src/cal/rcalc/Rmakefile ray/src/cal/rcalc/Rmakefile
---- ray.orig/src/cal/rcalc/Rmakefile Sat Jul 6 18:20:18 2002
-+++ ray/src/cal/rcalc/Rmakefile Sat Jul 6 22:31:06 2002
-@@ -24,7 +24,7 @@
- caldefn.o calfunc.o ealloc.o savestr.o $(COMPAT) $(MLIB)
-
- install: rcalc
-- cp rcalc $(INSTDIR)
-+ install rcalc $(DESTDIR)$(INSTDIR)
-
- clean:
- set nonomatch; rm -f *.o rcalc
-diff -ur ray.orig/src/cal/util/Makefile ray/src/cal/util/Makefile
---- ray.orig/src/cal/util/Makefile Sat Jul 6 18:20:18 2002
-+++ ray/src/cal/util/Makefile Sat Jul 6 22:31:06 2002
-@@ -19,7 +19,7 @@
- all: $(PROGS)
-
- install: $(PROGS)
-- cp $(PROGS) $(INSTDIR)
-+ install $(PROGS) $(DESTDIR)$(INSTDIR)
-
- clean:
- set nonomatch; rm -f *.o $(PROGS)
-diff -ur ray.orig/src/cal/util/Rmakefile ray/src/cal/util/Rmakefile
---- ray.orig/src/cal/util/Rmakefile Sat Jul 6 18:20:18 2002
-+++ ray/src/cal/util/Rmakefile Sat Jul 6 22:31:06 2002
-@@ -19,7 +19,7 @@
- all: $(PROGS)
-
- install: $(PROGS)
-- cp $(PROGS) $(INSTDIR)
-+ install $(PROGS) $(DESTDIR)$(INSTDIR)
-
- clean:
- set nonomatch; rm -f *.o $(PROGS)
-diff -ur ray.orig/src/common/Rmakefile ray/src/common/Rmakefile
---- ray.orig/src/common/Rmakefile Sat Jul 6 18:20:18 2002
-+++ ray/src/common/Rmakefile Sat Jul 6 22:31:06 2002
-@@ -31,17 +31,18 @@
-
- OGLOBJ = rglfile.o rglmat.o rgldomat.o rglsurf.o rglinst.o rglsrc.o
-
--all: librt.a $(SPECIAL)
-+all: librayt.a $(SPECIAL)
-
--librt.a: $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
-- ar rc librt.a $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
-- -ranlib librt.a
-+librayt.a: $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
-+ ar rc librayt.a $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
-+ -ranlib librayt.a
-+ cp librayt.a ../lib/librayt.a
-
- install: all
-- mv librt.a ../lib/librt.a
-+ mv librayt.a ../lib/librayt.a
-
- clean:
-- rm -f *.o librt.a
-+ rm -f *.o librayt.a
-
- ogl: $(OGLOBJ)
- ar rc librgl.a $(OGLOBJ)
-diff -ur ray.orig/src/common/lookup.h ray/src/common/lookup.h
---- ray.orig/src/common/lookup.h Sat Jul 6 18:20:18 2002
-+++ ray/src/common/lookup.h Sat Jul 6 22:31:06 2002
-@@ -5,6 +5,7 @@
- /*
- * Header file for general associative table lookup routines
- */
-+#include <string.h>
-
- typedef struct {
- char *key; /* key name */
-@@ -80,4 +81,3 @@
- extern void lu_done();
- extern unsigned long lu_shash();
-
--extern int strcmp();
-diff -ur ray.orig/src/cv/Rmakefile ray/src/cv/Rmakefile
---- ray.orig/src/cv/Rmakefile Sat Jul 6 18:20:18 2002
-+++ ray/src/cv/Rmakefile Sat Jul 6 22:31:06 2002
-@@ -22,12 +22,14 @@
-
- LIBFILES = source.cal tilt.cal lamp.tab tmesh.cal
-
-+MGF_LIB = ../lib/libmgf.a
-+
- all: $(PROGS)
-
- install: $(PROGS) $(LIBFILES)
-- cp $(PROGS) $(INSTDIR)
-- cd $(LIBDIR) ; rm -f $(LIBFILES)
-- cp $(LIBFILES) $(LIBDIR)
-+ install $(PROGS) $(DESTDIR)$(INSTDIR)
-+ cd $(DESTDIR)$(LIBDIR) ; rm -f $(LIBFILES)
-+ install $(LIBFILES) $(DESTDIR)$(LIBDIR)
-
- clean:
- set nonomatch; rm -f $(PROGS) *.o core
-@@ -37,31 +39,31 @@
- $(CC) $(CFLAGS) -o thf2rad thf2rad.o
-
- ies2rad: ies2rad.o
-- $(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrt -lm
-+ $(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrayt -lm
-
- arch2rad: arch2rad.o trans.o
-- $(CC) $(CFLAGS) -o arch2rad arch2rad.o trans.o -lrt
-+ $(CC) $(CFLAGS) -o arch2rad arch2rad.o trans.o -lrayt
-
- nff2rad: nff2rad.o
- $(CC) $(CFLAGS) -o nff2rad nff2rad.o
-
- lampcolor: lampcolor.o
-- $(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrt
-+ $(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrayt
-
- tmesh2rad: tmesh2rad.o tmesh.o
-- $(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o tmesh.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o tmesh.o -lrayt $(MLIB)
-
- obj2rad: obj2rad.o trans.o tmesh.o
-- $(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o tmesh.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o tmesh.o -lrayt $(MLIB)
-
--mgf2rad: MGF_LIB mgf2rad.o tmesh.o
-- $(CC) $(CFLAGS) -o mgf2rad mgf2rad.o tmesh.o -lmgf -lrt $(MLIB)
-+mgf2rad: $(MGF_LIB) mgf2rad.o tmesh.o
-+ $(CC) $(CFLAGS) -o mgf2rad mgf2rad.o tmesh.o -lmgf -lrayt $(MLIB)
-
- rad2mgf: rad2mgf.o
-- $(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrayt $(MLIB)
-
--mgf2meta: MGF_LIB mgf2meta.o
-- $(CC) $(CFLAGS) -o mgf2meta mgf2meta.o -lmgf -lmeta -lrt $(MLIB)
-+mgf2meta: $(MGF_LIB) mgf2meta.o
-+ $(CC) $(CFLAGS) -o mgf2meta mgf2meta.o -lmgf -lmeta -lrayt $(MLIB)
-
- mgfilt:
- cd mgflib ; rm -f mgfilt ; \
-@@ -75,7 +77,7 @@
- CFLAGS="$(OPT) $(MACH) -DNOPROTO" ; \
- mv mgf2inv ..
-
--MGF_LIB:
-+$(MGF_LIB):
- cd mgflib ; rm -f libmgf.a ; \
- make libmgf.a CC=$(CC) \
- CFLAGS="$(OPT) $(MACH) -DNOPROTO" ; \
-diff -ur ray.orig/src/gen/Rmakefile ray/src/gen/Rmakefile
---- ray.orig/src/gen/Rmakefile Sat Jul 6 18:20:18 2002
-+++ ray/src/gen/Rmakefile Sat Jul 6 22:31:06 2002
-@@ -22,9 +22,9 @@
- all: $(PROGS)
-
- install: $(PROGS) $(LIBFILES)
-- cp $(PROGS) $(INSTDIR)
-- cd $(LIBDIR) ; rm -f $(LIBFILES)
-- cp $(LIBFILES) $(LIBDIR)
-+ install $(PROGS) $(DESTDIR)$(INSTDIR)
-+ cd $(DESTDIR)$(LIBDIR) ; rm -f $(LIBFILES)
-+ install $(LIBFILES) $(DESTDIR)$(LIBDIR)
-
- clean:
- set nonomatch; rm -f $(PROGS) *.o core
-@@ -48,22 +48,22 @@
- $(CC) $(CFLAGS) -o genprism genprism.o $(MLIB)
-
- xform: xform.o
-- $(CC) $(CFLAGS) -o xform xform.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o xform xform.o -lrayt $(MLIB)
-
- replmarks: replmarks.o
-- $(CC) $(CFLAGS) -o replmarks replmarks.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o replmarks replmarks.o -lrayt $(MLIB)
-
- mkillum: mkillum.o mkillum2.o mkillum3.o
-- $(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o -lrayt $(MLIB)
-
- genrev: genrev.o
-- $(CC) $(CFLAGS) -o genrev genrev.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o genrev genrev.o -lrayt $(MLIB)
-
- genworm: genworm.o
-- $(CC) $(CFLAGS) -o genworm genworm.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o genworm genworm.o -lrayt $(MLIB)
-
- gensurf: gensurf.o
-- $(CC) $(CFLAGS) -o gensurf gensurf.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o gensurf gensurf.o -lrayt $(MLIB)
-
- genclock: genclock.o
- $(CC) $(CFLAGS) -o genclock genclock.o $(MLIB)
-diff -ur ray.orig/src/hd/Rmakefile ray/src/hd/Rmakefile
---- ray.orig/src/hd/Rmakefile Sat Jul 6 18:20:18 2002
-+++ ray/src/hd/Rmakefile Sat Jul 6 22:46:00 2002
-@@ -14,31 +14,30 @@
- SPECIAL =
-
- INSTDIR = /usr/local/bin
--DEVDIR = $(INSTDIR)/dev
-
- LIBDIR = /usr/local/lib/ray
-
- PROGS = rholo rhpict rhcopy genrhgrid rhoptimize rhinfo
-
--DEVS = $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi
-+DEVS = x11.hdi x11h.hdi
-
- all: $(PROGS)
-
- install: all $(DEVS) $(SPECIAL)
-- cp $(PROGS) $(INSTDIR)
-+ install $(PROGS) $(DESTDIR)$(INSTDIR)
-
- clean:
- set nonomatch; rm -f *.o $(PROGS) core
-
--ogl: $(DEVDIR)/glx.hdi $(DEVDIR)/glxh.hdi \
-- $(DEVDIR)/glxo.hdi $(DEVDIR)/glxoh.hdi \
-- $(DEVDIR)/glxs.hdi $(DEVDIR)/glxsh.hdi \
-- $(DEVDIR)/glxso.hdi $(DEVDIR)/glxsoh.hdi \
-- $(DEVDIR)/glx1.hdi $(DEVDIR)/glx1h.hdi \
-- $(DEVDIR)/ogl.hdi $(DEVDIR)/oglh.hdi \
-- $(DEVDIR)/oglo.hdi $(DEVDIR)/ogloh.hdi \
-- $(DEVDIR)/ogls.hdi $(DEVDIR)/oglsh.hdi \
-- $(DEVDIR)/oglso.hdi $(DEVDIR)/oglsoh.hdi
-+ogl: glx.hdi glxh.hdi \
-+ glxo.hdi glxoh.hdi \
-+ glxs.hdi glxsh.hdi \
-+ glxso.hdi glxsoh.hdi \
-+ glx1.hdi glx1h.hdi \
-+ ogl.hdi oglh.hdi \
-+ oglo.hdi ogloh.hdi \
-+ ogls.hdi oglsh.hdi \
-+ oglso.hdi oglsoh.hdi
-
- x10:
-
-@@ -51,135 +50,135 @@
- rholo: rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o holo.o holofile.o \
- viewbeams.o malloc.o Version.o
- $(CC) $(CFLAGS) -o rholo rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \
--holo.o holofile.o viewbeams.o malloc.o Version.o -lrt -lm
-+holo.o holofile.o viewbeams.o malloc.o Version.o -lrayt -lm
-
- rhpict: rhpict.o rhpict2.o holo.o holofile.o viewbeams.o malloc.o Version.o
- $(CC) $(CFLAGS) -o rhpict rhpict.o rhpict2.o holo.o holofile.o \
--viewbeams.o malloc.o Version.o -lrt -lm
-+viewbeams.o malloc.o Version.o -lrayt -lm
-
- rhcopy: rhcopy.o clumpbeams.o holo.o holofile.o
- $(CC) $(CFLAGS) -o rhcopy rhcopy.o clumpbeams.o \
--holo.o holofile.o -lrt -lm
-+holo.o holofile.o -lrayt -lm
-
- rhoptimize: rhoptimize.o clumpbeams.o holo.o holofile.o
- $(CC) $(CFLAGS) -o rhoptimize rhoptimize.o clumpbeams.o \
--holo.o holofile.o -lrt -lm
-+holo.o holofile.o -lrayt -lm
-
- rhinfo: rhinfo.o holo.o holofile.o
-- $(CC) $(CFLAGS) -o rhinfo rhinfo.o holo.o holofile.o -lrt -lm
-+ $(CC) $(CFLAGS) -o rhinfo rhinfo.o holo.o holofile.o -lrayt -lm
-
- genrhenv: genrhenv.o holo.o holofile.o
-- $(CC) $(CFLAGS) -o genrhenv genrhenv.o holo.o holofile.o -lrt -lm
-+ $(CC) $(CFLAGS) -o genrhenv genrhenv.o holo.o holofile.o -lrayt -lm
-
- genrhgrid: genrhgrid.o holo.o
-- $(CC) $(CFLAGS) -o genrhgrid genrhgrid.o holo.o -lrt -lm
-+ $(CC) $(CFLAGS) -o genrhgrid genrhgrid.o holo.o -lrayt -lm
-
--$(DEVDIR)/x11h.hdi: $(DEVDIR)/x11.hdi
-- rm -f $(DEVDIR)/x11h.hdi
-- ln $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi
-+x11h.hdi: x11.hdi
-+ rm -f x11h.hdi
-+ ln x11.hdi x11h.hdi
-
--$(DEVDIR)/x11.hdi: rhdisp.o rhdisp2.o viewbeams.o rhd_x11.o rhd_qtree.o \
-+x11.hdi: rhdisp.o rhdisp2.o viewbeams.o rhd_x11.o rhd_qtree.o \
- rhd_qtree2r.o rhd_ctab.o dircode.o holo.o
-- $(CC) $(CFLAGS) -o $(DEVDIR)/x11.hdi rhdisp.o rhdisp2.o viewbeams.o \
--rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o dircode.o -lrt -lX11 -lm
-+ $(CC) $(CFLAGS) -o x11.hdi rhdisp.o rhdisp2.o viewbeams.o \
-+rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o dircode.o -lrayt -lX11 -lm -L/usr/X11R6/lib
-
--$(DEVDIR)/glx1h.hdi: $(DEVDIR)/glx1.hdi
-- rm -f $(DEVDIR)/glx1h.hdi
-- ln $(DEVDIR)/glx1.hdi $(DEVDIR)/glx1h.hdi
--
--$(DEVDIR)/glxh.hdi: $(DEVDIR)/glx.hdi
-- rm -f $(DEVDIR)/glxh.hdi
-- ln $(DEVDIR)/glx.hdi $(DEVDIR)/glxh.hdi
--
--$(DEVDIR)/glxoh.hdi: $(DEVDIR)/glxo.hdi
-- rm -f $(DEVDIR)/glxoh.hdi
-- ln $(DEVDIR)/glxo.hdi $(DEVDIR)/glxoh.hdi
--
--$(DEVDIR)/glxsh.hdi: $(DEVDIR)/glxs.hdi
-- rm -f $(DEVDIR)/glxsh.hdi
-- ln $(DEVDIR)/glxs.hdi $(DEVDIR)/glxsh.hdi
--
--$(DEVDIR)/glxsoh.hdi: $(DEVDIR)/glxso.hdi
-- rm -f $(DEVDIR)/glxsoh.hdi
-- ln $(DEVDIR)/glxso.hdi $(DEVDIR)/glxsoh.hdi
--
--$(DEVDIR)/oglh.hdi: $(DEVDIR)/ogl.hdi
-- rm -f $(DEVDIR)/oglh.hdi
-- ln $(DEVDIR)/ogl.hdi $(DEVDIR)/oglh.hdi
--
--$(DEVDIR)/ogloh.hdi: $(DEVDIR)/oglo.hdi
-- rm -f $(DEVDIR)/ogloh.hdi
-- ln $(DEVDIR)/oglo.hdi $(DEVDIR)/ogloh.hdi
--
--$(DEVDIR)/oglsh.hdi: $(DEVDIR)/ogls.hdi
-- rm -f $(DEVDIR)/oglsh.hdi
-- ln $(DEVDIR)/ogls.hdi $(DEVDIR)/oglsh.hdi
--
--$(DEVDIR)/oglsoh.hdi: $(DEVDIR)/oglso.hdi
-- rm -f $(DEVDIR)/oglsoh.hdi
-- ln $(DEVDIR)/oglso.hdi $(DEVDIR)/oglsoh.hdi
-+glx1h.hdi: glx1.hdi
-+ rm -f glx1h.hdi
-+ ln glx1.hdi glx1h.hdi
-+
-+glxh.hdi: glx.hdi
-+ rm -f glxh.hdi
-+ ln glx.hdi glxh.hdi
-+
-+glxoh.hdi: glxo.hdi
-+ rm -f glxoh.hdi
-+ ln glxo.hdi glxoh.hdi
-+
-+glxsh.hdi: glxs.hdi
-+ rm -f glxsh.hdi
-+ ln glxs.hdi glxsh.hdi
-+
-+glxsoh.hdi: glxso.hdi
-+ rm -f glxsoh.hdi
-+ ln glxso.hdi glxsoh.hdi
-+
-+oglh.hdi: ogl.hdi
-+ rm -f oglh.hdi
-+ ln ogl.hdi oglh.hdi
-+
-+ogloh.hdi: oglo.hdi
-+ rm -f ogloh.hdi
-+ ln oglo.hdi ogloh.hdi
-+
-+oglsh.hdi: ogls.hdi
-+ rm -f oglsh.hdi
-+ ln ogls.hdi oglsh.hdi
-+
-+oglsoh.hdi: oglso.hdi
-+ rm -f oglsoh.hdi
-+ ln oglso.hdi oglsoh.hdi
-
--$(DEVDIR)/glx1.hdi: rhd_glx1.o rhdisp.o rhdisp2.o viewbeams.o \
-+glx1.hdi: rhd_glx1.o rhdisp.o rhdisp2.o viewbeams.o \
- rhd_qtree.o rhd_qtree2c.o dircode.o holo.o
-- rm -f $(DEVDIR)/glx1.hdi
-- $(CC) $(CFLAGS) -o $(DEVDIR)/glx1.hdi rhd_glx1.o rhdisp.o rhdisp2.o \
--viewbeams.o holo.o malloc.o rhd_qtree.o rhd_qtree2c.o dircode.o -lrt -lGLU -lGL -lX11 -lm
-+ rm -f glx1.hdi
-+ $(CC) $(CFLAGS) -o glx1.hdi rhd_glx1.o rhdisp.o rhdisp2.o \
-+viewbeams.o holo.o malloc.o rhd_qtree.o rhd_qtree2c.o dircode.o -lrayt -lGLU -lGL -lX11 -lm
-
--$(DEVDIR)/glx.hdi: rhd_glx0.o rhdisp.o rhdisp2.o viewbeams.o \
-+glx.hdi: rhd_glx0.o rhdisp.o rhdisp2.o viewbeams.o \
- sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
- sm_ogl.o sm.o sm_usets.o dircode.o holo.o
-- rm -f $(DEVDIR)/glx.hdi
-- $(CC) $(CFLAGS) -o $(DEVDIR)/glx.hdi rhd_glx0.o rhdisp.o rhdisp2.o \
-+ rm -f glx.hdi
-+ $(CC) $(CFLAGS) -o glx.hdi rhd_glx0.o rhdisp.o rhdisp2.o \
- viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
--sm_ogl.o sm.o sm_usets.o dircode.o -lrt -lGLU -lGL -lX11 -lm
-+sm_ogl.o sm.o sm_usets.o dircode.o -lrayt -lGLU -lGL -lX11 -lm
-
--$(DEVDIR)/glxo.hdi: rhd_glxo.o rhdisp.o rhdisp2.o viewbeams.o \
-+glxo.hdi: rhd_glxo.o rhdisp.o rhdisp2.o viewbeams.o \
- sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
- sm_ogl.o sm_usets.o sm.o dircode.o holo.o rhdobj.o
-- rm -f $(DEVDIR)/glxo.hdi
-- $(CC) $(CFLAGS) -o $(DEVDIR)/glxo.hdi rhd_glxo.o rhdisp.o rhdisp2.o \
-+ rm -f glxo.hdi
-+ $(CC) $(CFLAGS) -o glxo.hdi rhd_glxo.o rhdisp.o rhdisp2.o \
- viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
--sm_ogl.o sm_usets.o sm.o dircode.o rhdobj.o -lrgl -lrt -lGLU -lGL -lX11 -lm
-+sm_ogl.o sm_usets.o sm.o dircode.o rhdobj.o -lrgl -lrayt -lGLU -lGL -lX11 -lm
-
--$(DEVDIR)/glxs.hdi: rhd_glxs.o rhdisp.o rhdisp2.o viewbeams.o \
-+glxs.hdi: rhd_glxs.o rhdisp.o rhdisp2.o viewbeams.o \
- sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
- sm_ogl.o sm_usets.o sm.o dircode.o holo.o
-- rm -f $(DEVDIR)/glxs.hdi
-- $(CC) $(CFLAGS) -o $(DEVDIR)/glxs.hdi rhd_glxs.o rhdisp.o rhdisp2.o \
-+ rm -f glxs.hdi
-+ $(CC) $(CFLAGS) -o glxs.hdi rhd_glxs.o rhdisp.o rhdisp2.o \
- viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
--sm_ogl.o sm_usets.o sm.o dircode.o -lrt -lGLU -lGL -lX11 -lXext -lm
-+sm_ogl.o sm_usets.o sm.o dircode.o -lrayt -lGLU -lGL -lX11 -lXext -lm
-
--$(DEVDIR)/glxso.hdi: rhd_glxso.o rhdisp.o rhdisp2.o viewbeams.o \
-+glxso.hdi: rhd_glxso.o rhdisp.o rhdisp2.o viewbeams.o \
- sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
- sm_ogl.o sm_usets.o sm.o dircode.o holo.o rhdobj.o
-- rm -f $(DEVDIR)/glxso.hdi
-- $(CC) $(CFLAGS) -o $(DEVDIR)/glxso.hdi rhd_glxso.o rhdisp.o rhdisp2.o \
-+ rm -f glxso.hdi
-+ $(CC) $(CFLAGS) -o glxso.hdi rhd_glxso.o rhdisp.o rhdisp2.o \
- viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
- sm_ogl.o sm_usets.o sm.o dircode.o rhdobj.o \
---lrgl -lrt -lGLU -lGL -lX11 -lXext -lm
-+-lrgl -lrayt -lGLU -lGL -lX11 -lXext -lm
-
--$(DEVDIR)/ogl.hdi: rhd_ogl0.o rhdisp.o rhdisp2.o viewbeams.o \
-+ogl.hdi: rhd_ogl0.o rhdisp.o rhdisp2.o viewbeams.o \
- rhd_odraw.o rhd_geom.o holo.o
-- $(CC) $(CFLAGS) -o $(DEVDIR)/ogl.hdi rhd_ogl0.o rhdisp.o rhdisp2.o \
--viewbeams.o holo.o rhd_odraw.o rhd_geom.o -lrgl -lrt -lGLU -lGL -lX11 -lm
-+ $(CC) $(CFLAGS) -o ogl.hdi rhd_ogl0.o rhdisp.o rhdisp2.o \
-+viewbeams.o holo.o rhd_odraw.o rhd_geom.o -lrgl -lrayt -lGLU -lGL -lX11 -lm
-
--$(DEVDIR)/oglo.hdi: rhd_oglo.o rhdisp.o rhdisp2.o viewbeams.o \
-+oglo.hdi: rhd_oglo.o rhdisp.o rhdisp2.o viewbeams.o \
- rhd_odraw.o rhd_geom.o holo.o rhdobj.o
-- $(CC) $(CFLAGS) -o $(DEVDIR)/oglo.hdi rhd_oglo.o rhdisp.o \
-+ $(CC) $(CFLAGS) -o oglo.hdi rhd_oglo.o rhdisp.o \
- rhdisp2.o viewbeams.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \
---lrgl -lrt -lGLU -lGL -lX11 -lm
-+-lrgl -lrayt -lGLU -lGL -lX11 -lm
-
--$(DEVDIR)/ogls.hdi: rhd_ogls.o rhdisp.o rhdisp2.o viewbeams.o \
-+ogls.hdi: rhd_ogls.o rhdisp.o rhdisp2.o viewbeams.o \
- rhd_odraw.o rhd_geom.o holo.o
-- $(CC) $(CFLAGS) -o $(DEVDIR)/ogls.hdi rhd_ogls.o rhdisp.o rhdisp2.o \
-+ $(CC) $(CFLAGS) -o ogls.hdi rhd_ogls.o rhdisp.o rhdisp2.o \
- viewbeams.o holo.o rhd_odraw.o rhd_geom.o \
---lrgl -lrt -lGLU -lGL -lX11 -lXext -lm
-+-lrgl -lrayt -lGLU -lGL -lX11 -lXext -lm
-
--$(DEVDIR)/oglso.hdi: rhd_oglso.o rhdisp.o rhdisp2.o viewbeams.o \
-+oglso.hdi: rhd_oglso.o rhdisp.o rhdisp2.o viewbeams.o \
- rhd_odraw.o rhd_geom.o holo.o rhdobj.o
-- $(CC) $(CFLAGS) -o $(DEVDIR)/oglso.hdi rhd_oglso.o rhdisp.o rhdisp2.o \
-+ $(CC) $(CFLAGS) -o oglso.hdi rhd_oglso.o rhdisp.o rhdisp2.o \
- viewbeams.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \
---lrgl -lrt -lGLU -lGL -lX11 -lXext -lm
-+-lrgl -lrayt -lGLU -lGL -lX11 -lXext -lm
-
- rhd_glx0.o: rhd_glx.c
- $(CC) $(CFLAGS) -c rhd_glx.c
-diff -ur ray.orig/src/meta/Rmakefile ray/src/meta/Rmakefile
---- ray.orig/src/meta/Rmakefile Sat Jul 6 18:20:18 2002
-+++ ray/src/meta/Rmakefile Sat Jul 6 22:31:06 2002
-@@ -24,127 +24,98 @@
-
- common = $(io) syscalls.o misc.o savestr.o wputs.o eputs.o quit.o $(COMPAT)
-
--install: general
-+PROGS = mx80 meta2tga t4014 pexpand psort cv psmeta plotin imagew impress x11meta \
-+ bgraph igraph dgraph gcomp aed5 plot4
-+PROGS2 = mt160l mt160 mtext plotout xmeta okimate tbar
-+
-+all: $(common) ../lib/libmeta.a $(PROGS)
-+
-+install: $(PROGS)
-+ install $(PROGS) $(DESTDIR)$(INSTDIR)
-
- clean:
- set nonomatch; rm -f *.o a.out core
-
--general: $(INSTDIR)/mx80 $(INSTDIR)/meta2tga \
--$(INSTDIR)/t4014 $(INSTDIR)/pexpand $(INSTDIR)/psort \
--$(INSTDIR)/cv $(INSTDIR)/psmeta $(EXEC2)/plotin \
--$(INSTDIR)/imagew $(INSTDIR)/impress $(INSTDIR)/x11meta \
--../lib/libmeta.a $(INSTDIR)/bgraph $(INSTDIR)/igraph \
--$(INSTDIR)/dgraph $(INSTDIR)/gcomp $(INSTDIR)/aed5 $(INSTDIR)/plot4
--
--special: $(EXEC2)/mt160l $(EXEC2)/mt160 $(EXEC2)/mtext \
--$(EXEC2)/plotout $(EXEC2)/xmeta $(EXEC2)/okimate $(EXEC2)/tbar
--
--$(INSTDIR)/meta2tga $(EXEC2)/okimate $(INSTDIR)/impress \
--$(INSTDIR)/mx80 $(INSTDIR)/t4014 $(INSTDIR)/plotout $(INSTDIR)/x11meta \
--$(EXEC2)/mt160l $(EXEC2)/mt160 $(INSTDIR)/pexpand $(INSTDIR)/plot4 \
--$(INSTDIR)/psort $(INSTDIR)/imagew $(INSTDIR)/tcurve $(EXEC2)/mtext \
--$(INSTDIR)/tscat $(INSTDIR)/plotin $(INSTDIR)/tbar $(INSTDIR)/xmeta \
--../lib/libmeta.a $(INSTDIR)/aed5 $(INSTDIR)/psmeta: $(common)
--
--$(EXEC2)/mt160l: mt160l.o mplot.o plot.o palloc.o
-- $(CC) $(CFLAGS) -o $(EXEC2)/mt160l mt160l.o mplot.o plot.o \
-+mt160l: mt160l.o mplot.o plot.o palloc.o
-+ $(CC) $(CFLAGS) -o mt160l mt160l.o mplot.o plot.o \
- $(common) palloc.o
-
--$(EXEC2)/okimate: okimate.o mplot.o plot.o palloc.o
-- $(CC) $(CFLAGS) -o $(EXEC2)/okimate okimate.o mplot.o plot.o \
-+okimate: okimate.o mplot.o plot.o palloc.o
-+ $(CC) $(CFLAGS) -o okimate okimate.o mplot.o plot.o \
- $(common) palloc.o
-
--$(INSTDIR)/imagew: imagew.o mplot.o plot.o palloc.o
-+imagew: imagew.o mplot.o plot.o palloc.o
- $(CC) $(CFLAGS) imagew.o mplot.o plot.o $(common) \
--palloc.o $(MLIB)
-- cp a.out $(INSTDIR)/imagew
-+palloc.o $(MLIB) -o imagew
-
--$(EXEC2)/mt160: mt160.o mplot.o plot.o palloc.o
-- $(CC) $(CFLAGS) -o $(EXEC2)/mt160 mt160.o mplot.o plot.o $(common) \
-+mt160: mt160.o mplot.o plot.o palloc.o
-+ $(CC) $(CFLAGS) -o mt160 mt160.o mplot.o plot.o $(common) \
- palloc.o
-
--$(INSTDIR)/meta2tga: meta2tga.o rplot.o plot.o palloc.o
-+meta2tga: meta2tga.o rplot.o plot.o palloc.o
- $(CC) $(CFLAGS) meta2tga.o rplot.o plot.o $(common) \
--palloc.o $(MLIB)
-- cp a.out $(INSTDIR)/meta2tga
-+palloc.o $(MLIB) -o meta2tga
-
--$(INSTDIR)/mx80: mx80.o mplot.o plot.o palloc.o
-+mx80: mx80.o mplot.o plot.o palloc.o
- $(CC) $(CFLAGS) mx80.o mplot.o plot.o $(common) \
--palloc.o $(MLIB)
-- cp a.out $(INSTDIR)/mx80
-+palloc.o $(MLIB) -o mx80
-
--$(INSTDIR)/t4014: plotout.c ../lib/lib4014.a
-+t4014: plotout.c ../lib/lib4014.a
- $(CC) -DFORTEK $(CFLAGS) plotout.c $(common) \
--../lib/lib4014.a $(MLIB)
-- cp a.out $(INSTDIR)/t4014
-+../lib/lib4014.a $(MLIB) -o t4014
- rm -f plotout.o
-
--$(INSTDIR)/impress: impress.o implot.o imPfuncs.o plot.o
-+impress: impress.o implot.o imPfuncs.o plot.o
- $(CC) $(CFLAGS) impress.o implot.o imPfuncs.o \
--plot.o $(common) $(MLIB)
-- cp a.out $(INSTDIR)/impress
-+plot.o $(common) $(MLIB) -o impress
-+
-+aed5: aed5.o
-+ $(CC) $(CFLAGS) aed5.o $(common) $(MLIB) -o aed5
-
--$(INSTDIR)/aed5: aed5.o
-- $(CC) $(CFLAGS) aed5.o $(common) $(MLIB)
-- cp a.out $(INSTDIR)/aed5
--
--$(INSTDIR)/xmeta: xmeta.o xplot.o plot.o palloc.o
-- $(CC) $(CFLAGS) xmeta.o xplot.o plot.o palloc.o $(common) -lX11 $(MLIB)
-- cp a.out $(INSTDIR)/xmeta
--
--$(INSTDIR)/x11meta: xmeta.o x11plot.o plot.o palloc.o
-- $(CC) $(CFLAGS) xmeta.o x11plot.o plot.o palloc.o $(common) -lX11 $(MLIB)
-- cp a.out $(INSTDIR)/x11meta
--
--$(INSTDIR)/psmeta: psmeta.o psplot.o
-- $(CC) $(CFLAGS) psmeta.o psplot.o $(common) $(MLIB)
-- cp a.out $(INSTDIR)/psmeta
--
--$(INSTDIR)/plotout: plotout.c
-- $(CC) $(CFLAGS) plotout.c $(common) -lplot $(MLIB)
-- cp a.out $(INSTDIR)/plotout
-+xmeta: xmeta.o xplot.o plot.o palloc.o
-+ $(CC) $(CFLAGS) xmeta.o xplot.o plot.o palloc.o $(common) -lX11 $(MLIB) -o xmeta
-+
-+x11meta: xmeta.o x11plot.o plot.o palloc.o
-+ $(CC) $(CFLAGS) xmeta.o x11plot.o plot.o palloc.o $(common) -lX11 $(MLIB) -o x11meta
-+
-+psmeta: psmeta.o psplot.o
-+ $(CC) $(CFLAGS) psmeta.o psplot.o $(common) $(MLIB) -o psmeta
-+
-+plotout: plotout.c
-+ $(CC) $(CFLAGS) plotout.c $(common) -lplot $(MLIB) -o plotout
- rm -f plotout.o
-
--$(INSTDIR)/plotin: plotin.o primout.o
-- $(CC) $(CFLAGS) plotin.o primout.o $(common) $(MLIB)
-- cp a.out $(INSTDIR)/plotin
-+plotin: plotin.o primout.o
-+ $(CC) $(CFLAGS) plotin.o primout.o $(common) $(MLIB) -o plotin
-
--$(INSTDIR)/pexpand: pexpand.o expand.o segment.o palloc.o
-+pexpand: pexpand.o expand.o segment.o palloc.o
- $(CC) $(CFLAGS) pexpand.o expand.o segment.o \
--$(common) palloc.o $(MLIB)
-- cp a.out $(INSTDIR)/pexpand
-+$(common) palloc.o $(MLIB) -o pexpand
-
--$(INSTDIR)/psort: psort.o sort.o palloc.o
-- $(CC) $(CFLAGS) psort.o sort.o $(common) palloc.o $(MLIB)
-- cp a.out $(INSTDIR)/psort
-+psort: psort.o sort.o palloc.o
-+ $(CC) $(CFLAGS) psort.o sort.o $(common) palloc.o $(MLIB) -o psort
-
--$(INSTDIR)/cv: cv.o mfio.o cvhfio.o syscalls.o misc.o savestr.o \
-+cv: cv.o mfio.o cvhfio.o syscalls.o misc.o savestr.o \
- wputs.o eputs.o quit.o $(COMPAT)
- $(CC) $(CFLAGS) cv.o mfio.o cvhfio.o syscalls.o misc.o \
--savestr.o wputs.o eputs.o quit.o $(COMPAT) $(MLIB)
-- cp a.out $(INSTDIR)/cv
-+savestr.o wputs.o eputs.o quit.o $(COMPAT) $(MLIB) -o cv
-
--$(INSTDIR)/plot4: plot4.o primout.o
-- $(CC) $(CFLAGS) plot4.o primout.o $(common) $(MLIB)
-- cp a.out $(INSTDIR)/plot4
-+plot4: plot4.o primout.o
-+ $(CC) $(CFLAGS) plot4.o primout.o $(common) $(MLIB) -o plot4
-
--$(INSTDIR)/tcurve: tcurve.o tgraph.o primout.o
-+tcurve: tcurve.o tgraph.o primout.o
- $(CC) $(CFLAGS) tcurve.o tgraph.o primout.o \
--$(common) $(MLIB)
-- cp a.out $(INSTDIR)/tcurve
-+$(common) $(MLIB) -o tcurve
-
--$(INSTDIR)/tscat: tscat.o tgraph.o primout.o
-+tscat: tscat.o tgraph.o primout.o
- $(CC) $(CFLAGS) tscat.o tgraph.o primout.o \
--$(common) $(MLIB)
-- cp a.out $(INSTDIR)/tscat
-+$(common) $(MLIB) -o tscat
-+
-+tbar: tbar.o tgraph.o primout.o
-+ $(CC) $(CFLAGS) tbar.o tgraph.o primout.o $(common) $(MLIB) -o tbar
-
--$(INSTDIR)/tbar: tbar.o tgraph.o primout.o
-- $(CC) $(CFLAGS) tbar.o tgraph.o primout.o $(common) $(MLIB)
-- cp a.out $(INSTDIR)/tbar
--
--$(EXEC2)/mtext: mtext.o primout.o
-- $(CC) $(CFLAGS) mtext.o primout.o $(common)
-- cp a.out $(EXEC2)/mtext
-+mtext: mtext.o primout.o
-+ $(CC) $(CFLAGS) mtext.o primout.o $(common) -o mtext
-
- ../lib/libmeta.a: metacalls.o primout.o progname.o
- ar rc ../lib/libmeta.a metacalls.o primout.o \
-@@ -154,30 +125,26 @@
- ../lib/lib4014.a:
- cd lib4014; make INSTDIR=../../lib "CFLAGS=$(OPT)" install clean
-
--$(INSTDIR)/bgraph: bgraph.o mgvars.o mgraph.o ../lib/libmeta.a \
-+bgraph: bgraph.o mgvars.o mgraph.o ../lib/libmeta.a \
- calexpr.o caldefn.o calfunc.o ealloc.o
- $(CC) $(CFLAGS) bgraph.o mgvars.o mgraph.o \
--calexpr.o caldefn.o calfunc.o ealloc.o ../lib/libmeta.a $(MLIB)
-- cp a.out $(INSTDIR)/bgraph
-+calexpr.o caldefn.o calfunc.o ealloc.o ../lib/libmeta.a $(MLIB) -o bgraph
-
--$(INSTDIR)/igraph: igraph.o mgvars.o mgraph.o ../lib/libmeta.a \
-+igraph: igraph.o mgvars.o mgraph.o ../lib/libmeta.a \
- calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o
- $(CC) $(CFLAGS) igraph.o mgvars.o mgraph.o \
- calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o \
--../lib/libmeta.a $(MLIB)
-- cp a.out $(INSTDIR)/igraph
-+../lib/libmeta.a $(MLIB) -o igraph
-
--$(INSTDIR)/dgraph: dgraph.o cgraph.o mgvars.o ealloc.o calfunc.o \
-+dgraph: dgraph.o cgraph.o mgvars.o ealloc.o calfunc.o \
- calexpr.o caldefn.o savestr.o wputs.o $(COMPAT)
- $(CC) $(CFLAGS) dgraph.o cgraph.o mgvars.o \
--calfunc.o calexpr.o caldefn.o ealloc.o savestr.o wputs.o $(COMPAT) $(MLIB)
-- cp a.out $(INSTDIR)/dgraph
-+calfunc.o calexpr.o caldefn.o ealloc.o savestr.o wputs.o $(COMPAT) $(MLIB) -o dgraph
-
--$(INSTDIR)/gcomp: gcomp.o gcalc.o mgvars.o ealloc.o calfunc.o \
-+gcomp: gcomp.o gcalc.o mgvars.o ealloc.o calfunc.o \
- calexpr.o caldefn.o wputs.o savestr.o $(COMPAT)
- $(CC) $(CFLAGS) gcomp.o gcalc.o mgvars.o \
--calfunc.o calexpr.o caldefn.o ealloc.o wputs.o savestr.o $(COMPAT) $(MLIB)
-- cp a.out $(INSTDIR)/gcomp
-+calfunc.o calexpr.o caldefn.o ealloc.o wputs.o savestr.o $(COMPAT) $(MLIB) -o gcomp
-
- calexpr.o: calexpr.c calcomp.h
- $(CC) $(CFLAGS) -c -DVARIABLE -DFUNCTION -DRCONST calexpr.c
-diff -ur ray.orig/src/meta/igraph.c ray/src/meta/igraph.c
---- ray.orig/src/meta/igraph.c Sat Jul 6 18:20:18 2002
-+++ ray/src/meta/igraph.c Sat Jul 6 22:31:06 2002
-@@ -14,6 +14,8 @@
-
- #include "mgvars.h"
-
-+#include "meta.h"
-+
- typedef struct {
- char *descrip; /* description */
- char *value; /* value */
-diff -ur ray.orig/src/meta/meta.h ray/src/meta/meta.h
---- ray.orig/src/meta/meta.h Sat Jul 6 18:20:18 2002
-+++ ray/src/meta/meta.h Sat Jul 6 22:31:06 2002
-@@ -90,6 +90,7 @@
- #define YMN 1 /* index in xy array for ymin */
- #define XMX 2 /* index in xy array for xmax */
- #define YMX 3 /* index in xy array for ymax */
-+#define pout stdout
-
-
- /*
-diff -ur ray.orig/src/meta/meta2tga.c ray/src/meta/meta2tga.c
---- ray.orig/src/meta/meta2tga.c Sat Jul 6 18:20:18 2002
-+++ ray/src/meta/meta2tga.c Sat Jul 6 22:31:06 2002
-@@ -67,6 +67,8 @@
- #endif
- char comargs[200], command[300];
-
-+ fout=stdout;
-+
- #ifdef CPM
- fixargs("meta2tga", &argc, &argv);
- #endif
-diff -ur ray.orig/src/ot/Rmakefile ray/src/ot/Rmakefile
---- ray.orig/src/ot/Rmakefile Sat Jul 6 18:20:18 2002
-+++ ray/src/ot/Rmakefile Sat Jul 6 22:31:06 2002
-@@ -24,14 +24,14 @@
- o_cone.o o_instance.o bbox.o initotypes.o readfargs.o malloc.o
- $(CC) $(CFLAGS) -o oconv oconv.o writeoct.o sphere.o o_face.o \
- o_cone.o o_instance.o bbox.o readfargs.o \
--initotypes.o malloc.o -lrt $(MLIB)
-+initotypes.o malloc.o -lrayt $(MLIB)
-
- getbbox: getbbox.o readobj2.o bbox.o init2otypes.o
- $(CC) $(CFLAGS) -o getbbox getbbox.o readobj2.o \
--bbox.o init2otypes.o -lrt $(MLIB)
-+bbox.o init2otypes.o -lrayt $(MLIB)
-
- install: oconv getbbox
-- cp oconv getbbox $(INSTDIR)
-+ install oconv getbbox $(DESTDIR)$(INSTDIR)
-
- clean:
- set nonomatch; rm -f oconv getbbox *.o core
-diff -ur ray.orig/src/px/Rmakefile ray/src/px/Rmakefile
---- ray.orig/src/px/Rmakefile Sat Jul 6 18:20:18 2002
-+++ ray/src/px/Rmakefile Sat Jul 6 22:31:06 2002
-@@ -5,7 +5,7 @@
- ARCH = sun
- OPT = -O
- MACH = -DBSD
--SPECIAL = aed
-+# SPECIAL = aed
- CFLAGS = -I../common -L../lib $(OPT) $(MACH)
- CC = cc
- MLIB = -lm
-@@ -25,13 +25,13 @@
- all: $(PROGS) $(SPECIAL)
-
- x10: x10image
-- cp x10image $(INSTDIR)
-+ cp x10image $(DESTDIR)$(INSTDIR)
-
- aed: aedimage
-- cp aedimage $(INSTDIR)
-+ cp aedimage $(DESTDIR)$(INSTDIR)
-
- sgi: glimage
-- cp glimage $(INSTDIR)
-+ cp glimage $(DESTDIR)$(INSTDIR)
-
- ogl:
-
-@@ -39,15 +39,15 @@
-
- install: $(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
- pdfblur.csh pmblur.csh xyzimage.csh
-- cp $(PROGS) $(INSTDIR)
-- cp normpat.csh $(INSTDIR)/normpat
-- cp falsecolor.csh $(INSTDIR)/falsecolor
-- cp pdfblur.csh $(INSTDIR)/pdfblur
-- cp pmblur.csh $(INSTDIR)/pmblur
-- cp xyzimage.csh $(INSTDIR)/xyzimage
-- cp phisto.csh $(INSTDIR)/phisto
-- chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor \
--$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage $(INSTDIR)/phisto
-+ install $(PROGS) $(DESTDIR)$(INSTDIR)
-+ install normpat.csh $(DESTDIR)$(INSTDIR)/normpat
-+ install falsecolor.csh $(DESTDIR)$(INSTDIR)/falsecolor
-+ install pdfblur.csh $(DESTDIR)$(INSTDIR)/pdfblur
-+ install pmblur.csh $(DESTDIR)$(INSTDIR)/pmblur
-+ install xyzimage.csh $(DESTDIR)$(INSTDIR)/xyzimage
-+ install phisto.csh $(DESTDIR)$(INSTDIR)/phisto
-+ chmod 755 $(DESTDIR)$(INSTDIR)/normpat $(DESTDIR)$(INSTDIR)/falsecolor \
-+$(DESTDIR)$(INSTDIR)/pdfblur $(DESTDIR)$(INSTDIR)/pmblur $(DESTDIR)$(INSTDIR)/xyzimage $(DESTDIR)$(INSTDIR)/phisto
-
- clean:
- set nonomatch; rm -f x10image aedimage glimage \
-@@ -55,140 +55,140 @@
- cd tiff; make distclean
-
- pfilt: pfilt.o pf2.o pf3.o
-- $(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrayt $(MLIB)
-
- pcond: pcond.o pcond2.o pcond3.o pcond4.o warp3d.o
- $(CC) $(CFLAGS) -o pcond pcond.o pcond2.o pcond3.o pcond4.o warp3d.o \
---lrt $(MLIB)
-+-lrayt $(MLIB)
-
- pcwarp: pcwarp.o warp3d.o
-- $(CC) $(CFLAGS) -o pcwarp pcwarp.o warp3d.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o pcwarp pcwarp.o warp3d.o -lrayt $(MLIB)
-
- ttyimage: ttyimage.o
-- $(CC) $(CFLAGS) -o ttyimage ttyimage.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o ttyimage ttyimage.o -lrayt $(MLIB)
-
- t4027: t4027.o
-- $(CC) $(CFLAGS) -o t4027 t4027.o -lrt
-+ $(CC) $(CFLAGS) -o t4027 t4027.o -lrayt
-
- glimage: glimage.o
-- $(CC) $(CFLAGS) -o glimage glimage.o -lrt -lgl_s $(MLIB)
-+ $(CC) $(CFLAGS) -o glimage glimage.o -lrayt -lgl_s $(MLIB)
-
- aedimage: aedimage.o ciq.o cut.o closest.o biq.o
- $(CC) $(CFLAGS) -o aedimage aedimage.o ciq.o cut.o closest.o \
--biq.o -lrt $(MLIB)
-+biq.o -lrayt $(MLIB)
-
- oki20c: oki20c.o
-- $(CC) $(CFLAGS) -o oki20c oki20c.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o oki20c oki20c.o -lrayt $(MLIB)
-
- oki20: oki20.o
-- $(CC) $(CFLAGS) -o oki20 oki20.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o oki20 oki20.o -lrayt $(MLIB)
-
- paintjet: paintjet.o
-- $(CC) $(CFLAGS) -o paintjet paintjet.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o paintjet paintjet.o -lrayt $(MLIB)
-
- mt160r: mt160r.o
-- $(CC) $(CFLAGS) -o mt160r mt160r.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o mt160r mt160r.o -lrayt $(MLIB)
-
- greyscale: greyscale.o
-- $(CC) $(CFLAGS) -o greyscale greyscale.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o greyscale greyscale.o -lrayt $(MLIB)
-
- colorscale: colorscale.o
-- $(CC) $(CFLAGS) -o colorscale colorscale.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o colorscale colorscale.o -lrayt $(MLIB)
-
- pvalue: pvalue.o
-- $(CC) $(CFLAGS) -o pvalue pvalue.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o pvalue pvalue.o -lrayt $(MLIB)
-
- psum: psum.o
-- $(CC) $(CFLAGS) -o psum psum.o -lrt
-+ $(CC) $(CFLAGS) -o psum psum.o -lrayt
-
- pcompos: pcompos.o
-- $(CC) $(CFLAGS) -o pcompos pcompos.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o pcompos pcompos.o -lrayt $(MLIB)
-
- psign: psign.o
-- $(CC) $(CFLAGS) -o psign psign.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o psign psign.o -lrayt $(MLIB)
-
- d48c: d48c.o
-- $(CC) $(CFLAGS) -o d48c d48c.o -lrt
-+ $(CC) $(CFLAGS) -o d48c d48c.o -lrayt
-
- ra_gif: ra_gif.o clrtab.o neuclrtab.o
-- $(CC) $(CFLAGS) -o ra_gif ra_gif.o clrtab.o neuclrtab.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o ra_gif ra_gif.o clrtab.o neuclrtab.o -lrayt $(MLIB)
-
- ra_pr: ra_pr.o ciq.o cut.o closest.o biq.o
- $(CC) $(CFLAGS) -o ra_pr ra_pr.o ciq.o cut.o closest.o \
--biq.o -lrt $(MLIB)
-+biq.o -lrayt $(MLIB)
-
- ra_pr24: ra_pr24.o
-- $(CC) $(CFLAGS) -o ra_pr24 ra_pr24.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o ra_pr24 ra_pr24.o -lrayt $(MLIB)
-
- ra_avs: ra_avs.o
-- $(CC) $(CFLAGS) -o ra_avs ra_avs.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o ra_avs ra_avs.o -lrayt $(MLIB)
-
- ra_ps: ra_ps.o
-- $(CC) $(CFLAGS) -o ra_ps ra_ps.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o ra_ps ra_ps.o -lrayt $(MLIB)
-
- ra_ppm: ra_ppm.o
-- $(CC) $(CFLAGS) -o ra_ppm ra_ppm.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o ra_ppm ra_ppm.o -lrayt $(MLIB)
-
- ra_t8: ra_t8.o clrtab.o neuclrtab.o
-- $(CC) $(CFLAGS) -o ra_t8 ra_t8.o clrtab.o neuclrtab.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o ra_t8 ra_t8.o clrtab.o neuclrtab.o -lrayt $(MLIB)
-
- ra_t16: ra_t16.o
-- $(CC) $(CFLAGS) -o ra_t16 ra_t16.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o ra_t16 ra_t16.o -lrayt $(MLIB)
-
- ra_im: ra_im.o
- $(CC) $(CFLAGS) -o ra_im ra_im.o
-
- ra_bn: ra_bn.o
-- $(CC) $(CFLAGS) -o ra_bn ra_bn.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o ra_bn ra_bn.o -lrayt $(MLIB)
-
- ra_rgbe: ra_rgbe.o
-- $(CC) $(CFLAGS) -o ra_rgbe ra_rgbe.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o ra_rgbe ra_rgbe.o -lrayt $(MLIB)
-
- ra_pict: ra_pict.o
-- $(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrayt $(MLIB)
-
- ra_hexbit: ra_hexbit.o
-- $(CC) $(CFLAGS) -o ra_hexbit ra_hexbit.o -lrt
-+ $(CC) $(CFLAGS) -o ra_hexbit ra_hexbit.o -lrayt
-
- x10image: ximage.o ciq.o cut.o closest.o xraster.o biq.o
- $(CC) $(CFLAGS) -o x10image ximage.o xraster.o \
--ciq.o cut.o closest.o biq.o -lX -lrt $(MLIB)
-+ciq.o cut.o closest.o biq.o -lX -lrayt $(MLIB)
-
- ximage: x11image.o x11raster.o clrtab.o
- $(CC) $(CFLAGS) -o ximage x11image.o x11raster.o \
--clrtab.o -lrt -lX11 $(MLIB)
-+clrtab.o -lrayt -lX11 $(MLIB)
-
- protate: protate.o
-- $(CC) $(CFLAGS) -o protate protate.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o protate protate.o -lrayt $(MLIB)
-
- pextrem: pextrem.o
-- $(CC) $(CFLAGS) -o pextrem pextrem.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o pextrem pextrem.o -lrayt $(MLIB)
-
- pflip: pflip.o
-- $(CC) $(CFLAGS) -o pflip pflip.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o pflip pflip.o -lrayt $(MLIB)
-
- panim: panim.o client/libclient.a
- $(CC) $(CFLAGS) -o panim panim.o \
---lrt client/libclient.a -lrpcsvc $(MLIB)
-+-lrayt client/libclient.a -lrpcsvc $(MLIB)
-
- pcomb: pcomb.o
-- $(CC) $(CFLAGS) -o pcomb pcomb.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o pcomb pcomb.o -lrayt $(MLIB)
-
- pinterp: pinterp.o
-- $(CC) $(CFLAGS) -o pinterp pinterp.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o pinterp pinterp.o -lrayt $(MLIB)
-
- ra_xyze: ra_xyze.o
-- $(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrt $(MLIB)
-+ $(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrayt $(MLIB)
-
- ra_tiff: ra_tiff.o ../lib/libtiff.a
-- $(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrt -ltiff $(MLIB)
-+ $(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrayt -ltiff $(MLIB)
-
- ../common/tiff.h ../common/tiffio.h: ../lib/libtiff.a
- @chmod u+w ../common/tiff.h ../common/tiffio.h
- @touch ../common/tiff.h ../common/tiffio.h
-
- normtiff: normtiff.o ../lib/libtiff.a
-- $(CC) $(CFLAGS) -o normtiff normtiff.o -lrt -ltiff $(MLIB)
-+ $(CC) $(CFLAGS) -o normtiff normtiff.o -lrayt -ltiff $(MLIB)
-
- ../lib/libtiff.a: tiff/config.local
- cd tiff ; ./configure -quiet -noninteractive -with-CC=$(CC) \
-@@ -196,7 +196,7 @@
- cd libtiff ; make install
-
- ra_pixar: ra_pixar.o ra_pixar.c
-- $(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrt \
-+ $(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrayt \
- $(PIXAR_LIB)
-
- ra_pixar.o: ra_pixar.c
-@@ -204,11 +204,11 @@
-
- xshowtrace: xshowtrace.o x11findwind.o
- $(CC) $(CFLAGS) -o xshowtrace xshowtrace.o \
--x11findwind.o -lrt -lX11 $(MLIB)
-+x11findwind.o -lrayt -lX11 $(MLIB)
-
- macbethcal: macbethcal.o pmapgen.o mx3.o warp3d.o
- $(CC) $(CFLAGS) -o macbethcal macbethcal.o pmapgen.o mx3.o warp3d.o \
---lrt $(MLIB)
-+-lrayt $(MLIB)
-
-
- macbethcal.o: pmap.h ../common/color.h ../common/resolu.h
-diff -ur ray.orig/src/px/pcwarp.c ray/src/px/pcwarp.c
---- ray.orig/src/px/pcwarp.c Sat Jul 6 18:20:18 2002
-+++ ray/src/px/pcwarp.c Sat Jul 6 22:31:06 2002
-@@ -30,6 +30,7 @@
- int cwflags = 0;
- int rval;
- int i;
-+ infp=stdin;
-
- progname = argv[0];
- infp = stdin;
-diff -ur ray.orig/src/px/x11image.c ray/src/px/x11image.c
---- ray.orig/src/px/x11image.c Sat Jul 6 18:20:18 2002
-+++ ray/src/px/x11image.c Sat Jul 6 22:31:06 2002
-@@ -141,6 +141,7 @@
- int headline();
- int i;
- int pid;
-+ fin=stdin;
-
- progname = argv[0];
- fin = stdin;
-diff -ur ray.orig/src/rt/Rmakefile ray/src/rt/Rmakefile
---- ray.orig/src/rt/Rmakefile Sat Jul 6 18:20:18 2002
-+++ ray/src/rt/Rmakefile Sat Jul 6 22:31:06 2002
-@@ -5,8 +5,8 @@
-
- OPT = -O
- MACH = -DBSD
--CFLAGS = -I../common -L../lib $(OPT) $(MACH)
--SPECIAL = aed
-+CFLAGS = -I../common -L../lib $(OPT) $(MACH) -I/usr/include/ncurses
-+#SPECIAL = aed
- CC = cc
- MLIB = -lm
- LINT = lint
-@@ -18,7 +18,7 @@
- #
- DESTDIR = .
- INSTDIR = /usr/local/bin
--INSTALL = cp
-+INSTALL = install
-
- #
- # The following paths must exist and be relative to root:
-@@ -29,7 +29,7 @@
- #
- # Library routines:
- #
--LIBS = -lrt $(MLIB)
-+LIBS = -lrayt $(MLIB)
-
- #
- # Device drivers for rview (see also devtable.c):
-@@ -85,14 +85,14 @@
- # What this makefile produces:
- #
-
--PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
-+PROGS = rtrace rpict rview lookamb
-
- all: $(PROGS)
-
- install: $(PROGS) $(SPECIAL) rayinit.cal
-- $(INSTALL) $(PROGS) $(INSTDIR)
-- rm -f $(LIBDIR)/rayinit.cal
-- cp rayinit.cal $(LIBDIR)
-+ $(INSTALL) $(PROGS) $(DESTDIR)$(INSTDIR)
-+ rm -f $(DESTDIR)$(LIBDIR)/rayinit.cal
-+ $(INSTALL) rayinit.cal $(DESTDIR)$(LIBDIR)
-
- sun: $(DEVDIR)/sun $(DEVDIR)/sun.com
-
-@@ -114,17 +114,17 @@
- # Links:
- #
-
--$(DESTDIR)/rtrace: $(RTOBJS)
-- $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
-+rtrace: $(RTOBJS)
-+ $(CC) $(CFLAGS) -o rtrace $(RTOBJS) $(LIBS)
-
--$(DESTDIR)/rpict: $(RPOBJS)
-- $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
-+rpict: $(RPOBJS)
-+ $(CC) $(CFLAGS) -o rpict $(RPOBJS) $(LIBS)
-
--$(DESTDIR)/rview: $(RVOBJS)
-- $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(LIBS) $(DLIBS)
-+rview: $(RVOBJS)
-+ $(CC) $(CFLAGS) -o rview $(RVOBJS) $(LIBS) $(DLIBS)
-
--$(DESTDIR)/lookamb: lookamb.o ambio.o
-- $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
-+lookamb: lookamb.o ambio.o
-+ $(CC) $(CFLAGS) -o lookamb lookamb.o ambio.o $(LIBS)
-
- $(DEVDIR)/sun: sundev.o devmain.o colortab.o editline.o
- $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun devmain.o sundev.o colortab.o \
-diff -ur ray.orig/src/util/Rmakefile ray/src/util/Rmakefile
---- ray.orig/src/util/Rmakefile Sat Jul 6 18:20:18 2002
-+++ ray/src/util/Rmakefile Sat Jul 6 22:31:06 2002
-@@ -24,27 +24,27 @@
-
- install: all $(SPECIAL) objview.csh objpict.csh glare.csh dayfact.csh \
- rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh
-- cp $(PROGS) $(INSTDIR)
-- cp objview.csh $(INSTDIR)/objview
-- cp objline.csh $(INSTDIR)/objline
-- cp objpict.csh $(INSTDIR)/objpict
-- cp glare.csh $(INSTDIR)/glare
-- cp dayfact.csh $(INSTDIR)/dayfact
-- cp debugcal.csh $(INSTDIR)/debugcal
-- cp rlux.csh $(INSTDIR)/rlux
-- cp raddepend.csh $(INSTDIR)/raddepend
-- cp compamb.csh $(INSTDIR)/compamb
-- chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
-- $(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
-- $(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline \
-- $(INSTDIR)/compamb
-- csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
-+ cp $(PROGS) $(DESTDIR)$(INSTDIR)
-+ cp objview.csh $(DESTDIR)$(INSTDIR)/objview
-+ cp objline.csh $(DESTDIR)$(INSTDIR)/objline
-+ cp objpict.csh $(DESTDIR)$(INSTDIR)/objpict
-+ cp glare.csh $(DESTDIR)$(INSTDIR)/glare
-+ cp dayfact.csh $(DESTDIR)$(INSTDIR)/dayfact
-+ cp debugcal.csh $(DESTDIR)$(INSTDIR)/debugcal
-+ cp rlux.csh $(DESTDIR)$(INSTDIR)/rlux
-+ cp raddepend.csh $(DESTDIR)$(INSTDIR)/raddepend
-+ cp compamb.csh $(DESTDIR)$(INSTDIR)/compamb
-+ chmod 755 $(DESTDIR)$(INSTDIR)/objview $(DESTDIR)$(INSTDIR)/objpict \
-+ $(DESTDIR)$(INSTDIR)/glare $(DESTDIR)$(INSTDIR)/dayfact $(DESTDIR)$(INSTDIR)/debugcal \
-+ $(DESTDIR)$(INSTDIR)/rlux $(DESTDIR)$(INSTDIR)/raddepend $(DESTDIR)$(INSTDIR)/objline \
-+ $(DESTDIR)$(INSTDIR)/compamb
-+ csh -f tradinstall.csh $(DESTDIR)$(INSTDIR) $(DESTDIR)$(LIBDIR)/tcl
-
- clean:
- set nonomatch; rm -f *.o $(PROGS) core
-
- ogl: glrad
-- cp glrad $(INSTDIR)
-+ cp glrad $(DESTDIR)$(INSTDIR)
-
- x10:
-
-@@ -58,39 +58,39 @@
- $(CC) $(CFLAGS) -o scanner scanner.o -lm
-
- makedist: makedist.o setscan.o
-- $(CC) $(CFLAGS) -o makedist makedist.o setscan.o -lrt -lm
-+ $(CC) $(CFLAGS) -o makedist makedist.o setscan.o -lrayt -lm
-
- findglare: findglare.o glareval.o glaresrc.o setscan.o
- $(CC) $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \
--setscan.o -lrt -lm
-+setscan.o -lrayt -lm
-
- glarendx: glarendx.o
-- $(CC) $(CFLAGS) -o glarendx glarendx.o -lrt -lm
-+ $(CC) $(CFLAGS) -o glarendx glarendx.o -lrayt -lm
-
- xglaresrc: xglaresrc.o x11findwind.o
- $(CC) $(CFLAGS) -o xglaresrc xglaresrc.o \
--x11findwind.o -lrt -lX11 -lm
-+x11findwind.o -lrayt -lX11 -lm
-
- rad: rad.o
-- $(CC) $(CFLAGS) -o rad rad.o -lrt -lm
-+ $(CC) $(CFLAGS) -o rad rad.o -lrayt -lm
-
- ranimate: ranimate.o netproc.o
-- $(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrt -lm
-+ $(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrayt -lm
-
- rpiece: rpiece.o Version.o
-- $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrt -lm
-+ $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrayt -lm
-
- vwright: vwright.o
-- $(CC) $(CFLAGS) -o vwright vwright.o -lrt -lm
-+ $(CC) $(CFLAGS) -o vwright vwright.o -lrayt -lm
-
- vwrays: vwrays.o
-- $(CC) $(CFLAGS) -o vwrays vwrays.o -lrt -lm
-+ $(CC) $(CFLAGS) -o vwrays vwrays.o -lrayt -lm
-
- getinfo: getinfo.o
-- $(CC) $(CFLAGS) -o getinfo getinfo.o -lrt
-+ $(CC) $(CFLAGS) -o getinfo getinfo.o -lrayt
-
- glrad: glrad.o
-- $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrt -lGLU -lGL \
-+ $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrayt -lGLU -lGL \
- -lX11 -lXext -lm
-
- contour: contour.o
+++ /dev/null
-diff -Nur ray.orig/doc/man/man1/findglare.1 ray/doc/man/man1/findglare.1
---- ray.orig/doc/man/man1/findglare.1 Mon Nov 15 21:58:32 1993
-+++ ray/doc/man/man1/findglare.1 Wed Aug 21 22:33:26 2002
-@@ -54,7 +54,7 @@
- Note that the picture file must contain correct view specifications,
- as maintained by
- .I rpict(1),
--.I rview(1),
-+.I radview(1),
- .I pfilt(1)
- and
- .I pinterp(1).
-@@ -112,7 +112,7 @@
- .I ximage(1)
- to decide what this value should be.
- Alternatively, one can use the 't' command within
--.I rview(1).
-+.I radview(1).
- The idea is to pick a threshold that is well above the average level
- but smaller than the source areas.
- .PP
-@@ -157,4 +157,4 @@
- group at EPFL in Switzerland.
- .SH "SEE ALSO"
- getinfo(1), glare(1), glarendx(1), pfilt(1), rpict(1), rtrace(1),
--rview(1), xglaresrc(1), ximage(1)
-+radview(1), xglaresrc(1), ximage(1)
-diff -Nur ray.orig/doc/man/man1/genblinds.1 ray/doc/man/man1/genblinds.1
---- ray.orig/doc/man/man1/genblinds.1 Mon Oct 10 21:06:53 1994
-+++ ray/doc/man/man1/genblinds.1 Wed Aug 21 22:34:18 2002
-@@ -57,4 +57,4 @@
- .SH AUTHOR
- Jean-Louis Scartezzini and Greg Ward
- .SH "SEE ALSO"
--genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rview(1), xform(1)
-+genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), radview(1), xform(1)
-diff -Nur ray.orig/doc/man/man1/genbox.1 ray/doc/man/man1/genbox.1
---- ray.orig/doc/man/man1/genbox.1 Mon Nov 15 21:58:33 1993
-+++ ray/doc/man/man1/genbox.1 Wed Aug 21 22:34:28 2002
-@@ -42,4 +42,4 @@
- Because spheres and cylinders are used to construct boxes with
- rounded edges, a transparent box of this type appears quite messy.
- .SH "SEE ALSO"
--genrev(1), gensurf(1), genworm(1), rpict(1), rview(1), xform(1)
-+genrev(1), gensurf(1), genworm(1), rpict(1), radview(1), xform(1)
-diff -Nur ray.orig/doc/man/man1/genclock.1 ray/doc/man/man1/genclock.1
---- ray.orig/doc/man/man1/genclock.1 Wed Apr 9 23:46:29 1997
-+++ ray/doc/man/man1/genclock.1 Wed Aug 21 22:34:36 2002
-@@ -54,4 +54,4 @@
- .SH AUTHOR
- Greg Ward
- .SH "SEE ALSO"
--genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rview(1), xform(1)
-+genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), radview(1), xform(1)
-diff -Nur ray.orig/doc/man/man1/genprism.1 ray/doc/man/man1/genprism.1
---- ray.orig/doc/man/man1/genprism.1 Wed Mar 20 01:33:54 1996
-+++ ray/doc/man/man1/genprism.1 Wed Aug 21 22:34:48 2002
-@@ -57,4 +57,4 @@
- normals.
- If the normals face inward, the appearance will be bizarre.
- .SH "SEE ALSO"
--genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rview(1), xform(1)
-+genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), radview(1), xform(1)
-diff -Nur ray.orig/doc/man/man1/genrev.1 ray/doc/man/man1/genrev.1
---- ray.orig/doc/man/man1/genrev.1 Mon Nov 15 21:58:33 1993
-+++ ray/doc/man/man1/genrev.1 Wed Aug 21 22:34:56 2002
-@@ -57,4 +57,4 @@
- The -s option doesn't modify the surface normal correctly
- for the opposite side.
- .SH "SEE ALSO"
--calc(1), genbox(1), gensurf(1), genworm(1), rpict(1), rview(1), xform(1)
-+calc(1), genbox(1), gensurf(1), genworm(1), rpict(1), radview(1), xform(1)
-diff -Nur ray.orig/doc/man/man1/gensky.1 ray/doc/man/man1/gensky.1
---- ray.orig/doc/man/man1/gensky.1 Fri Apr 24 19:46:58 1998
-+++ ray/doc/man/man1/gensky.1 Wed Aug 21 22:35:03 2002
-@@ -97,7 +97,7 @@
- description to use with the
- .I \-av
- option of the RADIANCE rendering programs.
--(See rview(1) and rpict(1).)
-+(See radview(1) and rpict(1).)
- This value is the cosine-weighted radiance of the sky in
- watts/steradian/meter2.
- .PP
-@@ -227,4 +227,4 @@
- .SH AUTHOR
- Greg Ward
- .SH "SEE ALSO"
--rpict(1), rview(1), xform(1)
-+rpict(1), radview(1), xform(1)
-diff -Nur ray.orig/doc/man/man1/gensurf.1 ray/doc/man/man1/gensurf.1
---- ray.orig/doc/man/man1/gensurf.1 Mon Nov 15 21:58:33 1993
-+++ ray/doc/man/man1/gensurf.1 Wed Aug 21 22:35:10 2002
-@@ -95,4 +95,4 @@
- The smoothing operation requires that functions be defined
- beyond the [0,1] boundaries of s and t.
- .SH "SEE ALSO"
--calc(1), genbox(1), genrev(1), genworm(1), rpict(1), rview(1), xform(1)
-+calc(1), genbox(1), genrev(1), genworm(1), rpict(1), radview(1), xform(1)
-diff -Nur ray.orig/doc/man/man1/genworm.1 ray/doc/man/man1/genworm.1
---- ray.orig/doc/man/man1/genworm.1 Mon Nov 15 21:58:33 1993
-+++ ray/doc/man/man1/genworm.1 Wed Aug 21 22:35:19 2002
-@@ -46,4 +46,4 @@
- opaque materials should be used with this object.
- Also, a worm cannot double back inside itself without making a mess.
- .SH "SEE ALSO"
--calc(1), genbox(1), genrev(1), gensurf(1), rpict(1), rview(1), xform(1)
-+calc(1), genbox(1), genrev(1), gensurf(1), rpict(1), radview(1), xform(1)
-diff -Nur ray.orig/doc/man/man1/getinfo.1 ray/doc/man/man1/getinfo.1
---- ray.orig/doc/man/man1/getinfo.1 Fri Jan 15 19:26:44 1999
-+++ ray/doc/man/man1/getinfo.1 Wed Aug 21 22:35:26 2002
-@@ -47,4 +47,4 @@
- .SH AUTHOR
- Greg Ward
- .SH "SEE ALSO"
--oconv(1), pfilt(1), rhinfo(1), rpict(1), rview(1)
-+oconv(1), pfilt(1), rhinfo(1), rpict(1), radview(1)
-diff -Nur ray.orig/doc/man/man1/glrad.1 ray/doc/man/man1/glrad.1
---- ray.orig/doc/man/man1/glrad.1 Thu Jun 11 03:48:21 1998
-+++ ray/doc/man/man1/glrad.1 Wed Aug 21 22:40:12 2002
-@@ -49,7 +49,7 @@
- option of
- .I rpict(1)
- and
--.I rview(1).
-+.I radview(1).
- The
- .I \-S
- option turns on full-screen stereo for displays that support it.
-@@ -169,4 +169,4 @@
- undefined symbol errors.
- .SH "SEE ALSO"
- chmod(1), getinfo(1), ls(1), objview(1), oconv(1), ps(1), rad(1),
--ranimate(1), rhcopy(1), rholo(1), rpict(1), rtrace(1), rview(1), setmon(1)
-+ranimate(1), rhcopy(1), rholo(1), rpict(1), rtrace(1), radview(1), setmon(1)
-diff -Nur ray.orig/doc/man/man1/lookamb.1 ray/doc/man/man1/lookamb.1
---- ray.orig/doc/man/man1/lookamb.1 Mon Nov 15 21:58:35 1993
-+++ ray/doc/man/man1/lookamb.1 Wed Aug 21 22:35:36 2002
-@@ -20,7 +20,7 @@
- .I rpict(1),
- .I rtrace(1),
- or
--.I rview(1).
-+.I radview(1).
- The default mode prints the position, direction, level, weight,
- radius, value, position gradient and direction gradient
- for each stored ambient value preceded by a
-@@ -56,4 +56,4 @@
- .SH AUTHOR
- Greg Ward
- .SH "SEE ALSO"
--getinfo(1), oconv(1), pfilt(1), pinterp(1), rpict(1), rtrace(1), rview(1)
-+getinfo(1), oconv(1), pfilt(1), pinterp(1), rpict(1), rtrace(1), radview(1)
-diff -Nur ray.orig/doc/man/man1/mkillum.1 ray/doc/man/man1/mkillum.1
---- ray.orig/doc/man/man1/mkillum.1 Fri Oct 6 19:12:05 1995
-+++ ray/doc/man/man1/mkillum.1 Wed Aug 21 22:35:51 2002
-@@ -18,7 +18,7 @@
- secondary sources whose contributions can be computed more efficiently by
- .I rpict(1)
- and
--.I rview(1).
-+.I radview(1).
- This type of optimization is most useful for windows and skylights which
- represent concentrated sources of indirect illumination.
- .I Mkillum
-@@ -188,4 +188,4 @@
- Work on this program was initiated and sponsored by the LESO
- group at EPFL in Switzerland.
- .SH "SEE ALSO"
--oconv(1), rad(1), rpict(1), rtrace(1), rview(1)
-+oconv(1), rad(1), rpict(1), rtrace(1), radview(1)
-diff -Nur ray.orig/doc/man/man1/objview.1 ray/doc/man/man1/objview.1
---- ray.orig/doc/man/man1/objview.1 Thu Jun 11 03:47:38 1998
-+++ ray/doc/man/man1/objview.1 Wed Aug 21 22:36:01 2002
-@@ -44,4 +44,4 @@
- .SH AUTHOR
- Greg Ward Larson
- .SH "SEE ALSO"
--glrad(1), oconv(1), rad(1), rview(1)
-+glrad(1), oconv(1), rad(1), radview(1)
-diff -Nur ray.orig/doc/man/man1/oconv.1 ray/doc/man/man1/oconv.1
---- ray.orig/doc/man/man1/oconv.1 Wed Aug 16 04:19:06 1995
-+++ ray/doc/man/man1/oconv.1 Wed Aug 21 22:36:13 2002
-@@ -167,4 +167,4 @@
- can be used to automate octree creation and maintenance.
- .SH "SEE ALSO"
- getbbox(1), getinfo(1), make(1), rad(1),
--rpict(1), rview(1), rtrace(1), xform(1)
-+rpict(1), radview(1), rtrace(1), xform(1)
-diff -Nur ray.orig/doc/man/man1/pinterp.1 ray/doc/man/man1/pinterp.1
---- ray.orig/doc/man/man1/pinterp.1 Wed Jan 24 20:47:40 1996
-+++ ray/doc/man/man1/pinterp.1 Wed Aug 21 22:36:50 2002
-@@ -31,7 +31,7 @@
- The input picture files must contain correct view specifications, as
- maintained by
- .I rpict(1),
--.I rview(1),
-+.I radview(1),
- .I pfilt(1)
- and
- .I pinterp.
-@@ -237,4 +237,4 @@
- Greg Ward
- .SH "SEE ALSO"
- getinfo(1), pdfblur(1), pfilt(1), pmblur(1), rpict(1), ranimate(1),
--rtrace(1), rview(1)
-+rtrace(1), radview(1)
-diff -Nur ray.orig/doc/man/man1/pvalue.1 ray/doc/man/man1/pvalue.1
---- ray.orig/doc/man/man1/pvalue.1 Fri Jan 15 19:07:54 1999
-+++ ray/doc/man/man1/pvalue.1 Wed Aug 21 22:36:59 2002
-@@ -226,4 +226,4 @@
- the scanline ordering or picture size.
- .SH "SEE ALSO"
- getinfo(1), pcompos(1), pfilt(1), pflip(1),
--protate(1), rpict(1), rtrace(1), rview(1)
-+protate(1), rpict(1), rtrace(1), radview(1)
-diff -Nur ray.orig/doc/man/man1/rad.1 ray/doc/man/man1/rad.1
---- ray.orig/doc/man/man1/rad.1 Mon Feb 1 18:23:11 1999
-+++ ray/doc/man/man1/rad.1 Wed Aug 21 22:37:38 2002
-@@ -35,7 +35,7 @@
- .I rpict(1),
- .I pfilt(1),
- and/or
--.I rview(1)
-+.I radview(1)
- to render a specific scene.
- Variables in
- .I rfile
-@@ -124,7 +124,7 @@
- The
- .I \-o
- option specifies an output device for
--.I rview
-+.I radview
- (usually "x11")
- and runs this interactive program instead, using the first view in
- .I rfile
-@@ -190,10 +190,10 @@
- It is important to set this variable properly as it is used to
- determine the ambient value.
- An appropriate setting may be discovered by running
--.I rview
-+.I radview
- and noting the exposure given by the "exposure =" command.
- As in
--.I rview
-+.I radview
- and
- .I pfilt,
- the exposure setting may be given either as a multiplier or as a
-@@ -395,7 +395,7 @@
- values will be stored by
- .I rpict
- or
--.I rview.
-+.I radview.
- Although it is not required, an ambient file should be given whenever
- an interreflection calculation is expected.
- This will optimize successive runs and minimize artifacts.
-@@ -435,7 +435,7 @@
- This file can later be accessed by
- .I rpict
- or
--.I rview
-+.I radview
- in subsequent manual runs using the at-sign ('@') file insert option.
- (Using an "OPTFILE" also reduces the length of the rendering
- command, which improves appearance and may even be necessary on some
-@@ -476,7 +476,7 @@
- This variable may be used to specify additional options to
- .I rpict
- or
--.I rview.
-+.I radview.
- These options will appear after the options set automatically by
- .I rad,
- and thus will override the default values.
-@@ -564,7 +564,7 @@
- Now we can invoke
- .I rad
- to take a look at our scene interactively with
--.I rview:
-+.I radview:
- .IP "" .2i
- rad -o x11 sample.rif
- .PP
-@@ -573,10 +573,10 @@
- .I oconv
- first to create the octree (assuming it doesn't
- already exist), then
--.I rview
-+.I radview
- with a long list of options.
- Let's say that from within
--.I rview,
-+.I radview,
- we wrote out the view files "view1.vp" and "view2.vp".
- We could add these to "sample.rif" like so:
- .IP "" .2i
-@@ -587,7 +587,7 @@
- .fi
- .PP
- To start
--.I rview
-+.I radview
- again using vw2 instead of the default, we use:
- .IP "" .2i
- rad -o x11 -v vw2 sample.rif
-@@ -643,4 +643,4 @@
- .SH "SEE ALSO"
- glrad(1), make(1), mkillum(1), objview(1), oconv(1),
- pfilt(1), raddepend(1), ranimate(1),
--rholo(1), rpict(1), rtrace(1), rview(1), touch(1), vgaimage(1), ximage(1)
-+rholo(1), rpict(1), rtrace(1), radview(1), touch(1), vgaimage(1), ximage(1)
-diff -Nur ray.orig/doc/man/man1/rholo.1 ray/doc/man/man1/rholo.1
---- ray.orig/doc/man/man1/rholo.1 Thu Aug 5 23:55:15 1999
-+++ ray/doc/man/man1/rholo.1 Wed Aug 21 22:40:29 2002
-@@ -28,10 +28,10 @@
- .I Rholo
- is a program for generating and viewing holodeck files.
- Similar to
--.I rview(1),
-+.I radview(1),
- .I rholo
- can compute views interactively, but unlike
--.I rview,
-+.I radview,
- it reuses any and all information that was previously computed in
- this or earlier runs using the given holodeck file,
- .I hdkfile.
-@@ -624,4 +624,4 @@
- participating media will usually work.
- .SH "SEE ALSO"
- chmod(1), ls(1), ps(1), rad(1), ranimate(1), rhcopy(1), rhinfo(1),
--rhoptimize(1), rhpict(1), rpict(1), rtrace(1), rview(1)
-+rhoptimize(1), rhpict(1), rpict(1), rtrace(1), radview(1)
-diff -Nur ray.orig/doc/man/man1/rhpict.1 ray/doc/man/man1/rhpict.1
---- ray.orig/doc/man/man1/rhpict.1 Thu Mar 11 01:17:40 1999
-+++ ray/doc/man/man1/rhpict.1 Wed Aug 21 22:40:38 2002
-@@ -177,7 +177,7 @@
- .BI -vf \ file
- Get view parameters from
- .I file,
--which may be a picture or a file created by rview (with the "view" command).
-+which may be a picture or a file created by radview (with the "view" command).
- .TP
- .BI -S \ seqstart
- Instead of generating a single picture based only on the view
-@@ -220,4 +220,4 @@
- Greg Ward
- .SH "SEE ALSO"
- getinfo(1), pfilt(1), pinterp(1),
--printf(3), ra_rgbe(1), rholo(1), rpict(1), rview(1)
-+printf(3), ra_rgbe(1), rholo(1), rpict(1), radview(1)
-diff -Nur ray.orig/doc/man/man1/rpict.1 ray/doc/man/man1/rpict.1
---- ray.orig/doc/man/man1/rpict.1 Fri Feb 26 21:26:39 1999
-+++ ray/doc/man/man1/rpict.1 Wed Aug 21 22:38:01 2002
-@@ -161,7 +161,7 @@
- .BI -vf \ file
- Get view parameters from
- .I file,
--which may be a picture or a file created by rview (with the "view" command).
-+which may be a picture or a file created by radview (with the "view" command).
- .TP
- .BI -x \ res
- Set the maximum x resolution to
-@@ -767,4 +767,4 @@
- Greg Ward
- .SH "SEE ALSO"
- getinfo(1), lookamb(1), oconv(1), pfilt(1), pinterp(1), pmblur(1),
--printf(3), ra_rgbe(1), rad(1), rtrace(1), rview(1)
-+printf(3), ra_rgbe(1), rad(1), rtrace(1), radview(1)
-diff -Nur ray.orig/doc/man/man1/rtrace.1 ray/doc/man/man1/rtrace.1
---- ray.orig/doc/man/man1/rtrace.1 Fri Oct 17 20:48:00 1997
-+++ ray/doc/man/man1/rtrace.1 Wed Aug 21 22:38:11 2002
-@@ -603,4 +603,4 @@
- Greg Ward
- .SH "SEE ALSO"
- getinfo(1), lookamb(1), oconv(1), pfilt(1), pinterp(1),
--pvalue(1), rpict(1), rview(1), vwrays(1), ximage(1)
-+pvalue(1), rpict(1), radview(1), vwrays(1), ximage(1)
-diff -Nur ray.orig/doc/man/man1/rview.1 ray/doc/man/man1/rview.1
---- ray.orig/doc/man/man1/rview.1 Thu Feb 15 00:48:41 1996
-+++ ray/doc/man/man1/rview.1 Wed Aug 21 22:41:09 2002
-@@ -1,9 +1,9 @@
- .\" SCCSid "@(#)rview.1 2.21 2/14/96 LBL"
--.TH RVIEW 1 2/14/96 RADIANCE
-+.TH RADVIEW 1 2/14/96 RADIANCE
- .SH NAME
--rview - generate RADIANCE images interactively
-+radview - generate RADIANCE images interactively
- .SH SYNOPSIS
--.B rview
-+.B radview
- [
- .B "rpict options"
- ][
-@@ -21,11 +21,11 @@
- ]
- .B octree
- .br
--.B "rview [ options ] \-defaults"
-+.B "radview [ options ] \-defaults"
- .br
--.B "rview \-devices"
-+.B "radview \-devices"
- .SH DESCRIPTION
--.I Rview
-+.I Radview
- generates RADIANCE images using
- .I octree.
- Options specify the viewing parameters as well as
-@@ -50,7 +50,7 @@
- and
- .I \-pa
- options are unnecessary, since
--.I rview
-+.I radview
- scales the display image to the specified output device.
- Additionally, the
- .I \-b
-@@ -63,28 +63,28 @@
- In the third form, the list of supported output devices
- is displayed.
- .PP
--.I Rview
-+.I Radview
- starts rendering the image from the selected viewpoint and
- gradually improves the resolution of the display until
- interrupted by keyboard input.
--.I Rview
-+.I Radview
- then issues a prompt (usually ':') and accepts a command
- line from the user.
--.I Rview
-+.I Radview
- may also stop its calculation and wait for command input if
- the resolution of the display has reached the resolution of the
- graphics device.
- At this point, it will give the 'done:' prompt and await further
- instructions.
- If
--.I rview
-+.I radview
- runs out of memory due to lack of resources to store its computed
- image, it will give the 'out of memory:' prompt.
- At this prompt, the user can save the image, quit, or even restart
- a new image, although this is not generally recommended
- on virtual memory machines for efficiency reasons.
- .PP
--.I Rview
-+.I Radview
- is not meant to be a rendering program, and we strongly recommend that
- .I rpict(1)
- be used instead for that purpose.
-@@ -92,8 +92,8 @@
- .I rpict(1)
- does not store its image in memory or update any display of its output,
- it is much faster and less wasteful of its resources than
--.I rview.
--.I Rview
-+.I radview.
-+.I Radview
- is intended as a quick interactive program for deciding viewpoints
- and debugging scene descriptions and is not suited for producing
- polished images.
-@@ -180,7 +180,7 @@
- appearing in
- .I rfile).
- If
--.I rview
-+.I radview
- was started by
- .I rad,
- then the
-diff -Nur ray.orig/doc/man/man1/trad.1 ray/doc/man/man1/trad.1
---- ray.orig/doc/man/man1/trad.1 Tue Aug 12 23:15:59 1997
-+++ ray/doc/man/man1/trad.1 Wed Aug 21 22:38:55 2002
-@@ -111,4 +111,4 @@
- .I wish
- and Tcl/Tk language by John Ousterhout
- .SH "SEE ALSO"
--oconv(1), pfilt(1), rad(1), rpict(1), rview(1), wish(1), ximage(1)
-+oconv(1), pfilt(1), rad(1), rpict(1), radview(1), wish(1), ximage(1)
-diff -Nur ray.orig/doc/man/man1/vwright.1 ray/doc/man/man1/vwright.1
---- ray.orig/doc/man/man1/vwright.1 Fri Aug 30 02:32:19 1996
-+++ ray/doc/man/man1/vwright.1 Wed Aug 21 22:39:05 2002
-@@ -78,4 +78,4 @@
- .SH AUTHOR
- Greg Ward
- .SH "SEE ALSO"
--pdfblur(1), rad(1), rcalc(1), rpict(1), rview(1)
-+pdfblur(1), rad(1), rcalc(1), rpict(1), radview(1)
-diff -Nur ray.orig/doc/man/man1/xform.1 ray/doc/man/man1/xform.1
---- ray.orig/doc/man/man1/xform.1 Wed Jun 16 19:13:16 1999
-+++ ray/doc/man/man1/xform.1 Wed Aug 21 22:39:13 2002
-@@ -184,4 +184,4 @@
- .SH BUGS
- Only regular (distortion-free) transformations are allowed.
- .SH "SEE ALSO"
--genbox(1), gensurf(1), oconv(1), replmarks(1), rpict(1), rview(1)
-+genbox(1), gensurf(1), oconv(1), replmarks(1), rpict(1), radview(1)
-diff -Nur ray.orig/doc/man/man1/ximage.1 ray/doc/man/man1/ximage.1
---- ray.orig/doc/man/man1/ximage.1 Tue Oct 27 18:44:51 1998
-+++ ray/doc/man/man1/ximage.1 Wed Aug 21 22:39:23 2002
-@@ -239,4 +239,4 @@
- Philip Thompson (MIT)
- .SH "SEE ALSO"
- aedimage(1), normtiff(1), pcond(1), pfilt(1), rpict(1), rtrace(1),
--rview(1), xglaresrc(1), xshowtrace(1)
-+radview(1), xglaresrc(1), xshowtrace(1)
-diff -Nur ray.orig/doc/man/man1/xshowtrace.1 ray/doc/man/man1/xshowtrace.1
---- ray.orig/doc/man/man1/xshowtrace.1 Mon Nov 15 21:58:47 1993
-+++ ray/doc/man/man1/xshowtrace.1 Wed Aug 21 22:39:33 2002
-@@ -19,7 +19,7 @@
- The picture should have been created from a previous
- .I rpict(1)
- or
--.I rview(1)
-+.I radview(1)
- calculation using the given octree.
- Once the image is displayed, the user can use the 't' command of
- .I ximage
-@@ -39,4 +39,4 @@
- .I xshowtrace
- starts drawing rays, the rays will be displaced.
- .SH "SEE ALSO"
--oconv(1), rpict(1), rtrace(1), rview(1), ximage(1)
-+oconv(1), rpict(1), rtrace(1), radview(1), ximage(1)
-diff -Nur ray.orig/doc/ray.1 ray/doc/ray.1
---- ray.orig/doc/ray.1 Wed Jan 20 23:13:57 1999
-+++ ray/doc/ray.1 Wed Aug 21 22:41:38 2002
-@@ -45,7 +45,7 @@
- The central program is
- .I rpict,
- which produces a picture from a scene description.
--.I Rview
-+.I Radview
- is a variation of
- .I rpict
- that computes and displays images interactively.
-@@ -1320,10 +1320,10 @@
- but the octree will serve as input to the ray-tracing
- programs and directs the use of a scene description.
- .PP
--.I Rview
-+.I Radview
- is ray-tracing program for viewing a scene interactively.
- When the user specifies a new perspective,
--.I rview
-+.I radview
- quickly displays a rough
- image on the terminal, then progressively
- increases the resolution as the user looks on.
-diff -Nur ray.orig/doc/tutorial.1 ray/doc/tutorial.1
---- ray.orig/doc/tutorial.1 Thu Jan 2 04:16:19 1997
-+++ ray/doc/tutorial.1 Wed Aug 21 22:42:44 2002
-@@ -134,7 +134,7 @@
- .LP
- Now that we have a simple scene description, we may look at it with
- the interactive viewing program,
--.B rview.
-+.B radview.
- First, however, we must create the "octree"
- file that will be used to accelerate the rendering process.
- To accomplish this, type the following command:
-@@ -163,12 +163,12 @@
- where to point its camera.
- To simplify our example, we will use the same starting position for
- all our renderings, and change views only once
--.B rview
-+.B radview
- is started:
- .QP
- %
- .I
--rview -vp 2.25 .375 1 -vd -.25 .125 -.125 -av .5 .5 .5 test.oct
-+radview -vp 2.25 .375 1 -vd -.25 .125 -.125 -av .5 .5 .5 test.oct
- .R
- .LP
- The "-vp" option gives the view point, and the "-vd" option gives
-@@ -176,22 +176,22 @@
- The "-av" option specifies the amount of light globally present
- in the scene, permitting portions of the scene that are not
- illuminated directly to be visible.
--.B Rview
-+.B Radview
- has many more options, and their default values may be discovered using:
- .QP
- %
--.I "rview -defaults"
-+.I "radview -defaults"
- .LP
- You should start to see an image of a red ball forming on your screen.
- Take this opportunity to try each of
--.B rview's
-+.B radview's
- commands, as described in the manual.
- If you make a mistake in a view specification, use the
- .B last
- command to get back to where you were.
- It is probably a good idea to save your favorite view using the following
- command from within
--.B rview:
-+.B radview:
- .QP
- :
- .I "view default.vf"
-@@ -254,7 +254,7 @@
- .I "oconv room.rad > test.oct"
- .br
- %
--.I "rview -vf default.vf -av .5 .5 .5 test.oct"
-+.I "radview -vf default.vf -av .5 .5 .5 test.oct"
- .LP
- This is better, but our ball and light source are still floating, which
- is an unrealistic condition for most rooms.
-@@ -595,7 +595,7 @@
- Now let's look at our modified scene, using the same command as before:
- .QP
- %
--.I "rview -vf default.vf -av .5 .5 .5 test.oct"
-+.I "radview -vf default.vf -av .5 .5 .5 test.oct"
- .LP
- As you look around the scene, you will need to adjust the exposure repeatedly
- to be able to see detail over the wide dynamic range now present.
-@@ -611,13 +611,13 @@
- .I "e 1"
- .LP
- All commands in
--.B rview
-+.B radview
- can be abbreviated by one or two letters.
- Additional control over the exposure is possible by changing the multiplier
- factor to a value greater than one to lighten or less than one to darken.
- It is also possible to use absolute settings and spot normalization.
- (See the
--.B rview
-+.B radview
- manual entry for details.)\0
- .LP
- You may notice that, other than a patch of sun on the floor, the window does
-@@ -775,7 +775,7 @@
- # Technically, we could stop here and let rad figure out the rest,
- # but it is very useful to also give an exposure value that is
- # appropriate for this scene. We may discover this value from within
--# rview using the "e =" command once we have found the exposure level we
-+# radview using the "e =" command once we have found the exposure level we
- # like. For the interior of our space under these particular lighting
- # conditions, an exposure value of 0.5 works well:
-
-@@ -794,7 +794,7 @@
- option tells
- .B rad
- to run
--.B rview
-+.B radview
- under
- .I X11
- instead of creating pictures (the default action) using
-@@ -803,18 +803,18 @@
- substitute the appropriate driver module for
- .I x11.
- To discover what modules are available with your version of
--.B rview,
-+.B radview,
- type:
- .QP
- %
--.I "rview -devices"
-+.I "radview -devices"
- .LP
- Once started,
- .B rad
- shows us the commands as it executes them, first
- .B oconv
- then
--.B rview.
-+.B radview.
- .LP
- Since we didn't specify a view in our control file,
- .B rad
-@@ -843,7 +843,7 @@
- Rather than executing another
- .B rad
- command, we can get the same view functionality from within
--.B rview
-+.B radview
- using the "L" command.
- (This is a single-letter command, corresponding roughly to the "last"
- command for retrieving views from files, explained earlier.)\0
-@@ -854,7 +854,7 @@
- end of the control file for later access and batch rendering.
- For example, you can put the default viewpoint into your control file
- using the
--.B rview
-+.B radview
- commands:
- .QP
- :
-@@ -868,7 +868,7 @@
- (Shorter view names are better because they end up being part of the
- picture file name, which can get quite long.)\0
- Move around in
--.B rview
-+.B radview
- to find a few different views you like, and save them (with sensible names)
- to the control file using the "V" command.
- If you make a mistake and save a view you later decide you dislike, you
-@@ -1036,20 +1036,20 @@
- .fi
- .LP
- To look at the scene with
--.B rview,
-+.B radview,
- simply run:
- .QP
- %
- .I "rad -o x11 inter.rif"
- .LP
- Probably the first thing you notice after starting
--.B rview
-+.B radview
- is that nothing happens.
- It takes the calculation a while to get going, as it must trace
- many rays at the outset to determine the contribution at each
- point from the window area.
- Once
--.B rview
-+.B radview
- has stored up some values, the progress rate improves, but it
- never really reaches blistering speed.
- .LP
-diff -Nur ray.orig/lib/tcl/trad.hlp ray/lib/tcl/trad.hlp
---- ray.orig/lib/tcl/trad.hlp Thu Oct 26 22:42:52 2000
-+++ ray/lib/tcl/trad.hlp Wed Aug 21 22:52:19 2002
-@@ -487,7 +487,7 @@
-
- There are two basic ways to compute the exposure value.
- The first is by trial and error, where the value is adjusted up and
--down within rview using the "e = value" command.
-+down within radview using the "e = value" command.
- Though it sounds flaky, this is the most reliable way to set the
- exposure (and ambient level) in general lighting situations.
-
-@@ -545,7 +545,7 @@
- To remove an unwanted view, select it and press the "Delete" button.
- To undo this action, simply press the "Add" button again.
-
--The first view in the list is the default given to rview during
-+The first view in the list is the default given to radview during
- interactive rendering, and is the first view rendered in a batch run.
- To change the default view, select the newly desired view and press
- the "Set Default" button.
-@@ -614,7 +614,7 @@
- define a view.
-
- The simplest view specification is of the form "-vf viewfile", where
--"viewfile" is a file created with the rview "view" command, or a
-+"viewfile" is a file created with the radview "view" command, or a
- Radiance picture.
- This method of naming views, although convenient, is not the best
- since it is difficult to know exactly where such a view is by
-@@ -702,7 +702,7 @@
- The "Set Default" button may be used to make the selected view the
- default view for rendering.
- This simply moves the view to the top of the list in the rad input file.
--The default view will be the one normally rendered by rview when rad
-+The default view will be the one normally rendered by radview when rad
- is started interactively, and is the first view rendered in a batch
- process.
-
-@@ -838,7 +838,7 @@
- minutes) between progress reports.
-
- Other windows allow the user to customize the options to oconv(1),
--mkillum(1), rview(1) and rpict(1), and pfilt(1).
-+mkillum(1), radview(1) and rpict(1), and pfilt(1).
-
- .Options.Quality
-
-@@ -916,7 +916,7 @@
-
- The "Optfile" setting assigns a file to hold rendering options,
- which may be a convenience when these options are reused for
--rtrace(1) or rpiece(1), or manual invocations of rview or rpict.
-+rtrace(1) or rpiece(1), or manual invocations of radview or rpict.
- Using an options file also reduces the size of the command line,
- making it a little easier on the eye.
-
-@@ -977,7 +977,7 @@
- .Options.Render
-
- The "render opts" window is used to specify additional options to
--the rview(1) and rpict(1) rendering programs.
-+the radview(1) and rpict(1) rendering programs.
- Most of the important parameters are computed by rad, so this
- window is usually used to override specific parameters or to give
- additional information, such as which materials to exclude from the
-@@ -1109,7 +1109,7 @@
- The "rview" button on the Action screen starts an interactive
- rendering for the selected view, indicated by the menu button
- just to the right.
--Other views may be accessed within rview using the "L name"
-+Other views may be accessed within radview using the "L name"
- command, and new views can be added with the "V name"
- command.
-
-@@ -1119,7 +1119,7 @@
- a number later), then use the Views screen to override the previous
- view definition with the new one.
- (See the "View" topic in the current
--help category, the "Change" topic under "Views" and the rview(1)
-+help category, the "Change" topic under "Views" and the radview(1)
- manual page for more information.)
-
- If the octree is out-of-date, it will be rebuilt before rendering
-@@ -1129,7 +1129,7 @@
-
- The Action screen contains two menus for selecting views.
- The top menu, next to the "rview" button, sets the view to start
--with in rview, and is selected from the current view list.
-+with in radview, and is selected from the current view list.
- The second view menu, next to the "Start" button for batch
- rendering, selects the view or views to render in batch mode.
- If the special entry "ALL" is selected, then every view in the
-diff -Nur ray.orig/src/rt/Rmakefile ray/src/rt/Rmakefile
---- ray.orig/src/rt/Rmakefile Wed Aug 21 21:52:29 2002
-+++ ray/src/rt/Rmakefile Wed Aug 21 22:43:22 2002
-@@ -85,7 +85,7 @@
- # What this makefile produces:
- #
-
--PROGS = rtrace rpict rview lookamb
-+PROGS = rtrace rpict radview lookamb
-
- all: $(PROGS)
-
-@@ -120,8 +120,8 @@
- rpict: $(RPOBJS)
- $(CC) $(CFLAGS) -o rpict $(RPOBJS) $(LIBS)
-
--rview: $(RVOBJS)
-- $(CC) $(CFLAGS) -o rview $(RVOBJS) $(LIBS) $(DLIBS)
-+radview: $(RVOBJS)
-+ $(CC) $(CFLAGS) -o radview $(RVOBJS) $(LIBS) $(DLIBS)
-
- lookamb: lookamb.o ambio.o
- $(CC) $(CFLAGS) -o lookamb lookamb.o ambio.o $(LIBS)
-diff -Nur ray.orig/src/util/rad.c ray/src/util/rad.c
---- ray.orig/src/util/rad.c Tue Feb 2 17:57:57 1999
-+++ ray/src/util/rad.c Wed Aug 21 22:46:41 2002
-@@ -1068,14 +1068,14 @@
- return;
- if (sayview)
- printview(vw);
-- sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
-+ sprintf(combuf, "radview %s%s%s -R %s ", vw, po, opts, rifname);
- if (rvdevice != NULL)
- sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
- if (vdef(EXPOSURE))
- sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
- strcat(combuf, oct1name);
- if (runcom(combuf)) { /* run it */
-- fprintf(stderr, "%s: error running rview\n", progname);
-+ fprintf(stderr, "%s: error running radview\n", progname);
- quit(1);
- }
- }
-diff -Nur ray.orig/src/util/trad.hlp ray/src/util/trad.hlp
---- ray.orig/src/util/trad.hlp Tue Oct 20 20:52:16 1998
-+++ ray/src/util/trad.hlp Wed Aug 21 22:47:57 2002
-@@ -487,7 +487,7 @@
-
- There are two basic ways to compute the exposure value.
- The first is by trial and error, where the value is adjusted up and
--down within rview using the "e = value" command.
-+down within radview using the "e = value" command.
- Though it sounds flaky, this is the most reliable way to set the
- exposure (and ambient level) in general lighting situations.
-
-@@ -545,7 +545,7 @@
- To remove an unwanted view, select it and press the "Delete" button.
- To undo this action, simply press the "Add" button again.
-
--The first view in the list is the default given to rview during
-+The first view in the list is the default given to radview during
- interactive rendering, and is the first view rendered in a batch run.
- To change the default view, select the newly desired view and press
- the "Set Default" button.
-@@ -614,7 +614,7 @@
- define a view.
-
- The simplest view specification is of the form "-vf viewfile", where
--"viewfile" is a file created with the rview "view" command, or a
-+"viewfile" is a file created with the radview "view" command, or a
- Radiance picture.
- This method of naming views, although convenient, is not the best
- since it is difficult to know exactly where such a view is by
-@@ -702,7 +702,7 @@
- The "Set Default" button may be used to make the selected view the
- default view for rendering.
- This simply moves the view to the top of the list in the rad input file.
--The default view will be the one normally rendered by rview when rad
-+The default view will be the one normally rendered by radview when rad
- is started interactively, and is the first view rendered in a batch
- process.
-
-@@ -838,7 +838,7 @@
- minutes) between progress reports.
-
- Other windows allow the user to customize the options to oconv(1),
--mkillum(1), rview(1) and rpict(1), and pfilt(1).
-+mkillum(1), radview(1) and rpict(1), and pfilt(1).
-
- .Options.Quality
-
-@@ -916,7 +916,7 @@
-
- The "Optfile" setting assigns a file to hold rendering options,
- which may be a convenience when these options are reused for
--rtrace(1) or rpiece(1), or manual invocations of rview or rpict.
-+rtrace(1) or rpiece(1), or manual invocations of radview or rpict.
- Using an options file also reduces the size of the command line,
- making it a little easier on the eye.
-
-@@ -977,7 +977,7 @@
- .Options.Render
-
- The "render opts" window is used to specify additional options to
--the rview(1) and rpict(1) rendering programs.
-+the radview(1) and rpict(1) rendering programs.
- Most of the important parameters are computed by rad, so this
- window is usually used to override specific parameters or to give
- additional information, such as which materials to exclude from the
-@@ -1026,7 +1026,7 @@
- run, usually via rad(1).
- The top row of buttons is used to update the octree following a
- change to one or more input files.
--The "rview" button starts an interactive rendering in the
-+The "radview" button starts an interactive rendering in the
- foreground.
- The next set of buttons provides for the control of a batch
- rendering process, taking place in the background.
-@@ -1109,7 +1109,7 @@
- The "rview" button on the Action screen starts an interactive
- rendering for the selected view, indicated by the menu button
- just to the right.
--Other views may be accessed within rview using the "L name"
-+Other views may be accessed within radview using the "L name"
- command, and new views can be added with the "V name"
- command.
-
-@@ -1119,7 +1119,7 @@
- a number later), then use the Views screen to override the previous
- view definition with the new one.
- (See the "View" topic in the current
--help category, the "Change" topic under "Views" and the rview(1)
-+help category, the "Change" topic under "Views" and the radview(1)
- manual page for more information.)
-
- If the octree is out-of-date, it will be rebuilt before rendering
-@@ -1129,7 +1129,7 @@
-
- The Action screen contains two menus for selecting views.
- The top menu, next to the "rview" button, sets the view to start
--with in rview, and is selected from the current view list.
-+with in radview, and is selected from the current view list.
- The second view menu, next to the "Start" button for batch
- rendering, selects the view or views to render in batch mode.
- If the special entry "ALL" is selected, then every view in the
projects / packages / Radiance.git / commitdiff