r8827 - in trunk/BOOK/general: prog sysutils

thomas at linuxfromscratch.org thomas at linuxfromscratch.org
Thu Jan 20 11:52:22 PST 2011


Author: thomas
Date: 2011-01-20 12:52:11 -0700 (Thu, 20 Jan 2011)
New Revision: 8827

Added:
   trunk/BOOK/general/sysutils/cmake.xml
Removed:
   trunk/BOOK/general/prog/cmake.xml
Modified:
   trunk/BOOK/general/prog/prog.xml
   trunk/BOOK/general/sysutils/libarchive.xml
   trunk/BOOK/general/sysutils/sysutils.xml
Log:
Fix some inaccuracies in libarchive, move cmake to sysutils


Deleted: trunk/BOOK/general/prog/cmake.xml
===================================================================
--- trunk/BOOK/general/prog/cmake.xml	2011-01-19 20:28:52 UTC (rev 8826)
+++ trunk/BOOK/general/prog/cmake.xml	2011-01-20 19:52:11 UTC (rev 8827)
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY cmake-download-http "http://www.cmake.org/files/v2.8/cmake-&cmake-version;.tar.gz">
-  <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "a76a44b93acf5e3badda9de111385921">
-  <!ENTITY cmake-size          "5.3 MB">
-  <!ENTITY cmake-buildsize     "132 MB">
-  <!ENTITY cmake-time          "1.3 SBU">
-]>
-
-<sect1 id="cmake" xreflabel="cmake-&cmake-version;">
-  <?dbhtml filename="cmake.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>CMake-&cmake-version;</title>
-
-  <indexterm zone="cmake">
-    <primary sortas="a-CMake">CMake</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <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>
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&cmake-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&cmake-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &cmake-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &cmake-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &cmake-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &cmake-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/cmake-&cmake-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">CMake Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="libarchive"/>
-    <xref linkend="expat"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/cmake"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CMake</title>
-
-    <para>Install <application>CMake</application> by running the following
-    commands:</para>
-
-<screen><userinput>./bootstrap --prefix=/usr \
-            --system-libs \
-            --mandir=/share/man \
-            --docdir=/share/doc/cmake-&cmake-version; &&
-make</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<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>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>ctest, cpack, ccmake and cmake</seg>
-        <seg></seg>
-        <seg>/usr/share/cmake-&cmake-version;, /usr/share/doc/cmake-&cmake-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ctest">
-        <term><command>ctest</command></term>
-        <listitem>
-          <para>is a testing utility for cmake-generated build trees.</para>
-          <indexterm zone="cmake ctest">
-            <primary sortas="b-ctest">ctest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cpack">
-        <term><command>cpack</command></term>
-        <listitem>
-          <para>is the CMake packaging program.</para>
-          <indexterm zone="cmake cpack">
-            <primary sortas="b-cpack">cpack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ccmake">
-        <term><command>ccmake</command></term>
-        <listitem>
-          <para>is a curses based interactive frontend to cmake.</para>
-          <indexterm zone="cmake ccmake">
-            <primary sortas="b-ccmake">ccmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="c_make">
-        <term><command>cmake</command></term>
-        <listitem>
-          <para>is the makefile generator.</para>
-          <indexterm zone="cmake c_make">
-            <primary sortas="b-cmake">cmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>

Modified: trunk/BOOK/general/prog/prog.xml
===================================================================
--- trunk/BOOK/general/prog/prog.xml	2011-01-19 20:28:52 UTC (rev 8826)
+++ trunk/BOOK/general/prog/prog.xml	2011-01-20 19:52:11 UTC (rev 8827)
@@ -22,7 +22,6 @@
   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"/>

