[38277] branches/gsoc08-privileges/base

[pmagrath at macports.org]

Revision: 38277
          http://trac.macosforge.org/projects/macports/changeset/38277
Author:   pmagrath at macports.org
Date:     2008-07-14 12:03:37 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
Merged revisions 38163,38230,38232,38252,38255,38271 via svnmerge from 
https://svn.macosforge.org/repository/macports/trunk/base

........
  r38163 | jmr at macports.org | 2008-07-10 02:50:57 +0100 (Thu, 10 Jul 2008) | 2 lines
  
  In fetch, gracefully handle failure to spawn ping processes. (#15906)
........
  r38230 | raimue at macports.org | 2008-07-13 11:06:54 +0100 (Sun, 13 Jul 2008) | 3 lines
  
  port/port.tcl:
  Exit gracefully if an invalid global option was given
........
  r38232 | jmr at macports.org | 2008-07-13 11:25:29 +0100 (Sun, 13 Jul 2008) | 2 lines
  
  Mirror sites: add new transact SourceForge mirror
........
  r38252 | raimue at macports.org | 2008-07-13 22:40:06 +0100 (Sun, 13 Jul 2008) | 3 lines
  
  doc/port.1:
  Document 'port edit --editor'
........
  r38255 | raimue at macports.org | 2008-07-13 23:38:40 +0100 (Sun, 13 Jul 2008) | 4 lines
  
  port/port.tcl:
  Convert list to string to allow additional parameters,
  for example  port edit --editor 'vim -y'
........
  r38271 | mww at macports.org | 2008-07-14 15:29:47 +0100 (Mon, 14 Jul 2008) | 3 lines
  
  add 'llvm-gcc-4.2' compiler suite (from XCode 3.1);
  make a wild guess at default compiler choice for 10.6;
........

Modified Paths:
--------------
    branches/gsoc08-privileges/base/doc/port.1
    branches/gsoc08-privileges/base/src/port/port.tcl
    branches/gsoc08-privileges/base/src/port1.0/portconfigure.tcl
    branches/gsoc08-privileges/base/src/port1.0/portfetch.tcl
    branches/gsoc08-privileges/base/src/port1.0/resources/fetch/mirror_sites.tcl

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


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

Modified: branches/gsoc08-privileges/base/doc/port.1
===================================================================
--- branches/gsoc08-privileges/base/doc/port.1	2008-07-14 18:43:30 UTC (rev 38276)
+++ branches/gsoc08-privileges/base/doc/port.1	2008-07-14 19:03:37 UTC (rev 38277)
@@ -437,6 +437,12 @@
 with your default editor specified in your shell's environment variable. Alias
 .Ar ed
 also invokes this command.
+.Pp
+You can also use the
+.Fl -editor
+flag on the command line to specify an alternative editor. For example:
+.Dl port edit --editor nano apache2
+.Pp
 .Ss unarchive
 Unpack the port from a pre-built binary archive. When archive mode is enabled, this command is called automatically, prior to
 .Ar fetch ,

Modified: branches/gsoc08-privileges/base/src/port/port.tcl
===================================================================
--- branches/gsoc08-privileges/base/src/port/port.tcl	2008-07-14 18:43:30 UTC (rev 38276)
+++ branches/gsoc08-privileges/base/src/port/port.tcl	2008-07-14 19:03:37 UTC (rev 38277)
@@ -2316,9 +2316,9 @@
                     # Find an editor to edit the portfile
                     set editor ""
                     if {[info exists local_options(ports_edit_editor)]} {
-                        set editor $local_options(ports_edit_editor)
+                        set editor [join $local_options(ports_edit_editor)]
                     } elseif {[info exists local_options(ports_ed_editor)]} {
-                        set editor $local_options(ports_ed_editor)
+                        set editor [join $local_options(ports_ed_editor)]
                     } else {
                         foreach ed { VISUAL EDITOR } {
                             if {[info exists env($ed)]} {
@@ -3169,7 +3169,11 @@
 }
 
 # Parse global options that will affect all subsequent commands
-parse_options "global" ui_options global_options
+if {[catch {parse_options "global" ui_options global_options} result]} {
+    puts "Error: $result"
+    print_usage
+    exit 1
+}
 
 # Get arguments remaining after option processing
 set remaining_args [lrange $cmd_argv $cmd_argn end]

Modified: branches/gsoc08-privileges/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/gsoc08-privileges/base/src/port1.0/portconfigure.tcl	2008-07-14 18:43:30 UTC (rev 38276)
+++ branches/gsoc08-privileges/base/src/port1.0/portconfigure.tcl	2008-07-14 19:03:37 UTC (rev 38277)
@@ -285,6 +285,7 @@
             "darwin 7" { set configure.compiler gcc-3.3 }
             "darwin 8" { set configure.compiler gcc-4.0 }
             "darwin 9" { set configure.compiler gcc-4.0 }
+            "darwin 10" { set configure.compiler llvm-gcc-4.2 }
         }
     }
 
@@ -308,6 +309,12 @@
                 objc /usr/bin/gcc-4.2 \
                 cxx /usr/bin/g++-4.2 \
                 cpp /usr/bin/cpp-4.2 }
+        llvm-gcc-4.2 {
+            select_compiler "Mac OS X llvm-gcc 4.2" \
+                cc  /Developer/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2 \
+                objc /Developer/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2 \
+                cxx /Developer/usr/llvm-gcc-4.2/bin/llvm-g++-4.2 \
+                cpp /Developer/usr/llvm-gcc-4.2/bin/llvm-cpp-4.2 }
         apple-gcc-3.3 {
             select_compiler "MacPorts Apple gcc 3.3" \
                 cc  ${prefix}/bin/gcc-apple-3.3 \

Modified: branches/gsoc08-privileges/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/gsoc08-privileges/base/src/port1.0/portfetch.tcl	2008-07-14 18:43:30 UTC (rev 38276)
+++ branches/gsoc08-privileges/base/src/port1.0/portfetch.tcl	2008-07-14 19:03:37 UTC (rev 38277)
@@ -361,10 +361,15 @@
                 }
             }
             if { ![info exists seen($host)] } {
-                set seen($host) yes
-                lappend hosts $host
-                ui_debug "Pinging $host..."
-                set fds($host) [open "|ping -noq -c3 -t3 $host | grep round-trip | cut -d / -f 5"]
+                if {[catch {set fds($host) [open "|ping -noq -c3 -t3 $host | grep round-trip | cut -d / -f 5"]}]} {
+                    ui_debug "Spawning ping for $host failed"
+                    # will end up after all hosts that were pinged OK but before those that didn't respond
+                    set pingtimes($host) 5000
+                } else {
+                    ui_debug "Pinging $host..."
+                    set seen($host) yes
+                    lappend hosts $host
+                }
             }
         }
 

Modified: branches/gsoc08-privileges/base/src/port1.0/resources/fetch/mirror_sites.tcl
===================================================================
--- branches/gsoc08-privileges/base/src/port1.0/resources/fetch/mirror_sites.tcl	2008-07-14 18:43:30 UTC (rev 38276)
+++ branches/gsoc08-privileges/base/src/port1.0/resources/fetch/mirror_sites.tcl	2008-07-14 19:03:37 UTC (rev 38277)
@@ -272,6 +272,7 @@
     http://internap.dl.sourceforge.net/
     http://superb-east.dl.sourceforge.net/
     http://superb-west.dl.sourceforge.net/
+    http://transact.dl.sourceforge.net/
 }
 
 set portfetch::mirror_sites::sites(sourceforge_jp) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080714/fb15dc96/attachment.html