Update to 2.15.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6438 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 97 insertions, 123 deletions

diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 8f001ab36..ac38e94ce 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.97 2006/05/28 04:12:26 mezz Exp $
+#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.98 2006/05/28 22:13:36 marcus Exp $
 #
 
 PORTNAME=	gnome-utils
-PORTVERSION=	2.15.0
-PORTREVISION=	2
+PORTVERSION=	2.15.4
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -27,14 +26,16 @@ INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 INSTALLS_SHLIB=	yes
+INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel \
 		libgnomeprintui gnomedesktop ltverhack
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-MAN1=		gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1
+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
+		gnome-search-tool.schemas logview.schemas baobab.schemas
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index dbd326259..efb85d236 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-utils-2.15.0.tar.bz2) = 4628989354585116362c5e06c144402a
-SHA256 (gnome2/gnome-utils-2.15.0.tar.bz2) = 75a8ac18dc10fe927d220aee3b1eb28a15bcdb430432b77bf0f38fc928d7eab8
-SIZE (gnome2/gnome-utils-2.15.0.tar.bz2) = 2258436
+MD5 (gnome2/gnome-utils-2.15.4.tar.bz2) = a86b4c1b46c5849777e0ae51fbbe11cd
+SHA256 (gnome2/gnome-utils-2.15.4.tar.bz2) = 37c51998fd5e2ca24347cd80701c613391b45c82e49386f1daa9f2061bf3944f
+SIZE (gnome2/gnome-utils-2.15.4.tar.bz2) = 2454959
diff --git a/deskutils/gnome-utils/files/patch-logview__logview.h b/deskutils/gnome-utils/files/patch-logview__logview.h
deleted file mode 100644
index 3cd50f68c..000000000
--- a/deskutils/gnome-utils/files/patch-logview__logview.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- logview/logview.h.orig	Wed Apr 19 12:39:07 2006
-+++ logview/logview.h	Wed Apr 19 12:40:08 2006
-@@ -73,6 +73,7 @@
- void logview_set_window_title (LogviewWindow *window);
- void logview_set_font (LogviewWindow *window, const gchar *fontname);
- void logview_show_main_content (LogviewWindow *window);
-+GType logview_window_get_type (void);
- GtkWidget *logview_window_new (void);
- 
- #endif /* __LOGVIEW_H__ */
diff --git a/deskutils/gnome-utils/files/patch-logview_calendar.h b/deskutils/gnome-utils/files/patch-logview_calendar.h
deleted file mode 100644
index 3aefb999f..000000000
--- a/deskutils/gnome-utils/files/patch-logview_calendar.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- logview/calendar.h.orig	Tue Apr 18 22:20:35 2006
-+++ logview/calendar.h	Tue Apr 18 22:20:58 2006
-@@ -45,6 +45,7 @@ typedef struct CalendarClass
- 	GtkCalendarClass parent_class;
- }CalendarClass;
- 
-+GType calendar_get_type (void);
- GtkWidget *calendar_new (void);
- void calendar_select_date (Calendar *calendar, GDate *date);
- void calendar_init_data (Calendar *calendar, LogviewWindow *logview);
diff --git a/deskutils/gnome-utils/files/patch-logview_loglist.h b/deskutils/gnome-utils/files/patch-logview_loglist.h
deleted file mode 100644
index 149e04a59..000000000
--- a/deskutils/gnome-utils/files/patch-logview_loglist.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- logview/loglist.h.orig	Wed Apr 19 00:30:12 2006
-+++ logview/loglist.h	Wed Apr 19 00:30:23 2006
-@@ -39,6 +39,7 @@ typedef struct LogListClass
- 	GtkTreeViewClass parent_class;
- }LogListClass;
- 
-+GType loglist_get_type (void);
- GtkWidget *loglist_new (void);
- void loglist_connect (LogList *list, LogviewWindow *window);
- void loglist_add_log (LogList *list, Log *log);
diff --git a/deskutils/gnome-utils/files/patch-logview_logrtns.c b/deskutils/gnome-utils/files/patch-logview_logrtns.c
deleted file mode 100644
index 85333d2fe..000000000
--- a/deskutils/gnome-utils/files/patch-logview_logrtns.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- logview/logrtns.c.orig	Wed Apr 19 00:28:00 2006
-+++ logview/logrtns.c	Wed Apr 19 00:29:24 2006
-@@ -48,7 +48,7 @@ file_exist (char *filename, gboolean sho
-    char *secondary = NULL;
- 
-    if (filename == NULL)
--       return;
-+       return FALSE;
- 
-    result = gnome_vfs_open (&handle, filename, GNOME_VFS_OPEN_READ);
-    if (result != GNOME_VFS_OK) {
-@@ -83,7 +83,7 @@ file_is_zipped (char *filename)
- 	char *mime_type;
- 
-     if (filename == NULL)
--        return;
-+        return FALSE;
- 
- 	mime_type = gnome_vfs_get_mime_type (filename);
-     if (mime_type == NULL)
-@@ -106,7 +106,7 @@ file_is_log (char *filename, gboolean sh
-     LogStats *stats;
- 
-     if (filename == NULL)
--        return;
-+        return FALSE;
- 
-     stats = log_stats_new (filename, show_error);
-     if (stats==NULL)
-@@ -134,11 +134,11 @@ string_get_date_string (gchar *line)
-     int i=0;
- 
-     if (line == NULL || line[0] == 0)
--        return;
-+        return NULL;
- 
-     split = g_strsplit (line, " ", 4);
-     if (split == NULL)
--        return;
-+        return NULL;
- 
-     while ((day == NULL || month == NULL) && split[i]!=NULL && i<4) {
-         if (g_str_equal (split[i], "")) {
-@@ -531,7 +531,7 @@ log_unbold (gpointer data)
-     LogList *list;
-     Log *log = data;
- 
--    g_return_if_fail (log != NULL);
-+    g_return_val_if_fail (log != NULL, FALSE);
- 
-     logview = log->window;
- 
diff --git a/deskutils/gnome-utils/files/patch-logview_logview-findbar.h b/deskutils/gnome-utils/files/patch-logview_logview-findbar.h
deleted file mode 100644
index 1e6acd101..000000000
--- a/deskutils/gnome-utils/files/patch-logview_logview-findbar.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- logview/logview-findbar.h.orig	Wed Apr 19 00:27:03 2006
-+++ logview/logview-findbar.h	Wed Apr 19 00:27:17 2006
-@@ -44,6 +44,7 @@ typedef struct LogviewFindBarClass
- 	GtkHBoxClass parent_class;
- }LogviewFindBarClass;
- 
-+GType logview_findbar_get_type (void);
- GtkWidget *logview_findbar_new (void);
- void logview_findbar_connect (LogviewFindBar *findbar, LogviewWindow *logview);
- void logview_findbar_update_visibility (LogviewFindBar *findbar, LogviewWindow *logview);
diff --git a/deskutils/gnome-utils/files/patch-logview_misc.c b/deskutils/gnome-utils/files/patch-logview_misc.c
deleted file mode 100644
index 1a0f54cfe..000000000
--- a/deskutils/gnome-utils/files/patch-logview_misc.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- logview/misc.c.orig	Tue Apr 18 21:28:07 2006
-+++ logview/misc.c	Tue Apr 18 21:28:30 2006
-@@ -135,15 +135,15 @@ string_get_date (char *line)
- {
-     GDate *date;
-     struct tm tp;
--    int cp;
-+    char *cp;
-     
-     if (line == NULL || line[0] == 0)
-         return NULL;
- 
-     cp = strptime (line, "%b %d", &tp);
--    if (cp == 0) {
-+    if (cp == NULL) {
-         cp = strptime (line, "%F", &tp);
--        if (cp == 0) {
-+        if (cp == NULL) {
-             return NULL;
-         }
-     }
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index b16a5ac96..444765553 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -1,3 +1,4 @@
+bin/baobab
 bin/gnome-dictionary
 bin/gnome-panel-screenshot
 bin/gnome-screenshot
@@ -10,13 +11,14 @@ include/gdict-1.0/gdict/gdict-entry.h
 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-utils.h
 include/gdict-1.0/gdict/gdict-version.h
 include/gdict-1.0/gdict/gdict.h
 lib/libgdict-1.0.a
 lib/libgdict-1.0.la
 lib/libgdict-1.0.so
-lib/libgdict-1.0.so.3
+lib/libgdict-1.0.so.4
 libdata/bonobo/servers/GNOME_DictionaryApplet.server
 libdata/pkgconfig/gdict-1.0.pc
 libexec/gnome-dictionary-applet
@@ -40,10 +42,30 @@ share/doc/gdict/sources-loader.html
 share/doc/gdict/sources.html
 share/doc/gdict/style.css
 share/doc/gdict/up.png
+share/gnome/applications/baobab.desktop
 share/gnome/applications/gnome-dictionary.desktop
 share/gnome/applications/gnome-screenshot.desktop
 share/gnome/applications/gnome-search-tool.desktop
 share/gnome/applications/gnome-system-log.desktop
+share/gnome/baobab/pixmaps/alfa_sort.png
+share/gnome/baobab/pixmaps/baobab.glade
+share/gnome/baobab/pixmaps/baobab.xpm
+share/gnome/baobab/pixmaps/busy.gif
+share/gnome/baobab/pixmaps/done.png
+share/gnome/baobab/pixmaps/format_numeric.png
+share/gnome/baobab/pixmaps/format_percent.png
+share/gnome/baobab/pixmaps/green.png
+share/gnome/baobab/pixmaps/nautilus.png
+share/gnome/baobab/pixmaps/num_sort.png
+share/gnome/baobab/pixmaps/red.png
+share/gnome/baobab/pixmaps/scan_directory.png
+share/gnome/baobab/pixmaps/scan_harddisk.png
+share/gnome/baobab/pixmaps/search.png
+share/gnome/baobab/pixmaps/searchall.png
+share/gnome/baobab/pixmaps/shot.png
+share/gnome/baobab/pixmaps/stop.png
+share/gnome/baobab/pixmaps/white.png
+share/gnome/baobab/pixmaps/yellow.png
 share/gnome/gdict-1.0/sources/default.desktop
 share/gnome/gdict-1.0/sources/spanish.desktop
 share/gnome/gnome-2.0/ui/GNOME_DictionaryApplet.xml
@@ -53,6 +75,13 @@ share/gnome/gnome-screenshot/glade/gnome-screenshot.glade
 share/gnome/gnome-system-log/gnome-system-log-actions.db
 share/gnome/gnome-system-log/gnome-system-log-descript.db
 share/gnome/gnome-system-log/gnome-system-log-regexp.db
+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
+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/gnome-dictionary/C/figures/gnome-dictionary-add-source.png
 share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-applet-window.png
 share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-applet.png
@@ -72,24 +101,56 @@ 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/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
+share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/ru/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/uk/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/uk/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/uk/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/uk/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/uk/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/uk/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/uk/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/uk/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/uk/gnome-dictionary.xml
 share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/C/legal.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/ru/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/ru/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/uk/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/uk/gnome-search-tool.xml
 share/gnome/help/gnome-system-log/C/figures/syslog_window.png
 share/gnome/help/gnome-system-log/C/gnome-system-log.xml
 share/gnome/help/gnome-system-log/C/legal.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/uk/figures/syslog_window.png
+share/gnome/help/gnome-system-log/uk/gnome-system-log.xml
+share/gnome/omf/baobab/baobab-C.omf
 share/gnome/omf/gnome-dictionary/gnome-dictionary-C.omf
 share/gnome/omf/gnome-dictionary/gnome-dictionary-es.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-ru.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-uk.omf
 share/gnome/omf/gnome-search-tool/gnome-search-tool-C.omf
 share/gnome/omf/gnome-search-tool/gnome-search-tool-es.omf
+share/gnome/omf/gnome-search-tool/gnome-search-tool-ru.omf
+share/gnome/omf/gnome-search-tool/gnome-search-tool-uk.omf
 share/gnome/omf/gnome-system-log/gnome-system-log-C.omf
 share/gnome/omf/gnome-system-log/gnome-system-log-es.omf
-share/gnome/pixmaps/gnome-dictionary.png
+share/gnome/omf/gnome-system-log/gnome-system-log-uk.omf
 share/gnome/pixmaps/gsearchtool/thumbnail_frame.png
+share/icons/hicolor/48x48/apps/baobab.png
+share/icons/hicolor/48x48/apps/gnome-dictionary.png
+share/icons/hicolor/scalable/gnome-dictionary.svg
 share/locale/am/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
@@ -102,6 +163,7 @@ share/locale/cs/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/en_CA/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/en_GB/LC_MESSAGES/gnome-utils-2.0.mo
@@ -121,10 +183,12 @@ share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/mg/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-utils-2.0.mo
@@ -154,34 +218,56 @@ share/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/xh/LC_MESSAGES/gnome-utils-2.0.mo
 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
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrm share/gnome/pixmaps/gsearchtool
 @dirrm share/gnome/omf/gnome-system-log
 @dirrm share/gnome/omf/gnome-search-tool
 @dirrm share/gnome/omf/gnome-dictionary
+@dirrm share/gnome/omf/baobab
+@dirrm share/gnome/help/gnome-system-log/uk/figures
+@dirrm share/gnome/help/gnome-system-log/uk
 @dirrm share/gnome/help/gnome-system-log/es/figures
 @dirrm share/gnome/help/gnome-system-log/es
 @dirrm share/gnome/help/gnome-system-log/C/figures
 @dirrm share/gnome/help/gnome-system-log/C
 @dirrm share/gnome/help/gnome-system-log
+@dirrm share/gnome/help/gnome-search-tool/uk/figures
+@dirrm share/gnome/help/gnome-search-tool/uk
+@dirrm share/gnome/help/gnome-search-tool/ru/figures
+@dirrm share/gnome/help/gnome-search-tool/ru
 @dirrm share/gnome/help/gnome-search-tool/es/figures
 @dirrm share/gnome/help/gnome-search-tool/es
 @dirrm share/gnome/help/gnome-search-tool/C/figures
 @dirrm share/gnome/help/gnome-search-tool/C
 @dirrm share/gnome/help/gnome-search-tool
+@dirrm share/gnome/help/gnome-dictionary/uk/figures
+@dirrm share/gnome/help/gnome-dictionary/uk
+@dirrm share/gnome/help/gnome-dictionary/ru/figures
+@dirrm share/gnome/help/gnome-dictionary/ru
 @dirrm share/gnome/help/gnome-dictionary/es/figures
 @dirrm share/gnome/help/gnome-dictionary/es
 @dirrm share/gnome/help/gnome-dictionary/C/figures
 @dirrm share/gnome/help/gnome-dictionary/C
 @dirrm share/gnome/help/gnome-dictionary
+@dirrm share/gnome/help/baobab/C/figures
+@dirrm share/gnome/help/baobab/C
 @dirrm share/gnome/gnome-system-log
 @dirrm share/gnome/gnome-screenshot/glade
 @dirrm share/gnome/gnome-screenshot
 @dirrm share/gnome/gnome-dictionary
 @dirrm share/gnome/gdict-1.0/sources
 @dirrm share/gnome/gdict-1.0
+@dirrm share/gnome/baobab/pixmaps
+@dirrm share/gnome/baobab
 @dirrm share/doc/gdict
 @dirrm include/gdict-1.0/gdict
 @dirrm include/gdict-1.0