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