1 files changed, 23 insertions, 23 deletions
diff --git a/games/armagetronad/armagetronad.SlackBuild b/games/armagetronad/armagetronad.SlackBuild
index b931746029..e32cd1cf7b 100644
--- a/games/armagetronad/armagetronad.SlackBuild
+++ b/games/armagetronad/armagetronad.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2010-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2010-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # based on the hollywoodb's one on 12.2 repository
 # All rights reserved.
 #
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=armagetronad
-VERSION=${VERSION:-0.2.8.3.4}
+VERSION=${VERSION:-0.2.9.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,9 +58,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.src.tar.?z*
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-v$VERSION
+tar xvf $CWD/$PRGNAM-v$VERSION.tar.?z*
+cd $PRGNAM-v$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -68,8 +68,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+./bootstrap.sh
+
 # Fix wrong detection of libpng in configure
-sed -i 's|png_check_sig|png_sig_cmp|g' configure
+sed -i 's|png_check_sig|png_sig_cmp|g' configure || exit 1
 
 # Using --disable-games since it peppers installation
 # paths with 'games' subdirectories and we're handling that manually.
@@ -106,31 +108,29 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 rm -rf $PKG/etc/rc.d
 
-# don't overwrite old configs
-CONFIGS="aiplayers.cfg \
-  default.cfg \
-  settings.cfg \
-  settings_authentication.cfg \
-  settings_dedicated.cfg \
-  settings_visual.cfg"
-for config in $CONFIGS ;
-do
-  mv $PKG/etc/$PRGNAM/$config $PKG/etc/$PRGNAM/$config.new ;
-done
-
-# fix .desktop file
+# fix .desktop file and icons
 mkdir $PKG/usr/share/applications
-mv $PKG/usr/share/games/$PRGNAM/desktop/$PRGNAM.desktop $PKG/usr/share/applications
-install -D -m 0644 $PKG/usr/share/games/armagetronad/desktop/icons/large/armagetronad.png \
-  $PKG/usr/share/pixmaps/armagetronad.png
+install -D -m 0644 desktop/$PRGNAM.desktop \
+  $PKG/usr/share/applications/$PRGNAM.desktop
+install -D -m 0644 desktop/icons/48x48/$PRGNAM.png \
+  $PKG/usr/share/pixmaps/$PRGNAM.png
+for i in 16 32 48 ; do
+  install -D -m 0644 desktop/icons/${i}x${i}/$PRGNAM.png \
+    $PKG/usr/share/icons/hicolor/${i}x${i}/apps/
+done
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+# don't overwrite old configs
+for config in aiplayers default settings settings_authentication settings_dedicated settings_visual ; do
+  mv $PKG/etc/$PRGNAM/$config.cfg $PKG/etc/$PRGNAM/$config.cfg.new
+  echo "config etc/$PRGNAM/$config.cfg.new" >> $PKG/install/doinst.sh
+done
 
 cd $PKG
 /sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}