Changeset 14532 for trunk/base

Timestamp:

Oct 10, 2005, 2:23:55 PM (19 years ago)

Author:

pguyot (Paul Guyot)

Message:

Hack to act as if we were not expanding ${prefix}.
Remark:
port info tom

will output something with {${prefix}...} in it.

It's the way it worked (I mean in depends_*) and the way it still works.

File:

• trunk/base/src/port/portindex.tcl (modified) (4 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.33 2005/10/09 13:36:16 jberry Exp $
+# $Id: portindex.tcl,v 1.34 2005/10/10 14:23:55 pguyot Exp $
 
 catch {source \
@@ -100 +100 @@
 }
 
-proc pindex {portdir} {
-        variable prefix $darwinports::prefix
-        
+proc pindex {portdir} { 
     global target fd directory archive outdir stats 
     incr stats(total)
@@ -108 +106 @@
         puts "Failed to parse file $portdir/Portfile: $result"
         incr stats(failed)
-    } else {        
+    } else {
+                global darwinports::prefix
+        set save_prefix $prefix
+        set prefix {\${prefix}}
         array set portinfo [dportinfo $interp]
+        set $prefix $save_prefix
         dportclose $interp
         set portinfo(portdir) $portdir
@@ -127 +129 @@
                 exit 1
             }
-        }
-        
-        # 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 {
-                                lappend newDeps [regsub "^(path|lib|bin):$prefix/" $dep {\1:${prefix}/}]
-                        }
-                        set portinfo($dependstype) $newDeps
-                }
         }