1 --- xc/Makefile 2006-06-11 00:28:00.305505872 +0200
2 +++ xc/Makefile-new 2006-06-11 00:31:06.181248464 +0200
4 # Luna users will need to either run make as "make MAKE=make"
5 # or add "MAKE = make" to this file.
12 --- xc/config/cf/Imake.cf.orig 2006-01-09 15:56:12.000000000 +0100
13 +++ xc/config/cf/Imake.cf 2006-06-11 00:28:00.321503440 +0200
15 # define s390Architecture
19 +# define AlphaArchitecture
23 # define AlphaArchitecture
25 --- xc/config/cf/Imake.tmpl.orig 2006-04-03 01:12:46.000000000 +0200
26 +++ xc/config/cf/Imake.tmpl 2006-06-11 00:28:00.323503136 +0200
29 #ifndef BuildHtmlManPages
31 -#define BuildHtmlManPages YES
32 +#define BuildHtmlManPages NO
34 #define BuildHtmlManPages NO
37 #define LintlibDir $(USRLIBDIR)/lint
39 #ifndef SystemManDirectory
41 #define SystemManDirectory /usr/share/man
43 -#define SystemManDirectory /usr/man
46 #ifndef ManDirectoryRoot
49 #define NoRConst NO /* YES if const for structs of funcs is bad */
52 -#define InstPgmFlags -s
56 #define InstBinFlags -m 0755
58 #define CppCmd /LibDirName/cpp
61 -#define RawCppCmd CppCmd -undef
62 +#define RawCppCmd CppCmd
64 #ifndef CppNoLineInfoOption
65 #define CppNoLineInfoOption /**/
66 --- xc/config/cf/X11.tmpl.orig 2006-04-18 17:57:25.000000000 +0200
67 +++ xc/config/cf/X11.tmpl 2006-06-11 00:28:00.327502528 +0200
68 @@ -1649,8 +1649,12 @@
69 # define UsbMouseSupport NO
72 +#ifndef EtcX11Directory
73 +#define EtcX11Directory /etc/X11
76 #ifndef DefaultFSConfigFile
77 -#define DefaultFSConfigFile $(LIBDIR)/fs/config
78 +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
81 /* X-TrueType settings */
83 #define ConfigDir $(LIBDIR)/config
86 -#define DocDir $(LIBDIR)/doc
87 +#define DocDir $(LIBDIR)/share/doc
90 #define DocHtmlDir $(DOCDIR)/html
91 @@ -1795,31 +1799,31 @@
92 #define DocPdfDir $(DOCDIR)/PDF
95 -#define FontDir $(LIBDIR)/fonts
96 +#define FontDir /usr/share/fonts
99 -#define AdmDir /usr/adm
100 +#define AdmDir /var/log
103 -#define XinitDir $(LIBDIR)/xinit
104 +#define XinitDir $(ETCX11DIR)/xinit
107 -#define XdmDir $(LIBDIR)/xdm
108 +#define XdmDir $(ETCX11DIR)/xdm
111 #define XdmVarDir $(VARLIBDIR)/xdm
114 -#define XdmAuthDir $(LIBDIR)/xdm
115 +#define XdmAuthDir $(ETCX11DIR)/xdm
117 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
118 #define XdmConfigurationSubdirectory config
121 -#define TwmDir $(LIBDIR)/twm
122 +#define TwmDir $(ETCX11DIR)/twm
125 -#define XsmDir $(LIBDIR)/xsm
126 +#define XsmDir $(ETCX11DIR)/xsm
129 #define NlsDir $(LIBDIR)/nls
130 @@ -1828,23 +1832,20 @@
131 #define XLocaleDir $(LIBDIR)/locale
134 -#define LbxproxyDir $(LIBDIR)/lbxproxy
135 +#define LbxproxyDir $(ETCX11DIR)/lbxproxy
137 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
138 #define LbxproxyConfigSubdir config
140 #ifndef ProxyManagerDir
141 -#define ProxyManagerDir $(LIBDIR)/proxymngr
142 +#define ProxyManagerDir $(ETCX11DIR)/proxymngr
144 #ifndef ServerConfigDir
145 -#define ServerConfigDir $(LIBDIR)/xserver
146 +#define ServerConfigDir $(ETCX11DIR)/xserver
149 #define XPrintDir ServerConfigDir
151 -#ifndef EtcX11Directory
152 -#define EtcX11Directory /etc/X11
154 #ifndef InstallSecurityConfig
155 #define InstallSecurityConfig YES /* Install sample security policy */
157 @@ -1876,10 +1877,10 @@
158 #define OsNameDefines /* as nothing */
160 #ifndef DefaultUserPath /* for xdm */
161 -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
162 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
164 #ifndef DefaultSystemPath /* for xdm */
165 -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
166 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
168 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
169 #define DefaultSystemShell BourneShell
170 @@ -2014,7 +2015,7 @@
172 HTMLINDEXCMD = HtmlIndexCmd
174 - DOCUTILSRC = $(XTOP)/doc/util
175 + DOCUTILSRC = $(XTOP)/share/doc/util
176 CLIENTSRC = $(TOP)/clients
177 DEMOSRC = $(TOP)/demos
178 XDOCMACROS = $(DOCUTILSRC)/macros.t
179 @@ -2028,7 +2029,7 @@
180 SERVERSRC = $(XTOP)/programs/Xserver
181 CONTRIBSRC = ContribDir
182 UNSUPPORTEDSRC = UnsupportedDir
183 - DOCSRC = $(XTOP)/doc
184 + DOCSRC = $(XTOP)/share/doc
185 RGBSRC = $(XTOP)/programs/rgb
186 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
187 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
188 --- xc/config/cf/linux.cf.orig 2006-04-03 01:12:46.000000000 +0200
189 +++ xc/config/cf/linux.cf 2006-06-11 00:28:00.329502224 +0200
193 # if defined(i386Architecture)
194 -# define BuildLibGlxWithoutPIC YES
195 +# define BuildLibGlxWithoutPIC NO
201 #define HasVarRun YES
202 #ifndef VarDbDirectory
203 -# define VarDbDirectory $(VARDIR)/lib
204 +# define VarDbDirectory /var/lib
207 #ifndef XF86OSCardDrivers
208 --- xc/config/cf/site.def.orig 2006-01-09 15:56:13.000000000 +0100
209 +++ xc/config/cf/site.def 2006-06-11 00:28:00.330502072 +0200
210 @@ -104,10 +104,15 @@
211 #define HasSentinel YES
215 #undef DefaultUserPath
216 -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
218 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
219 +#undef DefaultSystemPath
220 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
224 +#define HasPamMisc YES
225 +#define HasFontconfig YES
228 /* You do NOT need SetUID if you only run the server under xdm */
229 --- xc/config/cf/xf86site.def.orig 2006-04-08 20:33:00.000000000 +0200
230 +++ xc/config/cf/xf86site.def 2006-06-11 00:28:00.335501312 +0200
233 * To not build/install the Cyrillic fonts, uncomment the following
235 -#define BuildCyrillicFonts NO
237 +#define BuildCyrillicFonts YES
240 * To not install the local font directory, uncomment the following
241 @@ -304,27 +304,26 @@
242 * HasGlide2 to YES and set the Glide2IncDir variable.
243 * HasGlide2 is per default NO.
245 -#define HasGlide2 YES
247 +#define HasGlide2 YES
250 * Set the path to your Glide include files.
252 -#define Glide2IncDir /usr/include/glide
254 +#define Glide2IncDir /usr/include/glide
259 -#define HasGlide3 YES
261 +#define HasGlide3 YES
264 * Set the path to your Glide 3 include files.
266 -#define Glide3IncDir /usr/include/glide3
269 +#define Glide3IncDir /usr/include/glide3
274 * Some Linux releases don't have a libtermcap. In this case you may need
275 * to uncomment the following
277 -#define TermcapLibrary -lncurses
279 +#define TermcapLibrary -lncurses
282 * Build a server that dynamically loads the modules by setting
284 * To forceably build static libraries in addition to shared libraries,
287 -#define ForceNormalLib YES
289 +#define ForceNormalLib YES
292 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
293 --- xc/config/cf/xfree86.cf.orig 2006-04-26 02:28:16.000000000 +0200
294 +++ xc/config/cf/xfree86.cf 2006-06-11 00:28:00.337501008 +0200
296 #define XConfigFile XF86Config
299 -#define XConfigDir $(LIBDIR)
300 +#define XConfigDir $(ETCX11DIR)
303 #define XLogFile XFree86
306 # ifndef XF86CardDrivers
307 # define XF86CardDrivers mga glint nv s3 s3virge sis savage \
308 - trident chips tdfx fbdev ati \
309 + trident chips fbdev ati \
310 DevelDrivers newport \
311 XF86OSCardDrivers XF86ExtraCardDrivers
313 --- xc/config/imake/imake.c.orig 2006-01-09 15:56:14.000000000 +0100
314 +++ xc/config/imake/imake.c 2006-06-11 00:28:00.339500704 +0200
315 @@ -1056,6 +1056,7 @@
316 static char* suse = "/etc/SuSE-release";
317 static char* redhat = "/etc/redhat-release";
318 static char* debian = "/etc/debian_version";
319 + static char* pld = "/etc/pld-release";
321 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
322 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
323 @@ -1070,6 +1071,7 @@
324 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
325 fprintf (inFile, "%s\n", "#define LinuxWare 11");
326 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
327 + fprintf (inFile, "%s\n", "#define LinuxPLD 13");
330 if (CrossCompiling) {
331 @@ -1096,6 +1098,11 @@
332 * at the content of /etc/debian_version */
335 + if (lstat (pld, &sb) == 0) {
336 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
337 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
340 /* what's the definitive way to tell what any particular distribution is? */
342 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
343 --- xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig 2006-03-11 18:36:50.000000000 +0100
344 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2006-06-11 00:28:00.340500552 +0200
348 CURSESLIB = NCursesLibName
349 -CURSESDEFINES = -DHAS_NCURSES
350 +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
353 XF86CONFIGFILE = XConfigFile
354 --- xc/programs/xdm/config/Xres.cpp.orig 2006-01-09 16:01:06.000000000 +0100
355 +++ xc/programs/xdm/config/Xres.cpp 2006-06-11 00:28:00.341500400 +0200
361 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
363 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
365 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
366 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
368 xlogin*useShape: true
369 xlogin*logoPadding: 10
370 --- xc/programs/xdm/resource.c.orig 2006-01-09 16:01:04.000000000 +0100
371 +++ xc/programs/xdm/resource.c 2006-06-11 00:28:00.342500248 +0200
375 #ifndef DEF_SERVER_LINE
376 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
377 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
380 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
381 +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
384 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
385 +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
387 #ifndef DEF_USER_PATH
388 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
389 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
391 #ifndef DEF_SYSTEM_PATH
392 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
393 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
395 #ifndef DEF_SYSTEM_SHELL
396 #define DEF_SYSTEM_SHELL "/bin/sh"
398 #ifndef DEF_FAILSAFE_CLIENT
399 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
400 +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
402 #ifndef DEF_XDM_CONFIG
403 -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
404 +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
407 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
408 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
410 #ifndef DEF_AUTH_NAME
416 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
417 +#define DEF_AUTH_DIR "/etc/X11/xdm"
419 #ifndef DEF_USER_AUTH_DIR
420 #define DEF_USER_AUTH_DIR "/tmp"
421 --- xc/programs/xinit/Imakefile.orig 2006-03-06 17:06:23.000000000 +0100
422 +++ xc/programs/xinit/Imakefile 2006-06-11 00:28:00.342500248 +0200
425 InstallManPage(startx,$(MANDIR))
427 -#if InstallXinitConfig
428 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
430 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
432 +XCOMM Red Hat gets this from a different package
433 +XCOMM #if InstallXinitConfig
434 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
436 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
439 LinkConfDirectory(xinit,.,xinit,.)
441 --- xc/programs/xterm/Imakefile.orig 2006-04-10 02:34:36.000000000 +0200
442 +++ xc/programs/xterm/Imakefile 2006-06-11 00:48:09.508679048 +0200
447 +#if InstallXtermSetUID
448 +#undef InstallXtermSetUID
451 #ifndef SpecialCObjectRule
452 #define SpecialCObjectRule(module,ignore,defines) \
453 module.o: ; $(CC) -c defines $(CFLAGS) module.c
455 XKB_DEFINES = XkbClientDefines
456 PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
457 DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF)
458 - INCLUDES = -I. $(XRFINCLUDES)
459 + INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES)
461 #ifdef OS2Architecture