July 2015 - macports-changes - lists.macosforge.org

[138953] trunk/dports/graphics/inkscape-devel/Portfile
by devans＠macports.org 24 Jul '15

24 Jul '15

Revision: 138953 https://trac.macports.org/changeset/138953 Author: devans(a)macports.org Date: 2015-07-24 16:35:24 -0700 (Fri, 24 Jul 2015) Log Message: ----------- inkscape-devel: update to bzr 14254. Modified Paths: -------------- trunk/dports/graphics/inkscape-devel/Portfile Modified: trunk/dports/graphics/inkscape-devel/Portfile =================================================================== --- trunk/dports/graphics/inkscape-devel/Portfile 2015-07-24 22:44:09 UTC (rev 138952) +++ trunk/dports/graphics/inkscape-devel/Portfile 2015-07-24 23:35:24 UTC (rev 138953) @@ -5,9 +5,8 @@ name inkscape-devel conflicts inkscape -set bzr_rev 14237 +set bzr_rev 14254 version 0.91.99.${bzr_rev} -revision 1 epoch 1 license GPL-2 LGPL-2.1 maintainers devans

1 0

[138952] trunk/dports/perl/p5-http-message/Portfile
by devans＠macports.org 24 Jul '15

24 Jul '15

Revision: 138952 https://trac.macports.org/changeset/138952 Author: devans(a)macports.org Date: 2015-07-24 15:44:09 -0700 (Fri, 24 Jul 2015) Log Message: ----------- p5-http-message: update to version 6.10. Modified Paths: -------------- trunk/dports/perl/p5-http-message/Portfile Modified: trunk/dports/perl/p5-http-message/Portfile =================================================================== --- trunk/dports/perl/p5-http-message/Portfile 2015-07-24 22:27:30 UTC (rev 138951) +++ trunk/dports/perl/p5-http-message/Portfile 2015-07-24 22:44:09 UTC (rev 138952) @@ -5,7 +5,7 @@ PortGroup perl5 1.0 perl5.branches 5.16 5.18 5.20 5.22 -perl5.setup HTTP-Message 6.08 +perl5.setup HTTP-Message 6.10 platforms darwin maintainers nomaintainer license {Artistic-1 GPL} @@ -17,8 +17,8 @@ the messages passed in HTTP style communication. These are classes \ representing requests, responses and the headers contained within them. -checksums rmd160 2c09fde11ad5db4e10c3ac70c86f2e5568e778fe \ - sha256 7e45b3013e2099a56b50f28bd880cafadfbc603025c0ebde761898bac3f14324 +checksums rmd160 7d9491097ffcdac8177b380f031dfaf93c77bd49 \ + sha256 bd990d3ce6545b8499ca69790847e248cf402614b48f975f8d2ef48cb8cf4c68 if {${perl5.major} != ""} { depends_lib-append \

1 0

[138951] trunk/base/src
by raimue＠macports.org 24 Jul '15

24 Jul '15

