-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.
-
- 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 -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 @@
+diff -urN xc.org/config/cf/Imake.cf xc/config/cf/Imake.cf
+--- xc.org/config/cf/Imake.cf 2003-11-21 15:13:57.000000000 +0100
++++ xc/config/cf/Imake.cf 2003-11-21 15:20:56.000000000 +0100
+@@ -766,6 +766,10 @@
# define s390Architecture
# undef __s390__
# endif /* s390 */
# ifdef __alpha
# define AlphaArchitecture
# undef __alpha
-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 @@
+diff -urN xc.org/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
+--- xc.org/config/cf/Imake.tmpl 2003-11-21 15:13:57.000000000 +0100
++++ xc/config/cf/Imake.tmpl 2003-11-21 15:20:56.000000000 +0100
+@@ -261,7 +261,7 @@
#ifndef BuildHtmlManPages
#ifdef RmanCmd
#else
#define BuildHtmlManPages NO
#endif
-@@ -833,11 +833,7 @@
+@@ -854,11 +854,7 @@
#define LintlibDir $(USRLIBDIR)/lint
#endif
#ifndef SystemManDirectory
#endif
#ifndef ManDirectoryRoot
#ifdef ProjectRoot
-@@ -974,7 +970,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
-@@ -1112,7 +1108,7 @@
+@@ -1140,7 +1136,7 @@
#define CppCmd /LibDirName/cpp
#endif
#ifndef RawCppCmd
#endif
#ifndef CppNoLineInfoOption
#define CppNoLineInfoOption /**/
-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 @@
+diff -urN xc.org/config/cf/linux.cf xc/config/cf/linux.cf
+--- xc.org/config/cf/linux.cf 2003-11-21 15:13:57.000000000 +0100
++++ xc/config/cf/linux.cf 2003-11-21 15:20:56.000000000 +0100
+@@ -325,7 +325,7 @@
+ */
+ #if BuildXF86DRI
+ # if defined(i386Architecture)
+-# define BuildLibGlxWithoutPIC YES
++# define BuildLibGlxWithoutPIC NO
+ # endif
+ #endif
+
+@@ -740,7 +740,7 @@
+
+ #define HasVarRun YES
+ #ifndef VarDbDirectory
+-# define VarDbDirectory $(VARDIR)/lib
++# define VarDbDirectory /var/lib
+ #endif
+
+ #ifndef XF86OSCardDrivers
+diff -urN xc.org/config/cf/site.def xc/config/cf/site.def
+--- xc.org/config/cf/site.def 2003-11-21 15:13:57.000000000 +0100
++++ xc/config/cf/site.def 2003-11-21 15:20:56.000000000 +0100
+@@ -119,10 +119,14 @@
+ #define HasSentinel YES
+ */
+
+-/*
+ #undef DefaultUserPath
+-#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
+-*/
++#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
++#undef DefaultSystemPath
++#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
++
++
++#define HasPam YES
++#define HasPamMisc YES
+
+
+ /* You do NOT need SetUID if you only run the server under xdm */
+diff -urN xc.org/config/cf/X11.tmpl xc/config/cf/X11.tmpl
+--- xc.org/config/cf/X11.tmpl 2003-11-21 15:13:57.000000000 +0100
++++ xc/config/cf/X11.tmpl 2003-11-21 15:20:56.000000000 +0100
+@@ -1261,8 +1261,12 @@
# define UsbMouseSupport NO
#endif
#endif
/* X-TrueType settings */
-@@ -1380,7 +1384,7 @@
+@@ -1385,7 +1389,7 @@
#define ConfigDir $(LIBDIR)/config
#endif
#ifndef DocDir
#endif
#ifndef DocHtmlDir
#define DocHtmlDir $(DOCDIR)/html
-@@ -1389,31 +1393,31 @@
- #define DocPsDir $(DOCDIR)/PostScript
+@@ -1397,31 +1401,31 @@
+ #define DocPdfDir $(DOCDIR)/PDF
#endif
#ifndef FontDir
-#define FontDir $(LIBDIR)/fonts
#endif
#ifndef NlsDir
#define NlsDir $(LIBDIR)/nls
-@@ -1425,23 +1429,20 @@
- #define PexApiDir $(LIBDIR)/PEX
+@@ -1430,23 +1434,20 @@
+ #define XLocaleDir $(LIBDIR)/locale
#endif
#ifndef LbxproxyDir
-#define LbxproxyDir $(LIBDIR)/lbxproxy
#ifndef InstallSecurityConfig
#define InstallSecurityConfig YES /* Install sample security policy */
#endif
-@@ -1473,10 +1474,10 @@
+@@ -1478,10 +1479,10 @@
#define OsNameDefines /* as nothing */
#endif
#ifndef DefaultUserPath /* for xdm */
#endif
#ifndef DefaultSystemShell /* for xdm to set in SHELL */
#define DefaultSystemShell BourneShell
-@@ -1603,7 +1604,7 @@
+@@ -1608,7 +1609,7 @@
HTMLINDEXCMD = HtmlIndexCmd
CLIENTSRC = $(TOP)/clients
DEMOSRC = $(TOP)/demos
XDOCMACROS = $(DOCUTILSRC)/macros.t
-@@ -1617,7 +1618,7 @@
+@@ -1622,7 +1623,7 @@
SERVERSRC = $(XTOP)/programs/Xserver
CONTRIBSRC = ContribDir
UNSUPPORTEDSRC = UnsupportedDir
RGBSRC = $(XTOP)/programs/rgb
BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
-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)
--# define BuildLibGlxWithoutPIC YES
-+# define BuildLibGlxWithoutPIC NO
- # endif
- #endif
-
-@@ -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
-+# if OSMinorVersion == 2
- # define BuildXF86DRM YES
- # else
- /* Only tested for Linux 2.3.0 through 2.3.18 */
-@@ -721,7 +721,7 @@
-
- #define HasVarRun YES
- #ifndef VarDbDirectory
--# define VarDbDirectory $(VARDIR)/lib
-+# define VarDbDirectory /var/lib
- #endif
-
- #ifndef XF86OSCardDrivers
-@@ -936,10 +936,10 @@
- #endif
-
- #ifndef LinkGLToUsrLib
--# define LinkGLToUsrLib YES
-+# define LinkGLToUsrLib NO
- #endif
- # ifndef LinkGLToUsrInclude
--# define LinkGLToUsrInclude YES
-+# define LinkGLToUsrInclude NO
- #endif
-
-
-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
- */
-
--/*
- #undef DefaultUserPath
--#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
--*/
-+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
-+#undef DefaultSystemPath
-+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
-+
-+
-+#define HasPam YES
-+#define HasPamMisc YES
-
-
- /* You do NOT need SetUID if you only run the server under xdm */
-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 @@
+diff -urN xc.org/config/cf/xf86site.def xc/config/cf/xf86site.def
+--- xc.org/config/cf/xf86site.def 2003-11-21 15:13:57.000000000 +0100
++++ xc/config/cf/xf86site.def 2003-11-21 15:20:56.000000000 +0100
+@@ -260,8 +260,8 @@
/*
* To not build/install the Cyrillic fonts, uncomment the following
*
/*
* To not install the local font directory, uncomment the following
-@@ -281,27 +281,26 @@
+@@ -307,27 +307,26 @@
* HasGlide2 to YES and set the Glide2IncDir variable.
* HasGlide2 is per default NO.
*
/*
-@@ -403,8 +402,8 @@
+@@ -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
- /*
- * If you have Tk (which is required to build XF86Setup), uncomment this
-@@ -413,8 +412,8 @@
- * default.
- * - XF86Setup is not built or supported with XFree86 4.x
- *
--#define HasTk YES
- */
-+#define HasTk YES
-
- /*
- * Set the paths and names for your Tk library if they don't match the
-@@ -427,25 +426,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
-@@ -455,17 +454,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
-@@ -677,8 +676,8 @@
+@@ -605,8 +604,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
-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 @@
+diff -urN xc.org/config/cf/xfree86.cf xc/config/cf/xfree86.cf
+--- xc.org/config/cf/xfree86.cf 2003-11-21 15:13:57.000000000 +0100
++++ xc/config/cf/xfree86.cf 2003-11-21 15:20:56.000000000 +0100
+@@ -128,7 +128,7 @@
#define XConfigFile XF86Config
#endif
#ifndef XConfigDir
#endif
#ifndef XLogFile
#define XLogFile XFree86
-@@ -877,7 +877,7 @@
- /* Pure PCI drivers should go first */
+@@ -760,7 +760,7 @@
+
# ifndef XF86CardDrivers
- # define XF86CardDrivers ati mga glint s3 s3virge sis savage\
-- trident chips tdfx fbdev \
-+ trident chips fbdev \
- DevelDrivers vga \
+ # define XF86CardDrivers mga glint nv s3 s3virge sis savage \
+- trident chips tdfx fbdev ati \
++ trident chips fbdev ati \
+ DevelDrivers newport \
XF86OSCardDrivers XF86ExtraCardDrivers
# endif
-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
+diff -urN xc.org/config/imake/imake.c xc/config/imake/imake.c
+--- xc.org/config/imake/imake.c 2003-11-21 15:13:57.000000000 +0100
++++ xc/config/imake/imake.c 2003-11-21 15:20:56.000000000 +0100
@@ -1057,6 +1057,7 @@
static char* suse = "/etc/SuSE-release";
static char* redhat = "/etc/redhat-release";
/* what's the definitive way to tell what any particular distribution is? */
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 \
- '-DPROJECTROOT="$(PROJECTROOT)"' \
-- '-DSERVER_CONFIG_FILE="$(LIBDIR)/$(XCONFIGFILE)"' \
-+ '-DSERVER_CONFIG_FILE="/etc/X11/$(XCONFIGFILE)"' \
- $(SITE_FONT_PATH) $(SITE_RGB_DB) \
- -DNO_WRAPPERS
-
-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
- 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/bin/XF86_$server X" ret] {
- mesg $messages(phase5.4) okay
- } else {
- mesg $messages(phase5.5) okay
-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
+diff -urN xc.org/Makefile xc/Makefile
+--- xc.org/Makefile 2003-11-21 15:13:57.000000000 +0100
++++ xc/Makefile 2003-11-21 15:20:56.000000000 +0100
+@@ -8,7 +8,7 @@
+ # or add "MAKE = make" to this file.
- 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
+ RELEASE = "Release 6.6"
+-SHELL = /bin/sh
++SHELL = /bin/sh -e
+ RM = rm -f
+ MV = mv
+ WORLDOPTS =
+diff -urN xc.org/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
+--- xc.org/programs/xdm/config/Xres.cpp 2003-11-21 15:18:39.000000000 +0100
++++ xc/programs/xdm/config/Xres.cpp 2003-11-21 15:21:45.000000000 +0100
+@@ -71,9 +71,9 @@
+ XHASHendif
#ifdef XPM
--/**/#if PLANES >= 8
+ XHASHif PLANES >= 8
-xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
-+/**/#if PLANES >= 15
+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 -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!
+diff -urN xc.org/programs/xdm/resource.c xc/programs/xdm/resource.c
+--- xc.org/programs/xdm/resource.c 2003-11-21 15:18:38.000000000 +0100
++++ xc/programs/xdm/resource.c 2003-11-21 15:20:56.000000000 +0100
+@@ -84,31 +84,31 @@
*/
+ #ifndef __EMX__
#ifndef DEF_SERVER_LINE
-#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
-+#define DEF_SERVER_LINE ":0 local /usr/bin/X :0"
++#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
#endif
#ifndef XRDB_PROGRAM
-#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
-+#define XRDB_PROGRAM "/usr/X11/xrdb"
++#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
#endif
#ifndef DEF_SESSION
-#define DEF_SESSION "/usr/bin/X11/xterm -ls"
-+#define DEF_SESSION "/usr/bin/xterm -ls"
++#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
#endif
#ifndef DEF_USER_PATH
-#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
-+#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin"
++#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
#endif
#ifndef DEF_SYSTEM_PATH
-#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
-+#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin"
++#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
#endif
#ifndef DEF_SYSTEM_SHELL
#define DEF_SYSTEM_SHELL "/bin/sh"
#endif
#ifndef DEF_FAILSAFE_CLIENT
-#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
-+#define DEF_FAILSAFE_CLIENT "/usr/bin/xterm"
++#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
#endif
#ifndef DEF_XDM_CONFIG
-#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
#endif
#ifndef DEF_AUTH_NAME
#ifdef HASXDMAUTH
-@@ -107,7 +107,7 @@
+@@ -118,7 +118,7 @@
#endif
#endif
#ifndef DEF_AUTH_DIR
#endif
#ifndef DEF_USER_AUTH_DIR
#define DEF_USER_AUTH_DIR "/tmp"
-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))
+diff -urN xc.org/programs/xinit/Imakefile xc/programs/xinit/Imakefile
+--- xc.org/programs/xinit/Imakefile 2003-11-21 15:18:47.000000000 +0100
++++ xc/programs/xinit/Imakefile 2003-11-21 15:20:56.000000000 +0100
+@@ -46,11 +46,12 @@
+ #endif
InstallManPage(startx,$(MANDIR))
-#if InstallXinitConfig
LinkConfDirectory(xinit,.,xinit,.)
-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
+diff -urN xc.org/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
+--- xc.org/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-11-21 15:17:43.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-11-21 15:20:56.000000000 +0100
+@@ -100,7 +100,7 @@
+
+ #if HasNCurses
+ CURSESLIB = NCursesLibName
+-CURSESDEFINES = -DHAS_NCURSES
++CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
+ #endif
+
+ XF86CONFIGFILE = XConfigFile
+diff -urN xc.org/programs/xterm/Imakefile xc/programs/xterm/Imakefile
+--- xc.org/programs/xterm/Imakefile 2003-11-21 15:19:09.000000000 +0100
++++ xc/programs/xterm/Imakefile 2003-11-21 15:20:56.000000000 +0100
@@ -36,6 +36,10 @@
#define XkbClientLibs /**/
#endif
#if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
(defined(LinuxArchitecture) && \
(LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
-@@ -110,7 +116,7 @@
+@@ -115,7 +121,7 @@
MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
XKB_DEFINES = XkbClientDefines
PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
INCLUDES = $(XRFINCLUDES)
#ifdef OS2Architecture
-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
+diff -urN xc.org/programs/xterm/xterm.h xc/programs/xterm/xterm.h
+--- xc.org/programs/xterm/xterm.h 2003-11-21 15:19:12.000000000 +0100
++++ xc/programs/xterm/xterm.h 2003-11-21 15:20:56.000000000 +0100
@@ -73,7 +73,7 @@
#endif
projects / packages / XFree86.git / blobdiff