XFree86-xdm-fixes.patch

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