diff --git a/d/lua/lua-5.2.3.tar.gz.sha1 b/d/lua/lua-5.2.3.tar.gz.sha1 deleted file mode 100644 index 2de58d33..00000000 --- a/d/lua/lua-5.2.3.tar.gz.sha1 +++ /dev/null @@ -1 +0,0 @@ -926b7907bc8d274e063d42804666b40a3f3c124c lua-5.2.3.tar.gz diff --git a/d/lua/lua-5.3.2.tar.gz.sha1 b/d/lua/lua-5.3.2.tar.gz.sha1 new file mode 100644 index 00000000..164fbf85 --- /dev/null +++ b/d/lua/lua-5.3.2.tar.gz.sha1 @@ -0,0 +1 @@ +7a47adef554fdca7d0c5536148de34579134a973 lua-5.3.2.tar.gz diff --git a/d/lua/lua.SlackBuild b/d/lua/lua.SlackBuild index 166bdaea..956d9f0e 100755 --- a/d/lua/lua.SlackBuild +++ b/d/lua/lua.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash # Build script for Slackware -# Copyright (C) 2011,2012,2013,2015 Damien Goutte-Gattat +# Copyright (C) 2011,2012,2013,2015,2016 Damien Goutte-Gattat # # Redistribution and use of this script, with or without modifications, # is permitted provided that the following conditions are met: @@ -26,7 +26,7 @@ # Source package infos NAMESRC=${NAMESRC:-lua} -VERSION=${VERSION:-5.2.3} +VERSION=${VERSION:-5.3.2} ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz} WGET=${WGET:-http://www.lua.org/ftp/$ARCHIVE} @@ -73,12 +73,12 @@ tar xf $CWD/$ARCHIVE cd $NAME sed -i 's,^#define LUA_ROOT.*$,#define LUA_ROOT "/usr/",' src/luaconf.h if [ "x$ARCH" = xx86_64 ]; then - sed -i 's,^#define LUA_CDIR.*$,#define LUA_CDIR "/usr/lib64/lua/5.2/",' src/luaconf.h + sed -i 's,"lib/lua/","lib64/lua/",' src/luaconf.h fi make linux INSTALL_TOP=/usr INSTALL_LIB=/usr/lib$LIBDIRSUFFIX MYLIBS=-ltermcap make install INSTALL_TOP=$PKG/usr \ INSTALL_LIB=$PKG/usr/lib$LIBDIRSUFFIX \ - INSTALL_CMOD=$PKG/usr/lib$LIBDIRSUFFIX/lua/5.2 + INSTALL_CMOD=$PKG/usr/lib$LIBDIRSUFFIX/lua/5.3 # Strip binaries find $PKG | xargs file | grep "ELF \(32\|64\)-bit LSB" | cut -d : -f 1 | \ @@ -119,9 +119,8 @@ PACKAGING=" chown root:root . -R /sbin/makepkg -l y -c n $OUT/$NAMEPKG-$VERSION-$ARCH-$BUILD.$EXT rm -rf $PKG +rm -rf $TMP/$NAME " -#rm -rf $TMP/$NAME -#" if type -p fakeroot ; then echo "$PACKAGING" | fakeroot else diff --git a/l/lgi/lgi.SlackBuild b/l/lgi/lgi.SlackBuild index efce73c1..8da12417 100755 --- a/l/lgi/lgi.SlackBuild +++ b/l/lgi/lgi.SlackBuild @@ -34,7 +34,7 @@ WGET=${WGET:-https://github.com/pavouk/lgi/archive/$VERSION.tar.gz} # Build infos NAMEPKG=${NAMEPKG:-lgi} -BUILD=${BUILD:-1GGD} +BUILD=${BUILD:-2GGD} ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')} EXT=${EXT:-txz} @@ -87,13 +87,13 @@ cd $NAME CFLAGS=$CPUOPT \ make \ PREFIX=/usr \ - LUA_LIBDIR=/usr/lib$LIBDIRSUFFIX/lua/5.2 \ - LUA_SHAREDIR=/usr/share/lua/5.2 + LUA_LIBDIR=/usr/lib$LIBDIRSUFFIX/lua/5.3 \ + LUA_SHAREDIR=/usr/share/lua/5.3 make install \ DESTDIR=$PKG \ PREFIX=/usr \ - LUA_LIBDIR=/usr/lib$LIBDIRSUFFIX/lua/5.2 \ - LUA_SHAREDIR=/usr/share/lua/5.2 + LUA_LIBDIR=/usr/lib$LIBDIRSUFFIX/lua/5.3 \ + LUA_SHAREDIR=/usr/share/lua/5.3 # Strip binaries find $PKG | xargs file | grep "ELF \(32\|64\)-bit LSB" | cut -d : -f 1 | \