upgrade to 5d7

PR:		45855
Submitted by:	Ports Fury

2 files changed, 32 insertions, 69 deletions

diff --git a/lang/scm/files/patch-ac b/lang/scm/files/patch-ac
index d0abc95..b0e9aff 100644
--- a/lang/scm/files/patch-ac
+++ b/lang/scm/files/patch-ac
@@ -1,9 +1,9 @@
---- build.orig	Mon Feb  7 06:05:12 2000
-+++ build	Tue Aug 15 05:17:25 2000
+--- build.orig	Tue Nov 26 04:04:53 2002
++++ build	Sat Nov 30 13:11:28 2002
 @@ -1,5 +1,5 @@
- #!/bin/sh
--:;exec scmlit -f $0 -e"(bi)" build $*
-+:;exec $SCMLIT -f $0 -e"(bi)" build $*
+ #! /bin/sh
+-:;exec ./scmlit -no-init-file -f $0 -e"(bi)" build $*
++:;exec $SCMLIT -no-init-file -f $0 -e"(bi)" build $*
  
  (require (in-vicinity (program-vicinity) "build.scm"))
  (require 'getopt)
diff --git a/lang/scm/files/patch-build.scm b/lang/scm/files/patch-build.scm
index daaeafa..83a7029 100644
--- a/lang/scm/files/patch-build.scm
+++ b/lang/scm/files/patch-build.scm
@@ -1,78 +1,41 @@
---- build.scm.orig	Fri Jan 25 10:19:37 2002
-+++ build.scm	Sun Apr  7 17:20:38 2002
-@@ -585,6 +585,7 @@
-      (curses darwin "" "" #f () ())
-      (regex darwin "" "" #f () ())
- 
-+     (c freebsd "" "" #f () ())
-      (m freebsd "" "-lm" #f () ())
-      (curses freebsd "" "-lncurses" "/usr/lib/libncurses.a" () ())
-      (regex freebsd "" "-lgnuregex" "" () ())
-@@ -1362,7 +1363,7 @@
+--- 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
  	  parms
--	  "cc" "-O" "-c"
+-	  "cc" "-O3 -pipe " "-c"
 +	  "%%CC%%" "%%CFLAGS%%" "-c"
  	  (c-includes parms)
  	  (c-flags parms)
  	  files)
-@@ -1372,7 +1373,7 @@
-     (batch:rename-file parms
- 		       oname (string-append oname "~"))
-     (and (batch:try-command parms
--			    "cc" "-o" oname
-+			    "%%CC%%" "-o" oname "-export-dynamic"
- 			    (must-be-first
- 			     '("-nostartfiles"
- 			       "pre-crt0.o" "crt0.o"
-@@ -1381,29 +1382,31 @@
- 	 oname)))
- (defcommand compile-dll-c-files freebsd
+@@ -1459,7 +1459,7 @@
    (lambda (files parms)
--    (and (batch:try-chopped-command
--	  parms
--	  "cc" "-O" "-fpic" "-c"
--	  (string-append
--	   "-I" (parameter-list-ref parms 'scm-srcdir))
--	  (c-includes parms)
--	  (c-flags parms)
--	  files)
--	 (let ((objs (map c->o files)))
--	   (every
--	    (lambda (f)
--	      (and (batch:try-command
--		    parms "ld" "-Bshareable" f)
--		   (batch:try-command
--		    parms "mv" "a.out" f)))
--	    objs)
--	   objs))))
--
-+    (and
-+     (batch:try-chopped-command
-+      parms
-+      "%%CC%%" "%%CFLAGS%%"
-+      "-fPIC" "-c" (c-includes parms)
-+      (c-flags parms)
-+      files)
-+     (let* ((results
-+	     (map
-+	      (lambda (fname)
-+		(and (batch:try-command
-+		      parms
-+		      "%%CC%%" "-shared" "-o"
-+		      (string-append fname ".so")
-+		      (string-append fname ".o"))
-+		     (batch:delete-file
-+		      parms (string-append fname ".o"))
-+		     (string-append fname ".so")))
-+	      (truncate-up-to (map c-> files) #\/))))
-+       (and (apply and? results) results)))))
- (defcommand make-dll-archive freebsd
+     (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 @@
    (lambda (oname objects libs parms)
      (and (batch:try-command
  	  parms
--	  "ld" "-Bshareable" "-o"
+-	  "cc" "-shared" "-o"
 +	  "%%CC%%" "-shared" "-o"
  	  (string-append
  	   (car (parameter-list-ref parms 'implvic))