Changeset 14501 for trunk/base

Timestamp:

Oct 9, 2005, 1:36:16 PM (19 years ago)

Author:

jberry

Message:

Alter prefix substitution to also look in bin: and lib: dependencies for
those that use full paths. This pushes us over into using regsub for
each dependency.

Thanks for letting me know about this, Paul.

File:

• trunk/base/src/port/portindex.tcl (modified) (2 diffs)

trunk/base/src/port/portindex.tcl

@@ -5 +5 @@
 # Traverse through all ports, creating an index and archiving port directories
 # if requested
-# $Id: portindex.tcl,v 1.32 2005/10/09 05:49:02 jmpp Exp $
+# $Id: portindex.tcl,v 1.33 2005/10/09 13:36:16 jberry Exp $
 
 catch {source \
@@ -135 +135 @@
                         set newDeps {}
                         foreach dep $deps {
-                                if {[string match "path:$prefix/*" $dep]} {
-                                    lappend newDeps [regsub "^path:$prefix/" $dep "path:\$\{prefix\}/"]
-                                } else {
-                                        lappend newDeps $dep
-                                }
+                                lappend newDeps [regsub "^(path|lib|bin):$prefix/" $dep {\1:${prefix}/}]
                         }
                         set portinfo($dependstype) $newDeps