]> git.pld-linux.org Git - packages/XFree86.git/blame - XFree86-PLD.patch
projects / packages / XFree86.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- control whether to listen on TCP is in xfs.config
[packages/XFree86.git] / XFree86-PLD.patch
CommitLineData
e1fe05b9
JR		 1diff -urN XFree86-4.0.1.orig/xc/Makefile XFree86-4.0.1/xc/Makefile
2--- XFree86-4.0.1.orig/xc/Makefile Wed Mar 22 22:23:30 2000
3+++ XFree86-4.0.1/xc/Makefile Sun Oct 29 23:41:32 2000
4@@ -5,10 +5,10 @@
5 # or add "MAKE = make" to this file.
6
7 RELEASE = "Release 6.4"
8-SHELL = /bin/sh
9+SHELL = /bin/sh -e
10 RM = rm -f
11 MV = mv
12-WORLDOPTS = -k
13+WORLDOPTS =
14 WIN32WORLDOPTS = -i
15 TOP = .
16 CURRENT_DIR = .
17diff -urN XFree86-4.0.1.orig/xc/config/cf/Imake.cf XFree86-4.0.1/xc/config/cf/Imake.cf
18--- XFree86-4.0.1.orig/xc/config/cf/Imake.cf Sat Jul 1 01:34:20 2000
19+++ XFree86-4.0.1/xc/config/cf/Imake.cf Sun Oct 29 23:21:35 2000
20@@ -583,6 +583,10 @@
21 # endif
22 # undef __i386__
23 # endif /* __i386__ */
24+# ifdef alpha
25+# define AlphaArchitecture
26+# undef alpha
27+# endif /* __alpha */
28 # ifdef __alpha
29 # define AlphaArchitecture
30 # undef __alpha
31diff -urN XFree86-4.0.1.orig/xc/config/cf/Imake.tmpl XFree86-4.0.1/xc/config/cf/Imake.tmpl
32--- XFree86-4.0.1.orig/xc/config/cf/Imake.tmpl Tue Jun 27 02:55:44 2000
33+++ XFree86-4.0.1/xc/config/cf/Imake.tmpl Sun Oct 29 23:21:34 2000
34@@ -208,7 +208,7 @@
35
36 #ifndef BuildHtmlManPages
37 #ifdef RmanCmd
38-#define BuildHtmlManPages YES
39+#define BuildHtmlManPages NO
40 #else
41 #define BuildHtmlManPages NO
42 #endif
43@@ -653,11 +653,7 @@
44 #define LintlibDir $(USRLIBDIR)/lint
45 #endif
46 #ifndef SystemManDirectory
47-#if SystemV4
48 #define SystemManDirectory /usr/share/man
49-#else
50-#define SystemManDirectory /usr/man
51-#endif
52 #endif
53 #ifndef ManDirectoryRoot
54 #ifdef ProjectRoot
55@@ -784,7 +780,7 @@
56 #define NoRConst NO /* YES if const for structs of funcs is bad */
57 #endif
58 #ifndef InstPgmFlags
59-#define InstPgmFlags -s
60+#define InstPgmFlags
61 #endif
62 #ifndef InstBinFlags
63 #define InstBinFlags -m 0755
64diff -urN XFree86-4.0.1.orig/xc/config/cf/X11.tmpl XFree86-4.0.1/xc/config/cf/X11.tmpl
65--- XFree86-4.0.1.orig/xc/config/cf/X11.tmpl Tue Jun 27 02:55:45 2000
66+++ XFree86-4.0.1/xc/config/cf/X11.tmpl Sun Oct 29 23:37:03 2000
67@@ -833,8 +833,11 @@
68 #define PexCCOptions DefaultCCOptions
69 #endif
70 #endif
71+#ifndef EtcX11Directory
72+#define EtcX11Directory /etc/X11
73+#endif
74 #ifndef DefaultFSConfigFile
75-#define DefaultFSConfigFile $(LIBDIR)/fs/config
76+#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
77 #endif
78
79 /* X-TrueType settings */
80@@ -950,10 +953,10 @@
81 #endif
82 #endif
83 #ifndef ConfigDir
84-#define ConfigDir $(LIBDIR)/config
85+#define ConfigDir $(LIBDIR)/config
86 #endif
87 #ifndef DocDir
88-#define DocDir $(LIBDIR)/doc
89+#define DocDir $(LIBDIR)/share/doc
90 #endif
91 #ifndef DocHtmlDir
92 #define DocHtmlDir $(DOCDIR)/html
93@@ -962,31 +965,31 @@
94 #define DocPsDir $(DOCDIR)/PostScript
95 #endif
96 #ifndef FontDir
97-#define FontDir $(LIBDIR)/fonts
98+#define FontDir /usr/share/fonts
99 #endif
100 #ifndef AdmDir
101-#define AdmDir /usr/adm
102+#define AdmDir /var/log
103 #endif
104 #ifndef XinitDir
105-#define XinitDir $(LIBDIR)/xinit
106+#define XinitDir $(ETCX11DIR)/xinit
107 #endif
108 #ifndef XdmDir
109-#define XdmDir $(LIBDIR)/xdm
110+#define XdmDir $(ETCX11DIR)/xdm
111 #endif
112 #ifndef XdmVarDir
113 #define XdmVarDir $(VARLIBDIR)/xdm
114 #endif
115 #ifndef XdmAuthDir
116-#define XdmAuthDir $(LIBDIR)/xdm
117+#define XdmAuthDir $(ETCX11DIR)/xdm
118 #endif
119 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
120 #define XdmConfigurationSubdirectory config
121 #endif
122 #ifndef TwmDir
123-#define TwmDir $(LIBDIR)/twm
124+#define TwmDir $(ETCX11DIR)/twm
125 #endif
126 #ifndef XsmDir
127-#define XsmDir $(LIBDIR)/xsm
128+#define XsmDir $(ETCX11DIR)/xsm
129 #endif
130 #ifndef NlsDir
131 #define NlsDir $(LIBDIR)/nls
132@@ -998,16 +1001,16 @@
133 #define PexApiDir $(LIBDIR)/PEX
134 #endif
135 #ifndef LbxproxyDir
136-#define LbxproxyDir $(LIBDIR)/lbxproxy
137+#define LbxproxyDir $(ETCX11DIR)/lbxproxy
138 #endif
139 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
140 #define LbxproxyConfigSubdir config
141 #endif
142 #ifndef ProxyManagerDir
143-#define ProxyManagerDir $(LIBDIR)/proxymngr
144+#define ProxyManagerDir $(ETCX11DIR)/proxymngr
145 #endif
146 #ifndef ServerConfigDir
147-#define ServerConfigDir $(LIBDIR)/xserver
148+#define ServerConfigDir $(ETCX11DIR)/xserver
149 #endif
150 #ifndef XPrintDir
151 #define XPrintDir ServerConfigDir
152@@ -1015,9 +1018,6 @@
153 #ifndef VarDirectory
154 #define VarDirectory /var/X11
155 #endif
156-#ifndef EtcX11Directory
157-#define EtcX11Directory /etc/X11
158-#endif
159 #ifndef InstallSecurityConfig
160 #define InstallSecurityConfig YES /* Install sample security policy */
161 #endif
162@@ -1049,10 +1049,10 @@
163 #define OsNameDefines /* as nothing */
164 #endif
165 #ifndef DefaultUserPath /* for xdm */
166-#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
167+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR):$$HOME/bin
168 #endif
169 #ifndef DefaultSystemPath /* for xdm */
170-#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
171+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR):$$HOME/bin
172 #endif
173 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
174 #define DefaultSystemShell BourneShell
175@@ -1162,7 +1162,7 @@
176
177 HTMLINDEXCMD = HtmlIndexCmd
178
179- DOCUTILSRC = $(XTOP)/doc/util
180+ DOCUTILSRC = $(XTOP)/share/doc/util
181 CLIENTSRC = $(TOP)/clients
182 DEMOSRC = $(TOP)/demos
183 XDOCMACROS = $(DOCUTILSRC)/macros.t
184@@ -1176,7 +1176,7 @@
185 SERVERSRC = $(XTOP)/programs/Xserver
186 CONTRIBSRC = ContribDir
187 UNSUPPORTEDSRC = UnsupportedDir
188- DOCSRC = $(XTOP)/doc
189+ DOCSRC = $(XTOP)/share/doc
190 RGBSRC = $(XTOP)/programs/rgb
191 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
192 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
193diff -urN XFree86-4.0.1.orig/xc/config/cf/linux.cf XFree86-4.0.1/xc/config/cf/linux.cf
194--- XFree86-4.0.1.orig/xc/config/cf/linux.cf Sat Jun 24 20:15:54 2000
195+++ XFree86-4.0.1/xc/config/cf/linux.cf Sun Oct 29 23:21:35 2000
196@@ -180,6 +180,8 @@
197 # endif
198 # elif defined(SparcArchitecture)
199 # define BuildXF86DRI YES
200+# elif defined(AlphaArchitecture)
201+# define BuildXF86DRI YES
202 # else
203 # define BuildXF86DRI NO
204 # endif
205@@ -194,7 +196,7 @@
206 # ifdef i386Architecture
207 # if OSMajorVersion == 2
208 /* Only tested for Linux 2.2.0 through 2.2.12 */
209-# if OSMinorVersion == 2 && OSTeenyVersion <= 12
210+# if OSMinorVersion == 2
211 # define BuildXF86DRM YES
212 # else
213 /* Only tested for Linux 2.3.0 through 2.3.18 */
214@@ -424,7 +426,7 @@
215 #define StandardCppDefines StandardDefines
216
217 #define HasVarRun YES
218-#define VarDbDirectory /var/state
219+#define VarDbDirectory /var/lib
220
221 #ifndef XF86OSCardDrivers
222 #define XF86OSCardDrivers v4l
223@@ -537,10 +539,10 @@
224 #endif
225
226 #ifndef LinkGLToUsrLib
227-#define LinkGLToUsrLib YES
228+#define LinkGLToUsrLib NO
229 #endif
230 #ifndef LinkGLToUsrInclude
231-#define LinkGLToUsrInclude YES
232+#define LinkGLToUsrInclude NO
233 #endif
234
235
236diff -urN XFree86-4.0.1.orig/xc/config/cf/site.def XFree86-4.0.1/xc/config/cf/site.def
237--- XFree86-4.0.1.orig/xc/config/cf/site.def Tue Jun 27 02:55:45 2000
238+++ XFree86-4.0.1/xc/config/cf/site.def Sun Oct 29 23:21:35 2000
239@@ -131,10 +131,13 @@
240 #define HasSentinel YES
241 */
242
243-/*
244 #undef DefaultUserPath
245-#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
246-*/
247+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR):$$HOME/bin
248+#undef DefaultSystemPath
249+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR):$$HOME/bin
250+
251+
252+#define HasPam YES
253
254
255 /* You do NOT need SetUID if you only run the server under xdm */
256diff -urN XFree86-4.0.1.orig/xc/config/cf/xf86site.def XFree86-4.0.1/xc/config/cf/xf86site.def
257--- XFree86-4.0.1.orig/xc/config/cf/xf86site.def Wed Jun 14 21:36:16 2000
258+++ XFree86-4.0.1/xc/config/cf/xf86site.def Sun Oct 29 23:21:35 2000
259@@ -134,16 +134,16 @@
260 * Some Linux releases don't have a libtermcap. In this case you may need
261 * to uncomment the following
262 *
263-#define TermcapLibrary -lncurses
264 */
265+#define TermcapLibrary -lncurses
266
267 /*
268 * If you have Tk (which is required to build XF86Setup), uncomment this
269 * Note: version 4.0 or 4.1 is required, and XF86Setup links it statically by
270 * default.
271 *
272-#define HasTk YES
273 */
274+#define HasTk YES
275
276 /*
277 * Set the paths and names for your Tk library if they don't match the
278@@ -156,25 +156,25 @@
279 *
280 * Some Linux releases need TkLibDir set to /usr/X11R6/lib
281 *
282-#define TkLibDir /usr/local/lib
283-#define TkIncDir /usr/local/include
284-#define TkLibName tk
285 */
286+#define TkLibDir /usr/lib
287+#define TkIncDir /usr/include
288+#define TkLibName tk
289
290 /*
291 * By default, XF86Setup is linked with a static Tk library. To change
292 * that, uncomment the following line.
293 *
294-#define XF86SetupUsesStaticTk NO
295 */
296+#define XF86SetupUsesStaticTk NO
297
298 /*
299 * If you have Tcl (which is required to build XF86Setup), uncomment this
300 * Note: version 7.4 or 7.5 is required, and XF86Setup links it statically by
301 * default.
302 *
303-#define HasTcl YES
304 */
305+#define HasTcl YES
306
307 /*
308 * Set the paths and names for your Tcl library if they don't match the
309@@ -184,17 +184,17 @@
310 *
311 * Some Linux releases need TclIncDir set to /usr/include/tcl.
312 *
313-#define TclLibDir /usr/local/lib
314-#define TclIncDir /usr/local/include
315-#define TclLibName tcl
316 */
317+#define TclLibDir /usr/lib
318+#define TclIncDir /usr/include
319+#define TclLibName tcl
320
321 /*
322 * By default, XF86Setup is linked with a static Tcl library. To change
323 * that, uncomment the following line.
324 *
325-#define XF86SetupUsesStaticTcl NO
326 */
327+#define XF86SetupUsesStaticTcl NO
328
329 /*
330 * Build a server that dynamically loads the modules by setting
331@@ -386,8 +386,8 @@
332 /*
333 * To not build/install the Cyrillic fonts, uncomment the following
334 *
335-#define BuildCyrillicFonts NO
336 */
337+#define BuildCyrillicFonts YES
338
339 /*
340 * To not build/install the Latin2 fonts, uncomment the following
341@@ -576,8 +576,8 @@
342 * To forceably build static libraries in addition to shared libraries,
343 * uncomment this.
344 *
345-#define ForceNormalLib YES
346 */
347+#define ForceNormalLib YES
348
349 /*
350 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
351@@ -663,26 +663,26 @@
352 * HasGlide2 to YES and set the Glide2IncDir variable.
353 * HasGlide2 is per default NO.
354 *
355-#define HasGlide2 YES
356 */
357+#define HasGlide2 YES
358
359 /*
360 * Set the path to your Glide include files.
361 *
362-#define Glide2IncDir /usr/include/glide
363 */
364+#define Glide2IncDir /usr/include/glide
365
366 /*
367 * The 3Dfx 3D DRI driver requires glide 3.
368 *
369-#define HasGlide3 YES
370 */
371+#define HasGlide3 YES
372
373 /*
374 * Set the path to your Glide 3 include files.
375 *
376-#define Glide3IncDir /usr/include/glide3
377 */
378+#define Glide3IncDir /usr/include/glide3
379
380 /*
381 * Undefine the following if you don't want to have config files and
382diff -urN XFree86-4.0.1.orig/xc/config/cf/xfree86.cf XFree86-4.0.1/xc/config/cf/xfree86.cf
383--- XFree86-4.0.1.orig/xc/config/cf/xfree86.cf Sat Jul 1 01:34:21 2000
384+++ XFree86-4.0.1/xc/config/cf/xfree86.cf Sun Oct 29 23:21:46 2000
385@@ -24,7 +24,7 @@
386 #define XConfigFile XF86Config
387 #endif
388 #ifndef XConfigDir
389-#define XConfigDir $(LIBDIR)
390+#define XConfigDir $(ETCX11DIR)
391 #endif
392
393 /*
394@@ -416,8 +416,11 @@
395
396 /* Pure PCI drivers should go first */
397 # ifndef XF86CardDrivers
398-# define XF86CardDrivers mga tdfx glint s3virge rendition tga \
399- r128 vga XF86OSCardDrivers XF86ExtraCardDrivers
400+# define XF86CardDrivers mga glint nv tga s3virge sis rendition \
401+ neomagic i740 tdfx \
402+ cirrus tseng trident chips apm \
403+ fbdev \
404+ ati r128 v4l vga XF86OSCardDrivers XF86ExtraCardDrivers
405 # endif
406 #endif
407
408@@ -563,7 +566,7 @@
409 * The server-side of PEX is not 64-bit clean.
410 */
411 #if !defined(BuildPexExt)
412-# if XF86Server && !defined(AlphaArchitecture)
413+# if XF86Server
414 # define BuildPexExt YES
415 # else
416 # define BuildPexExt NO
417diff -urN XFree86-4.0.1.orig/xc/config/imake/imake.c XFree86-4.0.1/xc/config/imake/imake.c
418--- XFree86-4.0.1.orig/xc/config/imake/imake.c Wed Jun 14 21:36:17 2000
419+++ XFree86-4.0.1/xc/config/imake/imake.c Sun Oct 29 23:21:35 2000
420@@ -951,6 +951,7 @@
421 static char* yast = "/sbin/YaST";
422 static char* redhat = "/etc/redhat-release";
423 static char* debian = "/etc/debian_version";
424+ static char* pld = "/etc/pld-release";
425
426 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
427 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
428@@ -965,6 +966,7 @@
429 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
430 fprintf (inFile, "%s\n", "#define LinuxWare 11");
431 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
432+ fprintf (inFile, "%s\n", "#define LinuxPLD 13");
433
434 if (lstat (yast, &sb) == 0) {
435 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxSuSE");
436@@ -981,6 +983,11 @@
437 fprintf (inFile, "%s\n", "#define DefaultLinuxDistName Debian");
438 /* You could also try to get the version of the Debian distrib by looking
439 * at the content of /etc/debian_version */
440+ return;
441+ }
442+ if (lstat (pld, &sb) == 0) {
443+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
444+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
445 return;
446 }
447 /* what's the definitive way to tell what any particular distribution is? */
448diff -urN XFree86-4.0.1.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile
449--- XFree86-4.0.1.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Sat Sep 4 15:04:28 1999
450+++ XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Sun Oct 29 23:21:35 2000
451@@ -118,7 +118,7 @@
452
453 XCONFIG_DEFINES = $(EXT_DEFINES) -DXF86SETUP \
454 '-DPROJECTROOT="$(PROJECTROOT)"' \
455- '-DSERVER_CONFIG_FILE="$(LIBDIR)/$(XCONFIGFILE)"' \
456+ '-DSERVER_CONFIG_FILE="/etc/X11/$(XCONFIGFILE)"' \
457 $(SITE_FONT_PATH) $(SITE_RGB_DB) \
458 -DNO_WRAPPERS
459
460diff -urN XFree86-4.0.1.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl
461--- XFree86-4.0.1.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Sun Apr 5 18:15:52 1998
462+++ XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Sun Oct 29 23:21:35 2000
463@@ -38,7 +38,7 @@
464 set devid [lindex $DeviceIDs $idx]
465 global Device_$devid
466 set server [set Device_${devid}(Server)]
467- set linkname $Xwinhome/bin/X
468+ set linkname /etc/X11/X
469 set lastlink $linkname
470 for {set nlinks 0} \
471 {[file exists $linkname] && [file type $linkname]=="link" \
472@@ -74,7 +74,7 @@
473 set CWD [pwd]
474 cd $linkdir
475 catch "unlink X" ret
476- if [catch "link $Xwinhome/bin/XF86_$server X" ret] {
477+ if [catch "link ../../usr/X11R6/bin/XF86_$server X" ret] {
478 mesg $messages(phase5.4) okay
479 } else {
480 mesg $messages(phase5.5) okay
481diff -urN XFree86-4.0.1.orig/xc/programs/xdm/config/Xres.cpp XFree86-4.0.1/xc/programs/xdm/config/Xres.cpp
482--- XFree86-4.0.1.orig/xc/programs/xdm/config/Xres.cpp Sun Mar 14 04:22:24 1999
483+++ XFree86-4.0.1/xc/programs/xdm/config/Xres.cpp Sun Oct 29 23:28:00 2000
484@@ -59,9 +59,9 @@
485 /**/#endif
486 #ifdef XPM
487 /**/#if PLANES >= 8
488-xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
489+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-transparent.xpm
490 /**/#else
491-xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
492+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
493 /**/#endif
494 xlogin*useShape: true
495 xlogin*logoPadding: 10
496diff -urN XFree86-4.0.1.orig/xc/programs/xdm/resource.c XFree86-4.0.1/xc/programs/xdm/resource.c
497--- XFree86-4.0.1.orig/xc/programs/xdm/resource.c Sun Dec 6 07:08:49 1998
498+++ XFree86-4.0.1/xc/programs/xdm/resource.c Sun Oct 29 23:35:50 2000
499@@ -70,31 +70,31 @@
500 */
501 #ifndef __EMX__
502 #ifndef DEF_SERVER_LINE
503-#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
504+#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
505 #endif
506 #ifndef XRDB_PROGRAM
507-#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
508+#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
509 #endif
510 #ifndef DEF_SESSION
511-#define DEF_SESSION "/usr/bin/X11/xterm -ls"
512+#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
513 #endif
514 #ifndef DEF_USER_PATH
515-#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
516+#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin:$HOME/bin"
517 #endif
518 #ifndef DEF_SYSTEM_PATH
519-#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
520+#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin:$HOME/bin"
521 #endif
522 #ifndef DEF_SYSTEM_SHELL
523 #define DEF_SYSTEM_SHELL "/bin/sh"
524 #endif
525 #ifndef DEF_FAILSAFE_CLIENT
526-#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
527+#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
528 #endif
529 #ifndef DEF_XDM_CONFIG
530-#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
531+#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
532 #endif
533 #ifndef DEF_CHOOSER
534-#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
535+#define DEF_CHOOSER "/etc/X11/xdm/chooser"
536 #endif
537 #ifndef DEF_AUTH_NAME
538 #ifdef HASXDMAUTH
539@@ -104,7 +104,7 @@
540 #endif
541 #endif
542 #ifndef DEF_AUTH_DIR
543-#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
544+#define DEF_AUTH_DIR "/etc/X11/xdm"
545 #endif
546 #ifndef DEF_USER_AUTH_DIR
547 #define DEF_USER_AUTH_DIR "/tmp"
548diff -urN XFree86-4.0.1.orig/xc/programs/xinit/Imakefile XFree86-4.0.1/xc/programs/xinit/Imakefile
549--- XFree86-4.0.1.orig/xc/programs/xinit/Imakefile Mon Jan 31 20:33:44 2000
550+++ XFree86-4.0.1/xc/programs/xinit/Imakefile Sun Oct 29 23:21:35 2000
551@@ -39,11 +39,13 @@
552 InstallNamedProg(startx,startx,$(BINDIR))
553 InstallManPage(startx,$(MANDIR))
554
555-#if InstallXinitConfig
556-InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
557-#else
558-InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
559-#endif
560+XCOMM Red Hat gets this from a different package
561+XCOMM #if InstallXinitConfig
562+XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
563+XCOMM #else
564+XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
565+XCOMM #endif
566+
567 #endif
568
569 LinkConfDirectory(xinit,.,xinit,.)
570diff -urN XFree86-4.0.1.orig/xc/programs/xterm/Imakefile XFree86-4.0.1/xc/programs/xterm/Imakefile
571--- XFree86-4.0.1.orig/xc/programs/xterm/Imakefile Fri Mar 3 21:02:27 2000
572+++ XFree86-4.0.1/xc/programs/xterm/Imakefile Sun Oct 29 23:21:35 2000
573@@ -36,6 +36,10 @@
574 #define XkbClientLibs /**/
575 #endif
576
577+#if InstallXtermSetUID
578+#undef InstallXtermSetUID
579+#endif
580+
581 #ifndef SpecialCObjectRule
582 #define SpecialCObjectRule(module,ignore,defines) \
583 module.o: ; $(CC) -c defines $(CFLAGS) module.c
584@@ -57,6 +61,8 @@
585 PTYLIB = -lpucc
586 #endif
587
588+ PTYLIB = -lutil
589+
590 #if ((LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
591 PTYLIB = -lutil
592 #endif
593@@ -101,7 +107,7 @@
594 -DOSMINORVERSION=$(OSMINORVERSION)
595 MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
596 XKB_DEFINES = XkbClientDefines
597- DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION)
598+ DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION)
599
600 #ifdef OS2Architecture
601 MAINSRC = os2main.c
602diff -urN XFree86-4.0.1.orig/xc/programs/xterm/xterm.h XFree86-4.0.1/xc/programs/xterm/xterm.h
603--- XFree86-4.0.1.orig/xc/programs/xterm/xterm.h Wed Jun 14 21:44:04 2000
604+++ XFree86-4.0.1/xc/programs/xterm/xterm.h Sun Oct 29 23:21:35 2000
605@@ -62,7 +62,7 @@
606 #endif
607
608 #ifndef DFT_TERMTYPE
609-#define DFT_TERMTYPE "xterm"
610+#define DFT_TERMTYPE "xterm-color"
611 #endif
612
613 #ifndef X_NOT_POSIX
XFree86 Window System servers and basic programs
This page took 0.0853739999999999 seconds and 4 git commands to generate.