update to 2.18.0

This moves this pkg to the new stable gnome branch, too much to list here.

5 files changed, 66 insertions, 60 deletions

diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index c8973eadcb2..ad0a6f49795 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.64 2007/03/21 12:05:49 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2007/04/11 18:06:54 drochner Exp $
 #
 
-DISTNAME=		gnome-utils-2.16.2
-PKGREVISION=		1
+DISTNAME=		gnome-utils-2.18.0
 CATEGORIES=		misc gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.16/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.18/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
diff --git a/misc/gnome2-utils/PLIST b/misc/gnome2-utils/PLIST
index c10240c647c..e69ded144ac 100644
--- a/misc/gnome2-utils/PLIST
+++ b/misc/gnome2-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2006/11/24 18:21:45 drochner Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/04/11 18:06:54 drochner Exp $
 bin/baobab
 bin/gnome-dictionary
 bin/gnome-panel-screenshot
@@ -14,6 +14,7 @@ include/gdict-1.0/gdict/gdict-enum-types.h
 include/gdict-1.0/gdict/gdict-source-loader.h
 include/gdict-1.0/gdict/gdict-source.h
 include/gdict-1.0/gdict/gdict-speller.h
+include/gdict-1.0/gdict/gdict-strategy-chooser.h
 include/gdict-1.0/gdict/gdict-utils.h
 include/gdict-1.0/gdict/gdict-version.h
 include/gdict-1.0/gdict/gdict.h
@@ -30,25 +31,8 @@ share/applications/gnome-dictionary.desktop
 share/applications/gnome-screenshot.desktop
 share/applications/gnome-search-tool.desktop
 share/applications/gnome-system-log.desktop
-share/baobab/pixmaps/alfa_sort.png
 share/baobab/pixmaps/baobab.glade
-share/baobab/pixmaps/baobab.xpm
-share/baobab/pixmaps/busy.gif
-share/baobab/pixmaps/done.png
-share/baobab/pixmaps/format_numeric.png
-share/baobab/pixmaps/format_percent.png
-share/baobab/pixmaps/green.png
-share/baobab/pixmaps/nautilus.png
-share/baobab/pixmaps/num_sort.png
-share/baobab/pixmaps/red.png
-share/baobab/pixmaps/scan_directory.png
-share/baobab/pixmaps/scan_harddisk.png
-share/baobab/pixmaps/search.png
-share/baobab/pixmaps/searchall.png
 share/baobab/pixmaps/shot.png
-share/baobab/pixmaps/stop.png
-share/baobab/pixmaps/white.png
-share/baobab/pixmaps/yellow.png
 share/gconf/schemas/baobab.schemas
 share/gconf/schemas/gnome-dictionary.schemas
 share/gconf/schemas/gnome-screenshot.schemas
@@ -56,6 +40,7 @@ share/gconf/schemas/gnome-search-tool.schemas
 share/gconf/schemas/logview.schemas
 share/gdict-1.0/sources/default.desktop
 share/gdict-1.0/sources/spanish.desktop
+share/gdict-1.0/sources/thai.desktop
 share/gnome-2.0/ui/GNOME_DictionaryApplet.xml
 share/gnome-dictionary/gnome-dictionary-preferences.glade
 share/gnome-dictionary/gnome-dictionary-ui.xml
@@ -70,6 +55,18 @@ share/gnome/help/baobab/C/figures/baobab_remote.png
 share/gnome/help/baobab/C/figures/baobab_treemaps.png
 share/gnome/help/baobab/C/figures/baobab_window.png
 share/gnome/help/baobab/C/legal.xml
+share/gnome/help/baobab/en_GB/baobab.xml
+share/gnome/help/baobab/en_GB/figures/baobab_fullscan.png
+share/gnome/help/baobab/en_GB/figures/baobab_prefs.png
+share/gnome/help/baobab/en_GB/figures/baobab_remote.png
+share/gnome/help/baobab/en_GB/figures/baobab_treemaps.png
+share/gnome/help/baobab/en_GB/figures/baobab_window.png
+share/gnome/help/baobab/es/baobab.xml
+share/gnome/help/baobab/es/figures/baobab_fullscan.png
+share/gnome/help/baobab/es/figures/baobab_prefs.png
+share/gnome/help/baobab/es/figures/baobab_remote.png
+share/gnome/help/baobab/es/figures/baobab_treemaps.png
+share/gnome/help/baobab/es/figures/baobab_window.png
 share/gnome/help/baobab/fr/baobab.xml
 share/gnome/help/baobab/fr/figures/baobab_fullscan.png
 share/gnome/help/baobab/fr/figures/baobab_prefs.png
@@ -119,6 +116,15 @@ share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-lookup.png
 share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-preferences-print.png
 share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-preferences-source.png
 share/gnome/help/gnome-dictionary/fr/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/it/gnome-dictionary.xml
 share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-add-source.png
 share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-applet-window.png
 share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-applet.png
@@ -168,6 +174,8 @@ share/gnome/help/gnome-system-log/fr/figures/syslog_window.png
 share/gnome/help/gnome-system-log/fr/gnome-system-log.xml
 share/gnome/help/gnome-system-log/it/figures/syslog_window.png
 share/gnome/help/gnome-system-log/it/gnome-system-log.xml
