1 diff -urN xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
2 --- xc.orig/config/cf/Imake.cf 2004-08-08 14:23:13.490683768 +0200
3 +++ xc/config/cf/Imake.cf 2004-08-08 14:24:15.046325888 +0200
5 # define s390Architecture
9 +# define AlphaArchitecture
13 # define AlphaArchitecture
15 diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
16 --- xc.orig/config/cf/Imake.tmpl 2004-08-08 14:23:13.457688784 +0200
17 +++ xc/config/cf/Imake.tmpl 2004-08-08 14:24:15.066322848 +0200
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 CppCmd /LibDirName/cpp
43 -#define RawCppCmd CppCmd -undef
44 +#define RawCppCmd CppCmd
46 #ifndef CppNoLineInfoOption
47 #define CppNoLineInfoOption /**/
48 diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
49 --- xc.orig/config/cf/linux.cf 2004-08-08 14:23:13.452689544 +0200
50 +++ xc/config/cf/linux.cf 2004-08-08 14:24:15.097318136 +0200
54 # if defined(i386Architecture)
55 -# define BuildLibGlxWithoutPIC YES
56 +# define BuildLibGlxWithoutPIC NO
63 #ifndef VarDbDirectory
64 -# define VarDbDirectory $(VARDIR)/lib
65 +# define VarDbDirectory /var/lib
68 #ifndef XF86OSCardDrivers
69 diff -urN xc.orig/config/cf/site.def xc/config/cf/site.def
70 --- xc.orig/config/cf/site.def 2004-08-08 14:23:13.491683616 +0200
71 +++ xc/config/cf/site.def 2004-08-08 14:24:15.098317984 +0200
73 #define HasSentinel YES
77 #undef DefaultUserPath
78 -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
80 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
81 +#undef DefaultSystemPath
82 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
86 +#define HasPamMisc YES
89 /* You do NOT need SetUID if you only run the server under xdm */
90 diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
91 --- xc.orig/config/cf/X11.tmpl 2004-08-08 14:23:13.498682552 +0200
92 +++ xc/config/cf/X11.tmpl 2004-08-08 14:24:15.083320264 +0200
93 @@ -1390,8 +1390,12 @@
94 # define UsbMouseSupport NO
97 +#ifndef EtcX11Directory
98 +#define EtcX11Directory /etc/X11
101 #ifndef DefaultFSConfigFile
102 -#define DefaultFSConfigFile $(LIBDIR)/fs/config
103 +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
107 @@ -1478,7 +1482,7 @@
108 #define ConfigDir $(LIBDIR)/config
111 -#define DocDir $(LIBDIR)/doc
112 +#define DocDir $(LIBDIR)/share/doc
115 #define DocHtmlDir $(DOCDIR)/html
116 @@ -1490,31 +1494,31 @@
117 #define DocPdfDir $(DOCDIR)/PDF
120 -#define FontDir $(LIBDIR)/fonts
121 +#define FontDir /usr/share/fonts
124 -#define AdmDir /usr/adm
125 +#define AdmDir /var/log
128 -#define XinitDir $(LIBDIR)/xinit
129 +#define XinitDir $(ETCX11DIR)/xinit
132 -#define XdmDir $(LIBDIR)/xdm
133 +#define XdmDir $(ETCX11DIR)/xdm
136 #define XdmVarDir $(VARLIBDIR)/xdm
139 -#define XdmAuthDir $(LIBDIR)/xdm
140 +#define XdmAuthDir $(ETCX11DIR)/xdm
142 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
143 #define XdmConfigurationSubdirectory config
146 -#define TwmDir $(LIBDIR)/twm
147 +#define TwmDir $(ETCX11DIR)/twm
150 -#define XsmDir $(LIBDIR)/xsm
151 +#define XsmDir $(ETCX11DIR)/xsm
154 #define NlsDir $(LIBDIR)/nls
155 @@ -1523,23 +1527,20 @@
156 #define XLocaleDir $(LIBDIR)/locale
159 -#define LbxproxyDir $(LIBDIR)/lbxproxy
160 +#define LbxproxyDir $(ETCX11DIR)/lbxproxy
162 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
163 #define LbxproxyConfigSubdir config
165 #ifndef ProxyManagerDir
166 -#define ProxyManagerDir $(LIBDIR)/proxymngr
167 +#define ProxyManagerDir $(ETCX11DIR)/proxymngr
169 #ifndef ServerConfigDir
170 -#define ServerConfigDir $(LIBDIR)/xserver
171 +#define ServerConfigDir $(ETCX11DIR)/xserver
174 #define XPrintDir ServerConfigDir
176 -#ifndef EtcX11Directory
177 -#define EtcX11Directory /etc/X11
179 #ifndef InstallSecurityConfig
180 #define InstallSecurityConfig YES /* Install sample security policy */
182 @@ -1571,10 +1572,10 @@
183 #define OsNameDefines /* as nothing */
185 #ifndef DefaultUserPath /* for xdm */
186 -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
187 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
189 #ifndef DefaultSystemPath /* for xdm */
190 -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
191 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
193 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
194 #define DefaultSystemShell BourneShell
195 @@ -1709,7 +1710,7 @@
197 HTMLINDEXCMD = HtmlIndexCmd
199 - DOCUTILSRC = $(XTOP)/doc/util
200 + DOCUTILSRC = $(XTOP)/share/doc/util
201 CLIENTSRC = $(TOP)/clients
202 DEMOSRC = $(TOP)/demos
203 XDOCMACROS = $(DOCUTILSRC)/macros.t
204 @@ -1723,7 +1724,7 @@
205 SERVERSRC = $(XTOP)/programs/Xserver
206 CONTRIBSRC = ContribDir
207 UNSUPPORTEDSRC = UnsupportedDir
208 - DOCSRC = $(XTOP)/doc
209 + DOCSRC = $(XTOP)/share/doc
210 RGBSRC = $(XTOP)/programs/rgb
211 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
212 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
213 diff -urN xc.orig/config/cf/xorg.cf xc/config/cf/xorg.cf
214 --- xc.orig/config/cf/xorg.cf 2004-08-08 14:23:13.473686352 +0200
215 +++ xc/config/cf/xorg.cf 2004-08-08 14:26:34.721092096 +0200
217 #define XConfigFile xorg.conf
220 -#define XConfigDir $(LIBDIR)
221 +#define XConfigDir $(ETCX11DIR)
224 #define XLogFile Xorg
226 neomagic i740 tdfx savage \
227 cirrus vmware tseng trident chips apm \
228 GlideDriver i128 i386Drivers \
229 - ati DevelDrivers ark \
230 + ati DevelDrivers ark fbdev \
231 cyrix siliconmotion via \
233 dummy XF86OSCardDrivers XF86ExtraCardDrivers
234 diff -urN xc.orig/config/cf/xorgsite.def xc/config/cf/xorgsite.def
235 --- xc.orig/config/cf/xorgsite.def 2004-08-08 14:23:13.467687264 +0200
236 +++ xc/config/cf/xorgsite.def 2004-08-08 14:24:15.099317832 +0200
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 @@ -302,20 +302,20 @@
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 * Some Linux releases don't have a libtermcap. In this case you may need
273 * to uncomment the following
275 -#define TermcapLibrary -lncurses
277 +#define TermcapLibrary -lncurses
280 * Build a server that dynamically loads the modules by setting
282 * To forceably build static libraries in addition to shared libraries,
285 -#define ForceNormalLib YES
287 +#define ForceNormalLib YES
290 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
291 diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
292 --- xc.orig/config/imake/imake.c 2004-08-08 14:23:13.723648352 +0200
293 +++ xc/config/imake/imake.c 2004-08-08 14:24:15.116315248 +0200
294 @@ -1057,6 +1057,7 @@
295 static char* suse = "/etc/SuSE-release";
296 static char* redhat = "/etc/redhat-release";
297 static char* debian = "/etc/debian_version";
298 + static char* pld = "/etc/pld-release";
300 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
301 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
302 @@ -1071,6 +1072,7 @@
303 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
304 fprintf (inFile, "%s\n", "#define LinuxWare 11");
305 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
306 + fprintf (inFile, "%s\n", "#define LinuxPLD 13");
309 if (CrossCompiling) {
310 @@ -1097,6 +1099,11 @@
311 * at the content of /etc/debian_version */
314 + if (lstat (pld, &sb) == 0) {
315 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
316 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
319 /* what's the definitive way to tell what any particular distribution is? */
321 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
322 diff -urN xc.orig/Makefile xc/Makefile
323 --- xc.orig/Makefile 2004-08-08 14:23:52.771712144 +0200
324 +++ xc/Makefile 2004-08-08 14:24:15.046325888 +0200
326 # or add "MAKE = make" to this file.
328 RELEASE = "Release 6.7"
334 diff -urN xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
335 --- xc.orig/programs/xdm/config/Xres.cpp 2004-08-08 14:22:57.000000000 +0200
336 +++ xc/programs/xdm/config/Xres.cpp 2004-08-08 14:24:15.140311600 +0200
342 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
344 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
346 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
347 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
349 xlogin*useShape: true
350 xlogin*logoPadding: 10
351 diff -urN xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
352 --- xc.orig/programs/xdm/resource.c 2004-08-08 14:22:57.000000000 +0200
353 +++ xc/programs/xdm/resource.c 2004-08-08 14:24:15.151309928 +0200
357 #ifndef DEF_SERVER_LINE
358 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
359 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
362 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
363 +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
366 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
367 +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
369 #ifndef DEF_USER_PATH
370 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
371 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
373 #ifndef DEF_SYSTEM_PATH
374 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
375 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
377 #ifndef DEF_SYSTEM_SHELL
378 #define DEF_SYSTEM_SHELL "/bin/sh"
380 #ifndef DEF_FAILSAFE_CLIENT
381 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
382 +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
384 #ifndef DEF_XDM_CONFIG
385 -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
386 +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
389 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
390 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
392 #ifndef DEF_AUTH_NAME
398 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
399 +#define DEF_AUTH_DIR "/etc/X11/xdm"
401 #ifndef DEF_USER_AUTH_DIR
402 #define DEF_USER_AUTH_DIR "/tmp"
403 diff -urN xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile
404 --- xc.orig/programs/xinit/Imakefile 2004-08-08 14:22:55.000000000 +0200
405 +++ xc/programs/xinit/Imakefile 2004-08-08 14:24:15.175306280 +0200
408 InstallManPage(startx,$(MANDIR))
410 -#if InstallXinitConfig
411 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
413 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
415 +XCOMM Red Hat gets this from a different package
416 +XCOMM #if InstallXinitConfig
417 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
419 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
422 LinkConfDirectory(xinit,.,xinit,.)
424 diff -urN xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
425 --- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2004-08-08 14:22:34.000000000 +0200
426 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2004-08-08 14:24:15.128313424 +0200
430 CURSESLIB = NCursesLibName
431 -CURSESDEFINES = -DHAS_NCURSES
432 +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
435 XF86CONFIGFILE = XConfigFile
436 diff -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
437 --- xc.orig/programs/xterm/Imakefile 2004-08-08 14:22:19.000000000 +0200
438 +++ xc/programs/xterm/Imakefile 2004-08-08 14:24:54.244366880 +0200
440 #define XkbClientLibs /**/
443 +#if InstallXtermSetUID
444 +#undef InstallXtermSetUID
447 #ifndef SpecialCObjectRule
448 #define SpecialCObjectRule(module,ignore,defines) \
449 module.o: ; $(CC) -c defines $(CFLAGS) module.c
456 #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
457 (defined(LinuxArchitecture) && \
458 (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
460 XKB_DEFINES = XkbClientDefines
461 PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
462 DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
463 - INCLUDES = -I. $(XRFINCLUDES)
464 + INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES)
466 #ifdef OS2Architecture
468 diff -urN xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h
469 --- xc.orig/programs/xterm/xterm.h 2004-08-08 14:22:18.000000000 +0200
470 +++ xc/programs/xterm/xterm.h 2004-08-08 14:24:15.211300808 +0200
475 -#define DFT_TERMTYPE "xterm"
476 +#define DFT_TERMTYPE "xterm-color"