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

[79896] users/jmr/master.cfg
by jmr＠macports.org 29 Jun '11

29 Jun '11

Revision: 79896 http://trac.macports.org/changeset/79896 Author: jmr(a)macports.org Date: 2011-06-28 22:27:53 -0700 (Tue, 28 Jun 2011) Log Message: ----------- fix shell expansion Modified Paths: -------------- users/jmr/master.cfg Modified: users/jmr/master.cfg =================================================================== --- users/jmr/master.cfg 2011-06-29 05:23:04 UTC (rev 79895) +++ users/jmr/master.cfg 2011-06-29 05:27:53 UTC (rev 79896) @@ -128,7 +128,7 @@ ports_factory.addStep(ShellCommand(command=["./do_status.sh"], logfiles={"portstatus": "portstatus.log"})) # do we want to upload the individual logs so maintainers can review them? -ports_factory.addStep(ShellCommand(command=['rm -rf ./logs-*'])) +ports_factory.addStep(ShellCommand(command="rm -rf ./logs-*")) from buildbot.config import BuilderConfig

1 0

propchange - r79895 svn:log
by ryandesign＠macports.org 29 Jun '11

29 Jun '11

Author: ryandesign(a)macports.org (original author: jeremyhu(a)macports.org) Revision: 79895 Property Name: svn:log @@ -1 +1 @@ -VLC: Mode darwin11 fixups (almost there) +VLC: More darwin11 fixups (almost there)

1 0

[79895] trunk/dports/multimedia/VLC
by jeremyhu＠macports.org 29 Jun '11

29 Jun '11

Revision: 79895 http://trac.macports.org/changeset/79895 Author: jeremyhu(a)macports.org Date: 2011-06-28 22:23:04 -0700 (Tue, 28 Jun 2011) Log Message: ----------- VLC: Mode darwin11 fixups (almost there) Modified Paths: -------------- trunk/dports/multimedia/VLC/Portfile Added Paths: ----------- trunk/dports/multimedia/VLC/files/patch-compat.diff Modified: trunk/dports/multimedia/VLC/Portfile =================================================================== --- trunk/dports/multimedia/VLC/Portfile 2011-06-29 05:19:11 UTC (rev 79894) +++ trunk/dports/multimedia/VLC/Portfile 2011-06-29 05:23:04 UTC (rev 79895) @@ -46,7 +46,7 @@ } } -patchfiles patch-Makefile.am.diff patch-configure.ac-xcb.diff patch-png.c.diff patch-configure.ac-no_qtcapture.diff patch-configure.ac-macosx_audio.diff patch-noKaxTagMulti.diff patch-yadif.diff +patchfiles patch-Makefile.am.diff patch-configure.ac-xcb.diff patch-png.c.diff patch-configure.ac-no_qtcapture.diff patch-configure.ac-macosx_audio.diff patch-noKaxTagMulti.diff patch-yadif.diff patch-compat.diff post-patch { reinplace "s:librsvg-2/librsvg:librsvg:" ${worksrcpath}/modules/misc/svg.c @@ -277,6 +277,7 @@ platform darwin 10 { patchfiles-append patch-fdatasync_sl.diff } + platform darwin 11 { patchfiles-append patch-fdatasync_sl.diff } Added: trunk/dports/multimedia/VLC/files/patch-compat.diff =================================================================== --- trunk/dports/multimedia/VLC/files/patch-compat.diff (rev 0) +++ trunk/dports/multimedia/VLC/files/patch-compat.diff 2011-06-29 05:23:04 UTC (rev 79895) @@ -0,0 +1,14 @@ +diff -Naurp vlc-1.0.6.orig/compat/Makefile.am vlc-1.0.6/compat/Makefile.am +--- compat/Makefile.am 2010-03-07 10:38:01.000000000 -0800 ++++ compat/Makefile.am 2011-06-24 23:41:05.000000000 -0700 +@@ -1,4 +1,4 @@ + noinst_LTLIBRARIES = libcompat.la +-libcompat_la_SOURCES = ++libcompat_la_SOURCES = empty.c + libcompat_la_LIBADD = $(LTLIBOBJS) + libcompat_la_LDFLAGS = -no-undefined +diff -Naurp vlc-1.0.6.orig/compat/empty.c vlc-1.0.6/compat/empty.c +--- compat/empty.c 1969-12-31 16:00:00.000000000 -0800 ++++ compat/empty.c 2011-06-24 23:37:59.000000000 -0700 +@@ -0,0 +1 @@ ++static int __ar_fails_with_no_files;

