-diff -Nur XFree86-4.0.2.org/xc/Makefile XFree86-4.0.2/xc/Makefile
---- XFree86-4.0.2.org/xc/Makefile Wed Mar 22 22:23:30 2000
-+++ XFree86-4.0.2/xc/Makefile Wed Dec 20 13:41:02 2000
-@@ -5,10 +5,10 @@
+diff -Nru xc.orig/Makefile xc/Makefile
+--- xc.orig/Makefile 2003-11-02 05:38:01.000000000 +0100
++++ xc/Makefile 2003-12-23 12:09:12.071230112 +0100
+@@ -8,7 +8,7 @@
# or add "MAKE = make" to this file.
- RELEASE = "Release 6.4"
+ RELEASE = "Release 6.6"
-SHELL = /bin/sh
+SHELL = /bin/sh -e
RM = rm -f
MV = mv
--WORLDOPTS = -k
-+WORLDOPTS =
- WIN32WORLDOPTS = -i
- TOP = .
- CURRENT_DIR = .
-diff -Nur XFree86-4.0.2.org/xc/config/cf/Imake.cf XFree86-4.0.2/xc/config/cf/Imake.cf
---- XFree86-4.0.2.org/xc/config/cf/Imake.cf Mon Nov 6 23:53:47 2000
-+++ XFree86-4.0.2/xc/config/cf/Imake.cf Wed Dec 20 13:41:02 2000
-@@ -689,6 +689,10 @@
+ WORLDOPTS =
+diff -Nru xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
+--- xc.orig/config/cf/Imake.cf 2003-12-19 05:40:33.000000000 +0100
++++ xc/config/cf/Imake.cf 2003-12-23 12:09:11.983243488 +0100
+@@ -784,6 +784,10 @@
# define s390Architecture
# undef __s390__
# endif /* s390 */
# ifdef __alpha
# define AlphaArchitecture
# undef __alpha
-diff -Nur XFree86-4.0.2.org/xc/config/cf/Imake.tmpl XFree86-4.0.2/xc/config/cf/Imake.tmpl
---- XFree86-4.0.2.org/xc/config/cf/Imake.tmpl Tue Dec 5 01:45:28 2000
-+++ XFree86-4.0.2/xc/config/cf/Imake.tmpl Wed Dec 20 13:41:02 2000
-@@ -220,7 +220,7 @@
+diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
+--- xc.orig/config/cf/Imake.tmpl 2003-11-21 06:55:02.000000000 +0100
++++ xc/config/cf/Imake.tmpl 2003-12-23 12:09:11.992242120 +0100
+@@ -261,7 +261,7 @@
#ifndef BuildHtmlManPages
#ifdef RmanCmd
#else
#define BuildHtmlManPages NO
#endif
-@@ -686,11 +686,7 @@
+@@ -854,11 +854,7 @@
#define LintlibDir $(USRLIBDIR)/lint
#endif
#ifndef SystemManDirectory
#endif
#ifndef ManDirectoryRoot
#ifdef ProjectRoot
-@@ -817,7 +813,7 @@
+@@ -998,7 +994,7 @@
#define NoRConst NO /* YES if const for structs of funcs is bad */
#endif
#ifndef InstPgmFlags
#endif
#ifndef InstBinFlags
#define InstBinFlags -m 0755
-@@ -958,7 +954,7 @@
- #define CppCmd /lib/cpp
+@@ -1140,7 +1136,7 @@
+ #define CppCmd /LibDirName/cpp
#endif
#ifndef RawCppCmd
-#define RawCppCmd CppCmd -undef
#endif
#ifndef CppNoLineInfoOption
#define CppNoLineInfoOption /**/
-diff -Nur XFree86-4.0.2.org/xc/config/cf/X11.tmpl XFree86-4.0.2/xc/config/cf/X11.tmpl
---- XFree86-4.0.2.org/xc/config/cf/X11.tmpl Sat Dec 16 07:39:25 2000
-+++ XFree86-4.0.2/xc/config/cf/X11.tmpl Wed Dec 20 13:41:02 2000
-@@ -882,8 +882,12 @@
- #endif
+diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
+--- xc.orig/config/cf/X11.tmpl 2003-12-19 05:41:17.000000000 +0100
++++ xc/config/cf/X11.tmpl 2003-12-23 12:09:12.042234520 +0100
+@@ -1262,8 +1262,12 @@
+ # define UsbMouseSupport NO
#endif
+#ifndef EtcX11Directory
#endif
/* X-TrueType settings */
-@@ -1002,7 +1006,7 @@
+@@ -1389,7 +1393,7 @@
#define ConfigDir $(LIBDIR)/config
#endif
#ifndef DocDir
#endif
#ifndef DocHtmlDir
#define DocHtmlDir $(DOCDIR)/html
-@@ -1011,31 +1015,31 @@
- #define DocPsDir $(DOCDIR)/PostScript
+@@ -1401,31 +1405,31 @@
+ #define DocPdfDir $(DOCDIR)/PDF
#endif
#ifndef FontDir
-#define FontDir $(LIBDIR)/fonts
#endif
#ifndef NlsDir
#define NlsDir $(LIBDIR)/nls
-@@ -1047,23 +1051,20 @@
- #define PexApiDir $(LIBDIR)/PEX
+@@ -1434,23 +1438,20 @@
+ #define XLocaleDir $(LIBDIR)/locale
#endif
#ifndef LbxproxyDir
-#define LbxproxyDir $(LIBDIR)/lbxproxy
#ifndef InstallSecurityConfig
#define InstallSecurityConfig YES /* Install sample security policy */
#endif
-@@ -1095,10 +1096,10 @@
+@@ -1482,10 +1483,10 @@
#define OsNameDefines /* as nothing */
#endif
#ifndef DefaultUserPath /* for xdm */
#endif
#ifndef DefaultSystemShell /* for xdm to set in SHELL */
#define DefaultSystemShell BourneShell
-@@ -1211,7 +1212,7 @@
+@@ -1614,7 +1615,7 @@
HTMLINDEXCMD = HtmlIndexCmd
CLIENTSRC = $(TOP)/clients
DEMOSRC = $(TOP)/demos
XDOCMACROS = $(DOCUTILSRC)/macros.t
-@@ -1225,7 +1226,7 @@
+@@ -1628,7 +1629,7 @@
SERVERSRC = $(XTOP)/programs/Xserver
CONTRIBSRC = ContribDir
UNSUPPORTEDSRC = UnsupportedDir
RGBSRC = $(XTOP)/programs/rgb
BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
-diff -Nur XFree86-4.0.2.org/xc/config/cf/linux.cf XFree86-4.0.2/xc/config/cf/linux.cf
---- XFree86-4.0.2.org/xc/config/cf/linux.cf Thu Dec 14 20:24:08 2000
-+++ XFree86-4.0.2/xc/config/cf/linux.cf Wed Dec 20 13:45:03 2000
-@@ -276,7 +276,7 @@
- # if defined(i386Architecture) || defined(ia64Architecture)
- # if OSMajorVersion == 2
- /* Only tested for Linux 2.2.0 through 2.2.12 */
--# if OSMinorVersion == 2 && OSTeenyVersion <= 12
-+# if OSMinorVersion == 2
- # define BuildXF86DRM YES
- # else
- /* Only tested for Linux 2.3.0 through 2.3.18 */
-@@ -565,7 +565,7 @@
- #define StandardCppDefines StandardDefines
-
- #define HasVarRun YES
--#define VarDbDirectory $(VARDIR)/lib
-+#define VarDbDirectory /var/lib
-
- #ifndef XF86OSCardDrivers
- # define XF86OSCardDrivers v4l
-@@ -704,10 +704,10 @@
+diff -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
+--- xc.orig/config/cf/linux.cf 2003-12-19 05:41:59.000000000 +0100
++++ xc/config/cf/linux.cf 2003-12-23 12:09:12.008239688 +0100
+@@ -333,7 +333,7 @@
+ */
+ #if BuildXF86DRI
+ # if defined(i386Architecture)
+-# define BuildLibGlxWithoutPIC YES
++# define BuildLibGlxWithoutPIC NO
+ # endif
#endif
- #ifndef LinkGLToUsrLib
--# define LinkGLToUsrLib YES
-+# define LinkGLToUsrLib NO
- #endif
- # ifndef LinkGLToUsrInclude
--# define LinkGLToUsrInclude YES
-+# define LinkGLToUsrInclude NO
- #endif
+@@ -720,7 +720,7 @@
+ #define HasVarRun YES
+ #ifndef VarDbDirectory
+-# define VarDbDirectory $(VARDIR)/lib
++# define VarDbDirectory /var/lib
+ #endif
-diff -Nur XFree86-4.0.2.org/xc/config/cf/site.def XFree86-4.0.2/xc/config/cf/site.def
---- XFree86-4.0.2.org/xc/config/cf/site.def Tue Jun 27 02:55:45 2000
-+++ XFree86-4.0.2/xc/config/cf/site.def Wed Dec 20 13:41:02 2000
-@@ -131,10 +131,14 @@
+ #ifndef XF86OSCardDrivers
+diff -Nru xc.orig/config/cf/site.def xc/config/cf/site.def
+--- xc.orig/config/cf/site.def 2002-02-27 01:51:12.000000000 +0100
++++ xc/config/cf/site.def 2003-12-23 12:09:12.014238776 +0100
+@@ -119,10 +119,14 @@
#define HasSentinel YES
*/
/* You do NOT need SetUID if you only run the server under xdm */
-diff -Nur XFree86-4.0.2.org/xc/config/cf/xf86site.def XFree86-4.0.2/xc/config/cf/xf86site.def
---- XFree86-4.0.2.org/xc/config/cf/xf86site.def Thu Dec 14 20:24:16 2000
-+++ XFree86-4.0.2/xc/config/cf/xf86site.def Wed Dec 20 13:41:03 2000
-@@ -134,16 +134,16 @@
- * Some Linux releases don't have a libtermcap. In this case you may need
- * to uncomment the following
- *
--#define TermcapLibrary -lncurses
- */
-+#define TermcapLibrary -lncurses
-
- /*
- * If you have Tk (which is required to build XF86Setup), uncomment this
- * Note: version 4.0 or 4.1 is required, and XF86Setup links it statically by
- * default.
- *
--#define HasTk YES
- */
-+#define HasTk YES
-
- /*
- * Set the paths and names for your Tk library if they don't match the
-@@ -156,25 +156,25 @@
- *
- * Some Linux releases need TkLibDir set to /usr/X11R6/lib
- *
--#define TkLibDir /usr/local/lib
--#define TkIncDir /usr/local/include
--#define TkLibName tk
- */
-+#define TkLibDir /usr/lib
-+#define TkIncDir /usr/include
-+#define TkLibName tk
-
- /*
- * By default, XF86Setup is linked with a static Tk library. To change
- * that, uncomment the following line.
- *
--#define XF86SetupUsesStaticTk NO
- */
-+#define XF86SetupUsesStaticTk NO
-
- /*
- * If you have Tcl (which is required to build XF86Setup), uncomment this
- * Note: version 7.4 or 7.5 is required, and XF86Setup links it statically by
- * default.
- *
--#define HasTcl YES
- */
-+#define HasTcl YES
-
- /*
- * Set the paths and names for your Tcl library if they don't match the
-@@ -184,17 +184,17 @@
- *
- * Some Linux releases need TclIncDir set to /usr/include/tcl.
- *
--#define TclLibDir /usr/local/lib
--#define TclIncDir /usr/local/include
--#define TclLibName tcl
- */
-+#define TclLibDir /usr/lib
-+#define TclIncDir /usr/include
-+#define TclLibName tcl
-
- /*
- * By default, XF86Setup is linked with a static Tcl library. To change
- * that, uncomment the following line.
- *
--#define XF86SetupUsesStaticTcl NO
- */
-+#define XF86SetupUsesStaticTcl NO
-
- /*
- * Build a server that dynamically loads the modules by setting
-@@ -436,8 +436,8 @@
+diff -Nru xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def
+--- xc.orig/config/cf/xf86site.def 2003-09-10 13:00:03.000000000 +0200
++++ xc/config/cf/xf86site.def 2003-12-23 12:09:12.050233304 +0100
+@@ -260,8 +260,8 @@
/*
* To not build/install the Cyrillic fonts, uncomment the following
*
+#define BuildCyrillicFonts YES
/*
- * To not build/install the Latin2 fonts, uncomment the following
-@@ -626,8 +626,8 @@
- * To forceably build static libraries in addition to shared libraries,
- * uncomment this.
- *
--#define ForceNormalLib YES
- */
-+#define ForceNormalLib YES
-
- /*
- * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
-@@ -713,26 +713,26 @@
+ * To not install the local font directory, uncomment the following
+@@ -307,27 +307,26 @@
* HasGlide2 to YES and set the Glide2IncDir variable.
* HasGlide2 is per default NO.
*
+#define Glide2IncDir /usr/include/glide
/*
- * The 3Dfx 3D DRI driver requires glide 3.
+ * Have glide 3?
*
-#define HasGlide3 YES
*/
*
-#define Glide3IncDir /usr/include/glide3
*/
+-
+#define Glide3IncDir /usr/include/glide3
+
+ /*
+@@ -429,8 +428,8 @@
+ * Some Linux releases don't have a libtermcap. In this case you may need
+ * to uncomment the following
+ *
+-#define TermcapLibrary -lncurses
+ */
++#define TermcapLibrary -lncurses
+
/*
- * Undefine the following if you don't want to have config files and
-diff -Nur XFree86-4.0.2.org/xc/config/cf/xfree86.cf XFree86-4.0.2/xc/config/cf/xfree86.cf
---- XFree86-4.0.2.org/xc/config/cf/xfree86.cf Thu Dec 14 20:24:17 2000
-+++ XFree86-4.0.2/xc/config/cf/xfree86.cf Wed Dec 20 13:52:03 2000
-@@ -28,7 +28,7 @@
+ * Build a server that dynamically loads the modules by setting
+@@ -605,8 +604,8 @@
+ * To forceably build static libraries in addition to shared libraries,
+ * uncomment this.
+ *
+-#define ForceNormalLib YES
+ */
++#define ForceNormalLib YES
+
+ /*
+ * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
+diff -Nru xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
+--- xc.orig/config/cf/xfree86.cf 2003-11-21 06:55:07.000000000 +0100
++++ xc/config/cf/xfree86.cf 2003-12-23 12:09:12.055232544 +0100
+@@ -128,7 +128,7 @@
#define XConfigFile XF86Config
#endif
#ifndef XConfigDir
#endif
#ifndef XLogFile
#define XLogFile XFree86
-@@ -520,9 +520,10 @@
+@@ -760,7 +760,7 @@
- /* Pure PCI drivers should go first */
# ifndef XF86CardDrivers
--# define XF86CardDrivers mga glint s3virge sis savage\
-- trident chips fbdev \
-- DevelDrivers vga \
-+# define XF86CardDrivers mga glint nv tga s3virge sis savage\
-+ neomagic i740 tdfx trident chips fbdev \
-+ DevelDrivers vga cirrus tseng apm ati\
-+ r128 ati v4l vga\
+ # define XF86CardDrivers mga glint nv s3 s3virge sis savage \
+- trident chips tdfx fbdev ati \
++ trident chips fbdev ati \
+ DevelDrivers newport \
XF86OSCardDrivers XF86ExtraCardDrivers
# endif
- #endif
-diff -Nur XFree86-4.0.2.org/xc/config/imake/imake.c XFree86-4.0.2/xc/config/imake/imake.c
---- XFree86-4.0.2.org/xc/config/imake/imake.c Wed Nov 29 17:33:50 2000
-+++ XFree86-4.0.2/xc/config/imake/imake.c Wed Dec 20 13:41:03 2000
-@@ -952,6 +952,7 @@
- static char* yast = "/sbin/YaST";
+diff -Nru xc.orig/config/imake/imake.c xc/config/imake/imake.c
+--- xc.orig/config/imake/imake.c 2003-04-10 13:00:03.000000000 +0200
++++ xc/config/imake/imake.c 2003-12-23 12:09:12.060231784 +0100
+@@ -1057,6 +1057,7 @@
+ static char* suse = "/etc/SuSE-release";
static char* redhat = "/etc/redhat-release";
static char* debian = "/etc/debian_version";
+ static char* pld = "/etc/pld-release";
fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
-@@ -966,6 +967,7 @@
+@@ -1071,6 +1072,7 @@
fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
fprintf (inFile, "%s\n", "#define LinuxWare 11");
fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
+ fprintf (inFile, "%s\n", "#define LinuxPLD 13");
- if (lstat (yast, &sb) == 0) {
- fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxSuSE");
-@@ -982,6 +984,11 @@
- fprintf (inFile, "%s\n", "#define DefaultLinuxDistName Debian");
- /* You could also try to get the version of the Debian distrib by looking
+ #ifdef CROSSCOMPILE
+ if (CrossCompiling) {
+@@ -1097,6 +1099,11 @@
* at the content of /etc/debian_version */
-+ return;
-+ }
+ return;
+ }
+ if (lstat (pld, &sb) == 0) {
+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
- return;
- }
++ return;
++ }
/* what's the definitive way to tell what any particular distribution is? */
-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
---- XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Sat Sep 4 15:04:28 1999
-+++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Wed Dec 20 13:41:03 2000
-@@ -118,7 +118,7 @@
- XCONFIG_DEFINES = $(EXT_DEFINES) -DXF86SETUP \
- '-DPROJECTROOT="$(PROJECTROOT)"' \
-- '-DSERVER_CONFIG_FILE="$(LIBDIR)/$(XCONFIGFILE)"' \
-+ '-DSERVER_CONFIG_FILE="/etc/X11/$(XCONFIGFILE)"' \
- $(SITE_FONT_PATH) $(SITE_RGB_DB) \
- -DNO_WRAPPERS
-
-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
---- XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Sun Apr 5 18:15:52 1998
-+++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Wed Dec 20 13:41:03 2000
-@@ -38,7 +38,7 @@
- set devid [lindex $DeviceIDs $idx]
- global Device_$devid
- set server [set Device_${devid}(Server)]
-- set linkname $Xwinhome/bin/X
-+ set linkname /etc/X11/X
- set lastlink $linkname
- for {set nlinks 0} \
- {[file exists $linkname] && [file type $linkname]=="link" \
-@@ -74,7 +74,7 @@
- set CWD [pwd]
- cd $linkdir
- catch "unlink X" ret
-- if [catch "link $Xwinhome/bin/XF86_$server X" ret] {
-+ if [catch "link ../../usr/X11R6/bin/XF86_$server X" ret] {
- mesg $messages(phase5.4) okay
- } else {
- mesg $messages(phase5.5) okay
-diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp
---- XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp Wed Nov 29 17:46:09 2000
-+++ XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp Wed Dec 20 13:41:03 2000
-@@ -66,9 +66,9 @@
- /**/#endif
+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
+diff -Nru xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
+--- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-12-19 05:48:39.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-12-23 12:09:12.000000000 +0100
+@@ -107,7 +107,7 @@
+
+ #if HasNCurses
+ CURSESLIB = NCursesLibName
+-CURSESDEFINES = -DHAS_NCURSES
++CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
+ #endif
+
+ XF86CONFIGFILE = XConfigFile
+diff -Nru xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
+--- xc.orig/programs/xdm/config/Xres.cpp 2003-11-21 07:01:06.000000000 +0100
++++ xc/programs/xdm/config/Xres.cpp 2003-12-23 12:09:12.000000000 +0100
+@@ -71,9 +71,9 @@
+ XHASHendif
#ifdef XPM
- /**/#if PLANES >= 8
+-XHASHif PLANES >= 8
-xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
++XHASHif PLANES > 8
+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
- /**/#else
+ XHASHelse
-xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
- /**/#endif
+ XHASHendif
xlogin*useShape: true
xlogin*logoPadding: 10
-diff -Nur XFree86-4.0.2.org/xc/programs/xdm/resource.c XFree86-4.0.2/xc/programs/xdm/resource.c
---- XFree86-4.0.2.org/xc/programs/xdm/resource.c Sun Dec 6 07:08:49 1998
-+++ XFree86-4.0.2/xc/programs/xdm/resource.c Wed Dec 20 13:41:03 2000
-@@ -70,31 +70,31 @@
+diff -Nru xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
+--- xc.orig/programs/xdm/resource.c 2003-09-25 13:06:32.000000000 +0200
++++ xc/programs/xdm/resource.c 2003-12-23 12:09:12.000000000 +0100
+@@ -84,31 +84,31 @@
*/
#ifndef __EMX__
#ifndef DEF_SERVER_LINE
#endif
#ifndef DEF_AUTH_NAME
#ifdef HASXDMAUTH
-@@ -104,7 +104,7 @@
+@@ -118,7 +118,7 @@
#endif
#endif
#ifndef DEF_AUTH_DIR
#endif
#ifndef DEF_USER_AUTH_DIR
#define DEF_USER_AUTH_DIR "/tmp"
-diff -Nur XFree86-4.0.2.org/xc/programs/xinit/Imakefile XFree86-4.0.2/xc/programs/xinit/Imakefile
---- XFree86-4.0.2.org/xc/programs/xinit/Imakefile Tue Dec 5 01:59:44 2000
-+++ XFree86-4.0.2/xc/programs/xinit/Imakefile Wed Dec 20 13:41:03 2000
-@@ -41,11 +41,13 @@
- InstallNamedProg(startx,startx,$(BINDIR))
+diff -Nru xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile
+--- xc.orig/programs/xinit/Imakefile 2003-11-21 07:01:12.000000000 +0100
++++ xc/programs/xinit/Imakefile 2003-12-23 12:09:12.000000000 +0100
+@@ -46,11 +46,12 @@
+ #endif
InstallManPage(startx,$(MANDIR))
-#if InstallXinitConfig
+XCOMM #else
+XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
+XCOMM #endif
-+
- #endif
LinkConfDirectory(xinit,.,xinit,.)
-diff -Nur XFree86-4.0.2.org/xc/programs/xterm/Imakefile XFree86-4.0.2/xc/programs/xterm/Imakefile
---- XFree86-4.0.2.org/xc/programs/xterm/Imakefile Tue Dec 5 02:00:14 2000
-+++ XFree86-4.0.2/xc/programs/xterm/Imakefile Wed Dec 20 13:43:30 2000
+
+diff -Nru xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
+--- xc.orig/programs/xterm/Imakefile 2003-12-19 05:51:51.000000000 +0100
++++ xc/programs/xterm/Imakefile 2003-12-23 12:11:05.000000000 +0100
@@ -36,6 +36,10 @@
#define XkbClientLibs /**/
#endif
+ PTYLIB = -lutil
+
- #if ((LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
- PTYLIB = -lutil
- #endif
-@@ -109,7 +115,7 @@
- -DOSMINORVERSION=$(OSMINORVERSION)
- MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
+ #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
+ (defined(LinuxArchitecture) && \
+ (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
+@@ -116,7 +122,7 @@
XKB_DEFINES = XkbClientDefines
-- DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF)
-+ DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF)
+ PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
+ DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
+- INCLUDES = -I. $(XRFINCLUDES)
++ INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES)
#ifdef OS2Architecture
- MAINSRC = os2main.c
-diff -Nur XFree86-4.0.2.org/xc/programs/xterm/xterm.h XFree86-4.0.2/xc/programs/xterm/xterm.h
---- XFree86-4.0.2.org/xc/programs/xterm/xterm.h Sat Dec 9 05:02:44 2000
-+++ XFree86-4.0.2/xc/programs/xterm/xterm.h Wed Dec 20 13:41:03 2000
-@@ -62,7 +62,7 @@
- #endif
-
- #ifndef DFT_TERMTYPE
--#define DFT_TERMTYPE "xterm"
-+#define DFT_TERMTYPE "xterm-color"
- #endif
-
- #ifndef X_NOT_POSIX
---- XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile~ Thu Dec 14 20:47:46 2000
-+++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile Fri Dec 22 17:58:27 2000
-@@ -92,7 +92,7 @@
-
- #if HasNCurses
- CURSESLIB = NCursesLibName
--CURSESDEFINES = -DHAS_NCURSES
-+CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
- #endif
-
- DEFINES = -DXF86CONFIG=\"XConfigFile\" $(MODULEDEFINES) \
+ MAINSRC = os2main.c
projects / packages / XFree86.git / blobdiff