$NetBSD: patch-ab,v 1.1.1.1 2004/01/20 13:33:13 xtraeme Exp $

--- config/gdm.conf.in.orig	Sun Mar  4 15:27:12 2001
+++ config/gdm.conf.in	Fri Jul 26 19:51:41 2002
@@ -1,10 +1,10 @@
 [daemon]
 AutomaticLogin=
 Chooser=@EXPANDED_BINDIR@/gdmchooser --disable-sound --disable-crash-dialog
-DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
+DefaultPath=/bin:/usr/bin:/usr/local/bin:@X11BASE@/bin:@LOCALBASE@/bin
 DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init
 Greeter=@EXPANDED_BINDIR@/gdmlogin --disable-sound --disable-crash-dialog
-Group=gdm
+Group=@GDMGRP@
 HaltCommand=/sbin/shutdown -h now
 KillInitClients=true
 LogDir=@EXPANDED_AUTHDIR@
@@ -12,10 +12,10 @@
 PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/
 PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/
 RebootCommand=/sbin/shutdown -r now
-RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
+RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:@X11BASE@/bin:@LOCALBASE@/bin
 ServAuthDir=@EXPANDED_AUTHDIR@
 SessionDir=@EXPANDED_SYSCONFDIR@/gdm/Sessions/
-User=gdm
+User=@GDMOWN@
 UserAuthDir=
 UserAuthFBDir=/tmp
 UserAuthFile=.Xauthority
@@ -51,7 +51,7 @@
 GlobalFaceDir=@EXPANDED_DATADIR@/faces/
 Icon=@EXPANDED_PIXMAPDIR@/gdm.xpm
 LocaleFile=@EXPANDED_LOCALEDIR@/locale.alias
-Logo=@EXPANDED_PIXMAPDIR@/gnome-logo-large.png
+Logo=@EXPANDED_PIXMAPDIR@/Daemon.png
 Quiver=true
 SystemMenu=true
 Welcome=Welcome to %n
@@ -75,8 +75,8 @@
 Enable=false
 
 [servers]
-0=/usr/bin/X11/X
-#1=/usr/bin/X11/X
+0=@X11BASE@/bin/X
+#1=@X11BASE@/bin/X
 #Note: If you want to make sure X runs on a specific virtual console on linux,
 #      you can use the following (for console 7):
 #0=/usr/bin/X11/X vt7