[pkgsrc/trunk]: pkgsrc/graphics/radiance Rewrite csh scripts in sh, by reques...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a7aa43f51eb7
branches:  trunk
changeset: 392240:a7aa43f51eb7
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Wed Apr 29 05:15:14 2009 +0000

description:
Rewrite csh scripts in sh, by request of agc. Closes PR 37581.

While here, clean up a lot of pkglint; it appears that the manual
substitutions in the makefile got rolled into several of the patches
at some point. Various problems remain (e.g. the build system runs
/usr/bin/make explicitly in a number of places; plus the manual
substitutions should be tidied away) but this should cover the most
serious ones.

PKGREVISION++.

diffstat:

 graphics/radiance/Makefile         |    8 +-
 graphics/radiance/distinfo         |   12 +-
 graphics/radiance/patches/patch-aa |  499 ++++++++++++++++++++++++++++--------
 graphics/radiance/patches/patch-ac |   75 ++++-
 graphics/radiance/patches/patch-ae |    6 +-
 graphics/radiance/patches/patch-ai |   10 +-
 graphics/radiance/patches/patch-al |   10 +-
 7 files changed, 465 insertions(+), 155 deletions(-)

diffs (truncated from 834 to 300 lines):

diff -r 303093693df1 -r a7aa43f51eb7 graphics/radiance/Makefile
--- a/graphics/radiance/Makefile        Wed Apr 29 04:57:00 2009 +0000
+++ b/graphics/radiance/Makefile        Wed Apr 29 05:15:14 2009 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2009/03/17 21:40:46 darcy Exp $
+# $NetBSD: Makefile,v 1.23 2009/04/29 05:15:14 dholland Exp $
 #
 
 DISTNAME=      rad3R6P1
 PKGNAME=       radiance-3.6.1
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.radiance-online.org/software/non-cvs/        \
                http://www.radiance-online.org/software/
@@ -70,8 +70,8 @@
        ${RM} ${WRKSRC}/lib/.gdb_history
 
 do-build:
-       cd ${WRKSRC} && ${MAKE_ENV} csh ./makeall install
-       @${RM} -f ${WRKSRC}/radiance/bin/wish*
+       cd ${WRKSRC} && ${MAKE_ENV} ${SH} ./makeall install
+       ${RM} -f ${WRKSRC}/radiance/bin/wish*
 
 do-install:
        ${INSTALL_DATA_DIR} ${DESTDIRPREFIX:Q}/radiance
diff -r 303093693df1 -r a7aa43f51eb7 graphics/radiance/distinfo
--- a/graphics/radiance/distinfo        Wed Apr 29 04:57:00 2009 +0000
+++ b/graphics/radiance/distinfo        Wed Apr 29 05:15:14 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2007/04/18 18:47:21 joerg Exp $
+$NetBSD: distinfo,v 1.10 2009/04/29 05:15:14 dholland Exp $
 
 SHA1 (rad3R6P1.tar.gz) = 71f46abd1c30be282a93237fa0c162d3bf0b1f99
 RMD160 (rad3R6P1.tar.gz) = 3bcf40518a57cdb5455264c83a3e206b67b3d1fa
@@ -6,18 +6,18 @@
 SHA1 (rad3R6P1supp.tar.gz) = 8a13227eae507a7a4947a49b6aa741c95198ed4e
 RMD160 (rad3R6P1supp.tar.gz) = 9581a9f979044399e528114875c818b1de2f54ae
 Size (rad3R6P1supp.tar.gz) = 4632166 bytes
-SHA1 (patch-aa) = 9a1a89d66d60bb99d00c1cc9f76942126903c80e
+SHA1 (patch-aa) = dadffa1ed6199f85cd34b2ed20473d961679870b
 SHA1 (patch-ab) = 051d127e149280d127619d646dc8981b124e575e
-SHA1 (patch-ac) = 2d0eb6a263c4d4c088397a8dbeebc01219c624f1
+SHA1 (patch-ac) = 44ea632411e9db9caa6873588ce44413820eb77b
 SHA1 (patch-ad) = f3f7c68305964965851c9caeca53f0e534014085
-SHA1 (patch-ae) = eaeba41315973013676bf400e5acff29ff61946a
+SHA1 (patch-ae) = 83564e054b3832d5c1096c8cd7f5ba75cf75a0a5
 SHA1 (patch-af) = 9a4c265a18a138166c8a041730cd5818430f9186
 SHA1 (patch-ag) = e7f8944d96aa51ce8dfdec5abb6d498c3ca193cc
 SHA1 (patch-ah) = be320a6b9b8b6b2153a31ea9218eb7d41aa43b0e
