From b845163e8398933611ac591f6781b1d94cb2d15f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20=C5=BDivkovi=C4=87?= <igor@linuxfromscratch.org>
Date: Sun, 14 Mar 2004 22:31:34 +0000
Subject: [PATCH] updated to libxml2-2.6.7, cvs-1.11.14 and xmms-1.2.10

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@1893 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 basicnet/netprogs/cvs/cvs-desc.xml         | 4 +---
 basicnet/netprogs/cvs/cvs.ent              | 6 +++---
 general/genlib/libxml2/libxml2.ent         | 4 ++--
 index.xml                                  | 4 ++--
 introduction/welcome/changelog.xml         | 3 +++
 multimedia/audioutils/xmms.xml             | 2 --
 multimedia/audioutils/xmms/xmms-config.xml | 3 +--
 multimedia/audioutils/xmms/xmms-desc.xml   | 4 ++--
 multimedia/audioutils/xmms/xmms-inst.xml   | 3 +--
 multimedia/audioutils/xmms/xmms-intro.xml  | 2 +-
 multimedia/audioutils/xmms/xmms.ent        | 7 +++----
 11 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/basicnet/netprogs/cvs/cvs-desc.xml b/basicnet/netprogs/cvs/cvs-desc.xml
index 9cd6849878..8ebe4036a8 100644
--- a/basicnet/netprogs/cvs/cvs-desc.xml
+++ b/basicnet/netprogs/cvs/cvs-desc.xml
@@ -2,8 +2,7 @@
 <title>Contents</title>
 
 <para>The <application><acronym>CVS</acronym></application> package contains 
-<command>cvs</command>, <command>cvsbug</command> and <command>rcs2log
-</command>.</para>
+<command>cvs</command>, <command>cvsbug</command> and <command>rcs2log</command>.</para>
 
 </sect2>
 
@@ -22,4 +21,3 @@ support site.</para></sect3>
 <para><acronym>RCS</acronym> to Change Log generator.</para></sect3>
 
 </sect2>
-
diff --git a/basicnet/netprogs/cvs/cvs.ent b/basicnet/netprogs/cvs/cvs.ent
index 9fe9193c61..9dfa68343b 100644
--- a/basicnet/netprogs/cvs/cvs.ent
+++ b/basicnet/netprogs/cvs/cvs.ent
@@ -3,9 +3,9 @@
 <!ENTITY cvs-inst SYSTEM "cvs-inst.xml">
 <!ENTITY cvs-config SYSTEM "cvs-config.xml">
 <!ENTITY cvs-desc SYSTEM "cvs-desc.xml">
-<!ENTITY cvs-version "1.11.13">
+<!ENTITY cvs-version "1.11.14">
 <!ENTITY cvs-download-http "http://ftp.cvshome.org/LATEST_STABLE/cvs-&cvs-version;.tar.bz2">
 <!ENTITY cvs-download-ftp "">
-<!ENTITY cvs-size "2.1 MB">
+<!ENTITY cvs-size "2.2 MB">
 <!ENTITY cvs-buildsize "20 MB">
-<!ENTITY cvs-time "0.34 SBU">
+<!ENTITY cvs-time "0.31 SBU">
diff --git a/general/genlib/libxml2/libxml2.ent b/general/genlib/libxml2/libxml2.ent
index 13b8f0a662..44df5f18de 100644
--- a/general/genlib/libxml2/libxml2.ent
+++ b/general/genlib/libxml2/libxml2.ent
@@ -3,9 +3,9 @@
 <!ENTITY libxml2-inst SYSTEM "libxml2-inst.xml">
 <!ENTITY libxml2-desc SYSTEM "libxml2-desc.xml">
 <!ENTITY libxml2-exp SYSTEM "libxml2-exp.xml">
-<!ENTITY libxml2-version "2.6.6">
+<!ENTITY libxml2-version "2.6.7">
 <!ENTITY libxml2-download-http "http://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-&libxml2-version;.tar.bz2">
 <!ENTITY libxml2-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-&libxml2-version;.tar.bz2">
 <!ENTITY libxml2-size "2.6 MB">
 <!ENTITY libxml2-buildsize "54 MB">
-<!ENTITY libxml2-time "0.90 SBU">
+<!ENTITY libxml2-time "0.94 SBU">
diff --git a/index.xml b/index.xml
index ff5d7f9b4e..873cefcfd9 100644
--- a/index.xml
+++ b/index.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "CVS-20040313">
-<!ENTITY releasedate "March 13th, 2004">
+<!ENTITY version "CVS-20040314">
+<!ENTITY releasedate "March 14th, 2004">
 <!ENTITY blfs-version "cvs">
 
 <!ENTITY % book SYSTEM "book/book.ent">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 4bc44c1421..36a70e3e33 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -11,6 +11,9 @@ who wrote what.</para>
 
 <itemizedlist>
 
+<listitem><para>March 14th, 2004 [igor]: Updated to libxml2-2.6.7,
+CVS-1.11.14 and XMMS-1.2.10.</para></listitem>
+
 <listitem><para>March 13th, 2004 [igor]: Added a note about CUPS
 replacements for PSUtils commands, contributed by Alexander
 E. Patrakov.</para></listitem>
