Skip to content
Permalink
Browse files

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.

git-svn-id: https://svn.macports.org/repository/macports/trunk/base@14501 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
jdberry committed Oct 9, 2005
1 parent 23b7204 commit 61e81df1c77b298dc494e08a61ff6a996b7dda0d
Showing with 2 additions and 6 deletions.
  1. +2 −6 src/port/portindex.tcl
@@ -4,7 +4,7 @@ exec @TCLSH@ "$0" "$@"

# 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 \
[file join "@TCL_PACKAGE_DIR@" darwinports1.0 darwinports_fastload.tcl]}
@@ -134,11 +134,7 @@ proc pindex {portdir} {
set deps $portinfo($dependstype)
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
}

0 comments on commit 61e81df

Please sign in to comment.
You can’t perform that action at this time.