1 --- XFree86-4.1.0.org/xc/Makefile Wed Mar 22 22:23:30 2000
2 +++ XFree86-4.1.0/xc/Makefile Wed Dec 20 13:41:02 2000
4 # or add "MAKE = make" to this file.
6 RELEASE = "Release 6.5"
16 diff -Nur XFree86-4.0.2.org/xc/config/cf/Imake.cf XFree86-4.0.2/xc/config/cf/Imake.cf
17 --- XFree86-4.0.2.org/xc/config/cf/Imake.cf Mon Nov 6 23:53:47 2000
18 +++ XFree86-4.0.2/xc/config/cf/Imake.cf Wed Dec 20 13:41:02 2000
20 # define s390Architecture
24 +# define AlphaArchitecture
28 # define AlphaArchitecture
30 diff -Nur XFree86-4.0.2.org/xc/config/cf/Imake.tmpl XFree86-4.0.2/xc/config/cf/Imake.tmpl
31 --- XFree86-4.0.2.org/xc/config/cf/Imake.tmpl Tue Dec 5 01:45:28 2000
32 +++ XFree86-4.0.2/xc/config/cf/Imake.tmpl Wed Dec 20 13:41:02 2000
35 #ifndef BuildHtmlManPages
37 -#define BuildHtmlManPages YES
38 +#define BuildHtmlManPages NO
40 #define BuildHtmlManPages NO
43 #define LintlibDir $(USRLIBDIR)/lint
45 #ifndef SystemManDirectory
47 #define SystemManDirectory /usr/share/man
49 -#define SystemManDirectory /usr/man
52 #ifndef ManDirectoryRoot
55 #define NoRConst NO /* YES if const for structs of funcs is bad */
58 -#define InstPgmFlags -s
62 #define InstBinFlags -m 0755
64 #define CppCmd /lib/cpp
67 -#define RawCppCmd CppCmd -undef
68 +#define RawCppCmd CppCmd
70 #ifndef CppNoLineInfoOption
71 #define CppNoLineInfoOption /**/
72 diff -Nur XFree86-4.0.2.org/xc/config/cf/X11.tmpl XFree86-4.0.2/xc/config/cf/X11.tmpl
73 --- XFree86-4.0.2.org/xc/config/cf/X11.tmpl Sat Dec 16 07:39:25 2000
74 +++ XFree86-4.0.2/xc/config/cf/X11.tmpl Wed Dec 20 13:41:02 2000
79 +#ifndef EtcX11Directory
80 +#define EtcX11Directory /etc/X11
83 #ifndef DefaultFSConfigFile
84 -#define DefaultFSConfigFile $(LIBDIR)/fs/config
85 +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
88 /* X-TrueType settings */
90 #define ConfigDir $(LIBDIR)/config
93 -#define DocDir $(LIBDIR)/doc
94 +#define DocDir $(LIBDIR)/share/doc
97 #define DocHtmlDir $(DOCDIR)/html
98 @@ -1011,31 +1015,31 @@
99 #define DocPsDir $(DOCDIR)/PostScript
102 -#define FontDir $(LIBDIR)/fonts
103 +#define FontDir /usr/share/fonts
106 -#define AdmDir /usr/adm
107 +#define AdmDir /var/log
110 -#define XinitDir $(LIBDIR)/xinit
111 +#define XinitDir $(ETCX11DIR)/xinit
114 -#define XdmDir $(LIBDIR)/xdm
115 +#define XdmDir $(ETCX11DIR)/xdm
118 #define XdmVarDir $(VARLIBDIR)/xdm
121 -#define XdmAuthDir $(LIBDIR)/xdm
122 +#define XdmAuthDir $(ETCX11DIR)/xdm
124 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
125 #define XdmConfigurationSubdirectory config
128 -#define TwmDir $(LIBDIR)/twm
129 +#define TwmDir $(ETCX11DIR)/twm
132 -#define XsmDir $(LIBDIR)/xsm
133 +#define XsmDir $(ETCX11DIR)/xsm
136 #define NlsDir $(LIBDIR)/nls
137 @@ -1047,23 +1051,20 @@
138 #define PexApiDir $(LIBDIR)/PEX
141 -#define LbxproxyDir $(LIBDIR)/lbxproxy
142 +#define LbxproxyDir $(ETCX11DIR)/lbxproxy
144 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
145 #define LbxproxyConfigSubdir config
147 #ifndef ProxyManagerDir
148 -#define ProxyManagerDir $(LIBDIR)/proxymngr
149 +#define ProxyManagerDir $(ETCX11DIR)/proxymngr
151 #ifndef ServerConfigDir
152 -#define ServerConfigDir $(LIBDIR)/xserver
153 +#define ServerConfigDir $(ETCX11DIR)/xserver
156 #define XPrintDir ServerConfigDir
158 -#ifndef EtcX11Directory
159 -#define EtcX11Directory /etc/X11
161 #ifndef InstallSecurityConfig
162 #define InstallSecurityConfig YES /* Install sample security policy */
164 @@ -1095,10 +1096,10 @@
165 #define OsNameDefines /* as nothing */
167 #ifndef DefaultUserPath /* for xdm */
168 -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
169 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
171 #ifndef DefaultSystemPath /* for xdm */
172 -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
173 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
175 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
176 #define DefaultSystemShell BourneShell
177 @@ -1211,7 +1212,7 @@
179 HTMLINDEXCMD = HtmlIndexCmd
181 - DOCUTILSRC = $(XTOP)/doc/util
182 + DOCUTILSRC = $(XTOP)/share/doc/util
183 CLIENTSRC = $(TOP)/clients
184 DEMOSRC = $(TOP)/demos
185 XDOCMACROS = $(DOCUTILSRC)/macros.t
186 @@ -1225,7 +1226,7 @@
187 SERVERSRC = $(XTOP)/programs/Xserver
188 CONTRIBSRC = ContribDir
189 UNSUPPORTEDSRC = UnsupportedDir
190 - DOCSRC = $(XTOP)/doc
191 + DOCSRC = $(XTOP)/share/doc
192 RGBSRC = $(XTOP)/programs/rgb
193 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
194 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
195 diff -Nur XFree86-4.0.2.org/xc/config/cf/linux.cf XFree86-4.0.2/xc/config/cf/linux.cf
196 --- XFree86-4.0.2.org/xc/config/cf/linux.cf Thu Dec 14 20:24:08 2000
197 +++ XFree86-4.0.2/xc/config/cf/linux.cf Wed Dec 20 13:45:03 2000
199 # if defined(i386Architecture) || defined(ia64Architecture)
200 # if OSMajorVersion == 2
201 /* Only tested for Linux 2.2.0 through 2.2.12 */
202 -# if OSMinorVersion == 2 && OSTeenyVersion <= 12
203 +# if OSMinorVersion == 2
204 # define BuildXF86DRM YES
206 /* Only tested for Linux 2.3.0 through 2.3.18 */
208 #define StandardCppDefines StandardDefines
210 #define HasVarRun YES
211 -#define VarDbDirectory $(VARDIR)/lib
212 +#define VarDbDirectory /var/lib
214 #ifndef XF86OSCardDrivers
215 # define XF86OSCardDrivers v4l
216 @@ -704,10 +704,10 @@
219 #ifndef LinkGLToUsrLib
220 -# define LinkGLToUsrLib YES
221 +# define LinkGLToUsrLib NO
223 # ifndef LinkGLToUsrInclude
224 -# define LinkGLToUsrInclude YES
225 +# define LinkGLToUsrInclude NO
229 diff -Nur XFree86-4.0.2.org/xc/config/cf/site.def XFree86-4.0.2/xc/config/cf/site.def
230 --- XFree86-4.0.2.org/xc/config/cf/site.def Tue Jun 27 02:55:45 2000
231 +++ XFree86-4.0.2/xc/config/cf/site.def Wed Dec 20 13:41:02 2000
232 @@ -131,10 +131,14 @@
233 #define HasSentinel YES
237 #undef DefaultUserPath
238 -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
240 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
241 +#undef DefaultSystemPath
242 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
246 +#define HasPamMisc YES
249 /* You do NOT need SetUID if you only run the server under xdm */
250 diff -Nur XFree86-4.0.2.org/xc/config/cf/xf86site.def XFree86-4.0.2/xc/config/cf/xf86site.def
251 --- XFree86-4.0.2.org/xc/config/cf/xf86site.def Thu Dec 14 20:24:16 2000
252 +++ XFree86-4.0.2/xc/config/cf/xf86site.def Wed Dec 20 13:41:03 2000
253 @@ -134,16 +134,16 @@
254 * Some Linux releases don't have a libtermcap. In this case you may need
255 * to uncomment the following
257 -#define TermcapLibrary -lncurses
259 +#define TermcapLibrary -lncurses
262 * If you have Tk (which is required to build XF86Setup), uncomment this
263 * Note: version 4.0 or 4.1 is required, and XF86Setup links it statically by
271 * Set the paths and names for your Tk library if they don't match the
272 @@ -156,25 +156,25 @@
274 * Some Linux releases need TkLibDir set to /usr/X11R6/lib
276 -#define TkLibDir /usr/local/lib
277 -#define TkIncDir /usr/local/include
278 -#define TkLibName tk
280 +#define TkLibDir /usr/lib
281 +#define TkIncDir /usr/include
282 +#define TkLibName tk
285 * By default, XF86Setup is linked with a static Tk library. To change
286 * that, uncomment the following line.
288 -#define XF86SetupUsesStaticTk NO
290 +#define XF86SetupUsesStaticTk NO
293 * If you have Tcl (which is required to build XF86Setup), uncomment this
294 * Note: version 7.4 or 7.5 is required, and XF86Setup links it statically by
302 * Set the paths and names for your Tcl library if they don't match the
303 @@ -184,17 +184,17 @@
305 * Some Linux releases need TclIncDir set to /usr/include/tcl.
307 -#define TclLibDir /usr/local/lib
308 -#define TclIncDir /usr/local/include
309 -#define TclLibName tcl
311 +#define TclLibDir /usr/lib
312 +#define TclIncDir /usr/include
313 +#define TclLibName tcl
316 * By default, XF86Setup is linked with a static Tcl library. To change
317 * that, uncomment the following line.
319 -#define XF86SetupUsesStaticTcl NO
321 +#define XF86SetupUsesStaticTcl NO
324 * Build a server that dynamically loads the modules by setting
327 * To not build/install the Cyrillic fonts, uncomment the following
329 -#define BuildCyrillicFonts NO
331 +#define BuildCyrillicFonts YES
334 * To not build/install the Latin2 fonts, uncomment the following
336 * To forceably build static libraries in addition to shared libraries,
339 -#define ForceNormalLib YES
341 +#define ForceNormalLib YES
344 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
345 @@ -713,26 +713,26 @@
346 * HasGlide2 to YES and set the Glide2IncDir variable.
347 * HasGlide2 is per default NO.
349 -#define HasGlide2 YES
351 +#define HasGlide2 YES
354 * Set the path to your Glide include files.
356 -#define Glide2IncDir /usr/include/glide
358 +#define Glide2IncDir /usr/include/glide
361 * The 3Dfx 3D DRI driver requires glide 3.
363 -#define HasGlide3 YES
365 +#define HasGlide3 YES
368 * Set the path to your Glide 3 include files.
370 -#define Glide3IncDir /usr/include/glide3
372 +#define Glide3IncDir /usr/include/glide3
375 * Undefine the following if you don't want to have config files and
376 diff -Nur XFree86-4.0.2.org/xc/config/cf/xfree86.cf XFree86-4.0.2/xc/config/cf/xfree86.cf
377 --- XFree86-4.0.2.org/xc/config/cf/xfree86.cf Thu Dec 14 20:24:17 2000
378 +++ XFree86-4.0.2/xc/config/cf/xfree86.cf Wed Dec 20 13:52:03 2000
380 #define XConfigFile XF86Config
383 -#define XConfigDir $(LIBDIR)
384 +#define XConfigDir $(ETCX11DIR)
387 #define XLogFile XFree86
388 diff -Nur XFree86-4.0.2.org/xc/config/imake/imake.c XFree86-4.0.2/xc/config/imake/imake.c
389 --- XFree86-4.0.2.org/xc/config/imake/imake.c Wed Nov 29 17:33:50 2000
390 +++ XFree86-4.0.2/xc/config/imake/imake.c Wed Dec 20 13:41:03 2000
392 static char* yast = "/sbin/YaST";
393 static char* redhat = "/etc/redhat-release";
394 static char* debian = "/etc/debian_version";
395 + static char* pld = "/etc/pld-release";
397 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
398 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
400 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
401 fprintf (inFile, "%s\n", "#define LinuxWare 11");
402 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
403 + fprintf (inFile, "%s\n", "#define LinuxPLD 13");
405 if (lstat (yast, &sb) == 0) {
406 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxSuSE");
408 fprintf (inFile, "%s\n", "#define DefaultLinuxDistName Debian");
409 /* You could also try to get the version of the Debian distrib by looking
410 * at the content of /etc/debian_version */
413 + if (lstat (pld, &sb) == 0) {
414 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
415 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
418 /* what's the definitive way to tell what any particular distribution is? */
419 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
420 --- XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Sat Sep 4 15:04:28 1999
421 +++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Wed Dec 20 13:41:03 2000
424 XCONFIG_DEFINES = $(EXT_DEFINES) -DXF86SETUP \
425 '-DPROJECTROOT="$(PROJECTROOT)"' \
426 - '-DSERVER_CONFIG_FILE="$(LIBDIR)/$(XCONFIGFILE)"' \
427 + '-DSERVER_CONFIG_FILE="/etc/X11/$(XCONFIGFILE)"' \
428 $(SITE_FONT_PATH) $(SITE_RGB_DB) \
431 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
432 --- XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Sun Apr 5 18:15:52 1998
433 +++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Wed Dec 20 13:41:03 2000
435 set devid [lindex $DeviceIDs $idx]
437 set server [set Device_${devid}(Server)]
438 - set linkname $Xwinhome/bin/X
439 + set linkname /etc/X11/X
440 set lastlink $linkname
442 {[file exists $linkname] && [file type $linkname]=="link" \
447 - if [catch "link $Xwinhome/bin/XF86_$server X" ret] {
448 + if [catch "link ../../usr/X11R6/bin/XF86_$server X" ret] {
449 mesg $messages(phase5.4) okay
451 mesg $messages(phase5.5) okay
452 diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp
453 --- XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp Wed Nov 29 17:46:09 2000
454 +++ XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp Wed Dec 20 13:41:03 2000
459 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
460 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
462 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
463 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
465 xlogin*useShape: true
466 xlogin*logoPadding: 10
467 diff -Nur XFree86-4.0.2.org/xc/programs/xdm/resource.c XFree86-4.0.2/xc/programs/xdm/resource.c
468 --- XFree86-4.0.2.org/xc/programs/xdm/resource.c Sun Dec 6 07:08:49 1998
469 +++ XFree86-4.0.2/xc/programs/xdm/resource.c Wed Dec 20 13:41:03 2000
473 #ifndef DEF_SERVER_LINE
474 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
475 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
478 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
479 +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
482 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
483 +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
485 #ifndef DEF_USER_PATH
486 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
487 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
489 #ifndef DEF_SYSTEM_PATH
490 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
491 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
493 #ifndef DEF_SYSTEM_SHELL
494 #define DEF_SYSTEM_SHELL "/bin/sh"
496 #ifndef DEF_FAILSAFE_CLIENT
497 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
498 +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
500 #ifndef DEF_XDM_CONFIG
501 -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
502 +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
505 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
506 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
508 #ifndef DEF_AUTH_NAME
514 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
515 +#define DEF_AUTH_DIR "/etc/X11/xdm"
517 #ifndef DEF_USER_AUTH_DIR
518 #define DEF_USER_AUTH_DIR "/tmp"
519 diff -Nur XFree86-4.0.2.org/xc/programs/xinit/Imakefile XFree86-4.0.2/xc/programs/xinit/Imakefile
520 --- XFree86-4.0.2.org/xc/programs/xinit/Imakefile Tue Dec 5 01:59:44 2000
521 +++ XFree86-4.0.2/xc/programs/xinit/Imakefile Wed Dec 20 13:41:03 2000
523 InstallNamedProg(startx,startx,$(BINDIR))
524 InstallManPage(startx,$(MANDIR))
526 -#if InstallXinitConfig
527 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
529 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
531 +XCOMM Red Hat gets this from a different package
532 +XCOMM #if InstallXinitConfig
533 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
535 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
540 LinkConfDirectory(xinit,.,xinit,.)
541 diff -Nur XFree86-4.0.2.org/xc/programs/xterm/Imakefile XFree86-4.0.2/xc/programs/xterm/Imakefile
542 --- XFree86-4.0.2.org/xc/programs/xterm/Imakefile Tue Dec 5 02:00:14 2000
543 +++ XFree86-4.0.2/xc/programs/xterm/Imakefile Wed Dec 20 13:43:30 2000
545 #define XkbClientLibs /**/
548 +#if InstallXtermSetUID
549 +#undef InstallXtermSetUID
552 #ifndef SpecialCObjectRule
553 #define SpecialCObjectRule(module,ignore,defines) \
554 module.o: ; $(CC) -c defines $(CFLAGS) module.c
561 #if ((LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
565 -DOSMINORVERSION=$(OSMINORVERSION)
566 MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
567 XKB_DEFINES = XkbClientDefines
568 - DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF)
569 + DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF)
571 #ifdef OS2Architecture
573 diff -Nur XFree86-4.0.2.org/xc/programs/xterm/xterm.h XFree86-4.0.2/xc/programs/xterm/xterm.h
574 --- XFree86-4.0.2.org/xc/programs/xterm/xterm.h Sat Dec 9 05:02:44 2000
575 +++ XFree86-4.0.2/xc/programs/xterm/xterm.h Wed Dec 20 13:41:03 2000
580 -#define DFT_TERMTYPE "xterm"
581 +#define DFT_TERMTYPE "xterm-color"
585 --- XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile~ Thu Dec 14 20:47:46 2000
586 +++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile Fri Dec 22 17:58:27 2000
590 CURSESLIB = NCursesLibName
591 -CURSESDEFINES = -DHAS_NCURSES
592 +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
595 DEFINES = -DXF86CONFIG=\"XConfigFile\" $(MODULEDEFINES) \