1 diff -Nru xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
2 --- xc.orig/config/cf/Imake.cf 2003-12-19 05:40:33.000000000 +0100
3 +++ xc/config/cf/Imake.cf 2003-12-23 12:09:11.983243488 +0100
5 # define s390Architecture
9 +# define AlphaArchitecture
13 # define AlphaArchitecture
15 diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
16 --- xc.orig/config/cf/Imake.tmpl 2003-11-21 06:55:02.000000000 +0100
17 +++ xc/config/cf/Imake.tmpl 2003-12-23 12:09:11.992242120 +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 -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
49 --- xc.orig/config/cf/X11.tmpl 2003-12-19 05:41:17.000000000 +0100
50 +++ xc/config/cf/X11.tmpl 2003-12-23 12:09:12.042234520 +0100
51 @@ -1262,8 +1262,12 @@
52 # define UsbMouseSupport NO
55 +#ifndef EtcX11Directory
56 +#define EtcX11Directory /etc/X11
59 #ifndef DefaultFSConfigFile
60 -#define DefaultFSConfigFile $(LIBDIR)/fs/config
61 +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
64 /* X-TrueType settings */
66 #define ConfigDir $(LIBDIR)/config
69 -#define DocDir $(LIBDIR)/doc
70 +#define DocDir $(LIBDIR)/share/doc
73 #define DocHtmlDir $(DOCDIR)/html
74 @@ -1401,31 +1405,31 @@
75 #define DocPdfDir $(DOCDIR)/PDF
78 -#define FontDir $(LIBDIR)/fonts
79 +#define FontDir /usr/share/fonts
82 -#define AdmDir /usr/adm
83 +#define AdmDir /var/log
86 -#define XinitDir $(LIBDIR)/xinit
87 +#define XinitDir $(ETCX11DIR)/xinit
90 -#define XdmDir $(LIBDIR)/xdm
91 +#define XdmDir $(ETCX11DIR)/xdm
94 #define XdmVarDir $(VARLIBDIR)/xdm
97 -#define XdmAuthDir $(LIBDIR)/xdm
98 +#define XdmAuthDir $(ETCX11DIR)/xdm
100 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
101 #define XdmConfigurationSubdirectory config
104 -#define TwmDir $(LIBDIR)/twm
105 +#define TwmDir $(ETCX11DIR)/twm
108 -#define XsmDir $(LIBDIR)/xsm
109 +#define XsmDir $(ETCX11DIR)/xsm
112 #define NlsDir $(LIBDIR)/nls
113 @@ -1434,23 +1438,20 @@
114 #define XLocaleDir $(LIBDIR)/locale
117 -#define LbxproxyDir $(LIBDIR)/lbxproxy
118 +#define LbxproxyDir $(ETCX11DIR)/lbxproxy
120 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
121 #define LbxproxyConfigSubdir config
123 #ifndef ProxyManagerDir
124 -#define ProxyManagerDir $(LIBDIR)/proxymngr
125 +#define ProxyManagerDir $(ETCX11DIR)/proxymngr
127 #ifndef ServerConfigDir
128 -#define ServerConfigDir $(LIBDIR)/xserver
129 +#define ServerConfigDir $(ETCX11DIR)/xserver
132 #define XPrintDir ServerConfigDir
134 -#ifndef EtcX11Directory
135 -#define EtcX11Directory /etc/X11
137 #ifndef InstallSecurityConfig
138 #define InstallSecurityConfig YES /* Install sample security policy */
140 @@ -1482,10 +1483,10 @@
141 #define OsNameDefines /* as nothing */
143 #ifndef DefaultUserPath /* for xdm */
144 -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
145 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
147 #ifndef DefaultSystemPath /* for xdm */
148 -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
149 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
151 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
152 #define DefaultSystemShell BourneShell
153 @@ -1614,7 +1615,7 @@
155 HTMLINDEXCMD = HtmlIndexCmd
157 - DOCUTILSRC = $(XTOP)/doc/util
158 + DOCUTILSRC = $(XTOP)/share/doc/util
159 CLIENTSRC = $(TOP)/clients
160 DEMOSRC = $(TOP)/demos
161 XDOCMACROS = $(DOCUTILSRC)/macros.t
162 @@ -1628,7 +1629,7 @@
163 SERVERSRC = $(XTOP)/programs/Xserver
164 CONTRIBSRC = ContribDir
165 UNSUPPORTEDSRC = UnsupportedDir
166 - DOCSRC = $(XTOP)/doc
167 + DOCSRC = $(XTOP)/share/doc
168 RGBSRC = $(XTOP)/programs/rgb
169 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
170 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
171 diff -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
172 --- xc.orig/config/cf/linux.cf 2003-12-19 05:41:59.000000000 +0100
173 +++ xc/config/cf/linux.cf 2003-12-23 12:09:12.008239688 +0100
177 # if defined(i386Architecture)
178 -# define BuildLibGlxWithoutPIC YES
179 +# define BuildLibGlxWithoutPIC NO
185 #define HasVarRun YES
186 #ifndef VarDbDirectory
187 -# define VarDbDirectory $(VARDIR)/lib
188 +# define VarDbDirectory /var/lib
191 #ifndef XF86OSCardDrivers
192 diff -Nru xc.orig/config/cf/site.def xc/config/cf/site.def
193 --- xc.orig/config/cf/site.def 2002-02-27 01:51:12.000000000 +0100
194 +++ xc/config/cf/site.def 2003-12-23 12:09:12.014238776 +0100
195 @@ -119,10 +119,14 @@
196 #define HasSentinel YES
200 #undef DefaultUserPath
201 -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
203 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
204 +#undef DefaultSystemPath
205 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
209 +#define HasPamMisc YES
212 /* You do NOT need SetUID if you only run the server under xdm */
213 diff -urN xc.org/config/cf/xorgsite.def xc/config/cf/xorgsite.def
214 --- xc.org/config/cf/xorgsite.def 2004-04-02 23:47:10.000000000 +0200
215 +++ xc/config/cf/xorgsite.def 2004-04-19 01:01:24.744961760 +0200
218 * To not build/install the Cyrillic fonts, uncomment the following
220 -#define BuildCyrillicFonts NO
222 +#define BuildCyrillicFonts YES
225 * To not install the local font directory, uncomment the following
226 @@ -307,20 +308,20 @@
227 * HasGlide2 to YES and set the Glide2IncDir variable.
228 * HasGlide2 is per default NO.
230 -#define HasGlide2 YES
232 +#define HasGlide2 YES
235 * Set the path to your Glide include files.
237 -#define Glide2IncDir /usr/include/glide
239 +#define Glide2IncDir /usr/include/glide
244 -#define HasGlide3 YES
246 +#define HasGlide3 YES
249 * Set the path to your Glide 3 include files.
251 * Some Linux releases don't have a libtermcap. In this case you may need
252 * to uncomment the following
254 -#define TermcapLibrary -lncurses
256 +#define TermcapLibrary -lncurses
259 * Build a server that dynamically loads the modules by setting
261 * To forceably build static libraries in addition to shared libraries,
264 -#define ForceNormalLib YES
266 +#define ForceNormalLib YES
269 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
270 diff -Nru xc.orig/config/cf/xorg.cf xc/config/cf/xorg.cf
271 --- xc.orig/config/cf/xorg.cf 2003-11-21 06:55:07.000000000 +0100
272 +++ xc/config/cf/xorg.cf 2003-12-23 12:09:12.055232544 +0100
274 #define XConfigFile XF86Config
277 -#define XConfigDir $(LIBDIR)
278 +#define XConfigDir $(ETCX11DIR)
281 #define XLogFile XFree86
282 diff -Nru xc.orig/config/imake/imake.c xc/config/imake/imake.c
283 --- xc.orig/config/imake/imake.c 2003-04-10 13:00:03.000000000 +0200
284 +++ xc/config/imake/imake.c 2003-12-23 12:09:12.060231784 +0100
285 @@ -1057,6 +1057,7 @@
286 static char* suse = "/etc/SuSE-release";
287 static char* redhat = "/etc/redhat-release";
288 static char* debian = "/etc/debian_version";
289 + static char* pld = "/etc/pld-release";
291 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
292 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
293 @@ -1071,6 +1072,7 @@
294 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
295 fprintf (inFile, "%s\n", "#define LinuxWare 11");
296 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
297 + fprintf (inFile, "%s\n", "#define LinuxPLD 13");
300 if (CrossCompiling) {
301 @@ -1097,6 +1099,11 @@
302 * at the content of /etc/debian_version */
305 + if (lstat (pld, &sb) == 0) {
306 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
307 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
310 /* what's the definitive way to tell what any particular distribution is? */
312 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
313 diff -Nru xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
314 --- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-12-19 05:48:39.000000000 +0100
315 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-12-23 12:09:12.000000000 +0100
319 CURSESLIB = NCursesLibName
320 -CURSESDEFINES = -DHAS_NCURSES
321 +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
324 XF86CONFIGFILE = XConfigFile
325 diff -Nru xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
326 --- xc.orig/programs/xdm/config/Xres.cpp 2003-11-21 07:01:06.000000000 +0100
327 +++ xc/programs/xdm/config/Xres.cpp 2003-12-23 12:09:12.000000000 +0100
332 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
334 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
336 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
337 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
339 xlogin*useShape: true
340 xlogin*logoPadding: 10
341 diff -Nru xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
342 --- xc.orig/programs/xdm/resource.c 2003-09-25 13:06:32.000000000 +0200
343 +++ xc/programs/xdm/resource.c 2003-12-23 12:09:12.000000000 +0100
347 #ifndef DEF_SERVER_LINE
348 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
349 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
352 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
353 +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
356 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
357 +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
359 #ifndef DEF_USER_PATH
360 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
361 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
363 #ifndef DEF_SYSTEM_PATH
364 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
365 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
367 #ifndef DEF_SYSTEM_SHELL
368 #define DEF_SYSTEM_SHELL "/bin/sh"
370 #ifndef DEF_FAILSAFE_CLIENT
371 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
372 +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
374 #ifndef DEF_XDM_CONFIG
375 -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
376 +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
379 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
380 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
382 #ifndef DEF_AUTH_NAME
388 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
389 +#define DEF_AUTH_DIR "/etc/X11/xdm"
391 #ifndef DEF_USER_AUTH_DIR
392 #define DEF_USER_AUTH_DIR "/tmp"
393 diff -Nru xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile
394 --- xc.orig/programs/xinit/Imakefile 2003-11-21 07:01:12.000000000 +0100
395 +++ xc/programs/xinit/Imakefile 2003-12-23 12:09:12.000000000 +0100
398 InstallManPage(startx,$(MANDIR))
400 -#if InstallXinitConfig
401 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
403 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
405 +XCOMM Red Hat gets this from a different package
406 +XCOMM #if InstallXinitConfig
407 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
409 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
412 LinkConfDirectory(xinit,.,xinit,.)
414 diff -Nru xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h
415 --- xc.orig/programs/xterm/xterm.h 2003-12-19 05:51:52.000000000 +0100
416 +++ xc/programs/xterm/xterm.h 2003-12-23 12:09:12.000000000 +0100
421 -#define DFT_TERMTYPE "xterm"
422 +#define DFT_TERMTYPE "xterm-color"
426 --- xc/programs/xterm/Imakefile.orig 2004-08-13 12:57:19.000000000 +0000
427 +++ xc/programs/xterm/Imakefile 2004-09-10 17:56:10.644328280 +0000
429 #define XkbClientLibs /**/
432 +#if InstallXtermSetUID
433 +#undef InstallXtermSetUID
436 #ifndef SpecialCObjectRule
437 #define SpecialCObjectRule(module,ignore,defines) \
438 module.o: ; $(CC) -c defines $(CFLAGS) module.c
445 #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
446 (defined(LinuxArchitecture) && \
447 (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
449 XKB_DEFINES = XkbClientDefines
450 PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
451 DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
452 - INCLUDES = -I. $(XRFINCLUDES)
453 + INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES)
455 #ifdef OS2Architecture