From 5c64de504f2c5162853e99446bf120fce67526a6 Mon Sep 17 00:00:00 2001
From: Gerard Beekmans <gerard@linuxfromscratch.org>
Date: Tue, 7 Aug 2001 02:23:27 +0000
Subject: [PATCH] Removed texinfo patch

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@914 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 Attic/appendixc/packages.xml      | 1 -
 Attic/appendixc/texinfo-patch.xml | 4 ----
 chapter04/packages.xml            | 1 -
 chapter04/texinfo-patch.xml       | 4 ----
 chapter06/texinfo-exp.xml         | 9 ---------
 chapter06/texinfo-inst.xml        | 3 +--
 chapter06/texinfo.xml             | 1 -
 index.xml                         | 5 -----
 8 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 Attic/appendixc/texinfo-patch.xml
 delete mode 100644 chapter04/texinfo-patch.xml
 delete mode 100644 chapter06/texinfo-exp.xml

diff --git a/Attic/appendixc/packages.xml b/Attic/appendixc/packages.xml
index aecea646a..bd21afec7 100644
--- a/Attic/appendixc/packages.xml
+++ b/Attic/appendixc/packages.xml
@@ -25,7 +25,6 @@ package quicker.</para>
 &ac-tar;
 &ac-tar-patch;
 &ac-texinfo;
-&ac-texinfo-patch;
 &ac-textutils;
 &ac-glibc;
 &ac-glibc-threads;
diff --git a/Attic/appendixc/texinfo-patch.xml b/Attic/appendixc/texinfo-patch.xml
deleted file mode 100644
index c2a3ff62b..000000000
--- a/Attic/appendixc/texinfo-patch.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-Texinfo Patch (&texinfo-version;):
-<ulink url="&ftp;/">&ftp;/</ulink>
-<ulink url="&http;/">&http;/</ulink>
-
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index 8ce59f8cb..1c40b001d 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -24,7 +24,6 @@
 &c3-textutils;
 &c3-mawk;
 &c3-texinfo;
-&c3-texinfo-patch;
 &c3-patch;
 &c3-makedev;
 &c3-glibc;
diff --git a/chapter04/texinfo-patch.xml b/chapter04/texinfo-patch.xml
deleted file mode 100644
index e0d6e8c92..000000000
--- a/chapter04/texinfo-patch.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-Texinfo Patch (&texinfo-version;) - &texinfo-patch-size;:
-<ulink url="&ftp;/texinfo-&texinfo-version;.patch.bz2">&ftp;/texinfo-&texinfo-version;.patch.bz2</ulink>
-<ulink url="&http;/texinfo-&texinfo-version;.patch.bz2">&http;/texinfo-&texinfo-version;.patch.bz2</ulink>
-
diff --git a/chapter06/texinfo-exp.xml b/chapter06/texinfo-exp.xml
deleted file mode 100644
index 7dda4a0d4..000000000
--- a/chapter06/texinfo-exp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>patch -Np1 -i ../texinfo-4.0.patch:</userinput> This patch
-fixes a problem with compiling texinfo on gcc-3.0 systems.  More
-specifically, it moves an #ifdef out of a printf macro in order to be
-compatible.</para>
-
-</sect2>
diff --git a/chapter06/texinfo-inst.xml b/chapter06/texinfo-inst.xml
index e92fc1058..d52951b08 100644
--- a/chapter06/texinfo-inst.xml
+++ b/chapter06/texinfo-inst.xml
@@ -3,8 +3,7 @@
 
 <para>Install Texinfo by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch &amp;&amp;</userinput>
-<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
 <userinput>make &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</userinput>
 <userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen></para>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 206d52923..a920b9e8a 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -5,7 +5,6 @@
 Estimated disk space required:  &texinfo-compsize;</screen>
 
 &c6-texinfo-inst;
-&c6-texinfo-exp;
 &aa-texinfo-desc;
 
 </sect1>
diff --git a/index.xml b/index.xml
index 6f076f459..284364d15 100644
--- a/index.xml
+++ b/index.xml
@@ -87,7 +87,6 @@
 <!ENTITY c3-textutils SYSTEM "chapter3/textutils.xml">
 <!ENTITY c3-mawk SYSTEM "chapter3/mawk.xml">
 <!ENTITY c3-texinfo SYSTEM "chapter3/texinfo.xml">
-<!ENTITY c3-texinfo-patch SYSTEM "chapter3/texinfo-patch.xml">
 <!ENTITY c3-gettext SYSTEM "chapter3/gettext.xml">
 <!ENTITY c3-makedev SYSTEM "chapter3/makedev.xml">
 <!ENTITY c3-glibc SYSTEM "chapter3/glibc.xml">
@@ -178,7 +177,6 @@
 <!ENTITY c5-tar SYSTEM "chapter5/tar.xml">
 <!ENTITY c5-tar-inst SYSTEM "chapter5/tar-inst.xml">
 <!ENTITY c5-texinfo SYSTEM "chapter5/texinfo.xml">
-<!ENTITY c5-texinfo-exp SYSTEM "chapter5/texinfo-exp.xml">
 <!ENTITY c5-texinfo-inst SYSTEM "chapter5/texinfo-inst.xml">
 <!ENTITY c5-textutils SYSTEM "chapter5/textutils.xml">
 <!ENTITY c5-textutils-inst SYSTEM "chapter5/textutils-inst.xml">
@@ -221,7 +219,6 @@
 <!ENTITY c6-m4 SYSTEM "chapter6/m4.xml">
 <!ENTITY c6-m4-inst SYSTEM "chapter6/m4-inst.xml">
 <!ENTITY c6-texinfo SYSTEM "chapter6/texinfo.xml">
-<!ENTITY c6-texinfo-exp SYSTEM "chapter6/texinfo-exp.xml">
 <!ENTITY c6-texinfo-inst SYSTEM "chapter6/texinfo-inst.xml">
 <!ENTITY c6-autoconf SYSTEM "chapter6/autoconf.xml">
 <!ENTITY c6-autoconf-inst SYSTEM "chapter6/autoconf-inst.xml">
@@ -479,7 +476,6 @@
 <!ENTITY ac-textutils SYSTEM "appendixc/textutils.xml">
 <!ENTITY ac-mawk SYSTEM "appendixc/mawk.xml">
 <!ENTITY ac-texinfo SYSTEM "appendixc/texinfo.xml">
-<!ENTITY ac-texinfo-patch SYSTEM "appendixc/texinfo-patch.xml">
 <!ENTITY ac-gettext SYSTEM "appendixc/gettext.xml">
 <!ENTITY ac-makedev SYSTEM "appendixc/makedev.xml">
 <!ENTITY ac-glibc SYSTEM "appendixc/glibc.xml">
@@ -639,7 +635,6 @@
 
 <!ENTITY texinfo-version "4.0">
 <!ENTITY texinfo-size "812 KB">
-<!ENTITY texinfo-patch-size "1 KB">
 <!ENTITY texinfo-compsize-static "static-texinfo MB">
 <!ENTITY texinfo-time-static "static-texinfo minutes">
 <!ENTITY texinfo-compsize "dynamic-texinfo MB">