thunderbird: Updated to 24.0

mozconfig,PRE_BUILD,BUILD,INSTALL sync with firefox's setup, much better

7 files changed, 75 insertions, 64 deletions

diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index 1f7ac6633f..50f9798a92 100755
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -1,35 +1,15 @@
-cd  $SOURCE_DIRECTORY/comm-*  &&
+cd  "${SOURCE_DIRECTORY}"/comm-*  &&
 
-THUNDERBIRD_HOME=${INSTALL_ROOT}/usr/lib/thunderbird &&
+THUNDERBIRD_HOME="${INSTALL_ROOT}"/usr/lib/thunderbird &&
 export  MOZ_THUNDERBIRD="1"   &&
 
 #
 # No fast optimization for Mozilla, bit us so many times...
 #
-export  CFLAGS="${CFLAGS//-O3/-O2}"      &&
-export  CXXFLAGS="${CXXFLAGS//-O3/-O2}"  &&
-
-#
-# -ffast-math breaks plugins
-#
-CFLAGS="${CFLAGS//-ffast-math/}"      &&
-CXXFLAGS="${CXXFLAGS//-ffast-math/}"  &&
-
-#
-# Forcing SSE for mfpmath causes Thunderbird to segfault on start
-#
-CFLAGS="${CFLAGS//-mfpmath=sse/}"      &&
-CXXFLAGS="${CXXFLAGS//-mfpmath=sse/}"  &&
-
-if  echo $LDFLAGS | grep  -q  '\-s'; then
-  OPTS="$OPTS  --enable-strip"
-fi  &&
-
-LDFLAGS="${LDFLAGS/-Wl,--as-needed/}" &&
-
-if [[ $THUNDERBIRD_OFFICIAL == y ]]; then
-  OPTS="$OPTS --enable-official-branding"
-fi
+CFLAGS="${CFLAGS//-Os/-O2}"      &&
+CXXFLAGS="${CXXFLAGS//-Os/-O2}"  &&
+CFLAGS="${CFLAGS//-O3/-O2}"      &&
+CXXFLAGS="${CXXFLAGS//-O3/-O2}"  &&
 
 #
 # Avoid buggy GCC 4.6 AVX code generation, which breaks libxul
@@ -44,12 +24,10 @@ if [[ $gccmajor == "4" ]] && [[ $gccminor -ge "6" ]]; then
   CXXFLAGS="${CXXFLAGS//-mavx} -mno-avx"
 fi
 
+for option in $OPTS; do
+  echo "ac_add_options $option" >> .mozconfig
+done &&
 
-./configure --prefix=${INSTALL_ROOT}/usr     \
-            --with-user-appdir=.thunderbird  \
-            --enable-application=mail        \
-            --disable-system-cairo           \
-            --disable-crashreporter          \
-              $OPTS                          &&
-
-make
+make_single  &&
+make -f client.mk build &&
+make_normal
diff --git a/mail/thunderbird/CONFIGURE b/mail/thunderbird/CONFIGURE
index 34f2348818..c765ac5591 100755
--- a/mail/thunderbird/CONFIGURE
+++ b/mail/thunderbird/CONFIGURE
@@ -1,2 +1,6 @@
 config_query THUNDERBIRD_OFFICIAL "Enable official branding? If enabled, you may \
-be restricted in distributing these binaries IAW mozilla policies" n
+be restricted in distributing these binaries IAW mozilla policies" n  &&
+
+config_query  THUNDERBIRD_STRIP            \
+              'Remove debugging symbols?'  \
+              n
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index d3caa1dfb0..166f670480 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,11 +1,13 @@
            SPELL=thunderbird
-         VERSION=17.0.8
-      PATCHLEVEL=1
+         VERSION=24.0
           SOURCE=$SPELL-$VERSION.source.tar.bz2
-     SOURCE_HASH=sha512:d234c11f2ba88db40c6b875dfb425658d0d5b6fce163f19f0ba128c0802f00e3fde87c952a9a897e1328c747d6e7ec821b037d468ea2a269658bd449d78e0bba
+         SOURCE2=$SOURCE.asc
+      SOURCE_GPG="mozilla.gpg:${SOURCE2}:UPSTREAM_HASH"
+  SOURCE2_IGNORE=signature
+   SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE
+  SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
            TMPFS=off
-   SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE
   SECURITY_PATCH=38
         WEB_SITE=http://www.mozilla.org/products/thunderbird/
          ENTERED=20041028
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index a1417574ea..0349af7fed 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,7 @@
+2013-09-19 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 24.0
+	* mozconfig,PRE_BUILD,BUILD,INSTALL: Sync with firefox's setup, much better
+
 2013-08-24 Remko van der Vossen <wich@sourcemage.org>
 	* DETAILS, DEPENDS: version 17.0.8
 
