Remove GDM, this isn't part of GNOME 2.22. The GNOME release team has decided

to downgrade the GDM, see more info:

http://mail.gnome.org/archives/desktop-devel-list/2008-February/msg00124.html


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

13 files changed, 0 insertions, 356 deletions

diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
deleted file mode 100644
index d990070be..000000000
--- a/x11/gdm/files/gdm.in
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#    $MCom: ports/x11/gdm/files/gdm.in,v 1.24 2008/02/04 06:07:29 marcus Exp $
-
-# PROVIDE: gdm
-# REQUIRE: LOGIN cleanvar moused syscons dbus
-#
-# Add the following to /etc/rc.conf to start GDM at boot time:
-#
-# gdm_enable="YES"
-#
-
-. %%RC_SUBR%%
-. %%GNOME_SUBR%%
-
-gdm_enable=${gdm_enable-${gnome_enable}}
-
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin
-
-name="gdm"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-procname="%%PREFIX%%/sbin/gdm-binary"
-start_cmd="gdm_start"
-
-gdm_start()
-{
-    if ! checkyesno gdm_enable ; then
-	return 0
-    fi
-    echo "Starting ${name}."
-
-    ( iter=0
-    while ! ps -axoargs | grep "^/usr/libexec/getty " | grep -qv grep >/dev/null 2>&1; do
-	if [ ${iter} -eq 60 ]; then
-	    break
-	fi
-	sleep 1
-	iter=$(expr ${iter} + 1)
-    done
-    ${command} ) &
-}
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/x11/gdm/files/patch-common_gdm-address.c b/x11/gdm/files/patch-common_gdm-address.c
deleted file mode 100644
index 994bdf404..000000000
--- a/x11/gdm/files/patch-common_gdm-address.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- common/gdm-address.c.orig	2008-02-03 11:52:26.000000000 -0500
-+++ common/gdm-address.c	2008-02-13 01:23:07.000000000 -0500
-@@ -25,8 +25,9 @@
- #include <stdio.h>
- #include <fcntl.h>
- #include <unistd.h>
--#include <stropts.h>
- #include <string.h>
-+#include <sys/types.h>
-+#include <sys/param.h>
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
-@@ -35,7 +36,6 @@
- #endif
- #include <netdb.h>
- #include <sys/ioctl.h>
--#include <net/if.h>
- 
- #ifndef G_OS_WIN32
- #include <sys/socket.h>
-@@ -46,6 +46,7 @@
- #include <winsock2.h>
- #include <ws2tcpip.h>
- #endif
-+#include <net/if.h>
- 
- #include <glib-object.h>
- 
diff --git a/x11/gdm/files/patch-common_gdm-common.c b/x11/gdm/files/patch-common_gdm-common.c
deleted file mode 100644
index 9fa4acafa..000000000
--- a/x11/gdm/files/patch-common_gdm-common.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- common/gdm-common.c.orig	2007-12-23 10:29:20.000000000 +0100
-+++ common/gdm-common.c	2007-12-23 10:29:34.000000000 +0100
-@@ -33,6 +33,10 @@
- 
- #include "gdm-common.h"
- 
-+#ifndef ENODATA
-+#define ENODATA EAGAIN
-+#endif
-+
- void
- gdm_set_fatal_warnings_if_unstable (void)
- {
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 06ebc0800..000000000
--- 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-common_gdm-signal-handler.c b/x11/gdm/files/patch-common_gdm-signal-handler.c
deleted file mode 100644
index d2a71ddb2..000000000
--- a/x11/gdm/files/patch-common_gdm-signal-handler.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- common/gdm-signal-handler.c.orig	2007-10-30 11:41:48.000000000 -0400
-+++ common/gdm-signal-handler.c	2007-11-02 15:07:28.000000000 -0400
-@@ -27,7 +27,6 @@
- #include <unistd.h>
- #include <string.h>
- #include <signal.h>
--#include <execinfo.h>
- #include <syslog.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
-@@ -151,6 +150,7 @@ signal_io_watch (GIOChannel       *ioc,
- static void
- fallback_get_backtrace (void)
- {
-+/*
-         void *  frames[64];
-         size_t  size;
-         char ** strings;
-@@ -167,13 +167,14 @@ fallback_get_backtrace (void)
-         } else {
-                 g_warning ("GDM crashed, but symbols couldn't be retrieved.");
-         }
-+*/
- }
- 
- 
- static gboolean
- crashlogger_get_backtrace (void)
--{
--        gboolean success = FALSE;
-+{ 
-+       gboolean success = FALSE;
-         int      pid;
- 
-         pid = fork();
diff --git a/x11/gdm/files/patch-config.h.in b/x11/gdm/files/patch-config.h.in
deleted file mode 100644
index d17901da1..000000000
--- a/x11/gdm/files/patch-config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.in.orig	2007-11-02 20:48:28.000000000 -0400
-+++ config.h.in	2007-11-02 20:49:39.000000000 -0400
-@@ -23,6 +23,9 @@
- #undef HAVE_LC_MESSAGES
- #undef HAVE_LIBSM
- #undef HAVE_LIBXDMCP
-+#undef HAVE_LOGIN
-+#undef HAVE_LOGOUT
-+#undef HAVE_LOGWTMP
- #undef HAVE_LOGINCAP
- #undef HAVE_LOGINDEVPERM
- #undef HAVE_LOGINRESTRICTIONS
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 e57350568..000000000
--- a/x11/gdm/files/patch-daemon-gdm-server.c
+++ /dev/null
@@ -1,64 +0,0 @@
---- daemon/gdm-server.c.orig	2007-11-19 22:53:12.000000000 +0100
-+++ daemon/gdm-server.c	2007-12-25 11:56:07.000000000 +0100
-@@ -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 @@
-         char    *parent_display_name;
-         char    *parent_auth_file;
-         char    *chosen_hostname;
-+        char    *vt;
- 
-         guint    child_watch_id;
- };
-@@ -663,7 +668,7 @@
-         gboolean res;
- 
-         /* fork X server process */
--        res = gdm_server_spawn (server, NULL);
-+        res = gdm_server_spawn (server, server->priv->vt);
- 
-         return res;
- }
-@@ -890,12 +895,33 @@
- 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-daemon-gdm-xdmcp-display-factory.c b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
deleted file mode 100644
index e3062eeea..000000000
--- a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- daemon/gdm-xdmcp-display-factory.c.orig	2007-11-01 10:15:58.269325570 -0400
-+++ daemon/gdm-xdmcp-display-factory.c	2007-11-01 10:20:19.093220785 -0400
-@@ -35,6 +35,7 @@
- #include <netdb.h>
- #include <arpa/inet.h>
- #include <net/if.h>
-+#include <netinet/in.h>
- #ifdef HAVE_SYS_SOCKIO_H
- #include <sys/sockio.h>
- #endif
diff --git a/x11/gdm/files/patch-daemon_Makefile.in b/x11/gdm/files/patch-daemon_Makefile.in
deleted file mode 100644
index 9186a23e3..000000000
--- a/x11/gdm/files/patch-daemon_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- daemon/Makefile.in.orig	2007-11-02 20:54:53.000000000 -0400
-+++ daemon/Makefile.in	2007-11-02 20:55:08.000000000 -0400
-@@ -451,6 +451,7 @@ test_session_SOURCES = \
- 
- test_session_LDADD = \
- 	$(DAEMON_LIBS)		\
-+	$(EXTRA_DAEMON_LIBS)	\
- 	$(PAM_LIBS)		\
- 	$(top_builddir)/common/libgdmcommon.la	\
- 	$(NULL)
diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c
deleted file mode 100644
index 67c65fc4c..000000000
--- a/x11/gdm/files/patch-daemon_gdm-session-worker.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- daemon/gdm-session-worker.c.orig	2008-01-15 17:23:12.000000000 -0500
-+++ daemon/gdm-session-worker.c	2008-01-15 17:22:36.000000000 -0500
-@@ -226,7 +226,7 @@ gdm_session_execute (const char *file,
-                          * what to search if PATH is unset. POSIX may, dunno.
-                          */
- 
--                        path = "/bin:/usr/bin:.";
-+                        path = "/bin:/usr/bin:%%LOCALBASE%%/bin:.";
-                 }
- 
-                 len = strlen (file) + 1;
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 ae5572ddd..000000000
--- 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/files/patch-gui_simple-greeter_Makefile.in b/x11/gdm/files/patch-gui_simple-greeter_Makefile.in
deleted file mode 100644
index 56d49b99b..000000000
--- a/x11/gdm/files/patch-gui_simple-greeter_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/simple-greeter/Makefile.in.orig	2008-02-13 01:57:37.000000000 -0500
-+++ gui/simple-greeter/Makefile.in	2008-02-13 01:57:44.000000000 -0500
-@@ -445,7 +445,7 @@ INCLUDES = \
- 	-DGDMCONFDIR=\"$(gdmconfdir)\"                  \
- 	-DDATADIR=\""$(datadir)"\"		 	\
- 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
--	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"	\
-+	-DLIBLOCALEDIR=\""$(prefix)/share/locale"\"	\
- 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
- 	-DGLADEDIR=\""$(pkgdatadir)"\" 	\
- 	-DLIBEXECDIR=\""$(libexecdir)"\" 		\
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
deleted file mode 100644
index 0ad57a462..000000000
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
+++ /dev/null
@@ -1,91 +0,0 @@
---- gui/simple-greeter/gdm-languages.c.orig	2008-02-25 17:21:43.000000000 -0500
-+++ gui/simple-greeter/gdm-languages.c	2008-02-27 01:17:09.000000000 -0500
-@@ -50,6 +50,8 @@
- #define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes"
- #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale"
- 
-+#define GDM_DEFAULT_LOCALE "C"
-+
- typedef struct _GdmLocale {
-         char *id;
-         char *name;
-@@ -479,7 +481,7 @@ select_dirs (const struct dirent *dirent
-                                 struct stat st;
-                                 char       *path;
- 
--                                path = g_build_filename (LIBLOCALEDIR, dirent->d_name, NULL);
-+                                path = g_build_filename ("/usr/share/locale", dirent->d_name, NULL);
-                                 if (g_stat (path, &st) == 0) {
-                                         mode = st.st_mode;
-                                 }
-@@ -499,7 +501,7 @@ collect_locales_from_directory (void)
-         int             ndirents;
-         int             cnt;
- 
--        ndirents = scandir (LIBLOCALEDIR, &dirents, select_dirs, alphasort);
-+        ndirents = scandir ("/usr/share/locale", &dirents, select_dirs, alphasort);
- 
-         for (cnt = 0; cnt < ndirents; ++cnt) {
-                 char      *path;
-@@ -533,7 +535,7 @@ collect_locales_from_directory (void)
-                 }
- 
-                 /* try to get additional information from LC_IDENTIFICATION */
--                path = g_build_filename (LIBLOCALEDIR, dirents[cnt]->d_name, "LC_IDENTIFICATION", NULL);
-+                path = g_build_filename ("/usr/share/locale", dirents[cnt]->d_name, "LC_IDENTIFICATION", NULL);
-                 res = g_file_test (path, G_FILE_TEST_IS_REGULAR);
-                 if (res) {
-                         GMappedFile      *mapped;
-@@ -568,6 +570,35 @@ collect_locales_from_aliases (void)
- }
- 
- static void
-+collect_default_locale (void)
-+{
-+        GdmLocale  *locale;
-+        GdmLocale  *old_locale;
-+
-+        locale = g_new0 (GdmLocale, 1);
-+        gdm_parse_language_name (GDM_DEFAULT_LOCALE,
-+                                 &locale->language_code,
-+                                 &locale->territory_code,
-+                                 &locale->codeset,
-+                                 &locale->modifier);
-+
-+        locale->id = construct_language_name (locale->language_code, locale->territory_code,
-+                                              NULL, locale->modifier);
-+        locale->name = construct_language_name (locale->language_code, locale->territory_code,
-+                                                locale->codeset, locale->modifier);
-+
-+        old_locale = g_hash_table_lookup (gdm_available_locales_map, locale->id);
-+        if (old_locale != NULL) {
-+                if (strlen (old_locale->name) > strlen (locale->name)) {
-+                        chooser_locale_free (locale);
-+                        return;
-+                }
-+        }
-+
-+        g_hash_table_insert (gdm_available_locales_map, g_strdup (locale->id), locale);
-+}
-+
-+static void
- collect_locales (void)
- {
- 
-@@ -575,6 +606,7 @@ collect_locales (void)
-                 gdm_available_locales_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) chooser_locale_free);
-         }
- 
-+        collect_default_locale ();
-         collect_locales_from_archive ();
-         collect_locales_from_directory ();
-         collect_locales_from_aliases ();
-@@ -957,6 +989,8 @@ gdm_get_language_from_name (const char *
-         }
- 
-         language = get_translated_language (language_code, name);
-+        if (language == NULL && ! strcmp (language_code, GDM_DEFAULT_LOCALE))
-+                language = GDM_DEFAULT_LOCALE;
- 
-         if (territory_code != NULL) {
-                 territory = get_translated_territory (territory_code, name);