<!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>[148996] trunk/dports/math/octave/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/148996">148996</a></dd>
<dt>Author</dt> <dd>dstrubbe@macports.org</dd>
<dt>Date</dt> <dd>2016-05-24 11:49:57 -0700 (Tue, 24 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>octave: Use linear_algebra port group.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathoctavePortfile">trunk/dports/math/octave/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathoctavePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/octave/Portfile (148995 => 148996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave/Portfile 2016-05-24 18:07:47 UTC (rev 148995)
+++ trunk/dports/math/octave/Portfile 2016-05-24 18:49:57 UTC (rev 148996)
</span><span class="lines">@@ -4,8 +4,8 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup compilers 1.0
</span><span class="cx"> PortGroup muniversal 1.0
</span><del>-PortGroup active_variants 1.1
</del><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><ins>+PortGroup linear_algebra 1.0
</ins><span class="cx">
</span><span class="cx"> name octave
</span><span class="cx"> version 4.0.2
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> description a high-level language for numerical computations
</span><span class="cx"> long_description \
</span><span class="cx"> GNU Octave is a high-level language, primarily intended for numerical \
</span><del>- computations. It provides a convenient command line interface for \
</del><ins>+ computations. It provides a convenient command-line interface for \
</ins><span class="cx"> solving linear and nonlinear problems numerically.
</span><span class="cx">
</span><span class="cx"> homepage http://www.gnu.org/software/octave
</span><span class="lines">@@ -274,44 +274,10 @@
</span><span class="cx"> port:transfig \
</span><span class="cx"> port:pstoedit
</span><span class="cx">
</span><del>-variant accelerate description {use BLAS from Apple's Accelerate.framework} conflicts atlas openblas {
- depends_lib-append port:vecLibFort
-
- configure.args-append \
- --with-blas=-lvecLibFort \
- --with-lapack=""
</del><ins>+pre-configure {
+ configure.args-append --with-blas="-L${prefix}/lib ${linalglib}" --with-lapack=""
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant openblas description {use BLAS from MacPorts' openblas port} conflicts atlas accelerate {
-
- depends_lib-append path:lib/libopenblas.dylib:OpenBLAS
- # LAPACK required
- require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
-
- # replicate default values if configure script finds openblas on its own
- configure.args-append \
- --with-blas=-lopenblas \
- --with-lapack=""
-}
-
-variant atlas description {use BLAS from MacPorts' atlas port} conflicts accelerate openblas {
- depends_lib-append port:atlas
-
- # replicate default values if configure script finds atlas on its own
- configure.args-append \
- --with-blas="-lcblas -lf77blas -latlas" \
- --with-lapack=-llapack
-}
-
-if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
- default_variants-append +accelerate
-}
-
-if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
- ui_error "\n\nYou must select either the +accelerate, +atlas, or +openblas variant.\n"
- return -code error "Invalid variant selection"
-}
-
</del><span class="cx"> variant java description {enable Java interface} {
</span><span class="cx"> PortGroup java 1.0
</span><span class="cx"> configure.args-replace --disable-java --enable-java
</span></span></pre>
</div>
</div>
</body>
</html>