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

[95992] contrib/buildbot/deploy_archives.sh
by wsiegrist＠apple.com 27 Jul '12

27 Jul '12

Revision: 95992 https://trac.macports.org/changeset/95992 Author: wsiegrist(a)apple.com Date: 2012-07-27 13:59:42 -0700 (Fri, 27 Jul 2012) Log Message: ----------- Do not try to set owner/times on packages server. Modified Paths: -------------- contrib/buildbot/deploy_archives.sh Modified: contrib/buildbot/deploy_archives.sh =================================================================== --- contrib/buildbot/deploy_archives.sh 2012-07-27 20:59:13 UTC (rev 95991) +++ contrib/buildbot/deploy_archives.sh 2012-07-27 20:59:42 UTC (rev 95992) @@ -54,9 +54,9 @@ done if [[ -n "$DLHOST" ]]; then - rsync -av --ignore-existing ${ULPATH}/ ${DLHOST}:${DLPATH} + rsync -rlDzv --ignore-existing ${ULPATH}/ ${DLHOST}:${DLPATH} else - rsync -av --ignore-existing ${ULPATH}/ ${DLPATH} + rsync -rlDzv --ignore-existing ${ULPATH}/ ${DLPATH} fi else echo $ULPATH appears to contain no archives

1 0

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

27 Jul '12

Revision: 95991 https://trac.macports.org/changeset/95991 Author: wsiegrist(a)apple.com Date: 2012-07-27 13:59:13 -0700 (Fri, 27 Jul 2012) Log Message: ----------- Set dlhost for new packages server Modified Paths: -------------- contrib/buildbot/master.cfg Modified: contrib/buildbot/master.cfg =================================================================== --- contrib/buildbot/master.cfg 2012-07-27 20:09:34 UTC (rev 95990) +++ contrib/buildbot/master.cfg 2012-07-27 20:59:13 UTC (rev 95991) @@ -196,12 +196,14 @@ if production: prefix='/opt/local' src_prefix='/opt/mports' - dlpath='/www/hosts/packages.macports.org' + dlhost='packages(a)packages.macports.org' + dlpath='/var/www/html/packages' else: prefix='%(workdir)s/opt/local' src_prefix='%(workdir)s/opt/mports' dlpath='./deployed_archives' -dlhost='' + dlhost='' + ulpath='archive_staging' ulpath_unique=ulpath+'-%(buildername)s'

1 0

[95990] trunk/dports/python/py-tables/Portfile
by mmoll＠macports.org 27 Jul '12

27 Jul '12

Revision: 95990 https://trac.macports.org/changeset/95990 Author: mmoll(a)macports.org Date: 2012-07-27 13:09:34 -0700 (Fri, 27 Jul 2012) Log Message: ----------- py-tables: update to 2.4.0 Modified Paths: -------------- trunk/dports/python/py-tables/Portfile Modified: trunk/dports/python/py-tables/Portfile =================================================================== --- trunk/dports/python/py-tables/Portfile 2012-07-27 17:17:16 UTC (rev 95989) +++ trunk/dports/python/py-tables/Portfile 2012-07-27 20:09:34 UTC (rev 95990) @@ -5,8 +5,7 @@ set realname tables name py-${realname} -version 2.3.1 -revision 1 +version 2.4.0 python.versions 25 26 27 python.default_version 27 categories python science @@ -20,9 +19,9 @@ homepage http://www.pytables.org/ master_sites http://sourceforge.net/projects/pytables/files/pytables/${version} -checksums md5 97cf501c185226f5424e31cd74c1a001 \ - sha1 c8592ce71809120cf3e8ee8e7befcfaa54085b3c \ - rmd160 04934c0a411d35ec8658b1a0f56ea77f7600618b +checksums md5 ec20938fca8b579020c5a4cc567caf7c \ + sha1 3f96927a80f0bfb812206d5af0a08c988a733158 \ + rmd160 659e02e3cd08068005e98bb2dc637724d6ea9808 distname ${realname}-${version} if {$subport != $name} { @@ -49,7 +48,7 @@ post-destroot { xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} xinstall -m 644 -W ${worksrcpath} ANNOUNCE.txt LICENSE.txt README.txt \ - MIGRATING_TO_2.x.txt RELEASE_NOTES.txt THANKS VERSION \ + RELEASE_NOTES.txt THANKS VERSION \ ${destroot}${prefix}/share/doc/${name} } }

1 0

[95989] trunk/dports/devel/thrift-devel/Portfile
by blair＠macports.org 27 Jul '12

27 Jul '12