-SHA1 (patch-ai) = 02c6c3109c8e425d394980e1d223169dd6a3e7ae
+SHA1 (patch-ai) = 2e48691bea7e189c86c65c646ef71ea854f105bb
 SHA1 (patch-aj) = 5242f18c523bbebcfdd886fa20501434f07b74c0
 SHA1 (patch-ak) = 6cc99ea8f5c06e2234cdc4905631d56982404835
-SHA1 (patch-al) = c215a209fccd3d1d2e64d09018bce87291efc880
+SHA1 (patch-al) = 455a831b05ec0a1627fc77591b0173be5e095072
 SHA1 (patch-am) = 705a3f62c5688f593fd5c5a1a71b22e4652b1c77
 SHA1 (patch-an) = d0c388a5aaea622b220e3ef4c0f52956ecca5470
 SHA1 (patch-ao) = 22e3e8f3b593bca0423390f696324f42e8b52098
diff -r 303093693df1 -r a7aa43f51eb7 graphics/radiance/patches/patch-aa
--- a/graphics/radiance/patches/patch-aa        Wed Apr 29 04:57:00 2009 +0000
+++ b/graphics/radiance/patches/patch-aa        Wed Apr 29 05:15:14 2009 +0000
@@ -1,64 +1,142 @@
-$NetBSD: patch-aa,v 1.4 2006/02/26 21:26:32 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2009/04/29 05:15:14 dholland Exp $
+
+csh programming considered harmful.
+
+note that this is now a sh script, but I can't patch the #! line
+because there's an rcsid in the way.
 
