libraries/tolua++: Changed homepage, cleanups.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

4 files changed, 37 insertions, 18 deletions

diff --git a/libraries/tolua++/README b/libraries/tolua++/README
index ae59da959b264..99e976edbcd6e 100644
--- a/libraries/tolua++/README
+++ b/libraries/tolua++/README
@@ -1,7 +1,7 @@
-tolua++ is an extended version of tolua, a tool to integrate C/C++ code
-with Lua.
+tolua++ is an extended version of tolua, a tool to integrate C/C++
+code with Lua.
 
 tolua++ includes new features oriented to c++ such as:
-* Support for std::string as a basic type (this can be turned off by a
-  command line option).
-* Support for class templates
+- support for std::string as a basic type (this can be turned off
+  by a command line option);
+- Support for class templates.
diff --git a/libraries/tolua++/slack-desc b/libraries/tolua++/slack-desc
index e2e49ed9009d8..68a8fb7da04d7 100644
--- a/libraries/tolua++/slack-desc
+++ b/libraries/tolua++/slack-desc
@@ -10,10 +10,10 @@ tolua++: tolua++ (tool to integrate C/C++ code with Lua)
 tolua++:
 tolua++: Tolua++ is an extended version of tolua, a tool to integrate C/C++
 tolua++: code with Lua. tolua++ includes new features oriented to c++ such as:
+tolua++: - support for std::string as a basic type (this can be turned off
+tolua++: by a command line option);
+tolua++: - support for class templates.
 tolua++:
-tolua++: * Support for std::string as a basic type (this can be turned off
-tolua++: by a command line option).
-tolua++: * Support for class templates
+tolua++: Homepage: https://github.com/LuaDist/toluapp
 tolua++:
-tolua++: Homeapge: http://www.codenix.com/~tolua/
 tolua++:
diff --git a/libraries/tolua++/tolua++.SlackBuild b/libraries/tolua++/tolua++.SlackBuild
index 5801ebf437fb3..5a77a5fbeb279 100644
--- a/libraries/tolua++/tolua++.SlackBuild
+++ b/libraries/tolua++/tolua++.SlackBuild
@@ -3,6 +3,25 @@
 # Slackware build script for tolua++
 
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2011-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# 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=tolua++
 VERSION=${VERSION:-1.0.93}
@@ -11,7 +30,7 @@ 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
@@ -22,8 +41,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"
@@ -46,10 +65,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 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 {} \;
+ \( -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 {} \;
 
 # Fix lib64 install directory and fix version info.
 sed -i "s|'/lib'|'/lib${LIBDIRSUFFIX}'|g" SConstruct
@@ -66,7 +85,7 @@ scons install \
   prefix="$PKG/usr" \
   shared="TRUE"
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/tolua++/tolua++.info b/libraries/tolua++/tolua++.info
index 728f4a02f8d72..7e92701fd3221 100644
--- a/libraries/tolua++/tolua++.info
+++ b/libraries/tolua++/tolua++.info
@@ -1,6 +1,6 @@
 PRGNAM="tolua++"
 VERSION="1.0.93"
-HOMEPAGE="http://www.codenix.com/~tolua/"
+HOMEPAGE="https://github.com/LuaDist/toluapp"
 DOWNLOAD="http://ponce.cc/slackware/sources/repo/tolua++-1.0.93.tar.bz2"
 MD5SUM="100aa6907b8108582080b37d79c0afd7"
 DOWNLOAD_x86_64=""