[37922] branches/gsoc08-privileges/base

[pmagrath at macports.org]

Revision: 37922
          http://trac.macosforge.org/projects/macports/changeset/37922
Author:   pmagrath at macports.org
Date:     2008-06-29 06:23:50 -0700 (Sun, 29 Jun 2008)
Log Message:
-----------
Merged revisions 37909,37913-37914 via svnmerge from 
https://svn.macosforge.org/repository/macports/trunk/base

........
  r37909 | raimue at macports.org | 2008-06-28 23:39:49 +0100 (Sat, 28 Jun 2008) | 4 lines
  
  port/port.tcl:
  Added new port selectors depends_lib:, depends_build:, depends_run:.
  Also added a shorthand depends: for all three of them.
........
  r37913 | raimue at macports.org | 2008-06-29 02:15:46 +0100 (Sun, 29 Jun 2008) | 3 lines
  
  pextlib1.0/Pextlib.c:
  Whitespace only, correct indent
........
  r37914 | jmr at macports.org | 2008-06-29 05:03:03 +0100 (Sun, 29 Jun 2008) | 2 lines
  
  Try the distfiles mirror for tagged files too. Closes #15485.
........

Modified Paths:
--------------
    branches/gsoc08-privileges/base/src/pextlib1.0/Pextlib.c
    branches/gsoc08-privileges/base/src/port/port.tcl
    branches/gsoc08-privileges/base/src/port1.0/portfetch.tcl

Property Changed:
----------------
    branches/gsoc08-privileges/base/


Property changes on: branches/gsoc08-privileges/base
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/base:1-37880
   + /trunk/base:1-37921

Modified: branches/gsoc08-privileges/base/src/pextlib1.0/Pextlib.c
===================================================================
--- branches/gsoc08-privileges/base/src/pextlib1.0/Pextlib.c	2008-06-29 12:56:47 UTC (rev 37921)
+++ branches/gsoc08-privileges/base/src/pextlib1.0/Pextlib.c	2008-06-29 13:23:50 UTC (rev 37922)
@@ -1194,8 +1194,8 @@
 	Tcl_CreateObjCommand(interp, "mkchannelfromfd", MkChannelFromFdCmd, NULL, NULL);
 	Tcl_CreateObjCommand(interp, "pipe", PipeCmd, NULL, NULL);
 	Tcl_CreateObjCommand(interp, "curl", CurlCmd, NULL, NULL);
-    Tcl_CreateObjCommand(interp, "symlink", CreateSymlinkCmd, NULL, NULL);
-    Tcl_CreateObjCommand(interp, "unsetenv", UnsetEnvCmd, NULL, NULL);
+	Tcl_CreateObjCommand(interp, "symlink", CreateSymlinkCmd, NULL, NULL);
+	Tcl_CreateObjCommand(interp, "unsetenv", UnsetEnvCmd, NULL, NULL);
 	
 	Tcl_CreateObjCommand(interp, "readline", ReadlineCmd, NULL, NULL);
 	Tcl_CreateObjCommand(interp, "rl_history", RLHistoryCmd, NULL, NULL);

Modified: branches/gsoc08-privileges/base/src/port/port.tcl
===================================================================
--- branches/gsoc08-privileges/base/src/port/port.tcl	2008-06-29 12:56:47 UTC (rev 37921)
+++ branches/gsoc08-privileges/base/src/port/port.tcl	2008-06-29 13:23:50 UTC (rev 37922)
@@ -864,6 +864,9 @@
         ^categories:        -
         ^category:          -
         ^version:           -
+        ^depends_lib:       -
+        ^depends_build:     -
+        ^depends_run:       -
         ^revision:          { # Handle special port selectors
             advance
 
@@ -881,6 +884,19 @@
             set el 1
         }
 
+        ^depends:           { # A port selector shorthand for depends_lib, depends_build or depends_run
+            advance
+
+            # Break up the token, because older Tcl switch doesn't support -matchvar
+            regexp {^(\w+):(.*)} $token matchvar field pat
+
+            add_multiple_ports reslist [get_matching_ports $pat no regexp "depends_lib"]
+            add_multiple_ports reslist [get_matching_ports $pat no regexp "depends_build"]
+            add_multiple_ports reslist [get_matching_ports $pat no regexp "depends_run"]
+
+            set el 1
+        }
+
         [][?*]              { # Handle portname glob patterns
             advance; add_multiple_ports reslist [get_matching_ports $token no glob]
             set el 1

Modified: branches/gsoc08-privileges/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/gsoc08-privileges/base/src/port1.0/portfetch.tcl	2008-06-29 12:56:47 UTC (rev 37921)
+++ branches/gsoc08-privileges/base/src/port1.0/portfetch.tcl	2008-06-29 13:23:50 UTC (rev 37922)
@@ -256,7 +256,22 @@
             }
         }
         
+        # add in the global and fallback mirrors for each tag
         foreach site $site_list {
+            if {[regexp {([a-zA-Z]+://.+/?):([0-9A-Za-z_-]+)$} $site match site tag]} {
+                if {![info exists extras_added($tag)]} {
+                    set site_list [concat $site_list [mirror_sites $global_mirror_site $tag ""] [mirror_sites $fallback_mirror_site $tag ""]]
+                    if {[string equal $list master_sites] && [info exists env(MASTER_SITE_LOCAL)]} {
+                        set site_list [concat [list $env(MASTER_SITE_LOCAL)] $site_list]
+                    } elseif {[string equal $list patch_sites] && [info exists env(PATCH_SITE_LOCAL)]} {
+                        set site_list [concat [list $env(PATCH_SITE_LOCAL)] $site_list]
+                    }
+                    set extras_added($tag) yes
+                }
+            }
+        }
+        
+        foreach site $site_list {
 	    if {[regexp {([a-zA-Z]+://.+/?):([0-9A-Za-z_-]+)$} $site match site tag]} {
                 lappend portfetch::$tag $site
             } else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080629/b2a783e8/attachment.html