diff --git a/multimedia/audioutils/xmms.xml b/multimedia/audioutils/xmms.xml
index 5f281f043d..b3eb216d1e 100644
--- a/multimedia/audioutils/xmms.xml
+++ b/multimedia/audioutils/xmms.xml
@@ -4,9 +4,7 @@
 
 &XMMS-intro;
 &XMMS-inst;
-&XMMS-exp;
 &XMMS-config;
 &XMMS-desc;
 
 </sect1>
-
diff --git a/multimedia/audioutils/xmms/xmms-config.xml b/multimedia/audioutils/xmms/xmms-config.xml
index f66badb562..fa32c94d48 100644
--- a/multimedia/audioutils/xmms/xmms-config.xml
+++ b/multimedia/audioutils/xmms/xmms-config.xml
@@ -8,10 +8,9 @@
 <sect3><title>Configuration Information</title>
 
 <para>When you start <command>xmms</command> for the first time, you can 
-configure it with <userinput>CTRL+P</userinput> Note that you can extend XMMS' 
+configure it with <userinput>CTRL+P</userinput>. Note that you can extend XMMS' 
 functionality with plugins and skins. You can find these at 
 <ulink url="http://xmms.org"/>.</para>
 </sect3>
 
 </sect2>
-
diff --git a/multimedia/audioutils/xmms/xmms-desc.xml b/multimedia/audioutils/xmms/xmms-desc.xml
index 525853103e..53853b543b 100644
--- a/multimedia/audioutils/xmms/xmms-desc.xml
+++ b/multimedia/audioutils/xmms/xmms-desc.xml
@@ -9,10 +9,10 @@
 
 <sect3><title>xmms</title>
 <para><acronym>XMMS</acronym>, which stands for X MultiMedia System, is a 
-program comparable in function with <application>WinAMP</application>. It's main function is playing audio 
+program comparable in function with <application>WinAMP</application>. Its main function is playing audio 
 files like <filename>WAV</filename> and <filename>MP3</filename>. It can be 
 extended with plugins to play a number of 
-other audio or video formats. It's look can be customized with <application>WinAMP</application> style 
+other audio or video formats. Its look can be customized with <application>WinAMP</application> style 
 skins.</para></sect3>
 
 <sect3><title>xmms-config</title>
diff --git a/multimedia/audioutils/xmms/xmms-inst.xml b/multimedia/audioutils/xmms/xmms-inst.xml
index dcda49b278..1a6c825ffb 100644
--- a/multimedia/audioutils/xmms/xmms-inst.xml
+++ b/multimedia/audioutils/xmms/xmms-inst.xml
@@ -4,8 +4,7 @@
 <para>Install <application><acronym>XMMS</acronym></application> by running the following commands:
 </para>
 
-<screen><userinput><command>./configure --prefix=/usr --enable-one-plugin-dir &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
 </sect2>
-
diff --git a/multimedia/audioutils/xmms/xmms-intro.xml b/multimedia/audioutils/xmms/xmms-intro.xml
index 603e782157..cafb89e747 100644
--- a/multimedia/audioutils/xmms/xmms-intro.xml
+++ b/multimedia/audioutils/xmms/xmms-intro.xml
@@ -21,7 +21,7 @@ url="&XMMS-download-ftp;"/></para></listitem>
 <sect4><title>Required</title>
 <para><xref linkend="GTK"/></para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="esound"/>, 
+<para><xref linkend="alsa"/>, <xref linkend="esound"/>, 
 <xref linkend="libogg"/>, <xref linkend="libvorbis"/>, 
 <xref linkend="libmikmod"/>, <xref linkend="libxml"/>,
 <xref linkend="gnome-libs"/> and gnome-applets 
diff --git a/multimedia/audioutils/xmms/xmms.ent b/multimedia/audioutils/xmms/xmms.ent
index c685c10eff..7643e334ea 100644
--- a/multimedia/audioutils/xmms/xmms.ent
+++ b/multimedia/audioutils/xmms/xmms.ent
@@ -1,12 +1,11 @@
 <!ENTITY XMMS SYSTEM "../xmms.xml">
 <!ENTITY XMMS-intro SYSTEM "xmms-intro.xml">
 <!ENTITY XMMS-inst SYSTEM "xmms-inst.xml">
-<!ENTITY XMMS-exp SYSTEM "xmms-exp.xml">
 <!ENTITY XMMS-config SYSTEM "xmms-config.xml">
 <!ENTITY XMMS-desc SYSTEM "xmms-desc.xml">
-<!ENTITY XMMS-version "1.2.9">
+<!ENTITY XMMS-version "1.2.10">
 <!ENTITY XMMS-download-http "http://www.xmms.org/files/1.2.x/xmms-&XMMS-version;.tar.bz2">
 <!ENTITY XMMS-download-ftp "ftp://ftp.xmms.org/pub/xmms/1.2.x/xmms-&XMMS-version;.tar.bz2">
 <!ENTITY XMMS-size "2.4 MB">
-<!ENTITY XMMS-buildsize "54.5 MB">
-<!ENTITY XMMS-time "1.10 SBU">
+<!ENTITY XMMS-buildsize "55 MB">
+<!ENTITY XMMS-time "0.84 SBU">