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

[107486] branches/gsoc13-tests/tests/test
by marius＠macports.org 01 Jul '13

01 Jul '13

Revision: 107486 https://trac.macports.org/changeset/107486 Author: marius(a)macports.org Date: 2013-07-01 03:21:12 -0700 (Mon, 01 Jul 2013) Log Message: ----------- Added cleanup proc to library.tcl and fixed relativa paths. Modified Paths: -------------- branches/gsoc13-tests/tests/test/checksums-1/test.tcl branches/gsoc13-tests/tests/test/library.tcl Modified: branches/gsoc13-tests/tests/test/checksums-1/test.tcl =================================================================== --- branches/gsoc13-tests/tests/test/checksums-1/test.tcl 2013-07-01 08:44:24 UTC (rev 107485) +++ branches/gsoc13-tests/tests/test/checksums-1/test.tcl 2013-07-01 10:21:12 UTC (rev 107486) @@ -5,7 +5,7 @@ set file "output" set dir "work" -set path [file dirname $argv0] +set path [file dirname [file normalize $argv0]] # Useful procs proc get_md5 {filename} { @@ -41,9 +41,9 @@ } # Initial setup -load_variables -port_clean [file dirname $argv0] -port_run [file dirname $argv0] +load_variables $path +port_clean $path +port_run $path # Test cases test md5_checksum { Modified: branches/gsoc13-tests/tests/test/library.tcl =================================================================== --- branches/gsoc13-tests/tests/test/library.tcl 2013-07-01 08:44:24 UTC (rev 107485) +++ branches/gsoc13-tests/tests/test/library.tcl 2013-07-01 10:21:12 UTC (rev 107486) @@ -1,23 +1,23 @@ -set autoconf "../../../Mk/macports.autoconf.mk" +set autoconf [file dirname $argv0]/../../../Mk/macports.autoconf.mk # Set of procs used for testing. # Sets $bindir variable from macports.autoconf.mk # autogenerated file. -proc load_variables {} { +proc load_variables {pwd} { global autoconf global bindir global datadir global portsrc - global pwd + global cpwd if { [file exists $autoconf] == 0 } { - puts "$autoconf does not exist." + puts "ERROR: $autoconf does not exist." exit 1 } - set aux [expr [string length [pwd]] - 20] - set pwd [string range [pwd] 0 [expr [string last "/" [pwd] $aux] - 1]] + set aux [expr [string length $pwd] - 20] + set cpwd [string range $pwd 0 [expr [string last "/" $pwd $aux] - 1]] set line [get_line $autoconf "prefix"] set prefix [lrange [split $line " "] 1 1] @@ -27,17 +27,22 @@ set bindir $prefix/$bin/ set datadir $prefix/share - set portsrc $pwd/test-macports.conf + set portsrc $cpwd/test-macports.conf +} +proc cleanup {} { + global cpwd + + file delete -force /tmp/macports-tests/ + file delete -force $cpwd/PortIndex $cpwd/PortIndex.quick } # Sets initial directories -proc set_dir {} { +proc set_dir {pwd} { global datadir - global pwd + global cpwd - file delete -force /tmp/macports-tests/ - file delete -force $pwd/PortIndex $pwd/PortIndex.quick + cleanup file mkdir /tmp/macports-tests/ports file mkdir /tmp/macports-tests/opt/local/etc/macports/ @@ -47,14 +52,14 @@ file mkdir /tmp/macports-tests/opt/local/var/macports/build/ file link -symbolic /tmp/macports-tests/opt/local/share/macports $datadir/macports - file link -symbolic /tmp/macports-tests/ports/test $pwd/test + file link -symbolic /tmp/macports-tests/ports/test $cpwd/test } # Run portindex proc port_index {} { global bindir global datadir - global pwd + global cpwd # Move up 2 level to run portindex. set path [pwd] @@ -64,37 +69,45 @@ set result [eval exec $bindir$cmd 2>@1] - file copy $pwd/sources.conf /tmp/macports-tests/opt/local/etc/macports/ - file copy $pwd/PortIndex $pwd/PortIndex.quick /tmp/macports-tests/ports/ + file copy $cpwd/sources.conf /tmp/macports-tests/opt/local/etc/macports/ + file copy $cpwd/PortIndex $cpwd/PortIndex.quick /tmp/macports-tests/ports/ cd $path } # Executes port clean. -proc port_clean {} { +proc port_clean {pwd} { global bindir global datadir global portsrc + set back [pwd] + cd $pwd + set env "env PORTSRC=${portsrc}" set cmd "port" set args "clean" set result [eval exec $env $bindir$cmd $args 2>@1] + cd $back } # Runs the portfile. -proc port_run {} { +proc port_run {pwd} { global bindir global datadir global portsrc + set back [pwd] + cd $pwd + set env "env PORTSRC=${portsrc}" set cmd "port" set args "-d test" set output "output" set result [catch {eval exec $env $bindir$cmd $args >&output} ] + cd $back return $result }