+share/gnome/help/gnome-system-log/ru/figures/syslog_window.png
+share/gnome/help/gnome-system-log/ru/gnome-system-log.xml
 share/gnome/help/gnome-system-log/sv/figures/syslog_window.png
 share/gnome/help/gnome-system-log/sv/gnome-system-log.xml
 share/gnome/help/gnome-system-log/uk/figures/syslog_window.png
@@ -192,8 +200,9 @@ share/gtk-doc/html/gdict/sources-loader.html
 share/gtk-doc/html/gdict/sources.html
 share/gtk-doc/html/gdict/style.css
 share/gtk-doc/html/gdict/up.png
-share/icons/hicolor/48x48/apps/baobab.png
+share/icons/hicolor/24x24/apps/baobab.png
 share/icons/hicolor/48x48/apps/gnome-dictionary.png
+share/icons/hicolor/scalable/apps/baobab.svg
 share/icons/hicolor/scalable/apps/gnome-dictionary.svg
 share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
@@ -267,12 +276,15 @@ share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 share/omf/baobab/baobab-C.omf
+share/omf/baobab/baobab-en_GB.omf
+share/omf/baobab/baobab-es.omf
 share/omf/baobab/baobab-fr.omf
 share/omf/baobab/baobab-sv.omf
 share/omf/gnome-dictionary/gnome-dictionary-C.omf
 share/omf/gnome-dictionary/gnome-dictionary-el.omf
 share/omf/gnome-dictionary/gnome-dictionary-es.omf
 share/omf/gnome-dictionary/gnome-dictionary-fr.omf
+share/omf/gnome-dictionary/gnome-dictionary-it.omf
 share/omf/gnome-dictionary/gnome-dictionary-ru.omf
 share/omf/gnome-dictionary/gnome-dictionary-sv.omf
 share/omf/gnome-dictionary/gnome-dictionary-uk.omf
@@ -286,6 +298,7 @@ share/omf/gnome-system-log/gnome-system-log-C.omf
 share/omf/gnome-system-log/gnome-system-log-es.omf
 share/omf/gnome-system-log/gnome-system-log-fr.omf
 share/omf/gnome-system-log/gnome-system-log-it.omf
+share/omf/gnome-system-log/gnome-system-log-ru.omf
 share/omf/gnome-system-log/gnome-system-log-sv.omf
 share/omf/gnome-system-log/gnome-system-log-uk.omf
 share/pixmaps/gsearchtool/thumbnail_frame.png
@@ -298,12 +311,15 @@ share/pixmaps/gsearchtool/thumbnail_frame.png
 @comment in scrollkeeper: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gtk-doc/html/gdict
 @dirrm share/gnome/help/gnome-system-log/uk/figures
 @dirrm share/gnome/help/gnome-system-log/uk
 @dirrm share/gnome/help/gnome-system-log/sv/figures
 @dirrm share/gnome/help/gnome-system-log/sv
+@dirrm share/gnome/help/gnome-system-log/ru/figures
+@dirrm share/gnome/help/gnome-system-log/ru
 @dirrm share/gnome/help/gnome-system-log/it/figures
 @dirrm share/gnome/help/gnome-system-log/it
 @dirrm share/gnome/help/gnome-system-log/fr/figures
@@ -332,6 +348,8 @@ share/pixmaps/gsearchtool/thumbnail_frame.png
 @dirrm share/gnome/help/gnome-dictionary/sv
 @dirrm share/gnome/help/gnome-dictionary/ru/figures
 @dirrm share/gnome/help/gnome-dictionary/ru
+@dirrm share/gnome/help/gnome-dictionary/it/figures
+@dirrm share/gnome/help/gnome-dictionary/it
 @dirrm share/gnome/help/gnome-dictionary/fr/figures
 @dirrm share/gnome/help/gnome-dictionary/fr
 @dirrm share/gnome/help/gnome-dictionary/es/figures
@@ -345,6 +363,10 @@ share/pixmaps/gsearchtool/thumbnail_frame.png
 @dirrm share/gnome/help/baobab/sv
 @dirrm share/gnome/help/baobab/fr/figures
 @dirrm share/gnome/help/baobab/fr
+@dirrm share/gnome/help/baobab/es/figures
+@dirrm share/gnome/help/baobab/es
+@dirrm share/gnome/help/baobab/en_GB/figures
+@dirrm share/gnome/help/baobab/en_GB
 @dirrm share/gnome/help/baobab/C/figures
 @dirrm share/gnome/help/baobab/C
 @dirrm share/gnome/help/baobab
diff --git a/misc/gnome2-utils/distinfo b/misc/gnome2-utils/distinfo
index 3c5b10e899c..c413280c236 100644
--- a/misc/gnome2-utils/distinfo
+++ b/misc/gnome2-utils/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2006/11/24 18:21:45 drochner Exp $
+$NetBSD: distinfo,v 1.21 2007/04/11 18:06:54 drochner Exp $
 
