]> git.pld-linux.org Git - packages/XFree86.git/blame - XFree86-PLD.patch
projects / packages / XFree86.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- added %{epoch}: (fixes broken dependances with upgrade),
[packages/XFree86.git] / XFree86-PLD.patch
CommitLineData
e9cc699d 1diff -Nru xc.orig/Makefile xc/Makefile
2--- xc.orig/Makefile 2003-04-25 13:00:01.000000000 +0200
3+++ xc/Makefile 2003-09-26 10:27:39.655002672 +0200
bf7d3e51 4@@ -8,7 +8,7 @@
e1fe05b9
JR		 5 # or add "MAKE = make" to this file.
6
ea1f593a 7 RELEASE = "Release 6.6"
e1fe05b9
JR		 8-SHELL = /bin/sh
9+SHELL = /bin/sh -e
10 RM = rm -f
11 MV = mv
bf7d3e51 12 WORLDOPTS =
e9cc699d 13diff -Nru xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
14--- xc.orig/config/cf/Imake.cf 2003-07-10 13:00:02.000000000 +0200
15+++ xc/config/cf/Imake.cf 2003-09-26 10:27:39.710994160 +0200
16@@ -746,6 +746,10 @@
b19d4d8b
JR		 17 # define s390Architecture
18 # undef __s390__
19 # endif /* s390 */
e1fe05b9
JR		 20+# ifdef alpha
21+# define AlphaArchitecture
22+# undef alpha
b19d4d8b 23+# endif /* alpha */
e1fe05b9
JR		 24 # ifdef __alpha
25 # define AlphaArchitecture
26 # undef __alpha
e9cc699d 27diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
28--- xc.orig/config/cf/Imake.tmpl 2003-09-25 13:00:02.000000000 +0200
29+++ xc/config/cf/Imake.tmpl 2003-09-26 10:27:39.733990664 +0200
30@@ -261,7 +261,7 @@
e1fe05b9
JR		 31
32 #ifndef BuildHtmlManPages
33 #ifdef RmanCmd
34-#define BuildHtmlManPages YES
35+#define BuildHtmlManPages NO
36 #else
37 #define BuildHtmlManPages NO
38 #endif
e9cc699d 39@@ -845,11 +845,7 @@
e1fe05b9
JR		 40 #define LintlibDir $(USRLIBDIR)/lint
41 #endif
42 #ifndef SystemManDirectory
43-#if SystemV4
44 #define SystemManDirectory /usr/share/man
45-#else
46-#define SystemManDirectory /usr/man
47-#endif
48 #endif
49 #ifndef ManDirectoryRoot
50 #ifdef ProjectRoot
e9cc699d 51@@ -986,7 +982,7 @@
e1fe05b9
JR		 52 #define NoRConst NO /* YES if const for structs of funcs is bad */
53 #endif
54 #ifndef InstPgmFlags
55-#define InstPgmFlags -s
56+#define InstPgmFlags
57 #endif
58 #ifndef InstBinFlags
59 #define InstBinFlags -m 0755
e9cc699d 60@@ -1124,7 +1120,7 @@
2452d5b7 61 #define CppCmd /LibDirName/cpp
8a78032e
JR		 62 #endif
63 #ifndef RawCppCmd
64-#define RawCppCmd CppCmd -undef
65+#define RawCppCmd CppCmd
66 #endif
67 #ifndef CppNoLineInfoOption
68 #define CppNoLineInfoOption /**/
e9cc699d 69diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
70--- xc.orig/config/cf/X11.tmpl 2003-09-25 13:00:02.000000000 +0200
71+++ xc/config/cf/X11.tmpl 2003-09-26 10:27:39.755987320 +0200
72@@ -1240,8 +1240,12 @@
2452d5b7 73 # define UsbMouseSupport NO
e1fe05b9 74 #endif
b19d4d8b 75
e1fe05b9
JR		 76+#ifndef EtcX11Directory
77+#define EtcX11Directory /etc/X11
78+#endif
b19d4d8b 79+
e1fe05b9
JR		 80 #ifndef DefaultFSConfigFile
81-#define DefaultFSConfigFile $(LIBDIR)/fs/config
82+#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
83 #endif
84
85 /* X-TrueType settings */
e9cc699d 86@@ -1364,7 +1368,7 @@
b19d4d8b 87 #define ConfigDir $(LIBDIR)/config
e1fe05b9
JR		 88 #endif
89 #ifndef DocDir
90-#define DocDir $(LIBDIR)/doc
91+#define DocDir $(LIBDIR)/share/doc
92 #endif
93 #ifndef DocHtmlDir
94 #define DocHtmlDir $(DOCDIR)/html
e9cc699d 95@@ -1376,31 +1380,31 @@
96 #define DocPdfDir $(DOCDIR)/PDF
e1fe05b9
JR		 97 #endif
98 #ifndef FontDir
99-#define FontDir $(LIBDIR)/fonts
100+#define FontDir /usr/share/fonts
101 #endif
102 #ifndef AdmDir
103-#define AdmDir /usr/adm
104+#define AdmDir /var/log
105 #endif
106 #ifndef XinitDir
107-#define XinitDir $(LIBDIR)/xinit
108+#define XinitDir $(ETCX11DIR)/xinit
109 #endif
110 #ifndef XdmDir
111-#define XdmDir $(LIBDIR)/xdm
112+#define XdmDir $(ETCX11DIR)/xdm
113 #endif
114 #ifndef XdmVarDir
115 #define XdmVarDir $(VARLIBDIR)/xdm
116 #endif
117 #ifndef XdmAuthDir
118-#define XdmAuthDir $(LIBDIR)/xdm
119+#define XdmAuthDir $(ETCX11DIR)/xdm
120 #endif
121 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
122 #define XdmConfigurationSubdirectory config
123 #endif
124 #ifndef TwmDir
125-#define TwmDir $(LIBDIR)/twm
126+#define TwmDir $(ETCX11DIR)/twm
127 #endif
128 #ifndef XsmDir
129-#define XsmDir $(LIBDIR)/xsm
130+#define XsmDir $(ETCX11DIR)/xsm
131 #endif
132 #ifndef NlsDir
133 #define NlsDir $(LIBDIR)/nls
e9cc699d 134@@ -1409,23 +1413,20 @@
135 #define XLocaleDir $(LIBDIR)/locale
e1fe05b9
JR		 136 #endif
137 #ifndef LbxproxyDir
138-#define LbxproxyDir $(LIBDIR)/lbxproxy
139+#define LbxproxyDir $(ETCX11DIR)/lbxproxy
140 #endif
141 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
142 #define LbxproxyConfigSubdir config
143 #endif
144 #ifndef ProxyManagerDir
145-#define ProxyManagerDir $(LIBDIR)/proxymngr
146+#define ProxyManagerDir $(ETCX11DIR)/proxymngr
147 #endif
148 #ifndef ServerConfigDir
149-#define ServerConfigDir $(LIBDIR)/xserver
150+#define ServerConfigDir $(ETCX11DIR)/xserver
151 #endif
152 #ifndef XPrintDir
153 #define XPrintDir ServerConfigDir
e1fe05b9
JR		 154 #endif
155-#ifndef EtcX11Directory
156-#define EtcX11Directory /etc/X11
157-#endif
158 #ifndef InstallSecurityConfig
159 #define InstallSecurityConfig YES /* Install sample security policy */
160 #endif
e9cc699d 161@@ -1457,10 +1458,10 @@
e1fe05b9
JR		 162 #define OsNameDefines /* as nothing */
163 #endif
164 #ifndef DefaultUserPath /* for xdm */
165-#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
8a78032e 166+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
e1fe05b9
JR		 167 #endif
168 #ifndef DefaultSystemPath /* for xdm */
169-#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
8a78032e 170+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
e1fe05b9
JR		 171 #endif
172 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
173 #define DefaultSystemShell BourneShell
e9cc699d 174@@ -1587,7 +1588,7 @@
e1fe05b9
JR		 175
176 HTMLINDEXCMD = HtmlIndexCmd
177
178- DOCUTILSRC = $(XTOP)/doc/util
179+ DOCUTILSRC = $(XTOP)/share/doc/util
180 CLIENTSRC = $(TOP)/clients
181 DEMOSRC = $(TOP)/demos
182 XDOCMACROS = $(DOCUTILSRC)/macros.t
e9cc699d 183@@ -1601,7 +1602,7 @@
e1fe05b9
JR		 184 SERVERSRC = $(XTOP)/programs/Xserver
185 CONTRIBSRC = ContribDir
186 UNSUPPORTEDSRC = UnsupportedDir
187- DOCSRC = $(XTOP)/doc
188+ DOCSRC = $(XTOP)/share/doc
189 RGBSRC = $(XTOP)/programs/rgb
190 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
191 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
e9cc699d 192diff -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
193--- xc.orig/config/cf/linux.cf 2003-09-10 13:00:02.000000000 +0200
194+++ xc/config/cf/linux.cf 2003-09-26 10:27:39.767985496 +0200
195@@ -309,7 +309,7 @@
31df3500
JR		 196 */
197 #if BuildXF86DRI
ea1f593a 198 # if defined(i386Architecture)
31df3500
JR		 199-# define BuildLibGlxWithoutPIC YES
200+# define BuildLibGlxWithoutPIC NO
ea1f593a 201 # endif
31df3500
JR		 202 #endif
203
e9cc699d 204@@ -328,7 +328,7 @@
205 # if defined(i386Architecture) || defined(ia64Architecture) || defined(SparcArchitecture) || defined(AlphaArchitecture) || defined(AMD64Architecture)
e1fe05b9
JR		 206 # if OSMajorVersion == 2
207 /* Only tested for Linux 2.2.0 through 2.2.12 */
208-# if OSMinorVersion == 2 && OSTeenyVersion <= 12
209+# if OSMinorVersion == 2
b19d4d8b 210 # define BuildXF86DRM YES
e1fe05b9
JR		 211 # else
212 /* Only tested for Linux 2.3.0 through 2.3.18 */
e9cc699d 213@@ -716,7 +716,7 @@
e1fe05b9
JR		 214
215 #define HasVarRun YES
2452d5b7 216 #ifndef VarDbDirectory
217-# define VarDbDirectory $(VARDIR)/lib
218+# define VarDbDirectory /var/lib
219 #endif
e1fe05b9
JR		 220
221 #ifndef XF86OSCardDrivers
e9cc699d 222diff -Nru xc.orig/config/cf/site.def xc/config/cf/site.def
223--- xc.orig/config/cf/site.def 2002-02-27 01:51:12.000000000 +0100
224+++ xc/config/cf/site.def 2003-09-26 10:27:39.773984584 +0200
2452d5b7 225@@ -119,10 +119,14 @@
e1fe05b9
JR		 226 #define HasSentinel YES
227 */
228
229-/*
230 #undef DefaultUserPath
231-#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
232-*/
8a78032e 233+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
e1fe05b9 234+#undef DefaultSystemPath
8a78032e 235+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
e1fe05b9
JR		 236+
237+
238+#define HasPam YES
54408bbb 239+#define HasPamMisc YES
e1fe05b9
JR		 240
241
242 /* You do NOT need SetUID if you only run the server under xdm */
e9cc699d 243diff -Nru xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def
244--- xc.orig/config/cf/xf86site.def 2003-09-10 13:00:03.000000000 +0200
245+++ xc/config/cf/xf86site.def 2003-09-26 10:27:39.790982000 +0200
246@@ -260,8 +260,8 @@
2452d5b7 247 /*
248 * To not build/install the Cyrillic fonts, uncomment the following
249 *
250-#define BuildCyrillicFonts NO
251 */
252+#define BuildCyrillicFonts YES
253
254 /*
255 * To not install the local font directory, uncomment the following
e9cc699d 256@@ -307,27 +307,26 @@
2452d5b7 257 * HasGlide2 to YES and set the Glide2IncDir variable.
258 * HasGlide2 is per default NO.
259 *
260-#define HasGlide2 YES
261 */
262+#define HasGlide2 YES
263
264 /*
265 * Set the path to your Glide include files.
266 *
267-#define Glide2IncDir /usr/include/glide
268 */
269+#define Glide2IncDir /usr/include/glide
270
271 /*
272 * Have glide 3?
273 *
274-#define HasGlide3 YES
275 */
276+#define HasGlide3 YES
277
278 /*
279 * Set the path to your Glide 3 include files.
280 *
281-#define Glide3IncDir /usr/include/glide3
282 */
283-
284+#define Glide3IncDir /usr/include/glide3
285
286
287 /*
e9cc699d 288@@ -429,8 +428,8 @@
e1fe05b9
JR		 289 * Some Linux releases don't have a libtermcap. In this case you may need
290 * to uncomment the following
291 *
292-#define TermcapLibrary -lncurses
293 */
294+#define TermcapLibrary -lncurses
295
296 /*
e9cc699d 297 * Build a server that dynamically loads the modules by setting
298@@ -605,8 +604,8 @@
e1fe05b9
JR		 299 * To forceably build static libraries in addition to shared libraries,
300 * uncomment this.
301 *
302-#define ForceNormalLib YES
303 */
304+#define ForceNormalLib YES
305
306 /*
307 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
e9cc699d 308diff -Nru xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
309--- xc.orig/config/cf/xfree86.cf 2003-09-25 13:00:04.000000000 +0200
310+++ xc/config/cf/xfree86.cf 2003-09-26 10:31:13.596478624 +0200
311@@ -128,7 +128,7 @@
e1fe05b9
JR		 312 #define XConfigFile XF86Config
313 #endif
314 #ifndef XConfigDir
315-#define XConfigDir $(LIBDIR)
316+#define XConfigDir $(ETCX11DIR)
317 #endif
b19d4d8b
JR		 318 #ifndef XLogFile
319 #define XLogFile XFree86
e9cc699d 320@@ -760,7 +760,7 @@
321
91e66983 322 # ifndef XF86CardDrivers
e9cc699d 323 # define XF86CardDrivers mga glint nv s3 s3virge sis savage \
324- trident chips tdfx fbdev ati \
325+ trident chips fbdev ati \
326 DevelDrivers newport \
91e66983 327 XF86OSCardDrivers XF86ExtraCardDrivers
328 # endif
e9cc699d 329diff -Nru xc.orig/config/imake/imake.c xc/config/imake/imake.c
330--- xc.orig/config/imake/imake.c 2003-04-10 13:00:03.000000000 +0200
331+++ xc/config/imake/imake.c 2003-09-26 10:27:39.803980024 +0200
2452d5b7 332@@ -1057,6 +1057,7 @@
333 static char* suse = "/etc/SuSE-release";
e1fe05b9
JR		 334 static char* redhat = "/etc/redhat-release";
335 static char* debian = "/etc/debian_version";
336+ static char* pld = "/etc/pld-release";
337
338 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
339 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
2452d5b7 340@@ -1071,6 +1072,7 @@
e1fe05b9
JR		 341 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
342 fprintf (inFile, "%s\n", "#define LinuxWare 11");
343 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
344+ fprintf (inFile, "%s\n", "#define LinuxPLD 13");
345
2452d5b7 346 #ifdef CROSSCOMPILE
347 if (CrossCompiling) {
348@@ -1097,6 +1099,11 @@
e1fe05b9 349 * at the content of /etc/debian_version */
2452d5b7 350 return;
351 }
e1fe05b9
JR		 352+ if (lstat (pld, &sb) == 0) {
353+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
354+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
2452d5b7 355+ return;
356+ }
e1fe05b9 357 /* what's the definitive way to tell what any particular distribution is? */
2452d5b7 358
359 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
e9cc699d 360diff -Nru xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
361--- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-03-04 17:25:10.000000000 +0100
362+++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-09-26 10:27:39.000000000 +0200
2452d5b7 363@@ -93,7 +93,7 @@
364
365 #if HasNCurses
366 CURSESLIB = NCursesLibName
367-CURSESDEFINES = -DHAS_NCURSES
368+CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
369 #endif
370
371 XF86CONFIGFILE = XConfigFile
e9cc699d 372diff -Nru xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
373--- xc.orig/programs/xdm/config/Xres.cpp 2003-01-04 04:11:31.000000000 +0100
374+++ xc/programs/xdm/config/Xres.cpp 2003-09-26 10:27:39.000000000 +0200
2452d5b7 375@@ -70,10 +70,10 @@
376 #endif /* XPM */
e1fe05b9
JR		 377 /**/#endif
378 #ifdef XPM
fa05ba13 379-/**/#if PLANES >= 8
e1fe05b9 380-xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
fa05ba13 381+/**/#if PLANES >= 15
8a78032e 382+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
e1fe05b9
JR		 383 /**/#else
384-xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
385+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
386 /**/#endif
387 xlogin*useShape: true
388 xlogin*logoPadding: 10
e9cc699d 389diff -Nru xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
390--- xc.orig/programs/xdm/resource.c 2003-09-25 13:06:32.000000000 +0200
391+++ xc/programs/xdm/resource.c 2003-09-26 10:27:39.000000000 +0200
392@@ -84,31 +84,31 @@
e1fe05b9 393 */
e9cc699d 394 #ifndef __EMX__
e1fe05b9
JR		 395 #ifndef DEF_SERVER_LINE
396-#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
47559fe6 397+#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
e1fe05b9
JR		 398 #endif
399 #ifndef XRDB_PROGRAM
400-#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
47559fe6 401+#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
e1fe05b9
JR		 402 #endif
403 #ifndef DEF_SESSION
404-#define DEF_SESSION "/usr/bin/X11/xterm -ls"
47559fe6 405+#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
e1fe05b9
JR		 406 #endif
407 #ifndef DEF_USER_PATH
408-#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
47559fe6 409+#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
e1fe05b9
JR		 410 #endif
411 #ifndef DEF_SYSTEM_PATH
412-#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
47559fe6 413+#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
e1fe05b9
JR		 414 #endif
415 #ifndef DEF_SYSTEM_SHELL
416 #define DEF_SYSTEM_SHELL "/bin/sh"
417 #endif
418 #ifndef DEF_FAILSAFE_CLIENT
419-#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
47559fe6 420+#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
e1fe05b9
JR		 421 #endif
422 #ifndef DEF_XDM_CONFIG
423-#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
424+#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
425 #endif
426 #ifndef DEF_CHOOSER
427-#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
428+#define DEF_CHOOSER "/etc/X11/xdm/chooser"
429 #endif
430 #ifndef DEF_AUTH_NAME
431 #ifdef HASXDMAUTH
e9cc699d 432@@ -118,7 +118,7 @@
e1fe05b9
JR		 433 #endif
434 #endif
435 #ifndef DEF_AUTH_DIR
436-#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
437+#define DEF_AUTH_DIR "/etc/X11/xdm"
438 #endif
439 #ifndef DEF_USER_AUTH_DIR
440 #define DEF_USER_AUTH_DIR "/tmp"
e9cc699d 441diff -Nru xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile
442--- xc.orig/programs/xinit/Imakefile 2003-06-10 13:08:06.000000000 +0200
443+++ xc/programs/xinit/Imakefile 2003-09-26 10:27:39.000000000 +0200
2452d5b7 444@@ -39,11 +39,12 @@
e1fe05b9
JR		 445 InstallNamedProg(startx,startx,$(BINDIR))
446 InstallManPage(startx,$(MANDIR))
447
448-#if InstallXinitConfig
449-InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
450-#else
451-InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
452-#endif
453+XCOMM Red Hat gets this from a different package
454+XCOMM #if InstallXinitConfig
455+XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
456+XCOMM #else
457+XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
458+XCOMM #endif
e1fe05b9
JR		 459
460 LinkConfDirectory(xinit,.,xinit,.)
2452d5b7 461
e9cc699d 462diff -Nru xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
463--- xc.orig/programs/xterm/Imakefile 2003-09-25 13:06:59.000000000 +0200
464+++ xc/programs/xterm/Imakefile 2003-09-26 10:27:39.000000000 +0200
e1fe05b9
JR		 465@@ -36,6 +36,10 @@
466 #define XkbClientLibs /**/
467 #endif
468
469+#if InstallXtermSetUID
470+#undef InstallXtermSetUID
471+#endif
472+
473 #ifndef SpecialCObjectRule
474 #define SpecialCObjectRule(module,ignore,defines) \
475 module.o: ; $(CC) -c defines $(CFLAGS) module.c
476@@ -57,6 +61,8 @@
477 PTYLIB = -lpucc
478 #endif
479
480+ PTYLIB = -lutil
481+
2452d5b7 482 #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
483 (defined(LinuxArchitecture) && \
484 (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
e9cc699d 485@@ -115,7 +121,7 @@
e1fe05b9
JR		 486 MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
487 XKB_DEFINES = XkbClientDefines
2452d5b7 488 PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
489- DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
490+ DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
491 INCLUDES = $(XRFINCLUDES)
e1fe05b9
JR		 492
493 #ifdef OS2Architecture
e9cc699d 494diff -Nru xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h
495--- xc.orig/programs/xterm/xterm.h 2003-09-25 13:07:01.000000000 +0200
496+++ xc/programs/xterm/xterm.h 2003-09-26 10:27:39.000000000 +0200
2452d5b7 497@@ -73,7 +73,7 @@
e1fe05b9
JR		 498 #endif
499
500 #ifndef DFT_TERMTYPE
501-#define DFT_TERMTYPE "xterm"
502+#define DFT_TERMTYPE "xterm-color"
503 #endif
504
505 #ifndef X_NOT_POSIX
XFree86 Window System servers and basic programs
This page took 0.10686 seconds and 4 git commands to generate.