Revision: 95989 https://trac.macports.org/changeset/95989 Author: blair(a)macports.org Date: 2012-07-27 10:17:16 -0700 (Fri, 27 Jul 2012) Log Message: ----------- thrift-devel: depend on autoconf since automake only depends_build on it. Modified Paths: -------------- trunk/dports/devel/thrift-devel/Portfile Modified: trunk/dports/devel/thrift-devel/Portfile =================================================================== --- trunk/dports/devel/thrift-devel/Portfile 2012-07-27 16:53:01 UTC (rev 95988) +++ trunk/dports/devel/thrift-devel/Portfile 2012-07-27 17:17:16 UTC (rev 95989) @@ -6,6 +6,7 @@ name thrift-devel conflicts thrift version 1366428 +revision 1 categories devel license Apache-2 maintainers gmail.com:naoya.n blair openmaintainer @@ -28,7 +29,8 @@ use_parallel_build no -depends_build port:automake \ +depends_build port:autoconf \ + port:automake \ port:boost \ port:pkgconfig depends_lib-append port:openssl

1 0

[95988] trunk/dports/devel/thrift-devel/Portfile
by blair＠macports.org 27 Jul '12

27 Jul '12

Revision: 95988 https://trac.macports.org/changeset/95988 Author: blair(a)macports.org Date: 2012-07-27 09:53:01 -0700 (Fri, 27 Jul 2012) Log Message: ----------- thrift-devel: update to r1366428 which adds --with-qt4 configure support. Revision Links: -------------- https://trac.macports.org/changeset/1366428 Modified Paths: -------------- trunk/dports/devel/thrift-devel/Portfile Modified: trunk/dports/devel/thrift-devel/Portfile =================================================================== --- trunk/dports/devel/thrift-devel/Portfile 2012-07-27 15:51:09 UTC (rev 95987) +++ trunk/dports/devel/thrift-devel/Portfile 2012-07-27 16:53:01 UTC (rev 95988) @@ -5,8 +5,7 @@ name thrift-devel conflicts thrift -version 1365183 -revision 1 +version 1366428 categories devel license Apache-2 maintainers gmail.com:naoya.n blair openmaintainer @@ -35,13 +34,6 @@ depends_lib-append port:openssl pre-configure { - # Currently the only way to disable detecting qt4-mac is by - # requiring a non-existent version of QtCore. See - # https://issues.apache.org/jira/browse/THRIFT-1661 . - if {![variant_isset qt4]} { - reinplace "s|QtCore >= 4|QtCore >= 99|g" ${worksrcpath}/configure.ac - } - system "cd ${worksrcpath} && ./bootstrap.sh" # Remove when https://issues.apache.org/jira/browse/THRIFT-1614 is @@ -61,6 +53,7 @@ --with-php=no \ --with-php_extension=no \ --with-python=no \ + --with-qt4=no \ --with-ruby=no variant java description "enable the Java library" { @@ -112,6 +105,8 @@ # See https://issues.apache.org/jira/browse/THRIFT-1348. variant qt4 description "enable non-blocking thrift server for use within Qt" { + configure.args-delete --with-qt4=no + configure.args-append --with-qt4=yes depends_lib-append port:qt4-mac }

1 0

[95987] contrib/buildbot/master.cfg
by jmr＠macports.org 27 Jul '12

27 Jul '12

Revision: 95987 https://trac.macports.org/changeset/95987 Author: jmr(a)macports.org Date: 2012-07-27 08:51:09 -0700 (Fri, 27 Jul 2012) Log Message: ----------- buildbot: upload archives from different slaves to unique paths on the master Modified Paths: -------------- contrib/buildbot/master.cfg Modified: contrib/buildbot/master.cfg =================================================================== --- contrib/buildbot/master.cfg 2012-07-27 15:30:53 UTC (rev 95986) +++ contrib/buildbot/master.cfg 2012-07-27 15:51:09 UTC (rev 95987) @@ -196,15 +196,14 @@ if production: prefix='/opt/local' src_prefix='/opt/mports' - dlhost='' dlpath='/www/hosts/packages.macports.org' - ulpath='archive_staging' else: prefix='%(workdir)s/opt/local' src_prefix='%(workdir)s/opt/mports' - dlhost='' dlpath='./deployed_archives' - ulpath='archive_staging' +dlhost='' +ulpath='archive_staging' +ulpath_unique=ulpath+'-%(buildername)s' ports_factory = BuildFactory() @@ -232,14 +231,14 @@ 'ULPATH': ulpath})) # upload archives from build slave to master from buildbot.steps.transfer import DirectoryUpload -ports_factory.addStep(DirectoryUpload(slavesrc=ulpath, masterdest=ulpath)) +ports_factory.addStep(DirectoryUpload(slavesrc=ulpath, masterdest=WithProperties(ulpath_unique))) # sign generated binaries and sync to download server (if distributable) from buildbot.steps.master import MasterShellCommand ports_factory.addStep(MasterShellCommand(command=["./deploy_archives.sh"], name="deploy archives", description="deploy archives", env={'PRIVKEY': privkey, - 'ULPATH': ulpath, + 'ULPATH': WithProperties(ulpath_unique), 'DLHOST': dlhost, 'DLPATH': dlpath})) @@ -247,7 +246,7 @@ ports_factory.addStep(ShellCommand(command=["./do_status.sh"], name="status", description="status", - env={'PREFIX': WithProperties(prefix), + env={'PREFIX': WithProperties(prefix) }, logfiles={"portstatus": "portstatus.log"})) # TODO: do we want to upload the individual logs so maintainers can review them?

