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

propchange - r89263 svn:log
by ryandesign＠macports.org 30 Jan '12

30 Jan '12

Author: ryandesign(a)macports.org (original author: michaelld(a)macports.org) Revision: 89263 Property Name: svn:log --- /admin/var/tmp/revprops/pre-89263-ryandesign(a)macports.org 2012-01-30 13:46:30.000000000 -0800 +++ /admin/var/tmp/revprops/post-89263-ryandesign(a)macports.org 2012-01-30 13:46:32.000000000 -0800 @@ -1 +1 @@ -liblastfm: Add post-destroot to fix self-id of installed libraries. +liblastfm: Add post-destroot to fix self-id of installed libraries; see #32675

1 0

[89467] trunk/base/src/cregistry/sql.c
by jmr＠macports.org 30 Jan '12

30 Jan '12

Revision: 89467 http://trac.macports.org/changeset/89467 Author: jmr(a)macports.org Date: 2012-01-30 13:04:33 -0800 (Mon, 30 Jan 2012) Log Message: ----------- silence a C89 warning Modified Paths: -------------- trunk/base/src/cregistry/sql.c Modified: trunk/base/src/cregistry/sql.c =================================================================== --- trunk/base/src/cregistry/sql.c 2012-01-30 20:54:31 UTC (rev 89466) +++ trunk/base/src/cregistry/sql.c 2012-01-30 21:04:33 UTC (rev 89467) @@ -181,19 +181,19 @@ char* rollback = "ROLLBACK"; sqlite3_stmt* stmt = NULL; - //puts("Attempting to ROLLBACK..."); + /*puts("Attempting to ROLLBACK...");*/ if (sqlite3_prepare_v2(db, rollback, -1, &stmt, NULL) != SQLITE_OK) { - //printf("failed prepare: %d: %s\n", sqlite3_errcode(db), sqlite3_errmsg(db)); + /*printf("failed prepare: %d: %s\n", sqlite3_errcode(db), sqlite3_errmsg(db));*/ return 0; } if (sqlite3_step(stmt) != SQLITE_DONE) { - //printf("failed step: %d: %s\n", sqlite3_errcode(db), sqlite3_errmsg(db)); + /*printf("failed step: %d: %s\n", sqlite3_errcode(db), sqlite3_errmsg(db));*/ return 0; } - //puts("success."); + /*puts("success.");*/ return 1; } @@ -210,7 +210,7 @@ int update_db(sqlite3* db, reg_error* errPtr) { const char* version; int r; - int did_update = 0; // true, if an update was done and the loop should be run again + int did_update = 0; /* true, if an update was done and the loop should be run again */ char* q_begin = "BEGIN"; char* q_version = "SELECT value FROM registry.metadata WHERE key = 'version'"; char* query = q_begin;

1 0

[89466] trunk/base/src/port
by jmr＠macports.org 30 Jan '12

30 Jan '12

Revision: 89466 http://trac.macports.org/changeset/89466 Author: jmr(a)macports.org Date: 2012-01-30 12:54:31 -0800 (Mon, 30 Jan 2012) Log Message: ----------- remove explicit 'ed' alias of edit action, since abbreviations now work for all actions Modified Paths: -------------- trunk/base/src/port/port-help.tcl trunk/base/src/port/port.tcl Modified: trunk/base/src/port/port-help.tcl =================================================================== --- trunk/base/src/port/port-help.tcl 2012-01-30 18:11:22 UTC (rev 89465) +++ trunk/base/src/port/port-help.tcl 2012-01-30 20:54:31 UTC (rev 89466) @@ -135,8 +135,6 @@ Edit given ports } -set porthelp(ed) $porthelp(edit) - set porthelp(exit) { Exit port Modified: trunk/base/src/port/port.tcl =================================================================== --- trunk/base/src/port/port.tcl 2012-01-30 18:11:22 UTC (rev 89465) +++ trunk/base/src/port/port.tcl 2012-01-30 20:54:31 UTC (rev 89466) @@ -3704,7 +3704,7 @@ close $f } - ed - edit { + edit { # Edit the port's portfile with the user's editor # Restore our entire environment from start time. @@ -4039,7 +4039,6 @@ search [list action_search [ACTION_ARGS_STRINGS]] \ list [list action_list [ACTION_ARGS_PORTS]] \ \ - ed [list action_portcmds [ACTION_ARGS_PORTS]] \ edit [list action_portcmds [ACTION_ARGS_PORTS]] \ cat [list action_portcmds [ACTION_ARGS_PORTS]] \ dir [list action_portcmds [ACTION_ARGS_PORTS]] \ @@ -4155,7 +4154,6 @@ global cmd_opts_array array set cmd_opts_array { edit {{editor 1}} - ed {{editor 1}} info {category categories depends_fetch depends_extract depends_build depends_lib depends_run depends description epoch fullname heading homepage index license

