- updated to 4.1.0

Changed files:
    XFree86-Xwrapper.patch -> 1.4
    XFree86-agpgart-load.patch -> 1.2
    XFree86-fhs.patch -> 1.2
    XFree86-mga-busmstr.patch -> 1.2
    XFree86-no-kernel-modules.patch -> 1.2
    XFree86-xman.patch -> 1.3

diff --git a/XFree86-Xwrapper.patch b/XFree86-Xwrapper.patch
index 820f98a78e06be7177234ba6e099c8bac056bd7a..b4bafa4a70333a9c606011c8e81ccb7e99c550d4 100644 (file)
--- a/XFree86-Xwrapper.patch
+++ b/XFree86-Xwrapper.patch
@@ -1,6 +1,6 @@
-diff -Nur XFree86-4.0.2.org/xc/config/cf/Server.tmpl XFree86-4.0.2/xc/config/cf/Server.tmpl
---- XFree86-4.0.2.org/xc/config/cf/Server.tmpl Fri Feb 18 17:23:07 2000
-+++ XFree86-4.0.2/xc/config/cf/Server.tmpl     Thu Dec 21 08:47:33 2000
+diff -urN XFree86-4.1.0.orig/xc/config/cf/Server.tmpl XFree86-4.1.0/xc/config/cf/Server.tmpl
+--- XFree86-4.1.0.orig/xc/config/cf/Server.tmpl        Fri Apr 20 17:51:15 2001
++++ XFree86-4.1.0/xc/config/cf/Server.tmpl     Sun Jun 17 20:17:24 2001
 @@ -31,8 +31,14 @@
  #ifndef MakeDllModules
  #define MakeDllModules NO
@@ -17,9 +17,9 @@ diff -Nur XFree86-4.0.2.org/xc/config/cf/Server.tmpl XFree86-4.0.2/xc/config/cf/
  #endif
  
  /*
-diff -Nur XFree86-4.0.2.org/xc/config/cf/xf86site.def XFree86-4.0.2/xc/config/cf/xf86site.def
---- XFree86-4.0.2.org/xc/config/cf/xf86site.def        Thu Dec 21 09:01:05 2000
-+++ XFree86-4.0.2/xc/config/cf/xf86site.def    Thu Dec 21 08:47:33 2000
+diff -urN XFree86-4.1.0.orig/xc/config/cf/xf86site.def XFree86-4.1.0/xc/config/cf/xf86site.def
+--- XFree86-4.1.0.orig/xc/config/cf/xf86site.def       Sun Jun 17 19:42:08 2001
++++ XFree86-4.1.0/xc/config/cf/xf86site.def    Sun Jun 17 20:17:24 2001
 @@ -348,13 +348,15 @@
   */
  
@@ -42,10 +42,10 @@ diff -Nur XFree86-4.0.2.org/xc/config/cf/xf86site.def XFree86-4.0.2/xc/config/cf
   */
  
  /*
-diff -Nur XFree86-4.0.2.org/xc/config/cf/xfree86.cf XFree86-4.0.2/xc/config/cf/xfree86.cf
---- XFree86-4.0.2.org/xc/config/cf/xfree86.cf  Thu Dec 21 09:01:06 2000
-+++ XFree86-4.0.2/xc/config/cf/xfree86.cf      Thu Dec 21 08:47:33 2000
-@@ -585,12 +585,15 @@
+diff -urN XFree86-4.1.0.orig/xc/config/cf/xfree86.cf XFree86-4.1.0/xc/config/cf/xfree86.cf
+--- XFree86-4.1.0.orig/xc/config/cf/xfree86.cf Sun Jun 17 19:42:08 2001
++++ XFree86-4.1.0/xc/config/cf/xfree86.cf      Sun Jun 17 20:17:24 2001
+@@ -720,12 +720,15 @@
  #endif
  
  /*
@@ -65,12 +65,12 @@ diff -Nur XFree86-4.0.2.org/xc/config/cf/xfree86.cf XFree86-4.0.2/xc/config/cf/x
  # endif
  #endif
  
-diff -Nur XFree86-4.0.2.org/xc/programs/Xserver/Imakefile XFree86-4.0.2/xc/programs/Xserver/Imakefile
---- XFree86-4.0.2.org/xc/programs/Xserver/Imakefile    Wed Dec 13 00:58:58 2000
-+++ XFree86-4.0.2/xc/programs/Xserver/Imakefile        Thu Dec 21 08:54:16 2000
+diff -urN XFree86-4.1.0.orig/xc/programs/Xserver/Imakefile XFree86-4.1.0/xc/programs/Xserver/Imakefile
+--- XFree86-4.1.0.orig/xc/programs/Xserver/Imakefile   Fri May 18 19:48:30 2001
++++ XFree86-4.1.0/xc/programs/Xserver/Imakefile        Sun Jun 17 20:17:24 2001
 @@ -4,11 +4,6 @@
   */
- XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.205 2000/12/11 20:29:31 dawes Exp $
+ XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.229 2001/05/18 17:48:30 torrey Exp $
  
 -#ifndef InstallXserverSetUID
 -#define InstallXserverSetUID NO
@@ -80,7 +80,7 @@ diff -Nur XFree86-4.0.2.org/xc/programs/Xserver/Imakefile XFree86-4.0.2/xc/progr
  #include <Server.tmpl>
  
  #ifdef XFree86Version
-@@ -1017,6 +1012,11 @@
+@@ -1068,6 +1063,11 @@
        $(XNESTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XNESTSYSLIBS))
  #endif /* XnestServer */
  
@@ -92,9 +92,9 @@ diff -Nur XFree86-4.0.2.org/xc/programs/Xserver/Imakefile XFree86-4.0.2/xc/progr
  
  #if XnonServer
  XCOMM
-diff -Nur XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c
---- XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c       Wed Nov 29 17:43:28 2000
-+++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c   Thu Dec 21 08:47:33 2000
+diff -urN XFree86-4.1.0.orig/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c
+--- XFree86-4.1.0.orig/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c      Tue Nov 14 22:59:24 2000
++++ XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c   Sun Jun 17 20:17:24 2001
 @@ -66,7 +66,10 @@
        /* check if we're run with euid==0 */
        if (geteuid() != 0)
