Disable the tty check again, not sure why I don't hit it.

2 files changed, 42 insertions, 27 deletions

diff --git a/graphics/rayshade/distinfo b/graphics/rayshade/distinfo
index 8a98cfb8eb4..47e967a3a2a 100644
--- a/graphics/rayshade/distinfo
+++ b/graphics/rayshade/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2006/06/08 21:40:21 joerg Exp $
+$NetBSD: distinfo,v 1.5 2006/06/20 22:50:13 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) = 1662768a88b3c34a03c73128e2e009759f8a5408
+SHA1 (patch-aa) = b510e1b3a98ef25ffe0d23f9b499fb5c16c333f4
 SHA1 (patch-ab) = 13b48848c4a40d86ee5ceef8dddf10988b59e088
 SHA1 (patch-ac) = 3a2d67bf28e6b0e96d2ec037efa5b219e9935a57
 SHA1 (patch-ba) = d36261ceede5f89645ff23f5a108b231fd5ea18d
diff --git a/graphics/rayshade/patches/patch-aa b/graphics/rayshade/patches/patch-aa
index f4de5d08a64..19f0b070f84 100644
--- a/graphics/rayshade/patches/patch-aa
+++ b/graphics/rayshade/patches/patch-aa
@@ -1,8 +1,23 @@
-$NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2006/06/20 22:50:13 joerg Exp $
 
 --- Configure.orig	1992-02-10 03:04:23.000000000 +0000
 +++ Configure
-@@ -364,7 +365,7 @@ where this is allowed will be marked "(~
+@@ -28,10 +28,10 @@ PATH=$PATH:'/sys5.3/bin:/sys5.3/usr/bin 
+ 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 $$)
+ 
+-if test ! -t 0; then
+-    echo "Say 'sh Configure', not 'sh <Configure'"
+-    exit 1
+-fi
++#if test ! -t 0; then
++#    echo "Say 'sh Configure', not 'sh <Configure'"
++#    exit 1
++#fi
+ 
+ (alias) >/dev/null 2>&1 && \
+     echo "(I see you are using the Korn shell.  Some ksh's blow up on Configure," && \
+@@ -364,7 +364,7 @@ where this is allowed will be marked "(~
  EOH
  rp="[Type carriage return to continue]"
  echo $n "$rp $c"
@@ -11,7 +26,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  cat <<EOH
  
  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
+@@ -386,7 +386,7 @@ SH files.  Configure will offer to let y
  EOH
  rp="[Type carriage return to continue]"
  echo $n "$rp $c"
@@ -20,7 +35,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  
  : get old answers, if there is a config file out there
  if test -f ../config.sh; then
-@@ -616,7 +617,8 @@ EOM
+@@ -616,7 +616,8 @@ EOM
  echo " "
  rp="Any additional libraries? [$dflt]"
  $echo $n "$rp $c"
@@ -30,7 +45,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  case "$ans" in
  none) ans='';
  esac
-@@ -720,7 +722,14 @@ fi
+@@ -720,7 +721,14 @@ fi
  echo " "
  set `echo $libc $libnames | tr ' ' '\012' | sort | uniq`
  $echo $n "Extracting names from $* for later perusal...$c"
@@ -46,7 +61,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  $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
+@@ -823,7 +831,8 @@ if $contains '^times$' libc.list >/dev/n
  	echo " "
  	rp="What type is returned by times() on this sytem? [$dflt]"
  	$echo $n "$rp $c"
@@ -56,7 +71,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  	clocktype="$ans"
  else
      echo 'times() not found, hope that will do.'
-@@ -872,7 +882,7 @@ $eunicefix filexp
+@@ -872,7 +881,7 @@ $eunicefix filexp
  : determine where manual pages are on this system
  echo " "
  case "$sysman" in
@@ -65,7 +80,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
      ;;
  esac
  if test -d "$sysman"; then
-@@ -1007,7 +1017,8 @@ Venix systems may wish to put "none" and
+@@ -1007,7 +1016,8 @@ Venix systems may wish to put "none" and
  EOM
  rp="Which models are supported? [$dflt]"
  $echo $n "$rp $c"
@@ -75,7 +90,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  models="$ans"
  
  case "$models" in
-@@ -1147,7 +1158,8 @@ else
+@@ -1147,7 +1157,8 @@ else
  	esac
  	rp="Use which C compiler? [$dflt]"
  	$echo $n "$rp $c"
@@ -85,7 +100,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  	cc="$ans"
  fi
  case "$cc" in
-@@ -1171,7 +1183,8 @@ specify the word "none".
+@@ -1171,7 +1182,8 @@ specify the word "none".
  EOH
  rp="What optimizer/debugger flag should be used? [$dflt]"
  $echo $n "$rp $c"
@@ -95,7 +110,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  optimize="$ans"
  case "$optimize" in
  'none') optimize=" ";;
