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

[116506] trunk/dports/lang/rust
by g5pw＠macports.org 27 Jan '14

27 Jan '14

Revision: 116506 https://trac.macports.org/changeset/116506 Author: g5pw(a)macports.org Date: 2014-01-27 05:33:06 -0800 (Mon, 27 Jan 2014) Log Message: ----------- lang/rust: update to 0.9 Modified Paths: -------------- trunk/dports/lang/rust/Portfile Added Paths: ----------- trunk/dports/lang/rust/files/ trunk/dports/lang/rust/files/src_etc_local_stage0.sh.diff Modified: trunk/dports/lang/rust/Portfile =================================================================== --- trunk/dports/lang/rust/Portfile 2014-01-27 11:19:45 UTC (rev 116505) +++ trunk/dports/lang/rust/Portfile 2014-01-27 13:33:06 UTC (rev 116506) @@ -6,7 +6,7 @@ PortGroup compiler_blacklist_versions 1.0 name rust -version 0.8 +version 0.9 categories lang devel platforms darwin supported_archs i386 x86_64 @@ -36,26 +36,26 @@ master_sites http://static.rust-lang.org/dist:dist distfiles ${distname}${extract.suffix}:dist checksums ${distname}${extract.suffix} \ - rmd160 c2646032eb6aa26eb5a0f1552177c1d1363223b1 \ - sha256 42f791ab1537357fe0f63d67ffe6bcb64ecf16b2bd3f1484ab589823f5914182 \ + rmd160 5cee2a9249b116c667ec3d23e2a70f704a9fa0b8 \ + sha256 c0911c3545b797a1ca16f3d76bf5ed234754b828efd1e22c182c7300ac7dd5d1 \ # Select the snapshot compiler; see src/snapshots.txt in distribution. set stage0(distdir) rust-stage0 -set stage0(date) 2013-09-23 -set stage0(rev) 348d844 +set stage0(date) 2014-01-20 +set stage0(rev) b6400f9 platform darwin i386 { set stage0(platform) macos-${configure.build_arch} switch ${configure.build_arch} { x86_64 { - set stage0(hash) efefdca6b4a40ebeb977037ebbf46c1353f09ee5 - set stage0(rmd160) 64e5a8beccd67e1abb04e67892a0db845db418dd - set stage0(sha256) ed46ae8bcd52b2574713e01a39ccd4c81d7ffe9303905dea0ee7b484c6a963f5 + set stage0(hash) 6458d3b46a951da62c20dd5b587d44333402e30b + set stage0(rmd160) afffc2ca08e82200543f502758765aa55dd7750d + set stage0(sha256) c0a7331863cbd162b33655a5d10378c356b2480d8d11bb5f2c69ec25a38bd7cc } i386 - default { - set stage0(hash) 7085e4dd6bc63864f2ad8a3a21dab945ffd99d8d - set stage0(rmd160) e4cac7f49094c11f90ecacb7f8191e0c253bd3b9 - set stage0(sha256) 08183c0c2398fb8b48ea6a11a38ff664473cf5e458078908663ff1feab1662e0 + set stage0(hash) 3e38ca0328422469ba5f25544ca2a9770cff438d + set stage0(rmd160) a8f03ab4b65d89a1927cff5ef2d67a46f9300843 + set stage0(sha256) 391b001d668599d046d8ade6a9cb05dc45199245e738440ad5bc4440b3e6b88a } } set stage0(distfile) [join "rust stage0 ${stage0(date)} @@ -93,6 +93,8 @@ macports-dragonegg-3.2 macports-dragonegg-3.3 \ macports-gcc-4.2 macports-gcc-4.3 macports-gcc-4.4 +patchfiles src_etc_local_stage0.sh.diff + post-patch { # TODO: Use patches for these when the build system stops changing # so much between releases. @@ -127,11 +129,11 @@ # TODO: Test whether i386 machines can cross-compile for x86_64. platform darwin i386 { set tgts {i686-apple-darwin x86_64-apple-darwin} - configure.pre_args-append --target-triples=[join $tgts ,] + configure.pre_args-append --target=[join $tgts ,] if {${configure.build_arch} eq "i386"} { - configure.pre_args-append --build-triple=[lindex $tgts 0] + configure.pre_args-append --build=[lindex $tgts 0] } else { - configure.pre_args-append --build-triple=[lindex $tgts 1] + configure.pre_args-append --build=[lindex $tgts 1] } } # TODO: Build docs also, probably in a subport. @@ -157,6 +159,7 @@ destroot.args VERBOSE=1 post-destroot { + # Install vim files foreach dir {after/syntax ftdetect indent syntax} { xinstall -d ${destroot}${prefix}/share/vim/vimfiles/${dir} xinstall -m 644 ${worksrcpath}/src/etc/vim/${dir}/rust.vim \ Added: trunk/dports/lang/rust/files/src_etc_local_stage0.sh.diff =================================================================== --- trunk/dports/lang/rust/files/src_etc_local_stage0.sh.diff (rev 0) +++ trunk/dports/lang/rust/files/src_etc_local_stage0.sh.diff 2014-01-27 13:33:06 UTC (rev 116506) @@ -0,0 +1,11 @@ +--- src/etc/local_stage0.sh 2014-01-12 21:47:36.000000000 +0100 ++++ src/etc/local_stage0.sh.new 2014-01-12 21:57:52.000000000 +0100 +@@ -44,8 +44,3 @@ + fi + + cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/ +-cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/

