1 diff -Nur XFree86-4.0.2.org/xc/Makefile XFree86-4.0.2/xc/Makefile
2 --- XFree86-4.0.2.org/xc/Makefile Wed Mar 22 22:23:30 2000
3 +++ XFree86-4.0.2/xc/Makefile Wed Dec 20 13:41:02 2000
5 # or add "MAKE = make" to this file.
7 RELEASE = "Release 6.4"
17 diff -Nur XFree86-4.0.2.org/xc/config/cf/Imake.cf XFree86-4.0.2/xc/config/cf/Imake.cf
18 --- XFree86-4.0.2.org/xc/config/cf/Imake.cf Mon Nov 6 23:53:47 2000
19 +++ XFree86-4.0.2/xc/config/cf/Imake.cf Wed Dec 20 13:41:02 2000
21 # define s390Architecture
25 +# define AlphaArchitecture
29 # define AlphaArchitecture
31 diff -Nur XFree86-4.0.2.org/xc/config/cf/Imake.tmpl XFree86-4.0.2/xc/config/cf/Imake.tmpl
32 --- XFree86-4.0.2.org/xc/config/cf/Imake.tmpl Tue Dec 5 01:45:28 2000
33 +++ XFree86-4.0.2/xc/config/cf/Imake.tmpl Wed Dec 20 13:41:02 2000
36 #ifndef BuildHtmlManPages
38 -#define BuildHtmlManPages YES
39 +#define BuildHtmlManPages NO
41 #define BuildHtmlManPages NO
44 #define LintlibDir $(USRLIBDIR)/lint
46 #ifndef SystemManDirectory
48 #define SystemManDirectory /usr/share/man
50 -#define SystemManDirectory /usr/man
53 #ifndef ManDirectoryRoot
56 #define NoRConst NO /* YES if const for structs of funcs is bad */
59 -#define InstPgmFlags -s
63 #define InstBinFlags -m 0755
65 #define CppCmd /lib/cpp
68 -#define RawCppCmd CppCmd -undef
69 +#define RawCppCmd CppCmd
71 #ifndef CppNoLineInfoOption
72 #define CppNoLineInfoOption /**/
73 diff -Nur XFree86-4.0.2.org/xc/config/cf/X11.tmpl XFree86-4.0.2/xc/config/cf/X11.tmpl
74 --- XFree86-4.0.2.org/xc/config/cf/X11.tmpl Sat Dec 16 07:39:25 2000
75 +++ XFree86-4.0.2/xc/config/cf/X11.tmpl Wed Dec 20 13:41:02 2000
80 +#ifndef EtcX11Directory
81 +#define EtcX11Directory /etc/X11
84 #ifndef DefaultFSConfigFile
85 -#define DefaultFSConfigFile $(LIBDIR)/fs/config
86 +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
89 /* X-TrueType settings */
91 #define ConfigDir $(LIBDIR)/config
94 -#define DocDir $(LIBDIR)/doc
95 +#define DocDir $(LIBDIR)/share/doc
98 #define DocHtmlDir $(DOCDIR)/html
99 @@ -1011,31 +1015,31 @@
100 #define DocPsDir $(DOCDIR)/PostScript
103 -#define FontDir $(LIBDIR)/fonts
104 +#define FontDir /usr/share/fonts
107 -#define AdmDir /usr/adm
108 +#define AdmDir /var/log
111 -#define XinitDir $(LIBDIR)/xinit
112 +#define XinitDir $(ETCX11DIR)/xinit
115 -#define XdmDir $(LIBDIR)/xdm
116 +#define XdmDir $(ETCX11DIR)/xdm
119 #define XdmVarDir $(VARLIBDIR)/xdm
122 -#define XdmAuthDir $(LIBDIR)/xdm
123 +#define XdmAuthDir $(ETCX11DIR)/xdm
125 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
126 #define XdmConfigurationSubdirectory config
129 -#define TwmDir $(LIBDIR)/twm
130 +#define TwmDir $(ETCX11DIR)/twm
133 -#define XsmDir $(LIBDIR)/xsm
134 +#define XsmDir $(ETCX11DIR)/xsm
137 #define NlsDir $(LIBDIR)/nls
138 @@ -1047,23 +1051,20 @@
139 #define PexApiDir $(LIBDIR)/PEX
142 -#define LbxproxyDir $(LIBDIR)/lbxproxy
143 +#define LbxproxyDir $(ETCX11DIR)/lbxproxy
145 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
146 #define LbxproxyConfigSubdir config
148 #ifndef ProxyManagerDir
149 -#define ProxyManagerDir $(LIBDIR)/proxymngr
150 +#define ProxyManagerDir $(ETCX11DIR)/proxymngr
152 #ifndef ServerConfigDir
153 -#define ServerConfigDir $(LIBDIR)/xserver
154 +#define ServerConfigDir $(ETCX11DIR)/xserver
157 #define XPrintDir ServerConfigDir
159 -#ifndef EtcX11Directory
160 -#define EtcX11Directory /etc/X11
162 #ifndef InstallSecurityConfig
163 #define InstallSecurityConfig YES /* Install sample security policy */
165 @@ -1095,10 +1096,10 @@
166 #define OsNameDefines /* as nothing */
168 #ifndef DefaultUserPath /* for xdm */
169 -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
170 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
172 #ifndef DefaultSystemPath /* for xdm */
173 -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
174 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
176 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
177 #define DefaultSystemShell BourneShell
178 @@ -1211,7 +1212,7 @@
180 HTMLINDEXCMD = HtmlIndexCmd
182 - DOCUTILSRC = $(XTOP)/doc/util
183 + DOCUTILSRC = $(XTOP)/share/doc/util
184 CLIENTSRC = $(TOP)/clients
185 DEMOSRC = $(TOP)/demos
186 XDOCMACROS = $(DOCUTILSRC)/macros.t
187 @@ -1225,7 +1226,7 @@
188 SERVERSRC = $(XTOP)/programs/Xserver
189 CONTRIBSRC = ContribDir
190 UNSUPPORTEDSRC = UnsupportedDir
191 - DOCSRC = $(XTOP)/doc
192 + DOCSRC = $(XTOP)/share/doc
193 RGBSRC = $(XTOP)/programs/rgb
194 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
195 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
196 diff -Nur XFree86-4.0.2.org/xc/config/cf/linux.cf XFree86-4.0.2/xc/config/cf/linux.cf
197 --- XFree86-4.0.2.org/xc/config/cf/linux.cf Thu Dec 14 20:24:08 2000
198 +++ XFree86-4.0.2/xc/config/cf/linux.cf Wed Dec 20 13:45:03 2000
200 # if defined(i386Architecture) || defined(ia64Architecture)
201 # if OSMajorVersion == 2
202 /* Only tested for Linux 2.2.0 through 2.2.12 */
203 -# if OSMinorVersion == 2 && OSTeenyVersion <= 12
204 +# if OSMinorVersion == 2
205 # define BuildXF86DRM YES
207 /* Only tested for Linux 2.3.0 through 2.3.18 */
209 #define StandardCppDefines StandardDefines
211 #define HasVarRun YES
212 -#define VarDbDirectory $(VARDIR)/lib
213 +#define VarDbDirectory /var/lib
215 #ifndef XF86OSCardDrivers
216 # define XF86OSCardDrivers v4l
217 @@ -704,10 +704,10 @@
220 #ifndef LinkGLToUsrLib
221 -# define LinkGLToUsrLib YES
222 +# define LinkGLToUsrLib NO
224 # ifndef LinkGLToUsrInclude
225 -# define LinkGLToUsrInclude YES
226 +# define LinkGLToUsrInclude NO
230 diff -Nur XFree86-4.0.2.org/xc/config/cf/site.def XFree86-4.0.2/xc/config/cf/site.def
231 --- XFree86-4.0.2.org/xc/config/cf/site.def Tue Jun 27 02:55:45 2000
232 +++ XFree86-4.0.2/xc/config/cf/site.def Wed Dec 20 13:41:02 2000
233 @@ -131,10 +131,14 @@
234 #define HasSentinel YES
238 #undef DefaultUserPath
239 -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
241 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
242 +#undef DefaultSystemPath
243 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
247 +#define HasPamMisc YES
250 /* You do NOT need SetUID if you only run the server under xdm */
251 diff -Nur XFree86-4.0.2.org/xc/config/cf/xf86site.def XFree86-4.0.2/xc/config/cf/xf86site.def
252 --- XFree86-4.0.2.org/xc/config/cf/xf86site.def Thu Dec 14 20:24:16 2000
253 +++ XFree86-4.0.2/xc/config/cf/xf86site.def Wed Dec 20 13:41:03 2000
254 @@ -134,16 +134,16 @@
255 * Some Linux releases don't have a libtermcap. In this case you may need
256 * to uncomment the following
258 -#define TermcapLibrary -lncurses
260 +#define TermcapLibrary -lncurses
263 * If you have Tk (which is required to build XF86Setup), uncomment this
264 * Note: version 4.0 or 4.1 is required, and XF86Setup links it statically by
272 * Set the paths and names for your Tk library if they don't match the
273 @@ -156,25 +156,25 @@
275 * Some Linux releases need TkLibDir set to /usr/X11R6/lib
277 -#define TkLibDir /usr/local/lib
278 -#define TkIncDir /usr/local/include
279 -#define TkLibName tk
281 +#define TkLibDir /usr/lib
282 +#define TkIncDir /usr/include
283 +#define TkLibName tk
286 * By default, XF86Setup is linked with a static Tk library. To change
287 * that, uncomment the following line.
289 -#define XF86SetupUsesStaticTk NO
291 +#define XF86SetupUsesStaticTk NO
294 * If you have Tcl (which is required to build XF86Setup), uncomment this
295 * Note: version 7.4 or 7.5 is required, and XF86Setup links it statically by
303 * Set the paths and names for your Tcl library if they don't match the
304 @@ -184,17 +184,17 @@
306 * Some Linux releases need TclIncDir set to /usr/include/tcl.
308 -#define TclLibDir /usr/local/lib
309 -#define TclIncDir /usr/local/include
310 -#define TclLibName tcl
312 +#define TclLibDir /usr/lib
313 +#define TclIncDir /usr/include
314 +#define TclLibName tcl
317 * By default, XF86Setup is linked with a static Tcl library. To change
318 * that, uncomment the following line.
320 -#define XF86SetupUsesStaticTcl NO
322 +#define XF86SetupUsesStaticTcl NO
325 * Build a server that dynamically loads the modules by setting
328 * To not build/install the Cyrillic fonts, uncomment the following
330 -#define BuildCyrillicFonts NO
332 +#define BuildCyrillicFonts YES
335 * To not build/install the Latin2 fonts, uncomment the following
337 * To forceably build static libraries in addition to shared libraries,
340 -#define ForceNormalLib YES
342 +#define ForceNormalLib YES
345 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
346 @@ -713,26 +713,26 @@
347 * HasGlide2 to YES and set the Glide2IncDir variable.
348 * HasGlide2 is per default NO.
350 -#define HasGlide2 YES
352 +#define HasGlide2 YES
355 * Set the path to your Glide include files.
357 -#define Glide2IncDir /usr/include/glide
359 +#define Glide2IncDir /usr/include/glide
362 * The 3Dfx 3D DRI driver requires glide 3.
364 -#define HasGlide3 YES
366 +#define HasGlide3 YES
369 * Set the path to your Glide 3 include files.
371 -#define Glide3IncDir /usr/include/glide3
373 +#define Glide3IncDir /usr/include/glide3
376 * Undefine the following if you don't want to have config files and
377 diff -Nur XFree86-4.0.2.org/xc/config/cf/xfree86.cf XFree86-4.0.2/xc/config/cf/xfree86.cf
378 --- XFree86-4.0.2.org/xc/config/cf/xfree86.cf Thu Dec 14 20:24:17 2000
379 +++ XFree86-4.0.2/xc/config/cf/xfree86.cf Wed Dec 20 13:52:03 2000
381 #define XConfigFile XF86Config
384 -#define XConfigDir $(LIBDIR)
385 +#define XConfigDir $(ETCX11DIR)
388 #define XLogFile XFree86
389 diff -Nur XFree86-4.0.2.org/xc/config/imake/imake.c XFree86-4.0.2/xc/config/imake/imake.c
390 --- XFree86-4.0.2.org/xc/config/imake/imake.c Wed Nov 29 17:33:50 2000
391 +++ XFree86-4.0.2/xc/config/imake/imake.c Wed Dec 20 13:41:03 2000
393 static char* yast = "/sbin/YaST";
394 static char* redhat = "/etc/redhat-release";
395 static char* debian = "/etc/debian_version";
396 + static char* pld = "/etc/pld-release";
398 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
399 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
401 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
402 fprintf (inFile, "%s\n", "#define LinuxWare 11");
403 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
404 + fprintf (inFile, "%s\n", "#define LinuxPLD 13");
406 if (lstat (yast, &sb) == 0) {
407 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxSuSE");
409 fprintf (inFile, "%s\n", "#define DefaultLinuxDistName Debian");
410 /* You could also try to get the version of the Debian distrib by looking
411 * at the content of /etc/debian_version */
414 + if (lstat (pld, &sb) == 0) {
415 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
416 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
419 /* what's the definitive way to tell what any particular distribution is? */
420 diff -Nur XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile
421 --- XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Sat Sep 4 15:04:28 1999
422 +++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Wed Dec 20 13:41:03 2000
425 XCONFIG_DEFINES = $(EXT_DEFINES) -DXF86SETUP \
426 '-DPROJECTROOT="$(PROJECTROOT)"' \
427 - '-DSERVER_CONFIG_FILE="$(LIBDIR)/$(XCONFIGFILE)"' \
428 + '-DSERVER_CONFIG_FILE="/etc/X11/$(XCONFIGFILE)"' \
429 $(SITE_FONT_PATH) $(SITE_RGB_DB) \
432 diff -Nur XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl
433 --- XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Sun Apr 5 18:15:52 1998
434 +++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Wed Dec 20 13:41:03 2000
436 set devid [lindex $DeviceIDs $idx]
438 set server [set Device_${devid}(Server)]
439 - set linkname $Xwinhome/bin/X
440 + set linkname /etc/X11/X
441 set lastlink $linkname
443 {[file exists $linkname] && [file type $linkname]=="link" \
448 - if [catch "link $Xwinhome/bin/XF86_$server X" ret] {
449 + if [catch "link ../../usr/X11R6/bin/XF86_$server X" ret] {
450 mesg $messages(phase5.4) okay
452 mesg $messages(phase5.5) okay
453 diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp
454 --- XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp Wed Nov 29 17:46:09 2000
455 +++ XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp Wed Dec 20 13:41:03 2000
460 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
461 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
463 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
464 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
466 xlogin*useShape: true
467 xlogin*logoPadding: 10
468 diff -Nur XFree86-4.0.2.org/xc/programs/xdm/resource.c XFree86-4.0.2/xc/programs/xdm/resource.c
469 --- XFree86-4.0.2.org/xc/programs/xdm/resource.c Sun Dec 6 07:08:49 1998
470 +++ XFree86-4.0.2/xc/programs/xdm/resource.c Wed Dec 20 13:41:03 2000
474 #ifndef DEF_SERVER_LINE
475 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
476 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
479 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
480 +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
483 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
484 +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
486 #ifndef DEF_USER_PATH
487 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
488 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
490 #ifndef DEF_SYSTEM_PATH
491 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
492 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
494 #ifndef DEF_SYSTEM_SHELL
495 #define DEF_SYSTEM_SHELL "/bin/sh"
497 #ifndef DEF_FAILSAFE_CLIENT
498 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
499 +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
501 #ifndef DEF_XDM_CONFIG
502 -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
503 +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
506 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
507 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
509 #ifndef DEF_AUTH_NAME
515 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
516 +#define DEF_AUTH_DIR "/etc/X11/xdm"
518 #ifndef DEF_USER_AUTH_DIR
519 #define DEF_USER_AUTH_DIR "/tmp"
520 diff -Nur XFree86-4.0.2.org/xc/programs/xinit/Imakefile XFree86-4.0.2/xc/programs/xinit/Imakefile
521 --- XFree86-4.0.2.org/xc/programs/xinit/Imakefile Tue Dec 5 01:59:44 2000
522 +++ XFree86-4.0.2/xc/programs/xinit/Imakefile Wed Dec 20 13:41:03 2000
524 InstallNamedProg(startx,startx,$(BINDIR))
525 InstallManPage(startx,$(MANDIR))
527 -#if InstallXinitConfig
528 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
530 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
532 +XCOMM Red Hat gets this from a different package
533 +XCOMM #if InstallXinitConfig
534 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
536 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
541 LinkConfDirectory(xinit,.,xinit,.)
542 diff -Nur XFree86-4.0.2.org/xc/programs/xterm/Imakefile XFree86-4.0.2/xc/programs/xterm/Imakefile
543 --- XFree86-4.0.2.org/xc/programs/xterm/Imakefile Tue Dec 5 02:00:14 2000
544 +++ XFree86-4.0.2/xc/programs/xterm/Imakefile Wed Dec 20 13:43:30 2000
546 #define XkbClientLibs /**/
549 +#if InstallXtermSetUID
550 +#undef InstallXtermSetUID
553 #ifndef SpecialCObjectRule
554 #define SpecialCObjectRule(module,ignore,defines) \
555 module.o: ; $(CC) -c defines $(CFLAGS) module.c
562 #if ((LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
566 -DOSMINORVERSION=$(OSMINORVERSION)
567 MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
568 XKB_DEFINES = XkbClientDefines
569 - DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF)
570 + DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF)
572 #ifdef OS2Architecture
574 diff -Nur XFree86-4.0.2.org/xc/programs/xterm/xterm.h XFree86-4.0.2/xc/programs/xterm/xterm.h
575 --- XFree86-4.0.2.org/xc/programs/xterm/xterm.h Sat Dec 9 05:02:44 2000
576 +++ XFree86-4.0.2/xc/programs/xterm/xterm.h Wed Dec 20 13:41:03 2000
581 -#define DFT_TERMTYPE "xterm"
582 +#define DFT_TERMTYPE "xterm-color"
586 --- XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile~ Thu Dec 14 20:47:46 2000
587 +++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile Fri Dec 22 17:58:27 2000
591 CURSESLIB = NCursesLibName
592 -CURSESDEFINES = -DHAS_NCURSES
593 +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
596 DEFINES = -DXF86CONFIG=\"XConfigFile\" $(MODULEDEFINES) \