16 files changed, 65 insertions, 637 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 09a31ce38e12..1a0ccc3e8baa 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.164 2009/11/28 05:59:03 mezz Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.174 2010/04/27 14:58:59 kwm Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.28.2
-PORTREVISION=	3
+PORTVERSION=	2.30.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -21,7 +20,8 @@ BUILD_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
 LIB_DEPENDS=	ck-connector.0:${PORTSDIR}/sysutils/consolekit \
 		polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome \
     		execinfo:${PORTSDIR}/devel/libexecinfo \
-		hal.1:${PORTSDIR}/sysutils/hal \
+		upower-glib.1:${PORTSDIR}/sysutils/upower \
+		xklavier.12:${PORTSDIR}/x11/libxklavier \
 		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
 RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
 		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \
@@ -39,7 +39,7 @@ INSTALLS_ICONS=	yes
 USE_RC_SUBR=	gdm
 USE_GNOME_SUBR=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomehier gconf2 libglade2 librsvg2 \
+USE_GNOME=	gnomehack intlhack gnomehier gconf2 librsvg2 \
 		gnomedocutils gnomeprefix gnomepanel
 GCONF_SCHEMAS=	gdm-simple-greeter.schemas
 GNU_CONFIGURE=	yes
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 7a19015ef0f2..0081bb351e9f 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.28.2.tar.bz2) = 9607c6bac31c9d8bd3446e66a4576c2e
-SHA256 (gnome2/gdm-2.28.2.tar.bz2) = 0165b4bf70e4a6d41d9e42877840805890c438bd655805b961e51adccbd9602a
-SIZE (gnome2/gdm-2.28.2.tar.bz2) = 2283246
+MD5 (gnome2/gdm-2.30.2.tar.bz2) = ba35f9f750b50be572952195989df2c5
+SHA256 (gnome2/gdm-2.30.2.tar.bz2) = 884f4816a78f8f1eece8f1468f19dc01c5350d4a3513d3c0e854f45f870c1ec5
+SIZE (gnome2/gdm-2.30.2.tar.bz2) = 2381359
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index 8c1de22a8dd9..d4f41552daa5 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,9 +1,9 @@
 #!/bin/sh
 # $FreeBSD$
-#    $MCom: ports/x11/gdm/files/gdm.in,v 1.38 2009/09/26 13:42:01 marcus Exp $
+#    $MCom: ports/x11/gdm/files/gdm.in,v 1.43 2010/04/17 19:06:00 marcus Exp $
 
 # PROVIDE: gdm
-# REQUIRE: LOGIN cleanvar moused syscons dbus hald
+# REQUIRE: LOGIN cleanvar moused syscons dbus
 #
 # Add the following to /etc/rc.conf to start GDM at boot time:
 #
diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in
index 1f16ea8e8ca2..3f9ebd29b37a 100644
--- a/x11/gdm/files/gdm.pam.in
+++ b/x11/gdm/files/gdm.pam.in
@@ -1,6 +1,6 @@
 #
 # $FreeBSD$
-#    $MCom: ports/x11/gdm/files/gdm.pam.in,v 1.8 2009/09/26 13:42:01 marcus Exp $
+#    $MCom: ports/x11/gdm/files/gdm.pam.in,v 1.11 2010/03/16 19:33:11 mezz Exp $
 #
 # PAM configuration for the "gdm" service
 #
diff --git a/x11/gdm/files/patch-common_gdm-address.c b/x11/gdm/files/patch-common_gdm-address.c
index a827d4b6d1b6..9a4e620ba8d3 100644
--- a/x11/gdm/files/patch-common_gdm-address.c
+++ b/x11/gdm/files/patch-common_gdm-address.c
@@ -1,5 +1,5 @@
---- common/gdm-address.c.orig	2009-02-19 21:45:13.000000000 -0500
-+++ common/gdm-address.c	2009-05-11 02:38:17.000000000 -0400
+--- common/gdm-address.c.orig	2010-01-13 17:32:59.000000000 +0000
++++ common/gdm-address.c	2010-01-17 12:55:48.000000000 +0000
 @@ -29,6 +29,8 @@
  #include <stropts.h>
  #endif
@@ -25,21 +25,3 @@
  
  #include <glib-object.h>
  
