Update gnome2-pixmaps and gnome-desktop to 2.10.0:

==============
Version 2.10.0
==============

  Translators

	* Gabor Kelemen (hu)
	* Luca Ferretti (it)
	* Žygimantas Beručka (lt)
	* Dan Damian (ro)
	* Leonid Kanter (ru)
	* Данило Шеган (sr)
	* Canonical Ltd (xh)
	* Abel Cheung (zh_TW)

==============
Version 2.9.92
==============

  Misc

	* Remove icons that are in gnome-icon-theme

  Translators

	* Vladimir "Kaladan" Petkov (bg)
	* Martin Willemoes Hansen (da)
	* Christophe Merlet (RedFox) (fr)
	* Ankit Patel (gu)
	* Changwoo Ryu (ko)
	* Kjartan Maraas (nb)
	* Kjartan Maraas (no)
	* Gnome PL Team (pl)
	* Evandro Fernandes Giovanini (pt_BR)
	* Paisa Seeluangsawat (th)
	* Baris Cicek (tr)
	* Maxim Dziumanenko (uk)
	* Canonical Ltd (xh)

==============
Version 2.9.91
==============

  libgnome-desktop

	* New gnome_desktop_item_set_launch_time() API (Elijah Newren, Mark)

  Translators

	* Jordi Mallach (ca)
	* Nikos Charonitakis (el)
	* David Lodge (en_GB)
	* Ivar Smolin (et)
	* Pauli Virtanen (fi)
	* Gil Osher (he)
	* Žygimantas Beručka (lt)
	* Duarte Loreto (pt)
	* Elian Myftiu (sq)

================
Version 2.9.90.1
================

  Misc

	* update LT_VERSION
	* update GNOME version

==============
Version 2.9.90
==============

  Translators

	* Vladimir "Kaladan" Petkov (bg)
	* Telsa Gwynne (cy)
	* Frank Arnold (de)
	* Francisco Javier F. Serrador (es)
	* Priit Laes (et)
	* Takeshi AIHANA (ja)
	* Tino Meinen (nl)
	* Åsmund Skjæveland (nn)
	* Marcel Telka (sk)
	* Elian Myftiu (sq)
	* Christian Rose (sv)

=============
Version 2.9.4
=============

  Misc

	* Add .desktop file for gnome-about (Vincent Untz)
	* Fix compiler warning (Kjartan)
	* distcheck fixing (Mark)

  libgnome-desktop

	* Don't append invalid URIs to command line when launching (Vijaykumar Patwari)

  Translators

	* Miloslav Trmac (cs)
	* Adam Weinberger (en_CA)
	* Žygimantas Beručka (lt)
	* Kjartan Maraas (nb)
	* Kjartan Maraas (no)
	* Christian Rose (sv)

=============
Version 2.9.3
=============

  Translators

	* Zuza Software Foundation (nso)
	* Zuza Software Foundation (zu)

=============
Version 2.9.2
=============

  Misc

	* move some icons in gnome-applets & gnome-icon-theme (David Madeley, Mark)
	* move data files for the menus to gnome-menus (Mark)
	* don't use some deprecated functions (Vincent)

  Translators

	* Meelad Zakaria (fa)
	* Zuza Software Foundation (nso)

4 files changed, 16 insertions, 30 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 426e2187383..0629abee034 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2005/02/26 17:24:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2005/03/22 16:09:27 jmmv Exp $
 #
 
-DISTNAME=		gnome-desktop-2.8.3
+DISTNAME=		gnome-desktop-2.10.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.8/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.10/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -21,11 +21,12 @@ USE_PERL5=		yes
 USE_X11=		yes
 USE_LIBTOOL=		yes
 
-BUILDLINK_DEPENDS.gnome2-pixmaps+=	gnome2-pixmaps>=2.8.1
+BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../graphics/gnome2-pixmaps/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/x11/gnome-desktop/PLIST b/x11/gnome-desktop/PLIST
index dcd10840a47..89e99cc1598 100644
--- a/x11/gnome-desktop/PLIST
+++ b/x11/gnome-desktop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/02/26 17:24:55 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/03/22 16:09:27 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
@@ -6,6 +6,7 @@ include/gnome-desktop-2.0/libgnomeui/gnome-hint.h
 lib/libgnome-desktop-2.la
 lib/pkgconfig/gnome-desktop-2.0.pc
 man/man1/gnome-about.1
