4 files changed, 23 insertions, 20 deletions
diff --git a/libraries/lua-filesystem/README b/libraries/lua-filesystem/README
index d8a3ea388d8c1..351268cd98dfb 100644
--- a/libraries/lua-filesystem/README
+++ b/libraries/lua-filesystem/README
@@ -1,5 +1,3 @@
-lua-filesystem (lua filesystem library)
-
 LuaFileSystem is a Lua library developed to complement the set
 of functions related to filesystems offered by the standard
 Lua distribution.
diff --git a/libraries/lua-filesystem/lfs.pc b/libraries/lua-filesystem/lfs.pc
index dc2f328d5d6ee..9df9c4dd3e79e 100644
--- a/libraries/lua-filesystem/lfs.pc
+++ b/libraries/lua-filesystem/lfs.pc
@@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib/lua/5.1
 
 Name: lfs
 Description: lfs - lua filesystem library
-Version: 1.6.2
+Version: @VERSION@ 
 Cflags: -I${includedir}
 Libs: -L${libdir} -L/usr/lib -llfs -llua -lm
diff --git a/libraries/lua-filesystem/lua-filesystem.SlackBuild b/libraries/lua-filesystem/lua-filesystem.SlackBuild
index 18a878f706afe..971a6d187f89d 100644
--- a/libraries/lua-filesystem/lua-filesystem.SlackBuild
+++ b/libraries/lua-filesystem/lua-filesystem.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 # Slackware build script for lua-filesystem
-# Copyright Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy, 2013
+
+# Copyright 2013-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +24,14 @@
 
 PRGNAM=lua-filesystem
 SRCNAM=luafilesystem
-VERSION=${VERSION:-1.6.2}
+VERSION=${VERSION:-1.6.3}
+SRCVER=v_$(echo $VERSION | tr . _)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 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 +42,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,28 +61,31 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
-cd $SRCNAM-$VERSION
+rm -rf $SRCNAM-$SRCVER
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.?z* || tar xvf $CWD/$SRCVER.tar.?z*
+cd $SRCNAM-$SRCVER
 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 {} \;
+ \( -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 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 sed -i \
   -e "s|/usr/local|/usr|" \
   -e "s|/lib|/lib$LIBDIRSUFFIX|" \
   -e "s|-O2 -Wall -fPIC|$SLKCFLAGS -Wall|" \
-  config
+  config || exit 1
 make
 install -m 0755 -D src/lfs.so $PKG/usr/lib$LIBDIRSUFFIX/lua/5.1/lfs.so
 install -m 0644 -D src/lfs.h $PKG/usr/include/lfs.h
 
 # install a pkgconfig file
 install -m 0644 -D $CWD/lfs.pc $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/lfs.pc
-sed -i "s|/lib|/lib$LIBDIRSUFFIX|" $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/lfs.pc
+sed -i \
+  -e "s|@VERSION@|$VERSION|" \
+  -e "s|/lib|/lib$LIBDIRSUFFIX|" \
+  $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/lfs.pc
 
 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
diff --git a/libraries/lua-filesystem/lua-filesystem.info b/libraries/lua-filesystem/lua-filesystem.info
index b1e1caa61aedc..2b159a4d5c0fe 100644
--- a/libraries/lua-filesystem/lua-filesystem.info
+++ b/libraries/lua-filesystem/lua-filesystem.info
@@ -1,8 +1,8 @@
 PRGNAM="lua-filesystem"
-VERSION="1.6.2"
+VERSION="1.6.3"
 HOMEPAGE="http://keplerproject.github.com/luafilesystem/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/luafilesystem-1.6.2.tar.xz"
-MD5SUM="495c7cb01c954c10a8a23c8331caf48b"
+DOWNLOAD="https://github.com/keplerproject/luafilesystem/archive/v_1_6_3.tar.gz"
+MD5SUM="d0552c7e5a082f5bb2865af63fb9dc95"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua"