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"
13 diff -urN xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
14 --- xc.orig/config/cf/Imake.cf Mon Dec 30 15:52:30 2002
15 +++ xc/config/cf/Imake.cf Mon Dec 30 16:02:13 2002
17 # define s390Architecture
21 +# define AlphaArchitecture
25 # define AlphaArchitecture
27 diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
28 --- xc.orig/config/cf/Imake.tmpl Mon Dec 30 15:52:30 2002
29 +++ xc/config/cf/Imake.tmpl Mon Dec 30 16:02:13 2002
32 #ifndef BuildHtmlManPages
34 -#define BuildHtmlManPages YES
35 +#define BuildHtmlManPages NO
37 #define BuildHtmlManPages NO
40 #define LintlibDir $(USRLIBDIR)/lint
42 #ifndef SystemManDirectory
44 #define SystemManDirectory /usr/share/man
46 -#define SystemManDirectory /usr/man
49 #ifndef ManDirectoryRoot
52 #define NoRConst NO /* YES if const for structs of funcs is bad */
55 -#define InstPgmFlags -s
59 #define InstBinFlags -m 0755
61 #define CppCmd /LibDirName/cpp
64 -#define RawCppCmd CppCmd -undef
65 +#define RawCppCmd CppCmd
67 #ifndef CppNoLineInfoOption
68 #define CppNoLineInfoOption /**/
69 diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
70 --- xc.orig/config/cf/X11.tmpl Mon Dec 30 15:52:30 2002
71 +++ xc/config/cf/X11.tmpl Mon Dec 30 16:02:13 2002
72 @@ -1256,8 +1256,12 @@
73 # define UsbMouseSupport NO
76 +#ifndef EtcX11Directory
77 +#define EtcX11Directory /etc/X11
80 #ifndef DefaultFSConfigFile
81 -#define DefaultFSConfigFile $(LIBDIR)/fs/config
82 +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
85 /* X-TrueType settings */
87 #define ConfigDir $(LIBDIR)/config
90 -#define DocDir $(LIBDIR)/doc
91 +#define DocDir $(LIBDIR)/share/doc
94 #define DocHtmlDir $(DOCDIR)/html
95 @@ -1389,31 +1393,31 @@
96 #define DocPsDir $(DOCDIR)/PostScript
99 -#define FontDir $(LIBDIR)/fonts
100 +#define FontDir /usr/share/fonts
103 -#define AdmDir /usr/adm
104 +#define AdmDir /var/log
107 -#define XinitDir $(LIBDIR)/xinit
108 +#define XinitDir $(ETCX11DIR)/xinit
111 -#define XdmDir $(LIBDIR)/xdm
112 +#define XdmDir $(ETCX11DIR)/xdm
115 #define XdmVarDir $(VARLIBDIR)/xdm
118 -#define XdmAuthDir $(LIBDIR)/xdm
119 +#define XdmAuthDir $(ETCX11DIR)/xdm
121 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
122 #define XdmConfigurationSubdirectory config
125 -#define TwmDir $(LIBDIR)/twm
126 +#define TwmDir $(ETCX11DIR)/twm
129 -#define XsmDir $(LIBDIR)/xsm
130 +#define XsmDir $(ETCX11DIR)/xsm
133 #define NlsDir $(LIBDIR)/nls
134 @@ -1425,23 +1429,20 @@
135 #define PexApiDir $(LIBDIR)/PEX
138 -#define LbxproxyDir $(LIBDIR)/lbxproxy
139 +#define LbxproxyDir $(ETCX11DIR)/lbxproxy
141 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
142 #define LbxproxyConfigSubdir config
144 #ifndef ProxyManagerDir
145 -#define ProxyManagerDir $(LIBDIR)/proxymngr
146 +#define ProxyManagerDir $(ETCX11DIR)/proxymngr
148 #ifndef ServerConfigDir
149 -#define ServerConfigDir $(LIBDIR)/xserver
150 +#define ServerConfigDir $(ETCX11DIR)/xserver
153 #define XPrintDir ServerConfigDir
155 -#ifndef EtcX11Directory
156 -#define EtcX11Directory /etc/X11
158 #ifndef InstallSecurityConfig
159 #define InstallSecurityConfig YES /* Install sample security policy */
161 @@ -1473,10 +1474,10 @@
162 #define OsNameDefines /* as nothing */
164 #ifndef DefaultUserPath /* for xdm */
165 -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
166 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
168 #ifndef DefaultSystemPath /* for xdm */
169 -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
170 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
172 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
173 #define DefaultSystemShell BourneShell
174 @@ -1603,7 +1604,7 @@
176 HTMLINDEXCMD = HtmlIndexCmd
178 - DOCUTILSRC = $(XTOP)/doc/util
179 + DOCUTILSRC = $(XTOP)/share/doc/util
180 CLIENTSRC = $(TOP)/clients
181 DEMOSRC = $(TOP)/demos
182 XDOCMACROS = $(DOCUTILSRC)/macros.t
183 @@ -1617,7 +1618,7 @@
184 SERVERSRC = $(XTOP)/programs/Xserver
185 CONTRIBSRC = ContribDir
186 UNSUPPORTEDSRC = UnsupportedDir
187 - DOCSRC = $(XTOP)/doc
188 + DOCSRC = $(XTOP)/share/doc
189 RGBSRC = $(XTOP)/programs/rgb
190 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
191 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
192 diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
193 --- xc.orig/config/cf/linux.cf Mon Dec 30 15:52:31 2002
194 +++ xc/config/cf/linux.cf Mon Dec 30 16:20:00 2002
198 # if defined(i386Architecture)
199 -# define BuildLibGlxWithoutPIC YES
200 +# define BuildLibGlxWithoutPIC NO
205 # if defined(i386Architecture) || defined(ia64Architecture) || defined(SparcArchitecture) || defined(AlphaArchitecture) || defined(x86_64Architecture)
206 # if OSMajorVersion == 2
207 /* Only tested for Linux 2.2.0 through 2.2.12 */
208 -# if OSMinorVersion == 2 && OSTeenyVersion <= 12
209 +# if OSMinorVersion == 2
210 # define BuildXF86DRM YES
212 /* Only tested for Linux 2.3.0 through 2.3.18 */
215 #define HasVarRun YES
216 #ifndef VarDbDirectory
217 -# define VarDbDirectory $(VARDIR)/lib
218 +# define VarDbDirectory /var/lib
221 #ifndef XF86OSCardDrivers
222 @@ -936,10 +936,10 @@
225 #ifndef LinkGLToUsrLib
226 -# define LinkGLToUsrLib YES
227 +# define LinkGLToUsrLib NO
229 # ifndef LinkGLToUsrInclude
230 -# define LinkGLToUsrInclude YES
231 +# define LinkGLToUsrInclude NO
235 diff -urN xc.orig/config/cf/site.def xc/config/cf/site.def
236 --- xc.orig/config/cf/site.def Mon Dec 30 15:52:31 2002
237 +++ xc/config/cf/site.def Mon Dec 30 16:02:13 2002
238 @@ -119,10 +119,14 @@
239 #define HasSentinel YES
243 #undef DefaultUserPath
244 -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
246 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
247 +#undef DefaultSystemPath
248 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
252 +#define HasPamMisc YES
255 /* You do NOT need SetUID if you only run the server under xdm */
256 diff -urN xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def
257 --- xc.orig/config/cf/xf86site.def Mon Dec 30 15:52:31 2002
258 +++ xc/config/cf/xf86site.def Mon Dec 30 16:28:24 2002
261 * To not build/install the Cyrillic fonts, uncomment the following
263 -#define BuildCyrillicFonts NO
265 +#define BuildCyrillicFonts YES
268 * To not install the local font directory, uncomment the following
269 @@ -281,27 +281,26 @@
270 * HasGlide2 to YES and set the Glide2IncDir variable.
271 * HasGlide2 is per default NO.
273 -#define HasGlide2 YES
275 +#define HasGlide2 YES
278 * Set the path to your Glide include files.
280 -#define Glide2IncDir /usr/include/glide
282 +#define Glide2IncDir /usr/include/glide
287 -#define HasGlide3 YES
289 +#define HasGlide3 YES
292 * Set the path to your Glide 3 include files.
294 -#define Glide3IncDir /usr/include/glide3
297 +#define Glide3IncDir /usr/include/glide3
302 * Some Linux releases don't have a libtermcap. In this case you may need
303 * to uncomment the following
305 -#define TermcapLibrary -lncurses
307 +#define TermcapLibrary -lncurses
310 * If you have Tk (which is required to build XF86Setup), uncomment this
312 * To forceably build static libraries in addition to shared libraries,
315 -#define ForceNormalLib YES
317 +#define ForceNormalLib YES
320 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
321 diff -urN xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
322 --- xc.orig/config/cf/xfree86.cf Mon Dec 30 15:52:31 2002
323 +++ xc/config/cf/xfree86.cf Mon Dec 30 16:02:13 2002
325 #define XConfigFile XF86Config
328 -#define XConfigDir $(LIBDIR)
329 +#define XConfigDir $(ETCX11DIR)
332 #define XLogFile XFree86
334 /* Pure PCI drivers should go first */
335 # ifndef XF86CardDrivers
336 # define XF86CardDrivers ati mga glint s3 s3virge sis savage\
337 - trident chips tdfx fbdev \
338 + trident chips fbdev \
340 XF86OSCardDrivers XF86ExtraCardDrivers
342 diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
343 --- xc.orig/config/imake/imake.c Mon Dec 30 15:52:31 2002
344 +++ xc/config/imake/imake.c Mon Dec 30 16:02:13 2002
345 @@ -1057,6 +1057,7 @@
346 static char* suse = "/etc/SuSE-release";
347 static char* redhat = "/etc/redhat-release";
348 static char* debian = "/etc/debian_version";
349 + static char* pld = "/etc/pld-release";
351 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
352 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
353 @@ -1071,6 +1072,7 @@
354 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
355 fprintf (inFile, "%s\n", "#define LinuxWare 11");
356 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
357 + fprintf (inFile, "%s\n", "#define LinuxPLD 13");
360 if (CrossCompiling) {
361 @@ -1097,6 +1099,11 @@
362 * at the content of /etc/debian_version */
365 + if (lstat (pld, &sb) == 0) {
366 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
367 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
370 /* what's the definitive way to tell what any particular distribution is? */
372 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
373 diff -urN xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
374 --- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile Mon Dec 30 15:53:56 2002
375 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile Mon Dec 30 16:02:13 2002
379 CURSESLIB = NCursesLibName
380 -CURSESDEFINES = -DHAS_NCURSES
381 +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
384 XF86CONFIGFILE = XConfigFile
385 diff -urN xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
386 --- xc.orig/programs/xdm/config/Xres.cpp Mon Dec 30 15:54:07 2002
387 +++ xc/programs/xdm/config/Xres.cpp Mon Dec 30 16:02:13 2002
393 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
394 +/**/#if PLANES >= 15
395 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
397 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
398 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
400 xlogin*useShape: true
401 xlogin*logoPadding: 10
402 diff -urN xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
403 --- xc.orig/programs/xdm/resource.c Mon Dec 30 15:54:06 2002
404 +++ xc/programs/xdm/resource.c Mon Dec 30 16:02:13 2002
406 * if it is server-specific). DO NOT CHANGE THESE DEFINITIONS!
408 #ifndef DEF_SERVER_LINE
409 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
410 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
413 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
414 +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
417 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
418 +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
420 #ifndef DEF_USER_PATH
421 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
422 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
424 #ifndef DEF_SYSTEM_PATH
425 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
426 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
428 #ifndef DEF_SYSTEM_SHELL
429 #define DEF_SYSTEM_SHELL "/bin/sh"
431 #ifndef DEF_FAILSAFE_CLIENT
432 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
433 +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
435 #ifndef DEF_XDM_CONFIG
436 -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
437 +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
440 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
441 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
443 #ifndef DEF_AUTH_NAME
449 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
450 +#define DEF_AUTH_DIR "/etc/X11/xdm"
452 #ifndef DEF_USER_AUTH_DIR
453 #define DEF_USER_AUTH_DIR "/tmp"
454 diff -urN xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile
455 --- xc.orig/programs/xinit/Imakefile Mon Dec 30 15:54:10 2002
456 +++ xc/programs/xinit/Imakefile Mon Dec 30 16:31:27 2002
458 InstallNamedProg(startx,startx,$(BINDIR))
459 InstallManPage(startx,$(MANDIR))
461 -#if InstallXinitConfig
462 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
464 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
466 +XCOMM Red Hat gets this from a different package
467 +XCOMM #if InstallXinitConfig
468 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
470 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
473 LinkConfDirectory(xinit,.,xinit,.)
475 diff -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
476 --- xc.orig/programs/xterm/Imakefile Mon Dec 30 15:54:16 2002
477 +++ xc/programs/xterm/Imakefile Mon Dec 30 16:35:55 2002
479 #define XkbClientLibs /**/
482 +#if InstallXtermSetUID
483 +#undef InstallXtermSetUID
486 #ifndef SpecialCObjectRule
487 #define SpecialCObjectRule(module,ignore,defines) \
488 module.o: ; $(CC) -c defines $(CFLAGS) module.c
495 #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
496 (defined(LinuxArchitecture) && \
497 (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
499 MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
500 XKB_DEFINES = XkbClientDefines
501 PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
502 - DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
503 + DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
504 INCLUDES = $(XRFINCLUDES)
506 #ifdef OS2Architecture
507 diff -urN xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h
508 --- xc.orig/programs/xterm/xterm.h Mon Dec 30 15:54:16 2002
509 +++ xc/programs/xterm/xterm.h Mon Dec 30 16:02:13 2002
514 -#define DFT_TERMTYPE "xterm"
515 +#define DFT_TERMTYPE "xterm-color"