octave: don't use FLTK by default

See discussion in #1865
macports · Jun 2, 2018 · 3f69e82 · 3f69e82
1 parent aec1479
commit 3f69e82
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/math/octave/Portfile b/math/octave/Portfile
@@ -13,7 +13,7 @@ compiler.blacklist-append   {*gcc-4.6} {clang < 700}
 name                octave
 version             4.4.0
 set package_version 4.x.x
-#revision            0
+revision            1
 categories          math science
 platforms           darwin
 license             GPL-3+
@@ -437,13 +437,14 @@ if { ![variant_isset qt4] && ![variant_isset qt5] } {
     }
 }
 
-variant fltk description {enable fltk as a graphics toolkit for plotting} {
+variant fltk_toolkit description {enable fltk as a graphics toolkit for plotting} {
     depends_lib-append path:lib/libfltk.dylib:fltk
     configure.args-replace --without-fltk --with-fltk
 }
-default_variants-append +fltk
+# see https://github.com/macports/macports-ports/pull/1865 for a discussion on fltk_toolkit
+#default_variants-append +fltk_toolkit
 
-if {[variant_isset fltk] || [variant_isset qt4] || [variant_isset qt5]} {
+if {[variant_isset fltk_toolkit] || [variant_isset qt4] || [variant_isset qt5]} {
     # native_graphics (fltk) and gui (Qt) require OpenGL and font and printing capabilities
     depends_lib-append  \
         port:fontconfig \
@@ -453,7 +454,7 @@ if {[variant_isset fltk] || [variant_isset qt4] || [variant_isset qt5]} {
     configure.args-replace --without-opengl --with-framework-opengl
 }
 
-if { ([variant_isset fltk] && [variant_isset qt4]) || ([variant_isset fltk] && [variant_isset qt5]) } {
+if { ([variant_isset fltk_toolkit] && [variant_isset qt4]) || ([variant_isset fltk_toolkit] && [variant_isset qt5]) } {
     notes-append "unless octave is run with --no-gui-libs, graphics_toolkit(\"fltk\") will cause a crash"
 }