- updated to 6.8.0

Changed files:
    X11-PLD.patch -> 1.5.2.3

diff --git a/X11-PLD.patch b/X11-PLD.patch
index c4553f8b739c91a2e07e5aac9005fe9fcc4b1c92..32c0ae1413c1a304b313514ee6917eb1b8c7fe19 100644 (file)
--- a/X11-PLD.patch
+++ b/X11-PLD.patch
@@ -1,6 +1,5 @@
-diff -urN xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
---- xc.orig/config/cf/Imake.cf 2004-08-08 14:23:13.490683768 +0200
-+++ xc/config/cf/Imake.cf      2004-08-08 14:24:15.046325888 +0200
+--- xc/config/cf/Imake.cf.wiget        2004-08-11 23:14:01.000000000 +0200
++++ xc/config/cf/Imake.cf      2004-09-09 16:16:53.093467589 +0200
 @@ -805,6 +805,10 @@
  #   define s390Architecture
  #  undef __s390__
@@ -12,9 +11,8 @@ diff -urN xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
  # 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       2004-08-08 14:23:13.457688784 +0200
-+++ xc/config/cf/Imake.tmpl    2004-08-08 14:24:15.066322848 +0200
+--- xc/config/cf/Imake.tmpl.wiget      2004-07-28 05:24:29.000000000 +0200
++++ xc/config/cf/Imake.tmpl    2004-09-09 16:16:53.116463078 +0200
 @@ -262,7 +262,7 @@
  
  #ifndef BuildHtmlManPages
@@ -45,10 +43,9 @@ diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
  #endif
  #ifndef CppNoLineInfoOption
  #define CppNoLineInfoOption /**/
-diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
---- xc.orig/config/cf/linux.cf 2004-08-08 14:23:13.452689544 +0200
-+++ xc/config/cf/linux.cf      2004-08-08 14:24:15.097318136 +0200
-@@ -366,7 +366,7 @@
+--- xc/config/cf/linux.cf.wiget        2004-08-11 23:14:01.000000000 +0200
++++ xc/config/cf/linux.cf      2004-09-09 16:16:53.123461705 +0200
+@@ -368,7 +368,7 @@
   */
  #if BuildXF86DRI
  # if defined(i386Architecture)
@@ -57,7 +54,7 @@ diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
  # endif
  #endif
  
-@@ -755,7 +755,7 @@
+@@ -757,7 +757,7 @@
  
  #define HasVarRun             YES
  #ifndef VarDbDirectory
@@ -66,9 +63,8 @@ diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
  #endif
  
  #ifndef XF86OSCardDrivers
-diff -urN xc.orig/config/cf/site.def xc/config/cf/site.def
---- xc.orig/config/cf/site.def 2004-08-08 14:23:13.491683616 +0200
-+++ xc/config/cf/site.def      2004-08-08 14:24:15.098317984 +0200
+--- xc/config/cf/site.def.wiget        2004-05-06 17:08:25.000000000 +0200
++++ xc/config/cf/site.def      2004-09-09 16:16:53.129460529 +0200
 @@ -119,10 +119,14 @@
  #define HasSentinel   YES
  */
@@ -87,10 +83,9 @@ diff -urN xc.orig/config/cf/site.def xc/config/cf/site.def
  
  
  /* You do NOT need SetUID if you only run the server under xdm */
-diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
---- xc.orig/config/cf/X11.tmpl 2004-08-08 14:23:13.498682552 +0200
-+++ xc/config/cf/X11.tmpl      2004-08-08 14:24:15.083320264 +0200
-@@ -1390,8 +1390,12 @@
+--- xc/config/cf/X11.tmpl.wiget        2004-09-03 18:18:18.000000000 +0200
++++ xc/config/cf/X11.tmpl      2004-09-09 16:16:53.172452095 +0200
+@@ -1398,8 +1398,12 @@
  # define UsbMouseSupport NO
  #endif
  
@@ -104,7 +99,7 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
  #endif
  
  #ifndef BinDir