---- makeall.orig       2003-12-14 17:24:09.000000000 +0000
-+++ makeall
-@@ -36,17 +36,10 @@ You must first answer the following ques
+--- makeall.orig       2003-12-14 12:24:09.000000000 -0500
++++ makeall    2009-04-29 00:37:35.000000000 -0400
+@@ -3,27 +3,27 @@
+ # 
+ # Make all the Radiance programs
+ #
+-if ( $#argv < 1 ) then
++if [ $# -lt 1 ]; then
+       echo "Usage: makeall install [clean] [make options]"
+       echo "   or: makeall clean"
+       echo "   or: makeall library"
+       exit 1
+-endif
+-if ( "$1" == library ) then
+-      source installib
++fi
++if [ x"$1" = xlibrary ]; then
++      . installib
+       cp -f src/*/*.{cal,tab,hex} $ldir
+       echo ""
+       echo "Set the environment variable RAYPATH=.:$ldir"
+       echo 'For C-shell users, put the following into ~/.cshrc'
+       echo "  setenv RAYPATH .:$ldir"
+-      echo 'For Bourne shell users, put the following into $HOME/profile'
++      echo 'For Bourne shell users, put the following into $HOME/.profile'
+       echo "  RAYPATH=.:$ldir"
+       echo "  export RAYPATH"
+       echo ""
+       exit 0
+-endif
+-set srcdirs=( common meta cv gen ot rt px hd util cal )
+-if ( "$1" == install ) then
++fi
++srcdirs='common meta cv gen ot rt px hd util cal'
++if [ x"$1" = xinstall ]; then
+       cat << _EOF_
+ 
+               `cat src/rt/VERSION` INSTALLATION
+@@ -35,183 +35,166 @@ this script.  You can type ^C (followed 
+ You must first answer the following questions.
  
  _EOF_
- if ( ! $?EDITOR ) then
+-if ( ! $?EDITOR ) then
 -      echo -n "What is your preferred editor [vi]? "
 -      set ans="$<"
 -      if ( "$ans" != "" ) then
 -              setenv EDITOR "$ans"
 -      else
-               setenv EDITOR vi
+-              setenv EDITOR vi
 -      endif
- endif
- again1:
+-endif
+-again1:
 -echo -n "Where do you want the executables [/usr/local/bin]? "
 -set idir=$<
-+set idir=@WRKSRC@/radiance/bin
- (echo $idir) >/dev/null
- if ( $status ) then
-       goto again1
-@@ -54,19 +47,16 @@ endif
- set idir=$idir
- if ( "$idir" == "" ) then
-       set idir=/usr/local/bin
+-(echo $idir) >/dev/null
+-if ( $status ) then
+-      goto again1
+-endif
+-set idir=$idir
+-if ( "$idir" == "" ) then
+-      set idir=/usr/local/bin
 -else if ( "$idir" !~ /* ) then
 -      echo "Directory must be relative to root, please reenter"
 -      goto again1
- endif
- if ( ! -d $idir ) then
+-endif
+-if ( ! -d $idir ) then
 -      mkdir $idir
-+      mkdir -p $idir
-       if ( $status ) then
+-      if ( $status ) then
++if [ x"$EDITOR" = x ]; then
++              EDITOR=vi
++              export EDITOR
++fi
++
++idir=@WRKSRC@/radiance/bin
++#(echo $idir) >/dev/null
++#if ( $status ) then
++#     continue
++#endif
++#set idir=$idir
++#if ( "$idir" == "" ) then
++#     set idir=/usr/local/bin
++#endif
++if [ ! -d "$idir" ]; then
++      mkdir -p "$idir"
++      if [ $? != 0 ]; then
                echo "Cannot create directory, please reenter"
-               goto again1
-       endif
- endif
+-              goto again1
+-      endif
+-endif
 -if ( ! -d $idir/dev ) then
 -      mkdir $idir/dev
-+if ( ! -d $idir/../dev ) then
-+      mkdir -p $idir/../dev
-       if ( $status ) then
+-      if ( $status ) then
++              exit 1
++      fi
++fi
++if [ ! -d "$idir/../dev" ]; then
++      mkdir -p "$idir/../dev"
++      if [ $? != 0 ]; then
                echo "Cannot create subdirectory, please reenter"
-               goto again1
-@@ -84,10 +74,6 @@ if ( "`ls -tL $rmake $0 |& head -1`" == 
-       goto gotrmake
- endif
- set newrmake
+-              goto again1
+-      endif
+-endif
+-set inpath=0
+-foreach i ( $path )
+-      if ( "$i" == "$idir" ) then
+-              set inpath=1
++              exit 1
++      fi
++fi
++inpath=0
++for i in $(echo $PATH | tr ':' ' '); do
++      if [ "$i" = "$idir" ]; then
++              inpath=1
+               break
+-      endif
+-end
+-set rmake=$idir/rmake
+-if ( "`ls -tL $rmake $0 |& head -1`" == $rmake ) then
+-      goto gotrmake
+-endif
+-set newrmake
 -more src/common/copyright.h
 -echo -n "Do you understand and accept the terms of this agreement [n]? "
 -set ans="$<"
 -if ( "$ans" !~ [yY]* ) exit
- set special=
- set arch=
- set opt=
-@@ -95,24 +81,7 @@ set mach=
- set compat=
- set extras=
- set esuffix=
+-set special=
+-set arch=
+-set opt=
+-set mach=
+-set compat=
+-set extras=
+-set esuffix=
 -cat << _EOF_
 -
 -Please select your system type from the following list:
@@ -77,75 +155,221 @@
 -_EOF_
 -echo -n "Choice? "
 -set arch="$<"
-+set arch=@PKGSRC_ARCH@
- switch ("$arch")
- case 1:                       # SPARC Station
-       set arch=sun
-@@ -163,14 +132,14 @@ case 5:                  # BSDI BSD/386
-       set compat="malloc.o erf.o strcmp.o"
-       breaksw
- case 6:                       # Linux
+-switch ("$arch")
+-case 1:                       # SPARC Station
+-      set arch=sun
+-      set mach="-I/usr/openwin/include -L/usr/openwin/lib -DNOSTEREO"
+-      set opt="-O -DSPEED=80"
+-      set compat="bmalloc.o strcmp.o getpagesize.o"
+-      breaksw
+-case 2:                       # HP workstation
+-      set mach=""
+-      set opt="-O -DSPEED=80 -Aa -D_HPUX_SOURCE"
+-      set compat="bmalloc.o getpagesize.o strcmp.o"
+-      set arch=hpux
+-      breaksw
+-case 3:                       # Silicon Graphics
+-      set arch=sgi
+-      switch (`uname -r`)
+-      case 3.*:
+-              set mach="-noprototypes"
+-              set opt="-O -DSPEED=80"
+-              set special="sgi"
+-              set compat="malloc.o strcmp.o"
+-              breaksw
+-      case 4.*:
+-              set mach=""
+-              set opt="-O2 -DSPEED=100"
+-              set compat="malloc.o strcmp.o"
+-              set extras='"MLIB=-lfastm -lm"'
+-              breaksw
+-      default:        # 5.x or later
++      fi
++done
++rmake=$idir/rmake
++#rmake2=`ls -tL $rmake $0 2>&1 | head -1`
++if [ ! -f "$rmake" -o "$0" -nt "$rmake" ]; then
++
++newrmake=
++special=
++arch=
++opt=
++mach=
++compat=
++extras=
++esuffix=
++arch=@PKGSRC_ARCH@
++case "$arch" in