Update to 2.6.0. Changes since previous stable version:

Version 2.6.0
=============

  Translators

	* Gareth Owen (en_GB)

Version 2.5.92
==============

  Translations

	* Sayed Jaffer Al-Mosawi (ar)
	* Peter \"Peshka\" Slavov (bg)
	* Alexander Winston (en_CA)
	* Elian Myftiu (sq)
	* Danilo Segan (sr)
	* Gurban Mohemmet Tewekgeli (tk)
	* Maxim Dziumanenko (uk)

Version 2.5.91
==============

  libgnome-desktop

	* Fix issue where dragging a file from an nfs mounted dir onto
	  a launcher wouldn't work (Mark)
	* Make the launcher editor use GtkFileChooser (Brian Skahan)

  Misc

	* Don't depend on strptime (Mark)
	* Check for scrollkeeper in configure (Mark)
	* Fixup OMF files to validate with latest scrollkeeper (Mark)

  Translations

	* Laszlo Dvornik (hu)
	* Luca Ferretti (it)
	* Amanpreet Singh Alam (pa)
	* Duarte Loreto (pt)
	* Elian Myftiu (sq)
	* Dinesh Nadarajah (ta)
	* Paisa Seeluangsawat (th)

Version 2.5.90
==============

  Misc

	* Allow build against an uninstalled build (Laszlo Peter)

Version 2.5.5
=============

  Misc

	* Use the new applications icon for the Applications menu (Mark)

Version 2.5.4
=============

  About Dialog

	* Set intro text as non-editable (Fernando Herrera)
	* Plug some leaks (Kjartan Maraas)

  libgnome-desktop

	* Include correct i18n header to fix warnings (The Written Word)

  Misc

	* Use the common docs build system (Malcolm Tredinnick)
	* Small configure.in cleanup (Tomasz K³oczko)
	* Fix underquoted AM_PATH_ESD issue (Alexander Winston)
	* Don't included generated .desktop files in tarball (Mark)
	* Distcheck fix (Mark)

  Translators

	* Christophe Merlet (RedFox) (fr)
	* Kjartan Maraas (no)
	* Miloslav Trmac (cs)

Version 2.5.3
=============

  About Dialog

	* Update the "Contact" link (Alex Duggan)

  Misc

	* FDL/GPL/LGPL docs updates (Eric Baudais)

  Translators

	* Dmitry G. Mastrukov (ru)

Version 2.5.2
=============

  libgnome-desktop

	* Handle g_filename_from_utf8() failure (Dennis Cranston)

  Translators

	* Danilo Segan (sr)
	* Kjartan Maraas (no)
	* Kostas Papadimas (el)

Version 2.5.1
=============

  libgnome-desktop

	* Remove unnecessary accessibility code (Padraig)
	* Use the correct mnemonic widget for the command entry (Padraig)

  Misc

	* Add a --enable-deprecations build flag (Mark)

  Translators

	Abel Cheung (zh_TW)
	G Karunakar (hi)
	Jordi Mallach (ca)
	Ole Laursen (da)
	Sanlig Badral (mn)

4 files changed, 27 insertions, 15 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 8553e10ecd9..1d8da1529e5 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2004/03/26 02:27:59 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/01 18:36:11 jmmv Exp $
 #
 
-DISTNAME=		gnome-desktop-2.4.1.1
-PKGREVISION=		5
+DISTNAME=		gnome-desktop-2.6.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -12,7 +11,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Common GNOME2 desktop files and libgnome-desktop library
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
@@ -29,6 +28,7 @@ USE_LIBTOOL=		yes
 .include "../../graphics/gnome2-pixmaps/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
diff --git a/x11/gnome-desktop/PLIST b/x11/gnome-desktop/PLIST
index af2a717fc8e..8dddf90eede 100644
--- a/x11/gnome-desktop/PLIST
+++ b/x11/gnome-desktop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/12/14 22:42:15 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/04/01 18:36:11 jmmv Exp $
 bin/gnome-about
 include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
 include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
@@ -7,7 +7,7 @@ lib/libgnome-desktop-2.a
 lib/libgnome-desktop-2.la
 lib/libgnome-desktop-2.so
 lib/libgnome-desktop-2.so.3
-lib/libgnome-desktop-2.so.3.9
+lib/libgnome-desktop-2.so.3.12
 lib/pkgconfig/gnome-desktop-2.0.pc
 man/man1/gnome-about.1
 share/gnome-about/gnome-64.gif
@@ -51,6 +51,7 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -63,6 +64,7 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -82,6 +84,7 @@ ${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -95,6 +98,7 @@ ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -102,13 +106,22 @@ ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
+share/omf/gnome-desktop/fdl-C.omf
+share/omf/gnome-desktop/gnome-feedback-C.omf
+share/omf/gnome-desktop/gpl-C.omf
+share/omf/gnome-desktop/lgpl-C.omf
+@dirrm share/omf/gnome-desktop
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/vfolders
-@exec ${MKDIR} %D/share/gnome/help/gnome-feedback/C/figures
-@dirrm share/gnome/help/gnome-feedback/C/figures
+@comment in gnome2-dirs: @dirrm share/gnome/help/lgpl/C
+@comment in gnome2-dirs: @dirrm share/gnome/help/gpl/C
 @dirrm share/gnome/help/gnome-feedback/C
 @dirrm share/gnome/help/gnome-feedback
+@comment in gnome2-dirs: @dirrm share/gnome/help/fdl/C
+@comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/gnome-about/headers
 @dirrm share/gnome-about
+@comment in gnome2-dirs: @dirrm share/gnome
 @dirrm include/gnome-desktop-2.0/libgnomeui
 @dirrm include/gnome-desktop-2.0/libgnome
 @dirrm include/gnome-desktop-2.0
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index 5160a14d044..fec7b3a3f65 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/26 02:27:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/04/01 18:36:11 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_DESKTOP_BUILDLINK3_MK:=	${GNOME_DESKTOP_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-desktop}
 BUILDLINK_PACKAGES+=	gnome-desktop
 
 .if !empty(GNOME_DESKTOP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-desktop+=	gnome-desktop>=2.4.1.1nb2
-BUILDLINK_RECOMMENDED.gnome-desktop?=	gnome-desktop>=2.4.1.1nb5
+BUILDLINK_DEPENDS.gnome-desktop+=	gnome-desktop>=2.6.0
 BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 .endif	# GNOME_DESKTOP_BUILDLINK3_MK
 
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index d0f62e705bd..7fcd3f66cf6 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/12/14 22:42:15 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2004/04/01 18:36:11 jmmv Exp $
 
-SHA1 (gnome-desktop-2.4.1.1.tar.bz2) = d9294bd9633a3c4c522b2db35c67253bbbfb1cee
-Size (gnome-desktop-2.4.1.1.tar.bz2) = 1054097 bytes
+SHA1 (gnome-desktop-2.6.0.tar.bz2) = 1c067a2e76ca5db38bc80fce0920861ff375fe34
+Size (gnome-desktop-2.6.0.tar.bz2) = 1095481 bytes
 SHA1 (patch-ae) = 85ff31395a7d24693e3125ee5c180a075612207c