Ticket #6258: depscache.patch

darwinports.tcl

@@ -1432 +1432 @@
 }
 
 # upgrade procedure
-proc darwinports::upgrade {pname dspec variationslist optionslist} {
+proc darwinports::upgrade {pname dspec variationslist optionslist {depscachename ""}} {
         array set options $optionslist
         array set variations $variationslist
+        if {![string match "" $depscachename]} {
+                upvar $depscachename depscache
+        } 
 
         # set to no-zero is epoch overrides version
         set epoch_override 0
@@ -1571 +1574 @@
                 # build depends is upgraded
                 if {[info exists portinfo(depends_build)]} {
                         foreach i $portinfo(depends_build) {
+                                if {![llength [array get depscache $i]]} {
                                 set d [lindex [split $i :] end]
-                                upgrade $d $i $variationslist $optionslist
+                                        set depscache($i) 1
+                                        upgrade $d $i $variationslist $optionslist depscache
+                                } 
                         }
                 }
                 # library depends is upgraded
                 if {[info exists portinfo(depends_lib)]} {
                         foreach i $portinfo(depends_lib) {
+                                if {![llength [array get depscache $i]]} {
                                 set d [lindex [split $i :] end]
-                                upgrade $d $i $variationslist $optionslist
+                                        set depscache($i) 1
+                                        upgrade $d $i $variationslist $optionslist depscache
+                                } 
                         }
                 }
                 # runtime depends is upgraded
                 if {[info exists portinfo(depends_run)]} {
                         foreach i $portinfo(depends_run) {
+                                if {![llength [array get depscache $i]]} {
                                 set d [lindex [split $i :] end]
-                                upgrade $d $i $variationslist $optionslist
+                                        set depscache($i) 1
+                                        upgrade $d $i $variationslist $optionslist depscache
+                                } 
                         }
                 }
         }