]>
Commit | Line | Data |
---|---|---|
04a5c55a JR |
1 | diff -urN XFree86-4.0.orig/xc/config/cf/Imake.tmpl XFree86-4.0/xc/config/cf/Imake.tmpl |
2 | --- XFree86-4.0.orig/xc/config/cf/Imake.tmpl Tue Mar 7 16:54:17 2000 | |
3 | +++ XFree86-4.0/xc/config/cf/Imake.tmpl Fri Mar 17 02:19:49 2000 | |
04a5c55a JR |
4 | @@ -585,11 +585,7 @@ |
5 | #define LintlibDir $(USRLIBDIR)/lint | |
6 | #endif | |
7 | #ifndef SystemManDirectory | |
8 | -#if SystemV4 | |
9 | #define SystemManDirectory /usr/share/man | |
10 | -#else | |
11 | -#define SystemManDirectory /usr/man | |
12 | -#endif | |
13 | #endif | |
14 | #ifndef ManDirectoryRoot | |
15 | #ifdef ProjectRoot | |
16 | @@ -710,7 +706,7 @@ | |
17 | #define NoRConst NO /* YES if const for structs of funcs is bad */ | |
18 | #endif | |
19 | #ifndef InstPgmFlags | |
20 | -#define InstPgmFlags -s | |
21 | +#define InstPgmFlags | |
22 | #endif | |
23 | #ifndef InstBinFlags | |
24 | #define InstBinFlags -m 0755 | |
25 | diff -urN XFree86-4.0.orig/xc/config/cf/X11.tmpl XFree86-4.0/xc/config/cf/X11.tmpl | |
26 | --- XFree86-4.0.orig/xc/config/cf/X11.tmpl Sat Mar 4 05:35:22 2000 | |
27 | +++ XFree86-4.0/xc/config/cf/X11.tmpl Fri Mar 17 02:19:49 2000 | |
28 | @@ -946,7 +946,7 @@ | |
29 | #define ConfigDir $(LIBDIR)/config | |
30 | #endif | |
31 | #ifndef DocDir | |
32 | -#define DocDir $(LIBDIR)/doc | |
33 | +#define DocDir $(LIBDIR)/share/doc | |
34 | #endif | |
35 | #ifndef DocHtmlDir | |
36 | #define DocHtmlDir $(DOCDIR)/html | |
37 | @@ -955,7 +955,7 @@ | |
38 | #define DocPsDir $(DOCDIR)/PostScript | |
39 | #endif | |
40 | #ifndef FontDir | |
41 | -#define FontDir $(LIBDIR)/fonts | |
42 | +#define FontDir /usr/share/fonts | |
43 | #endif | |
44 | #ifndef AdmDir | |
45 | #define AdmDir /usr/adm | |
46 | @@ -1147,7 +1147,7 @@ | |
47 | MKFONTDIR = $(CLIENTENVSETUP) $(XBUILDBINDIR)/mkfontdir | |
48 | #endif | |
49 | ||
50 | - DOCUTILSRC = $(XTOP)/doc/util | |
51 | + DOCUTILSRC = $(XTOP)/share/doc/util | |
52 | CLIENTSRC = $(TOP)/clients | |
53 | DEMOSRC = $(TOP)/demos | |
54 | XDOCMACROS = $(DOCUTILSRC)/macros.t | |
55 | @@ -1161,7 +1161,7 @@ | |
56 | SERVERSRC = $(XTOP)/programs/Xserver | |
57 | CONTRIBSRC = ContribDir | |
58 | UNSUPPORTEDSRC = UnsupportedDir | |
59 | - DOCSRC = $(XTOP)/doc | |
60 | + DOCSRC = $(XTOP)/share/doc | |
61 | RGBSRC = $(XTOP)/programs/rgb | |
62 | BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf | |
63 | MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir | |
64 | diff -urN XFree86-4.0.orig/xc/config/cf/host.def XFree86-4.0/xc/config/cf/host.def | |
65 | --- XFree86-4.0.orig/xc/config/cf/host.def Thu Jan 1 01:00:00 1970 | |
66 | +++ XFree86-4.0/xc/config/cf/host.def Fri Mar 17 02:19:49 2000 | |
67 | @@ -0,0 +1 @@ | |
68 | + | |
69 | diff -urN XFree86-4.0.orig/xc/config/cf/linux.cf XFree86-4.0/xc/config/cf/linux.cf | |
70 | --- XFree86-4.0.orig/xc/config/cf/linux.cf Sat Mar 4 05:35:22 2000 | |
71 | +++ XFree86-4.0/xc/config/cf/linux.cf Fri Mar 17 02:19:49 2000 | |
72 | @@ -192,7 +192,7 @@ | |
73 | # ifdef i386Architecture | |
74 | # if OSMajorVersion == 2 | |
75 | /* Only tested for Linux 2.2.0 through 2.2.12 */ | |
76 | -# if OSMinorVersion == 2 && OSTeenyVersion <= 12 | |
77 | +# if OSMinorVersion == 2 | |
78 | # define BuildXF86DRM YES | |
79 | # else | |
80 | /* Only tested for Linux 2.3.0 through 2.3.18 */ | |
81 | diff -urN XFree86-4.0.orig/xc/config/cf/site.def XFree86-4.0/xc/config/cf/site.def | |
82 | --- XFree86-4.0.orig/xc/config/cf/site.def Mon Oct 5 05:52:26 1998 | |
83 | +++ XFree86-4.0/xc/config/cf/site.def Fri Mar 17 02:19:49 2000 | |
84 | @@ -115,10 +115,10 @@ | |
85 | #define HasSentinel YES | |
86 | */ | |
87 | ||
88 | -/* | |
89 | #undef DefaultUserPath | |
90 | -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin | |
91 | -*/ | |
92 | +#define DefaultUserPath /bin:/usr/bin:/usr/local/bin | |
93 | +#undef DefaultSystemPath | |
94 | +#define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin | |
95 | ||
96 | ||
97 | /* You do NOT need SetUID if you only run the server under xdm */ | |
98 | diff -urN XFree86-4.0.orig/xc/config/cf/xf86site.def XFree86-4.0/xc/config/cf/xf86site.def | |
99 | --- XFree86-4.0.orig/xc/config/cf/xf86site.def Tue Mar 7 16:54:18 2000 | |
100 | +++ XFree86-4.0/xc/config/cf/xf86site.def Fri Mar 17 02:21:18 2000 | |
101 | @@ -134,16 +134,16 @@ | |
102 | * Some Linux releases don't have a libtermcap. In this case you may need | |
103 | * to uncomment the following | |
104 | * | |
105 | -#define TermcapLibrary -lncurses | |
106 | */ | |
107 | +#define TermcapLibrary -lncurses | |
108 | ||
109 | /* | |
110 | * If you have Tk (which is required to build XF86Setup), uncomment this | |
111 | * Note: version 4.0 or 4.1 is required, and XF86Setup links it statically by | |
112 | * default. | |
113 | * | |
114 | -#define HasTk YES | |
115 | */ | |
116 | +#define HasTk YES | |
117 | ||
118 | /* | |
119 | * Set the paths and names for your Tk library if they don't match the | |
120 | @@ -156,25 +156,25 @@ | |
121 | * | |
122 | * Some Linux releases need TkLibDir set to /usr/X11R6/lib | |
123 | * | |
124 | -#define TkLibDir /usr/local/lib | |
125 | -#define TkIncDir /usr/local/include | |
126 | -#define TkLibName tk | |
127 | */ | |
128 | +#define TkLibDir /usr/lib | |
129 | +#define TkIncDir /usr/include | |
130 | +#define TkLibName tk | |
131 | ||
132 | /* | |
133 | * By default, XF86Setup is linked with a static Tk library. To change | |
134 | * that, uncomment the following line. | |
135 | * | |
136 | -#define XF86SetupUsesStaticTk NO | |
137 | */ | |
138 | +#define XF86SetupUsesStaticTk NO | |
139 | ||
140 | /* | |
141 | * If you have Tcl (which is required to build XF86Setup), uncomment this | |
142 | * Note: version 7.4 or 7.5 is required, and XF86Setup links it statically by | |
143 | * default. | |
144 | * | |
145 | -#define HasTcl YES | |
146 | */ | |
147 | +#define HasTcl YES | |
148 | ||
149 | /* | |
150 | * Set the paths and names for your Tcl library if they don't match the | |
151 | @@ -184,17 +184,17 @@ | |
152 | * | |
153 | * Some Linux releases need TclIncDir set to /usr/include/tcl. | |
154 | * | |
155 | -#define TclLibDir /usr/local/lib | |
156 | -#define TclIncDir /usr/local/include | |
157 | -#define TclLibName tcl | |
158 | */ | |
159 | +#define TclLibDir /usr/lib | |
160 | +#define TclIncDir /usr/include | |
161 | +#define TclLibName tcl | |
162 | ||
163 | /* | |
164 | * By default, XF86Setup is linked with a static Tcl library. To change | |
165 | * that, uncomment the following line. | |
166 | * | |
167 | -#define XF86SetupUsesStaticTcl NO | |
168 | */ | |
169 | +#define XF86SetupUsesStaticTcl NO | |
170 | ||
171 | /* | |
172 | * Build a server that dynamically loads the modules by setting | |
173 | @@ -378,8 +378,8 @@ | |
174 | /* | |
175 | * To not build/install the Cyrillic fonts, uncomment the following | |
176 | * | |
177 | -#define BuildCyrillicFonts NO | |
178 | */ | |
179 | +#define BuildCyrillicFonts YES | |
180 | ||
181 | /* | |
182 | * To not build/install the Latin2 fonts, uncomment the following | |
183 | @@ -568,8 +568,8 @@ | |
184 | * To forceably build static libraries in addition to shared libraries, | |
185 | * uncomment this. | |
186 | * | |
187 | -#define ForceNormalLib YES | |
188 | */ | |
189 | +#define ForceNormalLib YES | |
190 | ||
191 | /* | |
192 | * Uncomment this if your default tools (eg, gcc, ld, as, etc) are | |
193 | @@ -655,26 +655,26 @@ | |
194 | * HasGlide2 to YES and set the Glide2IncDir variable. | |
195 | * HasGlide2 is per default NO. | |
196 | * | |
197 | -#define HasGlide2 YES | |
198 | */ | |
199 | +#define HasGlide2 YES | |
200 | ||
201 | /* | |
202 | * Set the path to your Glide include files. | |
203 | * | |
204 | -#define Glide2IncDir /usr/include/glide | |
205 | */ | |
206 | +#define Glide2IncDir /usr/include/glide | |
207 | ||
208 | /* | |
209 | * The 3Dfx 3D DRI driver requires glide 3. | |
210 | * | |
211 | -#define HasGlide3 YES | |
212 | */ | |
213 | +#define HasGlide3 YES | |
214 | ||
215 | /* | |
216 | * Set the path to your Glide 3 include files. | |
217 | * | |
218 | -#define Glide3IncDir /usr/include/glide3 | |
219 | */ | |
220 | +#define Glide3IncDir /usr/include/glide3 | |
221 | ||
222 | /* | |
223 | * If your system doesn't support vm86() mode and you have | |
04a5c55a JR |
224 | diff -urN XFree86-4.0.orig/xc/config/imake/imake.c XFree86-4.0/xc/config/imake/imake.c |
225 | --- XFree86-4.0.orig/xc/config/imake/imake.c Wed Dec 29 01:54:48 1999 | |
226 | +++ XFree86-4.0/xc/config/imake/imake.c Fri Mar 17 02:19:49 2000 | |
227 | @@ -934,6 +934,7 @@ | |
228 | static char* yast = "/sbin/YaST"; | |
229 | static char* redhat = "/etc/redhat-release"; | |
230 | static char* debian = "/etc/debian_version"; | |
231 | + static char* pld = "/etc/pld-release"; | |
232 | ||
233 | fprintf (inFile, "%s\n", "#define LinuxUnknown 0"); | |
234 | fprintf (inFile, "%s\n", "#define LinuxSuSE 1"); | |
235 | @@ -948,6 +949,7 @@ | |
236 | fprintf (inFile, "%s\n", "#define LinuxTurbo 10"); | |
237 | fprintf (inFile, "%s\n", "#define LinuxWare 11"); | |
238 | fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12"); | |
239 | + fprintf (inFile, "%s\n", "#define LinuxPLD 13"); | |
240 | ||
241 | if (lstat (yast, &sb) == 0) { | |
242 | fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxSuSE"); | |
243 | @@ -964,6 +966,11 @@ | |
244 | fprintf (inFile, "%s\n", "#define DefaultLinuxDistName Debian"); | |
245 | /* You could also try to get the version of the Debian distrib by looking | |
246 | * at the content of /etc/debian_version */ | |
247 | + return; | |
248 | + } | |
249 | + if (lstat (pld, &sb) == 0) { | |
250 | + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD"); | |
251 | + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD"); | |
252 | return; | |
253 | } | |
254 | /* what's the definitive way to tell what any particular distribution is? */ | |
04a5c55a JR |
255 | diff -urN XFree86-4.0.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile XFree86-4.0/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile |
256 | --- XFree86-4.0.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Mon Sep 6 15:23:12 1999 | |
257 | +++ XFree86-4.0/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Fri Mar 17 02:19:49 2000 | |
258 | @@ -118,7 +118,7 @@ | |
259 | ||
260 | XCONFIG_DEFINES = $(EXT_DEFINES) -DXF86SETUP \ | |
261 | '-DPROJECTROOT="$(PROJECTROOT)"' \ | |
262 | - '-DSERVER_CONFIG_FILE="$(LIBDIR)/$(XCONFIGFILE)"' \ | |
263 | + '-DSERVER_CONFIG_FILE="/etc/X11/$(XCONFIGFILE)"' \ | |
264 | $(SITE_FONT_PATH) $(SITE_RGB_DB) \ | |
265 | -DNO_WRAPPERS | |
266 | ||
267 | diff -urN XFree86-4.0.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl XFree86-4.0/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl | |
268 | --- XFree86-4.0.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Mon Apr 6 00:30:46 1998 | |
269 | +++ XFree86-4.0/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Fri Mar 17 02:19:49 2000 | |
270 | @@ -38,7 +38,7 @@ | |
271 | set devid [lindex $DeviceIDs $idx] | |
272 | global Device_$devid | |
273 | set server [set Device_${devid}(Server)] | |
274 | - set linkname $Xwinhome/bin/X | |
275 | + set linkname /etc/X11/X | |
276 | set lastlink $linkname | |
277 | for {set nlinks 0} \ | |
278 | {[file exists $linkname] && [file type $linkname]=="link" \ | |
279 | @@ -74,7 +74,7 @@ | |
280 | set CWD [pwd] | |
281 | cd $linkdir | |
282 | catch "unlink X" ret | |
283 | - if [catch "link $Xwinhome/bin/XF86_$server X" ret] { | |
284 | + if [catch "link ../../usr/X11R6/bin/XF86_$server X" ret] { | |
285 | mesg $messages(phase5.4) okay | |
286 | } else { | |
287 | mesg $messages(phase5.5) okay | |
288 | diff -urN XFree86-4.0.orig/xc/programs/xinit/Imakefile XFree86-4.0/xc/programs/xinit/Imakefile | |
289 | --- XFree86-4.0.orig/xc/programs/xinit/Imakefile Wed Feb 9 19:02:36 2000 | |
290 | +++ XFree86-4.0/xc/programs/xinit/Imakefile Fri Mar 17 02:19:49 2000 | |
291 | @@ -39,11 +39,13 @@ | |
292 | InstallNamedProg(startx,startx,$(BINDIR)) | |
293 | InstallManPage(startx,$(MANDIR)) | |
294 | ||
295 | -#if InstallXinitConfig | |
296 | -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR)) | |
297 | -#else | |
298 | -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR)) | |
299 | -#endif | |
300 | +XCOMM Red Hat gets this from a different package | |
301 | +XCOMM #if InstallXinitConfig | |
302 | +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR)) | |
303 | +XCOMM #else | |
304 | +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR)) | |
305 | +XCOMM #endif | |
306 | + | |
307 | #endif | |
308 | ||
309 | LinkConfDirectory(xinit,.,xinit,.) | |
310 | diff -urN XFree86-4.0.orig/xc/programs/xterm/Imakefile XFree86-4.0/xc/programs/xterm/Imakefile | |
311 | --- XFree86-4.0.orig/xc/programs/xterm/Imakefile Sat Mar 4 05:42:24 2000 | |
312 | +++ XFree86-4.0/xc/programs/xterm/Imakefile Fri Mar 17 02:19:49 2000 | |
313 | @@ -36,6 +36,10 @@ | |
314 | #define XkbClientLibs /**/ | |
315 | #endif | |
316 | ||
317 | +#if InstallXtermSetUID | |
318 | +#undef InstallXtermSetUID | |
319 | +#endif | |
320 | + | |
321 | #ifndef SpecialCObjectRule | |
322 | #define SpecialCObjectRule(module,ignore,defines) \ | |
323 | module.o: ; $(CC) -c defines $(CFLAGS) module.c | |
324 | @@ -57,6 +61,8 @@ | |
325 | PTYLIB = -lpucc | |
326 | #endif | |
327 | ||
328 | + PTYLIB = -lutil | |
329 | + | |
330 | #if ((LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1)) | |
331 | PTYLIB = -lutil | |
332 | #endif | |
333 | @@ -101,7 +107,7 @@ | |
334 | -DOSMINORVERSION=$(OSMINORVERSION) | |
335 | MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */ | |
336 | XKB_DEFINES = XkbClientDefines | |
337 | - DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) | |
338 | + DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) | |
339 | ||
340 | #ifdef OS2Architecture | |
341 | MAINSRC = os2main.c | |
342 | diff -urN XFree86-4.0.orig/xc/programs/xterm/xterm.h XFree86-4.0/xc/programs/xterm/xterm.h | |
343 | --- XFree86-4.0.orig/xc/programs/xterm/xterm.h Wed Mar 1 02:21:05 2000 | |
344 | +++ XFree86-4.0/xc/programs/xterm/xterm.h Fri Mar 17 02:19:49 2000 | |
345 | @@ -58,7 +58,7 @@ | |
346 | #endif | |
347 | ||
348 | #ifndef DFT_TERMTYPE | |
349 | -#define DFT_TERMTYPE "xterm" | |
350 | +#define DFT_TERMTYPE "xterm-color" | |
351 | #endif | |
352 | ||
353 | #ifndef X_NOT_POSIX | |
55b5ef9f JR |
354 | --- XFree86-4.0/xc/config/cf/linux.cf~ Mon May 1 20:18:57 2000 |
355 | +++ XFree86-4.0/xc/config/cf/linux.cf Mon May 1 22:39:02 2000 | |
356 | @@ -412,7 +412,7 @@ | |
357 | #define StandardCppDefines StandardDefines | |
358 | ||
359 | #define HasVarRun YES | |
360 | -#define VarDbDirectory /var/state | |
361 | +#define VarDbDirectory /var/lib | |
362 | ||
363 | #ifndef XF86ExtraCardDrivers | |
364 | #define XF86ExtraCardDrivers v4l |