Ticket #29256: Portfile.diff

Portfile

@@ -79 +79 @@
 test.run            yes
 test.target         check
 
-variant atlas conflicts accelerate description {use BLAS from ATLAS} {
+variant atlas conflicts no_atlas description {use BLAS from ATLAS} {
     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"
+variant no_atlas conflicts atlas description {use BLAS from Accelerate.framework} {
+    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 {[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]} {
-    default_variants +accelerate
-} elseif {![variant_isset accelerate]} {
+    default_variants +no_atlas
+} elseif {![variant_isset no_atlas]} {
     default_variants +atlas
 }
-if {![variant_isset atlas] && ![variant_isset accelerate]} {
+if {![variant_isset atlas] && ![variant_isset no_atlas]} {
     pre-fetch {
         return -code error "You must use either the atlas or accelerate variant."
     }
@@ -122 +115 @@
     configure.compiler      macports-gcc-4.5
 }
 
-variant g95 description {build with g95} requires accelerate conflicts atlas gcc43 gcc44 gcc45 {
+variant g95 description {build with g95} requires no_atlas 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"
-}
+} 
+
+variant accelerate requires no_atlas description {compatibility variant} {}
 
 if { ![variant_isset gcc43] && ![variant_isset gcc45] && ![variant_isset g95] } {
     default_variants +gcc44