[packages/X11.git] / X11-PLD.patch

diff -ur X11-6.9.0.org/xc/config/cf/Imake.cf X11-6.9.0/xc/config/cf/Imake.cf
--- X11-6.9.0.org/xc/config/cf/Imake.cf	2005-11-08 07:33:24.000000000 +0100
+++ X11-6.9.0/xc/config/cf/Imake.cf	2005-12-22 10:27:11.890963000 +0100
@@ -888,6 +888,10 @@
 #   define s390Architecture
 #  undef __s390__
 # endif /* s390 */
+# ifdef alpha
+#  define AlphaArchitecture
+#  undef alpha
+# endif /* alpha */
 # ifdef __alpha
 #  define AlphaArchitecture
 #  undef __alpha
diff -ur X11-6.9.0.org/xc/config/cf/Imake.tmpl X11-6.9.0/xc/config/cf/Imake.tmpl
--- X11-6.9.0.org/xc/config/cf/Imake.tmpl	2005-11-08 07:33:24.000000000 +0100
+++ X11-6.9.0/xc/config/cf/Imake.tmpl	2005-12-22 10:28:07.490963000 +0100
@@ -266,7 +266,7 @@
 
 #ifndef BuildHtmlManPages
 #ifdef RmanCmd
-#define BuildHtmlManPages YES
+#define BuildHtmlManPages NO
 #else
 #define BuildHtmlManPages NO
 #endif
@@ -882,11 +882,7 @@
 #define LintlibDir $(USRLIBDIR)/lint
 #endif
 #ifndef SystemManDirectory
-#if SystemV4
 #define SystemManDirectory /usr/share/man
-#else
-#define SystemManDirectory /usr/man
-#endif
 #endif
 #ifndef ManDirectoryRoot
 #ifdef ProjectRoot
@@ -1196,7 +1192,7 @@
 #define CppCmd /LibDirName/cpp
 #endif
 #ifndef RawCppCmd
-#define RawCppCmd CppCmd -undef
+#define RawCppCmd CppCmd
 #endif
 #ifndef CppNoLineInfoOption
 #define CppNoLineInfoOption /**/
diff -ur X11-6.9.0.org/xc/config/cf/linux.cf X11-6.9.0/xc/config/cf/linux.cf
--- X11-6.9.0.org/xc/config/cf/linux.cf	2005-10-21 21:10:27.000000000 +0200
+++ X11-6.9.0/xc/config/cf/linux.cf	2005-12-22 10:40:10.100963000 +0100
@@ -394,7 +394,7 @@
 #ifndef BuildLibGlxWithoutPIC
 # if BuildXF86DRI
 #  if defined(i386Architecture)
-#   define BuildLibGlxWithoutPIC	YES
+#   define BuildLibGlxWithoutPIC	NO
 #  endif
 # endif
 #endif
@@ -539,6 +539,10 @@
 # define HasExpat		YES
 #endif
 
+#ifndef HasFontconfig
+# define HasFontconfig         YES
+#endif
+
 #ifndef HasFreetype2
 # define HasFreetype2		YES
 #endif
@@ -792,7 +796,7 @@
 
 #define HasVarRun		YES
 #ifndef VarDbDirectory
-# define VarDbDirectory		$(VARDIR)/lib
+# define VarDbDirectory		/var/lib
 #endif
 
 #ifndef XF86OSCardDrivers
diff -ur X11-6.9.0.org/xc/config/cf/site.def X11-6.9.0/xc/config/cf/site.def
--- X11-6.9.0.org/xc/config/cf/site.def	2004-05-06 17:08:25.000000000 +0200
+++ X11-6.9.0/xc/config/cf/site.def	2005-12-22 10:29:12.390963000 +0100
@@ -124,6 +124,14 @@
 #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 */
 /* You MAY need SetUID if users run the server by hand or under xinit */
diff -ur X11-6.9.0.org/xc/config/cf/X11.tmpl X11-6.9.0/xc/config/cf/X11.tmpl
--- X11-6.9.0.org/xc/config/cf/X11.tmpl	2005-12-15 00:41:52.000000000 +0100
+++ X11-6.9.0/xc/config/cf/X11.tmpl	2005-12-22 10:32:25.830963000 +0100
@@ -597,7 +597,7 @@
 #define BuildXF86RushLibrary	(BuildXF86RushExt && !BuildServersOnly)
 #endif
 #ifndef BuildDPSLibraries
-#define BuildDPSLibraries	NO
+#define BuildDPSLibraries	YES
 #endif
 #ifndef BuildDPSLibrary
 #define BuildDPSLibrary		BuildDPSLibraries
@@ -693,7 +693,7 @@
 #endif
 
 #ifndef BuildXterm
-#define BuildXterm		NO
+#define BuildXterm		YES
 #endif
 
 #ifndef BuildXkbcomp
@@ -731,7 +731,7 @@
 #endif
 
 #ifndef InstallHardcopyDocs
-#define InstallHardcopyDocs	YES
+#define InstallHardcopyDocs	NO
 #endif
 
 #ifndef InstallMiscManPages
@@ -1395,8 +1395,12 @@
 # define UsbMouseSupport NO
 #endif
 
+#ifndef EtcX11Directory
+#define EtcX11Directory /etc/X11
+#endif
+
 #ifndef DefaultFSConfigFile
