From 76fa97b9d1090deb8410d33dbf28978ae3217a33 Mon Sep 17 00:00:00 2001
From: larryhaja <larryhaja@gmail.com>
Date: Wed, 13 Nov 2013 18:43:50 -0800
Subject: libraries/libnfs: Upgraded to version 1.8.0

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 libraries/libnfs/libnfs.SlackBuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'libraries/libnfs/libnfs.SlackBuild')

diff --git a/libraries/libnfs/libnfs.SlackBuild b/libraries/libnfs/libnfs.SlackBuild
index 0968f6984e..4148709094 100644
--- a/libraries/libnfs/libnfs.SlackBuild
+++ b/libraries/libnfs/libnfs.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libnfs
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -69,9 +69,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix pkg-config file.
-sed -i 's|@LIBNFS_PC_REQ_PRIVATE@||' $PRGNAM.pc.in
-
 ./bootstrap
 
 CFLAGS="$SLKCFLAGS" \
@@ -89,6 +86,9 @@ make install DESTDIR=$PKG
 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
 
+# Fix pkg-config file.
+sed -i 's|@LIBNFS_PC_REQ_PRIVATE@||' $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/$PRGNAM.pc
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-- 
cgit v1.2.3