4 files changed, 66 insertions, 28 deletions

diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index c270dd8b41c2..f32fb60bc060 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.135 2009/03/21 21:35:37 marcus Exp $
+#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.143 2009/10/22 14:08:07 kwm Exp $
 #
 
 PORTNAME=	gnome-utils
-PORTVERSION=	2.26.0
-PORTREVISION=	2
+PORTVERSION=	2.28.1
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
@@ -17,7 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 support utilities
 
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
+		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
@@ -26,16 +26,18 @@ USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel \
-		libgnomeprintui gnomedesktop ltverhack
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel ltverhack
 USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-MAN1=		gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 \
-		baobab.1
+MAN1=		gnome-dictionary.1 gnome-screenshot.1 gnome-search-tool.1 \
+		gnome-system-log.1 baobab.1
 GCONF_SCHEMAS=	gnome-dictionary.schemas gnome-screenshot.schemas \
 		gnome-search-tool.schemas baobab.schemas \
 		gnome-system-log.schemas
 
+post-patch:
+	@${RM} ${WRKSRC}/gsearchtool/gnome-search-tool.schemas
+
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 032b1ebd5678..971b781997a3 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/gnome-utils-2.28.1.tar.bz2) = 3c811993191ae0bbf8666405a504288a
+SHA256 (gnome2/gnome-utils-2.28.1.tar.bz2) = 15fc1d7e01b959ba9f412fa28ca020ddd3e0dfbd6b73918ec75ce6d0e9492ea9
+SIZE (gnome2/gnome-utils-2.28.1.tar.bz2) = 6827650
diff --git a/deskutils/gnome-utils/files/patch-logview_gtkmessagearea.c b/deskutils/gnome-utils/files/patch-logview_gtkmessagearea.c
deleted file mode 100644
index 2388e3449431..000000000000
--- a/deskutils/gnome-utils/files/patch-logview_gtkmessagearea.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/pkg-plist b/deskutils/gnome-utils/pkg-plist
index c53f053ed522..e113189d5f8f 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -62,15 +62,18 @@ 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/baobab.glade
+share/baobab/baobab-dialog-scan-props.ui
+share/baobab/baobab-main-window.ui
 share/baobab/pixmaps/shot.png
 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-preferences.ui
+share/gnome-dictionary/gnome-dictionary-source.ui
 share/gnome-dictionary/gnome-dictionary-ui.xml
 share/gnome-screenshot/gnome-screenshot.ui
+%%DATADIR%%/logview-filter.ui
 %%DATADIR%%/logview-toolbar.xml
 share/gnome/help/baobab/C/baobab.xml
 share/gnome/help/baobab/C/figures/baobab_fullscan.png
@@ -113,6 +116,14 @@ share/gnome/help/baobab/de/figures/baobab_ringschart1.png
 share/gnome/help/baobab/de/figures/baobab_ringschart2.png
 share/gnome/help/baobab/de/figures/baobab_treemaps.png
 share/gnome/help/baobab/de/figures/baobab_window.png
+share/gnome/help/baobab/el/baobab.xml
+share/gnome/help/baobab/el/figures/baobab_fullscan.png
+share/gnome/help/baobab/el/figures/baobab_prefs.png
+share/gnome/help/baobab/el/figures/baobab_remote.png
+share/gnome/help/baobab/el/figures/baobab_ringschart1.png
+share/gnome/help/baobab/el/figures/baobab_ringschart2.png
+share/gnome/help/baobab/el/figures/baobab_treemaps.png
+share/gnome/help/baobab/el/figures/baobab_window.png
 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
@@ -201,6 +212,14 @@ share/gnome/help/baobab/uk/figures/baobab_ringschart1.png
 share/gnome/help/baobab/uk/figures/baobab_ringschart2.png
 share/gnome/help/baobab/uk/figures/baobab_treemaps.png
 share/gnome/help/baobab/uk/figures/baobab_window.png
+share/gnome/help/baobab/zh_CN/baobab.xml
+share/gnome/help/baobab/zh_CN/figures/baobab_fullscan.png
+share/gnome/help/baobab/zh_CN/figures/baobab_prefs.png
+share/gnome/help/baobab/zh_CN/figures/baobab_remote.png
+share/gnome/help/baobab/zh_CN/figures/baobab_ringschart1.png
+share/gnome/help/baobab/zh_CN/figures/baobab_ringschart2.png
+share/gnome/help/baobab/zh_CN/figures/baobab_treemaps.png
+share/gnome/help/baobab/zh_CN/figures/baobab_window.png
 share/gnome/help/baobab/zh_HK/baobab.xml
 share/gnome/help/baobab/zh_HK/figures/baobab_fullscan.png
 share/gnome/help/baobab/zh_HK/figures/baobab_prefs.png
