diff options
| -rw-r--r-- | graphics/rayshade/Makefile | 13 | ||||
| -rw-r--r-- | graphics/rayshade/distinfo | 4 | ||||
| -rw-r--r-- | graphics/rayshade/files/config.ans | 19 | ||||
| -rw-r--r-- | graphics/rayshade/patches/patch-aa | 244 |
4 files changed, 222 insertions, 58 deletions
diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile index d8ee2a9e8e1..a275e28ca09 100644 --- a/graphics/rayshade/Makefile +++ b/graphics/rayshade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/04/17 13:46:35 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2006/06/08 21:40:21 joerg Exp $ DISTNAME= rayshade.4.0 PKGNAME= rayshade-4.0 @@ -13,15 +13,8 @@ COMMENT= Extensible system for creating ray-traced images HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./Configure -CONFIGURE_ARGS+= < ${WRKDIR}/config.ans BUILD_TARGET= -INSTALLATION_DIRS= bin lib - -pre-configure: - ${SED} -e 's|@CFLAGS@|${CFLAGS}|g' \ - -e 's|\$${PREFIX}|${PREFIX}|g' \ - -e 's|\$${LOCALBASE}|${LOCALBASE}|g' \ - ${FILESDIR}/config.ans > ${WRKDIR}/config.ans +INSTALLATION_DIRS= bin lib share/doc/rayshade share/examples/rayshade do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rayshade/rayshade ${PREFIX}/bin @@ -29,10 +22,8 @@ do-install: ${RANLIB} ${PREFIX}/lib/libray.a ${INSTALL_DATA} ${WRKSRC}/libshade/libshade.a ${PREFIX}/lib ${RANLIB} ${PREFIX}/lib/libshade.a - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rayshade ${INSTALL_DATA} ${WRKSRC}/Doc/Guide/* ${PREFIX}/share/doc/rayshade ${INSTALL_DATA} ${WRKSRC}/Doc/quickref.txt ${PREFIX}/share/doc/rayshade - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rayshade ${INSTALL_DATA} ${WRKSRC}/Examples/* ${PREFIX}/share/examples/rayshade .include "../../graphics/urt/buildlink3.mk" diff --git a/graphics/rayshade/distinfo b/graphics/rayshade/distinfo index 355b2114b32..8a98cfb8eb4 100644 --- a/graphics/rayshade/distinfo +++ b/graphics/rayshade/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 08:45:12 agc Exp $ +$NetBSD: distinfo,v 1.4 2006/06/08 21:40:21 joerg Exp $ SHA1 (rayshade.4.0.tar.Z) = 5fd1ce05e7ba3bc8e8b337c212eccb6b53b5b4ca RMD160 (rayshade.4.0.tar.Z) = a19bf35aa3f66de9ce406a1a98cf7edbde60f356 Size (rayshade.4.0.tar.Z) = 369527 bytes -SHA1 (patch-aa) = 13ffaabe7dc670b6e3945f548770190f0a0e86c7 +SHA1 (patch-aa) = 1662768a88b3c34a03c73128e2e009759f8a5408 SHA1 (patch-ab) = 13b48848c4a40d86ee5ceef8dddf10988b59e088 SHA1 (patch-ac) = 3a2d67bf28e6b0e96d2ec037efa5b219e9935a57 SHA1 (patch-ba) = d36261ceede5f89645ff23f5a108b231fd5ea18d diff --git a/graphics/rayshade/files/config.ans b/graphics/rayshade/files/config.ans deleted file mode 100644 index e7c60f3f382..00000000000 --- a/graphics/rayshade/files/config.ans +++ /dev/null @@ -1,19 +0,0 @@ - - --lm -clock_t - -cc -@CFLAGS@ --I${PREFIX}/include -I${LOCALBASE}/include - -${LOCALBASE}/include -${PREFIX}/lib/librle.a -drand48 -11 -${PREFIX}/bin -/usr/bin/mkdep -yacc - -y - diff --git a/graphics/rayshade/patches/patch-aa b/graphics/rayshade/patches/patch-aa index 4daa37a46b3..f4de5d08a64 100644 --- a/graphics/rayshade/patches/patch-aa +++ b/graphics/rayshade/patches/patch-aa @@ -1,30 +1,62 @@ -$NetBSD: patch-aa,v 1.1 1998/08/24 18:11:42 agc Exp $ +$NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $ -Work around deficiencies in the Configure script: -+ don't test for stdin being a tty -+ NetBSD's ar ts does generate random libs, but you *STILL* need -to run ranlib, especially on a.out platforms. Comment out ar ts -test - it's just plain wrong. - -*** Configure.orig Sun Feb 9 22:04:23 1992 ---- Configure Sun Mar 8 19:33:26 1998 -@@ -28,10 +28,11 @@ - PATH=$PATH:'/bsd4.3/usr/bin:/usr/bsd' - export PATH || (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh $0; kill $$) +--- Configure.orig 1992-02-10 03:04:23.000000000 +0000 ++++ Configure +@@ -364,7 +365,7 @@ where this is allowed will be marked "(~ + EOH + rp="[Type carriage return to continue]" + echo $n "$rp $c" +-. myread ++#. myread + cat <<EOH --if test ! -t 0; then -- echo "Say 'sh Configure', not 'sh <Configure'" -- exit 1 --fi -+# Neither FreeBSD's ports, or NetBSD's packages, want to be interactive -+#if test ! -t 0; then -+# echo "Say 'sh Configure', not 'sh <Configure'" -+# exit 1 -+#fi + Much effort has been expended to ensure that this shell script will run on +@@ -386,7 +387,7 @@ SH files. Configure will offer to let y + EOH + rp="[Type carriage return to continue]" + echo $n "$rp $c" +-. myread ++#. myread - (alias) >/dev/null 2>&1 && \ - echo "(I see you are using the Korn shell. Some ksh's blow up on Configure," && \ -@@ -872,7 +873,7 @@ + : get old answers, if there is a config file out there + if test -f ../config.sh; then +@@ -616,7 +617,8 @@ EOM + echo " " + rp="Any additional libraries? [$dflt]" + $echo $n "$rp $c" +-. myread ++#. myread ++ans="-lm" + case "$ans" in + none) ans=''; + esac +@@ -720,7 +722,14 @@ fi + echo " " + set `echo $libc $libnames | tr ' ' '\012' | sort | uniq` + $echo $n "Extracting names from $* for later perusal...$c" +-nm $* 2>/dev/null >libc.tmp ++case "${OPSYS}" in ++DragonFly) ++ nm -D $* 2>/dev/null >libc.tmp ++ ;; ++*) ++ nm $* 2>/dev/null >libc.tmp ++ ;; ++esac + $grep printf libc.tmp > libc.ptf + com="$sed -n -e 's/^.* [ADTS] *_[_.]*//p' -e 's/^.* [ADTS] //p'" + eval "$com <libc.ptf >libc.list" +@@ -823,7 +832,8 @@ if $contains '^times$' libc.list >/dev/n + echo " " + rp="What type is returned by times() on this sytem? [$dflt]" + $echo $n "$rp $c" +- . myread ++ #. myread ++ ans="clock_t" + clocktype="$ans" + else + echo 'times() not found, hope that will do.' +@@ -872,7 +882,7 @@ $eunicefix filexp : determine where manual pages are on this system echo " " case "$sysman" in @@ -33,7 +65,137 @@ test - it's just plain wrong. ;; esac if test -d "$sysman"; then -@@ -1988,12 +1989,12 @@ +@@ -1007,7 +1017,8 @@ Venix systems may wish to put "none" and + EOM + rp="Which models are supported? [$dflt]" + $echo $n "$rp $c" +-. myread ++#. myread ++ans="" + models="$ans" + + case "$models" in +@@ -1147,7 +1158,8 @@ else + esac + rp="Use which C compiler? [$dflt]" + $echo $n "$rp $c" +- . myread ++ #. myread ++ ans="cc" + cc="$ans" + fi + case "$cc" in +@@ -1171,7 +1183,8 @@ specify the word "none". + EOH + rp="What optimizer/debugger flag should be used? [$dflt]" + $echo $n "$rp $c" +-. myread ++#. myread ++ans="$CFLAGS" + optimize="$ans" + case "$optimize" in + 'none') optimize=" ";; +@@ -1220,7 +1233,8 @@ the C compiler, but you should NOT inclu + EOH + rp="Any additional cc flags? [$dflt]" + $echo $n "$rp $c" +-. myread ++#. myread ++ans="-I${PREFIX}/include" + case "$ans" in + none) ans=''; + esac +@@ -1258,7 +1272,8 @@ esac + echo " " + rp="Any additional ld flags (NOT including libraries)? [$dflt]" + $echo $n "$rp $c" +-. myread ++#. myread ++ans="$LDFLAGS" + case "$ans" in + none) ans=''; + esac +@@ -1421,7 +1436,8 @@ if $contains '^index$' libc.list >/dev/n + echo "Your system has both index() and strchr(). Shall I use" + rp="index() rather than strchr()? [$dflt]" + $echo $n "$rp $c" +- . myread ++ #. myread ++ ans=y + case "$ans" in + n*) d_index="$define" ;; + *) d_index="$undef" ;; +@@ -1567,7 +1583,8 @@ EOT + + rp="What directory holds the Utah Raster Toolkit include files? [$dflt]" + $echo $n "$rp $c" +-. myread ++#. myread ++ans="${PREFIX}/include" + case "$ans" in + 'none') + urtinc='' +@@ -1591,7 +1608,8 @@ case "$ans" in + echo " " + rp="Where is the Utah Raster Toolkit library? [$dflt]" + $echo $n "$rp $c" +- . myread ++ #. myread ++ ans="${PREFIX}/lib/librle.a" + urtlib="$ans" + urtinc="-I$urtinc" + ;; +@@ -1629,7 +1647,8 @@ cont=true + while $test "$cont"; do + rp="Use which function to generate random numbers? [$dflt]" + $echo $n "$rp $c" +- . myread ++ #. myread ++ ans="drand48" + if $test "$ans" = "$dflt"; then + : null + else +@@ -1802,7 +1821,8 @@ esac + dflt="$voidflags"; + rp="Your void support flags add up to what? [$dflt]" + $echo $n "$rp $c" +-. myread ++#. myread ++ans=11 + voidflags="$ans" + $rm -f try.* .out + +@@ -1824,7 +1844,8 @@ while $test "$cont" ; do + echo " " + rp="Where do you want to put the public executables? (~name ok) [$dflt]" + $echo $n "$rp $c" +- . myread ++ #. myread ++ ans=${PREFIX}/bin + bin="$ans" + bin=`filexp $bin` + if test -d $bin; then +@@ -1833,7 +1854,8 @@ while $test "$cont" ; do + dflt=n + rp="Directory $bin doesn't exist. Use that name anyway? [$dflt]" + $echo $n "$rp $c" +- . myread ++ #. myread ++ ans=y + dflt='' + case "$ans" in + y*) cont='';; +@@ -1968,7 +1990,8 @@ while $test "$cont" ; do + echo " " + rp="Name of program to make makefile dependencies? [$dflt]" + $echo $n "$rp $c" +-. myread ++#. myread ++ans=/usr/bin/mkdep + mkdep="$ans" + mkdep=`filexp $mkdep` + if test -f "$mkdep"; then +@@ -1988,12 +2011,12 @@ $rm -f dep.c dep.h dep.o dep.out : see if ar generates random libraries by itself echo " " echo "Checking how to generate random libraries on your machine..." @@ -52,7 +214,7 @@ test - it's just plain wrong. if test -f /usr/bin/ranlib; then ranlib=/usr/bin/ranlib elif test -f /bin/ranlib; then -@@ -2009,7 +2010,7 @@ +@@ -2009,7 +2032,7 @@ else orderlib=true ranlib=":" fi @@ -61,3 +223,33 @@ test - it's just plain wrong. : determine compiler compiler case "$bison" in +@@ -2024,7 +2047,8 @@ cont=true + echo " " + rp="Which compiler compiler (yacc or bison -y) will you use? [$dflt]" + $echo $n "$rp $c" +-. myread ++#. myread ++ans=yacc + case "$ans" in + '') ans="$dflt";; + *bis*) ans="bison -y";; +@@ -2153,7 +2177,8 @@ fastread='' + echo "If you didn't make any mistakes, then just type a carriage return here." + rp="If you need to edit config.sh, do it as a shell escape here:" + $echo $n "$rp $c" +-. UU/myread ++#. UU/myread ++ans="" + case "$ans" in + '') ;; + *) : in case they cannot read +@@ -2205,7 +2230,8 @@ It can take a while, so you might not wa + EOM + rp="Run make depend now? [$dflt]" + $echo $n "$rp $c" +- . UU/myread ++ #. UU/myread ++ ans=y + case "$ans" in + y*) make depend + echo "Now you must run a make." |