Update gnome-session to 2.2.1. Changes include:

  * Remove --program-transform-name and associated patches now that
    gnome-core has been split into multiple parts
  * Honour the --disable-schemas-install configure option (Julio Merino)
  * Support themeing of the icons on the splash screen (Havoc Pennington)
  * Locale updates

5 files changed, 21 insertions, 45 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 11d831782b4..09fc4708e32 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/02/21 11:54:18 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/04/20 13:59:34 rh Exp $
 #
 
-DISTNAME=		gnome-session-2.2.0.2
+DISTNAME=		gnome-session-2.2.1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,6 +12,8 @@ COMMENT=		GNOME2 session management utilities
 
 DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 
+CONFLICTS+=		gnome-core<1.4.2nb4
+
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
@@ -22,8 +24,6 @@ USE_PERL5=		build
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-CONFIGURE_ARGS+=	--program-transform-name=s,gnome,gnome2,
-
 GCONF2_SCHEMAS= 	gnome-session.schemas
 
 .include "../../audio/esound/buildlink2.mk"
diff --git a/x11/gnome-session/PLIST b/x11/gnome-session/PLIST
index a845b24da0e..2f3e80ee418 100644
--- a/x11/gnome-session/PLIST
+++ b/x11/gnome-session/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2003/02/14 21:08:38 jmmv Exp $
-bin/gnome2-session
-bin/gnome2-session-properties
-bin/gnome2-session-save
-bin/gnome2-smproxy
-bin/gnome2-wm
-man/man1/gnome2-session-properties.1
-man/man1/gnome2-session-save.1
-man/man1/gnome2-session.1
-man/man1/gnome2-smproxy.1
-man/man1/gnome2-wm.1
+@comment $NetBSD: PLIST,v 1.4 2003/04/20 13:59:34 rh Exp $
+bin/gnome-session
+bin/gnome-session-properties
+bin/gnome-session-save
+bin/gnome-smproxy
+bin/gnome-wm
+man/man1/session-properties.1
+man/man1/gnome-session-save.1
+man/man1/gnome-session.1
+man/man1/gnome-smproxy.1
+man/man1/gnome-wm.1
 man/man5/default.session.5
 share/control-center-2.0/capplets/session-properties.desktop
 share/gconf/schemas/gnome-session.schemas
@@ -29,6 +29,7 @@ ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gnome-session-2.0.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
@@ -36,9 +37,11 @@ ${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/hu/LC_MESSAGES/gnome-session-2.0.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
+${PKGLOCALEDIR}/locale/kn/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index d11209a9507..a490f6dbdfd 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/02/18 20:52:09 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2003/04/20 13:59:34 rh Exp $
 
-SHA1 (gnome-session-2.2.0.2.tar.bz2) = 7a40ddad89135a5bcd26d54e71871d3531040229
-Size (gnome-session-2.2.0.2.tar.bz2) = 736370 bytes
+SHA1 (gnome-session-2.2.1.tar.bz2) = 39bc305deecd14df4ed92da798e944b8070551a8
+Size (gnome-session-2.2.1.tar.bz2) = 726241 bytes
 SHA1 (patch-ab) = 6a7b9394c41442c4181f4efb33f7ea7c61ee6f6b
-SHA1 (patch-ac) = 2b467144bbf8f42a7a0796840c42ba8537aa8634
-SHA1 (patch-ad) = 24901462a72294008ef4f219668323fc159eaea0
diff --git a/x11/gnome-session/patches/patch-ac b/x11/gnome-session/patches/patch-ac
deleted file mode 100644
index d520f9ae1c1..00000000000
--- a/x11/gnome-session/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/02/14 21:08:39 jmmv Exp $
-
---- gnome-session/splash-widget.c.orig	2002-11-28 02:01:40.000000000 +0100
-+++ gnome-session/splash-widget.c
-@@ -313,7 +313,7 @@ read_background (SplashWidget *sw)
- 					    "/apps/gnome-session/options/splash_image",
- 					    NULL);
- 	if (!filename)
--		filename = g_strdup (GNOME_ICONDIR "/splash/gnome-splash.png");
-+		filename = g_strdup (GNOME_ICONDIR "/splash/gnome2-splash.png");
- 
- 	pb = gdk_pixbuf_new_from_file (filename, NULL);
- 	g_free (filename);
diff --git a/x11/gnome-session/patches/patch-ad b/x11/gnome-session/patches/patch-ad
deleted file mode 100644
index ebfdc5715b2..00000000000
--- a/x11/gnome-session/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/09/15 06:03:04 rh Exp $
-
---- man/Makefile.in.orig	Sun Sep 15 14:05:37 2002
-+++ man/Makefile.in
-@@ -178,6 +178,7 @@ install-man1:
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-+	  inst=`echo $$inst | sed 's/session-prop/gnome2-session-prop/'`; \
- 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
- 	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
- 	done