Ticket #15868: patch-macports-no-svn-rsync-from-autoconf.diff

macports1.0/macports.tcl

@@ -1377 +1377 @@
 proc mportsync {{optionslist {}}} {
     global macports::sources macports::portdbpath macports::rsync_options tcl_platform
     global macports::portverbose
-    global macports::autoconf::rsync_path
     array set options $optionslist
 
     set numfailed 0
@@ -1395 +1394 @@
             {^file$} {
                 set portdir [macports::getportdir $source]
                 if {[file exists $portdir/.svn]} {
-                    set svn_commandline "[macports::findBinary svn ${macports::autoconf::svn_path}] update --non-interactive ${portdir}"
+                    set svn_commandline "[macports::findBinary svn] update --non-interactive ${portdir}"
                     ui_debug $svn_commandline
                     if {
                         [catch {
@@ -1428 +1427 @@
                     set source "${source}/"
                 }
                 # Do rsync fetch
-                set rsync_commandline "${macports::autoconf::rsync_path} ${rsync_options} ${source} ${destdir}"
+                set rsync_commandline "[macports::findBinary rsync] ${rsync_options} ${source} ${destdir}"
                 ui_debug $rsync_commandline
                 if {[catch {system $rsync_commandline}]} {
                     ui_error "Synchronization of the local ports tree failed doing rsync"
@@ -1781 +1780 @@
 # 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
     array set options $optionslist
     
     # syncing ports tree.
@@ -1800 +1799 @@
     
     # sync the MacPorts sources
     ui_debug "Updating MacPorts sources using rsync"
-    if { [catch { system "$rsync_path $rsync_options rsync://${rsync_server}/${rsync_dir} $mp_source_path" } result ] } {
+    if { [catch { system "[macports::findBinary rsync] $rsync_options rsync://${rsync_server}/${rsync_dir} $mp_source_path" } result ] } {
        return -code error "Error synchronizing MacPorts sources: $result"
     }
 

macports1.0/macports_autoconf.tcl.in

@@ -35 +35 @@
     variable macports_conf_path "@MPCONFIGDIR_EXPANDED@"
     variable macports_version "@MP_VERSION@"
     variable macports_user_dir "~/.macports"
-    variable svn_path "@SVN@"
-    variable rsync_path "@RSYNC@"
     variable open_path "@OPEN@"
 }