From c08ea6b407d2d761370a0128aef527757d42cdd6 Mon Sep 17 00:00:00 2001
From: Mario Preksavec <mario@slackware.hr>
Date: Sun, 21 Feb 2016 09:35:36 +0700
Subject: network/davmail: Updated for version 4.7.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/davmail/davmail.SlackBuild | 28 +++++++++++++++++++---------
 network/davmail/davmail.info       | 10 +++++-----
 2 files changed, 24 insertions(+), 14 deletions(-)

(limited to 'network')

diff --git a/network/davmail/davmail.SlackBuild b/network/davmail/davmail.SlackBuild
index 44a2109bf6..fdbbcd2627 100644
--- a/network/davmail/davmail.SlackBuild
+++ b/network/davmail/davmail.SlackBuild
@@ -21,11 +21,13 @@
 #  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 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+# Modified by Mario Preksavec <mario@slackware.hr>
 
 PRGNAM=davmail
-VERSION=${VERSION:-4.6.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.7.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -33,22 +35,30 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=x86 ;;
-    *)       export ARCH=$MARCH ;;
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+       *) ARCH=$( uname -m ) ;;
   esac
 fi
 
+if [ "$ARCH" = "i486" ]; then
+  SRCARCH="x86"
+elif [ "$ARCH" = "i686" ]; then
+  SRCARCH="x86"
+elif [ "$ARCH" = "x86_64" ]; then
+  SRCARCH="$( uname -m )"
+fi
+
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-linux-$ARCH-$VERSION*
-tar xvf $CWD/$PRGNAM-linux-$ARCH-$VERSION*.tgz
-cd $PRGNAM-linux-$ARCH-$VERSION*
+rm -rf $PRGNAM-linux-$SRCARCH-$VERSION*
+tar xvf $CWD/$PRGNAM-linux-$SRCARCH-$VERSION*.tgz
+cd $PRGNAM-linux-$SRCARCH-$VERSION*
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/network/davmail/davmail.info b/network/davmail/davmail.info
index 3e47b5f9d2..574a42b84b 100644
--- a/network/davmail/davmail.info
+++ b/network/davmail/davmail.info
@@ -1,10 +1,10 @@
 PRGNAM="davmail"
-VERSION="4.6.2"
+VERSION="4.7.1"
 HOMEPAGE="http://davmail.sourceforge.net"
-DOWNLOAD="http://sourceforge.net/projects/davmail/files/davmail/4.6.2/davmail-linux-x86-4.6.2-2377.tgz"
-MD5SUM="fc7f8b95b6d1f3206194cadc706d913d"
-DOWNLOAD_x86_64="http://sourceforge.net/projects/davmail/files/davmail/4.6.2/davmail-linux-x86_64-4.6.2-2377.tgz"
-MD5SUM_x86_64="86fcfa8d651b4bb2a3512db839c75900"
+DOWNLOAD="http://sourceforge.net/projects/davmail/files/davmail/4.7.1/davmail-linux-x86-4.7.1-2416.tgz"
+MD5SUM="95ccac520040732e078556b238aa37b9"
+DOWNLOAD_x86_64="http://sourceforge.net/projects/davmail/files/davmail/4.7.1/davmail-linux-x86_64-4.7.1-2416.tgz"
+MD5SUM_x86_64="aa4c2d3437046dbce60cdc92839fdb1b"
 REQUIRES="jdk"
 MAINTAINER="Giuseppe Di Terlizzi"
 EMAIL="giuseppe.diterlizzi@gmail.com"
-- 
cgit v1.2.3