-#define DefaultFSConfigFile $(LIBDIR)/fs/config
+#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
 #endif
 
 #ifndef BinDir
@@ -1483,7 +1487,7 @@
 #define ConfigDir $(LIBDIR)/config
 #endif
 #ifndef DocDir
-#define DocDir $(LIBDIR)/doc
+#define DocDir $(LIBDIR)/share/doc
 #endif
 #ifndef DocHtmlDir
 #define DocHtmlDir $(DOCDIR)/html
@@ -1495,34 +1499,34 @@
 #define DocPdfDir $(DOCDIR)/PDF
 #endif
 #ifndef FontDir
-#define FontDir $(LIBDIR)/fonts
+#define FontDir /usr/share/fonts
 #endif
 #ifndef FontEncDir
 #define FontEncDir $(LIBDIR)/fonts/encodings
 #endif
 #ifndef AdmDir
-#define AdmDir /usr/adm
+#define AdmDir /var/log
 #endif
 #ifndef XinitDir
-#define XinitDir $(LIBDIR)/xinit
+#define XinitDir $(ETCX11DIR)/xinit
 #endif
 #ifndef XdmDir
-#define XdmDir $(LIBDIR)/xdm
+#define XdmDir $(ETCX11DIR)/xdm
 #endif
 #ifndef XdmVarDir
 #define XdmVarDir $(VARLIBDIR)/xdm
 #endif
 #ifndef XdmAuthDir
-#define XdmAuthDir $(LIBDIR)/xdm
+#define XdmAuthDir $(ETCX11DIR)/xdm
 #endif
 #ifndef XdmConfigurationSubdirectory		/* under xdm sources */
 #define XdmConfigurationSubdirectory config
 #endif
 #ifndef TwmDir
-#define TwmDir $(LIBDIR)/twm
+#define TwmDir $(ETCX11DIR)/twm
 #endif
 #ifndef XsmDir
-#define XsmDir $(LIBDIR)/xsm
+#define XsmDir $(ETCX11DIR)/xsm
 #endif
 #ifndef NlsDir
 #define NlsDir $(LIBDIR)/nls
@@ -1502,7 +1502,7 @@
 #define FontDir /usr/share/fonts
 #endif
 #ifndef FontEncDir
-#define FontEncDir $(LIBDIR)/fonts/encodings
+#define FontEncDir /usr/share/fonts/encodings
 #endif
 #ifndef AdmDir
 #define AdmDir /var/log
@@ -1531,23 +1535,20 @@
 #define XLocaleDir $(LIBDIR)/locale
 #endif
 #ifndef LbxproxyDir
-#define LbxproxyDir $(LIBDIR)/lbxproxy
+#define LbxproxyDir $(ETCX11DIR)/lbxproxy
 #endif
 #ifndef LbxproxyConfigSubdir		/* under lbxproxy sources */
 #define LbxproxyConfigSubdir config
 #endif
 #ifndef ProxyManagerDir
-#define ProxyManagerDir $(LIBDIR)/proxymngr
+#define ProxyManagerDir $(ETCX11DIR)/proxymngr
 #endif
 #ifndef ServerConfigDir
-#define ServerConfigDir $(LIBDIR)/xserver
+#define ServerConfigDir $(ETCX11DIR)/xserver
 #endif
 #ifndef XPrintDir
 #define XPrintDir ServerConfigDir
 #endif
-#ifndef EtcX11Directory
-#define EtcX11Directory /etc/X11
-#endif
 #ifndef InstallSecurityConfig
 #define InstallSecurityConfig YES	/* Install sample security policy */
 #endif
@@ -1579,10 +1580,10 @@
 #define OsNameDefines /* as nothing */
 #endif
 #ifndef DefaultUserPath			/* for xdm */
-#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
 #endif
 #ifndef DefaultSystemPath		/* for xdm */
-#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
 #endif
 #ifndef DefaultSystemShell		/* for xdm to set in SHELL */
 #define DefaultSystemShell BourneShell
@@ -1719,7 +1720,7 @@
 
      HTMLINDEXCMD = HtmlIndexCmd
 
-       DOCUTILSRC = $(XTOP)/doc/util
+       DOCUTILSRC = $(XTOP)/share/doc/util
         CLIENTSRC = $(TOP)/clients
           DEMOSRC = $(TOP)/demos
        XDOCMACROS = $(DOCUTILSRC)/macros.t
@@ -1733,7 +1734,7 @@
         SERVERSRC = $(XTOP)/programs/Xserver
        CONTRIBSRC = ContribDir
    UNSUPPORTEDSRC = UnsupportedDir
-           DOCSRC = $(XTOP)/doc
+           DOCSRC = $(XTOP)/share/doc
            RGBSRC = $(XTOP)/programs/rgb
       BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
      MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
diff -ur X11-6.9.0.org/xc/config/cf/xorg.cf X11-6.9.0/xc/config/cf/xorg.cf
--- X11-6.9.0.org/xc/config/cf/xorg.cf	2005-10-03 18:08:44.000000000 +0200
+++ X11-6.9.0/xc/config/cf/xorg.cf	2005-12-22 10:32:59.590963000 +0100
@@ -136,7 +136,7 @@
 #define XConfigFile		xorg.conf
 #endif
 #ifndef XConfigDir
