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