4 files changed, 32 insertions, 57 deletions
diff --git a/games/qtads/README b/games/qtads/README
index d96aefa0cef9e..d04031da8f93b 100644
--- a/games/qtads/README
+++ b/games/qtads/README
@@ -1,15 +1,12 @@
 qtads (a multimedia interpreter for TADS games)
 
 QTads is a so called "interpreter" for games created with the Text
-Adventure Development System, or "Tads" for short, a C-like object
+Adventure Development System, or "TADS" for short, a C-like object
 oriented programming language for authoring Interactive Fiction
 (similar to the Infocom or Legend Entertainment games, like
 "Zork"). Yes, we are talking about text adventures here.
 
-Both Tads 2 (*.gam) as well as Tads 3 (*.t3) games
-are supported. You can find a selection of games at
-http://www.ifarchive.org/if-archive/games/tads/
+Both TADS 2 (*.gam) and TADS 3 (*.t3) games are supported. You can
+find a selection of games at:
 
-By default, Qt4 is used for the user interface. If you prefer Qt5,
-install libraries/qt5 and run this script with QT5=yes in the
-environment.
+http://www.ifarchive.org/if-archive/games/tads/
diff --git a/games/qtads/qtads.SlackBuild b/games/qtads/qtads.SlackBuild
index 3081bb9e17c83..f48847df29c07 100644
--- a/games/qtads/qtads.SlackBuild
+++ b/games/qtads/qtads.SlackBuild
@@ -6,14 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# Both qt4 and qt5 are supported by upstream, so this script allows for
-# both. Not sure why anyone really cares (I'm pretty much GUI-insensitive,
-# plus I hate waiting for qt5 to build), but eventually Pat will probably
-# replace qt4 with qt5 in Slackware. When that happens, this script will
-# still be usable.
+# 20201020 bkw: updated for v3.0.0. Sadly the qt4 UI is gone in this
+# release, so qt5 is now a hard dep. SDL2_sound is no longer needed, but
+# it's replaced with fluidsynth.
 
 PRGNAM=qtads
-VERSION=${VERSION:-2.1.7}
+VERSION=${VERSION:-3.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -30,19 +28,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
+# No SLKCFLAGS: qmake-qt5 uses the CFLAGS qt5 was built with.
+# No need for LIBDIRSUFFIX either, qtads doesn't use /usr/lib(64).
 
 set -e
 
@@ -50,44 +37,35 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION-source.tar.xz
 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 {} \+
 
-if [ "${QT5:-no}" = "yes" ]; then
-  [ "$QT5DIR" = "" ] && source /etc/profile.d/qt5.sh
-  # qt5 uses the CFLAGS qt5 was built with.
-  qmake-qt5
-else
-  qmake
-  # qt4 needs CFLAGS forced. easier to do it this way than deal with qmake:
-  sed -i "s,-O2,$SLKCFLAGS," Makefile
-fi
+# In case the user just installed qt5 and hasn't logged out & back in:
+[ "$QT5DIR" = "" ] && source /etc/profile.d/qt5.sh
+
+qmake-qt5 PREFIX=/usr BINDIR=/usr/games DOCDIR=/usr/doc/$PRGNAM-$VERSION
+
+# Hardcoded share/ in man path.
+sed -i 's,/usr/share/man,/usr/man,g' Makefile
 
 # Setting CC/CXX shows the actual compile commands. Using gold speeds
 # up linking enough to be worth the effort.
 make CC=gcc CXX=g++ LINK="g++ -fuse-ld=gold"
-mkdir -p $PKG/usr/games
-
-# No 'make install' target, but things are laid out nicely in the source.
-install -s -m0755 -oroot -groot $PRGNAM $PKG/usr/games/$PRGNAM
-mkdir -p $PKG/usr/share
-mv share/man $PKG/usr
-gzip -9 $PKG/usr/man/man6/$PRGNAM.6
-mv share/* $PKG/usr/share
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING HTML_TADS_LICENSE NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# for use in the slack-desc:
-ldd $PRGNAM | grep -q Qt5 && QTVER=5 || QTVER=4
+# INSTALL_ROOT, *not* DESTDIR here!
+make install INSTALL_ROOT=$PKG
+
+gzip -9 $PKG/usr/man/man?/*.?
+
+# 'make install' doesn't install the GPL.
+cp -a LICENSE.TXT $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-sed "s,@QTVER@,$QTVER," $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/games/qtads/qtads.info b/games/qtads/qtads.info
index 9cf5ea117cd79..486be6ef747fc 100644
--- a/games/qtads/qtads.info
+++ b/games/qtads/qtads.info
@@ -1,10 +1,10 @@
 PRGNAM="qtads"
-VERSION="2.1.7"
+VERSION="3.0.0"
 HOMEPAGE="https://github.com/realnc/qtads"
-DOWNLOAD="https://github.com/realnc/qtads/releases/download/2.1.7/qtads-2.1.7.tar.bz2"
-MD5SUM="32139431f08ce157eb385f1894c18f24"
+DOWNLOAD="https://github.com/realnc/qtads/releases/download/v3.0.0/qtads-3.0.0-source.tar.xz"
+MD5SUM="bbe7ee79d776f7f656b0ca7acd4d815b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL_sound"
+REQUIRES="SDL2 qt5 fluidsynth"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/games/qtads/slack-desc b/games/qtads/slack-desc
index dffec7d40acb4..a976f829d9b01 100644
--- a/games/qtads/slack-desc
+++ b/games/qtads/slack-desc
@@ -14,6 +14,6 @@ qtads: oriented programming language for authoring Interactive Fiction
 qtads: (similar to the Infocom or Legend Entertainment games, like
 qtads: "Zork"). Yes, we are talking about text adventures here.
 qtads:
-qtads: This package built for Qt@QTVER@.
+qtads:
 qtads:
 qtads: