office/mairix: Updated for version 0.24.

Signed-off-by: David Spencer <baildon.research@googlemail.com>

3 files changed, 37 insertions, 14 deletions

diff --git a/office/mairix/README b/office/mairix/README
index bcff965e32..042d7984f2 100644
--- a/office/mairix/README
+++ b/office/mairix/README
@@ -1,5 +1,9 @@
-mairix is a program for indexing and searching email messages  stored in
-maildir, MH or mbox folders. Some features are fast and incremental
-indexing, the search mode populates a "virtual" maildir (or MH) folder with
-symlinks which point to the real messages, the search mode is very fast,
-indexing and searching works on the basis of words.
+mairix is a program for indexing and searching email messages stored
+in maildir, MH or mbox folders. Some features are fast and incremental
+indexing. The search mode populates a "virtual" maildir (or MH) folder
+with symlinks which point to the real messages. The search mode is very
+fast, indexing and searching works on the basis of words.
+
+The program is a very useful complement to mail programs like mutt
+(http://www.mutt.org/, which supports Maildir, MH and mbox folders) and
+Sylpheed (which supports MH folders).
diff --git a/office/mairix/mairix.SlackBuild b/office/mairix/mairix.SlackBuild
index a70e9e270d..3707c91369 100644
--- a/office/mairix/mairix.SlackBuild
+++ b/office/mairix/mairix.SlackBuild
@@ -2,17 +2,36 @@
 
 # Slackware build script for mairix
 
-# Written by Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2015-2018  Jostein Berntsen <jbernts@broadpark.no>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Written by Jostein Berntsen <jbernts@broadpark.no>
 
 PRGNAM=mairix
-VERSION=${VERSION:-0.23}
+VERSION=${VERSION:-0.24}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -23,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -43,7 +62,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/office/mairix/mairix.info b/office/mairix/mairix.info
index decf961fb3..bf502dbd8e 100644
--- a/office/mairix/mairix.info
+++ b/office/mairix/mairix.info
@@ -1,8 +1,8 @@
 PRGNAM="mairix"
-VERSION="0.23"
+VERSION="0.24"
 HOMEPAGE="http://www.rpcurnow.force9.co.uk/mairix/"
-DOWNLOAD="https://github.com/rc0/mairix/archive/0.23.tar.gz"
-MD5SUM="cdac0ec6da648d21c4264bb09b78dbb9"
+DOWNLOAD="https://github.com/rc0/mairix/archive/0.24/mairix-0.24.tar.gz"
+MD5SUM="fe01de41da04dccf5209adc5e119e9fb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""