[148834] trunk/dports/science/abinit/Portfile

[dstrubbe at macports.org]

Revision: 148834
          https://trac.macports.org/changeset/148834
Author:   dstrubbe at macports.org
Date:     2016-05-19 12:10:03 -0700 (Thu, 19 May 2016)
Log Message:
-----------
abinit: Use new linear_algebra port group.

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

Modified: trunk/dports/science/abinit/Portfile
===================================================================
--- trunk/dports/science/abinit/Portfile	2016-05-19 18:59:26 UTC (rev 148833)
+++ trunk/dports/science/abinit/Portfile	2016-05-19 19:10:03 UTC (rev 148834)
@@ -3,6 +3,7 @@
 
 PortSystem          1.0
 PortGroup           mpi 1.0
+PortGroup           linear_algebra 1.0
 
 name                abinit
 version             7.10.5
@@ -111,25 +112,15 @@
     set linalg-flavor "none"
     if { [variant_isset atlas] } {
         set linalg-flavor atlas
-        if {[variant_isset threads]} {
-            set linalg_libs    -ltatlas
-        } else {
-            set linalg_libs    -lsatlas
-        }
     } else {
         set linalg-flavor netlib
-        if { [variant_isset accelerate] } {
-            set linalg_libs        -lvecLibFort
-        } elseif { [variant_isset openblas] } {
-            set linalg_libs        -lopenblas
-        }
     }
     if { [variant_isset scalapack] } {
         set linalg-flavor ${linalg-flavor}+scalapack
-        set linalg_libs        "${linalg_libs} -lscalapack"
+        set linalglib        "${linalglib} -lscalapack"
     }
     configure.args-append   --with-linalg-flavor="${linalg-flavor}"
-    configure.args-append   --with-linalg-libs="${linalg_libs}"
+    configure.args-append   --with-linalg-libs="${linalglib}"
 }
 
 # install binaries and pkgconfig but not the very large number of test files
@@ -214,26 +205,6 @@
     test.target-append      libxc
 }
 
-#3 possibilities for blas/lapack + ScaLapack
-#-------------------------------------------
-if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset openblas]} {
-    default_variants-append +accelerate
-}
-
-variant accelerate conflicts atlas openblas description {Build with linear algebra from built-in Accelerate framework} {
-    depends_lib-append      port:vecLibFort
-}
-
-variant atlas conflicts accelerate openblas description {Build with linear algebra from ATLAS} {
-    depends_lib-append      port:atlas
-}
-
-variant openblas conflicts accelerate atlas description {Build with linear algebra from OpenBLAS} {
-    # allow OpenBLAS-devel too
-    depends_lib-append      path:lib/libopenblas.dylib:OpenBLAS
-    require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
-}
-
 variant scalapack description {Build with ScaLAPACK for parallel linear algebra} {
     depends_lib-append      port:scalapack
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160519/574549e0/attachment.html>