-#define XConfigDir		$(LIBDIR)
+#define XConfigDir             $(ETCX11DIR)
 #endif
 #ifndef XLogFile
 #define XLogFile		Xorg
@@ -408,7 +408,7 @@
 				neomagic i740 tdfx savage \
 				cirrus vmware tseng trident chips apm \
 				GlideDriver i128 i386Drivers \
-				ati DevelDrivers ark \
+				ati DevelDrivers ark fbdev \
 				cyrix siliconmotion via \
 				vesa vga \
 				dummy XF86OSCardDrivers XF86ExtraCardDrivers
diff -ur X11-6.9.0.org/xc/config/cf/xorgsite.def X11-6.9.0/xc/config/cf/xorgsite.def
--- X11-6.9.0.org/xc/config/cf/xorgsite.def	2005-07-16 09:59:50.000000000 +0200
+++ X11-6.9.0/xc/config/cf/xorgsite.def	2005-12-22 10:33:48.940963000 +0100
@@ -266,8 +266,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
@@ -435,8 +435,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
 
 /*
  * Build a server that dynamically loads the modules by setting
@@ -610,8 +610,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 -ur X11-6.9.0.org/xc/config/imake/imake.c X11-6.9.0/xc/config/imake/imake.c
--- X11-6.9.0.org/xc/config/imake/imake.c	2005-11-08 07:33:24.000000000 +0100
+++ X11-6.9.0/xc/config/imake/imake.c	2005-12-22 10:34:57.200963000 +0100
@@ -1061,6 +1061,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");
@@ -1075,6 +1076,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");
 
 #ifdef CROSSCOMPILE
   if (CrossCompiling) {
@@ -1101,6 +1103,12 @@
      * at the content of /etc/debian_version */
     return;
   }
+  if (lstat (pld, &sb) == 0) {
+    fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
+    fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
+    return;
+  }
+	  
   /* what's the definitive way to tell what any particular distribution is? */
 
   fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
diff -ur X11-6.9.0.org/xc/Makefile X11-6.9.0/xc/Makefile
--- X11-6.9.0.org/xc/Makefile	2005-12-15 00:41:52.000000000 +0100
+++ X11-6.9.0/xc/Makefile	2005-12-22 10:39:28.160963000 +0100
@@ -9,7 +9,7 @@
 # or add "MAKE = make" to this file.
 
 RELEASE = "Release 6.9"
-SHELL = /bin/sh
+SHELL = /bin/sh -e
 RM = rm -f
 MV = mv
 WORLDOPTS =
diff -ur X11-6.9.0.org/xc/programs/xdm/config/Xres.cpp X11-6.9.0/xc/programs/xdm/config/Xres.cpp
--- X11-6.9.0.org/xc/programs/xdm/config/Xres.cpp	2004-04-23 21:54:43.000000000 +0200
+++ X11-6.9.0/xc/programs/xdm/config/Xres.cpp	2005-12-22 10:35:32.500963000 +0100
@@ -70,10 +70,10 @@
 #endif /* XPM */
 XHASHendif
 #ifdef XPM
-XHASHif PLANES >= 8
-xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
+XHASHif PLANES > 8
+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
 XHASHelse
-xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
 XHASHendif
 xlogin*useShape: true
 xlogin*logoPadding: 10
diff -ur X11-6.9.0.org/xc/programs/xdm/resource.c X11-6.9.0/xc/programs/xdm/resource.c
--- X11-6.9.0.org/xc/programs/xdm/resource.c	2005-11-08 07:33:31.000000000 +0100
+++ X11-6.9.0/xc/programs/xdm/resource.c	2005-12-22 10:36:59.580963000 +0100
@@ -85,31 +85,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/X11R6/bin/X :0"
 #endif
 #ifndef XRDB_PROGRAM
-#define XRDB_PROGRAM "/usr/bin/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/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:/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:/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/X11R6/bin/xterm"
 #endif
 #ifndef DEF_XDM_CONFIG
-#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
+#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
 #endif
 #ifndef DEF_CHOOSER
-#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
+#define DEF_CHOOSER "/etc/X11/xdm/chooser"
 #endif
 #ifndef DEF_AUTH_NAME
 #ifdef HASXDMAUTH
@@ -119,7 +119,7 @@
 #endif
 #endif
 #ifndef DEF_AUTH_DIR
-#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
+#define DEF_AUTH_DIR "/etc/X11/xdm"
 #endif
 #ifndef DEF_USER_AUTH_DIR
 #define DEF_USER_AUTH_DIR	"/tmp"
diff -ur X11-6.9.0.org/xc/programs/xinit/Imakefile X11-6.9.0/xc/programs/xinit/Imakefile
--- X11-6.9.0.org/xc/programs/xinit/Imakefile	2005-11-15 05:03:10.000000000 +0100
+++ X11-6.9.0/xc/programs/xinit/Imakefile	2005-12-22 10:37:39.740963000 +0100
@@ -88,11 +88,12 @@
 #endif
 InstallManPage(startx,$(MANDIR))
 
-#if InstallXinitConfig
-InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
-#else
-InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
-#endif
+XCOMM Red Hat gets this from a different package
+XCOMM #if InstallXinitConfig
+XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
+XCOMM #else
+XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
+XCOMM #endif
 
 LinkConfDirectory(xinit,.,xinit,.)
 
