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

[81235] contrib/buildbot/master.cfg
by jmr＠macports.org 28 Jul '11

28 Jul '11

Revision: 81235 http://trac.macports.org/changeset/81235 Author: jmr(a)macports.org Date: 2011-07-27 17:43:15 -0700 (Wed, 27 Jul 2011) Log Message: ----------- buildbot: include subports of changed ports Modified Paths: -------------- contrib/buildbot/master.cfg Modified: contrib/buildbot/master.cfg =================================================================== --- contrib/buildbot/master.cfg 2011-07-28 00:34:29 UTC (rev 81234) +++ contrib/buildbot/master.cfg 2011-07-28 00:43:15 UTC (rev 81235) @@ -174,7 +174,7 @@ env={'PREFIX': WithProperties(prefix), 'SRC_PREFIX': WithProperties(src_prefix), 'BASE_UPDATE': 'selfupdate'})) -ports_factory.addStep(ShellCommandWithPortList(command=WithProperties('for portname in %(portlist)s; do echo $portname >> portlist; done'))) +ports_factory.addStep(ShellCommandWithPortList(command=WithProperties('for portname in %(portlist)s; do for subport in `./subports.tcl $portname`; do echo $subport >> portlist; done; done'))) # run MPAB on the port list ports_factory.addStep(Compile(command=["./mpab", "buildports", "portlist"], env={'PREFIX': WithProperties(prefix),

1 0

[81234] trunk/base/src/port/port.tcl
by jmr＠macports.org 28 Jul '11

28 Jul '11

Revision: 81234 http://trac.macports.org/changeset/81234 Author: jmr(a)macports.org Date: 2011-07-27 17:34:29 -0700 (Wed, 27 Jul 2011) Log Message: ----------- accept --subports for port info Modified Paths: -------------- trunk/base/src/port/port.tcl Modified: trunk/base/src/port/port.tcl =================================================================== --- trunk/base/src/port/port.tcl 2011-07-28 00:33:31 UTC (rev 81233) +++ trunk/base/src/port/port.tcl 2011-07-28 00:34:29 UTC (rev 81234) @@ -4059,7 +4059,7 @@ depends description epoch fullname heading homepage index license line long_description maintainer maintainers name platform platforms portdir pretty - replaced_by revision variant variants version} + replaced_by revision subports variant variants version} contents {size {units 1}} deps {index no-build} rdeps {index no-build full}

1 0

[81233] contrib/mpab/subports.tcl
by jmr＠macports.org 28 Jul '11

28 Jul '11

Revision: 81233 http://trac.macports.org/changeset/81233 Author: jmr(a)macports.org Date: 2011-07-27 17:33:31 -0700 (Wed, 27 Jul 2011) Log Message: ----------- mpab: add script to find subports Added Paths: ----------- contrib/mpab/subports.tcl Added: contrib/mpab/subports.tcl =================================================================== --- contrib/mpab/subports.tcl (rev 0) +++ contrib/mpab/subports.tcl 2011-07-28 00:33:31 UTC (rev 81233) @@ -0,0 +1,70 @@ +#!/usr/bin/tclsh +# +# Generates a list of the subports for the given port. +# +# Copyright (c) 2011 The MacPorts Project. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the MacPorts project, nor the names of any 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 EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +if {[info exists env(PREFIX)]} { + set prefix $env(PREFIX) +} else { + set prefix /opt/local +} + +source ${prefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl +package require macports + +if {[catch {mportinit "" "" ""} result]} { + ui_error "$errorInfo" + fatal "Failed to initialize ports sytem: $result" +} + +if {[llength $::argv] == 0} { + fatal "Usage: $argv0 <portname>" +} + +set portname [lindex $::argv 0] + +if {[catch {set one_result [mportlookup $portname]}]} { + fatal "lookup failed for port: $portname" +} +puts [lindex $one_result 0] +array set portinfo [lindex $one_result 1] +if {[info exists portinfo(porturl)]} { + if {[catch {set mport [mportopen $portinfo(porturl) "" ""]}]} { + ui_warn "failed to open port: $portname" + } else { + array unset portinfo + array set portinfo [mportinfo $mport] + if {[info exists portinfo(subports)]} { + foreach subport $portinfo(subports) { + puts $subport + } + } + } + catch {mportclose $mport} +} Property changes on: contrib/mpab/subports.tcl ___________________________________________________________________ Added: svn:executable + *

