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