6 files changed, 17 insertions, 55 deletions
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 6507c2040c6..68fabd569c4 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2004/03/26 02:27:46 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2004/04/01 19:09:07 jmmv Exp $
 #
 
-DISTNAME=		gnome-utils-2.4.1
-PKGREVISION=		10
+DISTNAME=		gnome-utils-2.6.0
 CATEGORIES=		misc gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
diff --git a/misc/gnome2-utils/PLIST b/misc/gnome2-utils/PLIST
index 95150c54438..87b367933b3 100644
--- a/misc/gnome2-utils/PLIST
+++ b/misc/gnome2-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/02/22 15:49:50 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/04/01 19:09:07 jmmv Exp $
 bin/gnome-dictionary
 bin/gnome-search-tool
 bin/gnome-system-log
@@ -49,6 +49,9 @@ share/gnome/help/gnome-search-tool/sv/legal.xml
 share/gnome/help/gnome-search-tool/zh_CN/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/zh_CN/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/zh_CN/legal.xml
+share/gnome/help/gnome-search-tool/zh_HK/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/zh_HK/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/zh_HK/legal.xml
 share/gnome/help/gnome-search-tool/zh_TW/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/zh_TW/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/zh_TW/legal.xml
@@ -105,6 +108,7 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-utils-2.0.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-utils-2.0.mo
@@ -119,6 +123,7 @@ ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-utils-2.0.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-utils-2.0.mo
@@ -131,6 +136,7 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gnome-utils-2.0.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo
@@ -147,6 +153,7 @@ share/omf/gnome-utils/gnome-search-tool-ja.omf
 share/omf/gnome-utils/gnome-search-tool-ko.omf
 share/omf/gnome-utils/gnome-search-tool-sv.omf
 share/omf/gnome-utils/gnome-search-tool-zh_CN.omf
+share/omf/gnome-utils/gnome-search-tool-zh_HK.omf
 share/omf/gnome-utils/gnome-search-tool-zh_TW.omf
 share/omf/gnome-utils/gnome-system-log-C.omf
 share/omf/gnome-utils/gnome-system-log-de.omf
@@ -158,10 +165,6 @@ share/omf/gnome-utils/gnome-system-log-ko.omf
 share/omf/gnome-utils/gnome-system-log-sv.omf
 share/omf/gnome-utils/gnome-system-log-zh_CN.omf
 share/omf/gnome-utils/gnome-system-log-zh_TW.omf
-share/pixmaps/gdict.png
-share/pixmaps/gnome-search-tool/gnome-search-tool-animation.png
-share/pixmaps/gnome-searchtool.png
-@dirrm share/pixmaps/gnome-search-tool
 @dirrm share/omf/gnome-utils
 @comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/gnome-system-log/zh_TW/figures
@@ -187,6 +190,8 @@ share/pixmaps/gnome-searchtool.png
 @dirrm share/gnome/help/gnome-system-log
 @dirrm share/gnome/help/gnome-search-tool/zh_TW/figures
 @dirrm share/gnome/help/gnome-search-tool/zh_TW
+@dirrm share/gnome/help/gnome-search-tool/zh_HK/figures
+@dirrm share/gnome/help/gnome-search-tool/zh_HK
 @dirrm share/gnome/help/gnome-search-tool/zh_CN/figures
 @dirrm share/gnome/help/gnome-search-tool/zh_CN
 @dirrm share/gnome/help/gnome-search-tool/sv/figures
@@ -213,5 +218,5 @@ share/pixmaps/gnome-searchtool.png
 @dirrm share/gnome-system-log
 @comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
 @comment in GConf2: @dirrm share/gconf/schemas
-@comment in gnome2-dirs: @dirrm share/applications
+@comment in xdg-dirs: @dirrm share/applications
 @comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/misc/gnome2-utils/distinfo b/misc/gnome2-utils/distinfo
index 56b2025461a..5037bb55a1c 100644
--- a/misc/gnome2-utils/distinfo
+++ b/misc/gnome2-utils/distinfo
@@ -1,7 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/01/17 00:21:01 xtraeme Exp $
+$NetBSD: distinfo,v 1.4 2004/04/01 19:09:07 jmmv Exp $
 
-SHA1 (gnome-utils-2.4.1.tar.bz2) = 10316a89be78737672bb706ab326caf6ea71af17
-Size (gnome-utils-2.4.1.tar.bz2) = 1628878 bytes
-SHA1 (patch-aa) = 778654537ef7b6a071be1ae854545c3c9f612507
-SHA1 (patch-ab) = 48d42744bc5342f32158d7b9a8027f98dec04cd9
-SHA1 (patch-ac) = 5f6d505a52fa343456c8f2d7178cc4de434bd9ae
+SHA1 (gnome-utils-2.6.0.tar.bz2) = 28769efd7fde0292aed444d86c1cf13235c1b508
+Size (gnome-utils-2.6.0.tar.bz2) = 1639773 bytes
diff --git a/misc/gnome2-utils/patches/patch-aa b/misc/gnome2-utils/patches/patch-aa
deleted file mode 100644
index 84984a7f05f..00000000000
--- a/misc/gnome2-utils/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/04/21 03:34:02 rh Exp $
-
---- gdictsrc/Makefile.in.orig	2003-03-13 20:23:10.000000000 +1000
-+++ gdictsrc/Makefile.in
-@@ -161,7 +161,7 @@ serverdir = $(libdir)/bonobo/servers
- server_in_files = GNOME_GDictApplet.server.in
- server_DATA = $(server_in_files:.server.in=.server)
- 
--schemadir = $(sysconfdir)/gconf/schemas
-+schemadir = ${GCONF_SCHEMA_FILE_DIR}
- schemas_in_file = gdict.schemas.in
- schema_DATA = $(schemas_in_file:.schemas.in=.schemas)
- schema_source_data = $(foreach file, $(schema_DATA), $(srcdir)/$(file))
diff --git a/misc/gnome2-utils/patches/patch-ab b/misc/gnome2-utils/patches/patch-ab
deleted file mode 100644
index df47fd77ad4..00000000000
--- a/misc/gnome2-utils/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/04/21 03:34:02 rh Exp $
-
---- logview/Makefile.in.orig	2003-04-21 12:48:24.000000000 +1000
-+++ logview/Makefile.in
-@@ -149,7 +149,7 @@ man_MANS = gnome-system-log.1
- Utilities_in_files = gnome-system-log.desktop.in
- Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
- 
--schemadir = $(sysconfdir)/gconf/schemas
-+schemadir = ${GCONF_SCHEMA_FILE_DIR}
- schemas_in_file = logview.schemas.in
- schema_DATA = $(schemas_in_file:.schemas.in=.schemas)
- schema_source_data = $(foreach file, $(schema_DATA), $(srcdir)/$(file))
diff --git a/misc/gnome2-utils/patches/patch-ac b/misc/gnome2-utils/patches/patch-ac
deleted file mode 100644
index 8a001ccfff3..00000000000
--- a/misc/gnome2-utils/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/01/17 00:21:01 xtraeme Exp $
-
---- gsearchtool/Makefile.in.orig	2004-01-17 01:15:34.000000000 +0100
-+++ gsearchtool/Makefile.in	2004-01-17 01:16:02.000000000 +0100
-@@ -142,7 +142,7 @@
- 
- bin_PROGRAMS = gnome-search-tool
- 
--schemadir = $(sysconfdir)/gconf/schemas
-+schemadir = @GCONF_SCHEMA_FILE_DIR@
- schema_DATA = gnome-search-tool.schemas
- 
- gnome_search_tool_SOURCES = \