---- XFree86-4.1.0.org/xc/Makefile Wed Mar 22 22:23:30 2000
-+++ XFree86-4.1.0/xc/Makefile Wed Dec 20 13:41:02 2000
+diff -urN xc.orig/Makefile xc/Makefile
+--- xc.orig/Makefile Mon Dec 30 15:54:17 2002
++++ xc/Makefile Mon Dec 30 16:02:13 2002
@@ -8,10 +8,10 @@
# or add "MAKE = make" to this file.
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 @@
+diff -urN xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
+--- xc.orig/config/cf/Imake.cf Mon Dec 30 15:52:30 2002
++++ xc/config/cf/Imake.cf Mon Dec 30 16:02:13 2002
+@@ -723,6 +723,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 -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
+--- xc.orig/config/cf/Imake.tmpl Mon Dec 30 15:52:30 2002
++++ xc/config/cf/Imake.tmpl Mon Dec 30 16:02:13 2002
+@@ -253,7 +253,7 @@
#ifndef BuildHtmlManPages
#ifdef RmanCmd
#else
#define BuildHtmlManPages NO
#endif
-@@ -686,11 +686,7 @@
+@@ -833,11 +833,7 @@
#define LintlibDir $(USRLIBDIR)/lint
#endif
#ifndef SystemManDirectory
#endif
#ifndef ManDirectoryRoot
#ifdef ProjectRoot
-@@ -817,7 +813,7 @@
+@@ -974,7 +970,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
+@@ -1112,7 +1108,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 -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
+--- xc.orig/config/cf/X11.tmpl Mon Dec 30 15:52:30 2002
++++ xc/config/cf/X11.tmpl Mon Dec 30 16:02:13 2002
+@@ -1256,8 +1256,12 @@
+ # define UsbMouseSupport NO
#endif
+#ifndef EtcX11Directory
#endif
/* X-TrueType settings */
-@@ -1002,7 +1006,7 @@
+@@ -1380,7 +1384,7 @@
#define ConfigDir $(LIBDIR)/config
#endif
#ifndef DocDir
#endif
#ifndef DocHtmlDir
#define DocHtmlDir $(DOCDIR)/html
-@@ -1011,31 +1015,31 @@
+@@ -1389,31 +1393,31 @@
#define DocPsDir $(DOCDIR)/PostScript
#endif
#ifndef FontDir
#endif
#ifndef NlsDir
#define NlsDir $(LIBDIR)/nls
-@@ -1047,23 +1051,20 @@
+@@ -1425,23 +1429,20 @@
#define PexApiDir $(LIBDIR)/PEX
#endif
#ifndef LbxproxyDir
#ifndef InstallSecurityConfig
#define InstallSecurityConfig YES /* Install sample security policy */
#endif
-@@ -1095,10 +1096,10 @@
+@@ -1473,10 +1474,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 @@
+@@ -1603,7 +1604,7 @@
HTMLINDEXCMD = HtmlIndexCmd
CLIENTSRC = $(TOP)/clients
DEMOSRC = $(TOP)/demos
XDOCMACROS = $(DOCUTILSRC)/macros.t
-@@ -1225,7 +1226,7 @@
+@@ -1617,7 +1618,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
-@@ -286,7 +286,7 @@
+diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
+--- xc.orig/config/cf/linux.cf Mon Dec 30 15:52:31 2002
++++ xc/config/cf/linux.cf Mon Dec 30 16:20:00 2002
+@@ -320,7 +320,7 @@
*/
#if BuildXF86DRI
# if defined(i386Architecture)
# endif
#endif
-@@ -298,7 +298,7 @@
- # if defined(i386Architecture) || defined(ia64Architecture)
+@@ -333,7 +333,7 @@
+ # if defined(i386Architecture) || defined(ia64Architecture) || defined(SparcArchitecture) || defined(AlphaArchitecture) || defined(x86_64Architecture)
# if OSMajorVersion == 2
/* Only tested for Linux 2.2.0 through 2.2.12 */
-# if OSMinorVersion == 2 && OSTeenyVersion <= 12
# define BuildXF86DRM YES
# else
/* Only tested for Linux 2.3.0 through 2.3.18 */
-@@ -565,7 +565,7 @@
- #define StandardCppDefines StandardDefines
+@@ -721,7 +721,7 @@
#define HasVarRun YES
--#define VarDbDirectory $(VARDIR)/lib
-+#define VarDbDirectory /var/lib
+ #ifndef VarDbDirectory
+-# define VarDbDirectory $(VARDIR)/lib
++# define VarDbDirectory /var/lib
+ #endif
#ifndef XF86OSCardDrivers
- # define XF86OSCardDrivers v4l
-@@ -704,10 +704,10 @@
+@@ -936,10 +936,10 @@
#endif
#ifndef LinkGLToUsrLib
#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 @@
+diff -urN xc.orig/config/cf/site.def xc/config/cf/site.def
+--- xc.orig/config/cf/site.def Mon Dec 30 15:52:31 2002
++++ xc/config/cf/site.def Mon Dec 30 16:02:13 2002
+@@ -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 @@
+diff -urN xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def
+--- xc.orig/config/cf/xf86site.def Mon Dec 30 15:52:31 2002
++++ xc/config/cf/xf86site.def Mon Dec 30 16:28:24 2002
+@@ -234,8 +234,8 @@
+ /*
+ * To not build/install the Cyrillic fonts, uncomment the following
+ *
+-#define BuildCyrillicFonts NO
+ */
++#define BuildCyrillicFonts YES
+
+ /*
+ * To not install the local font directory, uncomment the following
+@@ -281,27 +281,26 @@
+ * HasGlide2 to YES and set the Glide2IncDir variable.
+ * HasGlide2 is per default NO.
+ *
+-#define HasGlide2 YES
+ */
++#define HasGlide2 YES
+
+ /*
+ * Set the path to your Glide include files.
+ *
+-#define Glide2IncDir /usr/include/glide
+ */
++#define Glide2IncDir /usr/include/glide
+
+ /*
+ * Have glide 3?
+ *
+-#define HasGlide3 YES
+ */
++#define HasGlide3 YES
+
+ /*
+ * Set the path to your Glide 3 include files.
+ *
+-#define Glide3IncDir /usr/include/glide3
+ */
+-
++#define Glide3IncDir /usr/include/glide3
+
+
+ /*
+@@ -403,8 +402,8 @@
* Some Linux releases don't have a libtermcap. In this case you may need
* to uncomment the following
*
/*
* 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.
+@@ -413,8 +412,8 @@
+ * default.
+ * - XF86Setup is not built or supported with XFree86 4.x
*
-#define HasTk YES
*/
/*
* Set the paths and names for your Tk library if they don't match the
-@@ -156,25 +156,25 @@
+@@ -427,25 +426,25 @@
*
* Some Linux releases need TkLibDir set to /usr/X11R6/lib
*
/*
* Set the paths and names for your Tcl library if they don't match the
-@@ -184,17 +184,17 @@
+@@ -455,17 +454,17 @@
*
* Some Linux releases need TclIncDir set to /usr/include/tcl.
*
/*
* Build a server that dynamically loads the modules by setting
-@@ -436,8 +436,8 @@
- /*
- * To not build/install the Cyrillic fonts, uncomment the following
- *
--#define BuildCyrillicFonts NO
- */
-+#define BuildCyrillicFonts YES
-
- /*
- * To not build/install the Latin2 fonts, uncomment the following
-@@ -626,8 +626,8 @@
+@@ -677,8 +676,8 @@
* To forceably build static libraries in addition to shared libraries,
* uncomment this.
*
/*
* Uncomment this if your default tools (eg, gcc, ld, as, etc) are
-@@ -713,26 +713,26 @@
- * HasGlide2 to YES and set the Glide2IncDir variable.
- * HasGlide2 is per default NO.
- *
--#define HasGlide2 YES
- */
-+#define HasGlide2 YES
-
- /*
- * Set the path to your Glide include files.
- *
--#define Glide2IncDir /usr/include/glide
- */
-+#define Glide2IncDir /usr/include/glide
-
- /*
- * The 3Dfx 3D DRI driver requires glide 3.
- *
--#define HasGlide3 YES
- */
-+#define HasGlide3 YES
-
- /*
- * Set the path to your Glide 3 include files.
- *
--#define Glide3IncDir /usr/include/glide3
- */
-+#define Glide3IncDir /usr/include/glide3
-
- /*
- * 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 @@
+diff -urN xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
+--- xc.orig/config/cf/xfree86.cf Mon Dec 30 15:52:31 2002
++++ xc/config/cf/xfree86.cf Mon Dec 30 16:02:13 2002
+@@ -107,7 +107,7 @@
#define XConfigFile XF86Config
#endif
#ifndef XConfigDir
#endif
#ifndef XLogFile
#define XLogFile XFree86
-@@ -653,7 +653,7 @@
+@@ -877,7 +877,7 @@
/* Pure PCI drivers should go first */
# ifndef XF86CardDrivers
# define XF86CardDrivers ati mga glint s3 s3virge sis savage\
DevelDrivers vga \
XF86OSCardDrivers XF86ExtraCardDrivers
# 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 -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
+--- xc.orig/config/imake/imake.c Mon Dec 30 15:52:31 2002
++++ xc/config/imake/imake.c Mon Dec 30 16:02:13 2002
+@@ -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
+
+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
+diff -urN xc.orig/programs/Xserver/hw/xfree86/XF86Setup/Imakefile xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile
+--- xc.orig/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Mon Dec 30 15:53:38 2002
++++ xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Mon Dec 30 16:02:13 2002
@@ -118,7 +118,7 @@
XCONFIG_DEFINES = $(EXT_DEFINES) -DXF86SETUP \
$(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
+diff -urN xc.orig/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl
+--- xc.orig/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Mon Dec 30 15:53:38 2002
++++ xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Mon Dec 30 16:02:13 2002
@@ -38,7 +38,7 @@
set devid [lindex $DeviceIDs $idx]
global Device_$devid
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 @@
+diff -urN xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
+--- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile Mon Dec 30 15:53:56 2002
++++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile Mon Dec 30 16:02:13 2002
+@@ -93,7 +93,7 @@
+
+ #if HasNCurses
+ CURSESLIB = NCursesLibName
+-CURSESDEFINES = -DHAS_NCURSES
++CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
+ #endif
+
+ XF86CONFIGFILE = XConfigFile
+diff -urN xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
+--- xc.orig/programs/xdm/config/Xres.cpp Mon Dec 30 15:54:07 2002
++++ xc/programs/xdm/config/Xres.cpp Mon Dec 30 16:02:13 2002
+@@ -70,10 +70,10 @@
+ #endif /* XPM */
/**/#endif
#ifdef XPM
-/**/#if PLANES >= 8
/**/#endif
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 -urN xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
+--- xc.orig/programs/xdm/resource.c Mon Dec 30 15:54:06 2002
++++ xc/programs/xdm/resource.c Mon Dec 30 16:02:13 2002
+@@ -73,31 +73,31 @@
+ * if it is server-specific). DO NOT CHANGE THESE DEFINITIONS!
*/
- #ifndef __EMX__
#ifndef DEF_SERVER_LINE
-#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
+#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
#endif
#ifndef DEF_AUTH_NAME
#ifdef HASXDMAUTH
-@@ -104,7 +104,7 @@
+@@ -107,7 +107,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 @@
+diff -urN xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile
+--- xc.orig/programs/xinit/Imakefile Mon Dec 30 15:54:10 2002
++++ xc/programs/xinit/Imakefile Mon Dec 30 16:31:27 2002
+@@ -39,11 +39,12 @@
InstallNamedProg(startx,startx,$(BINDIR))
InstallManPage(startx,$(MANDIR))
+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 -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
+--- xc.orig/programs/xterm/Imakefile Mon Dec 30 15:54:16 2002
++++ xc/programs/xterm/Imakefile Mon Dec 30 16:35:55 2002
@@ -36,6 +36,10 @@
#define XkbClientLibs /**/
#endif
+ PTYLIB = -lutil
+
- #if ((LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
- PTYLIB = -lutil
- #endif
-@@ -109,7 +115,7 @@
- -DOSMINORVERSION=$(OSMINORVERSION)
+ #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
+ (defined(LinuxArchitecture) && \
+ (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
+@@ -110,7 +116,7 @@
MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
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 = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
++ DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
+ INCLUDES = $(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 @@
+diff -urN xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h
+--- xc.orig/programs/xterm/xterm.h Mon Dec 30 15:54:16 2002
++++ xc/programs/xterm/xterm.h Mon Dec 30 16:02:13 2002
+@@ -73,7 +73,7 @@
#endif
#ifndef DFT_TERMTYPE
#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) \
projects / packages / XFree86.git / blobdiff