May 2014 - macports-changes - lists.macosforge.org

[119641] trunk/dports/devel/mercurial/Portfile
by sean＠macports.org 02 May '14

02 May '14

Revision: 119641 https://trac.macports.org/changeset/119641 Author: sean(a)macports.org Date: 2014-05-02 16:02:45 -0700 (Fri, 02 May 2014) Log Message: ----------- mercurial: update to 3.0 Modified Paths: -------------- trunk/dports/devel/mercurial/Portfile Modified: trunk/dports/devel/mercurial/Portfile =================================================================== --- trunk/dports/devel/mercurial/Portfile 2014-05-02 23:02:42 UTC (rev 119640) +++ trunk/dports/devel/mercurial/Portfile 2014-05-02 23:02:45 UTC (rev 119641) @@ -5,7 +5,7 @@ PortGroup python 1.0 PortGroup bitbucket 1.0 -bitbucket.setup seanfarley mercurial 2.9.2 +bitbucket.setup seanfarley mercurial 3.0 revision 0 categories devel python license GPL-2+ @@ -27,8 +27,8 @@ homepage http://www.selenic.com/mercurial/ platforms darwin -checksums rmd160 0978dd8a1a3ef0b6e123ebbe8ed5915cfdc5eb8e \ - sha256 22d908bceedffeafca9f957f734e9211e34bd3dea15ef24772b4cb70706c6cb6 +checksums rmd160 2f71e8b363f2583e73c4b84f67f977ad628e9228 \ + sha256 ae4baf1fdd3f8943c84104f9aef1efe63cd9f72c39fce351664bd414e79e808a depends_build port:py27-docutils

1 0

[119640] trunk/dports/mail/mu/Portfile
by sean＠macports.org 02 May '14

02 May '14

Revision: 119640 https://trac.macports.org/changeset/119640 Author: sean(a)macports.org Date: 2014-05-02 16:02:42 -0700 (Fri, 02 May 2014) Log Message: ----------- mu-devel: update to newest commit Modified Paths: -------------- trunk/dports/mail/mu/Portfile Modified: trunk/dports/mail/mu/Portfile =================================================================== --- trunk/dports/mail/mu/Portfile 2014-05-02 23:02:39 UTC (rev 119639) +++ trunk/dports/mail/mu/Portfile 2014-05-02 23:02:42 UTC (rev 119640) @@ -41,11 +41,11 @@ } subport mu-devel { - github.setup djcb mu 757c87a22cab + github.setup djcb mu abe7ed306d7a name mu-devel version 0.9.9.0.99 - revision 14 + revision 15 - checksums rmd160 0e9c55685280853566041c5e1226f20820423c24 \ - sha256 f54678586eb4da215262c16679f6fbc05822537c804f74d5dbbcf3fd8affdfb7 + checksums rmd160 bae4155cfd1897f3c9e1aa1c0e9927b54c91f0f6 \ + sha256 6e6ab118886b09417944fd8e5be3c58db35edbf3db458c6b3dc1362e21c06176 }

1 0

[119639] trunk/dports/python/py-netcdf4/Portfile
by sean＠macports.org 02 May '14

02 May '14

Revision: 119639 https://trac.macports.org/changeset/119639 Author: sean(a)macports.org Date: 2014-05-02 16:02:39 -0700 (Fri, 02 May 2014) Log Message: ----------- py-netcdf4: update to 1.0.9 Modified Paths: -------------- trunk/dports/python/py-netcdf4/Portfile Modified: trunk/dports/python/py-netcdf4/Portfile =================================================================== --- trunk/dports/python/py-netcdf4/Portfile 2014-05-02 23:02:36 UTC (rev 119638) +++ trunk/dports/python/py-netcdf4/Portfile 2014-05-02 23:02:39 UTC (rev 119639) @@ -5,7 +5,7 @@ PortGroup python 1.0 name py-netcdf4 -version 1.0.8 +version 1.0.9 categories-append science platforms darwin maintainers sean \ @@ -25,8 +25,8 @@ master_sites http://pypi.python.org/packages/source/n/netCDF4 distname netCDF4-${version} -checksums rmd160 f87865cd2d101d4160504515a177fd396b50c8d0 \ - sha256 393a2e1bd10332a446a461c1f5e82b79f23fad76c3f3afa9af326dde54a58795 +checksums rmd160 a60eb5b32bd6e48ec6ddb546d849c98e151917cb \ + sha256 3cb4699b9ad1f29b5eeae6ba3754f9c929ceeb24376fb3705c0b28216a94c425 build.env-append USE_NCCONFIG=1 destroot.env-append USE_NCCONFIG=1

