network/msmtp: Updated for version 1.4.25.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

3 files changed, 30 insertions, 36 deletions

diff --git a/network/msmtp/README b/network/msmtp/README
index 9ba41b184c..1dfd63cbad 100644
--- a/network/msmtp/README
+++ b/network/msmtp/README
@@ -6,3 +6,5 @@ example, at a free mail provider) which does the delivery.
 To use this program with your mail user agent (MUA), create a configuration
 file with your mail account(s) and tell your MUA to call msmtp instead of
 /usr/sbin/sendmail.
+
+libgsasl and gnome-keyring are optional dependencies.
diff --git a/network/msmtp/msmtp.SlackBuild b/network/msmtp/msmtp.SlackBuild
index 9c1a703893..d2b99d5972 100644
--- a/network/msmtp/msmtp.SlackBuild
+++ b/network/msmtp/msmtp.SlackBuild
@@ -1,39 +1,33 @@
 #!/bin/sh
-
 # Slackware build script for msmtp
 
-# Copyright 2007 Martin Lefebvre <dadexter@sekurity.com>
-# Copyright 2009-2010 Grigorios Bouzakis <grbzks@xsmail.com>
+# Copyright 2009-2011 Grigorios Bouzakis <grbzks@imap.cc>
 # 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.
+# Permission to use, copy, modify, and distribute this software for any purpose
+# with or without fee is hereby granted, provided that the above copyright
+# notice and this permission notice appear in all copies.
 #
-# 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.
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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
+# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS 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.
 
 PRGNAM=msmtp
-VERSION=${VERSION:-1.4.21}
+VERSION=${VERSION:-1.4.25}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -57,6 +51,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
+      doc/Mutt+msmtp.txt doc/msmtprc-system.example doc/msmtprc-user.example"
+
 set -e
 
 rm -rf $PKG
@@ -79,30 +76,25 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man \
   --infodir=/usr/info \
+  --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+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
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS doc/*.txt \
-  doc/msmtp.html doc/msmtprc-system.example doc/msmtprc-user.example \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/msmtp/msmtp.info b/network/msmtp/msmtp.info
index 86e591e9fd..745cfbad42 100644
--- a/network/msmtp/msmtp.info
+++ b/network/msmtp/msmtp.info
@@ -1,10 +1,10 @@
 PRGNAM="msmtp"
-VERSION="1.4.21"
+VERSION="1.4.25"
 HOMEPAGE="http://msmtp.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/msmtp/msmtp-1.4.21.tar.bz2"
-MD5SUM="9d764cd9036168f49bc9d6531a7f3dba"
+DOWNLOAD="http://downloads.sourceforge.net/msmtp/msmtp-1.4.25.tar.bz2"
+MD5SUM="2d9603a7b5c1ebd83ea289ac2aa3a634"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Grigorios Bouzakis"
-EMAIL="grbzks@xsmail.com"
-APPROVED="dsomero"
+EMAIL="grbzks@imap.cc"
+APPROVED="rworkman"