Index: basicnet/netprogs/subversion.xml
===================================================================
--- basicnet/netprogs/subversion.xml	(revision 453769832354665e8bf95fc7f2bb2baedd697f07)
+++ basicnet/netprogs/subversion.xml	(revision d6eba2bd8cd910f61bf20716739f64cb1061a65d)
@@ -5,25 +5,14 @@
   %general-entities;
 
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-  <!ENTITY subversion-download-http "http://subversion.tigris.org/tarballs/subversion-&subversion-version;.tar.bz2">
+  <!ENTITY subversion-download-http "http://subversion.tigris.org/downloads/subversion-&subversion-version;.tar.bz2">
   <!ENTITY subversion-download-ftp  " ">
-  <!ENTITY subversion-md5sum        "07b95963968ae345541ca99d0e7bf082">
-  <!ENTITY subversion-size          "6.7 MB">
-
-  <!ENTITY subversion-buildsize     "100 MB (additional 57 MB to install all bindings and 465 MB to run all test suites)">
-  <!ENTITY subversion-time          "1.7 SBU (add 1.1 SBU for bindings and 20-60 minutes to run test suites)">
-
-  <!ENTITY svn-neon-version         "0.25.5">
+  <!ENTITY subversion-md5sum        "d4aa5aeb09acb3307841022d279ab895">
+  <!ENTITY subversion-size          "4.7 MB">
+
+  <!ENTITY subversion-buildsize     "109 MB (additional 74 MB to install all bindings and 405 MB to run all test suites)">
+  <!ENTITY subversion-time          "1.5 SBU (add 1.7 SBU for bindings and 2.2 SBU to run test suites)">
+
+  <!ENTITY svn-neon-version         "0.26.2">
+  <!ENTITY svn-swig-version         "1.3.29">
 ]>
 
@@ -91,40 +80,55 @@
     <bridgehead renderas="sect3">Subversion Dependencies</bridgehead>
 
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="apache"/> (for the
+    <application>APR</application> only) or
+    <ulink url="http://apr.apache.org/">Apache Portable Runtime</ulink> or
+    <ulink url="http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260&amp;expandFolder=74">
+    Subversion dependencies</ulink> (see the <filename>INSTALL</filename> file
+    for information on how to utilize this package)</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>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/>
-    (required to run the test suite),
+    <para role="optional"><xref linkend="python"/> (required to run the test suite),
     <!-- <xref linkend="db"/>, -->
-    <xref linkend="apache"/> or
-    <ulink url="http://apr.apache.org/">Apache Portable Runtime</ulink>,
-    <ulink url="http://www.webdav.org/neon/">neon-&svn-neon-version;</ulink>,
-    <xref linkend="jdk"/> (to build the Java bindings),
-    <ulink url="http://www.junit.org/">JUnit</ulink>
-    (required for running the Java bindings test suite and requires
-    <xref linkend="unzip"/>),
-    <ulink url="http://www.inet.no/dante/">Dante</ulink>
-    (alternate Java compiler), and
-    <ulink url="http://oss.software.ibm.com/developerworks/opensource/jikes/">
-    Jikes</ulink> (another alternate Java compiler)</para>
-
-    <bridgehead renderas="sect4">Optional for the Bundled Version of
-    <application>Neon</application></bridgehead>
-    <para role="optional"><xref linkend="pkgconfig"/>,
-    <xref linkend="libxml2"/> or <xref linkend="expat"/>,
-    <xref linkend="openssl"/>,
-    <xref linkend="heimdal"/> or <xref linkend="mitkrb"/></para>
-
-    <bridgehead renderas="sect4">Optional for the Bundled Version of
-    <application>Apache Portable Runtime</application></bridgehead>
-    <para role="optional"><xref linkend="expat"/> and
-    <xref linkend="gdbm"/></para>
-    <!-- <xref linkend="db"/>, -->
-
-    <bridgehead renderas="sect4">Optional to Build the
-    <application>SWIG</application> Bindings</bridgehead>
-    <para role="optional"><ulink url="http://www.swig.org">SWIG</ulink>,
+    <xref linkend="apache"/> (if you have <application>Apache Portable
+    Runtime</application> installed),
+    <ulink url="http://www.webdav.org/neon/">neon</ulink>*, and
+    <ulink url="http://code.google.com/p/serf/">serf</ulink></para>
+
+    <para>* The <command>configure</command> script will warn that the
+    installed <application>neon</application> version is not supported if the
+    version is greater than &svn-neon-version;. You can circumvent this
+    warning by passing <option>--disable-neon-version-check</option> to the
+    <command>configure</command> command. Note that this may or may not work,
+    depending on the version of <application>neon</application> you have
+    installed, but <application>neon</application>-0.26.3 is known to
+    work.</para>
+
+    <bridgehead renderas="sect4">Optional to Build the Java Bindings</bridgehead>
+    <para role="optional"><xref linkend="jdk"/> or
+    <ulink url="http://www.inet.no/dante/">Dante</ulink> or
+    <ulink url="http://oss.software.ibm.com/developerworks/opensource/jikes/">Jikes</ulink>,
+    and <xref linkend="junit"/> (to test the Java bindings)</para>
+
+    <bridgehead renderas="sect4">Optional to Build the SWIG Bindings</bridgehead>
+    <para role="optional"><ulink url="http://www.swig.org">SWIG</ulink>**,
     <xref linkend="python"/>, and
     <xref linkend="ruby"/></para>
 
