1 files changed, 49 insertions, 37 deletions
diff --git a/games/opentyrian/opentyrian.SlackBuild b/games/opentyrian/opentyrian.SlackBuild
index 7854c7f534..b13ff1a8e6 100644
--- a/games/opentyrian/opentyrian.SlackBuild
+++ b/games/opentyrian/opentyrian.SlackBuild
@@ -2,16 +2,24 @@
 
 # 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}
@@ -24,9 +32,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,56 +64,63 @@ 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