4 files changed, 49 insertions, 36 deletions
diff --git a/games/larn/larn.SlackBuild b/games/larn/larn.SlackBuild
index 43bd7dd9fd..722dc3a9f5 100644
--- a/games/larn/larn.SlackBuild
+++ b/games/larn/larn.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for larn
 
-# Copyright 2019 David Melik, Spokane, WA, USA
+# Copyright 2020 SlackBuilds.org Project, David Melik, Spokane, WA, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,23 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220505 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix permissions (no executable .txt files in the doc dir, please).
+
+# 20220220 bkw: Modified by SlackBuilds.org:
+# - fix build on 15.0.
+# - actually use SLKCFLAGS.
+# - the wrapper script in /usr/games was getting installed without
+#   +x permission, fix.
+# - use a relative symlink (not absolute) for the wrapper script.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=larn
-VERSION=${VERSION:-14.0.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-14.1.5}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +48,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -62,37 +79,35 @@ cd $TMP
 rm -rf RL_M-$VERSION
 tar xvf $CWD/RL_M-$VERSION.tar.gz
 cd RL_M-$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 {} \;
-
-cd build
-  cmake larn.sln -DCMAKE_BUILD_TYPE=Debug '.'
-  make
-  mv larn ..
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20220220 bkw: grrrr.
+sed -i "s,-Werror,$SLKCFLAGS," Makefile
+
+make
+
+mv larn ..
 cd ..
 mkdir -p $PKG/usr/share/games/larn
-cp -a larn data $PKG/usr/share/games/larn
-cp $CWD/larn.sh $PKG/usr/share/games/larn
-chown -R games:users $PKG/usr/share/games/larn
+install -s -m0755 larn $PKG/usr/share/games/larn
+mkdir -p $PKG/usr/share/games/larn/data
+chown -R games:users $PKG/usr/share/games/larn/data
 chmod 775 $PKG/usr/share/games/larn/data
+install -m0755 -oroot -groot $CWD/larn.sh $PKG/usr/share/games/larn
 mkdir -p $PKG/usr/games
 cd $PKG/usr/games
-ln -fs /usr/share/games/larn/larn.sh larn
+ln -s ../share/games/larn/larn.sh larn
 cd $TMP/RL_M-$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
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a MANUAL.txt README.md docs $PKG/usr/doc/$PRGNAM-$VERSION
+install -m0644 \
+  README.md docs/manual.txt docs/LICENSE.txt docs/history.txt docs/changelog.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/games/larn/larn.info b/games/larn/larn.info
index 46ebd9d1ee..6b34915af8 100644
--- a/games/larn/larn.info
+++ b/games/larn/larn.info
@@ -1,10 +1,10 @@
 PRGNAM="larn"
-VERSION="14.0.2"
-HOMEPAGE="https://web.archive.org/web/20170408164536/https://github.com/atsb/RL_M"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/RL_M-14.0.2.tar.gz"
-MD5SUM="481f03f6642aea0aeef7eb9d38fff881"
+VERSION="14.1.5"
+HOMEPAGE="https://github.com/atsb/RL_M"
+DOWNLOAD="https://github.com/atsb/RL_M/archive/14.1.5/RL_M-14.1.5.tar.gz"
+MD5SUM="d854be61e7f778b8ba4b3e1cf15a1f66"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="David Melik"
-EMAIL="davidnchmelik@gmail.com"
+EMAIL="dchmelik@gmail.com"
diff --git a/games/larn/larn.sh b/games/larn/larn.sh
index 579b6e0378..8d43c20f2e 100644
--- a/games/larn/larn.sh
+++ b/games/larn/larn.sh
@@ -1,5 +1,3 @@
 #!/bin/sh
-USERDIR=$(pwd)
 cd /usr/share/games/larn
-exec /usr/share/games/larn "$@"
-cd $USERDIR
+exec /usr/share/games/larn/larn "$@"
diff --git a/games/larn/slack-desc b/games/larn/slack-desc
index 3ee01fa8f0..9aa25c4d6a 100644
--- a/games/larn/slack-desc
+++ b/games/larn/slack-desc
@@ -8,9 +8,9 @@
     |-----handy-ruler------------------------------------------------------|
 larn: larn (adventure game)
 larn:
-larn: LARN is a dungeon type adventure game similar in concept to HACK, ROGUE
-larn: or MORIA, but with a different feel and winning criteria.  LARN was
-larn: released for the UNIX environment in 1986 by Noah Morgan.  It was
+larn: LARN is a dungeon type adventure game similar in concept to HACK,
+larn: ROGUE or MORIA, but with a different feel and winning criteria.  LARN
+larn: was released for the UNIX environment in 1986 by Noah Morgan.  It was
 larn: subsequently ported to the MS-DOS environment by Don Kneller.  Kevin
 larn: Routley worked on enhancements to LARN.
 larn: