[67265] trunk/base/src/port1.0

[jmr at macports.org]

Revision: 67265
          http://trac.macports.org/changeset/67265
Author:   jmr at macports.org
Date:     2010-05-03 16:43:34 -0700 (Mon, 03 May 2010)
Log Message:
-----------
empty default for os.subplatform

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

Modified: trunk/base/src/port1.0/portmain.tcl
===================================================================
--- trunk/base/src/port1.0/portmain.tcl	2010-05-03 23:34:24 UTC (rev 67264)
+++ trunk/base/src/port1.0/portmain.tcl	2010-05-03 23:43:34 UTC (rev 67265)
@@ -106,17 +106,14 @@
 if {[option os.platform] == "darwin"} {
     if {[file isdirectory /System/Library/Frameworks/Carbon.framework]} {
         default os.subplatform macosx
+        # we're on Mac OS X and can therefore build universal
+        default os.universal_supported yes
     } else {
         default os.subplatform puredarwin
+        default os.universal_supported no
     }
-}
-
-# check if we're on Mac OS X and can therefore build universal
-if {[info exists os.subplatform] && ${os.subplatform} == "macosx"} {
-    # the universal variant itself is now created in
-    # universal_setup, which is called from mportopen
-    default os.universal_supported yes
 } else {
+    default os.subplatform {}
     default os.universal_supported no
 }
 

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2010-05-03 23:34:24 UTC (rev 67264)
+++ trunk/base/src/port1.0/portutil.tcl	2010-05-03 23:43:34 UTC (rev 67265)
@@ -724,9 +724,9 @@
 
     set match 0
     # 'os' could be a platform or an arch when it's alone
-    if {$len == 2 && ($os == ${os.platform} || ([info exists os.subplatform] && $os == ${os.subplatform}) || $os == ${os.arch})} {
+    if {$len == 2 && ($os == ${os.platform} || $os == ${os.subplatform} || $os == ${os.arch})} {
         set match 1
-    } elseif {($os == ${os.platform} || ([info exists os.subplatform] && $os == ${os.subplatform}))
+    } elseif {($os == ${os.platform} || $os == ${os.subplatform})
               && (![info exists release] || ${os.major} == $release)
               && (![info exists arch] || ${os.arch} == $arch)} {
         set match 1
@@ -2594,7 +2594,7 @@
 proc _check_xcode_version {} {
     global os.subplatform macosx_version xcodeversion
 
-    if {[info exists os.subplatform] && ${os.subplatform} == "macosx"} {
+    if {${os.subplatform} == "macosx"} {
         switch $macosx_version {
             10.4 {
                 set min 2.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100503/87faa5c2/attachment-0001.html>