[148704] trunk/dports/math/octave-devel/Portfile

[mcalhoun at macports.org]

Revision: 148704
          https://trac.macports.org/changeset/148704
Author:   mcalhoun at macports.org
Date:     2016-05-15 03:43:22 -0700 (Sun, 15 May 2016)
Log Message:
-----------
octave-devel, octave-devel-rc, octave-devel-release: only link against font and OpenGL libraries if they are actually needed

Modified Paths:
--------------
    trunk/dports/math/octave-devel/Portfile

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2016-05-15 10:39:30 UTC (rev 148703)
+++ trunk/dports/math/octave-devel/Portfile	2016-05-15 10:43:22 UTC (rev 148704)
@@ -30,7 +30,7 @@
 
 if { ${name} eq ${subport} } {
     version         ${version_tip}
-    revision        11
+    revision        12
     hg.tag          225d88a97104
 
     # see http://savannah.gnu.org/bugs/?41027
@@ -47,7 +47,7 @@
 
 subport octave-devel-rc {
     version         ${version_rc}
-    revision        6
+    revision        7
     hg.tag          2b66f30a0de7
 
     if {${version_rc} eq ${version_release}} {
@@ -72,7 +72,7 @@
 
 subport octave-devel-release {
     version         ${version_release}
-    revision        2
+    revision        3
     hg.tag          5162cdfb56d8
 
     if {${version_release} eq ${version_rc}} {
@@ -305,7 +305,6 @@
 
 depends_lib-append   port:ncurses
 depends_lib-append   port:readline
-depends_lib-append   port:fontconfig
 depends_lib-append   port:pcre
 
 #--without-amd
@@ -444,18 +443,20 @@
 
 variant fltk 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
 
-    # as of version 4.1.0+ revision 0:
-    #    without fltk, configure script turns off "native_graphics," and
-    #       does not look for either freetype or gl2ps
-    #    it still looks for and links against fontconfig, however
-    depends_lib-append \
-        port:freetype  \
+if {[variant_isset fltk] || [variant_isset qt4gui]} {
+
+    # native_graphics (fltk) and gui (Qt) require OpenGL and font and printing capabilities
+    depends_lib-append  \
+        port:fontconfig \
+        port:freetype   \
         port:gl2ps
 
-    configure.args-replace --without-fltk --with-fltk
+    configure.args-replace --without-opengl --with-framework-opengl
 }
-default_variants-append +fltk
 
 if {[variant_isset fltk] && [variant_isset qt4gui]} {
     notes-append "unless octave is run with --no-gui-libs, graphics_toolkit(\"fltk\") will cause a crash"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160515/ac5ae846/attachment.html>