Revision: 138951 https://trac.macports.org/changeset/138951 Author: raimue(a)macports.org Date: 2015-07-24 15:27:30 -0700 (Fri, 24 Jul 2015) Log Message: ----------- base: sync test.tcl scripts with each other Modified Paths: -------------- trunk/base/src/macports1.0/tests/test.tcl trunk/base/src/package1.0/tests/test.tcl trunk/base/src/port1.0/tests/test.tcl Modified: trunk/base/src/macports1.0/tests/test.tcl =================================================================== --- trunk/base/src/macports1.0/tests/test.tcl 2015-07-24 22:16:30 UTC (rev 138950) +++ trunk/base/src/macports1.0/tests/test.tcl 2015-07-24 22:27:30 UTC (rev 138951) @@ -15,7 +15,7 @@ } proc print_help {arg} { - if { $arg eq "tests" } { + if {$arg eq "tests"} { puts "The list of available tests is:" cd tests set test_suite [glob *.test] @@ -34,19 +34,19 @@ # Process args foreach arg $argv { - if { $arg eq "-h" || $arg eq "-help" } { + if {$arg eq "-h" || $arg eq "-help"} { print_help "" exit 0 - } elseif { $arg eq "-debug" } { + } elseif {$arg eq "-debug"} { set index [expr {[lsearch $argv $arg] + 1}] set level [lindex $argv $index] - if { $level >= 0 && $level <= 3 } { - lappend arguments -debug $level + if {$level >= 0 && $level <= 3} { + lappend arguments "-debug" $level } else { puts "Invalid debug level." exit 1 } - } elseif { $arg eq "-t" } { + } elseif {$arg eq "-t"} { set index [expr {[lsearch $argv $arg] + 1}] set test_name [lindex $argv $index] set no 0 @@ -74,7 +74,6 @@ if {$test_name ne ""} { set result [exec -ignorestderr $tcl $test_name {*}$arguments] puts $result - } else { cd tests set test_suite [glob *.test] @@ -84,8 +83,13 @@ set lastline [lindex [split $result "\n"] end] if {[lrange [split $lastline "\t"] 1 1] ne "Total"} { - set lastline [lindex [split $result "\n"] end-2] - set errmsg [lindex [split $result "\n"] end] + if {[lrange [split $lastline "\t"] 1 1] eq ""} { + set lastline [lindex [split $result "\n"] 0] + set errmsg [lindex [split $result "\n"] 2] + } else { + set lastline [lindex [split $result "\n"] end-2] + set errmsg [lindex [split $result "\n"] end] + } } set splitresult [split $lastline "\t"] @@ -95,10 +99,18 @@ set fail [lindex $splitresult 8] # Format output - if {$total < 10} { set total "0${total}"} - if {$pass < 10} { set pass "0${pass}"} - if {$skip < 10} { set skip "0${skip}"} - if {$fail < 10} { set fail "0${fail}"} + if {$total < 10} { + set total "0${total}" + } + if {$pass < 10} { + set pass "0${pass}" + } + if {$skip < 10} { + set skip "0${skip}" + } + if {$fail < 10} { + set fail "0${fail}" + } # Check for errors. if {$fail != 0} { Modified: trunk/base/src/package1.0/tests/test.tcl =================================================================== --- trunk/base/src/package1.0/tests/test.tcl 2015-07-24 22:16:30 UTC (rev 138950) +++ trunk/base/src/package1.0/tests/test.tcl 2015-07-24 22:27:30 UTC (rev 138951) @@ -15,7 +15,7 @@ } proc print_help {arg} { - if { $arg eq "tests" } { + if {$arg eq "tests"} { puts "The list of available tests is:" cd tests set test_suite [glob *.test] @@ -54,7 +54,7 @@ set test_suite [glob *.test] foreach test $test_suite { if {$test_name ne $test} { - set no [expr {$no + 1}] + incr no } } if {$no == [llength $test_suite]} { Modified: trunk/base/src/port1.0/tests/test.tcl =================================================================== --- trunk/base/src/port1.0/tests/test.tcl 2015-07-24 22:16:30 UTC (rev 138950) +++ trunk/base/src/port1.0/tests/test.tcl 2015-07-24 22:27:30 UTC (rev 138951) @@ -54,7 +54,7 @@ set test_suite [glob *.test] foreach test $test_suite { if {$test_name ne $test} { - set no [expr {$no + 1}] + incr no } } if {$no == [llength $test_suite]} { @@ -83,8 +83,13 @@ set lastline [lindex [split $result "\n"] end] if {[lrange [split $lastline "\t"] 1 1] ne "Total"} { - set lastline [lindex [split $result "\n"] end-2] - set errmsg [lindex [split $result "\n"] end] + if {[lrange [split $lastline "\t"] 1 1] eq ""} { + set lastline [lindex [split $result "\n"] 0] + set errmsg [lindex [split $result "\n"] 2] + } else { + set lastline [lindex [split $result "\n"] end-2] + set errmsg [lindex [split $result "\n"] end] + } } set splitresult [split $lastline "\t"]