1 0

[119638] trunk/dports/science/openmpi/Portfile
by sean＠macports.org 02 May '14

02 May '14

Revision: 119638 https://trac.macports.org/changeset/119638 Author: sean(a)macports.org Date: 2014-05-02 16:02:36 -0700 (Fri, 02 May 2014) Log Message: ----------- openmpi-devel: update to newest commit Modified Paths: -------------- trunk/dports/science/openmpi/Portfile Modified: trunk/dports/science/openmpi/Portfile =================================================================== --- trunk/dports/science/openmpi/Portfile 2014-05-02 23:02:33 UTC (rev 119637) +++ trunk/dports/science/openmpi/Portfile 2014-05-02 23:02:36 UTC (rev 119638) @@ -44,17 +44,17 @@ if {[string first "-devel" $subport] > 0} { version 1.9a1 - revision 31387 + revision 31596 name openmpi-devel distname openmpi-${version}r${revision} master_sites http://www.open-mpi.org/nightly/trunk \ http://www.open-mpi.de/nightly/trunk - checksums md5 0cfb6ee6be3d64819989854c0a9ed472 \ - sha1 91a6ac2a36efb91ef0c2fac3b9cc0b0a116eade4 \ - rmd160 9127af1bc894aaad859568f44c6e06886df7b2fa \ - sha256 6078028dca500626330a7ea1cd75274fb69a54925c0b0fa564569e7f8ad447e3 + checksums md5 301eb14ab1666b5b343e9986ed77d247 \ + sha1 af9c2b2cc513f6236e4a0ee0256699b44f79a2af \ + rmd160 a33cbad3642a910ad1b5e1282df951ec299216c9 \ + sha256 d22eeaae95ee5dc1e827b94fbdd7b47b08db1cb37d4e1f8efa8b1f5c77f5778c livecheck.version ${revision} livecheck.url http://www.open-mpi.org/nightly/trunk

1 0

[119637] trunk/dports/science/mpich/Portfile
by sean＠macports.org 02 May '14

02 May '14

Revision: 119637 https://trac.macports.org/changeset/119637 Author: sean(a)macports.org Date: 2014-05-02 16:02:33 -0700 (Fri, 02 May 2014) Log Message: ----------- mpich-devel: update to newest commit Modified Paths: -------------- trunk/dports/science/mpich/Portfile Modified: trunk/dports/science/mpich/Portfile =================================================================== --- trunk/dports/science/mpich/Portfile 2014-05-02 23:02:29 UTC (rev 119636) +++ trunk/dports/science/mpich/Portfile 2014-05-02 23:02:33 UTC (rev 119637) @@ -50,16 +50,15 @@ if {[string first "-devel" $subport] > 0} { name mpich-devel version 3.1 - revision 157 + revision 208 # To see 3.1 as newer than 3.1rcX epoch 1 - distname mpich-master-v${version}-${revision}-gcdd8e0b7 + distname mpich-master-v${version}-${revision}-g62ada3c5 master_sites ${homepage}static/downloads/nightly/master/mpich - checksums \ - rmd160 2e4fd9ef54553cd6b4725ad04d8e319fe257f38c \ - sha256 36584ad54633ad0b8df7d4d4b7ee9f66af920d71b80e4ec6c9c0cf8cc78b1588 + checksums rmd160 7a11c1cc5edc764da86851e5fcd33b8fa0fd1bd5 \ + sha256 d4b06049dc446336769bb4219f1d6c1ad71fcabde169a6cef521cfd20d96cb5f livecheck.version ${revision} livecheck.regex \

