[55830] branches/images-and-archives/base

[blb at macports.org]

Revision: 55830
          http://trac.macports.org/changeset/55830
Author:   blb at macports.org
Date:     2009-08-19 19:25:54 -0700 (Wed, 19 Aug 2009)
Log Message:
-----------
Merge from trunk

Modified Paths:
--------------
    branches/images-and-archives/base/src/macports1.0/macports.tcl
    branches/images-and-archives/base/src/port1.0/portconfigure.tcl
    branches/images-and-archives/base/src/port1.0/portlivecheck.tcl
    branches/images-and-archives/base/src/port1.0/portutil.tcl

Property Changed:
----------------
    branches/images-and-archives/base/


Property changes on: branches/images-and-archives/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:50249-55672
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:50249-55829
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/images-and-archives/base/src/macports1.0/macports.tcl
===================================================================
--- branches/images-and-archives/base/src/macports1.0/macports.tcl	2009-08-20 02:21:26 UTC (rev 55829)
+++ branches/images-and-archives/base/src/macports1.0/macports.tcl	2009-08-20 02:25:54 UTC (rev 55830)
@@ -2117,7 +2117,7 @@
 # selfupdate procedure
 proc macports::selfupdate {{optionslist {}}} {
     global macports::prefix macports::portdbpath macports::libpath macports::rsync_server macports::rsync_dir macports::rsync_options
-    global macports::autoconf::macports_version macports::autoconf::rsync_path
+    global macports::autoconf::macports_version macports::autoconf::rsync_path tcl_platform
     array set options $optionslist
 
     # syncing ports tree.

Modified: branches/images-and-archives/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portconfigure.tcl	2009-08-20 02:21:26 UTC (rev 55829)
+++ branches/images-and-archives/base/src/port1.0/portconfigure.tcl	2009-08-20 02:25:54 UTC (rev 55830)
@@ -220,7 +220,7 @@
     } elseif {[tbool configure.m32]} {
         set flags "-m32"
     } elseif {${configure.build_arch} != ""} {
-        if {[arch_flag_supported] && $tool == "cc" || $tool == "cxx" || $tool == "objc"} {
+        if {[arch_flag_supported] && ($tool == "cc" || $tool == "cxx" || $tool == "objc")} {
             set flags "-arch ${configure.build_arch}"
         } elseif {${configure.build_arch} == "x86_64" || ${configure.build_arch} == "ppc64"} {
             set flags "-m64"

Modified: branches/images-and-archives/base/src/port1.0/portlivecheck.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portlivecheck.tcl	2009-08-20 02:21:26 UTC (rev 55829)
+++ branches/images-and-archives/base/src/port1.0/portlivecheck.tcl	2009-08-20 02:25:54 UTC (rev 55830)
@@ -121,6 +121,13 @@
         if {${livecheck.type} eq "default"} {
             set livecheck.type "fallback"
         }
+        if {$has_homepage} {
+            if {[regexp {^http://code.google.com/p/([^/]+)} $homepage _ tag]} {
+                set livecheck.type "googlecode"
+            } elseif {[regexp {^http://www.gnu.org/software/([^/]+)} $homepage _ tag]} {
+                set livecheck.type "gnu"
+            }
+        }
     }
     if {[lsearch -exact [split $available_types "|"] ${livecheck.type}] != -1} {
         # Load the defaults from _resources/port1.0/livecheck/${livecheck.type}.tcl.

Modified: branches/images-and-archives/base/src/port1.0/portutil.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portutil.tcl	2009-08-20 02:21:26 UTC (rev 55829)
+++ branches/images-and-archives/base/src/port1.0/portutil.tcl	2009-08-20 02:25:54 UTC (rev 55830)
@@ -1409,7 +1409,12 @@
     set res [mport_lookup $portname]
     if {[llength $res] < 2} \
     {
-        return {}
+        # Even if this port cannot be found in the index,
+        # it is still listed as dependency
+        if {[lsearch -exact $depsfound $portname] == -1} {
+            lappend depsfound $portname
+        }
+        return $depsfound
     }
 
     set depends {}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090819/9f06d7d2/attachment.html>