<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3c455d8857c262cec8eb9802604f71b77547356a">https://github.com/macports/macports-ports/commit/3c455d8857c262cec8eb9802604f71b77547356a</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 3c455d8857c octave: don't hardcode /opt/local
</span>3c455d8857c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3c455d8857c262cec8eb9802604f71b77547356a
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Sun Mar 24 16:24:10 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> octave: don't hardcode /opt/local
</span>---
math/octave/Portfile | 4 ++++
math/octave/files/patch-run-octave-libstdcpp.diff | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/Portfile b/math/octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ac72be016f..d0d716dfa40 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,6 +82,10 @@ if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libc++"} {
</span> # Patch the script which runs at destroot:
patchfiles-append patch-run-octave-libstdcpp.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|%PREFIX%|${prefix}|" ${worksrcpath}/run-octave.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Patch scripts installed by LegacySupport so that they call correct binaries.
post-activate {
foreach obin {mkoctfile octave octave-cli octave-config} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-run-octave-libstdcpp.diff b/math/octave/files/patch-run-octave-libstdcpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d43edb8f49f..398387f45aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-run-octave-libstdcpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-run-octave-libstdcpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,9 +5,9 @@
</span> fi
+if [ -n "$DYLD_LIBRARY_PATH" ]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DYLD_LIBRARY_PATH=/opt/local/lib/libgcc:${DYLD_LIBRARY_PATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DYLD_LIBRARY_PATH=%PREFIX%/lib/libgcc:${DYLD_LIBRARY_PATH}
</span> +else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DYLD_LIBRARY_PATH=/opt/local/lib/libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DYLD_LIBRARY_PATH=%PREFIX%/lib/libgcc
</span> +fi
+export DYLD_LIBRARY_PATH
+
</pre><pre style='margin:0'>
</pre>