1 0

[119636] trunk/dports/python/py-ferari/Portfile
by sean＠macports.org 02 May '14

02 May '14

Revision: 119636 https://trac.macports.org/changeset/119636 Author: sean(a)macports.org Date: 2014-05-02 16:02:29 -0700 (Fri, 02 May 2014) Log Message: ----------- py-ferari: add missing python dependency; fixes #43540 Modified Paths: -------------- trunk/dports/python/py-ferari/Portfile Modified: trunk/dports/python/py-ferari/Portfile =================================================================== --- trunk/dports/python/py-ferari/Portfile 2014-05-02 23:02:26 UTC (rev 119635) +++ trunk/dports/python/py-ferari/Portfile 2014-05-02 23:02:29 UTC (rev 119636) @@ -8,7 +8,7 @@ bitbucket.setup fenics-project ferari 208a515cad05 name py-ferari version 1.0.0 -revision 1 +revision 2 categories-append math science license LGPL-3+ @@ -28,7 +28,7 @@ python.link_binaries_suffix if {${subport} ne ${name}} { - depends_lib port:swig-python + depends_lib-append port:swig-python } # project has no tags or branches to version, so manually check

1 0

[119635] trunk/dports/math/ml/Portfile
by sean＠macports.org 02 May '14

02 May '14

Revision: 119635 https://trac.macports.org/changeset/119635 Author: sean(a)macports.org Date: 2014-05-02 16:02:26 -0700 (Fri, 02 May 2014) Log Message: ----------- ml: add missing require_fortran; fixes #43541 Modified Paths: -------------- trunk/dports/math/ml/Portfile Modified: trunk/dports/math/ml/Portfile =================================================================== --- trunk/dports/math/ml/Portfile 2014-05-02 23:02:23 UTC (rev 119634) +++ trunk/dports/math/ml/Portfile 2014-05-02 23:02:26 UTC (rev 119635) @@ -4,10 +4,11 @@ PortSystem 1.0 PortGroup mpi 1.0 -mpi.setup +mpi.setup require_fortran name ml version 6.2 +revision 1 categories math platforms darwin maintainers sean openmaintainer @@ -45,6 +46,10 @@ system -W ${destroot}${prefix}/lib "ln -s lib${name}.${version}.dylib lib${name}.dylib" } +if {![fortran_variant_isset]} { + default_variants +gfortran +} + if {[mpi_variant_isset]} { configure.args-append --enable-mpi configure.cflags-append -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX

1 0

[119634] trunk/dports/_resources/port1.0/group/compilers-1.0.tcl
by sean＠macports.org 02 May '14

02 May '14