1 0

[138950] trunk/base/src/macports1.0/tests/macports.test
by raimue＠macports.org 24 Jul '15

24 Jul '15

Revision: 138950 https://trac.macports.org/changeset/138950 Author: raimue(a)macports.org Date: 2015-07-24 15:16:30 -0700 (Fri, 24 Jul 2015) Log Message: ----------- macports1.0: rewrite/fix test for ui_message Modified Paths: -------------- trunk/base/src/macports1.0/tests/macports.test Modified: trunk/base/src/macports1.0/tests/macports.test =================================================================== --- trunk/base/src/macports1.0/tests/macports.test 2015-07-24 21:53:57 UTC (rev 138949) +++ trunk/base/src/macports1.0/tests/macports.test 2015-07-24 22:16:30 UTC (rev 138950) @@ -246,33 +246,46 @@ test ui_message { UI message unit test. } -setup { - set fd [open $pwd/message w+] - set fd2 [open $pwd/log w+] + set fd [open $pwd/message w] + set fd2 [open $pwd/log w] set macports::channels(0) $fd - set macports::channels(debuglog) $fd2 set macports::current_phase test set ::debuglog $fd2 } -body { set res [ui_message 0 prefix args] close $fd close $fd2 - set fd2 [open $pwd/message r] - set line [read $fd2] + + set fd [open $pwd/message r] + set fd2 [open $pwd/log r] + set line [read $fd] if {$line ne "prefixargs\n"} { - return "FAIL: wrong message: $line" + return "FAIL: wrong message: $line" } + set line [read $fd2] + if {$line ne ":0:test args\n"} { + return "FAIL: wrong log: $line" + } + close $fd close $fd2 - set fd [open $pwd/message w+] - set fd2 [open $pwd/log w+] - set res [ui_message debuglog prefix -nonewline arg] + set fd [open $pwd/message w] + set fd2 [open $pwd/log w] + set res [ui_message 0 prefix -nonewline arg] close $fd close $fd2 + + set fd [open $pwd/message r] set fd2 [open $pwd/log r] - set line [read $fd2] + set line [read $fd] if {$line ne "prefixarg"} { - return "FAIL: wrong message: $line" + return "FAIL: wrong message: $line" } + set line [read $fd2] + if {$line ne ":0:test arg"} { + return "FAIL: wrong log: $line" + } + close $fd close $fd2 return "UI message successful."

1 0

[138949] trunk/base/src/macports1.0/macports.tcl
by raimue＠macports.org 24 Jul '15

24 Jul '15

Revision: 138949 https://trac.macports.org/changeset/138949 Author: raimue(a)macports.org Date: 2015-07-24 14:53:57 -0700 (Fri, 24 Jul 2015) Log Message: ----------- macports1.0: Handle multi-line messages for log file For log messages with mulitple lines, repeat log level and phase for each line. Assume that messages with -nonewline actually do not contain multiple lines. Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2015-07-24 21:46:53 UTC (rev 138948) +++ trunk/base/src/macports1.0/macports.tcl 2015-07-24 21:53:57 UTC (rev 138949) @@ -246,7 +246,9 @@ if {[lindex $args 0] eq "-nonewline"} { puts -nonewline $chan $strprefix[lindex $args 1] } else { - puts $chan $strprefix[lindex $args 0] + foreach str [split [lindex $args 0] "\n"] { + puts $chan $strprefix$str + } } } }

1 0

[138948] trunk/base/src/macports1.0/macports.tcl
by raimue＠macports.org 24 Jul '15

24 Jul '15

