Changeset 14501 for trunk/base


Ignore:
Timestamp:
Oct 9, 2005, 1:36:16 PM (15 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/port/portindex.tcl

    r14494 r14501  
    55# Traverse through all ports, creating an index and archiving port directories
    66# if requested
    7 # $Id: portindex.tcl,v 1.32 2005/10/09 05:49:02 jmpp Exp $
     7# $Id: portindex.tcl,v 1.33 2005/10/09 13:36:16 jberry Exp $
    88
    99catch {source \
     
    135135                        set newDeps {}
    136136                        foreach dep $deps {
    137                                 if {[string match "path:$prefix/*" $dep]} {
    138                                     lappend newDeps [regsub "^path:$prefix/" $dep "path:\$\{prefix\}/"]
    139                                 } else {
    140                                         lappend newDeps $dep
    141                                 }
     137                                lappend newDeps [regsub "^(path|lib|bin):$prefix/" $dep {\1:${prefix}/}]
    142138                        }
    143139                        set portinfo($dependstype) $newDeps
Note: See TracChangeset for help on using the changeset viewer.