[148996] trunk/dports/math/octave/Portfile

[dstrubbe at macports.org]

Revision: 148996
          https://trac.macports.org/changeset/148996
Author:   dstrubbe at macports.org
Date:     2016-05-24 11:49:57 -0700 (Tue, 24 May 2016)
Log Message:
-----------
octave: Use linear_algebra port group.

Modified Paths:
--------------
    trunk/dports/math/octave/Portfile

Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile	2016-05-24 18:07:47 UTC (rev 148995)
+++ trunk/dports/math/octave/Portfile	2016-05-24 18:49:57 UTC (rev 148996)
@@ -4,8 +4,8 @@
 PortSystem          1.0
 PortGroup           compilers  1.0
 PortGroup           muniversal 1.0
-PortGroup           active_variants 1.1
 PortGroup           compiler_blacklist_versions 1.0
+PortGroup           linear_algebra 1.0
 
 name                octave
 version             4.0.2
@@ -16,7 +16,7 @@
 description         a high-level language for numerical computations
 long_description    \
     GNU Octave is a high-level language, primarily intended for numerical \
-    computations.  It provides a convenient command line interface for \
+    computations. It provides a convenient command-line interface for \
     solving linear and nonlinear problems numerically.
 
 homepage            http://www.gnu.org/software/octave
@@ -274,44 +274,10 @@
     port:transfig    \
     port:pstoedit
 
-variant accelerate description {use BLAS from Apple's Accelerate.framework} conflicts atlas openblas {
-    depends_lib-append port:vecLibFort
-
-    configure.args-append        \
-        --with-blas=-lvecLibFort \
-        --with-lapack=""
+pre-configure {
+    configure.args-append --with-blas="-L${prefix}/lib ${linalglib}" --with-lapack=""
 }
 
-variant openblas description {use BLAS from MacPorts' openblas port} conflicts atlas accelerate {
-
-    depends_lib-append path:lib/libopenblas.dylib:OpenBLAS
-    # LAPACK required
-    require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
-
-    # replicate default values if configure script finds openblas on its own
-    configure.args-append        \
-        --with-blas=-lopenblas   \
-        --with-lapack=""
-}
-
-variant atlas description {use BLAS from MacPorts' atlas port} conflicts accelerate openblas {
-    depends_lib-append port:atlas
-
-    # replicate default values if configure script finds atlas on its own
-    configure.args-append        \
-        --with-blas="-lcblas -lf77blas -latlas" \
-        --with-lapack=-llapack
-}
-
-if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
-    default_variants-append +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"
-}
-
 variant java description {enable Java interface} {
     PortGroup java 1.0
     configure.args-replace --disable-java --enable-java
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160524/cb6b5cfe/attachment.html>