Merge from vendor branch TNF:
[pkgsrc.git] / x11 / gdm / patches / patch-ab
1 $NetBSD$
2
3 --- config/gdm.conf.in.orig     Tue Sep  7 06:37:16 1999
4 +++ config/gdm.conf.in  Mon Nov 15 00:57:03 1999
5 @@ -1,20 +1,20 @@
6  [daemon]
7  Chooser=@bindir@/gdmchooser --disable-sound --disable-crash-dialog
8 -DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@bindir@
9 +DefaultPath=/bin:/usr/bin:/usr/local/bin:@X11BASE@/bin:@LOCALBASE@/bin
10  DisplayInitDir=@sysconfdir@/gdm/Init
11  Greeter=@bindir@/gdmlogin --disable-sound --disable-crash-dialog
12 -Group=gdm
13 +Group=@GDMGRP@
14  HaltCommand=/sbin/shutdown -h now
15  KillInitClients=1
16  LogDir=@authdir@
17 -PidFile=/var/run/gdm.pid
18 +PidFile=/var/run/xdm.pid
19  PostSessionScriptDir=@sysconfdir@/gdm/PostSession/
20  PreSessionScriptDir=@sysconfdir@/gdm/PreSession/
21  RebootCommand=/sbin/shutdown -r now
22 -RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@bindir@
23 +RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:@X11BASE@/bin:@LOCALBASE@/bin
24  ServAuthDir=@authdir@
25  SessionDir=@sysconfdir@/gdm/Sessions/
26 -User=gdm
27 +User=@GDMOWN@
28  UserAuthDir=
29  UserAuthFBDir=/tmp
30  UserAuthFile=.Xauthority
31 @@ -50,7 +50,7 @@
32  GlobalFaceDir=@datadir@/faces/
33  Icon=@pixmapdir@/gdm.xpm
34  LocaleFile=@localedir@/locale.alias
35 -Logo=@pixmapdir@/gnome-logo-large.png
36 +Logo=@pixmapdir@/Daemon.png
37  Quiver=1
38  SystemMenu=0
39  Welcome=Welcome to %n
40 @@ -64,7 +64,7 @@
41  Enable=0
42  
43  [servers]
44 -0=/usr/bin/X11/X
45 -#1=/usr/bin/X11/X
46 +0=@X11BASE@/bin/X
47 +#1=@X11BASE@/bin/X
48  
49