r6009 - in trunk/BOOK: . general/genlib introduction/welcome

tushar at linuxfromscratch.org tushar at linuxfromscratch.org
Sat May 6 12:05:35 PDT 2006


Author: tushar
Date: 2006-05-06 13:05:32 -0600 (Sat, 06 May 2006)
New Revision: 6009

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/genlib/popt.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Updated to popt-1.10.4

Modified: trunk/BOOK/general/genlib/popt.xml
===================================================================
--- trunk/BOOK/general/genlib/popt.xml	2006-05-06 18:43:07 UTC (rev 6008)
+++ trunk/BOOK/general/genlib/popt.xml	2006-05-06 19:05:32 UTC (rev 6009)
@@ -4,15 +4,15 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY popt-download-http "http://ftp.debian.org/debian/pool/main/p/popt/popt_&popt-version;.orig.tar.gz">
-  <!ENTITY popt-download-ftp "ftp://ftp.debian.org/debian/pool/main/p/popt/popt_&popt-version;.orig.tar.gz">
-  <!ENTITY popt-md5sum "5988e7aeb0ae4dac8d83561265984cc9">
-  <!ENTITY popt-size "562 KB">
-  <!ENTITY popt-buildsize "5.5 MB">
-  <!ENTITY popt-time "0.17 SBU">
+  <!ENTITY popt-download-http "http://rpm.net.in/mirror/rpm-4.4.x/popt-&popt-version;.tar.gz">
+  <!ENTITY popt-download-ftp "ftp://wraptastic.org/pub/rpm-4.4.x/popt-&popt-version;.tar.gz">
+  <!ENTITY popt-md5sum "63b943522a6788ae8f756ca123d83c00">
+  <!ENTITY popt-size "625 KB">
+  <!ENTITY popt-buildsize "6.5 MB">
+  <!ENTITY popt-time "0.29 SBU">
 ]>
 
-<sect1 id="popt" xreflabel="popt-&popt-version;-5">
+<sect1 id="popt" xreflabel="popt-&popt-version;">
   <?dbhtml filename="popt.html"?>
 
   <sect1info>
@@ -24,7 +24,7 @@
     </keywordset>
   </sect1info>
 
-  <title>Popt-&popt-version;-5</title>
+  <title>Popt-&popt-version;</title>
 
   <indexterm zone="popt">
     <primary sortas="a-Popt">Popt</primary>
@@ -59,14 +59,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Patch level upgrade: <ulink
-        url="http://ftp.debian.org/debian/pool/main/p/popt/popt_&popt-version;-5.diff.gz"/></para>
-      </listitem>
-    </itemizedlist>
-
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/popt"/></para>
 
@@ -78,16 +70,13 @@
     <para>Install <application>popt</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../popt_&popt-version;-5.diff &&
+<screen><userinput>autoreconf -f -i &&
 ./configure --prefix=/usr &&
-cp configure.in configure.ac &&
-touch configure.in configure.ac &&
 make</userinput></screen>
 
     <para>To test the results, issue:</para>
 
-<screen><userinput>sed -i "s/^run_diff /#run_diff /" testit.sh &&
-make check</userinput></screen>
+<screen><userinput>make check</userinput></screen>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
@@ -98,17 +87,12 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>cp configure.in configure.ac</command>: Because
-    <filename>Makefile.in</filename> is updated with the patch,
-    <filename>configure.ac</filename> is also needed for
-    <command>make</command> to work properly.</para>
+    <para><command>autoreconf -f -i</command>:
+    In this version, the maintainers did not generate the
+    autotooled files. This command regenerates these files so
+    that <filename>configure</filename> and <filename>Makefile.in</filename>
+    are created.</para>
 
-    <para><command>touch configure.in configure.ac</command>:
-    Ensure file timestamps are the same.</para>
-
-    <para><command>sed -i "s/^run_diff /#run_diff /" testit.sh</command>
-    disables tests that have missing data.</para>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-05-06 18:43:07 UTC (rev 6008)
+++ trunk/BOOK/general.ent	2006-05-06 19:05:32 UTC (rev 6009)
@@ -84,7 +84,7 @@
 <!-- Part III -->
 <!-- Chapter 8 -->
 <!ENTITY pcre-version                 "6.6">
-<!ENTITY popt-version                 "1.7">
+<!ENTITY popt-version                 "1.10.4">
 <!ENTITY slang-version                "2.0.6">
 <!ENTITY gamin-version                "0.1.7">
 <!ENTITY libxml-version               "1.8.17">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2006-05-06 18:43:07 UTC (rev 6008)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2006-05-06 19:05:32 UTC (rev 6009)
@@ -45,6 +45,9 @@
       <para>May 5th, 2006</para>
       <itemizedlist>
         <listitem>
+          <para>[tushar] - Updated to Popt-1.10.4.</para>
+        </listitem>
+        <listitem>
           <para>[dnicholson] - Updated to Bluefish-1.0.5.</para>
         </listitem>
         <listitem>




More information about the blfs-book mailing list