games/supermariowar: Updated for version 2020_04_25.

Signed-off-by: B. Watson <yalhcru@gmail.com>

5 files changed, 25 insertions, 44 deletions

diff --git a/games/supermariowar/README b/games/supermariowar/README
index 93229cbe1f..b984878a2a 100644
--- a/games/supermariowar/README
+++ b/games/supermariowar/README
@@ -1,14 +1,13 @@
 supermariowar (Super Mario multiplayer game)
 
 Super Mario War is a fan-made multiplayer Super Mario Bros. style
-deathmatch game in which players try to beat one another in a variety of
-gameplay modes. You can play on teams, design your own levels, design your
-own worlds, and much more! The goal is to stomp as many other Marios as
-possible to win the game. It's a tribute to Nintendo and the game Mario
-War by Samuele Poletto.
+deathmatch game in which players try to beat one another in a variety
+of gameplay modes. You can play on teams, design your own levels,
+design your own worlds, and much more! The goal is to stomp as many
+other Marios as possible to win the game. It's a tribute to Nintendo
+and the game Mario War by Samuele Poletto.
 
 Notes:
 
 - The game executable is called "smw".
 - Single player games against bots are supported.
-- Only 640x480 windowed and fullscreen video modes are supported.
diff --git a/games/supermariowar/doinst.sh b/games/supermariowar/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/supermariowar/doinst.sh
+++ b/games/supermariowar/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/supermariowar/supermariowar-2.0_beta1-yaml-cpp-config.cmake b/games/supermariowar/supermariowar-2.0_beta1-yaml-cpp-config.cmake
deleted file mode 100644
index 03fb190aad..0000000000
--- a/games/supermariowar/supermariowar-2.0_beta1-yaml-cpp-config.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(YAML-CPP REQUIRED yaml-cpp)
-find_path(YAML-CPP_INCLUDE_DIRECTORY
-    NAMES yaml.h
-    PATHS ${YAML-CPP_INCLUDE_DIRS} /usr/include/yaml-cpp
-)
-find_library(YAML-CPP_LIBRARY
-    NAMES yaml-cpp
-    PATHS ${YAML-CPP_LIBRARY_DIRS})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(yaml-cpp 
-    FOUND_VAR yaml-cpp_FOUND
-    REQUIRED_VARS YAML-CPP_LIBRARY YAML-CPP_INCLUDE_DIRECTORY
-)
-
-if (yaml-cpp_FOUND)
-    set(yaml-cpp_INCLUDE_DIRS ${YAML-CPP_INCLUDE_DIRECTORY})
-    set(yaml-cpp_LIBRARIES ${YAML-CPP_LIBRARY})
-endif ()
-mark_as_advanced(YAML-CPP_INCLUDE_DIRECTORY YAML-CPP_LIBRARY)
diff --git a/games/supermariowar/supermariowar.SlackBuild b/games/supermariowar/supermariowar.SlackBuild
index 31bfb0c66a..54e7389887 100644
--- a/games/supermariowar/supermariowar.SlackBuild
+++ b/games/supermariowar/supermariowar.SlackBuild
@@ -6,12 +6,14 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211209 bkw: updated for v2020_04_25 (latest beta). Note that the game
+# uses SDL2 by default now.
 # 20170302 bkw: use long-format github URL
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=supermariowar
-VERSION=${VERSION:-2.0beta1.1}
+VERSION=${VERSION:-2020_04_25}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -24,9 +26,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
@@ -36,7 +35,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-TARVER="$( echo "$VERSION" | sed 's,beta,-beta.,' )"
+TARVER="$( echo "$VERSION" | sed 's,_,-,g' )"
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -60,14 +59,9 @@ cd $TMP
 rm -rf $PRGNAM-$TARVER
 tar xvf $CWD/$PRGNAM-$TARVER.tar.gz
 cd $PRGNAM-$TARVER
-# thanks to the gentoo maintainers
-cp $CWD/$PRGNAM-2.0_beta1-yaml-cpp-config.cmake cmake/Findyaml-cpp.cmake
 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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # upstream ships these as zip files, but 'make install' expects them
 # to be unzipped.
@@ -83,8 +77,6 @@ sed -i \
 # implemented in 2.0beta1... screenshots still work, they're saved as
 # .bmp instead.
 
-# -DUSE_SDL2_LIBS=ON will be supported in the future.
-
 mkdir -p build
 cd build
   cmake \
@@ -103,6 +95,11 @@ cd ..
 # the executable bits set...
 chmod 0755 $PKG/usr/games/*
 
+# new-style icons. tiny ones, since that's all they gave us.
+# leave the .xpm icons in pixmaps.
+mkdir -p $PKG/usr/share/icons/hicolor/32x32/apps
+mv $PKG/usr/share/pixmaps/*.png $PKG/usr/share/icons/hicolor/32x32/apps
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 # get rid of the CRLFs in the docs
 for i in CHANGELOG CREDITS README.md docs/*.html docs/*.txt; do
diff --git a/games/supermariowar/supermariowar.info b/games/supermariowar/supermariowar.info
index ed031dd0d8..6c349d1ae9 100644
--- a/games/supermariowar/supermariowar.info
+++ b/games/supermariowar/supermariowar.info
@@ -1,8 +1,8 @@
 PRGNAM="supermariowar"
-VERSION="2.0beta1.1"
+VERSION="2020_04_25"
 HOMEPAGE="https://github.com/mmatyas/supermariowar"
-DOWNLOAD="https://github.com/mmatyas/supermariowar/archive/v2.0-beta.1.1/supermariowar-2.0-beta.1.1.tar.gz"
-MD5SUM="695209dfc4a549dfd6dea0d5aa421137"
+DOWNLOAD="https://github.com/mmatyas/supermariowar/archive/2020-04-25/supermariowar-2020-04-25.tar.gz"
+MD5SUM="ac6e6756bc9ef017aef2a900762b6775"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="enet yaml-cpp"