[37254] trunk/base/src/port/port.tcl

[raimue at macports.org]

Revision: 37254
          http://trac.macosforge.org/projects/macports/changeset/37254
Author:   raimue at macports.org
Date:     2008-05-31 22:22:03 -0700 (Sat, 31 May 2008)

Log Message:
-----------
port/port.tcl:
Fix output on occurrences of proc wrap

Modified Paths:
--------------
    trunk/base/src/port/port.tcl

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2008-06-01 05:12:23 UTC (rev 37253)
+++ trunk/base/src/port/port.tcl	2008-06-01 05:22:03 UTC (rev 37254)
@@ -1183,7 +1183,7 @@
 
         set ret "Usage: "
         set len [string length $action]
-        append ret [wrap "$action$cmds$args" [expr 80 - $len] [string repeat " " [expr 8 + $len]] 0]
+        append ret [wrap "$action$cmds$args" 80 [string repeat " " [expr 8 + $len]] 0]
         append ret "\n"
 
         return $ret
@@ -1393,8 +1393,8 @@
             if {[info exists portinfo(variants)]} {
                 global global_variations
 
-                puts -nonewline "Variants:    "
                 set joiner ""
+                set vars ""
                 foreach v [lsort $portinfo(variants)] {
                     set mod ""
                     if {[info exists variations($v)]} {
@@ -1405,10 +1405,11 @@
                         set mod "($global_variations($v))"
                     }
                     # TODO: selected by default_variants (with [+]/[-])
-                    puts -nonewline "$joiner$mod$v"
+                    append vars "$joiner$mod$v"
                     set joiner ", "
                 }
-                puts ""
+                puts -nonewline "Variants:    "
+                puts [wrap $vars 80 [string repeat " " 13] 0]
             }
             puts ""
             if {[info exists portinfo(long_description)]} {
@@ -2094,7 +2095,7 @@
                     puts -nonewline " ([join $portinfo(categories) ", "])"
                 }
                 puts ""
-                puts [wrap [join $portinfo(description)] 76 [string repeat " " 4]]
+                puts [wrap [join $portinfo(description)] 80 [string repeat " " 4]]
             }
 
             set joiner "\n"

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080531/00c72bf0/attachment.htm