@@ -107,18 +107,18 @@ diff -Nur XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_
        }
  
        /*
-diff -Nur XFree86-4.0.2.org/xc/programs/Xserver/os/Imakefile XFree86-4.0.2/xc/programs/Xserver/os/Imakefile
---- XFree86-4.0.2.org/xc/programs/Xserver/os/Imakefile Tue Dec  5 01:59:14 2000
-+++ XFree86-4.0.2/xc/programs/Xserver/os/Imakefile     Thu Dec 21 08:47:33 2000
-@@ -113,6 +113,7 @@
+diff -urN XFree86-4.1.0.orig/xc/programs/Xserver/os/Imakefile XFree86-4.1.0/xc/programs/Xserver/os/Imakefile
+--- XFree86-4.1.0.orig/xc/programs/Xserver/os/Imakefile        Mon Apr 23 18:17:12 2001
++++ XFree86-4.1.0/xc/programs/Xserver/os/Imakefile     Sun Jun 17 20:18:35 2001
+@@ -116,6 +116,7 @@
  #endif
          DEFINES = -DXSERV_t -DTRANS_SERVER $(CONNECTION_FLAGS) $(MEM_DEFINES) $(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) $(KRB5_DEFINES) $(RGB_DEFINES)
         INCLUDES = -I.  -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(TOP)/lib/Xau -I../lbx Krb5Includes
-+      EXTRA_DEFINES = -DUSE_PAM
-  DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) $(TRANS_INCLUDES) $(CONNECTION_FLAGS)
++  EXTRA_DEFINES = -DUSE_PAM
+  DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines
         LINTLIBS = ../dix/llib-ldix.ln
  
-@@ -156,6 +157,14 @@
+@@ -159,6 +160,14 @@
        cc -c $(DBM_DEFINES) $(CDEBUGFLAGS) $(ALLDEFINES) $*.c
  #else
  SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
@@ -133,9 +133,9 @@ diff -Nur XFree86-4.0.2.org/xc/programs/Xserver/os/Imakefile XFree86-4.0.2/xc/pr
  #endif
  
  #if HasKrb5
-diff -Nur XFree86-4.0.2.org/xc/programs/Xserver/os/wrapper.c XFree86-4.0.2/xc/programs/Xserver/os/wrapper.c
---- XFree86-4.0.2.org/xc/programs/Xserver/os/wrapper.c Thu Jan  1 01:00:00 1970
-+++ XFree86-4.0.2/xc/programs/Xserver/os/wrapper.c     Thu Dec 21 08:47:33 2000
+diff -urN XFree86-4.1.0.orig/xc/programs/Xserver/os/wrapper.c XFree86-4.1.0/xc/programs/Xserver/os/wrapper.c
+--- XFree86-4.1.0.orig/xc/programs/Xserver/os/wrapper.c        Thu Jan  1 01:00:00 1970
++++ XFree86-4.1.0/xc/programs/Xserver/os/wrapper.c     Sun Jun 17 20:17:24 2001
 @@ -0,0 +1,304 @@
 +/*
 + * X server wrapper.
@@ -441,10 +441,10 @@ diff -Nur XFree86-4.0.2.org/xc/programs/Xserver/os/wrapper.c XFree86-4.0.2/xc/pr
 +    exit(1);
 +}
 +
-diff -Nur XFree86-4.0.2.org/xc/programs/xinit/xinit.c XFree86-4.0.2/xc/programs/xinit/xinit.c
---- XFree86-4.0.2.org/xc/programs/xinit/xinit.c        Tue Nov  7 00:06:04 2000
-+++ XFree86-4.0.2/xc/programs/xinit/xinit.c    Thu Dec 21 08:47:33 2000
-@@ -147,6 +147,7 @@
+diff -urN XFree86-4.1.0.orig/xc/programs/xinit/xinit.c XFree86-4.1.0/xc/programs/xinit/xinit.c
+--- XFree86-4.1.0.orig/xc/programs/xinit/xinit.c       Mon Apr 16 08:51:46 2001
++++ XFree86-4.1.0/xc/programs/xinit/xinit.c    Sun Jun 17 20:17:24 2001
+@@ -148,6 +148,7 @@
  #define       OK_EXIT         0
  #define       ERR_EXIT        1
  
@@ -452,7 +452,7 @@ diff -Nur XFree86-4.0.2.org/xc/programs/xinit/xinit.c XFree86-4.0.2/xc/programs/
  char *default_server = "X";
  char *default_display = ":0";         /* choose most efficient */
  #ifndef __EMX__