diff -ur X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile X11-6.9.0/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
--- X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile	2005-08-23 03:14:35.000000000 +0200
+++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile	2005-12-22 10:39:11.440963000 +0100
@@ -110,7 +110,7 @@
 
 #if HasNCurses
 CURSESLIB = NCursesLibName
-CURSESDEFINES  = -DHAS_NCURSES
+CURSESDEFINES  = -DHAS_NCURSES -I/usr/include/ncurses
 #endif
 
 XF86CONFIGFILE = XConfigFile
diff -ur X11-6.9.0.org/xc/programs/xterm/Imakefile X11-6.9.0/xc/programs/xterm/Imakefile
--- X11-6.9.0.org/xc/programs/xterm/Imakefile	2005-12-15 00:28:27.000000000 +0100
+++ X11-6.9.0/xc/programs/xterm/Imakefile	2005-12-22 10:38:51.510963000 +0100
@@ -68,6 +68,10 @@
 # endif
 #endif
 
+#if InstallXtermSetUID
+#undef InstallXtermSetUID
+#endif
+
 #ifndef SpecialCObjectRule
 #define SpecialCObjectRule(module,ignore,defines) \
 module.o: ; $(CC) -c defines $(CFLAGS) module.c
@@ -88,6 +92,7 @@
     PUCCPTYDDEF = -DPUCC_PTYD	/* does not need to be setuid */
          PTYLIB = -lpucc
 #endif
+    PTYLIB = -lutil
 
 #if defined(NetBSDArchitecture) || \
     defined(OpenBSDArchitecture) || \
@@ -153,7 +158,7 @@
     XKB_DEFINES = XkbClientDefines
    PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
         DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF)
-       INCLUDES = -I. $(XRFINCLUDES)
+       INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES)
 
 #ifdef OS2Architecture
         MAINSRC = os2main.c
Commit	Line	Data
db36d1df AM	1	diff -ur X11-6.9.0.org/xc/config/cf/Imake.cf X11-6.9.0/xc/config/cf/Imake.cf
	2	--- X11-6.9.0.org/xc/config/cf/Imake.cf 2005-11-08 07:33:24.000000000 +0100
	3	+++ X11-6.9.0/xc/config/cf/Imake.cf 2005-12-22 10:27:11.890963000 +0100
	4	@@ -888,6 +888,10 @@
aa35d5a8 AM	5	# define s390Architecture
	6	# undef __s390__
	7	# endif /* s390 */
	8	+# ifdef alpha
	9	+# define AlphaArchitecture
	10	+# undef alpha
	11	+# endif /* alpha */
	12	# ifdef __alpha
	13	# define AlphaArchitecture
	14	# undef __alpha
db36d1df AM	15	diff -ur X11-6.9.0.org/xc/config/cf/Imake.tmpl X11-6.9.0/xc/config/cf/Imake.tmpl
	16	--- X11-6.9.0.org/xc/config/cf/Imake.tmpl 2005-11-08 07:33:24.000000000 +0100
	17	+++ X11-6.9.0/xc/config/cf/Imake.tmpl 2005-12-22 10:28:07.490963000 +0100
	18	@@ -266,7 +266,7 @@
aa35d5a8 AM	19
	20	#ifndef BuildHtmlManPages
	21	#ifdef RmanCmd
	22	-#define BuildHtmlManPages YES
	23	+#define BuildHtmlManPages NO
	24	#else
	25	#define BuildHtmlManPages NO
	26	#endif
db36d1df	27	@@ -882,11 +882,7 @@
aa35d5a8 AM	28	#define LintlibDir $(USRLIBDIR)/lint
	29	#endif
	30	#ifndef SystemManDirectory
	31	-#if SystemV4
	32	#define SystemManDirectory /usr/share/man
	33	-#else
	34	-#define SystemManDirectory /usr/man
	35	-#endif
	36	#endif
	37	#ifndef ManDirectoryRoot
	38	#ifdef ProjectRoot
db36d1df	39	@@ -1196,7 +1192,7 @@
aa35d5a8 AM	40	#define CppCmd /LibDirName/cpp
	41	#endif
	42	#ifndef RawCppCmd
	43	-#define RawCppCmd CppCmd -undef
	44	+#define RawCppCmd CppCmd
	45	#endif
	46	#ifndef CppNoLineInfoOption
	47	#define CppNoLineInfoOption /**/
db36d1df AM	48	diff -ur X11-6.9.0.org/xc/config/cf/linux.cf X11-6.9.0/xc/config/cf/linux.cf
	49	--- X11-6.9.0.org/xc/config/cf/linux.cf 2005-10-21 21:10:27.000000000 +0200
	50	+++ X11-6.9.0/xc/config/cf/linux.cf 2005-12-22 10:40:10.100963000 +0100
	51	@@ -394,7 +394,7 @@
	52	#ifndef BuildLibGlxWithoutPIC
	53	# if BuildXF86DRI
	54	# if defined(i386Architecture)
	55	-# define BuildLibGlxWithoutPIC YES
	56	+# define BuildLibGlxWithoutPIC NO
	57	# endif