Copied: trunk/BOOK/general/sysutils/cmake.xml (from rev 8826, trunk/BOOK/general/prog/cmake.xml)
===================================================================
--- trunk/BOOK/general/sysutils/cmake.xml	                        (rev 0)
+++ trunk/BOOK/general/sysutils/cmake.xml	2011-01-20 19:52:11 UTC (rev 8827)
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY cmake-download-http "http://www.cmake.org/files/v2.8/cmake-&cmake-version;.tar.gz">
+  <!ENTITY cmake-download-ftp  " ">
+  <!ENTITY cmake-md5sum        "a76a44b93acf5e3badda9de111385921">
+  <!ENTITY cmake-size          "5.3 MB">
+  <!ENTITY cmake-buildsize     "132 MB">
+  <!ENTITY cmake-time          "1.3 SBU">
+]>
+
+<sect1 id="cmake" xreflabel="cmake-&cmake-version;">
+  <?dbhtml filename="cmake.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>CMake-&cmake-version;</title>
+
+  <indexterm zone="cmake">
+    <primary sortas="a-CMake">CMake</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to CMake</title>
+
+    <para>The <application>CMake</application> package contains a modern toolset used
+    for generating <filename>Makefiles</filename>. It is a successor of the auto-generated
+    <command>configure</command> script.</para>
+
+    &lfs67_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&cmake-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&cmake-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &cmake-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &cmake-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &cmake-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &cmake-time;</para>
+      </listitem>
+    </itemizedlist>
+
+<!--
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/cmake-&cmake-version;-fixes-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+-->
+
+    <bridgehead renderas="sect3">CMake Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+    <xref linkend="curl"/>, 
+    <xref linkend="libarchive"/> and 
+    <xref linkend="expat"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/cmake"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of CMake</title>
+
+    <para>Install <application>CMake</application> by running the following
+    commands:</para>
+
+<screen><userinput>./bootstrap --prefix=/usr \
+            --system-libs \
+            --mandir=/share/man \
+            --docdir=/share/doc/cmake-&cmake-version; &&
+make</userinput></screen>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </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>bzip2</application>, 
+    <application>curl</application> and <application>expat</application> installed 
+    on the system.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>ctest, cpack, ccmake and cmake</seg>
+        <seg></seg>
+        <seg>/usr/share/cmake-&cmake-version;, /usr/share/doc/cmake-&cmake-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="ctest">
+        <term><command>ctest</command></term>
+        <listitem>
+          <para>is a testing utility for cmake-generated build trees.</para>
+          <indexterm zone="cmake ctest">
+            <primary sortas="b-ctest">ctest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cpack">
+        <term><command>cpack</command></term>
+        <listitem>
+          <para>is the CMake packaging program.</para>
+          <indexterm zone="cmake cpack">
+            <primary sortas="b-cpack">cpack</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ccmake">
+        <term><command>ccmake</command></term>
+        <listitem>
+          <para>is a curses based interactive frontend to cmake.</para>
+          <indexterm zone="cmake ccmake">
+            <primary sortas="b-ccmake">ccmake</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="c_make">
+        <term><command>cmake</command></term>
+        <listitem>
+          <para>is the makefile generator.</para>
+          <indexterm zone="cmake c_make">
+            <primary sortas="b-cmake">cmake</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>


Property changes on: trunk/BOOK/general/sysutils/cmake.xml
___________________________________________________________________
Added: svn:keywords
   + LastChangedBy Date

Modified: trunk/BOOK/general/sysutils/libarchive.xml
===================================================================
--- trunk/BOOK/general/sysutils/libarchive.xml	2011-01-19 20:28:52 UTC (rev 8826)
+++ trunk/BOOK/general/sysutils/libarchive.xml	2011-01-20 19:52:11 UTC (rev 8827)
@@ -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 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>libarchive supports DESTDIR installation.</para>
-
   </sect2>
 
   <sect2 role="content">
@@ -107,7 +103,7 @@
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>bsdtr, bsdcpio</seg>
+        <seg>bsdtar, bsdcpio</seg>
         <seg>libarchive.{so,a}</seg>
         <seg></seg>
       </seglistitem>


Property changes on: trunk/BOOK/general/sysutils/libarchive.xml
___________________________________________________________________
Added: svn:keywords
   + LastChangedBy Date

Modified: trunk/BOOK/general/sysutils/sysutils.xml
===================================================================
--- trunk/BOOK/general/sysutils/sysutils.xml	2011-01-19 20:28:52 UTC (rev 8826)
+++ trunk/BOOK/general/sysutils/sysutils.xml	2011-01-20 19:52:11 UTC (rev 8827)
@@ -45,6 +45,7 @@
   <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"/> -->
 




More information about the blfs-book mailing list