From 7ef9e9b007675f3a37f105918f42dced683136fa Mon Sep 17 00:00:00 2001
From: Corrado Franco <conraid (at) linux (dot) it>
Date: Sat, 7 Dec 2019 18:30:33 +0700
Subject: network/neomutt: Updated for version 20191129.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/neomutt/neomutt.SlackBuild | 28 ++++++++++++----------------
 network/neomutt/neomutt.info       |  6 +++---
 network/neomutt/slack-desc         | 10 +++++-----
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/network/neomutt/neomutt.SlackBuild b/network/neomutt/neomutt.SlackBuild
index 67f0738f64..fa3c7f21aa 100644
--- a/network/neomutt/neomutt.SlackBuild
+++ b/network/neomutt/neomutt.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for neomutt
 #
-# Copyright 2016-2018 Corrado Franco (http://conraid.net)
+# Copyright 2016-2019 Corrado Franco (https://conraid.net)
 # All rights reserved.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -25,22 +25,20 @@
 #
 # Latest version of this SlackBuild at https://github.com/conraid/SlackBuilds
 
-set -eu
-
 PRGNAM=neomutt
-VERSION=${VERSION:-20180716}
+VERSION=${VERSION:-20191129}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z ${ARCH:=""} ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i686 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+cd $(dirname $0) ; CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,13 +62,14 @@ fi
 [ ${USENOTMUCH:-no} == 'yes' ] && NOTMUCH="--notmuch" || NOTMUCH=""
 [ ${USEIDN2:-no} == 'yes' ] && IDN2="--idn2 --disable-idn" || IDN2=""
 
+set -eu
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$PRGNAM-$VERSION
-
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -101,15 +100,15 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make DESTDIR=$PKG install
 
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+install -Dm644 $CWD/files/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+install -Dm644 contrib/logo/$PRGNAM.svg $PKG/usr/share/pixmaps/$PRGNAM.svg
+
 # Rename conf files
 mv $PKG/etc/$PRGNAM/neomuttrc $PKG/etc/$PRGNAM/neomuttrc.new
 
@@ -120,8 +119,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-install -Dm644 $CWD/files/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-install -Dm644 contrib/logo/$PRGNAM.svg $PKG/usr/share/pixmaps/$PRGNAM.svg
-
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/neomutt/neomutt.info b/network/neomutt/neomutt.info
index af4825ea8a..4f0051f939 100644
--- a/network/neomutt/neomutt.info
+++ b/network/neomutt/neomutt.info
@@ -1,8 +1,8 @@
 PRGNAM="neomutt"
-VERSION="20180716"
+VERSION="20191129"
 HOMEPAGE="https://github.com/neomutt/neomutt"
-DOWNLOAD="https://github.com/neomutt/neomutt/archive/neomutt-20180716.tar.gz"
-MD5SUM="f628d1bcb31d36c926ed60f2105f742a"
+DOWNLOAD="https://github.com/neomutt/neomutt/archive/20191129/neomutt-20191129.tar.gz"
+MD5SUM="d00c0c79ad0048e9d9b38af92dbf6990"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/neomutt/slack-desc b/network/neomutt/slack-desc
index c22f38c326..2790ae9202 100644
--- a/network/neomutt/slack-desc
+++ b/network/neomutt/slack-desc
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
@@ -14,6 +14,6 @@ neomutt: advanced features like key bindings, keyboard macros, mail threading,
 neomutt: regular expression searches and a powerful pattern matching language
 neomutt: for selecting groups of messages.
 neomutt:
-neomutt:
+neomutt: homepage: https://github.com/neomutt/neomutt
 neomutt:
 neomutt:
-- 
cgit v1.2.3