1 0

[116505] trunk/base/src/macports1.0/macports_util.tcl
by jmr＠macports.org 27 Jan '14

27 Jan '14

Revision: 116505 https://trac.macports.org/changeset/116505 Author: jmr(a)macports.org Date: 2014-01-27 03:19:45 -0800 (Mon, 27 Jan 2014) Log Message: ----------- macports_util.tcl: quote expressions Modified Paths: -------------- trunk/base/src/macports1.0/macports_util.tcl Modified: trunk/base/src/macports1.0/macports_util.tcl =================================================================== --- trunk/base/src/macports1.0/macports_util.tcl 2014-01-27 11:13:03 UTC (rev 116504) +++ trunk/base/src/macports1.0/macports_util.tcl 2014-01-27 11:19:45 UTC (rev 116505) @@ -270,8 +270,8 @@ foreach {elem catchBody} $catchList { set typeList [lshift elem] set match? 1 - set typeList [lrange $typeList 0 [expr [llength $savedErrorCode] - 1]] - set codeList [lrange $savedErrorCode 0 [expr [llength $typeList] - 1]] + set typeList [lrange $typeList 0 [expr {[llength $savedErrorCode] - 1}]] + set codeList [lrange $savedErrorCode 0 [expr {[llength $typeList] - 1}]] foreach type $typeList code $codeList { if {![string match $type $code]} { set match? 0

1 0

[116504] trunk/base/portmgr/jobs/port_binary_distributable.tcl
by jmr＠macports.org 27 Jan '14

27 Jan '14

Revision: 116504 https://trac.macports.org/changeset/116504 Author: jmr(a)macports.org Date: 2014-01-27 03:13:03 -0800 (Mon, 27 Jan 2014) Log Message: ----------- port_binary_distributable.tcl: quote expressions Modified Paths: -------------- trunk/base/portmgr/jobs/port_binary_distributable.tcl Modified: trunk/base/portmgr/jobs/port_binary_distributable.tcl =================================================================== --- trunk/base/portmgr/jobs/port_binary_distributable.tcl 2014-01-27 11:01:13 UTC (rev 116503) +++ trunk/base/portmgr/jobs/port_binary_distributable.tcl 2014-01-27 11:13:03 UTC (rev 116504) @@ -146,8 +146,8 @@ # return license with any trailing dash followed by a number and/or plus sign removed proc remove_version {license} { set dash [string last - $license] - if {$dash != -1 && [regexp {[0-9.+]+} [string range $license [expr $dash + 1] end]]} { - return [string range $license 0 [expr $dash - 1]] + if {$dash != -1 && [regexp {[0-9.+]+} [string range $license [expr {$dash + 1}] end]]} { + return [string range $license 0 [expr {$dash - 1}]] } else { return $license }

