[57976] branches/release_1_8

[jmr at macports.org]

Revision: 57976
          http://trac.macports.org/changeset/57976
Author:   jmr at macports.org
Date:     2009-09-19 15:19:57 -0700 (Sat, 19 Sep 2009)
Log Message:
-----------
merge r56160 and r56162 from trunk:
 don't require macports svn on snow leopard

Revision Links:
--------------
    http://trac.macports.org/changeset/56160
    http://trac.macports.org/changeset/56162

Modified Paths:
--------------
    branches/release_1_8/base/src/port1.0/portfetch.tcl

Property Changed:
----------------
    branches/release_1_8/
    branches/release_1_8/base/


Property changes on: branches/release_1_8
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,56147,56435,56448,57026,57255,57784,57801,57974
   + /trunk:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,56147,56160,56162,56435,56448,57026,57255,57784,57801,57974


Property changes on: branches/release_1_8/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:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,55825,56147,56435,56448,56666,56889,57026,57048,57055,57131,57255,57784,57801,57820,57974
/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:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,55825,56147,56160,56162,56435,56448,56666,56889,57026,57048,57055,57131,57255,57784,57801,57820,57974
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_1_8/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/release_1_8/base/src/port1.0/portfetch.tcl	2009-09-19 22:06:17 UTC (rev 57975)
+++ branches/release_1_8/base/src/port1.0/portfetch.tcl	2009-09-19 22:19:57 UTC (rev 57976)
@@ -85,7 +85,7 @@
 default cvs.post_args {"${cvs.module}"}
 
 # we want the svn port so we know --trust-server-cert will work
-default svn.cmd {${prefix}/bin/svn}
+default svn.cmd {[portfetch::find_svn_path]}
 default svn.dir {${workpath}}
 default svn.method {export}
 default svn.revision ""
@@ -160,13 +160,18 @@
 }
 
 proc portfetch::set_fetch_type {option action args} {
+    global os.platform os.major
     if {[string equal ${action} "set"]} {
         switch $args {
             cvs {
                 depends_fetch-append bin:cvs:cvs
             }
             svn {
-                depends_fetch-append port:subversion
+                if {${os.platform} == "darwin" && ${os.major} >= 10} {
+                    depends_fetch-append bin:svn:subversion
+                } else {
+                    depends_fetch-append port:subversion
+                }
             }
             git {
                 depends_fetch-append bin:git:git-core
@@ -178,6 +183,15 @@
     }
 }
 
+proc portfetch::find_svn_path {args} {
+    global prefix os.platform os.major
+    if {${os.platform} == "darwin" && ${os.major} >= 10} {
+        return [findBinary svn $portutil::autoconf::svn_path]
+    } else {
+        return ${prefix}/bin/svn
+    }
+}
+
 set_ui_prefix
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090919/7a61fc44/attachment.html>