X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=XFree86-xdm-fixes.patch;h=80b6fe670ae6550f651480c0b3c9847a7f3489ed;hb=8b131cacf8f87dcf3bcdd3e965bef0a5efd1867d;hp=f50bf0cc827d8c2988c7453d3ac4d13604c9d2e7;hpb=2452d5b736af910a5940673c8eb1004a07c5e5f7;p=packages%2FXFree86.git

diff --git a/XFree86-xdm-fixes.patch b/XFree86-xdm-fixes.patch
index f50bf0c..80b6fe6 100644
--- a/XFree86-xdm-fixes.patch
+++ b/XFree86-xdm-fixes.patch
@@ -5,7 +5,7 @@ diff -urN xc.orig/programs/xdm/Imakefile xc/programs/xdm/Imakefile
  		  '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \
  		  '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
  		  '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \
--		  '-DDEF_CHOOSER="$(XDMDIR)/chooser"' \
+-		  '-DDEF_CHOOSER="$(CHOOSERPATH)"' \
 -		  '-DDEF_AUTH_DIR="$(XDMDIR)"' \
 -		  '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"'
 +		  '-DDEF_CHOOSER="$(BINDIR)/chooser"' \
@@ -30,7 +30,7 @@ diff -urN xc.orig/programs/xdm/config/Imakefile xc/programs/xdm/config/Imakefile
  
  all:: Xservers.ws xdm-config Xservers Xresources
  
--#if defined(i386Architecture) && (defined(NetBSDArchitecture) || defined(OpenBSDArchitecture))
+-#if defined(i386Architecture) && (defined(KNetBSDArchitecture) || defined(KOpenBSDArchitecture))
 -DEFAULTVT=vt05
 -#endif
 -
@@ -45,22 +45,22 @@ diff -urN xc.orig/programs/xdm/config/Imakefile xc/programs/xdm/config/Imakefile
  #endif
  
  CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter)
--CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU),NullParameter)
+-CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter)
 +#ifdef LinuxArchitecture
-+CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR),NullParameter)
++CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter)
 +#else
-+CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR),NullParameter)
++CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter)
 +#endif /* LinuxArchitecture */
  CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
  
  LinkFile(Xservers,Xservers.$(SERVERSTYPE))
-diff -urN xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
---- xc.orig/programs/xdm/config/Xres.cpp	Mon Dec 30 15:54:07 2002
-+++ xc/programs/xdm/config/Xres.cpp	Mon Dec 30 18:41:24 2002
+diff -urN xc.org/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
+--- xc.org/programs/xdm/config/Xres.cpp	2003-11-23 23:32:35.000000000 +0100
++++ xc/programs/xdm/config/Xres.cpp	2003-11-23 23:33:41.000000000 +0100
 @@ -41,9 +41,7 @@
- /**/#endif
+ XHASHendif
  #endif /* XPM */
- /**/#ifdef COLOR
+ XHASHifdef COLOR
 -#ifndef XPM
 -xlogin*greetColor: CadetBlue
 -#else