Revision: 138948 https://trac.macports.org/changeset/138948 Author: raimue(a)macports.org Date: 2015-07-24 14:46:53 -0700 (Fri, 24 Jul 2015) Log Message: ----------- macports1.0: Don't add a special "debuglog" string to channels, we want to log everything anyway Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2015-07-24 21:31:09 UTC (rev 138947) +++ trunk/base/src/macports1.0/macports.tcl 2015-07-24 21:46:53 UTC (rev 138948) @@ -138,10 +138,6 @@ ui_debug "Logging disabled, error opening log file: $err" return 1 } - # Add our log-channel to all already initialized channels - foreach key [array names channels] { - set macports::channels($key) [concat $macports::channels($key) debuglog] - } return 0 } proc macports::ch_logging {mport} { @@ -234,27 +230,27 @@ } foreach chan $macports::channels($priority) { - if {[info exists ::debuglog] && ($chan eq "debuglog")} { - set chan $::debuglog - if {[info exists macports::current_phase]} { - set phase $macports::current_phase - } - set strprefix ":${priority}:$phase " - if {[lindex $args 0] eq "-nonewline"} { - puts -nonewline $chan $strprefix[lindex $args 1] - } else { - puts $chan $strprefix[lindex $args 0] - } + if {[lindex $args 0] eq "-nonewline"} { + puts -nonewline $chan $prefix[lindex $args 1] + } else { + puts $chan $prefix[lindex $args 0] + } + } + if {[info exists ::debuglog]} { + set chan $::debuglog + if {[info exists macports::current_phase]} { + set phase $macports::current_phase + } + set strprefix ":${priority}:$phase " + if {[lindex $args 0] eq "-nonewline"} { + puts -nonewline $chan $strprefix[lindex $args 1] } else { - if {[lindex $args 0] eq "-nonewline"} { - puts -nonewline $chan $prefix[lindex $args 1] - } else { - puts $chan $prefix[lindex $args 0] - } + puts $chan $strprefix[lindex $args 0] } } } + proc macports::ui_init {priority args} { global macports::channels ::debuglog set default_channel [macports::ui_channels_default $priority] @@ -265,10 +261,6 @@ set channels($priority) $default_channel } - # if some priority initialized after log file is being created - if {[info exists ::debuglog]} { - set channels($priority) [concat $channels($priority) debuglog] - } # Simplify ui_$priority. try { set prefix [ui_prefix $priority]

1 0

[138947] trunk/base
by raimue＠macports.org 24 Jul '15

24 Jul '15

Revision: 138947 https://trac.macports.org/changeset/138947 Author: raimue(a)macports.org Date: 2015-07-24 14:31:09 -0700 (Fri, 24 Jul 2015) Log Message: ----------- configure: Update OS X versions Modified Paths: -------------- trunk/base/configure trunk/base/configure.ac Modified: trunk/base/configure =================================================================== --- trunk/base/configure 2015-07-24 21:26:53 UTC (rev 138946) +++ trunk/base/configure 2015-07-24 21:31:09 UTC (rev 138947) @@ -3038,7 +3038,7 @@ as_fn_error $? "This version of Mac OS X is not supported Please upgrade at http://store.apple.com/" "$LINENO" 5 ;; - 10.4.[0-9]|10.4.10|10.5.[0-7]|10.6.[0-7]|10.7.[0-4]|10.8.[0-4]|10.9.[0-4]) + 10.4.[0-9]|10.4.10|10.5.[0-7]|10.6.[0-7]|10.7.[0-4]|10.8.[0-4]|10.9.[0-4]|10.10.[0-3]) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This version of Mac OS X is out of date" >&5 $as_echo "$as_me: WARNING: This version of Mac OS X is out of date" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please run Software Update to update it" >&5 Modified: trunk/base/configure.ac =================================================================== --- trunk/base/configure.ac 2015-07-24 21:26:53 UTC (rev 138946) +++ trunk/base/configure.ac 2015-07-24 21:31:09 UTC (rev 138947) @@ -33,7 +33,7 @@ AC_MSG_ERROR([This version of Mac OS X is not supported Please upgrade at http://store.apple.com/] ;; - 10.4.[[0-9]]|10.4.10|10.5.[[0-7]]|10.6.[[0-7]]|10.7.[[0-4]]|10.8.[[0-4]]|10.9.[[0-4]]) + 10.4.[[0-9]]|10.4.10|10.5.[[0-7]]|10.6.[[0-7]]|10.7.[[0-4]]|10.8.[[0-4]]|10.9.[[0-4]]|10.10.[[0-3]]) AC_MSG_WARN([This version of Mac OS X is out of date]) AC_MSG_WARN([Please run Software Update to update it]) ;;

