Revision
148850
Author
dstrubbe@macports.org
Date
2016-05-19 18:10:56 -0700 (Thu, 19 May 2016)

Log Message

arpack: Use new linear_algebra port group.

Modified Paths

Diff

Modified: trunk/dports/math/arpack/Portfile (148849 => 148850)


--- trunk/dports/math/arpack/Portfile	2016-05-20 01:03:34 UTC (rev 148849)
+++ trunk/dports/math/arpack/Portfile	2016-05-20 01:10:56 UTC (rev 148850)
@@ -2,10 +2,10 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           active_variants 1.1
 PortGroup           muniversal 1.0
 PortGroup           mpi 1.0
 PortGroup           github 1.0
+PortGroup           linear_algebra 1.0
 
 github.setup        opencollab arpack-ng 3.3.0
 name                arpack
@@ -41,6 +41,8 @@
 configure.args-append LDFLAGS=''
 
 pre-configure {
+    configure.args-append --with-blas="-L${prefix}/lib ${linalglib}"
+
     if {${os.platform} eq "darwin" && ${os.major} < 9} {
         ui_error "${name} ${version} requires Mac OS X 10.5 or greater"
         return -code error "incompatible Mac OS X version"
@@ -61,31 +63,6 @@
     set universal_archs_supported "ppc ppc64"
 }
 
-variant accelerate conflicts atlas openblas description {build with Accelerate framework} {
-    depends_lib-append port:vecLibFort
-    configure.args-append --with-blas="-L${prefix}/lib -lvecLibFort"
-}
-
-variant atlas conflicts accelerate openblas description {build with atlas} {
-    depends_lib-append port:atlas
-    configure.args-append --with-blas="-L${prefix}/lib -lsatlas"
-}
-
-variant openblas conflicts accelerate atlas description {build with openblas} {
-    require_active_variants openblas lapack
-    depends_lib-append path:lib/libopenblas.dylib:OpenBLAS
-    configure.args-append --with-blas="-L${prefix}/lib -lopenblas"
-}
-
-if {![variant_isset atlas] && ![variant_isset openblas]} {
-    default_variants +accelerate
-}
-
-if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
-    ui_error "\n\nYou must select either the +accelerate, +atlas, or +openblas variant.\n"
-    return -code error "Invalid variant selection"
-}
-
 post-destroot {
     reinplace "s|/usr|${prefix}|g" ${destroot}${prefix}/lib/pkgconfig/arpack.pc
 }