1 0

[79894] users/jmr/master.cfg
by jmr＠macports.org 29 Jun '11

29 Jun '11

Revision: 79894 http://trac.macports.org/changeset/79894 Author: jmr(a)macports.org Date: 2011-06-28 22:19:11 -0700 (Tue, 28 Jun 2011) Log Message: ----------- update buildbot cfg Modified Paths: -------------- users/jmr/master.cfg Modified: users/jmr/master.cfg =================================================================== --- users/jmr/master.cfg 2011-06-29 05:18:26 UTC (rev 79893) +++ users/jmr/master.cfg 2011-06-29 05:19:11 UTC (rev 79894) @@ -122,55 +122,13 @@ env={'PREFIX': WithProperties("%(workdir)s/opt/local"), 'SRC_PREFIX': WithProperties("%(workdir)s/opt/mports")})) # sign generated binaries and sync to download server (if distributable) -opensslcmd = '/usr/bin/openssl' -# FIXME: configure these -prefix='../opt/local' -# private key to use for signing -privkey='' -# download server hostname and path where it keeps archives -dlhost='mparchives.local' -dlpath='/archives' -ports_factory.addStep(ShellCommand(command=[ -"""for port in `cat portlist`; do - if [[ -f logs-*/success/${port}.log ]]; then - if ./mpexport/base/portmgr/jobs/port_binary_distributable.tcl ${port}; then - echo $port is distributable - portversion=$("""+prefix+"""/bin/port info --version --line ${portName}) - portrevision=$("""+prefix+"""/bin/port info --revision --line ${portName}) - for archive in """+prefix+"""/var/macports/software/${portname}/${portname}-${portversion}_${portrevision}[+.]*; do - aname=$(basename $archive) - echo deploying archive: $aname - openssl dgst -ripemd160 -sign """+privkey+""" -out ./${aname}.rmd160 ${archive} - ssh """+dlhost+""" mkdir -p """+dlpath+"""/${portname} - rsync -av --ignore-existing ./${aname}.rmd160 ${archive} """+dlhost+""":"""+dlpath+"""/${portname} - rm ./${aname}.rmd160 - done - fi - fi -done -"""])) +ports_factory.addStep(ShellCommand(command=["./deploy_archives.sh"])) # make a logfile summarising the success/failure status for each port -ports_factory.addStep(ShellCommand(command=[ -"""rm -f portstatus.log -for port in `cat portlist`; do - if [[ -f logs-*/success/${port}.log ]]; then - echo "[OK] ${port}" >> portstatus.log - elif [[ -f logs-*/failure/${port}.log ]]; then - echo "[FAIL] ${port}" >> portstatus.log - # send email to appropriate places - portmaintainers=$("""+prefix+"""/bin/port info --maintainers --line ${port} | tr ',' ' ') - for maint in $portmaintainers; do - if [[ "$maint" != "nomaintainer(a)macports.org" && "$maint" != "openmaintainer(a)macports.org" ]]; then - # email maintainer - echo "not emailing $maint (not set up yet)" - fi - # also send to some new mailing list? - done - fi -done -"""], logfiles={"portstatus": "portstatus.log"})) -ports_factory.addStep(ShellCommand(command=["rm -r ./logs-*"])) +ports_factory.addStep(ShellCommand(command=["./do_status.sh"], + logfiles={"portstatus": "portstatus.log"})) +# do we want to upload the individual logs so maintainers can review them? +ports_factory.addStep(ShellCommand(command=['rm -rf ./logs-*'])) from buildbot.config import BuilderConfig

