<!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>[121949] 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/121949">121949</a></dd>
<dt>Author</dt> <dd>sean@macports.org</dd>
<dt>Date</dt> <dd>2014-07-11 22:24:36 -0700 (Fri, 11 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>octave: use compilers 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 (121948 => 121949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave/Portfile 2014-07-12 01:57:57 UTC (rev 121948)
+++ trunk/dports/math/octave/Portfile 2014-07-12 05:24:36 UTC (rev 121949)
</span><span class="lines">@@ -4,7 +4,11 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup active_variants 1.1
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><ins>+PortGroup compilers 1.0
</ins><span class="cx">
</span><ins>+compilers.choose fc f77 f90
+compilers.setup require_fortran
+
</ins><span class="cx"> name octave
</span><span class="cx">
</span><span class="cx"> version 3.6.4
</span><span class="lines">@@ -134,93 +138,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-set gcc_default "4.8"
-
-# create g95 variant, with full conflicts of GCC versions
-
-set gcc_conflicts ""
-foreach ver ${gcc_versions} {
- set gcc_ver_no_dot gcc[join [split ${ver} "."] ""]
- set gcc_conflicts "${gcc_conflicts} ${gcc_ver_no_dot}"
</del><ins>+if {![fortran_variant_isset]} {
+ default_variants-append +gcc48
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-eval [subst {
- variant g95 conflicts ${gcc_conflicts} requires accelerate \
- description "Build with MacPorts g95 as the Fortran Compiler" {
- depends_lib-append port:g95
- configure.fc ${prefix}/bin/g95
- configure.f77 ${prefix}/bin/g95
- configure.f90 ${prefix}/bin/g95
- }
-}]
-
-# create GCC variants, with partial conflicts of other GCC versions
-
-foreach ver1 ${gcc_versions} {
-
- set gcc_ver1_no_dot gcc[join [split ${ver1} "."] ""]
-
- set gcc_conflicts "conflicts g95"
- foreach ver2 ${gcc_versions} {
- if {${ver1} eq ${ver2}} {
- continue
- }
- set gcc_ver2_no_dot gcc[join [split ${ver2} "."] ""]
- set gcc_conflicts "${gcc_conflicts} ${gcc_ver2_no_dot}"
- }
-
- eval [subst {
- variant ${gcc_ver1_no_dot} ${gcc_conflicts} \
- description "Build with the MacPorts ${gcc_ver1_no_dot} as the Fortran Compiler" {
- depends_lib-append port:${gcc_ver1_no_dot}
- configure.fc ${prefix}/bin/gfortran-mp-${ver1}
- configure.f77 ${prefix}/bin/gfortran-mp-${ver1}
- configure.f90 ${prefix}/bin/gfortran-mp-${ver1}
- }
- }]
-}
-
-# check for setting the default variant
-
-set var_selection ""
-if {[variant_isset g95]} {
- set var_selection "g95"
-} else {
- foreach ver ${gcc_versions} {
- set gcc_ver_no_dot gcc[join [split ${ver} "."] ""]
- if {[variant_isset ${gcc_ver_no_dot}]} {
- set var_selection "${gcc_ver_no_dot}"
- }
- }
-}
-
-# check for need for default variant
-
-set gcc_default_no_dot gcc[join [split ${gcc_default} "."] ""]
-if {"${var_selection}" eq ""} {
- default_variants +${gcc_default_no_dot}
-}
-
-# check if the user disabled just the default variant
-
-set var_selection ""
-if {[variant_isset g95]} {
- set var_selection "g95"
-} else {
- foreach ver ${gcc_versions} {
- set gcc_ver_no_dot gcc[join [split ${ver} "."] ""]
- if {[variant_isset ${gcc_ver_no_dot}]} {
- set var_selection "${gcc_ver_no_dot}"
- }
- }
-}
-
-if {"${var_selection}" eq ""} {
- ui_error "\n\nYou cannot use the -${gcc_default_no_dot} variant alone; a Fortran compiler is required.\n"
- return -code error "Invalid variant selection"
-}
-
</del><span class="cx"> # atlas does not work with g95, so always conflict with it
</span><span class="cx">
</span><span class="cx"> variant atlas description {use BLAS from MacPorts' atlas port} \
</span></span></pre>
</div>
</div>
</body>
</html>