<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3f69e82a5cbbc610fe39a89c8c225515edd36ab3">https://github.com/macports/macports-ports/commit/3f69e82a5cbbc610fe39a89c8c225515edd36ab3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3f69e82a5cbbc610fe39a89c8c225515edd36ab3
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Wed May 30 20:54:49 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> octave: don't use FLTK by default
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See discussion in
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/macports/macports-ports/pull/1865
</span>---
math/octave/Portfile | 11 ++++++-----
1 file changed, 6 insertions(+), 5 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 acf91d7..a0f6375 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;'>@@ -13,7 +13,7 @@ compiler.blacklist-append {*gcc-4.6} {clang < 700}
</span> name octave
version 4.4.0
set package_version 4.x.x
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories math science
platforms darwin
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -437,13 +437,14 @@ if { ![variant_isset qt4] && ![variant_isset qt5] } {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant fltk description {enable fltk as a graphics toolkit for plotting} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant fltk_toolkit description {enable fltk as a graphics toolkit for plotting} {
</span> depends_lib-append path:lib/libfltk.dylib:fltk
configure.args-replace --without-fltk --with-fltk
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants-append +fltk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://github.com/macports/macports-ports/pull/1865 for a discussion on fltk_toolkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#default_variants-append +fltk_toolkit
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset fltk] || [variant_isset qt4] || [variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset fltk_toolkit] || [variant_isset qt4] || [variant_isset qt5]} {
</span> # native_graphics (fltk) and gui (Qt) require OpenGL and font and printing capabilities
depends_lib-append \
port:fontconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -453,7 +454,7 @@ if {[variant_isset fltk] || [variant_isset qt4] || [variant_isset qt5]} {
</span> configure.args-replace --without-opengl --with-framework-opengl
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ([variant_isset fltk] && [variant_isset qt4]) || ([variant_isset fltk] && [variant_isset qt5]) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ([variant_isset fltk_toolkit] && [variant_isset qt4]) || ([variant_isset fltk_toolkit] && [variant_isset qt5]) } {
</span> notes-append "unless octave is run with --no-gui-libs, graphics_toolkit(\"fltk\") will cause a crash"
}
</pre><pre style='margin:0'>
</pre>