Update to 2.6.0.6:

- Allow flexi x servers to be launched from the fifo script with
  "echo FLEXI_XSERVER > <ServAuthDir>/.gdmfifo" (Tuukka Hastrup, me)
- Autologin works on the first handled display not just first local
  display
- There is a global cookie for the SUP protocol in <ServAuthDir>/.cookie
- Xnest is set up properly on Solaris (Brian)
- Fixup comments in the config file (Brian, me)
- Fix language selection (Ray Strode)
- Set the GDM_XSERVER_LOCATION env var on the session so that the
  user can find out what they can do.
- Fix logindevperm stuff to allow a11y access to sound (Brian Cameron)
- Solaris build fixes for Solaris 9 and earlier (Brian Cameron)
- Translation updates (Kjartan Maraas, Christophe Merlet, Changwoo Ryu,
  Laszlo Dvornik, Adam Weinberger, Zygimantas Berucka, Alessio Frusciante,
  Francesco Marletta)

3 files changed, 15 insertions, 15 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 04d4aaca35e..bfc4ecb204e 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2004/12/28 02:47:52 reed Exp $
+# $NetBSD: Makefile,v 1.72 2004/12/28 21:51:12 jmmv Exp $
 #
 
-DISTNAME=	gdm-2.6.0.5
-PKGREVISION=	2
+DISTNAME=	gdm-2.6.0.6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.6/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 2b1c2797d4c..02ebff25b9c 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.18 2004/09/21 17:00:16 jmmv Exp $
+$NetBSD: distinfo,v 1.19 2004/12/28 21:51:12 jmmv Exp $
 
-SHA1 (gdm-2.6.0.5.tar.bz2) = 92988f46c228224a4a4387f1c4f9ed5db6162f51
-Size (gdm-2.6.0.5.tar.bz2) = 3218079 bytes
+SHA1 (gdm-2.6.0.6.tar.bz2) = 4fade91ee1ceb35901e0503555d3b8f4d1da9849
+Size (gdm-2.6.0.6.tar.bz2) = 3216098 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 Size (Daemon.README) = 2191 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
-SHA1 (patch-aa) = ce828a7bb22fd4d544f112888fd7d75d4c8b8ddd
+SHA1 (patch-aa) = d37a6b1a7fe1eec6d351b3f25015d1e901f8f3b4
 SHA1 (patch-ac) = d810e16076aa69070f238900198a0050eaf12516
 SHA1 (patch-ae) = f05e3bffbcb1522ac6265869eef52655d35511c2
 SHA1 (patch-af) = 467afc3ee4d555fac4d5d26e49c3ff8b098e7369
diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa
index 27b225d9dd7..69453551cff 100644
--- a/x11/gdm/patches/patch-aa
+++ b/x11/gdm/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.11 2004/09/01 14:42:59 jmmv Exp $
+$NetBSD: patch-aa,v 1.12 2004/12/28 21:51:12 jmmv Exp $
 
---- configure.orig	2004-08-18 22:09:11.000000000 +0200
+--- configure.orig	2004-10-27 01:06:14.000000000 +0200
 +++ configure
 @@ -21231,7 +21231,8 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
@@ -28,18 +28,19 @@ $NetBSD: patch-aa,v 1.11 2004/09/01 14:42:59 jmmv Exp $
              echo "$as_me:$LINENO: result: $DAEMON_LIBS" >&5
  echo "${ECHO_T}$DAEMON_LIBS" >&6
          else
-@@ -28163,6 +28164,10 @@ else
-    X_CONF_PATH="/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
+@@ -28158,6 +28159,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"
- 
- 
- 
-@@ -28218,6 +28223,8 @@ prefix=$old_prefix
++
+ # 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
  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"