-    <para>Note that the <application>Python</application>,
+    <para>** The <command>configure</command> script will issue warnings if
+    the installed version of <application>SWIG</application> is greater than
+    &svn-swig-version;, but will attempt to use it anyway if you build the
+    <application>SWIG</application> bindings. Versions of
+    <application>SWIG</application> up to 1.3.31 are known to work.</para>
+
+    <!-- <para>Note that the <application>Python</application>,
     <application>Perl</application> and <application>Ruby</application>
     bindings will not compile properly with the current version of
@@ -133,5 +137,5 @@
     instructions for building the <application>SWIG</application> bindings
     can be found in the <application>Subversion</application> source tree
-    file <filename>./subversion/bindings/swig/INSTALL</filename>.</para>
+    file <filename>./subversion/bindings/swig/INSTALL</filename>.</para> -->
 
     <para condition="html" role="usernotes">User Notes:
@@ -143,5 +147,5 @@
     <title>Installation of Subversion</title>
 
-    <caution>
+    <!-- <caution>
       <para>For reasons that are not yet fully understood,
       <application>Subversion</application> repositories based on some versions
@@ -163,29 +167,34 @@
       url="http://svnbook.red-bean.com/en/1.1/ch05s03.html#svn-ch-5-sect-3.5"/>
       if you need to migrate your repositores.</para>
-    </caution>
+    </caution> -->
 
     <para>Install <application>Subversion</application> by running the
     following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --without-berkeley-db \
-            --with-installbuilddir=/usr/lib/apr-0 &amp;&amp;
+<screen><userinput>sed -i 's/@SVN_APR_INCLUDES@/&amp; @CPPFLAGS@/' \
+    subversion/bindings/swig/perl/native/Makefile.PL.in
+
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-    <note>
+    <para>If you have <xref linkend="doxygen"/> installed and you wish to
+    build the API documentation, issue:
+    <command>doxygen doc/doxygen.conf</command>.</para>
+
+    <!-- <note>
       <para>If you have <application>Apache</application> installed, pass
-      the <option>--with-apr=/usr</option> and
-      <option>--with-apr-util=/usr</option> switches to the
+      the <option>-with-apr=/usr</option> and
+      <option>-with-apr-util=/usr</option> switches to the
       <command>configure</command> script. Otherwise,
       <application>Subversion</application> will overwrite APR and APR-utils
       from the <application>Apache</application> installation with the source
       distribution files. You may also need to pass
-      <option>--with-apxs=/usr/sbin/apxs</option> as <command>apxs</command>
+      <option>-with-apxs=/usr/sbin/apxs</option> as <command>apxs</command>
       might not be in an unprivileged user's <envar>PATH</envar> and won't be
       properly discovered. Additionally if you have
       <application>Apache</application> installed, you may safely remove the
-      <parameter>--with-installbuilddir=/usr/lib/apr-0</parameter> parameter
+      <parameter>-with-installbuilddir=/usr/lib/apr-0</parameter> parameter
       as it will have no effect.</para>
-    </note>
+    </note> -->
 
     <para>If you passed the <option>--enable-javahl</option> parameter to
@@ -195,7 +204,7 @@
 <screen><userinput>make javahl</userinput></screen>
 
-    <para>If you passed the <option>-with-swig</option> parameter to
-    <command>configure</command> and wish to build the
-    <application>Perl</application>, <application>Python</application> and/or
+    <para>If you have the necessary dependencies installed and you wish to
+    build the <application>Perl</application>,
+    <application>Python</application> and/or
     <application>Ruby</application> bindings, issue any or all of the following
     commands:</para>
@@ -205,18 +214,15 @@
 make swig-rb</userinput></screen>
 
