[pkgsrc/trunk]: pkgsrc/x11/gnome-session update to 2.22.1.1

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/662ea3ac35dc
branches:  trunk
changeset: 541130:662ea3ac35dc
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Apr 15 18:06:15 2008 +0000

description:
update to 2.22.1.1
This switches to the gnome-2.22 release branch.

diffstat:

 x11/gnome-session/Makefile         |   9 ++++-----
 x11/gnome-session/PLIST            |   4 +++-
 x11/gnome-session/distinfo         |  10 +++++-----
 x11/gnome-session/patches/patch-aa |   8 ++++----
 4 files changed, 16 insertions(+), 15 deletions(-)

diffs (98 lines):

diff -r 402e18a34f61 -r 662ea3ac35dc x11/gnome-session/Makefile
--- a/x11/gnome-session/Makefile        Tue Apr 15 18:05:29 2008 +0000
+++ b/x11/gnome-session/Makefile        Tue Apr 15 18:06:15 2008 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.93 2008/03/06 14:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2008/04/15 18:06:15 drochner Exp $
 #
 
-DISTNAME=              gnome-session-2.20.3
-PKGREVISION=           1
+DISTNAME=              gnome-session-2.22.1.1
 CATEGORIES=            x11 gnome
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-session/2.20/}
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-session/2.22/}
 SITES.gnome-splash-2.16.0.png= ${MASTER_SITE_LOCAL:=gnome-splash/}
 EXTRACT_SUFX=          .tar.bz2
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} gnome-splash-2.16.0.png
@@ -34,7 +33,6 @@
 # Make sure we do not use old packages that rely on XDG_{CONFIG,DATA}_DIRS
 # in the environment being set.
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.6.1
-BUILDLINK_API_DEPENDS.gnome-vfs2+=     gnome-vfs2>=2.8.3nb1
 
 BUILDLINK_DEPMETHOD.libXt?=    build
 
@@ -49,6 +47,7 @@
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../sysutils/gnome-settings-daemon/buildlink3.mk"
 .include "../../x11/gnome-control-center/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff -r 402e18a34f61 -r 662ea3ac35dc x11/gnome-session/PLIST
--- a/x11/gnome-session/PLIST   Tue Apr 15 18:05:29 2008 +0000
+++ b/x11/gnome-session/PLIST   Tue Apr 15 18:06:15 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2007/11/05 19:21:47 drochner Exp $
+@comment $NetBSD: PLIST,v 1.20 2008/04/15 18:06:15 drochner Exp $
 bin/gnome-session
 bin/gnome-session-properties
 bin/gnome-session-remove
@@ -43,6 +43,7 @@
 share/locale/fa/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/fi/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/fur/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/gu/LC_MESSAGES/gnome-session-2.0.mo
@@ -104,6 +105,7 @@
 share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
 share/pixmaps/splash/gnome-splash-orig.png
 share/pixmaps/splash/gnome-splash.png
+share/xsessions/gnome.desktop
 @dirrm share/pixmaps/splash
 @comment in xdg-dirs: @dirrm share/pixmaps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
diff -r 402e18a34f61 -r 662ea3ac35dc x11/gnome-session/distinfo
--- a/x11/gnome-session/distinfo        Tue Apr 15 18:05:29 2008 +0000
+++ b/x11/gnome-session/distinfo        Tue Apr 15 18:06:15 2008 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.34 2008/01/11 12:58:20 drochner Exp $
+$NetBSD: distinfo,v 1.35 2008/04/15 18:06:15 drochner Exp $
 
-SHA1 (gnome-session-2.20.3.tar.bz2) = cb76fbd436f43c51eed81d8fb3f7b3478e40d3e4
-RMD160 (gnome-session-2.20.3.tar.bz2) = 0e70455a1b776babc86ff472b6f7fd86a7c305e2
-Size (gnome-session-2.20.3.tar.bz2) = 751906 bytes
+SHA1 (gnome-session-2.22.1.1.tar.bz2) = 54ba733ec8c8530a1f9c03b9f11d66bf3e666163
+RMD160 (gnome-session-2.22.1.1.tar.bz2) = 0d8b26f95cee389e8aefd05251e16b7cd3703aa3
+Size (gnome-session-2.22.1.1.tar.bz2) = 773504 bytes
 SHA1 (gnome-splash-2.16.0.png) = 0d321be84c5668a2c0fecb494edc820d6b74ee9d
 RMD160 (gnome-splash-2.16.0.png) = 28667abaaef6ac20dde9f4101554a5043b4f9c96
 Size (gnome-splash-2.16.0.png) = 36601 bytes
-SHA1 (patch-aa) = e97c3f3c490b490b359d5b642c5d33a3e64b137d
+SHA1 (patch-aa) = 7cb4092f21ee08b7e7248df2cff677b678da22ec
 SHA1 (patch-ab) = b274bbe433151383ee0f2117dd2fb5746920be75
diff -r 402e18a34f61 -r 662ea3ac35dc x11/gnome-session/patches/patch-aa
--- a/x11/gnome-session/patches/patch-aa        Tue Apr 15 18:05:29 2008 +0000
+++ b/x11/gnome-session/patches/patch-aa        Tue Apr 15 18:06:15 2008 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.9 2007/11/05 19:21:48 drochner Exp $
+$NetBSD: patch-aa,v 1.10 2008/04/15 18:06:15 drochner Exp $
 
---- gnome-session/Makefile.in.orig     2007-09-17 20:55:46.000000000 +0200
+--- gnome-session/Makefile.in.orig     2008-03-10 22:01:44.000000000 +0100
 +++ gnome-session/Makefile.in
-@@ -311,7 +311,7 @@ INCLUDES = \
+@@ -301,7 +301,7 @@ INCLUDES = \
        -DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\"        \
        -DGNOME_ICONDIR=\""$(datadir)/pixmaps\""        \
        -DRSH_COMMAND=\""$(RSH_COMMAND)\""              \
 -      -DGCONFTOOL_CMD=\""$(GCONFTOOL)\""              \
 +      -DGCONFTOOL_CMD=\""$(REAL_GCONFTOOL)\""         \
        -DDEFAULTDIR="\"$(defaultdir)\""                \
-       -DESD_SERVER="\"$(ESD_SERVER)\""                \
        -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\""    \
+       -DTIME_UTILITY="\"$(TIME_UTILITY)\""            \