@@ -236,6 +255,15 @@ share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-lookup.png
 share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-preferences-print.png
 share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-preferences-source.png
 share/gnome/help/gnome-dictionary/ca/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/cs/gnome-dictionary.xml
 share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-add-source.png
 share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-applet-window.png
 share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-applet.png
@@ -349,8 +377,12 @@ 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/ca/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/ca/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/cs/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/cs/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/de/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/de/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/el/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/el/gnome-search-tool.xml
 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
@@ -409,6 +441,7 @@ 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-el.omf
 share/omf/baobab/baobab-en_GB.omf
 share/omf/baobab/baobab-es.omf
 share/omf/baobab/baobab-eu.omf
@@ -420,10 +453,12 @@ share/omf/baobab/baobab-pl.omf
 share/omf/baobab/baobab-ru.omf
 share/omf/baobab/baobab-sv.omf
 share/omf/baobab/baobab-uk.omf
+share/omf/baobab/baobab-zh_CN.omf
 share/omf/baobab/baobab-zh_HK.omf
 share/omf/baobab/baobab-zh_TW.omf
 share/omf/gnome-dictionary/gnome-dictionary-C.omf
 share/omf/gnome-dictionary/gnome-dictionary-ca.omf
+share/omf/gnome-dictionary/gnome-dictionary-cs.omf
 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
@@ -438,7 +473,9 @@ share/omf/gnome-dictionary/gnome-dictionary-sv.omf
 share/omf/gnome-dictionary/gnome-dictionary-uk.omf
 share/omf/gnome-search-tool/gnome-search-tool-C.omf
 share/omf/gnome-search-tool/gnome-search-tool-ca.omf
+share/omf/gnome-search-tool/gnome-search-tool-cs.omf
 share/omf/gnome-search-tool/gnome-search-tool-de.omf
+share/omf/gnome-search-tool/gnome-search-tool-el.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
@@ -478,8 +515,10 @@ share/locale/be@latin/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/br/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-utils-2.0.mo
 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
@@ -504,7 +543,6 @@ 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/kn/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
@@ -531,7 +569,6 @@ share/locale/pt_BR/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/si/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-utils-2.0.mo
@@ -607,8 +644,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-search-tool/es
 @dirrm share/gnome/help/gnome-search-tool/en_GB/figures
 @dirrm share/gnome/help/gnome-search-tool/en_GB
+@dirrm share/gnome/help/gnome-search-tool/el/figures
+@dirrm share/gnome/help/gnome-search-tool/el
 @dirrm share/gnome/help/gnome-search-tool/de/figures
 @dirrm share/gnome/help/gnome-search-tool/de
+@dirrm share/gnome/help/gnome-search-tool/cs/figures
+@dirrm share/gnome/help/gnome-search-tool/cs
 @dirrm share/gnome/help/gnome-search-tool/ca/figures
 @dirrm share/gnome/help/gnome-search-tool/ca
 @dirrm share/gnome/help/gnome-search-tool/C/figures
@@ -638,6 +679,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-dictionary/el
 @dirrm share/gnome/help/gnome-dictionary/de/figures
 @dirrm share/gnome/help/gnome-dictionary/de
+@dirrm share/gnome/help/gnome-dictionary/cs/figures
+@dirrm share/gnome/help/gnome-dictionary/cs
 @dirrm share/gnome/help/gnome-dictionary/ca/figures
 @dirrm share/gnome/help/gnome-dictionary/ca
 @dirrm share/gnome/help/gnome-dictionary/C/figures
@@ -647,6 +690,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/baobab/zh_TW
 @dirrm share/gnome/help/baobab/zh_HK/figures
 @dirrm share/gnome/help/baobab/zh_HK
+@dirrm share/gnome/help/baobab/zh_CN/figures
+@dirrm share/gnome/help/baobab/zh_CN
 @dirrm share/gnome/help/baobab/uk/figures
 @dirrm share/gnome/help/baobab/uk
 @dirrm share/gnome/help/baobab/sv/figures
@@ -669,6 +714,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @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/el/figures
+@dirrm share/gnome/help/baobab/el
 @dirrm share/gnome/help/baobab/de/figures
 @dirrm share/gnome/help/baobab/de
 @dirrm share/gnome/help/baobab/da/figures
@@ -699,8 +746,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.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/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/ps/LC_MESSAGES
@@ -717,6 +762,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES