From ce868efa813adc2f46d30be258fef118d2b15acd Mon Sep 17 00:00:00 2001
From: Larry Hajali
Date: Tue, 6 Nov 2018 17:41:55 -0800
Subject: libraries/libnfs: Updated for version 3.0.0

Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>
---
 libraries/libnfs/libnfs.SlackBuild | 36 +++++++++++++++++++++++++++++++-----
 libraries/libnfs/libnfs.info       |  6 +++---
 2 files changed, 34 insertions(+), 8 deletions(-)

(limited to 'libraries/libnfs')

diff --git a/libraries/libnfs/libnfs.SlackBuild b/libraries/libnfs/libnfs.SlackBuild
index 09b63e8f59..b326042ec5 100644
--- a/libraries/libnfs/libnfs.SlackBuild
+++ b/libraries/libnfs/libnfs.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libnfs
 
-# Copyright 2012-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2012-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libnfs
-VERSION=${VERSION:-2.0.0}
+VERSION=${VERSION:-3.0.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
+rm -rf $PRGNAM-$PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,6 +69,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+autoreconf -vif
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -88,13 +90,37 @@ make clean
 make
 make install DESTDIR=$PKG
 
+# Cmake was added in version 3.0.0.  Going to stick with
+# autoconf for now as it is a little more mature.
+#sed -i "s|lib)|lib${LIBDIRSUFFIX})|" lib/CMakeLists.txt
+
+#mkdir build
+#cd build
+#  cmake -G "Unix Makefiles" \
+#    -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
+#    -DINSTALL_LIB_DIR:PATH="/usr/lib${LIBDIRSUFFIX}" \
+#    -DINSTALL_MAN_DIR:PATH="/usr/man" \
+#    -DINSTALL_PKGCONFIG_DIR:PATH="/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
+#    -DINSTALL_CMAKE_DIR:PATH="/usr/lib${LIBDIRSUFFIX}/cmake" \
+#    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+#    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+#    -DENABLE_DOCUMENTATION:BOOL=ON \
+#    -DENABLE_UTILS:BOOL=ON \
+#    -DENABLE_EXAMPLES:BOOL=ON \
+#    -DCMAKE_BUILD_TYPE=Release ..
+
+#  make VERBOSE=1
+#  make install DESTDIR=$PKG
+#cd -
+
+
 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 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING LICENCE* README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG COPYING LICENCE* README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/libnfs/libnfs.info b/libraries/libnfs/libnfs.info
index 1cff108725..3458870eff 100644
--- a/libraries/libnfs/libnfs.info
+++ b/libraries/libnfs/libnfs.info
@@ -1,8 +1,8 @@
 PRGNAM="libnfs"
-VERSION="2.0.0"
+VERSION="3.0.0"
 HOMEPAGE="https://github.com/sahlberg/libnfs"
-DOWNLOAD="https://sites.google.com/site/libnfstarballs/li/libnfs-2.0.0.tar.gz"
-MD5SUM="87d913e26b9c4b7fe0b0460fa4e4cd99"
+DOWNLOAD="https://github.com/sahlberg/libnfs/archive/libnfs-3.0.0/libnfs-3.0.0.tar.gz"
+MD5SUM="c63ccf1a163392d4b249932bf2400c9d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3