Changeset 962 for trunk/base

Timestamp:

Oct 5, 2002, 9:11:36 PM (22 years ago)

Author:

landonf (Landon Fuller)

Message:

Update indexing to work with port{name,version,revision} -> {name,version,revision} switch

Location:

trunk/base/src

Files:

• port/port.tcl (modified) (1 diff)
• port/portall.tcl (modified) (1 diff)
• port/portindex.tcl (modified) (3 diffs)
• port1.0/portmain.tcl (modified) (1 diff)

trunk/base/src/port/port.tcl

@@ -121 +121 @@
             array set portinfo $array
             # XXX is this the right place to verify an entry?
-            if ![info exists portinfo(portname)] {
+            if ![info exists portinfo(name)] {
                 puts "Invalid port entry, missing portname"
                 continue
             }
             if ![info exists portinfo(description)] {
-                puts "Invalid port entry for $portinfo(portname), missing description"
+                puts "Invalid port entry for $portinfo(name), missing description"
                 continue
             }
-            if ![info exists portinfo(portversion)] {
-                puts "Invalid port entry for $portinfo(portname), missing portversion"
+            if ![info exists portinfo(version)] {
+                puts "Invalid port entry for $portinfo(name), missing version"
                 continue
             }
             set portfound 1
-            puts [format "%-15s\t%-8s\t%s" $portinfo(portname) $portinfo(portversion) $portinfo(description)]
+            puts [format "%-15s\t%-8s\t%s" $portinfo(name) $portinfo(version) $portinfo(description)]
             unset portinfo
         }

trunk/base/src/port/portall.tcl

@@ -38 +38 @@
     }
     array set portinfo [dportinfo $interp]
-    puts "Doing $target for port: $portinfo(portname)"
+    puts "Doing $target for port: $portinfo(name)"
     dportexec $interp $target
     dportclose $interp

trunk/base/src/port/portindex.tcl

@@ -44 +44 @@
     dportclose $interp
     set portinfo(portdir) $portdir
-    puts "Adding port $portinfo(portname)"
+    puts "Adding port $portinfo(name)"
     if {$archive == "1"} {
         if ![file isdirectory [file join $outdir [file dirname $portdir]]] {
@@ -54 +54 @@
         set portinfo(portarchive) [file join [file dirname $portdir] [file tail $portdir]].tgz
         cd [file join $directory [file dirname $portinfo(portdir)]]
-        puts "Archiving port $portinfo(portname) to [file join $outdir $portinfo(portarchive)]"
+        puts "Archiving port $portinfo(name) to [file join $outdir $portinfo(portarchive)]"
         if {[catch {exec tar -cf - [file tail $portdir] | gzip -c >[file join $outdir $portinfo(portarchive)]} result]} {
             puts "Failed to create port archive $portinfo(portarchive): $result"
@@ -62 +62 @@
     set output [array get portinfo]
     set len [expr [string length $output] + 1]
-    puts $fd "$portinfo(portname) $len"
+    puts $fd "$portinfo(name) $len"
     puts $fd $output
 }

trunk/base/src/port1.0/portmain.tcl

@@ -51 +51 @@
 default prefix /opt/local
 default filedir files
-default portrevision 0
+default revision 0
 default distname {${portname}-${portversion}}
 default worksrcdir {$distname}