1 0

[89465] trunk/dports/_resources/port1.0/group/crossbinutils-1.0.tcl
by pixilla＠macports.org 30 Jan '12

30 Jan '12

Revision: 89465 http://trac.macports.org/changeset/89465 Author: pixilla(a)macports.org Date: 2012-01-30 10:11:22 -0800 (Mon, 30 Jan 2012) Log Message: ----------- dports/_resources/port1.0/group/crossbinutils-1.0.tcl: - With gnu binutils source version 2.22 there is no COPYING.LIBGLOSS. Modified Paths: -------------- trunk/dports/_resources/port1.0/group/crossbinutils-1.0.tcl Modified: trunk/dports/_resources/port1.0/group/crossbinutils-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/crossbinutils-1.0.tcl 2012-01-30 17:43:21 UTC (rev 89464) +++ trunk/dports/_resources/port1.0/group/crossbinutils-1.0.tcl 2012-01-30 18:11:22 UTC (rev 89465) @@ -124,8 +124,8 @@ post-destroot { set docdir ${prefix}/share/doc/${name} xinstall -d ${destroot}${docdir} - xinstall -m 644 -W ${worksrcpath} COPYING COPYING.LIB COPYING.LIBGLOSS \ - COPYING3 COPYING3.LIB ChangeLog MAINTAINERS README \ + eval xinstall -m 644 \ + [glob -type f ${worksrcpath}/{COPYING*,ChangeLog,MAINTAINERS,README*}] \ ${destroot}${docdir} }

1 0

[89464] trunk/dports/databases/libgda5/Portfile
by jwa＠macports.org 30 Jan '12

30 Jan '12

Revision: 89464 http://trac.macports.org/changeset/89464 Author: jwa(a)macports.org Date: 2012-01-30 09:43:21 -0800 (Mon, 30 Jan 2012) Log Message: ----------- restore the old variants for legacy purposes, not to break old installs Modified Paths: -------------- trunk/dports/databases/libgda5/Portfile Modified: trunk/dports/databases/libgda5/Portfile =================================================================== --- trunk/dports/databases/libgda5/Portfile 2012-01-30 15:37:10 UTC (rev 89463) +++ trunk/dports/databases/libgda5/Portfile 2012-01-30 17:43:21 UTC (rev 89464) @@ -125,10 +125,55 @@ } } +# +# the following are legacy variants to be removed after a few update cycles + +variant with_mysql5 \ + description {support for current MySQL 5.x} { + depends_lib-append path:bin/mysql_config5:mysql5 + configure.env-append \ + MYSQL_CONFIG=${prefix}/lib/mysql5/bin/mysql_config + configure.args-delete --without-mysql + configure.args-append --with-mysql=${prefix}/lib/mysql5 + configure.cppflags-append "-I${prefix}/include/mysql5/mysql" +} + +variant with_postgresql83 conflicts with_postgresql84 with_postgresql90 \ + description {support for PostgreSQL 8.3.x} { + configure.cppflags-append "-I${prefix}/include/postgresql83" + depends_lib-append port:postgresql83 + configure.args-delete --without-postgres + configure.args-append --with-postgres=${prefix}/lib/postgresql83 +} + +variant with_postgresql84 conflicts with_postgresql83 with_postgresql90 \ + description {support for PostgreSQL 8.4.x} { + configure.cppflags-append "-I${prefix}/include/postgresql84" + depends_lib-append port:postgresql84 + configure.args-delete --without-postgres + configure.args-append --with-postgres=${prefix}/lib/postgresql84 +} + +variant with_postgresql90 conflicts with_postgresql83 with_postgresql84 \ + description {support for PostgreSQL 9.0.x} { + configure.cppflags-append "-I${prefix}/include/postgresql90" + depends_lib-append port:postgresql90 + configure.args-delete --without-postgres + configure.args-append --with-postgres=${prefix}/lib/postgresql90 +} + +variant without_bdb \ + description {remove support for Berkeley DB} { + configure.args-delete --with-bdb=${prefix} + configure.args-append --without-bdb +} + post-activate { system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor" } +notes "The with_ and without_ variants are deprecated" + livecheck.type regex livecheck.url http://ftp.gnome.org/pub/GNOME/sources/${gname}/${branch}/ livecheck.regex "LATEST-IS-(\\d+(?:\\.\\d+)*)"

