From 0195c18f460e235cf4d140f7a256d9a3477f1d2d Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Mon, 17 Sep 2018 14:24:55 -0400
Subject: [PATCH] libraries/libpst: Updated for version 0.6.72.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 libraries/libpst/README            |  2 ++
 libraries/libpst/libpst.SlackBuild | 23 +++++++++++++++--------
 libraries/libpst/libpst.info       |  6 +++---
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/libraries/libpst/README b/libraries/libpst/README
index cc8e808dea..07f340d27a 100644
--- a/libraries/libpst/README
+++ b/libraries/libpst/README
@@ -1,3 +1,5 @@
+libpst (MS Outlook Personal Folders converter)
+
 The libpst project includes a library and a set of utilities to decode
 and convert MS Outlook PST files.
 
diff --git a/libraries/libpst/libpst.SlackBuild b/libraries/libpst/libpst.SlackBuild
index 25a408885a..1fa5bfa36c 100644
--- a/libraries/libpst/libpst.SlackBuild
+++ b/libraries/libpst/libpst.SlackBuild
@@ -23,6 +23,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20180917 bkw: upgrade to 0.6.72
+
 # 20170122 bkw:
 # - upgrade to 0.6.69
 
@@ -41,7 +43,7 @@
 # - make install-strip instead of slow find stuff
 
 PRGNAM=libpst
-VERSION=${VERSION:-0.6.69}
+VERSION=${VERSION:-0.6.72}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,11 +83,17 @@ 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 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20180917 bkw: libpst supposedly supports python3 now, but python3
+# builds fail. Not tried to diagnose it, just reverting to python2,
+# like previous versions of libpst used.
+# ./configure --help claims that I can set PYTHON_VERSION in the environment
+# and it'll use that, but it doesn't work. So I have to use this abomination:
+sed -i 's,\<python3\..\>,,g' m4/ax_python.m4
+
+autoreconf -if
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -106,8 +114,7 @@ make install-strip DESTDIR=$PKG \
   htmldir=/usr/doc/$PRGNAM-$VERSION \
   htmldeveldir=/usr/doc/$PRGNAM-$VERSION/devel
 
-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
+gzip -9 $PKG/usr/man/man?/*.?
 
 # Package documentation has aready been copied
 # into $PKG/usr/doc/$PRGNAM-$VERSION by "make install"
diff --git a/libraries/libpst/libpst.info b/libraries/libpst/libpst.info
index 007a85e478..dbb08e1bf7 100644
--- a/libraries/libpst/libpst.info
+++ b/libraries/libpst/libpst.info
@@ -1,8 +1,8 @@
 PRGNAM="libpst"
-VERSION="0.6.69"
+VERSION="0.6.72"
 HOMEPAGE="http://www.five-ten-sg.com/libpst/"
-DOWNLOAD="http://www.five-ten-sg.com/libpst/packages/libpst-0.6.69.tar.gz"
-MD5SUM="710724f05dbea0ccb72137af65c8f225"
+DOWNLOAD="http://www.five-ten-sg.com/libpst/packages/libpst-0.6.72.tar.gz"
+MD5SUM="0085c9769a163e7ac59dba6518e0cc1e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""