network/luakit: Updated for version 2017.08.10 + new maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 26 insertions, 31 deletions

diff --git a/network/luakit/README b/network/luakit/README
index cdba08c04e4e5..88fe51204b835 100644
--- a/network/luakit/README
+++ b/network/luakit/README
@@ -7,6 +7,3 @@ constructed by the config files present in /etc/xdg/luakit
 Just copy the files you wish to change (and the rc.lua) into
 $XDG_CONFIG_HOME/luakit (defaults to ~/.config/luakit) and
 luakit will use those files when you next launch it.
-
-luajit is an optional dependency. You can pass LUAJIT=1 to the 
-SlackBuild.
diff --git a/network/luakit/luakit.SlackBuild b/network/luakit/luakit.SlackBuild
index b89e77c48e2e1..7ecbb79cfd331 100644
--- a/network/luakit/luakit.SlackBuild
+++ b/network/luakit/luakit.SlackBuild
@@ -23,15 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=luakit
-VERSION=${VERSION:-2012.09.13_r1}
+VERSION=${VERSION:-2017.08.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-SRCVER=`echo $VERSION |tr _ -`
-LUAJIT=${LUAJIT:-0} # 0 or 1
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -42,8 +40,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"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -57,39 +55,39 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVER
-if [ -e $CWD/$SRCVER.tar.gz ]; then
-  tar xvf $CWD/$SRCVER.tar.gz
-else
-  tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
-fi
-cd $PRGNAM-$SRCVER
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$VERSION.tar.gz
+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 {} \;
 
-_CFLAGS=`cat config.mk |grep CFLAGS | sed -e "s/CFLAGS//g" -e "s/+=//g" |tr "\n" " "`
 make \
   PREFIX=/usr \
   MANPREFIX=/usr/man \
   DOCDIR=/usr/doc/luakit-$VERSION \
-  CFLAGS="$_CFLAGS $SLKCFLAGS" \
-  USE_LUAJIT=$LUAJIT
+  DEVELOPMENT_PATHS=0
 
 make install \
   DESTDIR=$PKG \
   PREFIX=/usr \
   MANPREFIX=$PKG/usr/man \
-  DOCDIR=$PKG/usr/doc/luakit-$VERSION
+  DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
+
 
 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 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG.md \
+  CONTRIBUTING.md COPYING.GPLv3 \
+  README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/luakit/luakit.info b/network/luakit/luakit.info
index 09c7946ca0bf5..58b2c9d45f5bd 100644
--- a/network/luakit/luakit.info
+++ b/network/luakit/luakit.info
@@ -1,10 +1,10 @@
 PRGNAM="luakit"
-VERSION="2012.09.13_r1"
-HOMEPAGE="https://github.com/mason-larobina/luakit"
-DOWNLOAD="https://github.com/mason-larobina/luakit/archive/2012.09.13-r1.tar.gz"
-MD5SUM="c68a408402cac7bd30fb7c425d9adc5d"
+VERSION="2017.08.10"
+HOMEPAGE="https://github.com/luakit/luakit"
+DOWNLOAD="https://github.com/luakit/luakit/archive/2017.08.10/2017.08.10.tar.gz"
+MD5SUM="77065e5acf7a941954d6c61a28df98d1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lua webkitgtk lua-filesystem libunique"
-MAINTAINER="Andrew Tkalia"
-EMAIL="anddt@yandex.ru"
+REQUIRES="luajit webkit2gtk lua-filesystem"
+MAINTAINER="Leonard Schmidt"
+EMAIL="lems@gmx.net"