1 0

[79893] contrib/mpab
by jmr＠macports.org 29 Jun '11

29 Jun '11

Revision: 79893 http://trac.macports.org/changeset/79893 Author: jmr(a)macports.org Date: 2011-06-28 22:18:26 -0700 (Tue, 28 Jun 2011) Log Message: ----------- mpab: move complicated bits from buildbot config here Added Paths: ----------- contrib/mpab/deploy_archives.sh contrib/mpab/do_status.sh Added: contrib/mpab/deploy_archives.sh =================================================================== --- contrib/mpab/deploy_archives.sh (rev 0) +++ contrib/mpab/deploy_archives.sh 2011-06-29 05:18:26 UTC (rev 79893) @@ -0,0 +1,40 @@ +#!/bin/sh + +if [[ -z "$PORTLISTFILE" ]]; then + PORTLISTFILE=portlist +fi +if [[ -z "$PREFIX" ]]; then + PREFIX="../opt/local" +fi +# FIXME: configure these +# download server hostname +if [[ -z "$DLHOST" ]]; then + DLHOST=mparchives.local +fi +# path where it keeps archives +if [[ -z "$DLPATH" ]]; then + DLPATH="/archives" +fi +# private key to use for signing +if [[ -z "$PRIVKEY" ]]; then + PRIVKEY="" +fi + + +for portname in `cat $PORTLISTFILE`; do + if ls logs-*/success/${portname}.log > /dev/null 2>&1 ; then + if ./mpexport/base/portmgr/jobs/port_binary_distributable.tcl ${portname}; then + echo $portname is distributable + portversion=$(${PREFIX}/bin/port info --version --line ${portname}) + portrevision=$(${PREFIX}/bin/port info --revision --line ${portname}) + for archive in ${PREFIX}/var/macports/software/${portname}/${portname}-${portversion}_${portrevision}[+.]*; do + aname=$(basename $archive) + echo deploying archive: $aname + #openssl dgst -ripemd160 -sign "${PRIVKEY}" -out ./${aname}.rmd160 ${archive} + #ssh ${DLHOST} mkdir -p ${DLPATH}/${portname} + #rsync -av --ignore-existing ./${aname}.rmd160 ${archive} ${DLHOST}:${DLPATH}/${portname} + rm -f ./${aname}.rmd160 + done + fi + fi +done Property changes on: contrib/mpab/deploy_archives.sh ___________________________________________________________________ Added: svn:executable + * Added: contrib/mpab/do_status.sh =================================================================== --- contrib/mpab/do_status.sh (rev 0) +++ contrib/mpab/do_status.sh 2011-06-29 05:18:26 UTC (rev 79893) @@ -0,0 +1,33 @@ +#!/bin/sh + +if [[ -z "$PORTLISTFILE" ]]; then + PORTLISTFILE=portlist +fi +if [[ -z "$PREFIX" ]]; then + PREFIX="../opt/local" +fi +if [[ -z "$STATUS_LOG" ]]; then + STATUS_LOG=portstatus.log +fi + + +rm -f $STATUS_LOG +failed=0 +for portname in `cat $PORTLISTFILE`; do + if ls logs-*/success/${portname}.log > /dev/null 2>&1 ; then + echo "[OK] ${portname}" >> $STATUS_LOG + elif ls logs-*/failure/${portname}.log > /dev/null 2>&1 ; then + echo "[FAIL] ${portname}" >> $STATUS_LOG + let "failed = failed + 1" + # send email to appropriate places + portmaintainers=$(${PREFIX}/bin/port info --maintainers --line ${portname} | tr ',' ' ') + for maint in $portmaintainers; do + if [[ "$maint" != "nomaintainer(a)macports.org" && "$maint" != "openmaintainer(a)macports.org" ]]; then + # email maintainer + echo "not emailing $maint (not set up yet)" + fi + # also send to some new mailing list? + done + fi +done +exit $failed Property changes on: contrib/mpab/do_status.sh ___________________________________________________________________ Added: svn:executable + *

