2 files changed, 34 insertions, 30 deletions

diff --git a/lang/scm/files/patch-ac b/lang/scm/files/patch-ac
index 73d87faf7cdc..9b57c4a904fe 100644
--- a/lang/scm/files/patch-ac
+++ b/lang/scm/files/patch-ac
@@ -1,9 +1,9 @@
---- build.orig	Mon Dec  1 07:29:36 2003
-+++ build	Sun Dec  7 23:42:13 2003
+--- build.orig	Mon Sep 13 09:20:04 2004
++++ build	Wed Jun 29 01:42:24 2005
 @@ -1,5 +1,5 @@
  #! /bin/sh
--:;exec ./scmlit -no-init-file -f $0 -e"(bi)" build $*
-+:;exec $SCMLIT -no-init-file -f $0 -e"(bi)" build $*
+-:;exec ./scmlit -no-init-file -f $0 -e"(bi)" build "$@"
++:;exec $SCMLIT -no-init-file -f $0 -e"(bi)" build "$@"
  
  (require 'getopt)
  (require 'getopt-parameters)
diff --git a/lang/scm/files/patch-build.scm b/lang/scm/files/patch-build.scm
index 83a70298e81e..a7a9a3f16228 100644
--- a/lang/scm/files/patch-build.scm
+++ b/lang/scm/files/patch-build.scm
@@ -1,37 +1,41 @@
---- build.scm.orig	Wed Nov 27 10:44:43 2002
-+++ build.scm	Sat Nov 30 13:16:28 2002
-@@ -1438,7 +1438,7 @@
-   (lambda (files parms)
-     (and (batch:try-chopped-command
+--- build.scm.orig	Mon Jan 10 00:23:55 2005
++++ build.scm	Wed Jun 29 02:32:25 2005
+@@ -1576,7 +1576,7 @@
  	  parms
+ ;;; gcc 3.4.2 for FreeBSD does not allow options other than default i.e. -O0 if NO -DGCC_SPARC_BUG - dai 2004-10-30
+ 	  ;;"cc" "-O3 -pipe -DGCC_SPARC_BUG " "-c"
 -	  "cc" "-O3 -pipe " "-c"
 +	  "%%CC%%" "%%CFLAGS%%" "-c"
  	  (c-includes parms)
  	  (c-flags parms)
  	  files)
-@@ -1459,7 +1459,7 @@
+@@ -1586,7 +1586,7 @@
+     (batch:rename-file parms
+ 		       oname (string-append oname "~"))
+     (and (batch:try-command parms
+-			    "cc" "-o" oname
++			    "%%CC%%" "-o" oname
+ 			    (must-be-first
+ 			     '("-nostartfiles"
+ 			       "pre-crt0.o" "crt0.o"
+@@ -1596,14 +1596,14 @@
+ (defcommand compile-dll-c-files freebsd
    (lambda (files parms)
      (and (batch:try-chopped-command
- 	  parms
--	  "cc" "-O3 -pipe "
-+	  "%%CC%%" "%%CFLAGS%%"
- 	  "-fPIC" "-c" (c-includes parms)
- 	  (c-flags parms)
- 	  files)
-@@ -1468,10 +1468,10 @@
- 		 (lambda (fname)
- 		   (and (batch:try-command
- 			 parms
--			 "cc" "-shared"
-+			 "%%CC%%" "-shared"
- 			 (cond
- 			  ((equal? fname "edline") "-lreadline")
--			  ((equal? fname "x") "-L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -lxpg4")
-+			  ((equal? fname "x") "-L%%X11BASE%%/lib -lSM -lICE -lXext -lX11")
- 			  (else ""))
- 			 "-o"
- 			 (string-append fname ".so")
-@@ -1485,7 +1485,7 @@
+-	  parms "cc" "-O3 -pipe " "-fPIC" "-c"
++	  parms "%%CC%%" "%%CFLAGS%%" "-fPIC" "-c"
+ 	  (c-includes parms) (c-flags parms) files)
+ 	 (let ((fnames (truncate-up-to (map c-> files) #\/)))
+ 	   (and (batch:try-command
+ 		 parms "cc" "-shared"
+ 		 (cond
+ 		  ((equal? (car fnames) "edline") "-lreadline")
+-		  ((equal? (car fnames) "x") "-L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -lxpg4")
++		  ((equal? (car fnames) "x") "-L%%X11BASE%%/lib -lSM -lICE -lXext -lX11 -lxpg4")
+ 		  (else ""))
+ 		 "-o" (string-append (car fnames) ".so")
+ 		 (map (lambda (fname) (string-append fname ".o")) fnames))
+@@ -1616,7 +1616,7 @@
    (lambda (oname objects libs parms)
      (and (batch:try-command
  	  parms