Revision: 119634 https://trac.macports.org/changeset/119634 Author: sean(a)macports.org Date: 2014-05-02 16:02:23 -0700 (Fri, 02 May 2014) Log Message: ----------- compilers-1.0: remove unneeded flag replacement Modified Paths: -------------- trunk/dports/_resources/port1.0/group/compilers-1.0.tcl Modified: trunk/dports/_resources/port1.0/group/compilers-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/compilers-1.0.tcl 2014-05-02 22:13:33 UTC (rev 119633) +++ trunk/dports/_resources/port1.0/group/compilers-1.0.tcl 2014-05-02 23:02:23 UTC (rev 119634) @@ -63,9 +63,6 @@ set cdb(gcc4$v,dependsd) port:g95 set cdb(gcc4$v,dependsa) gcc4$v set cdb(gcc4$v,conflict) "gfortran g95" - set cdb(gcc4$v,flags) { - {{"-PIC"} {"-fPIC"}} - } set cdb(gcc4$v,cc) ${prefix}/bin/gcc-mp-4.$v set cdb(gcc4$v,cxx) ${prefix}/bin/g++-mp-4.$v set cdb(gcc4$v,cpp) ${prefix}/bin/cpp-mp-4.$v @@ -86,9 +83,6 @@ set cdb(clang3$v,dependsd) "" set cdb(clang3$v,dependsa) clang-3.$v set cdb(clang3$v,conflict) "" - set cdb(clang3$v,flags) { - {{"-PIC"} {"-fPIC"}} - } set cdb(clang3$v,cc) ${prefix}/bin/clang-mp-3.$v set cdb(clang3$v,cxx) ${prefix}/bin/clang++-mp-3.$v set cdb(clang3$v,cpp) "${prefix}/bin/clang-mp-3.$v -E" @@ -110,9 +104,6 @@ set cdb(dragonegg3$v,dependsd) port:g95 set cdb(dragonegg3$v,dependsa) dragonegg-3.$v set cdb(dragonegg3$v,conflict) "gfortran g95" - set cdb(dragonegg3$v,flags) { - {{"-PIC"} {"-fPIC"}} - } set cdb(dragonegg3$v,cc) ${prefix}/bin/dragonegg-3.$v-gcc set cdb(dragonegg3$v,cxx) ${prefix}/bin/dragonegg-3.$v-g++ set cdb(dragonegg3$v,cpp) ${prefix}/bin/dragonegg-3.$v-cpp @@ -130,9 +121,6 @@ set cdb(llvm,dependsd) "" set cdb(llvm,dependsa) "" set cdb(llvm,conflict) "" -set cdb(llvm,flags) { - {{"-fPIC"} {"-PIC"}} -} set cdb(llvm,cc) llvm-gcc-4.2 set cdb(llvm,cxx) llvm-g++-4.2 set cdb(llvm,cpp) llvm-cpp-4.2 @@ -151,9 +139,6 @@ set cdb(gfortran,dependsd) "" set cdb(gfortran,dependsa) "" set cdb(gfortran,conflict) "" -set cdb(gfortran,flags) { - {{"-fPIC"} {"-PIC"}} -} set cdb(gfortran,cc) "" set cdb(gfortran,cxx) "" set cdb(gfortran,cpp) "" @@ -170,9 +155,6 @@ set cdb(g95,dependsd) "" set cdb(g95,dependsa) g95 set cdb(g95,conflict) "" -set cdb(g95,flags) { - {{"-fPIC"} {"-PIC"}} -} set cdb(g95,cc) "" set cdb(g95,cxx) "" set cdb(g95,cpp) "" @@ -219,31 +201,6 @@ set c [lreplace $c $i $i] } - # for each pair of flags (old,new), build a string of if statements to - # replace old with new - set f "" - foreach flag $cdb($variant,flags) { - foreach {old new} $flag { - append f [subst { - if {\[string first $old \${configure.cflags}\] > -1} { - configure.cflags-delete $old - configure.cflags-append $new - } - }] - } - } - - foreach flag $cdb($variant,flags) { - foreach {old new} $flag { - append f [subst { - if {\[string first $old \${configure.cxxflags}\] > -1} { - configure.cxxflags-delete $old - configure.cxxflags-append $new - } - }] - } - } - # for each compiler, set the value if not empty; we can't use # configure.compiler because of dragonegg and possibly other new # compilers that aren't in macports portconfigure.tcl @@ -273,8 +230,6 @@ depends_skip_archcheck $cdb($variant,dependsa) $comp - - $f } }] }

1 0

[119633] trunk/base/src/macports1.0/tests/test.tcl
by cal＠macports.org 02 May '14

02 May '14