1 0

[81232] trunk/dports/mail/offlineimap/Portfile
by ryandesign＠macports.org 27 Jul '11

27 Jul '11

Revision: 81232 http://trac.macports.org/changeset/81232 Author: ryandesign(a)macports.org Date: 2011-07-27 16:03:06 -0700 (Wed, 27 Jul 2011) Log Message: ----------- offlineimap: update to 6.3.3, fix homepage and master_sites (#30146); use python27 (#29820); adjust destroot; fix license format; indicate noarch Modified Paths: -------------- trunk/dports/mail/offlineimap/Portfile Modified: trunk/dports/mail/offlineimap/Portfile =================================================================== --- trunk/dports/mail/offlineimap/Portfile 2011-07-27 22:51:53 UTC (rev 81231) +++ trunk/dports/mail/offlineimap/Portfile 2011-07-27 23:03:06 UTC (rev 81232) @@ -1,14 +1,16 @@ # $Id$ PortSystem 1.0 -PortGroup python26 1.0 +PortGroup python27 1.0 name offlineimap -version 6.2.0 +version 6.3.3 categories mail python platforms darwin -license GPLv2+ +license GPL-2+ maintainers boeyms openmaintainer +supported_archs noarch + # The following were borrowed from the Debian package. description IMAP/Maildir synchronization and reader support long_description OfflineIMAP is a tool to simplify your e-mail reading.\ @@ -32,21 +34,28 @@ support\ In short, OfflineIMAP is a tool to let you read mail\ how YOU want to. -homepage http://software.complete.org/offlineimap -master_sites debian:o/offlineimap/ -distname ${name}_${version} -worksrcdir ${name} -checksums md5 a23dab23ac08de063e330fe26d08e9b9 \ - sha1 fb4194d0911d064c5810c4f1fc147fe719125b4e +homepage http://offlineimap.org/ +master_sites https://github.com/nicolas33/offlineimap/tarball/v${version} +dist_subdir ${name} + +checksums sha1 90b822d481d79fd3f0146636038edadafda7fc40 \ + rmd160 2194e5819b212c9bf129178569a0d099a6a4921e + +post-extract { + move [glob ${workpath}/*] ${worksrcpath} +} + +python.link_binaries_suffix + post-destroot { - ln -s ${python.prefix}/bin/offlineimap ${destroot}${prefix}/bin - xinstall -m 644 ${worksrcpath}/FAQ.html \ - ${destroot}${prefix}/share/doc/offlineimap + xinstall -m 644 -W ${worksrcpath} COPYRIGHT COPYING README.rst \ + docs/FAQ.rst docs/MANUAL.rst \ + ${destroot}${prefix}/share/doc/${name} xinstall -m 644 ${worksrcpath}/offlineimap.conf \ - ${destroot}${prefix}/etc/example-offlineimap.conf + ${destroot}${prefix}/etc/offlineimap.conf.sample xinstall -m 644 ${worksrcpath}/offlineimap.conf.minimal \ - ${destroot}${prefix}/etc/example-offlineimap.conf.minimal + ${destroot}${prefix}/etc/offlineimap.conf.minimal.sample } livecheck.type regex

1 0

[81231] contrib/mpab/chroot-scripts/buildports
by jmr＠macports.org 27 Jul '11

27 Jul '11

