updating claws-mail-libre and adding claws-mail-libre-nonprism to nonprism repo

1 files changed, 13 insertions, 16 deletions

diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD
index fdbe6ed19..5ee1fec05 100644
--- a/libre/claws-mail-libre/PKGBUILD
+++ b/libre/claws-mail-libre/PKGBUILD
@@ -1,23 +1,21 @@
-# $Id: PKGBUILD 192327 2013-08-10 09:48:30Z andyrtr $
+# $Id$
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-pkgname=claws-mail-libre
-_pkgflag=libre
-_pkgname=${pkgname%-$_pkgflag}
-pkgver=3.9.2
+_pkgname=claws-mail
+pkgname=$_pkgname-libre
+pkgver=3.9.1
 pkgrel=3
 pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://www.$_pkgname.org"
 depends=('gtk2' 'gnutls' 'startup-notification' 'enchant'
-         'gpgme' 'libetpan>=1.1-4' 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind'
+         'gpgme' 'libetpan>=1.1' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' 
              # dependencies for plugins
              'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') 
              #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases
-[ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
 optdepends=('python2:           needed for some tools and python plugin'
             'perl:              needed for some tools and perl plugin'
             'spamassassin:      adds support for spamfiltering'
@@ -40,7 +38,7 @@ provides=("$_pkgname=$pkgver" 'claws')
 options=(!libtool)
 install=$_pkgname.install
 source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc})
-md5sums=('90de2a265e65fbd9dffdbf428bb0ee28'
+md5sums=('8adc734912ff1b83545cb12850100473'
          'SKIP')
 
 build() {
@@ -51,7 +49,7 @@ build() {
   sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
   sed -i 's:python -c:python2 -c:g' configure
 
-  ./configure --prefix=/usr --disable-static \
+  setarch $CARCH ./configure --prefix=/usr --disable-static \
     --enable-enchant \
     --enable-gnutls \
     --enable-ldap \
@@ -59,21 +57,20 @@ build() {
     --enable-pgpmime-plugin \
     --enable-spamassassin-plugin \
     --enable-bogofilter-plugin \
-    --enable-jpilot \
+    --disable-jpilot \
     #--help
-  make
+  setarch $CARCH make
 }
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  setarch $CARCH make DESTDIR=$pkgdir install
 
   # build and install extra tools
   cd tools
-  make
+  setarch $CARCH make
    # all executables and .conf files ; only top directory
   find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
-      install -D -m755 $i \
-        $pkgdir/usr/lib/$_pkgname/tools/$i
+    install -D -m755 $i $pkgdir/usr/lib/$_pkgname/tools/$i
   done
 }