1 0

[95986] trunk/dports/databases/xbase
by ryandesign＠macports.org 27 Jul '12

27 Jul '12

Revision: 95986 https://trac.macports.org/changeset/95986 Author: ryandesign(a)macports.org Date: 2012-07-27 08:30:53 -0700 (Fri, 27 Jul 2012) Log Message: ----------- xbase: fix build error on case-sensitive filesystems Modified Paths: -------------- trunk/dports/databases/xbase/Portfile Added Paths: ----------- trunk/dports/databases/xbase/files/patch-xbase64-xbnode-cpp.diff Modified: trunk/dports/databases/xbase/Portfile =================================================================== --- trunk/dports/databases/xbase/Portfile 2012-07-27 14:38:31 UTC (rev 95985) +++ trunk/dports/databases/xbase/Portfile 2012-07-27 15:30:53 UTC (rev 95986) @@ -32,6 +32,7 @@ patchfiles patch-bin-dumprecs-cpp.diff \ patch-xbase64-cpp.diff \ + patch-xbase64-xbnode-cpp.diff \ patch-xblock-cpp.diff \ patch-xbtypes-h.diff Added: trunk/dports/databases/xbase/files/patch-xbase64-xbnode-cpp.diff =================================================================== --- trunk/dports/databases/xbase/files/patch-xbase64-xbnode-cpp.diff (rev 0) +++ trunk/dports/databases/xbase/files/patch-xbase64-xbnode-cpp.diff 2012-07-27 15:30:53 UTC (rev 95986) @@ -0,0 +1,8 @@ +--- xbase64/xbnode.cpp.orig 2006-07-17 11:54:42.000000000 -0500 ++++ xbase64/xbnode.cpp 2012-07-27 10:29:05.000000000 -0500 +@@ -1,4 +1,4 @@ +-#include "xbNode.h" ++#include "xbnode.h" + + void xbNodeLink::AddNode(xbNodeLink* node) + {

1 0

[95985] trunk/dports/databases/xbase
by ryandesign＠macports.org 27 Jul '12

27 Jul '12

Revision: 95985 https://trac.macports.org/changeset/95985 Author: ryandesign(a)macports.org Date: 2012-07-27 07:38:31 -0700 (Fri, 27 Jul 2012) Log Message: ----------- xbase: fix redefinition of variable (#35355) Modified Paths: -------------- trunk/dports/databases/xbase/Portfile Added Paths: ----------- trunk/dports/databases/xbase/files/patch-bin-dumprecs-cpp.diff Modified: trunk/dports/databases/xbase/Portfile =================================================================== --- trunk/dports/databases/xbase/Portfile 2012-07-27 14:35:13 UTC (rev 95984) +++ trunk/dports/databases/xbase/Portfile 2012-07-27 14:38:31 UTC (rev 95985) @@ -5,6 +5,7 @@ name xbase version 3.1.2 +revision 1 categories databases devel # lib is LGPL, executables are GPL license {LGPL GPL-2+} @@ -29,7 +30,8 @@ sha1 5bd433a4f748a6fa1a7855b6a2325483d4ee7206 \ rmd160 8f2a16fcecd6098b7b3ca47354e33a387a7dc1d9 -patchfiles patch-xbase64-cpp.diff \ +patchfiles patch-bin-dumprecs-cpp.diff \ + patch-xbase64-cpp.diff \ patch-xblock-cpp.diff \ patch-xbtypes-h.diff Added: trunk/dports/databases/xbase/files/patch-bin-dumprecs-cpp.diff =================================================================== --- trunk/dports/databases/xbase/files/patch-bin-dumprecs-cpp.diff (rev 0) +++ trunk/dports/databases/xbase/files/patch-bin-dumprecs-cpp.diff 2012-07-27 14:38:31 UTC (rev 95985) @@ -0,0 +1,15 @@ +--- bin/dumprecs.cpp.orig 2012-07-27 12:55:00.000000000 +0200 ++++ bin/dumprecs.cpp 2012-07-27 13:32:01.000000000 +0200 +@@ -84,9 +84,9 @@ + } + + std::cout << "Processing file sequentially from beginning..." << std::endl; +- int i = 0; +- while(i<MyFile.NoOfRecords()){ +- rc = MyFile.DumpRecord(++i); ++ int j = 0; ++ while(j<MyFile.NoOfRecords()){ ++ rc = MyFile.DumpRecord(++j); + if( rc != XB_NO_ERROR ) + x.DisplayError( rc ); + }

