Depend on the latest glib2 and gnome-vfs2 which have sane paths built in.

Avoid the need to mess with the environment WRT the XDG_{CONFIG,DATA}_DIRS
variables.

While here, fix installation of this package (missing files), caused by
a change recently made to libgnomeui (-lSM is not a direct dependency any
more).

Bump PKGREVISION to 2.

3 files changed, 30 insertions, 28 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 56b557fc01d..15b5c1639b4 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2004/11/19 19:59:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.46 2005/01/11 12:36:24 jmmv Exp $
 #
 
 DISTNAME=		gnome-session-2.8.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.8/}
 SITES_gnome-splash-2.8.0.1.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
@@ -32,15 +32,10 @@ CPPFLAGS+=		-DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\\\"\"
 
 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.8.0.1.png \
-	    ${WRKSRC}/gnome-session/gnome-splash.png
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash-orig.png \
-	    ${PREFIX}/share/pixmaps/splash/gnome-splash-orig.png
+# Make sure we do not use old packages that rely on XDG_{CONFIG,DATA}_DIRS
+# in the environment being set.
+BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.1
+BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.8.3nb1
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -54,4 +49,15 @@ post-install:
 .include "../../textproc/scrollkeeper/buildlink3.mk"
 .include "../../x11/gnome2-control-center/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+
+post-extract:
+	${MV} ${WRKSRC}/gnome-session/gnome-splash.png \
+	    ${WRKSRC}/gnome-session/gnome-splash-orig.png
+	${CP} ${DISTDIR}/gnome-splash-2.8.0.1.png \
+	    ${WRKSRC}/gnome-session/gnome-splash.png
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash-orig.png \
+	    ${PREFIX}/share/pixmaps/splash/gnome-splash-orig.png
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 47899255057..3b46ff971bd 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.16 2004/12/08 02:13:39 taca Exp $
+$NetBSD: distinfo,v 1.17 2005/01/11 12:36:24 jmmv Exp $
 
 SHA1 (gnome-session-2.8.1.tar.bz2) = 0766a65f3b9de1b3266018da2c8f0fe0465e8f23
 Size (gnome-session-2.8.1.tar.bz2) = 883921 bytes
 SHA1 (gnome-splash-2.8.0.1.png) = c278e7fd1eb487b1905cedf0bb62e2672ba0e6f8
 Size (gnome-splash-2.8.0.1.png) = 115672 bytes
 SHA1 (patch-aa) = 6cdba04e00c439858b428dd275fff1c0c263534f
-SHA1 (patch-ab) = cb6e685ec5f2aa34fd72b7106906b3c05f519761
+SHA1 (patch-ab) = 7287c9f0a921f2dfe28373027a4f3564d58e5ac8
 SHA1 (patch-ac) = 45c0b5fcdef56b2286dbf84e73e924f5ad74bc6d
 SHA1 (patch-ae) = 36c909fcd0da338c692a49bf3a95e8867efac197
diff --git a/x11/gnome-session/patches/patch-ab b/x11/gnome-session/patches/patch-ab
index d19567c1b31..2228c4ceef7 100644
--- a/x11/gnome-session/patches/patch-ab
+++ b/x11/gnome-session/patches/patch-ab
@@ -1,16 +1,12 @@
-$NetBSD: patch-ab,v 1.3 2004/09/21 16:58:42 jmmv Exp $
+$NetBSD: patch-ab,v 1.4 2005/01/11 12:36:24 jmmv Exp $
 
---- gnome-session/main.c.orig	2004-08-16 15:36:51.000000000 +0200
-+++ gnome-session/main.c
-@@ -395,6 +395,11 @@ main (int argc, char *argv[])
-   ep = g_strconcat ("DISPLAY=", gdk_get_display (), NULL);
-   putenv (ep);
- 
-+  ep = "XDG_DATA_DIRS=" PREFIX "/share/";
-+  putenv (ep);
-+  ep = "XDG_CONFIG_DIRS=" PKG_SYSCONFDIR "/xdg/";
-+  putenv (ep);
-+
-   ignore (SIGPIPE);
- 
-   /* Need DISPLAY set */
+--- configure.orig	2004-10-12 17:57:32.000000000 +0200
++++ configure
+@@ -24686,6 +24686,7 @@ case "$GNOME_SESSION_LIBS" in
+ 		GNOME_HAVE_SM=no
+ 		;;
+ esac
++GNOME_HAVE_SM=yes
+ echo "$as_me:$LINENO: result: $GNOME_HAVE_SM" >&5
+ echo "${ECHO_T}$GNOME_HAVE_SM" >&6
+ if test "$GNOME_HAVE_SM" = no ; then