4 files changed, 43 insertions, 26 deletions
diff --git a/libraries/libnfs/README b/libraries/libnfs/README
index 7a0ddec909..a6f93a1052 100644
--- a/libraries/libnfs/README
+++ b/libraries/libnfs/README
@@ -1,5 +1,6 @@
 LIBNFS is a client library for accessing NFS shares over a network.
 
-Note: when downloading with wget or through sbopkg, add the 
-'--content-disposition' flag to get proper tarball.  Otherwise, 
-it will just be downloaded as libcec-$VERSION. :/
+Optionally libnfs can use libtirpc.  To use libtirpc with libnfs
+install libtirpc and then run the slackbuild as with the following
+argument.
+  # LIBTIRPC=yes ./libnfs.SlackBuild
diff --git a/libraries/libnfs/libnfs.SlackBuild b/libraries/libnfs/libnfs.SlackBuild
index 50cd4078ff..24bab68ebf 100644
--- a/libraries/libnfs/libnfs.SlackBuild
+++ b/libraries/libnfs/libnfs.SlackBuild
@@ -2,10 +2,28 @@
 
 # Slackware build script for libnfs
 
-# Written by Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2012-2013 Larry Hajali <larryhaja[at]gmail[dot]com>
+# 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.
+#
+#  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.
 
 PRGNAM=libnfs
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-1.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -38,21 +56,12 @@ fi
 
 set -e
 
-# In $CWD
-if [ ! -r sahlberg-$PRGNAM-$PRGNAM-$VERSION-0-g47e5a2c.tar.gz ]; then
-  if [ -r $PRGNAM-$VERSION ]; then
-    mv $PRGNAM-$VERSION sahlberg-$PRGNAM-$PRGNAM-$VERSION-0-g47e5a2c.tar.gz
-  fi
-fi
-
-DIRNAME=$(tar -tf $CWD/sahlberg-$PRGNAM-$PRGNAM-$VERSION-0-g47e5a2c.tar.gz | head -1)
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $DIRNAME
-tar xvf $CWD/sahlberg-$PRGNAM-$PRGNAM-$VERSION-0-g47e5a2c.tar.gz
-cd $DIRNAME
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -60,14 +69,21 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-./bootstrap
+# Make libtirpc optional.  Default is not to build w/libtirpc.
+if [ "${LIBTIRPC:-no}" == "yes" ]; then
+  OPT_DEPS="--enable-tirpc"
+else
+  unset OPT_DEPS
+fi
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --disable-dependency-tracking \
   --enable-static=no \
+  $OPT_DEPS \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/libraries/libnfs/libnfs.info b/libraries/libnfs/libnfs.info
index 29d2be925b..77ba0ed41f 100644
--- a/libraries/libnfs/libnfs.info
+++ b/libraries/libnfs/libnfs.info
@@ -1,10 +1,10 @@
 PRGNAM="libnfs"
-VERSION="1.3.0"
+VERSION="1.5.0"
 HOMEPAGE="https://github.com/sahlberg/libnfs"
-DOWNLOAD="https://github.com/sahlberg/libnfs/tarball/libnfs-1.3.0"
-MD5SUM="a29034dfaf2b147bca274c5449abdd4c"
+DOWNLOAD="https://github.com/downloads/sahlberg/libnfs/libnfs-1.5.0.tar.gz"
+MD5SUM="58d88d7a7cfb9455a3fb044d158cef55"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="%README%"
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/libraries/libnfs/slack-desc b/libraries/libnfs/slack-desc
index d2b92670ac..aa83c6b7c5 100644
--- a/libraries/libnfs/slack-desc
+++ b/libraries/libnfs/slack-desc
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|