sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make these into actual patches against XFree86 instead of patches against

Browse source 
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.
This commit is contained in:
John Baldwin 2001-03-22 01:45:11 +00:00
parent 185bd300eb
commit 7c8cef665b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=40186
4 changed files with 66 additions and 271 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
x11/XFree86/files/patch-cf-lnxdoc.rules
View file

@ -1,59 +1,11 @@
Index: files/patch-r03 --- config/cf/lnxdoc.rules.orig Tue Jul 18 18:16:01 2000
=================================================================== +++ config/cf/lnxdoc.rules Tue Jul 18 18:19:05 2000
RCS file: patch-r03 @@ -122,7 +122,7 @@
diff -N patch-r03 @(BASE=`basename sgmlfile .sgml`;\ @@\
--- /dev/null Wed Nov 8 02:15:56 2000 set -x;\ @@\
+++ patch-r03 Wed Nov 8 16:53:11 2000 RemoveFile($$BASE.latin1);\ @@\
@@ -0,0 +1,11 @@ - $(SGMLFMTCMD) -f latin1 -b -n sgmlfile && \ @@\
+--- config/cf/lnxdoc.rules.orig Tue Jul 18 18:16:01 2000 + $(SGMLFMTCMD) -f latin1 sgmlfile && \ @@\
++++ config/cf/lnxdoc.rules Tue Jul 18 18:19:05 2000 $(XFREE86IDENTFIX) < $$BASE.latin1 > _$@ && $(MV) _$@ $@ && \ @@\
+@@ -122,7 +122,7 @@ RemoveFile($$BASE.latin1)) @@\
+ @(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

88
x11/XFree86/files/patch-doc-Imakefile
View file

@ -1,77 +1,11 @@
Index: files/patch-r02 --- 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
RCS file: patch-r02 @@ -90,7 +90,7 @@
diff -N patch-r02 README.I128 README.Mach32 \
--- /dev/null Wed Nov 8 02:15:56 2000 README.Mach64 README.ark README.MGA README.NVIDIA README.mouse \
+++ patch-r02 Wed Nov 8 16:53:05 2000 README.neo README.rendition README.3DLabs README.cyrix \
@@ -0,0 +1,11 @@ - README.i740 README.r128
+--- programs/Xserver/hw/xfree86/doc/Imakefile.orig Tue Jul 18 15:31:36 2000 + README.i740 README.i810 README.r128
++++ programs/Xserver/hw/xfree86/doc/Imakefile Tue Jul 18 15:31:52 2000
+@@ -90,7 +90,7 @@ MAINDOCS = COPYRIGHT README README.Config BUILD RELNOTES
+ 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

75
x11/XFree86/files/patch-doc-jp-Imakefile
View file

@ -1,41 +1,34 @@
Index: files/patch-r04 --- 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
RCS file: patch-r04 @@ -3,7 +3,6 @@
diff -N patch-r04 XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile,v 3.8.2.4 1999/11/26 15:22:58 hohndel Exp $
--- /dev/null Wed Nov 8 02:15:56 2000 #include <Server.tmpl>
+++ patch-r04 Wed Nov 8 16:53:19 2000
@@ -0,0 +1,34 @@ -#if !BuildLinuxDocText
+--- programs/Xserver/hw/xfree86/doc/Japanese/Imakefile.orig Fri Dec 3 01:42:36 1999 /* FreeBSD's README is handled separately because of name length limits */
++++ programs/Xserver/hw/xfree86/doc/Japanese/Imakefile Mon Jul 24 19:15:08 2000 #ifdef BSD386Architecture
+@@ -3,7 +3,6 @@ OSREADME = /* README.Bsdi */
+ XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile,v 3.8.2.4 1999/11/26 15:22:58 hohndel Exp $ @@ -56,7 +55,6 @@
+ #include <Server.tmpl> #ifdef OS2Architecture
+ OSREADME = README.OS2
+-#if !BuildLinuxDocText #endif
+ /* FreeBSD's README is handled separately because of name length limits */ -#endif /* !BuildLinuxDocText */
+ #ifdef BSD386Architecture
+ OSREADME = /* README.Bsdi */ #if XFree86Version % 10
+@@ -56,7 +55,6 @@ REPORTFORM = BetaReport
+ #ifdef OS2Architecture @@ -64,7 +62,6 @@
+ OSREADME = README.OS2
+ #endif all::
+-#endif /* !BuildLinuxDocText */
+ -#if !BuildLinuxDocText
+ #if XFree86Version % 10 HWREADME = README.ati README.trident README.tseng README.WstDig \
+ REPORTFORM = BetaReport README.DECtga README.apm README.rendition README.epson \
+@@ -64,7 +62,6 @@ README.chips README.cirrus README.Video7 README.P9000 README.agx \
+ @@ -77,7 +74,6 @@
+ all:: MAINDOCS = COPYRIGHT README README.Config BUILD RELNOTES
+
+-#if !BuildLinuxDocText OTHERDOCS = VideoModes.doc QuickStart.doc README.clkprog xinput
+ HWREADME = README.ati README.trident README.tseng README.WstDig \ -#endif
+ README.DECtga README.apm README.rendition README.epson \
+ README.chips README.cirrus README.Video7 README.P9000 README.agx \ ## MISCDOCS = ServersOnly /*LbxproxyOnly*/ $(REPORTFORM) README.DGA
+@@ -77,7 +74,6 @@ MISCDOCS = VGADriver.doc modelines.txt
+ 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

104
x11/XFree86/files/patch-i810-Imakefile
View file

@ -1,94 +1,10 @@
Index: files/patch-r01 --- 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
RCS file: patch-r01 @@ -33,7 +33,6 @@
diff -N patch-r01 InstallLinkKitNonExecFile(i810_cursor.c,$(LINKKITDIR)/drivers/vga256/i810)
--- /dev/null Wed Nov 8 02:15:56 2000 InstallLinkKitNonExecFile(i810_accel.c,$(LINKKITDIR)/drivers/vga256/i810)
+++ patch-r01 Wed Nov 8 16:52:58 2000 InstallLinkKitNonExecFile(i810_cmap.c,$(LINKKITDIR)/drivers/vga256/i810)
@@ -0,0 +1,10 @@ -InstallLinkKitNonExecFile(i810_macros.h,$(LINKKITDIR)/drivers/vga256/i810)
+--- programs/Xserver/hw/xfree86/vga256/drivers/i810/Imakefile.orig Tue Jul 18 13:30:51 2000 InstallLinkKitNonExecFile(i810_reg.h,$(LINKKITDIR)/drivers/vga256/i810)
++++ programs/Xserver/hw/xfree86/vga256/drivers/i810/Imakefile Tue Jul 18 13:31:01 2000
+@@ -33,7 +33,6 @@ DependTarget()
+ 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