Re: Update lang/ecl to 20.4.24

On Tue, May 19, 2020 at 01:13:06PM -0400, Kurt Mosiejczuk wrote:
> On Tue, May 19, 2020 at 08:59:48AM -0700, Josh Elsasser wrote:
> > Here's a quick update to the new release, minimally tested as a
> > lang/sbcl build host. The patch removes files, don't forget patch -E
>
> Someone should do testing with math/maxima, net/clic, and sysutils/reed-alert.
>
> --Kurt

Maxima needs an upstream patch to build with ecl 20.4.24. This should
be safe to commit now, before updating ecl.

diff --git a/math/maxima/patches/patch-lisp-utils_defsystem_lisp b/math/maxima/patches/patch-lisp-utils_defsystem_lisp
new file mode 100644
index 00000000000..b3fd1683402
--- /dev/null
+++ b/math/maxima/patches/patch-lisp-utils_defsystem_lisp
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Upstream commit 615b4bf8b13d55a576bc60ad04f7b17d75f49021
+Fix for Bug #3629, to compile with ECL 20.4.24
+
+Index: lisp-utils/defsystem.lisp
+--- lisp-utils/defsystem.lisp.orig
++++ lisp-utils/defsystem.lisp
+@@ -4152,7 +4152,7 @@ the system definition, if provided."
+ #+:ecl
+ (progn
+ (ext:package-lock "CL" nil)
+- (setf (symbol-function 'lisp:require)
++ (setf (symbol-function 'cl:require)
+ (symbol-function 'new-require))
+ (ext:package-lock "CL" t))
+ #+:lispworks
diff --git a/math/maxima/patches/patch-src_maxima_system b/math/maxima/patches/patch-src_maxima_system
new file mode 100644
index 00000000000..5d651aa002e
--- /dev/null
+++ b/math/maxima/patches/patch-src_maxima_system
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Upstream commit 615b4bf8b13d55a576bc60ad04f7b17d75f49021
+Fix for Bug #3629, to compile with ECL 20.4.24
+
+Index: src/maxima.system
+--- src/maxima.system.orig
++++ src/maxima.system
+@@ -80,8 +80,7 @@
+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
+ (find-package "MAXIMA")))))
+ (if (and x (not (string= x ""))) (list x)))
+- :epilogue-code '(progn (require :defsystem)
+- (cl-user::run)))))))
++ :epilogue-code '(progn (cl-user::run)))))))
+
+ (defun maxima-binary-pathname ()
+ #+clisp