development/Fennel: Updated for version 1.0.0.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

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

3 files changed, 19 insertions, 38 deletions

diff --git a/development/Fennel/Fennel.SlackBuild b/development/Fennel/Fennel.SlackBuild
index 1b561c6d8ff6e..cdba0da44f07e 100644
--- a/development/Fennel/Fennel.SlackBuild
+++ b/development/Fennel/Fennel.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Slackware build script for Fennel
-# Copyright 2021 abooksigun <abooksigun09@gmail.com>
+# Copyright 2022 abooksigun <abooksigun09@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=Fennel
-VERSION=${VERSION:-0.8.1}
+SRCNAM=${PRGNAM,}
+VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -68,9 +69,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -78,33 +79,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-make fennel fennel.lua
-
 LUAVER=${LUAVER:-"5.1 5.2 5.3 5.4 jit"}
-BINARY=${BINARY:-no}
 
 for i in $LUAVER
 do
   if [ $i != 5.1 ]; then ver=$i; fi
-  if [ $i == "jit" ]; then libver=jit-5.1 include=luajit-2.0; else libver=$i include=lua$i; fi
   if $(lua$ver -v &> /dev/null)
   then
-    sed -i "1s|lua.*|lua$ver|" fennel
-    if [ $BINARY == "yes" ] && [ $i != 5.1 ]
-    then
-      make \
-        STATIC_LUA_LIB=/usr/lib$LIBDIRSUFFIX/liblua$libver.a \
-        LUA_INCLUDE_DIR=/usr/include/$include \
-        fennel-bin
-      install -D -m 0755 fennel-bin $PKG/usr/bin/fennel$ver
-      rm fennel-bin
-    else
-      install -D -m 0755 fennel $PKG/usr/bin/fennel$ver
-    fi
+    make LUA=lua$ver
+    install -D -m 0755 $SRCNAM $PKG/usr/bin/$SRCNAM$ver
     if [ $i != jit ]
     then
-      install -D -m 0644 -t $PKG/usr/share/lua/$i fennel.lua fennelview.lua 
+      install -D -m 0644 $SRCNAM.lua $PKG/usr/share/lua/$i/$SRCNAM.lua
     fi
+    rm $SRCNAM $SRCNAM.lua
   fi
 done
 
@@ -112,13 +100,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/man/man1
-gzip -9 fennel.1
-cp fennel.1.gz $PKG/usr/man/man1
+gzip -9 $SRCNAM.1
+cp $SRCNAM.1.gz $PKG/usr/man/man1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -t $PKG/usr/doc/$PRGNAM-$VERSION \
-  api.md changelog.md CODE-OF-CONDUCT.md CONTRIBUTING.md LICENSE lua-primer.md \
-  rationale.md README.md reference.md release-checklist.md setup.md tutorial.md
+cp -a LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/Fennel/Fennel.info b/development/Fennel/Fennel.info
index 7aa2f32dff628..5bde0e670aeb5 100644
--- a/development/Fennel/Fennel.info
+++ b/development/Fennel/Fennel.info
@@ -1,8 +1,8 @@
 PRGNAM="Fennel"
-VERSION="0.8.1"
+VERSION="1.0.0"
 HOMEPAGE="https://fennel-lang.org/"
-DOWNLOAD="https://github.com/bakpakin/Fennel/archive/0.8.1/Fennel-0.8.1.tar.gz"
-MD5SUM="3da27b2de69e9e1bfe80a3928cb0453a"
+DOWNLOAD="https://git.sr.ht/~technomancy/fennel/archive/1.0.0.tar.gz"
+MD5SUM="a42c841b00eecbe4a49402a1ab318a51"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua"
diff --git a/development/Fennel/README b/development/Fennel/README
index c34f0ae83cb52..fe1e9d12827c9 100644
--- a/development/Fennel/README
+++ b/development/Fennel/README
@@ -8,9 +8,9 @@ macro system.
   than hand-written Lua.
 * Compile-time macros: Ship compiled code with no runtime dependency
   on Fennel.
-* Embeddable: Fennel is a one-file library as well as an
-* executable. Embed it in other programs to support runtime
-* extensibility and interactive development.
+* Embeddable: Fennel is a one-file library as well as an executable.
+  Embed it in other programs to support runtime extensibility
+  and interactive development.
 
 Anywhere you can run Lua code, you can run Fennel code.
 
@@ -25,11 +25,6 @@ separated with space.
 After installation there are one or more fennel executable files for the
 equivalent versions of Lua.
 
-To install compiled binary versions (experimental, only works with
-lua5.2 or higher):
-
-  export BINARY=yes
-
 Optional dependency:
 * lua-readline
 For history completion