Changeset 6e08e9c0 for general

Timestamp:

08/16/2014 11:39:09 PM (10 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

e242b9a

Parents:

543a2c8

Message:

Parted-3.2 fails to build with --disable-device-mapper. Reported and fixed by Ken M.
Update to SQLite-3.8.6.
Update to git-2.1.0. Modified docs and man instructions.
MIT Kerberos V5-1.12.2: update gpg2, fix configure, install instructions and other parts.
Samba-4.1.11: promote libxslt-1.1.28 to Recommended.

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

File:

• general/prog/git.xml (modified) (6 diffs)

general/prog/git.xml

@@ -9 +9 @@
   <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
   <!ENTITY git-download-ftp  "ftp://ftp.kernel.org/pub/software/scm/git/git-&git-version;.tar.xz">
-  <!ENTITY git-md5sum        "0caa9c54bb04612062d21823163ecb13">
-  <!ENTITY git-size          "3.3 MB">
-  <!ENTITY git-buildsize     "269 MB (additional 13 MB for downloaded docs and man pages, or 24 MB building docs and man pages)">
-  <!ENTITY git-time          "0.7 SBU (additional 5.5 SBU for tests or 2.5 SBU for docs and man build)
-">
+  <!ENTITY git-md5sum        "47b1f55d9a16be112f7ae2c778a9b30c">
+  <!ENTITY git-size          "3.4 MB">
+  <!ENTITY git-buildsize     "208 MB (additional 14 MB for downloaded docs and man pages, or 27 MB building docs and man pages)">
+  <!ENTITY git-time          " 0.7 SBU (additional 9.6 SBU for tests or 2.8 SBU for docs and man build)">
 ]>
 
@@ -145 +144 @@
 
     <para>
+      You can build the man pages and/or html docs, or
+      use downloaded ones. If you choose to build them, use next two following
+      instructions.
+    </para>
+
+    <para>
       If you have installed <ulink
       url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> you can
@@ -174 +179 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>
-      If you created the man pages, install them as the
+<!-- ==== Method 1 for docs ====== -->
+    <bridgehead renderas="sect3">If you created the man pages and/or html docs</bridgehead>
+
+    <para>
+      Install the man pages as
       <systemitem class="username">root</systemitem> user:
     </para>
@@ -182 +190 @@
 
     <para>
-      If you created the html docs, install them as the
+      Install the html docs as
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html              &amp;&amp;
-mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text}         &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &amp;&amp;
-mkdir    /usr/share/doc/git-&git-version;/technical/{html,text}         &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/technical/{*.txt,text}        &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/technical/{*.,}html           &amp;&amp;
-mkdir    /usr/share/doc/git-&git-version;/howto/{html,text}             &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/howto/{*.txt,text}            &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput></screen>
-
-    <para>
-      Alternatively, If you downloaded the man pages untar them as the
+<screen role="root"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html</userinput></screen>
+
+<!-- ==== Method 2 for docs ====== -->
+    <bridgehead renderas="sect3">If you downloaded the man pages and/or html docs</bridgehead>
+
+    <para>
+      If you downloaded the man pages untar them as the
       <systemitem class="username">root</systemitem> user:
     </para>
@@ -215 +217 @@
 
 find /usr/share/doc/git-&git-version; -type d -exec chmod 755 {} \;     &amp;&amp;
-find /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} \;     &amp;&amp;
-
-mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
+find /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} \;</userinput></screen>
+
+<!-- ==== Reorganize docs ====== -->
+    <bridgehead renderas="sect3">Reorganize man pages and/or html docs (both methods)</bridgehead>
+
+    <para>
+      For both methods, reorganize the files, as
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
 mv       /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &amp;&amp;
 mkdir    /usr/share/doc/git-&git-version;/technical/{html,text}         &amp;&amp;
@@ -270 +280 @@
       permissions in the shipped documentation tar file.
     </para>
-
-    <para><option>--libexecdir=/usr/lib</option>: This option puts the
-    <filename class="directory">git-core</filename> directory in
-    <filename class="directory">/usr/lib</filename> instead of
-    <filename class="directory">/usr/libexec</filename> in accordance
-    with the old version of the FHS used before LFS-7.5.</para>
 
   </sect2>