diff options
Diffstat (limited to 'x11/gdm2/files/patch-ab')
| -rw-r--r-- | x11/gdm2/files/patch-ab | 42 |
1 files changed, 15 insertions, 27 deletions
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab index cd7353010772..4165942a4b05 100644 --- a/x11/gdm2/files/patch-ab +++ b/x11/gdm2/files/patch-ab @@ -1,18 +1,15 @@ - -$FreeBSD$ - ---- config/gdm.conf.in.orig Fri Nov 16 13:42:13 2001 -+++ config/gdm.conf.in Thu Dec 20 11:35:10 2001 -@@ -5,7 +5,7 @@ +--- config/gdm.conf.in.orig Mon May 20 23:50:34 2002 ++++ config/gdm.conf.in Mon May 20 23:53:04 2002 +@@ -17,7 +17,7 @@ # want gdm to kill/restart the server, turn this on AlwaysRestartServer=false - Configurator=@EXPANDED_GDMCONFIGDIR@/gdmconfig --disable-sound --disable-crash-dialog + Configurator=@EXPANDED_GDMCONFIGDIR@/gdmsetup --disable-sound --disable-crash-dialog -GnomeDefaultSession=@EXPANDED_DATADIR@/gnome/default.session +GnomeDefaultSession=@EXPANDED_DATADIR@/default.session 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/bin/X11:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@ DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init -@@ -13,7 +13,7 @@ +@@ -26,7 +26,7 @@ Group=gdm HaltCommand=/sbin/shutdown -h now KillInitClients=true @@ -21,28 +18,28 @@ $FreeBSD$ PidFile=/var/run/gdm.pid PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/ PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/ -@@ -22,7 +22,7 @@ +@@ -35,7 +35,7 @@ FailsafeXServer= XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing 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/bin/X11:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@ +RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@ ServAuthDir=@EXPANDED_AUTHDIR@ SessionDir=@EXPANDED_SYSCONFDIR@/gdm/Sessions/ SuspendCommand= -@@ -33,9 +33,9 @@ +@@ -46,9 +46,9 @@ TimedLoginEnable=false TimedLogin= TimedLoginDelay=30 --StandardXServer=/usr/bin/X11/X +-StandardXServer=/usr/X11R6/bin/X +StandardXServer=@EXPANDED_BINDIR@/X FlexibleXServers=5 --Xnest=/usr/bin/X11/Xnest -name Xnest +-Xnest=/usr/X11R6/bin/Xnest -name Xnest +Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest [security] # If any distributions ship with this one off, they should be shot -@@ -68,7 +68,7 @@ +@@ -81,7 +81,7 @@ Willing=@EXPANDED_SYSCONFDIR@/gdm/Xwilling [gui] @@ -51,7 +48,7 @@ $FreeBSD$ MaxIconWidth=128 MaxIconHeight=128 -@@ -77,14 +77,14 @@ +@@ -90,7 +90,7 @@ ConfigAvailable=true Browser=false DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png @@ -59,20 +56,11 @@ $FreeBSD$ +DefaultLocale=en_US.ISO_8859-1 # These are things excluded from the face browser, not from logging in Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm --Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,* -+Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*-r-*,* 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 -@@ -137,5 +137,5 @@ +@@ -151,5 +151,5 @@ [server-Standard] name=Standard server --command=/usr/bin/X11/X +-command=/usr/X11R6/bin/X +command=@EXPANDED_BINDIR@/X flexible=true |