Make these into actual patches against XFree86 instead of patches against

the XFree86 port directory.  Before these would generate the files
files/patch-r0[1234] (some of them multiple times), now they will actually
patch the X sources to achieve the desired results.

4 files changed, 66 insertions, 271 deletions

diff --git a/x11/XFree86/files/patch-cf-lnxdoc.rules b/x11/XFree86/files/patch-cf-lnxdoc.rules
index e2242b6d3635..250a7a17bf1e 100644
--- a/x11/XFree86/files/patch-cf-lnxdoc.rules
+++ b/x11/XFree86/files/patch-cf-lnxdoc.rules
@@ -1,59 +1,11 @@
-Index: files/patch-r03
-===================================================================
-RCS file: patch-r03
-diff -N patch-r03
---- /dev/null	Wed Nov  8 02:15:56 2000
-+++ patch-r03	Wed Nov  8 16:53:11 2000
-@@ -0,0 +1,11 @@
-+--- config/cf/lnxdoc.rules.orig	Tue Jul 18 18:16:01 2000
-++++ config/cf/lnxdoc.rules	Tue Jul 18 18:19:05 2000
-+@@ -122,7 +122,7 @@
-+ 	@(BASE=`basename sgmlfile .sgml`;\				@@\
-+ 	  set -x;\							@@\
-+ 	  RemoveFile($$BASE.latin1);\					@@\
-+-	  $(SGMLFMTCMD) -f latin1 -b -n sgmlfile && \			@@\
-++	  $(SGMLFMTCMD) -f latin1 sgmlfile && \				@@\
-+ 	  $(XFREE86IDENTFIX) < $$BASE.latin1 > _$@ && $(MV) _$@ $@ && \	@@\
-+ 	  RemoveFile($$BASE.latin1))					@@\
-+ 									@@\
-Index: files/patch-r04
-===================================================================
-RCS file: patch-r04
-diff -N patch-r04
---- /dev/null	Wed Nov  8 02:15:56 2000
-+++ patch-r04	Wed Nov  8 16:53:19 2000
-@@ -0,0 +1,34 @@
-+--- programs/Xserver/hw/xfree86/doc/Japanese/Imakefile.orig	Fri Dec  3 01:42:36 1999
-++++ programs/Xserver/hw/xfree86/doc/Japanese/Imakefile	Mon Jul 24 19:15:08 2000
-+@@ -3,7 +3,6 @@
-+ XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile,v 3.8.2.4 1999/11/26 15:22:58 hohndel Exp $
-+ #include <Server.tmpl>
-+ 
-+-#if !BuildLinuxDocText
-+ /* FreeBSD's README is handled separately because of name length limits */
-+ #ifdef BSD386Architecture
-+ OSREADME = /* README.Bsdi */
-+@@ -56,7 +55,6 @@
-+ #ifdef OS2Architecture
-+ OSREADME = README.OS2
-+ #endif
-+-#endif /* !BuildLinuxDocText */
-+ 
-+ #if XFree86Version % 10
-+ REPORTFORM = BetaReport
-+@@ -64,7 +62,6 @@
-+ 
-+ all::
-+ 
-+-#if !BuildLinuxDocText
-+ HWREADME =  README.ati README.trident README.tseng README.WstDig \
-+             README.DECtga  README.apm README.rendition README.epson \
-+             README.chips README.cirrus README.Video7 README.P9000 README.agx \
-+@@ -77,7 +74,6 @@
-+ MAINDOCS = COPYRIGHT README README.Config BUILD RELNOTES
-+ 
-+ OTHERDOCS = VideoModes.doc QuickStart.doc README.clkprog xinput
-+-#endif
-+ 
-+ ## MISCDOCS = ServersOnly /*LbxproxyOnly*/ $(REPORTFORM) README.DGA
-+ MISCDOCS = VGADriver.doc modelines.txt
+--- config/cf/lnxdoc.rules.orig	Tue Jul 18 18:16:01 2000
++++ config/cf/lnxdoc.rules	Tue Jul 18 18:19:05 2000
+@@ -122,7 +122,7 @@
+ 	@(BASE=`basename sgmlfile .sgml`;\				@@\
+ 	  set -x;\							@@\
+ 	  RemoveFile($$BASE.latin1);\					@@\
+-	  $(SGMLFMTCMD) -f latin1 -b -n sgmlfile && \			@@\
++	  $(SGMLFMTCMD) -f latin1 sgmlfile && \				@@\
+ 	  $(XFREE86IDENTFIX) < $$BASE.latin1 > _$@ && $(MV) _$@ $@ && \	@@\
+ 	  RemoveFile($$BASE.latin1))					@@\
+ 									@@\
diff --git a/x11/XFree86/files/patch-doc-Imakefile b/x11/XFree86/files/patch-doc-Imakefile
index 73c532a97de5..2f2284409235 100644
--- a/x11/XFree86/files/patch-doc-Imakefile
+++ b/x11/XFree86/files/patch-doc-Imakefile
@@ -1,77 +1,11 @@
-Index: files/patch-r02
-===================================================================
-RCS file: patch-r02
-diff -N patch-r02
---- /dev/null	Wed Nov  8 02:15:56 2000
-+++ patch-r02	Wed Nov  8 16:53:05 2000
-@@ -0,0 +1,11 @@
-+--- programs/Xserver/hw/xfree86/doc/Imakefile.orig	Tue Jul 18 15:31:36 2000
-++++ programs/Xserver/hw/xfree86/doc/Imakefile	Tue Jul 18 15:31:52 2000
-+@@ -90,7 +90,7 @@
-+             README.I128 README.Mach32 \
-+             README.Mach64 README.ark README.MGA README.NVIDIA README.mouse \
-+ 	    README.neo README.rendition README.3DLabs README.cyrix \
-+-	    README.i740 README.r128
-++	    README.i740 README.i810 README.r128
-+ 
-+ MAINDOCS = COPYRIGHT README README.Config BUILD RELNOTES
-+ 
-Index: files/patch-r03
-===================================================================
-RCS file: patch-r03
-diff -N patch-r03
---- /dev/null	Wed Nov  8 02:15:56 2000
-+++ patch-r03	Wed Nov  8 16:53:11 2000
-@@ -0,0 +1,11 @@
-+--- config/cf/lnxdoc.rules.orig	Tue Jul 18 18:16:01 2000
-++++ config/cf/lnxdoc.rules	Tue Jul 18 18:19:05 2000
-+@@ -122,7 +122,7 @@
-+ 	@(BASE=`basename sgmlfile .sgml`;\				@@\
-+ 	  set -x;\							@@\
-+ 	  RemoveFile($$BASE.latin1);\					@@\
-+-	  $(SGMLFMTCMD) -f latin1 -b -n sgmlfile && \			@@\
-++	  $(SGMLFMTCMD) -f latin1 sgmlfile && \				@@\
-+ 	  $(XFREE86IDENTFIX) < $$BASE.latin1 > _$@ && $(MV) _$@ $@ && \	@@\
-+ 	  RemoveFile($$BASE.latin1))					@@\
-+ 									@@\
-Index: files/patch-r04
-===================================================================
-RCS file: patch-r04
-diff -N patch-r04
---- /dev/null	Wed Nov  8 02:15:56 2000
-+++ patch-r04	Wed Nov  8 16:53:19 2000
-@@ -0,0 +1,34 @@
-+--- programs/Xserver/hw/xfree86/doc/Japanese/Imakefile.orig	Fri Dec  3 01:42:36 1999
-++++ programs/Xserver/hw/xfree86/doc/Japanese/Imakefile	Mon Jul 24 19:15:08 2000
-+@@ -3,7 +3,6 @@
-+ XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile,v 3.8.2.4 1999/11/26 15:22:58 hohndel Exp $
-+ #include <Server.tmpl>
-+ 
-+-#if !BuildLinuxDocText
-+ /* FreeBSD's README is handled separately because of name length limits */
-+ #ifdef BSD386Architecture
-+ OSREADME = /* README.Bsdi */
-+@@ -56,7 +55,6 @@
-+ #ifdef OS2Architecture
-+ OSREADME = README.OS2
-+ #endif
-+-#endif /* !BuildLinuxDocText */
-+ 
-+ #if XFree86Version % 10
-+ REPORTFORM = BetaReport
-+@@ -64,7 +62,6 @@
-+ 
-+ all::
-+ 
-+-#if !BuildLinuxDocText
-+ HWREADME =  README.ati README.trident README.tseng README.WstDig \
-+             README.DECtga  README.apm README.rendition README.epson \
-+             README.chips README.cirrus README.Video7 README.P9000 README.agx \
-+@@ -77,7 +74,6 @@
-+ MAINDOCS = COPYRIGHT README README.Config BUILD RELNOTES
-+ 
-+ OTHERDOCS = VideoModes.doc QuickStart.doc README.clkprog xinput
-+-#endif
-+ 
-+ ## MISCDOCS = ServersOnly /*LbxproxyOnly*/ $(REPORTFORM) README.DGA
-+ MISCDOCS = VGADriver.doc modelines.txt
+--- programs/Xserver/hw/xfree86/doc/Imakefile.orig	Tue Jul 18 15:31:36 2000
++++ programs/Xserver/hw/xfree86/doc/Imakefile	Tue Jul 18 15:31:52 2000
+@@ -90,7 +90,7 @@
+             README.I128 README.Mach32 \
+             README.Mach64 README.ark README.MGA README.NVIDIA README.mouse \
+ 	    README.neo README.rendition README.3DLabs README.cyrix \
+-	    README.i740 README.r128
++	    README.i740 README.i810 README.r128
+ 
+ MAINDOCS = COPYRIGHT README README.Config BUILD RELNOTES
+ 
diff --git a/x11/XFree86/files/patch-doc-jp-Imakefile b/x11/XFree86/files/patch-doc-jp-Imakefile
index d685bba510f9..32189d4c695c 100644
--- a/x11/XFree86/files/patch-doc-jp-Imakefile
+++ b/x11/XFree86/files/patch-doc-jp-Imakefile
@@ -1,41 +1,34 @@
-Index: files/patch-r04
-===================================================================
-RCS file: patch-r04
-diff -N patch-r04
---- /dev/null	Wed Nov  8 02:15:56 2000
-+++ patch-r04	Wed Nov  8 16:53:19 2000
-@@ -0,0 +1,34 @@
-+--- programs/Xserver/hw/xfree86/doc/Japanese/Imakefile.orig	Fri Dec  3 01:42:36 1999
-++++ programs/Xserver/hw/xfree86/doc/Japanese/Imakefile	Mon Jul 24 19:15:08 2000
-+@@ -3,7 +3,6 @@
-+ XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile,v 3.8.2.4 1999/11/26 15:22:58 hohndel Exp $
-+ #include <Server.tmpl>
-+ 
-+-#if !BuildLinuxDocText
-+ /* FreeBSD's README is handled separately because of name length limits */
-+ #ifdef BSD386Architecture
-+ OSREADME = /* README.Bsdi */
-+@@ -56,7 +55,6 @@
-+ #ifdef OS2Architecture
-+ OSREADME = README.OS2
-+ #endif
-+-#endif /* !BuildLinuxDocText */
-+ 
-+ #if XFree86Version % 10
-+ REPORTFORM = BetaReport
-+@@ -64,7 +62,6 @@
-+ 
-+ all::
-+ 
-+-#if !BuildLinuxDocText
-+ HWREADME =  README.ati README.trident README.tseng README.WstDig \
-+             README.DECtga  README.apm README.rendition README.epson \
-+             README.chips README.cirrus README.Video7 README.P9000 README.agx \
-+@@ -77,7 +74,6 @@
-+ MAINDOCS = COPYRIGHT README README.Config BUILD RELNOTES
-+ 
-+ OTHERDOCS = VideoModes.doc QuickStart.doc README.clkprog xinput
-+-#endif
-+ 
-+ ## MISCDOCS = ServersOnly /*LbxproxyOnly*/ $(REPORTFORM) README.DGA
-+ MISCDOCS = VGADriver.doc modelines.txt
+--- programs/Xserver/hw/xfree86/doc/Japanese/Imakefile.orig	Fri Dec  3 01:42:36 1999
++++ programs/Xserver/hw/xfree86/doc/Japanese/Imakefile	Mon Jul 24 19:15:08 2000
+@@ -3,7 +3,6 @@
+ XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile,v 3.8.2.4 1999/11/26 15:22:58 hohndel Exp $
+ #include <Server.tmpl>
+ 
+-#if !BuildLinuxDocText
+ /* FreeBSD's README is handled separately because of name length limits */
+ #ifdef BSD386Architecture
+ OSREADME = /* README.Bsdi */
+@@ -56,7 +55,6 @@
+ #ifdef OS2Architecture
+ OSREADME = README.OS2
+ #endif
+-#endif /* !BuildLinuxDocText */
+ 
+ #if XFree86Version % 10
+ REPORTFORM = BetaReport
+@@ -64,7 +62,6 @@
+ 
+ all::
+ 
+-#if !BuildLinuxDocText
+ HWREADME =  README.ati README.trident README.tseng README.WstDig \
+             README.DECtga  README.apm README.rendition README.epson \
+             README.chips README.cirrus README.Video7 README.P9000 README.agx \
+@@ -77,7 +74,6 @@
+ MAINDOCS = COPYRIGHT README README.Config BUILD RELNOTES
+ 
+ OTHERDOCS = VideoModes.doc QuickStart.doc README.clkprog xinput
+-#endif
+ 
+ ## MISCDOCS = ServersOnly /*LbxproxyOnly*/ $(REPORTFORM) README.DGA
+ MISCDOCS = VGADriver.doc modelines.txt
diff --git a/x11/XFree86/files/patch-i810-Imakefile b/x11/XFree86/files/patch-i810-Imakefile
index f3eee730ed8c..0c87b1f3dbab 100644
--- a/x11/XFree86/files/patch-i810-Imakefile
+++ b/x11/XFree86/files/patch-i810-Imakefile
@@ -1,94 +1,10 @@
-Index: files/patch-r01
-===================================================================
-RCS file: patch-r01
-diff -N patch-r01
---- /dev/null	Wed Nov  8 02:15:56 2000
-+++ patch-r01	Wed Nov  8 16:52:58 2000
-@@ -0,0 +1,10 @@
-+--- programs/Xserver/hw/xfree86/vga256/drivers/i810/Imakefile.orig	Tue Jul 18 13:30:51 2000
-++++ programs/Xserver/hw/xfree86/vga256/drivers/i810/Imakefile	Tue Jul 18 13:31:01 2000
-+@@ -33,7 +33,6 @@
-+ InstallLinkKitNonExecFile(i810_cursor.c,$(LINKKITDIR)/drivers/vga256/i810)
-+ InstallLinkKitNonExecFile(i810_accel.c,$(LINKKITDIR)/drivers/vga256/i810)
-+ InstallLinkKitNonExecFile(i810_cmap.c,$(LINKKITDIR)/drivers/vga256/i810)
-+-InstallLinkKitNonExecFile(i810_macros.h,$(LINKKITDIR)/drivers/vga256/i810)
-+ InstallLinkKitNonExecFile(i810_reg.h,$(LINKKITDIR)/drivers/vga256/i810)
-+ 
-+ DependTarget()
-Index: files/patch-r02
-===================================================================
-RCS file: patch-r02
-diff -N patch-r02
---- /dev/null	Wed Nov  8 02:15:56 2000
-+++ patch-r02	Wed Nov  8 16:53:05 2000
-@@ -0,0 +1,11 @@
-+--- programs/Xserver/hw/xfree86/doc/Imakefile.orig	Tue Jul 18 15:31:36 2000
-++++ programs/Xserver/hw/xfree86/doc/Imakefile	Tue Jul 18 15:31:52 2000
-+@@ -90,7 +90,7 @@
-+             README.I128 README.Mach32 \
-+             README.Mach64 README.ark README.MGA README.NVIDIA README.mouse \
-+ 	    README.neo README.rendition README.3DLabs README.cyrix \
-+-	    README.i740 README.r128
-++	    README.i740 README.i810 README.r128
-+ 
-+ MAINDOCS = COPYRIGHT README README.Config BUILD RELNOTES
-+ 
-Index: files/patch-r03
-===================================================================
-RCS file: patch-r03
-diff -N patch-r03
---- /dev/null	Wed Nov  8 02:15:56 2000
-+++ patch-r03	Wed Nov  8 16:53:11 2000
-@@ -0,0 +1,11 @@
-+--- config/cf/lnxdoc.rules.orig	Tue Jul 18 18:16:01 2000
-++++ config/cf/lnxdoc.rules	Tue Jul 18 18:19:05 2000
-+@@ -122,7 +122,7 @@
-+ 	@(BASE=`basename sgmlfile .sgml`;\				@@\
-+ 	  set -x;\							@@\
-+ 	  RemoveFile($$BASE.latin1);\					@@\
-+-	  $(SGMLFMTCMD) -f latin1 -b -n sgmlfile && \			@@\
-++	  $(SGMLFMTCMD) -f latin1 sgmlfile && \				@@\
-+ 	  $(XFREE86IDENTFIX) < $$BASE.latin1 > _$@ && $(MV) _$@ $@ && \	@@\
-+ 	  RemoveFile($$BASE.latin1))					@@\
-+ 									@@\
-Index: files/patch-r04
-===================================================================
-RCS file: patch-r04
-diff -N patch-r04
---- /dev/null	Wed Nov  8 02:15:56 2000
-+++ patch-r04	Wed Nov  8 16:53:19 2000
-@@ -0,0 +1,34 @@
-+--- programs/Xserver/hw/xfree86/doc/Japanese/Imakefile.orig	Fri Dec  3 01:42:36 1999
-++++ programs/Xserver/hw/xfree86/doc/Japanese/Imakefile	Mon Jul 24 19:15:08 2000
-+@@ -3,7 +3,6 @@
-+ XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile,v 3.8.2.4 1999/11/26 15:22:58 hohndel Exp $
-+ #include <Server.tmpl>
-+ 
-+-#if !BuildLinuxDocText
-+ /* FreeBSD's README is handled separately because of name length limits */
-+ #ifdef BSD386Architecture
-+ OSREADME = /* README.Bsdi */
-+@@ -56,7 +55,6 @@
-+ #ifdef OS2Architecture
-+ OSREADME = README.OS2
-+ #endif
-+-#endif /* !BuildLinuxDocText */
-+ 
-+ #if XFree86Version % 10
-+ REPORTFORM = BetaReport
-+@@ -64,7 +62,6 @@
-+ 
-+ all::
-+ 
-+-#if !BuildLinuxDocText
-+ HWREADME =  README.ati README.trident README.tseng README.WstDig \
-+             README.DECtga  README.apm README.rendition README.epson \
-+             README.chips README.cirrus README.Video7 README.P9000 README.agx \
-+@@ -77,7 +74,6 @@
-+ MAINDOCS = COPYRIGHT README README.Config BUILD RELNOTES
-+ 
-+ OTHERDOCS = VideoModes.doc QuickStart.doc README.clkprog xinput
-+-#endif
-+ 
-+ ## MISCDOCS = ServersOnly /*LbxproxyOnly*/ $(REPORTFORM) README.DGA
-+ MISCDOCS = VGADriver.doc modelines.txt
+--- programs/Xserver/hw/xfree86/vga256/drivers/i810/Imakefile.orig	Tue Jul 18 13:30:51 2000
++++ programs/Xserver/hw/xfree86/vga256/drivers/i810/Imakefile	Tue Jul 18 13:31:01 2000
+@@ -33,7 +33,6 @@
+ InstallLinkKitNonExecFile(i810_cursor.c,$(LINKKITDIR)/drivers/vga256/i810)
+ InstallLinkKitNonExecFile(i810_accel.c,$(LINKKITDIR)/drivers/vga256/i810)
+ InstallLinkKitNonExecFile(i810_cmap.c,$(LINKKITDIR)/drivers/vga256/i810)
+-InstallLinkKitNonExecFile(i810_macros.h,$(LINKKITDIR)/drivers/vga256/i810)
+ InstallLinkKitNonExecFile(i810_reg.h,$(LINKKITDIR)/drivers/vga256/i810)
+ 
+ DependTarget()