756a6f4b AM	58	# endif
756a6f4b AM	59	#endif
db36d1df AM	60	@@ -539,6 +539,10 @@
	61	# define HasExpat YES
	62	#endif
756a6f4b	63
db36d1df AM	64	+#ifndef HasFontconfig
	65	+# define HasFontconfig YES
	66	+#endif
	67	+
	68	#ifndef HasFreetype2
	69	# define HasFreetype2 YES
	70	#endif
	71	@@ -792,7 +796,7 @@
756a6f4b AM	72
	73	#define HasVarRun YES
	74	#ifndef VarDbDirectory
	75	-# define VarDbDirectory $(VARDIR)/lib
	76	+# define VarDbDirectory /var/lib
	77	#endif
	78
	79	#ifndef XF86OSCardDrivers
db36d1df AM	80	diff -ur X11-6.9.0.org/xc/config/cf/site.def X11-6.9.0/xc/config/cf/site.def
	81	--- X11-6.9.0.org/xc/config/cf/site.def 2004-05-06 17:08:25.000000000 +0200
	82	+++ X11-6.9.0/xc/config/cf/site.def 2005-12-22 10:29:12.390963000 +0100
	83	@@ -124,6 +124,14 @@
	84	#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
756a6f4b AM	85	*/
756a6f4b AM	86
756a6f4b AM	87	+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
	88	+#undef DefaultSystemPath
	89	+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
	90	+
	91	+
	92	+#define HasPam YES
	93	+#define HasPamMisc YES
db36d1df	94	+
756a6f4b AM	95
756a6f4b AM	96	/* You do NOT need SetUID if you only run the server under xdm */
db36d1df AM	97	/* You MAY need SetUID if users run the server by hand or under xinit */
	98	diff -ur X11-6.9.0.org/xc/config/cf/X11.tmpl X11-6.9.0/xc/config/cf/X11.tmpl
	99	--- X11-6.9.0.org/xc/config/cf/X11.tmpl 2005-12-15 00:41:52.000000000 +0100
	100	+++ X11-6.9.0/xc/config/cf/X11.tmpl 2005-12-22 10:32:25.830963000 +0100
51d35eb3 AM	101	@@ -597,7 +597,7 @@
	102	#define BuildXF86RushLibrary (BuildXF86RushExt && !BuildServersOnly)
	103	#endif
	104	#ifndef BuildDPSLibraries
	105	-#define BuildDPSLibraries NO
	106	+#define BuildDPSLibraries YES
	107	#endif
	108	#ifndef BuildDPSLibrary
	109	#define BuildDPSLibrary BuildDPSLibraries
	110	@@ -693,7 +693,7 @@
	111	#endif
	112
	113	#ifndef BuildXterm
	114	-#define BuildXterm NO
	115	+#define BuildXterm YES
	116	#endif
	117
	118	#ifndef BuildXkbcomp
db36d1df	119	@@ -731,7 +731,7 @@
756a6f4b	120	#endif
db36d1df	121
756a6f4b AM	122	#ifndef InstallHardcopyDocs
	123	-#define InstallHardcopyDocs YES
	124	+#define InstallHardcopyDocs NO
	125	#endif
db36d1df	126
756a6f4b	127	#ifndef InstallMiscManPages
db36d1df	128	@@ -1395,8 +1395,12 @@
aa35d5a8 AM	129	# define UsbMouseSupport NO
	130	#endif
	131
	132	+#ifndef EtcX11Directory
	133	+#define EtcX11Directory /etc/X11
	134	+#endif
	135	+
	136	#ifndef DefaultFSConfigFile
	137	-#define DefaultFSConfigFile $(LIBDIR)/fs/config
	138	+#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
	139	#endif
	140
756a6f4b	141	#ifndef BinDir
db36d1df	142	@@ -1483,7 +1487,7 @@
aa35d5a8 AM	143	#define ConfigDir $(LIBDIR)/config
	144	#endif
	145	#ifndef DocDir
	146	-#define DocDir $(LIBDIR)/doc
	147	+#define DocDir $(LIBDIR)/share/doc
	148	#endif
	149	#ifndef DocHtmlDir
	150	#define DocHtmlDir $(DOCDIR)/html
db36d1df	151	@@ -1495,34 +1499,34 @@
aa35d5a8 AM	152	#define DocPdfDir $(DOCDIR)/PDF
	153	#endif
	154	#ifndef FontDir
	155	-#define FontDir $(LIBDIR)/fonts
	156	+#define FontDir /usr/share/fonts
db36d1df AM	157	#endif
	158	#ifndef FontEncDir
	159	#define FontEncDir $(LIBDIR)/fonts/encodings
