[132910] trunk/dports/math/qrupdate/Portfile

[ryandesign at macports.org]

Revision: 132910
          https://trac.macports.org/changeset/132910
Author:   ryandesign at macports.org
Date:     2015-02-12 16:09:02 -0800 (Thu, 12 Feb 2015)
Log Message:
-----------
qrupdate: do not set default variant if user has already specified conflicting variant (#46830)

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

Modified: trunk/dports/math/qrupdate/Portfile
===================================================================
--- trunk/dports/math/qrupdate/Portfile	2015-02-12 23:52:11 UTC (rev 132909)
+++ trunk/dports/math/qrupdate/Portfile	2015-02-13 00:09:02 UTC (rev 132910)
@@ -82,13 +82,17 @@
 }
 
 if {[variant_isset g95]} {
-    default_variants-append +accelerate
+    if {![variant_isset atlas]} {
+        default_variants-append +accelerate
+    }
     post-patch {
         reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/Makefile
         reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/src/Makefile
     }
 } else {
-    default_variants-append +atlas
+    if {![variant_isset accelerate]} {
+        default_variants-append +atlas
+    }
     post-patch {
         reinplace "s|gfortran|${configure.fc}|" ${worksrcpath}/Makeconf
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150212/0256e5c9/attachment.html>