-SHA1 (gnome-utils-2.16.2.tar.bz2) = 216cd579ad369d1dd3b77eed798419bfb7f86836
-RMD160 (gnome-utils-2.16.2.tar.bz2) = 1be3877435cb228470252a25e65a5b85532906e2
-Size (gnome-utils-2.16.2.tar.bz2) = 3369888 bytes
-SHA1 (patch-aa) = 0ae23e6027b164a2e8a42eafeadcede0b9034ede
+SHA1 (gnome-utils-2.18.0.tar.bz2) = a12952b0f1229608aadd62de67bc3718104f6daa
+RMD160 (gnome-utils-2.18.0.tar.bz2) = 5cff0b58ec07b626c1331dc319cc699d064ee033
+Size (gnome-utils-2.18.0.tar.bz2) = 4077531 bytes
+SHA1 (patch-aa) = d9ae0c5a7c6c50d7bed468c314e70927810208bd
 SHA1 (patch-ab) = 730a2c697ff416c78b7721a548c591e8d123eb2f
-SHA1 (patch-ac) = 29075057d795d7604980471ce1c88411f1c9bec3
+SHA1 (patch-ac) = 482b496673bcfd4be21d5defed51e74da3009982
diff --git a/misc/gnome2-utils/patches/patch-aa b/misc/gnome2-utils/patches/patch-aa
index 33abfc36cd1..b9186b903e2 100644
--- a/misc/gnome2-utils/patches/patch-aa
+++ b/misc/gnome2-utils/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.5 2006/04/08 17:18:26 joerg Exp $
+$NetBSD: patch-aa,v 1.6 2007/04/11 18:06:55 drochner Exp $
 
---- gsearchtool/gsearchtool-support.c.orig	2006-04-08 16:51:54.000000000 +0000
+--- gsearchtool/gsearchtool-support.c.orig	2007-03-10 14:19:56.000000000 +0100
 +++ gsearchtool/gsearchtool-support.c
-@@ -29,6 +29,7 @@
- #  include <config.h>
+@@ -30,6 +30,7 @@
  #endif
  
+ #include <string.h>
 +#include <sys/types.h>
  #include <glib/gi18n.h>
  #include <glib/gdate.h>
diff --git a/misc/gnome2-utils/patches/patch-ac b/misc/gnome2-utils/patches/patch-ac
index f4efab91e2a..f07a9bd0c9e 100644
--- a/misc/gnome2-utils/patches/patch-ac
+++ b/misc/gnome2-utils/patches/patch-ac
@@ -1,33 +1,18 @@
-$NetBSD: patch-ac,v 1.4 2006/09/18 16:38:45 jmmv Exp $
+$NetBSD: patch-ac,v 1.5 2007/04/11 18:06:55 drochner Exp $
 
---- gnome-screenshot/screenshot-save.c.orig	2006-06-11 13:19:30.000000000 +0200
+--- gnome-screenshot/screenshot-save.c.orig	2007-03-10 14:19:50.000000000 +0100
 +++ gnome-screenshot/screenshot-save.c
-@@ -14,8 +14,6 @@ static char *tmp_filename = NULL;
- static SaveFunction save_callback = NULL;
- static gpointer save_user_data = NULL;
+@@ -115,7 +115,8 @@ read_pipe_from_child (GIOChannel   *sour
  
--extern int errno;
--
+       status = g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
  
- 
- /* Strategy for saving:
-@@ -98,6 +96,7 @@ read_pipe_from_child (GIOChannel   *sour
-       GtkWidget *dialog;
- 
-       g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
-+      if (error_message != NULL && strcmp (error_message, "OK") != 0) {
-       message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
-       dialog = gtk_message_dialog_new (NULL, 0,
- 				       GTK_MESSAGE_ERROR,
-@@ -106,6 +105,7 @@ read_pipe_from_child (GIOChannel   *sour
-       gtk_dialog_run (GTK_DIALOG (dialog));
-       gtk_widget_destroy (dialog);
-       exit (1);
-+      }
-     }
- 
-   (*save_callback) (save_user_data);
-@@ -194,8 +194,7 @@ screenshot_save_start (GdkPixbuf    *pix
+-      if (status == G_IO_STATUS_NORMAL)
++      if (status == G_IO_STATUS_NORMAL
++	&& error_message != NULL && strcmp (error_message, "OK") != 0)
+ 	{
+ 	  message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
+ 	  dialog = gtk_message_dialog_new (NULL, 0,
+@@ -226,8 +227,7 @@ screenshot_save_start (GdkPixbuf    *pix
  		   ERROR_MESSAGE,
  		   strlen (ERROR_MESSAGE));
  	}
@@ -37,7 +22,7 @@ $NetBSD: patch-ac,v 1.4 2006/09/18 16:38:45 jmmv Exp $
        close (pipe_from_child[1]);
        read (parent_exit_notification[0], &c, 1);
  
-@@ -211,7 +210,7 @@ screenshot_save_start (GdkPixbuf    *pix
+@@ -243,7 +243,7 @@ screenshot_save_start (GdkPixbuf    *pix
  
        channel = g_io_channel_unix_new (pipe_from_child[0]);
        g_io_add_watch (channel,