Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision e090737a9744e5f78c184cb953cdf050e90f0313)
+++ xsoft/graphweb/firefox.xml	(revision 5ccc18ddd8eb634cb52a2237b47c027d837cb2f4)
@@ -68,11 +68,11 @@
     <filename>.mozconfig</filename> file created below.</para>
 
-    <bridgehead renderas="sect4">Recommended (if you will be installing any
-    other package that utilizes NSS/NSPR, such as
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended"><xref linkend="nss"/>(if you will be installing
+    any other package that utilizes NSS/NSPR, such as
     <application>Thunderbird</application>,
-    <application>Mozilla</application>,
+    <application>SeaMonkey</application>,
     <application>Evolution</application>, or
-    <application>OpenOffice</application>)</bridgehead>
-    <para role="recommended"><xref linkend="nss"/></para>
+    <application>OpenOffice</application>)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: xsoft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision e090737a9744e5f78c184cb953cdf050e90f0313)
+++ xsoft/graphweb/seamonkey.xml	(revision 5ccc18ddd8eb634cb52a2237b47c027d837cb2f4)
@@ -5,14 +5,14 @@
   %general-entities;
 
-  <!ENTITY mozilla-download-http      "http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/&seamonkey-version;/seamonkey-&seamonkey-version;.source.tar.bz2">
-  <!ENTITY mozilla-download-ftp       "ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/&seamonkey-version;/seamonkey-&seamonkey-version;.source.tar.bz2">
-  <!ENTITY mozilla-md5sum             "4409ad62738d403719a62d00c0276e08">
-  <!ENTITY mozilla-size               "33.4 MB">
-  <!ENTITY mozilla-buildsize          "621 MB">
-  <!ENTITY mozilla-time               "16.6 SBU">
-
-  <!ENTITY mozilla-enigmail-version   "0.95.0">
-  <!ENTITY mozilla-enigmail-download  "http://www.mozilla-enigmail.org/download/source/enigmail-&mozilla-enigmail-version;.tar.gz">
-  <!ENTITY mozilla-enigmail-md5sum    "820ab216b6ba21f81392d56bb9991c18">
+  <!ENTITY seamonkey-download-http      "http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/&seamonkey-version;/seamonkey-&seamonkey-version;.source.tar.bz2">
+  <!ENTITY seamonkey-download-ftp       "ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/&seamonkey-version;/seamonkey-&seamonkey-version;.source.tar.bz2">
+  <!ENTITY seamonkey-md5sum             "d91320fcd6a6aa48cc7c4d5ae596b09e">
+  <!ENTITY seamonkey-size               "35.3 MB">
+  <!ENTITY seamonkey-buildsize          "631 MB">
+  <!ENTITY seamonkey-time               "18.4 SBU">
+
+  <!ENTITY seamonkey-enigmail-version   "0.95.6">
+  <!ENTITY seamonkey-enigmail-download  "http://www.mozilla-enigmail.org/download/source/enigmail-&seamonkey-enigmail-version;.tar.gz">
+  <!ENTITY seamonkey-enigmail-md5sum    "cfbe6ff77f80a349b396829757ad952a">
 ]>
 
@@ -61,20 +61,20 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&mozilla-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&mozilla-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &mozilla-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &mozilla-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &mozilla-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &mozilla-time;</para>
+        <para>Download (HTTP): <ulink url="&seamonkey-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&seamonkey-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &seamonkey-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &seamonkey-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &seamonkey-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &seamonkey-time;</para>
       </listitem>
     </itemizedlist>
@@ -91,8 +91,8 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para><ulink url="&mozilla-enigmail-download;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum (Enigmail): &mozilla-enigmail-md5sum;</para>
+        <para><ulink url="&seamonkey-enigmail-download;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum (Enigmail): &seamonkey-enigmail-md5sum;</para>
       </listitem>
     </itemizedlist>
@@ -101,9 +101,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>,
-      <xref linkend="libidl"/>, and
-      <xref linkend="zip"/>
-    </para>
+    <para role="required"><xref linkend="gtk2"/>,
+    <xref linkend="libidl"/>, and
+    <xref linkend="zip"/></para>
 
     <note>
@@ -116,17 +114,13 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="nss"/> (if you will be installing any other package that
-      utilizes NSS/NSPR, such as <application>Firefox</application>,
-      <application>Thunderbird</application>,
-      <application>Evolution</application>, or
-      <application>OpenOffice</application>)
-    </para>
+    <para role="recommended"><xref linkend="nss"/> (if you will be installing
+    any other package that utilizes NSS/NSPR, such as
+    <application>Firefox</application>, <application>Thunderbird</application>,
+    <application>Evolution</application>, or
+    <application>OpenOffice</application>)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="unzip"/> and
-      <xref linkend="libgnomeui"/> (to build the gnomevfs extension)
-    </para>
+    <para role="optional"><xref linkend="unzip"/> and
+    <xref linkend="libgnomeui"/> (to build the gnomevfs extension)</para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -246,15 +240,18 @@
 EOF</userinput></screen>
 
-    <para>Now clean up one <filename>Makefile</filename> to
-    add required libraries to a build step.  Note that the command
-    requires two separate lines as shown.</para>
-
-<screen><userinput>sed -i -e '/MOZ_JS_LIBS/a\
-\t\t$(MOZ_XFT_LIBS) \\' layout/build/Makefile.in</userinput></screen>
-
     <para>Compile <application>SeaMonkey</application> by running the
