Revision: 74438 http://trac.macports.org/changeset/74438 Author: jmr@macports.org Date: 2010-12-17 02:43:12 -0800 (Fri, 17 Dec 2010) Log Message: ----------- py25-numpy: match py26/py27 versions as per r74436,r74437 Revision Links: -------------- http://trac.macports.org/changeset/74436 http://trac.macports.org/changeset/74437 Modified Paths: -------------- trunk/dports/python/py25-numpy/Portfile Modified: trunk/dports/python/py25-numpy/Portfile =================================================================== --- trunk/dports/python/py25-numpy/Portfile 2010-12-17 10:24:57 UTC (rev 74437) +++ trunk/dports/python/py25-numpy/Portfile 2010-12-17 10:43:12 UTC (rev 74438) @@ -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" } @@ -82,7 +76,7 @@ # create binaries only for the native OS architecture, at # either 32 or 64 bits. Restrict the supported archs # accordingly. - if {[variant_exists universal] && [variant_isset universal]} { + if {[variant_isset universal]} { if { ${os.arch}=="i386" } { set universal_archs_supported { i386 x86_64 } } else {