Ticket #45353: patch-src-port1_0-portfetch_tcl.diff

src/port1.0/portfetch.tcl

@@ -424 +424 @@
 
 # Perform a git fetch
 proc portfetch::gitfetch {args} {
-    global worksrcpath patchfiles \
+    global workpath distname worksrcpath patchfiles \
            git.url git.branch git.sha1 git.cmd
 
+    set default_worksrcpath ${workpath}/${distname}
     set options "-q"
     if {${git.branch} eq ""} {
         # if we're just using HEAD, we can make a shallow repo
         set options "$options --depth=1"
     }
-    set cmdstring "${git.cmd} clone $options ${git.url} ${worksrcpath} 2>&1"
+    set cmdstring "${git.cmd} clone $options ${git.url} ${default_worksrcpath} 2>&1"
     ui_debug "Executing: $cmdstring"
     if {[catch {system $cmdstring} result]} {
         return -code error [msgcat::mc "Git clone failed"]
@@ -439 +440 @@
     }
 
     if {${git.branch} ne ""} {
-        set env "GIT_DIR=${worksrcpath}/.git GIT_WORK_TREE=${worksrcpath}"
+        set env "GIT_DIR=${default_worksrcpath}/.git GIT_WORK_TREE=${default_worksrcpath}"
         set cmdstring "$env ${git.cmd} checkout -q ${git.branch} 2>&1"
         ui_debug "Executing $cmdstring"
         if {[catch {system $cmdstring} result]} {
@@ -456 +457 @@
 
 # Perform a mercurial fetch.
 proc portfetch::hgfetch {args} {
-    global worksrcpath prefix_frozen patchfiles hg.url hg.tag hg.cmd \
+    global workpath distname worksrcpath prefix_frozen patchfiles \
+           hg.url hg.tag hg.cmd hg.args \
            fetch.ignore_sslcert
 
+    set default_worksrcpath ${workpath}/${distname}
     set insecureflag ""
     if {${fetch.ignore_sslcert}} {
         set insecureflag " --insecure"
     }
 
-    set cmdstring "${hg.cmd} clone${insecureflag} --rev \"${hg.tag}\" ${hg.url} ${worksrcpath} 2>&1"
+    set cmdstring "${hg.cmd} clone${insecureflag} --rev \"${hg.tag}\" ${hg.url} ${default_worksrcpath} 2>&1"
     ui_debug "Executing: $cmdstring"
     if {[catch {system $cmdstring} result]} {
         return -code error [msgcat::mc "Mercurial clone failed"]