1 0

[89463] trunk/base/src/pextlib1.0/system.c
by jmr＠macports.org 30 Jan '12

30 Jan '12

Revision: 89463 http://trac.macports.org/changeset/89463 Author: jmr(a)macports.org Date: 2012-01-30 07:37:10 -0800 (Mon, 30 Jan 2012) Log Message: ----------- better error handling in SystemCmd Modified Paths: -------------- trunk/base/src/pextlib1.0/system.c Modified: trunk/base/src/pextlib1.0/system.c =================================================================== --- trunk/base/src/pextlib1.0/system.c 2012-01-30 15:11:29 UTC (rev 89462) +++ trunk/base/src/pextlib1.0/system.c 2012-01-30 15:37:10 UTC (rev 89463) @@ -132,12 +132,14 @@ * popen() itself is not used because stderr is also desired. */ if (pipe(fdset) != 0) { + Tcl_SetResult(interp, strerror(errno), TCL_STATIC); return TCL_ERROR; } pid = fork(); switch (pid) { case -1: /* error */ + Tcl_SetResult(interp, strerror(errno), TCL_STATIC); return TCL_ERROR; break; case 0: /* child */ @@ -193,47 +195,52 @@ pos = 0; memset(circbuf, 0, sizeof(circbuf)); pdes = fdopen(fdset[0], "r"); - while ((buf = fgetln(pdes, &linelen)) != NULL) { - char *sbuf; - int slen; - - /* - * Allocate enough space to insert a terminating - * '\0' if the line is not terminated with a '\n' - */ - if (buf[linelen - 1] == '\n') - slen = linelen; - else - slen = linelen + 1; - - if (circbuf[pos].len == 0) - sbuf = malloc(slen); - else { - sbuf = realloc(circbuf[pos].line, slen); + if (pdes) { + while ((buf = fgetln(pdes, &linelen)) != NULL) { + char *sbuf; + int slen; + + /* + * Allocate enough space to insert a terminating + * '\0' if the line is not terminated with a '\n' + */ + if (buf[linelen - 1] == '\n') + slen = linelen; + else + slen = linelen + 1; + + if (circbuf[pos].len == 0) + sbuf = malloc(slen); + else { + sbuf = realloc(circbuf[pos].line, slen); + } + + if (sbuf == NULL) { + read_failed = 1; + break; + } + + memcpy(sbuf, buf, linelen); + /* terminate line with '\0',replacing '\n' if it exists */ + sbuf[slen - 1] = '\0'; + + circbuf[pos].line = sbuf; + circbuf[pos].len = slen; + + if (pos++ == CBUFSIZ - 1) { + pos = 0; + } + + if (ui_info(interp, sbuf) != TCL_OK) { + read_failed = 1; + break; + } } - - if (sbuf == NULL) { - read_failed = 1; - break; - } - - memcpy(sbuf, buf, linelen); - /* terminate line with '\0',replacing '\n' if it exists */ - sbuf[slen - 1] = '\0'; - - circbuf[pos].line = sbuf; - circbuf[pos].len = slen; - - if (pos++ == CBUFSIZ - 1) { - pos = 0; - } - - if (ui_info(interp, sbuf) != TCL_OK) { - read_failed = 1; - break; - } + fclose(pdes); + } else { + read_failed = 1; + Tcl_SetResult(interp, strerror(errno), TCL_STATIC); } - fclose(pdes); status = TCL_ERROR;