Revision: 81231 http://trac.macports.org/changeset/81231 Author: jmr(a)macports.org Date: 2011-07-27 15:51:53 -0700 (Wed, 27 Jul 2011) Log Message: ----------- mpab: fix recognition of 'all' Modified Paths: -------------- contrib/mpab/chroot-scripts/buildports Modified: contrib/mpab/chroot-scripts/buildports =================================================================== --- contrib/mpab/chroot-scripts/buildports 2011-07-27 22:47:05 UTC (rev 81230) +++ contrib/mpab/chroot-scripts/buildports 2011-07-27 22:51:53 UTC (rev 81231) @@ -66,15 +66,12 @@ /bin/mkdir -p ${PORTRESULTSDIR}/success ${PORTRESULTSDIR}/fail -if [[ -f /var/tmp/portlist ]]; then +if [[ -f /var/tmp/portlist && `head -n1 /var/tmp/portlist` != "all" ]]; then portList=`/bin/cat /var/tmp/portlist` - /bin/rm /var/tmp/portlist - if [[ `echo -n $portList` == "all" ]]; then - portList=`/usr/bin/tclsh /var/tmp/genportlist.tcl` - fi else portList=`/usr/bin/tclsh /var/tmp/genportlist.tcl` fi +/bin/rm -f /var/tmp/portlist portCount=`echo ${portList} | /usr/bin/wc -w` portCount=$(($portCount)) # Get rid of wc's spacing

1 0

[81230] trunk/dports/mail/offlineimap/Portfile
by ryandesign＠macports.org 27 Jul '11

27 Jul '11

Revision: 81230 http://trac.macports.org/changeset/81230 Author: ryandesign(a)macports.org Date: 2011-07-27 15:47:05 -0700 (Wed, 27 Jul 2011) Log Message: ----------- offlineimap: update livecheck; see #30146 Modified Paths: -------------- trunk/dports/mail/offlineimap/Portfile Modified: trunk/dports/mail/offlineimap/Portfile =================================================================== --- trunk/dports/mail/offlineimap/Portfile 2011-07-27 21:27:39 UTC (rev 81229) +++ trunk/dports/mail/offlineimap/Portfile 2011-07-27 22:47:05 UTC (rev 81230) @@ -48,3 +48,7 @@ xinstall -m 644 ${worksrcpath}/offlineimap.conf.minimal \ ${destroot}${prefix}/etc/example-offlineimap.conf.minimal } + +livecheck.type regex +livecheck.url https://github.com/nicolas33/offlineimap/downloads +livecheck.regex {tarball/v([0-9.]+)"}

1 0

[81229] contrib/buildbot/master.cfg
by wsiegrist＠apple.com 27 Jul '11

27 Jul '11

Revision: 81229 http://trac.macports.org/changeset/81229 Author: wsiegrist(a)apple.com Date: 2011-07-27 14:27:39 -0700 (Wed, 27 Jul 2011) Log Message: ----------- Use a pure ChangeFilter approach to scheduling between the two builders. Also cleanup portlist when we are done. Modified Paths: -------------- contrib/buildbot/master.cfg Modified: contrib/buildbot/master.cfg =================================================================== --- contrib/buildbot/master.cfg 2011-07-27 21:17:50 UTC (rev 81228) +++ contrib/buildbot/master.cfg 2011-07-27 21:27:39 UTC (rev 81229) @@ -74,7 +74,6 @@ ####### SCHEDULERS -# consider changes to _resources as unimportant def change_has_ports(change): for f in change.files: if "_resources" in f: @@ -89,22 +88,20 @@ return True return False +from buildbot.changes.filter import ChangeFilter +portsfilter = ChangeFilter(filter_fn=change_has_ports) +basefilter = ChangeFilter(filter_fn=change_has_base) -# Configure the Schedulers, which decide how to react to incoming changes. from buildbot.schedulers.basic import SingleBranchScheduler -from buildbot.changes.filter import ChangeFilter -repofilter = ChangeFilter(repository="/svn/repositories/macports/") c['schedulers'] = [SingleBranchScheduler( name="base", - treeStableTimer=10, - fileIsImportant=change_has_base, - change_filter = repofilter, + treeStableTimer=None, + change_filter = basefilter, builderNames=["buildbase"]), SingleBranchScheduler( name="ports", - treeStableTimer=10, - fileIsImportant=change_has_ports, - change_filter = repofilter, + treeStableTimer=None, + change_filter = portsfilter, builderNames=["buildports"]) ] @@ -211,7 +208,7 @@ }, logfiles={"portstatus": "portstatus.log"})) # TODO: do we want to upload the individual logs so maintainers can review them? -ports_factory.addStep(ShellCommand(command="rm -rf ./logs-* ./"+ulpath, +ports_factory.addStep(ShellCommand(command="rm -rf ./logs-* portlist ./"+ulpath, name="cleanup", description="cleanup"))

