Modified: trunk/dports/science/hpl/Portfile (148843 => 148844)

--- trunk/dports/science/hpl/Portfile	2016-05-19 22:02:38 UTC (rev 148843)
+++ trunk/dports/science/hpl/Portfile	2016-05-19 22:03:00 UTC (rev 148844)
@@ -3,10 +3,11 @@
 
 PortSystem          1.0
 PortGroup           mpi 1.0
+PortGroup           linear_algebra 1.0
 
 name                hpl
-version             2.1
-revision            1
+version             2.2
+revision            0
 categories          science
 platforms           darwin
 license             BSD
@@ -22,10 +23,11 @@
 homepage            http://www.netlib.org/benchmark/hpl
 master_sites        ${homepage}
 
-checksums           rmd160  4d4a981e16ca12d52c31d5f5c9557bed01616081 \
-                    sha156  460f7f36cc97a1a1fcc60e43d5833e6efb0aa03c
+checksums           rmd160  b25fc91dcbd82f43b6a149af9b4e2c5cd0f60c3e \
+                    sha156  ac7534163a09e21a5fa763e4e16dfc119bc84043f6e6a807aba666518f8df440
 
 mpi.setup           require -fortran
+linalg.setup        blas_only
 
 #variant threads?
 
@@ -51,12 +53,8 @@
     xinstall ${worksrcpath}/TUNING ${destroot}${prefix}/share/hpl/
 }
 
-if {![variant_isset atlas] && ![variant_isset openblas]} {
-    default_variants-append +accelerate
-}
-
 pre-build {
-    build.args-append      CC=${mpi.cc} LINKER=${mpi.cc}
+    build.args-append      CC=${mpi.cc} LINKER=${mpi.cc} LAlib="${linalglib}"
 }
 
 pre-test {
@@ -73,21 +71,8 @@
     notes    "Execute as: cd ${prefix}/share/hpl && ${mpi.exec} -n 4 xhpl"
 }
 
-variant atlas conflicts accelerate openblas description {Use ATLAS for BLAS library} {
-    depends_lib-append     port:atlas
-    build.args-append      LAlib="${prefix}/lib/libsatlas.dylib"
-}
+# tell linear algebra that lapack is not needed...
 
-variant accelerate conflicts atlas openblas description {Use Accelerate for BLAS library} {
-    build.args-append      LAlib="/usr/lib/libblas.dylib"
-}
-
-variant openblas conflicts atlas accelerate description {Use OpenBLAS for BLAS library} {
-    # allow OpenBLAS-devel too
-    depends_lib-append     path:lib/libopenblas.dylib:OpenBLAS
-    build.args-append      LAlib="${prefix}/lib/libopenblas.dylib"
-}
-
 livecheck.type      regex
 livecheck.url       [lindex ${master_sites} 0]
 livecheck.regex     ${name}-(\[0-9.\]+)${extract.suffix}