1 0

[89462] trunk/dports/net/httrack/Portfile
by ryandesign＠macports.org 30 Jan '12

30 Jan '12

Revision: 89462 http://trac.macports.org/changeset/89462 Author: ryandesign(a)macports.org Date: 2012-01-30 07:11:29 -0800 (Mon, 30 Jan 2012) Log Message: ----------- httrack: whitespace and formatting changes; add modeline Modified Paths: -------------- trunk/dports/net/httrack/Portfile Modified: trunk/dports/net/httrack/Portfile =================================================================== --- trunk/dports/net/httrack/Portfile 2012-01-30 15:07:51 UTC (rev 89461) +++ trunk/dports/net/httrack/Portfile 2012-01-30 15:11:29 UTC (rev 89462) @@ -1,30 +1,34 @@ +# -*- 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 httrack -version 3.44.1 -categories net -maintainers ross-williams.net:ross -description Website Copier/Offline Browser -long_description HTTrack is an offline browser utility that allows you to download a website from the Internet to a local directory -homepage http://www.httrack.com/ -master_sites http://download.httrack.com/ -platforms darwin +name httrack +version 3.44.1 +categories net +platforms darwin +maintainers ross-williams.net:ross -checksums sha1 5bdbc0b294b25929e52bc932e076c9e349a18fa9 \ - rmd160 04644ba0300b92392a255965d1c7191fe4f186fc - -depends_lib port:zlib +description Website Copier/Offline Browser -configure.args --with-zlib=${prefix} - +long_description HTTrack is an offline browser utility that allows you to \ + download a website from the Internet to a local directory. + +homepage http://www.httrack.com/ +master_sites http://download.httrack.com/ + +checksums sha1 5bdbc0b294b25929e52bc932e076c9e349a18fa9 \ + rmd160 04644ba0300b92392a255965d1c7191fe4f186fc + +depends_lib port:zlib + +configure.args --with-zlib=${prefix} + # Makefile fails during parallel builds -use_parallel_build no - -post-destroot { - # Remove metadata files not used by darwin or OS X - file delete ${destroot}${prefix}/share/pixmaps/httrack.xpm - file delete -force ${destroot}${prefix}/share/applications/ +use_parallel_build no + +post-destroot { + # Remove metadata files not used by darwin or OS X + file delete ${destroot}${prefix}/share/pixmaps/httrack.xpm + file delete -force ${destroot}${prefix}/share/applications/ } -# vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4

1 0

[89461] trunk/dports/audio/sox/Portfile
by ryandesign＠macports.org 30 Jan '12

30 Jan '12

Revision: 89461 http://trac.macports.org/changeset/89461 Author: ryandesign(a)macports.org Date: 2012-01-30 07:07:51 -0800 (Mon, 30 Jan 2012) Log Message: ----------- sox: obfuscate maintainer email Modified Paths: -------------- trunk/dports/audio/sox/Portfile Modified: trunk/dports/audio/sox/Portfile =================================================================== --- trunk/dports/audio/sox/Portfile 2012-01-30 15:07:20 UTC (rev 89460) +++ trunk/dports/audio/sox/Portfile 2012-01-30 15:07:51 UTC (rev 89461) @@ -6,7 +6,7 @@ name sox version 14.3.2 categories audio -maintainers hans(a)stare.cz +maintainers stare.cz:hans description SOund eXchange - universal sound sample translator long_description \ SoX (also known as Sound eXchange) translates sound samples between \

1 0

[89460] trunk/dports/audio/sox/Portfile
by ryandesign＠macports.org 30 Jan '12

30 Jan '12

