From 8dd291ed1459aec6277fc127367279052993a3d4 Mon Sep 17 00:00:00 2001 From: jhb Date: Thu, 22 Mar 2001 01:47:02 +0000 Subject: - XF86.patch is no longer needed as it is all checked into the XFree86 port conditional on the BUILD_XDIST variable. - Define BUILD_XDIST=yes when compiling XFree86. --- release/scripts/X11/XF86.patch | 94 ------------------------------------------ release/scripts/X11/build_x.sh | 8 ++-- 2 files changed, 4 insertions(+), 98 deletions(-) delete mode 100644 release/scripts/X11/XF86.patch (limited to 'release') diff --git a/release/scripts/X11/XF86.patch b/release/scripts/X11/XF86.patch deleted file mode 100644 index f3eee73..0000000 --- a/release/scripts/X11/XF86.patch +++ /dev/null @@ -1,94 +0,0 @@ -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 -+ -+-#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/release/scripts/X11/build_x.sh b/release/scripts/X11/build_x.sh index 0294467..24b56fe 100755 --- a/release/scripts/X11/build_x.sh +++ b/release/scripts/X11/build_x.sh @@ -40,8 +40,8 @@ fi home_dir=`dirname $0` # check out the XFree86 and XFree86-contrib ports and set them up -if ! ( cd $home_dir && cvs -R -d ${CVSROOT} co -P XFree86 XFree86-contrib && \ - cd XFree86 && patch < ../XF86.patch ); then +if ! ( cd $home_dir && \ + cvs -R -d ${CVSROOT} co -P XFree86 XFree86-contrib ); then echo "Could not checkout the XFree86 port!" echo usage @@ -49,8 +49,8 @@ fi # actually build X if ! ( cd $home_dir/XFree86 && \ - make DISTDIR=/usr/ports/distfiles DESTDIR=${output_dir} \ - NO_PKG_REGISTER=yes all install ); then + make BUILD_XDIST=yes DISTDIR=/usr/ports/distfiles \ + DESTDIR=${output_dir} NO_PKG_REGISTER=yes all install ); then echo "Could not build XFree86!" echo usage -- cgit v1.1