Revision
140782
Author
michaelld@macports.org
Date
2015-10-02 11:33:41 -0700 (Fri, 02 Oct 2015)

Log Message

octave: use fltk-devel on 10.11 for now; add a note about octave and the next fltk release.

Modified Paths

Diff

Modified: trunk/dports/math/octave/Portfile (140781 => 140782)


--- trunk/dports/math/octave/Portfile	2015-10-02 18:32:48 UTC (rev 140781)
+++ trunk/dports/math/octave/Portfile	2015-10-02 18:33:41 UTC (rev 140782)
@@ -233,8 +233,17 @@
 
 variant glgui conflicts x11 description {Enable OpenGL GUI (via FLTK) as the default graphical front-end} {
 
-    depends_lib-append path:lib/libfltk.dylib:fltk \
-                       port:fontconfig \
+    # for now on OSX 10.11, just use fltk-devel since fltk does not
+    # build; remove this condition with the next fltk release (noted
+    # in that Portfile too).
+
+    if {${os.major} == 15} {
+        depends_lib-append port:fltk-devel
+    } else {
+        depends_lib-append path:lib/libfltk.dylib:fltk
+    }
+
+    depends_lib-append port:fontconfig \
                        port:freetype \
                        port:gl2ps