-@@ -1478,7 +1482,7 @@
+@@ -1486,7 +1490,7 @@
  #define ConfigDir $(LIBDIR)/config
  #endif
  #ifndef DocDir
@@ -113,7 +108,7 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
  #endif
  #ifndef DocHtmlDir
  #define DocHtmlDir $(DOCDIR)/html
-@@ -1490,31 +1494,31 @@
+@@ -1498,31 +1502,31 @@
  #define DocPdfDir $(DOCDIR)/PDF
  #endif
  #ifndef FontDir
@@ -152,7 +147,7 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
  #endif
  #ifndef NlsDir
  #define NlsDir $(LIBDIR)/nls
-@@ -1523,23 +1527,20 @@
+@@ -1531,23 +1535,20 @@
  #define XLocaleDir $(LIBDIR)/locale
  #endif
  #ifndef LbxproxyDir
@@ -179,7 +174,7 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
  #ifndef InstallSecurityConfig
  #define InstallSecurityConfig YES     /* Install sample security policy */
  #endif
-@@ -1571,10 +1572,10 @@
+@@ -1579,10 +1580,10 @@
  #define OsNameDefines /* as nothing */
  #endif
  #ifndef DefaultUserPath                       /* for xdm */
@@ -192,7 +187,7 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
  #endif
  #ifndef DefaultSystemShell            /* for xdm to set in SHELL */
  #define DefaultSystemShell BourneShell
-@@ -1709,7 +1710,7 @@
+@@ -1719,7 +1720,7 @@
  
       HTMLINDEXCMD = HtmlIndexCmd
  
@@ -201,7 +196,7 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
          CLIENTSRC = $(TOP)/clients
            DEMOSRC = $(TOP)/demos
         XDOCMACROS = $(DOCUTILSRC)/macros.t
-@@ -1723,7 +1724,7 @@
+@@ -1733,7 +1734,7 @@
          SERVERSRC = $(XTOP)/programs/Xserver
         CONTRIBSRC = ContribDir
     UNSUPPORTEDSRC = UnsupportedDir
@@ -210,10 +205,9 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
             RGBSRC = $(XTOP)/programs/rgb
        BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
       MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
-diff -urN xc.orig/config/cf/xorg.cf xc/config/cf/xorg.cf
---- xc.orig/config/cf/xorg.cf  2004-08-08 14:23:13.473686352 +0200
-+++ xc/config/cf/xorg.cf       2004-08-08 14:26:34.721092096 +0200
-@@ -136,7 +136,7 @@
+--- xc/config/cf/xorg.cf.wiget 2004-09-04 00:00:10.000000000 +0200
++++ xc/config/cf/xorg.cf       2004-09-09 16:16:53.189448761 +0200
+@@ -142,7 +142,7 @@
  #define XConfigFile           xorg.conf
  #endif
  #ifndef XConfigDir
@@ -222,7 +216,7 @@ diff -urN xc.orig/config/cf/xorg.cf xc/config/cf/xorg.cf
  #endif
  #ifndef XLogFile
  #define XLogFile              Xorg
-@@ -397,7 +397,7 @@
+@@ -409,7 +409,7 @@
                                neomagic i740 tdfx savage \
                                cirrus vmware tseng trident chips apm \
                                GlideDriver i128 i386Drivers \
@@ -231,10 +225,9 @@ diff -urN xc.orig/config/cf/xorg.cf xc/config/cf/xorg.cf
                                cyrix siliconmotion via \
                                vesa vga \
                                dummy XF86OSCardDrivers XF86ExtraCardDrivers