1 0

[107485] branches/gsoc13-tests/tests/test/checksums-1
by marius＠macports.org 01 Jul '13

01 Jul '13

Revision: 107485 https://trac.macports.org/changeset/107485 Author: marius(a)macports.org Date: 2013-07-01 01:44:24 -0700 (Mon, 01 Jul 2013) Log Message: ----------- Merged checksum.tcl and test_checksum.tcl. Added Paths: ----------- branches/gsoc13-tests/tests/test/checksums-1/test.tcl Removed Paths: ------------- branches/gsoc13-tests/tests/test/checksums-1/checksum.tcl branches/gsoc13-tests/tests/test/checksums-1/test_checksum.tcl Deleted: branches/gsoc13-tests/tests/test/checksums-1/checksum.tcl =================================================================== --- branches/gsoc13-tests/tests/test/checksums-1/checksum.tcl 2013-07-01 08:15:12 UTC (rev 107484) +++ branches/gsoc13-tests/tests/test/checksums-1/checksum.tcl 2013-07-01 08:44:24 UTC (rev 107485) @@ -1,32 +0,0 @@ -set autoconf "../../../Mk/macports.autoconf.mk" - -source ../library.tcl - -proc get_md5 {filename} { - set md5 "debug: calculated (md5)" - - set line [get_line $filename $md5] - set result [lrange [split $line " "] 4 4] - - return $result -} - - -proc get_sha {filename} { - set sha "debug: calculated (sha1)" - - set line [get_line $filename $sha] - set result [lrange [split $line " "] 4 4] - - return $result -} - - -proc get_rmd {filename} { - set sha "debug: calculated (rmd160)" - - set line [get_line $filename $sha] - set result [lrange [split $line " "] 4 4] - - return $result -} Added: branches/gsoc13-tests/tests/test/checksums-1/test.tcl =================================================================== --- branches/gsoc13-tests/tests/test/checksums-1/test.tcl (rev 0) +++ branches/gsoc13-tests/tests/test/checksums-1/test.tcl 2013-07-01 08:44:24 UTC (rev 107485) @@ -0,0 +1,80 @@ +package require tcltest 2 +namespace import tcltest::* + +source [file dirname $argv0]/../library.tcl + +set file "output" +set dir "work" +set path [file dirname $argv0] + +# Useful procs +proc get_md5 {filename} { + global path + set md5 "debug: calculated (md5)" + + set line [get_line $path/$filename $md5] + set result [lrange [split $line " "] 4 4] + + return $result +} + + +proc get_sha {filename} { + global path + set sha "debug: calculated (sha1)" + + set line [get_line $path/$filename $sha] + set result [lrange [split $line " "] 4 4] + + return $result +} + + +proc get_rmd {filename} { + global path + set sha "debug: calculated (rmd160)" + + set line [get_line $path/$filename $sha] + set result [lrange [split $line " "] 4 4] + + return $result +} + +# Initial setup +load_variables +port_clean [file dirname $argv0] +port_run [file dirname $argv0] + +# Test cases +test md5_checksum { + Regression test for MD5 Checksum. +} -constraints { + root +} -body { + get_md5 $file +} -result "d41d8cd98f00b204e9800998ecf8427e" + + +test sha1_checksum { + Regression test for SHA1 Checksum. +} -constraints { + root +} -body { + get_sha $file +} -result "da39a3ee5e6b4b0d3255bfef95601890afd80709" + + +test rmd160_checksum { + Regression test for RMD160 Checksum. +} -constraints { + root +} -body { + get_rmd $file +} -result "9c1185a5c5e9fc54612808977ee8f548b2258d31" + + +# remove output file and print results +removeFile $file +removeDirectory $dir + +cleanupTests Deleted: branches/gsoc13-tests/tests/test/checksums-1/test_checksum.tcl =================================================================== --- branches/gsoc13-tests/tests/test/checksums-1/test_checksum.tcl 2013-07-01 08:15:12 UTC (rev 107484) +++ branches/gsoc13-tests/tests/test/checksums-1/test_checksum.tcl 2013-07-01 08:44:24 UTC (rev 107485) @@ -1,46 +0,0 @@ -package require tcltest 2 -namespace import tcltest::* - -source ./checksum.tcl - -set file "output" -set dir "work" - -# Initial setup -load_variables -port_clean -port_run - - -test md5_checksum { - Regression test for MD5 Checksum. -} -constraints { - root -} -body { - get_md5 $file -} -result "d41d8cd98f00b204e9800998ecf8427e" - - -test sha1_checksum { - Regression test for SHA1 Checksum. -} -constraints { - root -} -body { - get_sha $file -} -result "da39a3ee5e6b4b0d3255bfef95601890afd80709" - - -test rmd160_checksum { - Regression test for RMD160 Checksum. -} -constraints { - root -} -body { - get_rmd $file -} -result "9c1185a5c5e9fc54612808977ee8f548b2258d31" - - -# remove output file and print results -removeFile $file -removeDirectory $dir - -cleanupTests

1 0

[107484] trunk/dports/www/phpmyadmin/Portfile
by ryandesign＠macports.org 01 Jul '13

01 Jul '13

Revision: 107484 https://trac.macports.org/changeset/107484 Author: ryandesign(a)macports.org Date: 2013-07-01 01:15:12 -0700 (Mon, 01 Jul 2013) Log Message: ----------- phpmyadmin: update to 4.0.4.1 Modified Paths: -------------- trunk/dports/www/phpmyadmin/Portfile Modified: trunk/dports/www/phpmyadmin/Portfile =================================================================== --- trunk/dports/www/phpmyadmin/Portfile 2013-07-01 07:08:51 UTC (rev 107483) +++ trunk/dports/www/phpmyadmin/Portfile 2013-07-01 08:15:12 UTC (rev 107484) @@ -5,7 +5,7 @@ name phpmyadmin set my_name phpMyAdmin -version 4.0.4 +version 4.0.4.1 categories www php databases maintainers ryandesign openmaintainer license GPL-2 @@ -25,8 +25,8 @@ distname ${my_name}-${version}-all-languages use_xz yes -checksums rmd160 88a3441d2782e109af42a1ab0d4145ed8f0b61ec \ - sha256 e2e8ad0a2b4bf63bb62961f5489f4f7cfa1b9e39fd795d4566bb6c27f9856cf0 +checksums rmd160 22215e11f7093d05584ffe440b7b01f79988a237 \ + sha256 da15749b29d2a3011f9ad83e035f7d8a4f478a0b14179b1d3ea9441e8739c6bb platforms darwin freebsd

1 0

[107483] trunk/dports/python/py-kombu/Portfile
by stromnov＠macports.org 01 Jul '13

01 Jul '13

Revision: 107483 https://trac.macports.org/changeset/107483 Author: stromnov(a)macports.org Date: 2013-07-01 00:08:51 -0700 (Mon, 01 Jul 2013) Log Message: ----------- py-kombu: update to version 2.5.12 Modified Paths: -------------- trunk/dports/python/py-kombu/Portfile Modified: trunk/dports/python/py-kombu/Portfile =================================================================== --- trunk/dports/python/py-kombu/Portfile 2013-07-01 07:02:04 UTC (rev 107482) +++ trunk/dports/python/py-kombu/Portfile 2013-07-01 07:08:51 UTC (rev 107483) @@ -5,11 +5,11 @@ PortGroup python 1.0 name py-kombu -version 2.5.11 +version 2.5.12 revision 0 categories-append devel +platforms darwin license BSD -platforms darwin supported_archs noarch python.versions 25 26 27 31 32 33 @@ -21,14 +21,15 @@ homepage http://kombu.readthedocs.org/ master_sites http://pypi.python.org/packages/source/k/kombu/ + distname kombu-${version} -checksums rmd160 9984539c6a26dc4952da67561996129485aedada \ - sha256 cb9ee646cec2fde3e8bc7e408679d4b5a2ed9d02d625b8d026bdc600fbbf2418 +checksums rmd160 012da143f3b5804f80fc3bd18d80cb6d8a9a7680 \ + sha256 cc5b33eb96fd2d3846bd0b2fec34cfacf8205b69a1669a17c97af77bc6f1aa09 if {$subport != $name} { - depends_build-append \ - port:py${python.version}-setuptools + # py-kombu depends on pkg_resources module (part of setuptools) + depends_lib-append port:py${python.version}-setuptools livecheck.type none } else { livecheck.type regex