1 0

[138946] trunk/base/src/macports1.0
by raimue＠macports.org 24 Jul '15

24 Jul '15

Revision: 138946 https://trac.macports.org/changeset/138946 Author: raimue(a)macports.org Date: 2015-07-24 14:26:53 -0700 (Fri, 24 Jul 2015) Log Message: ----------- macports1.0: Remove unused phase argument in ui_message Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl trunk/base/src/macports1.0/tests/macports.test Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2015-07-24 20:54:54 UTC (rev 138945) +++ trunk/base/src/macports1.0/macports.tcl 2015-07-24 21:26:53 UTC (rev 138946) @@ -213,7 +213,7 @@ } } -proc ui_message {priority prefix phase args} { +proc ui_message {priority prefix args} { global macports::channels ::debuglog macports::current_phase # @@ -223,13 +223,13 @@ 0 - 1 {} 2 { if {[lindex $args 0] ne "-nonewline"} { - set hint "error: when 5 arguments are given, 2nd last must be \"-nonewline\"" - error "$hint\nusage: ui_message priority prefix phase ?-nonewline? string" + set hint "error: when 4 arguments are given, 3rd must be \"-nonewline\"" + error "$hint\nusage: ui_message priority prefix ?-nonewline? string" } } default { set hint "error: too many arguments specified" - error "$hint\nusage: ui_message priority prefix phase ?-nonewline? string" + error "$hint\nusage: ui_message priority prefix ?-nonewline? string" } } @@ -278,7 +278,7 @@ try { ::ui_init $priority $prefix $channels($priority) {*}$args } catch * { - interp alias {} ui_$priority {} ui_message $priority $prefix {} + interp alias {} ui_$priority {} ui_message $priority $prefix } } Modified: trunk/base/src/macports1.0/tests/macports.test =================================================================== --- trunk/base/src/macports1.0/tests/macports.test 2015-07-24 20:54:54 UTC (rev 138945) +++ trunk/base/src/macports1.0/tests/macports.test 2015-07-24 21:26:53 UTC (rev 138946) @@ -253,25 +253,25 @@ set macports::current_phase test set ::debuglog $fd2 } -body { - set res [ui_message 0 prefix phase args] + set res [ui_message 0 prefix args] close $fd close $fd2 set fd2 [open $pwd/message r] set line [read $fd2] if {$line ne "prefixargs\n"} { - return "FAIL: wrong message" + return "FAIL: wrong message: $line" } close $fd2 set fd [open $pwd/message w+] set fd2 [open $pwd/log w+] - set res [ui_message debuglog prefix phase -nonewline arg] + set res [ui_message debuglog prefix -nonewline arg] close $fd close $fd2 set fd2 [open $pwd/log r] set line [read $fd2] if {$line ne "prefixarg"} { - return "FAIL: wrong message" + return "FAIL: wrong message: $line" } close $fd2

1 0

[138945] trunk/base/src/macports1.0/macports.tcl
by raimue＠macports.org 24 Jul '15

24 Jul '15

