Revision

74436

Author

jmr@macports.org

Date

2010-12-17 02:21:22 -0800 (Fri, 17 Dec 2010)

Log Message

py26-numpy, py27-numpy: no need to check whether a variant is set before making it default

Modified Paths

• trunk/dports/python/py26-numpy/Portfile
• trunk/dports/python/py27-numpy/Portfile

Diff

--- trunk/dports/python/py26-numpy/Portfile	2010-12-17 09:51:29 UTC (rev 74435)
+++ trunk/dports/python/py26-numpy/Portfile	2010-12-17 10:21:22 UTC (rev 74436)
@@ -42,9 +42,7 @@
 
 # use ALTAS by default; if MacPorts' ATLAS is not used, numpy will
 # link with that supplied by Apple's Accelerate framework.
-if {![variant_isset atlas]} {
-    default_variants +atlas
-}
+default_variants +atlas
 
 # when using ATLAS (whether by default or specified by the user via
 # the +atlas variant) ...
@@ -63,18 +61,14 @@
     variant gcc45 conflicts gcc43 gcc44 \
     description {Use the gcc45 compiler (enables fortran linking)} {}
 
-    if {![variant_isset gcc43] &&
-        ![variant_isset gcc44] &&
-        ![variant_isset gcc45]} {
+    if {![variant_isset gcc43] && ![variant_isset gcc45]} {
         default_variants +gcc44
     }
     if {[variant_isset gcc43]} {
         set gcc_version "4.3"
-    }
-    if {[variant_isset gcc44]} {
+    } elseif {[variant_isset gcc44]} {
         set gcc_version "4.4"
-    }
-    if {[variant_isset gcc45]} {
+    } elseif {[variant_isset gcc45]} {
         set gcc_version "4.5"
     }
 

--- trunk/dports/python/py27-numpy/Portfile	2010-12-17 09:51:29 UTC (rev 74435)
+++ trunk/dports/python/py27-numpy/Portfile	2010-12-17 10:21:22 UTC (rev 74436)
@@ -41,9 +41,7 @@
 
 # use ALTAS by default; if MacPorts' ATLAS is not used, numpy will
 # link with that supplied by Apple's Accelerate framework.
-if {![variant_isset atlas]} {
-    default_variants +atlas
-}
+default_variants +atlas
 
 # when using ATLAS (whether by default or specified by the user via
 # the +atlas variant) ...
@@ -62,18 +60,14 @@
     variant gcc45 conflicts gcc43 gcc44 \
     description {Use the gcc45 compiler (enables fortran linking)} {}
 
-    if {![variant_isset gcc43] &&
-        ![variant_isset gcc44] &&
-        ![variant_isset gcc45]} {
+    if {![variant_isset gcc43] && ![variant_isset gcc45]} {
         default_variants +gcc44
     }
     if {[variant_isset gcc43]} {
         set gcc_version "4.3"
-    }
-    if {[variant_isset gcc44]} {
+    } elseif {[variant_isset gcc44]} {
         set gcc_version "4.4"
-    }
-    if {[variant_isset gcc45]} {
+    } elseif {[variant_isset gcc45]} {
         set gcc_version "4.5"
     }