-@@ -206,7 +208,7 @@ gdm_address_get_hostname (GdmAddress *ad
- 
-         host [0] = '\0';
-         res = getnameinfo ((const struct sockaddr *)address->ss,
--                           sizeof (struct sockaddr_storage),
-+                           gdm_sockaddr_len (address->ss),
-                            host, sizeof (host),
-                            NULL, 0,
-                            0);
-@@ -245,7 +247,7 @@ gdm_address_get_numeric_info (GdmAddress
-         host [0] = '\0';
-         serv [0] = '\0';
-         res = getnameinfo ((const struct sockaddr *)address->ss,
--                           sizeof (struct sockaddr_storage),
-+                           gdm_sockaddr_len (address->ss),
-                            host, sizeof (host),
-                            serv, sizeof (serv),
-                            NI_NUMERICHOST | NI_NUMERICSERV);
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
deleted file mode 100644
index 220aa1cb6ac2..000000000000
--- a/x11/gdm/files/patch-configure
+++ /dev/null
@@ -1,138 +0,0 @@
---- configure.orig	2009-09-22 12:26:34.000000000 +0200
-+++ configure	2009-09-22 12:29:51.000000000 +0200
-@@ -22494,10 +22494,12 @@
-     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= \$GLIB_REQUIRED_VERSION
-         gio-2.0 >= \$GLIB_REQUIRED_VERSION
-+	hal
- \"") >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- ") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -22519,10 +22521,12 @@
-     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= \$GLIB_REQUIRED_VERSION
-         gio-2.0 >= \$GLIB_REQUIRED_VERSION
-+	hal
- \"") >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- ") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -22530,6 +22534,7 @@
-   pkg_cv_COMMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- " 2>/dev/null`
- else
-   pkg_failed=yes
-@@ -22551,11 +22556,13 @@
- 	        COMMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- " 2>&1`
-         else
- 	        COMMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- " 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
-@@ -22564,6 +22571,7 @@
- 	{ { echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- ) were not met:
- 
- $COMMON_PKG_ERRORS
-@@ -22578,6 +22586,7 @@
- echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- ) were not met:
- 
- $COMMON_PKG_ERRORS
-@@ -22634,10 +22643,12 @@
-     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= \$GLIB_REQUIRED_VERSION
-         gio-2.0 >= \$GLIB_REQUIRED_VERSION
-+	hal
- \"") >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- ") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -22645,6 +22656,7 @@
-   pkg_cv_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- " 2>/dev/null`
- else
-   pkg_failed=yes
-@@ -22659,10 +22671,12 @@
-     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= \$GLIB_REQUIRED_VERSION
-         gio-2.0 >= \$GLIB_REQUIRED_VERSION
-+	hal
- \"") >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- ") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -22670,6 +22684,7 @@
-   pkg_cv_DAEMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- " 2>/dev/null`
- else
-   pkg_failed=yes
-@@ -22691,11 +22706,13 @@
- 	        DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- " 2>&1`
-         else
- 	        DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- " 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
-@@ -22704,6 +22721,7 @@
- 	{ { echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- ) were not met:
- 
- $DAEMON_PKG_ERRORS
-@@ -22718,6 +22736,7 @@
- echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- ) were not met:
- 
- $DAEMON_PKG_ERRORS
diff --git a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
index 692c275167b8..ede7f2c2f8b6 100644
--- a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
+++ b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
@@ -1,5 +1,5 @@
---- daemon/gdm-xdmcp-display-factory.c.orig	2009-07-20 03:09:09.000000000 +0200
-+++ daemon/gdm-xdmcp-display-factory.c	2009-07-20 09:54:25.000000000 +0200
+--- daemon/gdm-xdmcp-display-factory.c.orig	2009-12-21 17:36:30.000000000 +0100
++++ daemon/gdm-xdmcp-display-factory.c	2009-12-26 23:26:24.000000000 +0100
 @@ -35,6 +35,7 @@
  #include <netdb.h>
  #include <arpa/inet.h>
@@ -8,7 +8,7 @@
  #ifdef HAVE_SYS_SOCKIO_H
  #include <sys/sockio.h>
  #endif
-@@ -76,7 +77,7 @@ int deny_severity = LOG_WARNING;
+@@ -76,7 +77,7 @@
  #define DEFAULT_USE_MULTICAST         FALSE
  #define DEFAULT_MULTICAST_ADDRESS     "ff02::1"
  #define DEFAULT_HONOR_INDIRECT        TRUE