1 0

[107482] trunk/dports/python/py-nuitka/Portfile
by stromnov＠macports.org 01 Jul '13

01 Jul '13

Revision: 107482 https://trac.macports.org/changeset/107482 Author: stromnov(a)macports.org Date: 2013-07-01 00:02:04 -0700 (Mon, 01 Jul 2013) Log Message: ----------- py-nuitka: update to version 0.4.4 Modified Paths: -------------- trunk/dports/python/py-nuitka/Portfile Modified: trunk/dports/python/py-nuitka/Portfile =================================================================== --- trunk/dports/python/py-nuitka/Portfile 2013-07-01 07:00:27 UTC (rev 107481) +++ trunk/dports/python/py-nuitka/Portfile 2013-07-01 07:02:04 UTC (rev 107482) @@ -5,7 +5,7 @@ PortGroup python 1.0 name py-nuitka -version 0.4.3 +version 0.4.4 revision 0 categories-append devel platforms darwin @@ -23,8 +23,8 @@ distname Nuitka-${version} -checksums rmd160 939a1342715012e1b87359f4df847b3c1cba654f \ - sha256 d9970814a747f3909b56969b9e46b479e861158fbba4e3ddebb01c4a6f95afe1 +checksums rmd160 ebe16df4a4e062253880f52d4f4054e339c604de \ + sha256 4d91875caa0b2a0d4f291b8499b431fae01690afce207cee5fd481084fa2e34c if {$subport != $name} { livecheck.type none

1 0

[107481] trunk/dports/python/py-regex/Portfile
by stromnov＠macports.org 01 Jul '13

01 Jul '13

Revision: 107481 https://trac.macports.org/changeset/107481 Author: stromnov(a)macports.org Date: 2013-07-01 00:00:27 -0700 (Mon, 01 Jul 2013) Log Message: ----------- py-regex: update to version 2013-06-26 Modified Paths: -------------- trunk/dports/python/py-regex/Portfile Modified: trunk/dports/python/py-regex/Portfile =================================================================== --- trunk/dports/python/py-regex/Portfile 2013-07-01 06:58:25 UTC (rev 107480) +++ trunk/dports/python/py-regex/Portfile 2013-07-01 07:00:27 UTC (rev 107481) @@ -5,12 +5,12 @@ PortGroup python 1.0 name py-regex -set buildver 2013-06-05 +set buildver 2013-06-26 version 0.1-[string map {"-" "" "." ""} ${buildver}] revision 0 categories-append devel +platforms darwin license Python -platforms darwin python.versions 26 27 31 32 33 @@ -24,8 +24,8 @@ distname regex-${buildver} -checksums rmd160 b79040cbbc27c37f44f55c7a597b70713718b951 \ - sha256 4084b83610a3e1d0a6de5e92c557cf11bd94d985d184ed540036c7f5692515f6 +checksums rmd160 5a8dd19efeece19de7519814057177a0ce6d9cca \ + sha256 80af18724d7f69be0487bfd53985e573e7dffb398c23200318bfdb013ab6ff66 if {$subport != $name} { livecheck.type none

1 0

[107480] trunk/dports/python/py-billiard/Portfile
by stromnov＠macports.org 01 Jul '13

01 Jul '13

Revision: 107480 https://trac.macports.org/changeset/107480 Author: stromnov(a)macports.org Date: 2013-06-30 23:58:25 -0700 (Sun, 30 Jun 2013) Log Message: ----------- py-billiard: update to version 2.7.3.30 Modified Paths: -------------- trunk/dports/python/py-billiard/Portfile Modified: trunk/dports/python/py-billiard/Portfile =================================================================== --- trunk/dports/python/py-billiard/Portfile 2013-07-01 05:40:24 UTC (rev 107479) +++ trunk/dports/python/py-billiard/Portfile 2013-07-01 06:58:25 UTC (rev 107480) @@ -5,11 +5,11 @@ PortGroup python 1.0 name py-billiard -version 2.7.3.28 +version 2.7.3.30 revision 0 categories-append devel +platforms darwin license BSD -platforms darwin python.versions 25 26 27 31 32 33 @@ -22,8 +22,8 @@ master_sites http://pypi.python.org/packages/source/b/billiard/ distname billiard-${version} -checksums rmd160 c9181ef29a418b4a8cc3239db6a39d1998eca2a5 \ - sha256 1b2231dbd516e4d484de14c76b7916513d901397ac93973c3f61e8382cc7efb7 +checksums rmd160 3d68d2d2962d8d8d0fd6c47e88332192602b687f \ + sha256 7e9705d014125e75a40b5691c1479374f15c5eb44f666a842eee348ba9fd3a24 if {$subport != $name} { depends_build-append \