diff --git a/mail/thunderbird/INSTALL b/mail/thunderbird/INSTALL
index 03e706961f..48c0c90e58 100755
--- a/mail/thunderbird/INSTALL
+++ b/mail/thunderbird/INSTALL
@@ -1,13 +1,7 @@
-THUNDERBIRD_HOME=${INSTALL_ROOT}/usr/lib/thunderbird &&
-mkdir -p $THUNDERBIRD_HOME &&
-ln -s $THUNDERBIRD_HOME $THUNDERBIRD_HOME-$VERSION &&
+cd  "${SOURCE_DIRECTORY}"/comm-*  &&
+THUNDERBIRD_HOME="${INSTALL_ROOT}"/usr/lib/thunderbird  &&
 
-rm -f $THUNDERBIRD_HOME/chrome/app-chrome.manifest &&
-make install &&
-
-cd ${INSTALL_ROOT}/usr/lib/thunderbird &&
-export LD_LIBRARY_PATH="$THUNDERBIRD_HOME" &&
-export MOZILLA_FIVE_HOME="$THUNDERBIRD_HOME" &&
+make -f client.mk install &&
 
 #
 # Create symlink from NSS Root CA store, if it exists.  NSS requires this
@@ -17,15 +11,9 @@ export MOZILLA_FIVE_HOME="$THUNDERBIRD_HOME" &&
 # Only create if $THUNDERBIRD_HOME/libnssckbi.so does not exist or is already a
 # symlink.
 #
-if  test  -f   $INSTALL_ROOT/usr/lib/libnssckbi.so;  then
-  if  !  test  -f   $THUNDERBIRD_HOME/libnssckbi.so  ||
-         test  -h   $THUNDERBIRD_HOME/libnssckbi.so; then
-    ln -sf $TRACK_ROOT/usr/lib/libnssckbi.so  $THUNDERBIRD_HOME/libnssckbi.so
-  fi                                                                  
-fi  &&
-
-#
-# Bug #13846 (remove broken symlinks)
-#
-rm -f  $INSTALL_ROOT/usr/lib/thunderbird/install/mozilla-installer      \
-       $INSTALL_ROOT/usr/lib/thunderbird/install/mozilla-installer-bin
+if  test  -f   "${INSTALL_ROOT}"/usr/lib/libnssckbi.so;  then
+  if  !  test  -f   "${THUNDERBIRD_HOME}"/libnssckbi.so  ||
+         test  -h   "${THUNDERBIRD_HOME}"/libnssckbi.so; then
+    ln -sf "${TRACK_ROOT}"/usr/lib/libnssckbi.so  "${THUNDERBIRD_HOME}"/libnssckbi.so
+  fi
+fi
diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index 4a4232a4c0..a01ab0f745 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -1,4 +1,14 @@
-mk_source_dir  $SOURCE_DIRECTORY  &&
-cd             $SOURCE_DIRECTORY  &&
-unpack_file    ''                 &&
-cd             comm-*
+mk_source_dir  "${SOURCE_DIRECTORY}"  &&
+cd  "${SOURCE_DIRECTORY}"             &&
+unpack_file  ''                       &&
+cd  comm-*                            &&
+
+cp -v "${SPELL_DIRECTORY}"/mozconfig .mozconfig &&
+
+if [[ "$THUNDERBIRD_STRIP" == "y" ]]; then
+   sed -i '27iac_add_options --enable-strip' .mozconfig
+fi &&
+
+if [[ $THUNDERBIRD_OFFICIAL == y ]]; then
+  sed -i '27iac_add_options --enable-official-branding' .mozconfig || return 1
+fi
diff --git a/mail/thunderbird/mozconfig b/mail/thunderbird/mozconfig
new file mode 100644
index 0000000000..d31ac43fca
--- /dev/null
+++ b/mail/thunderbird/mozconfig
@@ -0,0 +1,25 @@
+#
+# See http://www.mozilla.org/build/ for build instructions.
+#
+
+# Options for client.mk.
+mk_add_options MOZ_CO_PROJECT=mail
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/thunderbird-build
+#mk_add_options AUTOCONF=autoconf2.13
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --enable-application=mail
+ac_add_options --with-pthreads
+ac_add_options --disable-system-png
+ac_add_options --disable-system-cairo
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-pango
+ac_add_options --enable-svg
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-crashreporter
+ac_add_options --disable-tests
+ac_add_options --prefix=$INSTALL_ROOT/usr
+ac_add_options --mandir=$INSTALL_ROOT/usr
+ac_add_options --enable-optimize="$CFLAGS -fno-fast-math"
+ac_add_options --with-default-mozilla-five-home=/usr/lib/thunderbird