[94726] trunk/dports/science/mpich2/Portfile

[eborisch at macports.org]

Revision: 94726
          https://trac.macports.org/changeset/94726
Author:   eborisch at macports.org
Date:     2012-06-27 12:11:15 -0700 (Wed, 27 Jun 2012)
Log Message:
-----------
mpich2: Fix paths in Fortran wrappers. Fixes #34983. Also adds gcc46 variant; removes system_gcc variant.

Modified Paths:
--------------
    trunk/dports/science/mpich2/Portfile

Modified: trunk/dports/science/mpich2/Portfile
===================================================================
--- trunk/dports/science/mpich2/Portfile	2012-06-27 18:55:15 UTC (rev 94725)
+++ trunk/dports/science/mpich2/Portfile	2012-06-27 19:11:15 UTC (rev 94726)
@@ -84,6 +84,16 @@
                                     ${destroot}${prefix}/bin/mpicc \
                                     ${destroot}${prefix}/etc/mpicxx.conf \
                                     ${destroot}${prefix}/etc/mpicc.conf
+    if {[ variant_isset gcc42 ] ||
+        [ variant_isset gcc43 ] ||
+        [ variant_isset gcc44 ] ||
+        [ variant_isset gcc45 ] ||
+        [ variant_isset gcc46 ]} {
+        reinplace -E "s|${destroot}||g" ${destroot}${prefix}/bin/mpif77 \
+                                        ${destroot}${prefix}/bin/mpif90 \
+                                        ${destroot}${prefix}/etc/mpif77.conf \
+                                        ${destroot}${prefix}/etc/mpif90.conf
+    }
 
     file delete ${destroot}${prefix}/sbin/mpeuninstall
 }
@@ -91,57 +101,58 @@
 # As MPICH creates compiler wrappers, there are lots of
 # variants for what compiler the user would like to wrap.
 
+variant gcc46 description {
+    Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc46
+} conflicts gcc42 gcc43 gcc44 gcc45 llvm clang {
+    depends_lib-append      port:gcc46
+    configure.compiler      macports-gcc-4.6
+}
+
 variant gcc45 description {
     Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc45
-} conflicts gcc42 gcc43 gcc44 system_gcc llvm clang {
+} conflicts gcc42 gcc43 gcc44 gcc46 llvm clang {
     depends_lib-append      port:gcc45
     configure.compiler      macports-gcc-4.5
 }
 
 variant gcc44 description {
     Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc44
-} conflicts gcc42 gcc43 gcc45 system_gcc llvm clang {
+} conflicts gcc42 gcc43 gcc45 gcc46 llvm clang {
     depends_lib-append      port:gcc44
     configure.compiler      macports-gcc-4.4
 }
 
 variant gcc43 description {
     Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc43
-} conflicts gcc42 gcc44 gcc45 system_gcc llvm clang {
+} conflicts gcc42 gcc44 gcc45 gcc46 llvm clang {
     depends_lib-append      port:gcc43
     configure.compiler      macports-gcc-4.3
 }
 
 variant gcc42 description {
     Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc42
-} conflicts gcc43 gcc44 gcc45 system_gcc llvm clang {
+} conflicts gcc43 gcc44 gcc45 gcc46 llvm clang {
     depends_lib-append      port:gcc42
     configure.compiler      macports-gcc-4.2
 }
-
 if {[ variant_isset gcc42 ] ||
     [ variant_isset gcc43 ] ||
     [ variant_isset gcc44 ] ||
-    [ variant_isset gcc45 ]} {
+    [ variant_isset gcc45 ] ||
+    [ variant_isset gcc46 ]} {
     configure.args-append   --enable-f77 --enable-fc
     configure.args-delete   --disable-f77 --disable-fc
 }
 
-variant system_gcc description {
-    Use system gcc (no Fortran)
-} conflicts gcc42 gcc43 gcc44 gcc45 llvm clang {
-    configure.compiler      gcc-4.2
-}
-
 variant llvm description {
     Use llvm-gcc
-} conflicts gcc42 gcc43 gcc44 gcc45 system_gcc clang {
+} conflicts gcc42 gcc43 gcc44 gcc45 gcc46 clang {
     configure.compiler      llvm-gcc-4.2
 }
 
 variant clang description {
     Use clang
-} conflicts gcc42 gcc43 gcc44 gcc45 system_gcc llvm {
+} conflicts gcc42 gcc43 gcc44 gcc45 gcc46 llvm {
     configure.compiler      clang
     configure.cxx           clang++
     configure.cflags-append -w
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120627/1a8b6ee1/attachment-0001.html>