4 files changed, 31 insertions, 22 deletions
diff --git a/games/antimicro/README b/games/antimicro/README
index 57406c7e63..2544b5ceed 100644
--- a/games/antimicro/README
+++ b/games/antimicro/README
@@ -1,10 +1,14 @@
 Antimicro is a GUI application to intercept gamepad signals and
-translate them to keyboard events, so that you can control games that
-do not have native gamepad support.
+translate them to keyboard and mouse events, so that you can use a
+gamepad with games that do not have native (or poor) gamepad support.
 
-It works for games you're playing on Linux or with WINE.
+It works for games you're playing on Linux or with WINE. It works with
+Steam or stand-alone games.
 
-https://github.com/AntiMicro/antimicro
+You can compile it using Qt4 or Qt5, at your option. Default is
+the Slackware default: Qt4. To compile with Qt5 instead:
+
+    # QT=5 ./antimicro.SlackBuild
 
 
 Profiles
diff --git a/games/antimicro/antimicro.SlackBuild b/games/antimicro/antimicro.SlackBuild
index f86b00b71f..1d0351030a 100644
--- a/games/antimicro/antimicro.SlackBuild
+++ b/games/antimicro/antimicro.SlackBuild
@@ -9,9 +9,12 @@
 # without any warranty.
 
 PRGNAM=antimicro
-VERSION=${VERSION:-2.20}
+VERSION=${VERSION:-2.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+QT=${QT:-4}
+DOCDIR=${DOCDIR:-/usr/doc}
+MANDIR=${MANDIR:-/usr/man}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -46,7 +49,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xf $CWD/$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -57,13 +60,11 @@ find -L . \
 
 mkdir -p build
 cd build
-  cmake \
+QT_SELECT=`echo $QT` cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DUSE_SDL_2=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DMAN_INSTALL_DIR=/usr/man \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
@@ -72,21 +73,21 @@ cd ..
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/man
-mv $PKG/usr/share/man/* $PKG/usr/man
+# Compress man pages
+mkdir -p $PKG/$MANDIR
+mv $PKG/usr/share/man/man1 $PKG/$MANDIR
 rm -rf $PKG/usr/share/man
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+find $PKG/$MANDIR -type f -exec gzip -9 {} \;
+for i in $( find $PKG/$MANDIR -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 cat other/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README.md gpl.txt Resources.txt \
-  other/40-uinput.rules \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/$DOCDIR/$PRGNAM-$VERSION
+cp -a README.md BuildOptions.md gpl.txt Resources.txt \
+  ProfileTips.md other/40-uinput.rules \
+  $PKG/$DOCDIR/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/$DOCDIR/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/games/antimicro/antimicro.info b/games/antimicro/antimicro.info
index b15bd9fdfb..3baf8042ab 100644
--- a/games/antimicro/antimicro.info
+++ b/games/antimicro/antimicro.info
@@ -1,8 +1,8 @@
 PRGNAM="antimicro"
-VERSION="2.20"
+VERSION="2.22"
 HOMEPAGE="https://github.com/AntiMicro/antimicro"
-DOWNLOAD="https://github.com/AntiMicro/antimicro/archive/2.20/antimicro-2.20.tar.gz"
-MD5SUM="cf6ae291684155605a9b700af9371810"
+DOWNLOAD="https://github.com/AntiMicro/antimicro/archive/2.22/antimicro-2.22.tar.gz"
+MD5SUM="165a0dbe5931783f0d2c035a87b8e6a1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2"
diff --git a/games/antimicro/doinst.sh b/games/antimicro/doinst.sh
index 5fb28930db..9a8ded3c60 100644
--- a/games/antimicro/doinst.sh
+++ b/games/antimicro/doinst.sh
@@ -1,3 +1,7 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi