Ticket #34933: getportresourcepath.patch

base/src/macports1.0/macports.tcl

@@ -1505 +1505 @@
 # @param url port url
 # @param path path in _resources we are interested in
 # @param fallback fall back to the default source tree
 # @return path to the _resources directory or the path to the fallback
 proc macports::getportresourcepath {url {path ""} {fallback yes}} {
-    global macports::sources_default
+    global macports::sources_default macports::sources
 
     set protocol [getprotocol $url]
 
     switch -- ${protocol} {
         file {
@@ -1521 +1521 @@
     }
 
     # append requested path
     set proposedpath [file join $proposedpath _resources $path]
 
+    set oldpath $proposedpath
+    if {![file exists $proposedpath]} {
+        foreach source $sources {
+            set protocol [getprotocol $source]
+
+            switch -- ${protocol} {
+                file {
+                    set proposedpath [file normalize [file join [getportdir $source]]]
+                }
+                default {
+                    set proposedpath [getsourcepath $source]
+                }
+            }
+
+            # append requested path
+            set proposedpath [file join $proposedpath _resources $path]
+            if {[file exists $proposedpath]} {
+                return $proposedpath
+            }
+        }
+    }
+
     if {$fallback == "yes" && ![file exists $proposedpath]} {
         return [getdefaultportresourcepath $path]
     }
 
-    return $proposedpath
+    # if we got here return the original path
+    return $oldpath
 }
 
 ##
 # Get the path to the _resources directory of the default source
 #