From 4f932ac45714979412903c8abfb78efc442e3053 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Tue, 22 Jun 2010 17:46:52 +0000
Subject: [PATCH] Minor update to gnome-session-2.30.2.

---
 x11/gnome/session/Makefile                |  5 ++--
 x11/gnome/session/distinfo                | 10 +++----
 x11/gnome/session/patches/patch-configure | 34 +++++++++--------------
 3 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/x11/gnome/session/Makefile b/x11/gnome/session/Makefile
index 381d8bbc02d..6729a86bb9a 100644
--- a/x11/gnome/session/Makefile
+++ b/x11/gnome/session/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.108 2010/05/14 10:23:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.109 2010/06/22 17:46:52 ajacoutot Exp $
 
 COMMENT=		GNOME session
 
 GNOME_PROJECT=		gnome-session
-GNOME_VERSION=		2.30.0
-PKGNAME=		${DISTNAME}p7
+GNOME_VERSION=		2.30.2
 
 CATEGORIES=		x11
 
diff --git a/x11/gnome/session/distinfo b/x11/gnome/session/distinfo
index 707256b0356..c19da2c2591 100644
--- a/x11/gnome/session/distinfo
+++ b/x11/gnome/session/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnome/gnome-session-2.30.0.tar.bz2) = 0V/dEg88fQHko4ikoOc5Mg==
-RMD160 (gnome/gnome-session-2.30.0.tar.bz2) = uLcPos2Hr4GdDUKF+EjhXzYJHL0=
-SHA1 (gnome/gnome-session-2.30.0.tar.bz2) = 07vKWLx4XMEpYquX6w5CJ5ok7G8=
-SHA256 (gnome/gnome-session-2.30.0.tar.bz2) = 7+tFMZQDVG+mDmywNeTeXodzHqZy/TdjV0mvSdD9TYQ=
-SIZE (gnome/gnome-session-2.30.0.tar.bz2) = 827745
+MD5 (gnome/gnome-session-2.30.2.tar.bz2) = 2TotqTGsC5wNmPa2ihenMA==
+RMD160 (gnome/gnome-session-2.30.2.tar.bz2) = aiafRiWvdr9qdK1EWuyRNIJ6cmw=
+SHA1 (gnome/gnome-session-2.30.2.tar.bz2) = EzPSwevEuAoA7movLTQwnP1zxeo=
+SHA256 (gnome/gnome-session-2.30.2.tar.bz2) = 6ntdiyVOug9O5fc37TaG/KT6c0rVSiDyBlNCQfau9Ow=
+SIZE (gnome/gnome-session-2.30.2.tar.bz2) = 817580
diff --git a/x11/gnome/session/patches/patch-configure b/x11/gnome/session/patches/patch-configure
index d82a16ed79e..a086f8d1d8c 100644
--- a/x11/gnome/session/patches/patch-configure
+++ b/x11/gnome/session/patches/patch-configure
@@ -1,12 +1,12 @@
-$OpenBSD: patch-configure,v 1.2 2010/04/22 22:38:51 ajacoutot Exp $
---- configure.orig	Tue Mar 30 02:04:26 2010
-+++ configure	Fri Apr 23 00:33:12 2010
-@@ -13254,13 +13254,11 @@ if test -n "$GNOME_SESSION_CFLAGS"; then
+$OpenBSD: patch-configure,v 1.3 2010/06/22 17:46:52 ajacoutot Exp $
+--- configure.orig	Tue Jun 22 04:06:47 2010
++++ configure	Tue Jun 22 19:36:30 2010
+@@ -12269,13 +12269,11 @@ if test -n "$GNOME_SESSION_CFLAGS"; then
          gio-2.0 >= \$GLIB_REQUIRED
          gtk+-2.0 >= \$GTK_REQUIRED
          dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
 -        devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED
- \"") >&5
+ \""; } >&5
    ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
          gio-2.0 >= $GLIB_REQUIRED
          gtk+-2.0 >= $GTK_REQUIRED
@@ -14,8 +14,8 @@ $OpenBSD: patch-configure,v 1.2 2010/04/22 22:38:51 ajacoutot Exp $
 -        devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
  ") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -13269,7 +13267,6 @@ if test -n "$GNOME_SESSION_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+@@ -12284,7 +12282,6 @@ if test -n "$GNOME_SESSION_CFLAGS"; then
          gio-2.0 >= $GLIB_REQUIRED
          gtk+-2.0 >= $GTK_REQUIRED
          dbus-glib-1 >= $DBUS_GLIB_REQUIRED
@@ -23,12 +23,12 @@ $OpenBSD: patch-configure,v 1.2 2010/04/22 22:38:51 ajacoutot Exp $
  " 2>/dev/null`
  else
    pkg_failed=yes
-@@ -13285,13 +13282,11 @@ if test -n "$GNOME_SESSION_LIBS"; then
+@@ -12300,13 +12297,11 @@ if test -n "$GNOME_SESSION_LIBS"; then
          gio-2.0 >= \$GLIB_REQUIRED
          gtk+-2.0 >= \$GTK_REQUIRED
          dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
 -        devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED
- \"") >&5
+ \""; } >&5
    ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
          gio-2.0 >= $GLIB_REQUIRED
          gtk+-2.0 >= $GTK_REQUIRED
@@ -36,8 +36,8 @@ $OpenBSD: patch-configure,v 1.2 2010/04/22 22:38:51 ajacoutot Exp $
 -        devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
  ") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -13300,7 +13295,6 @@ if test -n "$GNOME_SESSION_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+@@ -12315,7 +12310,6 @@ if test -n "$GNOME_SESSION_LIBS"; then
          gio-2.0 >= $GLIB_REQUIRED
          gtk+-2.0 >= $GTK_REQUIRED
          dbus-glib-1 >= $DBUS_GLIB_REQUIRED
@@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.2 2010/04/22 22:38:51 ajacoutot Exp $
  " 2>/dev/null`
  else
    pkg_failed=yes
-@@ -13323,14 +13317,12 @@ fi
+@@ -12338,14 +12332,12 @@ fi
          gio-2.0 >= $GLIB_REQUIRED
          gtk+-2.0 >= $GTK_REQUIRED
          dbus-glib-1 >= $DBUS_GLIB_REQUIRED
@@ -60,15 +60,7 @@ $OpenBSD: patch-configure,v 1.2 2010/04/22 22:38:51 ajacoutot Exp $
  " 2>&1`
          fi
  	# Put the nasty error message in config.log where it belongs
-@@ -13340,7 +13332,6 @@ fi
-         gio-2.0 >= $GLIB_REQUIRED
-         gtk+-2.0 >= $GTK_REQUIRED
-         dbus-glib-1 >= $DBUS_GLIB_REQUIRED
--        devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
- ) were not met:
- 
- $GNOME_SESSION_PKG_ERRORS
-@@ -13356,7 +13347,6 @@ $as_echo "$as_me: error: Package requirements (glib-2.
+@@ -12355,7 +12347,6 @@ fi
          gio-2.0 >= $GLIB_REQUIRED
          gtk+-2.0 >= $GTK_REQUIRED
          dbus-glib-1 >= $DBUS_GLIB_REQUIRED