Update to 2.26.0.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12133 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 5 insertions, 74 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index e87d671ab..e76be2c95 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,12 +3,11 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gdm/Makefile,v 1.145 2009/03/13 15:08:55 kwm Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.146 2009/03/15 19:53:15 marcus Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.25.92
-PORTREVISION=	1
+PORTVERSION=	2.26.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index d2d81f16a..8cdc2bc52 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.25.92.tar.bz2) = ae64fdb6ff66811a4eb0cbeba85fe2d1
-SHA256 (gnome2/gdm-2.25.92.tar.bz2) = 4b6bcbe39f06c3d4c358c9c35ab2629cd1817072043af0760ff1214beecb6685
-SIZE (gnome2/gdm-2.25.92.tar.bz2) = 2544094
+MD5 (gnome2/gdm-2.26.0.tar.bz2) = b1a8db2f0e058d3c7b4c9a4600839a14
+SHA256 (gnome2/gdm-2.26.0.tar.bz2) = 34b9e36eaaa004f47b3e67924537cba1bdfe6ae467d8f0d30028ae7e6ef34627
+SIZE (gnome2/gdm-2.26.0.tar.bz2) = 2552457
diff --git a/x11/gdm/files/patch-daemon_simple-slave-main.c b/x11/gdm/files/patch-daemon_simple-slave-main.c
deleted file mode 100644
index 9557734cf..000000000
--- a/x11/gdm/files/patch-daemon_simple-slave-main.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- daemon/simple-slave-main.c	2008/08/15 17:13:36	6382
-+++ daemon/simple-slave-main.c	2009/03/14 01:06:00	6769
-@@ -43,10 +43,13 @@
- #include "gdm-log.h"
- #include "gdm-common.h"
- #include "gdm-simple-slave.h"
-+#include "gdm-settings.h"
-+#include "gdm-settings-direct.h"
- 
- #include "gdm-settings-client.h"
- 
--static int gdm_return_code = 0;
-+static GdmSettings     *settings        = NULL;
-+static int              gdm_return_code = 0;
- 
- static DBusGConnection *
- get_system_bus (void)
-@@ -202,6 +205,17 @@
- 
-         gdm_log_init ();
- 
-+        settings = gdm_settings_new ();
-+        if (settings == NULL) {
-+                g_warning ("Unable to initialize settings");
-+                goto out;
-+        }
-+
-+        if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
-+                g_warning ("Unable to initialize settings");
-+                goto out;
-+        }
-+
-         gdm_log_set_debug (is_debug_set (debug));
- 
-         if (display_id == NULL) {
diff --git a/x11/gdm/files/patch-daemon_xdmcp-chooser-slave-main.c b/x11/gdm/files/patch-daemon_xdmcp-chooser-slave-main.c
deleted file mode 100644
index 4f271394a..000000000
--- a/x11/gdm/files/patch-daemon_xdmcp-chooser-slave-main.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- daemon/xdmcp-chooser-slave-main.c	2008/08/15 17:13:36	6382
-+++ daemon/xdmcp-chooser-slave-main.c	2009/03/14 01:06:00	6769
-@@ -43,8 +43,11 @@
- #include "gdm-log.h"
- #include "gdm-common.h"
- #include "gdm-xdmcp-chooser-slave.h"
-+#include "gdm-settings.h"
-+#include "gdm-settings-direct.h"
- 
--static int gdm_return_code = 0;
-+static GdmSettings     *settings        = NULL;
-+static int              gdm_return_code = 0;
- 
- static DBusGConnection *
- get_system_bus (void)
-@@ -199,6 +202,17 @@
- 
-         gdm_log_init ();
- 
-+        settings = gdm_settings_new ();
-+        if (settings == NULL) {
-+                g_warning ("Unable to initialize settings");
-+                goto out;
-+        }
-+
-+        if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
-+                g_warning ("Unable to initialize settings");
-+                goto out;
-+        }
-+
-         gdm_log_set_debug (is_debug_set (debug));
- 
-         if (display_id == NULL) {