1 0

[116503] trunk/base/src/registry2.0/registry.tcl
by jmr＠macports.org 27 Jan '14

27 Jan '14

Revision: 116503 https://trac.macports.org/changeset/116503 Author: jmr(a)macports.org Date: 2014-01-27 03:01:13 -0800 (Mon, 27 Jan 2014) Log Message: ----------- registry.tcl: fix Tcl 8.4 incompatibility introduced in r116450 Revision Links: -------------- https://trac.macports.org/changeset/116450 Modified Paths: -------------- trunk/base/src/registry2.0/registry.tcl Modified: trunk/base/src/registry2.0/registry.tcl =================================================================== --- trunk/base/src/registry2.0/registry.tcl 2014-01-27 10:53:44 UTC (rev 116502) +++ trunk/base/src/registry2.0/registry.tcl 2014-01-27 11:01:13 UTC (rev 116503) @@ -466,7 +466,7 @@ foreach f $contents { set fullpath [lindex $f 0] # strip image dir from start - if {[string range $fullpath 0 $idlen-1] == $location} { + if {[string range $fullpath 0 [expr {$idlen - 1}]] == $location} { set path [string range $fullpath $idlen [string length $fullpath]] } else { set path $fullpath

1 0

[116502] trunk/base/src/port1.0/portutil.tcl
by jmr＠macports.org 27 Jan '14

27 Jan '14

Revision: 116502 https://trac.macports.org/changeset/116502 Author: jmr(a)macports.org Date: 2014-01-27 02:53:44 -0800 (Mon, 27 Jan 2014) Log Message: ----------- portutil.tcl: fix Tcl 8.4 incompatibilities introduced in r116449 Revision Links: -------------- https://trac.macports.org/changeset/116449 Modified Paths: -------------- trunk/base/src/port1.0/portutil.tcl Modified: trunk/base/src/port1.0/portutil.tcl =================================================================== --- trunk/base/src/port1.0/portutil.tcl 2014-01-27 10:41:20 UTC (rev 116501) +++ trunk/base/src/port1.0/portutil.tcl 2014-01-27 10:53:44 UTC (rev 116502) @@ -581,7 +581,7 @@ return -code error "Malformed variant specification" } set code [lindex $args end] - set args [lrange $args 0 $len-2] + set args [lrange $args 0 [expr {$len - 2}]] set ditem [variant_new "temp-variant"] @@ -781,7 +781,7 @@ } set code [lindex $args end] set os [lindex $args 0] - set args [lrange $args 1 $len-2] + set args [lrange $args 1 [expr {$len - 2}]] foreach arg $args { if {[regexp {(^[0-9]+$)} $arg match result]} { @@ -1230,7 +1230,7 @@ set files $args set target ./ } else { - set files [lrange $args 0 [llength $args]-2] + set files [lrange $args 0 [expr {[llength $args] - 2}]] set target [lindex $args end] } @@ -2862,7 +2862,7 @@ } } else { # not root, so can't set owner/group - set permissions [lindex $attributes [lsearch $attributes "-permissions"]+1] + set permissions [lindex $attributes [expr {[lsearch $attributes "-permissions"] + 1}]] file attributes $file -permissions $permissions } } @@ -2956,7 +2956,7 @@ set i [string first . $depline] if {$i < 0} {set i [string length $depline]} - set depname [string range $depline 0 $i-1] + set depname [string range $depline 0 [expr {$i - 1}]] set depversion [string range $depline $i end] regsub {\.} $depversion {\.} depversion if {${os.platform} == "darwin"} {

1 0

[116501] trunk/base/src/port1.0/porttrace.tcl
by jmr＠macports.org 27 Jan '14

27 Jan '14

