Presenting GNOME 2.26.1 for FreeBSD.

Approved by:	portmgr (marcus)

23 files changed, 194 insertions, 79 deletions

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