<!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>[112628] 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/112628">112628</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2013-10-28 07:10:27 -0700 (Mon, 28 Oct 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>octave-devel:
* rev-bump for new SuiteSparse;
* split C/C++ and Fortran compiler selection;
* set &quot;gcc_default_no_dot&quot; to make default +gccXY selection more robust.</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 (112627 => 112628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-devel/Portfile        2013-10-28 14:09:37 UTC (rev 112627)
+++ trunk/dports/math/octave-devel/Portfile        2013-10-28 14:10:27 UTC (rev 112628)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> 
</span><span class="cx"> name                octave-devel
</span><span class="cx"> version             3.6.4
</span><del>-revision            8
</del><ins>+revision            9
</ins><span class="cx"> conflicts           octave
</span><span class="cx"> categories          math science
</span><span class="cx"> maintainers         michaelld openmaintainer
</span><span class="lines">@@ -126,6 +126,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
</span><ins>+set gcc_default &quot;4.8&quot;
</ins><span class="cx"> 
</span><span class="cx"> # create g95 variant, with full conflicts of GCC versions
</span><span class="cx"> 
</span><span class="lines">@@ -162,9 +163,10 @@
</span><span class="cx"> 
</span><span class="cx">     eval [subst {
</span><span class="cx">         variant ${gcc_ver1_no_dot} ${gcc_conflicts} \
</span><del>-            description &quot;Build with the MacPorts ${gcc_ver1_no_dot} Toolchain&quot; {
-                configure.compiler macports-gcc-${ver1}
-                configure.ldflags  -lgfortran
</del><ins>+            description &quot;Build with the MacPorts ${gcc_ver1_no_dot} as the Fortran Compiler&quot; {
+                configure.fc  ${prefix}/bin/gfortran-mp-${ver1}
+                configure.f77 ${prefix}/bin/gfortran-mp-${ver1}
+                configure.f90 ${prefix}/bin/gfortran-mp-${ver1}
</ins><span class="cx">             }
</span><span class="cx">     }]
</span><span class="cx"> }
</span><span class="lines">@@ -183,8 +185,11 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+# check for need for default variant
+
+set gcc_default_no_dot gcc[join [split ${gcc_default} &quot;.&quot;] &quot;&quot;]
</ins><span class="cx"> if {&quot;${var_selection}&quot; == &quot;&quot;} {
</span><del>-    default_variants +gcc48
</del><ins>+    default_variants +${gcc_default_no_dot}
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> # check if the user disabled just the default variant
</span><span class="lines">@@ -202,7 +207,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> if {&quot;${var_selection}&quot; == &quot;&quot;} {
</span><del>-    ui_error &quot;\n\nYou cannot use the -gcc48 variant alone; a Fortran compiler is required.\n&quot;
</del><ins>+    ui_error &quot;\n\nYou cannot use the -${gcc_default_no_dot} variant alone; a Fortran compiler is required.\n&quot;
</ins><span class="cx">     return -code error &quot;Invalid variant selection&quot;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -239,7 +244,9 @@
</span><span class="cx"> 
</span><span class="cx">     depends_lib-append    port:atlas
</span><span class="cx">     # NOTE: libtatlas does not work as of 3.10.1_5
</span><del>-    configure.args-append --with-blas=&quot;-lcblas -lf77blas -latlas&quot;
</del><ins>+    configure.args-append \
+        --with-blas=&quot;-lcblas -lf77blas -latlas&quot; \
+        --with-lapack=&quot;-llapack -lgfortran&quot;
</ins><span class="cx"> 
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>