1 diff -ur X11-6.9.0.org/xc/config/cf/Imake.cf X11-6.9.0/xc/config/cf/Imake.cf
2 --- X11-6.9.0.org/xc/config/cf/Imake.cf 2005-11-08 07:33:24.000000000 +0100
3 +++ X11-6.9.0/xc/config/cf/Imake.cf 2005-12-22 10:27:11.890963000 +0100
5 # define s390Architecture
9 +# define AlphaArchitecture
13 # define AlphaArchitecture
15 diff -ur X11-6.9.0.org/xc/config/cf/Imake.tmpl X11-6.9.0/xc/config/cf/Imake.tmpl
16 --- X11-6.9.0.org/xc/config/cf/Imake.tmpl 2005-11-08 07:33:24.000000000 +0100
17 +++ X11-6.9.0/xc/config/cf/Imake.tmpl 2005-12-22 10:28:07.490963000 +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 CppCmd /LibDirName/cpp
43 -#define RawCppCmd CppCmd -undef
44 +#define RawCppCmd CppCmd
46 #ifndef CppNoLineInfoOption
47 #define CppNoLineInfoOption /**/
48 diff -ur X11-6.9.0.org/xc/config/cf/linux.cf X11-6.9.0/xc/config/cf/linux.cf
49 --- X11-6.9.0.org/xc/config/cf/linux.cf 2005-10-21 21:10:27.000000000 +0200
50 +++ X11-6.9.0/xc/config/cf/linux.cf 2005-12-22 10:40:10.100963000 +0100
52 #ifndef BuildLibGlxWithoutPIC
54 # if defined(i386Architecture)
55 -# define BuildLibGlxWithoutPIC YES
56 +# define BuildLibGlxWithoutPIC NO
64 +#ifndef HasFontconfig
65 +# define HasFontconfig YES
69 # define HasFreetype2 YES
74 #ifndef VarDbDirectory
75 -# define VarDbDirectory $(VARDIR)/lib
76 +# define VarDbDirectory /var/lib
79 #ifndef XF86OSCardDrivers
80 diff -ur X11-6.9.0.org/xc/config/cf/site.def X11-6.9.0/xc/config/cf/site.def
81 --- X11-6.9.0.org/xc/config/cf/site.def 2004-05-06 17:08:25.000000000 +0200
82 +++ X11-6.9.0/xc/config/cf/site.def 2005-12-22 10:29:12.390963000 +0100
84 #define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
87 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
88 +#undef DefaultSystemPath
89 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
93 +#define HasPamMisc YES
96 /* You do NOT need SetUID if you only run the server under xdm */
97 /* You MAY need SetUID if users run the server by hand or under xinit */
98 diff -ur X11-6.9.0.org/xc/config/cf/X11.tmpl X11-6.9.0/xc/config/cf/X11.tmpl
99 --- X11-6.9.0.org/xc/config/cf/X11.tmpl 2005-12-15 00:41:52.000000000 +0100
100 +++ X11-6.9.0/xc/config/cf/X11.tmpl 2005-12-22 10:32:25.830963000 +0100
102 #define BuildXF86RushLibrary (BuildXF86RushExt && !BuildServersOnly)
104 #ifndef BuildDPSLibraries
105 -#define BuildDPSLibraries NO
106 +#define BuildDPSLibraries YES
108 #ifndef BuildDPSLibrary
109 #define BuildDPSLibrary BuildDPSLibraries
114 -#define BuildXterm NO
115 +#define BuildXterm YES
122 #ifndef InstallHardcopyDocs
123 -#define InstallHardcopyDocs YES
124 +#define InstallHardcopyDocs NO
127 #ifndef InstallMiscManPages
128 @@ -1395,8 +1395,12 @@
129 # define UsbMouseSupport NO
132 +#ifndef EtcX11Directory
133 +#define EtcX11Directory /etc/X11
136 #ifndef DefaultFSConfigFile
137 -#define DefaultFSConfigFile $(LIBDIR)/fs/config
138 +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
142 @@ -1483,7 +1487,7 @@
143 #define ConfigDir $(LIBDIR)/config
146 -#define DocDir $(LIBDIR)/doc
147 +#define DocDir $(LIBDIR)/share/doc
150 #define DocHtmlDir $(DOCDIR)/html
151 @@ -1495,34 +1499,34 @@
152 #define DocPdfDir $(DOCDIR)/PDF
155 -#define FontDir $(LIBDIR)/fonts
156 +#define FontDir /usr/share/fonts
159 -#define FontEncDir $(LIBDIR)/fonts/encodings
160 +#define FontEncDir /usr/share/fonts/encodings
163 -#define AdmDir /usr/adm
164 +#define AdmDir /var/log
167 -#define XinitDir $(LIBDIR)/xinit
168 +#define XinitDir $(ETCX11DIR)/xinit
171 -#define XdmDir $(LIBDIR)/xdm
172 +#define XdmDir $(ETCX11DIR)/xdm
175 #define XdmVarDir $(VARLIBDIR)/xdm
178 -#define XdmAuthDir $(LIBDIR)/xdm
179 +#define XdmAuthDir $(ETCX11DIR)/xdm
181 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
182 #define XdmConfigurationSubdirectory config
185 -#define TwmDir $(LIBDIR)/twm
186 +#define TwmDir $(ETCX11DIR)/twm
189 -#define XsmDir $(LIBDIR)/xsm
190 +#define XsmDir $(ETCX11DIR)/xsm
193 #define NlsDir $(LIBDIR)/nls
194 @@ -1531,23 +1535,20 @@
195 #define XLocaleDir $(LIBDIR)/locale
198 -#define LbxproxyDir $(LIBDIR)/lbxproxy
199 +#define LbxproxyDir $(ETCX11DIR)/lbxproxy
201 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
202 #define LbxproxyConfigSubdir config
204 #ifndef ProxyManagerDir
205 -#define ProxyManagerDir $(LIBDIR)/proxymngr
206 +#define ProxyManagerDir $(ETCX11DIR)/proxymngr
208 #ifndef ServerConfigDir
209 -#define ServerConfigDir $(LIBDIR)/xserver
210 +#define ServerConfigDir $(ETCX11DIR)/xserver
213 #define XPrintDir ServerConfigDir
215 -#ifndef EtcX11Directory
216 -#define EtcX11Directory /etc/X11
218 #ifndef InstallSecurityConfig
219 #define InstallSecurityConfig YES /* Install sample security policy */
221 @@ -1579,10 +1580,10 @@
222 #define OsNameDefines /* as nothing */
224 #ifndef DefaultUserPath /* for xdm */
225 -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
226 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
228 #ifndef DefaultSystemPath /* for xdm */
229 -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
230 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
232 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
233 #define DefaultSystemShell BourneShell
234 @@ -1719,7 +1720,7 @@
236 HTMLINDEXCMD = HtmlIndexCmd
238 - DOCUTILSRC = $(XTOP)/doc/util
239 + DOCUTILSRC = $(XTOP)/share/doc/util
240 CLIENTSRC = $(TOP)/clients
241 DEMOSRC = $(TOP)/demos
242 XDOCMACROS = $(DOCUTILSRC)/macros.t
243 @@ -1733,7 +1734,7 @@
244 SERVERSRC = $(XTOP)/programs/Xserver
245 CONTRIBSRC = ContribDir
246 UNSUPPORTEDSRC = UnsupportedDir
247 - DOCSRC = $(XTOP)/doc
248 + DOCSRC = $(XTOP)/share/doc
249 RGBSRC = $(XTOP)/programs/rgb
250 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
251 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
252 diff -ur X11-6.9.0.org/xc/config/cf/xorg.cf X11-6.9.0/xc/config/cf/xorg.cf
253 --- X11-6.9.0.org/xc/config/cf/xorg.cf 2005-10-03 18:08:44.000000000 +0200
254 +++ X11-6.9.0/xc/config/cf/xorg.cf 2005-12-22 10:32:59.590963000 +0100
256 #define XConfigFile xorg.conf
259 -#define XConfigDir $(LIBDIR)
260 +#define XConfigDir $(ETCX11DIR)
263 #define XLogFile Xorg
265 neomagic i740 tdfx savage \
266 cirrus vmware tseng trident chips apm \
267 GlideDriver i128 i386Drivers \
268 - ati DevelDrivers ark \
269 + ati DevelDrivers ark fbdev \
270 cyrix siliconmotion via \
272 dummy XF86OSCardDrivers XF86ExtraCardDrivers
273 diff -ur X11-6.9.0.org/xc/config/cf/xorgsite.def X11-6.9.0/xc/config/cf/xorgsite.def
274 --- X11-6.9.0.org/xc/config/cf/xorgsite.def 2005-07-16 09:59:50.000000000 +0200
275 +++ X11-6.9.0/xc/config/cf/xorgsite.def 2005-12-22 10:33:48.940963000 +0100
278 * To not build/install the Cyrillic fonts, uncomment the following
280 -#define BuildCyrillicFonts NO
282 +#define BuildCyrillicFonts YES
285 * To not install the local font directory, uncomment the following
287 * Some Linux releases don't have a libtermcap. In this case you may need
288 * to uncomment the following
290 -#define TermcapLibrary -lncurses
292 +#define TermcapLibrary -lncurses
295 * Build a server that dynamically loads the modules by setting
297 * To forceably build static libraries in addition to shared libraries,
300 -#define ForceNormalLib YES
302 +#define ForceNormalLib YES
305 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
306 diff -ur X11-6.9.0.org/xc/config/imake/imake.c X11-6.9.0/xc/config/imake/imake.c
307 --- X11-6.9.0.org/xc/config/imake/imake.c 2005-11-08 07:33:24.000000000 +0100
308 +++ X11-6.9.0/xc/config/imake/imake.c 2005-12-22 10:34:57.200963000 +0100
309 @@ -1061,6 +1061,7 @@
310 static char* suse = "/etc/SuSE-release";
311 static char* redhat = "/etc/redhat-release";
312 static char* debian = "/etc/debian_version";
313 + static char* pld = "/etc/pld-release";
315 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
316 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
317 @@ -1075,6 +1076,7 @@
318 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
319 fprintf (inFile, "%s\n", "#define LinuxWare 11");
320 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
321 + fprintf (inFile, "%s\n", "#define LinuxPLD 13");
324 if (CrossCompiling) {
325 @@ -1101,6 +1103,12 @@
326 * at the content of /etc/debian_version */
329 + if (lstat (pld, &sb) == 0) {
330 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
331 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
335 /* what's the definitive way to tell what any particular distribution is? */
337 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
338 diff -ur X11-6.9.0.org/xc/Makefile X11-6.9.0/xc/Makefile
339 --- X11-6.9.0.org/xc/Makefile 2005-12-15 00:41:52.000000000 +0100
340 +++ X11-6.9.0/xc/Makefile 2005-12-22 10:39:28.160963000 +0100
342 # or add "MAKE = make" to this file.
344 RELEASE = "Release 6.9"
350 diff -ur X11-6.9.0.org/xc/programs/xdm/config/Xres.cpp X11-6.9.0/xc/programs/xdm/config/Xres.cpp
351 --- X11-6.9.0.org/xc/programs/xdm/config/Xres.cpp 2004-04-23 21:54:43.000000000 +0200
352 +++ X11-6.9.0/xc/programs/xdm/config/Xres.cpp 2005-12-22 10:35:32.500963000 +0100
358 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
360 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
362 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
363 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
365 xlogin*useShape: true
366 xlogin*logoPadding: 10
367 diff -ur X11-6.9.0.org/xc/programs/xdm/resource.c X11-6.9.0/xc/programs/xdm/resource.c
368 --- X11-6.9.0.org/xc/programs/xdm/resource.c 2005-11-08 07:33:31.000000000 +0100
369 +++ X11-6.9.0/xc/programs/xdm/resource.c 2005-12-22 10:36:59.580963000 +0100
373 #ifndef DEF_SERVER_LINE
374 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
375 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
378 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
379 +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
382 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
383 +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
385 #ifndef DEF_USER_PATH
386 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
387 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
389 #ifndef DEF_SYSTEM_PATH
390 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
391 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
393 #ifndef DEF_SYSTEM_SHELL
394 #define DEF_SYSTEM_SHELL "/bin/sh"
396 #ifndef DEF_FAILSAFE_CLIENT
397 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
398 +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
400 #ifndef DEF_XDM_CONFIG
401 -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
402 +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
405 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
406 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
408 #ifndef DEF_AUTH_NAME
414 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
415 +#define DEF_AUTH_DIR "/etc/X11/xdm"
417 #ifndef DEF_USER_AUTH_DIR
418 #define DEF_USER_AUTH_DIR "/tmp"
419 diff -ur X11-6.9.0.org/xc/programs/xinit/Imakefile X11-6.9.0/xc/programs/xinit/Imakefile
420 --- X11-6.9.0.org/xc/programs/xinit/Imakefile 2005-11-15 05:03:10.000000000 +0100
421 +++ X11-6.9.0/xc/programs/xinit/Imakefile 2005-12-22 10:37:39.740963000 +0100
424 MakeScriptFromCpp(xinitrc, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DSHELL_CMD=$(SHELL_CMD) -DLIBDIR=$(LIBDIR))
426 -MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) $(COOKIEDEFS) -DSHELL_CMD=$(SHELL_CMD) -DLIBDIR=$(LIBDIR))
427 +MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) $(COOKIEDEFS) -DSHELL_CMD=$(SHELL_CMD) -DBINDIR=$(BINDIR) -DLIBDIR=$(LIBDIR))
429 #if defined(SCOArchitecture) || defined(USLArchitecture)
430 ARCHMANDEFS=-D__SCOMAN__
433 InstallManPage(startx,$(MANDIR))
435 -#if InstallXinitConfig
436 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
438 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
440 +XCOMM Red Hat gets this from a different package
441 +XCOMM #if InstallXinitConfig
442 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
444 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
447 LinkConfDirectory(xinit,.,xinit,.)
449 diff -ur X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile X11-6.9.0/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
450 --- X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2005-08-23 03:14:35.000000000 +0200
451 +++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2005-12-22 10:39:11.440963000 +0100
455 CURSESLIB = NCursesLibName
456 -CURSESDEFINES = -DHAS_NCURSES
457 +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
460 XF86CONFIGFILE = XConfigFile
461 diff -ur X11-6.9.0.org/xc/programs/xterm/Imakefile X11-6.9.0/xc/programs/xterm/Imakefile
462 --- X11-6.9.0.org/xc/programs/xterm/Imakefile 2005-12-15 00:28:27.000000000 +0100
463 +++ X11-6.9.0/xc/programs/xterm/Imakefile 2005-12-22 10:38:51.510963000 +0100
468 +#if InstallXtermSetUID
469 +#undef InstallXtermSetUID
472 #ifndef SpecialCObjectRule
473 #define SpecialCObjectRule(module,ignore,defines) \
474 module.o: ; $(CC) -c defines $(CFLAGS) module.c
476 PUCCPTYDDEF = -DPUCC_PTYD /* does not need to be setuid */
481 #if defined(NetBSDArchitecture) || \
482 defined(OpenBSDArchitecture) || \
484 XKB_DEFINES = XkbClientDefines
485 PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
486 DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF)
487 - INCLUDES = -I. $(XRFINCLUDES)
488 + INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES)
490 #ifdef OS2Architecture