1 diff -urN XFree86-4.0.1.orig/xc/Makefile XFree86-4.0.1/xc/Makefile
2 --- XFree86-4.0.1.orig/xc/Makefile Wed Mar 22 22:23:30 2000
3 +++ XFree86-4.0.1/xc/Makefile Sun Oct 29 23:41:32 2000
5 # or add "MAKE = make" to this file.
7 RELEASE = "Release 6.4"
17 diff -urN XFree86-4.0.1.orig/xc/config/cf/Imake.cf XFree86-4.0.1/xc/config/cf/Imake.cf
18 --- XFree86-4.0.1.orig/xc/config/cf/Imake.cf Sat Jul 1 01:34:20 2000
19 +++ XFree86-4.0.1/xc/config/cf/Imake.cf Sun Oct 29 23:21:35 2000
23 # endif /* __i386__ */
25 +# define AlphaArchitecture
27 +# endif /* __alpha */
29 # define AlphaArchitecture
31 diff -urN XFree86-4.0.1.orig/xc/config/cf/Imake.tmpl XFree86-4.0.1/xc/config/cf/Imake.tmpl
32 --- XFree86-4.0.1.orig/xc/config/cf/Imake.tmpl Tue Jun 27 02:55:44 2000
33 +++ XFree86-4.0.1/xc/config/cf/Imake.tmpl Sun Oct 29 23:21:34 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
64 diff -urN XFree86-4.0.1.orig/xc/config/cf/X11.tmpl XFree86-4.0.1/xc/config/cf/X11.tmpl
65 --- XFree86-4.0.1.orig/xc/config/cf/X11.tmpl Tue Jun 27 02:55:45 2000
66 +++ XFree86-4.0.1/xc/config/cf/X11.tmpl Sun Oct 29 23:37:03 2000
68 #define PexCCOptions DefaultCCOptions
71 +#ifndef EtcX11Directory
72 +#define EtcX11Directory /etc/X11
74 #ifndef DefaultFSConfigFile
75 -#define DefaultFSConfigFile $(LIBDIR)/fs/config
76 +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
79 /* X-TrueType settings */
84 -#define ConfigDir $(LIBDIR)/config
85 +#define ConfigDir $(LIBDIR)/config
88 -#define DocDir $(LIBDIR)/doc
89 +#define DocDir $(LIBDIR)/share/doc
92 #define DocHtmlDir $(DOCDIR)/html
94 #define DocPsDir $(DOCDIR)/PostScript
97 -#define FontDir $(LIBDIR)/fonts
98 +#define FontDir /usr/share/fonts
101 -#define AdmDir /usr/adm
102 +#define AdmDir /var/log
105 -#define XinitDir $(LIBDIR)/xinit
106 +#define XinitDir $(ETCX11DIR)/xinit
109 -#define XdmDir $(LIBDIR)/xdm
110 +#define XdmDir $(ETCX11DIR)/xdm
113 #define XdmVarDir $(VARLIBDIR)/xdm
116 -#define XdmAuthDir $(LIBDIR)/xdm
117 +#define XdmAuthDir $(ETCX11DIR)/xdm
119 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
120 #define XdmConfigurationSubdirectory config
123 -#define TwmDir $(LIBDIR)/twm
124 +#define TwmDir $(ETCX11DIR)/twm
127 -#define XsmDir $(LIBDIR)/xsm
128 +#define XsmDir $(ETCX11DIR)/xsm
131 #define NlsDir $(LIBDIR)/nls
132 @@ -998,16 +1001,16 @@
133 #define PexApiDir $(LIBDIR)/PEX
136 -#define LbxproxyDir $(LIBDIR)/lbxproxy
137 +#define LbxproxyDir $(ETCX11DIR)/lbxproxy
139 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
140 #define LbxproxyConfigSubdir config
142 #ifndef ProxyManagerDir
143 -#define ProxyManagerDir $(LIBDIR)/proxymngr
144 +#define ProxyManagerDir $(ETCX11DIR)/proxymngr
146 #ifndef ServerConfigDir
147 -#define ServerConfigDir $(LIBDIR)/xserver
148 +#define ServerConfigDir $(ETCX11DIR)/xserver
151 #define XPrintDir ServerConfigDir
152 @@ -1015,9 +1018,6 @@
154 #define VarDirectory /var/X11
156 -#ifndef EtcX11Directory
157 -#define EtcX11Directory /etc/X11
159 #ifndef InstallSecurityConfig
160 #define InstallSecurityConfig YES /* Install sample security policy */
162 @@ -1049,10 +1049,10 @@
163 #define OsNameDefines /* as nothing */
165 #ifndef DefaultUserPath /* for xdm */
166 -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
167 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR):$$HOME/bin
169 #ifndef DefaultSystemPath /* for xdm */
170 -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
171 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR):$$HOME/bin
173 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
174 #define DefaultSystemShell BourneShell
175 @@ -1162,7 +1162,7 @@
177 HTMLINDEXCMD = HtmlIndexCmd
179 - DOCUTILSRC = $(XTOP)/doc/util
180 + DOCUTILSRC = $(XTOP)/share/doc/util
181 CLIENTSRC = $(TOP)/clients
182 DEMOSRC = $(TOP)/demos
183 XDOCMACROS = $(DOCUTILSRC)/macros.t
184 @@ -1176,7 +1176,7 @@
185 SERVERSRC = $(XTOP)/programs/Xserver
186 CONTRIBSRC = ContribDir
187 UNSUPPORTEDSRC = UnsupportedDir
188 - DOCSRC = $(XTOP)/doc
189 + DOCSRC = $(XTOP)/share/doc
190 RGBSRC = $(XTOP)/programs/rgb
191 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
192 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
193 diff -urN XFree86-4.0.1.orig/xc/config/cf/linux.cf XFree86-4.0.1/xc/config/cf/linux.cf
194 --- XFree86-4.0.1.orig/xc/config/cf/linux.cf Sat Jun 24 20:15:54 2000
195 +++ XFree86-4.0.1/xc/config/cf/linux.cf Sun Oct 29 23:21:35 2000
198 # elif defined(SparcArchitecture)
199 # define BuildXF86DRI YES
200 +# elif defined(AlphaArchitecture)
201 +# define BuildXF86DRI YES
203 # define BuildXF86DRI NO
206 # ifdef i386Architecture
207 # if OSMajorVersion == 2
208 /* Only tested for Linux 2.2.0 through 2.2.12 */
209 -# if OSMinorVersion == 2 && OSTeenyVersion <= 12
210 +# if OSMinorVersion == 2
211 # define BuildXF86DRM YES
213 /* Only tested for Linux 2.3.0 through 2.3.18 */
215 #define StandardCppDefines StandardDefines
217 #define HasVarRun YES
218 -#define VarDbDirectory /var/state
219 +#define VarDbDirectory /var/lib
221 #ifndef XF86OSCardDrivers
222 #define XF86OSCardDrivers v4l
223 @@ -537,10 +539,10 @@
226 #ifndef LinkGLToUsrLib
227 -#define LinkGLToUsrLib YES
228 +#define LinkGLToUsrLib NO
230 #ifndef LinkGLToUsrInclude
231 -#define LinkGLToUsrInclude YES
232 +#define LinkGLToUsrInclude NO
236 diff -urN XFree86-4.0.1.orig/xc/config/cf/site.def XFree86-4.0.1/xc/config/cf/site.def
237 --- XFree86-4.0.1.orig/xc/config/cf/site.def Tue Jun 27 02:55:45 2000
238 +++ XFree86-4.0.1/xc/config/cf/site.def Sun Oct 29 23:21:35 2000
239 @@ -131,10 +131,13 @@
240 #define HasSentinel YES
244 #undef DefaultUserPath
245 -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
247 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR):$$HOME/bin
248 +#undef DefaultSystemPath
249 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR):$$HOME/bin
255 /* You do NOT need SetUID if you only run the server under xdm */
256 diff -urN XFree86-4.0.1.orig/xc/config/cf/xf86site.def XFree86-4.0.1/xc/config/cf/xf86site.def
257 --- XFree86-4.0.1.orig/xc/config/cf/xf86site.def Wed Jun 14 21:36:16 2000
258 +++ XFree86-4.0.1/xc/config/cf/xf86site.def Sun Oct 29 23:21:35 2000
259 @@ -134,16 +134,16 @@
260 * Some Linux releases don't have a libtermcap. In this case you may need
261 * to uncomment the following
263 -#define TermcapLibrary -lncurses
265 +#define TermcapLibrary -lncurses
268 * If you have Tk (which is required to build XF86Setup), uncomment this
269 * Note: version 4.0 or 4.1 is required, and XF86Setup links it statically by
277 * Set the paths and names for your Tk library if they don't match the
278 @@ -156,25 +156,25 @@
280 * Some Linux releases need TkLibDir set to /usr/X11R6/lib
282 -#define TkLibDir /usr/local/lib
283 -#define TkIncDir /usr/local/include
284 -#define TkLibName tk
286 +#define TkLibDir /usr/lib
287 +#define TkIncDir /usr/include
288 +#define TkLibName tk
291 * By default, XF86Setup is linked with a static Tk library. To change
292 * that, uncomment the following line.
294 -#define XF86SetupUsesStaticTk NO
296 +#define XF86SetupUsesStaticTk NO
299 * If you have Tcl (which is required to build XF86Setup), uncomment this
300 * Note: version 7.4 or 7.5 is required, and XF86Setup links it statically by
308 * Set the paths and names for your Tcl library if they don't match the
309 @@ -184,17 +184,17 @@
311 * Some Linux releases need TclIncDir set to /usr/include/tcl.
313 -#define TclLibDir /usr/local/lib
314 -#define TclIncDir /usr/local/include
315 -#define TclLibName tcl
317 +#define TclLibDir /usr/lib
318 +#define TclIncDir /usr/include
319 +#define TclLibName tcl
322 * By default, XF86Setup is linked with a static Tcl library. To change
323 * that, uncomment the following line.
325 -#define XF86SetupUsesStaticTcl NO
327 +#define XF86SetupUsesStaticTcl NO
330 * Build a server that dynamically loads the modules by setting
333 * To not build/install the Cyrillic fonts, uncomment the following
335 -#define BuildCyrillicFonts NO
337 +#define BuildCyrillicFonts YES
340 * To not build/install the Latin2 fonts, uncomment the following
342 * To forceably build static libraries in addition to shared libraries,
345 -#define ForceNormalLib YES
347 +#define ForceNormalLib YES
350 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
351 @@ -663,26 +663,26 @@
352 * HasGlide2 to YES and set the Glide2IncDir variable.
353 * HasGlide2 is per default NO.
355 -#define HasGlide2 YES
357 +#define HasGlide2 YES
360 * Set the path to your Glide include files.
362 -#define Glide2IncDir /usr/include/glide
364 +#define Glide2IncDir /usr/include/glide
367 * The 3Dfx 3D DRI driver requires glide 3.
369 -#define HasGlide3 YES
371 +#define HasGlide3 YES
374 * Set the path to your Glide 3 include files.
376 -#define Glide3IncDir /usr/include/glide3
378 +#define Glide3IncDir /usr/include/glide3
381 * Undefine the following if you don't want to have config files and
382 diff -urN XFree86-4.0.1.orig/xc/config/cf/xfree86.cf XFree86-4.0.1/xc/config/cf/xfree86.cf
383 --- XFree86-4.0.1.orig/xc/config/cf/xfree86.cf Sat Jul 1 01:34:21 2000
384 +++ XFree86-4.0.1/xc/config/cf/xfree86.cf Sun Oct 29 23:21:46 2000
386 #define XConfigFile XF86Config
389 -#define XConfigDir $(LIBDIR)
390 +#define XConfigDir $(ETCX11DIR)
396 /* Pure PCI drivers should go first */
397 # ifndef XF86CardDrivers
398 -# define XF86CardDrivers mga tdfx glint s3virge rendition tga \
399 - r128 vga XF86OSCardDrivers XF86ExtraCardDrivers
400 +# define XF86CardDrivers mga glint nv tga s3virge sis rendition \
401 + neomagic i740 tdfx \
402 + cirrus tseng trident chips apm \
404 + ati r128 v4l vga XF86OSCardDrivers XF86ExtraCardDrivers
409 * The server-side of PEX is not 64-bit clean.
411 #if !defined(BuildPexExt)
412 -# if XF86Server && !defined(AlphaArchitecture)
414 # define BuildPexExt YES
416 # define BuildPexExt NO
417 diff -urN XFree86-4.0.1.orig/xc/config/imake/imake.c XFree86-4.0.1/xc/config/imake/imake.c
418 --- XFree86-4.0.1.orig/xc/config/imake/imake.c Wed Jun 14 21:36:17 2000
419 +++ XFree86-4.0.1/xc/config/imake/imake.c Sun Oct 29 23:21:35 2000
421 static char* yast = "/sbin/YaST";
422 static char* redhat = "/etc/redhat-release";
423 static char* debian = "/etc/debian_version";
424 + static char* pld = "/etc/pld-release";
426 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
427 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
429 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
430 fprintf (inFile, "%s\n", "#define LinuxWare 11");
431 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
432 + fprintf (inFile, "%s\n", "#define LinuxPLD 13");
434 if (lstat (yast, &sb) == 0) {
435 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxSuSE");
437 fprintf (inFile, "%s\n", "#define DefaultLinuxDistName Debian");
438 /* You could also try to get the version of the Debian distrib by looking
439 * at the content of /etc/debian_version */
442 + if (lstat (pld, &sb) == 0) {
443 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
444 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
447 /* what's the definitive way to tell what any particular distribution is? */
448 diff -urN XFree86-4.0.1.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile
449 --- XFree86-4.0.1.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Sat Sep 4 15:04:28 1999
450 +++ XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Sun Oct 29 23:21:35 2000
453 XCONFIG_DEFINES = $(EXT_DEFINES) -DXF86SETUP \
454 '-DPROJECTROOT="$(PROJECTROOT)"' \
455 - '-DSERVER_CONFIG_FILE="$(LIBDIR)/$(XCONFIGFILE)"' \
456 + '-DSERVER_CONFIG_FILE="/etc/X11/$(XCONFIGFILE)"' \
457 $(SITE_FONT_PATH) $(SITE_RGB_DB) \
460 diff -urN XFree86-4.0.1.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl
461 --- XFree86-4.0.1.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Sun Apr 5 18:15:52 1998
462 +++ XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Sun Oct 29 23:21:35 2000
464 set devid [lindex $DeviceIDs $idx]
466 set server [set Device_${devid}(Server)]
467 - set linkname $Xwinhome/bin/X
468 + set linkname /etc/X11/X
469 set lastlink $linkname
471 {[file exists $linkname] && [file type $linkname]=="link" \
476 - if [catch "link $Xwinhome/bin/XF86_$server X" ret] {
477 + if [catch "link ../../usr/X11R6/bin/XF86_$server X" ret] {
478 mesg $messages(phase5.4) okay
480 mesg $messages(phase5.5) okay
481 diff -urN XFree86-4.0.1.orig/xc/programs/xdm/config/Xres.cpp XFree86-4.0.1/xc/programs/xdm/config/Xres.cpp
482 --- XFree86-4.0.1.orig/xc/programs/xdm/config/Xres.cpp Sun Mar 14 04:22:24 1999
483 +++ XFree86-4.0.1/xc/programs/xdm/config/Xres.cpp Sun Oct 29 23:28:00 2000
488 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
489 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-transparent.xpm
491 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
492 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
494 xlogin*useShape: true
495 xlogin*logoPadding: 10
496 diff -urN XFree86-4.0.1.orig/xc/programs/xdm/resource.c XFree86-4.0.1/xc/programs/xdm/resource.c
497 --- XFree86-4.0.1.orig/xc/programs/xdm/resource.c Sun Dec 6 07:08:49 1998
498 +++ XFree86-4.0.1/xc/programs/xdm/resource.c Sun Oct 29 23:35:50 2000
502 #ifndef DEF_SERVER_LINE
503 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
504 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
507 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
508 +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
511 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
512 +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
514 #ifndef DEF_USER_PATH
515 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
516 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin:$HOME/bin"
518 #ifndef DEF_SYSTEM_PATH
519 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
520 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin:$HOME/bin"
522 #ifndef DEF_SYSTEM_SHELL
523 #define DEF_SYSTEM_SHELL "/bin/sh"
525 #ifndef DEF_FAILSAFE_CLIENT
526 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
527 +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
529 #ifndef DEF_XDM_CONFIG
530 -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
531 +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
534 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
535 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
537 #ifndef DEF_AUTH_NAME
543 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
544 +#define DEF_AUTH_DIR "/etc/X11/xdm"
546 #ifndef DEF_USER_AUTH_DIR
547 #define DEF_USER_AUTH_DIR "/tmp"
548 diff -urN XFree86-4.0.1.orig/xc/programs/xinit/Imakefile XFree86-4.0.1/xc/programs/xinit/Imakefile
549 --- XFree86-4.0.1.orig/xc/programs/xinit/Imakefile Mon Jan 31 20:33:44 2000
550 +++ XFree86-4.0.1/xc/programs/xinit/Imakefile Sun Oct 29 23:21:35 2000
552 InstallNamedProg(startx,startx,$(BINDIR))
553 InstallManPage(startx,$(MANDIR))
555 -#if InstallXinitConfig
556 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
558 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
560 +XCOMM Red Hat gets this from a different package
561 +XCOMM #if InstallXinitConfig
562 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
564 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
569 LinkConfDirectory(xinit,.,xinit,.)
570 diff -urN XFree86-4.0.1.orig/xc/programs/xterm/Imakefile XFree86-4.0.1/xc/programs/xterm/Imakefile
571 --- XFree86-4.0.1.orig/xc/programs/xterm/Imakefile Fri Mar 3 21:02:27 2000
572 +++ XFree86-4.0.1/xc/programs/xterm/Imakefile Sun Oct 29 23:21:35 2000
574 #define XkbClientLibs /**/
577 +#if InstallXtermSetUID
578 +#undef InstallXtermSetUID
581 #ifndef SpecialCObjectRule
582 #define SpecialCObjectRule(module,ignore,defines) \
583 module.o: ; $(CC) -c defines $(CFLAGS) module.c
590 #if ((LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
594 -DOSMINORVERSION=$(OSMINORVERSION)
595 MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
596 XKB_DEFINES = XkbClientDefines
597 - DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION)
598 + DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION)
600 #ifdef OS2Architecture
602 diff -urN XFree86-4.0.1.orig/xc/programs/xterm/xterm.h XFree86-4.0.1/xc/programs/xterm/xterm.h
603 --- XFree86-4.0.1.orig/xc/programs/xterm/xterm.h Wed Jun 14 21:44:04 2000
604 +++ XFree86-4.0.1/xc/programs/xterm/xterm.h Sun Oct 29 23:21:35 2000
609 -#define DFT_TERMTYPE "xterm"
610 +#define DFT_TERMTYPE "xterm-color"