+share/applications/gnome-about.desktop
 share/gnome-about/gnome-64.gif
 share/gnome-about/gnome-version.xml
 share/gnome-about/headers/header-bg-ancient01a.png
@@ -25,18 +26,6 @@ share/gnome/help/gpl/C/gpl.xml
 share/gnome/help/gpl/eu/gpl.xml
 share/gnome/help/lgpl/C/lgpl.xml
 share/gnome/help/lgpl/eu/lgpl.xml
-share/gnome/vfolders/Accessories.directory
-share/gnome/vfolders/Applications.directory
-share/gnome/vfolders/Development.directory
-share/gnome/vfolders/Games.directory
-share/gnome/vfolders/Graphics.directory
-share/gnome/vfolders/Internet.directory
-share/gnome/vfolders/Multimedia.directory
-share/gnome/vfolders/Office.directory
-share/gnome/vfolders/Other.directory
-share/gnome/vfolders/Root.directory
-share/gnome/vfolders/Settings.directory
-share/gnome/vfolders/System.directory
 ${PKGLOCALEDIR}/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -108,6 +97,7 @@ ${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
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -123,7 +113,6 @@ share/omf/gnome-desktop/lgpl-C.omf
 share/omf/gnome-desktop/lgpl-eu.omf
 @dirrm share/omf/gnome-desktop
 @comment in scrollkeeper: @dirrm share/omf
-@dirrm share/gnome/vfolders
 @dirrm share/gnome/help/lgpl/eu
 @comment in gnome2-dirs: @dirrm share/gnome/help/lgpl/C
 @comment in gnome2-dirs: @dirrm share/gnome/help/lgpl
@@ -139,6 +128,7 @@ share/omf/gnome-desktop/lgpl-eu.omf
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/gnome-about/headers
 @dirrm share/gnome-about
+@comment in xdg-dirs: @dirrm share/applications
 @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 2044b55a202..75980c908a2 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/10/03 00:18:31 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2005/03/22 16:09:27 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_DESKTOP_BUILDLINK3_MK:=	${GNOME_DESKTOP_BUILDLINK3_MK}+
@@ -11,13 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-desktop}
 BUILDLINK_PACKAGES+=	gnome-desktop
 
 .if !empty(GNOME_DESKTOP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-desktop+=	gnome-desktop>=2.8.0
-BUILDLINK_RECOMMENDED.gnome-desktop+=	gnome-desktop>=2.8.0nb1
+BUILDLINK_DEPENDS.gnome-desktop+=	gnome-desktop>=2.10.0
 BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
-
-PRINT_PLIST_AWK+=	/^@dirrm share\/gnome\/vfolders$$/ \
-				{ print "@comment in gnome-desktop: " $$0; \
-				  next; }
 .endif	# GNOME_DESKTOP_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 6c1582eee13..6a8c74ca17b 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2005/02/26 17:24:55 jmmv Exp $
+$NetBSD: distinfo,v 1.13 2005/03/22 16:09:27 jmmv Exp $
 
-SHA1 (gnome-desktop-2.8.3.tar.bz2) = 8bc7a971c9861e73ae94b12901a916951509a96f
-RMD160 (gnome-desktop-2.8.3.tar.bz2) = 72e411e5f0b3828772ad34c70b25c1513895a5f6
-Size (gnome-desktop-2.8.3.tar.bz2) = 1142079 bytes
+SHA1 (gnome-desktop-2.10.0.tar.bz2) = 541ebe85b243943055cf1e63487d3e0113f2b4cf
+RMD160 (gnome-desktop-2.10.0.tar.bz2) = e7c58805a5b4078f49e86d1111c283d31a461019
+Size (gnome-desktop-2.10.0.tar.bz2) = 1102509 bytes
 SHA1 (patch-ae) = 66bfd41d49347ec4fb8edc063988a07f4fb58f7d
 SHA1 (patch-ag) = ad8d3466bdfe18c1b853ba69f863db35a5891996