Index: general.ent
===================================================================
--- general.ent	(revision afd68892c752fff5131fc160aedbf3073a4ff48c)
+++ general.ent	(revision 82e035a85726896a7864b3dee1f4f0c430bbcc01)
@@ -1,3 +1,3 @@
-<!ENTITY day          "24">
+<!ENTITY day          "25">
 <!ENTITY month        "01">
 <!ENTITY year         "2005">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision afd68892c752fff5131fc160aedbf3073a4ff48c)
+++ introduction/welcome/changelog.xml	(revision 82e035a85726896a7864b3dee1f4f0c430bbcc01)
@@ -22,4 +22,7 @@
 
 <itemizedlist>
+
+<listitem><para>January 25th, 2005 [randy]: Modified dependency list and added 
+patches to Cdrdao so that the gcdmaster program will build.</para></listitem>
 
 <listitem><para>January 24th, 2005 [randy]: Updated to 
Index: multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao.xml	(revision afd68892c752fff5131fc160aedbf3073a4ff48c)
+++ multimedia/cdwriteutils/cdrdao.xml	(revision 82e035a85726896a7864b3dee1f4f0c430bbcc01)
@@ -3,13 +3,13 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
- 
+
   <!ENTITY cdrdao-download-http "http://prdownloads.sourceforge.net/cdrdao/cdrdao-&cdrdao-version;.tar.gz">
   <!ENTITY cdrdao-download-ftp  " ">
   <!ENTITY cdrdao-size          "1.6 MB">
-  <!ENTITY cdrdao-buildsize     "46 MB">
-  <!ENTITY cdrdao-time          "0.68 SBU">
+  <!ENTITY cdrdao-buildsize     "54 MB">
+  <!ENTITY cdrdao-time          "1.47 SBU (includes building <command>gcdmaster</command>)">
 ]>
 
-<sect1 id="cdrdao" xreflabel="Cdrdao-&cdrdao-version;">
+<sect1 id="cdrdao-package" xreflabel="Cdrdao-&cdrdao-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -18,4 +18,6 @@
 <?dbhtml filename="cdrdao.html"?>
 <title>Cdrdao-&cdrdao-version;</title>
+<indexterm zone="cdrdao-package">
+<primary sortas="a-Cdrdao">Cdrdao</primary></indexterm>
 
 <sect2>
@@ -39,12 +41,39 @@
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch (if building <command>gcdmaster</command>): 
+<ulink url="&patch-root;/cdrdao-&cdrdao-version;-gcc34-1.patch"/></para>
+</listitem>
+<listitem><para>Required patch (if building <command>gcdmaster</command>): 
+<ulink url="&patch-root;/libglademm-2.2.0-gcc34-1.patch"/></para>
+</listitem>
+<listitem><para>Required patch (if building <command>gcdmaster</command>): 
+<ulink url="&patch-root;/libgnomecanvasmm-2.0.2-gcc34-1.patch"/></para>
+</listitem>
+</itemizedlist>
+</sect3>
+
 <sect3><title><application>Cdrdao</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="lame-package"/>,
-<xref linkend="pkgconfig"/>,
-<ulink url="http://www.gtkmm.org/">gtkmm-1.2.8</ulink> 
-(requires <xref linkend="GTK"/> and libsig++-1.0.4) and
-<ulink url="http://www.gtkmm.org/">gnomemm-1.2.4</ulink> 
-(requires <xref linkend="gnome-libs"/>)</para>
+<para><xref linkend="lame-package"/> (required to build 
+<command>toc2mp3</command>) and 
+<ulink url="http://www.polhode.com/pccts.html">PCCTS</ulink></para>
+</sect4>
+
+<sect4><title>Optional (required to build the <command>gcdmaster</command> 
+program)</title>
+<para><emphasis>Note: all the following packages must be built in 
+the order listed.</emphasis></para>
+
+<para><xref linkend="libgnomeui"/>, 
+<ulink url="http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/">
+libsigc++-1.2.5</ulink>, 
+<ulink url="http://www.gtkmm.org/">gtkmm-2.2.12</ulink>, 
+<ulink url="http://www.gtkmm.org/">libglademm-2.2.0</ulink>, 
+<ulink url="http://www.gtkmm.org/">libgnomecanvasmm-2.0.2</ulink>, 
+<ulink url="http://www.gtkmm.org/">gconfmm-2.0.2</ulink>, 
+<ulink url="http://www.gtkmm.org/">libgnomemm-2.0.1</ulink> and 
+<ulink url="http://www.gtkmm.org/">libgnomeuimm-2.0.0</ulink></para>
 </sect4>
 </sect3>
