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

[jmr at macports.org]

Revision: 116496
          https://trac.macports.org/changeset/116496
Author:   jmr at macports.org
Date:     2014-01-27 02:19:26 -0800 (Mon, 27 Jan 2014)
Log Message:
-----------
port.tcl: fix Tcl 8.4 incompatibilities introduced in r116448

Revision Links:
--------------
    https://trac.macports.org/changeset/116448

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

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2014-01-27 09:56:24 UTC (rev 116495)
+++ trunk/base/src/port/port.tcl	2014-01-27 10:19:26 UTC (rev 116496)
@@ -1717,14 +1717,14 @@
             set sepPos [string first "/" $opt]
             if {$sepPos >= 0} {
                 # Version terminated by "/" to disambiguate -variant from part of version
-                set portversion [string range $opt 0 $sepPos-1]
-                set opt [string range $opt $sepPos+1 end]
+                set portversion [string range $opt 0 [expr {$sepPos - 1}]]
+                set opt [string range $opt [expr {$sepPos + 1}] end]
             } else {
                 # Version terminated by "+", or else is complete
                 set sepPos [string first "+" $opt]
                 if {$sepPos >= 0} {
                     # Version terminated by "+"
-                    set portversion [string range $opt 0 $sepPos-1]
+                    set portversion [string range $opt 0 [expr {$sepPos - 1}]]
                     set opt [string range $opt $sepPos end]
                 } else {
                     # Unterminated version
@@ -1745,7 +1745,7 @@
             } elseif {[regexp {^([-+])([[:alpha:]_]+[\w\.]*)} $opt match sign variant] == 1} {
                 # It's a variant
                 set portvariants($variant) $sign
-                set opt [string range $opt [string length $variant]+1 end]
+                set opt [string range $opt [expr {[string length $variant] + 1}] end]
                 set consumed 1
             } else {
                 # Not an option we recognize, so break from port option processing
@@ -1889,8 +1889,8 @@
             set portdir [file split [macports::getportdir $porturl]]
             set lsize [llength $portdir]
             set portdir \
-                [file join [lindex $portdir $lsize-2] \
-                           [lindex $portdir $lsize-1]]
+                [file join [lindex $portdir [expr {$lsize - 2}]] \
+                           [lindex $portdir [expr {$lsize - 1}]]]
             if {[catch {mportsearch $portdir no exact portdir} result]} {
                 ui_debug "$::errorInfo"
                 break_softcontinue "Portdir $portdir not found" 1 status
@@ -2854,8 +2854,8 @@
             set portdir [file split [macports::getportdir $porturl]]
             set lsize [llength $portdir]
             set portdir \
-                [file join [lindex $portdir $lsize-2] \
-                           [lindex $portdir $lsize-1]]
+                [file join [lindex $portdir [expr {$lsize - 2}]] \
+                           [lindex $portdir [expr {$lsize - 1}]]]
             if {[catch {mportsearch $portdir no exact portdir} result]} {
                 ui_debug "$::errorInfo"
                 break_softcontinue "Portdir $portdir not found" 1 status
@@ -4647,7 +4647,7 @@
     }
 
     # Decide how to do completion based on where we are in the string
-    set prefix [string range $text 0 $start-1]
+    set prefix [string range $text 0 [expr {$start - 1}]]
     
     # If only whitespace characters preceed us, or if the
     # previous non-whitespace character was a ;, then we're
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140127/9e32f438/attachment.html>