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

[takeshi at macports.org]

Revision: 81037
          http://trac.macports.org/changeset/81037
Author:   takeshi at macports.org
Date:     2011-07-23 20:53:31 -0700 (Sat, 23 Jul 2011)
Log Message:
-----------
octave: removed Carbon. enabled acelerate with 64-bit

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

Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile	2011-07-24 03:14:17 UTC (rev 81036)
+++ trunk/dports/math/octave/Portfile	2011-07-24 03:53:31 UTC (rev 81037)
@@ -5,7 +5,7 @@
 
 name                octave
 version             3.2.4
-revision            4
+revision            5
 conflicts           octave-devel
 categories          math science
 maintainers         nomaintainer
@@ -62,7 +62,8 @@
                     --with-colamd \
                     --with-ccolamd \
                     --with-cholmod \
-                    --with-cxsparse
+                    --with-cxsparse \
+                    --without-framework-carbon
 
 configure.perl      ${prefix}/bin/perl
 configure.python    ' '
@@ -83,18 +84,14 @@
     depends_lib-append port:atlas
 }
 variant accelerate conflicts atlas description {use BLAS from Accelerate.framework} {
-    configure.fflags-append -ff2c
     if {![variant_isset g95]} {
-        configure.args-append   --with-blas="-framework Accelerate"
+        configure.fflags-append -ff2c
     }
-    configure.args-append   --with-lapack="-framework Accelerate"
-    
-    if {[string match *64* $build_arch] && ${os.major} == 10} {
-        # see http://www.macresearch.org/lapackblas-fortran-106#comment-17217
-        pre-fetch {
-            return -code error "Accelerate.framework cannot be used by 64-bit FORTRAN code on Snow Leopard."
-        }
+    if {[variant_isset g95] || ([string match *64* $build_arch] && ${os.major} >= 10)} {
+        depends_lib-append      port:dotwrp
+        configure.args-append   --with-blas="-ldotwrp -framework Accelerate"
     }
+    configure.args-append   --with-lapack="-framework Accelerate"
 }
 if {[variant_isset g95]} {
     default_variants +accelerate
@@ -124,9 +121,7 @@
 
 variant g95 description {build with g95} requires accelerate conflicts atlas gcc43 gcc44 gcc45 {
     depends_build-append    port:g95
-    depends_lib-append  port:dotwrp
     configure.f77       "${prefix}/bin/g95"
-    configure.args-append   --with-blas="-ldotwrp -framework Accelerate"
 }
 
 if { ![variant_isset gcc43] && ![variant_isset gcc45] && ![variant_isset g95] } {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110723/7ec9d73c/attachment.html>