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
162 -#define AdmDir /usr/adm
163 +#define AdmDir /var/log
166 -#define XinitDir $(LIBDIR)/xinit
167 +#define XinitDir $(ETCX11DIR)/xinit
170 -#define XdmDir $(LIBDIR)/xdm
171 +#define XdmDir $(ETCX11DIR)/xdm
174 #define XdmVarDir $(VARLIBDIR)/xdm
177 -#define XdmAuthDir $(LIBDIR)/xdm
178 +#define XdmAuthDir $(ETCX11DIR)/xdm
180 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
181 #define XdmConfigurationSubdirectory config
184 -#define TwmDir $(LIBDIR)/twm
185 +#define TwmDir $(ETCX11DIR)/twm
188 -#define XsmDir $(LIBDIR)/xsm
189 +#define XsmDir $(ETCX11DIR)/xsm
192 #define NlsDir $(LIBDIR)/nls
193 @@ -1531,23 +1535,20 @@
194 #define XLocaleDir $(LIBDIR)/locale
197 -#define LbxproxyDir $(LIBDIR)/lbxproxy
198 +#define LbxproxyDir $(ETCX11DIR)/lbxproxy
200 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
201 #define LbxproxyConfigSubdir config
203 #ifndef ProxyManagerDir
204 -#define ProxyManagerDir $(LIBDIR)/proxymngr
205 +#define ProxyManagerDir $(ETCX11DIR)/proxymngr
207 #ifndef ServerConfigDir
208 -#define ServerConfigDir $(LIBDIR)/xserver
209 +#define ServerConfigDir $(ETCX11DIR)/xserver
212 #define XPrintDir ServerConfigDir
214 -#ifndef EtcX11Directory
215 -#define EtcX11Directory /etc/X11
217 #ifndef InstallSecurityConfig
218 #define InstallSecurityConfig YES /* Install sample security policy */
220 @@ -1579,10 +1580,10 @@
221 #define OsNameDefines /* as nothing */
223 #ifndef DefaultUserPath /* for xdm */
224 -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
225 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
227 #ifndef DefaultSystemPath /* for xdm */
228 -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
229 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
231 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
232 #define DefaultSystemShell BourneShell
233 @@ -1719,7 +1720,7 @@
235 HTMLINDEXCMD = HtmlIndexCmd
237 - DOCUTILSRC = $(XTOP)/doc/util
238 + DOCUTILSRC = $(XTOP)/share/doc/util
239 CLIENTSRC = $(TOP)/clients
240 DEMOSRC = $(TOP)/demos
241 XDOCMACROS = $(DOCUTILSRC)/macros.t
242 @@ -1733,7 +1734,7 @@
243 SERVERSRC = $(XTOP)/programs/Xserver
244 CONTRIBSRC = ContribDir
245 UNSUPPORTEDSRC = UnsupportedDir
246 - DOCSRC = $(XTOP)/doc
247 + DOCSRC = $(XTOP)/share/doc
248 RGBSRC = $(XTOP)/programs/rgb
249 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
250 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
251 diff -ur X11-6.9.0.org/xc/config/cf/xorg.cf X11-6.9.0/xc/config/cf/xorg.cf
252 --- X11-6.9.0.org/xc/config/cf/xorg.cf 2005-10-03 18:08:44.000000000 +0200
253 +++ X11-6.9.0/xc/config/cf/xorg.cf 2005-12-22 10:32:59.590963000 +0100
255 #define XConfigFile xorg.conf
258 -#define XConfigDir $(LIBDIR)
259 +#define XConfigDir $(ETCX11DIR)
262 #define XLogFile Xorg
264 neomagic i740 tdfx savage \
265 cirrus vmware tseng trident chips apm \
266 GlideDriver i128 i386Drivers \
267 - ati DevelDrivers ark \
268 + ati DevelDrivers ark fbdev \
269 cyrix siliconmotion via \
271 dummy XF86OSCardDrivers XF86ExtraCardDrivers
273 /* SiS is 64-bit unclean as of this writing. */
274 # define i386DRIDrivers /**/
276 -# define DriDrivers i386DRIDrivers mga r128 radeon r200 tdfx
277 +# define DriDrivers gamma i386DRIDrivers mga r128 radeon r200 tdfx
279 #endif /* i386Architecture || ia64Architecture */
283 /* SiS is 64-bit unclean as of this writing. */
285 -# define DriDrivers i915 mga r128 radeon r200 tdfx
286 +# define DriDrivers i915 gamma mga r128 radeon r200 tdfx
288 #endif /*AMD64Arcitecture*/
291 * SiS is 64-bit unclean as of this writing.
294 -# define DriDrivers tdfx mga r128 radeon r200
295 +# define DriDrivers gamma tdfx mga r128 radeon r200
297 #endif /* AlphaArchitecture */
301 /* The tdfx driver needs Glide, which is not available for PPC. */
303 -# define DriDrivers mga r128 radeon r200
304 +# define DriDrivers gamma mga r128 radeon r200
306 #endif /* PpcArchitecture || Mc68020Architecture */
309 XF86OSCardDrivers XF86ExtraCardDrivers
312 -# define DriDrivers mga r128 radeon r200
313 +# define DriDrivers gamma mga r128 radeon r200
319 # define TdfxDriDriver /**/
321 -# define DriDrivers r128
322 +# define DriDrivers gamma r128
324 #endif /* Ppc64Architecture */
326 diff -ur X11-6.9.0.org/xc/config/cf/xorgsite.def X11-6.9.0/xc/config/cf/xorgsite.def
327 --- X11-6.9.0.org/xc/config/cf/xorgsite.def 2005-07-16 09:59:50.000000000 +0200
328 +++ X11-6.9.0/xc/config/cf/xorgsite.def 2005-12-22 10:33:48.940963000 +0100
331 * To not build/install the Cyrillic fonts, uncomment the following
333 -#define BuildCyrillicFonts NO
335 +#define BuildCyrillicFonts YES
338 * To not install the local font directory, uncomment the following
340 * Some Linux releases don't have a libtermcap. In this case you may need
341 * to uncomment the following
343 -#define TermcapLibrary -lncurses
345 +#define TermcapLibrary -lncurses
348 * Build a server that dynamically loads the modules by setting
350 * To forceably build static libraries in addition to shared libraries,
353 -#define ForceNormalLib YES
355 +#define ForceNormalLib YES
358 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
359 diff -ur X11-6.9.0.org/xc/config/imake/imake.c X11-6.9.0/xc/config/imake/imake.c
360 --- X11-6.9.0.org/xc/config/imake/imake.c 2005-11-08 07:33:24.000000000 +0100
361 +++ X11-6.9.0/xc/config/imake/imake.c 2005-12-22 10:34:57.200963000 +0100
362 @@ -1061,6 +1061,7 @@
363 static char* suse = "/etc/SuSE-release";
364 static char* redhat = "/etc/redhat-release";
365 static char* debian = "/etc/debian_version";
366 + static char* pld = "/etc/pld-release";
368 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
369 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
370 @@ -1075,6 +1076,7 @@
371 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
372 fprintf (inFile, "%s\n", "#define LinuxWare 11");
373 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
374 + fprintf (inFile, "%s\n", "#define LinuxPLD 13");
377 if (CrossCompiling) {
378 @@ -1101,6 +1103,12 @@
379 * at the content of /etc/debian_version */
382 + if (lstat (pld, &sb) == 0) {
383 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
384 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
388 /* what's the definitive way to tell what any particular distribution is? */
390 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
391 diff -ur X11-6.9.0.org/xc/Makefile X11-6.9.0/xc/Makefile
392 --- X11-6.9.0.org/xc/Makefile 2005-12-15 00:41:52.000000000 +0100
393 +++ X11-6.9.0/xc/Makefile 2005-12-22 10:39:28.160963000 +0100
395 # or add "MAKE = make" to this file.
397 RELEASE = "Release 6.9"
403 diff -ur X11-6.9.0.org/xc/programs/xdm/config/Xres.cpp X11-6.9.0/xc/programs/xdm/config/Xres.cpp
404 --- X11-6.9.0.org/xc/programs/xdm/config/Xres.cpp 2004-04-23 21:54:43.000000000 +0200
405 +++ X11-6.9.0/xc/programs/xdm/config/Xres.cpp 2005-12-22 10:35:32.500963000 +0100
411 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
413 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
415 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
416 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
418 xlogin*useShape: true
419 xlogin*logoPadding: 10
420 diff -ur X11-6.9.0.org/xc/programs/xdm/resource.c X11-6.9.0/xc/programs/xdm/resource.c
421 --- X11-6.9.0.org/xc/programs/xdm/resource.c 2005-11-08 07:33:31.000000000 +0100
422 +++ X11-6.9.0/xc/programs/xdm/resource.c 2005-12-22 10:36:59.580963000 +0100
426 #ifndef DEF_SERVER_LINE
427 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
428 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
431 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
432 +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
435 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
436 +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
438 #ifndef DEF_USER_PATH
439 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
440 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
442 #ifndef DEF_SYSTEM_PATH
443 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
444 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
446 #ifndef DEF_SYSTEM_SHELL
447 #define DEF_SYSTEM_SHELL "/bin/sh"
449 #ifndef DEF_FAILSAFE_CLIENT
450 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
451 +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
453 #ifndef DEF_XDM_CONFIG
454 -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
455 +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
458 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
459 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
461 #ifndef DEF_AUTH_NAME
467 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
468 +#define DEF_AUTH_DIR "/etc/X11/xdm"
470 #ifndef DEF_USER_AUTH_DIR
471 #define DEF_USER_AUTH_DIR "/tmp"
472 diff -ur X11-6.9.0.org/xc/programs/xinit/Imakefile X11-6.9.0/xc/programs/xinit/Imakefile
473 --- X11-6.9.0.org/xc/programs/xinit/Imakefile 2005-11-15 05:03:10.000000000 +0100
474 +++ X11-6.9.0/xc/programs/xinit/Imakefile 2005-12-22 10:37:39.740963000 +0100
477 InstallManPage(startx,$(MANDIR))
479 -#if InstallXinitConfig
480 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
482 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
484 +XCOMM Red Hat gets this from a different package
485 +XCOMM #if InstallXinitConfig
486 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
488 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
491 LinkConfDirectory(xinit,.,xinit,.)
493 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
494 --- X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2005-08-23 03:14:35.000000000 +0200
495 +++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2005-12-22 10:39:11.440963000 +0100
499 CURSESLIB = NCursesLibName
500 -CURSESDEFINES = -DHAS_NCURSES
501 +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
504 XF86CONFIGFILE = XConfigFile
505 diff -ur X11-6.9.0.org/xc/programs/xterm/Imakefile X11-6.9.0/xc/programs/xterm/Imakefile
506 --- X11-6.9.0.org/xc/programs/xterm/Imakefile 2005-12-15 00:28:27.000000000 +0100
507 +++ X11-6.9.0/xc/programs/xterm/Imakefile 2005-12-22 10:38:51.510963000 +0100
512 +#if InstallXtermSetUID
513 +#undef InstallXtermSetUID
516 #ifndef SpecialCObjectRule
517 #define SpecialCObjectRule(module,ignore,defines) \
518 module.o: ; $(CC) -c defines $(CFLAGS) module.c
520 PUCCPTYDDEF = -DPUCC_PTYD /* does not need to be setuid */
525 #if defined(NetBSDArchitecture) || \
526 defined(OpenBSDArchitecture) || \
528 XKB_DEFINES = XkbClientDefines
529 PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
530 DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF)
531 - INCLUDES = -I. $(XRFINCLUDES)
532 + INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES)
534 #ifdef OS2Architecture