6 files changed, 44 insertions, 7 deletions
diff --git a/games/fizmo/README b/games/fizmo/README
index 3274745000..3df3a4e1c2 100644
--- a/games/fizmo/README
+++ b/games/fizmo/README
@@ -5,3 +5,7 @@ along with a ncurses user interface, supporting Z-Machine versions 1
 to 5, 7 and 8. That means it allows you to play interactive ficiton,
 also known as textadventures, which were implemented either by Infocom
 or created using the Inform compiler.
+
+By default, the curses (fizmo-ncursesw) and 'dumb' console (fizmo-console)
+executables are always built. If you want a GUI for fizmo, install SDL2
+before running this script (the executable will be called fizmo-sdl2).
diff --git a/games/fizmo/doinst.sh b/games/fizmo/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/games/fizmo/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/fizmo/fizmo.SlackBuild b/games/fizmo/fizmo.SlackBuild
index 765302bc33..dc903f209e 100644
--- a/games/fizmo/fizmo.SlackBuild
+++ b/games/fizmo/fizmo.SlackBuild
@@ -6,8 +6,15 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20170709 bkw:
+# - Updated for v0.8.5_b1. Normally we avoid betas, but 0.8.4 has a
+#   horrible bug in its 'make install' target, and 0.8.5_b1 fixes
+#   that bug and is otherwise identical to 0.8.4.
+# - Add icon, .desktop, and doinst.
+# - Add note about optional SDL2 dep to README.
+
 PRGNAM=fizmo
-VERSION=${VERSION:-0.8.2}
+VERSION=${VERSION:-0.8.5_b1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,12 +47,14 @@ fi
 
 set -e
 
+SRCVER=${VERSION/_/-}
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -80,12 +89,24 @@ ln -s $PRGNAM-ncursesw.6.gz $PKG/usr/man/man6/$PRGNAM.6.gz
 ( cd doc ; ./create-txts.sh )
 rm -f INSTALL.txt QUICKSTART.txt # don't need install instructions
 
+# Icon created by SlackBuild author, based on
+# /usr/share/pixmaps/xterm-color_48x48.xpm
+mkdir -p $PKG/usr/share/pixmaps
+cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+
+# Desktop file written by SlackBuild author. It starts the curses version,
+# since the GUI version doesn't have a file-picker dialog if you start it
+# with no arguments.
+mkdir -p $PKG/usr/share/applications
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a *.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
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/fizmo/fizmo.desktop b/games/fizmo/fizmo.desktop
new file mode 100644
index 0000000000..e55113fbf8
--- /dev/null
+++ b/games/fizmo/fizmo.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Fizmo
+Comment=Interactive Fiction Engine
+Icon=fizmo
+Exec=fizmo
+Categories=Game;AdventureGame;
+Terminal=true
diff --git a/games/fizmo/fizmo.info b/games/fizmo/fizmo.info
index e0b3363b8d..2f1777f044 100644
--- a/games/fizmo/fizmo.info
+++ b/games/fizmo/fizmo.info
@@ -1,8 +1,8 @@
 PRGNAM="fizmo"
-VERSION="0.8.2"
+VERSION="0.8.5_b1"
 HOMEPAGE="http://spellbreaker.org/~chrender/fizmo/"
-DOWNLOAD="https://fizmo.spellbreaker.org/source/fizmo-0.8.2.tar.gz"
-MD5SUM="fd02653925463892612026c25deb1532"
+DOWNLOAD="https://fizmo.spellbreaker.org/source-beta/fizmo-0.8.5-b1.tar.gz"
+MD5SUM="2e68e334c76069db3dc1283e84a8bd14"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/fizmo/fizmo.png b/games/fizmo/fizmo.png
new file mode 100644
index 0000000000..ff3cb30639
--- /dev/null
+++ b/games/fizmo/fizmo.png