<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b5012edc65b90ca2b5d8a07d0ec8b55efa87db6f">https://github.com/macports/macports-ports/commit/b5012edc65b90ca2b5d8a07d0ec8b55efa87db6f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b5012edc65b abcl: avoid java PG
</span>b5012edc65b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b5012edc65b90ca2b5d8a07d0ec8b55efa87db6f
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sun Dec 10 08:44:40 2023 +0000
<span style='display:block; white-space:pre;color:#404040;'> abcl: avoid java PG
</span>---
_resources/port1.0/group/common_lisp-1.0.tcl | 2 +-
lang/abcl/Portfile | 21 ++++++++++-----------
2 files changed, 11 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/common_lisp-1.0.tcl b/_resources/port1.0/group/common_lisp-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index f6b091b765f..90da95e5f3e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/common_lisp-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/common_lisp-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@ options common_lisp.ccl
</span> default common_lisp.ccl [expr { ${os.platform} eq "darwin" && ${os.major} >= 14 && ${os.arch} ne "arm" }]
options common_lisp.abcl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# ABCL requires java and support OpenJDK 11 before 10.14 fragile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ABCL requires java and support OpenJDK 21 before 10.14 fragile
</span> default common_lisp.abcl [expr { ${os.platform} eq "darwin" && ${os.major} >= 18 }]
options common_lisp.build_run
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/abcl/Portfile b/lang/abcl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ec21e18671..d6c39de85e0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/abcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/abcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup java 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span>
name abcl
version 1.9.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> categories lang java
license GPL-2
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,9 +40,12 @@ depends_build-append \
</span> # It needed for implementation of FFI, not build
depends_run-append port:maven3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# It may work on openjdk6 and openjdk7, but officially it is 1.8+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-java.version 1.8+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-java.fallback openjdk11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# java PG may add or may not add java dependencies, it depends on what is installed on the system,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# anyway, ABCL cached used java inside produced scripts, and won't work without the same java.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# To avoid hell by undetermenistic behaviour, I simple use the latest JDK TLS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:openjdk21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set java_home ${prefix}/Library/Java/JavaVirtualMachines/jdk-21-macports.jdk/Contents/Home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
patchfiles-append patch-macports-xdg-data-dir.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,11 +59,8 @@ post-patch {
</span>
build.cmd ant
build.target abcl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This must be called to set ${java.home}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- java::java_set_env
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args -Djava.path=${java.home}/bin/java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append JAVA_HOME=${java_home}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args -Djava.path=${java_home}/bin/java
</span>
post-build {
reinplace "s|${worksrcpath}/dist/abcl.jar|${prefix}/share/java/abcl/abcl.jar|g" \
</pre><pre style='margin:0'>
</pre>