1 files changed, 45 insertions, 40 deletions
diff --git a/development/luajit/luajit.SlackBuild b/development/luajit/luajit.SlackBuild
index 7ab5f4d106fc..39d348e4711d 100644
--- a/development/luajit/luajit.SlackBuild
+++ b/development/luajit/luajit.SlackBuild
@@ -22,14 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20241106 bkw: Modified by SlackBuilds.org: update for v2.1.1727870382, to
+# match Slackware -current.
+
 # 20241017 bkw: Modified by SlackBuilds.org, BUILD=3: remove lua dep,
 # it's *not* required.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=luajit
-VERSION=${VERSION:-2.0.5}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.1.1727870382}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -69,45 +72,47 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf LuaJIT-$VERSION
-tar zxvf $CWD/LuaJIT-$VERSION.tar.gz
-cd LuaJIT-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.lz
+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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make \
-  Q=  \
-  PREFIX=/usr \
-  MULTILIB=lib${LIBDIRSUFFIX} \
-  INSTALL_LIB=/usr/lib${LIBDIRSUFFIX} \
-  INSTALL_MAN=/usr/man/man1
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make install \
-  Q=  \
-  DESTDIR=$PKG \
-  PREFIX=/usr \
-  MULTILIB=lib${LIBDIRSUFFIX} \
-  INSTALL_LIB=$PKG/usr/lib${LIBDIRSUFFIX} \
-  INSTALL_MAN=$PKG/usr/man/man1
-
-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 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  doc/* COPYRIGHT README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# 20241105 bkw: next 2 stanzas come from Pat V's luajit.SlackBuild from -current.
+# Enable Lua 5.2 features:
+sed -i -e '/-DLUAJIT_ENABLE_LUA52COMPAT/s/^#//' src/Makefile
+
+# preserve timestamps:
+sed -i -e '/install -m/s/-m/-p -m/' Makefile
+
+LIB=lib$LIBDIRSUFFIX
+USRLIB=/usr/$LIB
+MAN1=/usr/man/man1
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+runmake() {
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  make $1 \
+    Q=  \
+    DESTDIR=$2 \
+    PREFIX=/usr \
+    MULTILIB=$LIB \
+    INSTALL_LIB=$2/$USRLIB \
+    INSTALL_MAN=$2/$MAN1
+}
+
+runmake
+runmake install $PKG
+
+rm -f $PKG/$USRLIB/*.a
+strip $PKG/usr/bin/$PRGNAM-$VERSION $PKG/$USRLIB/lib$PRGNAM*.so.$VERSION
+gzip -9 $PKG/$MAN1/*
+
+mkdir -p $PKGDOC
+cp -a doc/* COPYRIGHT README $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc