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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/38cd25bd6efe
branches:  trunk
changeset: 535009:38cd25bd6efe
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Mon Nov 05 19:21:47 2007 +0000

description:
update to 2.20.1
This switches to the new gnome-2.20 branch.

diffstat:

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

diffs (100 lines):

diff -r ac5f923b1174 -r 38cd25bd6efe x11/gnome-session/Makefile
--- a/x11/gnome-session/Makefile        Mon Nov 05 19:18:23 2007 +0000
+++ b/x11/gnome-session/Makefile        Mon Nov 05 19:21:47 2007 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.89 2007/09/21 13:04:30 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2007/11/05 19:21:47 drochner Exp $
 #
 
-DISTNAME=              gnome-session-2.18.3
-PKGREVISION=           4
+DISTNAME=              gnome-session-2.20.1
 CATEGORIES=            x11 gnome
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-session/2.18/}
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-session/2.20/}
 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
@@ -49,8 +48,7 @@
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../textproc/scrollkeeper/buildlink3.mk"
-.include "../../x11/control-center/buildlink3.mk"
+.include "../../x11/gnome-control-center/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
diff -r ac5f923b1174 -r 38cd25bd6efe x11/gnome-session/PLIST
--- a/x11/gnome-session/PLIST   Mon Nov 05 19:18:23 2007 +0000
+++ b/x11/gnome-session/PLIST   Mon Nov 05 19:21:47 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2007/09/25 10:54:23 hira Exp $
+@comment $NetBSD: PLIST,v 1.19 2007/11/05 19:21:47 drochner Exp $
 bin/gnome-session
 bin/gnome-session-properties
 bin/gnome-session-remove
@@ -22,6 +22,7 @@
 share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-session-2.0.mo
@@ -81,6 +82,7 @@
 share/locale/ro/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
@@ -88,6 +90,7 @@
 share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/te/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
diff -r ac5f923b1174 -r 38cd25bd6efe x11/gnome-session/distinfo
--- a/x11/gnome-session/distinfo        Mon Nov 05 19:18:23 2007 +0000
+++ b/x11/gnome-session/distinfo        Mon Nov 05 19:21:47 2007 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.31 2007/07/13 17:40:43 drochner Exp $
+$NetBSD: distinfo,v 1.32 2007/11/05 19:21:47 drochner Exp $
 
-SHA1 (gnome-session-2.18.3.tar.bz2) = 35170535d20ffdaf02af445104394decc20a52c1
-RMD160 (gnome-session-2.18.3.tar.bz2) = 109ad8c913bc4cd67412a0a6521d25af50385e87
-Size (gnome-session-2.18.3.tar.bz2) = 716092 bytes
+SHA1 (gnome-session-2.20.1.tar.bz2) = d1dedcafe8685cfd8763e04ae3d5d696eb353797
+RMD160 (gnome-session-2.20.1.tar.bz2) = 528ee1f64973cefa0d86afdf574ad6ca69c3e72b
+Size (gnome-session-2.20.1.tar.bz2) = 759126 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) = 817579fb223f59e5d86fd041585a714f9262cf89
+SHA1 (patch-aa) = e97c3f3c490b490b359d5b642c5d33a3e64b137d
 SHA1 (patch-ab) = b274bbe433151383ee0f2117dd2fb5746920be75
diff -r ac5f923b1174 -r 38cd25bd6efe x11/gnome-session/patches/patch-aa
--- a/x11/gnome-session/patches/patch-aa        Mon Nov 05 19:18:23 2007 +0000
+++ b/x11/gnome-session/patches/patch-aa        Mon Nov 05 19:21:47 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2007/04/11 20:25:38 drochner Exp $
+$NetBSD: patch-aa,v 1.9 2007/11/05 19:21:48 drochner Exp $
 
---- gnome-session/Makefile.in.orig     2007-03-12 19:59:22.000000000 +0100
+--- gnome-session/Makefile.in.orig     2007-09-17 20:55:46.000000000 +0200
 +++ gnome-session/Makefile.in
-@@ -309,7 +309,7 @@ INCLUDES = \
+@@ -311,7 +311,7 @@ INCLUDES = \
        -DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\"        \
        -DGNOME_ICONDIR=\""$(datadir)/pixmaps\""        \
        -DRSH_COMMAND=\""$(RSH_COMMAND)\""              \
@@ -10,4 +10,4 @@
 +      -DGCONFTOOL_CMD=\""$(REAL_GCONFTOOL)\""         \
        -DDEFAULTDIR="\"$(defaultdir)\""                \
        -DESD_SERVER="\"$(ESD_SERVER)\""                \
-       -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\""
+       -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\""    \