[arch-commits] Commit in thunderbird/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Sunday, November 9, 2008 @ 12:45:29
  Author: jgc
Revision: 18842

Merged revisions 18841 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/thunderbird/trunk

........
  r18841 | jgc | 2008-11-09 18:44:54 +0100 (Sun, 09 Nov 2008) | 1 line
  
  upgpkg: thunderbird 2.0.0.17-1
........

Modified:
  thunderbird/repos/extra-i686/	(properties)
  thunderbird/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)


Property changes on: thunderbird/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /thunderbird/trunk:1-6671
   + /thunderbird/trunk:1-18841

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-09 17:44:54 UTC (rev 18841)
+++ extra-i686/PKGBUILD	2008-11-09 17:45:29 UTC (rev 18842)
@@ -3,7 +3,7 @@
 # Contributor: Dale Blount <dale at archlinux.org>
 # Contributor: Anders Bostrom <anders.bostrom at home.se>
 pkgname=thunderbird
-pkgver=2.0.0.16
+pkgver=2.0.0.17
 pkgrel=1
 pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64')
@@ -20,17 +20,17 @@
         thunderbird.desktop
         thunderbird-1.5-lang.patch
 	firefox-2.0-link-layout.patch)
-md5sums=('591c9f80a2f6772c5acf8fb6128f40bd'
+md5sums=('3adb8fabdc26a5859c55b9ce241edb3f'
          '17e3015259da53f40bc445b27078f693'
          'ea4e3c3dee98e3891bef16409551eb6e'
          'bc6f10a06407faee6494acad546aabf9'
          'b933c00957ea793fe940f4d46a85e10e')
 
 build() {
-  cd ${startdir}/src/mozilla
-  patch -Np1 -i ${startdir}/src/thunderbird-1.5-lang.patch || return 1
-  patch -Np1 -i ${startdir}/src/firefox-2.0-link-layout.patch || return 1
-  cp ${startdir}/src/mozconfig .mozconfig
+  cd "${srcdir}/mozilla"
+  patch -Np1 -i "${srcdir}/thunderbird-1.5-lang.patch" || return 1
+  patch -Np1 -i "${srcdir}/firefox-2.0-link-layout.patch" || return 1
+  cp "${srcdir}/mozconfig" .mozconfig
 
   if [ "${CARCH}" = "x86_64" ]; then
     echo "ac_cv_visibility_pragma=no" >> .mozconfig
@@ -41,29 +41,29 @@
   unset CFLAGS
 
   make -f client.mk build || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 
-  cd ${startdir}/pkg/usr/lib/thunderbird-${pkgver}
+  cd "${pkgdir}/usr/lib/thunderbird-${pkgver}"
   export MOZ_DISABLE_GNOME=1
-  export MOZTMP=`mktemp -d -p ${startdir}/src`
+  export MOZTMP=`mktemp -d -p ${srcdir}`
   LD_PRELOAD="" LD_LIBRARY_PATH="`pwd`" HOME="${MOZTMP}" ./thunderbird-bin -register || return 1
   rm -rf "${MOZTMP}"
 
-  ln -sf thunderbird-${pkgver} ${pkgdir}/usr/lib/thunderbird || return 1
-  ln -sf thunderbird-${pkgver} ${pkgdir}/usr/include/thunderbird || return 1
-  ln -sf thunderbird-${pkgver} ${pkgdir}/usr/share/idl/thunderbird || return 1
+  ln -sf thunderbird-${pkgver} "${pkgdir}/usr/lib/thunderbird" || return 1
+  ln -sf thunderbird-${pkgver} "${pkgdir}/usr/include/thunderbird" || return 1
+  ln -sf thunderbird-${pkgver} "${pkgdir}/usr/share/idl/thunderbird" || return 1
   
-  rm -rf ${startdir}/pkg/usr/bin/defaults
+  rm -rf "${pkgdir}/usr/bin/defaults"
 
-  install -m755 -d ${startdir}/pkg/usr/share/applications
-  install -m755 -d ${startdir}/pkg/usr/share/pixmaps
-  convert ${startdir}/src/mozilla/mail/app/default.xpm \
-      ${startdir}/pkg/usr/share/pixmaps/thunderbird.png || return 1
-  install -m644 ${startdir}/src/thunderbird.desktop \
-      ${startdir}/pkg/usr/share/applications/ || return 1
+  install -m755 -d "${pkgdir}/usr/share/applications"
+  install -m755 -d "${pkgdir}/usr/share/pixmaps"
+  convert "${srcdir}/mozilla/mail/app/default.xpm" \
+      "${pkgdir}/usr/share/pixmaps/thunderbird.png" || return 1
+  install -m644 "${srcdir}/thunderbird.desktop" \
+      "${pkgdir}/usr/share/applications/" || return 1
 
-  install -m644 ${startdir}/src/mozilla/mail/app/default.xpm \
-      ${startdir}/pkg/usr/lib/thunderbird/icons/ || return 1
+  install -m644 "${srcdir}/mozilla/mail/app/default.xpm" \
+      "${pkgdir}/usr/lib/thunderbird/icons/" || return 1
 
   rm -f ${pkgdir}/usr/lib/pkgconfig/thunderbird-ns{s,pr}.pc
   sed -e "s/thunderbird-${pkgver}/thunderbird/g" \