1 0

[79892] trunk/dports/audio/id3lib
by jeremyhu＠macports.org 29 Jun '11

29 Jun '11

Revision: 79892 http://trac.macports.org/changeset/79892 Author: jeremyhu(a)macports.org Date: 2011-06-28 21:40:06 -0700 (Tue, 28 Jun 2011) Log Message: ----------- id3lib: clang build fix Modified Paths: -------------- trunk/dports/audio/id3lib/Portfile Added Paths: ----------- trunk/dports/audio/id3lib/files/id3lib-main.patch Modified: trunk/dports/audio/id3lib/Portfile =================================================================== --- trunk/dports/audio/id3lib/Portfile 2011-06-29 04:35:30 UTC (rev 79891) +++ trunk/dports/audio/id3lib/Portfile 2011-06-29 04:40:06 UTC (rev 79892) @@ -27,7 +27,9 @@ depends_build port:autoconf port:automake port:libtool patchfiles patch_id3lib_3.8.3_UTF16_writing_bug.diff \ - id3lib-vbr-overflow.patch + id3lib-vbr-overflow.patch \ + id3lib-main.patch + patch.pre_args -p1 # Bundled libtool does not understand -arch for linking Added: trunk/dports/audio/id3lib/files/id3lib-main.patch =================================================================== --- trunk/dports/audio/id3lib/files/id3lib-main.patch (rev 0) +++ trunk/dports/audio/id3lib/files/id3lib-main.patch 2011-06-29 04:40:06 UTC (rev 79892) @@ -0,0 +1,72 @@ +diff -Naurp id3lib-3.8.3.orig/examples/demo_convert.cpp id3lib-3.8.3/examples/demo_convert.cpp +--- id3lib-3.8.3.orig/examples/demo_convert.cpp 2003-03-01 16:23:00.000000000 -0800 ++++ id3lib-3.8.3/examples/demo_convert.cpp 2011-06-28 21:37:42.000000000 -0700 +@@ -84,7 +84,7 @@ void DisplayTags(ostream &os, luint nTag + } + } + +-int main( unsigned int argc, char * const argv[]) ++int main(int argc, char * const argv[]) + { + flags_t ulFlag = ID3TT_ALL; + gengetopt_args_info args; +diff -Naurp id3lib-3.8.3.orig/examples/demo_copy.cpp id3lib-3.8.3/examples/demo_copy.cpp +--- id3lib-3.8.3.orig/examples/demo_copy.cpp 2003-03-01 16:23:00.000000000 -0800 ++++ id3lib-3.8.3/examples/demo_copy.cpp 2011-06-28 21:37:42.000000000 -0700 +@@ -81,7 +81,7 @@ void DisplayTags(ostream &os, luint nTag + } + } + +-int main( unsigned int argc, char * const argv[]) ++int main(int argc, char * const argv[]) + { + int ulFlag = ID3TT_ID3; + ID3D_INIT_DOUT(); +diff -Naurp id3lib-3.8.3.orig/examples/demo_info.cpp id3lib-3.8.3/examples/demo_info.cpp +--- id3lib-3.8.3.orig/examples/demo_info.cpp 2003-03-01 16:23:00.000000000 -0800 ++++ id3lib-3.8.3/examples/demo_info.cpp 2011-06-28 21:37:42.000000000 -0700 +@@ -309,7 +309,7 @@ void PrintInformation(const ID3_Tag &myT + + #define DEBUG + +-int main( unsigned int argc, char * const argv[]) ++int main(int argc, char * const argv[]) + { + ID3D_INIT_DOUT(); + +diff -Naurp id3lib-3.8.3.orig/examples/demo_tag.cpp id3lib-3.8.3/examples/demo_tag.cpp +--- id3lib-3.8.3.orig/examples/demo_tag.cpp 2003-03-01 16:23:00.000000000 -0800 ++++ id3lib-3.8.3/examples/demo_tag.cpp 2011-06-28 21:37:42.000000000 -0700 +@@ -46,7 +46,7 @@ void DisplayTags(ostream &os, luint nTag + os << "v2"; + } + +-int main( unsigned int argc, char * const argv[]) ++int main(int argc, char * const argv[]) + { + int ulFlag = ID3TT_ID3; + ID3D_INIT_DOUT(); +diff -Naurp id3lib-3.8.3.orig/examples/findeng.cpp id3lib-3.8.3/examples/findeng.cpp +--- id3lib-3.8.3.orig/examples/findeng.cpp 2003-03-01 16:23:00.000000000 -0800 ++++ id3lib-3.8.3/examples/findeng.cpp 2011-06-28 21:37:42.000000000 -0700 +@@ -9,7 +9,7 @@ + using std::cout; + using std::endl; + +-int main(unsigned argc, char* argv[]) ++int main(int argc, char* argv[]) + { + ID3D_INIT_DOUT(); + ID3D_INIT_WARNING(); +diff -Naurp id3lib-3.8.3.orig/examples/findstr.cpp id3lib-3.8.3/examples/findstr.cpp +--- id3lib-3.8.3.orig/examples/findstr.cpp 2003-03-01 16:23:00.000000000 -0800 ++++ id3lib-3.8.3/examples/findstr.cpp 2011-06-28 21:37:42.000000000 -0700 +@@ -9,7 +9,7 @@ + using std::cout; + using std::endl; + +-int main(unsigned argc, char* argv[]) ++int main(int argc, char* argv[]) + { + ID3D_INIT_DOUT(); + ID3D_INIT_WARNING();

