<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/eddc007e4f2b3135ad87a60b43ecbb01e8ce1e08">https://github.com/macports/macports-ports/commit/eddc007e4f2b3135ad87a60b43ecbb01e8ce1e08</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit eddc007e4f2b3135ad87a60b43ecbb01e8ce1e08
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Mon Dec 14 19:25:38 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> octave: enable non-gui build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> don't try to install liboctgui.dylib if there
</span><span style='display:block; white-space:pre;color:#404040;'> is no liboctgui
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> only default the app variant if there is
</span><span style='display:block; white-space:pre;color:#404040;'> liboctgui, as without liboctgui the app
</span><span style='display:block; white-space:pre;color:#404040;'> variant just opens and closes immediately
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> also: disable silent rules
</span>---
math/octave/Portfile | 18 ++++++++++++++++--
1 file changed, 16 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 e8d9dcf8488..b2ad808fd99 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;'>@@ -278,6 +278,8 @@ configure.args-append \
</span> --without-magick \
--disable-docs
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # avoid
# Undefined symbols for architecture x86_64:
# "print_usage()", referenced from: ...
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -559,7 +561,9 @@ variant app description "build application bundle to launch ${subport}" {
</span> copy ${worksrcpath}/${appName} ${destroot}${applications_dir}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants-append +app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset qt4] || [variant_isset qt5] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant docs description {build documentation files} {
depends_build-append port:texinfo
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -619,11 +623,21 @@ post-destroot {
</span> }
# do not force upgrade of every dependency every time the version changes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach lib {liboctave.8.dylib liboctgui.6.dylib liboctinterp.8.dylib} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lib {liboctave.8.dylib liboctinterp.8.dylib} {
</span> xinstall -d -m 0755 ${destroot}${prefix}/lib/octave/${package_version}
ln -s ../${version}/${lib} ${destroot}${prefix}/lib/octave/${package_version}/${lib}
system "install_name_tool -id ${prefix}/lib/octave/${package_version}/${lib} ${destroot}${prefix}/lib/octave/${version}/${lib}"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset qt4] || [variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # do not force upgrade of every dependency every time the version changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lib {liboctgui.6.dylib} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/lib/octave/${package_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ../${version}/${lib} ${destroot}${prefix}/lib/octave/${package_version}/${lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${prefix}/lib/octave/${package_version}/${lib} ${destroot}${prefix}/lib/octave/${version}/${lib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
# generate default octave_packages file so that it is removed if Octave is uninstalled
</pre><pre style='margin:0'>
</pre>