Revision: 119633 https://trac.macports.org/changeset/119633 Author: cal(a)macports.org Date: 2014-05-02 15:13:33 -0700 (Fri, 02 May 2014) Log Message: ----------- base macports1.0 tests: use Tcl 8.5, avoid eval Modified Paths: -------------- trunk/base/src/macports1.0/tests/test.tcl Modified: trunk/base/src/macports1.0/tests/test.tcl =================================================================== --- trunk/base/src/macports1.0/tests/test.tcl 2014-05-02 22:10:47 UTC (rev 119632) +++ trunk/base/src/macports1.0/tests/test.tcl 2014-05-02 22:13:33 UTC (rev 119633) @@ -1,5 +1,5 @@ # Global vars -set arguments "" +set arguments {} set test_name "" set color_out "" set tcl "" @@ -17,8 +17,8 @@ proc print_help {arg} { if { $arg eq "tests" } { puts "The list of available tests is:" - cd tests - set test_suite [glob *.test] + cd tests + set test_suite [glob *.test] foreach test $test_suite { puts [puts -nonewline " "]$test } @@ -41,7 +41,8 @@ set index [expr {[lsearch $argv $arg] + 1}] set level [lindex $argv $index] if { $level >= 0 && $level <= 3 } { - append arguments "-debug " $level + lappend arguments "-debug" + lappend arguments $level } else { puts "Invalid debug level." exit 1 @@ -50,29 +51,29 @@ set index [expr {[lsearch $argv $arg] + 1}] set test_name [lindex $argv $index] set no 0 - cd tests - set test_suite [glob *.test] + cd tests + set test_suite [glob *.test] foreach test $test_suite { - if { $test_name != $test } { - set no [expr {$no + 1}] + if {$test_name ne $test} { + incr no } } - if { $no == [llength $test_suite] } { + if {$no == [llength $test_suite]} { print_help tests exit 1 } - } elseif { $arg eq "-l" } { + } elseif {$arg eq "-l"} { print_help tests exit 0 - } elseif { $arg eq "-nocolor" } { + } elseif {$arg eq "-nocolor"} { set color_out "no" } } # Run tests -if { $test_name ne ""} { - set result [eval exec $tcl $test_name $arguments 2>@stderr] +if {$test_name ne ""} { + set result [exec -ignorestderr $tcl $test_name {*}$arguments] puts $result } else { @@ -80,31 +81,33 @@ set test_suite [glob *.test] foreach test $test_suite { - set result [eval exec $tcl $test $arguments 2>@stderr] - set lastline [lindex [split $result "\n"] end] + set result [exec -ignorestderr $tcl $test {*}$arguments] + set lastline [lindex [split $result "\n"] end] - if {[lrange [split $lastline "\t"] 1 1] != "Total"} { - set lastline [lindex [split $result "\n"] end-2] - set errmsg [lindex [split $result "\n"] end] - } + if {[lrange [split $lastline "\t"] 1 1] != "Total"} { + set lastline [lindex [split $result "\n"] end-2] + set errmsg [lindex [split $result "\n"] end] + } - set splitresult [split $lastline "\t"] + set splitresult [split $lastline "\t"] set total [lindex $splitresult 2] set pass [lindex $splitresult 4] set skip [lindex $splitresult 6] 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}"} + # 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}"} # Check for errors. - if { $fail != 0 } { set err "yes" } + if {$fail != 0} { + set err "yes" + } set out "" - if { ($fail != 0 || $skip != 0) && $color_out eq "" } { + if {($fail != 0 || $skip != 0) && $color_out eq ""} { # Color failed tests. append out "\x1b\[1;31mTotal:" $total " Passed:" $pass " Failed:" $fail " Skipped:" $skip " \x1b\[0m" $test } else { @@ -113,19 +116,21 @@ # Print results and constrints for auto-skipped tests. puts $out - if { $skip != 0 } { + if {$skip != 0} { set out " Constraint: " append out [string trim $errmsg "\t {}"] puts $out } - if { $fail != 0 } { - set end [expr {[string first $test $result 0] - 1}] - puts [string range $result 0 $end] - } + if {$fail != 0} { + set end [expr {[string first $test $result 0] - 1}] + puts [string range $result 0 $end] + } } } # Return 1 if errors were found. -if {$err ne ""} { exit 1 } +if {$err ne ""} { + exit 1 +} return 0

1 0

[119632] trunk/base/src/macports1.0/macports_dlist.tcl
by cal＠macports.org 02 May '14

02 May '14