aa35d5a8 AM	160	#endif
	161	#ifndef AdmDir
	162	-#define AdmDir /usr/adm
	163	+#define AdmDir /var/log
	164	#endif
	165	#ifndef XinitDir
	166	-#define XinitDir $(LIBDIR)/xinit
	167	+#define XinitDir $(ETCX11DIR)/xinit
	168	#endif
	169	#ifndef XdmDir
	170	-#define XdmDir $(LIBDIR)/xdm
	171	+#define XdmDir $(ETCX11DIR)/xdm
	172	#endif
	173	#ifndef XdmVarDir
	174	#define XdmVarDir $(VARLIBDIR)/xdm
	175	#endif
	176	#ifndef XdmAuthDir
	177	-#define XdmAuthDir $(LIBDIR)/xdm
	178	+#define XdmAuthDir $(ETCX11DIR)/xdm
	179	#endif
	180	#ifndef XdmConfigurationSubdirectory /* under xdm sources */
	181	#define XdmConfigurationSubdirectory config
	182	#endif
	183	#ifndef TwmDir
	184	-#define TwmDir $(LIBDIR)/twm
	185	+#define TwmDir $(ETCX11DIR)/twm
	186	#endif
	187	#ifndef XsmDir
	188	-#define XsmDir $(LIBDIR)/xsm
	189	+#define XsmDir $(ETCX11DIR)/xsm
	190	#endif
	191	#ifndef NlsDir
	192	#define NlsDir $(LIBDIR)/nls
bdbeb3fa AM	193	@@ -1502,7 +1502,7 @@
	194	#define FontDir /usr/share/fonts
	195	#endif
	196	#ifndef FontEncDir
	197	-#define FontEncDir $(LIBDIR)/fonts/encodings
	198	+#define FontEncDir /usr/share/fonts/encodings
	199	#endif
	200	#ifndef AdmDir
	201	#define AdmDir /var/log
756a6f4b	202	@@ -1531,23 +1535,20 @@
aa35d5a8 AM	203	#define XLocaleDir $(LIBDIR)/locale
	204	#endif
	205	#ifndef LbxproxyDir
	206	-#define LbxproxyDir $(LIBDIR)/lbxproxy
	207	+#define LbxproxyDir $(ETCX11DIR)/lbxproxy
	208	#endif
	209	#ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
	210	#define LbxproxyConfigSubdir config
	211	#endif
	212	#ifndef ProxyManagerDir
	213	-#define ProxyManagerDir $(LIBDIR)/proxymngr
	214	+#define ProxyManagerDir $(ETCX11DIR)/proxymngr
	215	#endif
	216	#ifndef ServerConfigDir
	217	-#define ServerConfigDir $(LIBDIR)/xserver
	218	+#define ServerConfigDir $(ETCX11DIR)/xserver
	219	#endif
	220	#ifndef XPrintDir
	221	#define XPrintDir ServerConfigDir
	222	#endif
	223	-#ifndef EtcX11Directory
	224	-#define EtcX11Directory /etc/X11
	225	-#endif
	226	#ifndef InstallSecurityConfig
	227	#define InstallSecurityConfig YES /* Install sample security policy */
	228	#endif
756a6f4b	229	@@ -1579,10 +1580,10 @@
aa35d5a8 AM	230	#define OsNameDefines /* as nothing */
	231	#endif
	232	#ifndef DefaultUserPath /* for xdm */
	233	-#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
	234	+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
	235	#endif
	236	#ifndef DefaultSystemPath /* for xdm */
	237	-#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
	238	+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
	239	#endif
	240	#ifndef DefaultSystemShell /* for xdm to set in SHELL */
	241	#define DefaultSystemShell BourneShell
756a6f4b	242	@@ -1719,7 +1720,7 @@
aa35d5a8 AM	243
	244	HTMLINDEXCMD = HtmlIndexCmd
	245
	246	- DOCUTILSRC = $(XTOP)/doc/util
	247	+ DOCUTILSRC = $(XTOP)/share/doc/util
	248	CLIENTSRC = $(TOP)/clients
	249	DEMOSRC = $(TOP)/demos
	250	XDOCMACROS = $(DOCUTILSRC)/macros.t
756a6f4b	251	@@ -1733,7 +1734,7 @@
aa35d5a8 AM	252	SERVERSRC = $(XTOP)/programs/Xserver
	253	CONTRIBSRC = ContribDir
	254	UNSUPPORTEDSRC = UnsupportedDir
	255	- DOCSRC = $(XTOP)/doc
	256	+ DOCSRC = $(XTOP)/share/doc
	257	RGBSRC = $(XTOP)/programs/rgb
	258	BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
	259	MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
db36d1df AM	260	diff -ur X11-6.9.0.org/xc/config/cf/xorg.cf X11-6.9.0/xc/config/cf/xorg.cf
	261	--- X11-6.9.0.org/xc/config/cf/xorg.cf 2005-10-03 18:08:44.000000000 +0200
	262	+++ X11-6.9.0/xc/config/cf/xorg.cf 2005-12-22 10:32:59.590963000 +0100
	263	@@ -136,7 +136,7 @@
756a6f4b	264	#define XConfigFile xorg.conf
aa35d5a8	265	#endif
756a6f4b AM	266	#ifndef XConfigDir
756a6f4b AM	267	-#define XConfigDir $(LIBDIR)
db36d1df	268	+#define XConfigDir $(ETCX11DIR)
aa35d5a8	269	#endif
756a6f4b AM	270	#ifndef XLogFile
756a6f4b AM	271	#define XLogFile Xorg
db36d1df	272	@@ -408,7 +408,7 @@
756a6f4b AM	273	neomagic i740 tdfx savage \
	274	cirrus vmware tseng trident chips apm \
	275	GlideDriver i128 i386Drivers \
	276	- ati DevelDrivers ark \
	277	+ ati DevelDrivers ark fbdev \
	278	cyrix siliconmotion via \
	279	vesa vga \
	280	dummy XF86OSCardDrivers XF86ExtraCardDrivers
