From dfff7acefff4d17a94402eca14f3304995b80533 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 12 Jun 2005 22:15:51 +0000
Subject: [PATCH] Update to thunderbird-1.0.2 and fix installation location for
 its 'defaults' directory

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@4583 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 introduction/welcome/changelog.xml |  6 +++++
 xsoft/other/thunderbird.xml        | 36 +++++++++++++++++++++++-------
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/general.ent b/general.ent
index d8763e45b0..5e41f77e0a 100644
--- a/general.ent
+++ b/general.ent
@@ -418,7 +418,7 @@
 <!ENTITY dillo-version                "0.8.4">
 
 <!-- Chapter 36 -->
-<!ENTITY thunderbird-version          "1.0">
+<!ENTITY thunderbird-version          "1.0.2">
 <!ENTITY pan-version                  "0.14.2">
 <!ENTITY balsa-version                "2.2.6">
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 97df04b668..610995499a 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -24,6 +24,12 @@
 
   <itemizedlist>
 
+    <listitem>
+      <para>June 12th, 2005 [bdubbs]: Updated to thunderbird-1.0.2 and fixed
+      problem in the installation of thunderbird's <filename class='directory'>
+      defaults></filename> directory.</para>
+    </listitem>
+    
     <listitem>
       <para>June 12th, 2005 [bdubbs]: Added instruction to make rc.iptables
       executable in firewalling section.</para>
diff --git a/xsoft/other/thunderbird.xml b/xsoft/other/thunderbird.xml
index 1b33c59fc9..17c241548f 100644
--- a/xsoft/other/thunderbird.xml
+++ b/xsoft/other/thunderbird.xml
@@ -6,14 +6,14 @@
 
   <!ENTITY thunderbird-download-http     "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;-source.tar.bz2">
   <!ENTITY thunderbird-download-ftp      "ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;-source.tar.bz2">
-  <!ENTITY thunderbird-md5sum            "232ffe434fd65f5f0284a760d6e4ba2a">
-  <!ENTITY thunderbird-size              "33 MB">
-  <!ENTITY thunderbird-buildsize         "608 MB">
-  <!ENTITY thunderbird-time              "12.38 SBU">
+  <!ENTITY thunderbird-md5sum            "9e5b8a3edb3ced400e769dc2faa45317">
+  <!ENTITY thunderbird-size              "31.8 MB">
+  <!ENTITY thunderbird-buildsize         "600 MB">
+  <!ENTITY thunderbird-time              "11.4 SBU">
 
-  <!ENTITY thunderbird-enigmail-version  "0.90.1">
+  <!ENTITY thunderbird-enigmail-version  "0.91.0">
   <!ENTITY thunderbird-enigmail-download "http://downloads.mozdev.org/enigmail/src/enigmail-&thunderbird-enigmail-version;.tar.gz">
-  <!ENTITY thunderbird-enigmail-md5sum   "61deeb21ec7df10de9ad790039063f41">
+  <!ENTITY thunderbird-enigmail-md5sum   "4ab46132f41b4f1718cd4141742f824b">
 
   <!ENTITY thunderbird-ipc-version       "1.1.2">
   <!ENTITY thunderbird-ipc-download      "http://downloads.mozdev.org/enigmail/src/ipc-&thunderbird-ipc-version;.tar.gz">
@@ -125,6 +125,10 @@
 <screen><userinput>export MOZILLA_OFFICIAL="1" &amp;&amp;
 export BUILD_OFFICIAL="1" &amp;&amp;
 export MOZ_THUNDERBIRD="1" &amp;&amp;
+
+sed -i -e 's/$(destdir)$(bindir)/$(DESTDIR)$(mozappdir)/' \
+       mail/app/Makefile.in &amp;&amp;
+ 
 ./configure --prefix=/usr \
             --with-default-mozilla-five-home=/usr/lib/thunderbird-&thunderbird-version; \
             --with-system-zlib \
@@ -201,6 +205,22 @@ touch `find . -name *.rdf`</userinput></screen>
       the <filename class='directory'>/usr</filename> hierarchy.</para>
     </note>
 
+    <para>Finally, unset the build variables from the unprivileged user's
+    environment:</para>
+    
+<screen><userinput>unset MOZILLA_OFFICIAL &amp;&amp;
+unset BUILD_OFFICIAL &amp;&amp;
+unset MOZ_THUNDERBIRD</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed -i -e 's/$(destdir)$(bindir)/$(DESTDIR)$(mozappdir)/'
+    mail/app/Makefile.in</command>: Correct the installation location of the
+    <filename class='directory'>defaults</filename> directory.</para>
+
   </sect2>
 
   <sect2 role="content">
@@ -212,12 +232,12 @@ touch `find . -name *.rdf`</userinput></screen>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>thunderbird</seg>
+        <seg>thunderbird and thunderbird-config</seg>
         <seg>Numerous libraries, email/newsgroups components, plugins,
         extensions, and helper modules installed in <filename
         class='directory'>/usr/lib/thunderbird-&thunderbird-version;</filename>
         </seg>
-        <seg>/usr/bin/defaults, /usr/include/thunderbird-&thunderbird-version;,
+        <seg>/usr/include/thunderbird-&thunderbird-version;,
         /usr/lib/thunderbird-&thunderbird-version;, and
         /usr/share/idl/thunderbird-&thunderbird-version;</seg>
       </seglistitem>