[125615] trunk/base

[jmr at macports.org]

Revision: 125615
          https://trac.macports.org/changeset/125615
Author:   jmr at macports.org
Date:     2014-09-22 15:45:27 -0700 (Mon, 22 Sep 2014)
Log Message:
-----------
allow using system svn on non-darwin systems, remove obsolete workaround from svn-and-patchsites test

Modified Paths:
--------------
    trunk/base/src/port1.0/portfetch.tcl
    trunk/base/tests/test/svn-and-patchsites/Portfile

Modified: trunk/base/src/port1.0/portfetch.tcl
===================================================================
--- trunk/base/src/port1.0/portfetch.tcl	2014-09-22 22:00:30 UTC (rev 125614)
+++ trunk/base/src/port1.0/portfetch.tcl	2014-09-22 22:45:27 UTC (rev 125615)
@@ -180,7 +180,7 @@
                 depends_fetch-append bin:cvs:cvs
             }
             svn {
-                if {${os.platform} == "darwin" && ${os.major} >= 10} {
+                if {${os.major} >= 10 || ${os.platform} != "darwin"} {
                     depends_fetch-append bin:svn:subversion
                 } else {
                     depends_fetch-append port:subversion

Modified: trunk/base/tests/test/svn-and-patchsites/Portfile
===================================================================
--- trunk/base/tests/test/svn-and-patchsites/Portfile	2014-09-22 22:00:30 UTC (rev 125614)
+++ trunk/base/tests/test/svn-and-patchsites/Portfile	2014-09-22 22:45:27 UTC (rev 125615)
@@ -31,11 +31,6 @@
                     7.4.002 md5 a03e1a5ad3722f2011751dda977641af \
                     7.4.003 md5 e6d070f592bb6da4d8cf2f7f134425e5
 
-# Set depends_fetch to be empty to remove the dependency on svn added by base,
-# as it is not available in the test suite. Otherwise MacPorts will try to
-# verify a subversion port exists.
-depends_fetch
-
 # disable the patch phase because the patches would never apply
 patch		{}
 extract		{}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140922/79e92b4d/attachment-0001.html>