<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[148704] trunk/dports/math/octave-devel/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/148704">148704</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2016-05-15 03:43:22 -0700 (Sun, 15 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>octave-devel, octave-devel-rc, octave-devel-release: only link against font and OpenGL libraries if they are actually needed</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathoctavedevelPortfile">trunk/dports/math/octave-devel/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathoctavedevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/octave-devel/Portfile (148703 => 148704)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> if { ${name} eq ${subport} } {
</span><span class="cx"> version ${version_tip}
</span><del>- revision 11
</del><ins>+ revision 12
</ins><span class="cx"> hg.tag 225d88a97104
</span><span class="cx">
</span><span class="cx"> # see http://savannah.gnu.org/bugs/?41027
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> subport octave-devel-rc {
</span><span class="cx"> version ${version_rc}
</span><del>- revision 6
</del><ins>+ revision 7
</ins><span class="cx"> hg.tag 2b66f30a0de7
</span><span class="cx">
</span><span class="cx"> if {${version_rc} eq ${version_release}} {
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> subport octave-devel-release {
</span><span class="cx"> version ${version_release}
</span><del>- revision 2
</del><ins>+ revision 3
</ins><span class="cx"> hg.tag 5162cdfb56d8
</span><span class="cx">
</span><span class="cx"> if {${version_release} eq ${version_rc}} {
</span><span class="lines">@@ -305,7 +305,6 @@
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:ncurses
</span><span class="cx"> depends_lib-append port:readline
</span><del>-depends_lib-append port:fontconfig
</del><span class="cx"> depends_lib-append port:pcre
</span><span class="cx">
</span><span class="cx"> #--without-amd
</span><span class="lines">@@ -444,18 +443,20 @@
</span><span class="cx">
</span><span class="cx"> variant fltk description {enable fltk as a graphics toolkit for plotting} {
</span><span class="cx"> depends_lib-append path:lib/libfltk.dylib:fltk
</span><ins>+ configure.args-replace --without-fltk --with-fltk
+}
+default_variants-append +fltk
</ins><span class="cx">
</span><del>- # 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 \
</del><ins>+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 \
</ins><span class="cx"> port:gl2ps
</span><span class="cx">
</span><del>- configure.args-replace --without-fltk --with-fltk
</del><ins>+ configure.args-replace --without-opengl --with-framework-opengl
</ins><span class="cx"> }
</span><del>-default_variants-append +fltk
</del><span class="cx">
</span><span class="cx"> if {[variant_isset fltk] && [variant_isset qt4gui]} {
</span><span class="cx"> notes-append "unless octave is run with --no-gui-libs, graphics_toolkit(\"fltk\") will cause a crash"
</span></span></pre>
</div>
</div>
</body>
</html>