1 0

[81228] contrib/mpab/chroot-scripts/buildports
by jmr＠macports.org 27 Jul '11

27 Jul '11

Revision: 81228 http://trac.macports.org/changeset/81228 Author: jmr(a)macports.org Date: 2011-07-27 14:17:50 -0700 (Wed, 27 Jul 2011) Log Message: ----------- mpab: build all ports if portlist is 'all' Modified Paths: -------------- contrib/mpab/chroot-scripts/buildports Modified: contrib/mpab/chroot-scripts/buildports =================================================================== --- contrib/mpab/chroot-scripts/buildports 2011-07-27 20:38:21 UTC (rev 81227) +++ contrib/mpab/chroot-scripts/buildports 2011-07-27 21:17:50 UTC (rev 81228) @@ -69,6 +69,9 @@ if [[ -f /var/tmp/portlist ]]; then portList=`/bin/cat /var/tmp/portlist` /bin/rm /var/tmp/portlist + if [[ `echo -n $portList` == "all" ]]; then + portList=`/usr/bin/tclsh /var/tmp/genportlist.tcl` + fi else portList=`/usr/bin/tclsh /var/tmp/genportlist.tcl` fi

1 0

[81227] trunk/dports/kde/skrooge/Portfile
by mk＠macports.org 27 Jul '11

27 Jul '11

Revision: 81227 http://trac.macports.org/changeset/81227 Author: mk(a)macports.org Date: 2011-07-27 13:38:21 -0700 (Wed, 27 Jul 2011) Log Message: ----------- skrooge: update to version 0.9.96 Modified Paths: -------------- trunk/dports/kde/skrooge/Portfile Modified: trunk/dports/kde/skrooge/Portfile =================================================================== --- trunk/dports/kde/skrooge/Portfile 2011-07-27 18:23:55 UTC (rev 81226) +++ trunk/dports/kde/skrooge/Portfile 2011-07-27 20:38:21 UTC (rev 81227) @@ -5,7 +5,7 @@ PortGroup kde4 1.1 name skrooge -version 0.9.93 +version 0.9.96 categories kde finance maintainers mk pixilla openmaintainer @@ -24,9 +24,9 @@ use_bzip2 yes -checksums md5 c0998ef816ea78e75b09b619813572d8 \ - sha1 ae2b13095baed45ff7930dc1dd0c6aae58ff66ce \ - rmd160 32814caf799ea9a7c83256f9d57a8c3f155a0085 +checksums md5 4b4d75b3dcbf8101770acf7e3d1c253a \ + sha1 7ca9ed462b9ede1e7b40e406caa2ffe0575b8570 \ + rmd160 83e978db26231d0d61bfb791c6c81ef8b9c84875 livecheck.type regex livecheck.url http://skrooge.org/files/

1 0

[81226] contrib/buildbot/master.cfg
by wsiegrist＠apple.com 27 Jul '11

27 Jul '11

Revision: 81226 http://trac.macports.org/changeset/81226 Author: wsiegrist(a)apple.com Date: 2011-07-27 11:23:55 -0700 (Wed, 27 Jul 2011) Log Message: ----------- Fix repo path we get from svn server Modified Paths: -------------- contrib/buildbot/master.cfg Modified: contrib/buildbot/master.cfg =================================================================== --- contrib/buildbot/master.cfg 2011-07-27 18:22:25 UTC (rev 81225) +++ contrib/buildbot/master.cfg 2011-07-27 18:23:55 UTC (rev 81226) @@ -93,7 +93,7 @@ # Configure the Schedulers, which decide how to react to incoming changes. from buildbot.schedulers.basic import SingleBranchScheduler from buildbot.changes.filter import ChangeFilter -repofilter = ChangeFilter(repository="/svn/repositories/macports") +repofilter = ChangeFilter(repository="/svn/repositories/macports/") c['schedulers'] = [SingleBranchScheduler( name="base", treeStableTimer=10,

1 0