Presenting GNOME 2.26 for FreeBSD. See

http://library.gnome.org/misc/release-notes/2.26/ for a list of what's new.
On the FreeBSD front, we introduced a port of libxul 1.9 as an alternative
for Firefox 2.0 as a Gecko provider.  Almost all of the Gecko consumers
can make use of this provider by setting:

WITH_GECKO=libxul

The GNOME 2.26 port was done by ahze, kwm, marcus, and mezz with
contributions by Joseph S. Atkinson, Peter Wemm, Eric L. Chen,
Martin Matuska, Craig Butler, and Pawel Worach.

7 files changed, 36 insertions, 107 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 8e00f2c136f0..e3f413599dc6 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,12 +3,12 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gdm/Makefile,v 1.142 2009/01/10 01:59:22 mezz Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.148 2009/03/18 04:02:31 marcus Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.24.1
-PORTREVISION=	6
+PORTVERSION=	2.26.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 70511a9d1f11..8cdc2bc522cc 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.24.1.tar.bz2) = 31139d7a79096463b127b4790058b056
-SHA256 (gnome2/gdm-2.24.1.tar.bz2) = 8869f464818a1626e481bba5c562bdb972ffb74f1a9da91d01199fa860ee040f
-SIZE (gnome2/gdm-2.24.1.tar.bz2) = 2579979
+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/gdm.in b/x11/gdm/files/gdm.in
index 23ab71b4beaa..2aa2cf3d9969 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
-#    $MCom: ports/x11/gdm/files/gdm.in,v 1.32 2008/08/17 17:31:43 marcus Exp $
+#    $MCom: ports/x11/gdm/files/gdm.in,v 1.35 2009/04/09 03:24:09 mezz Exp $
 
 # PROVIDE: gdm
 # REQUIRE: LOGIN cleanvar moused syscons dbus hald
diff --git a/x11/gdm/files/patch-common_gdm-settings-keys.h b/x11/gdm/files/patch-common_gdm-settings-keys.h
deleted file mode 100644
index 06ebc0800e18..000000000000
--- a/x11/gdm/files/patch-common_gdm-settings-keys.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- common/gdm-settings-keys.h.orig	2008-02-20 16:27:34.000000000 -0500
-+++ common/gdm-settings-keys.h	2008-02-25 22:23:35.000000000 -0500
-@@ -30,6 +30,7 @@ G_BEGIN_DECLS
- #define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
- #define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
- #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"
-+#define GDM_KEY_VT "daemon/VT"
- 
- #define GDM_KEY_XDMCP_ENABLE "xdmcp/Enable"
- #define GDM_KEY_MAX_PENDING "xdmcp/MaxPending"
diff --git a/x11/gdm/files/patch-daemon-gdm-server.c b/x11/gdm/files/patch-daemon-gdm-server.c
deleted file mode 100644
index 079c62c66b6a..000000000000
--- a/x11/gdm/files/patch-daemon-gdm-server.c
+++ /dev/null
@@ -1,73 +0,0 @@
---- daemon/gdm-server.c.orig	2008-03-17 19:11:00.000000000 -0400
-+++ daemon/gdm-server.c	2008-08-25 16:11:10.000000000 -0400
-@@ -44,6 +44,10 @@
- #include "gdm-common.h"
- #include "gdm-signal-handler.h"
- 
-+#include "gdm-settings.h"
-+#include "gdm-settings-direct.h"
-+#include "gdm-settings-keys.h"
-+
- #include "gdm-server.h"
- 
- extern char **environ;
-@@ -77,6 +81,7 @@ struct GdmServerPrivate
-         char    *parent_display_name;
-         char    *parent_auth_file;
-         char    *chosen_hostname;
-+        char    *vt;
- 
-         guint    child_watch_id;
- };
-@@ -306,7 +311,7 @@ gdm_server_resolve_command_line (GdmServ
-                 argv[len++] = g_strdup ("tcp");
-         }
- 
--        if (vtarg != NULL && ! gotvtarg) {
-+        if (vtarg != NULL && ! gotvtarg && strncmp (server->priv->display_name, ":0", 2) == 0) {
-                 argv[len++] = g_strdup (vtarg);
-         }
- 
-@@ -673,7 +678,7 @@ gdm_server_start (GdmServer *server)
-         gboolean res;
- 
-         /* fork X server process */
--        res = gdm_server_spawn (server, NULL);
-+        res = gdm_server_spawn (server, server->priv->vt);
- 
-         return res;
- }
-@@ -925,12 +930,33 @@ static void
- gdm_server_init (GdmServer *server)
- {
- 
-+        int vt;
-+        gboolean has_vt;
-+        GdmSettings *settings = NULL;
-         server->priv = GDM_SERVER_GET_PRIVATE (server);
- 
-+
-+        settings = gdm_settings_new();
-+        if (settings == NULL) {
-+                g_assert ("Unable to initialize settings");
-+        }
-+
-+        if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
-+                g_assert ("Unable to initialize settings");
-+        }
-+
-+        has_vt =  gdm_settings_direct_get_int (GDM_KEY_VT, &vt);
-+
-+        g_object_unref (settings);
-+
-         server->priv->pid = -1;
-         server->priv->command = g_strdup (X_SERVER " -br -verbose");
-         server->priv->log_dir = g_strdup (LOGDIR);
- 
-+        if (has_vt) {
-+                server->priv->vt = g_strdup_printf ("vt %d", vt);
-+        }
-+
-         add_ready_handler (server);
- }
- 
diff --git a/x11/gdm/files/patch-data_gdm.schemas.in.in b/x11/gdm/files/patch-data_gdm.schemas.in.in
deleted file mode 100644
index ae5572ddde3e..000000000000
--- a/x11/gdm/files/patch-data_gdm.schemas.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- data/gdm.schemas.in.in.orig	2007-12-13 12:14:19.000000000 -0500
-+++ data/gdm.schemas.in.in	2007-12-13 12:15:05.000000000 -0500
-@@ -11,6 +11,11 @@
-       <signature>s</signature>
-       <default>gdm</default>
-     </schema>
-+    <schema>
-+      <key>daemon/VT</key>
-+      <signature>i</signature>
-+      <default>9</default>
-+    </schema>
- 
-     <schema>
-       <key>xdmcp/Enable</key>
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 88d9237bd8e7..cfe404abd8bd 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -46,6 +46,7 @@ share/gnome/help/gdm/de/gdm.xml
 share/gnome/help/gdm/en_GB/gdm.xml
 share/gnome/help/gdm/es/gdm.xml
 share/gnome/help/gdm/fr/gdm.xml
