From cb7ef13440381471a7d0a51f55c0c73db608ca0c Mon Sep 17 00:00:00 2001
From: Andrew Benton <andy@linuxfromscratch.org>
Date: Wed, 29 Feb 2012 20:45:23 +0000
Subject: [PATCH] subversion tweaks

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9556 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genlib/apr.xml        |  2 +-
 general/genutils/apr-util.xml |  2 +-
 general/prog/subversion.xml   | 34 ++++------------------------------
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/general/genlib/apr.xml b/general/genlib/apr.xml
index 78ff58b167..3a4064d61f 100644
--- a/general/genlib/apr.xml
+++ b/general/genlib/apr.xml
@@ -7,7 +7,7 @@
   <!ENTITY apr-download-http
   "http://archive.apache.org/dist/apr/apr-&apr-version;.tar.bz2">
   <!ENTITY apr-download-ftp
-  "ftp://ftp.mirrorservice.org/sites/ftp.apache.org/apr/apr-1.4.6.tar.bz2">
+  "ftp://ftp.mirrorservice.org/sites/ftp.apache.org/apr/apr-&apr-version;.tar.bz2">
   <!ENTITY apr-md5sum        "ffee70a111fd07372982b0550bbb14b7">
   <!ENTITY apr-size          "768 KB">
   <!ENTITY apr-buildsize     "11 MB">
diff --git a/general/genutils/apr-util.xml b/general/genutils/apr-util.xml
index a2ceda37fe..28d1b52fcf 100644
--- a/general/genutils/apr-util.xml
+++ b/general/genutils/apr-util.xml
@@ -7,7 +7,7 @@
   <!ENTITY apr-util-download-http
   "http://archive.apache.org/dist/apr/apr-util-&apr-util-version;.tar.bz2">
   <!ENTITY apr-util-download-ftp
-  "ftp://ftp.mirrorservice.org/sites/ftp.apache.org/apr/apr-util-1.4.1.tar.bz2">
+  "ftp://ftp.mirrorservice.org/sites/ftp.apache.org/apr/apr-util-&apr-util-version;.tar.bz2">
   <!ENTITY apr-util-md5sum        "52b31b33fb1aa16e65ddaefc76e41151">
   <!ENTITY apr-util-size          "624 KB">
   <!ENTITY apr-util-buildsize     "8.1 MB">
diff --git a/general/prog/subversion.xml b/general/prog/subversion.xml
index 4fcc82177a..09a6297160 100644
--- a/general/prog/subversion.xml
+++ b/general/prog/subversion.xml
@@ -67,18 +67,13 @@
     <bridgehead renderas="sect3">Subversion Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="sqlite"/>, and
-    <xref linkend="apache"/> (for the
-    <application>APR</application> only) or
-    <ulink url="http://apr.apache.org/">Apache Portable Runtime</ulink></para>
+    <para role="required"><xref linkend="sqlite"/> and
+    <xref linkend="apr-util"/></para>
 
     <para>If you require the <application>Berkeley DB</application> back-end
     hooks in <application>Subversion</application> to build or support BDB
     based repositories, you must have <application>Berkeley DB</application>
-    linked into the <application>APR-util</application> library. There is
-    information in the <xref linkend="apache"/> instructions that shows the
-    required parameters to pass to the <command>configure</command> script when
-    building any of the <application>APR-util</application> packages.</para>
+    linked into the <application>APR-util</application> library.</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="python2"/> (required to run the test suite),
@@ -89,8 +84,7 @@
     <xref linkend="dbus-glib"/>,
     <xref linkend="gnome-keyring"/>,
     KWallet from KDE4,
-    <xref linkend="apache"/> (if you have <application>Apache Portable
-    Runtime</application> installed), and
+    <xref linkend="apache"/> and
     <xref linkend="neon"/> or
     <ulink url="http://code.google.com/p/serf/">serf</ulink></para>
 
@@ -180,25 +174,6 @@ make install-swig-rb</userinput></screen>
     <filename class='directory'>/usr/lib/svn-python</filename> to the
     <envar>PYTHONPATH</envar> environment variable to the system or
     personal profiles.</para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>--with-apr=<replaceable>&lt;prefix&gt;</replaceable>
-    --with-apr-util=<replaceable>&lt;prefix&gt;</replaceable></option>:
-    These options should be used if you wish to use the system-installed
-    version of the <application>APR</application>. Ensure you identify the
-    correct installation prefix.</para>
-
-    <para><option>--with-apxs=/usr/sbin/apxs</option>: This option should be
-    used to identify the system-installed version of the
-    <command>apxs</command> command installed during the
-    <application>Apache HTTPD</application> installation as
-    <command>apxs</command> might not be in an unprivileged user's
-    <envar>PATH</envar> and won't be properly discovered.</para>
-
   </sect2>
 
   <sect2 role="configuration">
@@ -217,7 +192,6 @@ make install-swig-rb</userinput></screen>
       <indexterm zone="subversion subversion-config">
         <primary sortas="e-etc-subversion-config">/etc/subversion/config</primary>
       </indexterm>
-
     </sect3>
 
     <sect3>