-@@ -316,7 +317,10 @@
+@@ -317,7 +318,10 @@
        if (argc == 0 ||
  #ifndef __EMX__
            (**argv != '/' && **argv != '.')) {

diff --git a/XFree86-agpgart-load.patch b/XFree86-agpgart-load.patch
index 2dba4e6b9b5d92b6d1ee21ec0b9355863607f210..6f601b90209d5204302f72cc621fdd6506c73f79 100644 (file)
--- a/XFree86-agpgart-load.patch
+++ b/XFree86-agpgart-load.patch
@@ -1,9 +1,9 @@
---- XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c.foo    Thu Mar  1 10:30:43 2001
-+++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c        Thu Mar  1 10:36:48 2001
-@@ -280,6 +280,9 @@
- 
- #if defined(XFree86Server)
-     if (!drmAvailable()) {
+--- XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c~       Sat May 19 02:26:45 2001
++++ XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c        Sun Jun 17 23:05:42 2001
+@@ -285,6 +285,9 @@
+ #if !defined(XFree86Server)
+       return -1;
+ #else
 +      if (!xf86LoadKernelModule("agpgart")) {
 +          ErrorF("[drm] failed to load kernel module \"agpgart\"\n");
 +      }

diff --git a/XFree86-fhs.patch b/XFree86-fhs.patch
index c4237e3cfee0fb349f4eb5ad0e32d1be3fc8b18d..f892d3cb6035c1044d80beb4367c0dbd179778b3 100644 (file)
--- a/XFree86-fhs.patch
+++ b/XFree86-fhs.patch
@@ -78,26 +78,6 @@
  ENVPREFIX=RSTART
  PACKAGEname=rstart
  
---- XFree86-4.0/xc/programs/xbiff/xbiff.man.fhs        Sat Feb 12 22:56:13 2000
-+++ XFree86-4.0/xc/programs/xbiff/xbiff.man    Wed Jun 28 19:17:19 2000
-@@ -55,7 +55,7 @@
- .TP 8
- .B \-file \fIfilename\fP
- This option specifies the name of the file which should be monitored.  By
--default, it watches /usr/spool/mail/\fIusername\fP, where \fIusername\fP
-+default, it watches /var/mail/\fIusername\fP, where \fIusername\fP
- is your login name.
- .TP 8
- .B \-volume \fIpercentage\fP
-@@ -114,7 +114,7 @@
- .TP 8
- .B file (\fPclass\fB File)
- Specifies the name of the file to monitor.  The default is to watch
--/usr/spool/mail/\fIusername\fP, where \fIusername\fP is your login name.
-+/var/mail/\fIusername\fP, where \fIusername\fP is your login name.
- .TP 8
- .B onceOnly (\fPclass\fB Boolean)
- Specifies that the bell is only rung the first time new mail is found
 --- XFree86-4.0/xc/programs/xbiff/MailboxP.h.fhs       Sat Feb 12 22:56:12 2000
 +++ XFree86-4.0/xc/programs/xbiff/MailboxP.h   Wed Jun 28 19:17:19 2000
 @@ -50,7 +50,7 @@

diff --git a/XFree86-mga-busmstr.patch b/XFree86-mga-busmstr.patch
index 3ca86a798e7aaf320f3e34b66dc71f580dbc057d..dc5ddc0b6d787471b87ad82db4d6848cee31db3b 100644 (file)
--- a/XFree86-mga-busmstr.patch
+++ b/XFree86-mga-busmstr.patch
@@ -1,26 +1,21 @@
-Index: mga_dri.c
-===================================================================
-RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c,v
-retrieving revision 1.14
-diff -u -r1.14 mga_dri.c
---- XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c 2000/12/11 22:34:55     1.14
-+++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c 2001/03/02 20:13:06
-@@ -379,6 +379,7 @@
-    int init_offset;
-    int i;
-    unsigned long mode_mask;
+--- XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c.orig    Wed May  2 17:06:09 2001
++++ XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c Sun Jun 17 23:03:55 2001
+@@ -897,6 +897,7 @@
+    DRIInfoPtr pDRIInfo;
+    MGADRIPtr pMGADRI;
+    MGADRIServerPrivatePtr pMGADRIServer;
 +   CARD32 pciCommand;
  
-    switch(pMGA->Chipset) {
+    switch ( pMga->Chipset ) {
     case PCI_CHIP_MGAG400:
-@@ -782,6 +783,11 @@
+@@ -1118,6 +1119,11 @@
        return FALSE;
     }
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "visual configs initialized\n" );
+    xf86DrvMsg( pScrn->scrnIndex, X_INFO, "[dri] visual configs initialized\n" );
 +
 +   /* Enable bus mastering in PCI config space */
-+   pciCommand = pciReadLong(pMGA->PciTag, PCI_CMD_STAT_REG);
-+   pciWriteLong(pMGA->PciTag, PCI_CMD_STAT_REG,
++   pciCommand = pciReadLong(pMga->PciTag, PCI_CMD_STAT_REG);
++   pciWriteLong(pMga->PciTag, PCI_CMD_STAT_REG,
 +              pciCommand | PCI_CMD_MASTER_ENABLE);
  
     return TRUE;

diff --git a/XFree86-no-kernel-modules.patch b/XFree86-no-kernel-modules.patch
index 8eabf8a888ed13947e853baae07a744916505719..5e7f9e7679df84c1431cdc8d9261c69ef7811546 100644 (file)
--- a/XFree86-no-kernel-modules.patch
+++ b/XFree86-no-kernel-modules.patch
@@ -1,5 +1,5 @@
---- XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Imakefile~        Wed Nov 29 17:43:32 2000
-+++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Imakefile Sun Dec 31 03:25:16 2000
+--- XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Imakefile~        Wed Apr 18 16:52:43 2001
++++ XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Imakefile Sun Jun 17 22:50:25 2001
 @@ -7,13 +7,8 @@
  XCOMM to maintain the single Makefile.linux with kernel-specific
  XCOMM support.  Later, we can move to a different Imakefile.
@@ -9,7 +9,7 @@
 -      $(MAKE) -f Makefile.linux
 -#else
  all::
-       echo 'Use "make -f Makefile.linux" to manually build drm.o'
+       @echo 'Use "make -f Makefile.linux" to manually build drm.o'
 -#endif
  
  clean::

diff --git a/XFree86-xman.patch b/XFree86-xman.patch
index 6a544070a1b435d5f11b543ffc4bf9d7faf6f9ab..1d03ddd87bef5f3d5daa2186cfeb2d0a808dddf5 100644 (file)
--- a/XFree86-xman.patch
+++ b/XFree86-xman.patch
@@ -1,17 +1,19 @@
---- XFree86-4.0.1/xc/programs/xman/vendor.h.foo        Mon Aug 14 15:13:05 2000
-+++ XFree86-4.0.1/xc/programs/xman/vendor.h    Mon Aug 14 15:13:38 2000
-@@ -63,7 +63,7 @@
+diff -urN XFree86-4.1.0.orig/xc/programs/xman/vendor.h XFree86-4.1.0/xc/programs/xman/vendor.h
+--- XFree86-4.1.0.orig/xc/programs/xman/vendor.h       Thu Apr 19 21:54:51 2001
++++ XFree86-4.1.0/xc/programs/xman/vendor.h    Sun Jun 17 22:42:16 2001
+@@ -62,7 +62,7 @@
+ #if defined(__FreeBSD__)
  # define MANCONF "/etc/manpath.config"
- #else
- # if (defined(BSD) && (BSD >= 199103)) || defined(linux)
--#  define MANCONF "/etc/man.conf"
-+#  define MANCONF "/etc/man.config"
- # endif
+ #elif (defined(BSD) && (BSD >= 199103)) || defined(linux)
+-# define MANCONF "/etc/man.conf"
++# define MANCONF "/etc/man.config"
  #endif
  
---- XFree86-4.0.1/xc/programs/xman/xman.man.foo        Mon Aug 14 15:13:11 2000
-+++ XFree86-4.0.1/xc/programs/xman/xman.man    Mon Aug 14 15:13:24 2000
-@@ -90,8 +90,8 @@
+ /*
+diff -urN XFree86-4.1.0.orig/xc/programs/xman/xman.man XFree86-4.1.0/xc/programs/xman/xman.man
+--- XFree86-4.1.0.orig/xc/programs/xman/xman.man       Sat Jan 27 19:21:18 2001
++++ XFree86-4.1.0/xc/programs/xman/xman.man    Sun Jun 17 22:41:25 2001
+@@ -93,8 +93,8 @@
  .SH "BSD AND LINUX SYSTEMS"        
  .PP
  In newer BSD and Linux systems, \fIXman\fP will search for a file named