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
202 -# define BuildLibGlxWithoutPIC YES
203 +# define BuildLibGlxWithoutPIC NO
206 /* The DRM module requires kernel services that appeared in late 2.1.x
208 # if defined(i386Architecture) || defined(ia64Architecture)
209 # if OSMajorVersion == 2
210 /* Only tested for Linux 2.2.0 through 2.2.12 */
211 -# if OSMinorVersion == 2 && OSTeenyVersion <= 12
212 +# if OSMinorVersion == 2
213 # define BuildXF86DRM YES
215 /* Only tested for Linux 2.3.0 through 2.3.18 */
217 #define StandardCppDefines StandardDefines
219 #define HasVarRun YES
220 -#define VarDbDirectory $(VARDIR)/lib
221 +#define VarDbDirectory /var/lib
223 #ifndef XF86OSCardDrivers
224 # define XF86OSCardDrivers v4l
225 @@ -704,10 +704,10 @@
228 #ifndef LinkGLToUsrLib
229 -# define LinkGLToUsrLib YES
230 +# define LinkGLToUsrLib NO
232 # ifndef LinkGLToUsrInclude
233 -# define LinkGLToUsrInclude YES
234 +# define LinkGLToUsrInclude NO
238 diff -Nur XFree86-4.0.2.org/xc/config/cf/site.def XFree86-4.0.2/xc/config/cf/site.def
239 --- XFree86-4.0.2.org/xc/config/cf/site.def Tue Jun 27 02:55:45 2000
240 +++ XFree86-4.0.2/xc/config/cf/site.def Wed Dec 20 13:41:02 2000
241 @@ -131,10 +131,14 @@
242 #define HasSentinel YES
246 #undef DefaultUserPath
247 -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
249 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
250 +#undef DefaultSystemPath
251 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
255 +#define HasPamMisc YES
258 /* You do NOT need SetUID if you only run the server under xdm */
259 diff -Nur XFree86-4.0.2.org/xc/config/cf/xf86site.def XFree86-4.0.2/xc/config/cf/xf86site.def
260 --- XFree86-4.0.2.org/xc/config/cf/xf86site.def Thu Dec 14 20:24:16 2000
261 +++ XFree86-4.0.2/xc/config/cf/xf86site.def Wed Dec 20 13:41:03 2000
262 @@ -134,16 +134,16 @@
263 * Some Linux releases don't have a libtermcap. In this case you may need
264 * to uncomment the following
266 -#define TermcapLibrary -lncurses
268 +#define TermcapLibrary -lncurses
271 * If you have Tk (which is required to build XF86Setup), uncomment this
272 * Note: version 4.0 or 4.1 is required, and XF86Setup links it statically by
280 * Set the paths and names for your Tk library if they don't match the
281 @@ -156,25 +156,25 @@
283 * Some Linux releases need TkLibDir set to /usr/X11R6/lib
285 -#define TkLibDir /usr/local/lib
286 -#define TkIncDir /usr/local/include
287 -#define TkLibName tk
289 +#define TkLibDir /usr/lib
290 +#define TkIncDir /usr/include
291 +#define TkLibName tk
294 * By default, XF86Setup is linked with a static Tk library. To change
295 * that, uncomment the following line.
297 -#define XF86SetupUsesStaticTk NO
299 +#define XF86SetupUsesStaticTk NO
302 * If you have Tcl (which is required to build XF86Setup), uncomment this
303 * Note: version 7.4 or 7.5 is required, and XF86Setup links it statically by
311 * Set the paths and names for your Tcl library if they don't match the
312 @@ -184,17 +184,17 @@
314 * Some Linux releases need TclIncDir set to /usr/include/tcl.
316 -#define TclLibDir /usr/local/lib
317 -#define TclIncDir /usr/local/include
318 -#define TclLibName tcl
320 +#define TclLibDir /usr/lib
321 +#define TclIncDir /usr/include
322 +#define TclLibName tcl
325 * By default, XF86Setup is linked with a static Tcl library. To change
326 * that, uncomment the following line.
328 -#define XF86SetupUsesStaticTcl NO
330 +#define XF86SetupUsesStaticTcl NO
333 * Build a server that dynamically loads the modules by setting
336 * To not build/install the Cyrillic fonts, uncomment the following
338 -#define BuildCyrillicFonts NO
340 +#define BuildCyrillicFonts YES
343 * To not build/install the Latin2 fonts, uncomment the following
345 * To forceably build static libraries in addition to shared libraries,
348 -#define ForceNormalLib YES
350 +#define ForceNormalLib YES
353 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
354 @@ -713,26 +713,26 @@
355 * HasGlide2 to YES and set the Glide2IncDir variable.
356 * HasGlide2 is per default NO.
358 -#define HasGlide2 YES
360 +#define HasGlide2 YES
363 * Set the path to your Glide include files.
365 -#define Glide2IncDir /usr/include/glide
367 +#define Glide2IncDir /usr/include/glide
370 * The 3Dfx 3D DRI driver requires glide 3.
372 -#define HasGlide3 YES
374 +#define HasGlide3 YES
377 * Set the path to your Glide 3 include files.
379 -#define Glide3IncDir /usr/include/glide3
381 +#define Glide3IncDir /usr/include/glide3
384 * Undefine the following if you don't want to have config files and
385 diff -Nur XFree86-4.0.2.org/xc/config/cf/xfree86.cf XFree86-4.0.2/xc/config/cf/xfree86.cf
386 --- XFree86-4.0.2.org/xc/config/cf/xfree86.cf Thu Dec 14 20:24:17 2000
387 +++ XFree86-4.0.2/xc/config/cf/xfree86.cf Wed Dec 20 13:52:03 2000
389 #define XConfigFile XF86Config
392 -#define XConfigDir $(LIBDIR)
393 +#define XConfigDir $(ETCX11DIR)
396 #define XLogFile XFree86
397 @@ -1035,7 +1035,7 @@
400 #ifndef BuildSuperProbe
401 -# define BuildSuperProbe NO
402 +# define BuildSuperProbe YES
406 diff -Nur XFree86-4.0.2.org/xc/config/imake/imake.c XFree86-4.0.2/xc/config/imake/imake.c
407 --- XFree86-4.0.2.org/xc/config/imake/imake.c Wed Nov 29 17:33:50 2000
408 +++ XFree86-4.0.2/xc/config/imake/imake.c Wed Dec 20 13:41:03 2000
410 static char* yast = "/sbin/YaST";
411 static char* redhat = "/etc/redhat-release";
412 static char* debian = "/etc/debian_version";
413 + static char* pld = "/etc/pld-release";
415 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
416 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
418 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
419 fprintf (inFile, "%s\n", "#define LinuxWare 11");
420 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
421 + fprintf (inFile, "%s\n", "#define LinuxPLD 13");
423 if (lstat (yast, &sb) == 0) {
424 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxSuSE");
426 fprintf (inFile, "%s\n", "#define DefaultLinuxDistName Debian");
427 /* You could also try to get the version of the Debian distrib by looking
428 * at the content of /etc/debian_version */
431 + if (lstat (pld, &sb) == 0) {
432 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
433 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
436 /* what's the definitive way to tell what any particular distribution is? */
437 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
438 --- XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Sat Sep 4 15:04:28 1999
439 +++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Wed Dec 20 13:41:03 2000
442 XCONFIG_DEFINES = $(EXT_DEFINES) -DXF86SETUP \
443 '-DPROJECTROOT="$(PROJECTROOT)"' \
444 - '-DSERVER_CONFIG_FILE="$(LIBDIR)/$(XCONFIGFILE)"' \
445 + '-DSERVER_CONFIG_FILE="/etc/X11/$(XCONFIGFILE)"' \
446 $(SITE_FONT_PATH) $(SITE_RGB_DB) \
449 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
450 --- XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Sun Apr 5 18:15:52 1998
451 +++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Wed Dec 20 13:41:03 2000
453 set devid [lindex $DeviceIDs $idx]
455 set server [set Device_${devid}(Server)]
456 - set linkname $Xwinhome/bin/X
457 + set linkname /etc/X11/X
458 set lastlink $linkname
460 {[file exists $linkname] && [file type $linkname]=="link" \
465 - if [catch "link $Xwinhome/bin/XF86_$server X" ret] {
466 + if [catch "link ../../usr/X11R6/bin/XF86_$server X" ret] {
467 mesg $messages(phase5.4) okay
469 mesg $messages(phase5.5) okay
470 diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp
471 --- XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp Wed Nov 29 17:46:09 2000
472 +++ XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp Wed Dec 20 13:41:03 2000
477 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
478 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
480 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
481 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
483 xlogin*useShape: true
484 xlogin*logoPadding: 10
485 diff -Nur XFree86-4.0.2.org/xc/programs/xdm/resource.c XFree86-4.0.2/xc/programs/xdm/resource.c
486 --- XFree86-4.0.2.org/xc/programs/xdm/resource.c Sun Dec 6 07:08:49 1998
487 +++ XFree86-4.0.2/xc/programs/xdm/resource.c Wed Dec 20 13:41:03 2000
491 #ifndef DEF_SERVER_LINE
492 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
493 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
496 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
497 +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
500 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
501 +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
503 #ifndef DEF_USER_PATH
504 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
505 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
507 #ifndef DEF_SYSTEM_PATH
508 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
509 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
511 #ifndef DEF_SYSTEM_SHELL
512 #define DEF_SYSTEM_SHELL "/bin/sh"
514 #ifndef DEF_FAILSAFE_CLIENT
515 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
516 +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
518 #ifndef DEF_XDM_CONFIG
519 -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
520 +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
523 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
524 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
526 #ifndef DEF_AUTH_NAME
532 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
533 +#define DEF_AUTH_DIR "/etc/X11/xdm"
535 #ifndef DEF_USER_AUTH_DIR
536 #define DEF_USER_AUTH_DIR "/tmp"
537 diff -Nur XFree86-4.0.2.org/xc/programs/xinit/Imakefile XFree86-4.0.2/xc/programs/xinit/Imakefile
538 --- XFree86-4.0.2.org/xc/programs/xinit/Imakefile Tue Dec 5 01:59:44 2000
539 +++ XFree86-4.0.2/xc/programs/xinit/Imakefile Wed Dec 20 13:41:03 2000
541 InstallNamedProg(startx,startx,$(BINDIR))
542 InstallManPage(startx,$(MANDIR))
544 -#if InstallXinitConfig
545 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
547 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
549 +XCOMM Red Hat gets this from a different package
550 +XCOMM #if InstallXinitConfig
551 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
553 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
558 LinkConfDirectory(xinit,.,xinit,.)
559 diff -Nur XFree86-4.0.2.org/xc/programs/xterm/Imakefile XFree86-4.0.2/xc/programs/xterm/Imakefile
560 --- XFree86-4.0.2.org/xc/programs/xterm/Imakefile Tue Dec 5 02:00:14 2000
561 +++ XFree86-4.0.2/xc/programs/xterm/Imakefile Wed Dec 20 13:43:30 2000
563 #define XkbClientLibs /**/
566 +#if InstallXtermSetUID
567 +#undef InstallXtermSetUID
570 #ifndef SpecialCObjectRule
571 #define SpecialCObjectRule(module,ignore,defines) \
572 module.o: ; $(CC) -c defines $(CFLAGS) module.c
579 #if ((LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
583 -DOSMINORVERSION=$(OSMINORVERSION)
584 MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
585 XKB_DEFINES = XkbClientDefines
586 - DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF)
587 + DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF)
589 #ifdef OS2Architecture
591 diff -Nur XFree86-4.0.2.org/xc/programs/xterm/xterm.h XFree86-4.0.2/xc/programs/xterm/xterm.h
592 --- XFree86-4.0.2.org/xc/programs/xterm/xterm.h Sat Dec 9 05:02:44 2000
593 +++ XFree86-4.0.2/xc/programs/xterm/xterm.h Wed Dec 20 13:41:03 2000
598 -#define DFT_TERMTYPE "xterm"
599 +#define DFT_TERMTYPE "xterm-color"
603 --- XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile~ Thu Dec 14 20:47:46 2000
604 +++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile Fri Dec 22 17:58:27 2000
608 CURSESLIB = NCursesLibName
609 -CURSESDEFINES = -DHAS_NCURSES
610 +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
613 DEFINES = -DXF86CONFIG=\"XConfigFile\" $(MODULEDEFINES) \