-    <para>To test the results of the <application>Subversion</application>
-    build, issue: <command>make check</command>. This will take quite a long
-    time.</para>
-
-    <note>
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <!-- <note>
       <para>The <computeroutput>fs-base-test</computeroutput> is known to fail
       with issues surrounding the Berkely database installation. As mentioned
       earlier, it is not yet fully understood why this test fails.</para>
-    </note>
+    </note> -->
 
     <para>To test the results of the Java bindings build, issue
     <command>make check-javahl</command>. Note you must have the
-    <application>JUnit</application> (version 3.8.x) testing framework
-    installed.</para>
+    <application>JUnit</application> testing framework installed.</para>
 
     <para>To test the results of any or all of the
@@ -231,7 +237,4 @@
 
 <screen role='root'><userinput>make install &amp;&amp;
-rm doc/{Makefile,doxygen.conf} &amp;&amp;
-find doc -type d -exec chmod 755 {} \; &amp;&amp;
-find doc -type f -exec chmod 644 {} \; &amp;&amp;
 install -v -m755 -d /usr/share/doc/subversion-&subversion-version; &amp;&amp;
 cp -v -R doc/* /usr/share/doc/subversion-&subversion-version;</userinput></screen>
@@ -251,5 +254,5 @@
 make install-swig-py &amp;&amp;
 echo /usr/lib/svn-python \
-    &gt; /usr/lib/python2.4/site-packages/subversion.pth &amp;&amp;
+    &gt; /usr/lib/python2.5/site-packages/subversion.pth &amp;&amp;
 
 make install-swig-rb</userinput></screen>
@@ -260,10 +263,7 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--with-installbuilddir=/usr/lib/apr-0</parameter>:
-    This parameter is used (and only has an effect if you used the source
-    provided version of Apache Portable Runtime) to force the installation
-    of some APR-related support programs to
-    <filename class="directory">/usr/lib/apr-0</filename> instead of
-    <filename class="directory">/usr/build</filename>.</para>
+    <para><command>sed -i '...' .../Makefile.PL.in</command>: This command
+    is used to fix a problem with compiling the <application>Perl</application>
+    bindings. It can be ommitted if you're not building the bindings.</para>
 
     <para><option>--with-neon=<replaceable>&lt;prefix&gt;</replaceable></option>:
@@ -271,8 +271,23 @@
     of <application>neon</application>.</para>
 
-    <para><option>--with-ssl</option>: This switch enables
-    <application>OpenSSL</application> support in
-    <application>neon</application> (only required if you use the bundled
-    version of <application>neon</application>).</para>
+    <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>
+
+    <para><parameter>--with-installbuilddir=/usr/lib/apr-0</parameter>:
+    This parameter is used (and only has an effect if you used the
+    <application>Subversion dependencies</application> package) to force the
+    installation of some APR-related support programs to
+    <filename class="directory">/usr/lib/apr-0</filename> instead of
+    <filename class="directory">/usr/build</filename>.</para>
 
   </sect2>
@@ -322,14 +337,17 @@
 
       <seglistitem>
-        <seg>svn, svnadmin, svndumpfilter, svnlook, svnserve, svnversion, and
-        optionally, neon-config and apr-config</seg>
-        <seg>libsvn*.{so,a} and optionally, libneon.{so,a} and the mod_dav_svn.so,
+        <seg>svn, svnadmin, svndumpfilter, svnlook, svnserve, svnsync and
+        svnversion</seg>
+        <seg>libsvn*.{so,a} and optionally, a Java library, the mod_dav_svn.so,
         and mod_authz_svn.so <application>Apache HTTP</application>
-        DSO modules</seg>
-        <seg>/etc/subversion, /usr/include/neon (optional), /usr/include/subversion-1,
+        DSO modules and various <application>Perl</application>,
+        <application>Python</application> and <application>Ruby</application>
+        modules</seg>
+        <seg>/usr/include/subversion-1,
         /usr/lib/perl5/site_perl/&lfs-perl-version;/i686-linux/auto/SVN (optional),
         /usr/lib/perl5/site_perl/&lfs-perl-version;/i686-linux/SVN (optional),
-        /usr/lib/svn-javahl (optional), /usr/lib/svn-python (optional),
-        /usr/share/doc/neon-&svn-neon-version; (optional), and
+        /usr/lib/ruby/site_ruby/x.x/i686-linux/svn,
+        /usr/lib/svn-javahl (optional),
+        /usr/lib/svn-python (optional) and
         /usr/share/doc/subversion-&subversion-version;</seg>
       </seglistitem>
