[packages/X11.git] / XFree86-xdm-fixes.patch

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