1 diff -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
5 # or add "MAKE = make" to this file.
7 RELEASE = "Release 6.6"
17 diff -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
21 # define s390Architecture
25 +# define AlphaArchitecture
29 # define AlphaArchitecture
31 diff -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
36 #ifndef BuildHtmlManPages
38 -#define BuildHtmlManPages YES
39 +#define BuildHtmlManPages NO
41 #define BuildHtmlManPages NO
44 #define LintlibDir $(USRLIBDIR)/lint
46 #ifndef SystemManDirectory
48 #define SystemManDirectory /usr/share/man
50 -#define SystemManDirectory /usr/man
53 #ifndef ManDirectoryRoot
56 #define NoRConst NO /* YES if const for structs of funcs is bad */
59 -#define InstPgmFlags -s
63 #define InstBinFlags -m 0755
65 #define CppCmd /LibDirName/cpp
68 -#define RawCppCmd CppCmd -undef
69 +#define RawCppCmd CppCmd
71 #ifndef CppNoLineInfoOption
72 #define CppNoLineInfoOption /**/
73 diff -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
80 +#ifndef EtcX11Directory
81 +#define EtcX11Directory /etc/X11
84 #ifndef DefaultFSConfigFile
85 -#define DefaultFSConfigFile $(LIBDIR)/fs/config
86 +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
89 /* X-TrueType settings */
91 #define ConfigDir $(LIBDIR)/config
94 -#define DocDir $(LIBDIR)/doc
95 +#define DocDir $(LIBDIR)/share/doc
98 #define DocHtmlDir $(DOCDIR)/html
99 @@ -1389,31 +1393,31 @@
100 #define DocPsDir $(DOCDIR)/PostScript
103 -#define FontDir $(LIBDIR)/fonts
104 +#define FontDir /usr/share/fonts
107 -#define AdmDir /usr/adm
108 +#define AdmDir /var/log
111 -#define XinitDir $(LIBDIR)/xinit
112 +#define XinitDir $(ETCX11DIR)/xinit
115 -#define XdmDir $(LIBDIR)/xdm
116 +#define XdmDir $(ETCX11DIR)/xdm
119 #define XdmVarDir $(VARLIBDIR)/xdm
122 -#define XdmAuthDir $(LIBDIR)/xdm
123 +#define XdmAuthDir $(ETCX11DIR)/xdm
125 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
126 #define XdmConfigurationSubdirectory config
129 -#define TwmDir $(LIBDIR)/twm
130 +#define TwmDir $(ETCX11DIR)/twm
133 -#define XsmDir $(LIBDIR)/xsm
134 +#define XsmDir $(ETCX11DIR)/xsm
137 #define NlsDir $(LIBDIR)/nls
138 @@ -1425,23 +1429,20 @@
139 #define PexApiDir $(LIBDIR)/PEX
142 -#define LbxproxyDir $(LIBDIR)/lbxproxy
143 +#define LbxproxyDir $(ETCX11DIR)/lbxproxy
145 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
146 #define LbxproxyConfigSubdir config
148 #ifndef ProxyManagerDir
149 -#define ProxyManagerDir $(LIBDIR)/proxymngr
150 +#define ProxyManagerDir $(ETCX11DIR)/proxymngr
152 #ifndef ServerConfigDir
153 -#define ServerConfigDir $(LIBDIR)/xserver
154 +#define ServerConfigDir $(ETCX11DIR)/xserver
157 #define XPrintDir ServerConfigDir
159 -#ifndef EtcX11Directory
160 -#define EtcX11Directory /etc/X11
162 #ifndef InstallSecurityConfig
163 #define InstallSecurityConfig YES /* Install sample security policy */
165 @@ -1473,10 +1474,10 @@
166 #define OsNameDefines /* as nothing */
168 #ifndef DefaultUserPath /* for xdm */
169 -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
170 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
172 #ifndef DefaultSystemPath /* for xdm */
173 -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
174 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
176 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
177 #define DefaultSystemShell BourneShell
178 @@ -1603,7 +1604,7 @@
180 HTMLINDEXCMD = HtmlIndexCmd
182 - DOCUTILSRC = $(XTOP)/doc/util
183 + DOCUTILSRC = $(XTOP)/share/doc/util
184 CLIENTSRC = $(TOP)/clients
185 DEMOSRC = $(TOP)/demos
186 XDOCMACROS = $(DOCUTILSRC)/macros.t
187 @@ -1617,7 +1618,7 @@
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
196 diff -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
202 # if defined(i386Architecture)
203 -# define BuildLibGlxWithoutPIC YES
204 +# define BuildLibGlxWithoutPIC NO
209 # if defined(i386Architecture) || defined(ia64Architecture) || defined(SparcArchitecture) || defined(AlphaArchitecture) || defined(x86_64Architecture)
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
214 # define BuildXF86DRM YES
216 /* Only tested for Linux 2.3.0 through 2.3.18 */
219 #define HasVarRun YES
220 #ifndef VarDbDirectory
221 -# define VarDbDirectory $(VARDIR)/lib
222 +# define VarDbDirectory /var/lib
225 #ifndef XF86OSCardDrivers
226 @@ -936,10 +936,10 @@
229 #ifndef LinkGLToUsrLib
230 -# define LinkGLToUsrLib YES
231 +# define LinkGLToUsrLib NO
233 # ifndef LinkGLToUsrInclude
234 -# define LinkGLToUsrInclude YES
235 +# define LinkGLToUsrInclude NO
239 diff -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 @@
243 #define HasSentinel YES
247 #undef DefaultUserPath
248 -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
250 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
251 +#undef DefaultSystemPath
252 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
256 +#define HasPamMisc YES
259 /* You do NOT need SetUID if you only run the server under xdm */
260 diff -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
265 * To not build/install the Cyrillic fonts, uncomment the following
267 -#define BuildCyrillicFonts NO
269 +#define BuildCyrillicFonts YES
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.
277 -#define HasGlide2 YES
279 +#define HasGlide2 YES
282 * Set the path to your Glide include files.
284 -#define Glide2IncDir /usr/include/glide
286 +#define Glide2IncDir /usr/include/glide
291 -#define HasGlide3 YES
293 +#define HasGlide3 YES
296 * Set the path to your Glide 3 include files.
298 -#define Glide3IncDir /usr/include/glide3
301 +#define Glide3IncDir /usr/include/glide3
306 * Some Linux releases don't have a libtermcap. In this case you may need
307 * to uncomment the following
309 -#define TermcapLibrary -lncurses
311 +#define TermcapLibrary -lncurses
314 * If you have Tk (which is required to build XF86Setup), uncomment this
317 * - XF86Setup is not built or supported with XFree86 4.x
324 * Set the paths and names for your Tk library if they don't match the
325 @@ -427,25 +426,25 @@
327 * Some Linux releases need TkLibDir set to /usr/X11R6/lib
329 -#define TkLibDir /usr/local/lib
330 -#define TkIncDir /usr/local/include
331 -#define TkLibName tk
333 +#define TkLibDir /usr/lib
334 +#define TkIncDir /usr/include
335 +#define TkLibName tk
338 * By default, XF86Setup is linked with a static Tk library. To change
339 * that, uncomment the following line.
341 -#define XF86SetupUsesStaticTk NO
343 +#define XF86SetupUsesStaticTk NO
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
355 * Set the paths and names for your Tcl library if they don't match the
356 @@ -455,17 +454,17 @@
358 * Some Linux releases need TclIncDir set to /usr/include/tcl.
360 -#define TclLibDir /usr/local/lib
361 -#define TclIncDir /usr/local/include
362 -#define TclLibName tcl
364 +#define TclLibDir /usr/lib
365 +#define TclIncDir /usr/include
366 +#define TclLibName tcl
369 * By default, XF86Setup is linked with a static Tcl library. To change
370 * that, uncomment the following line.
372 -#define XF86SetupUsesStaticTcl NO
374 +#define XF86SetupUsesStaticTcl NO
377 * Build a server that dynamically loads the modules by setting
379 * To forceably build static libraries in addition to shared libraries,
382 -#define ForceNormalLib YES
384 +#define ForceNormalLib YES
387 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
388 diff -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
392 #define XConfigFile XF86Config
395 -#define XConfigDir $(LIBDIR)
396 +#define XConfigDir $(ETCX11DIR)
399 #define XLogFile XFree86
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 \
407 XF86OSCardDrivers XF86ExtraCardDrivers
409 diff -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";
414 static char* redhat = "/etc/redhat-release";
415 static char* debian = "/etc/debian_version";
416 + static char* pld = "/etc/pld-release";
418 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
419 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
420 @@ -1071,6 +1072,7 @@
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");
427 if (CrossCompiling) {
428 @@ -1097,6 +1099,11 @@
429 * at the content of /etc/debian_version */
432 + if (lstat (pld, &sb) == 0) {
433 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
434 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
437 /* what's the definitive way to tell what any particular distribution is? */
439 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
440 diff -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
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) \
452 diff -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
456 set devid [lindex $DeviceIDs $idx]
458 set server [set Device_${devid}(Server)]
459 - set linkname $Xwinhome/bin/X
460 + set linkname /etc/X11/X
461 set lastlink $linkname
463 {[file exists $linkname] && [file type $linkname]=="link" \
468 - if [catch "link $Xwinhome/bin/XF86_$server X" ret] {
469 + if [catch "link ../../usr/bin/XF86_$server X" ret] {
470 mesg $messages(phase5.4) okay
472 mesg $messages(phase5.5) okay
473 diff -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
479 CURSESLIB = NCursesLibName
480 -CURSESDEFINES = -DHAS_NCURSES
481 +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
484 XF86CONFIGFILE = XConfigFile
485 diff -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
493 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
494 +/**/#if PLANES >= 15
495 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
497 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
498 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
500 xlogin*useShape: true
501 xlogin*logoPadding: 10
502 diff -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
506 * if it is server-specific). DO NOT CHANGE THESE DEFINITIONS!
508 #ifndef DEF_SERVER_LINE
509 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
510 +#define DEF_SERVER_LINE ":0 local /usr/bin/X :0"
513 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
514 +#define XRDB_PROGRAM "/usr/X11/xrdb"
517 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
518 +#define DEF_SESSION "/usr/bin/xterm -ls"
520 #ifndef DEF_USER_PATH
521 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
522 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin"
524 #ifndef DEF_SYSTEM_PATH
525 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
526 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin"
528 #ifndef DEF_SYSTEM_SHELL
529 #define DEF_SYSTEM_SHELL "/bin/sh"
531 #ifndef DEF_FAILSAFE_CLIENT
532 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
533 +#define DEF_FAILSAFE_CLIENT "/usr/bin/xterm"
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"
540 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
541 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
543 #ifndef DEF_AUTH_NAME
549 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
550 +#define DEF_AUTH_DIR "/etc/X11/xdm"
552 #ifndef DEF_USER_AUTH_DIR
553 #define DEF_USER_AUTH_DIR "/tmp"
554 diff -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
558 InstallNamedProg(startx,startx,$(BINDIR))
559 InstallManPage(startx,$(MANDIR))
561 -#if InstallXinitConfig
562 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
564 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
566 +XCOMM Red Hat gets this from a different package
567 +XCOMM #if InstallXinitConfig
568 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
570 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
573 LinkConfDirectory(xinit,.,xinit,.)
575 diff -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
579 #define XkbClientLibs /**/
582 +#if InstallXtermSetUID
583 +#undef InstallXtermSetUID
586 #ifndef SpecialCObjectRule
587 #define SpecialCObjectRule(module,ignore,defines) \
588 module.o: ; $(CC) -c defines $(CFLAGS) module.c
595 #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
596 (defined(LinuxArchitecture) && \
597 (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
599 MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
600 XKB_DEFINES = XkbClientDefines
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)
606 #ifdef OS2Architecture
607 diff -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
614 -#define DFT_TERMTYPE "xterm"
615 +#define DFT_TERMTYPE "xterm-color"