1 0

[79891] trunk/dports/gnome/file-roller
by jeremyhu＠macports.org 29 Jun '11

29 Jun '11

Revision: 79891 http://trac.macports.org/changeset/79891 Author: jeremyhu(a)macports.org Date: 2011-06-28 21:35:30 -0700 (Tue, 28 Jun 2011) Log Message: ----------- file-roller: Fix a bad return statement found by clang Modified Paths: -------------- trunk/dports/gnome/file-roller/Portfile Added Paths: ----------- trunk/dports/gnome/file-roller/files/ trunk/dports/gnome/file-roller/files/fixreturn.patch Modified: trunk/dports/gnome/file-roller/Portfile =================================================================== --- trunk/dports/gnome/file-roller/Portfile 2011-06-29 04:24:32 UTC (rev 79890) +++ trunk/dports/gnome/file-roller/Portfile 2011-06-29 04:35:30 UTC (rev 79891) @@ -5,7 +5,7 @@ name file-roller version 2.30.2 -revision 3 +revision 4 set branch [join [lrange [split ${version} .] 0 1] .] description An archive manager for GNOME long_description File Roller is an archive manager for the GNOME \ @@ -38,6 +38,8 @@ --disable-schemas-install \ --disable-scrollkeeper +patchfiles fixreturn.patch + post-activate { system "${prefix}/bin/scrollkeeper-update" system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor" Added: trunk/dports/gnome/file-roller/files/fixreturn.patch =================================================================== --- trunk/dports/gnome/file-roller/files/fixreturn.patch (rev 0) +++ trunk/dports/gnome/file-roller/files/fixreturn.patch 2011-06-29 04:35:30 UTC (rev 79891) @@ -0,0 +1,11 @@ +--- src/eggtreemultidnd.c.orig 2011-06-28 21:28:53.000000000 -0700 ++++ src/eggtreemultidnd.c 2011-06-28 21:29:17.000000000 -0700 +@@ -310,7 +310,7 @@ egg_tree_multi_drag_motion_event (GtkWid + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); + gtk_tree_selection_selected_foreach (selection, selection_foreach, &path_list); + if (path_list == NULL) +- return; ++ return FALSE; + + path_list = g_list_reverse (path_list); +

