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
70 # if defined(i386Architecture) || defined(ia64Architecture) || defined(SparcArchitecture) || defined(AlphaArchitecture) || defined(AMD64Architecture)
71 # if OSMajorVersion == 2
72 /* Only tested for Linux 2.2.0 through 2.2.12 */
73 -# if OSMinorVersion == 2 && OSTeenyVersion <= 12
74 +# if OSMinorVersion == 2
75 # define BuildXF86DRM YES
77 /* Only tested for Linux 2.3.0 through 2.3.18 */
81 #ifndef VarDbDirectory
82 -# define VarDbDirectory $(VARDIR)/lib
83 +# define VarDbDirectory /var/lib
86 #ifndef XF86OSCardDrivers
87 diff -urN xc.org/config/cf/site.def xc/config/cf/site.def
88 --- xc.org/config/cf/site.def 2003-11-21 15:13:57.000000000 +0100
89 +++ xc/config/cf/site.def 2003-11-21 15:20:56.000000000 +0100
91 #define HasSentinel YES
95 #undef DefaultUserPath
96 -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
98 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
99 +#undef DefaultSystemPath
100 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
104 +#define HasPamMisc YES
107 /* You do NOT need SetUID if you only run the server under xdm */
108 diff -urN xc.org/config/cf/X11.tmpl xc/config/cf/X11.tmpl
109 --- xc.org/config/cf/X11.tmpl 2003-11-21 15:13:57.000000000 +0100
110 +++ xc/config/cf/X11.tmpl 2003-11-21 15:20:56.000000000 +0100
111 @@ -1261,8 +1261,12 @@
112 # define UsbMouseSupport NO
115 +#ifndef EtcX11Directory
116 +#define EtcX11Directory /etc/X11
119 #ifndef DefaultFSConfigFile
120 -#define DefaultFSConfigFile $(LIBDIR)/fs/config
121 +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
124 /* X-TrueType settings */
125 @@ -1385,7 +1389,7 @@
126 #define ConfigDir $(LIBDIR)/config
129 -#define DocDir $(LIBDIR)/doc
130 +#define DocDir $(LIBDIR)/share/doc
133 #define DocHtmlDir $(DOCDIR)/html
134 @@ -1397,31 +1401,31 @@
135 #define DocPdfDir $(DOCDIR)/PDF
138 -#define FontDir $(LIBDIR)/fonts
139 +#define FontDir /usr/share/fonts
142 -#define AdmDir /usr/adm
143 +#define AdmDir /var/log
146 -#define XinitDir $(LIBDIR)/xinit
147 +#define XinitDir $(ETCX11DIR)/xinit
150 -#define XdmDir $(LIBDIR)/xdm
151 +#define XdmDir $(ETCX11DIR)/xdm
154 #define XdmVarDir $(VARLIBDIR)/xdm
157 -#define XdmAuthDir $(LIBDIR)/xdm
158 +#define XdmAuthDir $(ETCX11DIR)/xdm
160 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
161 #define XdmConfigurationSubdirectory config
164 -#define TwmDir $(LIBDIR)/twm
165 +#define TwmDir $(ETCX11DIR)/twm
168 -#define XsmDir $(LIBDIR)/xsm
169 +#define XsmDir $(ETCX11DIR)/xsm
172 #define NlsDir $(LIBDIR)/nls
173 @@ -1430,23 +1434,20 @@
174 #define XLocaleDir $(LIBDIR)/locale
177 -#define LbxproxyDir $(LIBDIR)/lbxproxy
178 +#define LbxproxyDir $(ETCX11DIR)/lbxproxy
180 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
181 #define LbxproxyConfigSubdir config
183 #ifndef ProxyManagerDir
184 -#define ProxyManagerDir $(LIBDIR)/proxymngr
185 +#define ProxyManagerDir $(ETCX11DIR)/proxymngr
187 #ifndef ServerConfigDir
188 -#define ServerConfigDir $(LIBDIR)/xserver
189 +#define ServerConfigDir $(ETCX11DIR)/xserver
192 #define XPrintDir ServerConfigDir
194 -#ifndef EtcX11Directory
195 -#define EtcX11Directory /etc/X11
197 #ifndef InstallSecurityConfig
198 #define InstallSecurityConfig YES /* Install sample security policy */
200 @@ -1478,10 +1479,10 @@
201 #define OsNameDefines /* as nothing */
203 #ifndef DefaultUserPath /* for xdm */
204 -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
205 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
207 #ifndef DefaultSystemPath /* for xdm */
208 -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
209 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
211 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
212 #define DefaultSystemShell BourneShell
213 @@ -1608,7 +1609,7 @@
215 HTMLINDEXCMD = HtmlIndexCmd
217 - DOCUTILSRC = $(XTOP)/doc/util
218 + DOCUTILSRC = $(XTOP)/share/doc/util
219 CLIENTSRC = $(TOP)/clients
220 DEMOSRC = $(TOP)/demos
221 XDOCMACROS = $(DOCUTILSRC)/macros.t
222 @@ -1622,7 +1623,7 @@
223 SERVERSRC = $(XTOP)/programs/Xserver
224 CONTRIBSRC = ContribDir
225 UNSUPPORTEDSRC = UnsupportedDir
226 - DOCSRC = $(XTOP)/doc
227 + DOCSRC = $(XTOP)/share/doc
228 RGBSRC = $(XTOP)/programs/rgb
229 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
230 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
231 diff -urN xc.org/config/cf/xf86site.def xc/config/cf/xf86site.def
232 --- xc.org/config/cf/xf86site.def 2003-11-21 15:13:57.000000000 +0100
233 +++ xc/config/cf/xf86site.def 2003-11-21 15:20:56.000000000 +0100
236 * To not build/install the Cyrillic fonts, uncomment the following
238 -#define BuildCyrillicFonts NO
240 +#define BuildCyrillicFonts YES
243 * To not install the local font directory, uncomment the following
244 @@ -307,27 +307,26 @@
245 * HasGlide2 to YES and set the Glide2IncDir variable.
246 * HasGlide2 is per default NO.
248 -#define HasGlide2 YES
250 +#define HasGlide2 YES
253 * Set the path to your Glide include files.
255 -#define Glide2IncDir /usr/include/glide
257 +#define Glide2IncDir /usr/include/glide
262 -#define HasGlide3 YES
264 +#define HasGlide3 YES
267 * Set the path to your Glide 3 include files.
269 -#define Glide3IncDir /usr/include/glide3
272 +#define Glide3IncDir /usr/include/glide3
277 * Some Linux releases don't have a libtermcap. In this case you may need
278 * to uncomment the following
280 -#define TermcapLibrary -lncurses
282 +#define TermcapLibrary -lncurses
285 * Build a server that dynamically loads the modules by setting
287 * To forceably build static libraries in addition to shared libraries,
290 -#define ForceNormalLib YES
292 +#define ForceNormalLib YES
295 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
296 diff -urN xc.org/config/cf/xfree86.cf xc/config/cf/xfree86.cf
297 --- xc.org/config/cf/xfree86.cf 2003-11-21 15:13:57.000000000 +0100
298 +++ xc/config/cf/xfree86.cf 2003-11-21 15:20:56.000000000 +0100
300 #define XConfigFile XF86Config
303 -#define XConfigDir $(LIBDIR)
304 +#define XConfigDir $(ETCX11DIR)
307 #define XLogFile XFree86
310 # ifndef XF86CardDrivers
311 # define XF86CardDrivers mga glint nv s3 s3virge sis savage \
312 - trident chips tdfx fbdev ati \
313 + trident chips fbdev ati \
314 DevelDrivers newport \
315 XF86OSCardDrivers XF86ExtraCardDrivers
317 diff -urN xc.org/config/imake/imake.c xc/config/imake/imake.c
318 --- xc.org/config/imake/imake.c 2003-11-21 15:13:57.000000000 +0100
319 +++ xc/config/imake/imake.c 2003-11-21 15:20:56.000000000 +0100
320 @@ -1057,6 +1057,7 @@
321 static char* suse = "/etc/SuSE-release";
322 static char* redhat = "/etc/redhat-release";
323 static char* debian = "/etc/debian_version";
324 + static char* pld = "/etc/pld-release";
326 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
327 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
328 @@ -1071,6 +1072,7 @@
329 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
330 fprintf (inFile, "%s\n", "#define LinuxWare 11");
331 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
332 + fprintf (inFile, "%s\n", "#define LinuxPLD 13");
335 if (CrossCompiling) {
336 @@ -1097,6 +1099,11 @@
337 * at the content of /etc/debian_version */
340 + if (lstat (pld, &sb) == 0) {
341 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
342 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
345 /* what's the definitive way to tell what any particular distribution is? */
347 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
348 diff -urN xc.org/Makefile xc/Makefile
349 --- xc.org/Makefile 2003-11-21 15:13:57.000000000 +0100
350 +++ xc/Makefile 2003-11-21 15:20:56.000000000 +0100
352 # or add "MAKE = make" to this file.
354 RELEASE = "Release 6.6"
360 diff -urN xc.org/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
361 --- xc.org/programs/xdm/config/Xres.cpp 2003-11-21 15:18:39.000000000 +0100
362 +++ xc/programs/xdm/config/Xres.cpp 2003-11-21 15:21:45.000000000 +0100
367 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
368 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
370 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
371 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
373 xlogin*useShape: true
374 xlogin*logoPadding: 10
375 diff -urN xc.org/programs/xdm/resource.c xc/programs/xdm/resource.c
376 --- xc.org/programs/xdm/resource.c 2003-11-21 15:18:38.000000000 +0100
377 +++ xc/programs/xdm/resource.c 2003-11-21 15:20:56.000000000 +0100
381 #ifndef DEF_SERVER_LINE
382 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
383 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
386 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
387 +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
390 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
391 +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
393 #ifndef DEF_USER_PATH
394 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
395 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
397 #ifndef DEF_SYSTEM_PATH
398 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
399 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
401 #ifndef DEF_SYSTEM_SHELL
402 #define DEF_SYSTEM_SHELL "/bin/sh"
404 #ifndef DEF_FAILSAFE_CLIENT
405 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
406 +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
408 #ifndef DEF_XDM_CONFIG
409 -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
410 +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
413 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
414 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
416 #ifndef DEF_AUTH_NAME
422 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
423 +#define DEF_AUTH_DIR "/etc/X11/xdm"
425 #ifndef DEF_USER_AUTH_DIR
426 #define DEF_USER_AUTH_DIR "/tmp"
427 diff -urN xc.org/programs/xinit/Imakefile xc/programs/xinit/Imakefile
428 --- xc.org/programs/xinit/Imakefile 2003-11-21 15:18:47.000000000 +0100
429 +++ xc/programs/xinit/Imakefile 2003-11-21 15:20:56.000000000 +0100
432 InstallManPage(startx,$(MANDIR))
434 -#if InstallXinitConfig
435 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
437 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
439 +XCOMM Red Hat gets this from a different package
440 +XCOMM #if InstallXinitConfig
441 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
443 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
446 LinkConfDirectory(xinit,.,xinit,.)
448 diff -urN xc.org/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
449 --- xc.org/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-11-21 15:17:43.000000000 +0100
450 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-11-21 15:20:56.000000000 +0100
454 CURSESLIB = NCursesLibName
455 -CURSESDEFINES = -DHAS_NCURSES
456 +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
459 XF86CONFIGFILE = XConfigFile
460 diff -urN xc.org/programs/xterm/Imakefile xc/programs/xterm/Imakefile
461 --- xc.org/programs/xterm/Imakefile 2003-11-21 15:19:09.000000000 +0100
462 +++ xc/programs/xterm/Imakefile 2003-11-21 15:20:56.000000000 +0100
464 #define XkbClientLibs /**/
467 +#if InstallXtermSetUID
468 +#undef InstallXtermSetUID
471 #ifndef SpecialCObjectRule
472 #define SpecialCObjectRule(module,ignore,defines) \
473 module.o: ; $(CC) -c defines $(CFLAGS) module.c
480 #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
481 (defined(LinuxArchitecture) && \
482 (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
484 MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
485 XKB_DEFINES = XkbClientDefines
486 PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
487 - DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
488 + DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
489 INCLUDES = $(XRFINCLUDES)
491 #ifdef OS2Architecture
492 diff -urN xc.org/programs/xterm/xterm.h xc/programs/xterm/xterm.h
493 --- xc.org/programs/xterm/xterm.h 2003-11-21 15:19:12.000000000 +0100
494 +++ xc/programs/xterm/xterm.h 2003-11-21 15:20:56.000000000 +0100
499 -#define DFT_TERMTYPE "xterm"
500 +#define DFT_TERMTYPE "xterm-color"