Revision: 89460 http://trac.macports.org/changeset/89460 Author: ryandesign(a)macports.org Date: 2012-01-30 07:07:20 -0800 (Mon, 30 Jan 2012) Log Message: ----------- sox: change maintainer to Jan Stary; see #33035 Modified Paths: -------------- trunk/dports/audio/sox/Portfile Modified: trunk/dports/audio/sox/Portfile =================================================================== --- trunk/dports/audio/sox/Portfile 2012-01-30 14:59:58 UTC (rev 89459) +++ trunk/dports/audio/sox/Portfile 2012-01-30 15:07:20 UTC (rev 89460) @@ -6,7 +6,7 @@ name sox version 14.3.2 categories audio -maintainers davidfavor.com:david +maintainers hans(a)stare.cz description SOund eXchange - universal sound sample translator long_description \ SoX (also known as Sound eXchange) translates sound samples between \

1 0

[89459] trunk/base
by jmr＠macports.org 30 Jan '12

30 Jan '12

Revision: 89459 http://trac.macports.org/changeset/89459 Author: jmr(a)macports.org Date: 2012-01-30 06:59:58 -0800 (Mon, 30 Jan 2012) Log Message: ----------- cache ping times for 24 hours and add settings for indicating that certain hosts should be preferred or blacklisted Modified Paths: -------------- trunk/base/portmgr/jobs/port_binary_distributable.tcl trunk/base/src/macports1.0/macports.tcl trunk/base/src/port1.0/fetch_common.tcl Modified: trunk/base/portmgr/jobs/port_binary_distributable.tcl =================================================================== --- trunk/base/portmgr/jobs/port_binary_distributable.tcl 2012-01-30 14:48:47 UTC (rev 89458) +++ trunk/base/portmgr/jobs/port_binary_distributable.tcl 2012-01-30 14:59:58 UTC (rev 89459) @@ -37,7 +37,7 @@ set good_licenses {afl agpl apache apsl artistic autoconf beopen bitstreamvera \ boost bsd bsd-old cecill cecill-b cecill-c cnri copyleft \ cpl curl epl fpll fontconfig freetype gd gfdl gpl \ - gplconflict ibmpl ijg isc jasper lgpl libtool lppl mit \ + gplconflict ibmpl ijg isc jasper lgpl libtool lppl mit \ mpl ncsa noncommercial openldap openssl permissive php \ psf public-domain qpl restrictive/distributable ruby \ sleepycat ssleay tcl/tk vim w3c wtfpl x11 zlib wxwidgets zpl} Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2012-01-30 14:48:47 UTC (rev 89458) +++ trunk/base/src/macports1.0/macports.tcl 2012-01-30 14:59:58 UTC (rev 89459) @@ -49,7 +49,9 @@ mp_remote_url mp_remote_submit_url configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \ applications_dir frameworks_dir developer_dir universal_archs build_arch macosx_deployment_target \ macportsuser proxy_override_env proxy_http proxy_https proxy_ftp proxy_rsync proxy_skip \ - master_site_local patch_site_local archive_site_local buildfromsource revupgrade_autorun revupgrade_mode revupgrade_check_id_loadcmds" + master_site_local patch_site_local archive_site_local buildfromsource \ + revupgrade_autorun revupgrade_mode revupgrade_check_id_loadcmds \ + host_blacklist preferred_hosts" variable user_options "submitter_name submitter_email submitter_key" variable portinterp_options "\ portdbpath porturl portpath portbuildpath auto_path prefix prefix_frozen portsharepath \ @@ -483,6 +485,9 @@ global macports::macosx_version global macports::macosx_deployment_target global macports::archivefetch_pubkeys + global macports::ping_cache + global macports::host_blacklisted + global macports::host_preferred # Set the system encoding to utf-8 encoding system utf-8 @@ -981,6 +986,24 @@ # add ccache to environment set env(CCACHE_DIR) ${macports::ccache_dir} + # load cached ping times + if {[catch { + set pingfile [open ${macports::portdbpath}/pingtimes r] + array set macports::ping_cache [gets $pingfile] + close $pingfile + }]} { array set macports::ping_cache {} } + # set up arrays of blacklisted and preferred hosts + if {[info exists macports::host_blacklist]} { + foreach host ${macports::host_blacklist} { + set macports::host_blacklisted($host) 1 + } + } + if {[info exists macports::preferred_hosts]} { + foreach host ${macports::preferred_hosts} { + set macports::host_preferred($host) 1 + } + } + # load the quick index _mports_load_quickindex @@ -1016,6 +1039,13 @@ # call this just before you exit proc mportshutdown {} { + # save ping times + global macports::ping_cache macports::portdbpath + catch { + set pingfile [open ${macports::portdbpath}/pingtimes w] + puts $pingfile [array get macports::ping_cache] + close $pingfile + } # close it down so the cleanup stuff is called, e.g. vacuuming the db registry::close } @@ -1103,6 +1133,10 @@ # deferred options processing. $workername alias getoption macports::getoption + # ping cache + $workername alias get_pingtime macports::get_pingtime + $workername alias set_pingtime macports::set_pingtime + foreach opt $portinterp_options { if {![info exists $opt]} { global macports::$opt @@ -4296,3 +4330,26 @@ } } +# get cached ping time for host, modified by blacklist and preferred list +proc macports::get_pingtime {host} { + global macports::ping_cache macports::host_blacklisted macports::host_preferred + if {[info exists host_blacklisted($host)]} { + return -1 + } elseif {[info exists host_preferred($host)]} { + return 1 + } elseif {[info exists ping_cache($host)]} { + # expire entries after 1 day + if {[expr [clock seconds] - [lindex $ping_cache($host) 1]] <= 86400} { + return [lindex $ping_cache($host) 0] + } else { + unset ping_cache($host) + } + } + return {} +} + +# cache a ping time of ms for host +proc macports::set_pingtime {host ms} { + global macports::ping_cache + set ping_cache($host) [list $ms [clock seconds]] +} Modified: trunk/base/src/port1.0/fetch_common.tcl =================================================================== --- trunk/base/src/port1.0/fetch_common.tcl 2012-01-30 14:48:47 UTC (rev 89458) +++ trunk/base/src/port1.0/fetch_common.tcl 2012-01-30 14:59:58 UTC (rev 89459) @@ -252,7 +252,7 @@ continue } foreach fallback $fallback_mirror_list { - if {[string match [append fallback *] $site]} { + if {[string match ${fallback}* $site]} { # don't bother pinging fallback mirrors set seen($host) yes # and make them sort to the very end of the list @@ -261,25 +261,29 @@ } } if { ![info exists seen($host)] } { - if {[catch {set fds($host) [open "|ping -noq -c3 -t3 $host | grep round-trip | cut -d / -f 5"]}]} { - ui_debug "Spawning ping for $host failed" - # will end up after all hosts that were pinged OK but before those that didn't respond - set pingtimes($host) 5000 - } else { - ui_debug "Pinging $host..." - set seen($host) yes - lappend hosts $host + # first check the persistent cache + set pingtimes($host) [get_pingtime $host] + if {$pingtimes($host) == {}} { + if {[catch {set fds($host) [open "|ping -noq -c3 -t3 $host | grep round-trip | cut -d / -f 5"]}]} { + ui_debug "Spawning ping for $host failed" + # will end up after all hosts that were pinged OK but before those that didn't respond + set pingtimes($host) 5000 + } else { + set seen($host) yes + lappend hosts $host + } } } } foreach host $hosts { - set len [gets $fds($host) pingtimes($host)] + gets $fds($host) pingtimes($host) if { [catch { close $fds($host) }] || ![string is double -strict $pingtimes($host)] } { # ping failed, so put it last in the list (but before the fallback mirrors) set pingtimes($host) 10000 } - ui_debug "$host ping time is $pingtimes($host)" + # cache it + set_pingtime $host $pingtimes($host) } if {[info exists oldeuid]} { @@ -294,7 +298,10 @@ } else { regexp $hostregex $site -> host } - lappend pinglist [ list $site $pingtimes($host) ] + # -1 means blacklisted + if {$pingtimes($host) != "-1"} { + lappend pinglist [ list $site $pingtimes($host) ] + } } set pinglist [ lsort -real -index 1 $pinglist ]

1 0