summaryrefslogtreecommitdiff
path: root/graphics/rayshade/patches/patch-aa
blob: f4de5d08a64ebfededfa9f2dc7fd3e3eca24caf4 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
$NetBSD: patch-aa,v 1.2 2006/06/08 21:40:21 joerg Exp $

--- 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
 
 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
 
 : 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
-	'') sysman=`loc . /usr/man/man1 /usr/man/man1 /usr/man/mann /usr/man/manl /usr/man/local/man1 /usr/man/u_man/man1 /usr/share/man/man1 /usr/catman/u_man/man1 /usr/man/l_man/man1 /usr/local/man/u_man/man1 /usr/local/man/l_man/man1 /usr/man/man.L`
+	'') sysman=`loc . /usr/local/man/man1 /usr/man/man1 /usr/man/mann /usr/man/manl /usr/man/local/man1 /usr/man/u_man/man1 /usr/share/man/man1 /usr/catman/u_man/man1 /usr/man/l_man/man1 /usr/local/man/u_man/man1 /usr/local/man/l_man/man1 /usr/man/man.L`
     ;;
 esac
 if test -d "$sysman"; then
@@ -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..."
-ar rc ran.a /dev/null
-if ar ts ran.a >/dev/null 2>&1; then
-	echo "ar appears to generate random libraries itself."
-	orderlib=false
-	ranlib=":"
-else
+#ar rc ran.a /dev/null
+#if ar ts ran.a >/dev/null 2>&1; then
+#	echo "ar appears to generate random libraries itself."
+#	orderlib=false
+#	ranlib=":"
+#else
 	if test -f /usr/bin/ranlib; then
 		ranlib=/usr/bin/ranlib
 	elif test -f /bin/ranlib; then
@@ -2009,7 +2032,7 @@ else
 		orderlib=true
 		ranlib=":"
 	fi
-fi
+#fi
 
 : 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."