-    following command:</para>
-
-<screen><userinput>make -f client.mk build</userinput></screen>
+    following commands:</para>
+
+<screen><userinput>cat &gt;&gt; layout/build/Makefile.in &lt;&lt; "EOF"
+
+ifdef MOZ_ENABLE_CANVAS
+EXTRA_DSO_LDOPTS += $(XLDFLAGS) -lX11 -lXrender
+endif
+EOF
+
+sed -i "s/^    enum$/&amp; xptinfo_enum_1/" \
+    xpcom/reflect/xptinfo/public/xptinfo.h
+
+make -f client.mk build</userinput></screen>
 
     <para>If you're building the <application>SeaMonkey</application>
@@ -263,12 +260,11 @@
     commands:</para>
 
-<screen><userinput>tar -xf ../enigmail-&mozilla-enigmail-version;.tar.gz -C mailnews/extensions &amp;&amp;
-
-pushd mailnews/extensions/enigmail &amp;&amp;
-./makemake -r &amp;&amp;
-popd &amp;&amp;
+<screen><userinput>tar -xf ../enigmail-&seamonkey-enigmail-version;.tar.gz -C mailnews/extensions &amp;&amp;
+
+( cd mailnews/extensions/enigmail &amp;&amp; ./makemake -r ) &amp;&amp;
 
 make -C ../seamonkey-build/mailnews/extensions/enigmail &amp;&amp;
-make -C ../seamonkey-build/mailnews/extensions/enigmail xpi</userinput></screen>
+make -C ../seamonkey-build/mailnews/extensions/enigmail \
+        XPIFILE=enigmail-&seamonkey-enigmail-version;.xpi xpi</userinput></screen>
 
     <para>This package does not come with a test suite. However, it
@@ -285,8 +281,6 @@
     /usr/include/seamonkey-&seamonkey-version;/ldap &amp;&amp;
 
-install -v -m755 -d /usr/lib/seamonkey-&seamonkey-version;/defaults/isp/US &amp;&amp;
-install -v -m644 mailnews/base/ispdata/movemail.rdf \
-    /usr/lib/seamonkey-&seamonkey-version;/defaults/isp &amp;&amp;
-ln -v -s ../movemail.rdf /usr/lib/seamonkey-&seamonkey-version;/defaults/isp/US</userinput></screen>
+install -v -m644 ../seamonkey-build/dist/bin/isp/movemail.rdf \
+    /usr/lib/seamonkey-&seamonkey-version;/isp</userinput></screen>
 
     <para>If you built <application>SeaMonkey</application> utilizing
@@ -315,10 +309,9 @@
     class="username">root</systemitem> user to install the
     <filename>.xpi</filename> file into the
-    <filename class='directory'>/usr/lib/seamonkey-&seamonkey-version;</filename>
+    <filename class='directory'>/usr/lib/seamonkey-&seamonkey-version;/xpi_store</filename>
     directory:</para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/lib/seamonkey-&seamonkey-version;/xpi_store &amp;&amp;
-install -v -m644 ../seamonkey-build/dist/bin/enigmail-&mozilla-enigmail-version;-*.xpi \
-    /usr/lib/seamonkey-&seamonkey-version;/xpi_store</userinput></screen>
+<screen role="root"><userinput>install -v -m644 -D ../seamonkey-build/dist/bin/enigmail-&seamonkey-enigmail-version;.xpi \
+    /usr/lib/seamonkey-&seamonkey-version;/xpi_store/enigmail-&seamonkey-enigmail-version;.xpi</userinput></screen>
 
       <para>There are two methods you can use to install the
@@ -346,5 +339,5 @@
     <para>If you want to install the <application>Enigmail</application>
     extension now, which offers system-wide access, issue the following
-    commands as the <systemitem class="username">root</systemitem> user:</para>
+    command as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make -C ../seamonkey-build/mailnews/extensions/enigmail install</userinput></screen>
@@ -439,4 +432,12 @@
     <title>Command Explanations</title>
 
+    <para><command>'EXTRA_DSO_LDOPTS' += -lX11 -lXrender ...</command>:
+    Building the layout backend will break when the canvas element is enabled
+    without adding these two required libraries.</para>
+
+    <para><command>sed -i "s/^    enum$/&amp; xptinfo_enum_1/" ...</command>:
+    This command is used to fix an anonymous enum in an external/public
+    interface header file.</para>
+
     <para><command>make -f client.mk ...</command>: Mozilla products are
     packaged to allow the use of a configuration file which can be used to
@@ -451,5 +452,5 @@
     <para><command>./makemake -r</command>: This command is used to recursively
     create <filename>Makefile</filename>s in the appropriate subdirectory
-    of seamonkey-build.</para>
+    of <filename class='directory'>seamonkey-build</filename>.</para>
 
     <para><command>make -C ... xpi</command>: This command builds the
@@ -459,5 +460,5 @@
 
     <para><command>install .../movemail.rdf ...</command>: This
-    command is used to install a file inadvertently left out of the
+    command is used to install files inadvertently left out of the
     installation script.</para>
 
@@ -470,8 +471,8 @@
     <command>seamonkey</command> script is in the user's path. If
     <application>SeaMonkey</application> is installed in a non-standard location,
-    then make a symlink to the <command>seamonkey</command> script in the
+    make a symlink to the <command>seamonkey</command> script in the
     <filename class="directory">/usr/bin</filename> directory.</para>
 
-    <para>Many applications look for <command>netscape</command> when they need
+    <para>Some applications look for <command>netscape</command> when they need
     to open a browser. You may make the following symlink for convenience (as
     the <systemitem class="username">root</systemitem> user).</para>
@@ -501,5 +502,5 @@
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>ln -v -s ../../seamonkey/plugins/<replaceable>&lt;plugin.so&gt;</replaceable> \
+<screen role="root"><userinput>ln -v -s ../../mozilla/plugins/<replaceable>&lt;plugin.so&gt;</replaceable> \
     /usr/lib/seamonkey-&seamonkey-version;/plugins</userinput></screen>
 
