From 90e6ce5331231c8fd112bd7d4620fb16bf4bc7ae Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 9 Jan 2005 11:09:59 +0000
Subject: * Upgrade to man-1.5p

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4513 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 6 +++++-
 chapter03/packages.xml  | 2 +-
 chapter03/patches.xml   | 7 -------
 chapter06/man.xml       | 4 ----
 general.ent             | 6 +++---
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e41136d4a..bf2aba79c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -27,7 +27,7 @@ of the LFS Book.</para>
 <listitem><para>lfs-bootscripts-3.1.0</para></listitem>
 <listitem><para>linux-2.6.10</para></listitem>
 <listitem><para>linux-libc-headers-2.6.10.0</para></listitem>
-<listitem><para>man-1.5o2</para></listitem>
+<listitem><para>man-1.5p</para></listitem>
 <listitem><para>man-pages-2.01</para></listitem>
 <listitem><para>perl-5.8.6</para></listitem>
 <listitem><para>sysvinit-2.86</para></listitem>
@@ -51,11 +51,15 @@ of the LFS Book.</para>
 <listitem><para>Removed:</para>
 <itemizedlist>
 <listitem><para>bash-3.0-fixes-1.patch</para></listitem>
+<listitem><para>man-1.5o2-80cols-1.patch</para></listitem>
 <listitem><para>sysvinit-2.85-proclen-1.patch</para></listitem>
 <listitem><para>texinfo-4.7-segfault-1.patch</para></listitem>
 </itemizedlist>
 </listitem>
 
+<listitem><para>January 9th, 2005 [matt]: Upgraded to man-1.5p.  Removed the 80
+column patch as it appears to have been fixed upstream</para></listitem>
+
 <listitem><para>January 8th, 2005 [matt]: Upgraded to man-1.5o2</para>
 </listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 0edffbaa4..edc700e68 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -258,7 +258,7 @@
 </varlistentry>
 
 <varlistentry>
-<term>Man (&man-version;) - 224 KB:</term>
+<term>Man (&man-version;) - 228 KB:</term>
 <listitem>
 <para><ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/"/></para>
 </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 0b8a3ca17..134800656 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -114,13 +114,6 @@ following:</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>Man 80-Columns Patch - 1 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;man-&man-version;-80cols-1.patch"/></para>
-</listitem>
-</varlistentry>
-
 <varlistentry>
 <term>Mktemp Tempfile Patch - 3 KB:</term>
 <listitem>
diff --git a/chapter06/man.xml b/chapter06/man.xml
index 5067eb177..1d88e3fd1 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -22,10 +22,6 @@
 <sect2 role="installation">
 <title>Installation of Man</title>
 
-<para>Apply a patch:</para>
-
-<screen><userinput>patch -Np1 -i ../man-&man-version;-80cols-1.patch</userinput></screen>
-
 <para>Issue a sed substitution:</para>
 
 <screen><userinput>sed -i 's@-is@&amp;R@g' configure</userinput></screen>
diff --git a/general.ent b/general.ent
index c9e839203..89de9ce7b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20050108">
-<!ENTITY releasedate "January 8, 2005">
+<!ENTITY version "SVN-20050109">
+<!ENTITY releasedate "January 9, 2005">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
@@ -50,7 +50,7 @@
 <!ENTITY linux-libc-headers-version "2.6.10.0">
 <!ENTITY m4-version "1.4.2">
 <!ENTITY make-version "3.80">
-<!ENTITY man-version "1.5o2">
+<!ENTITY man-version "1.5p">
 <!ENTITY man-pages-version "2.01">
 <!ENTITY mktemp-version "1.5">
 <!ENTITY module-init-tools-version "3.1">
-- 
cgit v1.2.3-54-g00ecf