1 0

[107479] trunk/dports/python/py-setuptools/Portfile
by jmr＠macports.org 01 Jul '13

01 Jul '13

Revision: 107479 https://trac.macports.org/changeset/107479 Author: jmr(a)macports.org Date: 2013-06-30 22:40:24 -0700 (Sun, 30 Jun 2013) Log Message: ----------- py-setuptools: update to 0.7.5 Modified Paths: -------------- trunk/dports/python/py-setuptools/Portfile Modified: trunk/dports/python/py-setuptools/Portfile =================================================================== --- trunk/dports/python/py-setuptools/Portfile 2013-07-01 05:31:48 UTC (rev 107478) +++ trunk/dports/python/py-setuptools/Portfile 2013-07-01 05:40:24 UTC (rev 107479) @@ -5,7 +5,7 @@ PortGroup python 1.0 name py-setuptools -version 0.7.4 +version 0.7.5 categories-append devel license {PSF ZPL} maintainers jmr openmaintainer @@ -22,9 +22,9 @@ master_sites https://pypi.python.org/packages/source/s/setuptools/ distname setuptools-${version} -checksums md5 c0b8864b63c13312f5d9568c2a54247e \ - rmd160 13efb59601d927c17ca56d7e84eb3634ef4c0655 \ - sha256 519c02e4421c39356485d304f89ae4212a1ea13927e13f5ffe63500a0d1ad1d1 +checksums md5 5d8dce6e13c7797e4073aa458f11ee5e \ + rmd160 05390260d8e487bb135d8beb14d30d25fed83591 \ + sha256 491821d88d36c794e7eb61ec836690031823e98d3f405eb9a75e068a93d45f8e python.versions 24 25 26 27 31 32 33 python.default_version 27

1 0

[107478] trunk/dports/lang/slime/Portfile
by easieste＠macports.org 01 Jul '13

01 Jul '13

Revision: 107478 https://trac.macports.org/changeset/107478 Author: easieste(a)macports.org Date: 2013-06-30 22:31:48 -0700 (Sun, 30 Jun 2013) Log Message: ----------- Snapshot slime from end of June. Modified Paths: -------------- trunk/dports/lang/slime/Portfile Modified: trunk/dports/lang/slime/Portfile =================================================================== --- trunk/dports/lang/slime/Portfile 2013-07-01 05:30:14 UTC (rev 107477) +++ trunk/dports/lang/slime/Portfile 2013-07-01 05:31:48 UTC (rev 107478) @@ -4,8 +4,8 @@ PortSystem 1.0 name slime -version 20130303 -epoch 20130303 +version 20130630 +epoch 20130630 revision 0 categories lang platforms darwin

1 0

[107477] trunk/dports/lang/abcl/Portfile
by easieste＠macports.org 01 Jul '13

01 Jul '13

Revision: 107477 https://trac.macports.org/changeset/107477 Author: easieste(a)macports.org Date: 2013-06-30 22:30:14 -0700 (Sun, 30 Jun 2013) Log Message: ----------- ABCL 1.2.1 Modified Paths: -------------- trunk/dports/lang/abcl/Portfile Modified: trunk/dports/lang/abcl/Portfile =================================================================== --- trunk/dports/lang/abcl/Portfile 2013-07-01 01:02:13 UTC (rev 107476) +++ trunk/dports/lang/abcl/Portfile 2013-07-01 05:30:14 UTC (rev 107477) @@ -4,7 +4,7 @@ PortSystem 1.0 name abcl -version 1.1.1 +version 1.2.1 revision 0 categories lang java license GPL-2 @@ -25,10 +25,11 @@ platforms darwin master_sites googlecode:abcl-dynamic-install distname abcl-src-${version} -checksums md5 07cec2c76400c836d55a22ee4102f995 \ - sha1 f9c71a91c5aef4b7061758d19291df0fb0b01b14 \ - rmd160 3c2dcc41d59e5f94ba3ea6f99ed2c1a7efc5a063 +checksums md5 88f653253c19f324b4e13c679847dd58 \ + sha1 b68dad72960e0a7a35e3825998dce9f93836dbd2 \ + rmd160 c1bbb04494419538a5cec4ac7902c6513a998d26 + depends_build port:apache-ant use_configure no

1 0