Revision: 116501 https://trac.macports.org/changeset/116501 Author: jmr(a)macports.org Date: 2014-01-27 02:41:20 -0800 (Mon, 27 Jan 2014) Log Message: ----------- porttrace.tcl: fix Tcl 8.4 incompatibility introduced in r116449 Revision Links: -------------- https://trac.macports.org/changeset/116449 Modified Paths: -------------- trunk/base/src/port1.0/porttrace.tcl Modified: trunk/base/src/port1.0/porttrace.tcl =================================================================== --- trunk/base/src/port1.0/porttrace.tcl 2014-01-27 10:37:37 UTC (rev 116500) +++ trunk/base/src/port1.0/porttrace.tcl 2014-01-27 10:41:20 UTC (rev 116501) @@ -273,8 +273,8 @@ # Skip empty lines. if {$line_length > 0} { set path_start [expr {[string first "\t" $theline] + 1}] - set op [string range $theline 0 $path_start-2] - set path [string range $theline $path_start $line_length-1] + set op [string range $theline 0 [expr {$path_start - 2}]] + set path [string range $theline $path_start [expr {$line_length - 1}]] # open/execve if {$op eq "open" || $op eq "execve"} {

1 0

[116500] trunk/dports/python
by jwa＠macports.org 27 Jan '14

27 Jan '14

Revision: 116500 https://trac.macports.org/changeset/116500 Author: jwa(a)macports.org Date: 2014-01-27 02:37:37 -0800 (Mon, 27 Jan 2014) Log Message: ----------- py-gdbm, -tkinter: version bump to 3.4.0b3 according to python34 version Modified Paths: -------------- trunk/dports/python/py-gdbm/Portfile trunk/dports/python/py-tkinter/Portfile Modified: trunk/dports/python/py-gdbm/Portfile =================================================================== --- trunk/dports/python/py-gdbm/Portfile 2014-01-27 10:31:12 UTC (rev 116499) +++ trunk/dports/python/py-gdbm/Portfile 2014-01-27 10:37:37 UTC (rev 116500) @@ -86,11 +86,11 @@ } subport py34-gdbm { maintainers jwa openmaintainer - version 3.4.0b2 - epoch 20140105 + version 3.4.0b3 + epoch 20140126 use_xz yes - checksums rmd160 3bd43d7e36edba515c9e76a7510d331058b6f993 \ - sha256 6141d1f048f87451a73d65a5df23d66e2d7eddc8044b2aba232a123d56f2cd0f + checksums rmd160 ee940fb8512e1fb644909a5c51d05305aefb1adb \ + sha256 e9bf449f89f05b5d262e2676ee6ec67be55076a65979a67cc45623b4eb9d22ce set setup_py "setup-py3k.py" set cfile "_gdbmmodule.c" livecheck.regex Python (3.4.\[0-9\]+) Modified: trunk/dports/python/py-tkinter/Portfile =================================================================== --- trunk/dports/python/py-tkinter/Portfile 2014-01-27 10:31:12 UTC (rev 116499) +++ trunk/dports/python/py-tkinter/Portfile 2014-01-27 10:37:37 UTC (rev 116500) @@ -94,13 +94,13 @@ } subport py34-tkinter { maintainers jwa openmaintainer - version 3.4.0b2 - epoch 20140105 + version 3.4.0b3 + epoch 20140126 # homepage is a placeholder until the release # homepage http://docs.python.org/release/${version}/library/tkinter.html use_xz yes - checksums rmd160 3bd43d7e36edba515c9e76a7510d331058b6f993 \ - sha256 6141d1f048f87451a73d65a5df23d66e2d7eddc8044b2aba232a123d56f2cd0f + checksums rmd160 ee940fb8512e1fb644909a5c51d05305aefb1adb \ + sha256 e9bf449f89f05b5d262e2676ee6ec67be55076a65979a67cc45623b4eb9d22ce append extract_files " Modules/tkinter.h" set module_name tkinter }

1 0

[116499] trunk/base/src/port1.0/fetch_common.tcl
by jmr＠macports.org 27 Jan '14

27 Jan '14

