[30034] trunk/base/src/port1.0/portmain.tcl

[source_changes at macosforge.org]

Revision: 30034
          http://trac.macosforge.org/projects/macports/changeset/30034
Author:   eridius at macports.org
Date:     2007-10-18 12:38:18 -0700 (Thu, 18 Oct 2007)

Log Message:
-----------
The default universal variant shouldn't disappear if I explicitly select +macosx

Modified Paths:
--------------
    trunk/base/src/port1.0/portmain.tcl

Modified: trunk/base/src/port1.0/portmain.tcl
===================================================================
--- trunk/base/src/port1.0/portmain.tcl	2007-10-18 19:32:22 UTC (rev 30033)
+++ trunk/base/src/port1.0/portmain.tcl	2007-10-18 19:38:18 UTC (rev 30034)
@@ -96,8 +96,8 @@
 if {[info exists os.platform] && ![info exists variations(${os.platform})]} { variant_set ${os.platform}}
 if {[info exists os.arch] && ![info exists variations(${os.arch})]} { variant_set ${os.arch} }
 if {[info exists os.platform] && (${os.platform} == "darwin") && ![file isdirectory /System/Library/Frameworks/Carbon.framework] && ![info exists variations(puredarwin)]} { variant_set puredarwin }
-if {[info exists os.platform] && (${os.platform} == "darwin") && [file isdirectory /System/Library/Frameworks/Carbon.framework] && ![info exists variations(macosx)]} {
-	variant_set macosx
+if {[info exists os.platform] && (${os.platform} == "darwin") && [file isdirectory /System/Library/Frameworks/Carbon.framework] && ![info exists variations(macosx)]} { variant_set macosx }
+if {[info exists variations(macosx)] && $variations(macosx) == "+"} {
 	# Declare default universal variant, on >10.3
 	variant universal {
 		if {[tbool use_xmkmf] || ![tbool use_configure]} {

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071018/1fdfd8b0/attachment.html