Update to 2.6.0.8:

- Enhanced a11y gesture listeners so they support XInput events
  for better a11y support.  (Bill Haneman).

- Add STRUTS support to gdm2's window manager for better a11y
  support (Bill Haneman).

- Improved the way the user's default PATH is set up by configure
  so it is set more sanely without redundant PATH's, and is more
  careful about not putting symlinked X11 directories in the PATH.
  Now can configure user's default directory via the --with-post-path
  argument.  (Brian Cameron).

- New configuration option to disallow visible feedback in password
  entry.  (John Martinsson).

- Fix width of "user name entry" to shrink to fit parent widget so
  text does not run out-of-bounds.  (Chookij Vanatham)

- Restart slave process if XDMCP chooser is selected from flexi
  server.  (Leena Gunda)

- Make default face obey the MaxIconWidth and MaxIconHeight
  configuration settings.  (Diego Gonzalez)

- gdm2 slave now sources /etc/environment if it exists. (Vicent Berger)

- Correct gdmsetup's tooltip to conform to GNOME HIG. (Sebastien Bacher)

- Use ngettext for translation.  (Christian Rose)

- Set default font size to "Sans 12".  (Erwann Chenede)

- Set name of password entry for more friendly a11y (Erwann Chenede)

- Mark "Remove Theme" for translation.  (Balamurali Viswanathan)

- Remove <span> tags from language display since they were causing
  formatting issues for some users.  (Glynn Foster)

- Ensure LC_MESSAGES is set so the user's default language can be
  displayed (Hidetoshi Tajima).

- Specify font for username/password entry for gdm2 supplied themes.
  (Alexander Kirillov)

- Add Kinyarwanda and Armenian to language list.  (Steve Murphy and
  petrosyan@gmail.com)

- Correct IPv6 logic so that it supports an IPv4 XDMCP request when
  IPv6 is enabled.  Fixed configure help for --enable-ipv6.
  (Brian Cameron)

- Set more sane Reboot/Halt/Shutdown commands on Solaris.  (Brian
  Cameron).

- Correct the usage of IFS in the Init/PreSession/PostSession/Xsession
  scripts so it works on Solaris.  (Leena Gunda)

- Support logindevperm on Solaris for automatic/timed login.
  (Brian Cameron)

- Swap Alt and Meta keys on Solaris.  (Leena Gunda)

- Correct IPv6 identification for Solaris.  (Leena Gunda)

- Cleanup.  (Mark McLoughlin and Kjartan Marass)

3 files changed, 20 insertions, 17 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 8deceefa3a6..f7c92c1a24e 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2005/02/03 13:37:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.75 2005/03/22 16:25:42 jmmv Exp $
 #
 
-DISTNAME=	gdm-2.6.0.7
+DISTNAME=	gdm-2.6.0.8
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -33,6 +33,7 @@ PKG_SUPPORTED_OPTIONS=	inet6 PAM
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ENV+=		PREFIX=${PREFIX}
 CONFIGURE_ENV+=		X11BASE=${X11BASE}
 MAKE_ENV+=		CHMOD=${CHMOD} CHOWN=${CHOWN}
 
@@ -90,6 +91,8 @@ GDMGRP=		daemon
 
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if ${OPSYS} == "NetBSD"
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 11d46ca70ae..c4da4d4c9ff 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.21 2005/02/23 17:36:10 wiz Exp $
+$NetBSD: distinfo,v 1.22 2005/03/22 16:25:42 jmmv Exp $
 
-SHA1 (gdm-2.6.0.7.tar.bz2) = 55fd0a5fa69c66e34f2392e709a09f5f11e8ce26
-RMD160 (gdm-2.6.0.7.tar.bz2) = 0ff060d281b05ee42209c90b65817560b8e3809f
-Size (gdm-2.6.0.7.tar.bz2) = 3345365 bytes
+SHA1 (gdm-2.6.0.8.tar.bz2) = 1f263b777b005a67b75560e992900136bb614b4b
+RMD160 (gdm-2.6.0.8.tar.bz2) = d7a84e1b523bedbac5dc38c124a297f877c40be0
+Size (gdm-2.6.0.8.tar.bz2) = 3357597 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
 Size (Daemon.README) = 2191 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
 Size (Daemon.png) = 15725 bytes
