update to 2.28.1

This switches to the gnome-2.28 release branch.

3 files changed, 52 insertions, 18 deletions

diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 2b78ee8c301..191a02d92c4 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.94 2009/08/26 19:58:01 sno Exp $
+# $NetBSD: Makefile,v 1.95 2009/10/24 12:54:59 drochner Exp $
 #
 
-DISTNAME=		gnome-utils-2.26.0
-PKGREVISION=		1
+DISTNAME=		gnome-utils-2.28.1
 CATEGORIES=		misc gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.26/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.28/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
@@ -52,14 +51,9 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../devel/GConf-ui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../sysutils/libgtop/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
@@ -70,4 +64,6 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
+.include "../../audio/libcanberra/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnome-utils/PLIST b/misc/gnome-utils/PLIST
index edebe7c80f0..fd19b98f4da 100644
--- a/misc/gnome-utils/PLIST
+++ b/misc/gnome-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2009/06/14 18:07:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.17 2009/10/24 12:54:59 drochner Exp $
 bin/baobab
 bin/gnome-dictionary
 bin/gnome-panel-screenshot
@@ -24,6 +24,7 @@ lib/pkgconfig/gdict-1.0.pc
 libexec/gnome-dictionary-applet
 man/man1/baobab.1
 man/man1/gnome-dictionary.1
+man/man1/gnome-screenshot.1
 man/man1/gnome-search-tool.1
 man/man1/gnome-system-log.1
 share/applications/baobab.desktop
@@ -31,7 +32,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/baobab.glade
+share/baobab/baobab-dialog-scan-props.ui
+share/baobab/baobab-main-window.ui
 share/baobab/pixmaps/shot.png
 share/gconf/schemas/baobab.schemas
 share/gconf/schemas/gnome-dictionary.schemas
@@ -42,9 +44,11 @@ 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
+share/gnome-utils/logview-filter.ui
 share/gnome-utils/logview-toolbar.xml
 share/gnome/help/baobab/C/baobab.xml
 share/gnome/help/baobab/C/figures/baobab_fullscan.png
@@ -87,6 +91,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
@@ -175,6 +187,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
@@ -210,6 +230,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
@@ -323,8 +352,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
@@ -423,8 +456,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
@@ -449,7 +484,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
@@ -476,7 +510,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
@@ -499,6 +532,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
@@ -510,10 +544,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
@@ -528,7 +564,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
diff --git a/misc/gnome-utils/distinfo b/misc/gnome-utils/distinfo
index 1d0b389ccfc..e495fc91db5 100644
--- a/misc/gnome-utils/distinfo
+++ b/misc/gnome-utils/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2009/03/17 12:07:47 jmcneill Exp $
+$NetBSD: distinfo,v 1.16 2009/10/24 12:54:59 drochner Exp $
 
-SHA1 (gnome-utils-2.26.0.tar.bz2) = ac1078ad2d75a561f7aa562d06316a221d6dcbc4
-RMD160 (gnome-utils-2.26.0.tar.bz2) = 7ef1bc0d7a497135426fa79505726b50acb75547
-Size (gnome-utils-2.26.0.tar.bz2) = 6882359 bytes
+SHA1 (gnome-utils-2.28.1.tar.bz2) = 2828e3e2defd0a829b40b28ae0c4bdcb3de067ef
+RMD160 (gnome-utils-2.28.1.tar.bz2) = 207d707ece3f1fa1359abdc5f6f7779654177726
+Size (gnome-utils-2.28.1.tar.bz2) = 6827650 bytes
 SHA1 (patch-aa) = 86226faedcf3078507799432b42b5601c4bc412e
 SHA1 (patch-ac) = 482b496673bcfd4be21d5defed51e74da3009982