1 diff -Nru xc.orig/Makefile xc/Makefile
2 --- xc.orig/Makefile 2003-11-02 05:38:01.000000000 +0100
3 +++ xc/Makefile 2003-12-23 12:09:12.071230112 +0100
5 # or add "MAKE = make" to this file.
7 RELEASE = "Release 6.7"
13 diff -Nru xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
14 --- xc.orig/config/cf/Imake.cf 2003-12-19 05:40:33.000000000 +0100
15 +++ xc/config/cf/Imake.cf 2003-12-23 12:09:11.983243488 +0100
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-11-21 06:55:02.000000000 +0100
29 +++ xc/config/cf/Imake.tmpl 2003-12-23 12:09:11.992242120 +0100
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-12-19 05:41:17.000000000 +0100
71 +++ xc/config/cf/X11.tmpl 2003-12-23 12:09:12.042234520 +0100
72 @@ -1262,8 +1262,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 @@ -1401,31 +1405,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 @@ -1434,23 +1438,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 @@ -1482,10 +1483,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 @@ -1614,7 +1615,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 @@ -1628,7 +1629,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-12-19 05:41:59.000000000 +0100
194 +++ xc/config/cf/linux.cf 2003-12-23 12:09:12.008239688 +0100
198 # if defined(i386Architecture)
199 -# define BuildLibGlxWithoutPIC YES
200 +# define BuildLibGlxWithoutPIC NO
206 #define HasVarRun YES
207 #ifndef VarDbDirectory
208 -# define VarDbDirectory $(VARDIR)/lib
209 +# define VarDbDirectory /var/lib
212 #ifndef XF86OSCardDrivers
213 diff -Nru xc.orig/config/cf/site.def xc/config/cf/site.def
214 --- xc.orig/config/cf/site.def 2002-02-27 01:51:12.000000000 +0100
215 +++ xc/config/cf/site.def 2003-12-23 12:09:12.014238776 +0100
216 @@ -119,10 +119,14 @@
217 #define HasSentinel YES
221 #undef DefaultUserPath
222 -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
224 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
225 +#undef DefaultSystemPath
226 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
230 +#define HasPamMisc YES
233 /* You do NOT need SetUID if you only run the server under xdm */
234 diff -Nru xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def
235 --- xc.orig/config/cf/xf86site.def 2003-09-10 13:00:03.000000000 +0200
236 +++ xc/config/cf/xf86site.def 2003-12-23 12:09:12.050233304 +0100
239 * To not build/install the Cyrillic fonts, uncomment the following
241 -#define BuildCyrillicFonts NO
243 +#define BuildCyrillicFonts YES
246 * To not install the local font directory, uncomment the following
247 @@ -307,27 +307,26 @@
248 * HasGlide2 to YES and set the Glide2IncDir variable.
249 * HasGlide2 is per default NO.
251 -#define HasGlide2 YES
253 +#define HasGlide2 YES
256 * Set the path to your Glide include files.
258 -#define Glide2IncDir /usr/include/glide
260 +#define Glide2IncDir /usr/include/glide
265 -#define HasGlide3 YES
267 +#define HasGlide3 YES
270 * Set the path to your Glide 3 include files.
272 -#define Glide3IncDir /usr/include/glide3
275 +#define Glide3IncDir /usr/include/glide3
280 * Some Linux releases don't have a libtermcap. In this case you may need
281 * to uncomment the following
283 -#define TermcapLibrary -lncurses
285 +#define TermcapLibrary -lncurses
288 * Build a server that dynamically loads the modules by setting
290 * To forceably build static libraries in addition to shared libraries,
293 -#define ForceNormalLib YES
295 +#define ForceNormalLib YES
298 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
299 diff -urN xc.org/config/cf/xf86site.def xc/config/cf/xf86site.def
300 --- xc.org/config/cf/xf86site.def 2004-04-18 22:10:56.000000000 +0200
301 +++ xc/config/cf/xf86site.def 2004-04-18 23:41:55.676970296 +0200
303 * Do you want to Build Fonts (Usually you only want to build and install
304 * fonts once, if this is a first time install you will want to build the
307 -#define BuildFonts NO
309 +#define BuildFonts NO
312 * To not build/install the 75dpi fonts, uncomment the following
315 * For FreeBSD/ELF (FreeBSD 3.0) it is possible to also build and install
316 * a.out compatibility libraries. To enable that, uncomment this.
318 -#define BuildAoutLibraries YES
320 +#define BuildAoutLibraries YES
323 * If you have trouble with make bombing out in Xlib, try uncommenting this.
324 diff -Nru xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
325 --- xc.orig/config/cf/xfree86.cf 2003-11-21 06:55:07.000000000 +0100
326 +++ xc/config/cf/xfree86.cf 2003-12-23 12:09:12.055232544 +0100
328 #define XConfigFile XF86Config
331 -#define XConfigDir $(LIBDIR)
332 +#define XConfigDir $(ETCX11DIR)
335 #define XLogFile XFree86
338 # ifndef XF86CardDrivers
339 # define XF86CardDrivers mga glint nv s3 s3virge sis savage \
340 - trident chips tdfx fbdev ati \
341 + trident chips fbdev ati \
342 DevelDrivers newport \
343 XF86OSCardDrivers XF86ExtraCardDrivers
345 diff -Nru xc.orig/config/imake/imake.c xc/config/imake/imake.c
346 --- xc.orig/config/imake/imake.c 2003-04-10 13:00:03.000000000 +0200
347 +++ xc/config/imake/imake.c 2003-12-23 12:09:12.060231784 +0100
348 @@ -1057,6 +1057,7 @@
349 static char* suse = "/etc/SuSE-release";
350 static char* redhat = "/etc/redhat-release";
351 static char* debian = "/etc/debian_version";
352 + static char* pld = "/etc/pld-release";
354 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
355 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
356 @@ -1071,6 +1072,7 @@
357 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
358 fprintf (inFile, "%s\n", "#define LinuxWare 11");
359 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
360 + fprintf (inFile, "%s\n", "#define LinuxPLD 13");
363 if (CrossCompiling) {
364 @@ -1097,6 +1099,11 @@
365 * at the content of /etc/debian_version */
368 + if (lstat (pld, &sb) == 0) {
369 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
370 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
373 /* what's the definitive way to tell what any particular distribution is? */
375 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
376 diff -Nru xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
377 --- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-12-19 05:48:39.000000000 +0100
378 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-12-23 12:09:12.000000000 +0100
382 CURSESLIB = NCursesLibName
383 -CURSESDEFINES = -DHAS_NCURSES
384 +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
387 XF86CONFIGFILE = XConfigFile
388 diff -Nru xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
389 --- xc.orig/programs/xdm/config/Xres.cpp 2003-11-21 07:01:06.000000000 +0100
390 +++ xc/programs/xdm/config/Xres.cpp 2003-12-23 12:09:12.000000000 +0100
395 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
397 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
399 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
400 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
402 xlogin*useShape: true
403 xlogin*logoPadding: 10
404 diff -Nru xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
405 --- xc.orig/programs/xdm/resource.c 2003-09-25 13:06:32.000000000 +0200
406 +++ xc/programs/xdm/resource.c 2003-12-23 12:09:12.000000000 +0100
410 #ifndef DEF_SERVER_LINE
411 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
412 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
415 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
416 +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
419 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
420 +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
422 #ifndef DEF_USER_PATH
423 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
424 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
426 #ifndef DEF_SYSTEM_PATH
427 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
428 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
430 #ifndef DEF_SYSTEM_SHELL
431 #define DEF_SYSTEM_SHELL "/bin/sh"
433 #ifndef DEF_FAILSAFE_CLIENT
434 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
435 +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
437 #ifndef DEF_XDM_CONFIG
438 -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
439 +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
442 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
443 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
445 #ifndef DEF_AUTH_NAME
451 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
452 +#define DEF_AUTH_DIR "/etc/X11/xdm"
454 #ifndef DEF_USER_AUTH_DIR
455 #define DEF_USER_AUTH_DIR "/tmp"
456 diff -Nru xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile
457 --- xc.orig/programs/xinit/Imakefile 2003-11-21 07:01:12.000000000 +0100
458 +++ xc/programs/xinit/Imakefile 2003-12-23 12:09:12.000000000 +0100
461 InstallManPage(startx,$(MANDIR))
463 -#if InstallXinitConfig
464 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
466 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
468 +XCOMM Red Hat gets this from a different package
469 +XCOMM #if InstallXinitConfig
470 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
472 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
475 LinkConfDirectory(xinit,.,xinit,.)
477 diff -Nru xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
478 --- xc.orig/programs/xterm/Imakefile 2003-12-19 05:51:51.000000000 +0100
479 +++ xc/programs/xterm/Imakefile 2003-12-23 12:11:05.000000000 +0100
481 #define XkbClientLibs /**/
484 +#if InstallXtermSetUID
485 +#undef InstallXtermSetUID
488 #ifndef SpecialCObjectRule
489 #define SpecialCObjectRule(module,ignore,defines) \
490 module.o: ; $(CC) -c defines $(CFLAGS) module.c
497 #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
498 (defined(LinuxArchitecture) && \
499 (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
501 XKB_DEFINES = XkbClientDefines
502 PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
503 DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF) $(XVERSIONDEFS) $(VENDORDEFINES)
504 - INCLUDES = -I. $(XRFINCLUDES)
505 + INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES)
507 #ifdef OS2Architecture
509 diff -Nru xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h
510 --- xc.orig/programs/xterm/xterm.h 2003-12-19 05:51:52.000000000 +0100
511 +++ xc/programs/xterm/xterm.h 2003-12-23 12:09:12.000000000 +0100
516 -#define DFT_TERMTYPE "xterm"
517 +#define DFT_TERMTYPE "xterm-color"