-SHA1 (patch-aa) = d37a6b1a7fe1eec6d351b3f25015d1e901f8f3b4
+SHA1 (patch-aa) = 68b631bdf400b33863c36b17478eb5e899659386
 SHA1 (patch-ac) = bcb4656d9467737d62b69a1dd3f3750d5607fef3
 SHA1 (patch-ae) = 358dc369e2bb7380b5c6bf7145c8822edba0330e
 SHA1 (patch-af) = 467afc3ee4d555fac4d5d26e49c3ff8b098e7369
diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa
index 69453551cff..5e241c979f0 100644
--- a/x11/gdm/patches/patch-aa
+++ b/x11/gdm/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2004/12/28 21:51:12 jmmv Exp $
+$NetBSD: patch-aa,v 1.13 2005/03/22 16:25:42 jmmv Exp $
 
---- configure.orig	2004-10-27 01:06:14.000000000 +0200
+--- configure.orig	2005-03-07 22:04:33.000000000 +0100
 +++ configure
-@@ -21231,7 +21231,8 @@ _ACEOF
+@@ -21643,7 +21643,8 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.12 2004/12/28 21:51:12 jmmv Exp $
  int
  main ()
  {
-@@ -21594,13 +21595,13 @@ echo "${ECHO_T}yes" >&6
+@@ -22113,13 +22114,13 @@ echo "${ECHO_T}yes" >&6
  
              echo "$as_me:$LINENO: checking DAEMON_CFLAGS" >&5
  echo $ECHO_N "checking DAEMON_CFLAGS... $ECHO_C" >&6
@@ -28,19 +28,19 @@ $NetBSD: patch-aa,v 1.12 2004/12/28 21:51:12 jmmv Exp $
              echo "$as_me:$LINENO: result: $DAEMON_LIBS" >&5
  echo "${ECHO_T}$DAEMON_LIBS" >&6
          else
-@@ -28158,6 +28159,11 @@ else
+@@ -29017,6 +29018,11 @@ else
     X_CONFIG_OPTIONS="-audit 0"
  fi
  
 +X_PATH="${X11BASE}/bin"
 +X_SERVER_PATH="${X11BASE}/bin"
 +X_SERVER="${X11BASE}/bin/X ${X_SERVER_ARGS}"
-+X_CONF_PATH="${X11BASE}/bin"
++GDM_CONF_PATH="${X11BASE}/bin:${PREFIX}/bin:/usr/bin:/bin"
 +
- # On Solaris, Xnest is only shipped in /usr/openwin/, so set path
- # properly.  The Xsun version of Xnest also requires the -pn
- # argument so it can be run as the user.  Note that you can have
-@@ -28233,6 +28239,8 @@ prefix=$old_prefix
+ # Don't add EXPANDED_BINDIR to GDM_USER_PATH if it is already in the PATH.
+ if test "x$EXPANDED_BINDIR" != "x/bin" -a "x$EXPANDED_BINDIR" != "x/usr/bin"; then
+    GDM_USER_PATH="$GDM_USER_PATH:$EXPANDED_BINDIR"
+@@ -29117,6 +29123,8 @@ prefix=$old_prefix
  exec_prefix=$old_exec_prefix
  
                                                                                                                                                                                                                                                                                                                                                                                                                                      ac_config_files="$ac_config_files Makefile daemon/Makefile gui/Makefile gui/greeter/Makefile gui/greeter/themes/Makefile gui/greeter/themes/circles/Makefile gui/greeter/themes/happygnome/Makefile gui/greeter/themes/happygnome-list/Makefile gui/modules/Makefile gui/modules/AccessKeyMouseEvents gui/modules/AccessDwellMouseEvents utils/Makefile pixmaps/Makefile pixmaps/16x16/Makefile pixmaps/32x32/Makefile pixmaps/48x48/Makefile config/Makefile po/Makefile.in vicious-extensions/Makefile docs/Makefile docs/C/Makefile docs/de/Makefile docs/es/Makefile docs/fr/Makefile docs/it/Makefile docs/sv/Makefile docs/ja/Makefile docs/ko/Makefile docs/zh_CN/Makefile docs/zh_HK/Makefile docs/zh_TW/Makefile config/gdm.conf config/Xsession config/Default config/PreSession config/PostSession daemon/gdm gdm-stop gdm-restart gdm-safe-restart gdmsetup-security gdm.spec"