From cc4dfdfd2d5a08ceabe83e780319be7c59158f81 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 30 Oct 2012 02:00:02 +0000
Subject: [PATCH] Update cvs for LFS-7.2

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10824 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/prog/cvs.xml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/general/prog/cvs.xml b/general/prog/cvs.xml
index f810648f4a..6cc21f8afa 100644
--- a/general/prog/cvs.xml
+++ b/general/prog/cvs.xml
@@ -35,7 +35,7 @@
     These instructions install the client used to manipulate the repository,
     creation of a repository is covered at <xref linkend="cvsserver"/>.</para>
 
-    &lfs71_checked;
+    &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -124,6 +124,10 @@
 
 <screen><userinput>patch -Np1 -i ../cvs-&cvs-version;-zlib-1.patch</userinput></screen>
 
+    <para>Now fix a conflict with newer libraries:</para>
+
+<screen><userinput>sed -i -e 's/getline /get_line /' lib/getline.{c,h}</userinput></screen>
+
     <para>Install <application>CVS</application> by running
     the following commands:</para>
 
@@ -131,10 +135,10 @@
 make</userinput></screen>
 
     <para>If you have <xref linkend="texlive"/>
-    installed and wish to create DVI, Postscript, HTML or text docs from the
+    installed and wish to create HTML or text docs from the
     documentation source files, issue the following command:</para>
 
-<screen><userinput>make -C doc html txt dvi ps</userinput></screen>
+<screen><userinput>make -C doc html txt</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>. This will
     take quite a while. If you don't have <command>rsh</command> configured for
@@ -152,20 +156,21 @@ make</userinput></screen>
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role='root'><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/cvs-&cvs-version; &amp;&amp;
+install -v -m755 -d         /usr/share/doc/cvs-&cvs-version; &amp;&amp;
 install -v -m644 FAQ README /usr/share/doc/cvs-&cvs-version; &amp;&amp;
-install -v -m644 doc/*.pdf /usr/share/doc/cvs-&cvs-version;</userinput></screen>
+install -v -m644 doc/*.pdf  /usr/share/doc/cvs-&cvs-version;</userinput></screen>
 
     <para>If you created any additional documentation, install it by issuing
     the following commands as the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role='root'><userinput>install -v -m644 doc/*.{ps,dvi,txt} /usr/share/doc/cvs-&cvs-version; &amp;&amp;
-install -v -m755 -d /usr/share/doc/cvs-&cvs-version;/html/cvs{,client} &amp;&amp;
+<screen role='root'><userinput>i
+install -v -m644 doc/*.txt /usr/share/doc/cvs-&cvs-version;                   &amp;&amp;
+install -v -m755 -d        /usr/share/doc/cvs-&cvs-version;/html/cvs{,client} &amp;&amp;
 install -v -m644 doc/cvs.html/* \
-                 /usr/share/doc/cvs-&cvs-version;/html/cvs &amp;&amp;
+                           /usr/share/doc/cvs-&cvs-version;/html/cvs          &amp;&amp;
 install -v -m644 doc/cvsclient.html/* \
-                 /usr/share/doc/cvs-&cvs-version;/html/cvsclient</userinput></screen>
+                           /usr/share/doc/cvs-&cvs-version;/html/cvsclient</userinput></screen>
 
   </sect2>