Revision: 138945 https://trac.macports.org/changeset/138945 Author: raimue(a)macports.org Date: 2015-07-24 13:54:54 -0700 (Fri, 24 Jul 2015) Log Message: ----------- macports1.0: Fix typo Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2015-07-24 20:43:24 UTC (rev 138944) +++ trunk/base/src/macports1.0/macports.tcl 2015-07-24 20:54:54 UTC (rev 138945) @@ -223,7 +223,7 @@ 0 - 1 {} 2 { if {[lindex $args 0] ne "-nonewline"} { - set hint "error: when 5 arguments are given, 2nd last must be \"-newnewline\"" + set hint "error: when 5 arguments are given, 2nd last must be \"-nonewline\"" error "$hint\nusage: ui_message priority prefix phase ?-nonewline? string" } }

1 0

[138944] trunk/base/src
by raimue＠macports.org 24 Jul '15

24 Jul '15

Revision: 138944 https://trac.macports.org/changeset/138944 Author: raimue(a)macports.org Date: 2015-07-24 13:43:24 -0700 (Fri, 24 Jul 2015) Log Message: ----------- macports1.0, port1.0: Remove ui_*_fetch and ui_*_checksum These seem to be a strange artifact from the implementation of the logging framework. They were added in r52854, but is only in use at a single location. However, it behaves exactly like the normal ui_*, so it is redundant. Revision Links: -------------- https://trac.macports.org/changeset/52854 Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl trunk/base/src/port1.0/portchecksum.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2015-07-24 20:35:45 UTC (rev 138943) +++ trunk/base/src/macports1.0/macports.tcl 2015-07-24 20:43:24 UTC (rev 138944) @@ -41,7 +41,7 @@ package require Tclx namespace eval macports { - namespace export bootstrap_options user_options portinterp_options open_mports ui_priorities port_phases + namespace export bootstrap_options user_options portinterp_options open_mports ui_priorities variable bootstrap_options "\ portdbpath binpath auto_path extra_env sources_conf prefix portdbformat \ portarchivetype portautoclean \ @@ -74,7 +74,6 @@ variable open_mports {} variable ui_priorities "error warn msg notice info debug any" - variable port_phases "any fetch checksum" variable current_phase main variable ui_prefix "---> " @@ -276,14 +275,10 @@ } catch * { set prefix [ui_prefix_default $priority] } - set phases {fetch checksum} try { ::ui_init $priority $prefix $channels($priority) {*}$args } catch * { interp alias {} ui_$priority {} ui_message $priority $prefix {} - foreach phase $phases { - interp alias {} ui_${priority}_$phase {} ui_message $priority $prefix $phase - } } } @@ -1303,9 +1298,6 @@ # instantiate the UI call-backs foreach priority $macports::ui_priorities { $workername alias ui_$priority ui_$priority - foreach phase $macports::port_phases { - $workername alias ui_${priority}_$phase ui_${priority}_$phase - } } # add the UI progress call-back if {[info exists macports::ui_options(progress_download)]} { Modified: trunk/base/src/port1.0/portchecksum.tcl =================================================================== --- trunk/base/src/port1.0/portchecksum.tcl 2015-07-24 20:35:45 UTC (rev 138943) +++ trunk/base/src/port1.0/portchecksum.tcl 2015-07-24 20:43:24 UTC (rev 138944) @@ -281,7 +281,7 @@ ui_debug "[format [msgcat::mc "Correct (%s) checksum for %s"] $type $distfile]" } else { ui_error "[format [msgcat::mc "Checksum (%s) mismatch for %s"] $type $distfile]" - ui_info_fetch "[format [msgcat::mc "Portfile checksum: %s %s %s"] $distfile $type $sum]" + ui_info "[format [msgcat::mc "Portfile checksum: %s %s %s"] $distfile $type $sum]" ui_info "[format [msgcat::mc "Distfile checksum: %s %s %s"] $distfile $type $calculated_sum]" # Raise the failure flag

1 0