Update to 2.6.0:

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

  Translators

	* Alexander Winston (en_CA)
	* Gareth Owen (en_GB)
	* Jitendra Shah (mr)
	* Mişu Moldovan (ro)
	* Leonid Kanter (ru)

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

  Translators

	* Vladimir \"Kaladan\" Petkov (bg)
	* Dinesh Nadarajah (ta)
	* Maxim Dziumanenko (uk)

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

  Session Manager

	* New splash screen for 2.6 (Jakub Steiner)
	* Make the capplet use GtkFileChooser (Chris Kelso)

  Translations

	* Mətin Əmirov (az)
	* Laszlo Dvornik (hu)
	* Christopher R. Gabriel (it)
	* Amanpreet Singh Alam (pa)
	* Paisa Seeluangsawat (th)

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

  Translations

	* Laurent Dhima (sq)
	* Paisa Seeluangsawat (th)

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

  Session Manager

	* Set accessible role on the logout dialog (Padraig)
	* Update help links to the new user-guide location (Mark)

  Session Properties Dialog

	* Make Escape actually with the warning dialog (Bala)
	* Don't warn user about discarding changes if no changes have been made (Bala)

  Translators

	* Changwoo Ryu (ko)
	* Robert Sedak (hr)
	* Maxim Dziumanenko (uk)

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

  Session Manager

	* Don't show silly icon when we can't find an splash icon (Glynn)
	* Update the icon map (Luca Ferretti)
	* Fix usage of deprecated function (Kjartan)

  Misc

	* Fix issue with underquoted definition of AM_PATH_ESD (Alexander
	  Winston)
	* Kill unused .desktop file (Mark)
	* Update support for lwm (James F. Carter)
	* Add support for openbox (Michael Terry)

  Translators

	* Kjartan Maraas (no)
	* Laurent Dhima (sq)
	* Miloslav Trmac (cs)
	* Mətin Əmirov (az)
	* Reinout van Schouwen (nl)

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

  Session Manager

	* Fix lock-up on log out with glib 2.3.1 (Mark)
	* Use a managed window for the logout dialog when accessibility
	  is enabled (Mark, Bill Haneman)
	* Require gtk+ 2.3.x and dump the pangox coverage cache hack (Mark)

  Translators

	* Duarte Loreto (pt)
	* Isam Bayazidi (ar)
	* Paul Duffy (ga)
	* Sanlig Badral (mn)

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

  Session Manager

	* Start the gnome-keyring daemon at login (Alexander Larsson)
	* Shut down the GConf daemon at logout (W. Michael Petullo, Mark)
	* Don't set the full path of the splash screen in GConf (Mark)

  Translators

	* Kostas Papadimas (el)
	* Paisa Seeluangsawat (th)

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

  Misc

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

  Translators

	Dafydd Harries (cy)
	Miloslav Trmac (cs)

4 files changed, 36 insertions, 16 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 3bf5d11e1c7..e1d2206528d 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.36 2004/03/26 02:27:59 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2004/04/01 18:48:11 jmmv Exp $
 #
 
-DISTNAME=		gnome-session-2.4.2
-PKGREVISION=		6
+DISTNAME=		gnome-session-2.6.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.4/}
-SITES_gnome-splash-2.4.2.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.6/}
+SITES_gnome-splash-2.6.0.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
 EXTRACT_SUFX=		.tar.bz2
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX} gnome-splash-2.4.2.png
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} gnome-splash-2.6.0.png
 
 MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
@@ -26,12 +25,14 @@ USE_X11=		yes
 USE_PERL5=		build
 USE_LIBTOOL=		yes
 
+MAKE_ENV+=		REAL_GCONFTOOL="${GCONFTOOL2}"
+
 GCONF2_SCHEMAS= 	gnome-session.schemas
 
 post-extract:
 	${MV} ${WRKSRC}/gnome-session/gnome-splash.png \
 	    ${WRKSRC}/gnome-session/gnome-splash-orig.png
-	${CP} ${DISTDIR}/gnome-splash-2.4.2.png \
+	${CP} ${DISTDIR}/gnome-splash-2.6.0.png \
 	    ${WRKSRC}/gnome-session/gnome-splash.png
 
 post-install:
@@ -45,7 +46,9 @@ post-install:
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/buildlink3.mk"
 .include "../../x11/gnome2-control-center/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-session/PLIST b/x11/gnome-session/PLIST
index c77bbf1e5c2..577201558fb 100644
--- a/x11/gnome-session/PLIST
+++ b/x11/gnome-session/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/03/07 17:42:23 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/04/01 18:48:11 jmmv Exp $
 bin/gnome-session
 bin/gnome-session-properties
 bin/gnome-session-remove
@@ -28,6 +28,7 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-session-2.0.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-session-2.0.mo
@@ -40,6 +41,7 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-session-2.0.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/gnome-session-2.0.mo
@@ -52,10 +54,12 @@ ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-session-2.0.mo
+${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-session-2.0.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo
@@ -75,11 +79,10 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
-share/pixmaps/splash/gnome-splash.png
 share/pixmaps/splash/gnome-splash-orig.png
+share/pixmaps/splash/gnome-splash.png
 @dirrm share/pixmaps/splash
-@exec ${MKDIR} %D/share/omf/gnome-core
-@unexec ${RMDIR} %D/share/omf/gnome-core 2>/dev/null || ${TRUE}
+@comment in xdg-dirs: @dirrm share/pixmaps
 @comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf2: @dirrm share/gconf/schemas
 @comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index fda548dcfc2..9aad064a181 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2004/03/07 17:42:23 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2004/04/01 18:48:11 jmmv Exp $
 
-SHA1 (gnome-session-2.4.2.tar.bz2) = c9001f78a4c02ef5b34114c8a0407157d22a73ae
-Size (gnome-session-2.4.2.tar.bz2) = 911570 bytes
-SHA1 (gnome-splash-2.4.2.png) = 6a74dd7847713d4667479920731b23a73402dfd6
-Size (gnome-splash-2.4.2.png) = 68834 bytes
+SHA1 (gnome-session-2.6.0.tar.bz2) = 0f01ba17747cb4da23ec5925acdc2b039f3eeba7
+Size (gnome-session-2.6.0.tar.bz2) = 836172 bytes
+SHA1 (gnome-splash-2.6.0.png) = b4eb67f21208f2262c1e4e6b284115bfbe3f4590
+Size (gnome-splash-2.6.0.png) = 124455 bytes
+SHA1 (patch-aa) = 17add977c9edf787128ff1311fa83182bbe8c967
diff --git a/x11/gnome-session/patches/patch-aa b/x11/gnome-session/patches/patch-aa
new file mode 100644
index 00000000000..f5983b78a2f
--- /dev/null
+++ b/x11/gnome-session/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.4 2004/04/01 18:48:11 jmmv Exp $
+
+--- gnome-session/Makefile.in.orig	2004-03-09 11:59:34.000000000 +0100
++++ gnome-session/Makefile.in
+@@ -164,7 +164,7 @@ INCLUDES = \
+ 	-DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\""	\
+ 	-DHALT_COMMAND=\""$(HALT_COMMAND)\""		\
+ 	-DRSH_COMMAND=\""$(RSH_COMMAND)\""		\
+-	-DGCONFTOOL_CMD=\""$(GCONFTOOL)\""		\
++	-DGCONFTOOL_CMD=\""$(REAL_GCONFTOOL)\""		\
+ 	-DDEFAULTDIR="\"$(defaultdir)\""		\
+ 	-DESD_SERVER="\"$(ESD_SERVER)\""
+