Update to 2.6.0.4:

- Allow not checking directory owners with CheckDirOwner key,
  (Andreas Schubert)

- FreeBSD support for VTAllocation stuff (Alexander Nedousukov)

- Add de_AT, de_CH, fr_BE, fr_CH, hy_AM to language list (#148349, #139454)

- Add more native versions of language names and fix up existing ones,
  #148373, #148486, 148356, #148350, #88777, #150293

- Add support for Solaris logindevperm and usiting (Brian Cameron)

- Fix some strings, fixes #144076, #144077, #147800

- On sun we automatically make the default config add -nobanner to
  the X server flags (Arvind)

- Fix doubleclicking on the user browser in the standard greeter

- Fix #144007 where bad .profile could screw up a session start

- Fix #148042 by making GETTEXT_PACKAGE just gdm

- Fix #147940 by properly checking if shutdown/reboot/suspend commands exist
  in the graphical greeter

- Fix #143707 by using Exclude key for the user dropdown lists in gdmsetup

- Fix some compiler warnings for new gcc

- .dmrc is created with umask 077 for maximum anality

- Translation updates (Kjartan Maraas, Laszlo Dvornik, Laurent Dhima,
  Martin Willemoes Hansen, Marie Lund, Metin Amiroff, Francisco Javier F.
  Serrador, Duarte Loreto, Tommi Vainikainen, Leonid Kanter, Changwoo Ryu,
  Funda Wang, Artur Flinta, GNOME PL Team, Miloslav Trmac, Adam Weinberger,
  Estevao Samuel Procopio, Tommi Vainikainen, Danilo Segan, Guntupalli
  Karunakar, Lucas Vieites, Christian Neumair, Nikos Charonitakis,
  Gustavo Maciel Dias Vieira, Afonso Celso Medina, Sebastien Bacher,
  Ole Laursen, Ivan Stojmirov, Andras Timar)

4 files changed, 81 insertions, 80 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 5c052146783..a611e27edd4 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2004/07/05 22:02:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.68 2004/09/01 14:42:59 jmmv Exp $
 #
 
-DISTNAME=	gdm-2.6.0.3
-PKGREVISION=	1
+DISTNAME=	gdm-2.6.0.4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.6/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST
index d729cffb609..724b7d994c5 100644
--- a/x11/gdm/PLIST
+++ b/x11/gdm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/07/05 22:02:58 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/09/01 14:42:59 jmmv Exp $
 bin/gdm
 bin/gdm-binary
 bin/gdmXnest
@@ -14,8 +14,8 @@ lib/gtk-2.0/modules/libdwellmouselistener.a
 lib/gtk-2.0/modules/libdwellmouselistener.la
 lib/gtk-2.0/modules/libkeymouselistener.a
 lib/gtk-2.0/modules/libkeymouselistener.la
-${PAM_MISC}libexec/gdmaskpass
 libexec/gdmtranslate
+${PAM_MISC}libexec/gdmaskpass
 man/man1/gdm.1
 sbin/gdm-restart
 sbin/gdm-safe-restart
@@ -102,70 +102,71 @@ share/gnome/help/gdm/zh_TW/legal.xml
 share/icons/hicolor/16x16/apps/gdm-xnest.png
 share/icons/hicolor/32x32/apps/gdm-setup.png
 share/icons/hicolor/32x32/apps/gdm-xnest.png
-${PKGLOCALEDIR}/locale/af/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/is/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/mi/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gdm-2.6.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/af/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/is/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/mi/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gdm.mo
 share/omf/gdm/gdm-C.omf
 share/omf/gdm/gdm-de.omf
 share/omf/gdm/gdm-es.omf
@@ -216,6 +217,7 @@ share/xsessions/gnome.desktop
 @dirrm share/gnome/help/gdm
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/gnome/capplets
+@comment in gnome2-dirs: @dirrm share/gnome
 @dirrm share/gdm/themes/happygnome-list
 @dirrm share/gdm/themes/happygnome
 @dirrm share/gdm/themes/circles
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 14756b3ea87..6156e1ac57c 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.16 2004/07/05 22:02:58 jmmv Exp $
+$NetBSD: distinfo,v 1.17 2004/09/01 14:42:59 jmmv Exp $
 
-SHA1 (gdm-2.6.0.3.tar.bz2) = 03462ee0ac5eb7238e7460fc6c985724500470b1
-Size (gdm-2.6.0.3.tar.bz2) = 3079606 bytes
+SHA1 (gdm-2.6.0.4.tar.bz2) = 84c48ade6e69ec3432dc762a8b79288308cf5fd8
+Size (gdm-2.6.0.4.tar.bz2) = 3217512 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 Size (Daemon.README) = 2191 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
-SHA1 (patch-aa) = 2704d70b2ad3b3908749e3423fc60e8815287451
+SHA1 (patch-aa) = ce828a7bb22fd4d544f112888fd7d75d4c8b8ddd
 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 29240d91a75..27b225d9dd7 100644
--- a/x11/gdm/patches/patch-aa
+++ b/x11/gdm/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2004/07/05 09:10:19 jmmv Exp $
+$NetBSD: patch-aa,v 1.11 2004/09/01 14:42:59 jmmv Exp $
 
---- configure.orig	2004-06-11 17:49:13.000000000 +0200
+--- configure.orig	2004-08-18 22:09:11.000000000 +0200
 +++ configure
-@@ -21237,7 +21237,8 @@ _ACEOF
+@@ -21231,7 +21231,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.10 2004/07/05 09:10:19 jmmv Exp $
  int
  main ()
  {
-@@ -21606,13 +21607,13 @@ echo "${ECHO_T}yes" >&6
+@@ -21594,13 +21595,13 @@ echo "${ECHO_T}yes" >&6
  
              echo "$as_me:$LINENO: checking DAEMON_CFLAGS" >&5
  echo $ECHO_N "checking DAEMON_CFLAGS... $ECHO_C" >&6
@@ -28,9 +28,9 @@ $NetBSD: patch-aa,v 1.10 2004/07/05 09:10:19 jmmv Exp $
              echo "$as_me:$LINENO: result: $DAEMON_LIBS" >&5
  echo "${ECHO_T}$DAEMON_LIBS" >&6
          else
-@@ -28015,6 +28018,10 @@ else
-    X_SERVER="/usr/X11R6/bin/X"
+@@ -28163,6 +28164,10 @@ else
     X_CONF_PATH="/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
+    X_CONFIG_OPTIONS="-audit 0"
  fi
 +X_PATH="${X11BASE}/bin"
 +X_SERVER_PATH="${X11BASE}/bin"
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.10 2004/07/05 09:10:19 jmmv Exp $
  
  
  
-@@ -28064,6 +28071,8 @@ prefix=$old_prefix
+@@ -28218,6 +28223,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"