Changeset 14492 for trunk/base

Timestamp:

Oct 9, 2005, 1:02:08 AM (19 years ago)

Author:

jberry

Message:

While creating the portindex, canonicalize any path dependencies that
start with $prefix, by substiting the word "$prefix" for this prefix.
This should mean that portindex generation is consistent no matter the
local prefix.

File:

• trunk/base/src/port/portindex.tcl (modified) (3 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.30 2005/09/22 23:03:13 jberry Exp $
+# $Id: portindex.tcl,v 1.31 2005/10/09 01:02:08 jberry Exp $
 
 catch {source \
@@ -101 +101 @@
 
 proc pindex {portdir} {
+        variable prefix $darwinports::prefix
+        
     global target fd directory archive outdir stats 
     incr stats(total)
@@ -126 +128 @@
             }
         }
+        
+        # Canonicalize any path: dependencies by substituting out $prefix
+        foreach dependstype { depends_build depends_lib depends_run } {
+                if {[info exists portinfo($dependstype)]} {
+                        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
+                                }
+                        }
+                        set portinfo($dependstype) $newDeps
+                }
+        }
+        
         set output [array get portinfo]
         set len [expr [string length $output] + 1]