2 files changed, 32 insertions, 33 deletions
diff --git a/games/opentyrian/opentyrian.SlackBuild b/games/opentyrian/opentyrian.SlackBuild
index 1c50c6f2327f6..e6ca72ed42665 100644
--- a/games/opentyrian/opentyrian.SlackBuild
+++ b/games/opentyrian/opentyrian.SlackBuild
@@ -6,6 +6,8 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230107 bkw: update for v2.1.20221123.
+
 # 20211026 bkw: BUILD=2
 # - fix build on -current.
 # - /usr/share/opentyrian => /usr/share/games/opentyrian
@@ -16,7 +18,7 @@
 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}
@@ -61,29 +63,33 @@ 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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-sed -i 's,/usr/share,/usr/share/games,' src/file.c
+# 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
 
-mkdir -p \
-  $PKG/usr/games \
-  $PKG/usr/share/games/$PRGNAM/data \
-  $PKG/usr/man/man6 \
-  $PKG/usr/share/pixmaps \
-  $PKG/usr/share/applications \
-  $PKG/usr/doc/$PRGNAM-$VERSION \
-  $PKG/install
+DOCDIR=/usr/doc/$PRGNAM-$VERSION
+PKGDOC=$PKG/$DOCDIR
 
-SLKCFLAGS+=" -fcommon"
-sed -i "s,-g0,$SLKCFLAGS," Makefile
-sed -i "s,-g3.*\$,$SLKCFLAGS," Makefile
-make
+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
 
-install -s $PRGNAM $PKG/usr/games
+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
@@ -95,32 +101,25 @@ 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/games/$PRGNAM/data
 cd -
 
-for i in linux/icons/*.png; do
-  px=$( basename $i | cut -d. -f1 | cut -d- -f2 )
-  size=${px}x${px}
-  dir=$PKG/usr/share/icons/hicolor/$size/apps
-  mkdir -p $dir
-  cat $i > $dir/$PRGNAM.png
-done
-
+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
 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
diff --git a/games/opentyrian/opentyrian.info b/games/opentyrian/opentyrian.info
index 15c36e6897896..f9bf493eb5b18 100644
--- a/games/opentyrian/opentyrian.info
+++ b/games/opentyrian/opentyrian.info
@@ -1,9 +1,9 @@
 PRGNAM="opentyrian"
-VERSION="2.1.20130907"
+VERSION="2.1.20221123"
 HOMEPAGE="https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
-DOWNLOAD="https://www.camanis.net/opentyrian/releases/opentyrian-2.1.20130907-src.tar.gz \
-          https://camanis.net/tyrian/tyrian21.zip"
-MD5SUM="978686c5a1dfbac69a2161aadf084c2b \
+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=""