1 diff -Nru xc.orig/Makefile xc/Makefile
2 --- xc.orig/Makefile 2003-04-25 13:00:01.000000000 +0200
3 +++ xc/Makefile 2003-09-26 10:27:39.655002672 +0200
5 # or add "MAKE = make" to this file.
7 RELEASE = "Release 6.6"
13 diff -Nru xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
14 --- xc.orig/config/cf/Imake.cf 2003-07-10 13:00:02.000000000 +0200
15 +++ xc/config/cf/Imake.cf 2003-09-26 10:27:39.710994160 +0200
17 # define s390Architecture
21 +# define AlphaArchitecture
25 # define AlphaArchitecture
27 diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
28 --- xc.orig/config/cf/Imake.tmpl 2003-09-25 13:00:02.000000000 +0200
29 +++ xc/config/cf/Imake.tmpl 2003-09-26 10:27:39.733990664 +0200
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 -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
70 --- xc.orig/config/cf/X11.tmpl 2003-09-25 13:00:02.000000000 +0200
71 +++ xc/config/cf/X11.tmpl 2003-09-26 10:27:39.755987320 +0200
72 @@ -1240,8 +1240,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 @@ -1376,31 +1380,31 @@
96 #define DocPdfDir $(DOCDIR)/PDF
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 @@ -1409,23 +1413,20 @@
135 #define XLocaleDir $(LIBDIR)/locale
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 @@ -1457,10 +1458,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 @@ -1587,7 +1588,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 @@ -1601,7 +1602,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 -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
193 --- xc.orig/config/cf/linux.cf 2003-09-10 13:00:02.000000000 +0200
194 +++ xc/config/cf/linux.cf 2003-09-26 10:27:39.767985496 +0200
198 # if defined(i386Architecture)
199 -# define BuildLibGlxWithoutPIC YES
200 +# define BuildLibGlxWithoutPIC NO
205 # if defined(i386Architecture) || defined(ia64Architecture) || defined(SparcArchitecture) || defined(AlphaArchitecture) || defined(AMD64Architecture)
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 diff -Nru xc.orig/config/cf/site.def xc/config/cf/site.def
223 --- xc.orig/config/cf/site.def 2002-02-27 01:51:12.000000000 +0100
224 +++ xc/config/cf/site.def 2003-09-26 10:27:39.773984584 +0200
225 @@ -119,10 +119,14 @@
226 #define HasSentinel YES
230 #undef DefaultUserPath
231 -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
233 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
234 +#undef DefaultSystemPath
235 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
239 +#define HasPamMisc YES
242 /* You do NOT need SetUID if you only run the server under xdm */
243 diff -Nru xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def
244 --- xc.orig/config/cf/xf86site.def 2003-09-10 13:00:03.000000000 +0200
245 +++ xc/config/cf/xf86site.def 2003-09-26 10:27:39.790982000 +0200
248 * To not build/install the Cyrillic fonts, uncomment the following
250 -#define BuildCyrillicFonts NO
252 +#define BuildCyrillicFonts YES
255 * To not install the local font directory, uncomment the following
256 @@ -307,27 +307,26 @@
257 * HasGlide2 to YES and set the Glide2IncDir variable.
258 * HasGlide2 is per default NO.
260 -#define HasGlide2 YES
262 +#define HasGlide2 YES
265 * Set the path to your Glide include files.
267 -#define Glide2IncDir /usr/include/glide
269 +#define Glide2IncDir /usr/include/glide
274 -#define HasGlide3 YES
276 +#define HasGlide3 YES
279 * Set the path to your Glide 3 include files.
281 -#define Glide3IncDir /usr/include/glide3
284 +#define Glide3IncDir /usr/include/glide3
289 * Some Linux releases don't have a libtermcap. In this case you may need
290 * to uncomment the following
292 -#define TermcapLibrary -lncurses
294 +#define TermcapLibrary -lncurses
297 * Build a server that dynamically loads the modules by setting
299 * To forceably build static libraries in addition to shared libraries,
302 -#define ForceNormalLib YES
304 +#define ForceNormalLib YES
307 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
308 diff -Nru xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
309 --- xc.orig/config/cf/xfree86.cf 2003-09-25 13:00:04.000000000 +0200
310 +++ xc/config/cf/xfree86.cf 2003-09-26 10:31:13.596478624 +0200
312 #define XConfigFile XF86Config
315 -#define XConfigDir $(LIBDIR)
316 +#define XConfigDir $(ETCX11DIR)
319 #define XLogFile XFree86
322 # ifndef XF86CardDrivers
323 # define XF86CardDrivers mga glint nv s3 s3virge sis savage \
324 - trident chips tdfx fbdev ati \
325 + trident chips fbdev ati \
326 DevelDrivers newport \
327 XF86OSCardDrivers XF86ExtraCardDrivers
329 diff -Nru xc.orig/config/imake/imake.c xc/config/imake/imake.c
330 --- xc.orig/config/imake/imake.c 2003-04-10 13:00:03.000000000 +0200
331 +++ xc/config/imake/imake.c 2003-09-26 10:27:39.803980024 +0200
332 @@ -1057,6 +1057,7 @@
333 static char* suse = "/etc/SuSE-release";
334 static char* redhat = "/etc/redhat-release";
335 static char* debian = "/etc/debian_version";
336 + static char* pld = "/etc/pld-release";
338 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
339 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
340 @@ -1071,6 +1072,7 @@
341 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
342 fprintf (inFile, "%s\n", "#define LinuxWare 11");
343 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
344 + fprintf (inFile, "%s\n", "#define LinuxPLD 13");
347 if (CrossCompiling) {
348 @@ -1097,6 +1099,11 @@
349 * at the content of /etc/debian_version */
352 + if (lstat (pld, &sb) == 0) {
353 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
354 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
357 /* what's the definitive way to tell what any particular distribution is? */
359 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
360 diff -Nru xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
361 --- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-03-04 17:25:10.000000000 +0100
362 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-09-26 10:27:39.000000000 +0200
366 CURSESLIB = NCursesLibName
367 -CURSESDEFINES = -DHAS_NCURSES
368 +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
371 XF86CONFIGFILE = XConfigFile
372 diff -Nru xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
373 --- xc.orig/programs/xdm/config/Xres.cpp 2003-01-04 04:11:31.000000000 +0100
374 +++ xc/programs/xdm/config/Xres.cpp 2003-09-26 10:27:39.000000000 +0200
380 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
381 +/**/#if PLANES >= 15
382 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
384 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
385 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
387 xlogin*useShape: true
388 xlogin*logoPadding: 10
389 diff -Nru xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
390 --- xc.orig/programs/xdm/resource.c 2003-09-25 13:06:32.000000000 +0200
391 +++ xc/programs/xdm/resource.c 2003-09-26 10:27:39.000000000 +0200
395 #ifndef DEF_SERVER_LINE
396 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
397 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
400 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
401 +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
404 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
405 +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
407 #ifndef DEF_USER_PATH
408 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
409 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
411 #ifndef DEF_SYSTEM_PATH
412 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
413 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
415 #ifndef DEF_SYSTEM_SHELL
416 #define DEF_SYSTEM_SHELL "/bin/sh"
418 #ifndef DEF_FAILSAFE_CLIENT
419 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
420 +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
422 #ifndef DEF_XDM_CONFIG
423 -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
424 +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
427 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
428 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
430 #ifndef DEF_AUTH_NAME
436 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
437 +#define DEF_AUTH_DIR "/etc/X11/xdm"
439 #ifndef DEF_USER_AUTH_DIR
440 #define DEF_USER_AUTH_DIR "/tmp"
441 diff -Nru xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile
442 --- xc.orig/programs/xinit/Imakefile 2003-06-10 13:08:06.000000000 +0200
443 +++ xc/programs/xinit/Imakefile 2003-09-26 10:27:39.000000000 +0200
445 InstallNamedProg(startx,startx,$(BINDIR))
446 InstallManPage(startx,$(MANDIR))
448 -#if InstallXinitConfig
449 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
451 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
453 +XCOMM Red Hat gets this from a different package
454 +XCOMM #if InstallXinitConfig
455 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
457 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
460 LinkConfDirectory(xinit,.,xinit,.)
462 diff -Nru xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
463 --- xc.orig/programs/xterm/Imakefile 2003-09-25 13:06:59.000000000 +0200
464 +++ xc/programs/xterm/Imakefile 2003-09-26 10:27:39.000000000 +0200
466 #define XkbClientLibs /**/
469 +#if InstallXtermSetUID
470 +#undef InstallXtermSetUID
473 #ifndef SpecialCObjectRule
474 #define SpecialCObjectRule(module,ignore,defines) \
475 module.o: ; $(CC) -c defines $(CFLAGS) module.c
482 #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
483 (defined(LinuxArchitecture) && \
484 (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
486 MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
487 XKB_DEFINES = XkbClientDefines
488 PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
489 - DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
490 + DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
491 INCLUDES = $(XRFINCLUDES)
493 #ifdef OS2Architecture
494 diff -Nru xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h
495 --- xc.orig/programs/xterm/xterm.h 2003-09-25 13:07:01.000000000 +0200
496 +++ xc/programs/xterm/xterm.h 2003-09-26 10:27:39.000000000 +0200
501 -#define DFT_TERMTYPE "xterm"
502 +#define DFT_TERMTYPE "xterm-color"