diff options
161 files changed, 2709 insertions, 544 deletions
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile index 8afe07d8bd1e..e9b7be2c8f37 100644 --- a/accessibility/accerciser/Makefile +++ b/accessibility/accerciser/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/accerciser/Makefile,v 1.26 2009/03/17 13:06:24 kwm Exp $ +# $MCom: ports-stable/accessibility/accerciser/Makefile,v 1.1 2009/04/15 09:45:46 kwm Exp $ # PORTNAME= accerciser -PORTVERSION= 1.6.0 +PORTVERSION= 1.6.1 CATEGORIES= accessibility gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/accessibility/accerciser/distinfo b/accessibility/accerciser/distinfo index 667789dd9ab5..121515aa8a2f 100644 --- a/accessibility/accerciser/distinfo +++ b/accessibility/accerciser/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/accerciser-1.6.0.tar.bz2) = 04236a82648a4859811f959cc5576d06 -SHA256 (gnome2/accerciser-1.6.0.tar.bz2) = bcfc077c0bf212dfec550baff1db93229eebceafb8f6c1defa60dcd000e61af3 -SIZE (gnome2/accerciser-1.6.0.tar.bz2) = 1341848 +MD5 (gnome2/accerciser-1.6.1.tar.bz2) = 9dd36435858f6eaf63694eb16584e777 +SHA256 (gnome2/accerciser-1.6.1.tar.bz2) = 22c362a04025c876d5b454b7016edc888b737098d93b23e18f9f7cd59ba7ecf0 +SIZE (gnome2/accerciser-1.6.1.tar.bz2) = 1345128 diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile index c4f64c9024e1..90eb3a165ab1 100644 --- a/accessibility/orca/Makefile +++ b/accessibility/orca/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/orca/Makefile,v 1.62 2009/03/16 08:07:55 kwm Exp $ +# $MCom: ports-stable/accessibility/orca/Makefile,v 1.3 2009/04/15 09:42:54 kwm Exp $ # PORTNAME= orca -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= accessibility gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo index 94d4092ea982..6053ed3a61b0 100644 --- a/accessibility/orca/distinfo +++ b/accessibility/orca/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/orca-2.26.0.tar.bz2) = d097f28747943a32d50e3b91eab5c518 -SHA256 (gnome2/orca-2.26.0.tar.bz2) = 4c53b0643341977d6cd706461f80473cae3236678905aab898e773e473e2809d -SIZE (gnome2/orca-2.26.0.tar.bz2) = 2234371 +MD5 (gnome2/orca-2.26.1.tar.bz2) = 7c8b995b0e55cf902d3a658f1adae0cf +SHA256 (gnome2/orca-2.26.1.tar.bz2) = a4d47629c117a4163127310281dde4869ddf29e46fe76e4c552ea76a5757219f +SIZE (gnome2/orca-2.26.1.tar.bz2) = 2248081 diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 4c041b95f2d8..6bb1526899a2 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -3,11 +3,11 @@ # Whom: Anders Nordby <anders@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/archivers/file-roller/Makefile,v 1.155 2009/03/18 04:39:09 marcus Exp $ +# $MCom: ports-stable/archivers/file-roller/Makefile,v 1.3 2009/04/15 22:32:08 kwm Exp $ # PORTNAME= file-roller -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= GNOME diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo index c6e88ae56cec..a6a6a4fbdd06 100644 --- a/archivers/file-roller/distinfo +++ b/archivers/file-roller/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/file-roller-2.26.0.tar.bz2) = 795c6b0a2b3b02c5f407b1d9f9b643ef -SHA256 (gnome2/file-roller-2.26.0.tar.bz2) = 75b523ad80f315731aeb2c87e4d95716c1d20704b2d598eaad8aae3406cb9408 -SIZE (gnome2/file-roller-2.26.0.tar.bz2) = 1509272 +MD5 (gnome2/file-roller-2.26.1.tar.bz2) = b9e25c0e96d3cacc69be42037ba93589 +SHA256 (gnome2/file-roller-2.26.1.tar.bz2) = 4bfc1cd9405c91850034e07b1c0c69c4e1067e4bda5c8135f70085e578cf6918 +SIZE (gnome2/file-roller-2.26.1.tar.bz2) = 1563081 diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist index 3e38d045f482..4855c34757f7 100644 --- a/archivers/file-roller/pkg-plist +++ b/archivers/file-roller/pkg-plist @@ -47,6 +47,12 @@ share/gnome/help/file-roller/de/figures/file-roller_main_window.png share/gnome/help/file-roller/de/figures/file-roller_rightarrow.png share/gnome/help/file-roller/de/figures/file-roller_uparrow.png share/gnome/help/file-roller/de/file-roller.xml +share/gnome/help/file-roller/el/figures/file-roller_home.png +share/gnome/help/file-roller/el/figures/file-roller_leftarrow.png +share/gnome/help/file-roller/el/figures/file-roller_main_window.png +share/gnome/help/file-roller/el/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/el/figures/file-roller_uparrow.png +share/gnome/help/file-roller/el/file-roller.xml share/gnome/help/file-roller/en_GB/figures/file-roller_home.png share/gnome/help/file-roller/en_GB/figures/file-roller_leftarrow.png share/gnome/help/file-roller/en_GB/figures/file-roller_main_window.png @@ -211,6 +217,7 @@ share/omf/file-roller/file-roller-C.omf share/omf/file-roller/file-roller-ca.omf share/omf/file-roller/file-roller-bg.omf share/omf/file-roller/file-roller-de.omf +share/omf/file-roller/file-roller-el.omf share/omf/file-roller/file-roller-en_GB.omf share/omf/file-roller/file-roller-es.omf share/omf/file-roller/file-roller-fi.omf @@ -245,6 +252,8 @@ share/omf/file-roller/file-roller-vi.omf @dirrm share/gnome/help/file-roller/es @dirrm share/gnome/help/file-roller/en_GB/figures @dirrm share/gnome/help/file-roller/en_GB +@dirrm share/gnome/help/file-roller/el/figures +@dirrm share/gnome/help/file-roller/el @dirrm share/gnome/help/file-roller/de/figures @dirrm share/gnome/help/file-roller/de @dirrm share/gnome/help/file-roller/ca/figures diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 4a2f7dd532bf..8613607aa021 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/pulseaudio/Makefile,v 1.16 2009/04/09 04:36:26 marcus Exp $ +# $MCom: ports-stable/audio/pulseaudio/Makefile,v 1.2 2009/04/18 19:59:03 marcus Exp $ # PORTNAME= pulseaudio PORTVERSION= 0.9.14 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/ diff --git a/audio/pulseaudio/files/patch-src_daemon_main.c b/audio/pulseaudio/files/patch-src_daemon_main.c index 27b2c4f1a6a8..95a929a4b75a 100644 --- a/audio/pulseaudio/files/patch-src_daemon_main.c +++ b/audio/pulseaudio/files/patch-src_daemon_main.c @@ -8,21 +8,3 @@ #include <liboil/liboil.h> -@@ -689,7 +690,7 @@ int main(int argc, char *argv[]) { - * first take the autospawn lock to make things - * synchronous. */ - -- if ((autospawn_fd = pa_autospawn_lock_init()) < 0) { -+ /*if ((autospawn_fd = pa_autospawn_lock_init()) < 0) { - pa_log("Failed to initialize autospawn lock"); - goto finish; - } -@@ -699,7 +700,7 @@ int main(int argc, char *argv[]) { - goto finish; - } - -- autospawn_locked = TRUE; -+ autospawn_locked = TRUE;*/ - } - - if (conf->daemonize) { diff --git a/audio/pulseaudio/files/patch-src_daemon_start-pulseaudio-x11.in b/audio/pulseaudio/files/patch-src_daemon_start-pulseaudio-x11.in deleted file mode 100644 index 65001b57236c..000000000000 --- a/audio/pulseaudio/files/patch-src_daemon_start-pulseaudio-x11.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/daemon/start-pulseaudio-x11.in.orig 2009-03-07 19:48:47.000000000 -0500 -+++ src/daemon/start-pulseaudio-x11.in 2009-03-07 19:48:56.000000000 -0500 -@@ -19,7 +19,7 @@ - - set -e - --@PA_BINARY@ --start "$@" -+@PA_BINARY@ -D "$@" - - if [ x"$DISPLAY" != x ] ; then - diff --git a/audio/pulseaudio/files/patch-src_pulse_context.c b/audio/pulseaudio/files/patch-src_pulse_context.c deleted file mode 100644 index fda93a2a65c7..000000000000 --- a/audio/pulseaudio/files/patch-src_pulse_context.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/pulse/context.c.orig 2009-03-08 14:33:36.000000000 -0400 -+++ src/pulse/context.c 2009-03-08 14:33:42.000000000 -0400 -@@ -664,7 +664,7 @@ static int context_autospawn(pa_context - n = 0; - - argv[n++] = c->conf->daemon_binary; -- argv[n++] = "--start"; -+ argv[n++] = "-D"; - - while (n < MAX_ARGS) { - char *a; diff --git a/audio/pulseaudio/files/patch-ubuntu-bundle b/audio/pulseaudio/files/patch-ubuntu-bundle new file mode 100644 index 000000000000..d56f21932fad --- /dev/null +++ b/audio/pulseaudio/files/patch-ubuntu-bundle @@ -0,0 +1,1666 @@ +From 121bfc9f1916395e5216927ec3a9e0bbd742395a Mon Sep 17 00:00:00 2001 +From: Sjoerd Simons <sjoerd@debian.org> +Date: Sun, 19 Oct 2008 13:39:50 +0100 +Subject: [PATCH] load module gconf earlier + +--- + src/daemon/default.pa.in | 19 ++++++++++--------- + 1 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in +index 7032038..41322c6 100755 +--- src/daemon/default.pa.in ++++ src/daemon/default.pa.in +@@ -72,6 +72,16 @@ load-module module-native-protocol-unix + #load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 description="RTP Multicast Sink" + #load-module module-rtp-send source=rtp.monitor + ++### Load additional modules from GConf settings. This can be configured with the paprefs tool. ++### Please keep in mind that the modules configured by paprefs might conflict with manually ++### loaded modules. ++.ifexists module-gconf@PA_SOEXT@ ++.nofail ++load-module module-gconf ++.fail ++.endif ++ ++ + ### Automatically restore the volume of streams and devices + load-module module-stream-restore + load-module module-device-restore +@@ -96,15 +106,6 @@ load-module module-console-kit + ### Enable positioned event sounds + load-module module-position-event-sounds + +-### Load additional modules from GConf settings. This can be configured with the paprefs tool. +-### Please keep in mind that the modules configured by paprefs might conflict with manually +-### loaded modules. +-.ifexists module-gconf@PA_SOEXT@ +-.nofail +-load-module module-gconf +-.fail +-.endif +- + # X11 modules should not be started from default.pa so that one daemon + # can be shared by multiple sessions. + +Index: pulseaudio-0.9.14/src/daemon/daemon.conf.in +=================================================================== +--- src/daemon/daemon.conf.in 2009-03-07 05:01:11.000000000 -0500 ++++ src/daemon/daemon.conf.in 2009-03-07 05:01:54.000000000 -0500 +@@ -46,7 +46,7 @@ + ; log-target = auto + ; log-level = notice + +-; resample-method = speex-float-3 ++resample-method = src-linear + ; disable-remixing = no + ; disable-lfe-remixing = yes + +@@ -72,5 +72,5 @@ + ; default-sample-rate = 44100 + ; default-sample-channels = 2 + +-; default-fragments = 4 +-; default-fragment-size-msec = 25 ++default-fragments = 8 ++default-fragment-size-msec = 10 +Index: pulseaudio-0.9.13/src/daemon/default.pa.in +=================================================================== +--- src/daemon/default.pa.in 2009-01-06 22:58:47.000000000 -0500 ++++ src/daemon/default.pa.in 2009-01-06 22:59:15.000000000 -0500 +@@ -29,6 +29,9 @@ + + .fail + ++### Automatically suspend sinks/sources that become idle for too long ++load-module module-suspend-on-idle ++ + ### Automatically restore the volume of streams and devices + load-module module-stream-restore + load-module module-device-restore +@@ -95,9 +98,6 @@ + ### Make sure we always have a sink around, even if it is a null sink. + load-module module-always-sink + +-### Automatically suspend sinks/sources that become idle for too long +-load-module module-suspend-on-idle +- + ### If autoexit on idle is enabled we want to make sure we only quit + ### when no local session needs us anymore. + load-module module-console-kit +Index: pulseaudio-0.9.13/src/pulsecore/sink-input.c +=================================================================== +--- src/pulsecore/sink-input.c 2008-12-28 23:33:28.000000000 -0500 ++++ src/pulsecore/sink-input.c 2008-12-28 23:35:20.000000000 -0500 +@@ -292,8 +292,6 @@ + pa_assert_se(i->sink->n_corked -- >= 1); + else if (i->state != PA_SINK_INPUT_CORKED && state == PA_SINK_INPUT_CORKED) + i->sink->n_corked++; +- +- pa_sink_update_status(i->sink); + } + + /* Called from main context */ +@@ -331,6 +329,8 @@ + pa_hook_fire(&i->sink->core->hooks[PA_CORE_HOOK_SINK_INPUT_STATE_CHANGED], ssync); + } + ++ pa_sink_update_status(i->sink); ++ + return 0; + } + +@@ -381,6 +381,8 @@ + pa_hook_fire(&i->sink->core->hooks[PA_CORE_HOOK_SINK_INPUT_UNLINK_POST], i); + } + ++ pa_sink_update_status(i->sink); ++ + i->sink = NULL; + pa_sink_input_unref(i); + } +@@ -442,6 +444,8 @@ + + pa_subscription_post(i->sink->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_NEW, i->index); + pa_hook_fire(&i->sink->core->hooks[PA_CORE_HOOK_SINK_INPUT_PUT], i); ++ ++ pa_sink_update_status(i->sink); + } + + /* Called from main context */ +Index: pulseaudio-0.9.13/src/pulsecore/sink.c +=================================================================== +--- src/pulsecore/sink.c 2008-12-28 23:35:05.000000000 -0500 ++++ src/pulsecore/sink.c 2008-12-28 23:35:20.000000000 -0500 +@@ -990,7 +990,9 @@ + unsigned ret; + + pa_sink_assert_ref(s); +- pa_assert(PA_SINK_IS_LINKED(s->state)); ++ ++ if (!PA_SINK_IS_LINKED(s->state)) ++ return 0; + + ret = pa_idxset_size(s->inputs); + pa_assert(ret >= s->n_corked); +Index: pulseaudio-0.9.13/src/pulsecore/source-output.c +=================================================================== +--- src/pulsecore/source-output.c 2008-12-28 23:35:05.000000000 -0500 ++++ src/pulsecore/source-output.c 2008-12-28 23:35:20.000000000 -0500 +@@ -246,7 +246,6 @@ + else if (o->state != PA_SOURCE_OUTPUT_CORKED && state == PA_SOURCE_OUTPUT_CORKED) + o->source->n_corked++; + +- pa_source_update_status(o->source); + } + + /* Called from main context */ +@@ -264,6 +263,8 @@ + if (state != PA_SOURCE_OUTPUT_UNLINKED) + pa_hook_fire(&o->source->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_STATE_CHANGED], o); + ++ pa_source_update_status(o->source); ++ + return 0; + } + +@@ -302,6 +303,8 @@ + pa_hook_fire(&o->source->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_UNLINK_POST], o); + } + ++ pa_source_update_status(o->source); ++ + o->source = NULL; + pa_source_output_unref(o); + } +@@ -353,6 +356,8 @@ + + pa_subscription_post(o->source->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_NEW, o->index); + pa_hook_fire(&o->source->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_PUT], o); ++ ++ pa_source_update_status(o->source); + } + + /* Called from main context */ +Index: pulseaudio-0.9.13/src/pulsecore/source.c +=================================================================== +--- src/pulsecore/source.c 2008-12-28 23:35:05.000000000 -0500 ++++ src/pulsecore/source.c 2008-12-28 23:35:20.000000000 -0500 +@@ -637,7 +637,9 @@ + unsigned ret; + + pa_source_assert_ref(s); +- pa_assert(PA_SOURCE_IS_LINKED(s->state)); ++ ++ if (!PA_SOURCE_IS_LINKED(s->state)) ++ return 0; + + ret = pa_idxset_size(s->outputs); + pa_assert(ret >= s->n_corked); +Index: pulseaudio-0.9.13/src/pulsecore/sample-util.c +=================================================================== +--- src/pulsecore/sample-util.c 2009-01-03 18:30:13.000000000 -0500 ++++ src/pulsecore/sample-util.c 2009-01-03 18:30:30.000000000 -0500 +@@ -777,7 +777,7 @@ + return (l/fs) * fs; + } + +-int pa_frame_aligned(size_t l, const pa_sample_spec *ss) { ++pa_bool_t pa_frame_aligned(size_t l, const pa_sample_spec *ss) { + size_t fs; + + pa_assert(ss); +Index: pulseaudio-0.9.13/src/pulsecore/sample-util.h +=================================================================== +--- src/pulsecore/sample-util.h 2009-01-03 18:30:13.000000000 -0500 ++++ src/pulsecore/sample-util.h 2009-01-03 18:30:30.000000000 -0500 +@@ -71,7 +71,7 @@ + + size_t pa_frame_align(size_t l, const pa_sample_spec *ss) PA_GCC_PURE; + +-int pa_frame_aligned(size_t l, const pa_sample_spec *ss) PA_GCC_PURE; ++pa_bool_t pa_frame_aligned(size_t l, const pa_sample_spec *ss) PA_GCC_PURE; + + void pa_interleave(const void *src[], unsigned channels, void *dst, size_t ss, unsigned n); + void pa_deinterleave(const void *src, void *dst[], unsigned channels, size_t ss, unsigned n); +Index: pulseaudio-0.9.13/src/pulsecore/once.c +=================================================================== +--- src/pulsecore/once.c 2009-01-03 18:47:32.000000000 -0500 ++++ src/pulsecore/once.c 2009-01-03 18:48:07.000000000 -0500 +@@ -28,13 +28,13 @@ + + #include "once.h" + +-int pa_once_begin(pa_once *control) { ++pa_bool_t pa_once_begin(pa_once *control) { + pa_mutex *m; + + pa_assert(control); + + if (pa_atomic_load(&control->done)) +- return 0; ++ return FALSE; + + pa_atomic_inc(&control->ref); + +@@ -50,15 +50,17 @@ + * wait until it is unlocked */ + pa_mutex_lock(m); + ++ pa_assert(pa_atomic_load(&control->done)); ++ + pa_once_end(control); +- return 0; ++ return FALSE; + } + + pa_assert_se(m = pa_mutex_new(FALSE, FALSE)); + pa_mutex_lock(m); + + if (pa_atomic_ptr_cmpxchg(&control->mutex, NULL, m)) +- return 1; ++ return TRUE; + + pa_mutex_unlock(m); + pa_mutex_free(m); +@@ -91,4 +93,3 @@ + pa_once_end(control); + } + } +- +Index: pulseaudio-0.9.13/src/pulsecore/once.h +=================================================================== +--- src/pulsecore/once.h 2009-01-03 18:47:43.000000000 -0500 ++++ src/pulsecore/once.h 2009-01-03 18:48:07.000000000 -0500 +@@ -38,7 +38,7 @@ + } + + /* Not to be called directly, use the macros defined below instead */ +-int pa_once_begin(pa_once *o); ++pa_bool_t pa_once_begin(pa_once *o); + void pa_once_end(pa_once *o); + + #define PA_ONCE_BEGIN \ +Index: pulseaudio-0.9.13/src/pulsecore/protocol-native.c +=================================================================== +--- src/pulsecore/protocol-native.c 2009-01-15 17:25:43.000000000 -0500 ++++ src/pulsecore/protocol-native.c 2009-01-15 17:25:56.000000000 -0500 +@@ -3933,7 +3933,7 @@ + } + + CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); +- CHECK_VALIDITY(c->pstream, !name || pa_namereg_is_valid_name(name), tag, PA_ERR_INVALID); ++ CHECK_VALIDITY(c->pstream, !name || pa_namereg_is_valid_name(name) || *name == 0, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, idx != PA_INVALID_INDEX || name, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, idx == PA_INVALID_INDEX || !name, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, !name || idx == PA_INVALID_INDEX, tag, PA_ERR_INVALID); +@@ -3942,6 +3942,8 @@ + + if (idx == PA_INVALID_INDEX && name && !*name) { + ++ pa_log_debug("%s all sinks", b ? "Suspending" : "Resuming"); ++ + if (pa_sink_suspend_all(c->protocol->core, b) < 0) { + pa_pstream_send_error(c->pstream, tag, PA_ERR_INVALID); + return; +@@ -3967,6 +3969,8 @@ + + if (idx == PA_INVALID_INDEX && name && !*name) { + ++ pa_log_debug("%s all sources", b ? "Suspending" : "Resuming"); ++ + if (pa_source_suspend_all(c->protocol->core, b) < 0) { + pa_pstream_send_error(c->pstream, tag, PA_ERR_INVALID); + return; +Index: pulseaudio-0.9.14/src/pulsecore/asyncq.c +=================================================================== +--- src/pulsecore/asyncq.c 2009-01-31 15:19:57.000000000 -0500 ++++ src/pulsecore/asyncq.c 2009-01-31 15:20:05.000000000 -0500 +@@ -163,14 +163,14 @@ + return 0; + } + +-static pa_bool_t flush_postq(pa_asyncq *l) { ++static pa_bool_t flush_postq(pa_asyncq *l, pa_bool_t wait) { + struct localq *q; + + pa_assert(l); + + while ((q = l->last_localq)) { + +- if (push(l, q->data, FALSE) < 0) ++ if (push(l, q->data, wait) < 0) + return FALSE; + + l->last_localq = q->prev; +@@ -187,7 +187,7 @@ + int pa_asyncq_push(pa_asyncq*l, void *p, pa_bool_t wait) { + pa_assert(l); + +- if (!flush_postq(l)) ++ if (!flush_postq(l, wait)) + return -1; + + return push(l, p, wait); +@@ -199,8 +199,9 @@ + pa_assert(l); + pa_assert(p); + +- if (pa_asyncq_push(l, p, FALSE) >= 0) +- return; ++ if (flush_postq(l, FALSE)) ++ if (pa_asyncq_push(l, p, FALSE) >= 0) ++ return; + + /* OK, we couldn't push anything in the queue. So let's queue it + * locally and push it later */ +@@ -299,7 +300,7 @@ + + for (;;) { + +- if (flush_postq(l)) ++ if (flush_postq(l, FALSE)) + break; + + if (pa_fdsem_before_poll(l->read_fdsem) >= 0) { +Index: pulseaudio-0.9.14/src/pulsecore/sink.c +=================================================================== +--- src/pulsecore/sink.c 2009-01-31 15:24:30.000000000 -0500 ++++ src/pulsecore/sink.c 2009-01-31 15:24:55.000000000 -0500 +@@ -641,7 +641,7 @@ + + pa_assert(length > 0); + +- n = s->thread_info.state == PA_SINK_RUNNING ? fill_mix_info(s, &length, info, MAX_MIX_CHANNELS) : 0; ++ n = fill_mix_info(s, &length, info, MAX_MIX_CHANNELS); + + if (n == 0) { + +@@ -684,8 +684,7 @@ + result->index = 0; + } + +- if (s->thread_info.state == PA_SINK_RUNNING) +- inputs_drop(s, info, n, result); ++ inputs_drop(s, info, n, result); + + pa_sink_unref(s); + } +@@ -715,7 +714,7 @@ + + pa_assert(length > 0); + +- n = s->thread_info.state == PA_SINK_RUNNING ? fill_mix_info(s, &length, info, MAX_MIX_CHANNELS) : 0; ++ n = fill_mix_info(s, &length, info, MAX_MIX_CHANNELS); + + if (n == 0) { + if (target->length > length) +@@ -764,8 +763,7 @@ + pa_memblock_release(target->memblock); + } + +- if (s->thread_info.state == PA_SINK_RUNNING) +- inputs_drop(s, info, n, target); ++ inputs_drop(s, info, n, target); + + pa_sink_unref(s); + } +Index: pulseaudio-0.9.14/src/pulsecore/source.c +=================================================================== +--- src/pulsecore/source.c 2009-01-31 15:24:30.000000000 -0500 ++++ src/pulsecore/source.c 2009-01-31 15:24:55.000000000 -0500 +@@ -428,9 +428,6 @@ + pa_assert(PA_SOURCE_IS_OPENED(s->thread_info.state)); + pa_assert(chunk); + +- if (s->thread_info.state != PA_SOURCE_RUNNING) +- return; +- + if (s->thread_info.soft_muted || !pa_cvolume_is_norm(&s->thread_info.soft_volume)) { + pa_memchunk vchunk = *chunk; + +@@ -469,9 +466,6 @@ + pa_assert(o->thread_info.direct_on_input); + pa_assert(chunk); + +- if (s->thread_info.state != PA_SOURCE_RUNNING) +- return; +- + if (s->thread_info.soft_muted || !pa_cvolume_is_norm(&s->thread_info.soft_volume)) { + pa_memchunk vchunk = *chunk; + +Index: pulseaudio-0.9.14/src/modules/module-device-restore.c +=================================================================== +--- src/modules/module-device-restore.c 2009-01-31 15:47:31.000000000 -0500 ++++ src/modules/module-device-restore.c 2009-01-31 15:47:55.000000000 -0500 +@@ -98,14 +98,14 @@ + pa_log_info("Synced."); + } + +-static struct entry* read_entry(struct userdata *u, char *name) { ++static struct entry* read_entry(struct userdata *u, const char *name) { + datum key, data; + struct entry *e; + + pa_assert(u); + pa_assert(name); + +- key.dptr = name; ++ key.dptr = (char*) name; + key.dsize = (int) strlen(name); + + data = gdbm_fetch(u->gdbm_file, key); +@@ -235,13 +235,22 @@ + if ((e = read_entry(u, name))) { + + if (u->restore_volume) { +- pa_log_info("Restoring volume for sink %s.", new_data->name); +- pa_sink_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map)); ++ ++ if (!new_data->volume_is_set) { ++ pa_log_info("Restoring volume for sink %s.", new_data->name); ++ pa_sink_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map)); ++ } else ++ pa_log_debug("Not restoring volume for sink %s, because already set.", new_data->name); ++ + } + + if (u->restore_muted) { +- pa_log_info("Restoring mute state for sink %s.", new_data->name); +- pa_sink_new_data_set_muted(new_data, e->muted); ++ ++ if (!new_data->muted_is_set) { ++ pa_log_info("Restoring mute state for sink %s.", new_data->name); ++ pa_sink_new_data_set_muted(new_data, e->muted); ++ } else ++ pa_log_debug("Not restoring mute state for sink %s, because already set.", new_data->name); + } + + pa_xfree(e); +@@ -263,13 +272,21 @@ + if ((e = read_entry(u, name))) { + + if (u->restore_volume) { +- pa_log_info("Restoring volume for source %s.", new_data->name); +- pa_source_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map)); ++ ++ if (!new_data->volume_is_set) { ++ pa_log_info("Restoring volume for source %s.", new_data->name); ++ pa_source_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map)); ++ } else ++ pa_log_debug("Not restoring volume for source %s, because already set.", new_data->name); + } + + if (u->restore_muted) { +- pa_log_info("Restoring mute state for source %s.", new_data->name); +- pa_source_new_data_set_muted(new_data, e->muted); ++ ++ if (!new_data->muted_is_set) { ++ pa_log_info("Restoring mute state for source %s.", new_data->name); ++ pa_source_new_data_set_muted(new_data, e->muted); ++ } else ++ pa_log_debug("Not restoring mute state for source %s, because already set.", new_data->name); + } + + pa_xfree(e); +Index: pulseaudio-0.9.14/src/modules/module-oss.c +=================================================================== +--- src/modules/module-oss.c 2009-01-31 16:09:19.000000000 -0500 ++++ src/modules/module-oss.c 2009-01-31 16:13:16.000000000 -0500 +@@ -121,7 +121,7 @@ + int mixer_fd; + int mixer_devmask; + +- int nfrags, frag_size; ++ int nfrags, frag_size, orig_frag_size; + + pa_bool_t use_mmap; + unsigned out_mmap_current, in_mmap_current; +@@ -536,7 +536,7 @@ + } + + if (u->nfrags >= 2 && u->frag_size >= 1) +- if (pa_oss_set_fragments(u->fd, u->nfrags, u->frag_size) < 0) { ++ if (pa_oss_set_fragments(u->fd, u->nfrags, u->orig_frag_size) < 0) { + pa_log_warn("Resume failed, couldn't set original fragment settings."); + goto fail; + } +@@ -601,10 +601,10 @@ + + build_pollfd(u); + +- if (u->sink) +- sink_get_volume(u->sink); +- if (u->source) +- source_get_volume(u->source); ++ if (u->sink && u->sink->get_volume) ++ u->sink->get_volume(u->sink); ++ if (u->source && u->source->get_volume) ++ u->source->get_volume(u->source); + + pa_log_info("Resumed successfully..."); + +@@ -877,7 +877,7 @@ + + /* pa_log("loop"); */ + +- if (PA_SINK_IS_OPENED(u->sink->thread_info.state)) ++ if (u->sink && PA_SINK_IS_OPENED(u->sink->thread_info.state)) + if (u->sink->thread_info.rewind_requested) + pa_sink_process_rewind(u->sink, 0); + +@@ -1144,7 +1144,7 @@ + struct userdata *u = NULL; + const char *dev; + int fd = -1; +- int nfrags, frag_size; ++ int nfrags, orig_frag_size, frag_size; + int mode, caps; + pa_bool_t record = TRUE, playback = TRUE, use_mmap = TRUE; + pa_sample_spec ss; +@@ -1201,12 +1201,12 @@ + + if (use_mmap && (!(caps & DSP_CAP_MMAP) || !(caps & DSP_CAP_TRIGGER))) { + pa_log_info("OSS device not mmap capable, falling back to UNIX read/write mode."); +- use_mmap = 0; ++ use_mmap = FALSE; + } + + if (use_mmap && mode == O_WRONLY) { + pa_log_info("Device opened for playback only, cannot do memory mapping, falling back to UNIX write() mode."); +- use_mmap = 0; ++ use_mmap = FALSE; + } + + if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >= 0) +@@ -1216,6 +1216,7 @@ + + pa_log_info("Device opened in %s mode.", mode == O_WRONLY ? "O_WRONLY" : (mode == O_RDONLY ? "O_RDONLY" : "O_RDWR")); + ++ orig_frag_size = frag_size; + if (nfrags >= 2 && frag_size >= 1) + if (pa_oss_set_fragments(fd, nfrags, frag_size) < 0) + goto fail; +@@ -1235,6 +1236,7 @@ + m->userdata = u; + u->fd = fd; + u->mixer_fd = -1; ++ u->mixer_devmask = 0; + u->use_getospace = u->use_getispace = TRUE; + u->use_getodelay = TRUE; + u->mode = mode; +@@ -1242,6 +1244,7 @@ + u->device_name = pa_xstrdup(dev); + u->in_nfrags = u->out_nfrags = (uint32_t) (u->nfrags = nfrags); + u->out_fragment_size = u->in_fragment_size = (uint32_t) (u->frag_size = frag_size); ++ u->orig_frag_size = orig_frag_size; + u->use_mmap = use_mmap; + u->rtpoll = pa_rtpoll_new(); + pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll); +@@ -1383,7 +1386,6 @@ + + if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) { + pa_bool_t do_close = TRUE; +- u->mixer_devmask = 0; + + if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0) + pa_log_warn("SOUND_MIXER_READ_DEVMASK failed: %s", pa_cstrerror(errno)); +@@ -1409,6 +1411,7 @@ + if (do_close) { + pa_close(u->mixer_fd); + u->mixer_fd = -1; ++ u->mixer_devmask = 0; + } + } + +Index: pulseaudio-0.9.14/src/modules/oss-util.c +=================================================================== +--- src/modules/oss-util.c 2009-01-31 16:09:19.000000000 -0500 ++++ src/modules/oss-util.c 2009-01-31 16:12:37.000000000 -0500 +@@ -241,6 +241,8 @@ + int arg; + arg = ((int) nfrags << 16) | simple_log2(frag_size); + ++ pa_log_debug("Asking for %i fragments of size %i (requested %i)", nfrags, 1 << simple_log2(frag_size), frag_size); ++ + if (ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &arg) < 0) { + pa_log("SNDCTL_DSP_SETFRAGMENT: %s", pa_cstrerror(errno)); + return -1; +Index: pulseaudio-0.9.14/src/pulse/volume.c +=================================================================== +--- src/pulse/volume.c 2009-01-31 16:22:02.000000000 -0500 ++++ src/pulse/volume.c 2009-01-31 16:22:50.000000000 -0500 +@@ -304,7 +304,7 @@ + p == PA_CHANNEL_POSITION_LFE; + } + +-pa_cvolume *pa_cvolume_remap(pa_cvolume *v, pa_channel_map *from, pa_channel_map *to) { ++pa_cvolume *pa_cvolume_remap(pa_cvolume *v, const pa_channel_map *from, const pa_channel_map *to) { + int a, b; + pa_cvolume result; + +Index: pulseaudio-0.9.14/src/pulse/volume.h +=================================================================== +--- src/pulse/volume.h 2009-01-31 16:22:02.000000000 -0500 ++++ src/pulse/volume.h 2009-01-31 16:23:21.000000000 -0500 +@@ -207,7 +207,7 @@ + #endif + + /** Remap a volume from one channel mapping to a different channel mapping. \since 0.9.12 */ +-pa_cvolume *pa_cvolume_remap(pa_cvolume *v, pa_channel_map *from, pa_channel_map *to); ++pa_cvolume *pa_cvolume_remap(pa_cvolume *v, const pa_channel_map *from, const pa_channel_map *to); + + /** Return non-zero if the specified volume is compatible with + * the specified sample spec. \since 0.9.13 */ +Index: pulseaudio-0.9.14/src/modules/module-esound-sink.c +=================================================================== +--- src/modules/module-esound-sink.c 2009-01-31 16:25:18.000000000 -0500 ++++ src/modules/module-esound-sink.c 2009-01-31 16:25:40.000000000 -0500 +@@ -168,7 +168,7 @@ + w = pa_bytes_to_usec((uint64_t) u->offset + u->memchunk.length, &u->sink->sample_spec); + + *((pa_usec_t*) data) = w > r ? w - r : 0; +- break; ++ return 0; + } + + case SINK_MESSAGE_PASS_SOCKET: { +Index: pulseaudio-0.9.14/src/pulsecore/ltdl-helper.c +=================================================================== +--- src/pulsecore/ltdl-helper.c 2009-02-04 18:50:11.000000000 -0500 ++++ src/pulsecore/ltdl-helper.c 2009-02-04 18:50:21.000000000 -0500 +@@ -42,7 +42,9 @@ + pa_assert(handle); + pa_assert(symbol); + +- if ((f = ((pa_void_func_t) (size_t) lt_dlsym(handle, symbol)))) ++ *(void**) &f = lt_dlsym(handle, symbol); ++ ++ if (f) + return f; + + if (!module) +@@ -57,7 +59,7 @@ + if (!isalnum(*c)) + *c = '_'; + +- f = (pa_void_func_t) (size_t) lt_dlsym(handle, sn); ++ *(void**) &f = lt_dlsym(handle, sn); + pa_xfree(sn); + + return f; +Index: pulseaudio-0.9.14/src/pulsecore/sink.c +=================================================================== +--- src/pulsecore/sink.c 2009-02-04 19:05:00.000000000 -0500 ++++ src/pulsecore/sink.c 2009-02-04 19:05:50.000000000 -0500 +@@ -467,6 +467,9 @@ + s->thread_info.rewind_nbytes = 0; + s->thread_info.rewind_requested = FALSE; + ++ if (s->thread_info.state == PA_SINK_SUSPENDED) ++ return; ++ + if (nbytes > 0) + pa_log_debug("Processing rewind..."); + +@@ -476,7 +479,7 @@ + } + + if (nbytes > 0) +- if (s->monitor_source && PA_SOURCE_IS_OPENED(s->monitor_source->thread_info.state)) ++ if (s->monitor_source && PA_SOURCE_IS_LINKED(s->monitor_source->thread_info.state)) + pa_source_process_rewind(s->monitor_source, nbytes); + } + +@@ -556,7 +559,7 @@ + /* Drop read data */ + pa_sink_input_drop(i, result->length); + +- if (s->monitor_source && PA_SOURCE_IS_OPENED(pa_source_get_state(s->monitor_source))) { ++ if (s->monitor_source && PA_SOURCE_IS_LINKED(s->monitor_source->thread_info.state)) { + + if (pa_hashmap_size(i->thread_info.direct_outputs) > 0) { + void *ostate = NULL; +@@ -612,7 +615,7 @@ + } + } + +- if (s->monitor_source && PA_SOURCE_IS_OPENED(pa_source_get_state(s->monitor_source))) ++ if (s->monitor_source && PA_SOURCE_IS_LINKED(s->monitor_source->thread_info.state)) + pa_source_post(s->monitor_source, result); + } + +@@ -623,7 +626,7 @@ + size_t block_size_max; + + pa_sink_assert_ref(s); +- pa_assert(PA_SINK_IS_OPENED(s->thread_info.state)); ++ pa_assert(PA_SINK_IS_LINKED(s->thread_info.state)); + pa_assert(pa_frame_aligned(length, &s->sample_spec)); + pa_assert(result); + +@@ -632,6 +635,13 @@ + pa_assert(!s->thread_info.rewind_requested); + pa_assert(s->thread_info.rewind_nbytes == 0); + ++ if (s->thread_info.state == PA_SINK_SUSPENDED) { ++ result->memblock = pa_memblock_ref(s->silence.memblock); ++ result->index = s->silence.index; ++ result->length = PA_MIN(s->silence.length, length); ++ return; ++ } ++ + if (length <= 0) + length = pa_frame_align(MIX_BUFFER_LENGTH, &s->sample_spec); + +@@ -696,7 +706,7 @@ + size_t length, block_size_max; + + pa_sink_assert_ref(s); +- pa_assert(PA_SINK_IS_OPENED(s->thread_info.state)); ++ pa_assert(PA_SINK_IS_LINKED(s->thread_info.state)); + pa_assert(target); + pa_assert(target->memblock); + pa_assert(target->length > 0); +@@ -707,6 +717,11 @@ + pa_assert(!s->thread_info.rewind_requested); + pa_assert(s->thread_info.rewind_nbytes == 0); + ++ if (s->thread_info.state == PA_SINK_SUSPENDED) { ++ pa_silence_memchunk(target, &s->sample_spec); ++ return; ++ } ++ + length = target->length; + block_size_max = pa_mempool_block_size_max(s->core->mempool); + if (length > block_size_max) +@@ -774,7 +789,7 @@ + size_t l, d; + + pa_sink_assert_ref(s); +- pa_assert(PA_SINK_IS_OPENED(s->thread_info.state)); ++ pa_assert(PA_SINK_IS_LINKED(s->thread_info.state)); + pa_assert(target); + pa_assert(target->memblock); + pa_assert(target->length > 0); +@@ -804,7 +819,7 @@ + /* Called from IO thread context */ + void pa_sink_render_full(pa_sink *s, size_t length, pa_memchunk *result) { + pa_sink_assert_ref(s); +- pa_assert(PA_SINK_IS_OPENED(s->thread_info.state)); ++ pa_assert(PA_SINK_IS_LINKED(s->thread_info.state)); + pa_assert(length > 0); + pa_assert(pa_frame_aligned(length, &s->sample_spec)); + pa_assert(result); +@@ -830,7 +845,7 @@ + + /* The returned value is supposed to be in the time domain of the sound card! */ + +- if (!PA_SINK_IS_OPENED(s->state)) ++ if (s->state == PA_SINK_SUSPENDED) + return 0; + + if (!(s->flags & PA_SINK_LATENCY)) +@@ -1342,6 +1357,9 @@ + pa_sink_assert_ref(s); + pa_assert(PA_SINK_IS_LINKED(s->thread_info.state)); + ++ if (s->thread_info.state == PA_SINK_SUSPENDED) ++ return; ++ + if (nbytes == (size_t) -1) + nbytes = s->thread_info.max_rewind; + +@@ -1403,7 +1421,7 @@ + pa_sink_assert_ref(s); + pa_assert(PA_SINK_IS_LINKED(s->state)); + +- if (!PA_SINK_IS_OPENED(s->state)) ++ if (s->state == PA_SINK_SUSPENDED) + return 0; + + pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_GET_REQUESTED_LATENCY, &usec, 0, NULL) == 0); +Index: pulseaudio-0.9.14/src/pulsecore/source.c +=================================================================== +--- src/pulsecore/source.c 2009-02-04 19:05:00.000000000 -0500 ++++ src/pulsecore/source.c 2009-02-04 19:05:50.000000000 -0500 +@@ -406,7 +406,10 @@ + void *state = NULL; + + pa_source_assert_ref(s); +- pa_assert(PA_SOURCE_IS_OPENED(s->thread_info.state)); ++ pa_assert(PA_SOURCE_IS_LINKED(s->thread_info.state)); ++ ++ if (s->thread_info.state == PA_SOURCE_SUSPENDED) ++ return; + + if (nbytes <= 0) + return; +@@ -425,9 +428,12 @@ + void *state = NULL; + + pa_source_assert_ref(s); +- pa_assert(PA_SOURCE_IS_OPENED(s->thread_info.state)); ++ pa_assert(PA_SOURCE_IS_LINKED(s->thread_info.state)); + pa_assert(chunk); + ++ if (s->thread_info.state == PA_SOURCE_SUSPENDED) ++ return; ++ + if (s->thread_info.soft_muted || !pa_cvolume_is_norm(&s->thread_info.soft_volume)) { + pa_memchunk vchunk = *chunk; + +@@ -461,11 +467,14 @@ + /* Called from IO thread context */ + void pa_source_post_direct(pa_source*s, pa_source_output *o, const pa_memchunk *chunk) { + pa_source_assert_ref(s); +- pa_assert(PA_SOURCE_IS_OPENED(s->thread_info.state)); ++ pa_assert(PA_SOURCE_IS_LINKED(s->thread_info.state)); + pa_source_output_assert_ref(o); + pa_assert(o->thread_info.direct_on_input); + pa_assert(chunk); + ++ if (s->thread_info.state == PA_SOURCE_SUSPENDED) ++ return; ++ + if (s->thread_info.soft_muted || !pa_cvolume_is_norm(&s->thread_info.soft_volume)) { + pa_memchunk vchunk = *chunk; + +@@ -491,7 +500,7 @@ + pa_source_assert_ref(s); + pa_assert(PA_SOURCE_IS_LINKED(s->state)); + +- if (!PA_SOURCE_IS_OPENED(s->state)) ++ if (s->state == PA_SOURCE_SUSPENDED) + return 0; + + if (!(s->flags & PA_SOURCE_LATENCY)) +@@ -882,7 +891,7 @@ + pa_source_assert_ref(s); + pa_assert(PA_SOURCE_IS_LINKED(s->state)); + +- if (!PA_SOURCE_IS_OPENED(s->state)) ++ if (s->state == PA_SOURCE_SUSPENDED) + return 0; + + pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_GET_REQUESTED_LATENCY, &usec, 0, NULL) == 0); +Index: pulseaudio-0.9.14/src/pulsecore/sink.c +=================================================================== +--- src/pulsecore/sink.c 2009-02-04 19:19:17.000000000 -0500 ++++ src/pulsecore/sink.c 2009-02-04 19:19:24.000000000 -0500 +@@ -464,6 +464,11 @@ + pa_sink_assert_ref(s); + pa_assert(PA_SINK_IS_LINKED(s->thread_info.state)); + ++ /* If nobody requested this and this is actually no real rewind ++ * then we can short cut this */ ++ if (!s->thread_info.rewind_requested && nbytes <= 0) ++ return; ++ + s->thread_info.rewind_nbytes = 0; + s->thread_info.rewind_requested = FALSE; + +Index: pulseaudio-0.9.14/src/pulsecore/sink.c +=================================================================== +--- src/pulsecore/sink.c 2009-02-04 19:21:36.000000000 -0500 ++++ src/pulsecore/sink.c 2009-02-04 19:21:54.000000000 -0500 +@@ -1235,6 +1235,10 @@ + case PA_SINK_MESSAGE_SET_STATE: + + s->thread_info.state = PA_PTR_TO_UINT(userdata); ++ ++ if (s->thread_info.state == PA_SINK_SUSPENDED) ++ s->thread_info.rewind_requested = FALSE; ++ + return 0; + + case PA_SINK_MESSAGE_DETACH: +Index: pulseaudio-0.9.14/src/utils/pacmd.c +=================================================================== +--- src/utils/pacmd.c 2009-02-04 19:35:26.000000000 -0500 ++++ src/utils/pacmd.c 2009-02-04 19:35:33.000000000 -0500 +@@ -47,16 +47,16 @@ + int fd = -1; + int ret = 1, i; + struct sockaddr_un sa; +- char ibuf[256], obuf[256]; ++ char ibuf[PIPE_BUF], obuf[PIPE_BUF]; + size_t ibuf_index, ibuf_length, obuf_index, obuf_length; +- fd_set ifds, ofds; + char *cli; ++ pa_bool_t ibuf_eof, obuf_eof, ibuf_closed, obuf_closed; + + setlocale(LC_ALL, ""); + bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR); + + if (pa_pid_file_check_running(&pid, "pulseaudio") < 0) { +- pa_log("No PulseAudio daemon running"); ++ pa_log("No PulseAudio daemon running, or not running as session daemon."); + goto fail; + } + +@@ -99,15 +99,47 @@ + } + + ibuf_index = ibuf_length = obuf_index = obuf_length = 0; ++ ibuf_eof = obuf_eof = ibuf_closed = obuf_closed = FALSE; + ++ if (argc > 1) { ++ for (i = 1; i < argc; i++) { ++ size_t k; ++ ++ k = PA_MIN(sizeof(ibuf) - ibuf_length, strlen(argv[i])); ++ memcpy(ibuf + ibuf_length, argv[1], k); ++ ibuf_length += k; ++ ++ if (ibuf_length < sizeof(ibuf)) { ++ ibuf[ibuf_length] = i < argc-1 ? ' ' : '\n'; ++ ibuf_length++; ++ } ++ } + +- FD_ZERO(&ifds); +- FD_SET(0, &ifds); +- FD_SET(fd, &ifds); +- +- FD_ZERO(&ofds); ++ ibuf_eof = TRUE; ++ } + + for (;;) { ++ fd_set ifds, ofds; ++ ++ if (ibuf_eof && ++ obuf_eof && ++ ibuf_length <= 0 && ++ obuf_length <= 0) ++ break; ++ ++ FD_ZERO(&ifds); ++ FD_ZERO(&ofds); ++ ++ if (obuf_length > 0) ++ FD_SET(1, &ofds); ++ else if (!obuf_eof) ++ FD_SET(fd, &ifds); ++ ++ if (ibuf_length > 0) ++ FD_SET(fd, &ofds); ++ else if (!ibuf_eof) ++ FD_SET(0, &ifds); ++ + if (select(FD_SETSIZE, &ifds, &ofds, NULL, NULL) < 0) { + pa_log(_("select(): %s"), strerror(errno)); + goto fail; +@@ -118,15 +150,16 @@ + assert(!ibuf_length); + + if ((r = read(0, ibuf, sizeof(ibuf))) <= 0) { +- if (r == 0) +- break; +- +- pa_log(_("read(): %s"), strerror(errno)); +- goto fail; ++ if (r < 0) { ++ pa_log(_("read(): %s"), strerror(errno)); ++ goto fail; ++ } ++ ++ ibuf_eof = TRUE; ++ } else { ++ ibuf_length = (size_t) r; ++ ibuf_index = 0; + } +- +- ibuf_length = (size_t) r; +- ibuf_index = 0; + } + + if (FD_ISSET(fd, &ifds)) { +@@ -134,15 +167,16 @@ + assert(!obuf_length); + + if ((r = read(fd, obuf, sizeof(obuf))) <= 0) { +- if (r == 0) +- break; +- +- pa_log(_("read(): %s"), strerror(errno)); +- goto fail; ++ if (r < 0) { ++ pa_log(_("read(): %s"), strerror(errno)); ++ goto fail; ++ } ++ ++ obuf_eof = TRUE; ++ } else { ++ obuf_length = (size_t) r; ++ obuf_index = 0; + } +- +- obuf_length = (size_t) r; +- obuf_index = 0; + } + + if (FD_ISSET(1, &ofds)) { +@@ -170,28 +204,26 @@ + + ibuf_length -= (size_t) r; + ibuf_index += obuf_index; +- + } + +- FD_ZERO(&ifds); +- FD_ZERO(&ofds); +- +- if (obuf_length <= 0) +- FD_SET(fd, &ifds); +- else +- FD_SET(1, &ofds); ++ if (ibuf_length <= 0 && ibuf_eof && !ibuf_closed) { ++ close(0); ++ shutdown(fd, SHUT_WR); ++ ibuf_closed = TRUE; ++ } + +- if (ibuf_length <= 0) +- FD_SET(0, &ifds); +- else +- FD_SET(fd, &ofds); ++ if (obuf_length <= 0 && obuf_eof && !obuf_closed) { ++ shutdown(fd, SHUT_RD); ++ close(1); ++ obuf_closed = TRUE; ++ } + } + + ret = 0; + + fail: + if (fd >= 0) +- close(fd); ++ pa_close(fd); + + return ret; + } +Index: pulseaudio-0.9.14/src/modules/rtp/module-rtp-recv.c +=================================================================== +--- src/modules/rtp/module-rtp-recv.c 2009-02-06 18:04:53.000000000 -0500 ++++ src/modules/rtp/module-rtp-recv.c 2009-02-06 18:07:32.000000000 -0500 +@@ -453,7 +453,7 @@ + data.module = u->module; + pa_sink_input_new_data_set_sample_spec(&data, &sdp_info->sample_spec); + +- s->sink_input = pa_sink_input_new(u->module->core, &data, 0); ++ s->sink_input = pa_sink_input_new(u->module->core, &data, PA_SINK_INPUT_VARIABLE_RATE); + pa_sink_input_new_data_done(&data); + + if (!s->sink_input) { +Index: pulseaudio-0.9.14/src/modules/module-suspend-on-idle.c +=================================================================== +--- src/modules/module-suspend-on-idle.c 2009-02-12 18:28:26.000000000 -0500 ++++ src/modules/module-suspend-on-idle.c 2009-02-13 01:37:53.000000000 -0500 +@@ -158,6 +158,9 @@ + pa_sink_input_assert_ref(s); + pa_assert(u); + ++ if (!s->sink) ++ return PA_HOOK_OK; ++ + if (pa_sink_used_by(s->sink) <= 0) { + struct device_info *d; + if ((d = pa_hashmap_get(u->device_infos, s->sink))) +@@ -172,6 +175,9 @@ + pa_source_output_assert_ref(s); + pa_assert(u); + ++ if (!s->source) ++ return PA_HOOK_OK; ++ + if (pa_source_used_by(s->source) <= 0) { + struct device_info *d; + if ((d = pa_hashmap_get(u->device_infos, s->source))) +Index: pulseaudio-0.9.14/src/pulse/channelmap.c +=================================================================== +--- src/pulse/channelmap.c 2009-02-13 22:55:36.000000000 -0500 ++++ src/pulse/channelmap.c 2009-02-13 22:55:44.000000000 -0500 +@@ -216,10 +216,10 @@ + + case 6: + m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT; +- m->map[1] = PA_CHANNEL_POSITION_SIDE_LEFT; ++ m->map[1] = PA_CHANNEL_POSITION_REAR_LEFT; + m->map[2] = PA_CHANNEL_POSITION_FRONT_CENTER; + m->map[3] = PA_CHANNEL_POSITION_FRONT_RIGHT; +- m->map[4] = PA_CHANNEL_POSITION_SIDE_RIGHT; ++ m->map[4] = PA_CHANNEL_POSITION_REAR_RIGHT; + m->map[5] = PA_CHANNEL_POSITION_LFE; + return m; + +Index: pulseaudio-0.9.14/src/pulse/scache.c +=================================================================== +--- src/pulse/scache.c 2009-02-13 22:58:05.000000000 -0500 ++++ src/pulse/scache.c 2009-02-13 22:58:26.000000000 -0500 +@@ -66,10 +66,8 @@ + pa_tagstruct_put_channel_map(t, &s->channel_map); + pa_tagstruct_putu32(t, (uint32_t) length); + +- if (s->context->version >= 13) { +- pa_init_proplist(s->proplist); ++ if (s->context->version >= 13) + pa_tagstruct_put_proplist(t, s->proplist); +- } + + pa_pstream_send_tagstruct(s->context->pstream, t); + pa_pdispatch_register_reply(s->context->pdispatch, tag, DEFAULT_TIMEOUT, pa_create_stream_callback, s, NULL); +Index: pulseaudio-0.9.14/src/pulse/gccmacro.h +=================================================================== +--- src/pulse/gccmacro.h 2009-02-13 23:07:17.000000000 -0500 ++++ src/pulse/gccmacro.h 2009-02-13 23:09:29.000000000 -0500 +@@ -85,7 +85,7 @@ + #endif + + #ifndef PA_GCC_PACKED +-#ifdef __GNUCC__ ++#ifdef __GNUC__ + #define PA_GCC_PACKED __attribute__ ((packed)) + #else + /** Structure shall be packed in memory **/ +@@ -105,7 +105,7 @@ + #endif + + #ifndef PA_GCC_MALLOC +-#ifdef __GNUCC__ ++#ifdef __GNUC__ + #define PA_GCC_MALLOC __attribute__ ((malloc)) + #else + /** Macro for usage of GCC's malloc attribute */ +Index: pulseaudio-0.9.14/src/pulsecore/shm.c +=================================================================== +--- src/pulsecore/shm.c 2009-02-13 23:07:17.000000000 -0500 ++++ src/pulsecore/shm.c 2009-02-13 23:09:29.000000000 -0500 +@@ -70,14 +70,14 @@ + + /* We now put this SHM marker at the end of each segment. It's + * optional, to not require a reboot when upgrading, though */ +-struct shm_marker PA_GCC_PACKED { ++struct shm_marker { + pa_atomic_t marker; /* 0xbeefcafe */ + pa_atomic_t pid; + uint64_t _reserved1; + uint64_t _reserved2; + uint64_t _reserved3; + uint64_t _reserved4; +-}; ++} PA_GCC_PACKED; + + static char *segment_name(char *fn, size_t l, unsigned id) { + pa_snprintf(fn, l, "/pulse-shm-%u", id); +Index: pulseaudio-0.9.14/src/pulsecore/memblock.c +=================================================================== +--- src/pulsecore/memblock.c 2009-02-18 16:40:03.000000000 -0500 ++++ src/pulsecore/memblock.c 2009-02-18 16:40:13.000000000 -0500 +@@ -57,7 +57,7 @@ + + #define PA_MEMEXPORT_SLOTS_MAX 128 + +-#define PA_MEMIMPORT_SLOTS_MAX 128 ++#define PA_MEMIMPORT_SLOTS_MAX 160 + #define PA_MEMIMPORT_SEGMENTS_MAX 16 + + struct pa_memblock { +Index: pulseaudio-0.9.14/src/pulse/context.c +=================================================================== +--- src/pulse/context.c 2009-02-18 16:45:34.000000000 -0500 ++++ src/pulse/context.c 2009-02-18 16:46:22.000000000 -0500 +@@ -332,8 +332,7 @@ + + pa_assert(p); + pa_assert(chunk); +- pa_assert(chunk->memblock); +- pa_assert(chunk->length); ++ pa_assert(chunk->length > 0); + pa_assert(c); + pa_assert(PA_REFCNT_VALUE(c) >= 1); + +@@ -341,11 +340,11 @@ + + if ((s = pa_dynarray_get(c->record_streams, channel))) { + +- pa_assert(seek == PA_SEEK_RELATIVE); +- pa_assert(offset == 0); +- +- pa_memblockq_seek(s->record_memblockq, offset, seek); +- pa_memblockq_push_align(s->record_memblockq, chunk); ++ if (chunk->memblock) { ++ pa_memblockq_seek(s->record_memblockq, offset, seek); ++ pa_memblockq_push_align(s->record_memblockq, chunk); ++ } else ++ pa_memblockq_seek(s->record_memblockq, offset+chunk->length, seek); + + if (s->read_callback) { + size_t l; +Index: pulseaudio-0.9.14/src/pulsecore/protocol-native.c +=================================================================== +--- src/pulsecore/protocol-native.c 2009-02-18 16:45:34.000000000 -0500 ++++ src/pulsecore/protocol-native.c 2009-02-18 16:46:22.000000000 -0500 +@@ -4075,17 +4075,20 @@ + if (playback_stream_isinstance(stream)) { + playback_stream *ps = PLAYBACK_STREAM(stream); + +- if (seek != PA_SEEK_RELATIVE || offset != 0) +- pa_asyncmsgq_post(ps->sink_input->sink->asyncmsgq, PA_MSGOBJECT(ps->sink_input), SINK_INPUT_MESSAGE_SEEK, PA_UINT_TO_PTR(seek), offset, NULL, NULL); +- +- pa_asyncmsgq_post(ps->sink_input->sink->asyncmsgq, PA_MSGOBJECT(ps->sink_input), SINK_INPUT_MESSAGE_POST_DATA, NULL, 0, chunk, NULL); ++ if (chunk->memblock) { ++ if (seek != PA_SEEK_RELATIVE || offset != 0) ++ pa_asyncmsgq_post(ps->sink_input->sink->asyncmsgq, PA_MSGOBJECT(ps->sink_input), SINK_INPUT_MESSAGE_SEEK, PA_UINT_TO_PTR(seek), offset, NULL, NULL); ++ ++ pa_asyncmsgq_post(ps->sink_input->sink->asyncmsgq, PA_MSGOBJECT(ps->sink_input), SINK_INPUT_MESSAGE_POST_DATA, NULL, 0, chunk, NULL); ++ } else ++ pa_asyncmsgq_post(ps->sink_input->sink->asyncmsgq, PA_MSGOBJECT(ps->sink_input), SINK_INPUT_MESSAGE_SEEK, PA_UINT_TO_PTR(seek), offset+chunk->length, NULL, NULL); + + } else { + upload_stream *u = UPLOAD_STREAM(stream); + size_t l; + + if (!u->memchunk.memblock) { +- if (u->length == chunk->length) { ++ if (u->length == chunk->length && chunk->memblock) { + u->memchunk = *chunk; + pa_memblock_ref(u->memchunk.memblock); + u->length = 0; +@@ -4101,17 +4104,22 @@ + if (l > chunk->length) + l = chunk->length; + +- + if (l > 0) { +- void *src, *dst; ++ void *dst; + dst = pa_memblock_acquire(u->memchunk.memblock); +- src = pa_memblock_acquire(chunk->memblock); + +- memcpy((uint8_t*) dst + u->memchunk.index + u->memchunk.length, +- (uint8_t*) src+chunk->index, l); ++ if (chunk->memblock) { ++ void *src; ++ src = pa_memblock_acquire(chunk->memblock); ++ ++ memcpy((uint8_t*) dst + u->memchunk.index + u->memchunk.length, ++ (uint8_t*) src + chunk->index, l); ++ ++ pa_memblock_release(chunk->memblock); ++ } else ++ pa_silence_memory((uint8_t*) dst + u->memchunk.index + u->memchunk.length, l, &u->sample_spec); + + pa_memblock_release(u->memchunk.memblock); +- pa_memblock_release(chunk->memblock); + + u->memchunk.length += l; + u->length -= l; +Index: pulseaudio-0.9.14/src/pulsecore/pstream.c +=================================================================== +--- src/pulsecore/pstream.c 2009-02-18 16:45:34.000000000 -0500 ++++ src/pulsecore/pstream.c 2009-02-18 16:48:15.000000000 -0500 +@@ -832,8 +832,7 @@ + ntohl(p->read.shm_info[PA_PSTREAM_SHM_INDEX]), + ntohl(p->read.shm_info[PA_PSTREAM_SHM_LENGTH])))) { + +- pa_log_warn("Failed to import memory block."); +- return -1; ++ pa_log_debug("Failed to import memory block."); + } + + if (p->recieve_memblock_callback) { +@@ -842,7 +841,7 @@ + + chunk.memblock = b; + chunk.index = 0; +- chunk.length = pa_memblock_get_length(b); ++ chunk.length = b ? pa_memblock_get_length(b) : ntohl(p->read.shm_info[PA_PSTREAM_SHM_LENGTH]); + + offset = (int64_t) ( + (((uint64_t) ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI])) << 32) | +@@ -857,7 +856,8 @@ + p->recieve_memblock_callback_userdata); + } + +- pa_memblock_unref(b); ++ if (b) ++ pa_memblock_unref(b); + } + + goto frame_done; +Index: pulseaudio-0.9.14/src/pulsecore/core-error.c +=================================================================== +--- src/pulsecore/core-error.c 2009-03-05 17:12:02.000000000 -0500 ++++ src/pulsecore/core-error.c 2009-03-05 17:12:16.000000000 -0500 +@@ -47,6 +47,9 @@ + char *translated, *t; + char errbuf[128]; + ++ if (errnum < 0) ++ errnum = -errnum; ++ + if ((t = PA_STATIC_TLS_GET(cstrerror))) + pa_xfree(t); + +Index: pulseaudio-0.9.14/src/pulse/error.c +=================================================================== +--- src/pulse/error.c 2009-03-05 17:12:34.000000000 -0500 ++++ src/pulse/error.c 2009-03-05 17:12:54.000000000 -0500 +@@ -66,7 +66,10 @@ + + pa_init_i18n(); + +- if (error < 0 || error >= PA_ERR_MAX) ++ if (error < 0) ++ error = -error; ++ ++ if (error >= PA_ERR_MAX) + return NULL; + + return _(errortab[error]); +Index: pulseaudio-0.9.14/src/pulsecore/sink.c +=================================================================== +--- src/pulsecore/sink.c 2009-02-19 18:45:44.000000000 -0500 ++++ src/pulsecore/sink.c 2009-02-19 18:46:04.000000000 -0500 +@@ -1557,6 +1557,9 @@ + + pa_sink_assert_ref(s); + ++ pa_assert(!min_latency || !max_latency || ++ min_latency <= max_latency); ++ + s->thread_info.min_latency = min_latency; + s->thread_info.max_latency = max_latency; + +Index: pulseaudio-0.9.14/src/pulsecore/source.c +=================================================================== +--- src/pulsecore/source.c 2009-02-19 18:46:57.000000000 -0500 ++++ src/pulsecore/source.c 2009-02-19 18:47:08.000000000 -0500 +@@ -994,6 +994,9 @@ + + pa_source_assert_ref(s); + ++ pa_assert(!min_latency || !max_latency || ++ min_latency <= max_latency); ++ + s->thread_info.min_latency = min_latency; + s->thread_info.max_latency = max_latency; + +Index: pulseaudio-0.9.14/src/utils/paplay.c +=================================================================== +--- src/utils/paplay.c 2009-02-19 19:25:01.000000000 -0500 ++++ src/utils/paplay.c 2009-02-19 19:25:10.000000000 -0500 +@@ -400,7 +400,10 @@ + pa_context_set_state_callback(context, context_state_callback, NULL); + + /* Connect the context */ +- pa_context_connect(context, server, 0, NULL); ++ if (pa_context_connect(context, server, 0, NULL) < 0) { ++ fprintf(stderr, _("pa_context_connect() failed: %s"), pa_strerror(pa_context_errno(context))); ++ goto quit; ++ } + + /* Run the main loop */ + if (pa_mainloop_run(m, &ret) < 0) { +Index: pulseaudio-0.9.14/src/utils/pactl.c +=================================================================== +--- src/utils/pactl.c 2009-02-19 19:25:01.000000000 -0500 ++++ src/utils/pactl.c 2009-02-19 19:25:10.000000000 -0500 +@@ -561,6 +561,7 @@ + pa_xfree(d); + fprintf(stderr, _("Premature end of file\n")); + quit(1); ++ return; + } + + pa_stream_write(s, d, length, pa_xfree, 0, PA_SEEK_RELATIVE); +@@ -925,7 +926,10 @@ + } + + pa_context_set_state_callback(context, context_state_callback, NULL); +- pa_context_connect(context, server, 0, NULL); ++ if (pa_context_connect(context, server, 0, NULL) < 0) { ++ fprintf(stderr, _("pa_context_connect() failed: %s"), pa_strerror(pa_context_errno(context))); ++ goto quit; ++ } + + if (pa_mainloop_run(m, &ret) < 0) { + fprintf(stderr, _("pa_mainloop_run() failed.\n")); +Index: pulseaudio-0.9.14/src/pulsecore/protocol-native.c +=================================================================== +--- src/pulsecore/protocol-native.c 2009-02-19 19:25:10.000000000 -0500 ++++ src/pulsecore/protocol-native.c 2009-02-19 19:25:11.000000000 -0500 +@@ -2472,7 +2472,10 @@ + if (!(name = pa_proplist_gets(p, PA_PROP_EVENT_ID))) + name = pa_proplist_gets(p, PA_PROP_MEDIA_NAME); + +- CHECK_VALIDITY(c->pstream, name && pa_namereg_is_valid_name(name), tag, PA_ERR_INVALID); ++ if (!name || !pa_namereg_is_valid_name(name)) { ++ pa_proplist_free(p); ++ CHECK_VALIDITY(c->pstream, FALSE, tag, PA_ERR_INVALID); ++ } + + s = upload_stream_new(c, &ss, &map, name, length, p); + pa_proplist_free(p); +@@ -3426,24 +3429,29 @@ + } + } + +- CHECK_VALIDITY(c->pstream, mode == PA_UPDATE_SET || mode == PA_UPDATE_MERGE || mode == PA_UPDATE_REPLACE, tag, PA_ERR_INVALID); ++ if (!(mode == PA_UPDATE_SET || mode == PA_UPDATE_MERGE || mode == PA_UPDATE_REPLACE)) { ++ pa_proplist_free(p); ++ CHECK_VALIDITY(c->pstream, FALSE, tag, PA_ERR_INVALID); ++ } + + if (command == PA_COMMAND_UPDATE_PLAYBACK_STREAM_PROPLIST) { + playback_stream *s; + + s = pa_idxset_get_by_index(c->output_streams, idx); +- CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_NOENTITY); +- CHECK_VALIDITY(c->pstream, playback_stream_isinstance(s), tag, PA_ERR_NOENTITY); +- ++ if (!s || !playback_stream_isinstance(s)) { ++ pa_proplist_free(p); ++ CHECK_VALIDITY(c->pstream, FALSE, tag, PA_ERR_NOENTITY); ++ } + pa_proplist_update(s->sink_input->proplist, mode, p); + pa_subscription_post(c->protocol->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, s->sink_input->index); + + } else if (command == PA_COMMAND_UPDATE_RECORD_STREAM_PROPLIST) { + record_stream *s; + +- s = pa_idxset_get_by_index(c->record_streams, idx); +- CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_NOENTITY); +- ++ if (!(s = pa_idxset_get_by_index(c->record_streams, idx))) { ++ pa_proplist_free(p); ++ CHECK_VALIDITY(c->pstream, FALSE, tag, PA_ERR_NOENTITY); ++ } + pa_proplist_update(s->source_output->proplist, mode, p); + pa_subscription_post(c->protocol->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_CHANGE, s->source_output->index); + } else { +@@ -3454,6 +3462,7 @@ + } + + pa_pstream_send_simple_ack(c->pstream, tag); ++ pa_proplist_free(p); + } + + static void command_remove_proplist(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) { +@@ -4034,7 +4043,7 @@ + CHECK_VALIDITY(c->pstream, m->load_once || idx != PA_INVALID_INDEX, tag, PA_ERR_INVALID); + + cb = (pa_native_protocol_ext_cb_t) pa_hashmap_get(c->protocol->extensions, m); +- CHECK_VALIDITY(c->pstream, m, tag, PA_ERR_NOEXTENSION); ++ CHECK_VALIDITY(c->pstream, cb, tag, PA_ERR_NOEXTENSION); + + if (cb(c->protocol, m, c, tag, t) < 0) + protocol_error(c); +Index: pulseaudio-0.9.14/src/utils/padsp.c +=================================================================== +--- src/utils/padsp.c 2009-02-19 19:25:01.000000000 -0500 ++++ src/utils/padsp.c 2009-02-19 19:25:11.000000000 -0500 +@@ -1202,7 +1202,7 @@ + static void sink_info_cb(pa_context *context, const pa_sink_info *si, int eol, void *userdata) { + fd_info *i = userdata; + +- if (!si && eol < 0) { ++ if (!si || eol < 0) { + i->operation_success = 0; + pa_threaded_mainloop_signal(i->mainloop, 0); + return; +@@ -1224,7 +1224,7 @@ + static void source_info_cb(pa_context *context, const pa_source_info *si, int eol, void *userdata) { + fd_info *i = userdata; + +- if (!si && eol < 0) { ++ if (!si || eol < 0) { + i->operation_success = 0; + pa_threaded_mainloop_signal(i->mainloop, 0); + return; +Index: pulseaudio-0.9.14/src/pulsecore/core-util.c +=================================================================== +--- src/pulsecore/core-util.c 2009-02-19 19:25:01.000000000 -0500 ++++ src/pulsecore/core-util.c 2009-02-19 19:26:05.000000000 -0500 +@@ -1376,6 +1376,7 @@ + return -1; + } + ++ pa_xfree(p); + return 0; + } + +@@ -1408,6 +1409,7 @@ + + if (pa_make_secure_dir(d, m, (uid_t) -1, (gid_t) -1) < 0) { + pa_log_error("Failed to create secure directory: %s", pa_cstrerror(errno)); ++ pa_xfree(d); + goto fail; + } + +@@ -2424,7 +2426,7 @@ + + pa_strip_nl(ln); + +- if (ln[0]) ++ if (r && ln[0]) + return pa_xstrdup(ln); + } + +Index: pulseaudio-0.9.14/src/daemon/daemon-conf.c +=================================================================== +--- src/daemon/daemon-conf.c 2009-02-19 19:25:01.000000000 -0500 ++++ src/daemon/daemon-conf.c 2009-02-19 19:25:11.000000000 -0500 +@@ -643,7 +643,7 @@ + if (c->config_file) + pa_strbuf_printf(s, _("### Read from configuration file: %s ###\n"), c->config_file); + +- pa_assert(c->log_level <= PA_LOG_LEVEL_MAX); ++ pa_assert(c->log_level < PA_LOG_LEVEL_MAX); + + pa_strbuf_printf(s, "daemonize = %s\n", pa_yes_no(c->daemonize)); + pa_strbuf_printf(s, "fail = %s\n", pa_yes_no(c->fail)); +Index: pulseaudio-0.9.14/src/pulsecore/protocol-esound.c +=================================================================== +--- src/pulsecore/protocol-esound.c 2009-02-19 19:25:01.000000000 -0500 ++++ src/pulsecore/protocol-esound.c 2009-02-19 19:25:11.000000000 -0500 +@@ -926,7 +926,7 @@ + + c->request = PA_MAYBE_INT32_SWAP(c->swap_byte_order, c->request); + +- if (c->request < ESD_PROTO_CONNECT || c->request > ESD_PROTO_MAX) { ++ if (c->request < ESD_PROTO_CONNECT || c->request >= ESD_PROTO_MAX) { + pa_log("recieved invalid request."); + return -1; + } +Index: pulseaudio-0.9.14/src/modules/module-stream-restore.c +=================================================================== +--- src/modules/module-stream-restore.c 2009-02-19 19:25:01.000000000 -0500 ++++ src/modules/module-stream-restore.c 2009-02-19 19:25:11.000000000 -0500 +@@ -429,6 +429,7 @@ + pa_xfree(n); + continue; + } ++ pa_xfree(n); + + if (u->restore_volume) { + pa_cvolume v = e->volume; +@@ -460,6 +461,7 @@ + pa_xfree(n); + continue; + } ++ pa_xfree(n); + + if (u->restore_device && + (s = pa_namereg_get(u->core, e->device, PA_NAMEREG_SOURCE, TRUE))) { +Index: pulseaudio-0.9.14/src/modules/alsa-util.c +=================================================================== +--- src/modules/alsa-util.c 2009-02-19 19:28:55.000000000 -0500 ++++ src/modules/alsa-util.c 2009-02-19 19:29:23.000000000 -0500 +@@ -107,7 +107,7 @@ + static void defer_cb(pa_mainloop_api*a, pa_defer_event* e, void *userdata) { + struct pa_alsa_fdlist *fdl = userdata; + unsigned num_fds, i; +- int err; ++ int err, n; + struct pollfd *temp; + + pa_assert(a); +@@ -116,7 +116,11 @@ + + a->defer_enable(fdl->defer, 0); + +- num_fds = (unsigned) snd_mixer_poll_descriptors_count(fdl->mixer); ++ if ((n = snd_mixer_poll_descriptors_count(fdl->mixer)) < 0) { ++ pa_log("snd_mixer_poll_descriptors_count() failed: %s", snd_strerror(n)); ++ return; ++ } ++ num_fds = (unsigned) n; + + if (num_fds != fdl->num_fds) { + if (fdl->fds) +Index: pulseaudio-0.9.14/src/daemon/cmdline.c +=================================================================== +--- src/daemon/cmdline.c 2009-02-22 00:19:36.000000000 -0500 ++++ src/daemon/cmdline.c 2009-02-22 00:21:01.000000000 -0500 +@@ -292,7 +292,7 @@ + + case ARG_DISALLOW_EXIT: + if ((conf->disallow_exit = optarg ? pa_parse_boolean(optarg) : TRUE) < 0) { +- pa_log(_("--disallow-exit boolean argument")); ++ pa_log(_("--disallow-exit expects boolean argument")); + goto fail; + } + break; +Index: pulseaudio-0.9.14/src/pulsecore/protocol-esound.c +=================================================================== +--- src/pulsecore/protocol-esound.c 2009-03-05 17:15:48.000000000 -0500 ++++ src/pulsecore/protocol-esound.c 2009-03-05 17:15:49.000000000 -0500 +@@ -1198,6 +1198,9 @@ + connection *c = CONNECTION(o); + connection_assert_ref(c); + ++ if (!c->protocol) ++ return -1; ++ + switch (code) { + case CONNECTION_MESSAGE_REQUEST_DATA: + do_work(c); +Index: pulseaudio-0.9.14/src/pulsecore/protocol-simple.c +=================================================================== +--- src/pulsecore/protocol-simple.c 2009-03-05 17:12:00.000000000 -0500 ++++ src/pulsecore/protocol-simple.c 2009-03-05 17:15:49.000000000 -0500 +@@ -283,6 +283,9 @@ + connection *c = CONNECTION(o); + connection_assert_ref(c); + ++ if (!c->protocol) ++ return -1; ++ + switch (code) { + case CONNECTION_MESSAGE_REQUEST_DATA: + do_work(c); diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 1c90f48bbc35..2cd1c53bc085 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server/Makefile,v 1.168 2009/03/17 13:17:16 kwm Exp $ +# $MCom: ports-stable/databases/evolution-data-server/Makefile,v 1.5 2009/04/15 23:04:33 kwm Exp $ # PORTNAME= evolution-data-server -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1.1 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo index ed4def55e750..105b9df87f16 100644 --- a/databases/evolution-data-server/distinfo +++ b/databases/evolution-data-server/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evolution-data-server-2.26.0.tar.bz2) = d010845a4ee9604f050403b106c2f416 -SHA256 (gnome2/evolution-data-server-2.26.0.tar.bz2) = 1e15e964355de7db63f9ee1480c0882ede0d44252ed5778fe65b4e163f7945f0 -SIZE (gnome2/evolution-data-server-2.26.0.tar.bz2) = 7344309 +MD5 (gnome2/evolution-data-server-2.26.1.1.tar.bz2) = 0d626ddc09116f25fe5b42bd38b7f440 +SHA256 (gnome2/evolution-data-server-2.26.1.1.tar.bz2) = 530bc9309625afceb6545569dfa11ecc9ffe9b944e0d775ad82780dd6441ab8e +SIZE (gnome2/evolution-data-server-2.26.1.1.tar.bz2) = 7375026 diff --git a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in index f84db6643729..8e3728055401 100644 --- a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in +++ b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in @@ -1,6 +1,6 @@ ---- docs/reference/camel/Makefile.in.orig 2009-01-16 16:16:56.000000000 +0100 -+++ docs/reference/camel/Makefile.in 2009-01-16 16:18:31.000000000 +0100 -@@ -130,7 +130,7 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LI +--- docs/reference/camel/Makefile.in.orig 2009-04-17 01:03:20.000000000 +0200 ++++ docs/reference/camel/Makefile.in 2009-04-17 01:04:39.000000000 +0200 +@@ -132,7 +132,7 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LI GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ HAVE_JW = @HAVE_JW@ @@ -9,3 +9,21 @@ ICONV_CFLAGS = @ICONV_CFLAGS@ ICONV_LIBS = @ICONV_LIBS@ IDL_INCLUDES = @IDL_INCLUDES@ +@@ -730,7 +730,7 @@ install-data-local: + mv -f $${installdir}/$(DOC_MODULE).devhelp \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ + fi; \ +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ ++# gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ + fi + + uninstall-local: +@@ -759,7 +759,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++# gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist index d8ef379ca612..c76030056e2f 100644 --- a/databases/evolution-data-server/pkg-plist +++ b/databases/evolution-data-server/pkg-plist @@ -742,6 +742,7 @@ share/locale/ko/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/ku/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/lt/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/lv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/mai/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/mk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/ml/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/mn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo @@ -842,6 +843,8 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile index 652ba138ebeb..00d5da799579 100644 --- a/databases/libgda4/Makefile +++ b/databases/libgda4/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/libgda4/Makefile,v 1.3 2008/10/09 22:27:17 kwm Exp $ +# $MCom: ports-stable/databases/libgda4/Makefile,v 1.2 2009/04/18 20:16:29 marcus Exp $ # PORTNAME= libgda4 -PORTVERSION?= 4.0.1 +PORTVERSION?= 4.0.2 PORTREVISION?= 0 CATEGORIES= databases gnome MASTER_SITES= GNOME @@ -115,7 +115,8 @@ CONFIGURE_ARGS+= --without-java .endif post-patch: - @${REINPLACE_CMD} -e 's|-ldl||g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-ldl||g' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|include/db.h|include/db${BDB_VER}/db.h|g' \ -e 's|ldb47|ldb${BDB_VER}|g' \ -e 's|ldb|ldb${BDB_VER}|g' \ @@ -126,7 +127,7 @@ post-patch: ${WRKSRC}/providers/bdb/gda-bdb-test.c .if ${LIBGDA4_SLAVE}!="no" #. for d in msql firebird odbc freetds mdb ldap mysql sqlite postgres -. for d in bdb jdbc mdb mysql sqlite postgres +. for d in bdb jdbc mdb mysql postgres @${REINPLACE_CMD} -e 's|$$(top_builddir)/libgda/libgda-4.0.la|${LOCALBASE}/lib/libgda-4.0.la|g' \ ${WRKSRC}/providers/${d}/Makefile.in . endfor diff --git a/databases/libgda4/distinfo b/databases/libgda4/distinfo index ec106d75a9d8..1dcda6b5be20 100644 --- a/databases/libgda4/distinfo +++ b/databases/libgda4/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgda-4.0.1.tar.bz2) = 7449861d4f421cd3cd20e670434122fb -SHA256 (gnome2/libgda-4.0.1.tar.bz2) = e9b4c7cadbdcbc5ce40faff9d9c6bf9f602ec300da25faf706469f61aa9cef59 -SIZE (gnome2/libgda-4.0.1.tar.bz2) = 8380951 +MD5 (gnome2/libgda-4.0.2.tar.bz2) = cd79f6542cdd9477017b76b5f81c776f +SHA256 (gnome2/libgda-4.0.2.tar.bz2) = 8d9b150d4e1fedb02eaf2a3ec4f9f6fbe26039de35df58986cd37c66a24cd3f8 +SIZE (gnome2/libgda-4.0.2.tar.bz2) = 8358969 diff --git a/databases/libgda4/files/patch-libgda_sqlite_gda_sqlite-provider.c b/databases/libgda4/files/patch-libgda_sqlite_gda_sqlite-provider.c deleted file mode 100644 index 6cdb8eb3fb9b..000000000000 --- a/databases/libgda4/files/patch-libgda_sqlite_gda_sqlite-provider.c +++ /dev/null @@ -1,22 +0,0 @@ -Index: libgda/sqlite/gda-sqlite-provider.c -=================================================================== ---- libgda/sqlite/gda-sqlite-provider.c (revision 3276) -+++ libgda/sqlite/gda-sqlite-provider.c (working copy) -@@ -404,7 +404,7 @@ - /* It's a function */ - recset = (GdaDataModelArray *) cdata->functions_model; - if (!recset) { -- recset = GDA_DATA_MODEL_ARRAY (gda_data_model_array_new, 3); -+ recset = GDA_DATA_MODEL_ARRAY (gda_data_model_array_new (3)); - gda_column_set_description (0, "name"); - gda_column_set_name (0, "name"); - gda_column_set_g_type (0, G_TYPE_STRING); -@@ -422,7 +422,7 @@ - /* It's an aggregate */ - recset = (GdaDataModelArray *) cdata->aggregates_model; - if (!recset) { -- recset = GDA_DATA_MODEL_ARRAY (gda_data_model_array_new, 3); -+ recset = GDA_DATA_MODEL_ARRAY (gda_data_model_array_new (3)); - gda_column_set_description (0, "name"); - gda_column_set_name (0, "name"); - gda_column_set_g_type (0, G_TYPE_STRING); diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile index cf342af08f2d..612664f49da5 100644 --- a/deskutils/deskbar-applet/Makefile +++ b/deskutils/deskbar-applet/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.99 2009/03/18 04:27:55 marcus Exp $ +# $MCom: ports-stable/deskutils/deskbar-applet/Makefile,v 1.3 2009/04/15 15:18:16 kwm Exp $ # PORTNAME= deskbar-applet -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo index b038a7cfb542..11f67455645f 100644 --- a/deskutils/deskbar-applet/distinfo +++ b/deskutils/deskbar-applet/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/deskbar-applet-2.26.0.tar.bz2) = 168044d1312bf30e71f2ed587d2bffb6 -SHA256 (gnome2/deskbar-applet-2.26.0.tar.bz2) = 547c80dc1a21b0f4e8b866601623b902448ac81780c2d29a25299a0953e1bc17 -SIZE (gnome2/deskbar-applet-2.26.0.tar.bz2) = 969825 +MD5 (gnome2/deskbar-applet-2.26.1.tar.bz2) = d7747abc1baa951bba684f9ab1db9699 +SHA256 (gnome2/deskbar-applet-2.26.1.tar.bz2) = a7d0b46f52cdbf3667cdd477bfa979e7895e29a1c21452f6e5a762cefc0414a8 +SIZE (gnome2/deskbar-applet-2.26.1.tar.bz2) = 1027265 diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile index c9361fb2cf1c..9663e2ca1f31 100644 --- a/deskutils/nautilus-sendto/Makefile +++ b/deskutils/nautilus-sendto/Makefile @@ -3,19 +3,20 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.16 2008/02/10 19:57:54 marcus Exp $ +# $MCom: ports-stable/deskutils/nautilus-sendto/Makefile,v 1.4 2009/04/20 06:12:55 marcus Exp $ PORTNAME= nautilus-sendto -PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTVERSION= 1.1.4.1 CATEGORIES= deskutils MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Integration between nautilus, evolution, and pidgin -BUILD_DEPENDS= evolution:${PORTSDIR}/mail/evolution -RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution +BUILD_DEPENDS= evolution:${PORTSDIR}/mail/evolution \ + empathy:${PORTSDIR}/net-im/empathy +RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution \ + empathy:${PORTSDIR}/net-im/empathy MAN1= nautilus-sendto.1 GCONF_SCHEMAS= nst.schemas diff --git a/deskutils/nautilus-sendto/distinfo b/deskutils/nautilus-sendto/distinfo index f5929c3d10c2..d9c87aabdbc5 100644 --- a/deskutils/nautilus-sendto/distinfo +++ b/deskutils/nautilus-sendto/distinfo @@ -1,3 +1,3 @@ -MD5 (nautilus-sendto-1.0.1.tar.bz2) = 33f2a9b27a7641967f97493453ca60ac -SHA256 (nautilus-sendto-1.0.1.tar.bz2) = 6b3dc8393de520b5bf3aa3249874be473add312514fed222a6091f9523d05915 -SIZE (nautilus-sendto-1.0.1.tar.bz2) = 367316 +MD5 (nautilus-sendto-1.1.4.1.tar.bz2) = c4b66eb6fd24eff0b2240b832085a20e +SHA256 (nautilus-sendto-1.1.4.1.tar.bz2) = b432d5f8cbddcd4699e3b726f0bef5c004d4271189ff34d8085477b8b0cb1175 +SIZE (nautilus-sendto-1.1.4.1.tar.bz2) = 363299 diff --git a/deskutils/nautilus-sendto/pkg-plist b/deskutils/nautilus-sendto/pkg-plist index 21596e9e0599..5e7d10d6a8e3 100644 --- a/deskutils/nautilus-sendto/pkg-plist +++ b/deskutils/nautilus-sendto/pkg-plist @@ -1,20 +1,23 @@ bin/nautilus-sendto lib/nautilus-sendto/plugins/libnstbluetooth.la lib/nautilus-sendto/plugins/libnstbluetooth.so +lib/nautilus-sendto/plugins/libnstburn.la +lib/nautilus-sendto/plugins/libnstburn.so +lib/nautilus-sendto/plugins/libnstempathy.la +lib/nautilus-sendto/plugins/libnstempathy.so lib/nautilus-sendto/plugins/libnstevolution.la lib/nautilus-sendto/plugins/libnstevolution.so %%PIDGIN%%lib/nautilus-sendto/plugins/libnstpidgin.la %%PIDGIN%%lib/nautilus-sendto/plugins/libnstpidgin.so -lib/nautilus-sendto/plugins/libnstsylpheed.la -lib/nautilus-sendto/plugins/libnstsylpheed.so -lib/nautilus-sendto/plugins/libnstthunderbird.la -lib/nautilus-sendto/plugins/libnstthunderbird.so +lib/nautilus-sendto/plugins/libnstremovable_devices.la +lib/nautilus-sendto/plugins/libnstremovable_devices.so lib/nautilus/extensions-2.0/libnautilus-sendto.la lib/nautilus/extensions-2.0/libnautilus-sendto.so %%PIDGIN%%lib/pidgin/nautilus.la %%PIDGIN%%lib/pidgin/nautilus.so share/nautilus-sendto/glade/nautilus-sendto.glade share/locale/ar/LC_MESSAGES/nautilus-sendto.mo +share/locale/ast/LC_MESSAGES/nautilus-sendto.mo share/locale/be@latin/LC_MESSAGES/nautilus-sendto.mo share/locale/be/LC_MESSAGES/nautilus-sendto.mo share/locale/bg/LC_MESSAGES/nautilus-sendto.mo @@ -40,6 +43,7 @@ share/locale/ka/LC_MESSAGES/nautilus-sendto.mo share/locale/ko/LC_MESSAGES/nautilus-sendto.mo share/locale/lt/LC_MESSAGES/nautilus-sendto.mo share/locale/mk/LC_MESSAGES/nautilus-sendto.mo +share/locale/mr/LC_MESSAGES/nautilus-sendto.mo share/locale/nb/LC_MESSAGES/nautilus-sendto.mo share/locale/ne/LC_MESSAGES/nautilus-sendto.mo share/locale/nl/LC_MESSAGES/nautilus-sendto.mo @@ -69,7 +73,11 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-sendto.mo @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile index 5b87af18e1a9..c7bcfda0c2ab 100644 --- a/deskutils/planner/Makefile +++ b/deskutils/planner/Makefile @@ -3,11 +3,11 @@ # Whom: Dmitry Sivachenko <demon@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/planner/Makefile,v 1.4 2007/05/19 21:36:03 marcus Exp $ +# $MCom: ports-stable/deskutils/planner/Makefile,v 1.4 2009/04/16 00:34:24 kwm Exp $ # PORTNAME= planner -PORTVERSION= 0.14.3 +PORTVERSION= 0.14.4 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -27,7 +27,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static \ --disable-python \ - --disable-dotnet + --disable-python-plugin CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -35,16 +35,28 @@ GCONF_SCHEMAS= planner.schemas MAN1= planner.1 +OPTIONS= GDA "Enable database support (though libgda)" off \ + EVO "Enable evolution data server support" off + .include <bsd.port.pre.mk> -.if ${HAVE_GNOME:Mlibgda2}!="" -USE_GNOME+= libgda2 -CONFIGURE_ARGS+=--enable-database=yes + +.if defined(WITH_GDA) +USE_GNOME+= libgda3 +CONFIGURE_ARGS+=--with-database=gda3 PLIST_SUB+= GDA="" .else PLIST_SUB+= GDA="@comment " .endif +.if defined(WITH_EVO) +USE_GNOME+= evolutiondataserver +CONFIGURE_ARGS+=--enable-eds --enable-eds-backend +PLIST_SUB+= EVO="" +.else +PLIST_SUB+= EVO="@comment " +.endif + post-install: @-update-desktop-database diff --git a/deskutils/planner/distinfo b/deskutils/planner/distinfo index dba03ac8822e..10aad8483f79 100644 --- a/deskutils/planner/distinfo +++ b/deskutils/planner/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/planner-0.14.3.tar.bz2) = 9aee1307f8b9d643241473791f0efa64 -SHA256 (gnome2/planner-0.14.3.tar.bz2) = 8fa5e28b0ba71c0822be73d3c0719623e711b5f9abdcddb63321e31c02a168fe -SIZE (gnome2/planner-0.14.3.tar.bz2) = 3685823 +MD5 (gnome2/planner-0.14.4.tar.bz2) = 8fcbd1b55dd037662f7710a28a96bb92 +SHA256 (gnome2/planner-0.14.4.tar.bz2) = d45efc53dae4e2b03e2ad8ac1c31f615bfd77e67500b11baf4dee49feee7147a +SIZE (gnome2/planner-0.14.4.tar.bz2) = 3738005 diff --git a/deskutils/planner/pkg-plist b/deskutils/planner/pkg-plist index e96c932a020b..768c6dd45b3b 100644 --- a/deskutils/planner/pkg-plist +++ b/deskutils/planner/pkg-plist @@ -26,6 +26,9 @@ lib/planner/file-modules/libmrp-xml.so lib/planner/file-modules/libmrp-xsl.a lib/planner/file-modules/libmrp-xsl.la lib/planner/file-modules/libmrp-xsl.so +%%EVO%%lib/planner/plugins/libeds-plugin.a +%%EVO%%lib/planner/plugins/libeds-plugin.la +%%EVO%%lib/planner/plugins/libeds-plugin.so lib/planner/plugins/libhtml-plugin.a lib/planner/plugins/libhtml-plugin.la lib/planner/plugins/libhtml-plugin.so @@ -165,6 +168,7 @@ share/locale/fi/LC_MESSAGES/planner.mo share/locale/fr/LC_MESSAGES/planner.mo share/locale/ga/LC_MESSAGES/planner.mo share/locale/gl/LC_MESSAGES/planner.mo +share/locale/gu/LC_MESSAGES/planner.mo share/locale/hi/LC_MESSAGES/planner.mo share/locale/hr/LC_MESSAGES/planner.mo share/locale/hu/LC_MESSAGES/planner.mo @@ -179,6 +183,7 @@ share/locale/lv/LC_MESSAGES/planner.mo share/locale/mk/LC_MESSAGES/planner.mo share/locale/ml/LC_MESSAGES/planner.mo share/locale/mn/LC_MESSAGES/planner.mo +share/locale/mr/LC_MESSAGES/planner.mo share/locale/ms/LC_MESSAGES/planner.mo share/locale/nb/LC_MESSAGES/planner.mo share/locale/ne/LC_MESSAGES/planner.mo @@ -249,6 +254,7 @@ share/planner/sql/upgrade-0.11-0.13.sql share/planner/sql/upgrade-0.6.x-0.11.sql share/planner/stylesheets/html1_css.xsl share/planner/stylesheets/html1_css_ie.xsl +share/planner/stylesheets/html1_css_ie7.xsl share/planner/stylesheets/html1_gantt.xsl share/planner/stylesheets/html1_resources.xsl share/planner/stylesheets/html1_tasks.xsl @@ -299,6 +305,8 @@ share/planner/ui/xml-planner-plugin.ui @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/gl/LC_MESSAGES @dirrmtry share/locale/gl @dirrmtry share/locale/dz/LC_MESSAGES diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index 495add874560..92831a096f08 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -3,12 +3,12 @@ # Whom: Dmitry Sivachenko <demon@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/anjuta/Makefile,v 1.37 2009/03/31 13:33:41 kwm Exp $ +# $MCom: ports-stable/devel/anjuta/Makefile,v 1.6 2009/04/20 04:42:30 marcus Exp $ # PORTNAME= anjuta -PORTVERSION= 2.26.0.1 -PORTREVISION= 3 +PORTVERSION= 2.26.1.0 +PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -30,7 +30,8 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ neato:${PORTSDIR}/graphics/graphviz \ p5-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \ libtool:${PORTSDIR}/devel/libtool15 \ - ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme + ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \ + exctags:${PORTSDIR}/devel/ctags USE_BZIP2= yes USE_AUTOTOOLS= autotools:run @@ -67,11 +68,22 @@ BUILD_DEPENDS+= svn:${PORTSDIR}/devel/subversion RUN_DEPENDS+= svn:${PORTSDIR}/devel/subversion USE_APACHE= 2.0+ +## Test if we got apache 20 or 22. +.if exists(${LOCALBASE}/include/apache22/httpd.h) +APR_CONFIG=${LOCALBASE}/bin/apr-1-config +APU_CONFIG=${LOCALBASE}/bin/apu-1-config +.else +APR_CONFIG=${LOCALBASE}/lib/apache2/apr-config +APU_CONFIG=${LOCALBASE}/lib/apache2/apu-config +.endif +CONFIGURE_ENV+= APR_CFLAGS="`${APR_CONFIG} --includes`" \ + APR_LIBS="`${APU_CONFIG} --libs`" \ + APR_UTILS_CFLAGS="`${APU_CONFIG} --includes`" \ + APR_UTILS_LIBS="`${APU_CONFIG} --libs`" \ + CONFIGURE_ARGS+=--with-subversion-dir=${LOCALBASE}/bin \ --with-svn-include=${LOCALBASE}/include \ - --with-svn-lib=${LOCALBASE}/lib \ - --with-apr-config=${LOCALBASE}/bin/apr-1-config \ - --with-apu-config=${LOCALBASE}/bin/apu-1-config + --with-svn-lib=${LOCALBASE}/lib PLIST_SUB+= SVN="" .else CONFIGURE_ARGS+=--disable-plugin-subversion @@ -83,7 +95,10 @@ LIB_DEPENDS+= devhelp-1.0:${PORTSDIR}/devel/devhelp PLIST_SUB+= DEVHELP="" .else CONFIGURE_ARGS+=--disable-plugin-devhelp -PLIST_SUB+= DEVHELP="@comment " +# XXX Even if we disable the devhelp plugin it gets build and installed. +# See if versions beyond 2.26.1.0 still do this. +#PLIST_SUB+= DEVHELP="@comment " +PLIST_SUB+= DEVHELP="" .endif post-configure: @@ -91,6 +106,9 @@ post-configure: ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|"make|"gmake|g' \ ${WRKSRC}/plugins/build-basic-autotools/plugin.c + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/plugins/symbol-db/plugin.h \ + ${WRKSRC}/plugins/symbol-db/symbol-db-prefs.h post-install: .if !defined(NOPORTDOCS) diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo index a52aeb6d51b4..4c9969819570 100644 --- a/devel/anjuta/distinfo +++ b/devel/anjuta/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/anjuta-2.26.0.1.tar.bz2) = 84d3aae494f9866ca7d2a906be82a8df -SHA256 (gnome2/anjuta-2.26.0.1.tar.bz2) = 9e4778cfd9bdf364ebccdedb9305cbe49fb7bc215ef7b12f9f07db4dfb1e1e1f -SIZE (gnome2/anjuta-2.26.0.1.tar.bz2) = 7703345 +MD5 (gnome2/anjuta-2.26.1.0.tar.bz2) = 00d51cac65f2099d71f73c960830b633 +SHA256 (gnome2/anjuta-2.26.1.0.tar.bz2) = 80d27bcf1ebf803055014ae7d4295e5f025c2abdd22b7e465e6c7462ef027d45 +SIZE (gnome2/anjuta-2.26.1.0.tar.bz2) = 7705572 diff --git a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c index 0235ff1e8d24..126c7d9e305b 100644 --- a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c +++ b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c @@ -1,5 +1,5 @@ ---- libanjuta/anjuta-launcher.c.orig 2008-05-29 22:37:02.000000000 +0200 -+++ libanjuta/anjuta-launcher.c 2008-06-05 16:12:17.000000000 +0200 +--- libanjuta/anjuta-launcher.c.orig 2009-03-18 04:24:10.000000000 -0400 ++++ libanjuta/anjuta-launcher.c 2009-04-16 19:49:25.000000000 -0400 @@ -761,7 +761,8 @@ anjuta_launcher_scan_output (GIOChannel GError *err = NULL; do @@ -10,7 +10,7 @@ if (n > 0) /* There is output */ { gchar *utf8_chars = NULL; -@@ -789,6 +790,13 @@ anjuta_launcher_scan_output (GIOChannel +@@ -789,6 +790,15 @@ anjuta_launcher_scan_output (GIOChannel anjuta_launcher_synchronize (launcher); ret = FALSE; } @@ -18,13 +18,15 @@ + { + launcher->priv->stdout_is_done = TRUE; + anjuta_launcher_synchronize (launcher); -+ ret = FALSE; ++ if (err) ++ g_error_free (err); ++ return FALSE; + } + /* Read next chars if buffer was too small * (the maximum length of one character is 6 bytes) */ } while (!err && (n > FILE_BUFFER_SIZE - 7)); -@@ -818,7 +826,8 @@ anjuta_launcher_scan_error (GIOChannel * +@@ -818,7 +828,8 @@ anjuta_launcher_scan_error (GIOChannel * GError *err = NULL; do { @@ -34,7 +36,7 @@ if (n > 0) /* There is stderr output */ { gchar *utf8_chars; -@@ -844,6 +853,13 @@ anjuta_launcher_scan_error (GIOChannel * +@@ -844,6 +855,15 @@ anjuta_launcher_scan_error (GIOChannel * anjuta_launcher_synchronize (launcher); ret = FALSE; } @@ -42,13 +44,15 @@ + { + launcher->priv->stderr_is_done = TRUE; + anjuta_launcher_synchronize (launcher); -+ ret = FALSE; ++ if (err) ++ g_error_free (err); ++ return FALSE; + } + /* Read next chars if buffer was too small * (the maximum length of one character is 6 bytes) */ } while (!err && (n > FILE_BUFFER_SIZE - 7)); -@@ -873,7 +889,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch +@@ -873,7 +893,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch GError *err = NULL; do { @@ -58,13 +62,14 @@ if (n > 0) /* There is stderr output */ { gchar *utf8_chars; -@@ -902,6 +919,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch +@@ -902,6 +923,11 @@ anjuta_launcher_scan_pty (GIOChannel *ch { ret = FALSE; } + else if (status == G_IO_STATUS_EOF) + { + ret = FALSE; ++ break; + } /* Read next chars if buffer was too small * (the maximum length of one character is 6 bytes) */ diff --git a/devel/anjuta/files/patch-plugins_symbol-db_plugin.c b/devel/anjuta/files/patch-plugins_symbol-db_plugin.c new file mode 100644 index 000000000000..d19ef6d15a0a --- /dev/null +++ b/devel/anjuta/files/patch-plugins_symbol-db_plugin.c @@ -0,0 +1,11 @@ +--- plugins/symbol-db/plugin.c.orig 2009-04-17 01:08:28.000000000 -0400 ++++ plugins/symbol-db/plugin.c 2009-04-17 01:09:11.000000000 -0400 +@@ -1510,7 +1510,7 @@ do_check_offline_files_changed (SymbolDB + GHashTable *prj_elements_hash; + GPtrArray *to_add_files = NULL; + gint i; +- gint real_added ; ++ gint real_added = 0; + + pm = anjuta_shell_get_interface (ANJUTA_PLUGIN (sdb_plugin)->shell, + IAnjutaProjectManager, NULL); diff --git a/devel/anjuta/files/patch-plugins_symbol-db_plugin.h b/devel/anjuta/files/patch-plugins_symbol-db_plugin.h new file mode 100644 index 000000000000..10565abef21e --- /dev/null +++ b/devel/anjuta/files/patch-plugins_symbol-db_plugin.h @@ -0,0 +1,11 @@ +--- plugins/symbol-db/plugin.h.orig 2009-04-17 01:02:20.000000000 -0400 ++++ plugins/symbol-db/plugin.h 2009-04-17 01:02:37.000000000 -0400 +@@ -49,7 +49,7 @@ typedef struct _SymbolDBPluginClass Symb + #include "symbol-db-prefs.h" + + /* a sort of 'default' value for ctags executable. User must have it installed */ +-#define CTAGS_PATH "/usr/bin/ctags" ++#define CTAGS_PATH "%%LOCALBASE%%/bin/exctags" + + struct _SymbolDBPlugin { + AnjutaPlugin parent; diff --git a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c new file mode 100644 index 000000000000..1b6405e7555a --- /dev/null +++ b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c @@ -0,0 +1,80 @@ +--- plugins/symbol-db/symbol-db-engine-core.c.orig 2009-03-18 04:24:07.000000000 -0400 ++++ plugins/symbol-db/symbol-db-engine-core.c 2009-04-20 00:40:52.000000000 -0400 +@@ -1486,7 +1486,7 @@ sdb_engine_ctags_output_thread (gpointer + + /* found out a new marker */ + marker_ptr = strstr (marker_ptr + len_marker, CTAGS_MARKER); +- } while (remaining_chars + len_marker < len_chars || marker_ptr != NULL); ++ } while (remaining_chars > 0 || marker_ptr != NULL); + } + else + { +@@ -1644,7 +1644,7 @@ sdb_engine_ctags_launcher_create (Symbol + anjuta_launcher_set_encoding (priv->ctags_launcher, NULL); + + g_signal_connect (G_OBJECT (priv->ctags_launcher), "child-exited", +- G_CALLBACK (on_scan_files_end_1), NULL); ++ G_CALLBACK (on_scan_files_end_1), dbe); + + exe_string = g_strdup_printf ("%s --sort=no --fields=afmiKlnsStz --c++-kinds=+p " + "--filter=yes --filter-terminator='"CTAGS_MARKER"'", +@@ -1810,8 +1810,8 @@ sdb_engine_scan_files_1 (SymbolDBEngine + gchar *temp_file; + while (TRUE) + { +- temp_file = g_strdup_printf ("/anjuta-%d_%ld.tags", getpid (), +- time (NULL)); ++ temp_file = g_strdup_printf ("%s/anjuta-%d_%ld.tags", SHARED_MEMORY_PREFIX, getpid (), ++ (long) time (NULL)); + gchar *test; + test = g_strconcat (SHARED_MEMORY_PREFIX, temp_file, NULL); + if (g_file_test (test, G_FILE_TEST_EXISTS) == TRUE) +@@ -1831,12 +1831,12 @@ sdb_engine_scan_files_1 (SymbolDBEngine + priv->shared_mem_str = temp_file; + + if ((priv->shared_mem_fd = +- shm_open (temp_file, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0) ++ open (temp_file, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0) + { + g_warning ("Error while trying to open a shared memory file. Be" + "sure to have "SHARED_MEMORY_PREFIX" mounted with tmpfs"); + } +- ++ + priv->shared_mem_file = fdopen (priv->shared_mem_fd, "a+b"); + /*DEBUG_PRINT ("temp_file %s", temp_file);*/ + +@@ -2419,7 +2419,7 @@ sdb_engine_init (SymbolDBEngine * object + static void + sdb_engine_unlink_shared_files (gpointer key, gpointer value, gpointer user_data) + { +- shm_unlink (key); ++ unlink (key); + } + + static void +@@ -2508,7 +2508,7 @@ sdb_engine_finalize (GObject * object) + + if (priv->shared_mem_str) + { +- shm_unlink (priv->shared_mem_str); ++ unlink (priv->shared_mem_str); + g_free (priv->shared_mem_str); + priv->shared_mem_str = NULL; + } +@@ -5834,12 +5834,12 @@ symbol_db_engine_update_buffer_symbols ( + * target buffer one */ + base_filename = g_filename_display_basename (relative_path); + +- shared_temp_file = g_strdup_printf ("/anjuta-%d-%ld-%s", getpid (), +- time (NULL), base_filename); ++ shared_temp_file = g_strdup_printf ("%s/anjuta-%d-%ld-%s", SHARED_MEMORY_PREFIX, getpid (), ++ (long) time (NULL), base_filename); + g_free (base_filename); + + if ((buffer_mem_fd = +- shm_open (shared_temp_file, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0) ++ open (shared_temp_file, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0) + { + g_warning ("Error while trying to open a shared memory file. Be" + "sure to have "SHARED_MEMORY_PREFIX" mounted with tmpfs"); diff --git a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h new file mode 100644 index 000000000000..cecb81021faf --- /dev/null +++ b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h @@ -0,0 +1,11 @@ +--- plugins/symbol-db/symbol-db-engine-priv.h.orig 2009-04-15 19:40:20.000000000 -0400 ++++ plugins/symbol-db/symbol-db-engine-priv.h 2009-04-15 19:40:34.000000000 -0400 +@@ -47,7 +47,7 @@ + + #define CTAGS_MARKER "#_#\n" + +-#define SHARED_MEMORY_PREFIX "/dev/shm" ++#define SHARED_MEMORY_PREFIX "/tmp" + + #define THREADS_MAX_CONCURRENT 2 + #define TRIGGER_SIGNALS_DELAY 100 diff --git a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h new file mode 100644 index 000000000000..3d9398a872c1 --- /dev/null +++ b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h @@ -0,0 +1,11 @@ +--- plugins/symbol-db/symbol-db-prefs.h.orig 2009-04-17 01:06:07.000000000 -0400 ++++ plugins/symbol-db/symbol-db-prefs.h 2009-04-17 01:06:34.000000000 -0400 +@@ -40,7 +40,7 @@ typedef struct _SymbolDBPrefsPriv Symbol + #include "symbol-db-system.h" + + +-#define CTAGS_PREFS "preferences_entry:text:/usr/bin/ctags:0:symboldb.ctags" ++#define CTAGS_PREFS "preferences_entry:text:%%LOCALBASE%%/bin/exctags:0:symboldb.ctags" + #define CTAGS_PREFS_KEY "symboldb.ctags" + #define PROJECT_AUTOSCAN "symboldb.scan_prj_pkgs" + #define PARALLEL_SCAN "symboldb.parallel_scan" diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile index 9fc3db3ce1a7..2cbe114e1ff9 100644 --- a/devel/glade3/Makefile +++ b/devel/glade3/Makefile @@ -3,11 +3,11 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glade3/Makefile,v 1.42 2009/04/07 03:05:07 marcus Exp $ +# $MCom: ports-stable/devel/glade3/Makefile,v 1.2 2009/04/24 05:51:34 kwm Exp $ # PORTNAME= glade3 -PORTVERSION= 3.6.1 +PORTVERSION= 3.6.3 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/glade3/distinfo b/devel/glade3/distinfo index b2f41be4d945..87ff7c6bc02f 100644 --- a/devel/glade3/distinfo +++ b/devel/glade3/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glade3-3.6.1.tar.bz2) = b145889e43319dabffe6ae4ac74b2d42 -SHA256 (gnome2/glade3-3.6.1.tar.bz2) = e105d09e8098a0d6d541a7a84a841f8b28b48828236ebed1af6963bf1270feba -SIZE (gnome2/glade3-3.6.1.tar.bz2) = 2265057 +MD5 (gnome2/glade3-3.6.3.tar.bz2) = a552d248626d2023ddf0f1d831cfd945 +SHA256 (gnome2/glade3-3.6.3.tar.bz2) = c2eeb519d5fe59c4247952d0f78abd7936a09641adaa8e719c930360f8a2501e +SIZE (gnome2/glade3-3.6.3.tar.bz2) = 2234796 diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist index 4a1793fc11d2..1b07b22b08cb 100644 --- a/devel/glade3/pkg-plist +++ b/devel/glade3/pkg-plist @@ -66,7 +66,7 @@ lib/libgladeui-1.so.9 libdata/pkgconfig/gladeui-1.0.pc share/applications/glade-3.desktop %%DOCSDIR%%/GladeApp.html -share/doc/gladeui/GladeBaseEditor.html +%%DOCSDIR%%/GladeBaseEditor.html %%DOCSDIR%%/GladeClipboard.html %%DOCSDIR%%/GladeClipboardView.html %%DOCSDIR%%/GladeCommand.html @@ -91,18 +91,9 @@ share/doc/gladeui/GladeWidgetAction.html %%DOCSDIR%%/gladeui-glade-signal-editor.html %%DOCSDIR%%/gladeui-glade-utils.html share/doc/gladeui/gladeui-glade-xml-utils.html -%%DOCSDIR%%/gladeui.devhelp -%%DOCSDIR%%/gladeui.devhelp2 -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/ix01.html -%%DOCSDIR%%/left.png %%DOCSDIR%%/misc.html %%DOCSDIR%%/properties.html -%%DOCSDIR%%/right.png -%%DOCSDIR%%/style.css -%%DOCSDIR%%/up.png +%%DOCSDIR%%/pythonsupport.html %%DOCSDIR%%/widgetclasses.html %%GNOME:%%%%DATADIR%%/catalogs/bonobo.xml %%GNOME:%%%%DATADIR%%/catalogs/bonobo.xml.in @@ -479,6 +470,8 @@ share/locale/si/LC_MESSAGES/glade3.mo share/locale/sk/LC_MESSAGES/glade3.mo share/locale/sl/LC_MESSAGES/glade3.mo share/locale/sq/LC_MESSAGES/glade3.mo +share/locale/sr/LC_MESSAGES/glade3.mo +share/locale/sr@latin/LC_MESSAGES/glade3.mo share/locale/sv/LC_MESSAGES/glade3.mo share/locale/ta/LC_MESSAGES/glade3.mo share/locale/te/LC_MESSAGES/glade3.mo @@ -554,6 +547,10 @@ share/omf/glade/glade-sv.omf @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/oc/LC_MESSAGES diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile index 3687e14e7751..6b928a0c5b5b 100644 --- a/devel/gvfs/Makefile +++ b/devel/gvfs/Makefile @@ -3,11 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gvfs/Makefile,v 1.43 2009/04/03 10:02:13 kwm Exp $ +# $MCom: ports-stable/devel/gvfs/Makefile,v 1.2 2009/04/24 04:38:36 marcus Exp $ # PORTNAME= gvfs -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 +PORTREFISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo index 5aa52eec0deb..6606489816b6 100644 --- a/devel/gvfs/distinfo +++ b/devel/gvfs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gvfs-1.2.1.tar.bz2) = df8f624587adfabe7009838ce6d8d5fd -SHA256 (gnome2/gvfs-1.2.1.tar.bz2) = 0e3c3469721ff1d4296bf4af7e1f131201d2dc6a36c772d99e1630f8cce31da2 -SIZE (gnome2/gvfs-1.2.1.tar.bz2) = 1048427 +MD5 (gnome2/gvfs-1.2.2.tar.bz2) = 85f69289185b0c9c42644c0e730b67c8 +SHA256 (gnome2/gvfs-1.2.2.tar.bz2) = ee301e9dbdfd4432313b6f5edafa42a8d3b28c60c3a705a18a5a6cef27c315ed +SIZE (gnome2/gvfs-1.2.2.tar.bz2) = 1049206 diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure index a707a133b21d..0b1b2a2ab9f7 100644 --- a/devel/gvfs/files/patch-configure +++ b/devel/gvfs/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig 2009-03-02 17:50:05.000000000 -0500 -+++ configure 2009-03-02 17:50:44.000000000 -0500 +--- configure.orig 2009-04-24 00:15:09.000000000 -0400 ++++ configure 2009-04-24 00:16:04.000000000 -0400 @@ -26973,6 +26973,9 @@ fi *-linux*) use_gphoto2=yes @@ -10,3 +10,21 @@ *) use_gphoto2=no ;; +@@ -28018,7 +28021,7 @@ if test "${ac_cv_lib_archive_archive_ent + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-larchive $LIBS" ++LIBS="-larchive -lcrypto -lmd $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28094,7 +28097,7 @@ _ACEOF + if test x$with_archive_libs != x/usr/lib; then + ARCHIVE_LIBS="-L$with_archive_libs -larchive" + else +- ARCHIVE_LIBS="-larchive" ++ ARCHIVE_LIBS="-larchive -lcrypto -lmd" + fi + else + { $as_echo "$as_me:$LINENO: checking for archive_entry_filetype in -larchive" >&5 diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index a7c29a86ce92..44e00260a610 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgtop/Makefile,v 1.47 2009/03/02 00:41:25 marcus Exp $ +# $MCom: ports-stable/devel/libgtop/Makefile,v 1.1 2009/04/15 13:33:33 kwm Exp $ # PORTNAME= libgtop -PORTVERSION= 2.26.0 -PORTREVISION= 2 +PORTVERSION= 2.26.1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo index 6bcefcbda493..c104c4de753c 100644 --- a/devel/libgtop/distinfo +++ b/devel/libgtop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgtop-2.26.0.tar.bz2) = a51ff49eddcce4573f7385e4be33158a -SHA256 (gnome2/libgtop-2.26.0.tar.bz2) = acc11d54614722a752a44237b5e11e9d6508da82c6d7ad25bf97156f5e28a7fd -SIZE (gnome2/libgtop-2.26.0.tar.bz2) = 791512 +MD5 (gnome2/libgtop-2.26.1.tar.bz2) = 49fe5c91a6bbc103a0a05c6854a6cc11 +SHA256 (gnome2/libgtop-2.26.1.tar.bz2) = 7762730a99c652695d8e2137a90519ce86fa245e22217dbf8d660ab4ed464385 +SIZE (gnome2/libgtop-2.26.1.tar.bz2) = 767089 diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist index cbba908c8e37..0424bed88b3a 100644 --- a/devel/libgtop/pkg-plist +++ b/devel/libgtop/pkg-plist @@ -48,10 +48,6 @@ lib/libgtop-2.0.la lib/libgtop-2.0.so lib/libgtop-2.0.so.7 libdata/pkgconfig/libgtop-2.0.pc -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/left.png %%DOCSDIR%%/libgtop-Close.html %%DOCSDIR%%/libgtop-Command.html %%DOCSDIR%%/libgtop-GlibTop-Server.html @@ -61,17 +57,9 @@ libdata/pkgconfig/libgtop-2.0.pc %%DOCSDIR%%/libgtop-PPP.html %%DOCSDIR%%/libgtop-Shared-Memory-Limits.html %%DOCSDIR%%/libgtop-Uptime.html -%%DOCSDIR%%/libgtop-cpu.html -%%DOCSDIR%%/libgtop-fsusage.html -%%DOCSDIR%%/libgtop-lib.html -%%DOCSDIR%%/libgtop-loadavg.html -%%DOCSDIR%%/libgtop-mem.html -%%DOCSDIR%%/libgtop-mountlist.html -%%DOCSDIR%%/libgtop-msg-limits.html %%DOCSDIR%%/libgtop-open.html %%DOCSDIR%%/libgtop-parameter.html %%DOCSDIR%%/libgtop-procargs.html -%%DOCSDIR%%/libgtop-prockernel.html %%DOCSDIR%%/libgtop-proclist.html %%DOCSDIR%%/libgtop-procmap.html %%DOCSDIR%%/libgtop-procmem.html @@ -83,20 +71,15 @@ libdata/pkgconfig/libgtop-2.0.pc %%DOCSDIR%%/libgtop-procuid.html %%DOCSDIR%%/libgtop-sem-limits.html %%DOCSDIR%%/libgtop-signal.html -%%DOCSDIR%%/libgtop-swap.html %%DOCSDIR%%/libgtop-sysdeps.html %%DOCSDIR%%/libgtop-sysinfo.html %%DOCSDIR%%/libgtop-union.html %%DOCSDIR%%/libgtop-version.html %%DOCSDIR%%/libgtop-white-paper-overview.html %%DOCSDIR%%/libgtop-white-paper.html -%%DOCSDIR%%/libgtop.devhelp -%%DOCSDIR%%/libgtop.devhelp2 -%%DOCSDIR%%/right.png -%%DOCSDIR%%/style.css -%%DOCSDIR%%/up.png share/locale/am/LC_MESSAGES/libgtop-2.0.mo share/locale/ar/LC_MESSAGES/libgtop-2.0.mo +share/locale/as/LC_MESSAGES/libgtop-2.0.mo share/locale/az/LC_MESSAGES/libgtop-2.0.mo share/locale/be/LC_MESSAGES/libgtop-2.0.mo share/locale/bg/LC_MESSAGES/libgtop-2.0.mo @@ -130,6 +113,7 @@ share/locale/id/LC_MESSAGES/libgtop-2.0.mo share/locale/it/LC_MESSAGES/libgtop-2.0.mo share/locale/ja/LC_MESSAGES/libgtop-2.0.mo share/locale/ka/LC_MESSAGES/libgtop-2.0.mo +share/locale/kn/LC_MESSAGES/libgtop-2.0.mo share/locale/ko/LC_MESSAGES/libgtop-2.0.mo share/locale/ku/LC_MESSAGES/libgtop-2.0.mo share/locale/ky/LC_MESSAGES/libgtop-2.0.mo @@ -203,3 +187,5 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 00fe7d15e043..0525f20b39e1 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libsoup/Makefile,v 1.58 2009/03/21 02:38:40 marcus Exp $ +# $MCom: ports-stable/devel/libsoup/Makefile,v 1.9 2009/04/15 21:49:46 kwm Exp $ # PORTNAME= libsoup -PORTVERSION= 2.26.0 -PORTREVISION= 1 +PORTVERSION= 2.26.1 PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo index a34d4ff800ef..01f0eb83eb8b 100644 --- a/devel/libsoup/distinfo +++ b/devel/libsoup/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libsoup-2.26.0.tar.bz2) = 9df9d2b3304213641d3214a774d75ee1 -SHA256 (gnome2/libsoup-2.26.0.tar.bz2) = 47b749b20717df24393c83adcce9a3a10f0690517c18da8d0a1ddcb410a0ac1d -SIZE (gnome2/libsoup-2.26.0.tar.bz2) = 736527 +MD5 (gnome2/libsoup-2.26.1.tar.bz2) = 94c0495dc8bf213709bdb175ab224c7e +SHA256 (gnome2/libsoup-2.26.1.tar.bz2) = bfc37afcfcc5f182dd2b80b4c21aa3262c7719173ee27bc45ffb00a6a8267c78 +SIZE (gnome2/libsoup-2.26.1.tar.bz2) = 736811 diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 636185cd11ee..27837d720476 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/editors/gedit/Makefile,v 1.97 2009/03/16 08:01:49 kwm Exp $ +# $MCom: ports-stable/editors/gedit/Makefile,v 1.11 2009/04/15 10:30:46 kwm Exp $ # PORTNAME= gedit -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= editors gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo index 14b1f2704313..bcc8c76148d5 100644 --- a/editors/gedit/distinfo +++ b/editors/gedit/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gedit-2.26.0.tar.bz2) = 577b30e6f17f6dce0af7be3e522d6058 -SHA256 (gnome2/gedit-2.26.0.tar.bz2) = c1fde28ba54e2b6b9457b7a21e40f88989428838d2ef6e9fbd496955442d3552 -SIZE (gnome2/gedit-2.26.0.tar.bz2) = 4198506 +MD5 (gnome2/gedit-2.26.1.tar.bz2) = ced9cdd3da86cbc8ed353f7ebd3c398f +SHA256 (gnome2/gedit-2.26.1.tar.bz2) = d1f9cd88f15d41773b3b4fe6364f91cbeb2e688f83431329fa306ee0cef9415d +SIZE (gnome2/gedit-2.26.1.tar.bz2) = 4297289 diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist index 156f54593334..b1461518600b 100644 --- a/editors/gedit/pkg-plist +++ b/editors/gedit/pkg-plist @@ -202,6 +202,7 @@ share/gedit-2/plugins/modelines/language-mappings %%PYTHON%%share/gedit-2/plugins/snippets/cpp.xml %%PYTHON%%share/gedit-2/plugins/snippets/css.xml %%PYTHON%%share/gedit-2/plugins/snippets/docbook.xml +%%PYTHON%%share/gedit-2/plugins/snippets/fortran.xml %%PYTHON%%share/gedit-2/plugins/snippets/global.xml %%PYTHON%%share/gedit-2/plugins/snippets/haskell.xml %%PYTHON%%share/gedit-2/plugins/snippets/html.xml @@ -269,6 +270,14 @@ share/gnome/help/gedit/de/figures/gedit_recent_files_menu_icon.png share/gnome/help/gedit/de/figures/gedit_window.png share/gnome/help/gedit/de/gedit.xml share/gnome/help/gedit/de/legal.xml +share/gnome/help/gedit/el/figures/gedit_format_bold.png +share/gnome/help/gedit/el/figures/gedit_format_italic.png +share/gnome/help/gedit/el/figures/gedit_format_strikethrough.png +share/gnome/help/gedit/el/figures/gedit_format_underline.png +share/gnome/help/gedit/el/figures/gedit_recent_files_menu_icon.png +share/gnome/help/gedit/el/figures/gedit_window.png +share/gnome/help/gedit/el/gedit.xml +share/gnome/help/gedit/el/legal.xml share/gnome/help/gedit/es/figures/gedit_format_bold.png share/gnome/help/gedit/es/figures/gedit_format_italic.png share/gnome/help/gedit/es/figures/gedit_format_strikethrough.png @@ -411,6 +420,7 @@ share/locale/bn_IN/LC_MESSAGES/gedit.mo share/locale/br/LC_MESSAGES/gedit.mo share/locale/bs/LC_MESSAGES/gedit.mo share/locale/ca/LC_MESSAGES/gedit.mo +share/locale/crh/LC_MESSAGES/gedit.mo share/locale/cs/LC_MESSAGES/gedit.mo share/locale/cy/LC_MESSAGES/gedit.mo share/locale/da/LC_MESSAGES/gedit.mo @@ -489,6 +499,7 @@ share/omf/gedit/gedit-C.omf share/omf/gedit/gedit-bg.omf share/omf/gedit/gedit-da.omf share/omf/gedit/gedit-de.omf +share/omf/gedit/gedit-el.omf share/omf/gedit/gedit-es.omf share/omf/gedit/gedit-fi.omf share/omf/gedit/gedit-fr.omf @@ -538,6 +549,8 @@ share/omf/gedit/gedit-zh_TW.omf @dirrm share/gnome/help/gedit/fi @dirrm share/gnome/help/gedit/es/figures @dirrm share/gnome/help/gedit/es +@dirrm share/gnome/help/gedit/el/figures +@dirrm share/gnome/help/gedit/el @dirrm share/gnome/help/gedit/de/figures @dirrm share/gnome/help/gedit/de @dirrm share/gnome/help/gedit/da/figures @@ -615,6 +628,8 @@ share/omf/gedit/gedit-zh_TW.omf @dirrmtry share/locale/hy @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/crh/LC_MESSAGES +@dirrmtry share/locale/crh @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 297f77ab8d81..ec56adbce089 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/games/gnome-games/Makefile,v 1.192 2009/03/18 00:15:21 kwm Exp $ +# $MCom: ports-stable/games/gnome-games/Makefile,v 1.3 2009/04/16 01:48:53 kwm Exp $ # PORTNAME= gnome-games -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= games gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo index 8933fab7a4e4..66bb0b304602 100644 --- a/games/gnome-games/distinfo +++ b/games/gnome-games/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-games-2.26.0.tar.bz2) = 77e03e0caa57daec39e7cf8e09c87598 -SHA256 (gnome2/gnome-games-2.26.0.tar.bz2) = e7578f0f8fb612cd3afc7016ee9828ae6972b03ff746a396842c96d08081bbe1 -SIZE (gnome2/gnome-games-2.26.0.tar.bz2) = 21575301 +MD5 (gnome2/gnome-games-2.26.1.tar.bz2) = bce5a4126f103cb8fb25aee76e5dd119 +SHA256 (gnome2/gnome-games-2.26.1.tar.bz2) = 4721330b126e60788165dce91308cd7ce72554ecfa4cb714b929e16afbf67aba +SIZE (gnome2/gnome-games-2.26.1.tar.bz2) = 23273583 diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index 41403a8235aa..89e955f48c5d 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -700,6 +700,9 @@ share/gnome/help/aisleriot/ca/figures/clock-rules.png share/gnome/help/aisleriot/de/aisleriot.xml share/gnome/help/aisleriot/de/figures/camelot-goal.png share/gnome/help/aisleriot/de/figures/clock-rules.png +share/gnome/help/aisleriot/el/aisleriot.xml +share/gnome/help/aisleriot/el/figures/camelot-goal.png +share/gnome/help/aisleriot/el/figures/clock-rules.png share/gnome/help/aisleriot/es/aisleriot.xml share/gnome/help/aisleriot/es/figures/camelot-goal.png share/gnome/help/aisleriot/es/figures/clock-rules.png @@ -725,6 +728,9 @@ share/gnome/help/blackjack/C/legal.xml share/gnome/help/blackjack/ca/blackjack.xml share/gnome/help/blackjack/ca/figures/blackjack_start_window.png share/gnome/help/blackjack/ca/figures/blackjack_win_window.png +share/gnome/help/blackjack/da/blackjack.xml +share/gnome/help/blackjack/da/figures/blackjack_start_window.png +share/gnome/help/blackjack/da/figures/blackjack_win_window.png share/gnome/help/blackjack/de/blackjack.xml share/gnome/help/blackjack/de/figures/blackjack_start_window.png share/gnome/help/blackjack/de/figures/blackjack_win_window.png @@ -823,6 +829,10 @@ share/gnome/help/glines/de/figures/glines-gameover.png share/gnome/help/glines/de/figures/glines-startgame.png share/gnome/help/glines/de/figures/preferences.png share/gnome/help/glines/de/glines.xml +share/gnome/help/glines/el/figures/glines-gameover.png +share/gnome/help/glines/el/figures/glines-startgame.png +share/gnome/help/glines/el/figures/preferences.png +share/gnome/help/glines/el/glines.xml share/gnome/help/glines/en_GB/figures/glines-gameover.png share/gnome/help/glines/en_GB/figures/glines-startgame.png share/gnome/help/glines/en_GB/figures/preferences.png @@ -876,6 +886,11 @@ share/gnome/help/gnect/de/figures/mainwindow.png share/gnome/help/gnect/de/figures/tables.png share/gnome/help/gnect/de/figures/tileset.png share/gnome/help/gnect/de/gnect.xml +share/gnome/help/gnect/el/figures/connect.png +share/gnome/help/gnect/el/figures/mainwindow.png +share/gnome/help/gnect/el/figures/tables.png +share/gnome/help/gnect/el/figures/tileset.png +share/gnome/help/gnect/el/gnect.xml share/gnome/help/gnect/en_GB/figures/connect.png share/gnome/help/gnect/en_GB/figures/mainwindow.png share/gnome/help/gnect/en_GB/figures/tables.png @@ -934,6 +949,15 @@ share/gnome/help/gnibbles/de/figures/playing.png share/gnome/help/gnibbles/de/figures/tables.png share/gnome/help/gnibbles/de/figures/worm_op.png share/gnome/help/gnibbles/de/gnibbles.xml +share/gnome/help/gnibbles/el/figures/connect.png +share/gnome/help/gnibbles/el/figures/game.png +share/gnome/help/gnibbles/el/figures/intro.png +share/gnome/help/gnibbles/el/figures/playing.png +share/gnome/help/gnibbles/el/figures/tables.png +share/gnome/help/gnibbles/el/figures/worm_op.png +share/gnome/help/gnibbles/el/gnibbles.xml +share/gnome/help/gnobots2/el/figures/gnobots2-main.png +share/gnome/help/gnobots2/el/gnobots2.xml share/gnome/help/gnibbles/en_GB/figures/connect.png share/gnome/help/gnibbles/en_GB/figures/game.png share/gnome/help/gnibbles/en_GB/figures/intro.png @@ -1132,6 +1156,7 @@ share/gnome/help/gnometris/fr/gnometris.xml share/gnome/help/gnometris/it/gnometris.xml share/gnome/help/gnometris/oc/gnometris.xml share/gnome/help/gnometris/sv/gnometris.xml +share/gnome/help/gnometris/zh_CN/gnometris.xml share/gnome/help/gnomine/C/figures/easy-hints-1.png share/gnome/help/gnomine/C/figures/easy-hints-2.png share/gnome/help/gnomine/C/figures/easy-hints-3.png @@ -1286,6 +1311,20 @@ share/gnome/help/gnomine/sv/figures/imnotsureflagscheckbox.png share/gnome/help/gnomine/sv/figures/main-window.png share/gnome/help/gnomine/sv/figures/preferences.png share/gnome/help/gnomine/sv/figures/statusbar.png +share/gnome/help/gnomine/zh_CN/figures/easy-hints-1.png +share/gnome/help/gnomine/zh_CN/figures/easy-hints-2.png +share/gnome/help/gnomine/zh_CN/figures/easy-hints-3.png +share/gnome/help/gnomine/zh_CN/figures/faces.png +share/gnome/help/gnomine/zh_CN/figures/flags.png +share/gnome/help/gnomine/zh_CN/figures/hard-hints-1.png +share/gnome/help/gnomine/zh_CN/figures/hard-hints-2.png +share/gnome/help/gnomine/zh_CN/figures/hard-hints-3.png +share/gnome/help/gnomine/zh_CN/figures/highscores.png +share/gnome/help/gnomine/zh_CN/figures/imnotsureflagscheckbox.png +share/gnome/help/gnomine/zh_CN/figures/main-window.png +share/gnome/help/gnomine/zh_CN/figures/preferences.png +share/gnome/help/gnomine/zh_CN/figures/statusbar.png +share/gnome/help/gnomine/zh_CN/gnomine.xml share/gnome/help/gnomine/sv/gnomine.xml share/gnome/help/gnotravex/C/figures/gnotravex_game.png share/gnome/help/gnotravex/C/figures/gnotravex_mainwindow.png @@ -1334,6 +1373,9 @@ share/gnome/help/gnotski/ca/gnotski.xml share/gnome/help/gnotski/de/figures/gnotski_start_window.png share/gnome/help/gnotski/de/figures/gnotski_win.png share/gnome/help/gnotski/de/gnotski.xml +share/gnome/help/gnotski/el/figures/gnotski_start_window.png +share/gnome/help/gnotski/el/figures/gnotski_win.png +share/gnome/help/gnotski/el/gnotski.xml share/gnome/help/gnotski/en_GB/figures/gnotski_start_window.png share/gnome/help/gnotski/en_GB/figures/gnotski_win.png share/gnome/help/gnotski/en_GB/gnotski.xml @@ -1560,6 +1602,10 @@ share/gnome/help/same-gnome/de/figures/play.png share/gnome/help/same-gnome/de/figures/start-up.png share/gnome/help/same-gnome/de/legal.xml share/gnome/help/same-gnome/de/same-gnome.xml +share/gnome/help/same-gnome/el/figures/play.png +share/gnome/help/same-gnome/el/figures/start-up.png +share/gnome/help/same-gnome/el/legal.xml +share/gnome/help/same-gnome/el/same-gnome.xml share/gnome/help/same-gnome/en_GB/figures/play.png share/gnome/help/same-gnome/en_GB/figures/start-up.png share/gnome/help/same-gnome/en_GB/legal.xml @@ -1776,6 +1822,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo share/omf/aisleriot/aisleriot-C.omf share/omf/aisleriot/aisleriot-ca.omf share/omf/aisleriot/aisleriot-de.omf +share/omf/aisleriot/aisleriot-el.omf share/omf/aisleriot/aisleriot-es.omf share/omf/aisleriot/aisleriot-eu.omf share/omf/aisleriot/aisleriot-fr.omf @@ -1784,6 +1831,7 @@ share/omf/aisleriot/aisleriot-ru.omf share/omf/aisleriot/aisleriot-sv.omf share/omf/blackjack/blackjack-C.omf share/omf/blackjack/blackjack-ca.omf +share/omf/blackjack/blackjack-da.omf share/omf/blackjack/blackjack-de.omf share/omf/blackjack/blackjack-el.omf share/omf/blackjack/blackjack-en_GB.omf @@ -1807,6 +1855,7 @@ share/omf/glchess/glchess-sv.omf share/omf/glines/glines-C.omf share/omf/glines/glines-ca.omf share/omf/glines/glines-de.omf +share/omf/glines/glines-el.omf share/omf/glines/glines-en_GB.omf share/omf/glines/glines-es.omf share/omf/glines/glines-eu.omf @@ -1819,6 +1868,7 @@ share/omf/glines/glines-tr.omf share/omf/gnect/gnect-C.omf share/omf/gnect/gnect-ca.omf share/omf/gnect/gnect-de.omf +share/omf/gnect/gnect-el.omf share/omf/gnect/gnect-en_GB.omf share/omf/gnect/gnect-es.omf share/omf/gnect/gnect-eu.omf @@ -1829,6 +1879,7 @@ share/omf/gnect/gnect-sv.omf share/omf/gnibbles/gnibbles-C.omf share/omf/gnibbles/gnibbles-ca.omf share/omf/gnibbles/gnibbles-de.omf +share/omf/gnibbles/gnibbles-el.omf share/omf/gnibbles/gnibbles-en_GB.omf share/omf/gnibbles/gnibbles-es.omf share/omf/gnibbles/gnibbles-eu.omf @@ -1839,6 +1890,7 @@ share/omf/gnibbles/gnibbles-sv.omf share/omf/gnobots2/gnobots2-C.omf share/omf/gnobots2/gnobots2-ca.omf share/omf/gnobots2/gnobots2-de.omf +share/omf/gnobots2/gnobots2-el.omf share/omf/gnobots2/gnobots2-en_GB.omf share/omf/gnobots2/gnobots2-es.omf share/omf/gnobots2/gnobots2-eu.omf @@ -1874,6 +1926,7 @@ share/omf/gnometris/gnometris-fr.omf share/omf/gnometris/gnometris-it.omf share/omf/gnometris/gnometris-oc.omf share/omf/gnometris/gnometris-sv.omf +share/omf/gnometris/gnometris-zh_CN.omf share/omf/gnomine/gnomine-C.omf share/omf/gnomine/gnomine-ca.omf share/omf/gnomine/gnomine-de.omf @@ -1885,6 +1938,7 @@ share/omf/gnomine/gnomine-fr.omf share/omf/gnomine/gnomine-it.omf share/omf/gnomine/gnomine-oc.omf share/omf/gnomine/gnomine-sv.omf +share/omf/gnomine/gnomine-zh_CN.omf share/omf/gnotravex/gnotravex-C.omf share/omf/gnotravex/gnotravex-ca.omf share/omf/gnotravex/gnotravex-de.omf @@ -1900,6 +1954,7 @@ share/omf/gnotravex/gnotravex-sv.omf share/omf/gnotski/gnotski-C.omf share/omf/gnotski/gnotski-ca.omf share/omf/gnotski/gnotski-de.omf +share/omf/gnotski/gnotski-el.omf share/omf/gnotski/gnotski-en_GB.omf share/omf/gnotski/gnotski-es.omf share/omf/gnotski/gnotski-eu.omf @@ -1945,6 +2000,7 @@ share/omf/mahjongg/mahjongg-sv.omf share/omf/same-gnome/same-gnome-C.omf share/omf/same-gnome/same-gnome-ca.omf share/omf/same-gnome/same-gnome-de.omf +share/omf/same-gnome/same-gnome-el.omf share/omf/same-gnome/same-gnome-en_GB.omf share/omf/same-gnome/same-gnome-es.omf share/omf/same-gnome/same-gnome-eu.omf @@ -1991,6 +2047,8 @@ share/pixmaps/gnome-sudoku/footprints.png @dirrm share/gnome/help/same-gnome/es @dirrm share/gnome/help/same-gnome/en_GB/figures @dirrm share/gnome/help/same-gnome/en_GB +@dirrm share/gnome/help/same-gnome/el/figures +@dirrm share/gnome/help/same-gnome/el @dirrm share/gnome/help/same-gnome/de/figures @dirrm share/gnome/help/same-gnome/de @dirrm share/gnome/help/same-gnome/ca/figures @@ -2086,6 +2144,8 @@ share/pixmaps/gnome-sudoku/footprints.png @dirrm share/gnome/help/gnotski/es @dirrm share/gnome/help/gnotski/en_GB/figures @dirrm share/gnome/help/gnotski/en_GB +@dirrm share/gnome/help/gnotski/el/figures +@dirrm share/gnome/help/gnotski/el @dirrm share/gnome/help/gnotski/de/figures @dirrm share/gnome/help/gnotski/de @dirrm share/gnome/help/gnotski/ca/figures @@ -2118,6 +2178,8 @@ share/pixmaps/gnome-sudoku/footprints.png @dirrm share/gnome/help/gnotravex/C/figures @dirrm share/gnome/help/gnotravex/C @dirrm share/gnome/help/gnotravex +@dirrm share/gnome/help/gnomine/zh_CN/figures +@dirrm share/gnome/help/gnomine/zh_CN @dirrm share/gnome/help/gnomine/sv/figures @dirrm share/gnome/help/gnomine/sv @dirrm share/gnome/help/gnomine/oc/figures @@ -2141,6 +2203,7 @@ share/pixmaps/gnome-sudoku/footprints.png @dirrm share/gnome/help/gnomine/C/figures @dirrm share/gnome/help/gnomine/C @dirrm share/gnome/help/gnomine +@dirrm share/gnome/help/gnometris/zh_CN @dirrm share/gnome/help/gnometris/sv @dirrm share/gnome/help/gnometris/oc @dirrm share/gnome/help/gnometris/it @@ -2197,6 +2260,8 @@ share/pixmaps/gnome-sudoku/footprints.png @dirrm share/gnome/help/gnobots2/es @dirrm share/gnome/help/gnobots2/en_GB/figures @dirrm share/gnome/help/gnobots2/en_GB +@dirrm share/gnome/help/gnobots2/el/figures +@dirrm share/gnome/help/gnobots2/el @dirrm share/gnome/help/gnobots2/de/figures @dirrm share/gnome/help/gnobots2/de @dirrm share/gnome/help/gnobots2/da @@ -2219,6 +2284,8 @@ share/pixmaps/gnome-sudoku/footprints.png @dirrm share/gnome/help/gnibbles/es @dirrm share/gnome/help/gnibbles/en_GB/figures @dirrm share/gnome/help/gnibbles/en_GB +@dirrm share/gnome/help/gnibbles/el/figures +@dirrm share/gnome/help/gnibbles/el @dirrm share/gnome/help/gnibbles/de/figures @dirrm share/gnome/help/gnibbles/de @dirrm share/gnome/help/gnibbles/ca/figures @@ -2240,6 +2307,8 @@ share/pixmaps/gnome-sudoku/footprints.png @dirrm share/gnome/help/gnect/es @dirrm share/gnome/help/gnect/en_GB/figures @dirrm share/gnome/help/gnect/en_GB +@dirrm share/gnome/help/gnect/el/figures +@dirrm share/gnome/help/gnect/el @dirrm share/gnome/help/gnect/de/figures @dirrm share/gnome/help/gnect/de @dirrm share/gnome/help/gnect/ca/figures @@ -2265,6 +2334,8 @@ share/pixmaps/gnome-sudoku/footprints.png @dirrm share/gnome/help/glines/es @dirrm share/gnome/help/glines/en_GB/figures @dirrm share/gnome/help/glines/en_GB +@dirrm share/gnome/help/glines/el/figures +@dirrm share/gnome/help/glines/el @dirrm share/gnome/help/glines/de/figures @dirrm share/gnome/help/glines/de @dirrm share/gnome/help/glines/ca/figures @@ -2313,6 +2384,8 @@ share/pixmaps/gnome-sudoku/footprints.png @dirrm share/gnome/help/blackjack/el @dirrm share/gnome/help/blackjack/de/figures @dirrm share/gnome/help/blackjack/de +@dirrm share/gnome/help/blackjack/da/figures +@dirrm share/gnome/help/blackjack/da @dirrm share/gnome/help/blackjack/ca/figures @dirrm share/gnome/help/blackjack/ca @dirrm share/gnome/help/blackjack/C/figures @@ -2330,6 +2403,8 @@ share/pixmaps/gnome-sudoku/footprints.png @dirrm share/gnome/help/aisleriot/eu @dirrm share/gnome/help/aisleriot/es/figures @dirrm share/gnome/help/aisleriot/es +@dirrm share/gnome/help/aisleriot/el/figures +@dirrm share/gnome/help/aisleriot/el @dirrm share/gnome/help/aisleriot/de/figures @dirrm share/gnome/help/aisleriot/de @dirrm share/gnome/help/aisleriot/ca/figures diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index a5f6fa7b35ba..58e8c57f3929 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/eog/Makefile,v 1.92 2009/03/17 18:17:48 kwm Exp $ +# $MCom: ports-stable/graphics/eog/Makefile,v 1.8 2009/04/15 12:29:15 kwm Exp $ # PORTNAME= eog -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo index 3e5e3e3272a1..0ca60da0c1e5 100644 --- a/graphics/eog/distinfo +++ b/graphics/eog/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/eog-2.26.0.tar.bz2) = 5d513046f80bc989e715243d8cee2825 -SHA256 (gnome2/eog-2.26.0.tar.bz2) = f88eab10382b2e48f51d70e2f2b7250798df7cc9a23a9cc97855e8ade6a497a0 -SIZE (gnome2/eog-2.26.0.tar.bz2) = 2418149 +MD5 (gnome2/eog-2.26.1.tar.bz2) = d64d556b58c6342479a1efcb1bf9401e +SHA256 (gnome2/eog-2.26.1.tar.bz2) = 91b50a2958d5319e5908c3c0095c613278a9a25ee9904e5cba847f84917d4778 +SIZE (gnome2/eog-2.26.1.tar.bz2) = 2415358 diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist index 971722944178..55d8c67c1c01 100644 --- a/graphics/eog/pkg-plist +++ b/graphics/eog/pkg-plist @@ -134,6 +134,10 @@ share/gnome/help/eog/de/eog.xml share/gnome/help/eog/de/figures/eog_save_as_window.png share/gnome/help/eog/de/figures/eog_start_window.png share/gnome/help/eog/de/figures/eog_toolbar_editor_window.png +share/gnome/help/eog/el/eog.xml +share/gnome/help/eog/el/figures/eog_save_as_window.png +share/gnome/help/eog/el/figures/eog_start_window.png +share/gnome/help/eog/el/figures/eog_toolbar_editor_window.png share/gnome/help/eog/en_GB/eog.xml share/gnome/help/eog/en_GB/figures/eog_save_as_window.png share/gnome/help/eog/en_GB/figures/eog_start_window.png @@ -302,6 +306,7 @@ share/omf/eog/eog-ar.omf share/omf/eog/eog-ca.omf share/omf/eog/eog-da.omf share/omf/eog/eog-de.omf +share/omf/eog/eog-el.omf share/omf/eog/eog-en_GB.omf share/omf/eog/eog-es.omf share/omf/eog/eog-eu.omf @@ -354,6 +359,8 @@ share/omf/eog/eog-zh_TW.omf @dirrm share/gnome/help/eog/es @dirrm share/gnome/help/eog/en_GB/figures @dirrm share/gnome/help/eog/en_GB +@dirrm share/gnome/help/eog/el/figures +@dirrm share/gnome/help/eog/el @dirrm share/gnome/help/eog/de/figures @dirrm share/gnome/help/eog/de @dirrm share/gnome/help/eog/da/figures diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 4ab6249b2a52..bc2de5c6c7ef 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -3,11 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/evince/Makefile,v 1.120 2009/03/17 18:25:18 kwm Exp $ +# $MCom: ports-stable/graphics/evince/Makefile,v 1.7 2009/04/16 08:20:58 kwm Exp $ # PORTNAME= evince -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo index 1f46e64b1075..d6e711ccd8a9 100644 --- a/graphics/evince/distinfo +++ b/graphics/evince/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evince-2.26.0.tar.bz2) = 11c440e48702231e40066a78aae56f84 -SHA256 (gnome2/evince-2.26.0.tar.bz2) = c1b92f887abcacd3e38b84ba6abefeefc7730bf6b90d21304f020199db2e54f3 -SIZE (gnome2/evince-2.26.0.tar.bz2) = 1856736 +MD5 (gnome2/evince-2.26.1.tar.bz2) = 5508b1f1fc0b4b66de59b7af1e560d8b +SHA256 (gnome2/evince-2.26.1.tar.bz2) = bf2591ef38a4e705cbce1d2cd6d1b4e4d4734cdfccaae61648797a6a5dc69426 +SIZE (gnome2/evince-2.26.1.tar.bz2) = 1879053 diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index a9e5e0549aee..33399035f926 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -3,7 +3,7 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/librsvg2/Makefile,v 1.123 2009/03/17 14:48:53 kwm Exp $ +# $MCom: ports-stable/graphics/librsvg2/Makefile,v 1.5 2009/04/20 05:55:53 marcus Exp $ # PORTNAME= librsvg2 @@ -40,12 +40,12 @@ CROCO_VERSION= 0.6 MAN1= rsvg.1 -OPTIONS= MOZILLA_PLUGIN "Enable the SVG browser plug-in" no +OPTIONS= MOZILLA_PLUGIN "Enable the SVG browser plug-in" on .include <bsd.port.pre.mk> .if defined(WITH_MOZILLA_PLUGIN) -USE_GECKO= firefox mozilla seamonkey xulrunner +USE_GECKO= firefox mozilla seamonkey libxul xulrunner USE_WEBPLUGINS= gecko* WEBPLUGINS_FILES=libmozsvgdec.so .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile index a2fe9ca0bd66..3686dcf9d47f 100644 --- a/mail/evolution-exchange/Makefile +++ b/mail/evolution-exchange/Makefile @@ -3,11 +3,11 @@ # Whom: Adam Weinberger, based off kiesel's ximian-exchange port # # $FreeBSD$ -# $MCom: ports/mail/evolution-exchange/Makefile,v 1.133 2009/03/17 16:01:03 kwm Exp $ +# $MCom: ports-stable/mail/evolution-exchange/Makefile,v 1.3 2009/04/16 01:14:40 kwm Exp $ # PORTNAME= evolution-exchange -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -41,17 +41,6 @@ GCONF_SCHEMAS= apps_exchange_addressbook-${VERSION}.schemas .include <bsd.port.pre.mk> -.if !defined(NO_KERBEROS) && exists(/usr/lib/libkrb5.so) -CONFIGURE_ARGS+= --with-krb5=/usr -.else -LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal -.if defined(HEIMDAL_HOME) -CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include -.else -CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} -.endif -.endif - .if ${ARCH} == "amd64" CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" .endif diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo index 746e7ec259c9..6ae7752dcc91 100644 --- a/mail/evolution-exchange/distinfo +++ b/mail/evolution-exchange/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evolution-exchange-2.26.0.tar.bz2) = 845f0a74e4565a6639f3b8adb736cbc1 -SHA256 (gnome2/evolution-exchange-2.26.0.tar.bz2) = 677c363f5c983b0cf64ed167904ad063c87785a9da666cb35cac6c12b1d9d3a0 -SIZE (gnome2/evolution-exchange-2.26.0.tar.bz2) = 945729 +MD5 (gnome2/evolution-exchange-2.26.1.tar.bz2) = 9333f3e0558aaf331d61493b7bae23ae +SHA256 (gnome2/evolution-exchange-2.26.1.tar.bz2) = 7b0f2b9db2c92fd18be64b9b2c575faf0661c82d4989edab1acda0599cdffe83 +SIZE (gnome2/evolution-exchange-2.26.1.tar.bz2) = 958113 diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 923e453a45ec..6137fa3ce582 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -3,11 +3,11 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/mail/evolution/Makefile,v 1.192 2009/03/17 14:37:43 kwm Exp $ +# $MCom: ports-stable/mail/evolution/Makefile,v 1.3 2009/04/16 01:08:59 kwm Exp $ # PORTNAME= evolution -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1.1 PORTREVISION= 0 CATEGORIES= mail gnome MASTER_SITES= GNOME diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index ec93f5216431..b03cf39a1adf 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evolution-2.26.0.tar.bz2) = 97234b1ecded0232a1b68d2fc03b0252 -SHA256 (gnome2/evolution-2.26.0.tar.bz2) = 74a2d936ba8330d0abe059062bb84446f379c605480c0c404575e419926d5004 -SIZE (gnome2/evolution-2.26.0.tar.bz2) = 32677910 +MD5 (gnome2/evolution-2.26.1.1.tar.bz2) = e24b8c13d350c17ab8332482f60aa144 +SHA256 (gnome2/evolution-2.26.1.1.tar.bz2) = 82d6b10c5682900d91dfa40b8c1e76e7ef2e2168e26982828814ffc66930daa2 +SIZE (gnome2/evolution-2.26.1.1.tar.bz2) = 32809193 diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile index cc755adc7d53..b70c690c3b20 100644 --- a/misc/gnome-devel-docs/Makefile +++ b/misc/gnome-devel-docs/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.10 2009/03/18 04:45:17 marcus Exp $ +# $MCom: ports-stable/misc/gnome-devel-docs/Makefile,v 1.1 2009/04/16 07:49:58 kwm Exp $ # PORTNAME= gnome-devel-docs -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= misc gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/misc/gnome-devel-docs/distinfo b/misc/gnome-devel-docs/distinfo index eb71a6e0377b..6fd894b5055c 100644 --- a/misc/gnome-devel-docs/distinfo +++ b/misc/gnome-devel-docs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-devel-docs-2.26.0.tar.bz2) = 122e1a90a2ff7bdea199ad9cb477c7a5 -SHA256 (gnome2/gnome-devel-docs-2.26.0.tar.bz2) = 000a6c42331190c0ce622ed491deffcf909d43b92eac5180a2b95d7392592c2e -SIZE (gnome2/gnome-devel-docs-2.26.0.tar.bz2) = 3420092 +MD5 (gnome2/gnome-devel-docs-2.26.1.tar.bz2) = bd0ecf6d74888cd15a908b99da9877b3 +SHA256 (gnome2/gnome-devel-docs-2.26.1.tar.bz2) = 4f0a364a775d62d21af841dde491c6952c11fa3a6309cc717e75de6c8048ae8a +SIZE (gnome2/gnome-devel-docs-2.26.1.tar.bz2) = 3545931 diff --git a/misc/gnome-devel-docs/pkg-plist b/misc/gnome-devel-docs/pkg-plist index 3017ede02ff5..792b3a28f831 100644 --- a/misc/gnome-devel-docs/pkg-plist +++ b/misc/gnome-devel-docs/pkg-plist @@ -302,8 +302,11 @@ share/gnome/help/hig-book/C/images/windows-toolbox-large.png share/gnome/help/hig-book/C/images/windows-toolbox-small.png share/gnome/help/integration-guide/C/integration-guide.xml share/gnome/help/integration-guide/cs/integration-guide.xml +share/gnome/help/integration-guide/de/integration-guide.xml +share/gnome/help/integration-guide/el/integration-guide.xml share/gnome/help/integration-guide/en_GB/integration-guide.xml share/gnome/help/integration-guide/es/integration-guide.xml +share/gnome/help/integration-guide/fr/integration-guide.xml share/gnome/help/integration-guide/pt_BR/integration-guide.xml share/gnome/help/integration-guide/sv/integration-guide.xml share/gnome/help/integration-guide/zh_CN/integration-guide.xml @@ -325,6 +328,30 @@ share/gnome/help/platform-overview/C/ipc-network.xml share/gnome/help/platform-overview/C/legal-fdl.xml share/gnome/help/platform-overview/C/platform-overview.xml share/gnome/help/platform-overview/C/platform.xml +share/gnome/help/platform-overview/de/apx-modules.xml +share/gnome/help/platform-overview/de/bindings.xml +share/gnome/help/platform-overview/de/core-tech.xml +share/gnome/help/platform-overview/de/desktop-tech.xml +share/gnome/help/platform-overview/de/figures/graphics.png +share/gnome/help/platform-overview/de/figures/i18n.png +share/gnome/help/platform-overview/de/figures/pango.png +share/gnome/help/platform-overview/de/intro.xml +share/gnome/help/platform-overview/de/ipc-network.xml +share/gnome/help/platform-overview/de/legal-fdl.xml +share/gnome/help/platform-overview/de/platform-overview.xml +share/gnome/help/platform-overview/de/platform.xml +share/gnome/help/platform-overview/el/apx-modules.xml +share/gnome/help/platform-overview/el/bindings.xml +share/gnome/help/platform-overview/el/core-tech.xml +share/gnome/help/platform-overview/el/desktop-tech.xml +share/gnome/help/platform-overview/el/figures/graphics.png +share/gnome/help/platform-overview/el/figures/i18n.png +share/gnome/help/platform-overview/el/figures/pango.png +share/gnome/help/platform-overview/el/intro.xml +share/gnome/help/platform-overview/el/ipc-network.xml +share/gnome/help/platform-overview/el/legal-fdl.xml +share/gnome/help/platform-overview/el/platform-overview.xml +share/gnome/help/platform-overview/el/platform.xml share/gnome/help/platform-overview/es/apx-modules.xml share/gnome/help/platform-overview/es/bindings.xml share/gnome/help/platform-overview/es/core-tech.xml @@ -391,13 +418,18 @@ share/omf/gdp-style-guide/gdp-style-guide-C.omf share/omf/hig-book/hig-book-C.omf share/omf/integration-guide/integration-guide-C.omf share/omf/integration-guide/integration-guide-cs.omf +share/omf/integration-guide/integration-guide-de.omf +share/omf/integration-guide/integration-guide-el.omf share/omf/integration-guide/integration-guide-en_GB.omf share/omf/integration-guide/integration-guide-es.omf +share/omf/integration-guide/integration-guide-fr.omf share/omf/integration-guide/integration-guide-pt_BR.omf share/omf/integration-guide/integration-guide-sv.omf share/omf/integration-guide/integration-guide-zh_CN.omf share/omf/optimization-guide/optimization-guide-C.omf share/omf/platform-overview/platform-overview-C.omf +share/omf/platform-overview/platform-overview-de.omf +share/omf/platform-overview/platform-overview-el.omf share/omf/platform-overview/platform-overview-es.omf share/omf/platform-overview/platform-overview-fr.omf share/omf/platform-overview/platform-overview-it.omf @@ -420,6 +452,10 @@ share/omf/platform-overview/platform-overview-ru.omf @dirrm share/gnome/help/platform-overview/fr @dirrm share/gnome/help/platform-overview/es/figures @dirrm share/gnome/help/platform-overview/es +@dirrm share/gnome/help/platform-overview/el/figures +@dirrm share/gnome/help/platform-overview/el +@dirrm share/gnome/help/platform-overview/de/figures +@dirrm share/gnome/help/platform-overview/de @dirrm share/gnome/help/platform-overview/C/figures @dirrm share/gnome/help/platform-overview/C @dirrm share/gnome/help/platform-overview @@ -429,8 +465,11 @@ share/omf/platform-overview/platform-overview-ru.omf @dirrm share/gnome/help/integration-guide/zh_CN @dirrm share/gnome/help/integration-guide/sv @dirrm share/gnome/help/integration-guide/pt_BR +@dirrm share/gnome/help/integration-guide/fr @dirrm share/gnome/help/integration-guide/es @dirrm share/gnome/help/integration-guide/en_GB +@dirrm share/gnome/help/integration-guide/el +@dirrm share/gnome/help/integration-guide/de @dirrm share/gnome/help/integration-guide/cs @dirrm share/gnome/help/integration-guide/C @dirrm share/gnome/help/integration-guide diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile index 66ddc2e0b959..a9cf0cd608bd 100644 --- a/misc/gnome-user-docs/Makefile +++ b/misc/gnome-user-docs/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/misc/gnome-user-docs/Makefile,v 1.50 2009/03/17 18:00:46 kwm Exp $ +# $MCom: ports-stable/misc/gnome-user-docs/Makefile,v 1.1 2009/04/16 07:43:13 kwm Exp $ # PORTNAME= gnome-user-docs -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= misc gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo index 426541be9496..ec6575e09e62 100644 --- a/misc/gnome-user-docs/distinfo +++ b/misc/gnome-user-docs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-user-docs-2.26.0.tar.bz2) = 3735096cf4b076696ebed217bf600190 -SHA256 (gnome2/gnome-user-docs-2.26.0.tar.bz2) = 266c870e7e97b340d9bb59de95fd96b58e01288e93729d1e34ae020d9f837f70 -SIZE (gnome2/gnome-user-docs-2.26.0.tar.bz2) = 14112318 +MD5 (gnome2/gnome-user-docs-2.26.1.tar.bz2) = 519ad5fa8e7a2ce31dd42fc2c67d824a +SHA256 (gnome2/gnome-user-docs-2.26.1.tar.bz2) = 6ff17ffef01afed929306e1cb103574722f2cf36078d33edb5a023e7cb27f245 +SIZE (gnome2/gnome-user-docs-2.26.1.tar.bz2) = 15257876 diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist index 14bd90500c5b..89f48f0df7ee 100644 --- a/misc/gnome-user-docs/pkg-plist +++ b/misc/gnome-user-docs/pkg-plist @@ -474,6 +474,45 @@ share/gnome/help/gnome-access-guide/pt/figures/tabbed_section.png share/gnome/help/gnome-access-guide/pt/figures/text_box.png share/gnome/help/gnome-access-guide/pt/figures/tree.png share/gnome/help/gnome-access-guide/pt/gnome-access-guide.xml +share/gnome/help/gnome-access-guide/ru/figures/Braille_Tab.png +share/gnome/help/gnome-access-guide/ru/figures/General_Tab.png +share/gnome/help/gnome-access-guide/ru/figures/KeyBindings_Tab.png +share/gnome/help/gnome-access-guide/ru/figures/KeyBindings_Tab_Unbound.png +share/gnome/help/gnome-access-guide/ru/figures/KeyEcho_Tab.png +share/gnome/help/gnome-access-guide/ru/figures/Magnifier_Advanced.png +share/gnome/help/gnome-access-guide/ru/figures/Magnifier_Tab.png +share/gnome/help/gnome-access-guide/ru/figures/MainWindow.png +share/gnome/help/gnome-access-guide/ru/figures/Pronunciation_Tab.png +share/gnome/help/gnome-access-guide/ru/figures/RPM_search_gnome_common.png +share/gnome/help/gnome-access-guide/ru/figures/Speech_Tab.png +share/gnome/help/gnome-access-guide/ru/figures/TextAttributes_Tab.png +share/gnome/help/gnome-access-guide/ru/figures/accessx.png +share/gnome/help/gnome-access-guide/ru/figures/bouncekeys.png +share/gnome/help/gnome-access-guide/ru/figures/button.png +share/gnome/help/gnome-access-guide/ru/figures/check_box.png +share/gnome/help/gnome-access-guide/ru/figures/dropdown_combination_box.png +share/gnome/help/gnome-access-guide/ru/figures/dropdown_list_box.png +share/gnome/help/gnome-access-guide/ru/figures/mousekeys.png +share/gnome/help/gnome-access-guide/ru/figures/move_object_arrows.png +share/gnome/help/gnome-access-guide/ru/figures/move_object_before.png +share/gnome/help/gnome-access-guide/ru/figures/move_object_jump.png +share/gnome/help/gnome-access-guide/ru/figures/move_object_push.png +share/gnome/help/gnome-access-guide/ru/figures/radio_button.png +share/gnome/help/gnome-access-guide/ru/figures/slider.png +share/gnome/help/gnome-access-guide/ru/figures/slowkeys.png +share/gnome/help/gnome-access-guide/ru/figures/spin_box.png +share/gnome/help/gnome-access-guide/ru/figures/stickyaltlatch.png +share/gnome/help/gnome-access-guide/ru/figures/stickyaltlock.png +share/gnome/help/gnome-access-guide/ru/figures/stickyctrllatch.png +share/gnome/help/gnome-access-guide/ru/figures/stickyctrllock.png +share/gnome/help/gnome-access-guide/ru/figures/stickyshiftlatch.png +share/gnome/help/gnome-access-guide/ru/figures/stickyshiftlock.png +share/gnome/help/gnome-access-guide/ru/figures/stickywindowlatch.png +share/gnome/help/gnome-access-guide/ru/figures/stickywindowlock.png +share/gnome/help/gnome-access-guide/ru/figures/tabbed_section.png +share/gnome/help/gnome-access-guide/ru/figures/text_box.png +share/gnome/help/gnome-access-guide/ru/figures/tree.png +share/gnome/help/gnome-access-guide/ru/gnome-access-guide.xml share/gnome/help/gnome-access-guide/sv/figures/Braille_Tab.png share/gnome/help/gnome-access-guide/sv/figures/General_Tab.png share/gnome/help/gnome-access-guide/sv/figures/KeyBindings_Tab.png @@ -2212,6 +2251,7 @@ share/omf/gnome-access-guide/gnome-access-guide-hu.omf share/omf/gnome-access-guide/gnome-access-guide-it.omf share/omf/gnome-access-guide/gnome-access-guide-oc.omf share/omf/gnome-access-guide/gnome-access-guide-pt.omf +share/omf/gnome-access-guide/gnome-access-guide-ru.omf share/omf/gnome-access-guide/gnome-access-guide-sv.omf share/omf/gnome-access-guide/gnome-access-guide-zh_CN.omf share/omf/system-admin-guide/system-admin-guide-C.omf @@ -2318,6 +2358,8 @@ share/omf/user-guide/user-guide-zh_CN.omf @dirrm share/gnome/help/gnome-access-guide/zh_CN @dirrm share/gnome/help/gnome-access-guide/sv/figures @dirrm share/gnome/help/gnome-access-guide/sv +@dirrm share/gnome/help/gnome-access-guide/ru/figures +@dirrm share/gnome/help/gnome-access-guide/ru @dirrm share/gnome/help/gnome-access-guide/pt/figures @dirrm share/gnome/help/gnome-access-guide/pt @dirrm share/gnome/help/gnome-access-guide/oc/figures diff --git a/misc/quick-lounge-applet/Makefile b/misc/quick-lounge-applet/Makefile index ee6ef3d9525d..88106f70fda4 100644 --- a/misc/quick-lounge-applet/Makefile +++ b/misc/quick-lounge-applet/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/misc/quick-lounge-applet/Makefile,v 1.13 2009/02/21 13:44:22 kwm Exp $ +# $MCom: ports-stable/misc/quick-lounge-applet/Makefile,v 1.3 2009/04/16 08:13:36 kwm Exp $ # PORTNAME= quick-lounge-applet -PORTVERSION= 2.13.2 +PORTVERSION= 2.14.0 CATEGORIES= misc gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/misc/quick-lounge-applet/distinfo b/misc/quick-lounge-applet/distinfo index 48e058b71451..c42682670b19 100644 --- a/misc/quick-lounge-applet/distinfo +++ b/misc/quick-lounge-applet/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/quick-lounge-applet-2.13.2.tar.bz2) = 033723a90f6ce15d1340ee542631607c -SHA256 (gnome2/quick-lounge-applet-2.13.2.tar.bz2) = 7f43fa3b12cc517fa947399a5d93feee72280c71f5698ba9abd207d7e6771a9a -SIZE (gnome2/quick-lounge-applet-2.13.2.tar.bz2) = 405000 +MD5 (gnome2/quick-lounge-applet-2.14.0.tar.bz2) = f3fe457f145c74d42002930e6c91ad83 +SHA256 (gnome2/quick-lounge-applet-2.14.0.tar.bz2) = 44fa9f1a80316b8ccc4835bc3ad9b9ab6185ae2cc48c418a17926758e1bb67f8 +SIZE (gnome2/quick-lounge-applet-2.14.0.tar.bz2) = 396628 diff --git a/misc/quick-lounge-applet/pkg-plist b/misc/quick-lounge-applet/pkg-plist index a78f6d018d17..48e8e850d9de 100644 --- a/misc/quick-lounge-applet/pkg-plist +++ b/misc/quick-lounge-applet/pkg-plist @@ -8,6 +8,12 @@ share/gnome/help/quick-lounge/C/figures/quick-lounge_up.png share/gnome/help/quick-lounge/C/figures/quick-lounge_window.png share/gnome/help/quick-lounge/C/legal.xml share/gnome/help/quick-lounge/C/quick-lounge.xml +share/gnome/help/quick-lounge/de/figures/quick-lounge_down.png +share/gnome/help/quick-lounge/de/figures/quick-lounge_end.png +share/gnome/help/quick-lounge/de/figures/quick-lounge_start.png +share/gnome/help/quick-lounge/de/figures/quick-lounge_up.png +share/gnome/help/quick-lounge/de/figures/quick-lounge_window.png +share/gnome/help/quick-lounge/de/quick-lounge.xml share/gnome/help/quick-lounge/fr/figures/quick-lounge_down.png share/gnome/help/quick-lounge/fr/figures/quick-lounge_end.png share/gnome/help/quick-lounge/fr/figures/quick-lounge_start.png @@ -28,6 +34,7 @@ share/locale/el/LC_MESSAGES/quick-lounge-applet.mo share/locale/en_CA/LC_MESSAGES/quick-lounge-applet.mo share/locale/en_GB/LC_MESSAGES/quick-lounge-applet.mo share/locale/es/LC_MESSAGES/quick-lounge-applet.mo +share/locale/et/LC_MESSAGES/quick-lounge-applet.mo share/locale/eu/LC_MESSAGES/quick-lounge-applet.mo share/locale/fi/LC_MESSAGES/quick-lounge-applet.mo share/locale/fr/LC_MESSAGES/quick-lounge-applet.mo @@ -70,6 +77,8 @@ share/quick-lounge-applet/ui/properties.ui @dirrmtry share/locale/dz @dirrm share/gnome/help/quick-lounge/fr/figures @dirrm share/gnome/help/quick-lounge/fr +@dirrm share/gnome/help/quick-lounge/de/figures +@dirrm share/gnome/help/quick-lounge/de @dirrm share/gnome/help/quick-lounge/C/figures @dirrm share/gnome/help/quick-lounge/C @dirrm share/gnome/help/quick-lounge diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile index 627e6e19ba2e..fd801e38bc66 100644 --- a/net-im/empathy/Makefile +++ b/net-im/empathy/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net-im/empathy/Makefile,v 1.22 2009/03/30 19:03:24 marcus Exp $ +# $MCom: ports-stable/net-im/empathy/Makefile,v 1.3 2009/04/15 11:41:56 kwm Exp $ PORTNAME= empathy -PORTVERSION= 2.26.0.1 +PORTVERSION= 2.26.1 CATEGORIES= net-im gnome MASTER_SITES= GNOME diff --git a/net-im/empathy/distinfo b/net-im/empathy/distinfo index 8bd4e142df70..a855e33fda6d 100644 --- a/net-im/empathy/distinfo +++ b/net-im/empathy/distinfo @@ -1,3 +1,3 @@ -MD5 (empathy-2.26.0.1.tar.bz2) = e3b0e891c7eac3d6f3eb85373a6f4e25 -SHA256 (empathy-2.26.0.1.tar.bz2) = 02c5648cf48ddd726aba4a484b8c2317af846f9c01d61e2b3700f30e8944b390 -SIZE (empathy-2.26.0.1.tar.bz2) = 2181144 +MD5 (empathy-2.26.1.tar.bz2) = 1edc492c0fd339dc30f0a443adad5fbe +SHA256 (empathy-2.26.1.tar.bz2) = bb3b3663b11e3e573a13dd1b51d8a5b02797a43c53a64efc529f6604f40503c7 +SIZE (empathy-2.26.1.tar.bz2) = 2006578 diff --git a/net-im/empathy/pkg-plist b/net-im/empathy/pkg-plist index 24d08c2c8b0e..7dca126190c5 100644 --- a/net-im/empathy/pkg-plist +++ b/net-im/empathy/pkg-plist @@ -337,33 +337,26 @@ share/gnome/help/empathy/C/figures/empathy-main-window.png share/gnome/help/empathy/C/legal.xml share/gnome/help/empathy/ca/empathy.xml share/gnome/help/empathy/ca/figures/empathy-main-window.png -share/gnome/help/empathy/ca/figures/empathy-new-account.png share/gnome/help/empathy/cs/empathy.xml share/gnome/help/empathy/cs/figures/empathy-main-window.png share/gnome/help/empathy/de/empathy.xml share/gnome/help/empathy/de/figures/empathy-main-window.png -share/gnome/help/empathy/de/figures/empathy-new-account.png share/gnome/help/empathy/el/empathy.xml share/gnome/help/empathy/el/figures/empathy-main-window.png -share/gnome/help/empathy/el/figures/empathy-new-account.png share/gnome/help/empathy/en_GB/empathy.xml share/gnome/help/empathy/en_GB/figures/empathy-main-window.png share/gnome/help/empathy/es/empathy.xml share/gnome/help/empathy/es/figures/empathy-main-window.png -share/gnome/help/empathy/es/figures/empathy-new-account.png share/gnome/help/empathy/fi/empathy.xml share/gnome/help/empathy/fi/figures/empathy-main-window.png -share/gnome/help/empathy/fi/figures/empathy-new-account.png share/gnome/help/empathy/fr/empathy.xml share/gnome/help/empathy/fr/figures/empathy-main-window.png -share/gnome/help/empathy/fr/figures/empathy-new-account.png share/gnome/help/empathy/it/empathy.xml share/gnome/help/empathy/it/figures/empathy-main-window.png share/gnome/help/empathy/ru/empathy.xml share/gnome/help/empathy/ru/figures/empathy-main-window.png share/gnome/help/empathy/sv/empathy.xml share/gnome/help/empathy/sv/figures/empathy-main-window.png -share/gnome/help/empathy/sv/figures/empathy-new-account.png share/icons/hicolor/16x16/apps/empathy.png share/icons/hicolor/22x22/apps/empathy.png share/icons/hicolor/24x24/apps/empathy.png diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile index aeeb3d94e6cb..2b091968ae71 100644 --- a/net/avahi-app/Makefile +++ b/net/avahi-app/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net/avahi-app/Makefile,v 1.9 2008/03/20 16:07:21 mezz Exp $ +# $MCom: ports-stable/net/avahi-app/Makefile,v 1.1 2009/04/20 23:42:18 marcus Exp $ # PORTNAME= avahi -PORTVERSION= 0.6.24 -PORTREVISION?= 1 +PORTVERSION= 0.6.25 +PORTREVISION?= 0 CATEGORIES?= net dns MASTER_SITES= http://www.avahi.org/download/ PKGNAMESUFFIX?= -app diff --git a/net/avahi-app/distinfo b/net/avahi-app/distinfo index 77aa13f6178e..b891bb8c0b35 100644 --- a/net/avahi-app/distinfo +++ b/net/avahi-app/distinfo @@ -1,3 +1,3 @@ -MD5 (avahi-0.6.24.tar.gz) = 068c1d220b07037e64caf87d4a7a0504 -SHA256 (avahi-0.6.24.tar.gz) = 260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950 -SIZE (avahi-0.6.24.tar.gz) = 1115626 +MD5 (avahi-0.6.25.tar.gz) = a83155a6e29e3988f07e5eea3287b21e +SHA256 (avahi-0.6.25.tar.gz) = 9220d974f5515b8ccfa3900cd72cedcac0fa4cc87ca3c64405f7c55346cbba59 +SIZE (avahi-0.6.25.tar.gz) = 1103653 diff --git a/net/avahi-app/pkg-plist b/net/avahi-app/pkg-plist index 1d2c450aff02..cca894f1937f 100644 --- a/net/avahi-app/pkg-plist +++ b/net/avahi-app/pkg-plist @@ -124,6 +124,7 @@ share/locale/it/LC_MESSAGES/avahi.mo share/locale/ms/LC_MESSAGES/avahi.mo share/locale/pl/LC_MESSAGES/avahi.mo share/locale/pt_BR/LC_MESSAGES/avahi.mo +share/locale/ro/LC_MESSAGES/avahi.mo share/locale/ru/LC_MESSAGES/avahi.mo share/locale/sr/LC_MESSAGES/avahi.mo share/locale/sv/LC_MESSAGES/avahi.mo diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile index 63fa56282dc2..e8997cc1c51d 100644 --- a/net/libgweather/Makefile +++ b/net/libgweather/Makefile @@ -3,11 +3,11 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net/libgweather/Makefile,v 1.25 2009/03/17 23:07:29 kwm Exp $ +# $MCom: ports-stable/net/libgweather/Makefile,v 1.1 2009/04/15 22:11:37 kwm Exp $ # PORTNAME= libgweather -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= net gnome MASTER_SITES= GNOME diff --git a/net/libgweather/distinfo b/net/libgweather/distinfo index cfe463151c37..df1af4699b9a 100644 --- a/net/libgweather/distinfo +++ b/net/libgweather/distinfo @@ -1,3 +1,3 @@ -MD5 (libgweather-2.26.0.tar.bz2) = b96016d7b35c66cf251189e9851ee252 -SHA256 (libgweather-2.26.0.tar.bz2) = c1efdeb59fe87145d13d99b7bb6f51b56505081fb2ebc2f7fe7dc3f7699da45e -SIZE (libgweather-2.26.0.tar.bz2) = 6536099 +MD5 (libgweather-2.26.1.tar.bz2) = 382041ee8f4efeec1afde968624d34fe +SHA256 (libgweather-2.26.1.tar.bz2) = accde7dfe0ec866fd4a071469bca24725ecad516e7a8f004d55d0e5b38711842 +SIZE (libgweather-2.26.1.tar.bz2) = 6540960 diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile index de6059a78ab2..c40e5af138f6 100644 --- a/net/vinagre/Makefile +++ b/net/vinagre/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net/vinagre/Makefile,v 1.24 2009/03/18 00:32:18 kwm Exp $ +# $MCom: ports-stable/net/vinagre/Makefile,v 1.1 2009/04/15 09:36:08 kwm Exp $ # PORTNAME= vinagre -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= net gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo index 8f873d515440..31d0bbc6fc7f 100644 --- a/net/vinagre/distinfo +++ b/net/vinagre/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/vinagre-2.26.0.tar.bz2) = 6930bec2968c96dfb3407d6492ae42d4 -SHA256 (gnome2/vinagre-2.26.0.tar.bz2) = 3308e8072335370aa88201cbac23896c3f6118669c2fc531b7f7e8b62fb89c3e -SIZE (gnome2/vinagre-2.26.0.tar.bz2) = 1412103 +MD5 (gnome2/vinagre-2.26.1.tar.bz2) = 1ff7756444f85320565c606c9c8aa5d5 +SHA256 (gnome2/vinagre-2.26.1.tar.bz2) = d5a9fc5940d23f7a0209846576a81d4fc62f9fb038f945693b1be77c4e50f09c +SIZE (gnome2/vinagre-2.26.1.tar.bz2) = 1453150 diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist index b9943a89a7e4..e04109e4cfa9 100644 --- a/net/vinagre/pkg-plist +++ b/net/vinagre/pkg-plist @@ -18,6 +18,8 @@ share/gnome/help/vinagre/cs/figures/vinagre-screenshot.png share/gnome/help/vinagre/cs/vinagre.xml share/gnome/help/vinagre/de/figures/vinagre-screenshot.png share/gnome/help/vinagre/de/vinagre.xml +share/gnome/help/vinagre/el/figures/vinagre-screenshot.png +share/gnome/help/vinagre/el/vinagre.xml share/gnome/help/vinagre/en_GB/figures/vinagre-screenshot.png share/gnome/help/vinagre/en_GB/vinagre.xml share/gnome/help/vinagre/es/figures/vinagre-screenshot.png @@ -125,6 +127,7 @@ share/omf/vinagre/vinagre-C.omf share/omf/vinagre/vinagre-ca.omf share/omf/vinagre/vinagre-cs.omf share/omf/vinagre/vinagre-de.omf +share/omf/vinagre/vinagre-el.omf share/omf/vinagre/vinagre-en_GB.omf share/omf/vinagre/vinagre-es.omf share/omf/vinagre/vinagre-fr.omf @@ -160,6 +163,8 @@ share/omf/vinagre/vinagre-th.omf @dirrm share/gnome/help/vinagre/es @dirrm share/gnome/help/vinagre/en_GB/figures @dirrm share/gnome/help/vinagre/en_GB +@dirrm share/gnome/help/vinagre/el/figures +@dirrm share/gnome/help/vinagre/el @dirrm share/gnome/help/vinagre/de/figures @dirrm share/gnome/help/vinagre/de @dirrm share/gnome/help/vinagre/cs/figures diff --git a/net/vino/Makefile b/net/vino/Makefile index 0f1edaa04b55..6d055f83f75a 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -3,11 +3,11 @@ # Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org> # # $FreeBSD$ -# $MCom: ports/net/vino/Makefile,v 1.68 2009/03/18 00:27:09 kwm Exp $ +# $MCom: ports-stable/net/vino/Makefile,v 1.1 2009/04/15 09:28:05 kwm Exp $ # PORTNAME= vino -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= net gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/net/vino/distinfo b/net/vino/distinfo index b2e2fc19385f..3627acc6f753 100644 --- a/net/vino/distinfo +++ b/net/vino/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/vino-2.26.0.tar.bz2) = 7a10464824d8446411b90c162d34401e -SHA256 (gnome2/vino-2.26.0.tar.bz2) = 1dfad6b20f99b3f8c79b265c2e71e19ad206317e38b1d167debb41fc9e6d94fb -SIZE (gnome2/vino-2.26.0.tar.bz2) = 710542 +MD5 (gnome2/vino-2.26.1.tar.bz2) = f6f5122b0644eb72b4cfaf202b3c8b1e +SHA256 (gnome2/vino-2.26.1.tar.bz2) = 06720448e4c95101868dc07bc6719a4879a9a7a830847cf4f69b731bfc8d3c52 +SIZE (gnome2/vino-2.26.1.tar.bz2) = 711760 diff --git a/net/vino/files/patch-configure b/net/vino/files/patch-configure index c7da75af74e6..6cb7065fc880 100644 --- a/net/vino/files/patch-configure +++ b/net/vino/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2009-02-27 20:32:40.000000000 -0500 -+++ configure 2009-02-27 20:34:44.000000000 -0500 -@@ -17882,6 +17882,8 @@ cat confdefs.h >>conftest.$ac_ext +--- configure.orig 2009-04-15 11:26:27.000000000 +0200 ++++ configure 2009-04-15 11:26:27.000000000 +0200 +@@ -18108,6 +18108,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -9,7 +9,7 @@ #include <ifaddrs.h> int -@@ -17896,6 +17898,7 @@ main () +@@ -18122,6 +18124,7 @@ main () } _ACEOF rm -f conftest.$ac_objext @@ -17,12 +17,3 @@ if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -@@ -17921,7 +17924,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- if test $"$have_getifaddrs" = "yes"; then -+ if test x"$have_getifaddrs" = x"yes"; then - HAVE_GETIFADDRS_TRUE= - HAVE_GETIFADDRS_FALSE='#' - else diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index 660c4e7a5449..897f8bd23aa8 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/security/gnome-keyring/Makefile,v 1.76 2009/03/15 00:23:43 marcus Exp $ +# $MCom: ports-stable/security/gnome-keyring/Makefile,v 1.3 2009/04/20 00:24:30 marcus Exp $ # PORTNAME= gnome-keyring PORTVERSION= 2.26.1 +PORTREVISION= 1 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/security/gnome-keyring/files/patch-pam_gkr-pam-client.c b/security/gnome-keyring/files/patch-pam_gkr-pam-client.c new file mode 100644 index 000000000000..05a0306e6913 --- /dev/null +++ b/security/gnome-keyring/files/patch-pam_gkr-pam-client.c @@ -0,0 +1,18 @@ +--- pam/gkr-pam-client.c.orig 2008-10-07 12:25:23.000000000 -0400 ++++ pam/gkr-pam-client.c 2008-10-07 12:38:36.000000000 -0400 +@@ -96,12 +96,12 @@ check_peer_same_uid (int sock) + struct xucred xuc; + socklen_t xuc_len = sizeof (xuc); + +- if (getsockopt (sock, SOL_SOCKET, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && +- xuc_len == sizeof (xuc)) { ++ if (getsockopt (sock, 0, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && ++ xuc.cr_version == XUCRED_VERSION) { + uid = xuc.cr_uid; + } else { + syslog (GKR_LOG_ERR, "could not get gnome-keyring-daemon socket credentials, " +- "(returned len %d/%d)\n", xuc_len, (int)sizeof (xuc)); ++ "(returned version %d/%d)\n", xuc.cr_version, XUCRED_VERSION); + return -1; + } + diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile index 478708eb1900..8dd70e2b6d7d 100644 --- a/security/seahorse-plugins/Makefile +++ b/security/seahorse-plugins/Makefile @@ -3,11 +3,11 @@ # Whom: Dave McKay <dave@mu.org> # # $FreeBSD$ -# $MCom: ports/security/seahorse-plugins/Makefile,v 1.10 2009/03/30 05:54:57 marcus Exp $ +# $MCom: ports-stable/security/seahorse-plugins/Makefile,v 1.1 2009/04/15 10:36:03 kwm Exp $ # PORTNAME= seahorse-plugins -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/security/seahorse-plugins/distinfo b/security/seahorse-plugins/distinfo index 7897b7b5507a..8e2883c653f3 100644 --- a/security/seahorse-plugins/distinfo +++ b/security/seahorse-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/seahorse-plugins-2.26.0.tar.bz2) = 8936feb29cf9e4b935d1059ee4e416c6 -SHA256 (gnome2/seahorse-plugins-2.26.0.tar.bz2) = b56c3c947204dac0802332332feea6eee282616a654b92d3135340cb842bf377 -SIZE (gnome2/seahorse-plugins-2.26.0.tar.bz2) = 1350051 +MD5 (gnome2/seahorse-plugins-2.26.1.tar.bz2) = d0aecc4e8e008b45362adf8a8716f38c +SHA256 (gnome2/seahorse-plugins-2.26.1.tar.bz2) = 898acf0009beff402875378483460436d64104c11235ed3a3c3ff43b5229b752 +SIZE (gnome2/seahorse-plugins-2.26.1.tar.bz2) = 1311443 diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 99729e102ce8..06fd9ffa046d 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -3,11 +3,12 @@ # Whom: Dave McKay <dave@mu.org> # # $FreeBSD$ -# $MCom: ports/security/seahorse/Makefile,v 1.79 2009/03/15 01:01:47 marcus Exp $ +# $MCom: ports-stable/security/seahorse/Makefile,v 1.5 2009/04/20 00:55:09 marcus Exp $ # PORTNAME= seahorse PORTVERSION= 2.26.1 +PORTREVISION= 1 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/security/seahorse/files/patch-common_seahorse-registry.c b/security/seahorse/files/patch-common_seahorse-registry.c deleted file mode 100644 index d3ab78c0de42..000000000000 --- a/security/seahorse/files/patch-common_seahorse-registry.c +++ /dev/null @@ -1,44 +0,0 @@ ---- common/seahorse-registry.c.orig 2009-02-14 19:20:38.000000000 +0100 -+++ common/seahorse-registry.c 2009-02-24 21:15:26.000000000 +0100 -@@ -51,6 +51,25 @@ - registry_singleton = NULL; - } - -+static guint registry_hash (gconstpointer key) -+{ -+ SeahorseRegistryType *rtype; -+ -+ rtype = (SeahorseRegistryType *) key; -+ -+ return (guint) rtype->type; -+} -+ -+static gboolean registry_equal (gconstpointer a, gconstpointer b) -+{ -+ SeahorseRegistryType *rta, *rtb; -+ -+ rta = (SeahorseRegistryType *) a; -+ rtb = (SeahorseRegistryType *) b; -+ -+ return (rta->type == rtb->type); -+} -+ - static void - keys_to_list (gpointer key, gpointer value, gpointer user_data) - { -@@ -63,13 +82,14 @@ - gpointer value, GDestroyNotify destroy_func) - { - GHashTable *set; -+ SeahorseRegistryType *rtype; - - g_return_if_fail (table); - g_return_if_fail (category); - - set = g_hash_table_lookup (table, GUINT_TO_POINTER (category)); - if (!set) { -- set = g_hash_table_new_full (g_direct_hash, g_direct_equal, destroy_func, NULL); -+ set = g_hash_table_new_full (registry_hash, registry_equal, destroy_func, NULL); - g_hash_table_replace (table, GUINT_TO_POINTER (category), set); - } - diff --git a/security/seahorse/files/patch-common_seahorse-registry.h b/security/seahorse/files/patch-common_seahorse-registry.h deleted file mode 100644 index f1f57de3b042..000000000000 --- a/security/seahorse/files/patch-common_seahorse-registry.h +++ /dev/null @@ -1,21 +0,0 @@ ---- common/seahorse-registry.h.orig 2008-11-23 18:26:42.000000000 -0500 -+++ common/seahorse-registry.h 2008-11-23 18:26:47.000000000 -0500 -@@ -35,6 +35,7 @@ G_BEGIN_DECLS - - typedef struct _SeahorseRegistry SeahorseRegistry; - typedef struct _SeahorseRegistryClass SeahorseRegistryClass; -+typedef struct _SeahorseRegistryType SeahorseRegistryType; - - struct _SeahorseRegistry { - GObject parent; -@@ -44,6 +45,10 @@ struct _SeahorseRegistryClass { - GObjectClass parent_class; - }; - -+struct _SeahorseRegistryType { -+ GType type; -+}; -+ - /* member functions */ - GType seahorse_registry_get_type (void) G_GNUC_CONST; - diff --git a/security/seahorse/files/patch-ssh_seahorse-ssh-operation.c b/security/seahorse/files/patch-ssh_seahorse-ssh-operation.c index d3528e2a7a64..1c7acece0685 100644 --- a/security/seahorse/files/patch-ssh_seahorse-ssh-operation.c +++ b/security/seahorse/files/patch-ssh_seahorse-ssh-operation.c @@ -1,19 +1,19 @@ ---- ssh/seahorse-ssh-operation.c.orig 2008-07-21 18:15:51.000000000 -0400 -+++ ssh/seahorse-ssh-operation.c 2008-07-22 22:49:51.000000000 -0400 -@@ -280,11 +280,14 @@ askpass_handler (GIOChannel *source, GIO +--- ssh/seahorse-ssh-operation.c.orig 2009-04-12 10:29:33.000000000 -0400 ++++ ssh/seahorse-ssh-operation.c 2009-04-19 20:44:50.000000000 -0400 +@@ -281,11 +281,14 @@ askpass_handler (GIOChannel *source, GIO const gchar *result = NULL; if (condition & G_IO_IN) { -+ GIOStatus status; ++ GIOStatus status; /* Read 1 line from the io channel, including newline character */ - g_io_channel_read_line (source, &string, &length, NULL, &err); + status = g_io_channel_read_line (source, &string, &length, NULL, &err); - if (err != NULL) { -+ if (status == G_IO_STATUS_EOF) { -+ ret = FALSE; -+ } else if (err != NULL) { ++ if (status == G_IO_STATUS_EOF) { ++ ret = FALSE; ++ } else if (err != NULL) { g_critical ("couldn't read from seahorse-ssh-askpass: %s", err->message); g_clear_error (&err); ret = FALSE; diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index 1121385058d9..8e7642beed7b 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -3,11 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/brasero/Makefile,v 1.43 2009/03/22 00:17:29 marcus Exp $ +# $MCom: ports-stable/sysutils/brasero/Makefile,v 1.1 2009/04/16 02:11:50 kwm Exp $ PORTNAME= brasero -PORTVERSION= 2.26.0 -PORTREVISION= 1 +PORTVERSION= 2.26.1 CATEGORIES= sysutils audio multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo index d1776af4b68c..c0114aa768a4 100644 --- a/sysutils/brasero/distinfo +++ b/sysutils/brasero/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/brasero-2.26.0.tar.bz2) = ef968fe98874da4e26b61591ee57be4a -SHA256 (gnome2/brasero-2.26.0.tar.bz2) = a1d3568f4e6d68e824884c0e06acd38fdd6cf142231ca6ded2647b95ab289c8a -SIZE (gnome2/brasero-2.26.0.tar.bz2) = 3129146 +MD5 (gnome2/brasero-2.26.1.tar.bz2) = 06bec1a0442b33de80151cc8253b7160 +SHA256 (gnome2/brasero-2.26.1.tar.bz2) = bfb8a54b238b3935d42106ff6d741ec6a529fdb6ef2016041df2620411556aed +SIZE (gnome2/brasero-2.26.1.tar.bz2) = 3310649 diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist index b2536ed17af0..173a11b924b7 100644 --- a/sysutils/brasero/pkg-plist +++ b/sysutils/brasero/pkg-plist @@ -264,6 +264,7 @@ share/icons/hicolor/32x32/apps/brasero.png share/icons/hicolor/48x48/apps/brasero.png share/icons/hicolor/scalable/apps/brasero.svg share/locale/ar/LC_MESSAGES/brasero.mo +share/locale/as/LC_MESSAGES/brasero.mo share/locale/bg/LC_MESSAGES/brasero.mo share/locale/bn_IN/LC_MESSAGES/brasero.mo share/locale/ca/LC_MESSAGES/brasero.mo @@ -309,6 +310,8 @@ share/locale/sv/LC_MESSAGES/brasero.mo share/locale/ta/LC_MESSAGES/brasero.mo share/locale/te/LC_MESSAGES/brasero.mo share/locale/th/LC_MESSAGES/brasero.mo +share/locale/tr/LC_MESSAGES/brasero.mo +share/locale/uk/LC_MESSAGES/brasero.mo share/locale/vi/LC_MESSAGES/brasero.mo share/locale/zh_CN/LC_MESSAGES/brasero.mo share/locale/zh_HK/LC_MESSAGES/brasero.mo @@ -377,6 +380,8 @@ share/omf/brasero/brasero-sv.omf @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @@ -389,3 +394,5 @@ share/omf/brasero/brasero-sv.omf @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile index b64a6212adff..3e9e623fddb9 100644 --- a/sysutils/consolekit/Makefile +++ b/sysutils/consolekit/Makefile @@ -3,11 +3,11 @@ # Whom: Florent Thoumie <flz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/consolekit/Makefile,v 1.19 2008/12/24 16:12:03 marcus Exp $ +# $MCom: ports-stable/sysutils/consolekit/Makefile,v 1.2 2009/04/18 22:09:26 marcus Exp $ PORTNAME= consolekit PORTVERSION= 0.3.0 -PORTREVISION= 6 +PORTREVISION= 8 CATEGORIES= sysutils gnome MASTER_SITES= http://people.freedesktop.org/~mccann/dist/ DISTFILES= ConsoleKit-${PORTVERSION}${EXTRACT_SUFX} diff --git a/sysutils/consolekit/files/patch-data_ConsoleKit.conf b/sysutils/consolekit/files/patch-data_ConsoleKit.conf index 155e92ec6edd..9a3e97aa95c5 100644 --- a/sysutils/consolekit/files/patch-data_ConsoleKit.conf +++ b/sysutils/consolekit/files/patch-data_ConsoleKit.conf @@ -1,6 +1,15 @@ ---- data/ConsoleKit.conf.orig 2008-12-24 11:06:53.000000000 -0500 -+++ data/ConsoleKit.conf 2008-12-24 11:07:17.000000000 -0500 -@@ -91,6 +91,8 @@ +--- data/ConsoleKit.conf.orig 2008-04-19 01:39:49.000000000 -0400 ++++ data/ConsoleKit.conf 2009-04-17 01:51:54.000000000 -0400 +@@ -32,6 +32,8 @@ + <allow send_interface="org.freedesktop.ConsoleKit.Manager" + send_member="GetSeats"/> + <allow send_interface="org.freedesktop.ConsoleKit.Manager" ++ send_member="GetSessions"/> ++ <allow send_interface="org.freedesktop.ConsoleKit.Manager" + send_member="GetSessionForCookie"/> + <allow send_interface="org.freedesktop.ConsoleKit.Manager" + send_member="GetSessionForUnixProcess"/> +@@ -91,6 +93,8 @@ send_member="GetIdleHint"/> <allow send_interface="org.freedesktop.ConsoleKit.Session" send_member="GetIdleSinceHint"/> diff --git a/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c b/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c index d11c6d123f99..d57649345813 100644 --- a/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c +++ b/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c @@ -1,5 +1,5 @@ --- src/ck-sysdeps-freebsd.c.orig 2008-04-03 20:36:21.000000000 -0400 -+++ src/ck-sysdeps-freebsd.c 2009-02-14 15:26:37.000000000 -0500 ++++ src/ck-sysdeps-freebsd.c 2009-04-18 18:04:39.000000000 -0400 @@ -27,6 +27,7 @@ #include <unistd.h> #include <string.h> @@ -24,9 +24,12 @@ *stat = NULL; } -@@ -235,21 +234,25 @@ ck_unix_pid_get_env_hash (pid_t pid) +@@ -233,24 +232,28 @@ ck_process_stat_free (CkProcessStat *sta + GHashTable * + ck_unix_pid_get_env_hash (pid_t pid) { - GHashTable *hash; +- GHashTable *hash; ++ GHashTable *hash = NULL; char **penv; + char errbuf[_POSIX2_LINE_MAX]; kvm_t *kd; @@ -41,17 +44,28 @@ } if (! get_kinfo_proc (pid, &p)) { -+ g_warning ("get_kinfo_proc failed: %s", g_strerror(errno)); - return NULL; +- return NULL; ++ g_warning ("get_kinfo_proc failed: %s", g_strerror (errno)); ++ goto fail; } penv = kvm_getenvv (kd, &p, 0); if (penv == NULL) { -+ g_warning ("kvm_getenvv failed"); - return NULL; +- return NULL; ++ g_warning ("kvm_getenvv failed: %s", kvm_geterr (kd)); ++ goto fail; } -@@ -280,7 +283,7 @@ ck_unix_pid_get_env (pid_t pid, + hash = g_hash_table_new_full (g_str_hash, +@@ -270,6 +273,7 @@ ck_unix_pid_get_env_hash (pid_t pid) + } + } + ++fail: + kvm_close (kd); + + return hash; +@@ -280,7 +284,7 @@ ck_unix_pid_get_env (pid_t pid, const char *var) { GHashTable *hash; @@ -60,7 +74,7 @@ /* * Would probably be more efficient to just loop through the -@@ -288,6 +291,8 @@ ck_unix_pid_get_env (pid_t pid, +@@ -288,6 +292,8 @@ ck_unix_pid_get_env (pid_t pid, * table, but this works for now. */ hash = ck_unix_pid_get_env_hash (pid); @@ -69,7 +83,7 @@ val = g_strdup (g_hash_table_lookup (hash, var)); g_hash_table_destroy (hash); -@@ -327,38 +332,38 @@ gboolean +@@ -327,38 +333,38 @@ gboolean ck_get_max_num_consoles (guint *num) { int max_consoles; @@ -125,7 +139,7 @@ } char * -@@ -369,7 +374,12 @@ ck_get_console_device_for_num (guint num +@@ -369,7 +375,12 @@ ck_get_console_device_for_num (guint num /* The device number is always one less than the VT number. */ num--; @@ -139,7 +153,7 @@ return device; } -@@ -379,6 +389,7 @@ ck_get_console_num_from_device (const ch +@@ -379,6 +390,7 @@ ck_get_console_num_from_device (const ch guint *num) { guint n; @@ -147,7 +161,7 @@ gboolean ret; n = 0; -@@ -388,7 +399,11 @@ ck_get_console_num_from_device (const ch +@@ -388,7 +400,11 @@ ck_get_console_num_from_device (const ch return FALSE; } @@ -160,7 +174,7 @@ /* The VT number is always one more than the device number. */ n++; ret = TRUE; -@@ -408,6 +423,7 @@ ck_get_active_console_num (int consol +@@ -408,6 +424,7 @@ ck_get_active_console_num (int consol gboolean ret; int res; int active; @@ -168,7 +182,7 @@ g_assert (console_fd != -1); -@@ -420,7 +436,12 @@ ck_get_active_console_num (int consol +@@ -420,7 +437,12 @@ ck_get_active_console_num (int consol goto out; } diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile index 9eccabebf5a4..1baf7b279f21 100644 --- a/sysutils/gnome-power-manager/Makefile +++ b/sysutils/gnome-power-manager/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.52 2009/03/07 18:42:22 marcus Exp $ +# $MCom: ports-stable/sysutils/gnome-power-manager/Makefile,v 1.5 2009/04/19 06:23:37 marcus Exp $ # PORTNAME= gnome-power-manager PORTVERSION= 2.24.4 -PORTREVISION= 1 +PORTREVISION= 4 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,7 +20,9 @@ BUILD_DEPENDS= docbook2html:${PORTSDIR}/textproc/docbook-utils \ ${LOCALBASE}/share/sgml/docbook/4.1/catalog:${PORTSDIR}/textproc/docbook-410 LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \ notify.1:${PORTSDIR}/devel/libnotify \ - execinfo:${PORTSDIR}/devel/libexecinfo + execinfo:${PORTSDIR}/devel/libexecinfo \ + polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome \ + unique-1.0.2:${PORTSDIR}/x11-toolkits/unique USE_GETTEXT= yes USE_BZIP2= yes @@ -32,7 +34,8 @@ USE_GSTREAMER= good USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libwnck \ gnomedocutils gnomepanel CONFIGURE_ARGS= --with-doc-dir=${PREFIX}/share/doc \ - --disable-docbook-docs + --disable-docbook-docs \ + --enable-policykit CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/sysutils/gnome-power-manager/files/patch-libhal-glib_libhal-gdevice.c b/sysutils/gnome-power-manager/files/patch-libhal-glib_libhal-gdevice.c new file mode 100644 index 000000000000..6d98cece2825 --- /dev/null +++ b/sysutils/gnome-power-manager/files/patch-libhal-glib_libhal-gdevice.c @@ -0,0 +1,11 @@ +--- libhal-glib/libhal-gdevice.c.orig 2009-04-19 02:15:52.000000000 -0400 ++++ libhal-glib/libhal-gdevice.c 2009-04-19 02:16:09.000000000 -0400 +@@ -280,7 +280,7 @@ hal_gdevice_query_capability (HalGDevice + return FALSE; + } + ret = dbus_g_proxy_call (proxy, "QueryCapability", error, +- G_TYPE_STRING, device->priv->udi, ++ G_TYPE_STRING, capability, + G_TYPE_INVALID, + G_TYPE_BOOLEAN, has_capability, + G_TYPE_INVALID); diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-button.c b/sysutils/gnome-power-manager/files/patch-src_gpm-button.c new file mode 100644 index 000000000000..7960d9f22d74 --- /dev/null +++ b/sysutils/gnome-power-manager/files/patch-src_gpm-button.c @@ -0,0 +1,37 @@ +--- src/gpm-button.c.orig 2009-04-19 02:17:58.000000000 -0400 ++++ src/gpm-button.c 2009-04-19 02:20:39.000000000 -0400 +@@ -494,6 +494,25 @@ hal_daemon_stop_cb (HalGManager *hal_man + } + } + ++/* ++ * hal_daemon_new_device_cb ++ **/ ++static void ++hal_daemon_new_device_cb (HalGManager *hal_manager, const gchar *udi, GpmButton *button) ++{ ++ gboolean is_button; ++ HalGDevice *device; ++ ++ device = hal_gdevice_new (); ++ hal_gdevice_set_udi (device, udi); ++ hal_gdevice_query_capability (device, "button", &is_button, NULL); ++ if (is_button == TRUE) { ++ egg_debug ("Watching %s", udi); ++ watch_add_button (button, udi); ++ } ++ g_object_unref (device); ++} ++ + /** + * gpm_button_init: + * @button: This class instance +@@ -543,6 +562,8 @@ gpm_button_init (GpmButton *button) + G_CALLBACK (hal_daemon_start_cb), button); + g_signal_connect (button->priv->hal_manager, "daemon-stop", + G_CALLBACK (hal_daemon_stop_cb), button); ++ g_signal_connect (button->priv->hal_manager, "device-added", ++ G_CALLBACK (hal_daemon_new_device_cb), button); + + button->priv->hal_devicestore = hal_gdevicestore_new (); + diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile index e86d4ec00dcb..8b5554aa1e35 100644 --- a/sysutils/gnome-settings-daemon/Makefile +++ b/sysutils/gnome-settings-daemon/Makefile @@ -3,11 +3,12 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.37 2009/03/17 14:00:07 kwm Exp $ +# $MCom: ports-stable/sysutils/gnome-settings-daemon/Makefile,v 1.2 2009/04/18 10:59:37 kwm Exp $ # PORTNAME= gnome-settings-daemon -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,6 +17,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 settings daemon LIB_DEPENDS= pulse.0:${PORTSDIR}/audio/pulseaudio +RUN_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb USE_XORG= xxf86misc USE_BZIP2= yes diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo index e075a7705eb3..54077390c442 100644 --- a/sysutils/gnome-settings-daemon/distinfo +++ b/sysutils/gnome-settings-daemon/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-settings-daemon-2.26.0.tar.bz2) = c3a2934deccfcf13de15507d4be802d3 -SHA256 (gnome2/gnome-settings-daemon-2.26.0.tar.bz2) = 20502568f82ce92bc26122ceafae0f63ed71bfba0366db03c163c8567db2a103 -SIZE (gnome2/gnome-settings-daemon-2.26.0.tar.bz2) = 1143867 +MD5 (gnome2/gnome-settings-daemon-2.26.1.tar.bz2) = 7be383de54c0707c64843ae51563c43a +SHA256 (gnome2/gnome-settings-daemon-2.26.1.tar.bz2) = 4dff1daa84fe485e302f61286df1dd188292302ee792ddb4fb1c34e65aea0a80 +SIZE (gnome2/gnome-settings-daemon-2.26.1.tar.bz2) = 1084129 diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c b/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c deleted file mode 100644 index 73931511df77..000000000000 --- a/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/media-keys/gsd-media-keys-manager.c.orig 2009-02-04 16:33:14.000000000 -0500 -+++ plugins/media-keys/gsd-media-keys-manager.c 2009-02-27 14:05:26.000000000 -0500 -@@ -64,6 +64,8 @@ - - #if defined(__OpenBSD__) - # define EJECT_COMMAND "eject -t /dev/cd0" -+#elif defined(__FreeBSD__) -+# define EJECT_COMMAND "cdcontrol eject" - #else - # define EJECT_COMMAND "eject -T" - #endif diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_sound_gst-sound-manager.c b/sysutils/gnome-settings-daemon/files/patch-plugins_sound_gst-sound-manager.c deleted file mode 100644 index cc0baf6fdc50..000000000000 --- a/sysutils/gnome-settings-daemon/files/patch-plugins_sound_gst-sound-manager.c +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/sound/gsd-sound-manager.c.orig 2008-04-07 10:04:58.426471043 -0400 -+++ plugins/sound/gsd-sound-manager.c 2008-04-07 10:05:10.592326201 -0400 -@@ -23,6 +23,7 @@ - - #include <sys/types.h> - #include <sys/wait.h> -+#include <signal.h> - #include <stdlib.h> - #include <stdio.h> - #include <unistd.h> diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 15449b0689dc..ff23cfb534c2 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.132 2009/03/17 16:06:07 kwm Exp $ +# $MCom: ports-stable/sysutils/gnome-system-monitor/Makefile,v 1.1 2009/04/15 13:39:54 kwm Exp $ # PORTNAME= gnome-system-monitor -PORTVERSION= 2.26.0.1 +PORTVERSION= 2.26.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index b2fda80f472a..07c5c565ca10 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-system-monitor-2.26.0.1.tar.bz2) = 553de9c4912f4af25f92a3380626c0f1 -SHA256 (gnome2/gnome-system-monitor-2.26.0.1.tar.bz2) = 6b78e253e848b0652e76bfacae300e2b02f4f3081e418f3f19aa54fe337ee6f5 -SIZE (gnome2/gnome-system-monitor-2.26.0.1.tar.bz2) = 2217159 +MD5 (gnome2/gnome-system-monitor-2.26.1.tar.bz2) = 105eaf7f64a19848d5fe94e4cd4e4189 +SHA256 (gnome2/gnome-system-monitor-2.26.1.tar.bz2) = 856c7460cf2462b46ec119a608ce803bcd567dca5939308566089752544d1687 +SIZE (gnome2/gnome-system-monitor-2.26.1.tar.bz2) = 2261345 diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index f77bc953585e..f6bdb12cfbb4 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -71,6 +71,20 @@ share/gnome/help/gnome-system-monitor/de/figures/sortMenu2.png share/gnome/help/gnome-system-monitor/de/figures/systemMonitor.png share/gnome/help/gnome-system-monitor/de/figures/viewMenu.png share/gnome/help/gnome-system-monitor/de/gnome-system-monitor.xml +share/gnome/help/gnome-system-monitor/el/figures/addColumn.png +share/gnome/help/gnome-system-monitor/el/figures/changePriority.png +share/gnome/help/gnome-system-monitor/el/figures/colorPanel.png +share/gnome/help/gnome-system-monitor/el/figures/columnContextMenu.png +share/gnome/help/gnome-system-monitor/el/figures/gnome-system-monitor_window.png +share/gnome/help/gnome-system-monitor/el/figures/memoryMaps.png +share/gnome/help/gnome-system-monitor/el/figures/moreInfo.png +share/gnome/help/gnome-system-monitor/el/figures/processListing.png +share/gnome/help/gnome-system-monitor/el/figures/sortButton.png +share/gnome/help/gnome-system-monitor/el/figures/sortMenu.png +share/gnome/help/gnome-system-monitor/el/figures/sortMenu2.png +share/gnome/help/gnome-system-monitor/el/figures/systemMonitor.png +share/gnome/help/gnome-system-monitor/el/figures/viewMenu.png +share/gnome/help/gnome-system-monitor/el/gnome-system-monitor.xml share/gnome/help/gnome-system-monitor/es/figures/addColumn.png share/gnome/help/gnome-system-monitor/es/figures/changePriority.png share/gnome/help/gnome-system-monitor/es/figures/colorPanel.png @@ -226,6 +240,7 @@ share/omf/gnome-system-monitor/gnome-system-monitor-ar.omf share/omf/gnome-system-monitor/gnome-system-monitor-bg.omf share/omf/gnome-system-monitor/gnome-system-monitor-ca.omf share/omf/gnome-system-monitor/gnome-system-monitor-de.omf +share/omf/gnome-system-monitor/gnome-system-monitor-el.omf share/omf/gnome-system-monitor/gnome-system-monitor-es.omf share/omf/gnome-system-monitor/gnome-system-monitor-fr.omf share/omf/gnome-system-monitor/gnome-system-monitor-oc.omf @@ -246,6 +261,8 @@ share/pixmaps/gnome-system-monitor/upload.svg @dirrm share/gnome/help/gnome-system-monitor/fr @dirrm share/gnome/help/gnome-system-monitor/es/figures @dirrm share/gnome/help/gnome-system-monitor/es +@dirrm share/gnome/help/gnome-system-monitor/el/figures +@dirrm share/gnome/help/gnome-system-monitor/el @dirrm share/gnome/help/gnome-system-monitor/de/figures @dirrm share/gnome/help/gnome-system-monitor/de @dirrm share/gnome/help/gnome-system-monitor/ca/figures diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile index edc2bb3e0a87..b5f6a217800c 100644 --- a/sysutils/pessulus/Makefile +++ b/sysutils/pessulus/Makefile @@ -3,11 +3,11 @@ # Whom: FreeBSD GNOME Team # # $FreeBSD$ -# $MCom: ports/sysutils/pessulus/Makefile,v 1.21 2009/03/17 22:42:37 kwm Exp $ +# $MCom: ports-stable/sysutils/pessulus/Makefile,v 1.1 2009/04/15 21:45:06 kwm Exp $ # PORTNAME= pessulus -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo index abf262cb9b22..7ef05b03f78b 100644 --- a/sysutils/pessulus/distinfo +++ b/sysutils/pessulus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pessulus-2.26.0.tar.bz2) = c7614fec0aa77f1a928080e7633741a0 -SHA256 (gnome2/pessulus-2.26.0.tar.bz2) = 774df341c1898c0f9b58d43708e14016184fdbfc7947288ef62c137208b6a079 -SIZE (gnome2/pessulus-2.26.0.tar.bz2) = 165600 +MD5 (gnome2/pessulus-2.26.1.tar.bz2) = 526e18ccf9fbf19e255910e7710f69b9 +SHA256 (gnome2/pessulus-2.26.1.tar.bz2) = ce159a64b6507a0094b93ceee85354acd3ca1b2946c0b05e6da4e57ec545a024 +SIZE (gnome2/pessulus-2.26.1.tar.bz2) = 166842 diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist index 71afc8f83f36..dc55d6f43d43 100644 --- a/sysutils/pessulus/pkg-plist +++ b/sysutils/pessulus/pkg-plist @@ -107,6 +107,7 @@ share/locale/pt/LC_MESSAGES/pessulus.mo share/locale/pt_BR/LC_MESSAGES/pessulus.mo share/locale/ro/LC_MESSAGES/pessulus.mo share/locale/ru/LC_MESSAGES/pessulus.mo +share/locale/si/LC_MESSAGES/pessulus.mo share/locale/sk/LC_MESSAGES/pessulus.mo share/locale/sl/LC_MESSAGES/pessulus.mo share/locale/sq/LC_MESSAGES/pessulus.mo @@ -134,6 +135,8 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @dirrmtry share/locale/sr@latin +@dirrmtry share/locale/si/LC_MESSAGES +@dirrmtry share/locale/si @dirrmtry share/locale/ps/LC_MESSAGES @dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile index 4a9726c01ecd..52f83ddee53b 100644 --- a/sysutils/system-tools-backends/Makefile +++ b/sysutils/system-tools-backends/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.51 2008/03/09 18:48:33 mezz Exp $ +# $MCom: ports-stable/sysutils/system-tools-backends/Makefile,v 1.1 2009/04/16 08:56:17 kwm Exp $ # PORTNAME= system-tools-backends -PORTVERSION= 2.6.0 -PORTREVISION= 1 +PORTVERSION= 2.6.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -38,4 +37,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp .endif +post-configure: + @${REINPLACE_CMD} -e 's|@GETTEXT_PACKAGE@|system-tools-backends|g' \ + ${WRKSRC}/po/Makefile + .include <bsd.port.post.mk> diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo index 3e804006bda3..43e2f1c0fc1b 100644 --- a/sysutils/system-tools-backends/distinfo +++ b/sysutils/system-tools-backends/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/system-tools-backends-2.6.0.tar.bz2) = faf321012e92b72305878cd684547c54 -SHA256 (gnome2/system-tools-backends-2.6.0.tar.bz2) = 5c35820a7a3d7fc3af5c6e3ce7c7529359809e486fdafecb68601ac4d2bfa6f0 -SIZE (gnome2/system-tools-backends-2.6.0.tar.bz2) = 421806 +MD5 (gnome2/system-tools-backends-2.6.1.tar.bz2) = c82a9d305c3a1bf924bba6b1bced3e86 +SHA256 (gnome2/system-tools-backends-2.6.1.tar.bz2) = 7f56dd08cf5425218b697d5db82e6ce03aff4f7b57f58d3053f0a7af632b3747 +SIZE (gnome2/system-tools-backends-2.6.1.tar.bz2) = 441586 diff --git a/sysutils/system-tools-backends/files/patch-dispatcher_main.c b/sysutils/system-tools-backends/files/patch-dispatcher_main.c index b575cbfd46fa..d21e2c24edf9 100644 --- a/sysutils/system-tools-backends/files/patch-dispatcher_main.c +++ b/sysutils/system-tools-backends/files/patch-dispatcher_main.c @@ -1,11 +1,11 @@ ---- dispatcher/main.c.orig 2007-10-29 20:36:16.890317344 -0400 -+++ dispatcher/main.c 2007-10-29 20:37:02.584773483 -0400 -@@ -47,7 +47,7 @@ - +--- dispatcher/main.c.orig 2009-03-17 02:57:49.000000000 +0100 ++++ dispatcher/main.c 2009-04-16 10:05:33.000000000 +0200 +@@ -48,7 +48,7 @@ daemonize (void) setsid (); -- if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY)) != -1) -+ if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY, 0600)) != -1) + if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", +- O_CREAT | O_WRONLY, ++ O_CREAT | O_WRONLY, 0600, + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) != -1) { str = g_strdup_printf ("%d", getpid ()); - write (pidfile_fd, str, strlen (str)); diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist index c679607233eb..26aca35ca483 100644 --- a/sysutils/system-tools-backends/pkg-plist +++ b/sysutils/system-tools-backends/pkg-plist @@ -14,6 +14,23 @@ share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.TimeConfig.serv share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UserConfig.service share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UsersConfig.service share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.service +share/locale/bg/LC_MESSAGES/system-tools-backends.mo +share/locale/ca/LC_MESSAGES/system-tools-backends.mo +share/locale/da/LC_MESSAGES/system-tools-backends.mo +share/locale/de/LC_MESSAGES/system-tools-backends.mo +share/locale/el/LC_MESSAGES/system-tools-backends.mo +share/locale/es/LC_MESSAGES/system-tools-backends.mo +share/locale/fi/LC_MESSAGES/system-tools-backends.mo +share/locale/fr/LC_MESSAGES/system-tools-backends.mo +share/locale/he/LC_MESSAGES/system-tools-backends.mo +share/locale/hu/LC_MESSAGES/system-tools-backends.mo +share/locale/it/LC_MESSAGES/system-tools-backends.mo +share/locale/pl/LC_MESSAGES/system-tools-backends.mo +share/locale/pt_BR/LC_MESSAGES/system-tools-backends.mo +share/locale/ro/LC_MESSAGES/system-tools-backends.mo +share/locale/sl/LC_MESSAGES/system-tools-backends.mo +share/locale/sv/LC_MESSAGES/system-tools-backends.mo +share/locale/zh_CN/LC_MESSAGES/system-tools-backends.mo share/system-tools-backends-2.0/files/general_gprs_chatscript share/system-tools-backends-2.0/files/general_isdn_ppp_options share/system-tools-backends-2.0/files/general_pppoe_ppp_options @@ -60,3 +77,17 @@ share/system-tools-backends-2.0/scripts/Utils/XML.pm @dirrm share/system-tools-backends-2.0/scripts @dirrm share/system-tools-backends-2.0/files @dirrm share/system-tools-backends-2.0 +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile index 9dbf7f618bae..556e38190467 100644 --- a/textproc/gnome-doc-utils/Makefile +++ b/textproc/gnome-doc-utils/Makefile @@ -3,11 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.64 2009/03/17 17:42:07 kwm Exp $ +# $MCom: ports-stable/textproc/gnome-doc-utils/Makefile,v 1.1 2009/04/16 07:52:40 kwm Exp $ # PORTNAME= gnome-doc-utils -PORTVERSION= 0.16.0 +PORTVERSION= 0.16.1 CATEGORIES= textproc gnome MASTER_SITES= GNOME diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo index be728e4f9952..56c198680c89 100644 --- a/textproc/gnome-doc-utils/distinfo +++ b/textproc/gnome-doc-utils/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome-doc-utils-0.16.0.tar.bz2) = 45971197fd48147ee928462d5b74f234 -SHA256 (gnome-doc-utils-0.16.0.tar.bz2) = 87d2178a7192165f8d3a125f4baf114329c82cf33f3a0317cecf4c3f9e05829e -SIZE (gnome-doc-utils-0.16.0.tar.bz2) = 625895 +MD5 (gnome-doc-utils-0.16.1.tar.bz2) = 85d4bba44773f6162de72e81e8bd0ab0 +SHA256 (gnome-doc-utils-0.16.1.tar.bz2) = 73e0c7f06efcc42b3b3c353dd5d4c19f178119505bcbb554312be6862616e248 +SIZE (gnome-doc-utils-0.16.1.tar.bz2) = 626475 diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 4475410756c1..4138465e0d24 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gtkhtml3/Makefile,v 1.146 2009/03/17 13:10:04 kwm Exp $ +# $MCom: ports-stable/www/gtkhtml3/Makefile,v 1.7 2009/04/15 23:28:43 kwm Exp $ # PORTNAME= gtkhtml3 -PORTVERSION= 3.26.0 +PORTVERSION= 3.26.1.1 CATEGORIES= www gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo index 6b91c93c475e..cfe245bf7ac9 100644 --- a/www/gtkhtml3/distinfo +++ b/www/gtkhtml3/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtkhtml-3.26.0.tar.bz2) = 75d3b6dcd939c2ddcad8aa255ab76f90 -SHA256 (gnome2/gtkhtml-3.26.0.tar.bz2) = 1049b36358f998a2f9748117edf53f4153113084934395c2672d7471d8bd48e4 -SIZE (gnome2/gtkhtml-3.26.0.tar.bz2) = 1472290 +MD5 (gnome2/gtkhtml-3.26.1.1.tar.bz2) = fd5a76c425d3010af38dea5f36d84438 +SHA256 (gnome2/gtkhtml-3.26.1.1.tar.bz2) = 8a53eaf4e040fc93695543b82ca676b02c33b5bfc50ef498ebcaf8305d548e61 +SIZE (gnome2/gtkhtml-3.26.1.1.tar.bz2) = 1499057 diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist index 84f8e7ab0131..3c04f90bda86 100644 --- a/www/gtkhtml3/pkg-plist +++ b/www/gtkhtml3/pkg-plist @@ -87,6 +87,7 @@ share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/mai/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/mg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/mk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ml/LC_MESSAGES/gtkhtml-%%VERSION%%.mo @@ -146,6 +147,8 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index abf357e11ede..861d5ed80f6e 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -3,11 +3,11 @@ # Whom: ade, archie # # $FreeBSD$ -# $MCom: ports/x11-fm/nautilus/Makefile,v 1.177 2009/04/03 09:50:59 kwm Exp $ +# $MCom: ports-stable/x11-fm/nautilus/Makefile,v 1.4 2009/04/15 12:03:35 kwm Exp $ # PORTNAME= nautilus -PORTVERSION= 2.26.1 +PORTVERSION= 2.26.2 CATEGORIES= x11-fm gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo index 63e552518b93..3dbeb848bb99 100644 --- a/x11-fm/nautilus/distinfo +++ b/x11-fm/nautilus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/nautilus-2.26.1.tar.bz2) = 5d75f5de2806e9003e36a4613866b8d1 -SHA256 (gnome2/nautilus-2.26.1.tar.bz2) = 86c8839ad5c8a1c5674eb3617bbe15e9c9bb2358a7435a0e2d22cd25ab7718ff -SIZE (gnome2/nautilus-2.26.1.tar.bz2) = 5925125 +MD5 (gnome2/nautilus-2.26.2.tar.bz2) = 6b9292ed9dde8b5f86a3b6df1422d5f8 +SHA256 (gnome2/nautilus-2.26.2.tar.bz2) = c88a041667acb9085b7874acc6c6997317cc830d25d4d8c4b771e4cc4df15294 +SIZE (gnome2/nautilus-2.26.2.tar.bz2) = 5913284 diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile index d0ccd33b270d..06a46e3b6dbc 100644 --- a/x11-themes/gnome-themes/Makefile +++ b/x11-themes/gnome-themes/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.157 2009/03/18 04:13:56 marcus Exp $ +# $MCom: ports-stable/x11-themes/gnome-themes/Makefile,v 1.3 2009/04/15 22:18:14 kwm Exp $ # PORTNAME= gnome-themes -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= x11-themes gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo index 5a44fa7dd57a..9c218fbae40a 100644 --- a/x11-themes/gnome-themes/distinfo +++ b/x11-themes/gnome-themes/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-themes-2.26.0.tar.bz2) = 3f841154544867585504153d57df1fda -SHA256 (gnome2/gnome-themes-2.26.0.tar.bz2) = 434052b3236d07da0b3b9fec7591917484dbf8fe61dd7113aeaaf58e724b54aa -SIZE (gnome2/gnome-themes-2.26.0.tar.bz2) = 1431670 +MD5 (gnome2/gnome-themes-2.26.1.tar.bz2) = edab6b4f97121f449ab69d8eda373d07 +SHA256 (gnome2/gnome-themes-2.26.1.tar.bz2) = 19580e349178b2df8673ac7f188d60b401f45994b8d8218a20a225905b027336 +SIZE (gnome2/gnome-themes-2.26.1.tar.bz2) = 1458871 diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist index a3cbb80f6f2d..ee279b1f72d6 100644 --- a/x11-themes/gnome-themes/pkg-plist +++ b/x11-themes/gnome-themes/pkg-plist @@ -2262,6 +2262,7 @@ share/locale/is/LC_MESSAGES/gnome-themes.mo share/locale/it/LC_MESSAGES/gnome-themes.mo share/locale/ja/LC_MESSAGES/gnome-themes.mo share/locale/ka/LC_MESSAGES/gnome-themes.mo +share/locale/kn/LC_MESSAGES/gnome-themes.mo share/locale/ko/LC_MESSAGES/gnome-themes.mo share/locale/ku/LC_MESSAGES/gnome-themes.mo share/locale/ky/LC_MESSAGES/gnome-themes.mo diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile index f63c2892915a..176bcc1dff5f 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.74 2009/04/09 03:24:10 mezz Exp $ +# $MCom: ports-stable/x11-themes/gtk-engines2/Makefile,v 1.3 2009/04/15 12:13:33 kwm Exp $ # PORTNAME= gtk-engines2 -PORTVERSION= 2.18.0 +PORTVERSION= 2.18.1 CATEGORIES= x11-themes MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo index e0683a261980..b98c4308bc5f 100644 --- a/x11-themes/gtk-engines2/distinfo +++ b/x11-themes/gtk-engines2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtk-engines-2.18.0.tar.bz2) = 6a7ac01fc9f9429bfb126e068e74eb4f -SHA256 (gnome2/gtk-engines-2.18.0.tar.bz2) = a969c132c69c0d807316561cf08c8a5267fa18993d6f3617fe626586338c077f -SIZE (gnome2/gtk-engines-2.18.0.tar.bz2) = 604860 +MD5 (gnome2/gtk-engines-2.18.1.tar.bz2) = 5dc748cfb0587bb412adc49b666fb6f8 +SHA256 (gnome2/gtk-engines-2.18.1.tar.bz2) = d7e2672fcf80f5c35d481c24e0ab5b7d0f6526dcc3d8821ab76468c1816dc3bc +SIZE (gnome2/gtk-engines-2.18.1.tar.bz2) = 608460 diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist index 3b10b4365a87..c645df1e5e55 100644 --- a/x11-themes/gtk-engines2/pkg-plist +++ b/x11-themes/gtk-engines2/pkg-plist @@ -56,6 +56,7 @@ share/locale/hi/LC_MESSAGES/gtk-engines.mo share/locale/hu/LC_MESSAGES/gtk-engines.mo share/locale/it/LC_MESSAGES/gtk-engines.mo share/locale/ja/LC_MESSAGES/gtk-engines.mo +share/locale/kn/LC_MESSAGES/gtk-engines.mo share/locale/ko/LC_MESSAGES/gtk-engines.mo share/locale/lt/LC_MESSAGES/gtk-engines.mo share/locale/mk/LC_MESSAGES/gtk-engines.mo diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index bad736de1e33..4913259c77da 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.117 2009/03/17 22:51:24 kwm Exp $ +# $MCom: ports-stable/x11-toolkits/libwnck/Makefile,v 1.3 2009/04/15 17:27:23 kwm Exp $ # PORTNAME= libwnck -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo index 4299aded9bbe..9b6856d8f637 100644 --- a/x11-toolkits/libwnck/distinfo +++ b/x11-toolkits/libwnck/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libwnck-2.26.0.tar.bz2) = 73873bf666fc18dff04d66c48400b0c5 -SHA256 (gnome2/libwnck-2.26.0.tar.bz2) = b47a9252da2f5a32e171a8ecfc4fe74a9fa241fdc68a6bc063935573be8939dc -SIZE (gnome2/libwnck-2.26.0.tar.bz2) = 707479 +MD5 (gnome2/libwnck-2.26.1.tar.bz2) = 015b5d2e65d15448fa143513fce03541 +SHA256 (gnome2/libwnck-2.26.1.tar.bz2) = 53737b2bcc520d16d4a83517e2ec6ee52269cec2706a9b4cdb876615c525f430 +SIZE (gnome2/libwnck-2.26.1.tar.bz2) = 711253 diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist index 168881d9e0c3..b614890c5689 100644 --- a/x11-toolkits/libwnck/pkg-plist +++ b/x11-toolkits/libwnck/pkg-plist @@ -28,6 +28,7 @@ share/locale/bn_IN/LC_MESSAGES/libwnck.mo share/locale/bs/LC_MESSAGES/libwnck.mo share/locale/ca/LC_MESSAGES/libwnck.mo share/locale/ca@valencia/LC_MESSAGES/libwnck.mo +share/locale/crh/LC_MESSAGES/libwnck.mo share/locale/cs/LC_MESSAGES/libwnck.mo share/locale/cy/LC_MESSAGES/libwnck.mo share/locale/da/LC_MESSAGES/libwnck.mo @@ -125,6 +126,8 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/crh/LC_MESSAGES +@dirrmtry share/locale/crh @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 6fd6e3c0f364..e237be39311a 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/pango/Makefile,v 1.139 2009/03/27 18:56:24 marcus Exp $ +# $MCom: ports-stable/x11-toolkits/pango/Makefile,v 1.7 2009/04/15 22:25:48 kwm Exp $ # PORTNAME= pango -PORTVERSION= 1.24.0 -PORTREVISION?= 2 +PORTVERSION= 1.24.1 +PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME \ ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index 3ea90a967301..4ffdb13a3b9b 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pango-1.24.0.tar.bz2) = d209f41079833cd2ef2c5e580ab9c5ee -SHA256 (gnome2/pango-1.24.0.tar.bz2) = 7a0af222b8f07defbf492246b7f7ba386025ab504f2ec4abc408d3d6fa4d4b95 -SIZE (gnome2/pango-1.24.0.tar.bz2) = 1520527 +MD5 (gnome2/pango-1.24.1.tar.bz2) = af0beac1dd1825e241c5728081f16acd +SHA256 (gnome2/pango-1.24.1.tar.bz2) = e00c343dd14c23b89a6767f87d31d4246c14739c57c0174008a86b33174b9ab2 +SIZE (gnome2/pango-1.24.1.tar.bz2) = 1526008 diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index 277b44db6328..c2f1723c92a5 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/vte/Makefile,v 1.94 2009/03/16 07:57:41 kwm Exp $ +# $MCom$ # PORTNAME= vte -PORTVERSION= 0.20.0 +PORTVERSION= 0.20.1 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo index f716a7305113..c3b9461711f6 100644 --- a/x11-toolkits/vte/distinfo +++ b/x11-toolkits/vte/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/vte-0.20.0.tar.bz2) = 12dde859bc98e039336baff6e9e6b15b -SHA256 (gnome2/vte-0.20.0.tar.bz2) = 6612c72fe73279a23e296a70e19b3f5dd270c6d16cf0cc6a191475c1a16846f7 -SIZE (gnome2/vte-0.20.0.tar.bz2) = 1089171 +MD5 (gnome2/vte-0.20.1.tar.bz2) = c0fe9038978eaeb70abf16cd7f791752 +SHA256 (gnome2/vte-0.20.1.tar.bz2) = 64a4a05d3072c6c13b47b9d25a58edd7b174c1452540acd6a4dfadcd584ee0ac +SIZE (gnome2/vte-0.20.1.tar.bz2) = 1090308 diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index e3f413599dc6..6166262e3f91 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.148 2009/03/18 04:02:31 marcus Exp $ +# $MCom: ports-stable/x11/gdm/Makefile,v 1.8 2009/04/15 23:39:01 kwm Exp $ # PORTNAME= gdm -PORTVERSION= 2.26.0 -PORTREVISION= 1 +PORTVERSION= 2.26.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index 8cdc2bc522cc..e0eb9e84b26e 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gdm-2.26.0.tar.bz2) = b1a8db2f0e058d3c7b4c9a4600839a14 -SHA256 (gnome2/gdm-2.26.0.tar.bz2) = 34b9e36eaaa004f47b3e67924537cba1bdfe6ae467d8f0d30028ae7e6ef34627 -SIZE (gnome2/gdm-2.26.0.tar.bz2) = 2552457 +MD5 (gnome2/gdm-2.26.1.tar.bz2) = c2c15f8b741962f278fa7e790aaa9a2b +SHA256 (gnome2/gdm-2.26.1.tar.bz2) = 34abc69bdfd1b6bb6d1f64dd1e34652c61310dc69305712d7aeec6203678fa4c +SIZE (gnome2/gdm-2.26.1.tar.bz2) = 2526832 diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in index 2aa2cf3d9969..a8a1a3496a5e 100644 --- a/x11/gdm/files/gdm.in +++ b/x11/gdm/files/gdm.in @@ -1,6 +1,6 @@ #!/bin/sh # $FreeBSD$ -# $MCom: ports/x11/gdm/files/gdm.in,v 1.35 2009/04/09 03:24:09 mezz Exp $ +# $MCom$ # PROVIDE: gdm # REQUIRE: LOGIN cleanvar moused syscons dbus hald diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in index ea630b7b1350..014d6c8151e9 100644 --- a/x11/gdm/files/gdm.pam.in +++ b/x11/gdm/files/gdm.pam.in @@ -1,5 +1,6 @@ # # $FreeBSD$ +# $MCom$ # # PAM configuration for the "gdm" service # diff --git a/x11/gdm/files/patch-daemon_gdm-display-access-file.c b/x11/gdm/files/patch-daemon_gdm-display-access-file.c new file mode 100644 index 000000000000..0f54784eca16 --- /dev/null +++ b/x11/gdm/files/patch-daemon_gdm-display-access-file.c @@ -0,0 +1,12 @@ +--- daemon/gdm-display-access-file.c.orig 2009-04-16 01:32:41.000000000 +0200 ++++ daemon/gdm-display-access-file.c 2009-04-16 01:33:17.000000000 +0200 +@@ -41,6 +41,9 @@ + #include "gdm-display-access-file.h" + #include "gdm-common.h" + ++/* OpenBSD defines 255, glibc defines 64. */ ++#define HOST_NAME_MAX 64 ++ + struct _GdmDisplayAccessFilePrivate + { + char *username; diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index e615a286de74..4606065a4b82 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-applets/Makefile,v 1.197 2009/03/17 13:00:26 kwm Exp $ +# $MCom: ports-stable/x11/gnome-applets/Makefile,v 1.1 2009/04/13 13:21:01 kwm Exp $ # PORTNAME= gnome-applets -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index 62fe9e66ee2e..e2ccd424fd44 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-applets-2.26.0.tar.bz2) = eed64366b0a1f4032506ac7221ce898a -SHA256 (gnome2/gnome-applets-2.26.0.tar.bz2) = fec614c75bf26daab73489eae26021f358cfe371f0b70ea1d1ad32a5d6e1761e -SIZE (gnome2/gnome-applets-2.26.0.tar.bz2) = 8602310 +MD5 (gnome2/gnome-applets-2.26.1.tar.bz2) = ef6c44bba892d28b46cf19fcb2e71d61 +SHA256 (gnome2/gnome-applets-2.26.1.tar.bz2) = 87a2262dd777a31dafda23d91da42f7b17e542dea51b5597ecada4fa74793a07 +SIZE (gnome2/gnome-applets-2.26.1.tar.bz2) = 8786596 diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index 2a93c03d1c47..2397598500a5 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -427,6 +427,11 @@ share/gnome/help/char-palette/de/figures/charpalette_applet.png share/gnome/help/char-palette/de/figures/charpalette_chargroup.png share/gnome/help/char-palette/de/figures/charpick-preferences.png share/gnome/help/char-palette/de/figures/charpick_characters.png +share/gnome/help/char-palette/el/char-palette.xml +share/gnome/help/char-palette/el/figures/charpalette_applet.png +share/gnome/help/char-palette/el/figures/charpalette_chargroup.png +share/gnome/help/char-palette/el/figures/charpick_characters.png +share/gnome/help/char-palette/el/figures/charpick-preferences.png share/gnome/help/char-palette/en_GB/char-palette.xml share/gnome/help/char-palette/en_GB/figures/charpalette_applet.png share/gnome/help/char-palette/en_GB/figures/charpalette_chargroup.png @@ -442,7 +447,6 @@ share/gnome/help/char-palette/eu/figures/charpalette_applet.png share/gnome/help/char-palette/eu/figures/charpalette_chargroup.png share/gnome/help/char-palette/eu/figures/charpick-preferences.png share/gnome/help/char-palette/eu/figures/charpick_characters.png -share/gnome/help/cpufreq-applet/eu/cpufreq-applet.xml share/gnome/help/char-palette/fi/char-palette.xml share/gnome/help/char-palette/fi/figures/charpalette_applet.png share/gnome/help/char-palette/fi/figures/charpalette_chargroup.png @@ -573,6 +577,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-applet-selector.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/el/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/el/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/el/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/el/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/el/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/el/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/el/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/el/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/el/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/el/figures/cpufreq-applet.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-25.png @@ -593,6 +607,7 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/eu/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/eu/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/eu/figures/cpufreq-25.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/eu/figures/cpufreq-50.png @@ -705,6 +720,12 @@ share/gnome/help/drivemount/de/figures/drivemount-applet_example.png share/gnome/help/drivemount/de/figures/drivemount-applet_mount.png share/gnome/help/drivemount/de/figures/drivemount-applet_open.png share/gnome/help/drivemount/de/figures/drivemount-applet_status.png +share/gnome/help/drivemount/el/drivemount.xml +share/gnome/help/drivemount/el/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/el/figures/drivemount-applet_example.png +share/gnome/help/drivemount/el/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/el/figures/drivemount-applet_open.png +share/gnome/help/drivemount/el/figures/drivemount-applet_status.png share/gnome/help/drivemount/en_GB/drivemount.xml share/gnome/help/drivemount/en_GB/figures/drivemount-applet_eject.png share/gnome/help/drivemount/en_GB/figures/drivemount-applet_example.png @@ -796,6 +817,8 @@ share/gnome/help/geyes/da/figures/geyes_applet.png share/gnome/help/geyes/da/geyes.xml share/gnome/help/geyes/de/figures/geyes_applet.png share/gnome/help/geyes/de/geyes.xml +share/gnome/help/geyes/el/figures/geyes_applet.png +share/gnome/help/geyes/el/geyes.xml share/gnome/help/geyes/en_GB/figures/geyes_applet.png share/gnome/help/geyes/en_GB/geyes.xml share/gnome/help/geyes/es/figures/geyes_applet.png @@ -833,6 +856,7 @@ share/gnome/help/gswitchit/oc/gswitchit.xml share/gnome/help/gswitchit/ru/gswitchit.xml share/gnome/help/gswitchit/sv/gswitchit.xml share/gnome/help/gswitchit/uk/gswitchit.xml +share/gnome/help/gswitchit/zh_CN/gswitchit.xml share/gnome/help/gweather/C/figures/gweather-details.png share/gnome/help/gweather/C/figures/gweather-menu-prefs.png share/gnome/help/gweather/C/figures/gweather-prefs-general.png @@ -864,6 +888,21 @@ share/gnome/help/gweather/de/figures/stock_weather-snow.png share/gnome/help/gweather/de/figures/stock_weather-storm.png share/gnome/help/gweather/de/figures/stock_weather-sunny.png share/gnome/help/gweather/de/gweather.xml +share/gnome/help/gweather/el/figures/gweather-details.png +share/gnome/help/gweather/el/figures/gweather-menu-prefs.png +share/gnome/help/gweather/el/figures/gweather-prefs-general.png +share/gnome/help/gweather/el/figures/gweather-prefs-locations.png +share/gnome/help/gweather/el/figures/gweather_applet.png +share/gnome/help/gweather/el/figures/stock_weather-cloudy.png +share/gnome/help/gweather/el/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/el/figures/stock_weather-fog.png +share/gnome/help/gweather/el/figures/stock_weather-night-clear.png +share/gnome/help/gweather/el/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/el/figures/stock_weather-showers.png +share/gnome/help/gweather/el/figures/stock_weather-snow.png +share/gnome/help/gweather/el/figures/stock_weather-storm.png +share/gnome/help/gweather/el/figures/stock_weather-sunny.png +share/gnome/help/gweather/el/gweather.xml share/gnome/help/gweather/en_GB/figures/gweather-details.png share/gnome/help/gweather/en_GB/figures/gweather-menu-prefs.png share/gnome/help/gweather/en_GB/figures/gweather-prefs-general.png @@ -1081,6 +1120,7 @@ share/gnome/help/gweather/zh_CN/gweather.xml %%PYTHON%%share/gnome/help/invest-applet/el/invest-applet.xml %%PYTHON%%share/gnome/help/invest-applet/es/invest-applet.xml %%PYTHON%%share/gnome/help/invest-applet/fi/invest-applet.xml +%%PYTHON%%share/gnome/help/invest-applet/ru/invest-applet.xml %%PYTHON%%share/gnome/help/invest-applet/sv/invest-applet.xml share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/C/legal.xml @@ -1134,6 +1174,10 @@ share/gnome/help/multiload/de/figures/multiload-preferences.png share/gnome/help/multiload/de/figures/system-monitor-applet_window.png share/gnome/help/multiload/de/figures/system_monitor.png share/gnome/help/multiload/de/multiload.xml +share/gnome/help/multiload/el/figures/multiload-preferences.png +share/gnome/help/multiload/el/figures/system-monitor-applet_window.png +share/gnome/help/multiload/el/figures/system_monitor.png +share/gnome/help/multiload/el/multiload.xml share/gnome/help/multiload/en_GB/figures/multiload-preferences.png share/gnome/help/multiload/en_GB/figures/system-monitor-applet_window.png share/gnome/help/multiload/en_GB/figures/system_monitor.png @@ -1320,6 +1364,8 @@ share/gnome/help/trashapplet/sv/figures/trash-applet.png share/gnome/help/trashapplet/sv/trashapplet.xml share/gnome/help/trashapplet/uk/figures/trash-applet.png share/gnome/help/trashapplet/uk/trashapplet.xml +share/gnome/help/trashapplet/zh_CN/figures/trash-applet.png +share/gnome/help/trashapplet/zh_CN/trashapplet.xml %%CPUFREQ%%share/icons/hicolor/16x16/apps/gnome-cpu-frequency-applet.png share/icons/hicolor/16x16/apps/gnome-eyes-applet.png share/icons/hicolor/16x16/apps/gnome-sticky-notes-applet.png @@ -1354,6 +1400,7 @@ share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bn_IN/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bs/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/crh/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo share/locale/da/LC_MESSAGES/gnome-applets-2.0.mo @@ -1479,6 +1526,7 @@ share/omf/char-palette/char-palette-C.omf share/omf/char-palette/char-palette-bg.omf share/omf/char-palette/char-palette-ca.omf share/omf/char-palette/char-palette-de.omf +share/omf/char-palette/char-palette-el.omf share/omf/char-palette/char-palette-en_GB.omf share/omf/char-palette/char-palette-es.omf share/omf/char-palette/char-palette-eu.omf @@ -1507,6 +1555,7 @@ share/omf/char-palette/char-palette-uk.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-C.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-ca.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-de.omf +%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-el.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-en_GB.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-es.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-eu.omf @@ -1521,6 +1570,7 @@ share/omf/char-palette/char-palette-uk.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-zh_CN.omf share/omf/drivemount/drivemount-C.omf share/omf/drivemount/drivemount-de.omf +share/omf/drivemount/drivemount-el.omf share/omf/drivemount/drivemount-en_GB.omf share/omf/drivemount/drivemount-es.omf share/omf/drivemount/drivemount-eu.omf @@ -1540,6 +1590,7 @@ share/omf/geyes/geyes-ca.omf share/omf/geyes/geyes-cs.omf share/omf/geyes/geyes-da.omf share/omf/geyes/geyes-de.omf +share/omf/geyes/geyes-el.omf share/omf/geyes/geyes-en_GB.omf share/omf/geyes/geyes-es.omf share/omf/geyes/geyes-eu.omf @@ -1565,8 +1616,10 @@ share/omf/gswitchit/gswitchit-oc.omf share/omf/gswitchit/gswitchit-ru.omf share/omf/gswitchit/gswitchit-sv.omf share/omf/gswitchit/gswitchit-uk.omf +share/omf/gswitchit/gswitchit-zh_CN.omf share/omf/gweather/gweather-C.omf share/omf/gweather/gweather-de.omf +share/omf/gweather/gweather-el.omf share/omf/gweather/gweather-en_GB.omf share/omf/gweather/gweather-es.omf share/omf/gweather/gweather-eu.omf @@ -1587,6 +1640,7 @@ share/omf/gweather/gweather-zh_CN.omf %%PYTHON%%share/omf/invest-applet/invest-applet-el.omf %%PYTHON%%share/omf/invest-applet/invest-applet-es.omf %%PYTHON%%share/omf/invest-applet/invest-applet-fi.omf +%%PYTHON%%share/omf/invest-applet/invest-applet-ru.omf %%PYTHON%%share/omf/invest-applet/invest-applet-sv.omf share/omf/mixer_applet2/mixer_applet2-C.omf share/omf/mixer_applet2/mixer_applet2-ca.omf @@ -1610,6 +1664,7 @@ share/omf/mixer_applet2/mixer_applet2-uk.omf share/omf/multiload/multiload-C.omf share/omf/multiload/multiload-ca.omf share/omf/multiload/multiload-de.omf +share/omf/multiload/multiload-el.omf share/omf/multiload/multiload-en_GB.omf share/omf/multiload/multiload-es.omf share/omf/multiload/multiload-eu.omf @@ -1658,6 +1713,7 @@ share/omf/trashapplet/trashapplet-pt_BR.omf share/omf/trashapplet/trashapplet-ru.omf share/omf/trashapplet/trashapplet-sv.omf share/omf/trashapplet/trashapplet-uk.omf +share/omf/trashapplet/trashapplet-zh_CN.omf share/pixmaps/accessx-status-applet/ax-applet.png share/pixmaps/accessx-status-applet/ax-bouncekeys.png share/pixmaps/accessx-status-applet/ax-key-base.png @@ -1807,6 +1863,8 @@ share/xmodmap/xmodmap.yu @dirrm share/omf/char-palette %%BATTERY%%@dirrm share/omf/battstat @dirrm share/omf/accessx-status +@dirrm share/gnome/help/trashapplet/zh_CN/figures +@dirrm share/gnome/help/trashapplet/zh_CN @dirrm share/gnome/help/trashapplet/uk/figures @dirrm share/gnome/help/trashapplet/uk @dirrm share/gnome/help/trashapplet/sv/figures @@ -1905,6 +1963,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/multiload/es @dirrm share/gnome/help/multiload/en_GB/figures @dirrm share/gnome/help/multiload/en_GB +@dirrm share/gnome/help/multiload/el/figures +@dirrm share/gnome/help/multiload/el @dirrm share/gnome/help/multiload/de/figures @dirrm share/gnome/help/multiload/de @dirrm share/gnome/help/multiload/ca/figures @@ -1952,6 +2012,7 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/mixer_applet2/C @dirrm share/gnome/help/mixer_applet2 %%PYTHON%%@dirrm share/gnome/help/invest-applet/sv +%%PYTHON%%@dirrm share/gnome/help/invest-applet/ru %%PYTHON%%@dirrm share/gnome/help/invest-applet/fi %%PYTHON%%@dirrm share/gnome/help/invest-applet/es %%PYTHON%%@dirrm share/gnome/help/invest-applet/el @@ -1987,11 +2048,14 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/gweather/es @dirrm share/gnome/help/gweather/en_GB/figures @dirrm share/gnome/help/gweather/en_GB +@dirrm share/gnome/help/gweather/el/figures +@dirrm share/gnome/help/gweather/el @dirrm share/gnome/help/gweather/de/figures @dirrm share/gnome/help/gweather/de @dirrm share/gnome/help/gweather/C/figures @dirrm share/gnome/help/gweather/C @dirrm share/gnome/help/gweather +@dirrm share/gnome/help/gswitchit/zh_CN @dirrm share/gnome/help/gswitchit/uk @dirrm share/gnome/help/gswitchit/sv @dirrm share/gnome/help/gswitchit/ru @@ -2029,6 +2093,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/geyes/es @dirrm share/gnome/help/geyes/en_GB/figures @dirrm share/gnome/help/geyes/en_GB +@dirrm share/gnome/help/geyes/el/figures +@dirrm share/gnome/help/geyes/el @dirrm share/gnome/help/geyes/de/figures @dirrm share/gnome/help/geyes/de @dirrm share/gnome/help/geyes/da/figures @@ -2068,6 +2134,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/drivemount/es @dirrm share/gnome/help/drivemount/en_GB/figures @dirrm share/gnome/help/drivemount/en_GB +@dirrm share/gnome/help/drivemount/el/figures +@dirrm share/gnome/help/drivemount/el @dirrm share/gnome/help/drivemount/de/figures @dirrm share/gnome/help/drivemount/de @dirrm share/gnome/help/drivemount/C/figures @@ -2097,6 +2165,8 @@ share/xmodmap/xmodmap.yu %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/el/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/el %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/de/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/de %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ca/figures @@ -2155,6 +2225,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/char-palette/es @dirrm share/gnome/help/char-palette/en_GB/figures @dirrm share/gnome/help/char-palette/en_GB +@dirrm share/gnome/help/char-palette/el/figures +@dirrm share/gnome/help/char-palette/el @dirrm share/gnome/help/char-palette/de/figures @dirrm share/gnome/help/char-palette/de @dirrm share/gnome/help/char-palette/ca/figures diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index e75c0a5c1839..50dc4c3cdeb7 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-desktop/Makefile,v 1.158 2009/03/17 23:02:03 kwm Exp $ +# $MCom: ports-stable/x11/gnome-desktop/Makefile,v 1.3 2009/04/15 21:55:48 kwm Exp $ # PORTNAME= gnome-desktop -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index 23ed78cda401..0c74d96d486b 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-desktop-2.26.0.tar.bz2) = 796fc830e0baff24381809a7abe012f8 -SHA256 (gnome2/gnome-desktop-2.26.0.tar.bz2) = 3b3fe18bc30ad60f1bbbb2bc2d2ec14a2f9babb9312eb4834395b5839b7d7ee9 -SIZE (gnome2/gnome-desktop-2.26.0.tar.bz2) = 3186127 +MD5 (gnome2/gnome-desktop-2.26.1.tar.bz2) = 96f2a033b2db2da1cd8d3d21fef61c4d +SHA256 (gnome2/gnome-desktop-2.26.1.tar.bz2) = a0341c77360dbb23fbad61987ce9f78f9bfc11ac12e48f60cb049359b4b76d7d +SIZE (gnome2/gnome-desktop-2.26.1.tar.bz2) = 3228329 diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index 778cfb503f38..8ca0561a54b6 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -43,6 +43,7 @@ share/gnome/help/gpl/ar/gpl.xml share/gnome/help/gpl/ca/gpl.xml share/gnome/help/gpl/cs/gpl.xml share/gnome/help/gpl/de/gpl.xml +share/gnome/help/gpl/el/gpl.xml share/gnome/help/gpl/es/gpl.xml share/gnome/help/gpl/eu/gpl.xml share/gnome/help/gpl/fi/gpl.xml @@ -58,6 +59,7 @@ share/gnome/help/gpl/zh_CN/gpl.xml share/gnome/help/lgpl/C/lgpl.xml share/gnome/help/lgpl/ar/lgpl.xml share/gnome/help/lgpl/de/lgpl.xml +share/gnome/help/lgpl/el/lgpl.xml share/gnome/help/lgpl/es/lgpl.xml share/gnome/help/lgpl/eu/lgpl.xml share/gnome/help/lgpl/fi/lgpl.xml @@ -189,6 +191,7 @@ share/omf/gpl/gpl-ar.omf share/omf/gpl/gpl-ca.omf share/omf/gpl/gpl-cs.omf share/omf/gpl/gpl-de.omf +share/omf/gpl/gpl-el.omf share/omf/gpl/gpl-es.omf share/omf/gpl/gpl-eu.omf share/omf/gpl/gpl-fi.omf @@ -204,6 +207,7 @@ share/omf/gpl/gpl-zh_CN.omf share/omf/lgpl/lgpl-C.omf share/omf/lgpl/lgpl-ar.omf share/omf/lgpl/lgpl-de.omf +share/omf/lgpl/lgpl-el.omf share/omf/lgpl/lgpl-es.omf share/omf/lgpl/lgpl-eu.omf share/omf/lgpl/lgpl-fi.omf @@ -303,6 +307,7 @@ share/pixmaps/vnterm.xpm @dirrm share/gnome/help/lgpl/fi @dirrm share/gnome/help/lgpl/eu @dirrm share/gnome/help/lgpl/es +@dirrm share/gnome/help/lgpl/el @dirrm share/gnome/help/lgpl/de @dirrm share/gnome/help/lgpl/ar @dirrm share/gnome/help/gpl/zh_CN @@ -317,6 +322,7 @@ share/pixmaps/vnterm.xpm @dirrm share/gnome/help/gpl/fi @dirrm share/gnome/help/gpl/eu @dirrm share/gnome/help/gpl/es +@dirrm share/gnome/help/gpl/el @dirrm share/gnome/help/gpl/de @dirrm share/gnome/help/gpl/cs @dirrm share/gnome/help/gpl/ca diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index bc8a9fc65565..8f3eebd51ccc 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-menus/Makefile,v 1.92 2009/03/17 22:49:00 kwm Exp $ +# $MCom: ports-stable/x11/gnome-menus/Makefile,v 1.7 2009/04/15 17:32:15 kwm Exp $ # PORTNAME= gnome-menus -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo index 565c10d6f128..05b6d5ac36dc 100644 --- a/x11/gnome-menus/distinfo +++ b/x11/gnome-menus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-menus-2.26.0.tar.bz2) = 55fd07e67d8334de2e03e4e23c011452 -SHA256 (gnome2/gnome-menus-2.26.0.tar.bz2) = 84a97b6d74b14e27888a0f54759e570cb701400c5b176471871bc08a6acafb15 -SIZE (gnome2/gnome-menus-2.26.0.tar.bz2) = 460779 +MD5 (gnome2/gnome-menus-2.26.1.tar.bz2) = c5100879f6ff9750d4bc7e553671ad93 +SHA256 (gnome2/gnome-menus-2.26.1.tar.bz2) = 2a5696f6673aef57a87bb32e36c51a1a940ca701f6222c864b428b356bfe84e4 +SIZE (gnome2/gnome-menus-2.26.1.tar.bz2) = 460916 diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 6b28ff3f50a8..f106288e99c8 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-panel/Makefile,v 1.199 2009/03/17 23:22:06 kwm Exp $ +# $MCom: ports-stable/x11/gnome-panel/Makefile,v 1.3 2009/04/16 08:01:26 kwm Exp $ # PORTNAME= gnome-panel -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index 3b6a87d5285e..4d1b450ac981 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-panel-2.26.0.tar.bz2) = 27965de9b12952b22b7e232af6acb0de -SHA256 (gnome2/gnome-panel-2.26.0.tar.bz2) = e8e21b008d4afcebfc3241d0f91dd2dcc0b171b16f5675fc1b7ed699e79b56f3 -SIZE (gnome2/gnome-panel-2.26.0.tar.bz2) = 3421179 +MD5 (gnome2/gnome-panel-2.26.1.tar.bz2) = af5587b38fc8b05aeeab3e834aa6e548 +SHA256 (gnome2/gnome-panel-2.26.1.tar.bz2) = 4e3b653d274c5150c5165eee84ec5cd6c0f0425407316ae01c6c166a13f320b2 +SIZE (gnome2/gnome-panel-2.26.1.tar.bz2) = 3424402 diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index 9c17f80b1cc3..f83800966c38 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -197,6 +197,9 @@ share/gnome/help/fish/th/legal.xml share/gnome/help/fish/uk/figures/fish_applet.png share/gnome/help/fish/uk/fish.xml share/gnome/help/fish/uk/legal.xml +share/gnome/help/fish/zh_CN/figures/fish_applet.png +share/gnome/help/fish/zh_CN/fish.xml +share/gnome/help/fish/zh_CN/legal.xml share/gnome/help/window-list/C/window-list.xml share/gnome/help/window-list/ar/window-list.xml share/gnome/help/window-list/ca/window-list.xml @@ -460,6 +463,7 @@ share/omf/fish/fish-ru.omf share/omf/fish/fish-sv.omf share/omf/fish/fish-th.omf share/omf/fish/fish-uk.omf +share/omf/fish/fish-zh_CN.omf share/omf/gnome-panel/fish-applet-2-ja.omf share/omf/gnome-panel/fish-applet-2-zh_CN.omf share/omf/gnome-panel/fish-applet-2-zh_TW.omf @@ -572,6 +576,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf @dirrm share/gnome/help/window-list/ar @dirrm share/gnome/help/window-list/C @dirrm share/gnome/help/window-list +@dirrm share/gnome/help/fish/zh_CN/figures +@dirrm share/gnome/help/fish/zh_CN @dirrm share/gnome/help/fish/uk/figures @dirrm share/gnome/help/fish/uk @dirrm share/gnome/help/fish/th/figures diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index f405f4aa5db6..5e25497172f4 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.106 2009/03/18 20:43:54 marcus Exp $ +# $MCom: ports-stable/x11/gnome-screensaver/Makefile,v 1.1 2009/04/16 01:20:04 kwm Exp $ # PORTNAME= gnome-screensaver -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo index 8bd268f47938..eae52a2b7277 100644 --- a/x11/gnome-screensaver/distinfo +++ b/x11/gnome-screensaver/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-screensaver-2.26.0.tar.bz2) = f9c5144defc80991b18c653c029001d6 -SHA256 (gnome2/gnome-screensaver-2.26.0.tar.bz2) = cb2fb89feaed0706291278d386839c0b5a850eba58ad989942eff0fc806646b6 -SIZE (gnome2/gnome-screensaver-2.26.0.tar.bz2) = 2044980 +MD5 (gnome2/gnome-screensaver-2.26.1.tar.bz2) = 13b9066bb2dfe9face50b3d852b67ded +SHA256 (gnome2/gnome-screensaver-2.26.1.tar.bz2) = 14b68dc59646b5a53487c311d770ccc8458581480c201faf003349119d340830 +SIZE (gnome2/gnome-screensaver-2.26.1.tar.bz2) = 2031739 diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist index 97557b557a12..9532b59e5f49 100644 --- a/x11/gnome-screensaver/pkg-plist +++ b/x11/gnome-screensaver/pkg-plist @@ -26,6 +26,7 @@ share/locale/bg/LC_MESSAGES/gnome-screensaver.mo share/locale/bn/LC_MESSAGES/gnome-screensaver.mo share/locale/bn_IN/LC_MESSAGES/gnome-screensaver.mo share/locale/ca/LC_MESSAGES/gnome-screensaver.mo +share/locale/crh/LC_MESSAGES/gnome-screensaver.mo share/locale/cs/LC_MESSAGES/gnome-screensaver.mo share/locale/cy/LC_MESSAGES/gnome-screensaver.mo share/locale/da/LC_MESSAGES/gnome-screensaver.mo @@ -126,6 +127,8 @@ share/pixmaps/gnome-logo-white.svg @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/crh/LC_MESSAGES +@dirrmtry share/locale/crh @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 4e349abf1d5d..4c2e59ae41a9 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-session/Makefile,v 1.169 2009/03/17 22:56:03 kwm Exp $ +# $MCom: ports-stable/x11/gnome-session/Makefile,v 1.3 2009/04/16 01:54:40 kwm Exp $ # PORTNAME= gnome-session -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME \ http://www.marcuscom.com/downloads/:local @@ -39,9 +39,8 @@ CONFIGURE_ARGS= --disable-docbook-docs CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -MAN1= gnome-session.1 gnome-wm.1 session-properties.1 \ +MAN1= gnome-session.1 gnome-wm.1 gnome-session-properties.1 \ gnome-session-save.1 -MAN5= default.session.5 GCONF_SCHEMAS= gnome-session.schemas SPLASHES= freebsd-splashes-gnome-2.18_1.tar diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index ec640615bbf0..05d44f5bc1da 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,6 +1,6 @@ -MD5 (gnome2/gnome-session-2.26.0.tar.bz2) = e17dbce7446b3e42fac2b1cea7dedffd -SHA256 (gnome2/gnome-session-2.26.0.tar.bz2) = 0a161c419718b83e18200fe51e7e5f827b9b72a5ef055782c8c896c550a7881b -SIZE (gnome2/gnome-session-2.26.0.tar.bz2) = 829541 +MD5 (gnome2/gnome-session-2.26.1.tar.bz2) = aa280939a3e07209081095e8e10fe619 +SHA256 (gnome2/gnome-session-2.26.1.tar.bz2) = 35e304ec42ed69a2b98377fd7cfac19fa00ca53bb5d6307094ebf077c00dbc32 +SIZE (gnome2/gnome-session-2.26.1.tar.bz2) = 835266 MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5 SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508 SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720 diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index 3105abf40848..40fd84898d2c 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-terminal/Makefile,v 1.116 2009/03/16 07:48:29 kwm Exp $ +# $MCom: ports-stable/x11/gnome-terminal/Makefile,v 1.3 2009/04/15 14:55:27 kwm Exp $ # PORTNAME= gnome-terminal -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index 7991565065b4..ec408d727375 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-terminal-2.26.0.tar.bz2) = 013e51a2c4dd7dde5db49587952065ae -SHA256 (gnome2/gnome-terminal-2.26.0.tar.bz2) = ea99c8eba63d348514cc0042f0f3c7df3e03498aa316a9458bed1cd2f0efb6ce -SIZE (gnome2/gnome-terminal-2.26.0.tar.bz2) = 1969827 +MD5 (gnome2/gnome-terminal-2.26.1.tar.bz2) = 49acf3da4c820249b763d636f27e3a46 +SHA256 (gnome2/gnome-terminal-2.26.1.tar.bz2) = e102f4a602699851dd37d7d58fea698a024cf1d680262ab3f0df612a809a3971 +SIZE (gnome2/gnome-terminal-2.26.1.tar.bz2) = 2027751 diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index 8db648f547e4..83bb026bad34 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -28,6 +28,12 @@ share/gnome/help/gnome-terminal/da/gnome-terminal.xml share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/de/gnome-terminal.xml +share/gnome/help/gnome-terminal/el/figures/gnome-terminal-default.png +share/gnome/help/gnome-terminal/el/figures/gnome-terminal-tabbed.png +share/gnome/help/gnome-terminal/el/gnome-terminal.xml +share/gnome/help/gnome-terminal/en_GB/figures/gnome-terminal-default.png +share/gnome/help/gnome-terminal/en_GB/figures/gnome-terminal-tabbed.png +share/gnome/help/gnome-terminal/en_GB/gnome-terminal.xml share/gnome/help/gnome-terminal/es/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/es/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/es/gnome-terminal.xml @@ -157,6 +163,8 @@ share/omf/gnome-terminal/gnome-terminal-ca.omf share/omf/gnome-terminal/gnome-terminal-cs.omf share/omf/gnome-terminal/gnome-terminal-da.omf share/omf/gnome-terminal/gnome-terminal-de.omf +share/omf/gnome-terminal/gnome-terminal-el.omf +share/omf/gnome-terminal/gnome-terminal-en_GB.omf share/omf/gnome-terminal/gnome-terminal-es.omf share/omf/gnome-terminal/gnome-terminal-fr.omf share/omf/gnome-terminal/gnome-terminal-it.omf @@ -197,6 +205,10 @@ share/omf/gnome-terminal/gnome-terminal-zh_TW.omf @dirrm share/gnome/help/gnome-terminal/fr @dirrm share/gnome/help/gnome-terminal/es/figures @dirrm share/gnome/help/gnome-terminal/es +@dirrm share/gnome/help/gnome-terminal/en_GB/figures +@dirrm share/gnome/help/gnome-terminal/en_GB +@dirrm share/gnome/help/gnome-terminal/el/figures +@dirrm share/gnome/help/gnome-terminal/el @dirrm share/gnome/help/gnome-terminal/de/figures @dirrm share/gnome/help/gnome-terminal/de @dirrm share/gnome/help/gnome-terminal/da/figures diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index 682a0f55291f..a7fa16df4908 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2/Makefile,v 1.264 2009/03/18 20:45:35 marcus Exp $ +# $MCom: ports-stable/x11/gnome2/Makefile,v 1.7 2009/04/16 10:56:46 kwm Exp $ # PORTNAME= gnome2 -PORTVERSION= 2.26.0 +PORTVERSION= 2.26.1 PORTREVISION?= 0 CATEGORIES?= x11 gnome MASTER_SITES= # empty |