Ticket #21725: portlist.diff

port.tcl

@@ -3789 +3789 @@
 
 
 proc action_list { action portlist opts } {
-    global private_options
+    global private_options macports::sources
     set status 0
-    
+    set local_sources [list]
+ 
+    foreach source $sources {
+        set src [string trim [lindex $source 0]]
+        if  {[lsearch $local_sources $src ] < 0} {
+            lappend local_sources $src
+        }
+    }
+
     # Default to list all ports if no portnames are supplied
     if { ![llength $portlist] && [info exists private_options(ports_no_args)] && $private_options(ports_no_args) eq "yes"} {
         add_to_portlist portlist [list name "-all-"]
@@ -3817 +3825 @@
             }
         }
 
+        set portpicked false
+        set matches [list]
         foreach {name array} $res {
             array unset portinfo
             array set portinfo $array
@@ -3824 +3834 @@
             if {[info exists portinfo(portdir)]} {
                 set outdir $portinfo(portdir)
             }
-            puts [format "%-30s @%-14s %s" $portinfo(name) $portinfo(version) $outdir]
+            set porturl $portinfo(porturl)
+            if {[macports::ui_isset ports_verbose]} {
+                set bullet ""
+                set len [expr {[string length $porturl] - [string length $outdir] - 2}]
+                set sourceindex [lsearch $local_sources [string range $porturl 0 $len]]
+                if {!$portpicked} {
+                    set bullet "*"
+                }
+                set portpicked true
+                puts [format "%-30s @%-14s %s \[%s\]%s" $portinfo(name) $portinfo(version) $outdir $sourceindex $bullet]
+            } else {
+                puts [format "%-30s @%-14s %s" $portinfo(name) $portinfo(version) $outdir]
+            }
         }
     }
-    
+    # Display legend
+    if {[macports::ui_isset ports_verbose]} {
+        set index -1
+        foreach source $local_sources {
+            incr index
+            ui_msg "${index}:${source}"
+        }
+    }
     return $status
 }