Ticket #39352: Portfile-arpack.diff

Portfile

@@ -13 +13 @@
 description             Package for solving large scale eigenvalue problems
 long_description  \
     ARPACK is a collection of Fortran77 subroutines designed to solve large \
-    scale eigenvalue problems.
+    scale eigenvalue problems. Parallel ARPACK (PARPACK) is included if built with an MPI variant.
 homepage            http://forge.scilab.org/index.php/p/arpack-ng
 master_sites        ${homepage}/downloads/497
 distfiles           get
@@ -23 +23 @@
                     rmd160  2c55eca384cc0a1aebacdef527f88426932bf57b
 worksrcdir          ${name}-ng_${version}
 
-# openmpi does not have a universal variant
-universal_variant   no
-configure.args-append --enable-mpi home=${worksrcpath}
+configure.args-append home=${worksrcpath}
+# LDFLAGS needs to be defined here to avoid it having also a "-arch" option, considered illegal by gfortran
 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'
 }
 
-pre-fetch { 
-        if {"darwin" == ${os.platform} && ${os.major} < 9} { 
-                ui_error "${name} ${version} requires Mac OS X 10.5 or greater" 
-                return -code error "incompatible Mac OS X version" 
-        } 
+pre-fetch {
+        if {"darwin" == ${os.platform} && ${os.major} < 9} {
+                ui_error "${name} ${version} requires Mac OS X 10.5 or greater"
+                return -code error "incompatible Mac OS X version"
+        }
 }
 
-
 # Fortran compilers can not cross-compile
 if { ${os.arch}=="i386" } {
     set universal_archs_supported "i386 x86_64"
@@ -47 +45 @@
     set universal_archs_supported "ppc ppc64"
 }
 
-variant openmpi description {build with OpenMPI} conflicts mpich {
-    depends_lib-append port:openmpi
-    configure.env-append MPIF77=${prefix}/bin/openmpif77
+variant openmpi description {build PARPACK, with OpenMPI} conflicts mpich universal {
+    depends_lib-append    port:openmpi
+    configure.args-append --enable-mpi
+    configure.env-append  MPIF77=${prefix}/bin/openmpif77
 }
 
-variant mpich description {build with MPICH} conflicts openmpi {
-    depends_lib-append path:bin/mpicc:mpich
-    configure.env-append MPIF77=${prefix}/bin/mpif77
+variant mpich description {build PARPACK, with MPICH} conflicts openmpi {
+    depends_lib-append    path:bin/mpif77:mpich
+    configure.args-append --enable-mpi
+    configure.env-append  MPIF77=${prefix}/bin/mpif77
 }
 
 if {![variant_isset mpich]} {
@@ -95 +95 @@
         default_variants      +gcc47
 }
 
-# warning: this is ignored if atlas is installed
 variant accelerate conflicts atlas description {build with Accelerate framework} {
-    configure.args-append --with-lapack=/usr/lib/liblapack.dylib
+    configure.args-append --with-blas=/usr/lib/libblas.dylib --with-lapack=/usr/lib/liblapack.dylib
     patchfiles-append patch-ARPACK-cdot-and-zdot.diff
     if {[variant_isset openmpi] || [variant_isset mpich]} {
         patchfiles-append patch-PARPACK-cdot-and-zdot.diff
@@ -106 +105 @@
 
 variant atlas description {build with atlas} {
     depends_lib-append port:atlas
-    patchfiles-append patch-configure-atlas.diff
-    configure.args-append --with-lapack=${prefix}/lib/libtatlas.dylib
+    configure.args-append --with-blas=${prefix}/lib/libsatlas.dylib
 }
 
 if {![variant_isset atlas]} {