Revision: 119632 https://trac.macports.org/changeset/119632 Author: cal(a)macports.org Date: 2014-05-02 15:10:47 -0700 (Fri, 02 May 2014) Log Message: ----------- base: macports_dlist.tcl: avoid eval Modified Paths: -------------- trunk/base/src/macports1.0/macports_dlist.tcl Modified: trunk/base/src/macports1.0/macports_dlist.tcl =================================================================== --- trunk/base/src/macports1.0/macports_dlist.tcl 2014-05-02 20:21:58 UTC (rev 119631) +++ trunk/base/src/macports1.0/macports_dlist.tcl 2014-05-02 22:10:47 UTC (rev 119632) @@ -17,7 +17,7 @@ # 3. Neither the name of Apple Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -55,21 +55,21 @@ # dlist_match_multi # Returns all dependency entries for which the entry's value for 'key' exactly matches the given 'value'. -# dlist - the dependency list to search -# criteria - the key/value pairs to compare +# dlist - the dependency list to search +# criteria - the key/value pairs to compare proc dlist_match_multi {dlist criteria} { set result {} foreach ditem $dlist { - set match 1 - foreach {key value} $criteria { - if {[ditem_key $ditem $key] != $value} { - set match 0 - break - } + set match 1 + foreach {key value} $criteria { + if {[ditem_key $ditem $key] != $value} { + set match 0 + break + } } if {$match} { - lappend result $ditem + lappend result $ditem } } return $result @@ -77,9 +77,9 @@ # dlist_search # Returns all dependency entries whose 'key' contains 'value'. -# dlist - the dependency list to search -# key - the key to compare: Requires, Provides, et al. -# value - the value to compare +# dlist - the dependency list to search +# key - the key to compare: Requires, Provides, et al. +# value - the value to compare proc dlist_search {dlist key value} { set result {} @@ -93,22 +93,22 @@ # dlist_delete # Deletes the specified ditem from the dlist. -# dlist - the list to search -# ditem - the item to delete +# dlist - the list to search +# ditem - the item to delete proc dlist_delete {dlist ditem} { - upvar $dlist uplist - set ix [lsearch -exact $uplist $ditem] - if {$ix >= 0} { + upvar $dlist uplist + set ix [lsearch -exact $uplist $ditem] + if {$ix >= 0} { set uplist [lreplace $uplist $ix $ix] - } + } } # dlist_has_pending # Returns true if the dlist contains ditems # which will provide one of the specified names, # and thus are still "pending". -# dlist - the dependency list to search -# tokens - the list of pending tokens to check for +# dlist - the dependency list to search +# tokens - the list of pending tokens to check for proc dlist_has_pending {dlist tokens} { foreach token $tokens { @@ -153,9 +153,9 @@ # ditem_key # Sets and returns the given key of the dependency item. -# ditem - the dependency item to operate on -# key - the key to set -# value - optional value to set the key to +# ditem - the dependency item to operate on +# key - the key to set +# value - optional value to set the key to proc ditem_key {ditem args} { set nbargs [llength $args] @@ -170,40 +170,40 @@ # ditem_append # Appends the value to the given key of the dependency item. -# ditem - the dependency item to operate on -# key - the key to append to -# value - the value to append to the key +# ditem - the dependency item to operate on +# key - the key to append to +# value - the value to append to the key proc ditem_append {ditem key args} { - eval "return \[macports_dlist::ditem_append $ditem $key $args\]" + return [macports_dlist::ditem_append $ditem $key {*}$args] } # ditem_append_unique # Appends the value to the given key of the dependency item if # they were not there yet. -# ditem - the dependency item to operate on -# key - the key to append to -# value - the value to append to the key +# ditem - the dependency item to operate on +# key - the key to append to +# value - the value to append to the key proc ditem_append_unique {ditem key args} { - eval "return \[macports_dlist::ditem_append_unique $ditem $key $args\]" + return [macports_dlist::ditem_append_unique $ditem $key {*}$args] } # ditem_contains # Tests whether the ditem key contains the specified value; # or if the value is omitted, tests whether the key exists. -# ditem - the dependency item to test -# key - the key to examine -# value - optional value to search for in the key +# ditem - the dependency item to test +# key - the key to examine +# value - optional value to search for in the key proc ditem_contains {ditem key args} { - eval "return \[macports_dlist::ditem_contains $ditem $key $args\]" + return [macports_dlist::ditem_contains $ditem $key {*}$args] } # dlist_append_dependents # Returns the ditems which are dependents of the ditem specified. -# dlist - the dependency list to search -# ditem - the item which itself, and its dependents should be selected -# result - used for recursing, pass empty initially. +# dlist - the dependency list to search +# ditem - the item which itself, and its dependents should be selected +# result - used for recursing, pass empty initially. proc dlist_append_dependents {dlist ditem result} { # Only append things if the root item is not in the list. @@ -233,9 +233,9 @@ # on unfulfilled tokens in the Uses key. However these items # will eventually be returned if there are no alternatives. # Soft-dependencies can be implemented in this way. -# dlist - the dependency list to select from -# statusdict - the status dictionary describing the history -# of the dependency list. +# dlist - the dependency list to select from +# statusdict - the status dictionary describing the history +# of the dependency list. proc dlist_get_next {dlist statusdict} { upvar $statusdict upstatus @@ -278,14 +278,14 @@ # ditems are eligible to run (the selector returns {}) then # dlist_eval will exit with a list of the remaining ditems, # or {} if all ditems were evaluated. -# dlist - the dependency list to evaluate -# testcond - test condition to populate the status dictionary -# should return {-1, 0, 1} -# handler - the handler to invoke on each ditem -# canfail - If 1, then progress will not stop when a failure -# occures; if 0, then dlist_eval will return on the -# first failure -# selector - the selector for determining eligibility +# dlist - the dependency list to evaluate +# testcond - test condition to populate the status dictionary +# should return {-1, 0, 1} +# handler - the handler to invoke on each ditem +# canfail - If 1, then progress will not stop when a failure +# occures; if 0, then dlist_eval will return on the +# first failure +# selector - the selector for determining eligibility proc dlist_eval {dlist testcond handler {canfail "0"} {selector "dlist_get_next"}} { array set statusdict [list] @@ -294,7 +294,7 @@ # can evaluate to true. if {$testcond ne ""} { foreach ditem $dlist { - if {[eval "expr \[\$testcond \$ditem\] == 1"]} { + if {[expr [$testcond $ditem]]} { foreach token [ditem_key $ditem provides] { set statusdict($token) 1 } @@ -308,14 +308,14 @@ set ditem [$selector $dlist statusdict] if {$ditem == {}} { - if {[llength $dlist] > 0} { - ui_debug "dlist_eval: all entries in dependency list have unsatisfied dependencies; can't process" - } + if {[llength $dlist] > 0} { + ui_debug "dlist_eval: all entries in dependency list have unsatisfied dependencies; can't process" + } break } else { # $handler should return a unix status code, 0 for success. # statusdict notation is 1 for success - if {[catch {eval "$handler $ditem"} result]} { + if {[catch {$handler $ditem} result]} { puts $result return $dlist } @@ -388,7 +388,7 @@ variable $ditem set x [lindex [array get $ditem $key] 1] if {$x != {}} { - eval "lappend x $args" + lappend x {*}$args } else { set x $args } @@ -400,7 +400,7 @@ variable $ditem set x [lindex [array get $ditem $key] 1] if {$x != {}} { - eval "lappend x $args" + lappend x {*}$args set x [lsort -unique $x] } else { set x $args @@ -412,7 +412,7 @@ proc ditem_contains {ditem key args} { variable $ditem if {[llength $args] == 0} { - eval "return \[info exists ${ditem}($key)\]" + return [info exists [subst $ditem]($key)] } else { set x [lindex [array get $ditem $key] 1] if {[llength $x] > 0 && [lsearch -exact $x [lindex $args 0]] != -1} { @@ -425,4 +425,3 @@ # End of macports_dlist namespace } -

1 0