1 0

[79890] contrib/mpab/mpsync.sh
by jmr＠macports.org 29 Jun '11

29 Jun '11

Revision: 79890 http://trac.macports.org/changeset/79890 Author: jmr(a)macports.org Date: 2011-06-28 21:24:32 -0700 (Tue, 28 Jun 2011) Log Message: ----------- mpab: fix rsync path Modified Paths: -------------- contrib/mpab/mpsync.sh Modified: contrib/mpab/mpsync.sh =================================================================== --- contrib/mpab/mpsync.sh 2011-06-29 03:54:01 UTC (rev 79889) +++ contrib/mpab/mpsync.sh 2011-06-29 04:24:32 UTC (rev 79890) @@ -57,7 +57,7 @@ fi rsync -av --del --exclude '*~' --exclude '.svn' \ - ${dataDir}/${exportDir} \ + ${dataDir}/${exportDir}/ \ ${chrootPath}${SRC_PREFIX} || exit 1 echo "Re-creating portindex"

1 0

[79889] contrib/mpab/mpsync.sh
by jmr＠macports.org 29 Jun '11

29 Jun '11

Revision: 79889 http://trac.macports.org/changeset/79889 Author: jmr(a)macports.org Date: 2011-06-28 20:54:01 -0700 (Tue, 28 Jun 2011) Log Message: ----------- more verbosity Modified Paths: -------------- contrib/mpab/mpsync.sh Modified: contrib/mpab/mpsync.sh =================================================================== --- contrib/mpab/mpsync.sh 2011-06-29 03:35:16 UTC (rev 79888) +++ contrib/mpab/mpsync.sh 2011-06-29 03:54:01 UTC (rev 79889) @@ -56,7 +56,7 @@ umount=yes fi -rsync -r --del --exclude '*~' --exclude '.svn' \ +rsync -av --del --exclude '*~' --exclude '.svn' \ ${dataDir}/${exportDir} \ ${chrootPath}${SRC_PREFIX} || exit 1

1 0

[79888] trunk/dports/www/libmicrohttpd/Portfile
by ryandesign＠macports.org 29 Jun '11

29 Jun '11

Revision: 79888 http://trac.macports.org/changeset/79888 Author: ryandesign(a)macports.org Date: 2011-06-28 20:35:16 -0700 (Tue, 28 Jun 2011) Log Message: ----------- libmicrohttpd: use gnu fetch group, so that we have http sources, so that the distfiles mirrors can mirror it Modified Paths: -------------- trunk/dports/www/libmicrohttpd/Portfile Modified: trunk/dports/www/libmicrohttpd/Portfile =================================================================== --- trunk/dports/www/libmicrohttpd/Portfile 2011-06-29 03:24:47 UTC (rev 79887) +++ trunk/dports/www/libmicrohttpd/Portfile 2011-06-29 03:35:16 UTC (rev 79888) @@ -15,11 +15,10 @@ part of another application. GNU libmicrohttpd is \ free software and part of the GNU project. homepage http://www.gnu.org/software/libmicrohttpd/ +master_sites gnu platforms darwin depends_lib port:gnutls port:libgcrypt port:curl -master_sites ftp://ftp.gnu.org/gnu/libmicrohttpd/ - checksums sha1 d6b18ed0716f82663ab34d27b44ba708b86335fb \ rmd160 ae8a1d6f9e3c1936dde21c8796ac7b6801f04d56

1 0