Ticket #34369: Portfile.diff2

Index: Portfile
===================================================================
--- Portfile    (revision 93111)
+++ Portfile    (working copy)
@@ -5,7 +5,7 @@
 
 name          arpack
 version       3.1.0
-revision      1
+revision      2
 categories    math
 license       BSD
 platforms     darwin
@@ -25,14 +25,12 @@
 
 # openmpi does not have a universal variant
 universal_variant   no
-depends_build port:openmpi
 configure.args-append --enable-mpi home=${worksrcpath}
 if { ${build_arch}=="x86_64" || ${build_arch}=="ppc64" } {
     configure.args-append FFLAGS='-O2 -m64' LDFLAGS='-L${prefix}/lib'
 } else {
     configure.args-append FFLAGS='-O2 -m32' LDFLAGS='-L${prefix}/lib'
 }
-configure.env-append MPIF77=${prefix}/bin/openmpif77
 
 pre-fetch { 
        if {"darwin" == ${os.platform} && ${os.major} < 9} { 
@@ -49,6 +47,22 @@
     set universal_archs_supported "ppc ppc64"
 }
 
+variant openmpi description {build with OpenMPI} conflicts mpich2 {
+    depends_build port:openmpi
+    configure.env-append MPIF77=${prefix}/bin/openmpif77
+}
+
+variant mpich2 description {build with MPICH2} conflicts openmpi {
+    depends_build port:mpich2
+    configure.env-append MPIF77=${prefix}/bin/mpif77 
+    configure.args-append FFLAGS='-I${prefix}/include/mpich2'
+}
+
+if {![variant_isset mpich2]} {
+    default_variants +openmpi
+}
+
+
 variant gcc42 description {build with gfortran-mp-4.2} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 g95 universal {
        depends_build-append    port:gcc42
        configure.env-append F77=${prefix}/bin/gfortran-mp-4.2