<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/211cb08124966a01cef6d6e4823b7e3932a14c1e">https://github.com/macports/macports-ports/commit/211cb08124966a01cef6d6e4823b7e3932a14c1e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 211cb08124966a01cef6d6e4823b7e3932a14c1e
</span>Author: Jordan Ellis Coppard <jc+git@wz.ht>
AuthorDate: Mon Jun 20 19:57:24 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> update: janet portgroup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * jpm is now packaged via MacPorts as it no longer exists
</span><span style='display:block; white-space:pre;color:#404040;'> by default after a janet installation. This updates
</span><span style='display:block; white-space:pre;color:#404040;'> the portgroup to use this MacPorts packaged jpm and
</span><span style='display:block; white-space:pre;color:#404040;'> associated directories.
</span><span style='display:block; white-space:pre;color:#404040;'> * options to compile jpm also changed, namely the
</span><span style='display:block; white-space:pre;color:#404040;'> compilers and archive.
</span>---
_resources/port1.0/group/janet-1.0.tcl | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/janet-1.0.tcl b/_resources/port1.0/group/janet-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 394fa42514f..93eb0bfd555 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/janet-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/janet-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,9 +41,9 @@ pre-build {
</span> default build.cmd {${prefix}/bin/jpm}
default build.args {--verbose
--offline
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --compiler=[compwrap::wrapped_compiler_path cc]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --cpp-compiler=[compwrap::wrapped_compiler_path cxx]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --archiver=[janetpg::get_default_ar]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --cc=[compwrap::wrapped_compiler_path cc]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --c++=[compwrap::wrapped_compiler_path cxx]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --ar=[janetpg::get_default_ar]
</span> build
}
default build.target {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,6 +59,7 @@ default destroot.destdir {}
</span>
pre-destroot {
xinstall -d -m 0755 ${destroot}${prefix}/lib/janet
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/lib/jpm/.manifests
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,8 +72,11 @@ post-destroot {
</span>
proc janetpg::janet_setup {} {
destroot.env-append JANET_PATH=[option destroot][option prefix]/lib/janet
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append JANET_MODPATH=[option destroot][option prefix]/lib/jpm
</span> depends_lib-delete port:janet
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:jpm
</span> depends_lib-append port:janet
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:jpm
</span> }
port::register_callback janetpg::janet_setup
</pre><pre style='margin:0'>
</pre>