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
104 #ifndef InstallHardcopyDocs
105 -#define InstallHardcopyDocs YES
106 +#define InstallHardcopyDocs NO
109 #ifndef InstallMiscManPages
110 @@ -1395,8 +1395,12 @@
111 # define UsbMouseSupport NO
114 +#ifndef EtcX11Directory
115 +#define EtcX11Directory /etc/X11
118 #ifndef DefaultFSConfigFile
119 -#define DefaultFSConfigFile $(LIBDIR)/fs/config
120 +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
124 @@ -1483,7 +1487,7 @@
125 #define ConfigDir $(LIBDIR)/config
128 -#define DocDir $(LIBDIR)/doc
129 +#define DocDir $(LIBDIR)/share/doc
132 #define DocHtmlDir $(DOCDIR)/html
133 @@ -1495,34 +1499,34 @@
134 #define DocPdfDir $(DOCDIR)/PDF
137 -#define FontDir $(LIBDIR)/fonts
138 +#define FontDir /usr/share/fonts
141 #define FontEncDir $(LIBDIR)/fonts/encodings
144 -#define AdmDir /usr/adm
145 +#define AdmDir /var/log
148 -#define XinitDir $(LIBDIR)/xinit
149 +#define XinitDir $(ETCX11DIR)/xinit
152 -#define XdmDir $(LIBDIR)/xdm
153 +#define XdmDir $(ETCX11DIR)/xdm
156 #define XdmVarDir $(VARLIBDIR)/xdm
159 -#define XdmAuthDir $(LIBDIR)/xdm
160 +#define XdmAuthDir $(ETCX11DIR)/xdm
162 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
163 #define XdmConfigurationSubdirectory config
166 -#define TwmDir $(LIBDIR)/twm
167 +#define TwmDir $(ETCX11DIR)/twm
170 -#define XsmDir $(LIBDIR)/xsm
171 +#define XsmDir $(ETCX11DIR)/xsm
174 #define NlsDir $(LIBDIR)/nls
175 @@ -1531,23 +1535,20 @@
176 #define XLocaleDir $(LIBDIR)/locale
179 -#define LbxproxyDir $(LIBDIR)/lbxproxy
180 +#define LbxproxyDir $(ETCX11DIR)/lbxproxy
182 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
183 #define LbxproxyConfigSubdir config
185 #ifndef ProxyManagerDir
186 -#define ProxyManagerDir $(LIBDIR)/proxymngr
187 +#define ProxyManagerDir $(ETCX11DIR)/proxymngr
189 #ifndef ServerConfigDir
190 -#define ServerConfigDir $(LIBDIR)/xserver
191 +#define ServerConfigDir $(ETCX11DIR)/xserver
194 #define XPrintDir ServerConfigDir
196 -#ifndef EtcX11Directory
197 -#define EtcX11Directory /etc/X11
199 #ifndef InstallSecurityConfig
200 #define InstallSecurityConfig YES /* Install sample security policy */
202 @@ -1579,10 +1580,10 @@
203 #define OsNameDefines /* as nothing */
205 #ifndef DefaultUserPath /* for xdm */
206 -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
207 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
209 #ifndef DefaultSystemPath /* for xdm */
210 -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
211 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
213 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
214 #define DefaultSystemShell BourneShell
215 @@ -1719,7 +1720,7 @@
217 HTMLINDEXCMD = HtmlIndexCmd
219 - DOCUTILSRC = $(XTOP)/doc/util
220 + DOCUTILSRC = $(XTOP)/share/doc/util
221 CLIENTSRC = $(TOP)/clients
222 DEMOSRC = $(TOP)/demos
223 XDOCMACROS = $(DOCUTILSRC)/macros.t
224 @@ -1733,7 +1734,7 @@
225 SERVERSRC = $(XTOP)/programs/Xserver
226 CONTRIBSRC = ContribDir
227 UNSUPPORTEDSRC = UnsupportedDir
228 - DOCSRC = $(XTOP)/doc
229 + DOCSRC = $(XTOP)/share/doc
230 RGBSRC = $(XTOP)/programs/rgb
231 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
232 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
233 diff -ur X11-6.9.0.org/xc/config/cf/xorg.cf X11-6.9.0/xc/config/cf/xorg.cf
234 --- X11-6.9.0.org/xc/config/cf/xorg.cf 2005-10-03 18:08:44.000000000 +0200
235 +++ X11-6.9.0/xc/config/cf/xorg.cf 2005-12-22 10:32:59.590963000 +0100
237 #define XConfigFile xorg.conf
240 -#define XConfigDir $(LIBDIR)
241 +#define XConfigDir $(ETCX11DIR)
244 #define XLogFile Xorg
246 neomagic i740 tdfx savage \
247 cirrus vmware tseng trident chips apm \
248 GlideDriver i128 i386Drivers \
249 - ati DevelDrivers ark \
250 + ati DevelDrivers ark fbdev \
251 cyrix siliconmotion via \
253 dummy XF86OSCardDrivers XF86ExtraCardDrivers
254 diff -ur X11-6.9.0.org/xc/config/cf/xorgsite.def X11-6.9.0/xc/config/cf/xorgsite.def
255 --- X11-6.9.0.org/xc/config/cf/xorgsite.def 2005-07-16 09:59:50.000000000 +0200
256 +++ X11-6.9.0/xc/config/cf/xorgsite.def 2005-12-22 10:33:48.940963000 +0100
259 * To not build/install the Cyrillic fonts, uncomment the following
261 -#define BuildCyrillicFonts NO
263 +#define BuildCyrillicFonts YES
266 * To not install the local font directory, uncomment the following
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 -ur X11-6.9.0.org/xc/config/imake/imake.c X11-6.9.0/xc/config/imake/imake.c
288 --- X11-6.9.0.org/xc/config/imake/imake.c 2005-11-08 07:33:24.000000000 +0100
289 +++ X11-6.9.0/xc/config/imake/imake.c 2005-12-22 10:34:57.200963000 +0100
290 @@ -1061,6 +1061,7 @@
291 static char* suse = "/etc/SuSE-release";
292 static char* redhat = "/etc/redhat-release";
293 static char* debian = "/etc/debian_version";
294 + static char* pld = "/etc/pld-release";
296 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
297 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
298 @@ -1075,6 +1076,7 @@
299 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
300 fprintf (inFile, "%s\n", "#define LinuxWare 11");
301 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
302 + fprintf (inFile, "%s\n", "#define LinuxPLD 13");
305 if (CrossCompiling) {
306 @@ -1101,6 +1103,12 @@
307 * at the content of /etc/debian_version */
310 + if (lstat (pld, &sb) == 0) {
311 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
312 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
316 /* what's the definitive way to tell what any particular distribution is? */
318 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
319 diff -ur X11-6.9.0.org/xc/Makefile X11-6.9.0/xc/Makefile
320 --- X11-6.9.0.org/xc/Makefile 2005-12-15 00:41:52.000000000 +0100
321 +++ X11-6.9.0/xc/Makefile 2005-12-22 10:39:28.160963000 +0100
323 # or add "MAKE = make" to this file.
325 RELEASE = "Release 6.9"
331 diff -ur X11-6.9.0.org/xc/programs/xdm/config/Xres.cpp X11-6.9.0/xc/programs/xdm/config/Xres.cpp
332 --- X11-6.9.0.org/xc/programs/xdm/config/Xres.cpp 2004-04-23 21:54:43.000000000 +0200
333 +++ X11-6.9.0/xc/programs/xdm/config/Xres.cpp 2005-12-22 10:35:32.500963000 +0100
339 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
341 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
343 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
344 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
346 xlogin*useShape: true
347 xlogin*logoPadding: 10
348 diff -ur X11-6.9.0.org/xc/programs/xdm/resource.c X11-6.9.0/xc/programs/xdm/resource.c
349 --- X11-6.9.0.org/xc/programs/xdm/resource.c 2005-11-08 07:33:31.000000000 +0100
350 +++ X11-6.9.0/xc/programs/xdm/resource.c 2005-12-22 10:36:59.580963000 +0100
354 #ifndef DEF_SERVER_LINE
355 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
356 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
359 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
360 +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
363 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
364 +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
366 #ifndef DEF_USER_PATH
367 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
368 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
370 #ifndef DEF_SYSTEM_PATH
371 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
372 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
374 #ifndef DEF_SYSTEM_SHELL
375 #define DEF_SYSTEM_SHELL "/bin/sh"
377 #ifndef DEF_FAILSAFE_CLIENT
378 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
379 +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
381 #ifndef DEF_XDM_CONFIG
382 -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
383 +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
386 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
387 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
389 #ifndef DEF_AUTH_NAME
395 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
396 +#define DEF_AUTH_DIR "/etc/X11/xdm"
398 #ifndef DEF_USER_AUTH_DIR
399 #define DEF_USER_AUTH_DIR "/tmp"
400 diff -ur X11-6.9.0.org/xc/programs/xinit/Imakefile X11-6.9.0/xc/programs/xinit/Imakefile
401 --- X11-6.9.0.org/xc/programs/xinit/Imakefile 2005-11-15 05:03:10.000000000 +0100
402 +++ X11-6.9.0/xc/programs/xinit/Imakefile 2005-12-22 10:37:39.740963000 +0100
405 InstallManPage(startx,$(MANDIR))
407 -#if InstallXinitConfig
408 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
410 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
412 +XCOMM Red Hat gets this from a different package
413 +XCOMM #if InstallXinitConfig
414 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
416 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
419 LinkConfDirectory(xinit,.,xinit,.)
421 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
422 --- X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2005-08-23 03:14:35.000000000 +0200
423 +++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2005-12-22 10:39:11.440963000 +0100
427 CURSESLIB = NCursesLibName
428 -CURSESDEFINES = -DHAS_NCURSES
429 +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
432 XF86CONFIGFILE = XConfigFile
433 diff -ur X11-6.9.0.org/xc/programs/xterm/Imakefile X11-6.9.0/xc/programs/xterm/Imakefile
434 --- X11-6.9.0.org/xc/programs/xterm/Imakefile 2005-12-15 00:28:27.000000000 +0100
435 +++ X11-6.9.0/xc/programs/xterm/Imakefile 2005-12-22 10:38:51.510963000 +0100
440 +#if InstallXtermSetUID
441 +#undef InstallXtermSetUID
444 #ifndef SpecialCObjectRule
445 #define SpecialCObjectRule(module,ignore,defines) \
446 module.o: ; $(CC) -c defines $(CFLAGS) module.c
448 PUCCPTYDDEF = -DPUCC_PTYD /* does not need to be setuid */
453 #if defined(NetBSDArchitecture) || \
454 defined(OpenBSDArchitecture) || \
456 XKB_DEFINES = XkbClientDefines
457 PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
458 DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF)
459 - INCLUDES = -I. $(XRFINCLUDES)
460 + INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES)
462 #ifdef OS2Architecture