Skip to content
Permalink
Browse files

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

…sion,revision} switch

git-svn-id: https://svn.macports.org/repository/macports/trunk/base@962 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
landonf committed Oct 5, 2002
1 parent 9724049 commit 06edd47f2dd81d9c428d76199402e3197b8e0789
Showing with 10 additions and 10 deletions.
  1. +5 −5 src/port/port.tcl
  2. +1 −1 src/port/portall.tcl
  3. +3 −3 src/port/portindex.tcl
  4. +1 −1 src/port1.0/portmain.tcl
@@ -120,20 +120,20 @@ switch -- $action {
foreach {name array} $res {
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
}
if {![info exists portfound] || $portfound == 0} {
@@ -37,7 +37,7 @@ proc pindex {portdir} {
return -1
}
array set portinfo [dportinfo $interp]
puts "Doing $target for port: $portinfo(portname)"
puts "Doing $target for port: $portinfo(name)"
dportexec $interp $target
dportclose $interp
}
@@ -43,7 +43,7 @@ proc pindex {portdir} {
array set portinfo [dportinfo $interp]
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]]] {
if {[catch {file mkdir [file join $outdir [file dirname $portdir]]} result]} {
@@ -53,15 +53,15 @@ proc pindex {portdir} {
}
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"
exit 1
}
}
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
}

@@ -50,7 +50,7 @@ default workdir work
default workpath {[file join $portpath $workdir]}
default prefix /opt/local
default filedir files
default portrevision 0
default revision 0
default distname {${portname}-${portversion}}
default worksrcdir {$distname}
default filesdir {files}

0 comments on commit 06edd47

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