Fix some inaccuracies in libarchive, move cmake to sysutils

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8827 af4574ff-66df-0310-9fd7-8a98e5e911e0

general/prog/prog.xml

@@ -22,7 +22,6 @@ $Date$
   build many popular programming environments to greatly expand your
   system's development capabilities.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="doxygen.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>

general/sysutils/cmake.xml

@@ -30,8 +30,8 @@
     <title>Introduction to CMake</title>
 
     <para>The <application>CMake</application> package contains a modern toolset used
-    for generating Makefiles. It is a successor of the auto-generated
-    <filename>configure</filename> script.</para>
+    for generating <filename>Makefiles</filename>. It is a successor of the auto-generated
+    <command>configure</command> script.</para>
 
     &lfs67_checked;
 
@@ -71,7 +71,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="libarchive"/>
+    <xref linkend="curl"/>, 
+    <xref linkend="libarchive"/> and 
     <xref linkend="expat"/>
     </para>
 
@@ -96,17 +97,15 @@ make</userinput></screen>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>CMake supports DESTDIR in the generated Makefiles as well as in the Makefile
-    used to build CMake itself.</para>
-
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
 
     <para><option>--system-libs</option>: This option forces the build system
-    to link against <application>zlib</application>, <application>curl</application> and
-    <application>expat</application> installed on the system.</para>
+    to link against <application>zlib</application>, <application>bzip2</application>, 
+    <application>curl</application> and <application>expat</application> installed 
+    on the system.</para>
 
   </sect2>
 

general/sysutils/libarchive.xml

@@ -30,7 +30,7 @@
     <title>Introduction to libarchive</title>
 
     <para>The <application>libarchive</application> library provides a single interface for
-    reading/writing various compession formats.</para>
+    reading/writing various compression formats.</para>
 
     &lfs67_checked;
 
@@ -68,12 +68,10 @@
 
     <bridgehead renderas="sect3">libarchive Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="attr"/>,
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
     <xref linkend="libxml2"/> or <xref linkend="expat"/>,
-    <xref linkend="xz-utils"/>,
-    <xref linkend="openssl"/>
+    <xref linkend="xz-utils"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -94,8 +92,6 @@ make</userinput></screen>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>libarchive supports DESTDIR installation.</para>
-
   </sect2>
 
   <sect2 role="content">
@@ -107,7 +103,7 @@ make</userinput></screen>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>bsdtr, bsdcpio</seg>
+        <seg>bsdtar, bsdcpio</seg>
         <seg>libarchive.{so,a}</seg>
         <seg></seg>
       </seglistitem>

general/sysutils/sysutils.xml

@@ -45,6 +45,7 @@ $Date$
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eject.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gvfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libarchive.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake.xml"/>
   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lzma-utils.xml"/> -->
   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/> -->