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