-diff -urN xc.orig/config/cf/xorgsite.def xc/config/cf/xorgsite.def
---- xc.orig/config/cf/xorgsite.def     2004-08-08 14:23:13.467687264 +0200
-+++ xc/config/cf/xorgsite.def  2004-08-08 14:24:15.099317832 +0200
-@@ -255,8 +255,8 @@
+--- xc/config/cf/xorgsite.def.wiget    2004-08-21 04:06:44.000000000 +0200
++++ xc/config/cf/xorgsite.def  2004-09-09 16:16:53.193447976 +0200
+@@ -264,8 +264,8 @@
  /*
   * To not build/install the Cyrillic fonts, uncomment the following
   *
@@ -244,7 +237,7 @@ diff -urN xc.orig/config/cf/xorgsite.def xc/config/cf/xorgsite.def
  
  /*
   * To not install the local font directory, uncomment the following
-@@ -302,20 +302,20 @@
+@@ -311,20 +311,20 @@
   * HasGlide2 to YES and set the Glide2IncDir variable. 
   * HasGlide2 is per default NO.
   *
@@ -268,7 +261,7 @@ diff -urN xc.orig/config/cf/xorgsite.def xc/config/cf/xorgsite.def
  
  /*
   * Set the path to your Glide 3 include files.
-@@ -424,8 +424,8 @@
+@@ -433,8 +433,8 @@
   * Some Linux releases don't have a libtermcap.  In this case you may need
   * to uncomment the following
   *
@@ -278,7 +271,7 @@ diff -urN xc.orig/config/cf/xorgsite.def xc/config/cf/xorgsite.def
  
  /*
   * Build a server that dynamically loads the modules by setting
-@@ -600,8 +600,8 @@
+@@ -610,8 +610,8 @@
   * To forceably build static libraries in addition to shared libraries,
   * uncomment this.
   *
@@ -288,9 +281,8 @@ diff -urN xc.orig/config/cf/xorgsite.def xc/config/cf/xorgsite.def
  
  /*
   * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
-diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
---- xc.orig/config/imake/imake.c       2004-08-08 14:23:13.723648352 +0200
-+++ xc/config/imake/imake.c    2004-08-08 14:24:15.116315248 +0200
+--- xc/config/imake/imake.c.wiget      2004-06-11 19:59:30.000000000 +0200
++++ xc/config/imake/imake.c    2004-09-09 16:16:53.252436404 +0200
 @@ -1057,6 +1057,7 @@
    static char* suse = "/etc/SuSE-release";
    static char* redhat = "/etc/redhat-release";
@@ -319,21 +311,8 @@ diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
    /* what's the definitive way to tell what any particular distribution is? */
  
    fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
-diff -urN xc.orig/Makefile xc/Makefile
---- xc.orig/Makefile   2004-08-08 14:23:52.771712144 +0200
-+++ xc/Makefile        2004-08-08 14:24:15.046325888 +0200
-@@ -8,7 +8,7 @@
- # or add "MAKE = make" to this file.
- 
- RELEASE = "Release 6.7"
--SHELL = /bin/sh
-+SHELL = /bin/sh -e
- RM = rm -f
- MV = mv
- WORLDOPTS =
-diff -urN xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
---- xc.orig/programs/xdm/config/Xres.cpp       2004-08-08 14:22:57.000000000 +0200
-+++ xc/programs/xdm/config/Xres.cpp    2004-08-08 14:24:15.140311600 +0200
+--- xc/programs/xdm/config/Xres.cpp.wiget      2004-04-23 21:54:43.000000000 +0200
++++ xc/programs/xdm/config/Xres.cpp    2004-09-09 16:16:53.261434639 +0200
 @@ -70,10 +70,10 @@
  #endif /* XPM */
  XHASHendif
@@ -348,9 +327,8 @@ diff -urN xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
  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    2004-08-08 14:22:57.000000000 +0200
-+++ xc/programs/xdm/resource.c 2004-08-08 14:24:15.151309928 +0200
+--- xc/programs/xdm/resource.c.wiget   2004-04-23 21:54:42.000000000 +0200
++++ xc/programs/xdm/resource.c 2004-09-09 16:16:53.264434051 +0200
 @@ -85,31 +85,31 @@
   */
  #ifndef __EMX__
@@ -400,9 +378,8 @@ diff -urN xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
  #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   2004-08-08 14:22:55.000000000 +0200
