5 files changed, 78 insertions, 50 deletions
diff --git a/games/opentyrian/README b/games/opentyrian/README
index ccc9e80bfd..cff9d021c1 100644
--- a/games/opentyrian/README
+++ b/games/opentyrian/README
@@ -1,8 +1,8 @@
 opentyrian (arcade-style vertical scrolling shooter)
 
-OpenTyrian is a port of the DOS shoot-em-up Tyrian.  The story is set in
-20,031 where you play as Trent Hawkins, a skilled fighter-pilot employed
-to fight Microsol and save the galaxy.
+OpenTyrian is a port of the MS-DOS shoot-em-up Tyrian. The story is
+set in 20,031 where you play as Trent Hawkins, a skilled fighter pilot
+employed to fight Microsol and save the galaxy.
 
 Gameplay is similar to the arcade game Raiden. For gameplay help, see
 README and manual.txt in /usr/doc/opentyrian-$VERSION/.
diff --git a/games/opentyrian/doinst.sh b/games/opentyrian/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/opentyrian/doinst.sh
+++ b/games/opentyrian/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/opentyrian/opentyrian.SlackBuild b/games/opentyrian/opentyrian.SlackBuild
index 156e6a54ea..b13ff1a8e6 100644
--- a/games/opentyrian/opentyrian.SlackBuild
+++ b/games/opentyrian/opentyrian.SlackBuild
@@ -1,17 +1,28 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for opentyrian
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230525 bkw: old homepage went away. script not changed.
+# 20230107 bkw: update for v2.1.20221123.
+
+# 20211026 bkw: BUILD=2
+# - fix build on -current.
+# - /usr/share/opentyrian => /usr/share/games/opentyrian
+# - new-style icons.
+
 # 20170620 bkw: fix compile on -current (still works fine on 14.2)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=opentyrian
-VERSION=${VERSION:-2.1.20130907}
+VERSION=${VERSION:-2.1.20221123}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -21,7 +32,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}
@@ -49,59 +64,66 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
+tar xvf $CWD/$PRGNAM-$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 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p \
-  $PKG/usr/games \
-  $PKG/usr/share/$PRGNAM/data \
-  $PKG/usr/man/man6 \
-  $PKG/usr/share/pixmaps \
-  $PKG/usr/share/applications \
-  $PKG/usr/doc/$PRGNAM-$VERSION \
-  $PKG/install
-
-sed -i "s,-g0,$SLKCFLAGS," Makefile
-sed -i "s,-g3.*\$,$SLKCFLAGS," Makefile
-make
-
-install -s $PRGNAM $PKG/usr/games
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20230107 bkw: absolute path in .desktop file.
+sed -i '/^Exec=/s,=,=/usr/games/,' linux/$PRGNAM.desktop
+
+# 20230107 bkw: they didn't give us a make variable for this...
+sed -i "s,-O2,$SLKCFLAGS," Makefile
+
+DOCDIR=/usr/doc/$PRGNAM-$VERSION
+PKGDOC=$PKG/$DOCDIR
+
+make \
+  prefix=/usr \
+  bindir=/usr/games \
+  mandir=/usr/man \
+  docdir=$DOCDIR \
+  TYRIAN_DIR=/usr/share/games/$PRGNAM/data \
+  DESTDIR=$PKG \
+  INSTALL_PROGRAM="install -s" \
+  all \
+  install
+
+gzip -9 $PKG/usr/man/man?/*.?
 
 # Probably some of the data files are redundant. We certainly don't
 # need the DOS executables or their docs (except manual.doc which
 # has the game story).
 cat <<EOF > $PKG/usr/doc/$PRGNAM-$VERSION/manual.txt
-20140429 bkw: This is the original manual from the DOS game. The install
-instructions are obsolete, but the backstory and gameplay instructions
-are still relevant [beginning with V) THE STORY].
+20140429 bkw: This is the original manual from the MS-DOS game. The
+install instructions are obsolete, but the backstory and gameplay
+instructions are still relevant [beginning with "V) THE STORY"].
 
 EOF
 
+mkdir -p $PKG/{install,usr/share/{pixmaps,games/$PRGNAM/data}}
+
 unzip $CWD/tyrian$DATAVER.zip
 cd tyrian$DATAVER
   chmod 644 *
-  sed 's/\r//' manual.doc >> $PKG/usr/doc/$PRGNAM-$VERSION/manual.txt
+  sed 's/\r//' manual.doc >> $PKGDOC/manual.txt
   rm -f *.exe *.doc
-  mv * $PKG/usr/share/$PRGNAM/data
+  mv * $PKG/usr/share/games/$PRGNAM/data
 cd -
 
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
 gzip -9c < linux/man/$PRGNAM.6 > $PKG/usr/man/man6/$PRGNAM.6.gz
-cat linux/icons/tyrian-128.png > $PKG/usr/share/pixmaps/$PRGNAM.png
-cat linux/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+sed 's,Exec=,&/usr/games/,' linux/$PRGNAM.desktop \
+    > $PKG/usr/share/applications/$PRGNAM.desktop
 
-chmod 644 CREDITS
-cp -a COPYING CREDITS NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a COPYING $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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/opentyrian/opentyrian.info b/games/opentyrian/opentyrian.info
index 47c0bd02ae..19caf3f0e7 100644
--- a/games/opentyrian/opentyrian.info
+++ b/games/opentyrian/opentyrian.info
@@ -1,12 +1,12 @@
 PRGNAM="opentyrian"
-VERSION="2.1.20130907"
-HOMEPAGE="https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
-DOWNLOAD="http://www.camanis.net/opentyrian/releases/opentyrian-2.1.20130907-src.tar.gz \
-          http://camanis.net/tyrian/tyrian21.zip"
-MD5SUM="978686c5a1dfbac69a2161aadf084c2b \
+VERSION="2.1.20221123"
+HOMEPAGE="https://github.com/opentyrian/opentyrian/"
+DOWNLOAD="https://github.com/opentyrian/opentyrian/archive/v2.1.20221123/opentyrian-2.1.20221123.tar.gz \
+          https://www.camanis.net/tyrian/tyrian21.zip"
+MD5SUM="d3e082d310073bc9577a4ec4974c76b4 \
         2a3b206a6de25ed4b771af073f8ca904"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/games/opentyrian/slack-desc b/games/opentyrian/slack-desc
index 35b9e7aa37..e70c67bd99 100644
--- a/games/opentyrian/slack-desc
+++ b/games/opentyrian/slack-desc
@@ -8,12 +8,12 @@
           |-----handy-ruler------------------------------------------------------|
 opentyrian: opentyrian (arcade-style vertical scrolling shooter)
 opentyrian:
-opentyrian: OpenTyrian is a port of the DOS shoot-em-up Tyrian.  The story is set
-opentyrian: in 20,031 where you play as Trent Hawkins, a skilled fighter-pilot
+opentyrian: OpenTyrian is a port of the MS-DOS shoot-em-up Tyrian. The story is
+opentyrian: set in 20,031 where you play as Trent Hawkins, a skilled fighter pilot
 opentyrian: employed to fight Microsol and save the galaxy.
 opentyrian:
-opentyrian: Gameplay is similar to the arcade game Raiden.
-opentyrian:
+opentyrian: Gameplay is similar to the arcade game Raiden. For gameplay help, see
+opentyrian: README and manual.txt in /usr/doc/opentyrian-$VERSION/.
 opentyrian:
 opentyrian:
 opentyrian: