[pkgsrc/trunk]: pkgsrc/x11/gnome-session Patch data/Makefile.in not to instal...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b0e72e006335
branches:  trunk
changeset: 541709:b0e72e006335
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Fri Apr 25 04:02:23 2008 +0000

description:
Patch data/Makefile.in not to install share/xsessions/gnome.desktop;
this conflicts with the file gdm installs.  Given that gdm has always
done this and that gdm's file uses dbus, let's keep the status quo for now.

Thanks to jmcneill@ for reporting this.

diffstat:

 x11/gnome-session/PLIST            |   3 +--
 x11/gnome-session/distinfo         |   3 ++-
 x11/gnome-session/patches/patch-ac |  15 +++++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r 7f8fdd12b7cb -r b0e72e006335 x11/gnome-session/PLIST
--- a/x11/gnome-session/PLIST   Fri Apr 25 02:28:24 2008 +0000
+++ b/x11/gnome-session/PLIST   Fri Apr 25 04:02:23 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2008/04/15 18:06:15 drochner Exp $
+@comment $NetBSD: PLIST,v 1.21 2008/04/25 04:02:23 bjs Exp $
 bin/gnome-session
 bin/gnome-session-properties
 bin/gnome-session-remove
@@ -105,7 +105,6 @@
 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 7f8fdd12b7cb -r b0e72e006335 x11/gnome-session/distinfo
--- a/x11/gnome-session/distinfo        Fri Apr 25 02:28:24 2008 +0000
+++ b/x11/gnome-session/distinfo        Fri Apr 25 04:02:23 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2008/04/15 18:06:15 drochner Exp $
+$NetBSD: distinfo,v 1.36 2008/04/25 04:02:23 bjs Exp $
 
 SHA1 (gnome-session-2.22.1.1.tar.bz2) = 54ba733ec8c8530a1f9c03b9f11d66bf3e666163
 RMD160 (gnome-session-2.22.1.1.tar.bz2) = 0d8b26f95cee389e8aefd05251e16b7cd3703aa3
@@ -8,3 +8,4 @@
 Size (gnome-splash-2.16.0.png) = 36601 bytes
 SHA1 (patch-aa) = 7cb4092f21ee08b7e7248df2cff677b678da22ec
 SHA1 (patch-ab) = b274bbe433151383ee0f2117dd2fb5746920be75
+SHA1 (patch-ac) = 35cc0f0982cb8ed711a4ebc45d2e9570725cbf95
diff -r 7f8fdd12b7cb -r b0e72e006335 x11/gnome-session/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome-session/patches/patch-ac        Fri Apr 25 04:02:23 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.11 2008/04/25 04:02:23 bjs Exp $
+
+--- data/Makefile.in.orig      2008-04-10 10:34:02.000000000 -0400
++++ data/Makefile.in
+@@ -628,8 +628,8 @@ info: info-recursive
+ info-am:
+ 
+ install-data-am: install-data-local install-defaultDATA \
+-      install-pixmapDATA install-schemasDATA install-settingsDATA \
+-      install-xsessionDATA
++      install-pixmapDATA install-schemasDATA install-settingsDATA
++#     install-xsessionDATA
+ 
+ install-dvi: install-dvi-recursive
+