XFree86-xdm-fixes.patch

   1 --- XFree86-4.3.0/xc/programs/xdm/Imakefile.orig        Sat Dec  7 21:31:04 2002
   2 +++ XFree86-4.3.0/xc/programs/xdm/Imakefile     Wed May 14 22:07:20 2003
   3 @@ -256,9 +256,9 @@
   4                   '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \
   5                   '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
   6                   '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \
   7 -                 '-DDEF_CHOOSER="$(XDMDIR)/chooser"' \
   8 -                 '-DDEF_AUTH_DIR="$(XDMDIR)"' \
   9 -                 '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"'
  10 +                 '-DDEF_CHOOSER="$(BINDIR)/chooser"' \
  11 +                 '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \
  12 +                 '-DDEF_GREETER_LIB="$(USRLIBDIR)/libXdmGreet.so"'
  13
  14  ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter)
  15  LinkConfDirectory(xdm,.,xdm,.)
  16 @@ -277,7 +277,7 @@
  17  #if BuildChooser
  18  SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES))
  19  NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter)
  20 -InstallProgram(chooser,$(XDMDIR))
  21 +InstallProgram(chooser,$(BINDIR))
  22  InstallAppDefaults(Chooser)
  23  #endif
  24  #if BuildBoth
  25 diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Imakefile XFree86-4.0.2/xc/programs/xdm/config/Imakefile
  26 --- XFree86-4.0.2.org/xc/programs/xdm/config/Imakefile  Mon Jan 31 20:33:43 2000
  27 +++ XFree86-4.0.2/xc/programs/xdm/config/Imakefile      Thu Dec 21 13:20:54 2000
  28 @@ -5,9 +5,7 @@
  29
  30  all:: Xservers.ws xdm-config Xservers Xresources
  31
  32 -#if defined(i386Architecture) && (defined(NetBSDArchitecture) || defined(OpenBSDArchitecture))
  33 -DEFAULTVT=vt05
  34 -#endif
  35 +DEFAULTVT=vt9
  36
  37  #ifndef XdmPixmap
  38  # define XdmPixmap XFree86.xpm
  39 @@ -25,7 +23,11 @@
  40  #endif
  41
  42  CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter)
  43 -CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU),NullParameter)
  44 +#ifdef LinuxArchitecture
  45 +CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR),NullParameter)
  46 +#else
  47 +CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR),NullParameter)
  48 +#endif /* LinuxArchitecture */
  49  CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
  50
  51  LinkFile(Xservers,Xservers.$(SERVERSTYPE))
  52 diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp
  53 --- XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp   Thu Dec 21 13:06:17 2000
  54 +++ XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp       Thu Dec 21 13:19:25 2000
  55 @@ -36,9 +36,7 @@
  56  /**/#endif
  57  #endif /* XPM */
  58  /**/#ifdef COLOR
  59 -#ifndef XPM
  60 -xlogin*greetColor: CadetBlue
  61 -#else
  62 +#ifdef XPM
  63  xlogin*borderWidth: 1
  64  xlogin*frameWidth: 5
  65  xlogin*innerFramesWidth: 2
  66 @@ -47,6 +45,8 @@
  67  xlogin*background: grey
  68  !xlogin*foreground: darkgreen
  69  xlogin*greetColor: Blue3
  70 +#else
  71 +login*greetColor: CadetBlue
  72  #endif /* XPM */
  73  xlogin*failColor: red
  74  *Foreground: black