desktop/ion: Build with lua51.

Signed-off-by: B. Watson <urchlay@slackware.uk>

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

desktop/ion/doinst.sh

@@ -1,16 +1,14 @@
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
   elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
     rm $NEW
   fi
-  # Otherwise, we leave the .new copy for the admin to consider...
 }
 
+config etc/X11/xinit/xinitrc.ion.new
 config etc/ion3/look_ios.lua.new
 config etc/ion3/look_cleanios.lua.new
 config etc/ion3/cfg_kludges.lua.new

desktop/ion/ion.SlackBuild

@@ -6,6 +6,11 @@
 # Modified by the SlackBuilds.org project
 # (assumed to be in public domain per our submission policy)
 
+# 20241020 bkw, BUILD=4:
+# - build with new lua51 package (since lua's been updated to 5.4 and
+#   this won't work with 5.4).
+# - add xinitrc.ion.new to doinst.sh.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ion
@@ -22,9 +27,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -59,18 +61,20 @@ rm -rf $PRGNAM-$SRC_VERSION
 tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.gz
 cd $PRGNAM-$SRC_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 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Patch system.mk after filtering it through sed to replace a few path issues,
 # x86_64-specific things, and add optimization flags
 sed -e "s%@VERSION@%$VERSION%g" -e "s%@LIBDIRSUFFIX@%$LIBDIRSUFFIX%g" \
   $CWD/system.mk.diff | patch -p1
 
-make -j1 OPTS="$SLKCFLAGS"
+make -j1 \
+  OPTS="$SLKCFLAGS" \
+  LUA_LIBS="-llua5.1" \
+  LUA_INCLUDES="-I/usr/include/lua5.1" \
+  LUA=/usr/bin/lua5.1 \
+  LUAC=/usr/bin/luac5.1
 
 # The Makefile doesn't support DESTDIR :/
 make install \
@@ -81,7 +85,7 @@ make install \
   DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION \
   INCDIR=$PKG/usr/include/ion3 \
   LIBDIR=$PKG/usr/lib${LIBDIRSUFFIX} \
-  LOCALEDIR=$PKG/usr/share/locale
+  LOCALEDIR=$PKG/usr/share/locale \
 
 # Install an xinitrc file so that ion will show up in xwmconfig
 # We also need to patch the reference to the X11 lib directory when

desktop/ion/ion.info

@@ -5,6 +5,6 @@ DOWNLOAD="http://gajon.org/otherstuff/ion-3-20090110.tar.gz"
 MD5SUM="1f17be1e87187b4af7de047187cc4930"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lua"
+REQUIRES="lua51"
 MAINTAINER="Jorge Gajon"
 EMAIL="gajon@gajon.org"