<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[31331] trunk/dports/python</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/macports/changeset/31331">31331</a></dd>
<dt>Author</dt> <dd>erickt@macports.org</dd>
<dt>Date</dt> <dd>2007-11-20 00:34:33 -0800 (Tue, 20 Nov 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>fix install bug for scipy and numpy</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpynumpyPortfile">trunk/dports/python/py-numpy/Portfile</a></li>
<li><a href="#trunkdportspythonpyscipyPortfile">trunk/dports/python/py-scipy/Portfile</a></li>
<li><a href="#trunkdportspythonpy25numpyPortfile">trunk/dports/python/py25-numpy/Portfile</a></li>
<li><a href="#trunkdportspythonpy25scipyPortfile">trunk/dports/python/py25-scipy/Portfile</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpynumpyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-numpy/Portfile (31330 => 31331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-numpy/Portfile        2007-11-20 05:49:37 UTC (rev 31330)
+++ trunk/dports/python/py-numpy/Portfile        2007-11-20 08:34:33 UTC (rev 31331)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> 
</span><span class="cx"> name                    py-numpy
</span><span class="cx"> version                 1.0.4
</span><del>-revision                1
</del><ins>+revision                3
</ins><span class="cx"> categories              python
</span><span class="cx"> platforms               darwin
</span><span class="cx"> maintainers             erickt@macports.org
</span><span class="lines">@@ -22,26 +22,27 @@
</span><span class="cx"> 
</span><span class="cx"> depends_lib             lib:fftw:fftw-3
</span><span class="cx"> 
</span><del>-variant g95 conflicts gcc42 gcc43 description &quot;Use g95 as fortran compiler&quot; {
-  depends_lib-append    port:g95
</del><ins>+variant g95 conflicts gcc42 gcc43 description &quot;Use g95 as fortran compiler&quot; { 
+  depends_lib-append    port:g95 
+  set fc_options        &quot;config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95&quot;
+  build.cmd-append      ${fc_options} 
+  destroot.cmd-append   ${fc_options} 
+} 

+variant gcc42 conflicts g95 gcc43 description &quot;Use gfortran as fortran compiler&quot; { 
+  depends_lib-append    port:gcc42 
+  set fc_options        &quot;config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2&quot;
+  build.cmd-append      ${fc_options} 
+  destroot.cmd-append   ${fc_options} 
+} 

+variant gcc43 conflicts g95 gcc42 description &quot;Use gfortran as fortran compiler&quot; { 
+  depends_lib-append    port:gcc43 
+  set fc_options        &quot;config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3&quot;
+  build.cmd-append      ${fc_options} 
+  destroot.cmd-append   ${fc_options} 
+} 

+if { ![variant_isset g95] &amp;&amp; ![variant_isset gcc42] &amp;&amp; ![variant_isset gcc43] } { 
+  default_variants      +g95 
</ins><span class="cx"> }
</span><del>-
-variant gcc42 conflicts g95 gcc43 description &quot;Use gfortran as fortran compiler&quot; {
-  depends_lib-append    port:gcc42
-  build.cmd-append      config_fc \
-                        --fcompiler gnu95 \
-                        --f77exec ${prefix}/bin/gfortran-mp-4.2 \
-                        --f90exec ${prefix}/bin/gfortran-mp-4.2
-}
-
-variant gcc43 conflicts g95 gcc42 description &quot;Use gfortran as fortran compiler&quot; {
-  depends_lib-append    port:gcc43
-  build.cmd-append      config_fc \
-                        --fcompiler gnu95 \
-                        --f77exec ${prefix}/bin/gfortran-mp-4.3 \
-                        --f90exec ${prefix}/bin/gfortran-mp-4.3
-}
-
-if { ![variant_isset g95] &amp;&amp; ![variant_isset gcc42] &amp;&amp; ![variant_isset gcc43] } {
-  default_variants      +g95
-}
</del></span></pre></div>
<a id="trunkdportspythonpyscipyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-scipy/Portfile (31330 => 31331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-scipy/Portfile        2007-11-20 05:49:37 UTC (rev 31330)
+++ trunk/dports/python/py-scipy/Portfile        2007-11-20 08:34:33 UTC (rev 31331)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> 
</span><span class="cx"> name                    py-scipy
</span><span class="cx"> version                 0.6.0
</span><ins>+revision                1
</ins><span class="cx"> categories              python
</span><span class="cx"> platforms               darwin
</span><span class="cx"> maintainers             erickt@macports.org
</span><span class="lines">@@ -25,3 +26,28 @@
</span><span class="cx"> worksrcdir              ${distname}
</span><span class="cx"> 
</span><span class="cx"> build.env               CCFLAGS=&quot;-I${prefix}/include -L${prefix}/lib&quot;
</span><ins>+
+variant g95 conflicts gcc42 gcc43 description &quot;Use g95 as fortran compiler&quot; { 
+  depends_lib-append    port:g95 
+  set fc_options        &quot;config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95&quot;
+  build.cmd-append      ${fc_options} 
+  destroot.cmd-append   ${fc_options} 
+} 

+variant gcc42 conflicts g95 gcc43 description &quot;Use gfortran as fortran compiler&quot; { 
+  depends_lib-append    port:gcc42 
+  set fc_options        &quot;config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2&quot;
+  build.cmd-append      ${fc_options} 
+  destroot.cmd-append   ${fc_options} 
+} 

+variant gcc43 conflicts g95 gcc42 description &quot;Use gfortran as fortran compiler&quot; { 
+  depends_lib-append    port:gcc43 
+  set fc_options        &quot;config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3&quot;
+  build.cmd-append      ${fc_options} 
+  destroot.cmd-append   ${fc_options} 
+} 

+if { ![variant_isset g95] &amp;&amp; ![variant_isset gcc42] &amp;&amp; ![variant_isset gcc43] } { 
+  default_variants      +g95 
+}
</ins></span></pre></div>
<a id="trunkdportspythonpy25numpyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py25-numpy/Portfile (31330 => 31331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py25-numpy/Portfile        2007-11-20 05:49:37 UTC (rev 31330)
+++ trunk/dports/python/py25-numpy/Portfile        2007-11-20 08:34:33 UTC (rev 31331)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> 
</span><span class="cx"> name                    py25-numpy
</span><span class="cx"> version                 1.0.4
</span><del>-revision                1
</del><ins>+revision                3
</ins><span class="cx"> categories              python
</span><span class="cx"> platforms               darwin
</span><span class="cx"> maintainers             erickt@macports.org
</span><span class="lines">@@ -23,30 +23,27 @@
</span><span class="cx"> depends_lib             lib:fftw:fftw-3 \
</span><span class="cx">                         port:py25-hashlib
</span><span class="cx"> 
</span><del>-variant g95 conflicts gcc42 gcc43 description &quot;Use g95 as fortran compiler&quot; {
-  depends_lib-append    port:g95
-  build.cmd-append      config_fc \
-                        --fcompiler gnu95 \
-                        --f77exec ${prefix}/bin/g95 \
-                        --f90exec ${prefix}/bin/g95
</del><ins>+variant g95 conflicts gcc42 gcc43 description &quot;Use g95 as fortran compiler&quot; { 
+  depends_lib-append    port:g95 
+  set fc_options        &quot;config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95&quot;
+  build.cmd-append      ${fc_options} 
+  destroot.cmd-append   ${fc_options} 
+} 

+variant gcc42 conflicts g95 gcc43 description &quot;Use gfortran as fortran compiler&quot; { 
+  depends_lib-append    port:gcc42 
+  set fc_options        &quot;config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2&quot;
+  build.cmd-append      ${fc_options} 
+  destroot.cmd-append   ${fc_options} 
+} 

+variant gcc43 conflicts g95 gcc42 description &quot;Use gfortran as fortran compiler&quot; { 
+  depends_lib-append    port:gcc43 
+  set fc_options        &quot;config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3&quot;
+  build.cmd-append      ${fc_options} 
+  destroot.cmd-append   ${fc_options} 
+} 

+if { ![variant_isset g95] &amp;&amp; ![variant_isset gcc42] &amp;&amp; ![variant_isset gcc43] } { 
+  default_variants      +g95 
</ins><span class="cx"> }
</span><del>-
-variant gcc42 conflicts g95 gcc43 description &quot;Use gfortran as fortran compiler&quot; {
-  depends_lib-append    port:gcc42
-  build.cmd-append      config_fc \
-                        --fcompiler gnu95 \
-                        --f77exec ${prefix}/bin/gfortran-mp-4.2 \
-                        --f90exec ${prefix}/bin/gfortran-mp-4.2
-}
-
-variant gcc43 conflicts g95 gcc42 description &quot;Use gfortran as fortran compiler&quot; {
-  depends_lib-append    port:gcc43
-  build.cmd-append      config_fc \
-                        --fcompiler gnu95 \
-                        --f77exec ${prefix}/bin/gfortran-mp-4.3 \
-                        --f90exec ${prefix}/bin/gfortran-mp-4.3
-}
-
-if { ![variant_isset g95] &amp;&amp; ![variant_isset gcc42] &amp;&amp; ![variant_isset gcc43] } {
-  default_variants      +g95
-}
</del></span></pre></div>
<a id="trunkdportspythonpy25scipyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py25-scipy/Portfile (31330 => 31331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py25-scipy/Portfile        2007-11-20 05:49:37 UTC (rev 31330)
+++ trunk/dports/python/py25-scipy/Portfile        2007-11-20 08:34:33 UTC (rev 31331)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> 
</span><span class="cx"> name                    py25-scipy
</span><span class="cx"> version                 0.6.0
</span><ins>+revision                1
</ins><span class="cx"> categories              python
</span><span class="cx"> platforms               darwin
</span><span class="cx"> maintainers             erickt@macports.org
</span><span class="lines">@@ -25,3 +26,28 @@
</span><span class="cx"> worksrcdir              ${distname}
</span><span class="cx"> 
</span><span class="cx"> build.env               CCFLAGS=&quot;-I${prefix}/include -L${prefix}/lib&quot;
</span><ins>+
+variant g95 conflicts gcc42 gcc43 description &quot;Use g95 as fortran compiler&quot; { 
+  depends_lib-append    port:g95 
+  set fc_options        &quot;config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95&quot;
+  build.cmd-append      ${fc_options} 
+  destroot.cmd-append   ${fc_options} 
+} 

+variant gcc42 conflicts g95 gcc43 description &quot;Use gfortran as fortran compiler&quot; { 
+  depends_lib-append    port:gcc42 
+  set fc_options        &quot;config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2&quot;
+  build.cmd-append      ${fc_options} 
+  destroot.cmd-append   ${fc_options} 
+} 

+variant gcc43 conflicts g95 gcc42 description &quot;Use gfortran as fortran compiler&quot; { 
+  depends_lib-append    port:gcc43 
+  set fc_options        &quot;config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3&quot;
+  build.cmd-append      ${fc_options} 
+  destroot.cmd-append   ${fc_options} 
+} 

+if { ![variant_isset g95] &amp;&amp; ![variant_isset gcc42] &amp;&amp; ![variant_isset gcc43] } { 
+  default_variants      +g95 
+}
</ins></span></pre>
</div>
</div>

</body>
</html>