1 diff -urN xc.org/config/cf/Imake.cf xc/config/cf/Imake.cf
2 --- xc.org/config/cf/Imake.cf 2003-11-21 15:13:57.000000000 +0100
3 +++ xc/config/cf/Imake.cf 2003-11-21 15:20:56.000000000 +0100
5 # define s390Architecture
9 +# define AlphaArchitecture
13 # define AlphaArchitecture
15 diff -urN xc.org/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
16 --- xc.org/config/cf/Imake.tmpl 2003-11-21 15:13:57.000000000 +0100
17 +++ xc/config/cf/Imake.tmpl 2003-11-21 15:20:56.000000000 +0100
20 #ifndef BuildHtmlManPages
22 -#define BuildHtmlManPages YES
23 +#define BuildHtmlManPages NO
25 #define BuildHtmlManPages NO
28 #define LintlibDir $(USRLIBDIR)/lint
30 #ifndef SystemManDirectory
32 #define SystemManDirectory /usr/share/man
34 -#define SystemManDirectory /usr/man
37 #ifndef ManDirectoryRoot
40 #define NoRConst NO /* YES if const for structs of funcs is bad */
43 -#define InstPgmFlags -s
47 #define InstBinFlags -m 0755
49 #define CppCmd /LibDirName/cpp
52 -#define RawCppCmd CppCmd -undef
53 +#define RawCppCmd CppCmd
55 #ifndef CppNoLineInfoOption
56 #define CppNoLineInfoOption /**/
57 diff -urN xc.org/config/cf/linux.cf xc/config/cf/linux.cf
58 --- xc.org/config/cf/linux.cf 2003-11-21 15:13:57.000000000 +0100
59 +++ xc/config/cf/linux.cf 2003-11-21 15:20:56.000000000 +0100
63 # if defined(i386Architecture)
64 -# define BuildLibGlxWithoutPIC YES
65 +# define BuildLibGlxWithoutPIC NO
72 #ifndef VarDbDirectory
73 -# define VarDbDirectory $(VARDIR)/lib
74 +# define VarDbDirectory /var/lib
77 #ifndef XF86OSCardDrivers
78 diff -urN xc.org/config/cf/site.def xc/config/cf/site.def
79 --- xc.org/config/cf/site.def 2003-11-21 15:13:57.000000000 +0100
80 +++ xc/config/cf/site.def 2003-11-21 15:20:56.000000000 +0100
82 #define HasSentinel YES
86 #undef DefaultUserPath
87 -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
89 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
90 +#undef DefaultSystemPath
91 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
95 +#define HasPamMisc YES
98 /* You do NOT need SetUID if you only run the server under xdm */
99 diff -urN xc.org/config/cf/X11.tmpl xc/config/cf/X11.tmpl
100 --- xc.org/config/cf/X11.tmpl 2003-11-21 15:13:57.000000000 +0100
101 +++ xc/config/cf/X11.tmpl 2003-11-21 15:20:56.000000000 +0100
102 @@ -1261,8 +1261,12 @@
103 # define UsbMouseSupport NO
106 +#ifndef EtcX11Directory
107 +#define EtcX11Directory /etc/X11
110 #ifndef DefaultFSConfigFile
111 -#define DefaultFSConfigFile $(LIBDIR)/fs/config
112 +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
115 /* X-TrueType settings */
116 @@ -1385,7 +1389,7 @@
117 #define ConfigDir $(LIBDIR)/config
120 -#define DocDir $(LIBDIR)/doc
121 +#define DocDir $(LIBDIR)/share/doc
124 #define DocHtmlDir $(DOCDIR)/html
125 @@ -1397,31 +1401,31 @@
126 #define DocPdfDir $(DOCDIR)/PDF
129 -#define FontDir $(LIBDIR)/fonts
130 +#define FontDir /usr/share/fonts
133 -#define AdmDir /usr/adm
134 +#define AdmDir /var/log
137 -#define XinitDir $(LIBDIR)/xinit
138 +#define XinitDir $(ETCX11DIR)/xinit
141 -#define XdmDir $(LIBDIR)/xdm
142 +#define XdmDir $(ETCX11DIR)/xdm
145 #define XdmVarDir $(VARLIBDIR)/xdm
148 -#define XdmAuthDir $(LIBDIR)/xdm
149 +#define XdmAuthDir $(ETCX11DIR)/xdm
151 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
152 #define XdmConfigurationSubdirectory config
155 -#define TwmDir $(LIBDIR)/twm
156 +#define TwmDir $(ETCX11DIR)/twm
159 -#define XsmDir $(LIBDIR)/xsm
160 +#define XsmDir $(ETCX11DIR)/xsm
163 #define NlsDir $(LIBDIR)/nls
164 @@ -1430,23 +1434,20 @@
165 #define XLocaleDir $(LIBDIR)/locale
168 -#define LbxproxyDir $(LIBDIR)/lbxproxy
169 +#define LbxproxyDir $(ETCX11DIR)/lbxproxy
171 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
172 #define LbxproxyConfigSubdir config
174 #ifndef ProxyManagerDir
175 -#define ProxyManagerDir $(LIBDIR)/proxymngr
176 +#define ProxyManagerDir $(ETCX11DIR)/proxymngr
178 #ifndef ServerConfigDir
179 -#define ServerConfigDir $(LIBDIR)/xserver
180 +#define ServerConfigDir $(ETCX11DIR)/xserver
183 #define XPrintDir ServerConfigDir
185 -#ifndef EtcX11Directory
186 -#define EtcX11Directory /etc/X11
188 #ifndef InstallSecurityConfig
189 #define InstallSecurityConfig YES /* Install sample security policy */
191 @@ -1478,10 +1479,10 @@
192 #define OsNameDefines /* as nothing */
194 #ifndef DefaultUserPath /* for xdm */
195 -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
196 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
198 #ifndef DefaultSystemPath /* for xdm */
199 -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
200 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
202 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
203 #define DefaultSystemShell BourneShell
204 @@ -1608,7 +1609,7 @@
206 HTMLINDEXCMD = HtmlIndexCmd
208 - DOCUTILSRC = $(XTOP)/doc/util
209 + DOCUTILSRC = $(XTOP)/share/doc/util
210 CLIENTSRC = $(TOP)/clients
211 DEMOSRC = $(TOP)/demos
212 XDOCMACROS = $(DOCUTILSRC)/macros.t
213 @@ -1622,7 +1623,7 @@
214 SERVERSRC = $(XTOP)/programs/Xserver
215 CONTRIBSRC = ContribDir
216 UNSUPPORTEDSRC = UnsupportedDir
217 - DOCSRC = $(XTOP)/doc
218 + DOCSRC = $(XTOP)/share/doc
219 RGBSRC = $(XTOP)/programs/rgb
220 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
221 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
222 diff -urN xc.org/config/cf/xf86site.def xc/config/cf/xf86site.def
223 --- xc.org/config/cf/xf86site.def 2003-11-21 15:13:57.000000000 +0100
224 +++ xc/config/cf/xf86site.def 2003-11-21 15:20:56.000000000 +0100
227 * To not build/install the Cyrillic fonts, uncomment the following
229 -#define BuildCyrillicFonts NO
231 +#define BuildCyrillicFonts YES
234 * To not install the local font directory, uncomment the following
235 @@ -307,27 +307,26 @@
236 * HasGlide2 to YES and set the Glide2IncDir variable.
237 * HasGlide2 is per default NO.
239 -#define HasGlide2 YES
241 +#define HasGlide2 YES
244 * Set the path to your Glide include files.
246 -#define Glide2IncDir /usr/include/glide
248 +#define Glide2IncDir /usr/include/glide
253 -#define HasGlide3 YES
255 +#define HasGlide3 YES
258 * Set the path to your Glide 3 include files.
260 -#define Glide3IncDir /usr/include/glide3
263 +#define Glide3IncDir /usr/include/glide3
268 * Some Linux releases don't have a libtermcap. In this case you may need
269 * to uncomment the following
271 -#define TermcapLibrary -lncurses
273 +#define TermcapLibrary -lncurses
276 * Build a server that dynamically loads the modules by setting
278 * To forceably build static libraries in addition to shared libraries,
281 -#define ForceNormalLib YES
283 +#define ForceNormalLib YES
286 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
287 diff -urN xc.org/config/cf/xfree86.cf xc/config/cf/xfree86.cf
288 --- xc.org/config/cf/xfree86.cf 2003-11-21 15:13:57.000000000 +0100
289 +++ xc/config/cf/xfree86.cf 2003-11-21 15:20:56.000000000 +0100
291 #define XConfigFile XF86Config
294 -#define XConfigDir $(LIBDIR)
295 +#define XConfigDir $(ETCX11DIR)
298 #define XLogFile XFree86
301 # ifndef XF86CardDrivers
302 # define XF86CardDrivers mga glint nv s3 s3virge sis savage \
303 - trident chips tdfx fbdev ati \
304 + trident chips fbdev ati \
305 DevelDrivers newport \
306 XF86OSCardDrivers XF86ExtraCardDrivers
308 diff -urN xc.org/config/imake/imake.c xc/config/imake/imake.c
309 --- xc.org/config/imake/imake.c 2003-11-21 15:13:57.000000000 +0100
310 +++ xc/config/imake/imake.c 2003-11-21 15:20:56.000000000 +0100
311 @@ -1057,6 +1057,7 @@
312 static char* suse = "/etc/SuSE-release";
313 static char* redhat = "/etc/redhat-release";
314 static char* debian = "/etc/debian_version";
315 + static char* pld = "/etc/pld-release";
317 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
318 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
319 @@ -1071,6 +1072,7 @@
320 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
321 fprintf (inFile, "%s\n", "#define LinuxWare 11");
322 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
323 + fprintf (inFile, "%s\n", "#define LinuxPLD 13");
326 if (CrossCompiling) {
327 @@ -1097,6 +1099,11 @@
328 * at the content of /etc/debian_version */
331 + if (lstat (pld, &sb) == 0) {
332 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
333 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
336 /* what's the definitive way to tell what any particular distribution is? */
338 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
339 diff -urN xc.org/Makefile xc/Makefile
340 --- xc.org/Makefile 2003-11-21 15:13:57.000000000 +0100
341 +++ xc/Makefile 2003-11-21 15:20:56.000000000 +0100
343 # or add "MAKE = make" to this file.
345 RELEASE = "Release 6.6"
351 diff -urN xc.org/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
352 --- xc.org/programs/xdm/config/Xres.cpp 2003-11-21 15:18:39.000000000 +0100
353 +++ xc/programs/xdm/config/Xres.cpp 2003-11-21 15:21:45.000000000 +0100
358 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
359 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
361 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
362 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
364 xlogin*useShape: true
365 xlogin*logoPadding: 10
366 diff -urN xc.org/programs/xdm/resource.c xc/programs/xdm/resource.c
367 --- xc.org/programs/xdm/resource.c 2003-11-21 15:18:38.000000000 +0100
368 +++ xc/programs/xdm/resource.c 2003-11-21 15:20:56.000000000 +0100
372 #ifndef DEF_SERVER_LINE
373 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
374 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
377 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
378 +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
381 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
382 +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
384 #ifndef DEF_USER_PATH
385 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
386 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
388 #ifndef DEF_SYSTEM_PATH
389 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
390 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
392 #ifndef DEF_SYSTEM_SHELL
393 #define DEF_SYSTEM_SHELL "/bin/sh"
395 #ifndef DEF_FAILSAFE_CLIENT
396 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
397 +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
399 #ifndef DEF_XDM_CONFIG
400 -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
401 +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
404 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
405 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
407 #ifndef DEF_AUTH_NAME
413 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
414 +#define DEF_AUTH_DIR "/etc/X11/xdm"
416 #ifndef DEF_USER_AUTH_DIR
417 #define DEF_USER_AUTH_DIR "/tmp"
418 diff -urN xc.org/programs/xinit/Imakefile xc/programs/xinit/Imakefile
419 --- xc.org/programs/xinit/Imakefile 2003-11-21 15:18:47.000000000 +0100
420 +++ xc/programs/xinit/Imakefile 2003-11-21 15:20:56.000000000 +0100
423 InstallManPage(startx,$(MANDIR))
425 -#if InstallXinitConfig
426 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
428 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
430 +XCOMM Red Hat gets this from a different package
431 +XCOMM #if InstallXinitConfig
432 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
434 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
437 LinkConfDirectory(xinit,.,xinit,.)
439 diff -urN xc.org/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
440 --- xc.org/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-11-21 15:17:43.000000000 +0100
441 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-11-21 15:20:56.000000000 +0100
445 CURSESLIB = NCursesLibName
446 -CURSESDEFINES = -DHAS_NCURSES
447 +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
450 XF86CONFIGFILE = XConfigFile
451 diff -urN xc.org/programs/xterm/Imakefile xc/programs/xterm/Imakefile
452 --- xc.org/programs/xterm/Imakefile 2003-11-21 15:19:09.000000000 +0100
453 +++ xc/programs/xterm/Imakefile 2003-11-21 15:20:56.000000000 +0100
455 #define XkbClientLibs /**/
458 +#if InstallXtermSetUID
459 +#undef InstallXtermSetUID
462 #ifndef SpecialCObjectRule
463 #define SpecialCObjectRule(module,ignore,defines) \
464 module.o: ; $(CC) -c defines $(CFLAGS) module.c
471 #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
472 (defined(LinuxArchitecture) && \
473 (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
475 MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
476 XKB_DEFINES = XkbClientDefines
477 PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
478 - DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
479 + DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
480 INCLUDES = $(XRFINCLUDES)
482 #ifdef OS2Architecture
483 diff -urN xc.org/programs/xterm/xterm.h xc/programs/xterm/xterm.h
484 --- xc.org/programs/xterm/xterm.h 2003-11-21 15:19:12.000000000 +0100
485 +++ xc/programs/xterm/xterm.h 2003-11-21 15:20:56.000000000 +0100
490 -#define DFT_TERMTYPE "xterm"
491 +#define DFT_TERMTYPE "xterm-color"