<!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>[116367] trunk/dports/math/fftw-3/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/116367">116367</a></dd>
<dt>Author</dt> <dd>sean@macports.org</dd>
<dt>Date</dt> <dd>2014-01-23 12:14:03 -0800 (Thu, 23 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>fftw-3: use mpi portgroup</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathfftw3Portfile">trunk/dports/math/fftw-3/Portfile</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathfftw3Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/fftw-3/Portfile (116366 => 116367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/fftw-3/Portfile        2014-01-23 20:13:59 UTC (rev 116366)
+++ trunk/dports/math/fftw-3/Portfile        2014-01-23 20:14:03 UTC (rev 116367)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</ins><span class="cx"> # $Id$
</span><span class="cx"> 
</span><span class="cx"> PortSystem      1.0
</span><span class="lines">@@ -3,8 +4,14 @@
</span><span class="cx"> PortGroup       muniversal 1.0
</span><span class="cx"> PortGroup       compiler_blacklist_versions 1.0
</span><ins>+PortGroup       mpi 1.0
</ins><span class="cx"> 
</span><ins>+# don't change configure.cc, etc. since we'll take care of that manually with
+# MPICC env var
+mpi.choose
+mpi.setup
+
</ins><span class="cx"> name            fftw-3
</span><span class="cx"> version         3.3.3
</span><del>-revision        5
</del><ins>+revision        6
</ins><span class="cx"> categories      math
</span><span class="cx"> license         GPL-2+
</span><span class="lines">@@ -56,26 +63,22 @@
</span><span class="cx">     -fomit-frame-pointer \
</span><span class="cx">     -fstrict-aliasing
</span><span class="cx"> 
</span><del>-if { [string match *clang* ${configure.compiler}] } {
-    set is_clang    1
-} else {
-    set is_clang    0
-}
-
-if { $is_clang == 1 } {
-    array set merger_configure_args {
-        ppc    &quot;--enable-fma&quot;
-        ppc64  &quot;--enable-fma&quot;
-        i386   &quot;--enable-sse2 --enable-avx&quot;
-        x86_64 &quot;--enable-sse2 --enable-avx&quot;
</del><ins>+pre-configure {
+    if { [avx_compiler_isset] == 1 } {
+        array set merger_configure_args {
+            ppc    &quot;--enable-fma&quot;
+            ppc64  &quot;--enable-fma&quot;
+            i386   &quot;--enable-sse2 --enable-avx&quot;
+            x86_64 &quot;--enable-sse2 --enable-avx&quot;
+        }
+    } else {
+        array set merger_configure_args {
+            ppc    &quot;--enable-fma&quot;
+            ppc64  &quot;--enable-fma&quot;
+            i386   &quot;--enable-sse2&quot;
+            x86_64 &quot;--enable-sse2&quot;
+        }
</ins><span class="cx">     }
</span><del>-} else {
-    array set merger_configure_args {
-        ppc    &quot;--enable-fma&quot;
-        ppc64  &quot;--enable-fma&quot;
-        i386   &quot;--enable-sse2&quot;
-        x86_64 &quot;--enable-sse2&quot;
-    }
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> test.run     yes
</span><span class="lines">@@ -84,12 +87,14 @@
</span><span class="cx"> use_parallel_build yes
</span><span class="cx"> 
</span><span class="cx"> platform i386 {
</span><del>-  if {![variant_isset universal]} {
-    configure.args-append --enable-sse2
-    if { $is_clang == 1 } {
-        configure.args-append --enable-avx
</del><ins>+    pre-configure {
+        if {![variant_isset universal]} {
+            configure.args-append --enable-sse2
+            if { [avx_compiler_isset] == 1 } {
+                configure.args-append --enable-avx
+            }
+        }
</ins><span class="cx">     }
</span><del>-  }
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> platform powerpc {
</span><span class="lines">@@ -101,38 +106,40 @@
</span><span class="cx"> subport fftw-3-single {
</span><span class="cx">     configure.args-append --enable-float
</span><span class="cx"> 
</span><del>-    if { $is_clang == 1 } {
-        array set merger_configure_args {
-            ppc    &quot;--enable-fma --enable-altivec&quot;
-            ppc64  &quot;--enable-fma --enable-altivec&quot;
-            i386   &quot;--enable-sse --enable-avx&quot;
-            x86_64 &quot;--enable-sse --enable-avx&quot;
-        }
-    } else {
-        array set merger_configure_args {
-            ppc    &quot;--enable-fma --enable-altivec&quot;
-            ppc64  &quot;--enable-fma --enable-altivec&quot;
-            i386   &quot;--enable-sse&quot;
-            x86_64 &quot;--enable-sse&quot;
-        }
-    }
-
</del><span class="cx">     depends_lib port:fftw-3
</span><span class="cx"> 
</span><del>-    platform i386 {
</del><ins>+    platform powerpc {
</ins><span class="cx">         if {![variant_isset universal]} {
</span><del>-            configure.args-delete --enable-sse2
-            configure.args-append --enable-sse
-            if { $is_clang == 1 } {
-                configure.args-append --enable-avx
-            }
</del><ins>+            configure.args-append --enable-altivec
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    platform powerpc {
-        if {![variant_isset universal]} {
-            configure.args-append --enable-altivec
</del><ins>+    pre-configure {
+        if { [avx_compiler_isset] == 1 } {
+            array set merger_configure_args {
+                ppc    &quot;--enable-fma --enable-altivec&quot;
+                ppc64  &quot;--enable-fma --enable-altivec&quot;
+                i386   &quot;--enable-sse --enable-avx&quot;
+                x86_64 &quot;--enable-sse --enable-avx&quot;
+            }
+        } else {
+            array set merger_configure_args {
+                ppc    &quot;--enable-fma --enable-altivec&quot;
+                ppc64  &quot;--enable-fma --enable-altivec&quot;
+                i386   &quot;--enable-sse&quot;
+                x86_64 &quot;--enable-sse&quot;
+            }
</ins><span class="cx">         }
</span><ins>+
+        platform i386 {
+            if {![variant_isset universal]} {
+                configure.args-delete --enable-sse2
+                configure.args-append --enable-sse
+                if { [avx_compiler_isset] == 1 } {
+                    configure.args-append --enable-avx
+                }
+            }
+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     post-destroot {
</span><span class="lines">@@ -150,7 +157,7 @@
</span><span class="cx">         file delete ${destroot}${prefix}/share/info/fftw3.info-4
</span><span class="cx">         file delete ${destroot}${prefix}/share/info/fftw3.info-5
</span><span class="cx"> 
</span><del>-        if {[variant_isset mpich] || [variant_isset openmpi]} {
</del><ins>+        if {[mpi_variant_isset]} {
</ins><span class="cx">           file delete ${destroot}${prefix}/include/fftw3-mpi.f03
</span><span class="cx">           file delete ${destroot}${prefix}/include/fftw3-mpi.h
</span><span class="cx">           file delete ${destroot}${prefix}/include/fftw3l-mpi.f03
</span><span class="lines">@@ -160,8 +167,11 @@
</span><span class="cx"> 
</span><span class="cx"> subport fftw-3-long {
</span><span class="cx">     configure.args-append --enable-long-double
</span><del>-    if { $is_clang == 1 } {
-        configure.args-delete --enable-avx
</del><ins>+
+    pre-configure {
+        if { [avx_compiler_isset] == 1 } {
+            configure.args-delete --enable-avx
+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     array set merger_configure_args {
</span><span class="lines">@@ -200,7 +210,7 @@
</span><span class="cx">         file delete ${destroot}${prefix}/share/info/fftw3.info-4
</span><span class="cx">         file delete ${destroot}${prefix}/share/info/fftw3.info-5
</span><span class="cx"> 
</span><del>-        if {[variant_isset mpich] || [variant_isset openmpi]} {
</del><ins>+        if {[mpi_variant_isset]} {
</ins><span class="cx">           file delete ${destroot}${prefix}/include/fftw3-mpi.f03
</span><span class="cx">           file delete ${destroot}${prefix}/include/fftw3-mpi.h
</span><span class="cx">           file delete ${destroot}${prefix}/include/fftw3l-mpi.f03
</span><span class="lines">@@ -216,79 +226,17 @@
</span><span class="cx">     lappend merger_configure_args(x86_64)  &quot;--disable-fortran&quot;
</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 g95_conflicts {}
-
-foreach ver ${gcc_versions} {
-    set ver_no_dot [join [split ${ver} &quot;.&quot;] &quot;&quot;]
-
-    set variant_line {variant gcc${ver_no_dot} description &quot;build with gfortran from gcc${ver_no_dot}&quot; conflicts g95}
-
-    foreach over ${gcc_versions} {
-        if {${ver} == ${over}} {
-            continue
-        }
-
-        set over_no_dot [join [split ${over} &quot;.&quot;] &quot;&quot;]
-        append variant_line &quot; conflicts gcc${over_no_dot}&quot;
-    }
-    append variant_line { {}}
-
-    eval $variant_line
-
-    append g95_conflicts &quot; conflicts gcc${ver_no_dot}&quot;
</del><ins>+if {[fortran_variant_isset]} {
+    configure.args-delete --disable-fortran
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
-
-foreach ver ${gcc_versions} {
-    set ver_no_dot [join [split ${ver} &quot;.&quot;] &quot;&quot;]
-
-    if {[variant_isset gcc${ver_no_dot}]} {
-        depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
-        depends_build-append port:gcc${ver_no_dot}
-
-        configure.args-delete --disable-fortran
-
-        configure.fc  ${prefix}/bin/gfortran-mp-${ver}
-        configure.f77 ${prefix}/bin/gfortran-mp-${ver}
-        configure.f90 ${prefix}/bin/gfortran-mp-${ver}
</del><ins>+pre-configure {
+    if {[mpi_variant_isset]} {
+        configure.env           MPICC=${mpi.cc}
+        configure.args-append   --enable-mpi
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-if {[variant_isset g95]} {
-    depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
-    depends_build-append port:g95
-
-    configure.args-delete --disable-fortran
-
-    configure.fc ${prefix}/bin/g95
-    configure.f77 ${prefix}/bin/g95
-    configure.f90 ${prefix}/bin/g95
-
-    if {${build_arch} eq &quot;i386&quot;} {
-        lappend merger_configure_args(x86_64)  &quot;--disable-fortran&quot;
-    } elseif {${build_arch} eq &quot;x86_64&quot;} {
-        lappend merger_configure_args(i386)    &quot;--disable-fortran&quot;
-    } else {
-        lappend merger_configure_args(ppc64)   &quot;--disable-fortran&quot;
-    }
-}
-
-variant openmpi description {compile FFTW MPI library with OpenMPI} conflicts mpich {
-    depends_lib-append      port:openmpi
-    configure.env           MPICC=${prefix}/lib/openmpi/bin/mpicc
-    configure.args-append   --enable-mpi
-}
-
-variant mpich description {compile FFTW MPI library with MPICH} conflicts openmpi {
-    depends_lib-append      path:bin/mpicc-mp:mpich-default
-    configure.env           MPICC=${prefix}/bin/mpicc-mp
-    configure.args-append   --enable-mpi
-}
-
-variant mpich2 requires mpich description {Legacy compatibility variant} {}
-
</del><span class="cx"> if {${name} == ${subport}} {
</span><span class="cx">     livecheck.type  regex
</span><span class="cx">     livecheck.url   ${homepage}
</span></span></pre>
</div>
</div>

</body>
</html>