4 files changed, 24 insertions, 22 deletions
diff --git a/network/claws-mail/README b/network/claws-mail/README
index 11cd434dae..bf1c742dd8 100644
--- a/network/claws-mail/README
+++ b/network/claws-mail/README
@@ -18,5 +18,6 @@ Lots of extra functionality, like an RSS aggregator, calendar, or laptop LED
 handling, are provided by extra plugins.
 
 * libetpan is required for IMAP support, it can be found at slackbuilds.org
+* enchant is required for spellchecking support, it can be found at 
+  slackbuilds.org
 * gpgme is optional for GnuPG support (and is included with slackware)
-
diff --git a/network/claws-mail/claws-mail.SlackBuild b/network/claws-mail/claws-mail.SlackBuild
index 8ee64f1780..a022e1437e 100644
--- a/network/claws-mail/claws-mail.SlackBuild
+++ b/network/claws-mail/claws-mail.SlackBuild
@@ -4,10 +4,11 @@
 # Written by Erik Hanson  erik@slackbuilds.org
 
 PRGNAM=claws-mail
-VERSION=3.3.1
+VERSION=3.6.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -19,12 +20,14 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -eu
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -35,17 +38,21 @@ CFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --enable-static=no \
-  || exit 1
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
 
 gzip -9 $PKG/usr/man/man?/*.?
-mkdir -p $PKG/usr/doc $PKG/install
+
+mkdir -p $PKG/usr/doc
 mv $PKG/usr/share/doc/claws-mail $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share/doc
-cp -a ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
diff --git a/network/claws-mail/claws-mail.info b/network/claws-mail/claws-mail.info
index 3c5a4d1d2c..f4152d9fdd 100644
--- a/network/claws-mail/claws-mail.info
+++ b/network/claws-mail/claws-mail.info
@@ -1,8 +1,8 @@
 PRGNAM="claws-mail"
-VERSION="3.3.1"
+VERSION="3.6.1"
 HOMEPAGE="http://www.claws-mail.org/"
-DOWNLOAD="http://downloads.sourceforge.net/sylpheed-claws/claws-mail-3.3.1.tar.bz2"
-MD5SUM="f4bfa174cf1e6bda86ec5ff276be9d9a"
+DOWNLOAD="http://downloads.sourceforge.net/sylpheed-claws/claws-mail-3.6.1.tar.bz2"
+MD5SUM="761b8ae2d574588460a0fb1ea4931ccb"
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="Michiel"
+APPROVED="rworkman"
diff --git a/network/claws-mail/doinst.sh b/network/claws-mail/doinst.sh
index a72ea3a01c..3857649f50 100644
--- a/network/claws-mail/doinst.sh
+++ b/network/claws-mail/doinst.sh
@@ -1,9 +1,3 @@
-
-if [ -x usr/bin/update-desktop-database ]; then
-	usr/bin/update-desktop-database &> /dev/null
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications &> /dev/null
 fi
-
-if [ -x usr/bin/gtk-update-icon-cache ]; then
-	gtk-update-icon-cache -f -t usr/share/icons/hicolor &> /dev/null
-fi
-