db36d1df AM	281	diff -ur X11-6.9.0.org/xc/config/cf/xorgsite.def X11-6.9.0/xc/config/cf/xorgsite.def
	282	--- X11-6.9.0.org/xc/config/cf/xorgsite.def 2005-07-16 09:59:50.000000000 +0200
	283	+++ X11-6.9.0/xc/config/cf/xorgsite.def 2005-12-22 10:33:48.940963000 +0100
	284	@@ -266,8 +266,8 @@
aa35d5a8 AM	285	/*
	286	* To not build/install the Cyrillic fonts, uncomment the following
	287	*
	288	-#define BuildCyrillicFonts NO
	289	*/
	290	+#define BuildCyrillicFonts YES
	291
	292	/*
	293	* To not install the local font directory, uncomment the following
db36d1df	294	@@ -435,8 +435,8 @@
aa35d5a8 AM	295	* Some Linux releases don't have a libtermcap. In this case you may need
	296	* to uncomment the following
	297	*
	298	-#define TermcapLibrary -lncurses
	299	*/
	300	+#define TermcapLibrary -lncurses
	301
	302	/*
	303	* Build a server that dynamically loads the modules by setting
756a6f4b	304	@@ -610,8 +610,8 @@
aa35d5a8 AM	305	* To forceably build static libraries in addition to shared libraries,
	306	* uncomment this.
	307	*
	308	-#define ForceNormalLib YES
	309	*/
	310	+#define ForceNormalLib YES
	311
	312	/*
	313	* Uncomment this if your default tools (eg, gcc, ld, as, etc) are
db36d1df AM	314	diff -ur X11-6.9.0.org/xc/config/imake/imake.c X11-6.9.0/xc/config/imake/imake.c
	315	--- X11-6.9.0.org/xc/config/imake/imake.c 2005-11-08 07:33:24.000000000 +0100
	316	+++ X11-6.9.0/xc/config/imake/imake.c 2005-12-22 10:34:57.200963000 +0100
	317	@@ -1061,6 +1061,7 @@
aa35d5a8 AM	318	static char* suse = "/etc/SuSE-release";
	319	static char* redhat = "/etc/redhat-release";
	320	static char* debian = "/etc/debian_version";
	321	+ static char* pld = "/etc/pld-release";
	322
	323	fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
	324	fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
db36d1df	325	@@ -1075,6 +1076,7 @@
aa35d5a8 AM	326	fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
	327	fprintf (inFile, "%s\n", "#define LinuxWare 11");
	328	fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
	329	+ fprintf (inFile, "%s\n", "#define LinuxPLD 13");
	330
	331	#ifdef CROSSCOMPILE
	332	if (CrossCompiling) {
db36d1df	333	@@ -1101,6 +1103,12 @@
aa35d5a8 AM	334	* at the content of /etc/debian_version */
	335	return;
	336	}
	337	+ if (lstat (pld, &sb) == 0) {
	338	+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
	339	+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
	340	+ return;
	341	+ }
db36d1df	342	+
aa35d5a8 AM	343	/* what's the definitive way to tell what any particular distribution is? */
	344
	345	fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
db36d1df AM	346	diff -ur X11-6.9.0.org/xc/Makefile X11-6.9.0/xc/Makefile
	347	--- X11-6.9.0.org/xc/Makefile 2005-12-15 00:41:52.000000000 +0100
	348	+++ X11-6.9.0/xc/Makefile 2005-12-22 10:39:28.160963000 +0100
	349	@@ -9,7 +9,7 @@
	350	# or add "MAKE = make" to this file.
	351
	352	RELEASE = "Release 6.9"
	353	-SHELL = /bin/sh
	354	+SHELL = /bin/sh -e
	355	RM = rm -f
	356	MV = mv
	357	WORLDOPTS =
	358	diff -ur X11-6.9.0.org/xc/programs/xdm/config/Xres.cpp X11-6.9.0/xc/programs/xdm/config/Xres.cpp
	359	--- X11-6.9.0.org/xc/programs/xdm/config/Xres.cpp 2004-04-23 21:54:43.000000000 +0200
	360	+++ X11-6.9.0/xc/programs/xdm/config/Xres.cpp 2005-12-22 10:35:32.500963000 +0100
756a6f4b AM	361	@@ -70,10 +70,10 @@
756a6f4b AM	362	#endif /* XPM */
aa35d5a8 AM	363	XHASHendif
	364	#ifdef XPM
	365	-XHASHif PLANES >= 8
	366	-xloginlogoFileName: BITMAPDIR/*//XDM_PIXMAP
	367	+XHASHif PLANES > 8
	368	+xloginlogoFileName: BITMAPDIR/*//xdm-pld-logo.xpm
	369	XHASHelse
	370	-xloginlogoFileName: BITMAPDIR/*//XDM_BWPIXMAP
	371	+xloginlogoFileName: BITMAPDIR/*//xdm-pld-logo-bw.xpm
	372	XHASHendif
	373	xlogin*useShape: true
	374	xlogin*logoPadding: 10