1 0

[95984] trunk/dports/databases/xbase/Portfile
by ryandesign＠macports.org 27 Jul '12

27 Jul '12

Revision: 95984 https://trac.macports.org/changeset/95984 Author: ryandesign(a)macports.org Date: 2012-07-27 07:35:13 -0700 (Fri, 27 Jul 2012) Log Message: ----------- xbase: build fails when ccache is on Modified Paths: -------------- trunk/dports/databases/xbase/Portfile Modified: trunk/dports/databases/xbase/Portfile =================================================================== --- trunk/dports/databases/xbase/Portfile 2012-07-27 14:33:49 UTC (rev 95983) +++ trunk/dports/databases/xbase/Portfile 2012-07-27 14:35:13 UTC (rev 95984) @@ -35,4 +35,6 @@ configure.args-append --without-xbase-locking +configure.ccache no + use_parallel_build no

1 0

[95983] trunk/dports/databases/xbase/Portfile
by ryandesign＠macports.org 27 Jul '12

27 Jul '12

Revision: 95983 https://trac.macports.org/changeset/95983 Author: ryandesign(a)macports.org Date: 2012-07-27 07:33:49 -0700 (Fri, 27 Jul 2012) Log Message: ----------- xbase: whitespace changes; add modeline Modified Paths: -------------- trunk/dports/databases/xbase/Portfile Modified: trunk/dports/databases/xbase/Portfile =================================================================== --- trunk/dports/databases/xbase/Portfile 2012-07-27 14:16:42 UTC (rev 95982) +++ trunk/dports/databases/xbase/Portfile 2012-07-27 14:33:49 UTC (rev 95983) @@ -1,34 +1,38 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 # $Id$ -PortSystem 1.0 +PortSystem 1.0 -name xbase -version 3.1.2 -categories databases devel +name xbase +version 3.1.2 +categories databases devel # lib is LGPL, executables are GPL -license {LGPL GPL-2+} -platforms darwin -maintainers nomaintainer -description XBase compatible C++ class library -long_description Xbase is an XBase compatible C++ class library. It \ - provides C and C++ programmers with a cross-platform class and \ - function library for manipulating Xbase type datafiles and \ - indexes. There is support for .DBF and .NDX files (including \ - support for Dbase III and IV memo fields, dates, and record \ - and file locking), and limited support is also supplied for \ - .NTX (clipper index) files. +license {LGPL GPL-2+} +platforms darwin +maintainers nomaintainer -homepage http://linux.techass.com/projects/xdb/ -master_sites sourceforge:project/xdb/Source/${version} -distname ${name}64-${version} -checksums md5 7f3a727c142b4339faa781e1f6d5871c \ - sha1 5bd433a4f748a6fa1a7855b6a2325483d4ee7206 \ - rmd160 8f2a16fcecd6098b7b3ca47354e33a387a7dc1d9 +description XBase compatible C++ class library -patchfiles patch-xbase64-cpp.diff \ - patch-xblock-cpp.diff \ - patch-xbtypes-h.diff +long_description Xbase is an XBase compatible C++ class library. It \ + provides C and C++ programmers with a cross-platform \ + class and function library for manipulating Xbase type \ + datafiles and indexes. There is support for .DBF and \ + .NDX files (including support for Dbase III and IV memo \ + fields, dates, and record and file locking), and limited \ + support is also supplied for .NTX (clipper index) files. +homepage http://linux.techass.com/projects/xdb/ +master_sites sourceforge:project/xdb/Source/${version} +distname ${name}64-${version} + +checksums md5 7f3a727c142b4339faa781e1f6d5871c \ + sha1 5bd433a4f748a6fa1a7855b6a2325483d4ee7206 \ + rmd160 8f2a16fcecd6098b7b3ca47354e33a387a7dc1d9 + +patchfiles patch-xbase64-cpp.diff \ + patch-xblock-cpp.diff \ + patch-xbtypes-h.diff + configure.args-append --without-xbase-locking use_parallel_build no

1 0