7 files changed, 105 insertions, 15 deletions

diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 775db55c2a9f..dc257b3bc725 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.130 2008/10/20 22:42:42 kwm Exp $
+#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.135 2009/03/21 21:35:37 marcus Exp $
 #
 
 PORTNAME=	gnome-utils
-PORTVERSION=	2.24.1
+PORTVERSION=	2.26.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
@@ -34,6 +35,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=		gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 \
 		baobab.1
 GCONF_SCHEMAS=	gnome-dictionary.schemas gnome-screenshot.schemas \
-		gnome-search-tool.schemas logview.schemas baobab.schemas
+		gnome-search-tool.schemas baobab.schemas \
+		gnome-system-log.schemas
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index a1a9ef57a8ac..032b1ebd5678 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-utils-2.24.1.tar.bz2) = 232937a4bf5c9ebb1bbc86793871d843
-SHA256 (gnome2/gnome-utils-2.24.1.tar.bz2) = 6b7e29feaa25d5e85fa55a00775e7b3296725ef98b455b8b1d810cf379cfdd00
-SIZE (gnome2/gnome-utils-2.24.1.tar.bz2) = 6410784
+MD5 (gnome2/gnome-utils-2.26.0.tar.bz2) = 667400cfb9bee954028024ac3cf91a09
+SHA256 (gnome2/gnome-utils-2.26.0.tar.bz2) = 8407acc4f1839d86157d4eb19406cb8c0762729af8d0ddcc288844ffc9ecb120
+SIZE (gnome2/gnome-utils-2.26.0.tar.bz2) = 6882359
diff --git a/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c
index 9d1ee8c9c55c..f29974a81f2c 100644
--- a/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c
+++ b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c
@@ -1,9 +1,9 @@
---- gsearchtool/gsearchtool-support.c.orig	Thu Jan  5 23:26:25 2006
-+++ gsearchtool/gsearchtool-support.c	Thu Jan  5 23:27:04 2006
-@@ -31,6 +31,7 @@
- 
+--- gsearchtool/gsearchtool-support.c.orig	2008-12-19 16:53:22.000000000 -0500
++++ gsearchtool/gsearchtool-support.c	2009-02-27 17:30:06.000000000 -0500
+@@ -32,6 +32,7 @@
+ #include <string.h>
  #include <glib/gi18n.h>
- #include <glib/gdate.h>
+ #include <glib.h>
 +#include <sys/types.h>
  #include <regex.h>
  #include <gdk/gdkx.h>