db36d1df AM	375	diff -ur X11-6.9.0.org/xc/programs/xdm/resource.c X11-6.9.0/xc/programs/xdm/resource.c
	376	--- X11-6.9.0.org/xc/programs/xdm/resource.c 2005-11-08 07:33:31.000000000 +0100
	377	+++ X11-6.9.0/xc/programs/xdm/resource.c 2005-12-22 10:36:59.580963000 +0100
756a6f4b	378	@@ -85,31 +85,31 @@
aa35d5a8 AM	379	*/
	380	#ifndef __EMX__
	381	#ifndef DEF_SERVER_LINE
	382	-#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
	383	+#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
	384	#endif
	385	#ifndef XRDB_PROGRAM
	386	-#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
	387	+#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
	388	#endif
	389	#ifndef DEF_SESSION
	390	-#define DEF_SESSION "/usr/bin/X11/xterm -ls"
	391	+#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
	392	#endif
	393	#ifndef DEF_USER_PATH
	394	-#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
	395	+#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
	396	#endif
	397	#ifndef DEF_SYSTEM_PATH
	398	-#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
	399	+#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
	400	#endif
	401	#ifndef DEF_SYSTEM_SHELL
	402	#define DEF_SYSTEM_SHELL "/bin/sh"
	403	#endif
	404	#ifndef DEF_FAILSAFE_CLIENT
	405	-#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
	406	+#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
	407	#endif
	408	#ifndef DEF_XDM_CONFIG
	409	-#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
	410	+#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
	411	#endif
	412	#ifndef DEF_CHOOSER
	413	-#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
	414	+#define DEF_CHOOSER "/etc/X11/xdm/chooser"
	415	#endif
	416	#ifndef DEF_AUTH_NAME
	417	#ifdef HASXDMAUTH
756a6f4b	418	@@ -119,7 +119,7 @@
aa35d5a8 AM	419	#endif
	420	#endif
	421	#ifndef DEF_AUTH_DIR
	422	-#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
	423	+#define DEF_AUTH_DIR "/etc/X11/xdm"
	424	#endif
	425	#ifndef DEF_USER_AUTH_DIR
	426	#define DEF_USER_AUTH_DIR "/tmp"
db36d1df AM	427	diff -ur X11-6.9.0.org/xc/programs/xinit/Imakefile X11-6.9.0/xc/programs/xinit/Imakefile
	428	--- X11-6.9.0.org/xc/programs/xinit/Imakefile 2005-11-15 05:03:10.000000000 +0100
	429	+++ X11-6.9.0/xc/programs/xinit/Imakefile 2005-12-22 10:37:39.740963000 +0100
	430	@@ -88,11 +88,12 @@
aa35d5a8 AM	431	#endif
	432	InstallManPage(startx,$(MANDIR))
	433
	434	-#if InstallXinitConfig
	435	-InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
	436	-#else
	437	-InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
	438	-#endif
	439	+XCOMM Red Hat gets this from a different package
	440	+XCOMM #if InstallXinitConfig
	441	+XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
	442	+XCOMM #else
	443	+XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
	444	+XCOMM #endif
	445
	446	LinkConfDirectory(xinit,.,xinit,.)
	447
db36d1df AM	448	diff -ur X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile X11-6.9.0/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
	449	--- X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2005-08-23 03:14:35.000000000 +0200
	450	+++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2005-12-22 10:39:11.440963000 +0100
	451	@@ -110,7 +110,7 @@
	452
	453	#if HasNCurses
	454	CURSESLIB = NCursesLibName
	455	-CURSESDEFINES = -DHAS_NCURSES
	456	+CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
	457	#endif
	458
	459	XF86CONFIGFILE = XConfigFile
	460	diff -ur X11-6.9.0.org/xc/programs/xterm/Imakefile X11-6.9.0/xc/programs/xterm/Imakefile
	461	--- X11-6.9.0.org/xc/programs/xterm/Imakefile 2005-12-15 00:28:27.000000000 +0100
	462	+++ X11-6.9.0/xc/programs/xterm/Imakefile 2005-12-22 10:38:51.510963000 +0100
	463	@@ -68,6 +68,10 @@
	464	# endif
aa35d5a8 AM	465	#endif
	466
	467	+#if InstallXtermSetUID
	468	+#undef InstallXtermSetUID
	469	+#endif
	470	+
	471	#ifndef SpecialCObjectRule
	472	#define SpecialCObjectRule(module,ignore,defines) \
	473	module.o: ; $(CC) -c defines $(CFLAGS) module.c
db36d1df AM	474	@@ -88,6 +92,7 @@
db36d1df AM	475	PUCCPTYDDEF = -DPUCC_PTYD /* does not need to be setuid */
aa35d5a8 AM	476	PTYLIB = -lpucc
aa35d5a8 AM	477	#endif
db36d1df	478	+ PTYLIB = -lutil
aa35d5a8	479
db36d1df AM	480	#if defined(NetBSDArchitecture) \|\| \
	481	defined(OpenBSDArchitecture) \|\| \
	482	@@ -153,7 +158,7 @@
aa35d5a8 AM	483	XKB_DEFINES = XkbClientDefines
aa35d5a8 AM	484	PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
db36d1df	485	DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF)
aa35d5a8 AM	486	- INCLUDES = -I. $(XRFINCLUDES)
	487	+ INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES)
	488
	489	#ifdef OS2Architecture
	490	MAINSRC = os2main.c