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 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283
|
--- ./src/graph/view3D/globals.h.orig 2005-01-04 23:58:20.000000000 +0000
+++ ./src/graph/view3D/globals.h 2005-02-14 18:30:37.000000000 +0000
@@ -132,6 +132,8 @@
extern char propertyName[];
extern char propertyBuffer[];
+#undef R1
+#define R1 RR1
extern float transform[4][4], transform1[4][4],
R[4][4], R1[4][4], S[4][4], T[4][4], I[4][4];
extern float vxmax,vxmin,vymax,vymin,
--- ./src/algebra/Makefile.pamphlet.orig 2005-09-05 18:50:31.000000000 +0000
+++ ./src/algebra/Makefile.pamphlet 2005-09-20 21:15:13.000000000 +0000
@@ -1655,7 +1655,7 @@
else \
echo '(progn (in-package (quote boot)) (compile-file "$*.lsp" :output-file "$*.o"))' | ${DEPSYS} >${TMP}/trace ; \
fi )
- @ cp ${MID}/$*.o ${OUT}/$*.o
+ @ mkdir -p $$(dirname $(OUT)/$*.o) && cp ${MID}/$*.o ${OUT}/$*.o
@
<<genericSPADfiles>>=
--- ./src/doc/book.pamphlet 2006-01-09 20:42:23.000000000 +0000
+++ ./src/doc/book.pamphlet.orig 2006-01-09 20:42:06.000000000 +0000
@@ -62233,7 +62233,7 @@
These commands return the state of the interactive
environment to that immediately after step {\tt n}.
If {\tt n} is a positive number, then {\tt n} refers to step nummber
-{\tt n}. If {\tt n} is a negative number, it refers to the \tt n-th
+{\tt n}. If {\tt n} is a negative number, it refers to the {\tt n}-th
previous command (that is, undoes the effects of the last $-n$
commands).
--- ./Makefile.pamphlet.orig 2006-06-19 20:27:59.000000000 +0000
+++ ./Makefile.pamphlet 2006-06-19 20:28:40.000000000 +0000
@@ -736,7 +736,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -782,7 +782,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -828,7 +828,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -874,7 +874,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -920,7 +920,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -966,7 +966,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -1011,7 +1011,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -1062,7 +1062,7 @@
LISP=lsp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -1115,7 +1115,7 @@
LISP=lsp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
SRCDIRS=bootdir interpdir sharedir algebradir etcdir docdir inputdir
PATCH=patch
@@ -1166,7 +1166,7 @@
LISP=lsp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -1220,7 +1220,7 @@
LISP=lsp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS-LOCBFD>>
<<SRCDIRS>>
PATCH=patch
@@ -1271,7 +1271,7 @@
LISP=lsp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -1318,7 +1318,7 @@
LISP=lsp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS-LOCBFD>>
<<SRCDIRS>>
PATCH=patch
@@ -1364,7 +1364,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -1410,7 +1410,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -1461,7 +1461,7 @@
LISP=lsp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS-LOCBFD>>
<<SRCDIRS>>
PATCH=gpatch
@@ -1507,7 +1507,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -1553,7 +1553,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -1599,7 +1599,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -1645,7 +1645,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -1691,7 +1691,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -1737,7 +1737,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -1783,7 +1783,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -1829,7 +1829,7 @@
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
@@ -1887,7 +1887,7 @@
LISP=lsp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
+XLIB=/usr/lib
<<GCLOPTS>>
<<SRCDIRS>>
PATCH=patch
--- ./src/interp/sockio.lisp.pamphlet.orig 2006-11-01 16:18:42.000000000 -0500
+++ ./src/interp/sockio.lisp.pamphlet 2006-11-01 16:20:19.000000000 -0500
@@ -73,13 +73,18 @@
(progn
(clines "extern double plus_infinity(), minus_infinity(), NANQ();")
(clines "extern double sock_get_float();")
+ (clines "int sock_get_string_buf_wrapper(int i, object x, int j)"
+ "{ if (type_of(x)!=t_string) FEwrong_type_argument(sLstring,x);"
+ " if (x->st.st_fillp<j) FEerror(\"string too small in sock_get_string_buf_wrapper\",0);"
+ " return sock_get_string_buf(i, x->st.st_self, j);}")
(defentry open_server (string) (int "open_server"))
(defentry sock_get_int (int) (int "sock_get_int"))
(defentry sock_send_int (int int) (int "sock_send_int"))
- (defentry sock_get_string_buf (int string int) (int "sock_get_string_buf"))
+; (defentry sock_get_string_buf (int string int) (int "sock_get_string_buf"))
+ (defentry sock_get_string_buf (int object int) (int "sock_get_string_buf_wrapper"))
(defentry sock_send_string_len (int string int) (int "sock_send_string_len"))
(defentry sock_get_float (int) (double "sock_get_float"))
- (defentry sock_send_float (int float) (int "sock_send_float"))
+ (defentry sock_send_float (int double) (int "sock_send_float"))
(defentry sock_send_wakeup (int int) (int "sock_send_wakeup"))
(defentry server_switch () (int "server_switch"))
(defentry flush_stdout () (int "flush_stdout"))
|