1 --- xc/Makefile 2006-06-11 00:28:00.305505872 +0200
2 +++ xc/Makefile-new 2006-06-11 00:31:06.181248464 +0200
4 # Luna users will need to either run make as "make MAKE=make"
5 # or add "MAKE = make" to this file.
12 --- xc/config/cf/Imake.cf.orig 2006-01-09 15:56:12.000000000 +0100
13 +++ xc/config/cf/Imake.cf 2006-06-11 00:28:00.321503440 +0200
15 # define s390Architecture
19 +# define AlphaArchitecture
23 # define AlphaArchitecture
25 --- xc/config/cf/Imake.tmpl.orig 2006-04-03 01:12:46.000000000 +0200
26 +++ xc/config/cf/Imake.tmpl 2006-06-11 00:28:00.323503136 +0200
29 #ifndef BuildHtmlManPages
31 -#define BuildHtmlManPages YES
32 +#define BuildHtmlManPages NO
34 #define BuildHtmlManPages NO
37 #define LintlibDir $(USRLIBDIR)/lint
39 #ifndef SystemManDirectory
41 #define SystemManDirectory /usr/share/man
43 -#define SystemManDirectory /usr/man
46 #ifndef ManDirectoryRoot
49 #define NoRConst NO /* YES if const for structs of funcs is bad */
52 -#define InstPgmFlags -s
56 #define InstBinFlags -m 0755
58 #define CppCmd /LibDirName/cpp
61 -#define RawCppCmd CppCmd -undef
62 +#define RawCppCmd CppCmd
64 #ifndef CppNoLineInfoOption
65 #define CppNoLineInfoOption /**/
66 --- xc/config/cf/X11.tmpl.orig 2006-04-18 17:57:25.000000000 +0200
67 +++ xc/config/cf/X11.tmpl 2006-06-11 00:28:00.327502528 +0200
68 @@ -1649,8 +1649,12 @@
69 # define UsbMouseSupport NO
72 +#ifndef EtcX11Directory
73 +#define EtcX11Directory /etc/X11
76 #ifndef DefaultFSConfigFile
77 -#define DefaultFSConfigFile $(LIBDIR)/fs/config
78 +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
81 /* X-TrueType settings */
83 #define ConfigDir $(LIBDIR)/config
86 -#define DocDir $(LIBDIR)/doc
87 +#define DocDir $(LIBDIR)/share/doc
90 #define DocHtmlDir $(DOCDIR)/html
91 @@ -1795,31 +1799,31 @@
92 #define DocPdfDir $(DOCDIR)/PDF
95 -#define FontDir $(LIBDIR)/fonts
96 +#define FontDir /usr/share/fonts
99 -#define AdmDir /usr/adm
100 +#define AdmDir /var/log
103 -#define XinitDir $(LIBDIR)/xinit
104 +#define XinitDir $(ETCX11DIR)/xinit
107 -#define XdmDir $(LIBDIR)/xdm
108 +#define XdmDir $(ETCX11DIR)/xdm
111 #define XdmVarDir $(VARLIBDIR)/xdm
114 -#define XdmAuthDir $(LIBDIR)/xdm
115 +#define XdmAuthDir $(ETCX11DIR)/xdm
117 #ifndef XdmConfigurationSubdirectory /* under xdm sources */
118 #define XdmConfigurationSubdirectory config
121 -#define TwmDir $(LIBDIR)/twm
122 +#define TwmDir $(ETCX11DIR)/twm
125 -#define XsmDir $(LIBDIR)/xsm
126 +#define XsmDir $(ETCX11DIR)/xsm
129 #define NlsDir $(LIBDIR)/nls
130 @@ -1828,23 +1832,20 @@
131 #define XLocaleDir $(LIBDIR)/locale
134 -#define LbxproxyDir $(LIBDIR)/lbxproxy
135 +#define LbxproxyDir $(ETCX11DIR)/lbxproxy
137 #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
138 #define LbxproxyConfigSubdir config
140 #ifndef ProxyManagerDir
141 -#define ProxyManagerDir $(LIBDIR)/proxymngr
142 +#define ProxyManagerDir $(ETCX11DIR)/proxymngr
144 #ifndef ServerConfigDir
145 -#define ServerConfigDir $(LIBDIR)/xserver
146 +#define ServerConfigDir $(ETCX11DIR)/xserver
149 #define XPrintDir ServerConfigDir
151 -#ifndef EtcX11Directory
152 -#define EtcX11Directory /etc/X11
154 #ifndef InstallSecurityConfig
155 #define InstallSecurityConfig YES /* Install sample security policy */
157 @@ -1876,10 +1877,10 @@
158 #define OsNameDefines /* as nothing */
160 #ifndef DefaultUserPath /* for xdm */
161 -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
162 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
164 #ifndef DefaultSystemPath /* for xdm */
165 -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
166 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
168 #ifndef DefaultSystemShell /* for xdm to set in SHELL */
169 #define DefaultSystemShell BourneShell
170 @@ -2014,7 +2015,7 @@
172 HTMLINDEXCMD = HtmlIndexCmd
174 - DOCUTILSRC = $(XTOP)/doc/util
175 + DOCUTILSRC = $(XTOP)/share/doc/util
176 CLIENTSRC = $(TOP)/clients
177 DEMOSRC = $(TOP)/demos
178 XDOCMACROS = $(DOCUTILSRC)/macros.t
179 @@ -2028,7 +2029,7 @@
180 SERVERSRC = $(XTOP)/programs/Xserver
181 CONTRIBSRC = ContribDir
182 UNSUPPORTEDSRC = UnsupportedDir
183 - DOCSRC = $(XTOP)/doc
184 + DOCSRC = $(XTOP)/share/doc
185 RGBSRC = $(XTOP)/programs/rgb
186 BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
187 MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
188 --- xc/config/cf/linux.cf.orig 2006-04-03 01:12:46.000000000 +0200
189 +++ xc/config/cf/linux.cf 2006-06-11 00:28:00.329502224 +0200
193 # if defined(i386Architecture)
194 -# define BuildLibGlxWithoutPIC YES
195 +# define BuildLibGlxWithoutPIC NO
201 #define HasVarRun YES
202 #ifndef VarDbDirectory
203 -# define VarDbDirectory $(VARDIR)/lib
204 +# define VarDbDirectory /var/lib
207 #ifndef XF86OSCardDrivers
208 --- xc/config/cf/site.def.orig 2006-01-09 15:56:13.000000000 +0100
209 +++ xc/config/cf/site.def 2006-06-11 00:28:00.330502072 +0200
210 @@ -104,10 +104,10 @@
211 #define HasSentinel YES
215 #undef DefaultUserPath
216 -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
218 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
219 +#undef DefaultSystemPath
220 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
223 /* You do NOT need SetUID if you only run the server under xdm */
224 --- xc/config/cf/xf86site.def.orig 2006-04-08 20:33:00.000000000 +0200
225 +++ xc/config/cf/xf86site.def 2006-06-11 00:28:00.335501312 +0200
228 * To not build/install the Cyrillic fonts, uncomment the following
230 -#define BuildCyrillicFonts NO
232 +#define BuildCyrillicFonts YES
235 * To not install the local font directory, uncomment the following
237 * Some Linux releases don't have a libtermcap. In this case you may need
238 * to uncomment the following
240 -#define TermcapLibrary -lncurses
242 +#define TermcapLibrary -ltinfo
245 * Build a server that dynamically loads the modules by setting
247 * To forceably build static libraries in addition to shared libraries,
250 -#define ForceNormalLib YES
252 +#define ForceNormalLib YES
255 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
257 #define X86EMU_LIBPATH /usr/local/lib
261 +/* these must be before linux.cf is included */
264 +#define HasPamMisc YES
265 +#define HasFontconfig YES
266 --- xc/config/cf/xfree86.cf.orig 2006-04-26 02:28:16.000000000 +0200
267 +++ xc/config/cf/xfree86.cf 2006-06-11 00:28:00.337501008 +0200
269 #define XConfigFile XF86Config
272 -#define XConfigDir $(LIBDIR)
273 +#define XConfigDir $(ETCX11DIR)
276 #define XLogFile XFree86
279 # ifndef XF86CardDrivers
280 # define XF86CardDrivers mga glint nv s3 s3virge sis savage \
281 - trident chips tdfx fbdev ati \
282 + trident chips fbdev ati \
283 DevelDrivers newport \
284 XF86OSCardDrivers XF86ExtraCardDrivers
286 --- xc/config/imake/imake.c.orig 2006-01-09 15:56:14.000000000 +0100
287 +++ xc/config/imake/imake.c 2006-06-11 00:28:00.339500704 +0200
288 @@ -1056,6 +1056,7 @@
289 static char* suse = "/etc/SuSE-release";
290 static char* redhat = "/etc/redhat-release";
291 static char* debian = "/etc/debian_version";
292 + static char* pld = "/etc/pld-release";
294 fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
295 fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
296 @@ -1070,6 +1071,7 @@
297 fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
298 fprintf (inFile, "%s\n", "#define LinuxWare 11");
299 fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
300 + fprintf (inFile, "%s\n", "#define LinuxPLD 13");
303 if (CrossCompiling) {
304 @@ -1096,6 +1098,11 @@
305 * at the content of /etc/debian_version */
308 + if (lstat (pld, &sb) == 0) {
309 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
310 + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
313 /* what's the definitive way to tell what any particular distribution is? */
315 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
316 --- xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig 2006-03-11 18:36:50.000000000 +0100
317 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2006-06-11 00:28:00.340500552 +0200
321 CURSESLIB = NCursesLibName
322 -CURSESDEFINES = -DHAS_NCURSES
323 +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
326 XF86CONFIGFILE = XConfigFile
327 --- xc/programs/xdm/config/Xres.cpp.orig 2006-01-09 16:01:06.000000000 +0100
328 +++ xc/programs/xdm/config/Xres.cpp 2006-06-11 00:28:00.341500400 +0200
334 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
336 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
338 -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
339 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
341 xlogin*useShape: true
342 xlogin*logoPadding: 10
343 --- xc/programs/xdm/resource.c.orig 2006-01-09 16:01:04.000000000 +0100
344 +++ xc/programs/xdm/resource.c 2006-06-11 00:28:00.342500248 +0200
348 #ifndef DEF_SERVER_LINE
349 -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
350 +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
353 -#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
354 +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
357 -#define DEF_SESSION "/usr/bin/X11/xterm -ls"
358 +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
360 #ifndef DEF_USER_PATH
361 -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
362 +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
364 #ifndef DEF_SYSTEM_PATH
365 -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
366 +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
368 #ifndef DEF_SYSTEM_SHELL
369 #define DEF_SYSTEM_SHELL "/bin/sh"
371 #ifndef DEF_FAILSAFE_CLIENT
372 -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
373 +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
375 #ifndef DEF_XDM_CONFIG
376 -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
377 +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
380 -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
381 +#define DEF_CHOOSER "/etc/X11/xdm/chooser"
383 #ifndef DEF_AUTH_NAME
389 -#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
390 +#define DEF_AUTH_DIR "/etc/X11/xdm"
392 #ifndef DEF_USER_AUTH_DIR
393 #define DEF_USER_AUTH_DIR "/tmp"
394 --- xc/programs/xinit/Imakefile.orig 2006-03-06 17:06:23.000000000 +0100
395 +++ xc/programs/xinit/Imakefile 2006-06-11 00:28:00.342500248 +0200
398 InstallManPage(startx,$(MANDIR))
400 -#if InstallXinitConfig
401 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
403 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
405 +XCOMM PLD gets this from a different package
406 +XCOMM #if InstallXinitConfig
407 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
409 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
412 LinkConfDirectory(xinit,.,xinit,.)
414 --- xc/programs/xterm/Imakefile.orig 2008-11-01 20:57:39.000000000 +0100
415 +++ xc/programs/xterm/Imakefile 2013-02-15 18:39:33.885210018 +0100
420 +#if InstallXtermSetUID
421 +#undef InstallXtermSetUID
424 #ifndef SpecialCObjectRule
425 #define SpecialCObjectRule(module,ignore,defines) \
426 module.o: ; $(CC) -c defines $(CFLAGS) module.c
428 $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) \
429 $(XTERM_FEATURE_OPTIONS) $(PUTENVDEF) \
430 $(IMAKEDEFINES) $(TRACEDEF)
431 - INCLUDES = $(OBSOLETE_INCLUDES) $(XRFINCLUDES)
432 + INCLUDES = $(OBSOLETE_INCLUDES) $(XRFINCLUDES) -I/usr/include/ncurses
434 #ifdef OS2Architecture