From fbc5eebe5fe64efe751e1bf9af6d326229e7279b Mon Sep 17 00:00:00 2001
From: Philip Lacroix <slackph at posteo dot de>
Date: Wed, 8 Feb 2017 22:40:54 +0000
Subject: libraries/ftplib: Updated for version 4.0.1.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 libraries/ftplib/README            |  4 ++--
 libraries/ftplib/ftplib.SlackBuild | 22 ++++++++++++----------
 libraries/ftplib/ftplib.info       |  6 +++---
 libraries/ftplib/slack-desc        |  4 ++--
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/libraries/ftplib/README b/libraries/ftplib/README
index 1beccd25ec..70ba5fbf77 100644
--- a/libraries/ftplib/README
+++ b/libraries/ftplib/README
@@ -1,3 +1,3 @@
 ftplib is a set of routines that implement the FTP protocol. They allow
-applications to create and access remote files through function calls instead
-of needing to fork and exec an interactive ftp client program.
+applications to create and access remote files through function calls, instead
+of forking and executing an interactive ftp client program.
diff --git a/libraries/ftplib/ftplib.SlackBuild b/libraries/ftplib/ftplib.SlackBuild
index 56648754db..ff4ca677c2 100644
--- a/libraries/ftplib/ftplib.SlackBuild
+++ b/libraries/ftplib/ftplib.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ftplib
 
-# Copyright 2015 Philip Lacroix <slackph at posteo dot de>
+# Copyright 2015-2017 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,16 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ftplib
-VERSION=${VERSION:-4.0}
+VERSION=${VERSION:-4.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Replace third level revision separator for the source version.
+SRCVER=$(echo $VERSION | sed "s~\.\([0-9]*\)\.\([0-9]*\)$~\.\1-\2~")
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +43,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"
@@ -59,10 +62,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz
+rm -rf $PRGNAM-$SRCVER
+tar xvzf $CWD/$PRGNAM-$SRCVER.tar.gz
 
-cd $PRGNAM-$VERSION
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -74,8 +77,7 @@ CFLAGS="$SLKCFLAGS"
 
 cd src
 make
-# We'll edit the destination paths manually (since no config script or
-# DESTDIR variable are available).
+# Let's edit the destination paths (no config script or DESTDIR available).
 sed -i -e "s~/usr/local/bin~"$PKG"/usr/bin~" Makefile
 sed -i -e "s~/usr/local/lib~"$PKG"/usr/lib"${LIBDIRSUFFIX}"~" Makefile
 sed -i -e "s~/usr/local/include~"$PKG"/usr/include~" Makefile
diff --git a/libraries/ftplib/ftplib.info b/libraries/ftplib/ftplib.info
index 7b81583f07..29d3fe45fe 100644
--- a/libraries/ftplib/ftplib.info
+++ b/libraries/ftplib/ftplib.info
@@ -1,8 +1,8 @@
 PRGNAM="ftplib"
-VERSION="4.0"
+VERSION="4.0.1"
 HOMEPAGE="http://nbpfaus.net/~pfau/ftplib/"
-DOWNLOAD="http://nbpfaus.net/~pfau/ftplib/ftplib-4.0.tar.gz"
-MD5SUM="846c30323ee64850559cecb311118460"
+DOWNLOAD="http://nbpfaus.net/~pfau/ftplib/ftplib-4.0-1.tar.gz"
+MD5SUM="2bb35d21e1647c54032f63f59dfc24e7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/ftplib/slack-desc b/libraries/ftplib/slack-desc
index 7125665fbe..6fb713f555 100644
--- a/libraries/ftplib/slack-desc
+++ b/libraries/ftplib/slack-desc
@@ -6,11 +6,11 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-ftplib: ftplib (routines that implement the FTP protocol)
+ftplib: ftplib (routines implementing the FTP protocol)
 ftplib:
 ftplib: ftplib is a set of routines that implement the FTP protocol. They
 ftplib: allow applications to create and access remote files through function
-ftplib: calls instead of needing to fork and exec an interactive ftp client
+ftplib: calls, instead of forking and executing an interactive ftp client
 ftplib: program.
 ftplib:
 ftplib: Homepage: http://nbpfaus.net/~pfau/ftplib/
-- 
cgit v1.2.3