@@ -58,7 +87,11 @@
 commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+<screen><userinput><command>patch -Np1 -i ../cdrdao-&cdrdao-version;-gcc34-1.patch &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
@@ -67,34 +100,74 @@
 <title>Contents</title>
 
-<para>The <application>Cdrdao</application> package contains
-<command>cdrdao</command>,
-<command>cue2toc</command>, 
-<command>toc2cue</command>, 
-<command>toc2cddb</command> and optionally, 
-<command>toc2mp3</command>.</para>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Directory</segtitle>
+<seglistitem>
+<seg>cdrdao, cue2toc, toc2cddb, toc2cue and optionally, gcdmaster and 
+toc2mp3</seg>
+<seg>/usr/share/cdrdao</seg>
+</seglistitem>
+</segmentedlist>
 
-</sect2>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect2><title>Description</title>
+<varlistentry id="cdrdao">
+<term><command>cdrdao</command></term>
+<listitem><para>records audio or data <acronym>CD</acronym>-Rs in disk-at-once 
+(<acronym>DAO</acronym>) mode based on a textual description of the 
+<acronym>CD</acronym> contents.</para>
+<indexterm zone="cdrdao-package cdrdao">
+<primary sortas="b-cdrdao">cdrdao</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>cdrdao</title>
-<para><command>cdrdao</command> records audio or data
-<acronym>CD</acronym>-Rs in disk-at-once 
-(<acronym>DAO</acronym>) mode based on a textual description of the
-<acronym>CD</acronym> contents.
-</para></sect3>
+<varlistentry id="cue2toc">
+<term><command>cue2toc</command></term>
+<listitem><para>converts <acronym>CUE</acronym> to <acronym>TOC</acronym> 
+format for audio <acronym>CD</acronym>s.</para>
+<indexterm zone="cdrdao-package cue2toc">
+<primary sortas="b-cue2toc">cue2toc</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>cue2toc, toc2cue</title>
-<para><command>cue2toc</command> and <command>toc2cue</command>
-convert CUE to TOC format (and vice versa) for audio
-<acronym>CD</acronym>s.</para></sect3>
+<varlistentry id="gcdmaster">
+<term><command>gcdmaster</command></term>
+<listitem><para>is a graphical front end to <command>cdrdao</command> for 
+composing audio <acronym>CD</acronym>s.</para>
+<indexterm zone="cdrdao-package gcdmaster">
+<primary sortas="b-gcdmaster">gcdmaster</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>toc2cddb</title>
-<para><command>toc2cddb</command> converts a <application>Cdrdao</application> 
-TOC file into a cddb file and prints it to stdout.</para></sect3>
+<varlistentry id="toc2cddb">
+<term><command>toc2cddb</command></term>
+<listitem><para>converts a <application>Cdrdao</application> 
+<acronym>TOC</acronym> file into a cddb file and prints it to stdout.</para>
+<indexterm zone="cdrdao-package toc2cddb">
+<primary sortas="b-toc2cddb">toc2cddb</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>toc2mp3</title>
-<para><command>toc2mp3</command> converts an audio <acronym>CD</acronym> 
-disk image (.toc file) to mp3 files.</para></sect3>
+<varlistentry id="toc2cue">
+<term><command>toc2cue</command></term>
+<listitem><para>converts <acronym>TOC</acronym> to <acronym>CUE</acronym> 
+format for audio <acronym>CD</acronym>s.</para>
+<indexterm zone="cdrdao-package toc2cue">
+<primary sortas="b-toc2cue">toc2cue</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="toc2mp3">
+<term><command>toc2mp3</command></term>
+<listitem><para>converts an audio <acronym>CD</acronym>
+disk image (<filename>.toc</filename> file) to MP3 files (requires 
+<xref linkend="lame-package"/> to build).</para>
+<indexterm zone="cdrdao-package toc2mp3">
+<primary sortas="b-toc2mp3">toc2mp3</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
