Index: basicnet/netlibs/libsoup.xml
===================================================================
--- basicnet/netlibs/libsoup.xml	(revision dca2fac36bb4965627afe2a42454a37dc3dd701f)
+++ basicnet/netlibs/libsoup.xml	(revision b92552986a0abb5e0fea83949b321d7a96b94587)
@@ -4,9 +4,10 @@
   %general-entities;
 
-  <!ENTITY libsoup-download-http "http://ftp.gnome.org/pub/gnome/sources/libsoup/1.99/libsoup-&libsoup-version;.tar.bz2">
-  <!ENTITY libsoup-download-ftp  "ftp://ftp.gnome.org/pub/gnome/sources/libsoup/1.99/libsoup-&libsoup-version;.tar.bz2">
-  <!ENTITY libsoup-size          "365 KB">
-  <!ENTITY libsoup-buildsize     "13 MB">
-  <!ENTITY libsoup-time          "0.41 SBU">
+  <!ENTITY libsoup-download-http "http://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/libsoup-&libsoup-version;.tar.bz2">
+  <!ENTITY libsoup-download-ftp  "ftp://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/libsoup-&libsoup-version;.tar.bz2">
+  <!ENTITY libsoup-md5sum        "8132b0bce469affed688c4863702aa41">
+  <!ENTITY libsoup-size          "403 KB">
+  <!ENTITY libsoup-buildsize     "9.0 MB">
+  <!ENTITY libsoup-time          "0.32 SBU">
 ]>
 
@@ -29,29 +30,31 @@
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&libsoup-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&libsoup-download-ftp;"/></para></listitem>
+<listitem><para>Download (HTTP): 
+<ulink url="&libsoup-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&libsoup-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &libsoup-md5sum;</para></listitem>
 <listitem><para>Download size: &libsoup-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &libsoup-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &libsoup-time;</para></listitem></itemizedlist>
+<listitem><para>Estimated disk space required: 
+&libsoup-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&libsoup-time;</para></listitem></itemizedlist>
 </sect3>
 
 <sect3><title><application>libsoup</application> dependencies</title>
 <sect4><title>Required</title>
-<para>
-<xref linkend="GLib2"/> and
-<xref linkend="libxml2"/>
-</para></sect4>
+<para><xref linkend="GLib2"/> and <xref linkend="libxml2"/></para>
+</sect4>
+
 <sect4><title>Optional</title>
-<para>
-<xref linkend="gtk-doc"/>, 
-<xref linkend="docbook-utils"/> and 
-<ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink> (which
-needs <ulink
-url="ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/">libgpg-error</ulink>,
-<ulink url="ftp://ftp.gnupg.org/gcrypt/libgcrypt/">libgcrypt</ulink> and
-<ulink
-url="ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/opencdk/">opencdk</ulink>,
-in that order.)
-</para></sect4>
+<para><xref linkend="gtk-doc"/> and 
+<ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink> (which 
+needs <ulink 
+url="ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/">libgpg-error</ulink>, 
+<ulink url="ftp://ftp.gnupg.org/gcrypt/libgcrypt/">libgcrypt</ulink> and 
+<ulink 
+url="ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/opencdk/">opencdk</ulink>, 
+in that order.)</para>
+</sect4>
 </sect3>
 
@@ -64,8 +67,9 @@
 commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr --libexecdir=/usr/sbin &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
 
+<!-- 
 <note><para>Some versions of <application>GnuTLS</application> will cause the 
 <application>libsoup</application> build to fail. You can use the following
@@ -75,4 +79,5 @@
 <screen><userinput><command>sed -i -e "s@status \&amp; GNUTLS_CERT_CORRUPTED ||@/* status \&amp; GNUTLS_CERT_CORRUPTED || */@" \
     libsoup/soup-gnutls.c</command></userinput></screen>
+ -->
 
 </sect2>
@@ -89,6 +94,7 @@
 
 <sect3><title>libsoup libraries</title>
-<para><filename class="libraryfile">libsoup</filename> libraries provide functions for
-asynchronous <acronym>HTTP</acronym> connections.</para></sect3>
+<para><filename class="libraryfile">libsoup</filename> libraries provide 
+functions for asynchronous <acronym>HTTP</acronym> connections.</para>
+</sect3>
 
 </sect2>
