Ticket #35457: Portfile.diff

Portfile

@@ -62 +62 @@
 }
 
 
-variant threadsafe description {Enable threadsafety (experimental and un-supported, disables cxx support)} conflicts openmpi {
+variant threadsafe description {Enable threadsafety (experimental and un-supported, disables cxx support)} conflicts openmpi mpich2 {
     configure.args-delete       --disable-threadsafe --enable-cxx
     configure.args-append       --enable-threadsafe --disable-cxx
 }
 
 # openmpi conflicts with universal because there is no universal variant for
 # the openmpi port at the moment
-variant openmpi description {Enable Parallel HDF5} conflicts threadsafe universal {
+variant openmpi description {Enable Parallel HDF5 with openmpi} conflicts threadsafe universal mpich2 {
     depends_lib-append          port:openmpi
     configure.cc                ${prefix}/bin/openmpicc
     configure.args-delete       --disable-parallel --enable-cxx
@@ -77 +77 @@
 }
 
 
+variant mpich2 description {Enable Parallel HDF5 with mpich2} conflicts threadsafe universal openmpi {
+    depends_lib-append          port:mpich2
+    configure.cc                ${prefix}/bin/mpicc
+#    configure.args-delete       --disable-parallel --enable-cxx
+#    configure.args-append       --enable-parallel --disable-cxx
+    configure.args-delete       --disable-parallel
+    configure.args-append       --enable-parallel --enable-unsupported
+    if { [variant_isset gcc44] || [variant_isset gcc45] } {
+        configure.fc                ${prefix}/bin/mpif90
+    }
+}
+
 variant gcc44 description {Enable Fortran bindings (gfortran 4.4)} conflicts threadsafe universal gcc45 gcc46 {
     depends_lib-append          port:gcc44 
+    configure.compiler      macports-gcc-4.4
     configure.fc                ${prefix}/bin/gfortran-mp-4.4 
     if { [variant_isset openmpi] } {
         configure.fcflags-append    -I${prefix}/include/openmpi -L${prefix}/lib -lmpi_f90 -lmpi_f77 -lmpi
     }
+    if { [variant_isset mpich2] } {
+        configure.fcflags-append    -I${prefix}/include -L${prefix}/lib
+        configure.fc    mpif90
+        configure.cc    mpicc
+        configure.cxx   mpicxx
+    }
     configure.args-delete       --disable-fortran
     configure.args-append       --enable-fortran 
     configure.post_args LDFLAGS="-L${prefix}/lib"
@@ -90 +109 @@
 
 variant gcc45 description {Enable Fortran bindings (gfortran 4.5)} conflicts threadsafe universal gcc44 gcc46 {
     depends_lib-append          port:gcc45 
+    configure.compiler      macports-gcc-4.5
     configure.fc                ${prefix}/bin/gfortran-mp-4.5 
     if { [variant_isset openmpi] } {
         configure.fcflags-append    -I${prefix}/include/openmpi -L${prefix}/lib -lmpi_f90 -lmpi_f77 -lmpi
     }
+    if { [variant_isset mpich2] } {
+        configure.fcflags-append    -I${prefix}/include -L${prefix}/lib
+        configure.fc    mpif90
+        configure.cc    mpicc
+        configure.cxx   mpicxx
+    }
     configure.args-delete       --disable-fortran
     configure.args-append       --enable-fortran 
     configure.post_args LDFLAGS="-L${prefix}/lib"
@@ -101 +127 @@
 
 variant gcc46 description {Enable Fortran bindings (gfortran 4.6)} conflicts threadsafe universal gcc44 gcc45 {
     depends_lib-append          port:gcc46 
+    configure.compiler      macports-gcc-4.6
     configure.fc                ${prefix}/bin/gfortran-mp-4.6 
     if { [variant_isset openmpi] } {
         configure.fcflags-append    -I${prefix}/include/openmpi -L${prefix}/lib -lmpi_f90 -lmpi_f77 -lmpi
     }
+    if { [variant_isset mpich2] } {
+        configure.fcflags-append    -I${prefix}/include -L${prefix}/lib
+        configure.fc    mpif90
+        configure.cc    mpicc
+        configure.cxx   mpicxx
+    }
     configure.args-delete       --disable-fortran
     configure.args-append       --enable-fortran 
     configure.post_args LDFLAGS="-L${prefix}/lib"