summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjschauma <jschauma>2005-02-16 23:20:24 +0000
committerjschauma <jschauma>2005-02-16 23:20:24 +0000
commit6788f5734efa6f188fe765e90e48dc07cc58f0dc (patch)
tree2343cc1bf27037015712aef40593081abf24757c /graphics
parentb3d4fd13605b2aef29fcdd2ccff9d9778532eb07 (diff)
downloadpkgsrc-6788f5734efa6f188fe765e90e48dc07cc58f0dc.tar.gz
install lib files differently
also patch makefiles to use RANLIB and AR variables
Diffstat (limited to 'graphics')
-rw-r--r--graphics/radiance/Makefile8
-rw-r--r--graphics/radiance/PLIST30
-rw-r--r--graphics/radiance/distinfo14
-rw-r--r--graphics/radiance/patches/patch-aa4
-rw-r--r--graphics/radiance/patches/patch-ac4
-rw-r--r--graphics/radiance/patches/patch-ae38
-rw-r--r--graphics/radiance/patches/patch-ai18
-rw-r--r--graphics/radiance/patches/patch-al31
-rw-r--r--graphics/radiance/patches/patch-an17
9 files changed, 123 insertions, 41 deletions
diff --git a/graphics/radiance/Makefile b/graphics/radiance/Makefile
index bf55093a377..995abbfd85b 100644
--- a/graphics/radiance/Makefile
+++ b/graphics/radiance/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/02/16 22:17:33 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2005/02/16 23:20:24 jschauma Exp $
#
DISTNAME= rad3R6P1
@@ -39,7 +39,8 @@ PKGSRC_ARCH= 8
MAKE_ENV+= MV="${MV}" RM="${RM}" CP="${CP}" \
INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+ RANLIB="${RANLIB}" AR="${AR}"
do-configure:
.for patchee in ${PATCHEES}
@@ -51,7 +52,6 @@ do-configure:
${WRKSRC}/${patchee} > ${WRKSRC}/${patchee}.tmp && \
${MV} ${WRKSRC}/${patchee}.tmp ${WRKSRC}/${patchee}
.endfor
- ${RM} ${WRKSRC}/lib/.gdb_history
do-build:
cd ${WRKSRC} && ${MAKE_ENV} csh ./makeall install
@@ -61,8 +61,6 @@ do-install:
cd ${WRKSRC}/radiance && ${PAX} -rw . ${PREFIX}/radiance/
${INSTALL_DATA_DIR} ${PREFIX}/radiance/obj
cd ${WRKSRC}/obj && ${PAX} -rw . ${PREFIX}/radiance/obj/
- ${INSTALL_DATA_DIR} ${PREFIX}/radiance/lib
- cd ${WRKSRC}/lib && ${PAX} -rw . ${PREFIX}/radiance/lib/
${INSTALL_DATA_DIR} ${PREFIX}/radiance/man
cd ${WRKSRC}/doc/man && ${PAX} -rw . ${PREFIX}/radiance/man/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/radiance
diff --git a/graphics/radiance/PLIST b/graphics/radiance/PLIST
index bb9ffd00b9a..da7fc86d3fe 100644
--- a/graphics/radiance/PLIST
+++ b/graphics/radiance/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/16 22:17:33 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/02/16 23:20:24 jschauma Exp $
radiance/bin/arch2rad
radiance/bin/bgraph
radiance/bin/cnt
@@ -238,6 +238,33 @@ radiance/lib/winxmit.cal
radiance/lib/woodpat.cal
radiance/lib/woodtex.cal
radiance/lib/wrinkle.cal
+radiance/lib/clockface.hex
+radiance/lib/glaze1.cal
+radiance/lib/glaze2.cal
+radiance/lib/illum.cal
+radiance/lib/lamp.tab
+radiance/lib/rayinit.cal
+radiance/lib/rev.cal
+radiance/lib/skybright.cal
+radiance/lib/source.cal
+radiance/lib/surf.cal
+radiance/lib/tcl/do_action.tcl
+radiance/lib/tcl/do_file.tcl
+radiance/lib/tcl/do_options.tcl
+radiance/lib/tcl/do_results.tcl
+radiance/lib/tcl/do_scene.tcl
+radiance/lib/tcl/do_views.tcl
+radiance/lib/tcl/do_zone.tcl
+radiance/lib/tcl/file.hlp
+radiance/lib/tcl/getfile.tcl
+radiance/lib/tcl/gethelp.tcl
+radiance/lib/tcl/help.hlp
+radiance/lib/tcl/tclIndex
+radiance/lib/tcl/trad.hlp
+radiance/lib/tcl/trad.icon
+radiance/lib/tcl/util.tcl
+radiance/lib/tilt.cal
+radiance/lib/tmesh.cal
radiance/man/cat1/.DS_Store
radiance/man/cat1/arch2rad.1
radiance/man/cat1/bgraph.1
@@ -683,6 +710,7 @@ share/doc/radiance/ray.pdf
@dirrm radiance/lib/source
@dirrm radiance/lib/meta
@dirrm radiance/lib/lib
+@dirrm radiance/lib/tcl
@dirrm radiance/lib
@dirrm radiance/obj/alpha
@dirrm radiance/obj/cabin/anim1
diff --git a/graphics/radiance/distinfo b/graphics/radiance/distinfo
index ca58f1b978d..929e0b670a4 100644
--- a/graphics/radiance/distinfo
+++ b/graphics/radiance/distinfo
@@ -1,23 +1,23 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/02/16 22:17:33 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2005/02/16 23:20:24 jschauma Exp $
SHA1 (rad3R6P1.tar.gz) = 71f46abd1c30be282a93237fa0c162d3bf0b1f99
Size (rad3R6P1.tar.gz) = 7115997 bytes
SHA1 (rad3R6P1supp.tar.gz) = 8a13227eae507a7a4947a49b6aa741c95198ed4e
Size (rad3R6P1supp.tar.gz) = 4632166 bytes
-SHA1 (patch-aa) = ea43190811db3b3ae47c14c38bf3772be5dfc76a
+SHA1 (patch-aa) = a80bd880e1b293240e9a5d712dc318a9fdc1d272
SHA1 (patch-ab) = 5d06bcf2216ed084a757724045391bfbe05d56d2
-SHA1 (patch-ac) = 8336144bb4c768e50af4559606e895d4d1e30836
+SHA1 (patch-ac) = 2d0eb6a263c4d4c088397a8dbeebc01219c624f1
SHA1 (patch-ad) = f3f7c68305964965851c9caeca53f0e534014085
-SHA1 (patch-ae) = 26d2f239e45b944bb77ce9ea4fa07c0b3cd3f2ff
+SHA1 (patch-ae) = eaeba41315973013676bf400e5acff29ff61946a
SHA1 (patch-af) = 9a4c265a18a138166c8a041730cd5818430f9186
SHA1 (patch-ag) = e7f8944d96aa51ce8dfdec5abb6d498c3ca193cc
SHA1 (patch-ah) = a33746e1daae8f7dc6efabb1d73f85eecafb5152
-SHA1 (patch-ai) = 3f385778f0d9279a6744c85c9946066a54dc4af4
+SHA1 (patch-ai) = 02c6c3109c8e425d394980e1d223169dd6a3e7ae
SHA1 (patch-aj) = 5242f18c523bbebcfdd886fa20501434f07b74c0
SHA1 (patch-ak) = 438bd7e9ad397663ddac09543ac484610b13086b
-SHA1 (patch-al) = 7133f2839a85d8f2db752813832a4af0223d4ecd
+SHA1 (patch-al) = c215a209fccd3d1d2e64d09018bce87291efc880
SHA1 (patch-am) = bf4a456d905fbd5c9a9cabd3c32b1bb1c6c26620
-SHA1 (patch-an) = 396abe507a4700919ea3fdd9fc2f56773704d6df
+SHA1 (patch-an) = d0c388a5aaea622b220e3ef4c0f52956ecca5470
SHA1 (patch-ao) = 22e3e8f3b593bca0423390f696324f42e8b52098
SHA1 (patch-ap) = 42bb1691b2c1d76bf5d19872d70ca50332d31987
SHA1 (patch-aq) = 338ca0df287e797fbc784158e7d622f70ddcd35e
diff --git a/graphics/radiance/patches/patch-aa b/graphics/radiance/patches/patch-aa
index 41895875152..b50a17e41fa 100644
--- a/graphics/radiance/patches/patch-aa
+++ b/graphics/radiance/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/02/16 22:17:33 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2005/02/16 23:20:24 jschauma Exp $
Make this script run non-interactively.
@@ -79,7 +79,7 @@ Make this script run non-interactively.
-_EOF_
-echo -n "Choice? "
-set arch="$<"
-+set arch=9
++set arch=@PKGSRC_ARCH@
switch ("$arch")
case 1: # SPARC Station
set arch=sun
diff --git a/graphics/radiance/patches/patch-ac b/graphics/radiance/patches/patch-ac
index 84eccf491f1..d0f33278749 100644
--- a/graphics/radiance/patches/patch-ac
+++ b/graphics/radiance/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/02/16 22:17:33 jschauma Exp $
+$NetBSD: patch-ac,v 1.2 2005/02/16 23:20:24 jschauma Exp $
Make this script run non-interactively.
@@ -10,7 +10,7 @@ Make this script run non-interactively.
again2:
-echo -n "Where do you want the library files [/usr/local/lib/ray]? "
-set ldir=$<
-+set ldir=@WRKSRC@/builddir/lib
++set ldir=@WRKSRC@/radiance/lib
(echo $ldir) >/dev/null
if ( $status ) goto again2
set ldir=$ldir
diff --git a/graphics/radiance/patches/patch-ae b/graphics/radiance/patches/patch-ae
index 9d4c21c9c16..7c780ff55aa 100644
--- a/graphics/radiance/patches/patch-ae
+++ b/graphics/radiance/patches/patch-ae
@@ -1,27 +1,51 @@
-$NetBSD: patch-ae,v 1.1.1.1 2005/02/16 22:17:33 jschauma Exp $
+$NetBSD: patch-ae,v 1.2 2005/02/16 23:20:24 jschauma Exp $
---- ./src/common/Rmakefile.orig 2005-02-15 14:28:10.000000000 -0500
-+++ ./src/common/Rmakefile 2005-02-15 14:29:16.000000000 -0500
-@@ -6,12 +6,11 @@
+--- src/common/Rmakefile.orig 2004-10-27 19:36:09.000000000 -0400
++++ src/common/Rmakefile 2005-02-16 18:10:50.000000000 -0500
+@@ -5,13 +5,12 @@
+
OPT = -O
MACH = -DBSD
- CFLAGS = $(MACH) $(OPT)
+-CFLAGS = $(MACH) $(OPT)
-CC = cc
++CFLAGS += $(MACH) $(OPT)
SPECIAL =
COMPAT = bmalloc.o erf.o strcmp.o # frexp.o fwrite.o random.o
-LIBDIR = /usr/local/lib/ray
-+LIBDIR = @WRKSRC@/radiance/lib
++LIBDIR = /src/pkgsrc/graphics/radiance/work.i386/ray/radiance/lib
RTOBJ = cone.o face.o free_os.o instance.o readobj.o readoct.o otypes.o \
objset.o octree.o readfargs.o modobject.o getlibpath.o \
+@@ -37,8 +36,8 @@
+ all: librt.a $(SPECIAL)
+
+ librt.a: $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
+- ar rc librt.a $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
+- -ranlib librt.a
++ ${AR} rc librt.a $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
++ -${RANLIB} librt.a
+ mv librt.a ../lib/librt.a
+
+ install: all
+@@ -49,8 +48,8 @@
+ rm -f *.o librt.a
+
+ ogl: $(OGLOBJ)
+- ar rc librgl.a $(OGLOBJ)
+- -ranlib librgl.a
++ ${AR} rc librgl.a $(OGLOBJ)
++ -${RANLIB} librgl.a
+ mv librgl.a ../lib/librgl.a
+
+ x10:
@@ -62,7 +61,7 @@
sun:
getlibpath.o: getlibpath.c
- $(CC) $(CFLAGS) -DDEFPATH=\":$(LIBDIR)\" -c getlibpath.c
-+ $(CC) $(CFLAGS) -DDEFPATH=\":@PREFIX@/radiance/lib\" -c getlibpath.c
++ $(CC) $(CFLAGS) -DDEFPATH=\":/usr/pkg/radiance/lib\" -c getlibpath.c
tmapcolrs.o: tmapcolrs.c
$(CC) $(CFLAGS) -DPCOND=\"pcond\" -c tmapcolrs.c
diff --git a/graphics/radiance/patches/patch-ai b/graphics/radiance/patches/patch-ai
index 7cd4525d9c9..02baeb59f0a 100644
--- a/graphics/radiance/patches/patch-ai
+++ b/graphics/radiance/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1.1.1 2005/02/16 22:17:34 jschauma Exp $
+$NetBSD: patch-ai,v 1.2 2005/02/16 23:20:24 jschauma Exp $
--- src/meta/Rmakefile.orig 2003-10-21 22:15:07.000000000 -0400
-+++ src/meta/Rmakefile 2005-02-15 15:05:50.000000000 -0500
++++ src/meta/Rmakefile 2005-02-16 18:10:01.000000000 -0500
@@ -5,14 +5,13 @@
OPT = -O
@@ -9,19 +9,23 @@ $NetBSD: patch-ai,v 1.1.1.1 2005/02/16 22:17:34 jschauma Exp $
-CC = cc
MLIB = -lm
-CFLAGS = -DMDIR=\"$(MLIBDIR)/\" $(OPT) $(MACH) -I../common -L../lib
-+CFLAGS += -DMDIR=\"@PREFIX@/radiance/lib/meta/\" $(OPT) $(MACH) -I../common -L../lib ${LDFLAGS}
++CFLAGS += -DMDIR=\"/usr/pkg/radiance/lib/meta/\" $(OPT) $(MACH) -I../common -L../lib ${LDFLAGS}
-LIBDIR = /usr/local/lib
-+LIBDIR = @WRKSRC@/radience/work.i386/ray/radiance/lib
++LIBDIR = /src/pkgsrc/graphics/radiance/work.i386/ray/radience/work.i386/ray/radiance/lib
MLIBDIR = $(LIBDIR)/meta
DESTDIR = .
-INSTDIR = /usr/local/bin
-+INSTDIR = @WRKSRC@/radience/work.i386/ray/radiance/bin
++INSTDIR = /src/pkgsrc/graphics/radiance/work.i386/ray/radience/work.i386/ray/radiance/bin
# target lists
common = mfio.o syscalls.o misc.o
-@@ -130,7 +129,7 @@
- -ranlib ../lib/libmeta.a
+@@ -127,10 +126,10 @@
+ ../lib/libmeta.a: metacalls.o primout.o progname.o
+ ar rc ../lib/libmeta.a metacalls.o primout.o \
+ $(common) progname.o
+- -ranlib ../lib/libmeta.a
++ -${RANLIB} ../lib/libmeta.a
../lib/lib4014.a:
- cd lib4014; make INSTDIR=../../lib "CFLAGS=$(OPT)" install clean
diff --git a/graphics/radiance/patches/patch-al b/graphics/radiance/patches/patch-al
index 64d77ca0b14..ce1f7ee95dc 100644
--- a/graphics/radiance/patches/patch-al
+++ b/graphics/radiance/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.1.1.1 2005/02/16 22:17:34 jschauma Exp $
+$NetBSD: patch-al,v 1.2 2005/02/16 23:20:24 jschauma Exp $
---- ./src/rt/Rmakefile.orig 2005-02-15 14:43:54.000000000 -0500
-+++ ./src/rt/Rmakefile 2005-02-15 14:52:48.000000000 -0500
+--- src/rt/Rmakefile.orig 2004-10-27 19:23:48.000000000 -0400
++++ src/rt/Rmakefile 2005-02-16 18:10:40.000000000 -0500
@@ -5,9 +5,8 @@
OPT = -O
@@ -18,7 +18,7 @@ $NetBSD: patch-al,v 1.1.1.1 2005/02/16 22:17:34 jschauma Exp $
#
DESTDIR = .
-INSTDIR = /usr/local/bin
-+INSTDIR = @WRKSRC@/radiance/bin
++INSTDIR = /src/pkgsrc/graphics/radiance/work.i386/ray/radiance/bin
INSTALL = cp
#
@@ -26,8 +26,8 @@ $NetBSD: patch-al,v 1.1.1.1 2005/02/16 22:17:34 jschauma Exp $
#
-DEVDIR = $(INSTDIR)/dev
-LIBDIR = /usr/local/lib/ray
-+DEVDIR = @WRKSRC@/radiance/dev
-+LIBDIR = @WRKSRC@/radiance/lib
++DEVDIR = /src/pkgsrc/graphics/radiance/work.i386/ray/radiance/dev
++LIBDIR = /src/pkgsrc/graphics/radiance/work.i386/ray/radiance/lib
#
# Library routines:
@@ -39,12 +39,29 @@ $NetBSD: patch-al,v 1.1.1.1 2005/02/16 22:17:34 jschauma Exp $
#
# Device drivers for rvu (see also devtable.c):
+@@ -130,12 +129,12 @@
+ devmain.o tty.o editline.o $(LIBS)
+
+ $(RLIB): $(ROBJS) Version.o
+- ar rc $(RLIB) $(ROBJS) Version.o
+- -ranlib $(RLIB)
++ ${AR} rc $(RLIB) $(ROBJS) Version.o
++ -${RANLIB} $(RLIB)
+
+ $(RCLIB): $(RLOBJS)
+- ar rc $(RCLIB) $(RLOBJS)
+- -ranlib $(RCLIB)
++ ${AR} rc $(RCLIB) $(RLOBJS)
++ -${RANLIB} $(RCLIB)
+
+ #
+ # Special compiles:
@@ -159,7 +158,7 @@
# end of dispersion compiles.
devcomm.o: devcomm.c
- $(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
-+ $(CC) $(CFLAGS) -DDEVPATH=\"@PREFIX@/radiance/dev\" -c devcomm.c
++ $(CC) $(CFLAGS) -DDEVPATH=\"/usr/pkg/radiance/dev\" -c devcomm.c
aed.o: aed.c
$(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
diff --git a/graphics/radiance/patches/patch-an b/graphics/radiance/patches/patch-an
index 1e07e64ef4a..9d18c8a5f6a 100644
--- a/graphics/radiance/patches/patch-an
+++ b/graphics/radiance/patches/patch-an
@@ -1,7 +1,7 @@
-$NetBSD: patch-an,v 1.1.1.1 2005/02/16 22:17:34 jschauma Exp $
+$NetBSD: patch-an,v 1.2 2005/02/16 23:20:24 jschauma Exp $
---- src/cv/mgflib/Makefile.orig 2005-02-15 15:16:48.000000000 -0500
-+++ src/cv/mgflib/Makefile 2005-02-15 15:17:06.000000000 -0500
+--- src/cv/mgflib/Makefile.orig 2003-06-06 15:38:57.000000000 -0400
++++ src/cv/mgflib/Makefile 2005-02-16 18:10:56.000000000 -0500
@@ -6,8 +6,7 @@
# Use '-DMEM_PTR=char *' if your malloc return type is not 'void *'.
MACH =
@@ -12,3 +12,14 @@ $NetBSD: patch-an,v 1.1.1.1 2005/02/16 22:17:34 jschauma Exp $
OBJS = parser.o context.o xf.o object.o lookup.o badarg.o \
words.o fvect.o
+@@ -18,8 +17,8 @@
+ $(CC) $(CFLAGS) -o mgfilt mgfilt.o libmgf.a -lm
+
+ libmgf.a: $(OBJS)
+- ar rc libmgf.a $(OBJS)
+- -ranlib libmgf.a
++ ${AR} rc libmgf.a $(OBJS)
++ -${RANLIB} libmgf.a
+
+ mgf2inv: libmgf.a mgf2inv.o cvrgb.o
+ $(CC) $(CFLAGS) -o mgf2inv mgf2inv.o cvrgb.o libmgf.a -lm