@@ -17,7 +17,7 @@
  #define DEFAULT_MAX_DISPLAYS          16
  #define DEFAULT_MAX_PENDING_DISPLAYS  4
  #define DEFAULT_MAX_WAIT              30
-@@ -404,6 +405,11 @@ static int
+@@ -404,6 +405,11 @@
  create_socket (struct addrinfo *ai)
  {
          int sock;
@@ -29,7 +29,7 @@
  
          sock = socket (ai->ai_family, ai->ai_socktype, ai->ai_protocol);
          if (sock < 0) {
-@@ -411,6 +417,16 @@ create_socket (struct addrinfo *ai)
+@@ -411,6 +417,16 @@
                  return sock;
          }
  
@@ -46,93 +46,3 @@
          if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) {
                  g_warning ("bind: %s", g_strerror (errno));
                  close (sock);
-@@ -835,7 +851,7 @@ gdm_xdmcp_send_willing (GdmXdmcpDisplayF
-         XdmcpFlush (factory->priv->socket_fd,
-                     &factory->priv->buf,
-                     (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
--                    (int)sizeof (struct sockaddr_storage));
-+                    (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address)));
- 
-         g_free (status.data);
- }
-@@ -879,7 +895,7 @@ gdm_xdmcp_send_unwilling (GdmXdmcpDispla
-         XdmcpFlush (factory->priv->socket_fd,
-                     &factory->priv->buf,
-                     (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
--                    (int)sizeof (struct sockaddr_storage));
-+                    (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address)));
- 
-         last_time = time (NULL);
- }
-@@ -988,7 +1004,7 @@ gdm_xdmcp_send_forward_query (GdmXdmcpDi
-         XdmcpFlush (factory->priv->socket_fd,
-                     &factory->priv->buf,
-                     (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (ic->chosen_address),
--                    (int)sizeof (struct sockaddr_storage));
-+                    (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (ic->chosen_address)));
- 
-         g_free (port.data);
-         g_free (addr.data);
-@@ -1691,7 +1707,7 @@ gdm_xdmcp_really_send_managed_forward (G
-         XdmcpFlush (factory->priv->socket_fd,
-                     &factory->priv->buf,
-                     (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
--                    (int)sizeof (struct sockaddr_storage));
-+                    (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address)));
- 
-         g_free (addr.data);
- }
-@@ -1772,7 +1788,7 @@ gdm_xdmcp_send_got_managed_forward (GdmX
-         XdmcpFlush (factory->priv->socket_fd,
-                     &factory->priv->buf,
-                     (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
--                    (int)sizeof (struct sockaddr_storage));
-+                    (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address)));
- }
- 
- static gboolean
-@@ -1945,7 +1961,7 @@ gdm_xdmcp_send_decline (GdmXdmcpDisplayF
-         XdmcpFlush (factory->priv->socket_fd,
-                     &factory->priv->buf,
-                     (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
--                    (int)sizeof (struct sockaddr_storage));
-+                    (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address)));
- 
-         /* Send MANAGED_FORWARD to indicate that the connection
-          * reached some sort of resolution */
-@@ -2093,7 +2109,7 @@ gdm_xdmcp_send_accept (GdmXdmcpDisplayFa
-         XdmcpFlush (factory->priv->socket_fd,
-                     &factory->priv->buf,
-                     (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
--                    (int)sizeof (struct sockaddr_storage));
-+                    (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address)));
- 
-         host = NULL;
-         gdm_address_get_numeric_info (address, &host, NULL);
-@@ -2424,7 +2440,7 @@ gdm_xdmcp_send_failed (GdmXdmcpDisplayFa
-         XdmcpFlush (factory->priv->socket_fd,
-                     &factory->priv->buf,
-                     (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
--                    (int)sizeof (struct sockaddr_storage));
-+                    (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address)));
- }
- 
- static void
-@@ -2448,7 +2464,7 @@ gdm_xdmcp_send_refuse (GdmXdmcpDisplayFa
-         XdmcpFlush (factory->priv->socket_fd,
-                     &factory->priv->buf,
-                     (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
--                    (int)sizeof (struct sockaddr_storage));
-+                    (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address)));
- 
-         /*
-          * This was from a forwarded query quite apparently so
-@@ -2719,7 +2735,7 @@ gdm_xdmcp_send_alive (GdmXdmcpDisplayFac
-         XdmcpFlush (factory->priv->socket_fd,
-                     &factory->priv->buf,
-                     (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
--                    (int)sizeof (struct sockaddr_storage));
-+                    (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address)));
- }
- 
- static void
diff --git a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c
index 340e955b3832..b7ed323184f3 100644
--- a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c
+++ b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c
@@ -1,38 +1,11 @@
---- gui/simple-chooser/gdm-host-chooser-widget.c.orig	2009-02-19 21:45:09.000000000 -0500
-+++ gui/simple-chooser/gdm-host-chooser-widget.c	2009-05-11 02:34:20.000000000 -0400
-@@ -311,7 +311,7 @@ do_ping (GdmHostChooserWidget *widget,
-                 res = XdmcpFlush (widget->priv->socket_fd,
-                                   &widget->priv->broadcast_buf,
-                                   (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
--                                  (int)sizeof (struct sockaddr_storage));
-+                                  (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address)));
-                 if (! res) {
-                         g_warning ("Unable to flush the XDMCP broadcast packet: %s", g_strerror (errno));
-                 }
-@@ -328,7 +328,7 @@ do_ping (GdmHostChooserWidget *widget,
-                         res = XdmcpFlush (widget->priv->socket_fd,
-                                           &widget->priv->query_buf,
-                                           (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
--                                          (int)sizeof (struct sockaddr_storage));
-+                                          (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address)));
-                         if (! res) {
-                                 g_warning ("Unable to flush the XDMCP query packet");
-                         }
-@@ -442,7 +442,7 @@ find_broadcast_addresses (GdmHostChooser
-                         /* paranoia */
-                         ifreq.ifr_name[sizeof (ifreq.ifr_name) - 1] = '\0';
- 
--                        if (ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) {
-+                        if ((ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) && (errno != ENXIO)) {
-                                 g_warning ("Could not get SIOCGIFFLAGS for %s", ifr[i].ifr_name);
-                         }
- 
-@@ -542,6 +542,8 @@ xdmcp_init (GdmHostChooserWidget *widget
+--- gui/simple-chooser/gdm-host-chooser-widget.c.orig	2010-01-13 14:29:00.000000000 +0000
++++ gui/simple-chooser/gdm-host-chooser-widget.c	2010-01-17 13:04:14.000000000 +0000
+@@ -543,6 +543,8 @@ xdmcp_init (GdmHostChooserWidget *widget
  #ifdef ENABLE_IPV6
          widget->priv->socket_fd = socket (AF_INET6, SOCK_DGRAM, 0);
          if (widget->priv->socket_fd != -1) {
-+                int off = 0;
-+                setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof (off));
++		int off = 0;
++		setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof (off));
                  widget->priv->have_ipv6 = TRUE;
          }
  #endif
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-greeter-login-window.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-greeter-login-window.c
deleted file mode 100644
index 55f6d7ec8bd2..000000000000
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-greeter-login-window.c
+++ /dev/null
@@ -1,155 +0,0 @@
---- gui/simple-greeter/gdm-greeter-login-window.c.orig	2009-10-24 20:05:24.000000000 -0400
-+++ gui/simple-greeter/gdm-greeter-login-window.c	2009-10-24 20:11:02.000000000 -0400
-@@ -56,10 +56,6 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
- 
--#ifdef HAVE_DEVICEKIT_POWER
--#include <devkit-power-gobject/devicekit-power.h>
--#endif
--
- #include "gdm-settings-client.h"
- #include "gdm-settings-keys.h"
- #include "gdm-profile.h"
-@@ -83,6 +79,10 @@
- #define CK_SEAT_INTERFACE    "org.freedesktop.ConsoleKit.Seat"
- #define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
- 
-+#define GPM_DBUS_NAME "org.freedesktop.PowerManagement"
-+#define GPM_DBUS_PATH "/org/freedesktop/PowerManagement"
-+#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement"
-+
- #define GLADE_XML_FILE       "gdm-greeter-login-window.glade"
- 
- #define KEY_GREETER_DIR             "/apps/gdm/simple-greeter"
-@@ -477,22 +477,46 @@ adjust_other_login_visibility(GdmGreeter
-         }
- }
- 
--#ifdef HAVE_DEVICEKIT_POWER
- static gboolean
- can_suspend (GdmGreeterLoginWindow *login_window)
- {
--        gboolean ret;
--        DkpClient *dkp_client;
-+	DBusGConnection *connection;
-+	DBusGProxy *proxy;
-+	GError *error;
-+	gboolean ret;
-+	gboolean res;
-+
-+	error = NULL;
-+	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-+	if (error != NULL) {
-+		g_warning ("Couldn't connect to power manager: %s", error->message);
-+		g_error_free (error);
-+		return FALSE;
-+	}
-+	proxy = dbus_g_proxy_new_for_name (connection,
-+					   GPM_DBUS_NAME,
-+					   GPM_DBUS_PATH,
-+					   GPM_DBUS_INTERFACE);
-+
-+	ret = FALSE;
-+
-+	res = dbus_g_proxy_call (proxy, "CanSuspend",
-+				 &error,
-+				 G_TYPE_INVALID,
-+				 G_TYPE_BOOLEAN,
-+				 &ret,
-+				 G_TYPE_INVALID);
-+	if (!res) {
-+		if (error != NULL) {
-+			g_warning ("Could not ask power manager if user can suspend: %s",
-+				   error->message);
-+			g_error_free (error);
-+		}
-+		ret = FALSE;
-+	}
- 
--        /* use DeviceKit-power to get data */
--        dkp_client = dkp_client_new ();
--        g_object_get (dkp_client,
--                      "can-suspend", &ret,
--                      NULL);
--        g_object_unref (dkp_client);
--        return ret;
-+	return ret;
- }
--#endif
- 
- static void
- remove_sensitize_power_buttons_timeout (GdmGreeterLoginWindow *login_window)
-@@ -544,11 +568,7 @@ switch_mode (GdmGreeterLoginWindow *logi
- 
-         show_restart_buttons = get_show_restart_buttons (login_window);
- 
--#ifdef HAVE_DEVICEKIT_POWER
-         show_suspend_button = can_suspend (login_window);
--#else
--        show_suspend_button = FALSE;
--#endif
- 
-         /* we want to run this even if we're supposed to
-            be in the mode already so that we reset everything
-@@ -634,25 +654,39 @@ do_disconnect (GdmGreeterLoginWindow *lo
-         gtk_main_quit ();
- }
- 
--#ifdef HAVE_DEVICEKIT_POWER
- static void
- do_suspend (GdmGreeterLoginWindow *login_window)
- {
--        gboolean ret;
--        DkpClient *dkp_client;
--        GError *error = NULL;
--
--        /* use DeviceKit-power to get data */
--        dkp_client = dkp_client_new ();
--        ret = dkp_client_suspend (dkp_client, &error);
--        if (!ret) {
-+	GError *error;
-+	DBusGConnection *connection;
-+	DBusGProxy *proxy;
-+
-+	g_debug ("GdmGreeterLoginWindow: Suspend button clicked");
-+
-+	error = NULL;
-+	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-+	if (error != NULL) {
-                 g_warning ("Couldn't suspend: %s", error->message);
-                 g_error_free (error);
-                 return;
-         }
--        g_object_unref (dkp_client);
-+	proxy = dbus_g_proxy_new_for_name (connection,
-+					   GPM_DBUS_NAME,
-+					   GPM_DBUS_PATH,
-+					   GPM_DBUS_INTERFACE);
-+	error = NULL;
-+	dbus_g_proxy_call (proxy,
-+			   "Suspend",
-+			   &error,
-+			   G_TYPE_INVALID,
-+			   G_TYPE_INVALID);
-+	if (error != NULL) {
-+		g_warning ("Couldn't suspend: %s", error->message);
-+		g_error_free (error);
-+		return;
-+	}
-+	g_object_unref (proxy);
- }
--#endif
- 
- static void
- delete_entry_text (GtkWidget *entry)
-@@ -971,9 +1005,7 @@ static void
- suspend_button_clicked (GtkButton             *button,
-                         GdmGreeterLoginWindow *login_window)
- {
--#ifdef HAVE_DEVICEKIT_POWER
-         do_suspend (login_window);
--#endif
- }
- 
- 
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
index 83a029a19632..cd8a0f496b5d 100644
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
@@ -1,27 +1,11 @@
---- gui/simple-greeter/gdm-languages.c.orig	2009-07-20 03:09:09.000000000 +0200
-+++ gui/simple-greeter/gdm-languages.c	2009-07-20 10:02:41.000000000 +0200
-@@ -168,13 +168,13 @@ gdm_parse_language_name (const char *nam
-                         *codesetp = NULL;
-                 }
- 
--                if (*codesetp != NULL) {
-+/*                if (*codesetp != NULL) {
-                         char *codeset;
- 
-                         codeset = normalize_codeset (*codesetp);
-                         g_free (*codesetp);
-                         *codesetp = codeset;
--                }
-+                }*/
-         }
- 
-         if (modifierp != NULL) {
-@@ -352,7 +352,7 @@ add_locale (const char *language_name)
-         if (language_name_is_utf8 (language_name)) {
+--- gui/simple-greeter/gdm-languages.c.orig	2010-01-13 16:20:08.000000000 +0000
++++ gui/simple-greeter/gdm-languages.c	2010-01-17 13:10:50.000000000 +0000
+@@ -365,7 +365,7 @@ add_locale (const char *language_name,
+         if (is_utf8) {
                  name = g_strdup (language_name);
-         } else {
+         } else if (utf8_only) {
 -                name = g_strdup_printf ("%s.utf8", language_name);
 +                name = g_strdup_printf ("%s.UTF-8", language_name);
  
-                 if (!language_name_is_utf8 (name)) {
-                         g_free (name);
+                 language_name_get_codeset_details (name, NULL, &is_utf8);
+                 if (is_utf8) {
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
index d0a5d73f5e47..b0b8ed37d060 100644
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
@@ -1,6 +1,6 @@
---- gui/simple-greeter/gdm-user-manager.c.orig	2009-09-21 16:05:27.000000000 -0400
-+++ gui/simple-greeter/gdm-user-manager.c	2009-10-14 12:58:37.000000000 -0400
-@@ -65,6 +65,8 @@
+--- gui/simple-greeter/gdm-user-manager.c.orig	2009-12-21 17:36:30.000000000 +0100
++++ gui/simple-greeter/gdm-user-manager.c	2009-12-27 22:34:26.000000000 +0100
+@@ -66,6 +66,8 @@
  
  #ifdef __sun
  #define DEFAULT_MINIMAL_UID     100
@@ -9,7 +9,7 @@
  #else
  #define DEFAULT_MINIMAL_UID     500
  #endif
-@@ -1366,17 +1368,24 @@ reload_passwd (GdmUserManager *manager)
+@@ -1414,17 +1416,24 @@ reload_passwd (GdmUserManager *manager)
          GSList        *new_users;
          GSList        *list;
          GSList        *dup;
@@ -34,19 +34,23 @@
  
          g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users);
          g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
-@@ -1390,7 +1399,11 @@ reload_passwd (GdmUserManager *manager)
-                 }
-         }
+@@ -1443,9 +1452,15 @@ reload_passwd (GdmUserManager *manager)
+         } else {
+                 g_debug ("GdmUserManager: include_all is TRUE");
  
 +#ifdef __FreeBSD__
-+        for (pwent = getpwent (); pwent != NULL; pwent = getpwent ()) {
++		for (pwent = getpwent ();
++		     pwent != NULL;
++		     pwent = getpwent()) {
 +#else
-         for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) {
+                 for (pwent = fgetpwent (fp);
+                      pwent != NULL;
+                      pwent = fgetpwent (fp)) {
 +#endif
-                 GdmUser *user;
+                         GdmUser *user;
  
-                 user = NULL;
-@@ -1461,7 +1474,11 @@ reload_passwd (GdmUserManager *manager)
+                         user = NULL;
+@@ -1521,7 +1536,11 @@ reload_passwd (GdmUserManager *manager)
   out:
          /* Cleanup */
  
diff --git a/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in b/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in
new file mode 100644
index 000000000000..d14791f00d06
--- /dev/null
+++ b/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in
@@ -0,0 +1,11 @@
+--- gui/user-switch-applet/Makefile.in.orig	2010-03-20 15:19:16.000000000 -0500
++++ gui/user-switch-applet/Makefile.in	2010-03-20 15:20:28.000000000 -0500
+@@ -324,7 +324,7 @@
+ 	-DLIBDIR=\""$(libdir)"\" 			\
+ 	-DDATADIR=\""$(datadir)"\"		 	\
+ 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
+-	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"	\
++	-DLIBLOCALEDIR=\""/usr/share/locale"\"	\
+ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+ 	-DGLADEDIR=\""$(pkgdatadir)"\" 			\
+ 	-DLIBEXECDIR=\""$(libexecdir)"\" 		\
diff --git a/x11/gdm/files/patch-hal-keyboard b/x11/gdm/files/patch-hal-keyboard
deleted file mode 100644
index 904f1cdaccaa..000000000000
--- a/x11/gdm/files/patch-hal-keyboard
+++ /dev/null
@@ -1,104 +0,0 @@
---- daemon/gdm-session-direct.c.orig	2009-07-20 03:09:09.000000000 +0200
-+++ daemon/gdm-session-direct.c	2009-07-20 10:14:45.000000000 +0200
-@@ -45,6 +45,8 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
- 
-+#include <libhal.h>
-+
- #include "gdm-session-direct.h"
- #include "gdm-session.h"
- #include "gdm-session-private.h"
-@@ -597,14 +599,66 @@ get_default_language_name (GdmSessionDir
-     return setlocale (LC_MESSAGES, NULL);
- }
- 
-+static char *
-+get_system_default_layout (GdmSessionDirect *session)
-+{
-+    DBusConnection *connection;
-+    LibHalContext *ctx;
-+    char **devices;
-+    int n_devices;
-+    char *layout;
-+    char *result;
-+
-+    result = NULL;
-+
-+    connection = dbus_g_connection_get_connection (session->priv->connection);
-+    ctx = libhal_ctx_new ();
-+    libhal_ctx_set_dbus_connection (ctx, connection);
-+
-+    if (!libhal_ctx_init (ctx, NULL)) {
-+        goto out;
-+    }
-+
-+    devices = libhal_find_device_by_capability (ctx,
-+                                                "input.keyboard",
-+                                                &n_devices,
-+                                                NULL);
-+    if (n_devices > 0) {
-+        layout = libhal_device_get_property_string (ctx,
-+                                                    devices[0],
-+                                                    "input.x11_options.XkbLayout",
-+                                                    NULL);
-+        if (!layout) {
-+            layout = libhal_device_get_property_string (ctx,
-+                                                        devices[0],
-+                                                        "input.xkb.layout",
-+                                                        NULL);
-+        }
-+	result = g_strdup (layout);
-+	libhal_free_string (layout);
-+    }
-+
-+    libhal_free_string_array (devices);
-+
-+    libhal_ctx_shutdown (ctx, NULL);
-+    libhal_ctx_free (ctx);
-+
-+out:
-+    if (!result) {
-+        result = g_strdup ("us");
-+    }
-+
-+    return result;
-+}
-+
- static const char *
- get_default_layout_name (GdmSessionDirect *session)
- {
--    if (session->priv->saved_layout != NULL) {
--                return session->priv->saved_layout;
-+    if (!session->priv->saved_layout) {
-+        session->priv->saved_layout = get_system_default_layout (session);
-     }
- 
--    return "us";
-+    return session->priv->saved_layout;
- }
- 
- static char *
-@@ -1953,8 +2007,8 @@ setup_session_environment (GdmSessionDir
-                                                      "GDM_LANG",
-                                                      get_language_name (session));
- 
--        if (strcmp (get_layout_name (session),
--                    get_default_layout_name (session)) == 0) {
-+        if (g_strcmp0 (get_layout_name (session),
-+                    get_default_layout_name (session)) != 0) {
-                 gdm_session_direct_set_environment_variable (session,
-                                                              "GDM_KEYBOARD_LAYOUT",
-                                                              get_layout_name (session));
---- daemon/gdm-session-settings.c.orig	2009-05-19 17:18:12.000000000 +0200
-+++ daemon/gdm-session-settings.c	2009-07-20 10:10:15.000000000 +0200
-@@ -149,8 +149,7 @@ gdm_session_settings_set_layout_name (Gd
- {
-         g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings));
- 
--        if (settings->priv->layout_name == NULL ||
--            strcmp (settings->priv->layout_name, layout_name) != 0) {
-+        if (g_strcmp0 (settings->priv->layout_name, layout_name) != 0) {
-                 settings->priv->layout_name = g_strdup (layout_name);
-                 g_object_notify (G_OBJECT (settings), "layout-name");
-         }
diff --git a/x11/gdm/files/patch-hal-keyboard.2 b/x11/gdm/files/patch-hal-keyboard.2
deleted file mode 100644
index a0a84216cc29..000000000000
--- a/x11/gdm/files/patch-hal-keyboard.2
+++ /dev/null
@@ -1,40 +0,0 @@
---- daemon/gdm-session-direct.c.orig	2009-12-02 15:15:33.000000000 +0100
-+++ daemon/gdm-session-direct.c	2009-12-02 15:15:41.000000000 +0100
-@@ -608,6 +608,7 @@
-     char **devices;
-     int n_devices;
-     char *layout;
-+    char *variant;
-     char *result;
- 
-     result = NULL;
-@@ -635,8 +636,26 @@
-                                                         "input.xkb.layout",
-                                                         NULL);
-         }
--	result = g_strdup (layout);
-+
-+	variant = libhal_device_get_property_string (ctx,
-+						     devices[0],
-+						     "input.x11_options.XkbVariant",
-+						     NULL);
-+
-+	if (!variant) {
-+		variant = libhal_device_get_property_string (ctx,
-+							     devices[0],
-+							     "input.xkb.variant",
-+							     NULL);
-+	}
-+
-+	if(layout && variant)
-+		result = g_strdup_printf("%s\t%s", layout, variant);
-+	else
-+		result = g_strdup (layout);
-+
- 	libhal_free_string (layout);
-+	libhal_free_string (variant);
-     }
- 
-     libhal_free_string_array (devices);
-
-
diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install
index 97ae6b4832be..376987eda0e9 100644
--- a/x11/gdm/pkg-install
+++ b/x11/gdm/pkg-install
@@ -3,15 +3,15 @@
 case $2 in
 POST-INSTALL)
 	USER=gdm
-	GROUP=${USER}
+	GROUP=gdm
 	CHMOD=/bin/chmod
 	CHOWN=/usr/sbin/chown
 	MKDIR=/bin/mkdir
 
 	${MKDIR} -p /var/gdm
 	${MKDIR} -p /var/log/gdm
-	${CHMOD} 0755 /var/log/gdm
-	${CHOWN} root:wheel /var/log/gdm
+	${CHMOD} 1770 /var/log/gdm
+	${CHOWN} ${USER}:${GROUP} /var/log/gdm
 	${CHOWN} -R root:${GROUP} /var/gdm
 	${CHMOD} 1770 /var/gdm
 	${MKDIR} -p /var/run/gdm
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index a10f0b9db4ab..97705242ebaf 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -38,7 +38,8 @@ sbin/gdm-stop
 %%DATADIR%%/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop
 %%DATADIR%%/gconf.path
 %%DATADIR%%/gdb-cmd
-%%DATADIR%%/gdm-greeter-login-window.glade
+%%DATADIR%%/gdm-greeter-login-window.ui
+%%DATADIR%%/locale.alias
 %%DATADIR%%/session-setup.entries
 share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 share/gnome/help/gdm/C/gdm.xml
@@ -82,6 +83,7 @@ share/locale/dz/LC_MESSAGES/gdm.mo
 share/locale/el/LC_MESSAGES/gdm.mo
 share/locale/en_CA/LC_MESSAGES/gdm.mo
 share/locale/en_GB/LC_MESSAGES/gdm.mo
+share/locale/en@shaw/LC_MESSAGES/gdm.mo
 share/locale/eo/LC_MESSAGES/gdm.mo
 share/locale/es/LC_MESSAGES/gdm.mo
 share/locale/et/LC_MESSAGES/gdm.mo
@@ -228,7 +230,6 @@ share/pixmaps/nohost.png
 @dirrmtry etc/gdm
 @dirrmtry etc/dm/Sessions
 @dirrmtry etc/dm
-@dirrmtry sbin
 @dirrmtry share/log/gdm
 @dirrmtry share/log
 @unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
@@ -244,8 +245,6 @@ share/pixmaps/nohost.png
 @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
@@ -278,6 +277,8 @@ share/pixmaps/nohost.png
 @dirrmtry share/locale/hy
 @dirrmtry share/locale/fur/LC_MESSAGES
 @dirrmtry share/locale/fur
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/crh/LC_MESSAGES