summaryrefslogtreecommitdiff
path: root/x11/XFree86
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2001-02-27 23:07:59 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2001-02-27 23:07:59 +0000
commitec355984beb44df7936e2ab582769069a1d84fbd (patch)
treed81b917b3fc6563877ac1caee6a2a6995a269ad5 /x11/XFree86
parento Sanitize CFLAGS following example of palm/prc-tools-gcc. Remove (diff)
Add patches needed in building a release X11 distribution that matches
the ones we used to get from XFree86. Submitted by: jhb Approved by: jmz
Notes
Notes: svn path=/head/; revision=38870
Diffstat (limited to 'x11/XFree86')
-rw-r--r--x11/XFree86/files/patch-cf-lnxdoc.rules59
-rw-r--r--x11/XFree86/files/patch-doc-Imakefile77
-rw-r--r--x11/XFree86/files/patch-doc-jp-Imakefile41
-rw-r--r--x11/XFree86/files/patch-i810-Imakefile94
-rw-r--r--x11/XFree86/pkg-plist1
5 files changed, 272 insertions, 0 deletions
diff --git a/x11/XFree86/files/patch-cf-lnxdoc.rules b/x11/XFree86/files/patch-cf-lnxdoc.rules
new file mode 100644
index 000000000000..e2242b6d3635
--- /dev/null
+++ b/x11/XFree86/files/patch-cf-lnxdoc.rules
@@ -0,0 +1,59 @@
+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
diff --git a/x11/XFree86/files/patch-doc-Imakefile b/x11/XFree86/files/patch-doc-Imakefile
new file mode 100644
index 000000000000..73c532a97de5
--- /dev/null
+++ b/x11/XFree86/files/patch-doc-Imakefile
@@ -0,0 +1,77 @@
+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
diff --git a/x11/XFree86/files/patch-doc-jp-Imakefile b/x11/XFree86/files/patch-doc-jp-Imakefile
new file mode 100644
index 000000000000..d685bba510f9
--- /dev/null
+++ b/x11/XFree86/files/patch-doc-jp-Imakefile
@@ -0,0 +1,41 @@
+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
diff --git a/x11/XFree86/files/patch-i810-Imakefile b/x11/XFree86/files/patch-i810-Imakefile
new file mode 100644
index 000000000000..f3eee730ed8c
--- /dev/null
+++ b/x11/XFree86/files/patch-i810-Imakefile
@@ -0,0 +1,94 @@
+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
diff --git a/x11/XFree86/pkg-plist b/x11/XFree86/pkg-plist
index 2dc4751df93e..33c14b79934a 100644
--- a/x11/XFree86/pkg-plist
+++ b/x11/XFree86/pkg-plist
@@ -625,6 +625,7 @@ lib/X11/doc/README.clkprog
lib/X11/doc/README.cyrix
lib/X11/doc/README.epson
lib/X11/doc/README.i740
+lib/X11/doc/README.i810
lib/X11/doc/README.mouse
lib/X11/doc/README.neo
lib/X11/doc/README.r128
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-24 06:07:04 +0000