+share/gnome/help/gdm/it/gdm.xml
 share/gnome/help/gdm/ko/gdm.xml
 share/gnome/help/gdm/oc/gdm.xml
 share/gnome/help/gdm/ru/gdm.xml
@@ -58,13 +59,16 @@ share/locale/af/LC_MESSAGES/gdm.mo
 share/locale/am/LC_MESSAGES/gdm.mo
 share/locale/ar/LC_MESSAGES/gdm.mo
 share/locale/as/LC_MESSAGES/gdm.mo
+share/locale/ast/LC_MESSAGES/gdm.mo
 share/locale/az/LC_MESSAGES/gdm.mo
 share/locale/be/LC_MESSAGES/gdm.mo
+share/locale/be@latin/LC_MESSAGES/gdm.mo
 share/locale/bg/LC_MESSAGES/gdm.mo
 share/locale/bn/LC_MESSAGES/gdm.mo
 share/locale/bn_IN/LC_MESSAGES/gdm.mo
 share/locale/bs/LC_MESSAGES/gdm.mo
 share/locale/ca/LC_MESSAGES/gdm.mo
+share/locale/crh/LC_MESSAGES/gdm.mo
 share/locale/cs/LC_MESSAGES/gdm.mo
 share/locale/cy/LC_MESSAGES/gdm.mo
 share/locale/da/LC_MESSAGES/gdm.mo
@@ -96,7 +100,6 @@ share/locale/ka/LC_MESSAGES/gdm.mo
 share/locale/kn/LC_MESSAGES/gdm.mo
 share/locale/ko/LC_MESSAGES/gdm.mo
 share/locale/ku/LC_MESSAGES/gdm.mo
-share/locale/la/LC_MESSAGES/gdm.mo
 share/locale/lt/LC_MESSAGES/gdm.mo
 share/locale/lv/LC_MESSAGES/gdm.mo
 share/locale/mai/LC_MESSAGES/gdm.mo
@@ -134,6 +137,8 @@ share/locale/te/LC_MESSAGES/gdm.mo
 share/locale/th/LC_MESSAGES/gdm.mo
 share/locale/tr/LC_MESSAGES/gdm.mo
 share/locale/uk/LC_MESSAGES/gdm.mo
+share/locale/uz/LC_MESSAGES/gdm.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gdm.mo
 share/locale/vi/LC_MESSAGES/gdm.mo
 share/locale/wa/LC_MESSAGES/gdm.mo
 share/locale/xh/LC_MESSAGES/gdm.mo
@@ -141,6 +146,17 @@ share/locale/zh_CN/LC_MESSAGES/gdm.mo
 share/locale/zh_HK/LC_MESSAGES/gdm.mo
 share/locale/zh_TW/LC_MESSAGES/gdm.mo
 share/locale/zu/LC_MESSAGES/gdm.mo
+share/omf/gdm/gdm-C.omf
+share/omf/gdm/gdm-de.omf
+share/omf/gdm/gdm-en_GB.omf
+share/omf/gdm/gdm-es.omf
+share/omf/gdm/gdm-fr.omf
+share/omf/gdm/gdm-it.omf
+share/omf/gdm/gdm-ko.omf
+share/omf/gdm/gdm-oc.omf
+share/omf/gdm/gdm-ru.omf
+share/omf/gdm/gdm-sv.omf
+share/omf/gdm/gdm-uk.omf
 share/pixmaps/faces/astronaut.jpg
 share/pixmaps/faces/baseball.png
 share/pixmaps/faces/butterfly.png
@@ -174,11 +190,13 @@ share/pixmaps/nohost.png
 @exec mkdir -p %D/share/xsessions
 @dirrmtry share/xsessions
 @dirrm share/pixmaps/faces
+@dirrm share/omf/gdm
 @dirrm share/gnome/help/gdm/uk
 @dirrm share/gnome/help/gdm/sv
 @dirrm share/gnome/help/gdm/ru
 @dirrm share/gnome/help/gdm/oc
 @dirrm share/gnome/help/gdm/ko
+@dirrm share/gnome/help/gdm/it
 @dirrm share/gnome/help/gdm/fr
 @dirrm share/gnome/help/gdm/es
 @dirrm share/gnome/help/gdm/en_GB
@@ -210,6 +228,10 @@ share/pixmaps/nohost.png
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/uz/LC_MESSAGES
+@dirrmtry share/locale/uz
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -232,8 +254,6 @@ share/pixmaps/nohost.png
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/mai/LC_MESSAGES
 @dirrmtry share/locale/mai
-@dirrmtry share/locale/la/LC_MESSAGES
-@dirrmtry share/locale/la
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/hy/LC_MESSAGES
@@ -242,7 +262,13 @@ share/pixmaps/nohost.png
 @dirrmtry share/locale/fur
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as