diff --git a/deskutils/gnome-utils/files/patch-logview_gtkmessagearea.c b/deskutils/gnome-utils/files/patch-logview_gtkmessagearea.c
new file mode 100644
index 000000000000..2388e3449431
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_gtkmessagearea.c
@@ -0,0 +1,11 @@
+--- logview/gtkmessagearea.c.orig	2009-03-21 17:23:53.000000000 -0400
++++ logview/gtkmessagearea.c	2009-03-21 17:24:08.000000000 -0400
+@@ -33,6 +33,8 @@
+ 
+ #include "gtkmessagearea.h"
+ 
++#include <stdlib.h>
++
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
diff --git a/deskutils/gnome-utils/files/patch-logview_logview-manager.c b/deskutils/gnome-utils/files/patch-logview_logview-manager.c
new file mode 100644
index 000000000000..00ec357ef46e
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_logview-manager.c
@@ -0,0 +1,10 @@
+--- logview/logview-manager.c.orig	2009-03-21 17:25:27.000000000 -0400
++++ logview/logview-manager.c	2009-03-21 17:25:37.000000000 -0400
+@@ -25,6 +25,7 @@
+ 
+ #include <glib/gi18n.h>
+ 
++#include "logview-app.h"
+ #include "logview-prefs.h"
+ #include "logview-marshal.h"
+ 
diff --git a/deskutils/gnome-utils/files/patch-logview_logview-utils.c b/deskutils/gnome-utils/files/patch-logview_logview-utils.c
new file mode 100644
index 000000000000..4faad70213df
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_logview-utils.c
@@ -0,0 +1,11 @@
+--- logview/logview-utils.c.orig	2009-03-21 17:22:41.000000000 -0400
++++ logview/logview-utils.c	2009-03-21 17:23:22.000000000 -0400
+@@ -136,7 +136,7 @@ log_read_dates (const char **buffer_line
+ {
+   int current_year, offsetyear, i, n, rangemin, rangemax, timestamp_len = 0;
+   GSList *days = NULL;
+-  GDate *date, *newdate;
++  GDate *date = NULL, *newdate;
+   struct tm *tmptm;
+   char *date_string;
+   Day *day;
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 0f71ca4e1454..c53f053ed522 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -71,9 +71,7 @@ share/gnome-2.0/ui/GNOME_DictionaryApplet.xml
 share/gnome-dictionary/gnome-dictionary-preferences.glade
 share/gnome-dictionary/gnome-dictionary-ui.xml
 share/gnome-screenshot/gnome-screenshot.ui
-share/gnome-system-log/gnome-system-log-actions.db
-share/gnome-system-log/gnome-system-log-descript.db
-share/gnome-system-log/gnome-system-log-regexp.db
+%%DATADIR%%/logview-toolbar.xml
 share/gnome/help/baobab/C/baobab.xml
 share/gnome/help/baobab/C/figures/baobab_fullscan.png
 share/gnome/help/baobab/C/figures/baobab_prefs.png
@@ -91,6 +89,14 @@ share/gnome/help/baobab/ca/figures/baobab_ringschart1.png
 share/gnome/help/baobab/ca/figures/baobab_ringschart2.png
 share/gnome/help/baobab/ca/figures/baobab_treemaps.png
 share/gnome/help/baobab/ca/figures/baobab_window.png
+share/gnome/help/baobab/cs/baobab.xml
+share/gnome/help/baobab/cs/figures/baobab_fullscan.png
+share/gnome/help/baobab/cs/figures/baobab_prefs.png
+share/gnome/help/baobab/cs/figures/baobab_remote.png
+share/gnome/help/baobab/cs/figures/baobab_ringschart1.png
+share/gnome/help/baobab/cs/figures/baobab_ringschart2.png
+share/gnome/help/baobab/cs/figures/baobab_treemaps.png
+share/gnome/help/baobab/cs/figures/baobab_window.png
 share/gnome/help/baobab/da/baobab.xml
 share/gnome/help/baobab/da/figures/baobab_fullscan.png
 share/gnome/help/baobab/da/figures/baobab_prefs.png
@@ -123,6 +129,14 @@ share/gnome/help/baobab/es/figures/baobab_ringschart1.png
 share/gnome/help/baobab/es/figures/baobab_ringschart2.png
 share/gnome/help/baobab/es/figures/baobab_treemaps.png
 share/gnome/help/baobab/es/figures/baobab_window.png
+share/gnome/help/baobab/eu/baobab.xml
+share/gnome/help/baobab/eu/figures/baobab_fullscan.png
+share/gnome/help/baobab/eu/figures/baobab_prefs.png
+share/gnome/help/baobab/eu/figures/baobab_remote.png
+share/gnome/help/baobab/eu/figures/baobab_ringschart1.png
+share/gnome/help/baobab/eu/figures/baobab_ringschart2.png
+share/gnome/help/baobab/eu/figures/baobab_treemaps.png
+share/gnome/help/baobab/eu/figures/baobab_window.png
 share/gnome/help/baobab/fi/baobab.xml
 share/gnome/help/baobab/fi/figures/baobab_fullscan.png
 share/gnome/help/baobab/fi/figures/baobab_prefs.png
@@ -155,6 +169,14 @@ share/gnome/help/baobab/oc/figures/baobab_ringschart1.png
 share/gnome/help/baobab/oc/figures/baobab_ringschart2.png
 share/gnome/help/baobab/oc/figures/baobab_treemaps.png
 share/gnome/help/baobab/oc/figures/baobab_window.png
+share/gnome/help/baobab/pl/baobab.xml
+share/gnome/help/baobab/pl/figures/baobab_fullscan.png
+share/gnome/help/baobab/pl/figures/baobab_prefs.png
+share/gnome/help/baobab/pl/figures/baobab_remote.png
+share/gnome/help/baobab/pl/figures/baobab_ringschart1.png
+share/gnome/help/baobab/pl/figures/baobab_ringschart2.png
+share/gnome/help/baobab/pl/figures/baobab_treemaps.png
+share/gnome/help/baobab/pl/figures/baobab_window.png
 share/gnome/help/baobab/ru/baobab.xml
 share/gnome/help/baobab/ru/figures/baobab_fullscan.png
 share/gnome/help/baobab/ru/figures/baobab_prefs.png
@@ -250,6 +272,15 @@ share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-lookup.png
 share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-preferences-print.png
 share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-preferences-source.png
 share/gnome/help/gnome-dictionary/es/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/eu/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/eu/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/eu/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/eu/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/eu/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/eu/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/eu/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/eu/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/eu/gnome-dictionary.xml
 share/gnome/help/gnome-dictionary/fi/figures/gnome-dictionary-add-source.png
 share/gnome/help/gnome-dictionary/fi/figures/gnome-dictionary-applet-window.png
 share/gnome/help/gnome-dictionary/fi/figures/gnome-dictionary-applet.png
@@ -324,6 +355,8 @@ share/gnome/help/gnome-search-tool/en_GB/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/en_GB/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/es/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/eu/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/eu/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/fi/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/fi/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/fr/figures/gnome-search-tool_window.png
@@ -353,6 +386,8 @@ share/gnome/help/gnome-system-log/en_GB/figures/syslog_window.png
 share/gnome/help/gnome-system-log/en_GB/gnome-system-log.xml
 share/gnome/help/gnome-system-log/es/figures/syslog_window.png
 share/gnome/help/gnome-system-log/es/gnome-system-log.xml
+share/gnome/help/gnome-system-log/eu/figures/syslog_window.png
+share/gnome/help/gnome-system-log/eu/gnome-system-log.xml
 share/gnome/help/gnome-system-log/fi/figures/syslog_window.png
 share/gnome/help/gnome-system-log/fi/gnome-system-log.xml
 share/gnome/help/gnome-system-log/fr/figures/syslog_window.png
@@ -371,14 +406,17 @@ share/gnome/help/gnome-system-log/uk/figures/syslog_window.png
 share/gnome/help/gnome-system-log/uk/gnome-system-log.xml
 share/omf/baobab/baobab-C.omf
 share/omf/baobab/baobab-ca.omf
+share/omf/baobab/baobab-cs.omf
 share/omf/baobab/baobab-da.omf
 share/omf/baobab/baobab-de.omf
 share/omf/baobab/baobab-en_GB.omf
 share/omf/baobab/baobab-es.omf
+share/omf/baobab/baobab-eu.omf
 share/omf/baobab/baobab-fi.omf
 share/omf/baobab/baobab-fr.omf
 share/omf/baobab/baobab-it.omf
 share/omf/baobab/baobab-oc.omf
+share/omf/baobab/baobab-pl.omf
 share/omf/baobab/baobab-ru.omf
 share/omf/baobab/baobab-sv.omf
 share/omf/baobab/baobab-uk.omf
@@ -390,6 +428,7 @@ share/omf/gnome-dictionary/gnome-dictionary-de.omf
 share/omf/gnome-dictionary/gnome-dictionary-el.omf
 share/omf/gnome-dictionary/gnome-dictionary-en_GB.omf
 share/omf/gnome-dictionary/gnome-dictionary-es.omf
+share/omf/gnome-dictionary/gnome-dictionary-eu.omf
 share/omf/gnome-dictionary/gnome-dictionary-fi.omf
 share/omf/gnome-dictionary/gnome-dictionary-fr.omf
 share/omf/gnome-dictionary/gnome-dictionary-it.omf
@@ -402,6 +441,7 @@ share/omf/gnome-search-tool/gnome-search-tool-ca.omf
 share/omf/gnome-search-tool/gnome-search-tool-de.omf
 share/omf/gnome-search-tool/gnome-search-tool-en_GB.omf
 share/omf/gnome-search-tool/gnome-search-tool-es.omf
+share/omf/gnome-search-tool/gnome-search-tool-eu.omf
 share/omf/gnome-search-tool/gnome-search-tool-fi.omf
 share/omf/gnome-search-tool/gnome-search-tool-it.omf
 share/omf/gnome-search-tool/gnome-search-tool-ko.omf
@@ -416,6 +456,7 @@ share/omf/gnome-system-log/gnome-system-log-de.omf
 share/omf/gnome-system-log/gnome-system-log-el.omf
 share/omf/gnome-system-log/gnome-system-log-en_GB.omf
 share/omf/gnome-system-log/gnome-system-log-es.omf
+share/omf/gnome-system-log/gnome-system-log-eu.omf
 share/omf/gnome-system-log/gnome-system-log-fi.omf
 share/omf/gnome-system-log/gnome-system-log-fr.omf
 share/omf/gnome-system-log/gnome-system-log-it.omf
@@ -429,6 +470,7 @@ share/icons/hicolor/24x24/apps/baobab.png
 share/icons/hicolor/scalable/apps/baobab.svg
 share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/as/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/ast/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-utils-2.0.mo
@@ -528,6 +570,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-system-log/fr
 @dirrm share/gnome/help/gnome-system-log/fi/figures
 @dirrm share/gnome/help/gnome-system-log/fi
+@dirrm share/gnome/help/gnome-system-log/eu/figures
+@dirrm share/gnome/help/gnome-system-log/eu
 @dirrm share/gnome/help/gnome-system-log/es/figures
 @dirrm share/gnome/help/gnome-system-log/es
 @dirrm share/gnome/help/gnome-system-log/en_GB/figures
@@ -557,6 +601,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-search-tool/fr
 @dirrm share/gnome/help/gnome-search-tool/fi/figures
 @dirrm share/gnome/help/gnome-search-tool/fi
+@dirrm share/gnome/help/gnome-search-tool/eu/figures
+@dirrm share/gnome/help/gnome-search-tool/eu
 @dirrm share/gnome/help/gnome-search-tool/es/figures
 @dirrm share/gnome/help/gnome-search-tool/es
 @dirrm share/gnome/help/gnome-search-tool/en_GB/figures
@@ -582,6 +628,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-dictionary/fr
 @dirrm share/gnome/help/gnome-dictionary/fi/figures
 @dirrm share/gnome/help/gnome-dictionary/fi
+@dirrm share/gnome/help/gnome-dictionary/eu/figures
+@dirrm share/gnome/help/gnome-dictionary/eu
 @dirrm share/gnome/help/gnome-dictionary/es/figures
 @dirrm share/gnome/help/gnome-dictionary/es
 @dirrm share/gnome/help/gnome-dictionary/en_GB/figures
@@ -605,6 +653,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/baobab/sv
 @dirrm share/gnome/help/baobab/ru/figures
 @dirrm share/gnome/help/baobab/ru
+@dirrm share/gnome/help/baobab/pl/figures
+@dirrm share/gnome/help/baobab/pl
 @dirrm share/gnome/help/baobab/oc/figures
 @dirrm share/gnome/help/baobab/oc
 @dirrm share/gnome/help/baobab/it/figures
@@ -613,6 +663,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/baobab/fr
 @dirrm share/gnome/help/baobab/fi/figures
 @dirrm share/gnome/help/baobab/fi
+@dirrm share/gnome/help/baobab/eu/figures
+@dirrm share/gnome/help/baobab/eu
 @dirrm share/gnome/help/baobab/es/figures
 @dirrm share/gnome/help/baobab/es
 @dirrm share/gnome/help/baobab/en_GB/figures
@@ -621,12 +673,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/baobab/de
 @dirrm share/gnome/help/baobab/da/figures
 @dirrm share/gnome/help/baobab/da
+@dirrm share/gnome/help/baobab/cs/figures
+@dirrm share/gnome/help/baobab/cs
 @dirrm share/gnome/help/baobab/ca/figures
 @dirrm share/gnome/help/baobab/ca
 @dirrm share/gnome/help/baobab/C/figures
 @dirrm share/gnome/help/baobab/C
 @dirrm share/gnome/help/baobab
-@dirrm share/gnome-system-log
+@dirrm %%DATADIR%%
 @dirrm share/gnome-screenshot
 @dirrm share/gnome-dictionary
 @dirrm share/gdict-1.0/sources
@@ -667,5 +721,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as