Changeset ff53809

Timestamp:

05/07/2012 08:46:49 PM (12 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, 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, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

b84342d6

Parents:

f7b6f93a

Message:

Update to apache-and-1.8.3

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

Files:

• general.ent (modified) (1 diff)
• general/prog/pdl.xml (modified) (1 diff)
• general/sysutils/apache-ant.xml (modified) (6 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -330 +330 @@
 <!ENTITY mc-version                   "4.8.3">
 <!ENTITY sysstat-version              "10.0.2">
-<!ENTITY apache-ant-version           "1.8.1">
+<!ENTITY apache-ant-version           "1.8.3">
 <!ENTITY dbus-version                 "1.4.20">
 <!-- <!ENTITY hal-version                  "0.5.14"> -->

general/prog/pdl.xml

@@ -237 +237 @@
             <ulink url="&gnome-download-http;/gnome-libs/1.4/">GNOME
             Libraries-1.4</ulink>,
-            <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
+            <xref linkend="icedtea6"/>, <!-- or <xref linkend="jdk"/>, -->
             <xref linkend="tk"/>,
             <xref linkend="python2"/> (with

general/sysutils/apache-ant.xml

@@ -7 +7 @@
   <!ENTITY apache-ant-download-http "http://archive.apache.org/dist/ant/source/apache-ant-&apache-ant-version;-src.tar.bz2">
   <!ENTITY apache-ant-download-ftp  "ftp://anduin.linuxfromscratch.org/BLFS/svn/a/apache-ant-&apache-ant-version;-src.tar.bz2">
-  <!ENTITY apache-ant-md5sum        "8c31b30f6b9863d1fef4bdf484fc8507">
-  <!ENTITY apache-ant-size          "5.8 MB">
-  <!ENTITY apache-ant-buildsize     "119 MB">
+  <!ENTITY apache-ant-md5sum        "d7e0bdd538481b7c15dfb7fbcdd81b0e">
+  <!ENTITY apache-ant-size          "3.2 MB">
+  <!ENTITY apache-ant-buildsize     "67 MB">
   <!ENTITY apache-ant-time          "0.4 SBU">
 ]>
 
-<sect1 id="apache-ant" xreflabel="Apache Ant-&apache-ant-version;">
+<sect1 id="apache-ant" xreflabel="apache-ant-&apache-ant-version;">
   <?dbhtml filename="apache-ant.html"?>
 
@@ -21 +21 @@
   </sect1info>
 
-  <title>Apache Ant-&apache-ant-version;</title>
+  <title>apache-ant-&apache-ant-version;</title>
 
   <indexterm zone="apache-ant">
@@ -40 +40 @@
     that implements a particular task interface.</para>
 
-    <para>&lfssvn_checked;20101029&lfssvn_checked2;</para>
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -64 +64 @@
     </itemizedlist>
 
-    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required Patch: <ulink
-        url="&patch-root;/apache-ant-&apache-ant-version;-blfs_install-1.patch"/></para>
-      </listitem>
-    </itemizedlist> -->
-
     <bridgehead renderas="sect3">Apache Ant Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="icedtea6"/><!-- or
-    <xref linkend="jdk"/>--></para>
+    <para role="required">
+      <xref linkend="icedtea6"/> <!-- or <xref linkend="jdk"/> -->
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="junit"/></para>
+    <para role="recommended">
+      <xref linkend="junit"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -95 +90 @@
       <ulink url="http://ant.apache.org/manual/install.html#librarydependencies"/>
       for any prerequisite libraries you may need.</para>
-
-      <!-- <para>One such library is the
-      <application>JUnit</application>-3.8.1 testing framework library. Many
-      Ant-installed packages will use this library to perform the unit tests
-      during the build process. To install the JUnit library along with the
-      <application>Apache Ant</application> package, download it from
-      <ulink url="http://www.junit.org/"/>, unzip the distribution file (requires
-      <xref linkend="unzip"/>) and copy the <filename>junit.jar</filename> file
-      into the <filename class='directory'>lib</filename> subdirectory of the
-      <application>Apache Ant</application> source tree before beginning the
-      <application>Apache Ant</application> build.</para> -->
     </note>
 
@@ -120 +104 @@
 <screen><userinput>sed -i 's|${dist.dir}/etc|/etc/ant|'        build.xml &amp;&amp;
 sed -i 's|/etc/ant.conf|/etc/ant/ant.conf|' src/script/ant &amp;&amp;
-cp -v /usr/share/junit-&junit-version;/junit-&junit-version;.jar \
-      lib/optional/junit.jar</userinput></screen>
+cp -v /usr/share/junit-&junit-version;/junit-&junit-version;.jar lib/optional/junit.jar</userinput></screen>
 
     <para>The unit regression tests are performed during the build step below

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to apache-ant-1.8.3.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Remove JDK.</para>
         </listitem>