Revision: 116499 https://trac.macports.org/changeset/116499 Author: jmr(a)macports.org Date: 2014-01-27 02:31:12 -0800 (Mon, 27 Jan 2014) Log Message: ----------- fetch_common.tcl: fix Tcl 8.4 incompatibility introduced in r116449 Revision Links: -------------- https://trac.macports.org/changeset/116449 Modified Paths: -------------- trunk/base/src/port1.0/fetch_common.tcl Modified: trunk/base/src/port1.0/fetch_common.tcl =================================================================== --- trunk/base/src/port1.0/fetch_common.tcl 2014-01-27 10:23:20 UTC (rev 116498) +++ trunk/base/src/port1.0/fetch_common.tcl 2014-01-27 10:31:12 UTC (rev 116499) @@ -109,8 +109,8 @@ set aftersep [expr {[string first : $element] + 3}] set firstslash [string first / $element $aftersep] if {$firstslash != -1 && $firstslash < $lastcolon} { - set mirror_tag [string range $element $lastcolon+1 end] - set element [string range $element 0 $lastcolon-1] + set mirror_tag [string range $element [expr {$lastcolon + 1}] end] + set element [string range $element 0 [expr {$lastcolon - 1}]] } else { set mirror_tag "" }

1 0

[116498] trunk/dports/lang/python34/Portfile
by jwa＠macports.org 27 Jan '14

27 Jan '14

Revision: 116498 https://trac.macports.org/changeset/116498 Author: jwa(a)macports.org Date: 2014-01-27 02:23:20 -0800 (Mon, 27 Jan 2014) Log Message: ----------- python34: version bump to 3.4.0b3 Modified Paths: -------------- trunk/dports/lang/python34/Portfile Modified: trunk/dports/lang/python34/Portfile =================================================================== --- trunk/dports/lang/python34/Portfile 2014-01-27 10:21:44 UTC (rev 116497) +++ trunk/dports/lang/python34/Portfile 2014-01-27 10:23:20 UTC (rev 116498) @@ -7,8 +7,9 @@ name python34 # Remember to keep py34-tkinter and py34-gdbm's versions sync'd with this -version 3.4.0b2 -epoch 20140501 +version 3.4.0b3 +# typo in epoch, meant to have 20140105 at the end, wait until May to correct +epoch 20140502 set major [lindex [split $version .] 0] set branch [join [lrange [split ${version} .] 0 1] .] @@ -29,8 +30,8 @@ use_xz yes -checksums rmd160 3bd43d7e36edba515c9e76a7510d331058b6f993 \ - sha256 6141d1f048f87451a73d65a5df23d66e2d7eddc8044b2aba232a123d56f2cd0f +checksums rmd160 ee940fb8512e1fb644909a5c51d05305aefb1adb \ + sha256 e9bf449f89f05b5d262e2676ee6ec67be55076a65979a67cc45623b4eb9d22ce patchfiles patch-setup.py.diff \ patch-Lib-cgi.py.diff \

1 0

[116497] trunk/base/src/port
by jmr＠macports.org 27 Jan '14

27 Jan '14

Revision: 116497 https://trac.macports.org/changeset/116497 Author: jmr(a)macports.org Date: 2014-01-27 02:21:44 -0800 (Mon, 27 Jan 2014) Log Message: ----------- remove redundant calls to expr Modified Paths: -------------- trunk/base/src/port/portindex.tcl trunk/base/src/port/portmirror.tcl Modified: trunk/base/src/port/portindex.tcl =================================================================== --- trunk/base/src/port/portindex.tcl 2014-01-27 10:19:26 UTC (rev 116496) +++ trunk/base/src/port/portindex.tcl 2014-01-27 10:21:44 UTC (rev 116497) @@ -146,7 +146,7 @@ } } -if {[expr {$argc > 8}]} { +if {$argc > 8} { print_usage exit 1 } Modified: trunk/base/src/port/portmirror.tcl =================================================================== --- trunk/base/src/port/portmirror.tcl 2014-01-27 10:19:26 UTC (rev 116496) +++ trunk/base/src/port/portmirror.tcl 2014-01-27 10:21:44 UTC (rev 116497) @@ -82,7 +82,7 @@ puts "Usage: $argv0" } -if {[expr {$argc > 0}]} { +if {$argc > 0} { print_usage exit 1 }

1 0