-+++ xc/programs/xinit/Imakefile        2004-08-08 14:24:15.175306280 +0200
+--- xc/programs/xinit/Imakefile.wiget  2004-04-23 21:54:49.000000000 +0200
++++ xc/programs/xinit/Imakefile        2004-09-09 16:16:53.265433855 +0200
 @@ -48,11 +48,12 @@
  #endif
  InstallManPage(startx,$(MANDIR))
@@ -421,22 +398,9 @@ diff -urN xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile
  
  LinkConfDirectory(xinit,.,xinit,.)
  
-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      2004-08-08 14:22:34.000000000 +0200
-+++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile   2004-08-08 14:24:15.128313424 +0200
-@@ -110,7 +110,7 @@
- 
- #if HasNCurses
- CURSESLIB = NCursesLibName
--CURSESDEFINES  = -DHAS_NCURSES
-+CURSESDEFINES  = -DHAS_NCURSES -I/usr/include/ncurses
- #endif
- 
- XF86CONFIGFILE = XConfigFile
-diff -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
---- xc.orig/programs/xterm/Imakefile   2004-08-08 14:22:19.000000000 +0200
-+++ xc/programs/xterm/Imakefile        2004-08-08 14:24:54.244366880 +0200
-@@ -37,6 +37,10 @@
+--- xc/programs/xterm/Imakefile.wiget  2004-08-13 14:57:19.000000000 +0200
++++ xc/programs/xterm/Imakefile        2004-09-09 16:16:53.267433462 +0200
+@@ -36,6 +36,10 @@
  #define XkbClientLibs /**/
  #endif
  
@@ -447,7 +411,7 @@ diff -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
  #ifndef SpecialCObjectRule
  #define SpecialCObjectRule(module,ignore,defines) \
  module.o: ; $(CC) -c defines $(CFLAGS) module.c
-@@ -58,6 +62,8 @@
+@@ -57,6 +61,8 @@
           PTYLIB = -lpucc
  #endif
  
@@ -456,7 +420,7 @@ diff -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
  #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
      (defined(LinuxArchitecture) && \
       (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
-@@ -116,7 +116,7 @@
+@@ -116,7 +122,7 @@
      XKB_DEFINES = XkbClientDefines
     PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
          DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
@@ -465,10 +429,9 @@ diff -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
  
  #ifdef OS2Architecture
          MAINSRC = os2main.c
-diff -urN xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h
---- xc.orig/programs/xterm/xterm.h     2004-08-08 14:22:18.000000000 +0200
-+++ xc/programs/xterm/xterm.h  2004-08-08 14:24:15.211300808 +0200
-@@ -73,7 +73,7 @@
+--- xc/programs/xterm/xterm.h.wiget    2004-08-13 14:57:21.000000000 +0200
++++ xc/programs/xterm/xterm.h  2004-09-09 16:16:53.269433070 +0200
+@@ -75,7 +75,7 @@
  #endif
  
  #ifndef DFT_TERMTYPE
@@ -477,3 +440,25 @@ diff -urN xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h
  #endif
  
  #ifndef X_NOT_POSIX
+--- xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile.wiget     2004-09-02 03:10:29.000000000 +0200
++++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile   2004-09-09 16:16:53.266433659 +0200
+@@ -110,7 +110,7 @@
+ 
+ #if HasNCurses
+ CURSESLIB = NCursesLibName
+-CURSESDEFINES  = -DHAS_NCURSES
++CURSESDEFINES  = -DHAS_NCURSES -I/usr/include/ncurses
+ #endif
+ 
+ XF86CONFIGFILE = XConfigFile
+--- xc/Makefile.wiget  2004-09-03 18:18:17.000000000 +0200
++++ xc/Makefile        2004-09-09 16:18:24.437548570 +0200
+@@ -8,7 +8,7 @@
+ # or add "MAKE = make" to this file.
+ 
+ RELEASE = "Release 6.8"
+-SHELL = /bin/sh
++SHELL = /bin/sh -e
+ RM = rm -f
+ MV = mv
+ WORLDOPTS =