Ticket #34543: qrupdate-1.1.2.diff

Portfile

@@ -5 +5 @@
 PortGroup           muniversal 1.0
 
 name                qrupdate
-version             1.1.1
-set branch          [join [lrange [split ${version} .] 0 1] .]
-revision            3
+version             1.1.2
+# Ridiculous
+set branch          1.2
 categories          math
 license             GPL-3+
 maintainers         nomaintainer
@@ -18 +18 @@
 platforms           darwin
 master_sites        sourceforge:project/qrupdate/qrupdate/${branch}
 
-checksums           md5     7782c7ee6c234e56a72d6b86c1856fa0 \
-                    sha1    8fbaba202b0d4bf80852b2dc6c8d1d4b90b816d4 \
-                    rmd160  fd63306abe91adcd5d47e408d9cd4af3e1b32b0c
+checksums           rmd160  9d23b2d13278c335f6208ebb6775df4b4049785c \
+                    sha256  e2a1c711dc8ebc418e21195833814cb2f84b878b90a2774365f0166402308e08
 
-depends_lib         port:atlas
-
 use_configure       no
 build.target        lib solib
 
-build.args          PREFIX=${prefix} BLAS="-L${prefix}/lib" LAPACK="-L${prefix}/lib -llapack"
-destroot.args       PREFIX=${prefix} BLAS="-L${prefix}/lib" LAPACK="-L${prefix}/lib -llapack"
-test.args           PREFIX=${prefix} BLAS="-L${prefix}/lib" LAPACK="-L${prefix}/lib -llapack"
+build.args          PREFIX=${prefix}
+destroot.args       PREFIX=${prefix}
+test.args           PREFIX=${prefix}
 
 patchfiles          patch-Makefile.diff
 
@@ -66 +63 @@
     }
 }
 
-variant no_atlas description {build with Accelerate framework instead of atlas} {
-    depends_lib-delete      port:atlas
-    build.args          PREFIX=${prefix} BLAS="-framework Accelerate" LAPACK="-framework Accelerate"
-    destroot.args       PREFIX=${prefix} BLAS="-framework Accelerate" LAPACK="-framework Accelerate"
-    test.args           PREFIX=${prefix} BLAS="-framework Accelerate" LAPACK="-framework Accelerate"
+
+variant no_atlas description {Legacy compatibility variant} {}
+
+variant atlas description {build with atlas instead of Accelerate framework} {
+    depends_lib-append      port:atlas
+    build.args-append       BLAS="-framework Accelerate" LAPACK="-framework Accelerate"
+    destroot.args-append    BLAS="-framework Accelerate" LAPACK="-framework Accelerate"
+    test.args-append        BLAS="-framework Accelerate" LAPACK="-framework Accelerate"
 }
+if {![variant_isset atlas]} {
+    build.args-append       BLAS="-L${prefix}/lib" LAPACK="-L${prefix}/lib -llapack"
+    destroot.args-append    BLAS="-L${prefix}/lib" LAPACK="-L${prefix}/lib -llapack"
+    test.args-append        BLAS="-L${prefix}/lib" LAPACK="-L${prefix}/lib -llapack"
+}
 
-variant accelerate requires no_atlas description {compatibility variant} {}
+if {[variant_isset g95] || [variant_isset no_atlas]} {
+    default_variants -atlas
+} else {
+    default_variants +atlas
+}
 
+
 variant g95 conflicts gcc43 gcc44 gcc45 universal description {build with g95} {
     depends_build-append    port:g95
     post-patch {
@@ -109 +119 @@
     default_variants +gcc45
 }
 
-if {[variant_isset g95]} {
-    default_variants +no_atlas
-}
 
 test.run yes