-@@ -1220,7 +1233,8 @@ the C compiler, but you should NOT inclu
+@@ -1220,7 +1232,8 @@ the C compiler, but you should NOT inclu
  EOH
  rp="Any additional cc flags? [$dflt]"
  $echo $n "$rp $c"
@@ -105,7 +120,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  case "$ans" in
  none) ans='';
  esac
-@@ -1258,7 +1272,8 @@ esac
+@@ -1258,7 +1271,8 @@ esac
  echo " "
  rp="Any additional ld flags (NOT including libraries)? [$dflt]"
  $echo $n "$rp $c"
@@ -115,7 +130,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  case "$ans" in
  none) ans='';
  esac
-@@ -1421,7 +1436,8 @@ if $contains '^index$' libc.list >/dev/n
+@@ -1421,7 +1435,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"
@@ -125,7 +140,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  				case "$ans" in
  					n*) d_index="$define" ;;
  					*)  d_index="$undef" ;;
-@@ -1567,7 +1583,8 @@ EOT
+@@ -1567,7 +1582,8 @@ EOT
  
  rp="What directory holds the Utah Raster Toolkit include files? [$dflt]"
  $echo $n "$rp $c"
@@ -135,7 +150,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  case "$ans" in
  'none')
      urtinc=''
-@@ -1591,7 +1608,8 @@ case "$ans" in
+@@ -1591,7 +1607,8 @@ case "$ans" in
      echo " "
      rp="Where is the Utah Raster Toolkit library? [$dflt]"
      $echo $n "$rp $c"
@@ -145,7 +160,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
      urtlib="$ans"
      urtinc="-I$urtinc"
      ;;
-@@ -1629,7 +1647,8 @@ cont=true
+@@ -1629,7 +1646,8 @@ cont=true
  while $test "$cont"; do
  	rp="Use which function to generate random numbers? [$dflt]"
  	$echo $n "$rp $c"
@@ -155,7 +170,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  	if $test "$ans" = "$dflt"; then
  		: null
  	else
-@@ -1802,7 +1821,8 @@ esac
+@@ -1802,7 +1820,8 @@ esac
  dflt="$voidflags";
  rp="Your void support flags add up to what? [$dflt]"
  $echo $n "$rp $c"
@@ -165,7 +180,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  voidflags="$ans"
  $rm -f try.* .out
  
-@@ -1824,7 +1844,8 @@ while $test "$cont" ; do
+@@ -1824,7 +1843,8 @@ while $test "$cont" ; do
      echo " "
      rp="Where do you want to put the public executables? (~name ok) [$dflt]"
      $echo $n "$rp $c"
@@ -175,7 +190,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
      bin="$ans"
      bin=`filexp $bin`
      if test -d $bin; then
-@@ -1833,7 +1854,8 @@ while $test "$cont" ; do
+@@ -1833,7 +1853,8 @@ while $test "$cont" ; do
  	dflt=n
  	rp="Directory $bin doesn't exist.  Use that name anyway? [$dflt]"
  	$echo $n "$rp $c"
@@ -185,7 +200,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  	dflt=''
  	case "$ans" in
  	y*) cont='';;
-@@ -1968,7 +1990,8 @@ while $test "$cont" ; do
+@@ -1968,7 +1989,8 @@ while $test "$cont" ; do
  	echo " "
  rp="Name of program to make makefile dependencies? [$dflt]"
  $echo $n "$rp $c"
@@ -195,7 +210,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  mkdep="$ans"
  mkdep=`filexp $mkdep`
  if test -f "$mkdep"; then
-@@ -1988,12 +2011,12 @@ $rm -f dep.c dep.h dep.o dep.out
+@@ -1988,12 +2010,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..."
@@ -214,7 +229,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  	if test -f /usr/bin/ranlib; then
  		ranlib=/usr/bin/ranlib
  	elif test -f /bin/ranlib; then
-@@ -2009,7 +2032,7 @@ else
+@@ -2009,7 +2031,7 @@ else
  		orderlib=true
  		ranlib=":"
  	fi
@@ -223,7 +238,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  
  : determine compiler compiler
  case "$bison" in
-@@ -2024,7 +2047,8 @@ cont=true
+@@ -2024,7 +2046,8 @@ cont=true
      echo " "
  rp="Which compiler compiler (yacc or bison -y) will you use? [$dflt]"
  $echo $n "$rp $c"
@@ -233,7 +248,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  case "$ans" in
  '') ans="$dflt";;
  *bis*) ans="bison -y";;
-@@ -2153,7 +2177,8 @@ fastread=''
+@@ -2153,7 +2176,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"
@@ -243,7 +258,7 @@ $NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $
  case "$ans" in
  '') ;;
  *) : in case they cannot read
-@@ -2205,7 +2230,8 @@ It can take a while, so you might not wa
+@@ -2205,7 +2229,8 @@ It can take a while, so you might not wa
  EOM
      rp="Run make depend now? [$dflt]"
      $echo $n "$rp $c"